wip

Author: oscartbeaumont

apps/desktop/src-tauri/src/api.rs

@@ -5,9 +5,12 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use tauri::AppHandle;
 
-use crate::web_api::ManagerExt;
+use crate::web_api::{AuthedApiError, ManagerExt};
 
-pub async fn upload_multipart_initiate(app: &AppHandle, video_id: &str) -> Result<String, String> {
+pub async fn upload_multipart_initiate(
+    app: &AppHandle,
+    video_id: &str,
+) -> Result<String, AuthedApiError> {
     #[derive(Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Response {
@@ -49,7 +52,7 @@ pub async fn upload_multipart_presign_part(
     upload_id: &str,
     part_number: u32,
     md5_sum: &str,
-) -> Result<String, String> {
+) -> Result<String, AuthedApiError> {
     #[derive(Deserialize)]
     #[serde(rename_all = "camelCase")]
     pub struct Response {
@@ -114,7 +117,7 @@ pub async fn upload_multipart_complete(
     upload_id: &str,
     parts: &[UploadedPart],
     meta: Option<S3VideoMeta>,
-) -> Result<Option<String>, String> {
+) -> Result<Option<String>, AuthedApiError> {
     #[derive(Serialize)]
     #[serde(rename_all = "camelCase")]
     pub struct MultipartCompleteRequest<'a> {
@@ -179,7 +182,10 @@ pub struct PresignedS3PutRequest {
     pub meta: Option<S3VideoMeta>,
 }
 
-pub async fn upload_signed(app: &AppHandle, body: PresignedS3PutRequest) -> Result<String, String> {
+pub async fn upload_signed(
+    app: &AppHandle,
+    body: PresignedS3PutRequest,
+) -> Result<String, AuthedApiError> {
     #[derive(Deserialize)]
     struct Data {
         url: String,
@@ -218,7 +224,7 @@ pub async fn desktop_video_progress(
     video_id: &str,
     uploaded: u64,
     total: u64,
-) -> Result<(), String> {
+) -> Result<(), AuthedApiError> {
     let resp = app
         .authed_api_request("/api/desktop/video/progress", |client, url| {
             client.post(url).json(&json!({

apps/desktop/src-tauri/src/auth.rs

@@ -118,6 +118,3 @@ impl AuthStore {
         store.save().map_err(|e| e.to_string())
     }
 }
-
-#[derive(specta::Type, serde::Serialize, tauri_specta::Event, Debug, Clone, serde::Deserialize)]
-pub struct AuthenticationInvalid;

apps/desktop/src-tauri/src/lib.rs

@@ -28,7 +28,7 @@ mod web_api;
 mod windows;
 
 use audio::AppSounds;
-use auth::{AuthStore, AuthenticationInvalid, Plan};
+use auth::{AuthStore, Plan};
 use camera::CameraPreviewState;
 use cap_editor::{EditorInstance, EditorState};
 use cap_project::{
@@ -2000,7 +2000,6 @@ pub async fn run(recording_logging_handle: LoggingHandle) {
             RequestOpenSettings,
             RequestScreenCapturePrewarm,
             NewNotification,
-            AuthenticationInvalid,
             audio_meter::AudioInputLevelChange,
             captions::DownloadProgress,
             recording::RecordingEvent,

apps/desktop/src-tauri/src/recording.rs

@@ -37,6 +37,7 @@ use tauri_plugin_dialog::{DialogExt, MessageDialogBuilder};
 use tauri_specta::Event;
 use tracing::*;
 
+use crate::web_api::AuthedApiError;
 use crate::{
     App, CurrentRecordingChanged, MutableState, NewStudioRecordingAdded, RecordingState,
     RecordingStopped, VideoUploadInfo,
@@ -252,7 +253,7 @@ pub async fn start_recording(
     app: AppHandle,
     state_mtx: MutableState<'_, App>,
     inputs: StartRecordingInputs,
-) -> Result<(), String> {
+) -> Result<(), AuthedApiError> {
     if !matches!(state_mtx.read().await.recording_state, RecordingState::None) {
         return Err("Recording already in progress".to_string());
     }

apps/desktop/src-tauri/src/upload.rs

@@ -87,7 +87,6 @@ pub async fn upload_video(
             id: v.id,
         });
     }
->>>>>>> main
 
     info!("Uploading video {video_id}...");
 

apps/desktop/src-tauri/src/web_api.rs

@@ -6,7 +6,7 @@ use tracing::{error, warn};
 
 use crate::{
     ArcLock,
-    auth::{AuthSecret, AuthStore, AuthenticationInvalid},
+    auth::{AuthSecret, AuthStore},
 };
 
 #[derive(Error, Debug)]
@@ -83,7 +83,6 @@ impl<T: Manager<R> + Emitter<R>, R: Runtime> ManagerExt<R> for T {
         let Some(auth) = AuthStore::get(self.app_handle()).map_err(AuthedApiError::AuthStore)?
         else {
             warn!("Not logged in");
-            AuthenticationInvalid.emit(self).ok();
             return Err(AuthedApiError::InvalidAuthentication);
         };
 
@@ -92,7 +91,6 @@ impl<T: Manager<R> + Emitter<R>, R: Runtime> ManagerExt<R> for T {
 
         if response.status() == StatusCode::UNAUTHORIZED {
             error!("Authentication expired. Please log in again.");
-            AuthenticationInvalid.emit(self).ok();
             return Err(AuthedApiError::InvalidAuthentication);
         }
 

apps/desktop/src/routes/(window-chrome)/(main).tsx

@@ -238,11 +238,16 @@ function Page() {
 					}
 				})();
 
-				await commands.startRecording({
-					capture_target,
-					mode: payload.mode,
-					capture_system_audio: rawOptions.captureSystemAudio,
-				});
+				try {
+					await commands.startRecording({
+						capture_target,
+						mode: payload.mode,
+						capture_system_audio: rawOptions.captureSystemAudio,
+					});
+				} catch (err) {
+					alert("CRINGE");
+					throw err;
+				}
 			} else await commands.stopRecording();
 		},
 	}));

apps/desktop/src/routes/target-select-overlay.tsx

@@ -811,11 +811,17 @@ function RecordingControls(props: {
 							return;
 						}
 
-						commands.startRecording({
-							capture_target: props.target,
-							mode: rawOptions.mode,
-							capture_system_audio: rawOptions.captureSystemAudio,
-						});
+						commands
+							.startRecording({
+								capture_target: props.target,
+								mode: rawOptions.mode,
+								capture_system_audio: rawOptions.captureSystemAudio,
+							})
+							.catch((err) => {
+								console.log(err);
+								alert("CRINGE");
+								throw err;
+							});
 					}}
 				>
 					<div class="flex items-center py-1 pl-4 transition-colors hover:bg-blue-10">