Tweak

## Description

## Tests

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,26 +1,17 @@
 name: Report a bug
-description: Let us know if something's not working the way you expected.
+description: Things that were working earlier but don't anymore
 labels: []
 body:
     - type: markdown
       attributes:
           value: |
-              Before opening a new bug report, please ensure
-              1. you are on the latest version (it might've already been fixed),
-              2. you've searched for existing issues (please add your observations as a comment there instead of creating a duplicate).
-
-              If you are self hosting, please create a community [Q&A](https://github.com/ente-io/ente/discussions/categories/q-a) instead.
+              **Checklist**
+              1. You've searched existing [issues](https://github.com/search?q=repo%3Aente-io%2Fente+&type=issues) and [discussions](https://github.com/search?q=repo%3Aente-io%2Fente+&type=discussions)
+              2. It was working earlier (otherwise use [enhancements](https://github.com/ente-io/ente/discussions/categories/enhancements))
+              3. It is not about self hosting (for those use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
     - type: textarea
       attributes:
           label: Description
-          description: >
-              Please describe the bug. If possible, also include the steps to
-              reproduce the behaviour, and the expected behaviour (sometimes
-              bugs are just expectation mismatches, in which case this would be
-              a good fit for [feature
-              requests](https://github.com/ente-io/ente/discussions/categories/feature-requests)).
-      validations:
-          required: true
     - type: input
       attributes:
           label: Version

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Feature requests and questions
+    - name: Enhacements, feature requests, feedback and questions
       url: https://github.com/ente-io/ente/discussions
       about: Please use Discussions for everything apart from the above.

.github/workflows/auth-crowdin-push.yml

@@ -9,6 +9,10 @@ on:
             # Or the workflow itself is changed
             - ".github/workflows/auth-crowdin.yml"
 
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     push-sources-to-crowdin:
         runs-on: ubuntu-latest
@@ -20,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "auth/"
-                  config: "auth/crowdin.yml"
+                  base_path: "mobile/apps/auth/"
+                  config: "mobile/apps/auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

.github/workflows/auth-crowdin-sync.yml

@@ -8,6 +8,10 @@ on:
     # Also allow manually running the workflow.
     workflow_dispatch:
 
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     synchronize-with-crowdin:
         runs-on: ubuntu-latest
@@ -19,8 +23,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "auth/"
-                  config: "auth/crowdin.yml"
+                  base_path: "mobile/apps/auth/"
+                  config: "mobile/apps/auth/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true

.github/workflows/auth-internal-release.yml

@@ -6,13 +6,16 @@ on:
 env:
     FLUTTER_VERSION: "3.24.3"
 
+permissions:
+    contents: write
+
 jobs:
     build:
         runs-on: ubuntu-latest
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -52,7 +55,7 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
             - name: Notify Discord

.github/workflows/auth-lint.yml

@@ -10,12 +10,15 @@ on:
 env:
     FLUTTER_VERSION: "3.24.3"
 
+permissions:
+    contents: read
+
 jobs:
     lint:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4
@@ -30,7 +33,7 @@ jobs:
                           exit 1
                       fi
                   done
-            
+
             - name: Verify all icons are less than 20KB
               run: |
                   find assets/custom-icons -type f -name "*.svg" | while read -r file; do

.github/workflows/auth-release.yml

@@ -31,13 +31,16 @@ on:
 env:
     FLUTTER_VERSION: "3.24.3"
 
+permissions:
+    contents: write
+
 jobs:
-    build-ubuntu:
-        runs-on: ubuntu-20.04
+    build-linux-latest:
+        runs-on: ubuntu-22.04
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -80,7 +83,7 @@ jobs:
               # disable this step if release tag contains nightly or beta
               if: startsWith(github.ref, 'refs/tags/auth-v') && !contains(github.ref, 'nightly') && !contains(github.ref, 'beta')
               run: |
-                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore --dart-define=cronetHttpNoPlay=true
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -90,27 +93,38 @@ jobs:
             - name: Install dependencies for desktop build
               run: |
                   sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config libsqlite3-dev locate appindicator3-0.1 libappindicator3-dev libffi-dev libtiff5
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools libcurl4-openssl-dev
                   sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
 
+            - name: Install appimagetool
+              run: |
+                  wget -O appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+                  chmod +x appimagetool
+                  mv appimagetool /usr/local/bin/
+
             - name: Build desktop app
               run: |
                   flutter config --enable-linux-desktop
-                  # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
+                  # RPM
+                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
+                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
+                  # APPIMAGE
+                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
+                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
+                  # DEB
                   flutter_distributor package --platform=linux --targets=deb --skip-clean
                   mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
-              env:
-                  LIBSODIUM_USE_PKGCONFIG: 1
 
-            - name: Generate checksums and push to artifacts
+            - name: Generate checksums
               run: |
-                  sha256sum artifacts/ente-* > artifacts/sha256sum-apk-deb
+                sha256sum artifacts/ente-auth-*.apk >> artifacts/sha256sum-apk
+                sha256sum artifacts/ente-auth-*.deb artifacts/ente-auth-*.rpm artifacts/ente-auth-*.AppImage >> artifacts/sha256sum-linux
 
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -122,76 +136,16 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.auth
-                  releaseFiles: auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/auth/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
 
-    build-fedora-etc:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: auth
-
-        steps:
-            - name: Checkout code and submodules
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
-              uses: subosito/flutter-action@v2
-              with:
-                  channel: "stable"
-                  flutter-version: ${{ env.FLUTTER_VERSION  }}
-                  cache: true
-
-            - name: Create artifacts directory
-              run: mkdir artifacts
-
-            - name: Install dependencies for desktop build
-              run: |
-                  sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff6 xz-utils libarchive-tools libcurl4-openssl-dev
-                  sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
-
-            - name: Install appimagetool
-              run: |
-                  wget -O appimagetool "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage"
-                  chmod +x appimagetool
-                  mv appimagetool /usr/local/bin/
-
-            - name: Build desktop app
-              run: |
-                  flutter config --enable-linux-desktop
-                  # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
-                  # Run below command if it is a beta or nightly
-                  if [[ ${{ github.ref }} =~ beta|nightly ]]; then
-                    flutter_distributor package --platform=linux --targets=pacman --skip-clean
-                    mv dist/**/*-*-linux.pacman artifacts/ente-${{ github.ref_name }}-x86_64.pacman
-                  fi
-                  flutter_distributor package --platform=linux --targets=rpm --skip-clean
-                  mv dist/**/*-*-linux.rpm artifacts/ente-${{ github.ref_name }}-x86_64.rpm
-                  flutter_distributor package --platform=linux --targets=appimage --skip-clean
-                  mv dist/**/*-*-linux.AppImage artifacts/ente-${{ github.ref_name }}-x86_64.AppImage
-
-            - name: Generate checksums
-              run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage
-
-            - name: Create a draft GitHub release
-              uses: ncipollo/release-action@v1
-              with:
-                  artifacts: "auth/artifacts/*"
-                  draft: true
-                  allowUpdates: true
-                  updateOnlyUnreleased: true
-
     build-windows:
         runs-on: windows-latest
+        environment: "auth-win-build"
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -213,7 +167,7 @@ jobs:
               run: |
                   flutter config --enable-windows-desktop
                   # dart pub global activate flutter_distributor
-                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
                   make innoinstall
                   flutter_distributor package --platform=windows --targets=exe --skip-clean
                   mv dist/**/*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe
@@ -221,14 +175,22 @@ jobs:
             - name: Retain Windows EXE and DLLs
               run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows
 
-            - name: Code sign Windows installer and EXE
-              uses: dlemstra/code-sign-action@v1
+            - name: Sign files with Trusted Signing
+              uses: azure/trusted-signing-action@v0
               with:
-                  certificate: "${{ secrets.WINDOWS_CERTIFICATE }}"
-                  password: "${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}"
-                  files: |
-                      auth/artifacts/ente-${{ github.ref_name }}-installer.exe
-                      auth/ente-${{ github.ref_name }}-windows/auth.exe
+                azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+                azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+                azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+                endpoint: ${{ secrets.AZURE_ENDPOINT }}
+                trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+                certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+                files: |
+                      ${{ github.workspace }}/mobile/apps/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/mobile/apps/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                file-digest: SHA256
+                timestamp-rfc3161: http://timestamp.acs.microsoft.com
+                timestamp-digest: SHA256  
+
 
             - name: Zip Windows EXE and DLLs
               run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows
@@ -239,7 +201,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true
@@ -249,7 +211,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: auth
+                working-directory: mobile/apps/auth
 
         steps:
             - name: Checkout code and submodules
@@ -336,7 +298,7 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "auth/artifacts/*"
+                  artifacts: "mobile/apps/auth/artifacts/*"
                   draft: true
                   allowUpdates: true
                   updateOnlyUnreleased: true

.github/workflows/cli-release.yml

@@ -12,6 +12,10 @@ on:
         tags:
             - "cli-v*"
 
+permissions:
+    contents: write
+    packages: write
+
 jobs:
     draft-release:
         runs-on: ubuntu-latest

.github/workflows/codeql.yml

@@ -0,0 +1,53 @@
+# The only reason we're making a custom CodeQL configuration is because the
+# default setup does not have an option to run daily / weekly instead of per
+# push, which is too slow.
+#
+# In the future, it might become faster. Then just delete this file, and revert
+# to the default configuration.
+#
+# References:
+# https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/
+
+name: "CodeQL"
+
+on:
+    workflow_dispatch: # Allow running manually
+    schedule:
+        - cron: "22 1 * * 1"
+
+jobs:
+    analyze:
+        name: Analyze (${{ matrix.language }})
+        runs-on: 'ubuntu-latest'
+        permissions:
+            contents: read
+            # Required for all workflows.
+            security-events: write
+            # Required to fetch internal or private CodeQL packs.
+            packages: read
+
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - language: actions
+                      build-mode: none
+                    - language: go
+                      build-mode: autobuild
+                    - language: javascript-typescript
+                      build-mode: none
+
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+
+            - name: Initialize CodeQL
+              uses: github/codeql-action/init@v3
+              with:
+                  languages: ${{ matrix.language }}
+                  build-mode: ${{ matrix.build-mode }}
+
+            - name: Perform CodeQL Analysis
+              uses: github/codeql-action/analyze@v3
+              with:
+                  category: "/language:${{matrix.language}}"

.github/workflows/copycat-db-release.yml

@@ -3,6 +3,9 @@ name: "Release (copycat-db)"
 on:
     workflow_dispatch: # Run manually
 
+permissions:
+    contents: read
+
 jobs:
     build:
         runs-on: ubuntu-latest

.github/workflows/desktop-lint.yml

@@ -7,6 +7,9 @@ on:
             - "desktop/**"
             - ".github/workflows/desktop-lint.yml"
 
+permissions:
+    contents: read
+
 jobs:
     lint:
         runs-on: ubuntu-latest
@@ -20,7 +23,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "desktop/yarn.lock"
 

.github/workflows/docs-deploy.yml

@@ -10,6 +10,9 @@ on:
     # Also allow manually running the workflow
     workflow_dispatch:
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -25,7 +28,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "docs/yarn.lock"
 

.github/workflows/docs-lint.yml

@@ -0,0 +1,32 @@
+name: "Lint (docs)"
+
+on:
+    # Run on every pull request (open or push to it) that changes docs/
+    pull_request:
+        paths:
+            - "docs/**"
+            - ".github/workflows/docs-lint.yml"
+
+permissions:
+    contents: read
+
+jobs:
+    lint:
+        runs-on: ubuntu-latest
+        defaults:
+            run:
+                working-directory: docs
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup node and enable yarn caching
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22
+                  cache: "yarn"
+                  cache-dependency-path: "web/yarn.lock"
+
+            - run: yarn install
+
+            - run: yarn pretty:check

.github/workflows/docs-verify-build.yml

@@ -10,6 +10,9 @@ on:
             - "docs/**"
             - ".github/workflows/docs-verify-build.yml"
 
+permissions:
+    contents: read
+
 jobs:
     verify-build:
         runs-on: ubuntu-latest
@@ -25,7 +28,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "docs/yarn.lock"
 

.github/workflows/infra-deploy-staff.yml

@@ -10,6 +10,9 @@ on:
     # Also allow manually running the workflow
     workflow_dispatch:
 
+permissions:
+    contents: read
+
 jobs:
     lint:
         runs-on: ubuntu-latest
@@ -25,7 +28,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "infra/staff/yarn.lock"
 

.github/workflows/infra-lint-staff.yml

@@ -7,6 +7,9 @@ on:
             - "infra/staff/**"
             - ".github/workflows/infra-deploy-staff.yml"
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -22,7 +25,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "infra/staff/yarn.lock"
 

.github/workflows/mobile-crowdin-push.yml

@@ -5,10 +5,14 @@ on:
         branches: [main]
         paths:
             # Run workflow when mobiles's intl_en.arb is changed
-            - "mobile/lib/l10n/intl_en.arb"
+            - "mobile/apps/photos/lib/l10n/intl_en.arb"
             # Or the workflow itself is changed
             - ".github/workflows/mobile-crowdin.yml"
 
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     push-sources-to-crowdin:
         runs-on: ubuntu-latest
@@ -20,8 +24,8 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/"
-                  config: "mobile/crowdin.yml"
+                  base_path: "mobile/apps/photos/"
+                  config: "mobile/apps/photos/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: false

.github/workflows/mobile-crowdin-sync.yml

@@ -1,4 +1,4 @@
-name: "Sync Crowdin translations (mobile)"
+name: "Sync Crowdin translations (mobile/photos)"
 
 on:
     schedule:
@@ -8,6 +8,10 @@ on:
     # Also allow manually running the workflow.
     workflow_dispatch:
 
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     synchronize-with-crowdin:
         runs-on: ubuntu-latest
@@ -19,14 +23,14 @@ jobs:
             - name: Crowdin's action
               uses: crowdin/github-action@v2
               with:
-                  base_path: "mobile/"
-                  config: "mobile/crowdin.yml"
+                  base_path: "mobile/apps/photos/"
+                  config: "mobile/apps/photos/crowdin.yml"
                   upload_sources: true
                   upload_translations: false
                   download_translations: true
                   localization_branch_name: translations/mobile
                   create_pull_request: true
-                  pull_request_title: "[mobile] New translations"
+                  pull_request_title: "[mobile/photos] New translations"
                   pull_request_body: "New translations from [Crowdin](https://crowdin.com/project/ente-photos-app)"
                   pull_request_base_branch_name: "main"
                   project_id: 574741

.github/workflows/mobile-internal-release-rust.yml

@@ -0,0 +1,77 @@
+name: "Internal release (photos)"
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.24.3"
+    RUST_VERSION: "1.85.1"
+
+permissions:
+    contents: write
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        defaults:
+            run:
+                working-directory: mobile/apps/photos
+
+        steps:
+            - name: Checkout code and submodules
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Setup JDK 17
+              uses: actions/setup-java@v1
+              with:
+                  java-version: 17
+
+            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
+              uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  flutter-version: ${{ env.FLUTTER_VERSION  }}
+                  cache: true
+            
+            - name: Install Rust ${{ env.RUST_VERSION }}
+              uses: dtolnay/rust-toolchain@master
+              with:
+                toolchain: ${{ env.RUST_VERSION }}
+
+            - name: Install Flutter Rust Bridge
+              run: cargo install flutter_rust_bridge_codegen
+
+            - name: Setup keys
+              uses: timheuer/base64-to-file@v1
+              with:
+                  fileName: "keystore/ente_photos_key.jks"
+                  encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
+
+            - name: Build PlayStore AAB
+              run: |
+                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
+              env:
+                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
+                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
+                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
+                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
+
+            - name: Upload AAB to PlayStore
+              uses: r0adkll/upload-google-play@v1
+              with:
+                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+                  packageName: io.ente.photos
+                  releaseFiles: mobile/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  track: internal
+
+            - name: Notify Discord
+              uses: sarisia/actions-status-discord@v1
+              with:
+                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+                  nodetail: true
+                  title: "🏆 Internal release available for Photos"
+                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
+                  color: 0x00ff00

.github/workflows/mobile-internal-release.yml

@@ -4,7 +4,10 @@ on:
     workflow_dispatch: # Allow manually running the action
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.4"
+
+permissions:
+    contents: write
 
 jobs:
     build:
@@ -12,7 +15,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
 
         steps:
             - name: Checkout code and submodules
@@ -52,14 +55,14 @@ jobs:
               with:
                   serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
                   packageName: io.ente.photos
-                  releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+                  releaseFiles: mobile/apps/photos/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
                   track: internal
-            
+
             - name: Notify Discord
               uses: sarisia/actions-status-discord@v1
               with:
                   webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
                   nodetail: true
-                  title: "🏆 Internal release available for Photos"
+                  title: "🏆 Internal release Photos (Branch: ${{ github.ref_name }})"
                   description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
                   color: 0x00ff00

.github/workflows/mobile-lint.yml

@@ -4,19 +4,21 @@ on:
     # Run on every pull request (open or push to it) that changes mobile/
     pull_request:
         paths:
-            - "mobile/**"
+            - "mobile/apps/photos/**"
             - ".github/workflows/mobile-lint.yml"
 
 env:
+    FLUTTER_VERSION: "3.27.4"
 
-    FLUTTER_VERSION: "3.24.3"
+permissions:
+    contents: read
 
 jobs:
     lint:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
         steps:
             - name: Checkout code and submodules
               uses: actions/checkout@v4

.github/workflows/mobile-release.yml

@@ -9,7 +9,10 @@ on:
             - "photos-v*"
 
 env:
-    FLUTTER_VERSION: "3.24.3"
+    FLUTTER_VERSION: "3.27.4"
+
+permissions:
+    contents: write
 
 jobs:
     build:
@@ -17,7 +20,7 @@ jobs:
 
         defaults:
             run:
-                working-directory: mobile
+                working-directory: mobile/apps/photos
 
         steps:
             - name: Checkout code and submodules
@@ -59,5 +62,5 @@ jobs:
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
               with:
-                  artifacts: "mobile/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/build/app/outputs/flutter-apk/sha256sum"
+                  artifacts: "mobile/apps/photos/build/app/outputs/flutter-apk/ente-${{ github.ref_name }}.apk,mobile/apps/photos/build/app/outputs/flutter-apk/sha256sum"
                   draft: true

.github/workflows/photos-internal-release.yml

@@ -0,0 +1,190 @@
+name: "Internal Release V2 (photos)"
+
+on:
+  workflow_dispatch: # Manual trigger only
+
+env:
+  FLUTTER_VERSION: "3.27.4"
+  ANDROID_KEYSTORE_PATH: "keystore/ente_photos_key.jks"
+
+jobs:
+  build:
+    runs-on: macos-15 # Required for iOS builds
+    environment: "ios-build"
+    permissions:
+      contents: write
+
+    defaults:
+      run:
+        working-directory: mobile/apps/photos
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      
+      - name: Install Apple Certificate
+        env:
+          MAC_OS_CERTIFICATE: ${{ secrets.MAC_OS_CERTIFICATE }}
+          MAC_OS_CERTIFICATE_PASSWORD: ${{ secrets.MAC_OS_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # Create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # Import certificate from secrets
+          echo -n "$MAC_OS_CERTIFICATE" | base64 --decode -o $CERTIFICATE_PATH
+
+          # Create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # Import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$MAC_OS_CERTIFICATE_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple: -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # Make the keychain the default
+          security list-keychain -d user -s $KEYCHAIN_PATH
+      
+      - name: Add provisioning profiles
+        run: |
+          # Decode and install all provisioning profiles
+          PROFILES_HOME="$HOME/Library/MobileDevice/Provisioning Profiles"
+          mkdir -p "$PROFILES_HOME"
+          IFS=$'\n'
+          for profile in ${{ secrets.MAC_OS_PROFILES_BASE64 }}; do
+            PROFILE_PATH="$(mktemp "$PROFILES_HOME"/$(uuidgen).mobileprovision)"
+            echo "$profile" | base64 --decode > "$PROFILE_PATH"
+            echo "Saved provisioning profile to $PROFILE_PATH"
+          done
+      
+          # Common Setup
+    
+      - name: Setup JDK 17
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
+
+      - name: Install Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          cache: true
+      
+      - name: Get Flutter dependencies
+        run: flutter pub get
+
+      # Android Build
+      - name: Setup Android signing key
+        uses: timheuer/base64-to-file@v1
+        with:
+          fileName: ${{ env.ANDROID_KEYSTORE_PATH }}
+          encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
+
+      # - name: Build Android AAB
+      #   run: |
+      #     flutter build appbundle \
+      #       --dart-define=cronetHttpNoPlay=true \
+      #       --release \
+      #       --flavor playstore
+      #   env:
+      #     SIGNING_KEY_PATH: ${{ env.ANDROID_KEYSTORE_PATH }}
+      #     SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
+      #     SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
+      #     SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
+
+      # iOS Build (new secure implementation)
+      - name: Install fastlane
+        run: gem install fastlane
+      
+      - name: Update CocoaPods Specs
+        run: pod repo update
+        working-directory: mobile/apps/photos/ios
+
+      - name: Install CocoaPods dependencies
+        run: |
+          rm -f Podfile.lock
+          pod install
+        working-directory: mobile/apps/photos/ios
+
+      - name: Create ExportOptions.plist
+        run: |
+          cat <<EOF > ios/ExportOptions.plist
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+              <key>method</key>
+              <string>app-store</string>
+              <key>teamID</key>
+              <string>${{ secrets.IOS_TEAM_ID }}</string>
+              <key>provisioningProfiles</key>
+              <dict>
+                  <key>io.ente.photos</key>
+                  <string>match AppStore io.ente.photos</string>
+                  <key>io.ente.frame</key>
+                  <string>match AppStore io.ente.frame</string>
+                  <key>io.ente.frame.EntePeopleWidget</key>
+                  <string>match AppStore io.ente.frame.EntePeopleWidget</string>
+                  <key>io.ente.frame.EnteAlbumWidget</key>
+                  <string>match AppStore io.ente.frame.EnteAlbumWidget</string>
+                  <key>io.ente.frame.EnteMemoryWidget</key>
+                  <string>match AppStore io.ente.frame.EnteMemoryWidget</string>
+              </dict>
+          </dict>
+          </plist>
+          EOF
+      
+      - name: Setup App Store Connect API Key
+        run: |
+          echo '${{ secrets.IOS_API_KEY }}' > api_key.json
+          chmod 600 api_key.json
+
+      - name: Build iOS IPA
+        run: |
+          flutter build ipa \
+            --release \
+            --export-options-plist=ios/ExportOptions.plist \
+            --dart-define=cronetHttpNoPlay=true
+        env:
+          SIGNING_TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
+
+      # Uploads
+      # - name: Upload to Play Store
+      #   uses: r0adkll/upload-google-play@v1
+      #   with:
+      #     serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+      #     packageName: io.ente.photos
+      #     releaseFiles: build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
+      #     track: internal
+
+      - name: Upload to TestFlight
+        run: |
+          fastlane pilot upload \
+            --api_key_path api_key.json \
+            --ipa "build/ios/ipa/Ente Photos.ipa" \
+            --skip_waiting_for_build_processing \
+            --apple_id ${{ secrets.IOS_APPLE_ID }} \
+            --app_identifier "io.ente.photos"
+        env:
+          APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.IOS_API_KEY_ID }}
+          APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.IOS_ISSUER_ID }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.IOS_APP_SPECIFIC_PASSWORD }}
+
+      - name: Clean sensitive files
+        run: |
+          rm -f api_key.json
+          rm -f ${{ env.ANDROID_KEYSTORE_PATH }}
+
+      - name: Notify Discord
+        uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
+          title: "🚀 Dual Platform Release Uploaded"
+          description: |
+            **Android**: [Play Store Internal](https://play.google.com/store/apps/details?id=io.ente.photos)
+            **iOS**: TestFlight build processing
+          color: 0x00ff00

.github/workflows/server-lint.yml

@@ -7,6 +7,9 @@ on:
             - "server/**"
             - ".github/workflows/server-lint.yml"
 
+permissions:
+    contents: read
+
 jobs:
     lint:
         runs-on: ubuntu-latest

.github/workflows/server-publish-ghcr.yml

@@ -7,6 +7,10 @@ on:
     # Run manually if needed to publish out of schedule.
     workflow_dispatch:
 
+permissions:
+    contents: write  # for pushing the `ghcr/server` branch
+    packages: write
+
 jobs:
     publish:
         runs-on: ubuntu-latest
@@ -36,6 +40,6 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Update branch server/ghcr to point to source commit
+            - name: Update branch ghcr/server to point to source commit
               run: |
-                  git push -f origin HEAD:refs/heads/server/ghcr
+                  git push -f origin HEAD:refs/heads/ghcr/server

.github/workflows/server-release.yml

@@ -3,6 +3,9 @@ name: "Release (server)"
 on:
     workflow_dispatch: # Run manually
 
+permissions:
+    contents: read
+
 jobs:
     build:
         runs-on: ubuntu-latest

.github/workflows/web-crowdin-push-both.yml

@@ -12,6 +12,10 @@ on:
     # `gh workflow run web-crowdin-push-both.yml --ref <my-branch>`
     workflow_dispatch:
 
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     push-both-to-crowdin:
         runs-on: ubuntu-latest

.github/workflows/web-crowdin-sync.yml

@@ -22,6 +22,15 @@ on:
     # Also allow manually running the workflow.
     workflow_dispatch:
 
+# "In order to push translations and create pull requests, the Crowdin GitHub
+#  action requires the `GITHUB_TOKEN` to have write permission on the `contents`
+#  and `pull-requests`.
+#
+# - https://github.com/crowdin/github-action?tab=readme-ov-file#permissions
+permissions:
+    contents: write
+    pull-requests: write
+
 jobs:
     synchronize-with-crowdin:
         runs-on: ubuntu-latest

.github/workflows/web-deploy-one.yml

@@ -15,6 +15,9 @@ on:
                     - "payments"
                     - "photos"
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -26,13 +29,11 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 

.github/workflows/web-deploy-preview.yml

@@ -15,6 +15,9 @@ on:
                     - "payments"
                     - "photos"
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -26,13 +29,11 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 

.github/workflows/web-deploy-staging.yml

@@ -11,6 +11,9 @@ on:
     # Also allow manually running the workflow
     workflow_dispatch:
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -34,12 +37,11 @@ jobs:
               uses: actions/checkout@v4
               with:
                   ref: ${{ steps.select-branch.outputs.branch }}
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 

.github/workflows/web-deploy.yml

@@ -19,6 +19,9 @@ on:
     # Also allow manually running the workflow
     workflow_dispatch:
 
+permissions:
+    contents: read
+
 jobs:
     deploy:
         runs-on: ubuntu-latest
@@ -30,13 +33,11 @@ jobs:
         steps:
             - name: Checkout code
               uses: actions/checkout@v4
-              with:
-                  submodules: recursive
 
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 
@@ -92,3 +93,13 @@ jobs:
                   accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
                   apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
                   command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/payments web/apps/payments/dist
+
+            - name: Build locker
+              run: yarn build:locker
+
+            - name: Publish locker
+              uses: cloudflare/wrangler-action@v3
+              with:
+                  accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+                  apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+                  command: pages deploy --project-name=ente --commit-dirty=true --branch=deploy/locker web/apps/locker/out

.github/workflows/web-lint.yml

@@ -7,6 +7,9 @@ on:
             - "web/**"
             - ".github/workflows/web-lint.yml"
 
+permissions:
+    contents: read
+
 # Cancel in-progress lint runs when a new commit is pushed.
 concurrency:
     group: ${{ github.workflow }}-${{ github.ref }}
@@ -25,7 +28,7 @@ jobs:
             - name: Setup node and enable yarn caching
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: "yarn"
                   cache-dependency-path: "web/yarn.lock"
 

.github/workflows/web-publish-ghcr.yml

@@ -0,0 +1,38 @@
+name: "Publish ghcr (web)"
+
+on:
+    # Run automatically every Wednesday, at 07:00 UTC.
+    schedule:
+        - cron: '0 7 * * 3'
+    # Run manually if needed to publish out of schedule.
+    workflow_dispatch:
+
+permissions:
+    contents: write  # for pushing the `ghcr/web` branch
+    packages: write
+
+jobs:
+    publish:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Build and push
+              uses: mr-smithers-excellent/docker-build-push@v6
+              with:
+                  dockerfile: web/Dockerfile
+                  directory: web
+                  # Resultant package name will be ghcr.io/ente-io/web
+                  image: web
+                  registry: ghcr.io
+                  enableBuildKit: true
+                  multiPlatform: true
+                  platform: linux/amd64,linux/arm64
+                  tags: ${{ github.sha }}, latest
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Update branch ghcr/web to point to source commit
+              run: |
+                  git push -f origin HEAD:refs/heads/ghcr/web

.gitmodules

@@ -3,13 +3,9 @@
 	url = https://github.com/ente-io/sentry-dart.git
 	branch = sentry_flutter_ente
 [submodule "auth/flutter"]
-	path = auth/flutter
+	path = mobile/apps/auth/flutter
 	url = https://github.com/flutter/flutter.git
 	branch = stable
 [submodule "auth/assets/simple-icons"]
-	path = auth/assets/simple-icons
+	path = mobile/apps/auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git
-[submodule "web/apps/photos/thirdparty/photoswipe"]
-	path = web/apps/photos/thirdparty/photoswipe
-	url = https://github.com/ente-io/PhotoSwipe.git
-	branch = single-thread

CONTRIBUTING.md

@@ -1,54 +1,42 @@
 # Contributing
 
-First and foremost, thank you for your interest in contributing to Ente 🙏
-
-There are many ways to contribute, and most of them don't require writing code.
-
-* [Spread the word](#spread-the-word)
-* [Engage with the community](#engage-with-the-community)
-* [Translate](#translate)
-* [Document](#document)
-
+- [Spread the word](#spread-the-word)
+- [Engage with the community](#engage-with-the-community)
+- [Translate](#translate)
+- [Document](#document)
 
 ## Spread the word
 
-This is perhaps the most impactful contribution you can make. [Spread the
-word](https://help.ente.io/photos/features/referral-program/). Online on your
-favorite social media channels. Offline to your friends and family who are
-looking for a privacy-friendly alternative to big tech.
+**This is the most impactful contribution you can make**.
+
+[Spread the word](https://help.ente.io/photos/features/referral-program/). Online on your favorite social media channels. Offline to your friends and family who are looking for a privacy-friendly alternative to big tech.
 
 ## Engage with the community
 
-Just hang around, enjoy the vibe. Answer someone's query on our
-[Discord](https://discord.gg/z2YVKkycX3), or pile on in the sporadic #off-topic
-rants there. Chuckle (or wince!) at our [Twitter](https://twitter.com/enteio)
-memes. Suggest a new feature in our [Github
-Discussions](https://github.com/ente-io/ente/discussions/new?category=feature-requests),
-or upvote the existing ones that you feel we should focus on first. Provide your
-opinion on existing threads.
+Just hang around, enjoy the vibe. The Ente community — the people who are building Ente, and the people who are using Ente — hang out at various places depending on their proclivity:
 
-These might seem like small things, but it provides us energy. Knowing that
-there is a community of people who care for what we are building.
+- [Discord](https://discord.ente.io)
+- [Mastodon](https://fosstodon.org/@ente)
+- [X / Twitter](https://twitter.com/enteio)
+- [Github Discussions](https://github.com/ente-io/ente/discussions)
+
+Just being around might seem a small thing, but it provides us energy. Knowing that there is a community of people who care for what we are building, **who want us to do better**.
 
 ## Translate
 
-If you're interested in helping out with translation, please visit our Crowdin
-projects to get started:
-
-| Project  |  |
-| ------------- | ------------- |
-| [Auth](https://crowdin.com/project/ente-authenticator-app)  | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)  |
-| [Photos](https://crowdin.com/project/ente-photos-app)  | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)  |
-| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web)  | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)  |
+Visit our Crowdin projects to help with translations:
 
+| Project                                                             |                                                                                                                                   |
+| ------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| [Auth](https://crowdin.com/project/ente-authenticator-app)          | [![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) |
+| [Photos](https://crowdin.com/project/ente-photos-app)               | [![Crowdin](https://badges.crowdin.net/ente-photos-app/localized.svg)](https://crowdin.com/project/ente-photos-app)               |
+| [Photos Web / Desktop](https://crowdin.com/project/ente-photos-web) | [![Crowdin](https://badges.crowdin.net/ente-photos-web/localized.svg)](https://crowdin.com/project/ente-photos-web)               |
 
 If your language is not listed for translation, please [create a GitHub
 issue](https://github.com/ente-io/ente/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A+%0AProject%3A+auth%2Fphotos%2Fboth)
 to have it added. It is okay to have partial translations. Once ~90% of the
 strings in a language get translated, we will start surfacing it in the apps.
 
-Thank you for your support.
-
 ## Document
 
 The help guides and FAQs for users of Ente products are also open source, and
@@ -60,25 +48,9 @@ See [docs/](docs/README.md) for how to edit these documents.
 
 ## Code contributions
 
-Code is a small aspect of community, and the ways mentioned above are more
-important in helping us. But if you'd _really_ like to contribute code, it is
-best to start small. Consider some well-scoped changes, say like adding more
-[custom icons to auth](auth/docs/adding-icons.md).
+If you'd like to contribute code, it is best to start small. Consider some well-scoped changes, say like adding more [custom icons to auth](auth/docs/adding-icons.md), or fixing a specific bug.
 
-Each of the individual product/platform specific directories in this repository
-have instructions on setting up a dev environment.
-
-For anything beyond trivial bug fixes, please use [features requests and
-discussions](https://github.com/ente-io/ente/discussions) instead of performing
-code changes directly.
-
-> [!TIP]
->
-> Please remember that code is a important, but small, part of the overall big
-> picture that makes a product a joy to use. Something that's easy in code is
-> not necessarily the right choice for the product as a whole. So we'll repeat -
-> there are other ways to contribute than code that we'd request you to
-> consider.
+Code that changes the behaviour of the product might not get merged, at least not initially. The PR can serve as a discussion bed, but you might find it easier to just start a discussion instead, or post your perspective in the (likely) existing thread about the behaviour change or new feature you wish for.
 
 ## Leave a review or star
 

README.md

@@ -35,7 +35,7 @@ Private sharing. Collaborative albums. Family plans. Easy import, easier export.
 Background uploads. The list goes on. And of course, all of this, while being
 fully end-to-end encrypted across platforms.
 
-Ente Photos is a paid service, but we offer 5GB of free storage.
+Ente Photos is a paid service, but we offer 10GB of free storage.
 You can also clone this repository and choose to self-host.
 
 <br />
@@ -95,8 +95,8 @@ please see our [support guide](SUPPORT.md).
 <img src=".github/assets/ente-ducky.png" width=200 alt="Ente's Mascot, Ducky,
     inviting people to Ente's source code repository" />
 
-Please visit our [community page](https://ente.io/community) for all the ways to
-connect with the community.
+Please visit the [community section](https://ente.io/about#community) for all the ways to
+connect with our community.
 
 [![Discord](https://img.shields.io/discord/948937918347608085?style=for-the-badge&logo=Discord&logoColor=white&label=Discord)](https://discord.gg/z2YVKkycX3)
 [![Ente's Blog RSS](https://img.shields.io/badge/blog-rss-F88900?style=for-the-badge&logo=rss&logoColor=white)](https://ente.io/blog/rss.xml)

auth/assets/custom-icons/icons/mistral.svg

@@ -1,15 +0,0 @@
-<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g style="mix-blend-mode:difference">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M363.636 23H409.091V477.545H363.636V23ZM0 23H45.4545V477.545H0V23ZM227.273 295.727H181.818V386.636H227.273V295.727ZM272.727 113.909H318.182V204.818H272.727V113.909Z" fill="white"/>
-</g>
-<path d="M136.364 386.636H45.4545V477.545H136.364V386.636Z" fill="#EA3326"/>
-<path d="M500 386.636H409.091V477.545H500V386.636Z" fill="#EA3326"/>
-<path d="M136.364 295.727H45.4545V386.636H136.364V295.727Z" fill="#EB5829"/>
-<path d="M318.182 295.727H227.273V386.636H318.182V295.727Z" fill="#EB5829"/>
-<path d="M500 295.727H409.091V386.636H500V295.727Z" fill="#EB5829"/>
-<path d="M136.364 23H45.4545V113.909H136.364V23Z" fill="#F7D046"/>
-<path d="M500 23H409.091V113.909H500V23Z" fill="#F7D046"/>
-<path d="M227.273 113.909H45.4545V204.818H227.273V113.909Z" fill="#F2A73B"/>
-<path d="M500 113.909H318.182V204.818H500V113.909Z" fill="#F2A73B"/>
-<path d="M500 204.818H45.4545V295.727H500V204.818Z" fill="#EE792F"/>
-</svg>

auth/lib/l10n/arb/app_be.arb

@@ -1,81 +0,0 @@
-{
-  "account": "Уліковы запіс",
-  "unlock": "Разблакіраваць",
-  "recoveryKey": "Ключ аднаўлення",
-  "counterAppBarTitle": "Лічыльнік",
-  "@counterAppBarTitle": {
-    "description": "Text shown in the AppBar of the Counter Page"
-  },
-  "onBoardingBody": "Бяспечна зрабіць рэзервовую копію кодаў 2ФА",
-  "onBoardingGetStarted": "Пачаць",
-  "setupFirstAccount": "Наладзіць ваш першы ўліковы запіс",
-  "importScanQrCode": "Сканіраваць код QR-код",
-  "qrCode": "QR-код",
-  "importEnterSetupKey": "Увесці ключ наладжвання",
-  "importAccountPageTitle": "Увесці падрабязнасці ўліковага запісу",
-  "secretCanNotBeEmpty": "Сакрэт не можа быць пустым",
-  "bothIssuerAndAccountCanNotBeEmpty": "І выдавец, і ўліковы запіс не могуць быць пустымі",
-  "incorrectDetails": "Няправільныя падрабязнасці",
-  "pleaseVerifyDetails": "Праверце падрабязнасці і паспрабуйце яшчэ раз",
-  "codeIssuerHint": "Выдавец",
-  "codeSecretKeyHint": "Сакрэтны ключ",
-  "secret": "Сакрэт",
-  "all": "Усе",
-  "notes": "Нататкі",
-  "notesLengthLimit": "Максімальная колькасць сімвалаў у нататках не больш за {count}",
-  "@notesLengthLimit": {
-    "description": "Text to indicate the maximum number of characters allowed for notes",
-    "placeholders": {
-      "count": {
-        "description": "The maximum number of characters allowed for notes",
-        "type": "int",
-        "example": "100"
-      }
-    }
-  },
-  "codeAccountHint": "Уліковы запіс (vy@damen.com)",
-  "codeTagHint": "Тэг",
-  "accountKeyType": "Тып ключа",
-  "sessionExpired": "Сеанс завяршыўся",
-  "@sessionExpired": {
-    "description": "Title of the dialog when the users current session is invalid/expired"
-  },
-  "pleaseLoginAgain": "Аўтарызуйцеся яшчэ раз",
-  "loggingOut": "Выхад...",
-  "timeBasedKeyType": "Заснаваныя на часе (TOTP)",
-  "counterBasedKeyType": "Заснаваныя на лічыльніку (HOTP)",
-  "saveAction": "Захаваць",
-  "nextTotpTitle": "наступны",
-  "deleteCodeTitle": "Выдаліць код?",
-  "deleteCodeMessage": "Вы сапраўды хочаце выдаліць гэты код? Гэта дзеянне з'яўляецца незваротным.",
-  "trashCode": "Выдаліць код?",
-  "trashCodeMessage": "Вы сапраўды хочаце выдаліць код для {account}?",
-  "trash": "Сметніца",
-  "viewLogsAction": "Паглядзець журнал",
-  "preparingLogsTitle": "Падрыхтоўка журнала...",
-  "emailLogsTitle": "Адправіць журнал па электроннай пошце",
-  "blog": "Блог",
-  "changePassword": "Змяніць пароль",
-  "data": "Даныя",
-  "importLabel": "Імпарт",
-  "yes": "Так",
-  "no": "Не",
-  "email": "Электронная пошта",
-  "support": "Падтрымка",
-  "settings": "Налады",
-  "pleaseTryAgain": "Калі ласка, паспрабуйце яшчэ раз",
-  "delete": "Выдаліць",
-  "enterYourPasswordHint": "Увядзіце ваш пароль",
-  "faq": "Частыя пытанні",
-  "deleteAccount": "Выдаліць уліковы запіс",
-  "noDeleteAccountAction": "Не, выдаліць уліковы запіс",
-  "sendEmail": "Адправіць ліст",
-  "createNewAccount": "Стварыць новы ўліковы запіс",
-  "confirmPassword": "Пацвердзіць пароль",
-  "close": "Закрыць",
-  "oopsSomethingWentWrong": "Штосьці пайшло не так.",
-  "language": "Мова",
-  "security": "Бяспека",
-  "searchHint": "Пошук...",
-  "search": "Пошук"
-}

auth/lib/l10n/arb/app_et.arb

@@ -1,4 +0,0 @@
-{
-  "loggingOut": "Väljalogimine...",
-  "useRecoveryKey": "Kasuta taastevõtit"
-}

auth/lib/l10n/arb/app_hi.arb

@@ -1,107 +0,0 @@
-{
-  "account": "खाता",
-  "unlock": "खोलें",
-  "recoveryKey": "पुनःप्राप्ति कुंजी",
-  "counterAppBarTitle": "काउंटर",
-  "@counterAppBarTitle": {
-    "description": "Text shown in the AppBar of the Counter Page"
-  },
-  "onBoardingGetStarted": "प्रारंभ करें",
-  "setupFirstAccount": "अपना पहला अकाउंट सेटअप करें",
-  "importScanQrCode": "एक QR कोड स्कैन करें",
-  "qrCode": "QR कोड",
-  "importEnterSetupKey": "",
-  "importAccountPageTitle": "अकाउंट विवरण डालें",
-  "incorrectDetails": "ग़लत विवरण",
-  "pleaseVerifyDetails": "कृपया विवरण सत्यापित करें और पुनः प्रयास करें",
-  "codeIssuerHint": "ज़ारीकर्ता",
-  "codeSecretKeyHint": "सीक्रेट कुंजी",
-  "secret": "सीक्रेट",
-  "all": "सभी",
-  "notes": "नोट्स",
-  "notesLengthLimit": "नोट्स अधिकतम {count} अक्षर लम्बे हो सकते हैं",
-  "@notesLengthLimit": {
-    "description": "Text to indicate the maximum number of characters allowed for notes",
-    "placeholders": {
-      "count": {
-        "description": "The maximum number of characters allowed for notes",
-        "type": "int",
-        "example": "100"
-      }
-    }
-  },
-  "codeAccountHint": "अकाउंट (you@domain.com)",
-  "codeTagHint": "टैग",
-  "sessionExpired": "सत्र की अवधि समाप्त",
-  "@sessionExpired": {
-    "description": "Title of the dialog when the users current session is invalid/expired"
-  },
-  "pleaseLoginAgain": "कृपया फिर से लॉगिन करें",
-  "loggingOut": "लॉग आउट हो रहा है...",
-  "saveAction": "सेव करें",
-  "deleteCodeMessage": "क्या आप वाकई इस कोड को हटाना चाहते हैं? इस क्रिया को वापस नहीं किया जा सकता",
-  "trashCode": "?",
-  "trashCodeMessage": "क्या आप वाकई {account} के लिए कोड नष्ट करना चाहते हैं?",
-  "trash": "नष्ट करें",
-  "viewLogsAction": "लॉग देखें",
-  "preparingLogsTitle": "लॉग तैयार किये जा रहे हैं...",
-  "emailLogsTitle": "लॉग ईमेल करें",
-  "emailLogsMessage": "कृपया {email} पर लॉग ईमेल करें",
-  "@emailLogsMessage": {
-    "placeholders": {
-      "email": {
-        "type": "String"
-      }
-    }
-  },
-  "copyEmailAction": "ईमेल कॉपी करें",
-  "exportLogsAction": "लॉग एक्सपोर्ट करें",
-  "reportABug": "बग रिपोर्ट करें",
-  "reportBug": "बग रिपोर्ट करें",
-  "emailUsMessage": "कृपया हमें {email} पर ईमेल करें",
-  "@emailUsMessage": {
-    "placeholders": {
-      "email": {
-        "type": "String"
-      }
-    }
-  },
-  "contactSupport": "सपोर्ट टीम से संपर्क करें",
-  "rateUsOnStore": "हमें {storeName} पर रेट करें",
-  "blog": "ब्लॉग",
-  "verifyPassword": "पासवर्ड सत्यापित करें",
-  "pleaseWait": "कृपया प्रतीक्षा करें...",
-  "incorrectPasswordTitle": "ग़लत पासवर्ड",
-  "welcomeBack": "आपका पुनः स्वागत है!",
-  "changeEmail": "ईमेल बदलें",
-  "changePassword": "पासवर्ड बदलें",
-  "data": "डेटा",
-  "passwordEmptyError": "पासवर्ड रिक्त नहीं हो सकता है",
-  "importLabel": "इंपोर्ट",
-  "selectFile": "फ़ाइल का चयन करें",
-  "emailVerificationToggle": "ईमेल सत्यापन",
-  "ok": "ठीक है",
-  "cancel": "रद्द करें",
-  "yes": "हाँ",
-  "no": "नहीं",
-  "settings": "सेटिंग",
-  "pleaseTryAgain": "कृपया पुन: प्रयास करें",
-  "newUser": "एंटे में नए उपयोगकर्ता",
-  "delete": "हटाएं",
-  "enterYourPasswordHint": "अपना पासवर्ड दर्ज करें",
-  "forgotPassword": "पासवर्ड भूल गए",
-  "oops": "ओह",
-  "suggestFeatures": "विशेषताएं सुझाएं",
-  "faq": "अक्सर किये गए सवाल",
-  "somethingWentWrongMessage": "कुछ गड़बड़ हुई है, कृपया दोबारा प्रयास करें",
-  "leaveFamily": "परिवार छोड़ें",
-  "leaveFamilyMessage": "क्या आप सच में परिवार प्लान छोड़ना चाहते हैं?",
-  "inFamilyPlanMessage": "आप परिवार प्लान पर हैं!",
-  "hintForMobile": "कोड को संपादित करने या हटाने के लिए उसे लंबी देर तक दबाए।",
-  "hintForDesktop": "कोड को संपादित करने या हटाने के लिए उस पर राइट क्लिक करें।",
-  "scan": "स्कैन करें",
-  "scanACode": "कोड स्कैन करें",
-  "verify": "सत्यापित करें",
-  "verifyEmail": "ईमेल सत्यापित करें",
-  "twoFactorAuthTitle": "दो-चरणीय प्रमाणीकरण |"
-}

auth/lib/l10n/arb/app_vi.arb

@@ -1,508 +0,0 @@
-{
-  "account": "Tài khoản",
-  "unlock": "Mở khóa",
-  "recoveryKey": "Khóa khôi phục",
-  "counterAppBarTitle": "Bộ Đếm",
-  "@counterAppBarTitle": {
-    "description": "Text shown in the AppBar of the Counter Page"
-  },
-  "onBoardingBody": "Sao lưu mã 2FA của bạn một cách an toàn",
-  "onBoardingGetStarted": "Bắt đầu",
-  "setupFirstAccount": "Thiết lập tài khoản đầu tiên của bạn",
-  "importScanQrCode": "Quét mã QR",
-  "qrCode": "Mã QR",
-  "importEnterSetupKey": "Nhập khóa thiết lập",
-  "importAccountPageTitle": "Nhập chi tiết tài khoản",
-  "secretCanNotBeEmpty": "Khoá bí mật không được để trống",
-  "bothIssuerAndAccountCanNotBeEmpty": "Cả nhà phát hành và tài khoản không được để trống",
-  "incorrectDetails": "Thông tin chi tiết không chính xác",
-  "pleaseVerifyDetails": "Vui lòng xác minh chi tiết và thử lại",
-  "codeIssuerHint": "Bên phát hành",
-  "codeSecretKeyHint": "Khóa bí mật",
-  "secret": "Khóa bí mật",
-  "all": "Tất cả",
-  "notes": "Ghi chú",
-  "notesLengthLimit": "Ghi chú có thể dài tối đa {count} ký tự",
-  "@notesLengthLimit": {
-    "description": "Text to indicate the maximum number of characters allowed for notes",
-    "placeholders": {
-      "count": {
-        "description": "The maximum number of characters allowed for notes",
-        "type": "int",
-        "example": "100"
-      }
-    }
-  },
-  "codeAccountHint": "Tài khoản (bạn@miền.com)",
-  "codeTagHint": "Thẻ",
-  "accountKeyType": "Loại khóa",
-  "sessionExpired": "Phiên làm việc đã hết hạn",
-  "@sessionExpired": {
-    "description": "Title of the dialog when the users current session is invalid/expired"
-  },
-  "pleaseLoginAgain": "Vui lòng đăng nhập lại",
-  "loggingOut": "Đang đăng xuất...",
-  "timeBasedKeyType": "Dựa trên thời gian (TOTP)",
-  "counterBasedKeyType": "Dựa trên bộ đếm (HOTP)",
-  "saveAction": "Lưu",
-  "nextTotpTitle": "tiếp theo",
-  "deleteCodeTitle": "Xóa mã?",
-  "deleteCodeMessage": "Bạn có chắc chắn muốn xóa mã này không? Hành động này không thể đảo ngược.",
-  "trashCode": "Xóa mã?",
-  "trashCodeMessage": "Bạn có chắc chắn muốn xóa mã cho {account} không?",
-  "trash": "Xóa",
-  "viewLogsAction": "Xem các bản ghi",
-  "sendLogsDescription": "Thao tác này sẽ gửi nhật ký để giúp chúng tôi gỡ lỗi sự cố của bạn. Mặc dù chúng tôi thực hiện các biện pháp phòng ngừa để đảm bảo rằng thông tin nhạy cảm không được ghi lại, nhưng chúng tôi khuyến khích bạn xem các nhật ký này trước khi chia sẻ chúng.",
-  "preparingLogsTitle": "Đang chuẩn bị nhật ký...",
-  "emailLogsTitle": "Nhật ký email",
-  "emailLogsMessage": "Vui lòng gửi nhật ký tới {email}",
-  "@emailLogsMessage": {
-    "placeholders": {
-      "email": {
-        "type": "String"
-      }
-    }
-  },
-  "copyEmailAction": "Sao chép email",
-  "exportLogsAction": "Xuất nhật ký",
-  "reportABug": "Báo cáo lỗi",
-  "crashAndErrorReporting": "Báo cáo sự cố & lỗi",
-  "reportBug": "Báo lỗi",
-  "emailUsMessage": "Vui lòng gửi email cho chúng tôi tại {email}",
-  "@emailUsMessage": {
-    "placeholders": {
-      "email": {
-        "type": "String"
-      }
-    }
-  },
-  "contactSupport": "Liên hệ hỗ trợ",
-  "rateUsOnStore": "Đánh giá chúng tôi trên {storeName}",
-  "blog": "Blog",
-  "merchandise": "Hàng hóa",
-  "verifyPassword": "Xác nhận mật khẩu",
-  "pleaseWait": "Vui lòng chờ...",
-  "generatingEncryptionKeysTitle": "Đang tạo khóa mã hóa...",
-  "recreatePassword": "Tạo lại mật khẩu",
-  "recreatePasswordMessage": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn, vì vậy chúng tôi cần tạo lại mật khẩu một lần theo cách hoạt động với tất cả các thiết bị.\n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
-  "useRecoveryKey": "Dùng khóa khôi phục",
-  "incorrectPasswordTitle": "Mật khẩu không đúng",
-  "welcomeBack": "Chào mừng trở lại!",
-  "emailAlreadyRegistered": "Email đã được đăng kí.",
-  "emailNotRegistered": "Email chưa được đăng kí.",
-  "madeWithLoveAtPrefix": "được làm bằng ❤️ tại ",
-  "supportDevs": "Đăng ký <bold-green>ente</bold-green> để hỗ trợ dự án này.",
-  "supportDiscount": "Sử dụng mã giảm giá \"AUTH\" để được giảm 10% trong năm đầu tiên",
-  "changeEmail": "Thay đổi email",
-  "changePassword": "Đổi mật khẩu",
-  "data": "Dữ liệu",
-  "importCodes": "Nhập mã",
-  "importTypePlainText": "Văn bản thuần",
-  "importTypeEnteEncrypted": "Xuất key đã được mã hóa",
-  "passwordForDecryptingExport": "Mật khẩu để giải mã xuất",
-  "passwordEmptyError": "Mật khẩu không thể để trống",
-  "importFromApp": "Nhập mã từ {appName}",
-  "importGoogleAuthGuide": "Xuất dữ liệu tài khoản của bạn từ Google Authenticator sang mã QR bằng tùy chọn \"Chuyển tài khoản\". Sau đó dùng thiết bị khác quét mã QR.",
-  "importSelectJsonFile": "Chọn tệp JSON",
-  "importSelectAppExport": "Chọn {appName} tệp dữ liệu xuất",
-  "importEnteEncGuide": "Chọn tệp JSON được mã hóa đã xuất từ ​​ente",
-  "importRaivoGuide": "Sử dụng tùy chọn \"Xuất OTP sang lưu trữ Zip\" trong cài đặt của Raivo.",
-  "importBitwardenGuide": "Sử dụng tùy chọn \"Xuất vault\" trong công cụ Bitwarden và nhập tệp JSON không được mã hóa.",
-  "importAegisGuide": "Nếu vault của bạn được mã hóa, bạn sẽ cần nhập mật khẩu vault để giải mã vault.",
-  "import2FasGuide": "Sử dụng tùy chọn \"Cài đặt->Sao lưu -Xuất dữ liệu\" trong 2FAS.\n\nNếu bản sao lưu của bạn được mã hóa, bạn sẽ cần nhập mật khẩu để giải mã bản sao lưu",
-  "importLastpassGuide": "Sử dụng tùy chọn \"Chuyển tài khoản\" trong Cài đặt Lastpass Authenticator và nhấn \"Xuất tài khoản ra tệp\". Nhập tệp JSON đã tải xuống.",
-  "exportCodes": "Xuất mã",
-  "importLabel": "Nhập",
-  "importInstruction": "Vui lòng chọn tệp chứa danh sách mã của bạn ở định dạng sau",
-  "importCodeDelimiterInfo": "Các mã có thể được phân tách bằng một dấu phẩy hoặc một dòng mới",
-  "selectFile": "Chọn tập tin",
-  "emailVerificationToggle": "Email xác thực",
-  "emailVerificationEnableWarning": "Để tránh bị khóa tài khoản, hãy đảm bảo lưu trữ bản sao email 2FA của bạn bên ngoài Ente Auth trước khi bật xác minh email.",
-  "authToChangeEmailVerificationSetting": "Vui lòng xác thực để thay đổi email",
-  "authenticateGeneric": "Vui lòng xác thực",
-  "authToViewYourRecoveryKey": "Vui lòng xác thực để xem khóa khôi phục của bạn",
-  "authToChangeYourEmail": "Vui lòng xác thực để thay đổi email của bạn",
-  "authToChangeYourPassword": "Vui lòng xác thực để thay đổi mật khẩu của bạn",
-  "authToViewSecrets": "Vui lòng xác thực để xem bí mật của bạn",
-  "authToInitiateSignIn": "Vui lòng xác thực để bắt đầu đăng nhập nhằm sao lưu.",
-  "ok": "Đồng ý",
-  "cancel": "Hủy",
-  "yes": "Đúng",
-  "no": "Không",
-  "email": "Thư điện tử",
-  "support": "Hỗ trợ",
-  "general": "Tổng quan",
-  "settings": "Cài đặt",
-  "copied": "Đã sao chép",
-  "pleaseTryAgain": "Vui lòng thử lại",
-  "existingUser": "Người dùng hiện tại",
-  "newUser": "Mới tham gia Ente",
-  "delete": "Xóa",
-  "enterYourPasswordHint": "Nhập mật khẩu của bạn",
-  "forgotPassword": "Quên mật khẩu",
-  "oops": "Rất tiếc",
-  "suggestFeatures": "Gợi ý tính năng",
-  "faq": "Câu hỏi thường gặp",
-  "somethingWentWrongMessage": "Đã xảy ra lỗi, xin thử lại",
-  "leaveFamily": "Rời khỏi gia đình",
-  "leaveFamilyMessage": "Bạn có chắc chắn muốn thoát khỏi gói dành cho gia đình không?",
-  "inFamilyPlanMessage": "Bạn đang sử dụng gói dành cho gia đình!",
-  "hintForMobile": "Nhấn giữ trên mã để chỉnh sửa hoặc xóa.",
-  "hintForDesktop": "Nhấp chuột phải vào mã để chỉnh sửa hoặc xóa.",
-  "scan": "Quét",
-  "scanACode": "Quét mã",
-  "verify": "Xác minh",
-  "verifyEmail": "Xác nhận địa chỉ Email",
-  "enterCodeHint": "Nhập mã gồm 6 chữ số từ ứng dụng xác thực của bạn",
-  "lostDeviceTitle": "Mất thiết bị?",
-  "twoFactorAuthTitle": "Xác thực hai yếu tố",
-  "passkeyAuthTitle": "Xác minh mã khóa",
-  "verifyPasskey": "Xác minh mã khóa",
-  "loginWithTOTP": "Đăng nhập bằng TOTP",
-  "recoverAccount": "Khôi phục tài khoản",
-  "enterRecoveryKeyHint": "Nhập khóa khôi phục của bạn",
-  "recover": "Khôi phục",
-  "contactSupportViaEmailMessage": "Vui lòng gửi email đến {email} từ địa chỉ email đã đăng ký của bạn",
-  "@contactSupportViaEmailMessage": {
-    "placeholders": {
-      "email": {
-        "type": "String"
-      }
-    }
-  },
-  "invalidQRCode": "Mã QR không hợp lệ",
-  "noRecoveryKeyTitle": "Không có khóa khôi phục?",
-  "enterEmailHint": "Nhập địa chỉ email của bạn",
-  "invalidEmailTitle": "Địa chỉ email không hợp lệ",
-  "invalidEmailMessage": "Xin vui lòng nhập một địa chỉ email hợp lệ.",
-  "deleteAccount": "Xoá tài khoản",
-  "deleteAccountQuery": "Chúng tôi sẽ rất tiếc khi thấy bạn đi. Bạn đang phải đối mặt với một số vấn đề?",
-  "yesSendFeedbackAction": "Có, gửi phản hồi",
-  "noDeleteAccountAction": "Không, xóa tài khoản",
-  "initiateAccountDeleteTitle": "Vui lòng xác thực để bắt đầu xóa tài khoản",
-  "sendEmail": "Gửi email",
-  "createNewAccount": "Tạo tài khoản mới",
-  "weakStrength": "Yếu",
-  "strongStrength": "Mạnh",
-  "moderateStrength": "Trung bình",
-  "confirmPassword": "Xác nhận mật khẩu",
-  "close": "Đóng",
-  "oopsSomethingWentWrong": "Rất tiếc, Đã xảy ra lỗi.",
-  "selectLanguage": "Chọn ngôn ngữ",
-  "language": "Ngôn ngữ",
-  "social": "Xã hội",
-  "security": "Bảo mật",
-  "lockscreen": "Màn hình khoá",
-  "authToChangeLockscreenSetting": "Vui lòng xác thực để thay đổi cài đặt màn hình khóa",
-  "deviceLockEnablePreSteps": "Để bật khoá thiết bị, vui lòng thiết lập mật khẩu thiết bị hoặc khóa màn hình trong cài đặt hệ thống của bạn.",
-  "viewActiveSessions": "Xem danh sách phiên làm việc hiện tại",
-  "authToViewYourActiveSessions": "Vui lòng xác thực để xem danh sách phiên làm việc của bạn",
-  "searchHint": "Tìm kiếm...",
-  "search": "Tìm kiếm",
-  "sorryUnableToGenCode": "Rất tiếc, không thể tạo mã cho {issuerName}",
-  "noResult": "Không có kết quả",
-  "addCode": "Thêm mã",
-  "scanAQrCode": "Quét mã QR",
-  "enterDetailsManually": "Nhập chi tiết thủ công",
-  "edit": "Sửa",
-  "share": "Chia sẻ",
-  "shareCodes": "Chia sẻ mã",
-  "shareCodesDuration": "Chọn khoảng thời gian mà bạn muốn chia sẻ mã.",
-  "restore": "Khôi phục",
-  "copiedToClipboard": "Đã sao chép vào khay nhớ tạm",
-  "copiedNextToClipboard": "Đã sao chép mã tiếp theo vào bảng nhớ tạm",
-  "error": "Lỗi",
-  "recoveryKeyCopiedToClipboard": "Đã sao chép khóa khôi phục vào bộ nhớ tạm",
-  "recoveryKeyOnForgotPassword": "Nếu bạn quên mật khẩu, cách duy nhất bạn có thể khôi phục dữ liệu của mình là sử dụng khóa này.",
-  "recoveryKeySaveDescription": "Chúng tôi không lưu trữ khóa này, vui lòng lưu khóa 24 từ này ở nơi an toàn.",
-  "doThisLater": "Để sau",
-  "saveKey": "Lưu khóa",
-  "save": "Lưu",
-  "send": "Gửi",
-  "saveOrSendDescription": "Bạn có muốn lưu vào bộ nhớ (Mặc định lưu vào thư mục Tải về) hoặc chuyển qua ứng dụng khác?",
-  "saveOnlyDescription": "Bạn có muốn lưu vào bộ nhớ không (Mặc định lưu vào thư mục Tải về)?",
-  "back": "Quay lại",
-  "createAccount": "Tạo tài khoản",
-  "passwordStrength": "Độ mạnh mật khẩu: {passwordStrengthValue}",
-  "@passwordStrength": {
-    "description": "Text to indicate the password strength",
-    "placeholders": {
-      "passwordStrengthValue": {
-        "description": "The strength of the password as a string",
-        "type": "String",
-        "example": "Weak or Moderate or Strong"
-      }
-    },
-    "message": "Password Strength: {passwordStrengthText}"
-  },
-  "password": "Mật khẩu",
-  "signUpTerms": "Tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
-  "privacyPolicyTitle": "Chính sách bảo mật",
-  "termsOfServicesTitle": "Điều khoản",
-  "encryption": "Mã hóa",
-  "setPasswordTitle": "Đặt mật khẩu",
-  "changePasswordTitle": "Thay đổi mật khẩu",
-  "resetPasswordTitle": "Đặt lại mật khẩu",
-  "encryptionKeys": "Khóa mã hóa",
-  "passwordWarning": "Chúng tôi không lưu trữ mật khẩu này, vì vậy nếu bạn quên, <underline>chúng tôi không thể giải mã dữ liệu của bạn</underline>",
-  "enterPasswordToEncrypt": "Nhập mật khẩu mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
-  "enterNewPasswordToEncrypt": "Nhập một mật khẩu mới mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
-  "passwordChangedSuccessfully": "Thay đổi mật khẩu thành công",
-  "generatingEncryptionKeys": "Đang tạo khóa mã hóa...",
-  "continueLabel": "Tiếp tục",
-  "insecureDevice": "Thiết bị không an toàn",
-  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Rất tiếc, chúng tôi không thể tạo khóa bảo mật trên thiết bị này.\n\nvui lòng đăng ký từ một thiết bị khác.",
-  "howItWorks": "Cách thức hoạt động",
-  "ackPasswordLostWarning": "Tôi hiểu rằng việc mất mật khẩu có thể đồng nghĩa với việc mất dữ liệu của tôi vì dữ liệu của tôi được <underline>mã hóa hai đầu</underline>.",
-  "loginTerms": "Bằng cách nhấp vào đăng nhập, tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
-  "logInLabel": "Đăng nhập",
-  "logout": "Đăng xuất",
-  "areYouSureYouWantToLogout": "Bạn có chắc chắn muốn đăng xuất?",
-  "yesLogout": "Có, đăng xuất",
-  "exit": "Thoát",
-  "theme": "Chủ đề",
-  "lightTheme": "Sáng",
-  "darkTheme": "Tối",
-  "systemTheme": "Hệ thống",
-  "verifyingRecoveryKey": "Đang xác minh khóa khôi phục...",
-  "recoveryKeyVerified": "Khóa khôi phục đã được xác thực",
-  "recoveryKeySuccessBody": "Tuyệt vời! Khóa khôi phục của bạn hợp lệ. Cảm ơn bạn đã xác minh.\n\nHãy nhớ sao lưu khóa khôi phục của bạn một cách an toàn.",
-  "invalidRecoveryKey": "Khóa khôi phục bạn đã nhập không hợp lệ. Vui lòng đảm bảo rằng nó chứa 24 từ và kiểm tra chính tả của từng từ.\n\nNếu bạn đã nhập mã khôi phục cũ hơn, hãy đảm bảo mã đó dài 64 ký tự và kiểm tra từng ký tự.",
-  "recreatePasswordTitle": "Tạo lại mật khẩu",
-  "recreatePasswordBody": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn nhưng chúng tôi có thể tạo lại mật khẩu theo cách hoạt động với tất cả các thiết bị.\n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
-  "invalidKey": "Khoá không hợp lệ",
-  "tryAgain": "Thử lại",
-  "viewRecoveryKey": "Hiển thị khóa khôi phục",
-  "confirmRecoveryKey": "Xác nhận khóa khôi phục",
-  "recoveryKeyVerifyReason": "Nếu bạn quên mật khẩu, khóa khôi phục là cách duy nhất để khôi phục ảnh của bạn. Bạn có thể tìm thấy khóa khôi phục của mình trong Cài đặt > Tài khoản.\n\nVui lòng nhập khóa khôi phục của bạn tại đây để xác minh rằng bạn đã lưu chính xác.",
-  "confirmYourRecoveryKey": "Xác nhận khóa khôi phục",
-  "confirm": "Xác nhận",
-  "emailYourLogs": "Gửi email nhật ký của bạn",
-  "pleaseSendTheLogsTo": "Vui lòng gửi nhật ký đến \n{toEmail}",
-  "copyEmailAddress": "Sao chép địa chỉ email",
-  "exportLogs": "Xuất nhật ký",
-  "enterYourRecoveryKey": "Nhập khóa khôi phục của bạn",
-  "tempErrorContactSupportIfPersists": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
-  "networkHostLookUpErr": "Không thể kết nối đến Ente, vui lòng kiểm tra lại kết nối mạng. Nếu vẫn còn lỗi, xin vui lòng liên hệ hỗ trợ.",
-  "networkConnectionRefusedErr": "Không thể kết nối đến Ente, vui lòng thử lại sau. Nếu vẫn còn lỗi, xin vui lòng liên hệ hỗ trợ.",
-  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
-  "about": "Về chúng tôi",
-  "weAreOpenSource": "Chúng tôi có mã nguồn mở!",
-  "privacy": "Riêng tư",
-  "terms": "Điều khoản",
-  "checkForUpdates": "Kiểm tra cập nhật",
-  "checkStatus": "Kiểm tra trạng thái",
-  "downloadUpdate": "Tải xuống",
-  "criticalUpdateAvailable": "Đã có bản cập nhật quan trọng",
-  "updateAvailable": "Đã có bản cập nhật",
-  "update": "Cập nhật",
-  "checking": "Đang kiểm tra...",
-  "youAreOnTheLatestVersion": "Bạn đang sử dụng phiên bản mới nhất",
-  "warning": "Cánh báo",
-  "exportWarningDesc": "Tệp đã xuất chứa thông tin nhạy cảm. Hãy lưu trữ tệp này một cách an toàn.",
-  "iUnderStand": "Tôi hiểu",
-  "@iUnderStand": {
-    "description": "Text for the button to confirm the user understands the warning"
-  },
-  "authToExportCodes": "Vui lòng xác thực để xuất mã của bạn",
-  "importSuccessTitle": "Hoan hô!",
-  "importSuccessDesc": "Bạn đã nhập {count} mã!",
-  "@importSuccessDesc": {
-    "placeholders": {
-      "count": {
-        "description": "The number of codes imported",
-        "type": "int",
-        "example": "1"
-      }
-    }
-  },
-  "sorry": "Xin lỗi",
-  "importFailureDesc": "Không thể phân tích cú pháp tệp đã chọn.\nVui lòng viết thư cho support@ente.io nếu bạn cần trợ giúp!",
-  "pendingSyncs": "Cánh báo",
-  "pendingSyncsWarningBody": "Một số mã của bạn chưa được sao lưu.\n\nVui lòng đảm bảo rằng bạn có bản sao lưu cho các mã này trước khi đăng xuất.",
-  "checkInboxAndSpamFolder": "Vui lòng kiểm tra hộp thư đến (và thư rác) của bạn để hoàn tất xác minh",
-  "tapToEnterCode": "Chạm để nhập mã",
-  "resendEmail": "Gửi lại email",
-  "weHaveSendEmailTo": "Chúng tôi đã gửi thư đến <green>{email}</green>",
-  "@weHaveSendEmailTo": {
-    "description": "Text to indicate that we have sent a mail to the user",
-    "placeholders": {
-      "email": {
-        "description": "The email address of the user",
-        "type": "String",
-        "example": "example@ente.io"
-      }
-    }
-  },
-  "manualSort": "Tùy chỉnh",
-  "editOrder": "Chỉnh sửa đơn hàng",
-  "mostFrequentlyUsed": "Thường dùng",
-  "mostRecentlyUsed": "Dùng gần đây",
-  "activeSessions": "Các phiên làm việc hiện tại",
-  "somethingWentWrongPleaseTryAgain": "Phát hiện có lỗi, xin thử lại",
-  "thisWillLogYouOutOfThisDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị này!",
-  "thisWillLogYouOutOfTheFollowingDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị sau:",
-  "terminateSession": "Kết thúc phiên?",
-  "terminate": "Kết thúc",
-  "thisDevice": "Thiết bị này",
-  "toResetVerifyEmail": "Để đặt lại mật khẩu, vui lòng xác minh email của bạn trước.",
-  "thisEmailIsAlreadyInUse": "Email này đã được sử dụng",
-  "verificationFailedPleaseTryAgain": "Mã xác nhận thất bại. Vui lòng thử lại",
-  "yourVerificationCodeHasExpired": "Mã xác minh của bạn đã hết hạn",
-  "incorrectCode": "Mã không chính xác",
-  "sorryTheCodeYouveEnteredIsIncorrect": "Xin lỗi, mã bạn đã nhập không chính xác",
-  "emailChangedTo": "Thay đổi email thành {newEmail}",
-  "authenticationFailedPleaseTryAgain": "Xác thực lỗi, vui lòng thử lại",
-  "authenticationSuccessful": "Xác thực thành công!",
-  "twofactorAuthenticationSuccessfullyReset": "Xác thực hai bước được khôi phục thành công",
-  "incorrectRecoveryKey": "Khóa khôi phục không chính xác",
-  "theRecoveryKeyYouEnteredIsIncorrect": "Khóa khôi phục bạn đã nhập không chính xác",
-  "enterPassword": "Nhập mật khẩu",
-  "selectExportFormat": "Chọn định dạng dữ liệu xuất",
-  "exportDialogDesc": "Xuất dữ liệu được mã hóa sẽ được bảo vệ bằng mật khẩu bạn chọn.",
-  "encrypted": "Đã mã hóa",
-  "plainText": "Văn bản thuần",
-  "passwordToEncryptExport": "Mật khẩu để giải mã dữ liệu xuất",
-  "export": "Xuất dữ liệu",
-  "useOffline": "Sử dụng mà không sao lưu",
-  "signInToBackup": "Đăng nhập để sao lưu mã của bạn",
-  "singIn": "Đăng nhập",
-  "sigInBackupReminder": "Vui lòng xuất mã của bạn để đảm bảo rằng bạn có bản sao lưu có thể khôi phục.",
-  "offlineModeWarning": "Bạn đã chọn tiếp tục mà không cần sao lưu. Vui lòng sao lưu thủ công để đảm bảo mã của bạn được an toàn.",
-  "showLargeIcons": "Hiển thị biểu tượng lớn",
-  "compactMode": "Chế độ thu gọn",
-  "shouldHideCode": "Ẩn mã",
-  "doubleTapToViewHiddenCode": "Bạn có thể nhấn đúp vào một mục để xem mã",
-  "focusOnSearchBar": "Mở tìm kiếm khi khởi động ứng dụng",
-  "confirmUpdatingkey": "Bạn có chắc chắn muốn cập nhật khóa bí mật không?",
-  "minimizeAppOnCopy": "Thu nhỏ khi sao chép",
-  "editCodeAuthMessage": "Xác minh để chỉnh sửa mã",
-  "deleteCodeAuthMessage": "Xác minh để xóa mã",
-  "showQRAuthMessage": "Xác minh để hiển thị mã QR",
-  "confirmAccountDeleteTitle": "Xác nhận xóa tài khoản",
-  "confirmAccountDeleteMessage": "Tài khoản này được liên kết với các ứng dụng Ente trên các nền tảng khác, nếu bạn có sử dụng.\n\nDữ liệu đã tải lên của bạn, trên mọi nền tảng, sẽ bị lên lịch xóa và tài khoản của bạn sẽ bị xóa vĩnh viễn.",
-  "androidBiometricHint": "Xác định danh tính",
-  "@androidBiometricHint": {
-    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
-  },
-  "androidBiometricNotRecognized": "Không nhận dạng được. Vui lòng thử lại.",
-  "@androidBiometricNotRecognized": {
-    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
-  },
-  "androidBiometricSuccess": "Thành công",
-  "@androidBiometricSuccess": {
-    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
-  },
-  "androidCancelButton": "Hủy bỏ",
-  "@androidCancelButton": {
-    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
-  },
-  "androidSignInTitle": "Yêu cầu xác thực",
-  "@androidSignInTitle": {
-    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
-  },
-  "androidBiometricRequiredTitle": "Yêu cầu sinh trắc học",
-  "@androidBiometricRequiredTitle": {
-    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
-  },
-  "androidDeviceCredentialsRequiredTitle": "Yêu cầu thông tin xác thực thiết bị",
-  "@androidDeviceCredentialsRequiredTitle": {
-    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
-  },
-  "androidDeviceCredentialsSetupDescription": "Yêu cầu thông tin xác thực thiết bị",
-  "@androidDeviceCredentialsSetupDescription": {
-    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
-  },
-  "goToSettings": "Chuyển đến cài đặt",
-  "@goToSettings": {
-    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
-  },
-  "androidGoToSettingsDescription": "Xác thực sinh trắc học chưa được thiết lập trên thiết bị của bạn. Đi tới 'Cài đặt > Bảo mật' để thêm xác thực sinh trắc học.",
-  "@androidGoToSettingsDescription": {
-    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
-  },
-  "iOSLockOut": "Xác thực sinh trắc học bị vô hiệu hóa. Vui lòng khóa và mở khóa màn hình của bạn để kích hoạt nó.",
-  "@iOSLockOut": {
-    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
-  },
-  "iOSGoToSettingsDescription": "Xác thực sinh trắc học chưa được thiết lập trên thiết bị của bạn. Vui lòng bật Touch ID hoặc Face ID trên điện thoại của bạn.",
-  "@iOSGoToSettingsDescription": {
-    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
-  },
-  "iOSOkButton": "Đồng ý",
-  "@iOSOkButton": {
-    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
-  },
-  "noInternetConnection": "Không có kết nối Internet",
-  "pleaseCheckYourInternetConnectionAndTryAgain": "Vui lòng kiểm tra kết nối internet của bạn và thử lại.",
-  "signOutFromOtherDevices": "Đăng xuất khỏi các thiết bị khác",
-  "signOutOtherBody": "Nếu bạn cho rằng ai đó có thể biết mật khẩu của mình, bạn có thể buộc đăng xuất tất cả các thiết bị khác đang sử dụng tài khoản của mình.",
-  "signOutOtherDevices": "Đăng xuất khỏi các thiết bị khác",
-  "doNotSignOut": "Không được đăng xuất",
-  "hearUsWhereTitle": "Bạn biết đến Ente bằng cách nào? (không bắt buộc)",
-  "hearUsExplanation": "Chúng tôi không theo dõi lượt cài đặt ứng dụng. Sẽ rất hữu ích nếu bạn cho chúng tôi biết nơi bạn tìm thấy chúng tôi!",
-  "recoveryKeySaved": "Đã lưu khoá dự phòng vào thư mục Tải về!",
-  "waitingForBrowserRequest": "Đang chờ yêu cầu từ trình duyệt...",
-  "waitingForVerification": "Đang chờ xác thực",
-  "passkey": "Mã khoá",
-  "passKeyPendingVerification": "Đang chờ xác thực",
-  "loginSessionExpired": "Phiên làm việc hết hạn",
-  "loginSessionExpiredDetails": "Phiên làm việc hết hạn. Vui lòng đăng nhập lại.",
-  "developerSettingsWarning": "Bạn có chắc chắn muốn thay đổi Tuỳ chọn cho nhà phát triển không?",
-  "developerSettings": "Cài đặt cho nhà phát triển",
-  "serverEndpoint": "Điểm cuối máy chủ",
-  "invalidEndpoint": "Điểm cuối không hợp lệ",
-  "invalidEndpointMessage": "Xin lỗi, điểm cuối bạn nhập không hợp lệ. Vui lòng nhập một điểm cuối hợp lệ và thử lại.",
-  "endpointUpdatedMessage": "Cập nhật điểm cuối thành công",
-  "customEndpoint": "Đã kết nối đến",
-  "pinText": "Ghim",
-  "unpinText": "Bỏ ghim",
-  "pinnedCodeMessage": "{code} đã được ghim",
-  "unpinnedCodeMessage": "{code} đã được bỏ ghim",
-  "pinned": "Đã ghim",
-  "tags": "Thẻ",
-  "createNewTag": "Tạo thẻ mới",
-  "tag": "Thẻ",
-  "create": "Tạo",
-  "editTag": "Sửa thẻ",
-  "deleteTagTitle": "Xóa thẻ?",
-  "deleteTagMessage": "Bạn có chắc chắn muốn xóa thẻ này không? Hành động này không thể đảo ngược.",
-  "somethingWentWrongParsingCode": "Chúng tôi không thể phân tích {x} mã.",
-  "updateNotAvailable": "Cập nhật không khả dụng",
-  "viewRawCodes": "Xem mã nguồn",
-  "rawCodes": "Mã nguồn",
-  "rawCodeData": "Dữ liệu thô",
-  "appLock": "Khóa ứng dụng",
-  "noSystemLockFound": "Không thấy khoá hệ thống",
-  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Để bật khoá ứng dụng, vui lòng thiết lập mật khẩu thiết bị hoặc khóa màn hình trong cài đặt hệ thống của bạn.",
-  "autoLock": "Tự động khóa",
-  "immediately": "Tức thì",
-  "reEnterPassword": "Nhập lại mật khẩu",
-  "reEnterPin": "Nhập lại mã PIN",
-  "next": "Tiếp theo",
-  "tooManyIncorrectAttempts": "Quá nhiều lần thử không chính xác",
-  "tapToUnlock": "Nhấn để mở khóa",
-  "setNewPassword": "Đặt lại mật khẩu",
-  "deviceLock": "Khóa thiết bị",
-  "hideContent": "Ẩn nội dung",
-  "hideContentDescriptionAndroid": "Ẩn nội dung khi chuyển ứng dụng và chặn chụp màn hình",
-  "hideContentDescriptioniOS": "Ẩn nội dung khi chuyển ứng dụng",
-  "autoLockFeatureDescription": "Thời gian ứng dụng tự khoá sau khi ở trạng thái nền",
-  "appLockDescription": "Chọn giữa màn hình khoá mặc định của thiết bị và màn hình khoá tự chọn dùng mã PIN hoặc mật khẩu.",
-  "pinLock": "Mã PIN",
-  "enterPin": "Nhập mã PIN",
-  "setNewPin": "Đổi mã PIN",
-  "importFailureDescNew": "Không thể phân tích file đã chọn.",
-  "appLockNotEnabled": "Khóa ứng dụng chưa được bật",
-  "appLockNotEnabledDescription": "Vui lòng bật khóa ứng dụng từ Bảo mật > Khóa ứng dụng",
-  "authToViewPasskey": "Vui lòng xác thực để xem mã khóa",
-  "appLockOfflineModeWarning": "Bạn đã chọn tiếp tục mà không có bản sao lưu. Nếu bạn quên khóa ứng dụng, bạn sẽ bị khóa khỏi việc truy cập dữ liệu của mình.",
-  "duplicateCodes": "Mã trùng lặp",
-  "noDuplicates": "✨ Không có trùng lặp",
-  "youveNoDuplicateCodesThatCanBeCleared": "Bạn không có mã trùng lặp nào có thể được xóa",
-  "deduplicateCodes": "Loại bỏ mã trùng lặp",
-  "deselectAll": "Bỏ chọn tất cả",
-  "selectAll": "Chọn tất cả",
-  "deleteDuplicates": "Xóa trùng lặp",
-  "plainHTML": "HTML thuần"
-}

auth/lib/services/user_remote_flag_service.dart

@@ -1,141 +0,0 @@
-import 'dart:async';
-import 'dart:io';
-
-import 'package:collection/collection.dart';
-import 'package:dio/dio.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/core/event_bus.dart';
-import 'package:ente_auth/core/network.dart';
-import 'package:ente_auth/events/notification_event.dart';
-import 'package:ente_auth/services/user_service.dart';
-import 'package:logging/logging.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-
-class UserRemoteFlagService {
-  final _dio = Network.instance.getDio();
-  final _logger = Logger((UserRemoteFlagService).toString());
-  final _config = Configuration.instance;
-  late SharedPreferences _prefs;
-
-  UserRemoteFlagService._privateConstructor();
-
-  static final UserRemoteFlagService instance =
-      UserRemoteFlagService._privateConstructor();
-
-  static const String recoveryVerificationFlag = "recoveryKeyVerified";
-  static const String needRecoveryKeyVerification =
-      "needRecoveryKeyVerification";
-
-  Future<void> init() async {
-    _prefs = await SharedPreferences.getInstance();
-  }
-
-  bool shouldShowRecoveryVerification() {
-    if (!_prefs.containsKey(needRecoveryKeyVerification)) {
-      // fetch the status from remote
-      unawaited(_refreshRecoveryVerificationFlag());
-      return false;
-    } else {
-      final bool shouldShow = _prefs.getBool(needRecoveryKeyVerification)!;
-      if (shouldShow) {
-        // refresh the status to check if user marked it as done on another device
-        unawaited(_refreshRecoveryVerificationFlag());
-      }
-      return shouldShow;
-    }
-  }
-
-  // markRecoveryVerificationAsDone is used to track if user has verified their
-  // recovery key in the past or not. This helps in avoid showing the same
-  // prompt to the user on re-install or signing into a different device
-  Future<void> markRecoveryVerificationAsDone() async {
-    await _updateKeyValue(recoveryVerificationFlag, true.toString());
-    await _prefs.setBool(needRecoveryKeyVerification, false);
-  }
-
-  Future<void> _refreshRecoveryVerificationFlag() async {
-    _logger.finest('refresh recovery key verification flag');
-    final remoteStatusValue =
-        await _getValue(recoveryVerificationFlag, "false");
-    final bool isNeedVerificationFlagSet =
-        _prefs.containsKey(needRecoveryKeyVerification);
-    if (remoteStatusValue.toLowerCase() == "true") {
-      await _prefs.setBool(needRecoveryKeyVerification, false);
-      // If the user verified on different device, then we should refresh
-      // the UI to dismiss the Notification.
-      if (isNeedVerificationFlagSet) {
-        Bus.instance.fire(NotificationEvent());
-      }
-    } else if (!isNeedVerificationFlagSet) {
-      // Verification is not done yet as remoteStatus is false and local flag to
-      // show notification isn't set. Set the flag to true if any active
-      // session is older than 1 day.
-      final activeSessions = await UserService.instance.getActiveSessions();
-      final int microSecondsInADay = const Duration(days: 1).inMicroseconds;
-      final bool anyActiveSessionOlderThanADay =
-          activeSessions.sessions.firstWhereOrNull(
-                (e) =>
-                    (e.creationTime + microSecondsInADay) <
-                    DateTime.now().microsecondsSinceEpoch,
-              ) !=
-              null;
-      if (anyActiveSessionOlderThanADay) {
-        await _prefs.setBool(needRecoveryKeyVerification, true);
-        Bus.instance.fire(NotificationEvent());
-      } else {
-        // continue defaulting to no verification prompt
-        _logger.finest('No active session older than 1 day');
-      }
-    }
-  }
-
-  Future<String> _getValue(String key, String? defaultValue) async {
-    try {
-      final Map<String, dynamic> queryParams = {"key": key};
-      if (defaultValue != null) {
-        queryParams["defaultValue"] = defaultValue;
-      }
-      final response = await _dio.get(
-        "${_config.getHttpEndpoint()}/remote-store",
-        queryParameters: queryParams,
-        options: Options(
-          headers: {
-            "X-Auth-Token": _config.getToken(),
-          },
-        ),
-      );
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected status code ${response.statusCode}");
-      }
-      return response.data["value"];
-    } catch (e) {
-      _logger.info("Error while fetching bool status for $key", e);
-      rethrow;
-    }
-  }
-
-  // _setBooleanFlag sets the corresponding flag on remote
-  // to mark recovery as completed
-  Future<void> _updateKeyValue(String key, String value) async {
-    try {
-      final response = await _dio.post(
-        "${_config.getHttpEndpoint()}/remote-store/update",
-        data: {
-          "key": key,
-          "value": value,
-        },
-        options: Options(
-          headers: {
-            "X-Auth-Token": _config.getToken(),
-          },
-        ),
-      );
-      if (response.statusCode != HttpStatus.ok) {
-        throw Exception("Unexpected state");
-      }
-    } catch (e) {
-      _logger.warning("Failed to set flag for $key", e);
-      rethrow;
-    }
-  }
-}

auth/lib/ui/account/verify_recovery_page.dart

@@ -1,219 +0,0 @@
-import 'package:bip39/bip39.dart' as bip39;
-import 'package:dio/dio.dart';
-import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/ente_theme_data.dart';
-import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/services/local_authentication_service.dart';
-import 'package:ente_auth/services/user_remote_flag_service.dart';
-import 'package:ente_auth/ui/account/recovery_key_page.dart';
-import 'package:ente_auth/ui/common/gradient_button.dart';
-import 'package:ente_auth/ui/components/buttons/button_widget.dart';
-import 'package:ente_auth/utils/dialog_util.dart';
-import 'package:ente_auth/utils/navigation_util.dart';
-import 'package:ente_auth/utils/platform_util.dart';
-import 'package:ente_crypto_dart/ente_crypto_dart.dart';
-import 'package:flutter/material.dart';
-import 'package:logging/logging.dart';
-
-class VerifyRecoveryPage extends StatefulWidget {
-  const VerifyRecoveryPage({super.key});
-
-  @override
-  State<VerifyRecoveryPage> createState() => _VerifyRecoveryPageState();
-}
-
-class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
-  final _recoveryKey = TextEditingController();
-  final Logger _logger = Logger((_VerifyRecoveryPageState).toString());
-
-  void _verifyRecoveryKey() async {
-    final dialog =
-        createProgressDialog(context, context.l10n.verifyingRecoveryKey);
-    await dialog.show();
-    try {
-      final String inputKey = _recoveryKey.text.trim();
-      final String recoveryKey =
-          CryptoUtil.bin2hex(Configuration.instance.getRecoveryKey());
-      final String recoveryKeyWords = bip39.entropyToMnemonic(recoveryKey);
-      if (inputKey == recoveryKey || inputKey == recoveryKeyWords) {
-        try {
-          await UserRemoteFlagService.instance.markRecoveryVerificationAsDone();
-        } catch (e) {
-          await dialog.hide();
-          if (e is DioException && e.type == DioExceptionType.unknown) {
-            await showErrorDialog(
-              context,
-              "No internet connection",
-              "Please check your internet connection and try again.",
-            );
-          } else {
-            await showGenericErrorDialog(
-              context: context,
-              error: e,
-            );
-          }
-          return;
-        }
-
-        await dialog.hide();
-        // todo: change this as per figma once the component is ready
-        await showErrorDialog(
-          context,
-          context.l10n.recoveryKeyVerified,
-          context.l10n.recoveryKeySuccessBody,
-        );
-        Navigator.of(context).pop();
-      } else {
-        throw Exception("recovery key didn't match");
-      }
-    } catch (e, s) {
-      _logger.severe("failed to verify recovery key", e, s);
-      await dialog.hide();
-      final String errMessage = context.l10n.invalidRecoveryKey;
-      final result = await showChoiceDialog(
-        context,
-        title: context.l10n.invalidKey,
-        body: errMessage,
-        firstButtonLabel: context.l10n.tryAgain,
-        secondButtonLabel: context.l10n.viewRecoveryKey,
-        secondButtonAction: ButtonAction.second,
-      );
-      if (result!.action == ButtonAction.second) {
-        await _onViewRecoveryKeyClick();
-      }
-    }
-  }
-
-  Future<void> _onViewRecoveryKeyClick() async {
-    final hasAuthenticated =
-        await LocalAuthenticationService.instance.requestLocalAuthentication(
-      context,
-      "Please authenticate to view your recovery key",
-    );
-    await PlatformUtil.refocusWindows();
-
-    if (hasAuthenticated) {
-      String recoveryKey;
-      try {
-        recoveryKey =
-            CryptoUtil.bin2hex(Configuration.instance.getRecoveryKey());
-        await routeToPage(
-          context,
-          RecoveryKeyPage(
-            recoveryKey,
-            context.l10n.ok,
-            showAppBar: true,
-            onDone: () {
-              Navigator.of(context).pop();
-            },
-          ),
-        );
-      } catch (e) {
-        // ignore: unawaited_futures
-        showGenericErrorDialog(
-          context: context,
-          error: e,
-        );
-        return;
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final enteTheme = Theme.of(context).colorScheme.enteTheme;
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back),
-          color: Theme.of(context).iconTheme.color,
-          onPressed: () {
-            Navigator.of(context).pop();
-          },
-        ),
-      ),
-      body: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 16.0),
-        child: LayoutBuilder(
-          builder: (context, constraints) {
-            return SingleChildScrollView(
-              child: ConstrainedBox(
-                constraints: BoxConstraints(
-                  minWidth: constraints.maxWidth,
-                  minHeight: constraints.maxHeight,
-                ),
-                child: IntrinsicHeight(
-                  child: Column(
-                    children: [
-                      const SizedBox(height: 12),
-                      SizedBox(
-                        width: double.infinity,
-                        child: Text(
-                          context.l10n.confirmRecoveryKey,
-                          style: enteTheme.textTheme.h3Bold,
-                          textAlign: TextAlign.left,
-                        ),
-                      ),
-                      const SizedBox(height: 18),
-                      Text(
-                        context.l10n.recoveryKeyVerifyReason,
-                        style: enteTheme.textTheme.small
-                            .copyWith(color: enteTheme.colorScheme.textMuted),
-                      ),
-                      const SizedBox(height: 12),
-                      TextFormField(
-                        decoration: InputDecoration(
-                          filled: true,
-                          hintText: context.l10n.enterYourRecoveryKey,
-                          contentPadding: const EdgeInsets.all(20),
-                          border: UnderlineInputBorder(
-                            borderSide: BorderSide.none,
-                            borderRadius: BorderRadius.circular(6),
-                          ),
-                        ),
-                        style: const TextStyle(
-                          fontSize: 14,
-                          fontFeatures: [FontFeature.tabularFigures()],
-                        ),
-                        controller: _recoveryKey,
-                        autofocus: false,
-                        autocorrect: false,
-                        keyboardType: TextInputType.multiline,
-                        minLines: 4,
-                        maxLines: null,
-                        onChanged: (_) {
-                          setState(() {});
-                        },
-                      ),
-                      const SizedBox(height: 12),
-                      Expanded(
-                        child: Container(
-                          alignment: Alignment.bottomCenter,
-                          width: double.infinity,
-                          padding: const EdgeInsets.fromLTRB(0, 12, 0, 40),
-                          child: Column(
-                            mainAxisAlignment: MainAxisAlignment.end,
-                            crossAxisAlignment: CrossAxisAlignment.stretch,
-                            children: [
-                              GradientButton(
-                                onTap: _verifyRecoveryKey,
-                                text: context.l10n.confirm,
-                              ),
-                              const SizedBox(height: 8),
-                            ],
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 20),
-                    ],
-                  ),
-                ),
-              ),
-            );
-          },
-        ),
-      ),
-    );
-  }
-}

cli/README.md

@@ -60,7 +60,7 @@ ente account list
 #### Change export directory
 
 ```shell
-ente account update --email email@domain.com --dir ~/photos
+ente account update --app auth/photos --email email@domain.com --dir ~/photos
 ```
 
 ### Export

cli/config.yaml.example

@@ -5,8 +5,6 @@
 
 endpoint:
   api: "http://localhost:8080"
-  # Endpoint for the account service for passkey
-  accounts: "http://localhost:3001"
 
 log:
  http: false # log status code & time taken by requests

cli/internal/api/login.go

@@ -83,13 +83,14 @@ func (c *Client) VerifySRPSession(
 	return &res, nil
 }
 
-func (c *Client) SendEmailOTP(
+func (c *Client) SendLoginOTP(
 	ctx context.Context,
 	email string,
 ) error {
 	var res AuthorizationResponse
 	payload := map[string]interface{}{
-		"email": email,
+		"email":   email,
+		"purpose": "login",
 	}
 	r, err := c.restClient.R().
 		SetContext(ctx).

cli/internal/api/login_type.go

@@ -35,6 +35,7 @@ type AuthorizationResponse struct {
 	ID                 int64          `json:"id"`
 	KeyAttributes      *KeyAttributes `json:"keyAttributes,omitempty"`
 	EncryptedToken     string         `json:"encryptedToken,omitempty"`
+	AccountsUrl        string         `json:"accountsUrl"`
 	Token              string         `json:"token,omitempty"`
 	TwoFactorSessionID string         `json:"twoFactorSessionID"`
 	PassKeySessionID   string         `json:"passkeySessionID"`

cli/main.go

@@ -110,7 +110,6 @@ func initConfig(cliConfigDir string) {
 	viper.AddConfigPath(".")                // optionally look for config in the working directory
 
 	viper.SetDefault("endpoint.api", constants.EnteApiUrl)
-	viper.SetDefault("endpoint.accounts", constants.EnteAccountUrl)
 	viper.SetDefault("log.http", false)
 	if err := viper.ReadInConfig(); err != nil {
 		if _, ok := err.(viper.ConfigFileNotFoundError); ok {

cli/pkg/admin_actions.go

@@ -135,7 +135,7 @@ func (c *ClICtrl) UpdateFreeStorage(ctx context.Context, params model.AdminActio
 		return err
 	}
 
-	fmt.Printf("Updating storage for user %s to %s (old %s) with new expirty %s (old %s) \n",
+	fmt.Printf("Updating storage for user %s to %s (old %s) with new expiry %s (old %s) \n",
 		params.UserEmail,
 		utils.ByteCountDecimalGIB(storageSize), utils.ByteCountDecimalGIB(userDetails.Subscription.Storage),
 		date.Format("2006-01-02"),

cli/pkg/sign_in.go

@@ -8,8 +8,8 @@ import (
 	eCrypto "github.com/ente-io/cli/internal/crypto"
 	"github.com/ente-io/cli/pkg/model"
 	"github.com/ente-io/cli/utils/browser"
+	"github.com/ente-io/cli/utils/constants"
 	"github.com/ente-io/cli/utils/encoding"
-	"github.com/spf13/viper"
 	"log"
 
 	"github.com/kong/go-srp"
@@ -145,7 +145,10 @@ func (c *ClICtrl) verifyPassKey(ctx context.Context, authResp *api.Authorization
 	if !authResp.IsPasskeyRequired() {
 		return authResp, nil
 	}
-	baseAccountUrl := viper.GetString("endpoint.accounts")
+	baseAccountUrl := constants.EnteAccountUrl
+	if authResp.AccountsUrl != "" {
+		baseAccountUrl = authResp.AccountsUrl
+	}
 	passkeyAuthUrl := fmt.Sprintf("%s/passkeys/verify?passkeySessionID=%s&redirect=ente-cli://passkey&clientPackage=%s", baseAccountUrl, authResp.PassKeySessionID, app.ClientPkg())
 	fmt.Printf("Open this url in browser to verify passkey: %s\n", passkeyAuthUrl)
 	err := browser.OpenURL(passkeyAuthUrl)
@@ -167,7 +170,7 @@ func (c *ClICtrl) verifyPassKey(ctx context.Context, authResp *api.Authorization
 }
 
 func (c *ClICtrl) validateEmail(ctx context.Context, email string) (*api.AuthorizationResponse, error) {
-	err := c.Client.SendEmailOTP(ctx, email)
+	err := c.Client.SendLoginOTP(ctx, email)
 	if err != nil {
 		return nil, err
 	}

desktop/.github/workflows/desktop-release.yml

@@ -22,6 +22,9 @@ on:
         tags:
             - "v[0-9]+.[0-9]+.[0-9]+"
 
+permissions:
+    contents: write
+
 jobs:
     release:
         runs-on: ${{ matrix.os }}
@@ -45,12 +48,11 @@ jobs:
                       "${{ startsWith(github.ref, 'refs/tags/v') &&
                       format('photosd-{0}', github.ref_name) || ( inputs.source
                       || 'main' ) }}"
-                  submodules: recursive
 
             - name: Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
 
             - name: Increase yarn timeout
               # `yarn install` times out sometimes on the Windows runner,
@@ -111,6 +113,11 @@ jobs:
                   APPLE_APP_SPECIFIC_PASSWORD:
                       ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
                   APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+                  # Windows Azure Trusted Signing related values
+                  # https://www.electron.build/code-signing-win#using-azure-trusted-signing-beta
+                  AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
+                  AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
+                  AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
                   # Default is "draft", but since our nightly builds update
                   # existing pre-releases, set this to "prerelease".
                   EP_PRE_RELEASE: true

desktop/.prettierrc.json

@@ -1,6 +1,7 @@
 {
     "tabWidth": 4,
     "proseWrap": "always",
+    "objectWrap": "collapse",
     "plugins": [
         "prettier-plugin-organize-imports",
         "prettier-plugin-packagejson"

desktop/CHANGELOG.md

@@ -1,11 +1,37 @@
 # CHANGELOG
 
-## v1.7.10 (Unreleased)
+## v1.7.15 (Unreleased)
+
+- .
+
+## v1.7.14
+
+- Increase file size limit to 10 GB.
+
+## v1.7.13
+
+- Generate streams for videos (beta)
+
+    > Streamable videos can be enabled in Preferences. For more details, see the
+    > [video streaming FAQ](https://help.ente.io/photos/faq/video-streaming).
+
+- Support Turkish translations.
+
+## v1.7.12
+
+- Improved video player with streaming support (for already processed videos).
+- Support Arabic translations.
+
+## v1.7.11
+
+- Improved file viewer.
+- Improved live photo experience.
+
+## v1.7.10
 
 - Speed up selection for large libraries.
 - Support Japanese translations.
 - Fix video thumbnail generation on drag and drop.
-- .
 
 ## v1.7.9
 

desktop/README.md

@@ -10,19 +10,21 @@ To know more about Ente, see [our main README](../README.md) or visit
 
 ## Building from source
 
-Fetch submodules
+Clone this repository and change to this directory
 
 ```sh
-git submodule update --init --recursive
+git clone https://github.com/ente-io/ente
+cd ente/desktop
 ```
 
-Install dependencies
+Install dependencies (requires Yarn v1):
 
 ```sh
 yarn install
 ```
 
-Run in development mode (supports hot reload for the renderer process)
+Now you can run in development mode (supports hot reload for the renderer
+process)
 
 ```sh
 yarn dev

desktop/docs/dependencies.md

@@ -3,6 +3,7 @@
 - [Electron](#electron)
 - [Dev dependencies](#dev)
 - [Functionality](#functionality)
+- [Pinned](#pinned)
 
 ## Electron
 
@@ -140,3 +141,13 @@ handles to avoid reopening them for every operation.
 
 [chokidar](https://github.com/paulmillr/chokidar) is used as a file system
 watcher for the watch folders functionality.
+
+## Pinned
+
+- `electron-builder` is pinned to 26.0.14 because of
+  https://github.com/electron-userland/electron-builder/issues/9161
+
+    To reproduce this locally, add `x64ArchFiles: "ffmpeg"` to
+    `electron-builder.yml`, then run `node_modules/.bin/electron-builder --mac`.
+
+- `electron-store` is pinned to 8.2.0 because subsequent versions are ESM only.

desktop/electron-builder.yml

@@ -14,6 +14,11 @@ win:
     target:
         - target: nsis
           arch: [x64, arm64]
+    azureSignOptions:
+        publisherName: ENTE TECHNOLOGIES, INC.
+        endpoint: https://eus.codesigning.azure.net/
+        certificateProfileName: EnteTrustCertProfile
+        codeSigningAccountName: EnteTechnologiesInc
 nsis:
     deleteAppDataOnUninstall: true
 linux:

desktop/eslint.config.mjs

@@ -27,23 +27,26 @@ export default ts.config(
             // Allow numbers to be used in template literals.
             "@typescript-eslint/restrict-template-expressions": [
                 "error",
-                {
-                    allowNumber: true,
-                },
+                { allowNumber: true },
             ],
             // Allow void expressions as the entire body of an arrow function.
             "@typescript-eslint/no-confusing-void-expression": [
                 "error",
-                {
-                    ignoreArrowShorthand: true,
-                },
+                { ignoreArrowShorthand: true },
             ],
             // Allow free standing ternary expressions.
             "@typescript-eslint/no-unused-expressions": [
                 "error",
-                {
-                    allowTernary: true,
-                },
+                { allowTernary: true },
+            ],
+            // Allow force unwrapping potentially optional values.
+            //
+            // See: [Note: non-null-assertions have better stack trace]
+            "@typescript-eslint/no-non-null-assertion": "off",
+            // Allow `while(true)` etc.
+            "@typescript-eslint/no-unnecessary-condition": [
+                "error",
+                { allowConstantLoopConditions: true },
             ],
         },
     },

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.10-beta",
+    "version": "1.7.15-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -8,11 +8,11 @@
     "main": "app/main.js",
     "scripts": {
         "build": "yarn build-renderer && yarn build-main",
-        "build:ci": "yarn build-renderer && tsc",
-        "build:quick": "yarn build-renderer && yarn build-main:quick",
         "build-main": "tsc && electron-builder",
         "build-main:quick": "tsc && electron-builder --dir --config.compression=store --config.mac.identity=null",
         "build-renderer": "cross-env-shell _ENTE_IS_DESKTOP=1 \"cd ../web && yarn install && yarn build:photos && cd ../desktop && shx rm -rf out && shx cp -r ../web/apps/photos/out out\"",
+        "build:ci": "yarn build-renderer && tsc",
+        "build:quick": "yarn build-renderer && yarn build-main:quick",
         "dev": "concurrently --kill-others --success first --names 'main,rndr' \"yarn dev-main\" \"yarn dev-renderer\"",
         "dev-main": "tsc && electron .",
         "dev-renderer": "cross-env-shell _ENTE_IS_DESKTOP=1 \"cd ../web && yarn install && yarn workspace photos next dev -p 3008\"",
@@ -21,43 +21,39 @@
         "lint-fix": "yarn prettier --write --log-level warn . && yarn eslint && yarn tsc",
         "prepare": "node scripts/vips.js"
     },
-    "resolutions": {
-        "jackspeak": "2.1.1"
-    },
     "dependencies": {
         "any-shell-escape": "^0.1.1",
         "auto-launch": "^5.0.6",
-        "chokidar": "^3.6.0",
+        "chokidar": "^4.0.3",
         "clip-bpe-js": "^0.0.6",
         "comlink": "^4.4.2",
         "compare-versions": "^6.1.1",
-        "electron-log": "^5.3.0",
+        "electron-log": "^5.4.1",
         "electron-store": "^8.2.0",
-        "electron-updater": "^6.4.0",
+        "electron-updater": "^6.6.5",
         "ffmpeg-static": "^5.2.0",
-        "lru-cache": "^11.0.2",
+        "lru-cache": "^11.1.0",
         "next-electron-server": "^1.0.0",
         "node-stream-zip": "^1.15.0",
-        "onnxruntime-node": "^1.20.1"
+        "onnxruntime-node": "1.22.0-rev",
+        "zod": "^3.25.67"
     },
     "devDependencies": {
-        "@eslint/js": "^9.19.0",
-        "@tsconfig/node20": "^20.1.4",
+        "@eslint/js": "^9.30.1",
+        "@tsconfig/node22": "^22.0.2",
         "@types/auto-launch": "^5.0.5",
-        "@types/eslint__js": "^8.42.3",
-        "@types/ffmpeg-static": "^3.0.3",
         "ajv": "^8.17.1",
-        "concurrently": "^9.1.2",
+        "concurrently": "^9.2.0",
         "cross-env": "^7.0.3",
-        "electron": "^34.1.1",
-        "electron-builder": "^26.0.0",
+        "electron": "^37.1.0",
+        "electron-builder": "26.0.14",
         "eslint": "^9",
-        "prettier": "3.4.2",
+        "prettier": "3.6.2",
         "prettier-plugin-organize-imports": "^4.1.0",
-        "prettier-plugin-packagejson": "^2.5.8",
-        "shx": "^0.3.4",
-        "typescript": "^5.7.2",
-        "typescript-eslint": "^8.23.0"
+        "prettier-plugin-packagejson": "^2.5.17",
+        "shx": "^0.4.0",
+        "typescript": "^5.8.3",
+        "typescript-eslint": "^8.35.1"
     },
     "packageManager": "yarn@1.22.22",
     "productName": "ente"

desktop/scripts/vips.js

@@ -24,7 +24,7 @@
  *
  * Note that `vips.js` would've already run once `beforeBuild.js` is run, but on
  * our CI we prepare builds for multiple architectures in one go, so we need to
- * unconditonally replace the binary with the relevant one for the current
+ * unconditionally replace the binary with the relevant one for the current
  * architecture being built (which might be different from the one we're running
  * on). `beforeBuild.js` runs for each architecture being built.
  *

desktop/src/main.ts

@@ -35,6 +35,7 @@ import log, { initLogging } from "./main/log";
 import { createApplicationMenu, createTrayContextMenu } from "./main/menu";
 import { setupAutoUpdater } from "./main/services/app-update";
 import autoLauncher from "./main/services/auto-launcher";
+import { shouldHideDockIcon } from "./main/services/store";
 import { createWatcher } from "./main/services/watch";
 import { userPreferences } from "./main/stores/user-preferences";
 import { migrateLegacyWatchStoreIfNeeded } from "./main/stores/watch";
@@ -247,12 +248,7 @@ const registerPrivilegedSchemes = () => {
                 corsEnabled: true,
             },
         },
-        {
-            scheme: "stream",
-            privileges: {
-                supportFetchAPI: true,
-            },
-        },
+        { scheme: "stream", privileges: { supportFetchAPI: true } },
     ]);
 };
 
@@ -390,8 +386,8 @@ const createMainWindow = () => {
     const wasAutoLaunched = autoLauncher.wasAutoLaunched();
     if (wasAutoLaunched) {
         // Don't automatically show the app's window if we were auto-launched.
-        // On macOS, also hide the dock icon on macOS.
-        if (process.platform == "darwin") app.dock.hide();
+        // On macOS, also hide the dock icon.
+        app.dock?.hide();
     } else {
         // Show our window otherwise, maximizing it if we're not asked to set it
         // to a specific size.
@@ -409,10 +405,11 @@ const createMainWindow = () => {
     // "The unresponsive event is fired when Chromium detects that your
     //  webContents is not responding to input messages for > 30 seconds."
     window.webContents.on("unresponsive", () => {
-        log.error(
-            "MainWindow's webContents are unresponsive, will restart the renderer process",
-        );
-        window.webContents.forcefullyCrashRenderer();
+        // There is a known case when this can happen: When the user to select a
+        // folder to upload (Upload > Folder), the browser callback to us takes
+        // some time. When trying to upload very large folders on slower Windows
+        // machines, this can take up to 30 seconds.
+        log.warn("MainWindow's webContents are unresponsive");
     });
 
     window.on("close", (event) => {
@@ -425,14 +422,18 @@ const createMainWindow = () => {
 
     window.on("hide", () => {
         // On macOS, when hiding the window also hide the app's icon in the dock
-        // if the user has selected the Settings > Hide dock icon checkbox.
-        if (process.platform == "darwin" && userPreferences.get("hideDockIcon"))
-            app.dock.hide();
+        // unless the user has unchecked the Settings > Hide dock icon checkbox.
+        if (shouldHideDockIcon()) {
+            // macOS emits a window "hide" event when going fullscreen, and if
+            // we hide the dock icon there then the window disappears. So ignore
+            // this scenario.
+            if (!window.isFullScreen()) {
+                app.dock?.hide();
+            }
+        }
     });
 
-    window.on("show", () => {
-        if (process.platform == "darwin") void app.dock.show();
-    });
+    window.on("show", () => void app.dock?.show());
 
     // Let ipcRenderer know when mainWindow is in the foreground so that it can
     // in turn inform the renderer process.
@@ -613,7 +614,7 @@ const handleBackOnStripeCheckout = (window: BrowserWindow) =>
  *
  * But this is an issue for uploads in the self hosted apps (or when we
  * ourselves are trying to test things by with an arbitrary S3 bucket without
- * going via a worker). During upload, theer is no redirection, so the request
+ * going via a worker). During upload, there is no redirection, so the request
  * ACAO is "ente://app" but the response ACAO is `null` which don't match,
  * causing the request to fail.
  *

desktop/src/main/ipc.ts

@@ -13,8 +13,10 @@ import type { BrowserWindow } from "electron";
 import { ipcMain } from "electron/main";
 import type {
     CollectionMapping,
+    FFmpegCommand,
     FolderWatch,
     PendingUploads,
+    UtilityProcessType,
     ZipItem,
 } from "../types/ipc";
 import { logToDisk } from "./log";
@@ -30,7 +32,7 @@ import {
     openLogDirectory,
     selectDirectory,
 } from "./services/dir";
-import { ffmpegExec } from "./services/ffmpeg";
+import { ffmpegDetermineVideoDuration, ffmpegExec } from "./services/ffmpeg";
 import {
     fsExists,
     fsFindFiles,
@@ -40,22 +42,23 @@ import {
     fsRename,
     fsRm,
     fsRmdir,
+    fsStatMtime,
     fsWriteFile,
+    fsWriteFileViaBackup,
 } from "./services/fs";
 import { convertToJPEG, generateImageThumbnail } from "./services/image";
 import { logout } from "./services/logout";
-import { createMLWorker } from "./services/ml";
 import {
     lastShownChangelogVersion,
-    masterKeyB64,
-    saveMasterKeyB64,
+    masterKeyFromSafeStorage,
+    saveMasterKeyInSafeStorage,
     setLastShownChangelogVersion,
 } from "./services/store";
 import {
     clearPendingUploads,
     listZipItems,
-    markUploadedFiles,
-    markUploadedZipItems,
+    markUploadedFile,
+    markUploadedZipItem,
     pathOrZipItemSize,
     pendingUploads,
     setPendingUploads,
@@ -67,6 +70,7 @@ import {
     watchUpdateIgnoredFiles,
     watchUpdateSyncedFiles,
 } from "./services/watch";
+import { triggerCreateUtilityProcess } from "./services/workers";
 
 /**
  * Listen for IPC events sent/invoked by the renderer process, and route them to
@@ -104,10 +108,12 @@ export const attachIPCHandlers = () => {
 
     ipcMain.handle("selectDirectory", () => selectDirectory());
 
-    ipcMain.handle("masterKeyB64", () => masterKeyB64());
+    ipcMain.handle("masterKeyFromSafeStorage", () =>
+        masterKeyFromSafeStorage(),
+    );
 
-    ipcMain.handle("saveMasterKeyB64", (_, masterKeyB64: string) =>
-        saveMasterKeyB64(masterKeyB64),
+    ipcMain.handle("saveMasterKeyInSafeStorage", (_, masterKey: string) =>
+        saveMasterKeyInSafeStorage(masterKey),
     );
 
     ipcMain.handle("lastShownChangelogVersion", () =>
@@ -154,8 +160,16 @@ export const attachIPCHandlers = () => {
         fsWriteFile(path, contents),
     );
 
+    ipcMain.handle(
+        "fsWriteFileViaBackup",
+        (_, path: string, contents: string) =>
+            fsWriteFileViaBackup(path, contents),
+    );
+
     ipcMain.handle("fsIsDir", (_, dirPath: string) => fsIsDir(dirPath));
 
+    ipcMain.handle("fsStatMtime", (_, path: string) => fsStatMtime(path));
+
     ipcMain.handle("fsFindFiles", (_, folderPath: string) =>
         fsFindFiles(folderPath),
     );
@@ -170,20 +184,26 @@ export const attachIPCHandlers = () => {
         "generateImageThumbnail",
         (
             _,
-            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+            pathOrZipItem: string | ZipItem,
             maxDimension: number,
             maxSize: number,
-        ) => generateImageThumbnail(dataOrPathOrZipItem, maxDimension, maxSize),
+        ) => generateImageThumbnail(pathOrZipItem, maxDimension, maxSize),
     );
 
     ipcMain.handle(
         "ffmpegExec",
         (
             _,
-            command: string[],
-            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+            command: FFmpegCommand,
+            pathOrZipItem: string | ZipItem,
             outputFileExtension: string,
-        ) => ffmpegExec(command, dataOrPathOrZipItem, outputFileExtension),
+        ) => ffmpegExec(command, pathOrZipItem, outputFileExtension),
+    );
+
+    ipcMain.handle(
+        "ffmpegDetermineVideoDuration",
+        (_, pathOrZipItem: string | ZipItem) =>
+            ffmpegDetermineVideoDuration(pathOrZipItem),
     );
 
     // - Upload
@@ -203,13 +223,15 @@ export const attachIPCHandlers = () => {
     );
 
     ipcMain.handle(
-        "markUploadedFiles",
-        (_, paths: PendingUploads["filePaths"]) => markUploadedFiles(paths),
+        "markUploadedFile",
+        (_, path: string, associatedPath: string | undefined) =>
+            markUploadedFile(path, associatedPath),
     );
 
     ipcMain.handle(
-        "markUploadedZipItems",
-        (_, items: PendingUploads["zipItems"]) => markUploadedZipItems(items),
+        "markUploadedZipItem",
+        (_, item: ZipItem, associatedItem: ZipItem | undefined) =>
+            markUploadedZipItem(item, associatedItem),
     );
 
     ipcMain.handle("clearPendingUploads", () => clearPendingUploads());
@@ -220,9 +242,11 @@ export const attachIPCHandlers = () => {
  * the main window to do their thing.
  */
 export const attachMainWindowIPCHandlers = (mainWindow: BrowserWindow) => {
-    // - ML
+    // - Utility processes
 
-    ipcMain.on("createMLWorker", () => createMLWorker(mainWindow));
+    ipcMain.on("triggerCreateUtilityProcess", (_, type: UtilityProcessType) =>
+        triggerCreateUtilityProcess(type, mainWindow),
+    );
 };
 
 /**

desktop/src/main/log-worker.ts

@@ -0,0 +1,59 @@
+/**
+ * A object that behaves similar to the default export of "./log", except this
+ * can be used from within a utility process.
+ *
+ * ---
+ *
+ * We cannot directly do
+ *
+ *     import log from "../log";
+ *
+ * because that requires the Electron APIs that are not available to a utility
+ * process (See: [Note: Using Electron APIs in UtilityProcess]).
+ *
+ * But even if that were to work, logging will still be problematic since we'd
+ * try opening the log file from two different Node.js processes (this one, and
+ * the main one), and I didn't find any indication in the electron-log
+ * repository that the log file's integrity would be maintained in such cases.
+ *
+ * So instead we provide this proxy log object that uses the
+ * `process.parentPort` to transport the logs over to the main process, where
+ * the {@link processUtilityProcessLogMessage} function in the main process is
+ * expected to handle these (sending them to the actual log).
+ */
+export default {
+    error: (s: string, e?: unknown) =>
+        mainProcess("log.errorString", messageWithError(s, e)),
+    warn: (s: string, e?: unknown) =>
+        mainProcess("log.warnString", messageWithError(s, e)),
+    info: (...ms: unknown[]) => mainProcess("log.info", ms),
+    /**
+     * Unlike the real {@link log.debug}, this is (a) eagerly evaluated, and (b)
+     * accepts only strings.
+     */
+    debugString: (s: string) => mainProcess("log.debugString", s),
+};
+
+/**
+ * Send a message to the main process using a barebones RPC protocol.
+ */
+const mainProcess = (method: string, param: unknown) =>
+    process.parentPort.postMessage({ method, p: param });
+
+// Duplicated verbatim from ./log.ts
+const messageWithError = (message: string, e?: unknown) => {
+    if (!e) return message;
+
+    let es: string;
+    if (e instanceof Error) {
+        // In practice, we expect ourselves to be called with Error objects, so
+        // this is the happy path so to say.
+        es = [`${e.name}: ${e.message}`, e.stack].filter((x) => x).join("\n");
+    } else {
+        // For the rest rare cases, use the default string serialization of e.
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
+        es = String(e);
+    }
+
+    return `${message}: ${es}`;
+};

desktop/src/main/log.ts

@@ -83,6 +83,56 @@ const logDebug = (param: () => unknown) => {
     }
 };
 
+/**
+ * Handle log messages posted from the utility process in the main process.
+ *
+ * See: [Note: Using Electron APIs in UtilityProcess]
+ *
+ * @param message The arbitrary message that was received as an argument to the
+ * "message" event invoked on a {@link UtilityProcess}.
+ *
+ * @returns true if the message was recognized and handled, and false otherwise.
+ */
+export const processUtilityProcessLogMessage = (
+    logTag: string,
+    message: unknown,
+) => {
+    const m = message; /* shorter alias */
+    if (m && typeof m == "object" && "method" in m && "p" in m) {
+        const p = m.p;
+        switch (m.method) {
+            case "log.errorString":
+                if (typeof p == "string") {
+                    logError(`${logTag} ${p}`);
+                    return true;
+                }
+                break;
+            case "log.warnString":
+                if (typeof p == "string") {
+                    logWarn(`${logTag} ${p}`);
+                    return true;
+                }
+                break;
+            case "log.info":
+                if (Array.isArray(p)) {
+                    // Need to cast from any[] to unknown[]
+                    logInfo(logTag, ...(p as unknown[]));
+                    return true;
+                }
+                break;
+            case "log.debugString":
+                if (typeof p == "string") {
+                    logDebug(() => `${logTag} ${p}`);
+                    return true;
+                }
+                break;
+            default:
+                break;
+        }
+    }
+    return false;
+};
+
 /**
  * Ente's logger.
  *

desktop/src/main/menu.ts

@@ -7,7 +7,7 @@ import {
 } from "electron";
 import { allowWindowClose } from "../main";
 import { forceCheckForAppUpdates } from "./services/app-update";
-import { userPreferences } from "./stores/user-preferences";
+import { setShouldHideDockIcon, shouldHideDockIcon } from "./services/store";
 
 /** Create and return the entries in the app's main menu bar */
 export const createApplicationMenu = (mainWindow: BrowserWindow) => {
@@ -15,7 +15,7 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
     //
     // Whenever the menu is redrawn the current value of these variables is used
     // to set the checked state for the various settings checkboxes.
-    let shouldHideDockIcon = !!userPreferences.get("hideDockIcon");
+    let hideDockIcon = shouldHideDockIcon();
 
     const macOSOnly = (options: MenuItemConstructorOptions[]) =>
         process.platform == "darwin" ? options : [];
@@ -24,9 +24,9 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
 
     const toggleHideDockIcon = () => {
         // Persist
-        userPreferences.set("hideDockIcon", !shouldHideDockIcon);
+        setShouldHideDockIcon(!hideDockIcon);
         // And update the in-memory state
-        shouldHideDockIcon = !shouldHideDockIcon;
+        hideDockIcon = !hideDockIcon;
     };
 
     const handleHelp = () =>
@@ -36,17 +36,9 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
         {
             label: "Ente Photos",
             submenu: [
-                ...macOSOnly([
-                    {
-                        label: "About Ente",
-                        role: "about",
-                    },
-                ]),
+                ...macOSOnly([{ label: "About Ente", role: "about" }]),
                 { type: "separator" },
-                {
-                    label: "Check for Updates...",
-                    click: handleCheckForUpdates,
-                },
+                { label: "Check for Updates...", click: handleCheckForUpdates },
                 { type: "separator" },
 
                 ...macOSOnly([
@@ -56,7 +48,7 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
                             {
                                 label: "Hide Dock Icon",
                                 type: "checkbox",
-                                checked: shouldHideDockIcon,
+                                checked: hideDockIcon,
                                 click: toggleHideDockIcon,
                             },
                         ],
@@ -65,20 +57,11 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
 
                 { type: "separator" },
                 ...macOSOnly([
-                    {
-                        label: "Hide Ente",
-                        role: "hide",
-                    },
-                    {
-                        label: "Hide Others",
-                        role: "hideOthers",
-                    },
+                    { label: "Hide Ente", role: "hide" },
+                    { label: "Hide Others", role: "hideOthers" },
                     { type: "separator" },
                 ]),
-                {
-                    label: "Quit",
-                    role: "quit",
-                },
+                { label: "Quit", role: "quit" },
             ],
         },
         {
@@ -96,14 +79,8 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
                     {
                         label: "Speech",
                         submenu: [
-                            {
-                                role: "startSpeaking",
-                                label: "Start Speaking",
-                            },
-                            {
-                                role: "stopSpeaking",
-                                label: "Stop Speaking",
-                            },
+                            { role: "startSpeaking", label: "Start Speaking" },
+                            { role: "stopSpeaking", label: "Stop Speaking" },
                         ],
                     },
                 ]),
@@ -132,15 +109,7 @@ export const createApplicationMenu = (mainWindow: BrowserWindow) => {
                 ]),
             ],
         },
-        {
-            label: "Help",
-            submenu: [
-                {
-                    label: "Ente Help",
-                    click: handleHelp,
-                },
-            ],
-        },
+        { label: "Help", submenu: [{ label: "Ente Help", click: handleHelp }] },
     ]);
 };
 
@@ -159,13 +128,7 @@ export const createTrayContextMenu = (mainWindow: BrowserWindow) => {
     };
 
     return Menu.buildFromTemplate([
-        {
-            label: "Open Ente",
-            click: handleOpen,
-        },
-        {
-            label: "Quit Ente",
-            click: handleClose,
-        },
+        { label: "Open Ente", click: handleOpen },
+        { label: "Quit Ente", click: handleClose },
     ]);
 };

desktop/src/main/services/auto-launcher.ts

@@ -10,10 +10,7 @@ class AutoLauncher {
 
     constructor() {
         if (process.platform != "darwin") {
-            this.autoLaunch = new AutoLaunch({
-                name: "ente",
-                isHidden: true,
-            });
+            this.autoLaunch = new AutoLaunch({ name: "ente", isHidden: true });
         }
     }
 

desktop/src/main/services/ffmpeg.ts

@@ -1,132 +1,77 @@
-import pathToFfmpeg from "ffmpeg-static";
+/**
+ * @file A bridge to the ffmpeg utility process. This code runs in the main
+ * process.
+ */
+
+import { wrap } from "comlink";
 import fs from "node:fs/promises";
-import type { ZipItem } from "../../types/ipc";
-import { ensure } from "../utils/common";
-import { execAsync } from "../utils/electron";
+import type { FFmpegCommand, ZipItem } from "../../types/ipc";
 import {
     deleteTempFileIgnoringErrors,
-    makeFileForDataOrPathOrZipItem,
+    makeFileForStreamOrPathOrZipItem,
     makeTempFilePath,
 } from "../utils/temp";
-
-/* Ditto in the web app's code (used by the Wasm FFmpeg invocation). */
-const ffmpegPathPlaceholder = "FFMPEG";
-const inputPathPlaceholder = "INPUT";
-const outputPathPlaceholder = "OUTPUT";
+import type { FFmpegUtilityProcess } from "./ffmpeg-worker";
+import { ffmpegUtilityProcessEndpoint } from "./workers";
 
 /**
- * Run a FFmpeg command
- *
- * [Note: FFmpeg in Electron]
- *
- * There is a Wasm build of FFmpeg, but that is currently 10-20 times slower
- * that the native build. That is slow enough to be unusable for our purposes.
- * https://ffmpegwasm.netlify.app/docs/performance
- *
- * So the alternative is to bundle a FFmpeg executable binary with our app. e.g.
- *
- *     yarn add fluent-ffmpeg ffmpeg-static ffprobe-static
- *
- * (we only use ffmpeg-static, the rest are mentioned for completeness' sake).
- *
- * Interestingly, Electron already bundles an binary FFmpeg library (it comes
- * from the ffmpeg fork maintained by Chromium).
- * https://chromium.googlesource.com/chromium/third_party/ffmpeg
- * https://stackoverflow.com/questions/53963672/what-version-of-ffmpeg-is-bundled-inside-electron
- *
- * This can be found in (e.g. on macOS) at
- *
- *     $ file ente.app/Contents/Frameworks/Electron\ Framework.framework/Versions/Current/Libraries/libffmpeg.dylib
- *     .../libffmpeg.dylib: Mach-O 64-bit dynamically linked shared library arm64
- *
- * But I'm not sure if our code is supposed to be able to use it, and how.
+ * Return a handle to the ffmpeg utility process, starting it if needed.
+ */
+export const ffmpegUtilityProcess = () =>
+    ffmpegUtilityProcessEndpoint().then((port) =>
+        wrap<FFmpegUtilityProcess>(port),
+    );
+
+/**
+ * Implement the IPC "ffmpegExec" contract, writing the input and output to
+ * temporary files as needed, and then forward to the {@link ffmpegExec} running
+ * in the utility process.
  */
 export const ffmpegExec = async (
-    command: string[],
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    command: FFmpegCommand,
+    pathOrZipItem: string | ZipItem,
     outputFileExtension: string,
-): Promise<Uint8Array> => {
+): Promise<Uint8Array> =>
+    withInputFile(pathOrZipItem, async (worker, inputFilePath) => {
+        const outputFilePath = await makeTempFilePath(outputFileExtension);
+        try {
+            await worker.ffmpegExec(command, inputFilePath, outputFilePath);
+            return await fs.readFile(outputFilePath);
+        } finally {
+            await deleteTempFileIgnoringErrors(outputFilePath);
+        }
+    });
+
+export const withInputFile = async <T>(
+    pathOrZipItem: string | ZipItem,
+    f: (worker: FFmpegUtilityProcess, inputFilePath: string) => Promise<T>,
+): Promise<T> => {
+    const worker = await ffmpegUtilityProcess();
+
     const {
         path: inputFilePath,
         isFileTemporary: isInputFileTemporary,
         writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForDataOrPathOrZipItem(dataOrPathOrZipItem);
+    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);
 
-    const outputFilePath = await makeTempFilePath(outputFileExtension);
     try {
         await writeToTemporaryInputFile();
 
-        const cmd = substitutePlaceholders(
-            command,
-            inputFilePath,
-            outputFilePath,
-        );
-
-        await execAsync(cmd);
-
-        return await fs.readFile(outputFilePath);
+        return await f(worker, inputFilePath);
     } finally {
         if (isInputFileTemporary)
             await deleteTempFileIgnoringErrors(inputFilePath);
-        await deleteTempFileIgnoringErrors(outputFilePath);
     }
 };
 
-const substitutePlaceholders = (
-    command: string[],
-    inputFilePath: string,
-    outputFilePath: string,
-) =>
-    command.map((segment) => {
-        if (segment == ffmpegPathPlaceholder) {
-            return ffmpegBinaryPath();
-        } else if (segment == inputPathPlaceholder) {
-            return inputFilePath;
-        } else if (segment == outputPathPlaceholder) {
-            return outputFilePath;
-        } else {
-            return segment;
-        }
-    });
-
 /**
- * Return the path to the `ffmpeg` binary.
- *
- * At runtime, the FFmpeg binary is present in a path like (macOS example):
- * `ente.app/Contents/Resources/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg`
+ * Implement the IPC "ffmpegDetermineVideoDuration" contract, writing the input
+ * to temporary files as needed, and then forward to the
+ * {@link ffmpegDetermineVideoDuration} running in the utility process.
  */
-const ffmpegBinaryPath = () => {
-    // This substitution of app.asar by app.asar.unpacked is suggested by the
-    // ffmpeg-static library author themselves:
-    // https://github.com/eugeneware/ffmpeg-static/issues/16
-    return ensure(pathToFfmpeg).replace("app.asar", "app.asar.unpacked");
-};
-
-/**
- * A variant of {@link ffmpegExec} adapted to work with streams so that it can
- * handle the MP4 conversion of large video files.
- *
- * See: [Note: Convert to MP4]
-
- * @param inputFilePath The path to a file on the user's local file system. This
- * is the video we want to convert.
- * @param inputFilePath The path to a file on the user's local file system where
- * we should write the converted MP4 video.
- */
-export const ffmpegConvertToMP4 = async (
-    inputFilePath: string,
-    outputFilePath: string,
-): Promise<void> => {
-    const command = [
-        ffmpegPathPlaceholder,
-        "-i",
-        inputPathPlaceholder,
-        "-preset",
-        "ultrafast",
-        outputPathPlaceholder,
-    ];
-
-    const cmd = substitutePlaceholders(command, inputFilePath, outputFilePath);
-
-    await execAsync(cmd);
-};
+export const ffmpegDetermineVideoDuration = async (
+    pathOrZipItem: string | ZipItem,
+): Promise<number> =>
+    withInputFile(pathOrZipItem, async (worker, inputFilePath) =>
+        worker.ffmpegDetermineVideoDuration(inputFilePath),
+    );

desktop/src/main/services/fs.ts

@@ -24,12 +24,29 @@ export const fsReadTextFile = async (filePath: string) =>
 export const fsWriteFile = (path: string, contents: string) =>
     fs.writeFile(path, contents, { flush: true });
 
+export const fsWriteFileViaBackup = async (path: string, contents: string) => {
+    const backupPath = path + ".backup";
+    await fs.writeFile(backupPath, contents, { flush: true });
+    return fs.rename(backupPath, path);
+};
+
 export const fsIsDir = async (dirPath: string) => {
     if (!existsSync(dirPath)) return false;
     const stat = await fs.stat(dirPath);
     return stat.isDirectory();
 };
 
+export const fsStatMtime = (path: string) =>
+    // [Note: Integral last modified time]
+    //
+    // Whenever we need to find the modified time of a file, use the
+    // `mtime.getTime()` instead of `mtimeMs` of the stat; this way, it is
+    // guaranteed that the times are integral (we persist these values to remote
+    // in some cases, and the contract is for them to be integral; mtimeMs is a
+    // float with sub-millisecond precision), and that all places use the same
+    // value so that they're comparable.
+    fs.stat(path).then((st) => st.mtime.getTime());
+
 export const fsFindFiles = async (dirPath: string) => {
     const items = await fs.readdir(dirPath, { withFileTypes: true });
     let paths: string[] = [];

desktop/src/main/services/image.ts

@@ -6,7 +6,7 @@ import { type ZipItem } from "../../types/ipc";
 import { execAsync, isDev } from "../utils/electron";
 import {
     deleteTempFileIgnoringErrors,
-    makeFileForDataOrPathOrZipItem,
+    makeFileForStreamOrPathOrZipItem,
     makeTempFilePath,
 } from "../utils/temp";
 
@@ -61,7 +61,7 @@ const vipsPath = () =>
     );
 
 export const generateImageThumbnail = async (
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
     maxDimension: number,
     maxSize: number,
 ): Promise<Uint8Array> => {
@@ -69,7 +69,7 @@ export const generateImageThumbnail = async (
         path: inputFilePath,
         isFileTemporary: isInputFileTemporary,
         writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForDataOrPathOrZipItem(dataOrPathOrZipItem);
+    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);
 
     const outputFilePath = await makeTempFilePath("jpeg");
 

desktop/src/main/services/logout.ts

@@ -1,8 +1,9 @@
 import type { FSWatcher } from "chokidar";
 import log from "../log";
-import { clearConvertToMP4Results } from "../stream";
+import { clearPendingVideoResults } from "../stream";
 import { clearStores } from "./store";
 import { watchReset } from "./watch";
+import { terminateUtilityProcesses } from "./workers";
 import { clearOpenZipCache } from "./zip";
 
 /**
@@ -22,9 +23,9 @@ export const logout = (watcher: FSWatcher) => {
         ignoreError("FS watch", e);
     }
     try {
-        clearConvertToMP4Results();
+        clearPendingVideoResults();
     } catch (e) {
-        ignoreError("convert-to-mp4", e);
+        ignoreError("video", e);
     }
     try {
         clearStores();
@@ -36,4 +37,9 @@ export const logout = (watcher: FSWatcher) => {
     } catch (e) {
         ignoreError("zip cache", e);
     }
+    try {
+        terminateUtilityProcesses();
+    } catch (e) {
+        ignoreError("utility processes", e);
+    }
 };

desktop/src/main/services/ml-worker.ts

@@ -15,46 +15,16 @@ import { existsSync } from "fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import * as ort from "onnxruntime-node";
+import { z } from "zod/v4";
+import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
-import { ensure, wait } from "../utils/common";
+import { wait } from "../utils/common";
 import { writeStream } from "../utils/stream";
+import { fsStatMtime } from "./fs";
 
-/**
- * We cannot do
- *
- *     import log from "../log";
- *
- * because that requires the Electron APIs that are not available to a utility
- * process (See: [Note: Using Electron APIs in UtilityProcess]). But even if
- * that were to work, logging will still be problematic since we'd try opening
- * the log file from two different Node.js processes (this one, and the main
- * one), and I didn't find any indication in the electron-log repository that
- * the log file's integrity would be maintained in such cases.
- *
- * So instead we create this proxy log object that uses `process.parentPort` to
- * transport the logs over to the main process.
- */
-const log = {
-    /**
-     * Unlike the real {@link log.error}, this accepts only the first string
-     * argument, not the second optional error one.
-     */
-    errorString: (s: string) => mainProcess("log.errorString", s),
-    info: (...ms: unknown[]) => mainProcess("log.info", ms),
-    /**
-     * Unlike the real {@link log.debug}, this is (a) eagerly evaluated, and (b)
-     * accepts only strings.
-     */
-    debugString: (s: string) => mainProcess("log.debugString", s),
-};
+log.debugString("Started ML utility process");
 
-/**
- * Send a message to the main process using a barebones RPC protocol.
- */
-const mainProcess = (method: string, param: unknown) =>
-    process.parentPort.postMessage({ method, p: param });
-
-log.debugString(`Started ML worker process`);
+process.on("uncaughtException", (e, origin) => log.error(origin, e));
 
 process.parentPort.once("message", (e) => {
     // Initialize ourselves with the data we got from our parent.
@@ -63,12 +33,13 @@ process.parentPort.once("message", (e) => {
     // parent.
     expose(
         {
+            fsStatMtime,
             computeCLIPImageEmbedding,
             computeCLIPTextEmbeddingIfAvailable,
             detectFaces,
             computeFaceEmbeddings,
         },
-        messagePortMainEndpoint(ensure(e.ports[0])),
+        messagePortMainEndpoint(e.ports[0]!),
     );
 });
 
@@ -80,19 +51,12 @@ process.parentPort.once("message", (e) => {
 let _userDataPath: string | undefined;
 
 /** Equivalent to app.getPath("userData") */
-const userDataPath = () => ensure(_userDataPath);
+const userDataPath = () => _userDataPath!;
+
+const MLWorkerInitData = z.object({ userDataPath: z.string() });
 
 const parseInitData = (data: unknown) => {
-    if (
-        data &&
-        typeof data == "object" &&
-        "userDataPath" in data &&
-        typeof data.userDataPath == "string"
-    ) {
-        _userDataPath = data.userDataPath;
-    } else {
-        log.errorString("Unparseable initialization data");
-    }
+    _userDataPath = MLWorkerInitData.parse(data).userDataPath;
 };
 
 /**
@@ -131,10 +95,8 @@ const makeCachedInferenceSession = (
     const createSession = (modelPath: string) =>
         createInferenceSession(modelPath);
 
-    const cachedInferenceSession = () => {
-        if (!session) session = download().then(createSession);
-        return session;
-    };
+    const cachedInferenceSession = () =>
+        (session ??= download().then(createSession));
 
     return cachedInferenceSession;
 };
@@ -161,7 +123,7 @@ const modelPathDownloadingIfNeeded = async (
     } else {
         const size = (await fs.stat(modelPath)).size;
         if (size !== expectedByteSize) {
-            log.errorString(
+            log.error(
                 `The size ${size} of model ${modelName} does not match the expected size, downloading again`,
             );
             await downloadModel(modelPath, modelName);
@@ -222,14 +184,13 @@ const downloadModel = async (saveLocation: string, name: string) => {
 /**
  * Create an ONNX {@link InferenceSession} with some defaults.
  */
-const createInferenceSession = async (modelPath: string) => {
-    return await ort.InferenceSession.create(modelPath, {
+const createInferenceSession = (modelPath: string) =>
+    ort.InferenceSession.create(modelPath, {
         // Restrict the number of threads to 1.
         intraOpNumThreads: 1,
         // Be more conservative with RAM usage.
         enableCpuMemArena: false,
     });
-};
 
 const cachedCLIPImageSession = makeCachedInferenceSession(
     "mobileclip_s2_image_opset18_rgba_opt.onnx",
@@ -247,14 +208,12 @@ export const computeCLIPImageEmbedding = async (
 ) => {
     const session = await cachedCLIPImageSession();
     const inputArray = new Uint8Array(input.buffer);
-    const feeds = {
-        input: new ort.Tensor("uint8", inputArray, inputShape),
-    };
+    const feeds = { input: new ort.Tensor("uint8", inputArray, inputShape) };
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/CLIP image embedding took ${Date.now() - t} ms`);
     /* Need these model specific casts to type the result */
-    return ensure(results.output).data as Float32Array;
+    return results.output!.data as Float32Array;
 };
 
 const cachedCLIPTextSession = makeCachedInferenceSession(
@@ -263,10 +222,7 @@ const cachedCLIPTextSession = makeCachedInferenceSession(
 );
 
 let _tokenizer: Tokenizer | undefined;
-const getTokenizer = () => {
-    if (!_tokenizer) _tokenizer = new Tokenizer();
-    return _tokenizer;
-};
+const getTokenizer = () => (_tokenizer ??= new Tokenizer());
 
 /**
  * Compute CLIP embeddings for an text snippet.
@@ -276,9 +232,11 @@ const getTokenizer = () => {
 export const computeCLIPTextEmbeddingIfAvailable = async (text: string) => {
     const sessionOrSkip = await Promise.race([
         cachedCLIPTextSession(),
-        // Wait for a tick to get the session promise to resolved the first time
-        // this code runs on each app start (and the model has been downloaded).
-        wait(0).then(() => 1),
+        // Wait a bit to get the session promise to resolved the first time this
+        // code runs on each app start (in these cases the model will already be
+        // downloaded, so session creation should take only a 1 or 2 ticks: file
+        // system stat, and ort.InferenceSession.create).
+        wait(50).then(() => 1),
     ]);
 
     // Don't wait for the download to complete.
@@ -292,14 +250,12 @@ export const computeCLIPTextEmbeddingIfAvailable = async (text: string) => {
     const session = sessionOrSkip;
     const tokenizer = getTokenizer();
     const tokenizedText = Int32Array.from(tokenizer.encodeForCLIP(text));
-    const feeds = {
-        input: new ort.Tensor("int32", tokenizedText, [1, 77]),
-    };
+    const feeds = { input: new ort.Tensor("int32", tokenizedText, [1, 77]) };
 
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/CLIP text embedding took ${Date.now() - t} ms`);
-    return ensure(results.output).data as Float32Array;
+    return results.output!.data as Float32Array;
 };
 
 const cachedFaceDetectionSession = makeCachedInferenceSession(
@@ -316,13 +272,11 @@ export const detectFaces = async (
 ) => {
     const session = await cachedFaceDetectionSession();
     const inputArray = new Uint8Array(input.buffer);
-    const feeds = {
-        input: new ort.Tensor("uint8", inputArray, inputShape),
-    };
+    const feeds = { input: new ort.Tensor("uint8", inputArray, inputShape) };
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/YOLO face detection took ${Date.now() - t} ms`);
-    return ensure(results.output).data;
+    return results.output!.data;
 };
 
 const cachedFaceEmbeddingSession = makeCachedInferenceSession(

desktop/src/main/services/ml.ts

@@ -1,147 +0,0 @@
-/**
- * @file ML related functionality. This code runs in the main process.
- */
-
-import {
-    MessageChannelMain,
-    type BrowserWindow,
-    type UtilityProcess,
-} from "electron";
-import { app, utilityProcess } from "electron/main";
-import path from "node:path";
-import log from "../log";
-
-/** The active ML worker (utility) process, if any. */
-let _child: UtilityProcess | undefined;
-
-/**
- * Create a new ML worker process, terminating the older ones (if any).
- *
- * [Note: ML IPC]
- *
- * The primary reason for doing ML tasks in the Node.js layer is so that we can
- * use the binary ONNX runtime, which is 10-20x faster than the Wasm one that
- * can be used directly on the web layer.
- *
- * For this to work, the main and renderer process need to communicate with each
- * other. Further, in the web layer the ML indexing runs in a web worker (so as
- * to not get in the way of the main thread). So the communication has 2 hops:
- *
- *     Node.js main <-> Renderer main <-> Renderer web worker
- *
- * This naive way works, but has a problem. The Node.js main process is in the
- * code path for delivering user events to the renderer process. The ML tasks we
- * do take in the order of 100-300 ms (possibly more) for each individual
- * inference. Thus, the Node.js main process is busy for those 100-300 ms, and
- * does not forward events to the renderer, causing the UI to jitter.
- *
- * The solution for this is to spawn an Electron UtilityProcess, which we can
- * think of a regular Node.js child process.  This frees up the Node.js main
- * process, and would remove the jitter.
- * https://www.electronjs.org/docs/latest/tutorial/process-model
- *
- * It would seem that this introduces another hop in our IPC
- *
- *     Node.js utility process <-> Node.js main <-> ...
- *
- * but here we can use the special bit about Electron utility processes that
- * separates them from regular Node.js child processes: their support for
- * message ports. https://www.electronjs.org/docs/latest/tutorial/message-ports
- *
- * As a brief summary, a MessagePort is a web feature that allows two contexts
- * to communicate. A pair of message ports is called a message channel. The cool
- * thing about these is that we can pass these ports themselves over IPC.
- *
- * > One caveat here is that the message ports can only be passed using the
- * > `postMessage` APIs, not the usual send/invoke APIs.
- *
- * So we
- *
- * 1. In the utility process create a message channel.
- * 2. Spawn a utility process, and send one port of the pair to it.
- * 3. Send the other port of the pair to the renderer.
- *
- * The renderer will forward that port to the web worker that is coordinating
- * the ML indexing on the web layer. Thereafter, the utility process and web
- * worker can directly talk to each other!
- *
- *     Node.js utility process <-> Renderer web worker
- *
- * The RPC protocol is handled using comlink on both ends. The port itself needs
- * to be relayed using `postMessage`.
- */
-export const createMLWorker = (window: BrowserWindow) => {
-    if (_child) {
-        log.debug(() => "Terminating previous ML worker process");
-        _child.kill();
-        _child = undefined;
-    }
-
-    const { port1, port2 } = new MessageChannelMain();
-
-    const child = utilityProcess.fork(path.join(__dirname, "ml-worker.js"));
-    const userDataPath = app.getPath("userData");
-    child.postMessage({ userDataPath }, [port1]);
-
-    window.webContents.postMessage("createMLWorker/port", undefined, [port2]);
-
-    handleMessagesFromUtilityProcess(child);
-
-    _child = child;
-};
-
-/**
- * Handle messages posted from the utility process.
- *
- * [Note: Using Electron APIs in UtilityProcess]
- *
- * Only a small subset of the Electron APIs are available to a UtilityProcess.
- * As of writing (Jul 2024, Electron 30), only the following are available:
- *
- * - net
- * - systemPreferences
- *
- * In particular, `app` is not available.
- *
- * We structure our code so that it doesn't need anything apart from `net`.
- *
- * For the other cases,
- *
- * -  Additional parameters to the utility process are passed alongwith the
- *    initial message where we provide it the message port.
- *
- * -  When we need to communicate from the utility process to the main process,
- *    we use the `parentPort` in the utility process.
- */
-const handleMessagesFromUtilityProcess = (child: UtilityProcess) => {
-    const logTag = "[ml-worker]";
-    child.on("message", (m: unknown) => {
-        if (m && typeof m == "object" && "method" in m && "p" in m) {
-            const p = m.p;
-            switch (m.method) {
-                case "log.errorString":
-                    if (typeof p == "string") {
-                        log.error(`${logTag} ${p}`);
-                        return;
-                    }
-                    break;
-                case "log.info":
-                    if (Array.isArray(p)) {
-                        // Need to cast from any[] to unknown[]
-                        log.info(logTag, ...(p as unknown[]));
-                        return;
-                    }
-                    break;
-                case "log.debugString":
-                    if (typeof p == "string") {
-                        log.debug(() => `${logTag} ${p}`);
-                        return;
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
-        log.info("Ignoring unknown message from ML worker", m);
-    });
-};

desktop/src/main/services/store.ts

@@ -24,17 +24,17 @@ export const clearStores = () => {
  * On macOS, `safeStorage` stores our data under a Keychain entry named
  * "<app-name> Safe Storage". In our case, "ente Safe Storage".
  */
-export const saveMasterKeyB64 = (masterKeyB64: string) => {
-    const encryptedKey = safeStorage.encryptString(masterKeyB64);
-    const b64EncryptedKey = Buffer.from(encryptedKey).toString("base64");
-    safeStorageStore.set("encryptionKey", b64EncryptedKey);
+export const saveMasterKeyInSafeStorage = (masterKey: string) => {
+    const encryptedKeyBuffer = safeStorage.encryptString(masterKey);
+    const encryptedKey = Buffer.from(encryptedKeyBuffer).toString("base64");
+    safeStorageStore.set("encryptionKey", encryptedKey);
 };
 
-export const masterKeyB64 = (): string | undefined => {
-    const b64EncryptedKey = safeStorageStore.get("encryptionKey");
-    if (!b64EncryptedKey) return undefined;
-    const keyBuffer = Buffer.from(b64EncryptedKey, "base64");
-    return safeStorage.decryptString(keyBuffer);
+export const masterKeyFromSafeStorage = (): string | undefined => {
+    const encryptedKey = safeStorageStore.get("encryptionKey");
+    if (!encryptedKey) return undefined;
+    const encryptedKeyBuffer = Buffer.from(encryptedKey, "base64");
+    return safeStorage.decryptString(encryptedKeyBuffer);
 };
 
 export const lastShownChangelogVersion = (): number | undefined =>
@@ -42,3 +42,31 @@ export const lastShownChangelogVersion = (): number | undefined =>
 
 export const setLastShownChangelogVersion = (version: number) =>
     userPreferences.set("lastShownChangelogVersion", version);
+
+/**
+ * Return true if the dock icon should be hidden when the window is closed
+ * [macOS only].
+ *
+ * On macOS, if this function returns true then when hiding ("closing" it with
+ * the x traffic light) the window we also hide the app's icon in the dock. The
+ * user can modify their preference using the Menu bar > ente > Settings > Hide
+ * dock icon checkbox.
+ *
+ * If the user has not set a value for this preference (i.e., the value is
+ * `undefined`), we use the default `true`. This is confusing, but this way we
+ * can retain the preexisting preference key instead of doing a migration.
+ *
+ *     Value     | Behaviour
+ *     ----------|--------------
+ *     undefined |  default (hide)
+ *     false     |  show
+ *     true      |  hide
+ *
+ * On non-macOS platforms, it always returns false.
+ */
+export const shouldHideDockIcon = (): boolean =>
+    process.platform == "darwin" &&
+    userPreferences.get("hideDockIcon") !== false;
+
+export const setShouldHideDockIcon = (hide: boolean) =>
+    userPreferences.set("hideDockIcon", hide);

desktop/src/main/services/upload.ts

@@ -84,11 +84,7 @@ export const pendingUploads = async (): Promise<PendingUploads | undefined> => {
 
     if (filePaths.length == 0 && zipItems.length == 0) return undefined;
 
-    return {
-        collectionName,
-        filePaths,
-        zipItems,
-    };
+    return { collectionName, filePaths, zipItems };
 };
 
 /**
@@ -139,22 +135,35 @@ export const setPendingUploads = ({
     });
 };
 
-export const markUploadedFiles = (paths: string[]) => {
+export const markUploadedFile = (
+    path: string,
+    associatedPath: string | undefined,
+) => {
     const existing = uploadStatusStore.get("filePaths") ?? [];
-    const updated = existing.filter((p) => !paths.includes(p));
+    const updated = existing.filter((p) => p != path && p != associatedPath);
     uploadStatusStore.set("filePaths", updated);
+    // See: [Note: Integral last modified time]
+    return fs.stat(path).then((st) => st.mtime.getTime());
 };
 
-export const markUploadedZipItems = (
-    items: [zipPath: string, entryName: string][],
+export const markUploadedZipItem = (
+    item: ZipItem,
+    associatedItem: ZipItem | undefined,
 ) => {
     const existing = uploadStatusStore.get("zipItems") ?? [];
-    const updated = existing.filter(
-        (z) => !items.some((e) => z[0] == e[0] && z[1] == e[1]),
+    const updated = exceptZipItem(
+        exceptZipItem(existing, item),
+        associatedItem,
     );
     uploadStatusStore.set("zipItems", updated);
+    return fs.stat(item[0]).then((st) => st.mtime.getTime());
 };
 
+const exceptZipItem = (items: ZipItem[], item: ZipItem | undefined) =>
+    item
+        ? items.filter((zi) => !(zi[0] == item[0] && zi[1] == item[1]))
+        : items;
+
 export const clearPendingUploads = () => {
     uploadStatusStore.clear();
     clearOpenZipCache();

desktop/src/main/services/watch.ts

@@ -28,6 +28,13 @@ export const createWatcher = (mainWindow: BrowserWindow) => {
         // Ask the watcher to wait for a the file size to stabilize before
         // telling us about a new file. By default, it waits for 2 seconds.
         awaitWriteFinish: true,
+        // On macOS we start getting "EMFILE: too many open files" when watching
+        // large folders. This is a known regression in Chokidar v4:
+        // https://github.com/paulmillr/chokidar/issues/1385
+        //
+        // The recommended workaround for now is to enable usePolling. Since it
+        // comes at a performance cost, we only do it where needed (macOS).
+        ...(process.platform == "darwin" ? { usePolling: true } : {}),
     });
 
     watcher

desktop/src/main/services/workers.ts

@@ -0,0 +1,241 @@
+/**
+ * @file This main process code and interface for dealing with the various
+ * utility processes that we create.
+ */
+
+import type { Endpoint } from "comlink";
+import {
+    MessageChannelMain,
+    type BrowserWindow,
+    type UtilityProcess,
+} from "electron";
+import { app, utilityProcess } from "electron/main";
+import path from "node:path";
+import type { UtilityProcessType } from "../../types/ipc";
+import log, { processUtilityProcessLogMessage } from "../log";
+import { messagePortMainEndpoint } from "../utils/comlink";
+
+/**
+ * Terminate any existing utility processes if they're running.
+ *
+ * This function is called during the logout sequence.
+ */
+export const terminateUtilityProcesses = () => {
+    terminateMLProcessIfRunning();
+    terminateFFmpegProcessIfRunning();
+};
+
+/** The active ML utility process, if any. */
+let _utilityProcessML: UtilityProcess | undefined;
+
+/** The active FFmpeg utility process, if any. */
+let _utilityProcessFFmpeg: UtilityProcess | undefined;
+
+/**
+ * A promise to a comlink {@link Endpoint} that can be used to communicate with
+ * the active ffmpeg utility process (if any).
+ */
+let _utilityProcessFFmpegEndpoint: Promise<Endpoint> | undefined;
+
+/**
+ * Create a new utility process of the given {@link type}, terminating the older
+ * ones (if any).
+ *
+ * Currently the only type is "ml". The following note explains the reasoning
+ * why utility processes were used for the first workload (ML) that was handled
+ * this way. Similar reasoning applies to subsequent workloads (ffmpeg) that
+ * have been offloaded to utility processes in a slightly different manner to
+ * avoid stutter in the UI.
+ *
+ * [Note: ML IPC]
+ *
+ * The primary reason for doing ML tasks in the Node.js layer is so that we can
+ * use the binary ONNX runtime, which is 10-20x faster than the Wasm one that
+ * can be used directly on the web layer.
+ *
+ * For this to work, the main and renderer process need to communicate with each
+ * other. Further, in the web layer the ML indexing runs in a web worker (so as
+ * to not get in the way of the main thread). So the communication has 2 hops:
+ *
+ *     Node.js main <-> Renderer main <-> Renderer web worker
+ *
+ * This naive way works, but has a problem. The Node.js main process is in the
+ * code path for delivering user events to the renderer process. The ML tasks we
+ * do take in the order of 100-300 ms (possibly more) for each individual
+ * inference. Thus, the Node.js main process is busy for those 100-300 ms, and
+ * does not forward events to the renderer, causing the UI to jitter.
+ *
+ * The solution for this is to spawn an Electron UtilityProcess, which we can
+ * think of a regular Node.js child process. This frees up the Node.js main
+ * process, and would remove the jitter.
+ * https://www.electronjs.org/docs/latest/tutorial/process-model
+ *
+ * It would seem that this introduces another hop in our IPC
+ *
+ *     Node.js utility process <-> Node.js main <-> ...
+ *
+ * but here we can use the special bit about Electron utility processes that
+ * separates them from regular Node.js child processes: their support for
+ * message ports. https://www.electronjs.org/docs/latest/tutorial/message-ports
+ *
+ * As a brief summary, a MessagePort is a web feature that allows two contexts
+ * to communicate. A pair of message ports is called a message channel. The cool
+ * thing about these is that we can pass these ports themselves over IPC.
+ *
+ * > One caveat here is that the message ports can only be passed using the
+ * > `postMessage` APIs, not the usual send/invoke APIs.
+ *
+ * So we
+ *
+ * 1. In the utility process create a message channel.
+ * 2. Spawn a utility process, and send one port of the pair to it.
+ * 3. Send the other port of the pair to the renderer.
+ *
+ * The renderer will forward that port to the web worker that is coordinating
+ * the ML indexing on the web layer. Thereafter, the utility process and web
+ * worker can directly talk to each other!
+ *
+ *     Node.js utility process <-> Renderer web worker
+ *
+ * The RPC protocol is handled using comlink on both ends. The port itself needs
+ * to be relayed using `postMessage`.
+ */
+export const triggerCreateUtilityProcess = (
+    type: UtilityProcessType,
+    window: BrowserWindow,
+) => triggerCreateMLUtilityProcess(window);
+
+const terminateMLProcessIfRunning = () => {
+    if (_utilityProcessML) {
+        log.debug(() => "Terminating running ML utility process");
+        _utilityProcessML.kill();
+        _utilityProcessML = undefined;
+    }
+};
+
+export const triggerCreateMLUtilityProcess = (window: BrowserWindow) => {
+    terminateMLProcessIfRunning();
+
+    const { port1, port2 } = new MessageChannelMain();
+
+    const child = utilityProcess.fork(path.join(__dirname, "ml-worker.js"));
+    const userDataPath = app.getPath("userData");
+    child.postMessage(/* MLWorkerInitData */ { userDataPath }, [port1]);
+
+    window.webContents.postMessage("utilityProcessPort/ml", undefined, [port2]);
+
+    handleMessagesFromMLUtilityProcess(child);
+
+    _utilityProcessML = child;
+};
+
+/**
+ * Handle messages posted from the utility process.
+ *
+ * [Note: Using Electron APIs in UtilityProcess]
+ *
+ * Only a small subset of the Electron APIs are available to a UtilityProcess.
+ * As of writing (Jul 2024, Electron 30), only the following are available:
+ *
+ * - net
+ * - systemPreferences
+ *
+ * In particular, `app` is not available.
+ *
+ * We structure our code so that it doesn't need anything apart from `net`.
+ *
+ * For the other cases,
+ *
+ * -  Additional parameters to the utility process are passed alongwith the
+ *    initial message where we provide it the message port.
+ *
+ * -  When we need to communicate from the utility process to the main process,
+ *    we use the `parentPort` in the utility process.
+ */
+const handleMessagesFromMLUtilityProcess = (child: UtilityProcess) => {
+    child.on("message", (m: unknown) => {
+        if (processUtilityProcessLogMessage("[ml-worker]", m)) {
+            return;
+        }
+        log.info("Ignoring unknown message from ML utility process", m);
+    });
+};
+
+/**
+ * A comlink endpoint that can be used to communicate with the ffmpeg utility
+ * process. If there is no ffmpeg utility process, a new one is created on
+ * demand.
+ *
+ * See [Note: ML IPC] for a general outline of why utility processes are needed
+ * (tl;dr; to avoid stutter on the UI).
+ *
+ * In the case of ffmpeg, the IPC flow is a bit different: the utility process
+ * is not exposed to the web layer, and is internal to the node layer. The
+ * reason for this difference is that we need to create temporary files etc, and
+ * doing it a utility process requires access to the `app` module which are not
+ * accessible (See: [Note: Using Electron APIs in UtilityProcess]).
+ *
+ * There could've been possible reasonable workarounds, but the architecture
+ * we've adopted of three layers:
+ *
+ *     Renderer (web) <-> Node.js main <-> Node.js ffmpeg utility process
+ *
+ * The temporary file creation etc is handled in the Node.js main process, and
+ * paths to the files are forwarded to the ffmpeg utility process to act on.
+ *
+ * @returns an endpoint that can be used to communicate with the utility
+ * process. The utility process is expected to expose an object that conforms to
+ * the {@link ElectronFFmpegWorkerNode} interface on this endpoint.
+ */
+export const ffmpegUtilityProcessEndpoint = () =>
+    (_utilityProcessFFmpegEndpoint ??= createFFmpegUtilityProcessEndpoint());
+
+const terminateFFmpegProcessIfRunning = () => {
+    if (_utilityProcessFFmpeg) {
+        log.debug(() => "Terminating running FFmpeg utility process");
+        _utilityProcessFFmpeg.kill();
+        _utilityProcessFFmpeg = undefined;
+        _utilityProcessFFmpegEndpoint = undefined;
+    }
+};
+
+const createFFmpegUtilityProcessEndpoint = () => {
+    if (_utilityProcessFFmpeg) {
+        throw new Error("FFmpeg utility process is already running");
+    }
+
+    // Promise.withResolvers is currently in the node available to us.
+    let resolve: ((endpoint: Endpoint) => void) | undefined;
+    const promise = new Promise<Endpoint>((r) => (resolve = r));
+
+    const { port1, port2 } = new MessageChannelMain();
+
+    const child = utilityProcess.fork(path.join(__dirname, "ffmpeg-worker.js"));
+    // Send a handle to the port (one end of the message channel) to the utility
+    // process (alongwith any other init data). The utility process will reply
+    // with an "ack" when it get it.
+    const appVersion = app.getVersion();
+    child.postMessage(/* FFmpegWorkerInitData */ { appVersion }, [port1]);
+
+    child.on("message", (m: unknown) => {
+        if (m && typeof m == "object" && "method" in m) {
+            switch (m.method) {
+                case "ack":
+                    resolve!(messagePortMainEndpoint(port2));
+                    return;
+            }
+        }
+
+        if (processUtilityProcessLogMessage("[ffmpeg-worker]", m)) {
+            return;
+        }
+
+        log.info("Ignoring unknown message from ffmpeg utility process", m);
+    });
+
+    _utilityProcessFFmpeg = child;
+
+    // Resolve with the other end of the message channel (once we get an "ack"
+    // from the utility process).
+    return promise;
+};

desktop/src/main/stores/safe-storage.ts

@@ -5,9 +5,7 @@ interface SafeStorageStore {
 }
 
 const safeStorageSchema: Schema<SafeStorageStore> = {
-    encryptionKey: {
-        type: "string",
-    },
+    encryptionKey: { type: "string" },
 };
 
 export const safeStorageStore = new Store({

desktop/src/main/stores/upload-status.ts

@@ -22,30 +22,13 @@ export interface UploadStatusStore {
 }
 
 const uploadStatusSchema: Schema<UploadStatusStore> = {
-    collectionName: {
-        type: "string",
-    },
-    filePaths: {
-        type: "array",
-        items: {
-            type: "string",
-        },
-    },
+    collectionName: { type: "string" },
+    filePaths: { type: "array", items: { type: "string" } },
     zipItems: {
         type: "array",
-        items: {
-            type: "array",
-            items: {
-                type: "string",
-            },
-        },
-    },
-    zipPaths: {
-        type: "array",
-        items: {
-            type: "string",
-        },
+        items: { type: "array", items: { type: "string" } },
     },
+    zipPaths: { type: "array", items: { type: "string" } },
 };
 
 export const uploadStatusStore = new Store({

desktop/src/main/stores/user-preferences.ts

@@ -23,12 +23,7 @@ interface UserPreferences {
      * the app is not maximized (when the app was maximized when it was being
      * quit then {@link isWindowMaximized} will be set instead).
      */
-    windowBounds?: {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
+    windowBounds?: { x: number; y: number; width: number; height: number };
     /**
      * `true` if the app's main window is maximized the last time it was closed.
      */

desktop/src/main/stores/watch.ts

@@ -34,10 +34,7 @@ const watchStoreSchema: Schema<WatchStore> = {
                         },
                     },
                 },
-                ignoredFiles: {
-                    type: "array",
-                    items: { type: "string" },
-                },
+                ignoredFiles: { type: "array", items: { type: "string" } },
             },
         },
     },

desktop/src/main/stream.ts

@@ -7,13 +7,14 @@ import fs from "node:fs/promises";
 import { Writable } from "node:stream";
 import { pathToFileURL } from "node:url";
 import log from "./log";
-import { ffmpegConvertToMP4 } from "./services/ffmpeg";
+import { ffmpegUtilityProcess } from "./services/ffmpeg";
+import { type FFmpegGenerateHLSPlaylistAndSegmentsResult } from "./services/ffmpeg-worker";
 import { markClosableZip, openZip } from "./services/zip";
-import { ensure } from "./utils/common";
 import { writeStream } from "./utils/stream";
 import {
     deleteTempFile,
     deleteTempFileIgnoringErrors,
+    makeFileForStreamOrPathOrZipItem,
     makeTempFilePath,
 } from "./utils/temp";
 
@@ -57,25 +58,39 @@ const handleStreamRequest = async (request: Request): Promise<Response> => {
     const { host, searchParams } = new URL(url);
     switch (host) {
         case "read":
-            return handleRead(ensure(searchParams.get("path")));
+            return handleRead(searchParams.get("path")!);
 
         case "read-zip":
             return handleReadZip(
-                ensure(searchParams.get("zipPath")),
-                ensure(searchParams.get("entryName")),
+                searchParams.get("zipPath")!,
+                searchParams.get("entryName")!,
             );
 
         case "write":
-            return handleWrite(ensure(searchParams.get("path")), request);
+            return handleWrite(searchParams.get("path")!, request);
+
+        case "video": {
+            const op = searchParams.get("op");
+            if (op) {
+                switch (op) {
+                    case "convert-to-mp4":
+                        return handleConvertToMP4Write(request);
+                    case "generate-hls":
+                        return handleGenerateHLSWrite(request, searchParams);
+                    default:
+                        return new Response(`Unknown op ${op}`, {
+                            status: 404,
+                        });
+                }
+            }
 
-        case "convert-to-mp4": {
             const token = searchParams.get("token");
             const done = searchParams.get("done") !== null;
-            return token
-                ? done
-                    ? handleConvertToMP4ReadDone(token)
-                    : handleConvertToMP4Read(token)
-                : handleConvertToMP4Write(request);
+            if (!token) {
+                return new Response("Missing token", { status: 404 });
+            }
+
+            return done ? handleVideoDone(token) : handleVideoRead(token);
         }
 
         default:
@@ -105,6 +120,7 @@ const handleRead = async (path: string) => {
         res.headers.set("Content-Length", `${fileSize}`);
 
         // Add the file's last modified time (as epoch milliseconds).
+        // See: [Note: Integral last modified time]
         const mtimeMs = stat.mtime.getTime();
         res.headers.set("X-Last-Modified-Ms", `${mtimeMs}`);
     }
@@ -125,7 +141,12 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
     const { writable, readable } = new TransformStream();
     const stream = await zip.stream(entry);
 
-    const nodeWritable = Writable.fromWeb(writable);
+    // Silence a type error about the Promise<void> returned by the close method
+    // of writable as not being assignable to Promise<undefined> which started
+    // appearing after updating to TypeScript 5.8.
+    //
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+    const nodeWritable = Writable.fromWeb(writable as any);
     stream.pipe(nodeWritable);
 
     nodeWritable.on("error", (e: unknown) => {
@@ -161,21 +182,21 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
 };
 
 const handleWrite = async (path: string, request: Request) => {
-    await writeStream(path, ensure(request.body));
+    await writeStream(path, request.body!);
     return new Response("", { status: 200 });
 };
 
 /**
- * A map from token to file paths for convert-to-mp4 requests that we have
- * received.
+ * A map from token to file paths generated as a result of stream://video
+ * requests we have received.
  */
-const convertToMP4Results = new Map<string, string>();
+const pendingVideoResults = new Map<string, string>();
 
 /**
- * Clear any in-memory state for in-flight convert-to-mp4 requests. Meant to be
- * called during logout.
+ * Clear any in-memory state for in-flight streamed video processing requests.
+ * Meant to be called during logout.
  */
-export const clearConvertToMP4Results = () => convertToMP4Results.clear();
+export const clearPendingVideoResults = () => pendingVideoResults.clear();
 
 /**
  * [Note: Convert to MP4]
@@ -190,30 +211,32 @@ export const clearConvertToMP4Results = () => convertToMP4Results.clear();
  * mode for the Web fetch API). So we need to simulate that using two different
  * streaming requests.
  *
- *     renderer → main  stream://convert-to-mp4
+ *     renderer → main  stream://video?op=convert-to-mp4
  *                      → request.body is the original video
- *                      ← response is a token
+ *                      ← response is [token]
  *
- *     renderer → main  stream://convert-to-mp4?token=<token>
+ *     renderer → main  stream://video?token=<token>
  *                      ← response.body is the converted video
  *
- *     renderer → main  stream://convert-to-mp4?token=<token>&done
+ *     renderer → main  stream://video?token=<token>&done
  *                      ← 200 OK
  *
  * Note that the conversion itself is not streaming. The conversion still
- * happens in a single shot, we are just streaming the data across the IPC
- * boundary to allow us to pass large amounts of data without running out of
- * memory.
+ * happens in a single invocation of ffmpeg, we are just streaming the data
+ * across the IPC boundary to allow us to pass large amounts of data without
+ * running out of memory.
  *
  * See also: [Note: IPC streams]
  */
 const handleConvertToMP4Write = async (request: Request) => {
+    const worker = await ffmpegUtilityProcess();
+
     const inputTempFilePath = await makeTempFilePath();
-    await writeStream(inputTempFilePath, ensure(request.body));
+    await writeStream(inputTempFilePath, request.body!);
 
     const outputTempFilePath = await makeTempFilePath("mp4");
     try {
-        await ffmpegConvertToMP4(inputTempFilePath, outputTempFilePath);
+        await worker.ffmpegConvertToMP4(inputTempFilePath, outputTempFilePath);
     } catch (e) {
         log.error("Conversion to MP4 failed", e);
         await deleteTempFileIgnoringErrors(outputTempFilePath);
@@ -223,25 +246,112 @@ const handleConvertToMP4Write = async (request: Request) => {
     }
 
     const token = randomUUID();
-    convertToMP4Results.set(token, outputTempFilePath);
+    pendingVideoResults.set(token, outputTempFilePath);
     return new Response(token, { status: 200 });
 };
 
-const handleConvertToMP4Read = async (token: string) => {
-    const filePath = convertToMP4Results.get(token);
+const handleVideoRead = async (token: string) => {
+    const filePath = pendingVideoResults.get(token);
     if (!filePath)
         return new Response(`Unknown token ${token}`, { status: 404 });
 
     return net.fetch(pathToFileURL(filePath).toString());
 };
 
-const handleConvertToMP4ReadDone = async (token: string) => {
-    const filePath = convertToMP4Results.get(token);
+const handleVideoDone = async (token: string) => {
+    const filePath = pendingVideoResults.get(token);
     if (!filePath)
         return new Response(`Unknown token ${token}`, { status: 404 });
 
     await deleteTempFile(filePath);
 
-    convertToMP4Results.delete(token);
+    pendingVideoResults.delete(token);
     return new Response("", { status: 200 });
 };
+
+/**
+ * Generate a HLS playlist for the given video.
+ *
+ * See: [Note: Convert to MP4] for the general architecture of commands that do
+ * renderer <-> main I/O using streams.
+ *
+ * The difference here is that we the conversion generates two streams^ - one
+ * for the HLS playlist itself, and one for the file containing the encrypted
+ * and transcoded video chunks. The video stream we write to the pre-signed
+ * object upload URL(s), and then we return a JSON object containing the token
+ * for the playlist, and other metadata for use by the renderer.
+ *
+ * ^ if the video doesn't require a stream to be generated (e.g. it is very
+ *   small and already uses a compatible codec) then a HTT 204 is returned and
+ *   no stream is generated.
+ */
+const handleGenerateHLSWrite = async (
+    request: Request,
+    params: URLSearchParams,
+) => {
+    const fileID = parseInt(params.get("fileID") ?? "", 10);
+    const fetchURL = params.get("fetchURL");
+    const authToken = params.get("authToken");
+    if (!fileID || !fetchURL || !authToken) throw new Error("Missing params");
+
+    let inputItem: Parameters<typeof makeFileForStreamOrPathOrZipItem>[0];
+    const path = params.get("path");
+    if (path) {
+        inputItem = path;
+    } else {
+        const zipPath = params.get("zipPath");
+        const entryName = params.get("entryName");
+        if (zipPath && entryName) {
+            inputItem = [zipPath, entryName];
+        } else {
+            const body = request.body;
+            if (!body) throw new Error("Missing body");
+            inputItem = body;
+        }
+    }
+
+    const worker = await ffmpegUtilityProcess();
+
+    const {
+        path: inputFilePath,
+        isFileTemporary: isInputFileTemporary,
+        writeToTemporaryFile: writeToTemporaryInputFile,
+    } = await makeFileForStreamOrPathOrZipItem(inputItem);
+
+    const outputFilePathPrefix = await makeTempFilePath();
+    let result: FFmpegGenerateHLSPlaylistAndSegmentsResult | undefined;
+    try {
+        await writeToTemporaryInputFile();
+
+        result = await worker.ffmpegGenerateHLSPlaylistAndSegments(
+            inputFilePath,
+            outputFilePathPrefix,
+            fileID,
+            fetchURL,
+            authToken,
+        );
+
+        if (!result) {
+            // This video doesn't require stream generation.
+            return new Response(null, { status: 204 });
+        }
+
+        const { playlistPath, dimensions, videoSize, videoObjectID } = result;
+
+        const playlistToken = randomUUID();
+        pendingVideoResults.set(playlistToken, playlistPath);
+
+        return new Response(
+            JSON.stringify({
+                playlistToken,
+                dimensions,
+                videoSize,
+                videoObjectID,
+            }),
+            { status: 200 },
+        );
+    } finally {
+        if (isInputFileTemporary)
+            await deleteTempFileIgnoringErrors(inputFilePath);
+    }
+};

desktop/src/main/types/any-shell-escape.d.ts

@@ -12,7 +12,7 @@
  *
  * yields (on POSIX shells):
  *
- *     curl -v -H 'Location;' -H 'User-Agent: FoorBar'"'"'s so-called "Browser"' 'http://www.daveeddy.com/?name=dave&age=24'
+ *     curl -v -H 'Location;' -H 'User-Agent: FooBar'"'"'s so-called "Browser"' 'http://www.daveeddy.com/?name=dave&age=24'
  *
  * or (on Windows):
  *

desktop/src/main/utils/comlink.ts

@@ -19,7 +19,7 @@ export const messagePortMainEndpoint = (mp: MessagePortMain): Endpoint => {
     const listeners = new WeakMap<NL, EL>();
     return {
         postMessage: (message, transfer) => {
-            mp.postMessage(message, transfer as unknown as MessagePortMain[]);
+            mp.postMessage(message, (transfer ?? []) as MessagePortMain[]);
         },
         addEventListener: (_, eh) => {
             const l: EL = (data) =>

desktop/src/main/utils/common.ts

@@ -5,20 +5,21 @@
  * currently a common package that both of them share.
  */
 
-/**
- * Throw an exception if the given value is `null` or `undefined`.
- */
-export const ensure = <T>(v: T | null | undefined): T => {
-    if (v === null) throw new Error("Required value was null");
-    if (v === undefined) throw new Error("Required value was not found");
-    return v;
-};
-
 /**
  * Wait for {@link ms} milliseconds
  *
  * This function is a promisified `setTimeout`. It returns a promise that
  * resolves after {@link ms} milliseconds.
+ *
+ * Duplicated from `web/packages/utils/promise.ts`.
  */
 export const wait = (ms: number) =>
     new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * Convert `null` to `undefined`, passthrough everything else unchanged.
+ *
+ * Duplicated from `web/packages/utils/transform.ts`.
+ */
+export const nullToUndefined = <T>(v: T | null | undefined): T | undefined =>
+    v === null ? undefined : v;

desktop/src/main/utils/exec-worker.ts

@@ -0,0 +1,23 @@
+import shellescape from "any-shell-escape";
+import { exec } from "node:child_process";
+import { promisify } from "node:util";
+import log from "../log-worker";
+
+/**
+ * Run a shell command asynchronously (utility process edition).
+ *
+ * This is an almost verbatim copy of {@link execAsync} from `electron.ts`,
+ * except it is meant to be usable from a utility process where only a subset of
+ * imports are available. See [Note: Using Electron APIs in UtilityProcess].
+ */
+export const execAsyncWorker = async (command: string | string[]) => {
+    const escapedCommand = Array.isArray(command)
+        ? shellescape(command)
+        : command;
+    const startTime = Date.now();
+    const result = await execAsync_(escapedCommand);
+    log.debugString(`${escapedCommand} (${Date.now() - startTime} ms)`);
+    return result;
+};
+
+const execAsync_ = promisify(exec);

desktop/src/main/utils/http.ts

@@ -0,0 +1,31 @@
+export const clientPackageName = "io.ente.photos.desktop";
+
+/**
+ * Reimplementation of {@link publicRequestHeaders} from the web source.
+ *
+ * @param desktopAppVersion The desktop app's version. This will get passed on
+ * as the "X-Client-Version" header.
+ *
+ * We cannot directly use `app.getVersion()` to obtain this value since the
+ * {@link app} module is not accessible to Electron utility processes which also
+ * calls this function.
+ */
+export const publicRequestHeaders = (desktopAppVersion: string) => ({
+    "X-Client-Package": clientPackageName,
+    "X-Client-Version": desktopAppVersion,
+});
+
+/**
+ * Reimplementation of {@link authenticatedRequestHeaders} from the web source.
+ *
+ * This builds on top of {@link publicRequestHeaders} and takes the same
+ * parameters, and additionally also requires the {@link authToken} that will be
+ * passed as the "X-Auth-Token" header.
+ */
+export const authenticatedRequestHeaders = (
+    desktopAppVersion: string,
+    authToken: string,
+) => ({
+    ...publicRequestHeaders(desktopAppVersion),
+    "X-Auth-Token": authToken,
+});

desktop/src/main/utils/stream.ts

@@ -27,7 +27,7 @@ const writeNodeStream = async (filePath: string, fileStream: Readable) => {
 
     fileStream.pipe(writeable);
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         writeable.on("finish", resolve);
         writeable.on("error", (err) => {
             if (existsSync(filePath)) {

desktop/src/main/utils/temp.ts

@@ -5,7 +5,7 @@ import path from "node:path";
 import type { ZipItem } from "../../types/ipc";
 import log from "../log";
 import { markClosableZip, openZip } from "../services/zip";
-import { ensure } from "./common";
+import { writeStream } from "./stream";
 
 /**
  * Our very own directory within the system temp directory. Go crazy, but
@@ -20,17 +20,21 @@ const enteTempDirPath = async () => {
 /** Generate a random string suitable for being used as a file name prefix */
 const randomPrefix = () => {
     const ch = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    const randomChar = () => ensure(ch[Math.floor(Math.random() * ch.length)]);
+    const randomChar = () => ch[Math.floor(Math.random() * ch.length)]!;
 
     return Array(10).fill("").map(randomChar).join("");
 };
 
 /**
- * Return the path to a temporary file with the given {@link suffix}.
+ * Return the path to a temporary file with an optional {@link extension}.
  *
  * The function returns the path to a file in the system temp directory (in an
  * Ente specific folder therin) with a random prefix and an (optional)
- * {@link extension}.
+ * {@link extension}. The parent directory is guaranteed to exist.
+ *
+ * @param extension A string, if provided, is used as the extension for the
+ * generated path. It will be automatically prefixed by a dot, so don't include
+ * the dot in the provided string.
  *
  * It ensures that there is no existing item with the same name already.
  *
@@ -64,7 +68,7 @@ export const deleteTempFile = async (tempFilePath: string) => {
 };
 
 /**
- * A variant of {@link deleteTempFile} that supresses any errors, making it
+ * A variant of {@link deleteTempFile} that suppresses any errors, making it
  * safe to call them in a sequence without needing to handle the scenario where
  * one of them failing causes the rest to be skipped.
  */
@@ -76,8 +80,8 @@ export const deleteTempFileIgnoringErrors = async (tempFilePath: string) => {
     }
 };
 
-/** The result of {@link makeFileForDataOrPathOrZipItem}. */
-interface FileForDataOrPathOrZipItem {
+/** The result of {@link makeFileForStreamOrPathOrZipItem}. */
+interface FileForStreamOrPathOrZipItem {
     /**
      * The path to the file (possibly temporary).
      */
@@ -101,33 +105,32 @@ interface FileForDataOrPathOrZipItem {
 /**
  * Return the path to a file, a boolean indicating if this is a temporary path
  * that needs to be deleted after processing, and a function to write the given
- * {@link dataOrPathOrZipItem} into that temporary file if needed.
+ * {@link item} into that temporary file if needed.
  *
- * @param dataOrPathOrZipItem The contents of the file, or the path to an
- * existing file, or a (path to a zip file, name of an entry within that zip
- * file) tuple.
+ * @param item A {@link ReadableStream} with the contents of the file, or the
+ * path to an existing file, or a (path to a zip file, name of an entry within
+ * that zip file) tuple.
  */
-export const makeFileForDataOrPathOrZipItem = async (
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
-): Promise<FileForDataOrPathOrZipItem> => {
+export const makeFileForStreamOrPathOrZipItem = async (
+    item: ReadableStream | string | ZipItem,
+): Promise<FileForStreamOrPathOrZipItem> => {
     let path: string;
     let isFileTemporary: boolean;
     let writeToTemporaryFile = async () => {
         /* no-op */
     };
 
-    if (typeof dataOrPathOrZipItem == "string") {
-        path = dataOrPathOrZipItem;
+    if (typeof item == "string") {
+        path = item;
         isFileTemporary = false;
     } else {
         path = await makeTempFilePath();
         isFileTemporary = true;
-        if (dataOrPathOrZipItem instanceof Uint8Array) {
-            writeToTemporaryFile = () =>
-                fs.writeFile(path, dataOrPathOrZipItem);
+        if (item instanceof ReadableStream) {
+            writeToTemporaryFile = () => writeStream(path, item);
         } else {
             writeToTemporaryFile = async () => {
-                const [zipPath, entryName] = dataOrPathOrZipItem;
+                const [zipPath, entryName] = item;
                 const zip = openZip(zipPath);
                 try {
                     await zip.extract(entryName, path);

desktop/src/preload.ts

@@ -66,8 +66,10 @@ import type { IpcRendererEvent } from "electron";
 import type {
     AppUpdate,
     CollectionMapping,
+    FFmpegCommand,
     FolderWatch,
     PendingUploads,
+    UtilityProcessType,
     ZipItem,
 } from "./types/ipc";
 
@@ -111,10 +113,11 @@ const logout = () => {
     return ipcRenderer.invoke("logout");
 };
 
-const masterKeyB64 = () => ipcRenderer.invoke("masterKeyB64");
+const masterKeyFromSafeStorage = () =>
+    ipcRenderer.invoke("masterKeyFromSafeStorage");
 
-const saveMasterKeyB64 = (masterKeyB64: string) =>
-    ipcRenderer.invoke("saveMasterKeyB64", masterKeyB64);
+const saveMasterKeyInSafeStorage = (masterKey: string) =>
+    ipcRenderer.invoke("saveMasterKeyInSafeStorage", masterKey);
 
 const lastShownChangelogVersion = () =>
     ipcRenderer.invoke("lastShownChangelogVersion");
@@ -178,49 +181,58 @@ const fsReadTextFile = (path: string) =>
 const fsWriteFile = (path: string, contents: string) =>
     ipcRenderer.invoke("fsWriteFile", path, contents);
 
+const fsWriteFileViaBackup = (path: string, contents: string) =>
+    ipcRenderer.invoke("fsWriteFileViaBackup", path, contents);
+
 const fsIsDir = (dirPath: string) => ipcRenderer.invoke("fsIsDir", dirPath);
 
+const fsStatMtime = (path: string) => ipcRenderer.invoke("fsStatMtime", path);
+
 // - Conversion
 
 const convertToJPEG = (imageData: Uint8Array) =>
     ipcRenderer.invoke("convertToJPEG", imageData);
 
 const generateImageThumbnail = (
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
     maxDimension: number,
     maxSize: number,
 ) =>
     ipcRenderer.invoke(
         "generateImageThumbnail",
-        dataOrPathOrZipItem,
+        pathOrZipItem,
         maxDimension,
         maxSize,
     );
 
 const ffmpegExec = (
-    command: string[],
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    command: FFmpegCommand,
+    pathOrZipItem: string | ZipItem,
     outputFileExtension: string,
 ) =>
     ipcRenderer.invoke(
         "ffmpegExec",
         command,
-        dataOrPathOrZipItem,
+        pathOrZipItem,
         outputFileExtension,
     );
 
-// - ML
+const ffmpegDetermineVideoDuration = (pathOrZipItem: string | ZipItem) =>
+    ipcRenderer.invoke("ffmpegDetermineVideoDuration", pathOrZipItem);
 
-const createMLWorker = () => {
+// - Utility processes
+
+const triggerCreateUtilityProcess = (type: UtilityProcessType) => {
+    const portEvent = `utilityProcessPort/${type}`;
     const l = (event: IpcRendererEvent) => {
         void windowLoaded.then(() => {
             // "*"" is the origin to send to.
-            window.postMessage("createMLWorker/port", "*", event.ports);
-            ipcRenderer.off("createMLWorker/port", l);
+            window.postMessage(portEvent, "*", event.ports);
+            ipcRenderer.off(portEvent, l);
         });
     };
-    ipcRenderer.on("createMLWorker/port", l);
-    ipcRenderer.send("createMLWorker");
+    ipcRenderer.on(portEvent, l);
+    ipcRenderer.send("triggerCreateUtilityProcess", type);
 };
 
 // - Watch
@@ -286,11 +298,11 @@ const pendingUploads = () => ipcRenderer.invoke("pendingUploads");
 const setPendingUploads = (pendingUploads: PendingUploads) =>
     ipcRenderer.invoke("setPendingUploads", pendingUploads);
 
-const markUploadedFiles = (paths: PendingUploads["filePaths"]) =>
-    ipcRenderer.invoke("markUploadedFiles", paths);
+const markUploadedFile = (path: string, associatedPath?: string) =>
+    ipcRenderer.invoke("markUploadedFile", path, associatedPath);
 
-const markUploadedZipItems = (items: PendingUploads["zipItems"]) =>
-    ipcRenderer.invoke("markUploadedZipItems", items);
+const markUploadedZipItem = (item: ZipItem, associatedItem?: ZipItem) =>
+    ipcRenderer.invoke("markUploadedZipItem", item, associatedItem);
 
 const clearPendingUploads = () => ipcRenderer.invoke("clearPendingUploads");
 
@@ -332,7 +344,7 @@ const clearPendingUploads = () => ipcRenderer.invoke("clearPendingUploads");
  * >
  * > https://www.electronjs.org/docs/latest/api/context-bridge#methods
  *
- * The copy itself is relatively fast, but the problem with transfering large
+ * The copy itself is relatively fast, but the problem with transferring large
  * amounts of data is potentially running out of memory during the copy.
  *
  * For an alternative, see [Note: IPC streams].
@@ -347,8 +359,8 @@ contextBridge.exposeInMainWorld("electron", {
     selectDirectory,
     pathForFile,
     logout,
-    masterKeyB64,
-    saveMasterKeyB64,
+    masterKeyFromSafeStorage,
+    saveMasterKeyInSafeStorage,
     lastShownChangelogVersion,
     setLastShownChangelogVersion,
     isAutoLaunchEnabled,
@@ -373,7 +385,9 @@ contextBridge.exposeInMainWorld("electron", {
         rm: fsRm,
         readTextFile: fsReadTextFile,
         writeFile: fsWriteFile,
+        writeFileViaBackup: fsWriteFileViaBackup,
         isDir: fsIsDir,
+        statMtime: fsStatMtime,
         findFiles: fsFindFiles,
     },
 
@@ -382,10 +396,11 @@ contextBridge.exposeInMainWorld("electron", {
     convertToJPEG,
     generateImageThumbnail,
     ffmpegExec,
+    ffmpegDetermineVideoDuration,
 
     // - ML
 
-    createMLWorker,
+    triggerCreateUtilityProcess,
 
     // - Watch
 
@@ -406,7 +421,7 @@ contextBridge.exposeInMainWorld("electron", {
     pathOrZipItemSize,
     pendingUploads,
     setPendingUploads,
-    markUploadedFiles,
-    markUploadedZipItems,
+    markUploadedFile,
+    markUploadedZipItem,
     clearPendingUploads,
 });