Add back button to login and signup pages for 2d navigation

.github/workflows/tauri-publish-2d.yml

@@ -48,13 +48,13 @@ jobs:
         # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
 
       - name: install frontend dependencies
-        run: cd ./crates/desktop/artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: cd ./crates/desktop/tauri-artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          projectPath: ./crates/desktop/artcraft
+          projectPath: ./crates/desktop/tauri-artcraft
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'

Cargo.toml

@@ -24,7 +24,8 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
+  "crates/desktop/tauri-realtime",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
@@ -173,7 +174,7 @@ serde_derive = "1.0.219"
 serde_json = "1.0.140"
 serde_yaml = "0.9.1"
 sha3 = "0.10.8"
-tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
+tauri = { version = "2.4.1", features = ["unstable"] }
 thiserror = "2.0.12"
 toml = "0.8.20"
 url = { version = "2.5.4", features = ["serde"] }

crates/desktop/artcraft/src/commands/app_preferences/get_app_preferences_command.rs

@@ -1,70 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use errors::AnyhowResult;
-use log::{error, info};
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-#[derive(Serialize)]
-pub struct GetAppPreferencesResponse {
-  pub preferences: AppPreferencesPayload,
-}
-
-#[derive(Serialize)]
-pub struct AppPreferencesPayload {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-  
-  /// Play sounds on events.
-  pub play_sounds: bool,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_failure_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  #[deprecated]
-  pub generation_enqueue_sound: Option<String>,
-}
-
-
-#[tauri::command]
-pub async fn get_app_preferences_command(
-  app_prefs: State<'_, AppPreferencesManager>,
-) -> Result<GetAppPreferencesResponse, String> {
-  info!("get_app_preferences_command called");
-
-  let result = get_prefs(&app_prefs)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(GetAppPreferencesResponse {
-    preferences: result,
-  })
-}
-
-async fn get_prefs(app_prefs: &AppPreferencesManager) -> AnyhowResult<AppPreferencesPayload> {
-  let prefs = app_prefs.get_clone()?;
-  Ok(AppPreferencesPayload {
-    preferred_download_directory: prefs.preferred_download_directory,
-    play_sounds: prefs.play_sounds,
-    enqueue_success_sound: prefs.enqueue_success_sound,
-    enqueue_failure_sound: prefs.enqueue_failure_sound,
-    generation_success_sound: prefs.generation_success_sound,
-    generation_failure_sound: prefs.generation_failure_sound,
-    generation_enqueue_sound: prefs.generation_enqueue_sound,
-  })
-}

crates/desktop/artcraft/src/commands/app_preferences/mod.rs

@@ -1,2 +0,0 @@
-pub mod get_app_preferences_command;
-pub mod update_app_preference_command;

crates/desktop/artcraft/src/commands/app_preferences/update_app_preference_command.rs

@@ -1,122 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::{error, info};
-use openai_sora_client::sora_error::SoraError::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
-
-/// For now, we'll only update a single preference at a time.
-#[derive(Deserialize)]
-pub struct UpdateAppPreferencesRequest {
-  pub preference: PreferenceName,
-  /// We'll decode this with respect to the preference value.
-  pub value: Option<ValueType>,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(untagged)]
-pub enum ValueType {
-  Bool(bool),
-  String(String),
-  DownloadDirectory(PreferredDownloadDirectory),
-}
-
-#[derive(Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferenceName {
-  PreferredDownloadDirectory,
-  PlaySounds,
-  EnqueueSuccessSound,
-  EnqueueFailureSound,
-  GenerationSuccessSound,
-  GenerationFailureSound,
-}
-
-#[derive(Serialize)]
-pub struct UpdateAppPreferencesResponse {
-  pub success: bool,
-}
-
-#[tauri::command]
-pub async fn update_app_preferences_command(
-  request: UpdateAppPreferencesRequest,
-  app_prefs: State<'_, AppPreferencesManager>,
-  app_data_root: State<'_, AppDataRoot>,
-) -> Result<UpdateAppPreferencesResponse, String> {
-  info!("update_app_preferences_command called");
-
-  update_prefs(request, &app_prefs, &app_data_root)
-      .await
-      .map_err(|err| {
-        error!("Error getting app preferences: {:?}", err);
-        format!("Error getting app preferences: {:?}", err)
-      })?;
-
-  Ok(UpdateAppPreferencesResponse {
-    success: true,
-  })
-}
-
-async fn update_prefs(
-  request: UpdateAppPreferencesRequest, 
-  app_prefs: &AppPreferencesManager,
-  app_data_root: &AppDataRoot,
-) -> AnyhowResult<()> {
-  let mut prefs = app_prefs.get_clone()?;
-  
-  info!("Value is: {:?}", request.value);
-  
-  match request.preference {
-    PreferenceName::PreferredDownloadDirectory => {
-      match request.value {
-        Some(ValueType::DownloadDirectory(dir)) => 
-          prefs.preferred_download_directory = dir,
-        _ =>
-          return Err(anyhow!("Invalid value: {:?}", request.value)),
-      }
-    }
-    PreferenceName::PlaySounds => {
-      match request.value {
-        Some(ValueType::Bool(val)) => 
-          prefs.play_sounds = val,
-        _ => 
-          return Err(anyhow!("Invalid value: {:?}", request.value)),
-      }
-    }
-    PreferenceName::EnqueueSuccessSound => {
-      prefs.enqueue_success_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::EnqueueFailureSound => {
-      prefs.enqueue_failure_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::GenerationSuccessSound => {
-      prefs.generation_success_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-    PreferenceName::GenerationFailureSound => {
-      prefs.generation_failure_sound = request.value
-          .map(|val| string_value(&val))
-          .transpose()?;
-    }
-  }
-  
-  app_prefs.set_clone(&prefs)?;
-  app_data_root.settings_dir().write_app_preferences(&prefs)?;
-  
-  Ok(())
-}
-
-fn string_value(value: &ValueType) -> AnyhowResult<String> {
-  match value {
-    ValueType::String(val) => Ok(val.to_string()),
-    _ => Err(anyhow!("Invalid value type: {:?}", value)),
-  }
-}

crates/desktop/artcraft/src/commands/command_response_wrapper.rs

@@ -1,132 +0,0 @@
-use serde::Serialize;
-use std::error::Error;
-use std::str::FromStr;
-
-/// Easy to use Result<T, E> type.
-pub type CommandResult<SuccessPayload, ErrType, ErrPayload> = 
-  Result<CommandSuccessResponseWrapper<SuccessPayload>, CommandErrorResponseWrapper<ErrType, ErrPayload>>;
-
-/// No inner payloads for this type. Just strings as messages.
-pub type SimpleCommandResult = CommandResult<(), (), ()>;
-
-/// Statuses for successful commands.
-#[derive(Serialize, Clone, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum CommandSuccessStatus {
-  Success, // 200
-}
-
-/// Statuses for errorful commands.
-#[derive(Serialize, Clone, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum CommandErrorStatus {
-  BadRequest, // 400
-  Unauthorized, // 401
-  TooManyRequests, // 429
-  ServerError, // 500
-}
-
-#[derive(Serialize, Debug)]
-pub struct CommandSuccessResponseWrapper<T: Serialize> {
-  /// Both "success" and "error" types have a `status` field for the frontend.
-  pub status: CommandSuccessStatus,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub success_message: Option<String>,
-  
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub payload: Option<T>,
-}
-
-#[derive(Serialize, Debug)]
-pub struct CommandErrorResponseWrapper<ErrType: Serialize, ErrPayload: Serialize> {
-  /// Both "success" and "error" types have a `status` field for the frontend.
-  pub status: CommandErrorStatus,
-
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_message: Option<String>,
-  
-  /// Represents a "type" of error, preferably an enum without payloads.
-  /// Preferably this serializes to a string.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_type: Option<ErrType>,
-  
-  /// Represents a full error details object or payload.
-  /// This could be a structure, message, or whatever.
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub error_details: Option<ErrPayload>,
-}
-
-
-impl CommandSuccessResponseWrapper<()> {
-  pub fn empty() -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: None,
-    }
-  }
-}
-
-/// NB: This is a hack because of `()` (a.k.a. the "unit" type) and `Serialize` trait coherence and overlap.
-/// We cannot currently implement a trait for `()` and generic `Serialize` because `()` itself implements 
-/// `Serialize`. Rust's `"specialization"`, which would let us account for this, is an unstable, nightly-only
-/// feature. So instead we manually mark all types other than `()` with `SerializeMarker` as a hack to 
-/// distinguish the two.
-trait SerializeMarker : Serialize {}
-
-// NB: () is Serialize! So we can't broadly implement just `T: Serialize`.
-impl From<()> for CommandSuccessResponseWrapper<()> {
-  fn from(_: ()) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: None,
-    }
-  }
-}
-
-/// NB: Note the `"+ SerializeMarker"` bound here. This is a hack to distinguish between `()` and other types
-/// for which we will manually mark as `SerializeMarker`.
-impl <T> From<T> for CommandSuccessResponseWrapper<T> where T: Serialize + SerializeMarker {
-  fn from(val: T) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: None,
-      payload: Some(val),
-    }
-  }
-}
-
-impl From<&str> for CommandSuccessResponseWrapper<String> {
-  fn from(msg: &str) -> Self {
-    CommandSuccessResponseWrapper {
-      status: CommandSuccessStatus::Success,
-      success_message: Some(msg.to_string()),
-      payload: None,
-    }
-  }
-}
-
-impl From<&str> for CommandErrorResponseWrapper<(), ()> {
-  fn from(value: &str) -> Self {
-    CommandErrorResponseWrapper {
-      status: CommandErrorStatus::BadRequest, // NB: Default to 500 error.
-      error_message: Some(value.to_string()),
-      error_type: None,
-      error_details: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  
-  #[test]
-  fn test_empty_tuple_serialize() {
-    let response = super::CommandSuccessResponseWrapper::<()>::from(());
-    let serialized = serde_json::to_string(&response).unwrap();
-    // NB: This tests that the blanket "Serialize" impl doesn't produce a "null payload" field.
-    assert_eq!(serialized, r#"{"status":"success"}"#);
-  }
-}

crates/desktop/artcraft/src/commands/sora/check_sora_session_command.rs

@@ -1,114 +0,0 @@
-use std::ops::Add;
-use chrono::{DateTime, TimeDelta, Utc};
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::AnyhowResult;
-use log::{error, info};
-use once_cell::sync::Lazy;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::list_media::list_media::list_media;
-use serde_derive::Serialize;
-use tauri::{AppHandle, State};
-
-const CACHE_PERIOD : TimeDelta = TimeDelta::milliseconds(1000 * 60 * 5); // 5 minutes
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-pub struct CheckSoraSessionCommand {
-  pub state: SoraSessionState,
-  pub maybe_account_email: Option<String>,
-}
-
-#[derive(Serialize)]
-#[serde(rename_all = "snake_case")]
-pub enum SoraSessionState{
-  #[serde(rename = "not_set_up")]
-  NotSetUp,
-  #[serde(rename = "expired_or_error")]
-  ExpiredOrError,
-  #[serde(rename = "valid")]
-  Valid,
-}
-
-
-#[tauri::command]
-pub async fn check_sora_session_command(
-  app: AppHandle,
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> Result<CheckSoraSessionCommand, CheckSoraSessionCommand> {
-  info!("check_sora_session_command called");
-
-  match do_check(&sora_creds_manager).await {
-    Ok(state) => Ok(state),
-    Err(err) => {
-      error!("Error checking session state: {:?}", err);
-      Err(CheckSoraSessionCommand {
-        state: SoraSessionState::ExpiredOrError,
-        maybe_account_email: None,
-      })
-    }
-  }
-}
-
-async fn do_check(
-  sora_creds_manager: &SoraCredentialManager,
-) -> AnyhowResult<CheckSoraSessionCommand> {
-  
-  let mut creds = match sora_creds_manager.get_credentials()? {
-    Some(creds) => creds,
-    None => {
-      return Ok(CheckSoraSessionCommand {
-        state: SoraSessionState::NotSetUp,
-        maybe_account_email: None,
-      });
-    }
-  };
-
-  let mut needs_upgrade_or_check = false;
-  
-  let stats = sora_creds_manager.get_credential_stats()?;
-
-  match stats.last_consecutive_credential_success {
-    None => {
-      info!("Session never checked, needs upgrade or status checking.");
-      needs_upgrade_or_check= true;
-    }
-    Some(last_success) => {
-      let now = chrono::Utc::now();
-      let expires = last_success.add(CACHE_PERIOD);
-      if now.gt(&expires) {
-        info!("Session success expired, needs upgrade or status checking.");
-        needs_upgrade_or_check = true;
-      }
-    }
-  }
-  
-  let mut upgraded = false;
-  
-  if needs_upgrade_or_check {
-    info!("Attempting to upgrade session...");
-    upgraded = maybe_upgrade_or_renew_session(&mut creds).await?;
-    info!("Attempting to check session...");
-    list_media(&creds).await?;
-    sora_creds_manager.record_credential_success()?;
-  }
-
-  if upgraded {
-    info!("Saving upgraded session to manager and disk...");
-    sora_creds_manager.set_credentials(&creds)?;
-    sora_creds_manager.persist_all_to_disk()?;
-  }
-  
-  let maybe_account_email = creds
-      .jwt_bearer_token
-      .map(|token| token.jwt_claims().email.clone());
-
-  Ok(CheckSoraSessionCommand {
-    state: SoraSessionState::Valid,
-    maybe_account_email,
-  })
-}

crates/desktop/artcraft/src/commands/sora/open_sora_login_command.rs

@@ -1,39 +0,0 @@
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::AnyhowResult;
-use log::{error, info};
-use once_cell::sync::Lazy;
-use tauri::{AppHandle, State};
-
-#[tauri::command]
-pub async fn open_sora_login_command(
-  app: AppHandle,
-  app_data_root: State<'_, AppDataRoot>,
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> Result<String, String> {
-  info!("open_login_command called");
-
-  do_open_login(&app, &app_data_root, &sora_creds_manager)
-    .await
-    .map_err(|err| {
-      error!("Error opening login: {:?}", err);
-      format!("Error opening login: {:?}", err)
-    })?;
-
-  Ok("result".to_string())
-}
-
-async fn do_open_login(
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  sora_creds_manager: &SoraCredentialManager,
-) -> AnyhowResult<()> {
-  info!("Building login window...");
-
-  open_sora_login_window(app, app_data_root, sora_creds_manager).await?;
-
-  info!("Done.");
-  Ok(())
-}

crates/desktop/artcraft/src/commands/sora/sora_logout_command.rs

@@ -1,39 +0,0 @@
-use crate::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
-use crate::commands::command_response_wrapper::{CommandResult, CommandSuccessResponseWrapper, SimpleCommandResult};
-use crate::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::{AnyhowError, AnyhowResult};
-use log::{error, info};
-use once_cell::sync::Lazy;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::list_media::list_media::list_media;
-use serde_derive::Serialize;
-use std::fmt::format;
-use tauri::{AppHandle, State};
-
-#[tauri::command]
-pub async fn sora_logout_command(
-  sora_creds_manager: State<'_, SoraCredentialManager>,
-) -> SimpleCommandResult {
-  info!("sora_logout_command called");
-
-  if let Err(err) = sora_creds_manager.purge_credentials_from_disk() {
-    error!("Error purging credentials from disk: {:?}", err);
-    return Err("error purging credentials from disk".into());
-  }
-  
-  if let Err(err) = sora_creds_manager.clear_credentials() {
-    error!("Error clearing credentials from memory: {:?}", err);
-    return Err("error clearing credentials from memory".into());
-  }
-  
-  if let Err(err) = sora_creds_manager.reset_credential_stats() {
-    error!("Error resetting credential stats: {:?}", err);
-    return Err("error resetting credential stats".into());
-  }
-  
-  Ok(().into())
-}

crates/desktop/artcraft/src/events/mod.rs

@@ -1,4 +0,0 @@
-pub mod notification_event;
-pub mod sendable_event_error;
-pub mod sendable_event_trait;
-pub mod sora;

crates/desktop/artcraft/src/events/sendable_event_error.rs

@@ -1,31 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum SendableEventError {
-  TauriError(tauri::Error),
-  AnyhowError(anyhow::Error),
-}
-
-impl Error for SendableEventError {}
-
-impl Display for SendableEventError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::TauriError(err) => write!(f, "SendableEventError::TauriError: {}", err),
-      Self::AnyhowError(err) => write!(f, "SendableEventError::AnyhowError: {}", err),
-    }
-  }
-}
-
-impl From<anyhow::Error> for SendableEventError {
-  fn from(err: anyhow::Error) -> Self {
-    SendableEventError::AnyhowError(err)
-  }
-}
-
-impl From<tauri::Error> for SendableEventError {
-  fn from(err: tauri::Error) -> Self {
-    SendableEventError::TauriError(err)
-  }
-}

crates/desktop/artcraft/src/events/sendable_event_trait.rs

@@ -1,21 +0,0 @@
-use log::info;
-use crate::events::sendable_event_error::SendableEventError;
-use serde::Serialize;
-use tauri::{AppHandle, Emitter};
-
-/// Implement this on a Serializable object to be able to send it as an event to the frontend.
-pub trait SendableEvent : Serialize {
-  /// This is the name of the event that the frontend subscribes to.
-  const FRONTEND_EVENT_NAME: &'static str;
-  
-  /// Default implementation of send(). 
-  /// This serializes and sends the event to the frontend.
-  fn send(&self, app: &AppHandle) -> Result<(), SendableEventError> {
-    info!("Sending event to frontend: {}", Self::FRONTEND_EVENT_NAME);
-    let result = app.emit(Self::FRONTEND_EVENT_NAME, self);
-    if let Err(err) = result {
-      return Err(SendableEventError::from(err));
-    }
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/events/sora/mod.rs

@@ -1,5 +0,0 @@
-pub mod sora_image_enqueue_failure_event;
-pub mod sora_image_enqueue_success_event;
-pub mod sora_image_generation_complete_event;
-pub mod sora_image_generation_failed_event;
-pub mod sora_login_success_event;

crates/desktop/artcraft/src/events/sora/sora_image_enqueue_failure_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueFailureEvent {
-  // TODO: Reason.
-}
-
-impl SendableEvent for SoraImageEnqueueFailureEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-enqueue-failure";
-}

crates/desktop/artcraft/src/events/sora/sora_image_enqueue_success_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageEnqueueSuccessEvent {
-  // TODO: Token, etc.
-}
-
-impl SendableEvent for SoraImageEnqueueSuccessEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-enqueue-success";
-}

crates/desktop/artcraft/src/events/sora/sora_image_generation_complete_event.rs

@@ -1,12 +0,0 @@
-use serde_derive::Serialize;
-use tokens::tokens::media_files::MediaFileToken;
-use crate::events::sendable_event_trait::SendableEvent;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageGenerationCompleteEvent {
-  pub media_file_token: MediaFileToken,
-}
-
-impl SendableEvent for SoraImageGenerationCompleteEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-generation-complete";
-}

crates/desktop/artcraft/src/events/sora/sora_image_generation_failed_event.rs

@@ -1,12 +0,0 @@
-use serde_derive::Serialize;
-use crate::events::sendable_event_trait::SendableEvent;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraImageGenerationFailedEvent {
-  pub prompt: String,
-}
-
-impl SendableEvent for SoraImageGenerationFailedEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-image-generation-failed";
-}
-

crates/desktop/artcraft/src/events/sora/sora_login_success_event.rs

@@ -1,11 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use serde_derive::Serialize;
-
-#[derive(Debug, Clone, Serialize)]
-pub struct SoraLoginSuccessEvent {
-  // TODO: Reason.
-}
-
-impl SendableEvent for SoraLoginSuccessEvent {
-  const FRONTEND_EVENT_NAME: &'static str = "sora-login-success";
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences.rs

@@ -1,71 +0,0 @@
-use crate::state::app_preferences::app_preferences_serializable::AppPreferencesSerializable;
-use crate::state::app_preferences::preferred_download_directory::{PreferredDownloadDirectory, SystemDownloadDirectory};
-use crate::state::data_dir::app_data_root::AppDataRoot;
-
-#[derive(Clone)]
-pub struct AppPreferences {
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: PreferredDownloadDirectory,
-
-  /// Play sounds on events.
-  pub play_sounds: bool,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_success_sound: Option<String>,
-
-  /// Key pointing to file; defined in the frontend code.
-  /// Defined for enqueue since image enqueue can be async
-  pub enqueue_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  #[deprecated]
-  pub generation_enqueue_sound: Option<String>,
-}
-
-impl Default for AppPreferences {
-  fn default() -> Self {
-    Self {
-      preferred_download_directory: PreferredDownloadDirectory::System(SystemDownloadDirectory::Downloads),
-      play_sounds: true,
-      // NB: These are defined in the frontend.
-      enqueue_success_sound: Some("done".to_string()),
-      enqueue_failure_sound: Some("spike_throw".to_string()),
-      generation_success_sound: Some("special_flower".to_string()),
-      generation_failure_sound: Some("crumble".to_string()),
-      generation_enqueue_sound: Some("done".to_string()),
-    }
-  }
-}
-
-impl AppPreferences {
-  pub fn load_from_file_or_default(data_root: &AppDataRoot) -> Self {
-    let filename = data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Self::default();
-    }
-
-    match AppPreferencesSerializable::load_from_file(data_root) {
-      Ok(Some(serializable)) => {
-        serializable.to_preferences()
-      }
-      Ok(None) => {
-        Self::default()
-      }
-      Err(err) => {
-        println!("Error loading app preferences: {}", err);
-        Self::default()
-      }
-    }
-  }
-  
-  pub fn to_serializable(&self) -> AppPreferencesSerializable {
-    AppPreferencesSerializable::from_preferences(self)
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_manager.rs

@@ -1,10 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use memory_store::clone_cell::CloneCell;
-
-pub type AppPreferencesManager = CloneCell<AppPreferences>;
-
-pub fn load_app_preferences_or_default(data_root: &AppDataRoot) -> AppPreferencesManager {
-  let prefs = AppPreferences::load_from_file_or_default(data_root);
-  AppPreferencesManager::with_owned(prefs)
-}

crates/desktop/artcraft/src/state/app_preferences/app_preferences_serializable.rs

@@ -1,71 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-
-/// Vector clock versioning string rather than semver.
-const CURRENT_VERSION: &str = "1";
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct AppPreferencesSerializable {
-  /// Versioning string.
-  pub version: String,
-  
-  /// The downloads directory to use when a user downloads a file.
-  pub preferred_download_directory: Option<PreferredDownloadDirectory>,
-
-  /// Play sounds on events.
-  pub play_sounds: Option<bool>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_success_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_failure_sound: Option<String>,
-  
-  /// Key pointing to file; defined in the frontend code.
-  pub generation_enqueue_sound: Option<String>,
-}
-
-impl AppPreferencesSerializable {
-  pub fn load_from_file(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.settings_dir().get_app_preferences_path();
-    if !filename.exists() {
-      return Ok(None);
-    }
-
-    let contents = std::fs::read_to_string(filename)?;
-    let data: Self = serde_json::from_str(&contents)?;
-    Ok(Some(data))
-  }
-
-  pub fn from_preferences(preferences: &AppPreferences) -> Self {
-    Self {
-      version: CURRENT_VERSION.to_string(),
-      preferred_download_directory: Some(preferences.preferred_download_directory.clone()),
-      play_sounds: Some(preferences.play_sounds),
-      generation_success_sound: preferences.generation_success_sound.clone(),
-      generation_failure_sound: preferences.generation_failure_sound.clone(),
-      generation_enqueue_sound: preferences.generation_enqueue_sound.clone(),
-    }
-  }
-
-  pub fn to_preferences(&self) -> AppPreferences {
-    let mut preferences = AppPreferences::default();
-
-    if let Some(preferred_download_directory) = &self.preferred_download_directory {
-      preferences.preferred_download_directory = preferred_download_directory.clone();
-    }
-
-    if let Some(play_sounds) = self.play_sounds {
-      preferences.play_sounds = play_sounds;
-    }
-    
-    preferences.generation_success_sound = self.generation_success_sound.clone();
-    preferences.generation_failure_sound = self.generation_failure_sound.clone();
-    preferences.generation_enqueue_sound = self.generation_enqueue_sound.clone();
-    
-    preferences
-  }
-}

crates/desktop/artcraft/src/state/app_preferences/mod.rs

@@ -1,4 +0,0 @@
-pub mod app_preferences;
-pub mod app_preferences_manager;
-pub mod app_preferences_serializable;
-pub mod preferred_download_directory;

crates/desktop/artcraft/src/state/app_preferences/preferred_download_directory.rs

@@ -1,82 +0,0 @@
-use errors::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use std::fmt::{Display, Formatter};
-use std::path::PathBuf;
-use std::str::FromStr;
-
-const SYSTEM_DEFAULT_SENTINEL_VALUE: &str = "system_default";
-
-/// NB: The reason these are not flat is so that they serialize/deserialize nicely to/from JSON.
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum PreferredDownloadDirectory {
-  /// The system-default downloads directory, which varies by OS.
-  /// NB: Serializes as `"system_default"` in JSON.
-  System(SystemDownloadDirectory),
-  
-  /// A user-defined path
-  /// NB: Serializes as `{"custom": "/path/to/dir"}` in JSON.
-  Custom(PathBuf),
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
-#[serde(rename_all = "snake_case")]
-pub enum SystemDownloadDirectory {
-  Downloads,
-  Documents,
-}
-
-impl FromStr for SystemDownloadDirectory {
-  type Err = AnyhowError;
-
-  fn from_str(s: &str) -> Result<Self, Self::Err> {
-    match (s) {
-      "downloads" => Ok(SystemDownloadDirectory::Downloads),
-      "documents" => Ok(SystemDownloadDirectory::Documents),
-      _ => Err(AnyhowError::msg(format!("Invalid system download directory: {}", s))),
-    }
-  }
-}
-
-impl Display for PreferredDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      PreferredDownloadDirectory::System(system) => system.fmt(f),
-      PreferredDownloadDirectory::Custom(path) => write!(f, "{}", path.to_string_lossy()),
-    }
-  }
-}
-
-impl Display for SystemDownloadDirectory {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      SystemDownloadDirectory::Downloads => write!(f, "downloads"),
-      SystemDownloadDirectory::Documents => write!(f, "documents"),
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-  use crate::state::app_preferences::preferred_download_directory::SystemDownloadDirectory;
-  use std::str::FromStr;
-
-  mod json {
-    use super::*;
-
-    #[test]
-    fn to_json_system_default() {
-      let val = PreferredDownloadDirectory::System(SystemDownloadDirectory::Documents);
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"system\":\"documents\"}");
-    }
-    
-    #[test]
-    fn to_json_custom() {
-      let val = PreferredDownloadDirectory::Custom("/tmp".into());
-      let val = serde_json::to_string(&val).unwrap();
-      assert_eq!(&val, "{\"custom\":\"/tmp\"}");
-    }
-  }
-}

crates/desktop/artcraft/src/state/data_dir/app_settings_dir.rs

@@ -1,56 +0,0 @@
-use crate::state::app_preferences::app_preferences::AppPreferences;
-use crate::state::data_dir::trait_data_subdir::DataSubdir;
-use errors::AnyhowResult;
-use serde::Serialize;
-use std::fs::OpenOptions;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-/// For now, let's just keep a collection of loose json files in a settings dir.
-/// Once we know the structure and schema, we can standardize on a single json file.
-#[derive(Clone)]
-pub struct AppSettingsDir {
-  path: PathBuf,
-}
-
-impl DataSubdir for AppSettingsDir {
-  const DIRECTORY_NAME: &'static str = "settings";
-
-  fn new_from<P: AsRef<Path>> (dir: P) -> Self {
-    Self {
-      path: dir.as_ref().to_path_buf(),
-    }
-  }
-
-  fn path(&self) -> &Path {
-    &self.path
-  }
-}
-
-impl AppSettingsDir {
-  pub fn get_app_preferences_path(&self) -> PathBuf {
-    self.path.join("app_preferences.json")
-  }
-  
-  pub fn write_app_preferences(&self, prefs: &AppPreferences) -> AnyhowResult<()> {
-    let serializable = prefs.to_serializable();
-
-    let formatter = serde_json::ser::PrettyFormatter::with_indent(b"  ");
-    let mut buf = Vec::new();
-    let mut ser = serde_json::Serializer::with_formatter(&mut buf, formatter);
-    serializable.serialize(&mut ser)?;
-
-    let filename = self.get_app_preferences_path();
-
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-
-    file.write_all(&buf)?;
-    file.flush()?;
-    
-    Ok(())
-  }
-}

crates/desktop/artcraft/src/state/main_window_position.rs

@@ -1,73 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::windows::main_window::constants::MAIN_WINDOW_NAME;
-use errors::AnyhowResult;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::OpenOptions;
-use std::io::Write;
-use tauri::{AppHandle, Manager, PhysicalPosition, Window};
-
-#[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
-pub struct MainWindowPosition {
-  pub x: i32,
-  pub y: i32,
-}
-
-impl MainWindowPosition {
-  pub fn new(x: i32, y: i32) -> Self {
-    Self { x, y }
-  }
-
-  pub fn from_main_window(app: &AppHandle) -> AnyhowResult<Self> {
-    let windows = app.windows();
-    windows.get(MAIN_WINDOW_NAME)
-        .map(|window| Self::from_window(window))
-        .unwrap_or_else(|| Err(anyhow::anyhow!("Main window not found")))
-  }
-
-  pub fn from_window(window: &Window) -> AnyhowResult<Self> {
-    let position = window.outer_position()?;
-    Ok(Self {
-      x: position.x,
-      y: position.y,
-    })
-  }
-
-  pub fn from_filesystem_configs(app_data_root: &AppDataRoot) -> AnyhowResult<Option<Self>> {
-    let filename = app_data_root.get_window_position_config_file();
-    if !filename.exists() {
-      return Ok(None);
-    }
-    let contents = std::fs::read_to_string(filename)?;
-    let pos : MainWindowPosition = serde_json::from_str(&contents)?;
-    Ok(Some(pos))
-  }
-
-  pub fn apply_to_main_window(&self, app: &AppHandle) -> AnyhowResult<()> {
-    let windows = app.windows();
-    let window = windows.get(MAIN_WINDOW_NAME)
-        .ok_or_else(|| anyhow::anyhow!("Main window not found"))?;
-    window.set_position(PhysicalPosition::new(self.x, self.y))?;
-    Ok(())
-  }
-
-  pub fn persist_to_filesystem(&self, app_data_root: &AppDataRoot) -> AnyhowResult<()> {
-    let filename = app_data_root.get_window_position_config_file();
-    let json = serde_json::to_string(self)?;
-    let mut file = OpenOptions::new()
-        .create(true)
-        .write(true)
-        .truncate(true)
-        .open(filename)?;
-    file.write_all(json.as_bytes())?;
-    file.flush()?;
-    Ok(())
-  }
-
-  pub fn to_physical_position(&self) -> PhysicalPosition<i32> {
-    PhysicalPosition::new(self.x, self.y)
-  }
-
-  pub fn matches_physical_position(&self, pos: &PhysicalPosition<i32>) -> bool {
-    self.x == pos.x && self.y == pos.y
-  }
-}

crates/desktop/artcraft/src/state/sora/sora_credential_stats.rs

@@ -1,47 +0,0 @@
-
-/// This is meant to track 401s and other credential failures, not 500s.
-#[derive(Clone)]
-pub struct SoraCredentialStats {
-  pub last_credential_failure: Option<chrono::DateTime<chrono::Utc>>,
-  pub last_credential_success: Option<chrono::DateTime<chrono::Utc>>,
-  pub credential_success_count: u32,
-  pub credential_failure_count: u32,
-  /// This resets on each failure
-  pub last_consecutive_credential_success: Option<chrono::DateTime<chrono::Utc>>,
-  /// This resets on each failure
-  pub consecutive_credential_success_count: u32,
-  /// This resets on each success
-  pub consecutive_credential_failure_count: u32,
-}
-
-impl SoraCredentialStats {
-  pub fn new() -> Self {
-    Self {
-      last_credential_failure: None,
-      last_credential_success: None,
-      last_consecutive_credential_success: None,
-      credential_success_count: 0,
-      credential_failure_count: 0,
-      consecutive_credential_success_count: 0,
-      consecutive_credential_failure_count: 0,
-    }
-  }
-  
-  pub fn record_credential_success(&mut self) {
-    let now = chrono::Utc::now();
-    self.last_credential_success = Some(now);
-    self.last_consecutive_credential_success = Some(now);
-    self.credential_success_count += 1;
-    self.consecutive_credential_success_count += 1;
-    self.consecutive_credential_failure_count = 0;
-  }
-
-  pub fn record_credential_failure(&mut self) {
-    let now = chrono::Utc::now();
-    self.last_credential_failure = Some(now);
-    self.last_consecutive_credential_success = None;
-    self.credential_failure_count += 1;
-    self.consecutive_credential_failure_count += 1;
-    self.consecutive_credential_success_count = 0;
-  }
-}

crates/desktop/artcraft/src/threads/main_window_thread/persist_window_position_task.rs

@@ -1,34 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::main_window_position::MainWindowPosition;
-use crate::state::main_window_size::MainWindowSize;
-use crate::utils::best_window_size_heuristic::best_window_size_heuristic;
-use errors::AnyhowResult;
-use log::info;
-use memory_store::clone_slot::CloneSlot;
-use tauri::Window;
-
-pub async fn persist_window_position_task(
-  window: &Window,
-  app_data_root: &AppDataRoot,
-  window_pos_slot: &CloneSlot<MainWindowPosition>,
-) -> AnyhowResult<()> {
-
-  let current_window_position = MainWindowPosition::from_window(window)?;
-  let current_physical_pos = window.outer_position()?;
-
-  let mut save_size_to_disk = true;
-
-  if let Ok(Some(old_size)) = window_pos_slot.get_clone() {
-    if old_size.matches_physical_position(&current_physical_pos) {
-      save_size_to_disk = false;
-    }
-  }
-
-  if save_size_to_disk {
-    info!("Saving window position configs to disk...");
-    current_window_position.persist_to_filesystem(app_data_root)?;
-    window_pos_slot.set_clone(&current_window_position)?;
-  }
-
-  Ok(())
-}

crates/desktop/artcraft/src/utils/best_window_size_heuristic.rs

@@ -1,25 +0,0 @@
-use tauri::{PhysicalSize, Window};
-use errors::AnyhowResult;
-
-// A typical height difference when dev tools are open:
-//   Window inner size = PhysicalSize { width: 3704, height: 732 }
-//   Window outer size = PhysicalSize { width: 3704, height: 1476 }
-const HEIGHT_DIFFERENCE_THRESHOLD: u32 = 300;
-
-/// Get the best window size
-pub fn best_window_size_heuristic(window: &Window) -> AnyhowResult<PhysicalSize<u32>> {
-  // NB: Ordinarily we'd use inner size, as the outer size includes the window decorations.
-  // However, dev tools contract the inner size, and in the event they're open, we should 
-  // prefer the outer size.
-  let inner = window.inner_size()?;
-  let outer = window.outer_size()?;
-  
-  let height_delta = outer.height.saturating_sub(inner.height);
-  if height_delta > HEIGHT_DIFFERENCE_THRESHOLD {
-    // Dev tools are open, use the outer size
-    Ok(outer)
-  } else {
-    // Dev tools are not open, use the inner size
-    Ok(inner)
-  }
-}

crates/desktop/artcraft/src/utils/webview_unsafe.rs

@@ -1,38 +0,0 @@
-use errors::AnyhowResult;
-use tauri::{AppHandle, Manager};
-
-const MAIN_WINDOW_NAME: &str = "main";
-
-pub fn webview_unsafe_for_app(app: &AppHandle) -> AnyhowResult<()> {
-  let windows = app.windows();
-  let maybe_window = windows.get(MAIN_WINDOW_NAME);
-  
-  /*if let Some(window) = maybe_window {
-    let webview = window.get_webview(MAIN_WINDOW_NAME);
-    if let Some(webview) = webview {
-      webview_unsafe(&webview);
-    }
-  } else {
-    return Err(anyhow::anyhow!("Main window not found"));
-  }*/
-
-  Ok(())
-}
-
-/*pub fn webview_unsafe(webview: &Webview) {
-  let r = webview.with_webview(|webview| {
-    webview.controller();
-    #[cfg(target_os = "macos")]
-    unsafe {
-      let view: &objc2_web_kit::WKWebView = &*webview.inner().cast();
-      let controller: &objc2_web_kit::WKUserContentController = &*webview.controller().cast();
-      let window: &objc2_app_kit::NSWindow = &*webview.ns_window().cast();
-
-      //view.setPageZoom(40.);
-      //controller.removeAllUserScripts();
-      let bg_color = objc2_app_kit::NSColor::colorWithDeviceRed_green_blue_alpha(1.0, 0.2, 0.4, 1.);
-      window.setBackgroundColor(Some(&bg_color));
-    }
-
-  });
-}*/

crates/desktop/artcraft/src/windows/main_window/constants.rs

@@ -1,4 +0,0 @@
-
-/// The name of the main application window.
-/// This is the Artcraft application UX itself.
-pub const MAIN_WINDOW_NAME : &str = "main";

crates/desktop/artcraft/src/windows/main_window/mod.rs

@@ -1 +0,0 @@
-pub mod constants;

crates/desktop/artcraft/src/windows/mod.rs

@@ -1,2 +0,0 @@
-pub mod sora_login_window;
-pub mod main_window;

crates/desktop/artcraft/src/windows/sora_login_window/clear_browsing_on_test_domain.rs

@@ -1,20 +0,0 @@
-use anyhow::anyhow;
-use log::info;
-use tauri::Webview;
-use errors::AnyhowResult;
-
-// This is just so we have a way to clear browsing data while debugging / building.
-pub fn clear_browsing_data_on_test_domain(webview: &Webview) -> AnyhowResult<()> {
-  let url = webview.url()?;
-  let hostname= url.host()
-      .ok_or(anyhow!("no host in url"))?
-      .to_string();
-  match hostname.as_str() {
-    "storyteller.ai" => {
-      info!("Clearing all browsing data...");
-      webview.clear_all_browsing_data()?;
-    }
-    _ => {}
-  }
-  Ok(())
-}

crates/desktop/artcraft/src/windows/sora_login_window/extract_sora_webview_cookies.rs

@@ -1,28 +0,0 @@
-use errors::AnyhowResult;
-use once_cell::sync::Lazy;
-use reqwest::Url;
-use tauri::webview::Cookie;
-use tauri::WebviewWindow;
-
-const CHAT_GPT_ROOT_COOKIE_URL_STR: &str = "https://chatgpt.com";
-
-static CHAT_GPT_ROOT_COOKIE_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(CHAT_GPT_ROOT_COOKIE_URL_STR).expect("URL should parse")
-});
-
-pub fn extract_sora_webview_cookies(webview: &WebviewWindow) -> AnyhowResult<String> {
-  // NB(bt): Cookies were originally on sora.com, but now they're located on 
-  // the sora.chatgpt.com / *.chatgpt.com domains.
-  let cookies = get_all_chatgpt_cookies(webview)?;
-  let cookie_string = cookies
-    .iter()
-    .map(|cookie| format!("{}={}", cookie.name(), cookie.value()))
-    .collect::<Vec<String>>()
-    .join("; ");
-  Ok(cookie_string)
-}
-
-fn get_all_chatgpt_cookies(webview: &WebviewWindow) -> AnyhowResult<Vec<Cookie>> {
-  let cookies = webview.cookies_for_url(CHAT_GPT_ROOT_COOKIE_URL.clone())?;
-  Ok(cookies)
-}

crates/desktop/artcraft/src/windows/sora_login_window/keep_on_login_domains.rs

@@ -1,28 +0,0 @@
-use crate::windows::sora_login_window::open_sora_login_window::SORA_LOGIN_URL;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use log::info;
-use tauri::Webview;
-
-// NB: Probably best not to use this.
-pub fn keep_on_login_domains(webview: &Webview) -> AnyhowResult<()> {
-  let url = webview.url()?;
-  let hostname= url.host()
-      .ok_or(anyhow!("no host in url"))?
-      .to_string();
-  match hostname.as_str() {
-    "auth.openai.com" => {},
-    "openai.com" => {},
-    "sora.com" => {},
-    // Third party SSO
-    "accounts.google.com" => {},
-    "accounts.youtube.com" => {},
-    "login.live.com" => {},
-    "appleid.apple.com" => {},
-    _ => {
-      info!("Non login hostname: {}", hostname);
-      webview.navigate(SORA_LOGIN_URL.clone())?;
-    }
-  }
-  Ok(())
-}

crates/desktop/artcraft/src/windows/sora_login_window/mod.rs

@@ -1,5 +0,0 @@
-pub mod clear_browsing_on_test_domain;
-pub mod extract_sora_webview_cookies;
-pub mod keep_on_login_domains;
-pub mod open_sora_login_window;
-pub mod sora_login_thread;

crates/desktop/artcraft/src/windows/sora_login_window/open_sora_login_window.rs

@@ -1,84 +0,0 @@
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::utils::clear_all_webview_cookies::clear_all_webview_cookies;
-use crate::windows::sora_login_window::sora_login_thread::sora_login_thread;
-use anyhow::anyhow;
-use errors::AnyhowResult;
-use once_cell::sync::Lazy;
-use reqwest::Url;
-use std::time::Duration;
-use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindowBuilder};
-
-/// Name of the window
-pub const LOGIN_WINDOW_NAME: &str = "login_window";
-
-pub const START_URL_STR: &str = "https://google.com";
-
-pub static START_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(START_URL_STR).expect("URL should parse")
-});
-
-pub const SORA_HOMEPAGE_URL_STR: &str = "https://sora.com/";
-
-pub static SORA_HOMEPAGE_URL : Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_HOMEPAGE_URL_STR).expect("URL should parse")
-});
-
-pub const SORA_LOGIN_URL_STR: &str = "https://chatgpt.com/auth/login?next=%2Fsora%2F";
-
-pub static SORA_LOGIN_URL: Lazy<Url> = Lazy::new(|| {
-  Url::parse(SORA_LOGIN_URL_STR).expect("URL should parse")
-});
-
-//pub const SORA_ROOT_URL_STR: &str = "https://sora.com/";
-//
-//pub static SORA_ROOT_URL: Lazy<Url> = Lazy::new(|| {
-//  Url::parse(SORA_ROOT_URL_STR).expect("URL should parse")
-//});
-
-pub async fn open_sora_login_window(
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  sora_creds_manager: &SoraCredentialManager,
-) -> AnyhowResult<()> {
-  if app.get_window(LOGIN_WINDOW_NAME).is_some() {
-    return Err(anyhow!("Login window already open"));
-  }
-
-  let url = WebviewUrl::External(START_URL.clone());
-
-  let window = WebviewWindowBuilder::new(app, LOGIN_WINDOW_NAME, url)
-      //.user_agent(openai_sora_client::credentials::USER_AGENT)
-      .always_on_top(true)
-      .title("Login to OpenAI's Sora")
-      .center()
-      .resizable(true)
-      .visible(true)
-      .closable(true)
-      .min_inner_size(200.0, 800.0)
-      .focused(true)
-      .devtools(true)
-      .build()?;
-
-  let webview = window.get_webview(LOGIN_WINDOW_NAME)
-      .ok_or_else(|| anyhow!("no webview found"))?;
-
-  clear_all_webview_cookies(&webview)?;
-
-  webview.navigate(SORA_HOMEPAGE_URL.clone())?;
-
-  // NB: We're starting to get Cloudflare protection screens. Let's try to avoid.
-  tokio::time::sleep(Duration::from_millis(100)).await;
-
-  webview.navigate(SORA_LOGIN_URL.clone())?;
-  
-  let app_handle = app.clone();
-  let app_data_root = app_data_root.clone();
-  let sora_creds_manager = sora_creds_manager.clone();
-
-  let _ = tauri::async_runtime::spawn(async move {
-    sora_login_thread(app_handle, app_data_root, sora_creds_manager).await;
-  });
-
-  Ok(())
-}

crates/desktop/artcraft/src/windows/sora_login_window/sora_login_thread.rs

@@ -1,157 +0,0 @@
-use crate::events::sendable_event_trait::SendableEvent;
-use crate::events::sora::sora_login_success_event::SoraLoginSuccessEvent;
-use crate::state::data_dir::app_data_root::AppDataRoot;
-use crate::state::sora::sora_credential_holder::SoraCredentialHolder;
-use crate::state::sora::sora_credential_manager::SoraCredentialManager;
-use crate::utils::sora::initialize_sora_jwt_bearer_token::initialize_sora_jwt_bearer_token;
-use crate::windows::sora_login_window::extract_sora_webview_cookies::extract_sora_webview_cookies;
-use crate::windows::sora_login_window::open_sora_login_window::LOGIN_WINDOW_NAME;
-use anyhow::anyhow;
-use chrono::{DateTime, NaiveDateTime, TimeDelta};
-use errors::AnyhowResult;
-use log::{error, info, warn};
-use once_cell::sync::Lazy;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::utils::has_session_cookie::{has_session_cookie, SessionCookiePresence};
-use reqwest::Url;
-use std::fs;
-use std::fs::{read_to_string, OpenOptions};
-use std::io::Write;
-use std::ops::Sub;
-use tauri::{AppHandle, Manager, Webview, WebviewWindow};
-
-pub async fn sora_login_thread(
-  app: AppHandle,
-  app_data_root: AppDataRoot,
-  sora_creds_manager: SoraCredentialManager
-) {
-  loop {
-    let login_webview_window = match app.get_webview_window(LOGIN_WINDOW_NAME) {
-      Some(webview) => webview,
-      None => {
-        info!("Exit sora login thread.");
-        return; // NB: Only exit if we don't have the webview.
-      }
-    };
-
-    let result = check_login_window(
-      &app,
-      &login_webview_window,
-      &app_data_root,
-      &sora_creds_manager,
-    ).await;
- 
-    match result {
-      Err(err) => {
-        error!("Error checking login window: {:?}", err);
-      }
-      Ok(false) => {} // Continue iteration and try again...
-      Ok(true) => {
-        info!("Successfully saved cookies from login window. Closing.");
-        if let Err(err) = login_webview_window.close() {
-          error!("Error closing login window: {:?}", err);
-        }
-        return;
-      }
-    }
-
-    tokio::time::sleep(std::time::Duration::from_millis(2_000)).await;
-  }
-}
-
-/// Returns true if we can exit.
-async fn check_login_window(
-  app_handle: &AppHandle,
-  webview_window: &WebviewWindow,
-  app_data_root: &AppDataRoot,
-  sora_credential_manager: &SoraCredentialManager,
-) -> AnyhowResult<bool> {
-  
-  /* Login flow looks like this:
-  
-  1. Start: https://sora.chatgpt.com/
-  2. Login Start: https://chatgpt.com/auth/login?next=%2Fsora%2F [this is where we start]
-  3. Login Continue: https://auth.openai.com/log-in
-  4. SSO / Google Login (etc): https://accounts.google.com/v3/signin/challenge/pwd?[query]
-  5. Done / Landing: https://sora.chatgpt.com/explore
-   */
-  
-  /*
-  - Do not use credential manager until the end (we don't load old cookies!)
-  - Check if we're on the correct domain, if not exit? (or inverse, that we're not in login flow)
-   */
-
-  let hostname = get_hostname(webview_window)?;
-
-  let mut maybe_at_destination = false;
-
-  match hostname.as_str() {
-    "sora.com" | // Old destination
-    "sora.chatgpt.com" // New destination
-    => {
-      maybe_at_destination = true;
-    }
-    // chatgpt.com/auth is also an auth domain
-    "auth.openai.com" |
-    "accounts.google.com" |
-    "accounts.youtube.com" |
-    "login.live.com" |
-    "appleid.apple.com"
-    => {
-      // NB: We're in auth flow.
-      info!("Sora login webview is in auth flow; hostname `{}`.", hostname);
-      return Ok(false)
-    }
-    _ => {}, // We just don't know...
-  }
-
-  let webview_cookies = extract_sora_webview_cookies(webview_window)?.trim().to_string();
-
-  let session_cookie_presence = has_session_cookie(&webview_cookies)
-      .unwrap_or_else(|err| {
-        error!("Failed to check for session cookie: {:?}", err);
-        SessionCookiePresence::MaybePresent
-      });
-
-  info!("Sora login webview is at hostname `{}`; cookie status: {:?}.", hostname, session_cookie_presence);
-
-  match session_cookie_presence {
-    SessionCookiePresence::Absent => {
-      info!("Session cookies are absent.");
-      return Ok(false);
-    }
-    _ => {},
-  }
-
-  let mut new_credentials =
-      SoraCredentialSet::initialize_with_just_cookies_str(&webview_cookies);
-  
-  let _upgraded = maybe_upgrade_or_renew_session(&mut new_credentials).await?;
-
-  // TODO(bt): Race conditions ahead.
-
-  sora_credential_manager.clear_credentials()?;
-  sora_credential_manager.try_purge_credentials_from_disk();
-
-  sora_credential_manager.set_credentials(&new_credentials)?;
-  sora_credential_manager.persist_all_to_disk()?;
-
-  // NB: Event sent to the frontend for the login flow. We shouldn't rely on just this 
-  // alone as it could be brittle if the events aren't caught.
-  let event = SoraLoginSuccessEvent {};
-  
-  if let Err(err) = event.send(app_handle) {
-    error!("Error sending Sora login success event: {:?}", err);
-  }
-  
-  Ok(true)
-}
-
-fn get_hostname(webview: &WebviewWindow) -> AnyhowResult<String> {
-  let url = webview.url()?;
-  let url_hostname= url.host()
-      .ok_or(anyhow!("no host in url"))?
-      .to_string();
-  Ok(url_hostname)
-}

crates/desktop/artcraft/tauri.artcraft_3d.no_dev.conf.json

@@ -1,8 +0,0 @@
-{
-  "build": {
-    "frontendDist": "../../../frontend/apps/editor3d/dist",
-    "beforeDevCommand": "echo 'no dev'",
-    "devUrl": "http://localhost:5173",
-    "beforeBuildCommand": "nx run editor3d:build"
-  }
-}

crates/desktop/tauri-artcraft/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "artcraft"
+name = "tauri-artcraft"
 version = "0.1.0"
 description = "Artcraft"
 authors = ["you"]
@@ -12,7 +12,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "artcraft_app_lib"
+name = "tauri_artcraft_app_lib"
 crate-type = ["staticlib", "cdylib", "rlib"]
 
 [build-dependencies]
@@ -55,7 +55,6 @@ serde_json = { workspace = true }
 serde_yaml = { workspace = true }
 tauri = { workspace = true }
 tauri-plugin-log = "2.3.1"
-tauri-plugin-upload = "2.2.1"
 tempdir = "0.3.7"
 tempfile = "3.18.0"
 tokio = { version = "1.42", features = ["rt", "rt-multi-thread", "fs"] }
@@ -67,7 +66,6 @@ tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" }
 # NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error
 # types and can't do threading. We need to wait for a new version to unpin from Git.
 discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" }
-tauri-plugin-dialog = "2"
 
 [dev-dependencies]
 libloading = "0.8.6"

crates/desktop/tauri-artcraft/capabilities/default.json

@@ -8,24 +8,13 @@
   "permissions": [
     "core:default",
     "log:default",
-    "upload:allow-download",
-    "upload:default",
     {
       "identifier": "http:default",
       "allow": [
-        {
-          "url": "https://*.storyteller.ai"
-        },
-        {
-          "url": "https://*.fakeyou.com"
-        }
+        { "url": "https://*.storyteller.ai" },
+        { "url": "https://*.fakeyou.com" }
       ],
-      "deny": [
-        {
-          "url": "https://private.tauri.app"
-        }
-      ]
-    },
-    "dialog:default"
+      "deny": [{ "url": "https://private.tauri.app" }]
+    }
   ]
 }

crates/desktop/tauri-artcraft/gen/schemas/capabilities.json

@@ -1 +0,0 @@
-{"default":{"identifier":"default","description":"enables the default permissions","local":true,"windows":["main"],"permissions":["core:default","log:default","upload:allow-download","upload:default",{"identifier":"http:default","allow":[{"url":"https://*.storyteller.ai"},{"url":"https://*.fakeyou.com"}],"deny":[{"url":"https://private.tauri.app"}]}]}}