Merge branch 'main' into rendering-speed

Author: Brendonovich

.claude/settings.local.json

@@ -1,12 +1,12 @@
 {
-  "permissions": {
-    "allow": [
-      "Bash(pnpm typecheck:*)",
-      "Bash(pnpm lint:*)",
-      "Bash(pnpm build:*)",
-      "Bash(cargo check:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}
+	"permissions": {
+		"allow": [
+			"Bash(pnpm typecheck:*)",
+			"Bash(pnpm lint:*)",
+			"Bash(pnpm build:*)",
+			"Bash(cargo check:*)"
+		],
+		"deny": [],
+		"ask": []
+	}
+}

Cargo.lock

@@ -54,7 +54,7 @@
 		"@ts-rest/core": "^3.52.1",
 		"@types/react-tooltip": "^4.2.4",
 		"cva": "npm:class-variance-authority@^0.7.0",
-		"effect": "^3.17.14",
+		"effect": "^3.18.4",
 		"mp4box": "^0.5.2",
 		"posthog-js": "^1.215.3",
 		"solid-js": "^1.9.3",

apps/desktop/package.json

@@ -1,6 +1,6 @@
 [package]
 name = "cap-desktop"
-version = "0.3.72"
+version = "0.3.73"
 description = "Beautiful screen recordings, owned by you."
 authors = ["you"]
 edition = "2024"

apps/desktop/src-tauri/Cargo.toml

@@ -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 {
@@ -32,14 +35,12 @@ pub async fn upload_multipart_initiate(app: &AppHandle, video_id: &str) -> Resul
             .text()
             .await
             .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!(
-            "api/upload_multipart_initiate/{status}: {error_body}"
-        ));
+        return Err(format!("api/upload_multipart_initiate/{status}: {error_body}").into());
     }
 
     resp.json::<Response>()
         .await
-        .map_err(|err| format!("api/upload_multipart_initiate/response: {err}"))
+        .map_err(|err| format!("api/upload_multipart_initiate/response: {err}").into())
         .map(|data| data.upload_id)
 }
 
@@ -49,7 +50,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 {
@@ -76,14 +77,12 @@ pub async fn upload_multipart_presign_part(
             .text()
             .await
             .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!(
-            "api/upload_multipart_presign_part/{status}: {error_body}"
-        ));
+        return Err(format!("api/upload_multipart_presign_part/{status}: {error_body}").into());
     }
 
     resp.json::<Response>()
         .await
-        .map_err(|err| format!("api/upload_multipart_presign_part/response: {err}"))
+        .map_err(|err| format!("api/upload_multipart_presign_part/response: {err}").into())
         .map(|data| data.presigned_url)
 }
 
@@ -114,7 +113,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> {
@@ -150,14 +149,12 @@ pub async fn upload_multipart_complete(
             .text()
             .await
             .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!(
-            "api/upload_multipart_complete/{status}: {error_body}"
-        ));
+        return Err(format!("api/upload_multipart_complete/{status}: {error_body}").into());
     }
 
     resp.json::<Response>()
         .await
-        .map_err(|err| format!("api/upload_multipart_complete/response: {err}"))
+        .map_err(|err| format!("api/upload_multipart_complete/response: {err}").into())
         .map(|data| data.location)
 }
 
@@ -179,7 +176,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,
@@ -204,12 +204,12 @@ pub async fn upload_signed(app: &AppHandle, body: PresignedS3PutRequest) -> Resu
             .text()
             .await
             .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!("api/upload_signed/{status}: {error_body}"));
+        return Err(format!("api/upload_signed/{status}: {error_body}").into());
     }
 
     resp.json::<Response>()
         .await
-        .map_err(|err| format!("api/upload_signed/response: {err}"))
+        .map_err(|err| format!("api/upload_signed/response: {err}").into())
         .map(|data| data.presigned_put_data.url)
 }
 
@@ -218,7 +218,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!({
@@ -237,7 +237,7 @@ pub async fn desktop_video_progress(
             .text()
             .await
             .unwrap_or_else(|_| "<no response body>".to_string());
-        return Err(format!("api/desktop_video_progress/{status}: {error_body}"));
+        return Err(format!("api/desktop_video_progress/{status}: {error_body}").into());
     }
 
     Ok(())

apps/desktop/src-tauri/src/api.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/auth.rs

@@ -138,7 +138,9 @@ impl DeepLinkAction {
                     mode,
                 };
 
-                crate::recording::start_recording(app.clone(), state, inputs).await
+                crate::recording::start_recording(app.clone(), state, inputs)
+                    .await
+                    .map(|_| ())
             }
             DeepLinkAction::StopRecording => {
                 crate::recording::stop_recording(app.clone(), app.state()).await

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

@@ -1,3 +1,4 @@
+use crate::window_exclusion::WindowExclusion;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use specta::Type;
@@ -39,6 +40,24 @@ impl MainWindowRecordingStartBehaviour {
     }
 }
 
+const DEFAULT_EXCLUDED_WINDOW_TITLES: &[&str] = &[
+    "Cap",
+    "Cap Settings",
+    "Cap Recording Controls",
+    "Cap Camera",
+];
+
+pub fn default_excluded_windows() -> Vec<WindowExclusion> {
+    DEFAULT_EXCLUDED_WINDOW_TITLES
+        .iter()
+        .map(|title| WindowExclusion {
+            bundle_identifier: None,
+            owner_name: None,
+            window_title: Some((*title).to_string()),
+        })
+        .collect()
+}
+
 // When adding fields here, #[serde(default)] defines the value to use for existing configurations,
 // and `Default::default` defines the value to use for new configurations.
 // Things that affect the user experience should only be enabled by default for new configurations.
@@ -99,6 +118,8 @@ pub struct GeneralSettingsStore {
     pub post_deletion_behaviour: PostDeletionBehaviour,
     #[serde(default = "default_enable_new_uploader", skip_serializing_if = "no")]
     pub enable_new_uploader: bool,
+    #[serde(default = "default_excluded_windows")]
+    pub excluded_windows: Vec<WindowExclusion>,
 }
 
 fn default_enable_native_camera_preview() -> bool {
@@ -111,7 +132,7 @@ fn default_enable_new_recording_flow() -> bool {
 }
 
 fn default_enable_new_uploader() -> bool {
-    cfg!(debug_assertions)
+    true
 }
 
 fn no(_: &bool) -> bool {
@@ -162,6 +183,7 @@ impl Default for GeneralSettingsStore {
             enable_new_recording_flow: default_enable_new_recording_flow(),
             post_deletion_behaviour: PostDeletionBehaviour::DoNothing,
             enable_new_uploader: default_enable_new_uploader(),
+            excluded_windows: default_excluded_windows(),
         }
     }
 }
@@ -231,3 +253,9 @@ pub fn init(app: &AppHandle) {
 
     println!("GeneralSettingsState managed");
 }
+
+#[tauri::command]
+#[specta::specta]
+pub fn get_default_excluded_windows() -> Vec<WindowExclusion> {
+    default_excluded_windows()
+}

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

@@ -146,9 +146,9 @@ async fn handle_hotkey(app: AppHandle, action: HotkeyAction) -> Result<(), Strin
             Ok(())
         }
         HotkeyAction::StopRecording => recording::stop_recording(app.clone(), app.state()).await,
-        HotkeyAction::RestartRecording => {
-            recording::restart_recording(app.clone(), app.state()).await
-        }
+        HotkeyAction::RestartRecording => recording::restart_recording(app.clone(), app.state())
+            .await
+            .map(|_| ()),
         HotkeyAction::OpenRecordingPicker => {
             let _ = RequestOpenRecordingPicker { target_mode: None }.emit(&app);
             Ok(())