feat: Progressive upload during recording (faster Instant Mode) (#351)

* feat: Progressive upload, on the fly, during recording

* fix: check for completed mp4

* remove all the unnecessary logs

* back to commit before trying to remove logs/metadata

* feat: do not read file each time

* feat: 95% complete multipart

* cleanup some apis

* almost completely configure tracing

* fix logs for instant recording

* use compile-time env

* dotenv

* bruh

* -_-

* no cache pnpm

* bruh

* man idk

* idk

* smh

* pnpm v

* wha

* cleanup

---------

Co-authored-by: Brendan Allan <[email protected]>

Author: richiemcilroy

.github/workflows/ci.yml

@@ -54,16 +54,7 @@ jobs:
         with:
           shared-key: ${{ matrix.settings.target }}
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: pnpm
+      - uses: ./.github/actions/setup-js
 
       - name: Create .env file in root
         run: |
@@ -79,8 +70,7 @@ jobs:
           echo "NEXT_PUBLIC_CAP_AWS_REGION=${{ secrets.NEXT_PUBLIC_CAP_AWS_REGION }}" >> .env
           echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
 
-      - name: Copy .env to apps/desktop
-        run: cp .env apps/desktop/.env
+          cat .env >> $GITHUB_ENV
 
       - name: Run setup
         run: |
@@ -116,19 +106,7 @@ jobs:
         with:
           shared-key: ${{ matrix.settings.target }}
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - uses: ./.github/actions/setup-js
 
       - name: Create .env file in root
         run: |

.github/workflows/main.yml

@@ -170,19 +170,7 @@ jobs:
         with:
           shared-key: ${{ matrix.settings.target }}
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10.5.2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - uses: ./.github/actions/setup-js
 
       - name: Create .env file in root
         run: |
@@ -200,17 +188,11 @@ jobs:
           echo "NEXT_PUBLIC_CAP_AWS_BUCKET=${{ secrets.NEXT_PUBLIC_CAP_AWS_BUCKET }}" >> .env
           echo 'RUST_TARGET_TRIPLE=${{ matrix.settings.target }}' >> .env
 
-      - name: Copy .env to apps/desktop
-        run: cp .env apps/desktop/.env
-
-      - name: Output .env file
-        run: cat apps/desktop/.env
-
       - name: Build app
         working-directory: apps/desktop
         run: |
           pnpm -w cap-setup
-          pnpm tauri build --target ${{ matrix.settings.target }} --config src-tauri/tauri.prod.conf.json
+          pnpm build:tauri --target ${{ matrix.settings.target }} --config src-tauri/tauri.prod.conf.json
         env:
           # https://github.com/tauri-apps/tauri-action/issues/740
           CI: false

.github/workflows/publish.yml

@@ -2,8 +2,8 @@
   "name": "@cap/desktop",
   "type": "module",
   "scripts": {
-    "dev": "pnpm -w cap-setup && cross-env RUST_BACKTRACE=1 dotenv -e ../../.env -- pnpm run preparescript && tauri dev",
-    "build:tauri": "dotenv -e ../../.env -- pnpm run preparescript && tauri build",
+    "dev": "pnpm -w cap-setup && dotenv -e ../../.env -- pnpm run preparescript && pnpm tauri dev",
+    "build:tauri": "dotenv -e ../../.env -- pnpm run preparescript && dotenv -e ../../.env -- pnpm tauri build",
     "preparescript": "node scripts/prepare.js",
     "localdev": "dotenv -e ../../.env -- vinxi dev --port 3001",
     "build": "vinxi build",

Cargo.lock

@@ -8,7 +8,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "desktop_solid_lib"
+name = "cap_desktop"
 crate-type = ["lib", "cdylib", "staticlib"]
 
 [build-dependencies]
@@ -44,7 +44,7 @@ tauri-plugin-deep-link = "2.2.0"
 tauri-plugin-clipboard-manager = "2.2.1"
 
 serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+serde_json = "1.0.111"
 specta.workspace = true
 specta-typescript = "0.0.7"
 tokio.workspace = true
@@ -57,9 +57,9 @@ anyhow.workspace = true
 futures = "0.3"
 axum = { version = "0.7.5", features = ["ws"] }
 tracing = "0.1.40"
-tempfile = "3.12.0"
+tempfile = "3.9.0"
 ffmpeg.workspace = true
-chrono = "0.4.38"
+chrono = { version = "0.4.31", features = ["serde"] }
 rodio = "0.19.0"
 png = "0.17.13"
 device_query = "2.1.0"
@@ -88,6 +88,7 @@ dirs = "6.0.0"
 relative-path = "1.9.3"
 cap-fail = { version = "0.1.0", path = "../../../crates/fail" }
 tokio-stream = { version = "0.1.17", features = ["sync"] }
+md5 = "0.7.0"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-graphics = "0.24.0"

apps/desktop/package.json

@@ -72,7 +72,7 @@ impl EditorInstances {
         }
     }
 
-    pub async fn remove(window: &Window) {
+    pub async fn remove(window: Window) {
         let Some(instances) = window.try_state::<EditorInstances>() else {
             return;
         };

apps/desktop/src-tauri/Cargo.toml

@@ -50,7 +50,7 @@ use mp4::Mp4Reader;
 // use display::{list_capture_windows, Bounds, CaptureTarget, FPS};
 use notifications::NotificationType;
 use png::{ColorType, Encoder};
-use recording::RecordingActor;
+use recording::InProgressRecording;
 use relative_path::RelativePathBuf;
 use scap::capturer::Capturer;
 use scap::frame::Frame;
@@ -98,9 +98,9 @@ pub struct App {
     #[serde(skip)]
     handle: AppHandle,
     #[serde(skip)]
-    current_recording: Option<RecordingActor>,
+    current_recording: Option<InProgressRecording>,
     #[serde(skip)]
-    pre_created_video: Option<PreCreatedVideo>,
+    recording_logging_handle: LoggingHandle,
 }
 
 #[derive(specta::Type, Serialize, Deserialize, Clone, Debug)]
@@ -126,14 +126,14 @@ pub struct VideoRecordingMetadata {
 }
 
 #[derive(Clone, Serialize, Deserialize, specta::Type, Debug)]
-pub struct PreCreatedVideo {
+pub struct VideoUploadInfo {
     id: String,
     link: String,
     config: S3UploadMeta,
 }
 
 impl App {
-    pub fn set_current_recording(&mut self, actor: RecordingActor) {
+    pub fn set_current_recording(&mut self, actor: InProgressRecording) {
         let current_recording = self.current_recording.insert(actor);
 
         CurrentRecordingChanged.emit(&self.handle).ok();
@@ -148,7 +148,7 @@ impl App {
         }
     }
 
-    pub fn clear_current_recording(&mut self) -> Option<RecordingActor> {
+    pub fn clear_current_recording(&mut self) -> Option<InProgressRecording> {
         self.close_occluder_window();
 
         self.current_recording.take()
@@ -439,7 +439,6 @@ async fn get_recording_options(
 #[tauri::command]
 #[specta::specta]
 async fn set_recording_options(
-    app: AppHandle,
     state: MutableState<'_, App>,
     options: RecordingOptions,
 ) -> Result<(), String> {
@@ -1160,7 +1159,7 @@ pub struct UploadProgress {
 #[derive(Deserialize, Type)]
 pub enum UploadMode {
     Initial {
-        pre_created_video: Option<PreCreatedVideo>,
+        pre_created_video: Option<VideoUploadInfo>,
     },
     Reupload,
 }
@@ -1951,17 +1950,15 @@ async fn update_auth_plan(app: AppHandle) {
     AuthStore::update_auth_plan(&app).await.ok();
 }
 
+pub type DynLoggingLayer =
+    Box<dyn tracing_subscriber::Layer<tracing_subscriber::Registry> + Send + Sync>;
+type LoggingHandle =
+    tracing_subscriber::reload::Handle<Option<DynLoggingLayer>, tracing_subscriber::Registry>;
+
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
-pub async fn run() {
+pub async fn run(recording_logging_handle: LoggingHandle) {
     let tauri_context = tauri::generate_context!();
 
-    // let _guard = configure_logging(
-    //     &dirs::data_dir()
-    //         .unwrap()
-    //         .join(&tauri_context.config().identifier)
-    //         .join("logs"),
-    // );
-
     let specta_builder = tauri_specta::Builder::new()
         .commands(tauri_specta::collect_commands![
             get_recording_options,
@@ -2144,7 +2141,7 @@ pub async fn run() {
                         mode: RecordingMode::Studio,
                     },
                     current_recording: None,
-                    pre_created_video: None,
+                    recording_logging_handle,
                 })));
 
                 app.manage(Arc::new(RwLock::new(
@@ -2253,7 +2250,7 @@ pub async fn run() {
                                 }
                             }
                             CapWindowId::Editor { .. } => {
-                                EditorInstances::remove(window);
+                                tokio::spawn(EditorInstances::remove(window.clone()));
                             }
                             CapWindowId::Settings | CapWindowId::Upgrade => {
                                 // Don't quit the app when settings or upgrade window is closed