refactor: rename TimelineAsset -> Asset

.github/workflows/build-mobile.yml

@@ -55,7 +55,7 @@ jobs:
     runs-on: mich
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ inputs.ref || github.sha }}
           persist-credentials: false
@@ -66,7 +66,7 @@ jobs:
         working-directory: ./mobile
         run: printf "%s" $KEY_JKS | base64 -d > android/key.jks
 
-      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'zulu'
           java-version: '17'

.github/workflows/cache-cleanup.yml

@@ -19,7 +19,7 @@ jobs:
       actions: write
     steps:
       - name: Check out code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 

.github/workflows/cli.yml

@@ -29,7 +29,7 @@ jobs:
         working-directory: ./cli
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 
@@ -37,7 +37,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './cli/.nvmrc'
           registry-url: 'https://registry.npmjs.org'
@@ -65,7 +65,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 

.github/workflows/docs-build.yml

@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 
@@ -55,7 +55,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './docs/.nvmrc'
           cache: 'pnpm'

.github/workflows/docs-deploy.yml

@@ -20,7 +20,7 @@ jobs:
         run: echo 'The triggering workflow did not succeed' && exit 1
       - name: Get artifact
         id: get-artifact
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         with:
           script: |
             let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -38,7 +38,7 @@ jobs:
             return { found: true, id: matchArtifact.id };
       - name: Determine deploy parameters
         id: parameters
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         env:
           HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
         with:
@@ -108,13 +108,13 @@ jobs:
     if: ${{ fromJson(needs.checks.outputs.artifact).found && fromJson(needs.checks.outputs.parameters).shouldDeploy }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 
       - name: Load parameters
         id: parameters
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         env:
           PARAM_JSON: ${{ needs.checks.outputs.parameters }}
         with:
@@ -125,7 +125,7 @@ jobs:
             core.setOutput("shouldDeploy", parameters.shouldDeploy);
 
       - name: Download artifact
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         env:
           ARTIFACT_JSON: ${{ needs.checks.outputs.artifact }}
         with:

.github/workflows/docs-destroy.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 

.github/workflows/fix-format.yml

@@ -22,7 +22,7 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: 'Checkout'
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           token: ${{ steps.generate-token.outputs.token }}
@@ -32,7 +32,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -48,7 +48,7 @@ jobs:
           message: 'chore: fix formatting'
 
       - name: Remove label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         if: always()
         with:
           script: |

.github/workflows/pr-labeler.yml

@@ -11,4 +11,4 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0

.github/workflows/prepare-release.yml

@@ -55,20 +55,20 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: true
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
+        uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
 
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -117,13 +117,13 @@ jobs:
           private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
 
       - name: Checkout
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           persist-credentials: false
 
       - name: Download APK
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: release-apk-signed
 

.github/workflows/preview-label.yaml

@@ -24,7 +24,7 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      - uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
         with:
           script: |
             github.rest.issues.removeLabel({

.github/workflows/sdk.yml

@@ -16,7 +16,7 @@ jobs:
       run:
         working-directory: ./open-api/typescript-sdk
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 
@@ -24,7 +24,7 @@ jobs:
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
 
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './open-api/typescript-sdk/.nvmrc'
           registry-url: 'https://registry.npmjs.org'

.github/workflows/static_analysis.yml

@@ -42,7 +42,7 @@ jobs:
         working-directory: ./mobile
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
 

.github/workflows/test.yml

@@ -56,13 +56,13 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -93,13 +93,13 @@ jobs:
         working-directory: ./cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -133,13 +133,13 @@ jobs:
         working-directory: ./cli
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './cli/.nvmrc'
           cache: 'pnpm'
@@ -168,13 +168,13 @@ jobs:
         working-directory: ./web
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -205,13 +205,13 @@ jobs:
         working-directory: ./web
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -236,13 +236,13 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './web/.nvmrc'
           cache: 'pnpm'
@@ -277,13 +277,13 @@ jobs:
         working-directory: ./e2e
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -316,13 +316,13 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -347,14 +347,14 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
           submodules: 'recursive'
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -395,14 +395,14 @@ jobs:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
           submodules: 'recursive'
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './e2e/.nvmrc'
           cache: 'pnpm'
@@ -441,7 +441,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup Flutter SDK
@@ -466,12 +466,12 @@ jobs:
       run:
         working-directory: ./machine-learning
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Install uv
-        uses: astral-sh/setup-uv@d0cc045d04ccac9d8b7881df0226f9e82c39688e # v6.8.0
-      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
+      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
         # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
         # with:
         #   python-version: 3.11
@@ -503,13 +503,13 @@ jobs:
         working-directory: ./.github
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './.github/.nvmrc'
           cache: 'pnpm'
@@ -525,7 +525,7 @@ jobs:
     permissions:
       contents: read
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Run ShellCheck
@@ -540,13 +540,13 @@ jobs:
       contents: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'
@@ -595,13 +595,13 @@ jobs:
         working-directory: ./server
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
         with:
           persist-credentials: false
       - name: Setup pnpm
         uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
       - name: Setup Node
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
         with:
           node-version-file: './server/.nvmrc'
           cache: 'pnpm'

docs/package.json

@@ -17,9 +17,9 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "~3.9.0",
-    "@docusaurus/preset-classic": "~3.9.0",
-    "@docusaurus/theme-common": "~3.9.0",
+    "@docusaurus/core": "~3.8.0",
+    "@docusaurus/preset-classic": "~3.8.0",
+    "@docusaurus/theme-common": "~3.8.0",
     "@mdi/js": "^7.3.67",
     "@mdi/react": "^1.6.1",
     "@mdx-js/react": "^3.0.0",
@@ -35,7 +35,7 @@
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "~3.9.0",
+    "@docusaurus/module-type-aliases": "~3.8.0",
     "@docusaurus/tsconfig": "^3.7.0",
     "@docusaurus/types": "^3.7.0",
     "prettier": "^3.2.4",

e2e/package.json

@@ -43,7 +43,7 @@
     "pngjs": "^7.0.0",
     "prettier": "^3.2.5",
     "prettier-plugin-organize-imports": "^4.0.0",
-    "sharp": "^0.34.4",
+    "sharp": "^0.34.3",
     "socket.io-client": "^4.7.4",
     "supertest": "^7.0.0",
     "typescript": "^5.3.3",
@@ -53,8 +53,5 @@
   },
   "volta": {
     "node": "22.20.0"
-  },
-  "dependencies": {
-    "structured-headers": "^2.0.2"
   }
 }

e2e/src/utils.ts

@@ -561,16 +561,6 @@ export const utils = {
     await utils.waitForQueueFinish(accessToken, 'sidecar');
     await utils.waitForQueueFinish(accessToken, 'metadataExtraction');
   },
-
-  downloadAsset: async (accessToken: string, id: string) => {
-    const downloadedRes = await fetch(`${baseUrl}/api/assets/${id}/original`, {
-      headers: asBearerAuth(accessToken),
-    });
-    if (!downloadedRes.ok) {
-      throw new Error(`Failed to download asset ${id}: ${downloadedRes.status} ${await downloadedRes.text()}`);
-    }
-    return await downloadedRes.blob();
-  },
 };
 
 utils.initSdk();

mise.toml

@@ -1,7 +1,7 @@
 [tools]
 node = "22.20.0"
 flutter = "3.35.5"
-pnpm = "10.18.0"
+pnpm = "10.15.1"
 
 [tools."github:CQLabs/homebrew-dcm"]
 version = "1.30.0"

mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt

@@ -304,7 +304,6 @@ interface NativeSyncApi {
   fun getAssetsCountSince(albumId: String, timestamp: Long): Long
   fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
-  fun uploadAsset(callback: (Result<Boolean>) -> Unit)
   fun cancelHashing()
 
   companion object {
@@ -468,24 +467,6 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
-      run {
-        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.uploadAsset$separatedMessageChannelSuffix", codec)
-        if (api != null) {
-          channel.setMessageHandler { _, reply ->
-            api.uploadAsset{ result: Result<Boolean> ->
-              val error = result.exceptionOrNull()
-              if (error != null) {
-                reply.reply(MessagesPigeonUtils.wrapError(error))
-              } else {
-                val data = result.getOrNull()
-                reply.reply(MessagesPigeonUtils.wrapResult(data))
-              }
-            }
-          }
-        } else {
-          channel.setMessageHandler(null)
-        }
-      }
       run {
         val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$separatedMessageChannelSuffix", codec)
         if (api != null) {

mobile/ios/Runner/Sync/Messages.g.swift

@@ -363,7 +363,6 @@ protocol NativeSyncApi {
   func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
-  func uploadAsset(completion: @escaping (Result<Bool, Error>) -> Void)
   func cancelHashing() throws
 }
 
@@ -520,21 +519,6 @@ class NativeSyncApiSetup {
     } else {
       hashAssetsChannel.setMessageHandler(nil)
     }
-    let uploadAssetChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.uploadAsset\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
-    if let api = api {
-      uploadAssetChannel.setMessageHandler { _, reply in
-        api.uploadAsset { result in
-          switch result {
-          case .success(let res):
-            reply(wrapResult(res))
-          case .failure(let error):
-            reply(wrapError(error))
-          }
-        }
-      }
-    } else {
-      uploadAssetChannel.setMessageHandler(nil)
-    }
     let cancelHashingChannel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
     if let api = api {
       cancelHashingChannel.setMessageHandler { _, reply in

mobile/ios/Runner/Sync/MessagesImpl.swift

@@ -363,38 +363,4 @@ class NativeSyncApiImpl: NativeSyncApi {
       PHAssetResourceManager.default().cancelDataRequest(requestId)
     })
   }
-
-  func uploadAsset(completion: @escaping (Result<Bool, Error>) -> Void) {
-    let bufferSize = 200 * 1024 * 1024
-    var buffer = Data(count: bufferSize)
-    buffer.withUnsafeMutableBytes { bufferPointer in
-        arc4random_buf(bufferPointer.baseAddress!, bufferSize)
-    }
-    var hasher = Insecure.SHA1()
-    hasher.update(data: buffer)
-    let checksum = Data(hasher.finalize()).base64EncodedString()
-    let tempDirectory = FileManager.default.temporaryDirectory
-
-    let tempFileURL = tempDirectory.appendingPathComponent("buffer.tmp")
-    do {
-        try buffer.write(to: tempFileURL)
-        print("File saved to: \(tempFileURL.path)")
-    } catch {
-        print("Error writing file: \(error)")
-        return completion(Result.failure(error))
-    }
-    
-    let config = URLSessionConfiguration.background(withIdentifier: "app.mertalev.immich.upload")
-    let session = URLSession(configuration: config)
-    
-    var request = URLRequest(url: URL(string: "https://<hardcoded-host>/api/upload")!)
-    request.httpMethod = "POST"
-    request.setValue("<hardcoded-api-key>", forHTTPHeaderField: "X-Api-Key")
-    request.setValue("filename=\"test-image.jpg\", device-asset-id=\"rufh\", device-id=\"test\", file-created-at=\"2025-01-02T00:00:00.000Z\", file-modified-at=\"2025-01-01T00:00:00.000Z\", is-favorite, icloud-id=\"example-icloud-id\"", forHTTPHeaderField: "X-Immich-Asset-Data")
-    request.setValue("sha=:\(checksum):", forHTTPHeaderField: "Repr-Digest")
-    
-    let task = session.uploadTask(with: request, fromFile: tempFileURL)
-    task.resume()
-    completion(Result.success(true))
-  }
 }

mobile/lib/pages/backup/drift_backup.page.dart

@@ -15,7 +15,6 @@ import 'package:immich_mobile/presentation/widgets/backup/backup_toggle_button.w
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup_album.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -142,84 +141,6 @@ class _DriftBackupPageState extends ConsumerState<DriftBackupPage> {
                       await stopBackup();
                     },
                   ),
-                  Container(
-                    margin: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
-                    decoration: BoxDecoration(
-                      borderRadius: const BorderRadius.all(Radius.circular(20)),
-                      gradient: LinearGradient(
-                        colors: [
-                          context.primaryColor.withValues(alpha: 0.5),
-                          context.primaryColor.withValues(alpha: 0.4),
-                          context.primaryColor.withValues(alpha: 0.5),
-                        ],
-                        stops: const [0.0, 0.5, 1.0],
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                      ),
-                      boxShadow: [
-                        BoxShadow(
-                          color: context.primaryColor.withValues(alpha: 0.1),
-                          blurRadius: 12,
-                          offset: const Offset(0, 2),
-                        ),
-                      ],
-                    ),
-                    child: Container(
-                      margin: const EdgeInsets.all(1.5),
-                      decoration: BoxDecoration(
-                        borderRadius: const BorderRadius.all(Radius.circular(18.5)),
-                        color: context.colorScheme.surfaceContainerLow,
-                      ),
-                      child: Material(
-                        color: context.colorScheme.surfaceContainerLow,
-                        borderRadius: const BorderRadius.all(Radius.circular(20.5)),
-                        child: InkWell(
-                          borderRadius: const BorderRadius.all(Radius.circular(20.5)),
-                          onTap: () => ref.read(nativeSyncApiProvider).uploadAsset(),
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 16),
-                            child: Row(
-                              children: [
-                                Container(
-                                  padding: const EdgeInsets.all(8),
-                                  decoration: BoxDecoration(
-                                    shape: BoxShape.circle,
-                                    gradient: LinearGradient(
-                                      colors: [
-                                        context.primaryColor.withValues(alpha: 0.2),
-                                        context.primaryColor.withValues(alpha: 0.1),
-                                      ],
-                                    ),
-                                  ),
-                                  child: Icon(Icons.upload, color: context.primaryColor, size: 24),
-                                ),
-                                const SizedBox(width: 16),
-                                Expanded(
-                                  child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
-                                    children: [
-                                      Row(
-                                        crossAxisAlignment: CrossAxisAlignment.center,
-                                        children: [
-                                          Text(
-                                            "Upload Asset (for testing)",
-                                            style: context.textTheme.titleMedium?.copyWith(
-                                              fontWeight: FontWeight.w600,
-                                              color: context.primaryColor,
-                                            ),
-                                          ),
-                                        ],
-                                      ),
-                                    ],
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
                   switch (error) {
                     BackupError.none => const SizedBox.shrink(),
                     BackupError.syncFailed => Padding(

mobile/lib/platform/native_sync_api.g.dart

@@ -540,34 +540,6 @@ class NativeSyncApi {
     }
   }
 
-  Future<bool> uploadAsset() async {
-    final String pigeonVar_channelName =
-        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.uploadAsset$pigeonVar_messageChannelSuffix';
-    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
-      pigeonVar_channelName,
-      pigeonChannelCodec,
-      binaryMessenger: pigeonVar_binaryMessenger,
-    );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
-    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
-    if (pigeonVar_replyList == null) {
-      throw _createConnectionError(pigeonVar_channelName);
-    } else if (pigeonVar_replyList.length > 1) {
-      throw PlatformException(
-        code: pigeonVar_replyList[0]! as String,
-        message: pigeonVar_replyList[1] as String?,
-        details: pigeonVar_replyList[2],
-      );
-    } else if (pigeonVar_replyList[0] == null) {
-      throw PlatformException(
-        code: 'null-error',
-        message: 'Host platform returned null value for non-null return value.',
-      );
-    } else {
-      return (pigeonVar_replyList[0] as bool?)!;
-    }
-  }
-
   Future<void> cancelHashing() async {
     final String pigeonVar_channelName =
         'dev.flutter.pigeon.immich_mobile.NativeSyncApi.cancelHashing$pigeonVar_messageChannelSuffix';

mobile/openapi/README.md

@@ -263,11 +263,6 @@ Class | Method | HTTP request | Description
 *TrashApi* | [**emptyTrash**](doc//TrashApi.md#emptytrash) | **POST** /trash/empty | 
 *TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | 
 *TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | 
-*UploadApi* | [**cancelUpload**](doc//UploadApi.md#cancelupload) | **DELETE** /upload/{id} | 
-*UploadApi* | [**getUploadOptions**](doc//UploadApi.md#getuploadoptions) | **OPTIONS** /upload | 
-*UploadApi* | [**getUploadStatus**](doc//UploadApi.md#getuploadstatus) | **HEAD** /upload/{id} | 
-*UploadApi* | [**resumeUpload**](doc//UploadApi.md#resumeupload) | **PATCH** /upload/{id} | 
-*UploadApi* | [**startUpload**](doc//UploadApi.md#startupload) | **POST** /upload | 
 *UsersApi* | [**createProfileImage**](doc//UsersApi.md#createprofileimage) | **POST** /users/profile-image | 
 *UsersApi* | [**deleteProfileImage**](doc//UsersApi.md#deleteprofileimage) | **DELETE** /users/profile-image | 
 *UsersApi* | [**deleteUserLicense**](doc//UsersApi.md#deleteuserlicense) | **DELETE** /users/me/license | 
@@ -577,8 +572,6 @@ Class | Method | HTTP request | Description
  - [UpdateAlbumUserDto](doc//UpdateAlbumUserDto.md)
  - [UpdateAssetDto](doc//UpdateAssetDto.md)
  - [UpdateLibraryDto](doc//UpdateLibraryDto.md)
- - [UploadBackupConfig](doc//UploadBackupConfig.md)
- - [UploadOkDto](doc//UploadOkDto.md)
  - [UsageByUserDto](doc//UsageByUserDto.md)
  - [UserAdminCreateDto](doc//UserAdminCreateDto.md)
  - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md)

mobile/openapi/lib/api.dart

@@ -60,7 +60,6 @@ part 'api/system_metadata_api.dart';
 part 'api/tags_api.dart';
 part 'api/timeline_api.dart';
 part 'api/trash_api.dart';
-part 'api/upload_api.dart';
 part 'api/users_api.dart';
 part 'api/users_admin_api.dart';
 part 'api/view_api.dart';
@@ -344,8 +343,6 @@ part 'model/update_album_dto.dart';
 part 'model/update_album_user_dto.dart';
 part 'model/update_asset_dto.dart';
 part 'model/update_library_dto.dart';
-part 'model/upload_backup_config.dart';
-part 'model/upload_ok_dto.dart';
 part 'model/usage_by_user_dto.dart';
 part 'model/user_admin_create_dto.dart';
 part 'model/user_admin_delete_dto.dart';

mobile/openapi/lib/api/upload_api.dart

@@ -1,379 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class UploadApi {
-  UploadApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
-
-  final ApiClient apiClient;
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<Response> cancelUploadWithHttpInfo(String id, { String? key, String? slug, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/upload/{id}'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'DELETE',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<void> cancelUpload(String id, { String? key, String? slug, }) async {
-    final response = await cancelUploadWithHttpInfo(id,  key: key, slug: slug, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Performs an HTTP 'OPTIONS /upload' operation and returns the [Response].
-  Future<Response> getUploadOptionsWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/upload';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'OPTIONS',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  Future<void> getUploadOptions() async {
-    final response = await getUploadOptionsWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] uploadDraftInteropVersion (required):
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<Response> getUploadStatusWithHttpInfo(String id, String uploadDraftInteropVersion, { String? key, String? slug, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/upload/{id}'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    headerParams[r'upload-draft-interop-version'] = parameterToString(uploadDraftInteropVersion);
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'HEAD',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] uploadDraftInteropVersion (required):
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<void> getUploadStatus(String id, String uploadDraftInteropVersion, { String? key, String? slug, }) async {
-    final response = await getUploadStatusWithHttpInfo(id, uploadDraftInteropVersion,  key: key, slug: slug, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] contentLength (required):
-  ///   Non-negative size of the request body in bytes.
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] uploadComplete (required):
-  ///   Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.
-  ///
-  /// * [String] uploadDraftInteropVersion (required):
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  ///
-  /// * [String] uploadOffset (required):
-  ///   Non-negative byte offset indicating the starting position of the data in the request body within the entire file.
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<Response> resumeUploadWithHttpInfo(String contentLength, String id, String uploadComplete, String uploadDraftInteropVersion, String uploadOffset, { String? key, String? slug, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/upload/{id}'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    headerParams[r'content-length'] = parameterToString(contentLength);
-    headerParams[r'upload-complete'] = parameterToString(uploadComplete);
-    headerParams[r'upload-draft-interop-version'] = parameterToString(uploadDraftInteropVersion);
-    headerParams[r'upload-offset'] = parameterToString(uploadOffset);
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'PATCH',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] contentLength (required):
-  ///   Non-negative size of the request body in bytes.
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [String] uploadComplete (required):
-  ///   Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.
-  ///
-  /// * [String] uploadDraftInteropVersion (required):
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  ///
-  /// * [String] uploadOffset (required):
-  ///   Non-negative byte offset indicating the starting position of the data in the request body within the entire file.
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  Future<UploadOkDto?> resumeUpload(String contentLength, String id, String uploadComplete, String uploadDraftInteropVersion, String uploadOffset, { String? key, String? slug, }) async {
-    final response = await resumeUploadWithHttpInfo(contentLength, id, uploadComplete, uploadDraftInteropVersion, uploadOffset,  key: key, slug: slug, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UploadOkDto',) as UploadOkDto;
-    
-    }
-    return null;
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Note: This method returns the HTTP [Response].
-  ///
-  /// Parameters:
-  ///
-  /// * [String] contentLength (required):
-  ///   Non-negative size of the request body in bytes.
-  ///
-  /// * [String] reprDigest (required):
-  ///   RFC 9651 structured dictionary containing an `sha` (bytesequence) checksum used to detect duplicate files and validate data integrity.
-  ///
-  /// * [String] xImmichAssetData (required):
-  ///   RFC 9651 structured dictionary containing asset metadata with the following keys: - device-asset-id (string, required): Unique device asset identifier - device-id (string, required): Device identifier - file-created-at (string/date, required): ISO 8601 date string or Unix timestamp - file-modified-at (string/date, required): ISO 8601 date string or Unix timestamp - filename (string, required): Original filename - is-favorite (boolean, optional): Favorite status - live-photo-video-id (string, optional): Live photo ID for assets from iOS devices - icloud-id (string, optional): iCloud identifier for assets from iOS devices
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] uploadComplete:
-  ///   Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.
-  ///
-  /// * [String] uploadDraftInteropVersion:
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  Future<Response> startUploadWithHttpInfo(String contentLength, String reprDigest, String xImmichAssetData, { String? key, String? slug, String? uploadComplete, String? uploadDraftInteropVersion, }) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/upload';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (key != null) {
-      queryParams.addAll(_queryParams('', 'key', key));
-    }
-    if (slug != null) {
-      queryParams.addAll(_queryParams('', 'slug', slug));
-    }
-
-    headerParams[r'content-length'] = parameterToString(contentLength);
-    headerParams[r'repr-digest'] = parameterToString(reprDigest);
-    if (uploadComplete != null) {
-      headerParams[r'upload-complete'] = parameterToString(uploadComplete);
-    }
-    if (uploadDraftInteropVersion != null) {
-      headerParams[r'upload-draft-interop-version'] = parameterToString(uploadDraftInteropVersion);
-    }
-    headerParams[r'x-immich-asset-data'] = parameterToString(xImmichAssetData);
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// This endpoint requires the `asset.upload` permission.
-  ///
-  /// Parameters:
-  ///
-  /// * [String] contentLength (required):
-  ///   Non-negative size of the request body in bytes.
-  ///
-  /// * [String] reprDigest (required):
-  ///   RFC 9651 structured dictionary containing an `sha` (bytesequence) checksum used to detect duplicate files and validate data integrity.
-  ///
-  /// * [String] xImmichAssetData (required):
-  ///   RFC 9651 structured dictionary containing asset metadata with the following keys: - device-asset-id (string, required): Unique device asset identifier - device-id (string, required): Device identifier - file-created-at (string/date, required): ISO 8601 date string or Unix timestamp - file-modified-at (string/date, required): ISO 8601 date string or Unix timestamp - filename (string, required): Original filename - is-favorite (boolean, optional): Favorite status - live-photo-video-id (string, optional): Live photo ID for assets from iOS devices - icloud-id (string, optional): iCloud identifier for assets from iOS devices
-  ///
-  /// * [String] key:
-  ///
-  /// * [String] slug:
-  ///
-  /// * [String] uploadComplete:
-  ///   Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.
-  ///
-  /// * [String] uploadDraftInteropVersion:
-  ///   Indicates the version of the RUFH protocol supported by the client.
-  Future<UploadOkDto?> startUpload(String contentLength, String reprDigest, String xImmichAssetData, { String? key, String? slug, String? uploadComplete, String? uploadDraftInteropVersion, }) async {
-    final response = await startUploadWithHttpInfo(contentLength, reprDigest, xImmichAssetData,  key: key, slug: slug, uploadComplete: uploadComplete, uploadDraftInteropVersion: uploadDraftInteropVersion, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UploadOkDto',) as UploadOkDto;
-    
-    }
-    return null;
-  }
-}

mobile/openapi/lib/api_client.dart

@@ -740,10 +740,6 @@ class ApiClient {
           return UpdateAssetDto.fromJson(value);
         case 'UpdateLibraryDto':
           return UpdateLibraryDto.fromJson(value);
-        case 'UploadBackupConfig':
-          return UploadBackupConfig.fromJson(value);
-        case 'UploadOkDto':
-          return UploadOkDto.fromJson(value);
         case 'UsageByUserDto':
           return UsageByUserDto.fromJson(value);
         case 'UserAdminCreateDto':

mobile/openapi/lib/model/system_config_backups_dto.dart

@@ -14,31 +14,25 @@ class SystemConfigBackupsDto {
   /// Returns a new [SystemConfigBackupsDto] instance.
   SystemConfigBackupsDto({
     required this.database,
-    required this.upload,
   });
 
   DatabaseBackupConfig database;
 
-  UploadBackupConfig upload;
-
   @override
   bool operator ==(Object other) => identical(this, other) || other is SystemConfigBackupsDto &&
-    other.database == database &&
-    other.upload == upload;
+    other.database == database;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
-    (database.hashCode) +
-    (upload.hashCode);
+    (database.hashCode);
 
   @override
-  String toString() => 'SystemConfigBackupsDto[database=$database, upload=$upload]';
+  String toString() => 'SystemConfigBackupsDto[database=$database]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'database'] = this.database;
-      json[r'upload'] = this.upload;
     return json;
   }
 
@@ -52,7 +46,6 @@ class SystemConfigBackupsDto {
 
       return SystemConfigBackupsDto(
         database: DatabaseBackupConfig.fromJson(json[r'database'])!,
-        upload: UploadBackupConfig.fromJson(json[r'upload'])!,
       );
     }
     return null;
@@ -101,7 +94,6 @@ class SystemConfigBackupsDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'database',
-    'upload',
   };
 }
 

mobile/openapi/lib/model/system_config_nightly_tasks_dto.dart

@@ -17,7 +17,6 @@ class SystemConfigNightlyTasksDto {
     required this.databaseCleanup,
     required this.generateMemories,
     required this.missingThumbnails,
-    required this.removeStaleUploads,
     required this.startTime,
     required this.syncQuotaUsage,
   });
@@ -30,8 +29,6 @@ class SystemConfigNightlyTasksDto {
 
   bool missingThumbnails;
 
-  bool removeStaleUploads;
-
   String startTime;
 
   bool syncQuotaUsage;
@@ -42,7 +39,6 @@ class SystemConfigNightlyTasksDto {
     other.databaseCleanup == databaseCleanup &&
     other.generateMemories == generateMemories &&
     other.missingThumbnails == missingThumbnails &&
-    other.removeStaleUploads == removeStaleUploads &&
     other.startTime == startTime &&
     other.syncQuotaUsage == syncQuotaUsage;
 
@@ -53,12 +49,11 @@ class SystemConfigNightlyTasksDto {
     (databaseCleanup.hashCode) +
     (generateMemories.hashCode) +
     (missingThumbnails.hashCode) +
-    (removeStaleUploads.hashCode) +
     (startTime.hashCode) +
     (syncQuotaUsage.hashCode);
 
   @override
-  String toString() => 'SystemConfigNightlyTasksDto[clusterNewFaces=$clusterNewFaces, databaseCleanup=$databaseCleanup, generateMemories=$generateMemories, missingThumbnails=$missingThumbnails, removeStaleUploads=$removeStaleUploads, startTime=$startTime, syncQuotaUsage=$syncQuotaUsage]';
+  String toString() => 'SystemConfigNightlyTasksDto[clusterNewFaces=$clusterNewFaces, databaseCleanup=$databaseCleanup, generateMemories=$generateMemories, missingThumbnails=$missingThumbnails, startTime=$startTime, syncQuotaUsage=$syncQuotaUsage]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -66,7 +61,6 @@ class SystemConfigNightlyTasksDto {
       json[r'databaseCleanup'] = this.databaseCleanup;
       json[r'generateMemories'] = this.generateMemories;
       json[r'missingThumbnails'] = this.missingThumbnails;
-      json[r'removeStaleUploads'] = this.removeStaleUploads;
       json[r'startTime'] = this.startTime;
       json[r'syncQuotaUsage'] = this.syncQuotaUsage;
     return json;
@@ -85,7 +79,6 @@ class SystemConfigNightlyTasksDto {
         databaseCleanup: mapValueOfType<bool>(json, r'databaseCleanup')!,
         generateMemories: mapValueOfType<bool>(json, r'generateMemories')!,
         missingThumbnails: mapValueOfType<bool>(json, r'missingThumbnails')!,
-        removeStaleUploads: mapValueOfType<bool>(json, r'removeStaleUploads')!,
         startTime: mapValueOfType<String>(json, r'startTime')!,
         syncQuotaUsage: mapValueOfType<bool>(json, r'syncQuotaUsage')!,
       );
@@ -139,7 +132,6 @@ class SystemConfigNightlyTasksDto {
     'databaseCleanup',
     'generateMemories',
     'missingThumbnails',
-    'removeStaleUploads',
     'startTime',
     'syncQuotaUsage',
   };

mobile/openapi/lib/model/upload_backup_config.dart

@@ -1,100 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class UploadBackupConfig {
-  /// Returns a new [UploadBackupConfig] instance.
-  UploadBackupConfig({
-    required this.maxAgeHours,
-  });
-
-  /// Minimum value: 1
-  num maxAgeHours;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is UploadBackupConfig &&
-    other.maxAgeHours == maxAgeHours;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (maxAgeHours.hashCode);
-
-  @override
-  String toString() => 'UploadBackupConfig[maxAgeHours=$maxAgeHours]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'maxAgeHours'] = this.maxAgeHours;
-    return json;
-  }
-
-  /// Returns a new [UploadBackupConfig] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static UploadBackupConfig? fromJson(dynamic value) {
-    upgradeDto(value, "UploadBackupConfig");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return UploadBackupConfig(
-        maxAgeHours: num.parse('${json[r'maxAgeHours']}'),
-      );
-    }
-    return null;
-  }
-
-  static List<UploadBackupConfig> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UploadBackupConfig>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = UploadBackupConfig.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, UploadBackupConfig> mapFromJson(dynamic json) {
-    final map = <String, UploadBackupConfig>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = UploadBackupConfig.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of UploadBackupConfig-objects as value to a dart map
-  static Map<String, List<UploadBackupConfig>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UploadBackupConfig>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = UploadBackupConfig.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'maxAgeHours',
-  };
-}
-

mobile/openapi/lib/model/upload_ok_dto.dart

@@ -1,99 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class UploadOkDto {
-  /// Returns a new [UploadOkDto] instance.
-  UploadOkDto({
-    required this.id,
-  });
-
-  String id;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is UploadOkDto &&
-    other.id == id;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (id.hashCode);
-
-  @override
-  String toString() => 'UploadOkDto[id=$id]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'id'] = this.id;
-    return json;
-  }
-
-  /// Returns a new [UploadOkDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static UploadOkDto? fromJson(dynamic value) {
-    upgradeDto(value, "UploadOkDto");
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return UploadOkDto(
-        id: mapValueOfType<String>(json, r'id')!,
-      );
-    }
-    return null;
-  }
-
-  static List<UploadOkDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UploadOkDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = UploadOkDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, UploadOkDto> mapFromJson(dynamic json) {
-    final map = <String, UploadOkDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = UploadOkDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of UploadOkDto-objects as value to a dart map
-  static Map<String, List<UploadOkDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UploadOkDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = UploadOkDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'id',
-  };
-}
-

mobile/pigeon/native_sync_api.dart

@@ -106,8 +106,5 @@ abstract class NativeSyncApi {
   @TaskQueue(type: TaskQueueType.serialBackgroundThread)
   List<HashResult> hashAssets(List<String> assetIds, {bool allowNetworkAccess = false});
 
-  @async
-  bool uploadAsset();
-
   void cancelHashing();
 }

open-api/immich-openapi-specs.json

@@ -9225,324 +9225,6 @@
         "description": "This endpoint requires the `asset.delete` permission."
       }
     },
-    "/upload": {
-      "options": {
-        "operationId": "getUploadOptions",
-        "parameters": [],
-        "responses": {
-          "204": {
-            "description": ""
-          }
-        },
-        "tags": [
-          "Upload"
-        ]
-      },
-      "post": {
-        "operationId": "startUpload",
-        "parameters": [
-          {
-            "name": "content-length",
-            "in": "header",
-            "description": "Non-negative size of the request body in bytes.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "repr-digest",
-            "in": "header",
-            "description": "RFC 9651 structured dictionary containing an `sha` (bytesequence) checksum used to detect duplicate files and validate data integrity.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-complete",
-            "in": "header",
-            "description": "Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-draft-interop-version",
-            "in": "header",
-            "description": "Indicates the version of the RUFH protocol supported by the client.",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "x-immich-asset-data",
-            "in": "header",
-            "description": "RFC 9651 structured dictionary containing asset metadata with the following keys:\n- device-asset-id (string, required): Unique device asset identifier\n- device-id (string, required): Device identifier\n- file-created-at (string/date, required): ISO 8601 date string or Unix timestamp\n- file-modified-at (string/date, required): ISO 8601 date string or Unix timestamp\n- filename (string, required): Original filename\n- is-favorite (boolean, optional): Favorite status\n- live-photo-video-id (string, optional): Live photo ID for assets from iOS devices\n- icloud-id (string, optional): iCloud identifier for assets from iOS devices",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UploadOkDto"
-                }
-              }
-            },
-            "description": ""
-          },
-          "201": {
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "Upload"
-        ],
-        "x-immich-permission": "asset.upload",
-        "description": "This endpoint requires the `asset.upload` permission."
-      }
-    },
-    "/upload/{id}": {
-      "delete": {
-        "operationId": "cancelUpload",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "Upload"
-        ],
-        "x-immich-permission": "asset.upload",
-        "description": "This endpoint requires the `asset.upload` permission."
-      },
-      "head": {
-        "operationId": "getUploadStatus",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-draft-interop-version",
-            "in": "header",
-            "description": "Indicates the version of the RUFH protocol supported by the client.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "Upload"
-        ],
-        "x-immich-permission": "asset.upload",
-        "description": "This endpoint requires the `asset.upload` permission."
-      },
-      "patch": {
-        "operationId": "resumeUpload",
-        "parameters": [
-          {
-            "name": "content-length",
-            "in": "header",
-            "description": "Non-negative size of the request body in bytes.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "slug",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-complete",
-            "in": "header",
-            "description": "Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-draft-interop-version",
-            "in": "header",
-            "description": "Indicates the version of the RUFH protocol supported by the client.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "upload-offset",
-            "in": "header",
-            "description": "Non-negative byte offset indicating the starting position of the data in the request body within the entire file.",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UploadOkDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "Upload"
-        ],
-        "x-immich-permission": "asset.upload",
-        "description": "This endpoint requires the `asset.upload` permission."
-      }
-    },
     "/users": {
       "get": {
         "operationId": "searchUsers",
@@ -16296,14 +15978,10 @@
         "properties": {
           "database": {
             "$ref": "#/components/schemas/DatabaseBackupConfig"
-          },
-          "upload": {
-            "$ref": "#/components/schemas/UploadBackupConfig"
           }
         },
         "required": [
-          "database",
-          "upload"
+          "database"
         ],
         "type": "object"
       },
@@ -16828,9 +16506,6 @@
           "missingThumbnails": {
             "type": "boolean"
           },
-          "removeStaleUploads": {
-            "type": "boolean"
-          },
           "startTime": {
             "type": "string"
           },
@@ -16843,7 +16518,6 @@
           "databaseCleanup",
           "generateMemories",
           "missingThumbnails",
-          "removeStaleUploads",
           "startTime",
           "syncQuotaUsage"
         ],
@@ -17692,29 +17366,6 @@
         },
         "type": "object"
       },
-      "UploadBackupConfig": {
-        "properties": {
-          "maxAgeHours": {
-            "minimum": 1,
-            "type": "number"
-          }
-        },
-        "required": [
-          "maxAgeHours"
-        ],
-        "type": "object"
-      },
-      "UploadOkDto": {
-        "properties": {
-          "id": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "id"
-        ],
-        "type": "object"
-      },
       "UsageByUserDto": {
         "properties": {
           "photos": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -1309,12 +1309,8 @@ export type DatabaseBackupConfig = {
     enabled: boolean;
     keepLastAmount: number;
 };
-export type UploadBackupConfig = {
-    maxAgeHours: number;
-};
 export type SystemConfigBackupsDto = {
     database: DatabaseBackupConfig;
-    upload: UploadBackupConfig;
 };
 export type SystemConfigFFmpegDto = {
     accel: TranscodeHWAccel;
@@ -1434,7 +1430,6 @@ export type SystemConfigNightlyTasksDto = {
     databaseCleanup: boolean;
     generateMemories: boolean;
     missingThumbnails: boolean;
-    removeStaleUploads: boolean;
     startTime: string;
     syncQuotaUsage: boolean;
 };
@@ -1600,9 +1595,6 @@ export type TimeBucketsResponseDto = {
 export type TrashResponseDto = {
     count: number;
 };
-export type UploadOkDto = {
-    id: string;
-};
 export type UserUpdateMeDto = {
     avatarColor?: (UserAvatarColor) | null;
     email?: string;
@@ -4425,109 +4417,6 @@ export function restoreAssets({ bulkIdsDto }: {
         body: bulkIdsDto
     })));
 }
-export function getUploadOptions(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText("/upload", {
-        ...opts,
-        method: "OPTIONS"
-    }));
-}
-/**
- * This endpoint requires the `asset.upload` permission.
- */
-export function startUpload({ contentLength, key, reprDigest, slug, uploadComplete, uploadDraftInteropVersion, xImmichAssetData }: {
-    contentLength: string;
-    key?: string;
-    reprDigest: string;
-    slug?: string;
-    uploadComplete?: string;
-    uploadDraftInteropVersion?: string;
-    xImmichAssetData: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UploadOkDto;
-    } | {
-        status: 201;
-    }>(`/upload${QS.query(QS.explode({
-        key,
-        slug
-    }))}`, {
-        ...opts,
-        method: "POST",
-        headers: oazapfts.mergeHeaders(opts?.headers, {
-            "content-length": contentLength,
-            "repr-digest": reprDigest,
-            "upload-complete": uploadComplete,
-            "upload-draft-interop-version": uploadDraftInteropVersion,
-            "x-immich-asset-data": xImmichAssetData
-        })
-    }));
-}
-/**
- * This endpoint requires the `asset.upload` permission.
- */
-export function cancelUpload({ id, key, slug }: {
-    id: string;
-    key?: string;
-    slug?: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText(`/upload/${encodeURIComponent(id)}${QS.query(QS.explode({
-        key,
-        slug
-    }))}`, {
-        ...opts,
-        method: "DELETE"
-    }));
-}
-/**
- * This endpoint requires the `asset.upload` permission.
- */
-export function getUploadStatus({ id, key, slug, uploadDraftInteropVersion }: {
-    id: string;
-    key?: string;
-    slug?: string;
-    uploadDraftInteropVersion: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchText(`/upload/${encodeURIComponent(id)}${QS.query(QS.explode({
-        key,
-        slug
-    }))}`, {
-        ...opts,
-        method: "HEAD",
-        headers: oazapfts.mergeHeaders(opts?.headers, {
-            "upload-draft-interop-version": uploadDraftInteropVersion
-        })
-    }));
-}
-/**
- * This endpoint requires the `asset.upload` permission.
- */
-export function resumeUpload({ contentLength, id, key, slug, uploadComplete, uploadDraftInteropVersion, uploadOffset }: {
-    contentLength: string;
-    id: string;
-    key?: string;
-    slug?: string;
-    uploadComplete: string;
-    uploadDraftInteropVersion: string;
-    uploadOffset: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UploadOkDto;
-    }>(`/upload/${encodeURIComponent(id)}${QS.query(QS.explode({
-        key,
-        slug
-    }))}`, {
-        ...opts,
-        method: "PATCH",
-        headers: oazapfts.mergeHeaders(opts?.headers, {
-            "content-length": contentLength,
-            "upload-complete": uploadComplete,
-            "upload-draft-interop-version": uploadDraftInteropVersion,
-            "upload-offset": uploadOffset
-        })
-    }));
-}
 /**
  * This endpoint requires the `user.read` permission.
  */

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Monorepo for Immich",
   "private": true,
-  "packageManager": "pnpm@10.18.0+sha512.e804f889f1cecc40d572db084eec3e4881739f8dec69c0ff10d2d1beff9a4e309383ba27b5b750059d7f4c149535b6cd0d2cb1ed3aeb739239a4284a68f40cfa",
+  "packageManager": "pnpm@10.15.1+sha512.34e538c329b5553014ca8e8f4535997f96180a1d0f614339357449935350d924e22f8614682191264ec33d1462ac21561aff97f6bb18065351c162c7e8f6de67",
   "engines": {
     "pnpm": ">=10.0.0"
   }

pnpm-workspace.yaml

@@ -27,7 +27,7 @@ onlyBuiltDependencies:
   - '@tailwindcss/oxide'
 overrides:
   canvas: 2.11.2
-  sharp: ^0.34.4
+  sharp: ^0.34.3
 packageExtensions:
   nestjs-kysely:
     dependencies:

renovate.json

@@ -21,11 +21,6 @@
       "addLabels": [
         "📱mobile"
       ]
-    },
-    {
-      "matchPackageNames": ["ghcr.io/immich-app/postgres"],
-      "matchUpdateTypes": ["major"],
-      "enabled": false
     }
   ],
   "ignorePaths": [

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:202510092146@sha256:124ec9659cba4a206924de5e3691f84acde16d75fa2b10b7007542424b696b96 AS builder
+FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp \
@@ -48,7 +48,7 @@ RUN --mount=type=cache,id=pnpm-cli,target=/buildcache/pnpm-store \
   pnpm --filter @immich/sdk --filter @immich/cli build && \
   pnpm --filter @immich/cli --prod --no-optional deploy /output/cli-pruned
 
-FROM ghcr.io/immich-app/base-server-prod:202510092146@sha256:c39b9ad949e7777bce415e6931334aeff7331e04cb7f9df93f9ae44f6ff36b9e
+FROM ghcr.io/immich-app/base-server-prod:202509210934@sha256:0c7eacf0ba88ca52e1a267cfc62d20d07792ea2c604818c2cbd37dc7dcefdac9
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \

server/Dockerfile.dev

@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202510092146@sha256:124ec9659cba4a206924de5e3691f84acde16d75fa2b10b7007542424b696b96 AS dev
+FROM ghcr.io/immich-app/base-server-dev:202509210934@sha256:b5ce2d7eaf379d4cf15efd4bab180d8afc8a80d20b36c9800f4091aca6ae267e AS dev
 
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \

server/package.json

@@ -47,7 +47,7 @@
     "@opentelemetry/exporter-prometheus": "^0.205.0",
     "@opentelemetry/instrumentation-http": "^0.205.0",
     "@opentelemetry/instrumentation-ioredis": "^0.53.0",
-    "@opentelemetry/instrumentation-nestjs-core": "^0.52.0",
+    "@opentelemetry/instrumentation-nestjs-core": "^0.51.0",
     "@opentelemetry/instrumentation-pg": "^0.58.0",
     "@opentelemetry/resources": "^2.0.1",
     "@opentelemetry/sdk-metrics": "^2.0.1",
@@ -67,7 +67,7 @@
     "compression": "^1.8.0",
     "cookie": "^1.0.2",
     "cookie-parser": "^1.4.7",
-    "cron": "4.3.3",
+    "cron": "4.3.0",
     "exiftool-vendored": "^28.8.0",
     "express": "^5.1.0",
     "fast-glob": "^3.3.2",
@@ -85,7 +85,7 @@
     "multer": "^2.0.2",
     "nest-commander": "^3.16.0",
     "nestjs-cls": "^5.0.0",
-    "nestjs-kysely": "3.0.0",
+    "nestjs-kysely": "^3.0.0",
     "nestjs-otel": "^7.0.0",
     "nodemailer": "^7.0.0",
     "openid-client": "^6.3.3",
@@ -101,10 +101,9 @@
     "sanitize-filename": "^1.6.3",
     "sanitize-html": "^2.14.0",
     "semver": "^7.6.2",
-    "sharp": "^0.34.4",
+    "sharp": "^0.34.3",
     "sirv": "^3.0.0",
     "socket.io": "^4.8.1",
-    "structured-headers": "^2.0.2",
     "tailwindcss-preset-email": "^1.4.0",
     "thumbhash": "^0.1.1",
     "ua-parser-js": "^2.0.0",
@@ -165,6 +164,6 @@
     "node": "22.20.0"
   },
   "overrides": {
-    "sharp": "^0.34.4"
+    "sharp": "^0.34.3"
   }
 }

server/src/config.ts

@@ -22,9 +22,6 @@ export interface SystemConfig {
       cronExpression: string;
       keepLastAmount: number;
     };
-    upload: {
-      maxAgeHours: number;
-    };
   };
   ffmpeg: {
     crf: number;
@@ -136,7 +133,6 @@ export interface SystemConfig {
     clusterNewFaces: boolean;
     generateMemories: boolean;
     syncQuotaUsage: boolean;
-    removeStaleUploads: boolean;
   };
   trash: {
     enabled: boolean;
@@ -194,9 +190,6 @@ export const defaults = Object.freeze<SystemConfig>({
       cronExpression: CronExpression.EVERY_DAY_AT_2AM,
       keepLastAmount: 14,
     },
-    upload: {
-      maxAgeHours: 72,
-    },
   },
   ffmpeg: {
     crf: 23,
@@ -332,7 +325,6 @@ export const defaults = Object.freeze<SystemConfig>({
     syncQuotaUsage: true,
     missingThumbnails: true,
     clusterNewFaces: true,
-    removeStaleUploads: true,
   },
   trash: {
     enabled: true,

server/src/controllers/asset-upload.controller.spec.ts

@@ -1,445 +0,0 @@
-import { createHash, randomUUID } from 'node:crypto';
-import { AssetUploadController } from 'src/controllers/asset-upload.controller';
-import { AssetUploadService } from 'src/services/asset-upload.service';
-import { serializeDictionary } from 'structured-headers';
-import request from 'supertest';
-import { factory } from 'test/small.factory';
-import { ControllerContext, controllerSetup, mockBaseService } from 'test/utils';
-
-const makeAssetData = (overrides?: Partial<any>): string => {
-  return serializeDictionary({
-    filename: 'test-image.jpg',
-    'device-asset-id': 'test-asset-id',
-    'device-id': 'test-device',
-    'file-created-at': new Date('2025-01-02T00:00:00Z').toISOString(),
-    'file-modified-at': new Date('2025-01-01T00:00:00Z').toISOString(),
-    'is-favorite': false,
-    ...overrides,
-  });
-};
-
-describe(AssetUploadController.name, () => {
-  let ctx: ControllerContext;
-  let buffer: Buffer;
-  let checksum: string;
-  const service = mockBaseService(AssetUploadService);
-
-  beforeAll(async () => {
-    ctx = await controllerSetup(AssetUploadController, [{ provide: AssetUploadService, useValue: service }]);
-    return () => ctx.close();
-  });
-
-  beforeEach(() => {
-    service.resetAllMocks();
-    service.startUpload.mockImplementation((_, __, res, ___) => {
-      res.send();
-      return Promise.resolve();
-    });
-    service.resumeUpload.mockImplementation((_, __, res, ___, ____) => {
-      res.send();
-      return Promise.resolve();
-    });
-    service.cancelUpload.mockImplementation((_, __, res) => {
-      res.send();
-      return Promise.resolve();
-    });
-    service.getUploadStatus.mockImplementation((_, res, __, ___) => {
-      res.send();
-      return Promise.resolve();
-    });
-    ctx.reset();
-
-    buffer = Buffer.from(randomUUID());
-    checksum = `sha=:${createHash('sha1').update(buffer).digest('base64')}:`;
-  });
-
-  describe('POST /upload', () => {
-    it('should be an authenticated route', async () => {
-      await request(ctx.getHttpServer()).post('/upload');
-      expect(ctx.authenticate).toHaveBeenCalled();
-    });
-
-    it('should require at least version 3 of Upload-Draft-Interop-Version header if provided', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Upload-Draft-Interop-Version', '2')
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining(['version must not be less than 3']),
-        }),
-      );
-    });
-
-    it('should require X-Immich-Asset-Data header', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'x-immich-asset-data header is required' }));
-    });
-
-    it('should require Repr-Digest header', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Missing repr-digest header' }));
-    });
-
-    it('should allow conventional upload without Upload-Complete header', async () => {
-      const { status } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(201);
-    });
-
-    it('should require Upload-Length header for incomplete upload', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?0')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Missing upload-length header' }));
-    });
-
-    it('should infer upload length from content length if complete upload', async () => {
-      const { status } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .send(buffer);
-
-      expect(status).toBe(201);
-    });
-
-    it('should reject invalid Repr-Digest format', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', checksum)
-        .set('Repr-Digest', 'invalid-format')
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'Invalid repr-digest header' }));
-    });
-
-    it('should validate device-asset-id is required in asset data', async () => {
-      const assetData = serializeDictionary({
-        filename: 'test.jpg',
-        'device-id': 'test-device',
-        'file-created-at': new Date().toISOString(),
-        'file-modified-at': new Date().toISOString(),
-      });
-
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', assetData)
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining([expect.stringContaining('deviceAssetId')]),
-        }),
-      );
-    });
-
-    it('should validate device-id is required in asset data', async () => {
-      const assetData = serializeDictionary({
-        filename: 'test.jpg',
-        'device-asset-id': 'test-asset',
-        'file-created-at': new Date().toISOString(),
-        'file-modified-at': new Date().toISOString(),
-      });
-
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', assetData)
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining([expect.stringContaining('deviceId')]),
-        }),
-      );
-    });
-
-    it('should validate filename is required in asset data', async () => {
-      const assetData = serializeDictionary({
-        'device-asset-id': 'test-asset',
-        'device-id': 'test-device',
-        'file-created-at': new Date().toISOString(),
-        'file-modified-at': new Date().toISOString(),
-      });
-
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', assetData)
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining([expect.stringContaining('filename')]),
-        }),
-      );
-    });
-
-    it('should accept Upload-Incomplete header for version 3', async () => {
-      const { body, status } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '3')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Incomplete', '?0')
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(body).toEqual({});
-      expect(status).not.toBe(400);
-    });
-
-    it('should validate Upload-Complete is a boolean structured field', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', 'true')
-        .set('Upload-Length', '1024')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: 'upload-complete must be a structured boolean value' }));
-    });
-
-    it('should validate Upload-Length is a positive integer', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .post('/upload')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('X-Immich-Asset-Data', makeAssetData())
-        .set('Repr-Digest', checksum)
-        .set('Upload-Complete', '?1')
-        .set('Upload-Length', '-100')
-        .send(buffer);
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining(['uploadLength must not be less than 1']),
-        }),
-      );
-    });
-  });
-
-  describe('PATCH /upload/:id', () => {
-    const uploadId = factory.uuid();
-
-    it('should be an authenticated route', async () => {
-      await request(ctx.getHttpServer()).patch(`/upload/${uploadId}`);
-      expect(ctx.authenticate).toHaveBeenCalled();
-    });
-
-    it('should require Upload-Draft-Interop-Version header', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Offset', '0')
-        .set('Upload-Complete', '?1')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining(['version must be an integer number', 'version must not be less than 3']),
-        }),
-      );
-    });
-
-    it('should require Upload-Offset header', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('Upload-Complete', '?1')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining([
-            'uploadOffset must be an integer number',
-            'uploadOffset must not be less than 0',
-          ]),
-        }),
-      );
-    });
-
-    it('should require Upload-Complete header', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('Upload-Offset', '0')
-        .set('Content-Type', 'application/partial-upload')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: ['uploadComplete must be a boolean value'] }));
-    });
-
-    it('should validate UUID parameter', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch('/upload/invalid-uuid')
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('Upload-Offset', '0')
-        .set('Upload-Complete', '?0')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: ['id must be a UUID'] }));
-    });
-
-    it('should validate Upload-Offset is a non-negative integer', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '8')
-        .set('Upload-Offset', '-50')
-        .set('Upload-Complete', '?0')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining(['uploadOffset must not be less than 0']),
-        }),
-      );
-    });
-
-    it('should require Content-Type: application/partial-upload for version >= 6', async () => {
-      const { status, body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '6')
-        .set('Upload-Offset', '0')
-        .set('Upload-Complete', '?0')
-        .set('Content-Type', 'application/octet-stream')
-        .send(Buffer.from('test'));
-
-      expect(status).toBe(400);
-      expect(body).toEqual(
-        expect.objectContaining({
-          message: ['contentType must be equal to application/partial-upload'],
-        }),
-      );
-    });
-
-    it('should allow other Content-Type for version < 6', async () => {
-      const { body } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '3')
-        .set('Upload-Offset', '0')
-        .set('Upload-Incomplete', '?1')
-        .set('Content-Type', 'application/octet-stream')
-        .send();
-
-      // Will fail for other reasons, but not content-type validation
-      expect(body).not.toEqual(
-        expect.objectContaining({
-          message: expect.arrayContaining([expect.stringContaining('contentType')]),
-        }),
-      );
-    });
-
-    it('should accept Upload-Incomplete header for version 3', async () => {
-      const { status } = await request(ctx.getHttpServer())
-        .patch(`/upload/${uploadId}`)
-        .set('Upload-Draft-Interop-Version', '3')
-        .set('Upload-Offset', '0')
-        .set('Upload-Incomplete', '?1')
-        .send();
-
-      // Should not fail validation
-      expect(status).not.toBe(400);
-    });
-  });
-
-  describe('DELETE /upload/:id', () => {
-    const uploadId = factory.uuid();
-
-    it('should be an authenticated route', async () => {
-      await request(ctx.getHttpServer()).delete(`/upload/${uploadId}`);
-      expect(ctx.authenticate).toHaveBeenCalled();
-    });
-
-    it('should validate UUID parameter', async () => {
-      const { status, body } = await request(ctx.getHttpServer()).delete('/upload/invalid-uuid');
-
-      expect(status).toBe(400);
-      expect(body).toEqual(expect.objectContaining({ message: ['id must be a UUID'] }));
-    });
-  });
-
-  describe('HEAD /upload/:id', () => {
-    const uploadId = factory.uuid();
-
-    it('should be an authenticated route', async () => {
-      await request(ctx.getHttpServer()).head(`/upload/${uploadId}`);
-      expect(ctx.authenticate).toHaveBeenCalled();
-    });
-
-    it('should require Upload-Draft-Interop-Version header', async () => {
-      const { status } = await request(ctx.getHttpServer()).head(`/upload/${uploadId}`);
-
-      expect(status).toBe(400);
-    });
-
-    it('should validate UUID parameter', async () => {
-      const { status } = await request(ctx.getHttpServer())
-        .head('/upload/invalid-uuid')
-        .set('Upload-Draft-Interop-Version', '8');
-
-      expect(status).toBe(400);
-    });
-  });
-});

server/src/controllers/asset-upload.controller.ts

@@ -1,108 +0,0 @@
-import { Controller, Delete, Head, HttpCode, HttpStatus, Options, Param, Patch, Post, Req, Res } from '@nestjs/common';
-import { ApiHeader, ApiOkResponse, ApiTags } from '@nestjs/swagger';
-import { Request, Response } from 'express';
-import { GetUploadStatusDto, Header, ResumeUploadDto, StartUploadDto, UploadOkDto } from 'src/dtos/asset-upload.dto';
-import { AuthDto } from 'src/dtos/auth.dto';
-import { ImmichHeader, Permission } from 'src/enum';
-import { Auth, Authenticated } from 'src/middleware/auth.guard';
-import { AssetUploadService } from 'src/services/asset-upload.service';
-import { validateSyncOrReject } from 'src/utils/request';
-import { UUIDParamDto } from 'src/validation';
-
-const apiInteropVersion = {
-  name: Header.InteropVersion,
-  description: `Indicates the version of the RUFH protocol supported by the client.`,
-  required: true,
-};
-
-const apiUploadComplete = {
-  name: Header.UploadComplete,
-  description:
-    'Structured boolean indicating whether this request completes the file. Use Upload-Incomplete instead for version <= 3.',
-  required: true,
-};
-
-const apiContentLength = {
-  name: Header.ContentLength,
-  description: 'Non-negative size of the request body in bytes.',
-  required: true,
-};
-
-// This is important to let go of the asset lock for an inactive request
-const SOCKET_TIMEOUT_MS = 30_000;
-
-@ApiTags('Upload')
-@Controller('upload')
-export class AssetUploadController {
-  constructor(private service: AssetUploadService) {}
-
-  @Post()
-  @Authenticated({ sharedLink: true, permission: Permission.AssetUpload })
-  @ApiHeader({
-    name: ImmichHeader.AssetData,
-    description: `RFC 9651 structured dictionary containing asset metadata with the following keys:
-- device-asset-id (string, required): Unique device asset identifier
-- device-id (string, required): Device identifier
-- file-created-at (string/date, required): ISO 8601 date string or Unix timestamp
-- file-modified-at (string/date, required): ISO 8601 date string or Unix timestamp
-- filename (string, required): Original filename
-- is-favorite (boolean, optional): Favorite status
-- live-photo-video-id (string, optional): Live photo ID for assets from iOS devices
-- icloud-id (string, optional): iCloud identifier for assets from iOS devices`,
-    required: true,
-    example:
-      'device-asset-id="abc123", device-id="phone1", filename="photo.jpg", file-created-at="2024-01-01T00:00:00Z", file-modified-at="2024-01-01T00:00:00Z"',
-  })
-  @ApiHeader({
-    name: Header.ReprDigest,
-    description:
-      'RFC 9651 structured dictionary containing an `sha` (bytesequence) checksum used to detect duplicate files and validate data integrity.',
-    required: true,
-  })
-  @ApiHeader({ ...apiInteropVersion, required: false })
-  @ApiHeader({ ...apiUploadComplete, required: false })
-  @ApiHeader(apiContentLength)
-  @ApiOkResponse({ type: UploadOkDto })
-  startUpload(@Auth() auth: AuthDto, @Req() req: Request, @Res() res: Response): Promise<void> {
-    res.setTimeout(SOCKET_TIMEOUT_MS);
-    return this.service.startUpload(auth, req, res, validateSyncOrReject(StartUploadDto, req.headers));
-  }
-
-  @Patch(':id')
-  @Authenticated({ sharedLink: true, permission: Permission.AssetUpload })
-  @ApiHeader({
-    name: Header.UploadOffset,
-    description:
-      'Non-negative byte offset indicating the starting position of the data in the request body within the entire file.',
-    required: true,
-  })
-  @ApiHeader(apiInteropVersion)
-  @ApiHeader(apiUploadComplete)
-  @ApiHeader(apiContentLength)
-  @ApiOkResponse({ type: UploadOkDto })
-  resumeUpload(@Auth() auth: AuthDto, @Req() req: Request, @Res() res: Response, @Param() { id }: UUIDParamDto) {
-    res.setTimeout(SOCKET_TIMEOUT_MS);
-    return this.service.resumeUpload(auth, req, res, id, validateSyncOrReject(ResumeUploadDto, req.headers));
-  }
-
-  @Delete(':id')
-  @Authenticated({ sharedLink: true, permission: Permission.AssetUpload })
-  cancelUpload(@Auth() auth: AuthDto, @Res() res: Response, @Param() { id }: UUIDParamDto) {
-    res.setTimeout(SOCKET_TIMEOUT_MS);
-    return this.service.cancelUpload(auth, id, res);
-  }
-
-  @Head(':id')
-  @Authenticated({ sharedLink: true, permission: Permission.AssetUpload })
-  @ApiHeader(apiInteropVersion)
-  getUploadStatus(@Auth() auth: AuthDto, @Req() req: Request, @Res() res: Response, @Param() { id }: UUIDParamDto) {
-    res.setTimeout(SOCKET_TIMEOUT_MS);
-    return this.service.getUploadStatus(auth, res, id, validateSyncOrReject(GetUploadStatusDto, req.headers));
-  }
-
-  @Options()
-  @HttpCode(HttpStatus.NO_CONTENT)
-  getUploadOptions(@Res() res: Response) {
-    return this.service.getUploadOptions(res);
-  }
-}

server/src/controllers/index.ts

@@ -3,7 +3,6 @@ import { AlbumController } from 'src/controllers/album.controller';
 import { ApiKeyController } from 'src/controllers/api-key.controller';
 import { AppController } from 'src/controllers/app.controller';
 import { AssetMediaController } from 'src/controllers/asset-media.controller';
-import { AssetUploadController } from 'src/controllers/asset-upload.controller';
 import { AssetController } from 'src/controllers/asset.controller';
 import { AuthAdminController } from 'src/controllers/auth-admin.controller';
 import { AuthController } from 'src/controllers/auth.controller';
@@ -41,7 +40,6 @@ export const controllers = [
   AppController,
   AssetController,
   AssetMediaController,
-  AssetUploadController,
   AuthController,
   AuthAdminController,
   DownloadController,

server/src/dtos/asset-upload.dto.ts

@@ -1,196 +0,0 @@
-import { BadRequestException } from '@nestjs/common';
-import { ApiProperty } from '@nestjs/swagger';
-import { Expose, plainToInstance, Transform, Type } from 'class-transformer';
-import { Equals, IsBoolean, IsInt, IsNotEmpty, IsString, Min, ValidateIf, ValidateNested } from 'class-validator';
-import { ImmichHeader } from 'src/enum';
-import { Optional, ValidateBoolean, ValidateDate } from 'src/validation';
-import { parseDictionary } from 'structured-headers';
-
-export enum Header {
-  ContentLength = 'content-length',
-  ContentType = 'content-type',
-  InteropVersion = 'upload-draft-interop-version',
-  ReprDigest = 'repr-digest',
-  UploadComplete = 'upload-complete',
-  UploadIncomplete = 'upload-incomplete',
-  UploadLength = 'upload-length',
-  UploadOffset = 'upload-offset',
-}
-
-export class UploadAssetDataDto {
-  @IsNotEmpty()
-  @IsString()
-  deviceAssetId!: string;
-
-  @IsNotEmpty()
-  @IsString()
-  deviceId!: string;
-
-  @ValidateDate()
-  fileCreatedAt!: Date;
-
-  @ValidateDate()
-  fileModifiedAt!: Date;
-
-  @IsString()
-  @IsNotEmpty()
-  filename!: string;
-
-  @ValidateBoolean({ optional: true })
-  isFavorite?: boolean;
-
-  @Optional()
-  @IsString()
-  @IsNotEmpty()
-  livePhotoVideoId?: string;
-
-  @Optional()
-  @IsString()
-  @IsNotEmpty()
-  iCloudId!: string;
-}
-
-export class BaseUploadHeadersDto {
-  @Expose({ name: Header.ContentLength })
-  @Min(0)
-  @IsInt()
-  @Type(() => Number)
-  contentLength!: number;
-}
-
-export class StartUploadDto extends BaseUploadHeadersDto {
-  @Expose({ name: Header.InteropVersion })
-  @Optional()
-  @Min(3)
-  @IsInt()
-  @Type(() => Number)
-  version?: number;
-
-  @Expose({ name: ImmichHeader.AssetData })
-  @ValidateNested()
-  @Transform(({ value }) => {
-    if (!value) {
-      throw new BadRequestException(`${ImmichHeader.AssetData} header is required`);
-    }
-
-    try {
-      const dict = parseDictionary(value);
-      return plainToInstance(UploadAssetDataDto, {
-        deviceAssetId: dict.get('device-asset-id')?.[0],
-        deviceId: dict.get('device-id')?.[0],
-        filename: dict.get('filename')?.[0],
-        duration: dict.get('duration')?.[0],
-        fileCreatedAt: dict.get('file-created-at')?.[0],
-        fileModifiedAt: dict.get('file-modified-at')?.[0],
-        isFavorite: dict.get('is-favorite')?.[0],
-        livePhotoVideoId: dict.get('live-photo-video-id')?.[0],
-        iCloudId: dict.get('icloud-id')?.[0],
-      });
-    } catch {
-      throw new BadRequestException(`${ImmichHeader.AssetData} must be a valid structured dictionary`);
-    }
-  })
-  assetData!: UploadAssetDataDto;
-
-  @Expose({ name: Header.ReprDigest })
-  @Transform(({ value }) => {
-    if (!value) {
-      throw new BadRequestException(`Missing ${Header.ReprDigest} header`);
-    }
-
-    const checksum = parseDictionary(value).get('sha')?.[0];
-    if (checksum instanceof ArrayBuffer && checksum.byteLength === 20) {
-      return Buffer.from(checksum);
-    }
-    throw new BadRequestException(`Invalid ${Header.ReprDigest} header`);
-  })
-  checksum!: Buffer;
-
-  @Expose()
-  @Min(1)
-  @IsInt()
-  @Transform(({ obj }) => {
-    const uploadLength = obj[Header.UploadLength];
-    if (uploadLength != undefined) {
-      return Number(uploadLength);
-    }
-
-    const contentLength = obj[Header.ContentLength];
-    if (contentLength && isUploadComplete(obj) !== false) {
-      return Number(contentLength);
-    }
-    throw new BadRequestException(`Missing ${Header.UploadLength} header`);
-  })
-  uploadLength!: number;
-
-  @Expose()
-  @Transform(({ obj }) => isUploadComplete(obj))
-  uploadComplete?: boolean;
-}
-
-export class ResumeUploadDto extends BaseUploadHeadersDto {
-  @Expose({ name: Header.InteropVersion })
-  @Min(3)
-  @IsInt()
-  @Type(() => Number)
-  version!: number;
-
-  @Expose({ name: Header.ContentType })
-  @ValidateIf((o) => o.version && o.version >= 6)
-  @Equals('application/partial-upload')
-  contentType!: string;
-
-  @Expose({ name: Header.UploadLength })
-  @Min(1)
-  @IsInt()
-  @Type(() => Number)
-  @Optional()
-  uploadLength?: number;
-
-  @Expose({ name: Header.UploadOffset })
-  @Min(0)
-  @IsInt()
-  @Type(() => Number)
-  uploadOffset!: number;
-
-  @Expose()
-  @IsBoolean()
-  @Transform(({ obj }) => isUploadComplete(obj))
-  uploadComplete!: boolean;
-}
-
-export class GetUploadStatusDto {
-  @Expose({ name: Header.InteropVersion })
-  @Min(3)
-  @IsInt()
-  @Type(() => Number)
-  version!: number;
-}
-
-export class UploadOkDto {
-  @ApiProperty()
-  id!: string;
-}
-
-const STRUCTURED_TRUE = '?1';
-const STRUCTURED_FALSE = '?0';
-
-function isUploadComplete(obj: any) {
-  const uploadComplete = obj[Header.UploadComplete];
-  if (uploadComplete === STRUCTURED_TRUE) {
-    return true;
-  } else if (uploadComplete === STRUCTURED_FALSE) {
-    return false;
-  } else if (uploadComplete !== undefined) {
-    throw new BadRequestException('upload-complete must be a structured boolean value');
-  }
-
-  const uploadIncomplete = obj[Header.UploadIncomplete];
-  if (uploadIncomplete === STRUCTURED_TRUE) {
-    return false;
-  } else if (uploadIncomplete === STRUCTURED_FALSE) {
-    return true;
-  } else if (uploadComplete !== undefined) {
-    throw new BadRequestException('upload-incomplete must be a structured boolean value');
-  }
-}

server/src/dtos/system-config.dto.ts

@@ -55,23 +55,11 @@ export class DatabaseBackupConfig {
   keepLastAmount!: number;
 }
 
-export class UploadBackupConfig {
-  @IsInt()
-  @IsPositive()
-  @IsNotEmpty()
-  maxAgeHours!: number;
-}
-
 export class SystemConfigBackupsDto {
   @Type(() => DatabaseBackupConfig)
   @ValidateNested()
   @IsObject()
   database!: DatabaseBackupConfig;
-
-  @Type(() => UploadBackupConfig)
-  @ValidateNested()
-  @IsObject()
-  upload!: UploadBackupConfig;
 }
 
 export class SystemConfigFFmpegDto {
@@ -356,9 +344,6 @@ class SystemConfigNightlyTasksDto {
 
   @ValidateBoolean()
   syncQuotaUsage!: boolean;
-
-  @ValidateBoolean()
-  removeStaleUploads!: boolean;
 }
 
 class SystemConfigOAuthDto {

server/src/enum.ts

@@ -20,7 +20,6 @@ export enum ImmichHeader {
   SharedLinkSlug = 'x-immich-share-slug',
   Checksum = 'x-immich-checksum',
   Cid = 'x-immich-cid',
-  AssetData = 'x-immich-asset-data',
 }
 
 export enum ImmichQuery {
@@ -304,7 +303,6 @@ export enum AssetStatus {
   Active = 'active',
   Trashed = 'trashed',
   Deleted = 'deleted',
-  Partial = 'partial',
 }
 
 export enum SourceType {
@@ -495,7 +493,6 @@ export enum BootstrapEventPriority {
   JobService = -190,
   // Initialise config after other bootstrap services, stop other services from using config on bootstrap
   SystemConfig = 100,
-  UploadService = 200,
 }
 
 export enum QueueName {
@@ -531,8 +528,6 @@ export enum JobName {
   AssetFileMigration = 'AssetFileMigration',
   AssetGenerateThumbnailsQueueAll = 'AssetGenerateThumbnailsQueueAll',
   AssetGenerateThumbnails = 'AssetGenerateThumbnails',
-  PartialAssetCleanup = 'PartialAssetCleanup',
-  PartialAssetCleanupQueueAll = 'PartialAssetCleanupQueueAll',
 
   AuditLogCleanup = 'AuditLogCleanup',
   AuditTableCleanup = 'AuditTableCleanup',

server/src/queries/asset.job.repository.sql

@@ -14,7 +14,6 @@ from
   left join "smart_search" on "asset"."id" = "smart_search"."assetId"
 where
   "asset"."id" = $1::uuid
-  and "asset"."status" != 'partial'
 limit
   $2
 
@@ -41,7 +40,6 @@ from
   "asset"
 where
   "asset"."id" = $1::uuid
-  and "asset"."status" != 'partial'
 limit
   $2
 
@@ -54,7 +52,6 @@ from
   "asset"
 where
   "asset"."id" = $1::uuid
-  and "asset"."status" != 'partial'
 limit
   $2
 
@@ -81,8 +78,7 @@ from
   "asset"
   inner join "asset_job_status" on "asset_job_status"."assetId" = "asset"."id"
 where
-  "asset"."status" != 'partial'
-  and "asset"."deletedAt" is null
+  "asset"."deletedAt" is null
   and "asset"."visibility" != $1
   and (
     "asset_job_status"."previewAt" is null
@@ -114,7 +110,6 @@ from
   "asset"
 where
   "asset"."id" = $1
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.getForGenerateThumbnailJob
 select
@@ -146,7 +141,6 @@ from
   inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
   "asset"."id" = $1
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.getForMetadataExtraction
 select
@@ -184,7 +178,6 @@ from
   "asset"
 where
   "asset"."id" = $1
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.getAlbumThumbnailFiles
 select
@@ -205,8 +198,7 @@ from
   inner join "smart_search" on "asset"."id" = "smart_search"."assetId"
   inner join "asset_job_status" as "job_status" on "job_status"."assetId" = "asset"."id"
 where
-  "asset"."status" != 'partial'
-  and "asset"."deletedAt" is null
+  "asset"."deletedAt" is null
   and "asset"."visibility" in ('archive', 'timeline')
   and "job_status"."duplicatesDetectedAt" is null
 
@@ -218,7 +210,6 @@ from
   inner join "asset_job_status" as "job_status" on "assetId" = "asset"."id"
 where
   "asset"."visibility" != $1
-  and "asset"."status" != 'partial'
   and "asset"."deletedAt" is null
   and "job_status"."previewAt" is not null
   and not exists (
@@ -253,7 +244,6 @@ from
   "asset"
 where
   "asset"."id" = $2
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.getForDetectFacesJob
 select
@@ -294,7 +284,6 @@ from
   inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
   "asset"."id" = $2
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.getForSyncAssets
 select
@@ -379,7 +368,6 @@ from
   ) as "stacked_assets" on "stack"."id" is not null
 where
   "asset"."id" = $2
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.streamForVideoConversion
 select
@@ -393,7 +381,6 @@ where
     or "asset"."encodedVideoPath" = $2
   )
   and "asset"."visibility" != $3
-  and "asset"."status" != 'partial'
   and "asset"."deletedAt" is null
 
 -- AssetJobRepository.getForVideoConversion
@@ -407,7 +394,6 @@ from
 where
   "asset"."id" = $1
   and "asset"."type" = $2
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.streamForMetadataExtraction
 select
@@ -420,7 +406,6 @@ where
     "asset_job_status"."metadataExtractedAt" is null
     or "asset_job_status"."assetId" is null
   )
-  and "asset"."status" != 'partial'
   and "asset"."deletedAt" is null
 
 -- AssetJobRepository.getForStorageTemplateJob
@@ -441,8 +426,7 @@ from
   "asset"
   inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "asset"."status" != 'partial'
-  and "asset"."deletedAt" is null
+  "asset"."deletedAt" is null
   and "asset"."id" = $1
 
 -- AssetJobRepository.streamForStorageTemplateJob
@@ -463,8 +447,7 @@ from
   "asset"
   inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
 where
-  "asset"."status" != 'partial'
-  and "asset"."deletedAt" is null
+  "asset"."deletedAt" is null
 
 -- AssetJobRepository.streamForDeletedJob
 select
@@ -474,7 +457,6 @@ from
   "asset"
 where
   "asset"."deletedAt" <= $1
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.streamForSidecar
 select
@@ -487,7 +469,6 @@ where
     or "asset"."sidecarPath" is null
   )
   and "asset"."visibility" != $2
-  and "asset"."status" != 'partial'
 
 -- AssetJobRepository.streamForDetectFacesJob
 select
@@ -497,10 +478,8 @@ from
   inner join "asset_job_status" as "job_status" on "assetId" = "asset"."id"
 where
   "asset"."visibility" != $1
-  and "asset"."status" != 'partial'
   and "asset"."deletedAt" is null
   and "job_status"."previewAt" is not null
-  and "asset"."status" != 'partial'
 order by
   "asset"."fileCreatedAt" desc
 
@@ -510,14 +489,4 @@ select
 from
   "asset"
 where
-  "asset"."status" != 'partial'
-  and "asset"."deletedAt" is null
-
--- AssetJobRepository.streamForPartialAssetCleanupJob
-select
-  "id"
-from
-  "asset"
-where
-  "asset"."status" = 'partial'
-  and "asset"."createdAt" < $1
+  "asset"."deletedAt" is null

server/src/queries/asset.repository.sql

@@ -46,68 +46,6 @@ where
   "assetId" = $1
   and "key" = $2
 
--- AssetRepository.getCompletionMetadata
-select
-  "originalPath" as "path",
-  "status",
-  "fileModifiedAt",
-  "createdAt",
-  "checksum",
-  "fileSizeInByte" as "size"
-from
-  "asset"
-  inner join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
-where
-  "id" = $1
-  and "ownerId" = $2
-
--- AssetRepository.setComplete
-update "asset" as "complete_asset"
-set
-  "status" = 'active',
-  "visibility" = case
-    when (
-      "complete_asset"."type" = 'VIDEO'
-      and exists (
-        select
-        from
-          "asset"
-        where
-          "complete_asset"."id" = "asset"."livePhotoVideoId"
-      )
-    ) then 'hidden'::asset_visibility_enum
-    else 'timeline'::asset_visibility_enum
-  end
-where
-  "id" = $1
-  and "status" = 'partial'
-
--- AssetRepository.removeAndDecrementQuota
-with
-  "asset_exif" as (
-    select
-      "fileSizeInByte"
-    from
-      "asset_exif"
-    where
-      "assetId" = $1
-  ),
-  "asset" as (
-    delete from "asset"
-    where
-      "id" = $2
-    returning
-      "ownerId"
-  )
-update "user"
-set
-  "quotaUsageInBytes" = "quotaUsageInBytes" - "fileSizeInByte"
-from
-  "asset_exif",
-  "asset"
-where
-  "user"."id" = "asset"."ownerId"
-
 -- AssetRepository.getByDayOfYear
 with
   "res" as (
@@ -320,9 +258,7 @@ where
 
 -- AssetRepository.getUploadAssetIdByChecksum
 select
-  "id",
-  "status",
-  "createdAt"
+  "id"
 from
   "asset"
 where

server/src/repositories/asset-job.repository.ts

@@ -1,10 +1,10 @@
 import { Injectable } from '@nestjs/common';
-import { Kysely, sql } from 'kysely';
+import { Kysely } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { Asset, columns } from 'src/database';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { AssetFileType, AssetStatus, AssetType, AssetVisibility } from 'src/enum';
+import { AssetFileType, AssetType, AssetVisibility } from 'src/enum';
 import { DB } from 'src/schema';
 import { StorageAsset } from 'src/types';
 import {
@@ -28,7 +28,6 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .where('asset.id', '=', asUuid(id))
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .leftJoin('smart_search', 'asset.id', 'smart_search.assetId')
       .select(['id', 'type', 'ownerId', 'duplicateId', 'stackId', 'visibility', 'smart_search.embedding'])
       .limit(1)
@@ -40,7 +39,6 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .where('asset.id', '=', asUuid(id))
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .select(['id', 'sidecarPath', 'originalPath'])
       .select((eb) =>
         jsonArrayFrom(
@@ -60,7 +58,6 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .where('asset.id', '=', asUuid(id))
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .select(['id', 'sidecarPath', 'originalPath'])
       .limit(1)
       .executeTakeFirst();
@@ -72,7 +69,6 @@ export class AssetJobRepository {
       .selectFrom('asset')
       .select(['asset.id', 'asset.thumbhash'])
       .select(withFiles)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null)
       .where('asset.visibility', '!=', AssetVisibility.Hidden)
       .$if(!force, (qb) =>
@@ -97,7 +93,6 @@ export class AssetJobRepository {
       .select(['asset.id', 'asset.ownerId', 'asset.encodedVideoPath'])
       .select(withFiles)
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -117,7 +112,6 @@ export class AssetJobRepository {
       .select(withFiles)
       .$call(withExifInner)
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -128,7 +122,6 @@ export class AssetJobRepository {
       .select(columns.asset)
       .select(withFaces)
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -146,7 +139,6 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .where('asset.visibility', '!=', AssetVisibility.Hidden)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null)
       .innerJoin('asset_job_status as job_status', 'assetId', 'asset.id')
       .where('job_status.previewAt', 'is not', null);
@@ -157,7 +149,6 @@ export class AssetJobRepository {
     return this.db
       .selectFrom('asset')
       .select(['asset.id'])
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null)
       .innerJoin('smart_search', 'asset.id', 'smart_search.assetId')
       .$call(withDefaultVisibility)
@@ -186,7 +177,6 @@ export class AssetJobRepository {
       .select(['asset.id', 'asset.visibility'])
       .select((eb) => withFiles(eb, AssetFileType.Preview))
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -199,7 +189,6 @@ export class AssetJobRepository {
       .select((eb) => withFaces(eb, true))
       .select((eb) => withFiles(eb, AssetFileType.Preview))
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -252,7 +241,6 @@ export class AssetJobRepository {
       )
       .select((eb) => toJson(eb, 'stacked_assets').as('stack'))
       .where('asset.id', '=', id)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -267,7 +255,6 @@ export class AssetJobRepository {
           .where((eb) => eb.or([eb('asset.encodedVideoPath', 'is', null), eb('asset.encodedVideoPath', '=', '')]))
           .where('asset.visibility', '!=', AssetVisibility.Hidden),
       )
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null)
       .stream();
   }
@@ -279,7 +266,6 @@ export class AssetJobRepository {
       .select(['asset.id', 'asset.ownerId', 'asset.originalPath', 'asset.encodedVideoPath'])
       .where('asset.id', '=', id)
       .where('asset.type', '=', AssetType.Video)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .executeTakeFirst();
   }
 
@@ -295,7 +281,6 @@ export class AssetJobRepository {
             eb.or([eb('asset_job_status.metadataExtractedAt', 'is', null), eb('asset_job_status.assetId', 'is', null)]),
           ),
       )
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null)
       .stream();
   }
@@ -318,7 +303,6 @@ export class AssetJobRepository {
         'asset_exif.timeZone',
         'asset_exif.fileSizeInByte',
       ])
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .where('asset.deletedAt', 'is', null);
   }
 
@@ -340,7 +324,6 @@ export class AssetJobRepository {
       .selectFrom('asset')
       .select(['id', 'isOffline'])
       .where('asset.deletedAt', '<=', trashedBefore)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .stream();
   }
 
@@ -353,7 +336,6 @@ export class AssetJobRepository {
         qb.where((eb) => eb.or([eb('asset.sidecarPath', '=', ''), eb('asset.sidecarPath', 'is', null)])),
       )
       .where('asset.visibility', '!=', AssetVisibility.Hidden)
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .stream();
   }
 
@@ -362,38 +344,12 @@ export class AssetJobRepository {
     return this.assetsWithPreviews()
       .$if(force === false, (qb) => qb.where('job_status.facesRecognizedAt', 'is', null))
       .select(['asset.id'])
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
       .orderBy('asset.fileCreatedAt', 'desc')
       .stream();
   }
 
   @GenerateSql({ params: [DummyValue.DATE], stream: true })
   streamForMigrationJob() {
-    return this.db
-      .selectFrom('asset')
-      .select(['id'])
-      .where('asset.status', '!=', sql.lit(AssetStatus.Partial))
-      .where('asset.deletedAt', 'is', null)
-      .stream();
-  }
-
-  getForPartialAssetCleanupJob(assetId: string) {
-    return this.db
-      .selectFrom('asset')
-      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
-      .select(['originalPath as path', 'fileSizeInByte as size', 'checksum', 'fileModifiedAt'])
-      .where('id', '=', assetId)
-      .where('status', '=', sql.lit(AssetStatus.Partial))
-      .executeTakeFirst();
-  }
-
-  @GenerateSql({ params: [DummyValue.DATE], stream: true })
-  streamForPartialAssetCleanupJob(createdBefore: Date) {
-    return this.db
-      .selectFrom('asset')
-      .select(['id'])
-      .where('asset.status', '=', sql.lit(AssetStatus.Partial))
-      .where('asset.createdAt', '<', createdBefore)
-      .stream();
+    return this.db.selectFrom('asset').select(['id']).where('asset.deletedAt', 'is', null).stream();
   }
 }

server/src/repositories/asset.repository.ts

@@ -253,96 +253,6 @@ export class AssetRepository {
     return this.db.insertInto('asset').values(asset).returningAll().executeTakeFirstOrThrow();
   }
 
-  createWithMetadata(asset: Insertable<AssetTable> & { id: string }, size: number, metadata?: AssetMetadataItem[]) {
-    let query = this.db;
-    if (asset.livePhotoVideoId) {
-      (query as any) = query.with('motion_asset', (qb) =>
-        qb
-          .updateTable('asset')
-          .set({ visibility: AssetVisibility.Hidden })
-          .where('id', '=', asset.livePhotoVideoId!)
-          .where('type', '=', sql.lit(AssetType.Video))
-          .where('ownerId', '=', asset.ownerId)
-          .returning('id'),
-      );
-    }
-
-    (query as any) = query
-      .with('asset', (qb) =>
-        qb
-          .insertInto('asset')
-          .values(
-            asset.livePhotoVideoId ? { ...asset, livePhotoVideoId: sql<string>`(select id from motion_asset)` } : asset,
-          )
-          .returning(['id', 'ownerId']),
-      )
-      .with('exif', (qb) =>
-        qb
-          .insertInto('asset_exif')
-          .columns(['assetId', 'fileSizeInByte'])
-          .expression((eb) => eb.selectFrom('asset').select(['asset.id', eb.val(size).as('fileSizeInByte')])),
-      );
-
-    if (metadata && metadata.length > 0) {
-      (query as any) = query.with('metadata', (qb) =>
-        qb.insertInto('asset_metadata').values(metadata.map(({ key, value }) => ({ assetId: asset.id, key, value }))),
-      );
-    }
-
-    return query
-      .updateTable('user')
-      .from('asset')
-      .set({ quotaUsageInBytes: sql`"quotaUsageInBytes" + ${size}` })
-      .whereRef('user.id', '=', 'asset.ownerId')
-      .execute();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.UUID] })
-  getCompletionMetadata(assetId: string, ownerId: string) {
-    return this.db
-      .selectFrom('asset')
-      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
-      .select(['originalPath as path', 'status', 'fileModifiedAt', 'createdAt', 'checksum', 'fileSizeInByte as size'])
-      .where('id', '=', assetId)
-      .where('ownerId', '=', ownerId)
-      .executeTakeFirst();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  async setComplete(assetId: string) {
-    await this.db
-      .updateTable('asset as complete_asset')
-      .set((eb) => ({
-        status: sql.lit(AssetStatus.Active),
-        visibility: eb
-          .case()
-          .when(
-            eb.and([
-              eb('complete_asset.type', '=', sql.lit(AssetType.Video)),
-              eb.exists(eb.selectFrom('asset').whereRef('complete_asset.id', '=', 'asset.livePhotoVideoId')),
-            ]),
-          )
-          .then(sql<AssetVisibility>`'hidden'::asset_visibility_enum`)
-          .else(sql<AssetVisibility>`'timeline'::asset_visibility_enum`)
-          .end(),
-      }))
-      .where('id', '=', assetId)
-      .where('status', '=', sql.lit(AssetStatus.Partial))
-      .execute();
-  }
-
-  @GenerateSql({ params: [DummyValue.UUID] })
-  async removeAndDecrementQuota(id: string): Promise<void> {
-    await this.db
-      .with('asset_exif', (qb) => qb.selectFrom('asset_exif').where('assetId', '=', id).select('fileSizeInByte'))
-      .with('asset', (qb) => qb.deleteFrom('asset').where('id', '=', id).returning('ownerId'))
-      .updateTable('user')
-      .from(['asset_exif', 'asset'])
-      .set({ quotaUsageInBytes: sql`"quotaUsageInBytes" - "fileSizeInByte"` })
-      .whereRef('user.id', '=', 'asset.ownerId')
-      .execute();
-  }
-
   createAll(assets: Insertable<AssetTable>[]) {
     return this.db.insertInto('asset').values(assets).returningAll().execute();
   }
@@ -582,15 +492,17 @@ export class AssetRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID, DummyValue.BUFFER] })
-  getUploadAssetIdByChecksum(ownerId: string, checksum: Buffer) {
-    return this.db
+  async getUploadAssetIdByChecksum(ownerId: string, checksum: Buffer): Promise<string | undefined> {
+    const asset = await this.db
       .selectFrom('asset')
-      .select(['id', 'status', 'createdAt'])
+      .select('id')
       .where('ownerId', '=', asUuid(ownerId))
       .where('checksum', '=', checksum)
       .where('libraryId', 'is', null)
       .limit(1)
       .executeTakeFirst();
+
+    return asset?.id;
   }
 
   findLivePhotoMatch(options: LivePhotoSearchOptions) {

server/src/repositories/database.repository.ts

@@ -451,20 +451,6 @@ export class DatabaseRepository {
     return res as R;
   }
 
-  async withUuidLock<R>(uuid: string, callback: () => Promise<R>): Promise<R> {
-    let res;
-    await this.db.connection().execute(async (connection) => {
-      try {
-        await this.acquireUuidLock(uuid, connection);
-        res = await callback();
-      } finally {
-        await this.releaseUuidLock(uuid, connection);
-      }
-    });
-
-    return res as R;
-  }
-
   tryLock(lock: DatabaseLock): Promise<boolean> {
     return this.db.connection().execute(async (connection) => this.acquireTryLock(lock, connection));
   }
@@ -481,10 +467,6 @@ export class DatabaseRepository {
     await sql`SELECT pg_advisory_lock(${lock})`.execute(connection);
   }
 
-  private async acquireUuidLock(uuid: string, connection: Kysely<DB>): Promise<void> {
-    await sql`SELECT pg_advisory_lock(uuid_hash_extended(${uuid}, 0))`.execute(connection);
-  }
-
   private async acquireTryLock(lock: DatabaseLock, connection: Kysely<DB>): Promise<boolean> {
     const { rows } = await sql<{
       pg_try_advisory_lock: boolean;
@@ -495,8 +477,4 @@ export class DatabaseRepository {
   private async releaseLock(lock: DatabaseLock, connection: Kysely<DB>): Promise<void> {
     await sql`SELECT pg_advisory_unlock(${lock})`.execute(connection);
   }
-
-  private async releaseUuidLock(uuid: string, connection: Kysely<DB>): Promise<void> {
-    await sql`SELECT pg_advisory_unlock(uuid_hash_extended(${uuid}, 0))`.execute(connection);
-  }
 }

server/src/repositories/event.repository.ts

@@ -80,9 +80,6 @@ type EventMap = {
   // stack bulk events
   StackDeleteAll: [{ stackIds: string[]; userId: string }];
 
-  // upload events
-  UploadAbort: [{ assetId: string; abortTime: Date }];
-
   // user events
   UserSignup: [{ notify: boolean; id: string; password?: string }];
 
@@ -90,7 +87,7 @@ type EventMap = {
   WebsocketConnect: [{ userId: string }];
 };
 
-export const serverEvents = ['ConfigUpdate', 'UploadAbort'] as const;
+export const serverEvents = ['ConfigUpdate'] as const;
 export type ServerEvents = (typeof serverEvents)[number];
 
 export type EmitEvent = keyof EventMap;

server/src/repositories/storage.repository.ts

@@ -62,11 +62,7 @@ export class StorageRepository {
   }
 
   createWriteStream(filepath: string): Writable {
-    return createWriteStream(filepath, { flags: 'w', highWaterMark: 1024 * 1024 });
-  }
-
-  createOrAppendWriteStream(filepath: string): Writable {
-    return createWriteStream(filepath, { flags: 'a', highWaterMark: 1024 * 1024 });
+    return createWriteStream(filepath, { flags: 'w' });
   }
 
   createOrOverwriteFile(filepath: string, buffer: Buffer) {
@@ -160,13 +156,10 @@ export class StorageRepository {
     }
   }
 
-  mkdir(filepath: string): Promise<string | undefined> {
-    return fs.mkdir(filepath, { recursive: true });
-  }
-
   mkdirSync(filepath: string): void {
-    // does not throw an error if the folder already exists
-    mkdirSync(filepath, { recursive: true });
+    if (!existsSync(filepath)) {
+      mkdirSync(filepath, { recursive: true });
+    }
   }
 
   existsSync(filepath: string) {

server/src/schema/migrations/1759089915352-AddPartialAssetStatus.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TYPE "assets_status_enum" ADD VALUE IF NOT EXISTS 'partial'`.execute(db);
-}
-
-export async function down(): Promise<void> {
-  // Cannot remove enum values in PostgreSQL
-}

server/src/services/asset-media.service.spec.ts

@@ -215,11 +215,7 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should find an existing asset', async () => {
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue({
-        id: 'asset-id',
-        createdAt: new Date(),
-        status: AssetStatus.Active,
-      });
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
       await expect(sut.getUploadAssetIdByChecksum(authStub.admin, file1.toString('hex'))).resolves.toEqual({
         id: 'asset-id',
         status: AssetMediaStatus.DUPLICATE,
@@ -228,11 +224,7 @@ describe(AssetMediaService.name, () => {
     });
 
     it('should find an existing asset by base64', async () => {
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue({
-        id: 'asset-id',
-        createdAt: new Date(),
-        status: AssetStatus.Active,
-      });
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue('asset-id');
       await expect(sut.getUploadAssetIdByChecksum(authStub.admin, file1.toString('base64'))).resolves.toEqual({
         id: 'asset-id',
         status: AssetMediaStatus.DUPLICATE,
@@ -386,11 +378,7 @@ describe(AssetMediaService.name, () => {
       (error as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
 
       mocks.asset.create.mockRejectedValue(error);
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue({
-        id: assetEntity.id,
-        createdAt: new Date(),
-        status: AssetStatus.Active,
-      });
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue(assetEntity.id);
 
       await expect(sut.uploadAsset(authStub.user1, createDto, file)).resolves.toEqual({
         id: 'id_1',
@@ -815,11 +803,7 @@ describe(AssetMediaService.name, () => {
 
       mocks.asset.update.mockRejectedValue(error);
       mocks.asset.getById.mockResolvedValueOnce(sidecarAsset);
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue({
-        id: sidecarAsset.id,
-        createdAt: new Date(),
-        status: AssetStatus.Active,
-      });
+      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue(sidecarAsset.id);
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set([sidecarAsset.id]));
       // this is the original file size
       mocks.storage.stat.mockResolvedValue({ size: 0 } as Stats);

server/src/services/asset-media.service.ts

@@ -43,12 +43,12 @@ export class AssetMediaService extends BaseService {
       return;
     }
 
-    const asset = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, fromChecksum(checksum));
-    if (!asset) {
+    const assetId = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, fromChecksum(checksum));
+    if (!assetId) {
       return;
     }
 
-    return { id: asset.id, status: AssetMediaStatus.DUPLICATE };
+    return { id: assetId, status: AssetMediaStatus.DUPLICATE };
   }
 
   canUploadFile({ auth, fieldName, file }: UploadRequest): true {
@@ -165,10 +165,6 @@ export class AssetMediaService extends BaseService {
         throw new Error('Asset not found');
       }
 
-      if (asset.status === AssetStatus.Partial) {
-        throw new BadRequestException('Cannot replace a partial asset');
-      }
-
       this.requireQuota(auth, file.size);
 
       await this.replaceFileData(asset.id, dto, file, sidecarFile?.originalPath);
@@ -317,12 +313,12 @@ export class AssetMediaService extends BaseService {
 
     // handle duplicates with a success response
     if (isAssetChecksumConstraint(error)) {
-      const duplicate = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, file.checksum);
-      if (!duplicate) {
+      const duplicateId = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, file.checksum);
+      if (!duplicateId) {
         this.logger.error(`Error locating duplicate for checksum constraint`);
         throw new InternalServerErrorException();
       }
-      return { status: AssetMediaStatus.DUPLICATE, id: duplicate.id };
+      return { status: AssetMediaStatus.DUPLICATE, id: duplicateId };
     }
 
     this.logger.error(`Error uploading file ${error}`, error?.stack);

server/src/services/asset-upload.service.spec.ts

@@ -1,456 +0,0 @@
-import { BadRequestException, InternalServerErrorException } from '@nestjs/common';
-import { AssetMetadataKey, AssetStatus, AssetType, AssetVisibility, JobName, JobStatus } from 'src/enum';
-import { AssetUploadService } from 'src/services/asset-upload.service';
-import { ASSET_CHECKSUM_CONSTRAINT } from 'src/utils/database';
-import { authStub } from 'test/fixtures/auth.stub';
-import { factory } from 'test/small.factory';
-import { newTestService, ServiceMocks } from 'test/utils';
-
-describe(AssetUploadService.name, () => {
-  let sut: AssetUploadService;
-  let mocks: ServiceMocks;
-
-  beforeEach(() => {
-    ({ sut, mocks } = newTestService(AssetUploadService));
-  });
-
-  describe('onStart', () => {
-    const mockDto = {
-      assetData: {
-        filename: 'test.jpg',
-        deviceAssetId: 'device-asset-1',
-        deviceId: 'device-1',
-        fileCreatedAt: new Date('2025-01-01T00:00:00Z'),
-        fileModifiedAt: new Date('2025-01-01T12:00:00Z'),
-        isFavorite: false,
-        iCloudId: '',
-      },
-      checksum: Buffer.from('checksum'),
-      uploadLength: 1024,
-      uploadComplete: true,
-      contentLength: 1024,
-      isComplete: true,
-      version: 8,
-    };
-
-    it('should create a new asset and return upload metadata', async () => {
-      const assetId = factory.uuid();
-      mocks.crypto.randomUUID.mockReturnValue(assetId);
-
-      const result = await sut.onStart(authStub.user1, mockDto);
-
-      expect(result).toEqual({
-        id: assetId,
-        path: expect.stringContaining(assetId),
-        status: AssetStatus.Partial,
-        isDuplicate: false,
-      });
-
-      expect(mocks.asset.createWithMetadata).toHaveBeenCalledWith(
-        expect.objectContaining({
-          id: assetId,
-          ownerId: authStub.user1.user.id,
-          checksum: mockDto.checksum,
-          deviceAssetId: mockDto.assetData.deviceAssetId,
-          deviceId: mockDto.assetData.deviceId,
-          fileCreatedAt: mockDto.assetData.fileCreatedAt,
-          fileModifiedAt: mockDto.assetData.fileModifiedAt,
-          type: AssetType.Image,
-          isFavorite: false,
-          status: AssetStatus.Partial,
-          visibility: AssetVisibility.Hidden,
-          originalFileName: 'test.jpg',
-        }),
-        1024,
-        undefined,
-      );
-    });
-
-    it('should determine asset type from filename extension', async () => {
-      const videoDto = { ...mockDto, assetData: { ...mockDto.assetData, filename: 'video.mp4' } };
-      mocks.crypto.randomUUID.mockReturnValue(factory.uuid());
-
-      await sut.onStart(authStub.user1, videoDto);
-
-      expect(mocks.asset.createWithMetadata).toHaveBeenCalledWith(
-        expect.objectContaining({
-          type: AssetType.Video,
-        }),
-        expect.anything(),
-        undefined,
-      );
-    });
-
-    it('should throw BadRequestException for unsupported file types', async () => {
-      const unsupportedDto = { ...mockDto, assetData: { ...mockDto.assetData, filename: 'document.xyz' } };
-
-      await expect(sut.onStart(authStub.user1, unsupportedDto)).rejects.toThrow(BadRequestException);
-      await expect(sut.onStart(authStub.user1, unsupportedDto)).rejects.toThrow('unsupported file type');
-    });
-
-    it('should validate quota before creating asset', async () => {
-      const authWithQuota = {
-        ...authStub.user1,
-        user: {
-          ...authStub.user1.user,
-          quotaSizeInBytes: 2000,
-          quotaUsageInBytes: 1500,
-        },
-      };
-
-      await expect(sut.onStart(authWithQuota, mockDto)).rejects.toThrow(BadRequestException);
-      await expect(sut.onStart(authWithQuota, mockDto)).rejects.toThrow('Quota has been exceeded');
-    });
-
-    it('should allow upload when quota is null (unlimited)', async () => {
-      const authWithUnlimitedQuota = {
-        ...authStub.user1,
-        user: {
-          ...authStub.user1.user,
-          quotaSizeInBytes: null,
-          quotaUsageInBytes: 1000,
-        },
-      };
-
-      mocks.crypto.randomUUID.mockReturnValue(factory.uuid());
-
-      await expect(sut.onStart(authWithUnlimitedQuota, mockDto)).resolves.toBeDefined();
-    });
-
-    it('should allow upload when within quota', async () => {
-      const authWithQuota = {
-        ...authStub.user1,
-        user: {
-          ...authStub.user1.user,
-          quotaSizeInBytes: 5000,
-          quotaUsageInBytes: 1000,
-        },
-      };
-
-      mocks.crypto.randomUUID.mockReturnValue(factory.uuid());
-
-      const result = await sut.onStart(authWithQuota, mockDto);
-
-      expect(result.isDuplicate).toBe(false);
-    });
-
-    it('should handle duplicate detection via checksum constraint', async () => {
-      const existingAssetId = factory.uuid();
-      const checksumError = new Error('duplicate key value violates unique constraint');
-      (checksumError as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
-
-      mocks.asset.createWithMetadata.mockRejectedValue(checksumError);
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue({
-        id: existingAssetId,
-        status: AssetStatus.Partial,
-        createdAt: new Date(),
-      });
-
-      const result = await sut.onStart(authStub.user1, mockDto);
-
-      expect(result).toEqual({
-        id: existingAssetId,
-        path: expect.any(String),
-        status: AssetStatus.Partial,
-        isDuplicate: true,
-      });
-
-      expect(mocks.asset.getUploadAssetIdByChecksum).toHaveBeenCalledWith(authStub.user1.user.id, mockDto.checksum);
-    });
-
-    it('should throw InternalServerErrorException if duplicate lookup fails', async () => {
-      const checksumError = new Error('duplicate key value violates unique constraint');
-      (checksumError as any).constraint_name = ASSET_CHECKSUM_CONSTRAINT;
-
-      mocks.asset.createWithMetadata.mockRejectedValue(checksumError);
-      // eslint-disable-next-line unicorn/no-useless-undefined
-      mocks.asset.getUploadAssetIdByChecksum.mockResolvedValue(undefined);
-
-      await expect(sut.onStart(authStub.user1, mockDto)).rejects.toThrow(InternalServerErrorException);
-    });
-
-    it('should throw InternalServerErrorException for non-checksum errors', async () => {
-      const genericError = new Error('database connection failed');
-      mocks.asset.createWithMetadata.mockRejectedValue(genericError);
-
-      await expect(sut.onStart(authStub.user1, mockDto)).rejects.toThrow(InternalServerErrorException);
-    });
-
-    it('should include iCloud metadata when provided', async () => {
-      const dtoWithICloud = {
-        ...mockDto,
-        assetData: {
-          ...mockDto.assetData,
-          iCloudId: 'icloud-123',
-        },
-      };
-
-      mocks.crypto.randomUUID.mockReturnValue(factory.uuid());
-
-      await sut.onStart(authStub.user1, dtoWithICloud);
-
-      expect(mocks.asset.createWithMetadata).toHaveBeenCalledWith(expect.anything(), expect.anything(), [
-        { key: AssetMetadataKey.MobileApp, value: { iCloudId: 'icloud-123' } },
-      ]);
-    });
-
-    it('should set isFavorite when true', async () => {
-      const favoriteDto = {
-        ...mockDto,
-        assetData: {
-          ...mockDto.assetData,
-          isFavorite: true,
-        },
-      };
-
-      mocks.crypto.randomUUID.mockReturnValue(factory.uuid());
-
-      await sut.onStart(authStub.user1, favoriteDto);
-
-      expect(mocks.asset.createWithMetadata).toHaveBeenCalledWith(
-        expect.objectContaining({
-          isFavorite: true,
-        }),
-        expect.anything(),
-        undefined,
-      );
-    });
-  });
-
-  describe('onComplete', () => {
-    const assetId = factory.uuid();
-    const path = `/upload/${assetId}/file.jpg`;
-    const fileModifiedAt = new Date('2025-01-01T12:00:00Z');
-
-    it('should mark asset as complete and queue metadata extraction job', async () => {
-      await sut.onComplete({ id: assetId, path, fileModifiedAt });
-
-      expect(mocks.asset.setComplete).toHaveBeenCalledWith(assetId);
-      expect(mocks.job.queue).toHaveBeenCalledWith({
-        name: JobName.AssetExtractMetadata,
-        data: { id: assetId, source: 'upload' },
-      });
-    });
-
-    it('should update file modification time', async () => {
-      await sut.onComplete({ id: assetId, path, fileModifiedAt });
-
-      expect(mocks.storage.utimes).toHaveBeenCalledWith(path, expect.any(Date), fileModifiedAt);
-    });
-
-    it('should handle utimes failure gracefully', async () => {
-      mocks.storage.utimes.mockRejectedValue(new Error('Permission denied'));
-
-      await expect(sut.onComplete({ id: assetId, path, fileModifiedAt })).resolves.toBeUndefined();
-
-      // Should still complete asset and queue job
-      expect(mocks.asset.setComplete).toHaveBeenCalled();
-      expect(mocks.job.queue).toHaveBeenCalled();
-    });
-
-    it('should retry setComplete on transient failures', async () => {
-      mocks.asset.setComplete
-        .mockRejectedValueOnce(new Error('Transient error'))
-        .mockRejectedValueOnce(new Error('Transient error'))
-        .mockResolvedValue();
-
-      await sut.onComplete({ id: assetId, path, fileModifiedAt });
-
-      expect(mocks.asset.setComplete).toHaveBeenCalledTimes(3);
-    });
-
-    it('should retry job queueing on transient failures', async () => {
-      mocks.job.queue.mockRejectedValueOnce(new Error('Transient error')).mockResolvedValue();
-
-      await sut.onComplete({ id: assetId, path, fileModifiedAt });
-
-      expect(mocks.job.queue).toHaveBeenCalledTimes(2);
-    });
-  });
-
-  describe('onCancel', () => {
-    const assetId = factory.uuid();
-    const path = `/upload/${assetId}/file.jpg`;
-
-    it('should delete file and remove asset record', async () => {
-      await sut.onCancel(assetId, path);
-
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(path);
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledWith(assetId);
-    });
-
-    it('should retry unlink on transient failures', async () => {
-      mocks.storage.unlink.mockRejectedValueOnce(new Error('Transient error')).mockResolvedValue();
-
-      await sut.onCancel(assetId, path);
-
-      expect(mocks.storage.unlink).toHaveBeenCalledTimes(2);
-    });
-
-    it('should retry removeAndDecrementQuota on transient failures', async () => {
-      mocks.asset.removeAndDecrementQuota.mockRejectedValueOnce(new Error('Transient error')).mockResolvedValue();
-
-      await sut.onCancel(assetId, path);
-
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledTimes(2);
-    });
-  });
-
-  describe('removeStaleUploads', () => {
-    it('should queue cleanup jobs for stale partial assets', async () => {
-      const staleAssets = [{ id: factory.uuid() }, { id: factory.uuid() }, { id: factory.uuid() }];
-
-      mocks.assetJob.streamForPartialAssetCleanupJob.mockReturnValue(
-        // eslint-disable-next-line @typescript-eslint/require-await
-        (async function* () {
-          for (const asset of staleAssets) {
-            yield asset;
-          }
-        })(),
-      );
-
-      await sut.removeStaleUploads();
-
-      expect(mocks.assetJob.streamForPartialAssetCleanupJob).toHaveBeenCalledWith(expect.any(Date));
-
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([
-        { name: JobName.PartialAssetCleanup, data: staleAssets[0] },
-        { name: JobName.PartialAssetCleanup, data: staleAssets[1] },
-        { name: JobName.PartialAssetCleanup, data: staleAssets[2] },
-      ]);
-    });
-
-    it('should batch cleanup jobs', async () => {
-      const assets = Array.from({ length: 1500 }, () => ({ id: factory.uuid() }));
-
-      mocks.assetJob.streamForPartialAssetCleanupJob.mockReturnValue(
-        // eslint-disable-next-line @typescript-eslint/require-await
-        (async function* () {
-          for (const asset of assets) {
-            yield asset;
-          }
-        })(),
-      );
-
-      await sut.removeStaleUploads();
-
-      // Should be called twice: once for 1000, once for 500
-      expect(mocks.job.queueAll).toHaveBeenCalledTimes(2);
-    });
-
-    it('should handle empty stream', async () => {
-      mocks.assetJob.streamForPartialAssetCleanupJob.mockReturnValue((async function* () {})());
-
-      await sut.removeStaleUploads();
-
-      expect(mocks.job.queueAll).toHaveBeenCalledWith([]);
-    });
-  });
-
-  describe('removeStaleUpload', () => {
-    const assetId = factory.uuid();
-    const path = `/upload/${assetId}/file.jpg`;
-
-    it('should skip if asset not found', async () => {
-      // eslint-disable-next-line unicorn/no-useless-undefined
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue(undefined);
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Skipped);
-      expect(mocks.storage.stat).not.toHaveBeenCalled();
-    });
-
-    it('should complete asset if file matches expected state', async () => {
-      const checksum = Buffer.from('checksum');
-      const fileModifiedAt = new Date();
-
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue({
-        path,
-        checksum,
-        fileModifiedAt,
-        size: 1024,
-      });
-
-      mocks.storage.stat.mockResolvedValue({ size: 1024 } as any);
-      mocks.crypto.hashFile.mockResolvedValue(checksum);
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Success);
-      expect(mocks.asset.setComplete).toHaveBeenCalledWith(assetId);
-      expect(mocks.storage.unlink).not.toHaveBeenCalled();
-    });
-
-    it('should cancel asset if file size does not match', async () => {
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue({
-        path,
-        checksum: Buffer.from('checksum'),
-        fileModifiedAt: new Date(),
-        size: 1024,
-      });
-
-      mocks.storage.stat.mockResolvedValue({ size: 512 } as any);
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Success);
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(path);
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledWith(assetId);
-    });
-
-    it('should cancel asset if checksum does not match', async () => {
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue({
-        path,
-        checksum: Buffer.from('expected-checksum'),
-        fileModifiedAt: new Date(),
-        size: 1024,
-      });
-
-      mocks.storage.stat.mockResolvedValue({ size: 1024 } as any);
-      mocks.crypto.hashFile.mockResolvedValue(Buffer.from('actual-checksum'));
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Success);
-      expect(mocks.storage.unlink).toHaveBeenCalledWith(path);
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledWith(assetId);
-    });
-
-    it('should cancel asset if file does not exist', async () => {
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue({
-        path,
-        checksum: Buffer.from('checksum'),
-        fileModifiedAt: new Date(),
-        size: 1024,
-      });
-
-      const error = new Error('File not found') as NodeJS.ErrnoException;
-      error.code = 'ENOENT';
-      mocks.storage.stat.mockRejectedValue(error);
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Success);
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledWith(assetId);
-    });
-
-    it('should cancel asset if stat fails with permission error', async () => {
-      mocks.assetJob.getForPartialAssetCleanupJob.mockResolvedValue({
-        path,
-        checksum: Buffer.from('checksum'),
-        fileModifiedAt: new Date(),
-        size: 1024,
-      });
-
-      const error = new Error('Permission denied') as NodeJS.ErrnoException;
-      error.code = 'EACCES';
-      mocks.storage.stat.mockRejectedValue(error);
-
-      const result = await sut.removeStaleUpload({ id: assetId });
-
-      expect(result).toBe(JobStatus.Success);
-      expect(mocks.asset.removeAndDecrementQuota).toHaveBeenCalledWith(assetId);
-    });
-  });
-});

server/src/services/asset-upload.service.ts

@@ -1,454 +0,0 @@
-import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
-import { Response } from 'express';
-import { DateTime } from 'luxon';
-import { createHash } from 'node:crypto';
-import { dirname, extname, join } from 'node:path';
-import { Readable, Writable } from 'node:stream';
-import { SystemConfig } from 'src/config';
-import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
-import { StorageCore } from 'src/cores/storage.core';
-import { OnEvent, OnJob } from 'src/decorators';
-import { GetUploadStatusDto, ResumeUploadDto, StartUploadDto } from 'src/dtos/asset-upload.dto';
-import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  AssetMetadataKey,
-  AssetStatus,
-  AssetType,
-  AssetVisibility,
-  ImmichWorker,
-  JobName,
-  JobStatus,
-  QueueName,
-  StorageFolder,
-} from 'src/enum';
-import { ArgOf } from 'src/repositories/event.repository';
-import { BaseService } from 'src/services/base.service';
-import { JobItem, JobOf } from 'src/types';
-import { isAssetChecksumConstraint } from 'src/utils/database';
-import { mimeTypes } from 'src/utils/mime-types';
-import { withRetry } from 'src/utils/misc';
-
-export const MAX_RUFH_INTEROP_VERSION = 8;
-
-@Injectable()
-export class AssetUploadService extends BaseService {
-  // This is used to proactively abort previous requests for the same asset
-  // when a new one arrives. The previous request still holds the asset lock
-  // and will prevent the new request from proceeding until the previous one
-  // times out. As normal client behavior will not have concurrent requests,
-  // we can assume the previous request has already failed on the client end.
-  private activeRequests = new Map<string, { req: Readable; startTime: Date }>();
-
-  @OnEvent({ name: 'UploadAbort', workers: [ImmichWorker.Api], server: true })
-  onUploadAbort({ assetId, abortTime }: ArgOf<'UploadAbort'>) {
-    const entry = this.activeRequests.get(assetId);
-    if (!entry) {
-      return false;
-    }
-    if (abortTime > entry.startTime) {
-      entry.req.destroy();
-      this.activeRequests.delete(assetId);
-    }
-    return true;
-  }
-
-  async startUpload(auth: AuthDto, req: Readable, res: Response, dto: StartUploadDto): Promise<void> {
-    this.logger.verboseFn(() => `Starting upload: ${JSON.stringify(dto)}`);
-    const { uploadComplete, assetData, uploadLength, contentLength, version } = dto;
-    const isComplete = uploadComplete !== false;
-    const isResumable = version && uploadComplete !== undefined;
-    const { backup } = await this.getConfig({ withCache: true });
-
-    const asset = await this.onStart(auth, dto);
-    if (asset.isDuplicate) {
-      if (asset.status !== AssetStatus.Partial) {
-        return this.sendAlreadyCompleted(res);
-      }
-
-      const location = `/api/upload/${asset.id}`;
-      if (isResumable) {
-        this.sendInterimResponse(res, location, version, this.getUploadLimits(backup));
-        // this is a 5xx to indicate the client should do offset retrieval and resume
-        res.status(500).send('Incomplete asset already exists');
-        return;
-      }
-    }
-
-    if (isComplete && uploadLength !== contentLength) {
-      return this.sendInconsistentLength(res);
-    }
-
-    const location = `/api/upload/${asset.id}`;
-    if (isResumable) {
-      this.sendInterimResponse(res, location, version, this.getUploadLimits(backup));
-    }
-
-    this.addRequest(asset.id, req);
-    await this.databaseRepository.withUuidLock(asset.id, async () => {
-      // conventional upload, check status again with lock acquired before overwriting
-      if (asset.isDuplicate) {
-        const existingAsset = await this.assetRepository.getCompletionMetadata(asset.id, auth.user.id);
-        if (existingAsset?.status !== AssetStatus.Partial) {
-          return this.sendAlreadyCompleted(res);
-        }
-      }
-      await this.storageRepository.mkdir(dirname(asset.path));
-
-      let checksumBuffer: Buffer | undefined;
-      const writeStream = asset.isDuplicate
-        ? this.storageRepository.createWriteStream(asset.path)
-        : this.storageRepository.createOrAppendWriteStream(asset.path);
-      this.pipe(req, writeStream, contentLength);
-      if (isComplete) {
-        const hash = createHash('sha1');
-        req.on('data', (data: Buffer) => hash.update(data));
-        writeStream.on('finish', () => (checksumBuffer = hash.digest()));
-      }
-      await new Promise((resolve, reject) => writeStream.on('close', resolve).on('error', reject));
-      if (isResumable) {
-        this.setCompleteHeader(res, version, uploadComplete);
-      }
-      if (!isComplete) {
-        res.status(201).set('Location', location).setHeader('Upload-Limit', this.getUploadLimits(backup)).send();
-        return;
-      }
-      if (dto.checksum.compare(checksumBuffer!) !== 0) {
-        return await this.sendChecksumMismatch(res, asset.id, asset.path);
-      }
-
-      await this.onComplete({ id: asset.id, path: asset.path, fileModifiedAt: assetData.fileModifiedAt });
-      res.status(200).send({ id: asset.id });
-    });
-  }
-
-  resumeUpload(auth: AuthDto, req: Readable, res: Response, id: string, dto: ResumeUploadDto): Promise<void> {
-    this.logger.verboseFn(() => `Resuming upload for ${id}: ${JSON.stringify(dto)}`);
-    const { uploadComplete, uploadLength, uploadOffset, contentLength, version } = dto;
-    this.setCompleteHeader(res, version, false);
-    this.addRequest(id, req);
-    return this.databaseRepository.withUuidLock(id, async () => {
-      const completionData = await this.assetRepository.getCompletionMetadata(id, auth.user.id);
-      if (!completionData) {
-        res.status(404).send('Asset not found');
-        return;
-      }
-      const { fileModifiedAt, path, status, checksum: providedChecksum, size } = completionData;
-
-      if (status !== AssetStatus.Partial) {
-        return this.sendAlreadyCompleted(res);
-      }
-
-      if (uploadLength && size && size !== uploadLength) {
-        return this.sendInconsistentLength(res);
-      }
-
-      const expectedOffset = await this.getCurrentOffset(path);
-      if (expectedOffset !== uploadOffset) {
-        return this.sendOffsetMismatch(res, expectedOffset, uploadOffset);
-      }
-
-      const newLength = uploadOffset + contentLength;
-      if (uploadLength !== undefined && newLength > uploadLength) {
-        res.status(400).send('Upload would exceed declared length');
-        return;
-      }
-
-      if (contentLength === 0 && !uploadComplete) {
-        res.status(204).setHeader('Upload-Offset', expectedOffset.toString()).send();
-        return;
-      }
-
-      const writeStream = this.storageRepository.createOrAppendWriteStream(path);
-      this.pipe(req, writeStream, contentLength);
-      await new Promise((resolve, reject) => writeStream.on('close', resolve).on('error', reject));
-      this.setCompleteHeader(res, version, uploadComplete);
-      if (!uploadComplete) {
-        try {
-          const offset = await this.getCurrentOffset(path);
-          res.status(204).setHeader('Upload-Offset', offset.toString()).send();
-        } catch {
-          this.logger.error(`Failed to get current offset for ${path} after write`);
-          res.status(500).send();
-        }
-        return;
-      }
-
-      const checksum = await this.cryptoRepository.hashFile(path);
-      if (providedChecksum.compare(checksum) !== 0) {
-        return await this.sendChecksumMismatch(res, id, path);
-      }
-
-      await this.onComplete({ id, path, fileModifiedAt });
-      res.status(200).send({ id });
-    });
-  }
-
-  cancelUpload(auth: AuthDto, assetId: string, res: Response): Promise<void> {
-    this.abortExistingRequest(assetId);
-    return this.databaseRepository.withUuidLock(assetId, async () => {
-      const asset = await this.assetRepository.getCompletionMetadata(assetId, auth.user.id);
-      if (!asset) {
-        res.status(404).send('Asset not found');
-        return;
-      }
-      if (asset.status !== AssetStatus.Partial) {
-        return this.sendAlreadyCompleted(res);
-      }
-      await this.onCancel(assetId, asset.path);
-      res.status(204).send();
-    });
-  }
-
-  async getUploadStatus(auth: AuthDto, res: Response, id: string, { version }: GetUploadStatusDto): Promise<void> {
-    this.logger.verboseFn(() => `Getting upload status for ${id} with version ${version}`);
-    const { backup } = await this.getConfig({ withCache: true });
-    this.abortExistingRequest(id);
-    return this.databaseRepository.withUuidLock(id, async () => {
-      const asset = await this.assetRepository.getCompletionMetadata(id, auth.user.id);
-      if (!asset) {
-        res.status(404).send('Asset not found');
-        return;
-      }
-
-      const offset = await this.getCurrentOffset(asset.path);
-      this.setCompleteHeader(res, version, asset.status !== AssetStatus.Partial);
-      res
-        .status(204)
-        .setHeader('Upload-Offset', offset.toString())
-        .setHeader('Cache-Control', 'no-store')
-        .setHeader('Upload-Limit', this.getUploadLimits(backup))
-        .send();
-    });
-  }
-
-  async getUploadOptions(res: Response): Promise<void> {
-    const { backup } = await this.getConfig({ withCache: true });
-    res.status(204).setHeader('Upload-Limit', this.getUploadLimits(backup)).send();
-  }
-
-  @OnJob({ name: JobName.PartialAssetCleanupQueueAll, queue: QueueName.BackgroundTask })
-  async removeStaleUploads(): Promise<void> {
-    const config = await this.getConfig({ withCache: false });
-    const createdBefore = DateTime.now().minus({ hours: config.backup.upload.maxAgeHours }).toJSDate();
-    let jobs: JobItem[] = [];
-    const assets = this.assetJobRepository.streamForPartialAssetCleanupJob(createdBefore);
-    for await (const asset of assets) {
-      jobs.push({ name: JobName.PartialAssetCleanup, data: asset });
-      if (jobs.length >= JOBS_ASSET_PAGINATION_SIZE) {
-        await this.jobRepository.queueAll(jobs);
-        jobs = [];
-      }
-    }
-    await this.jobRepository.queueAll(jobs);
-  }
-
-  @OnJob({ name: JobName.PartialAssetCleanup, queue: QueueName.BackgroundTask })
-  removeStaleUpload({ id }: JobOf<JobName.PartialAssetCleanup>): Promise<JobStatus> {
-    return this.databaseRepository.withUuidLock(id, async () => {
-      const asset = await this.assetJobRepository.getForPartialAssetCleanupJob(id);
-      if (!asset) {
-        return JobStatus.Skipped;
-      }
-      const { checksum, fileModifiedAt, path, size } = asset;
-      try {
-        const stat = await this.storageRepository.stat(path);
-        if (size === stat.size && checksum === (await this.cryptoRepository.hashFile(path))) {
-          await this.onComplete({ id, path, fileModifiedAt });
-          return JobStatus.Success;
-        }
-      } catch (error: any) {
-        this.logger.debugFn(() => `Failed to check upload file ${path}: ${error.message}`);
-      }
-      await this.onCancel(id, path);
-      return JobStatus.Success;
-    });
-  }
-
-  async onStart(
-    auth: AuthDto,
-    { assetData, checksum, uploadLength }: StartUploadDto,
-  ): Promise<{ id: string; path: string; status: AssetStatus; isDuplicate: boolean }> {
-    const assetId = this.cryptoRepository.randomUUID();
-    const folder = StorageCore.getNestedFolder(StorageFolder.Upload, auth.user.id, assetId);
-    const extension = extname(assetData.filename);
-    const path = join(folder, `${assetId}${extension}`);
-    const type = mimeTypes.assetType(path);
-
-    if (type === AssetType.Other) {
-      throw new BadRequestException(`${assetData.filename} is an unsupported file type`);
-    }
-
-    this.validateQuota(auth, uploadLength);
-
-    try {
-      await this.assetRepository.createWithMetadata(
-        {
-          id: assetId,
-          ownerId: auth.user.id,
-          libraryId: null,
-          checksum,
-          originalPath: path,
-          deviceAssetId: assetData.deviceAssetId,
-          deviceId: assetData.deviceId,
-          fileCreatedAt: assetData.fileCreatedAt,
-          fileModifiedAt: assetData.fileModifiedAt,
-          localDateTime: assetData.fileCreatedAt,
-          type,
-          isFavorite: assetData.isFavorite,
-          livePhotoVideoId: assetData.livePhotoVideoId,
-          visibility: AssetVisibility.Hidden,
-          originalFileName: assetData.filename,
-          status: AssetStatus.Partial,
-        },
-        uploadLength,
-        assetData.iCloudId ? [{ key: AssetMetadataKey.MobileApp, value: { iCloudId: assetData.iCloudId } }] : undefined,
-      );
-    } catch (error: any) {
-      if (!isAssetChecksumConstraint(error)) {
-        this.logger.error(`Error creating upload asset record: ${error.message}`);
-        throw new InternalServerErrorException('Error creating asset');
-      }
-
-      const duplicate = await this.assetRepository.getUploadAssetIdByChecksum(auth.user.id, checksum);
-      if (!duplicate) {
-        throw new InternalServerErrorException('Error locating duplicate for checksum constraint');
-      }
-
-      return { id: duplicate.id, path, status: duplicate.status, isDuplicate: true };
-    }
-
-    return { id: assetId, path, status: AssetStatus.Partial, isDuplicate: false };
-  }
-
-  async onComplete({ id, path, fileModifiedAt }: { id: string; path: string; fileModifiedAt: Date }) {
-    this.logger.log('Completing upload for asset', id);
-    const jobData = { name: JobName.AssetExtractMetadata, data: { id, source: 'upload' } } as const;
-    await withRetry(() => this.assetRepository.setComplete(id));
-    try {
-      await withRetry(() => this.storageRepository.utimes(path, new Date(), fileModifiedAt));
-    } catch (error: any) {
-      this.logger.error(`Failed to update times for ${path}: ${error.message}`);
-    }
-    await withRetry(() => this.jobRepository.queue(jobData));
-  }
-
-  async onCancel(assetId: string, path: string): Promise<void> {
-    this.logger.log('Cancelling upload for asset', assetId);
-    await withRetry(() => this.storageRepository.unlink(path));
-    await withRetry(() => this.assetRepository.removeAndDecrementQuota(assetId));
-  }
-
-  private addRequest(assetId: string, req: Readable) {
-    const addTime = new Date();
-    const activeRequest = { req, startTime: addTime };
-    this.abortExistingRequest(assetId, addTime);
-    this.activeRequests.set(assetId, activeRequest);
-    req.on('close', () => {
-      if (this.activeRequests.get(assetId)?.req === req) {
-        this.activeRequests.delete(assetId);
-      }
-    });
-  }
-
-  private abortExistingRequest(assetId: string, abortTime = new Date()) {
-    const abortEvent = { assetId, abortTime };
-    // only emit if we didn't just abort it ourselves
-    if (!this.onUploadAbort(abortEvent)) {
-      this.eventRepository.serverSend('UploadAbort', abortEvent);
-    }
-  }
-
-  private pipe(req: Readable, writeStream: Writable, size: number) {
-    let receivedLength = 0;
-    req.on('data', (data: Buffer) => {
-      receivedLength += data.length;
-      if (!writeStream.write(data)) {
-        req.pause();
-        writeStream.once('drain', () => req.resume());
-      }
-    });
-
-    req.on('close', () => {
-      if (receivedLength < size) {
-        writeStream.emit('error', new Error('Request closed before all data received'));
-      }
-      writeStream.end();
-    });
-  }
-
-  private sendInterimResponse({ socket }: Response, location: string, interopVersion: number, limits: string): void {
-    if (socket && !socket.destroyed) {
-      // Express doesn't understand interim responses, so write directly to socket
-      socket.write(
-        'HTTP/1.1 104 Upload Resumption Supported\r\n' +
-          `Location: ${location}\r\n` +
-          `Upload-Limit: ${limits}\r\n` +
-          `Upload-Draft-Interop-Version: ${interopVersion}\r\n\r\n`,
-      );
-    }
-  }
-
-  private sendInconsistentLength(res: Response): void {
-    res.status(400).contentType('application/problem+json').send({
-      type: 'https://iana.org/assignments/http-problem-types#inconsistent-upload-length',
-      title: 'inconsistent length values for upload',
-    });
-  }
-
-  private sendAlreadyCompleted(res: Response): void {
-    res.status(400).contentType('application/problem+json').send({
-      type: 'https://iana.org/assignments/http-problem-types#completed-upload',
-      title: 'upload is already completed',
-    });
-  }
-
-  private sendOffsetMismatch(res: Response, expected: number, actual: number): void {
-    res.status(409).contentType('application/problem+json').setHeader('Upload-Offset', expected.toString()).send({
-      type: 'https://iana.org/assignments/http-problem-types#mismatching-upload-offset',
-      title: 'offset from request does not match offset of resource',
-      'expected-offset': expected,
-      'provided-offset': actual,
-    });
-  }
-
-  private sendChecksumMismatch(res: Response, assetId: string, path: string) {
-    this.logger.warn(`Removing upload asset ${assetId} due to checksum mismatch`);
-    res.status(460).send('File on server does not match provided checksum');
-    return this.onCancel(assetId, path);
-  }
-
-  private validateQuota(auth: AuthDto, size: number): void {
-    const { quotaSizeInBytes: quotaLimit, quotaUsageInBytes: currentUsage } = auth.user;
-    if (quotaLimit === null) {
-      return;
-    }
-
-    if (quotaLimit < currentUsage + size) {
-      throw new BadRequestException('Quota has been exceeded!');
-    }
-  }
-
-  private async getCurrentOffset(path: string): Promise<number> {
-    try {
-      const stat = await this.storageRepository.stat(path);
-      return stat.size;
-    } catch (error: any) {
-      if ((error as NodeJS.ErrnoException)?.code === 'ENOENT') {
-        return 0;
-      }
-      throw error;
-    }
-  }
-
-  private setCompleteHeader(res: Response, interopVersion: number | undefined, isComplete: boolean): void {
-    if (interopVersion === undefined || interopVersion > 3) {
-      res.setHeader('Upload-Complete', isComplete ? '?1' : '?0');
-    } else {
-      res.setHeader('Upload-Incomplete', isComplete ? '?0' : '?1');
-    }
-  }
-
-  private getUploadLimits({ upload }: SystemConfig['backup']) {
-    return `min-size=1, max-age=${upload.maxAgeHours * 3600}`;
-  }
-}

server/src/services/index.ts

@@ -3,7 +3,6 @@ import { AlbumService } from 'src/services/album.service';
 import { ApiKeyService } from 'src/services/api-key.service';
 import { ApiService } from 'src/services/api.service';
 import { AssetMediaService } from 'src/services/asset-media.service';
-import { AssetUploadService } from 'src/services/asset-upload.service';
 import { AssetService } from 'src/services/asset.service';
 import { AuditService } from 'src/services/audit.service';
 import { AuthAdminService } from 'src/services/auth-admin.service';
@@ -48,7 +47,6 @@ export const services = [
   AlbumService,
   ApiService,
   AssetMediaService,
-  AssetUploadService,
   AssetService,
   AuditService,
   AuthService,

server/src/services/job.service.spec.ts

@@ -48,7 +48,6 @@ describe(JobService.name, () => {
         { name: JobName.UserSyncUsage },
         { name: JobName.AssetGenerateThumbnailsQueueAll, data: { force: false } },
         { name: JobName.FacialRecognitionQueueAll, data: { force: false, nightly: true } },
-        { name: JobName.PartialAssetCleanupQueueAll },
       ]);
     });
   });

server/src/services/job.service.ts

@@ -302,10 +302,6 @@ export class JobService extends BaseService {
       jobs.push({ name: JobName.FacialRecognitionQueueAll, data: { force: false, nightly: true } });
     }
 
-    if (config.nightlyTasks.removeStaleUploads) {
-      jobs.push({ name: JobName.PartialAssetCleanupQueueAll });
-    }
-
     await this.jobRepository.queueAll(jobs);
   }
 

server/src/services/system-config.service.spec.ts

@@ -46,9 +46,6 @@ const updatedConfig = Object.freeze<SystemConfig>({
       cronExpression: '0 02 * * *',
       keepLastAmount: 14,
     },
-    upload: {
-      maxAgeHours: 72,
-    },
   },
   ffmpeg: {
     crf: 30,
@@ -118,7 +115,6 @@ const updatedConfig = Object.freeze<SystemConfig>({
     missingThumbnails: true,
     generateMemories: true,
     syncQuotaUsage: true,
-    removeStaleUploads: true,
   },
   reverseGeocoding: {
     enabled: true,

server/src/types.ts

@@ -352,8 +352,6 @@ export type JobItem =
   | { name: JobName.PersonCleanup; data?: IBaseJob }
   | { name: JobName.AssetDelete; data: IAssetDeleteJob }
   | { name: JobName.AssetDeleteCheck; data?: IBaseJob }
-  | { name: JobName.PartialAssetCleanup; data: IEntityJob }
-  | { name: JobName.PartialAssetCleanupQueueAll; data?: IBaseJob }
 
   // Library Management
   | { name: JobName.LibrarySyncFiles; data: ILibraryFileJob }

server/src/utils/database.ts

@@ -99,7 +99,7 @@ export const getKyselyConfig = (
       }),
     }),
     log(event) {
-      if (event.level === 'error' && (event.error as PostgresError).constraint_name !== ASSET_CHECKSUM_CONSTRAINT) {
+      if (event.level === 'error') {
         console.error('Query failed :', {
           durationMs: event.queryDurationMillis,
           error: event.error,

server/src/utils/misc.ts

@@ -14,7 +14,6 @@ import {
 import _ from 'lodash';
 import { writeFileSync } from 'node:fs';
 import path from 'node:path';
-import { setTimeout } from 'node:timers/promises';
 import picomatch from 'picomatch';
 import parse from 'picomatch/lib/parse';
 import { SystemConfig } from 'src/config';
@@ -325,18 +324,3 @@ export const globToSqlPattern = (glob: string) => {
 export function clamp(value: number, min: number, max: number) {
   return Math.max(min, Math.min(max, value));
 }
-
-export async function withRetry<T>(operation: () => Promise<T>, retries: number = 2, delay: number = 100): Promise<T> {
-  let lastError: any;
-  for (let attempt = 0; attempt <= retries; attempt++) {
-    try {
-      return await operation();
-    } catch (error: any) {
-      lastError = error;
-    }
-    if (attempt < retries) {
-      await setTimeout(delay);
-    }
-  }
-  throw lastError;
-}

server/src/utils/request.ts

@@ -1,35 +1,5 @@
-import { BadRequestException } from '@nestjs/common';
-import { plainToInstance } from 'class-transformer';
-import { validateSync } from 'class-validator';
-
 export const fromChecksum = (checksum: string): Buffer => {
   return Buffer.from(checksum, checksum.length === 28 ? 'base64' : 'hex');
 };
 
 export const fromMaybeArray = <T>(param: T | T[]) => (Array.isArray(param) ? param[0] : param);
-
-export function validateSyncOrReject<T extends object>(cls: new () => T, obj: any): T {
-  const dto = plainToInstance(cls, obj, { excludeExtraneousValues: true });
-  const errors = validateSync(dto);
-  if (errors.length === 0) {
-    return dto;
-  }
-
-  const constraints = [];
-  for (const error of errors) {
-    if (error.constraints) {
-      constraints.push(...Object.values(error.constraints));
-    }
-
-    if (!error.children) {
-      continue;
-    }
-
-    for (const child of error.children) {
-      if (child.constraints) {
-        constraints.push(...Object.values(child.constraints));
-      }
-    }
-  }
-  throw new BadRequestException(constraints);
-}

server/test/repositories/asset.repository.mock.ts

@@ -45,9 +45,5 @@ export const newAssetRepositoryMock = (): Mocked<RepositoryInterface<AssetReposi
     upsertMetadata: vitest.fn(),
     getMetadataByKey: vitest.fn(),
     deleteMetadataByKey: vitest.fn(),
-    getCompletionMetadata: vitest.fn(),
-    createWithMetadata: vitest.fn(),
-    removeAndDecrementQuota: vitest.fn(),
-    setComplete: vitest.fn(),
   };
 };

server/test/repositories/database.repository.mock.ts

@@ -20,7 +20,6 @@ export const newDatabaseRepositoryMock = (): Mocked<RepositoryInterface<Database
     prewarm: vitest.fn(),
     runMigrations: vitest.fn(),
     withLock: vitest.fn().mockImplementation((_, function_: <R>() => Promise<R>) => function_()),
-    withUuidLock: vitest.fn().mockImplementation((_, function_: <R>() => Promise<R>) => function_()),
     tryLock: vitest.fn(),
     isBusy: vitest.fn(),
     wait: vitest.fn(),

server/test/repositories/storage.repository.mock.ts

@@ -51,7 +51,6 @@ export const newStorageRepositoryMock = (): Mocked<RepositoryInterface<StorageRe
     readFile: vitest.fn(),
     createFile: vitest.fn(),
     createWriteStream: vitest.fn(),
-    createOrAppendWriteStream: vitest.fn(),
     createOrOverwriteFile: vitest.fn(),
     existsSync: vitest.fn(),
     overwriteFile: vitest.fn(),
@@ -59,7 +58,6 @@ export const newStorageRepositoryMock = (): Mocked<RepositoryInterface<StorageRe
     unlinkDir: vitest.fn().mockResolvedValue(true),
     removeEmptyDirs: vitest.fn(),
     checkFileExists: vitest.fn(),
-    mkdir: vitest.fn(),
     mkdirSync: vitest.fn(),
     checkDiskUsage: vitest.fn(),
     readdir: vitest.fn(),

web/package.json

@@ -27,7 +27,7 @@
   "dependencies": {
     "@formatjs/icu-messageformat-parser": "^2.9.8",
     "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@immich/ui": "^0.34.0",
+    "@immich/ui": "^0.29.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
     "@mdi/js": "^7.4.47",
     "@photo-sphere-viewer/core": "^5.11.5",
@@ -69,7 +69,7 @@
     "@sveltejs/adapter-static": "^3.0.8",
     "@sveltejs/enhanced-img": "^0.8.0",
     "@sveltejs/kit": "^2.27.1",
-    "@sveltejs/vite-plugin-svelte": "6.2.1",
+    "@sveltejs/vite-plugin-svelte": "6.2.0",
     "@tailwindcss/vite": "^4.1.7",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/svelte": "^5.2.8",
@@ -95,7 +95,7 @@
     "prettier-plugin-sort-json": "^4.1.1",
     "prettier-plugin-svelte": "^3.3.3",
     "rollup-plugin-visualizer": "^6.0.0",
-    "svelte": "5.39.11",
+    "svelte": "5.38.10",
     "svelte-check": "^4.1.5",
     "svelte-eslint-parser": "^1.3.3",
     "tailwindcss": "^4.1.7",

web/src/lib/components/ServerAboutItem.svelte

@@ -16,7 +16,7 @@
   <Label size="small" color="primary" for={id}>{title}</Label>
   <Text size="small" color="muted" {id}>
     {#if versionHref}
-      <Link href={versionHref}>{version}</Link>
+      <Link external href={versionHref}>{version}</Link>
     {:else}
       {version}
     {/if}

web/src/lib/components/asset-viewer/actions/action.ts

@@ -1,24 +1,24 @@
 import type { AssetAction } from '$lib/constants';
-import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+import type { Asset } from '$lib/managers/timeline-manager/types';
 import type { AlbumResponseDto, AssetResponseDto, PersonResponseDto, StackResponseDto } from '@immich/sdk';
 
 type ActionMap = {
-  [AssetAction.ARCHIVE]: { asset: TimelineAsset };
-  [AssetAction.UNARCHIVE]: { asset: TimelineAsset };
-  [AssetAction.FAVORITE]: { asset: TimelineAsset };
-  [AssetAction.UNFAVORITE]: { asset: TimelineAsset };
-  [AssetAction.TRASH]: { asset: TimelineAsset };
-  [AssetAction.DELETE]: { asset: TimelineAsset };
-  [AssetAction.RESTORE]: { asset: TimelineAsset };
-  [AssetAction.ADD]: { asset: TimelineAsset };
-  [AssetAction.ADD_TO_ALBUM]: { asset: TimelineAsset; album: AlbumResponseDto };
+  [AssetAction.ARCHIVE]: { asset: Asset };
+  [AssetAction.UNARCHIVE]: { asset: Asset };
+  [AssetAction.FAVORITE]: { asset: Asset };
+  [AssetAction.UNFAVORITE]: { asset: Asset };
+  [AssetAction.TRASH]: { asset: Asset };
+  [AssetAction.DELETE]: { asset: Asset };
+  [AssetAction.RESTORE]: { asset: Asset };
+  [AssetAction.ADD]: { asset: Asset };
+  [AssetAction.ADD_TO_ALBUM]: { asset: Asset; album: AlbumResponseDto };
   [AssetAction.STACK]: { stack: StackResponseDto };
-  [AssetAction.UNSTACK]: { assets: TimelineAsset[] };
-  [AssetAction.KEEP_THIS_DELETE_OTHERS]: { asset: TimelineAsset };
+  [AssetAction.UNSTACK]: { assets: Asset[] };
+  [AssetAction.KEEP_THIS_DELETE_OTHERS]: { asset: Asset };
   [AssetAction.SET_STACK_PRIMARY_ASSET]: { stack: StackResponseDto };
   [AssetAction.REMOVE_ASSET_FROM_STACK]: { stack: StackResponseDto | null; asset: AssetResponseDto };
-  [AssetAction.SET_VISIBILITY_LOCKED]: { asset: TimelineAsset };
-  [AssetAction.SET_VISIBILITY_TIMELINE]: { asset: TimelineAsset };
+  [AssetAction.SET_VISIBILITY_LOCKED]: { asset: Asset };
+  [AssetAction.SET_VISIBILITY_TIMELINE]: { asset: Asset };
   [AssetAction.SET_PERSON_FEATURED_PHOTO]: { asset: AssetResponseDto; person: PersonResponseDto };
 };
 

web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte

@@ -5,7 +5,7 @@
   import { AssetAction } from '$lib/constants';
   import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';
   import { addAssetsToAlbum, addAssetsToAlbums } from '$lib/utils/asset-utils';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto } from '@immich/sdk';
   import { modalManager } from '@immich/ui';
   import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';
@@ -29,13 +29,13 @@
     if (albums.length === 1) {
       const album = albums[0];
       await addAssetsToAlbum(album.id, [asset.id]);
-      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album });
+      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toAsset(asset), album });
     } else {
       await addAssetsToAlbums(
         albums.map((a) => a.id),
         [asset.id],
       );
-      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toTimelineAsset(asset), album: albums[0] });
+      onAction({ type: AssetAction.ADD_TO_ALBUM, asset: toAsset(asset), album: albums[0] });
     }
   };
 </script>

web/src/lib/components/asset-viewer/actions/archive-action.svelte

@@ -4,7 +4,7 @@
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { AssetAction } from '$lib/constants';
   import { toggleArchive } from '$lib/utils/asset-utils';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto } from '@immich/sdk';
   import { mdiArchiveArrowDownOutline, mdiArchiveArrowUpOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -19,11 +19,11 @@
 
   const onArchive = async () => {
     if (!asset.isArchived) {
-      preAction({ type: AssetAction.ARCHIVE, asset: toTimelineAsset(asset) });
+      preAction({ type: AssetAction.ARCHIVE, asset: toAsset(asset) });
     }
     const updatedAsset = await toggleArchive(asset);
     if (updatedAsset) {
-      onAction({ type: asset.isArchived ? AssetAction.ARCHIVE : AssetAction.UNARCHIVE, asset: toTimelineAsset(asset) });
+      onAction({ type: asset.isArchived ? AssetAction.ARCHIVE : AssetAction.UNARCHIVE, asset: toAsset(asset) });
     }
   };
 </script>

web/src/lib/components/asset-viewer/actions/delete-action.svelte

@@ -10,7 +10,7 @@
   import { showDeleteModal } from '$lib/stores/preferences.store';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { handleError } from '$lib/utils/handle-error';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { deleteAssets, type AssetResponseDto } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
   import { mdiDeleteForeverOutline, mdiDeleteOutline } from '@mdi/js';
@@ -43,9 +43,9 @@
 
   const trashAsset = async () => {
     try {
-      preAction({ type: AssetAction.TRASH, asset: toTimelineAsset(asset) });
+      preAction({ type: AssetAction.TRASH, asset: toAsset(asset) });
       await deleteAssets({ assetBulkDeleteDto: { ids: [asset.id] } });
-      onAction({ type: AssetAction.TRASH, asset: toTimelineAsset(asset) });
+      onAction({ type: AssetAction.TRASH, asset: toAsset(asset) });
 
       notificationController.show({
         message: $t('moved_to_trash'),
@@ -58,9 +58,9 @@
 
   const deleteAsset = async () => {
     try {
-      preAction({ type: AssetAction.DELETE, asset: toTimelineAsset(asset) });
+      preAction({ type: AssetAction.DELETE, asset: toAsset(asset) });
       await deleteAssets({ assetBulkDeleteDto: { ids: [asset.id], force: true } });
-      onAction({ type: AssetAction.DELETE, asset: toTimelineAsset(asset) });
+      onAction({ type: AssetAction.DELETE, asset: toAsset(asset) });
 
       notificationController.show({
         message: $t('permanently_deleted_asset'),

web/src/lib/components/asset-viewer/actions/download-action.svelte

@@ -2,7 +2,7 @@
   import { shortcut } from '$lib/actions/shortcut';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { downloadFile } from '$lib/utils/asset-utils';
   import { getAssetInfo } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
@@ -10,7 +10,7 @@
   import { t } from 'svelte-i18n';
 
   interface Props {
-    asset: TimelineAsset;
+    asset: Asset;
     menuItem?: boolean;
   }
 

web/src/lib/components/asset-viewer/actions/favorite-action.svelte

@@ -6,12 +6,12 @@
   } from '$lib/components/shared-components/notification/notification';
   import { AssetAction } from '$lib/constants';
   import { handleError } from '$lib/utils/handle-error';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { updateAsset, type AssetResponseDto } from '@immich/sdk';
+  import { IconButton } from '@immich/ui';
   import { mdiHeart, mdiHeartOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { OnAction } from './action';
-  import { IconButton } from '@immich/ui';
 
   interface Props {
     asset: AssetResponseDto;
@@ -33,7 +33,7 @@
 
       onAction({
         type: asset.isFavorite ? AssetAction.FAVORITE : AssetAction.UNFAVORITE,
-        asset: toTimelineAsset(asset),
+        asset: toAsset(asset),
       });
 
       notificationController.show({

web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte

@@ -2,7 +2,7 @@
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { AssetAction } from '$lib/constants';
   import { keepThisDeleteOthers } from '$lib/utils/asset-utils';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto, StackResponseDto } from '@immich/sdk';
   import { modalManager } from '@immich/ui';
   import { mdiPinOutline } from '@mdi/js';
@@ -30,7 +30,7 @@
 
     const keptAsset = await keepThisDeleteOthers(asset, stack);
     if (keptAsset) {
-      onAction({ type: AssetAction.UNSTACK, assets: [toTimelineAsset(keptAsset)] });
+      onAction({ type: AssetAction.UNSTACK, assets: [toAsset(keptAsset)] });
     }
   };
 </script>

web/src/lib/components/asset-viewer/actions/restore-action.svelte

@@ -6,7 +6,7 @@
   } from '$lib/components/shared-components/notification/notification';
   import { AssetAction } from '$lib/constants';
   import { handleError } from '$lib/utils/handle-error';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { restoreAssets, type AssetResponseDto } from '@immich/sdk';
   import { mdiHistory } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -24,7 +24,7 @@
       await restoreAssets({ bulkIdsDto: { ids: [asset.id] } });
       asset.isTrashed = false;
 
-      onAction({ type: AssetAction.RESTORE, asset: toTimelineAsset(asset) });
+      onAction({ type: AssetAction.RESTORE, asset: toAsset(asset) });
 
       notificationController.show({
         type: NotificationType.Info,

web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { AssetAction } from '$lib/constants';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { handleError } from '$lib/utils/handle-error';
   import { AssetVisibility, updateAssets } from '@immich/sdk';
   import { modalManager } from '@immich/ui';
@@ -10,7 +10,7 @@
   import type { OnAction, PreAction } from './action';
 
   interface Props {
-    asset: TimelineAsset;
+    asset: Asset;
     onAction: OnAction;
     preAction: PreAction;
   }

web/src/lib/components/asset-viewer/actions/unstack-action.svelte

@@ -2,7 +2,7 @@
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import { AssetAction } from '$lib/constants';
   import { deleteStack } from '$lib/utils/asset-utils';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import type { StackResponseDto } from '@immich/sdk';
   import { mdiImageOffOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -18,7 +18,7 @@
   const handleUnstack = async () => {
     const unstackedAssets = await deleteStack([stack.id]);
     if (unstackedAssets) {
-      onAction({ type: AssetAction.UNSTACK, assets: unstackedAssets.map((asset) => toTimelineAsset(asset)) });
+      onAction({ type: AssetAction.UNSTACK, assets: unstackedAssets.map((asset) => toAsset(asset)) });
     }
   };
 </script>

web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte

@@ -31,7 +31,7 @@
   import { getAssetJobName, getSharedLink } from '$lib/utils';
   import { canCopyImageToClipboard } from '$lib/utils/asset-utils';
   import { openFileUploadDialog } from '$lib/utils/file-uploader';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import {
     AssetJobName,
     AssetTypeEnum,
@@ -165,7 +165,7 @@
     {/if}
 
     {#if !isOwner && showDownloadButton}
-      <DownloadAction asset={toTimelineAsset(asset)} />
+      <DownloadAction asset={toAsset(asset)} />
     {/if}
 
     {#if showDetailButton}
@@ -184,7 +184,7 @@
           <MenuOption icon={mdiPresentationPlay} text={$t('slideshow')} onClick={onPlaySlideshow} />
         {/if}
         {#if showDownloadButton}
-          <DownloadAction asset={toTimelineAsset(asset)} menuItem />
+          <DownloadAction asset={toAsset(asset)} menuItem />
         {/if}
 
         {#if !isLocked}
@@ -243,7 +243,7 @@
           {/if}
 
           {#if !asset.isTrashed}
-            <SetVisibilityAction asset={toTimelineAsset(asset)} {onAction} {preAction} />
+            <SetVisibilityAction asset={toAsset(asset)} {onAction} {preAction} />
           {/if}
           <hr />
           <MenuOption

web/src/lib/components/asset-viewer/asset-viewer.svelte

@@ -8,7 +8,7 @@
   import { AssetAction, ProjectionType } from '$lib/constants';
   import { activityManager } from '$lib/managers/activity-manager.svelte';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { closeEditorCofirm } from '$lib/stores/asset-editor.store';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { isShowDetail } from '$lib/stores/preferences.store';
@@ -18,7 +18,7 @@
   import { getAssetJobMessage, getSharedLink, handlePromiseError } from '$lib/utils';
   import { handleError } from '$lib/utils/handle-error';
   import { SlideshowHistory } from '$lib/utils/slideshow-history';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import {
     AssetJobName,
     AssetTypeEnum,
@@ -50,7 +50,7 @@
 
   interface Props {
     asset: AssetResponseDto;
-    preloadAssets?: TimelineAsset[];
+    preloadAssets?: Asset[];
     showNavigation?: boolean;
     withStacked?: boolean;
     isShared?: boolean;
@@ -126,7 +126,7 @@
 
     untrack(() => {
       if (stack && stack?.assets.length > 1) {
-        preloadAssets.push(toTimelineAsset(stack.assets[1]));
+        preloadAssets.push(toAsset(stack.assets[1]));
       }
     });
   };
@@ -156,7 +156,7 @@
     slideshowStateUnsubscribe = slideshowState.subscribe((value) => {
       if (value === SlideshowState.PlaySlideshow) {
         slideshowHistory.reset();
-        slideshowHistory.queue(toTimelineAsset(asset));
+        slideshowHistory.queue(toAsset(asset));
         handlePromiseError(handlePlaySlideshow());
       } else if (value === SlideshowState.StopSlideshow) {
         handlePromiseError(handleStopSlideshow());
@@ -166,7 +166,7 @@
     shuffleSlideshowUnsubscribe = slideshowNavigation.subscribe((value) => {
       if (value === SlideshowNavigation.Shuffle) {
         slideshowHistory.reset();
-        slideshowHistory.queue(toTimelineAsset(asset));
+        slideshowHistory.queue(toAsset(asset));
       }
     });
 
@@ -303,8 +303,10 @@
 
   const handleStopSlideshow = async () => {
     try {
+      // eslint-disable-next-line tscompat/tscompat
       if (document.fullscreenElement) {
         document.body.style.cursor = '';
+        // eslint-disable-next-line tscompat/tscompat
         await document.exitFullscreen();
       }
     } catch (error) {
@@ -569,7 +571,7 @@
               imageClass={{ 'border-2 border-white': stackedAsset.id === asset.id }}
               brokenAssetClass="text-xs"
               dimmed={stackedAsset.id !== asset.id}
-              asset={toTimelineAsset(stackedAsset)}
+              asset={toAsset(stackedAsset)}
               onClick={() => {
                 asset = stackedAsset;
                 previewStackedAsset = undefined;

web/src/lib/components/asset-viewer/editor/crop-tool/crop-area.svelte

@@ -12,7 +12,7 @@
     resetGlobalCropStore,
     rotateDegrees,
   } from '$lib/stores/asset-editor.store';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import type { AssetResponseDto } from '@immich/sdk';
   import { animateCropChange, recalculateCrop } from './crop-settings';
   import { cropAreaEl, cropFrame, imgElement, isResizingOrDragging, overlayEl, resetCropStore } from './crop-store';
@@ -80,7 +80,7 @@
     aria-label="Crop area"
     type="button"
   >
-    <img draggable="false" src={img?.src} alt={$getAltText(toTimelineAsset(asset))} />
+    <img draggable="false" src={img?.src} alt={$getAltText(toAsset(asset))} />
     <div class={`${$isResizingOrDragging ? 'resizing' : ''} crop-frame`} bind:this={$cropFrame}>
       <div class="grid"></div>
       <div class="corner top-left"></div>

web/src/lib/components/asset-viewer/photo-viewer.svelte

@@ -5,7 +5,7 @@
   import BrokenAsset from '$lib/components/assets/broken-asset.svelte';
   import { assetViewerFadeDuration } from '$lib/constants';
   import { castManager } from '$lib/managers/cast-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';
   import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
   import { boundingBoxesArray } from '$lib/stores/people.store';
@@ -18,7 +18,7 @@
   import { getBoundingBox } from '$lib/utils/people-utils';
   import { cancelImageUrl } from '$lib/utils/sw-messaging';
   import { getAltText } from '$lib/utils/thumbnail-util';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { AssetMediaSize, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk';
   import { LoadingSpinner } from '@immich/ui';
   import { onDestroy, onMount } from 'svelte';
@@ -29,7 +29,7 @@
 
   interface Props {
     asset: AssetResponseDto;
-    preloadAssets?: TimelineAsset[] | undefined;
+    preloadAssets?: Asset[] | undefined;
     element?: HTMLDivElement | undefined;
     haveFadeTransition?: boolean;
     sharedLink?: SharedLinkResponseDto | undefined;
@@ -72,7 +72,7 @@
     $boundingBoxesArray = [];
   });
 
-  const preload = (targetSize: AssetMediaSize | 'original', preloadAssets?: TimelineAsset[]) => {
+  const preload = (targetSize: AssetMediaSize | 'original', preloadAssets?: Asset[]) => {
     for (const preloadAsset of preloadAssets || []) {
       if (preloadAsset.isImage) {
         let img = new Image();
@@ -249,7 +249,7 @@
       <img
         bind:this={$photoViewerImgElement}
         src={assetFileUrl}
-        alt={$getAltText(toTimelineAsset(asset))}
+        alt={$getAltText(toAsset(asset))}
         class="h-full w-full {$slideshowState === SlideshowState.None
           ? 'object-contain'
           : slideshowLookCssMapping[$slideshowLook]}"

web/src/lib/components/asset-viewer/slideshow-bar.svelte

@@ -100,7 +100,9 @@
   };
 
   const onShowSettings = async () => {
+    // eslint-disable-next-line tscompat/tscompat
     if (document.fullscreenElement) {
+      // eslint-disable-next-line tscompat/tscompat
       await document.exitFullscreen();
     }
     await modalManager.show(SlideshowSettingsModal);
@@ -112,7 +114,11 @@
         webkitIsFullScreen?: boolean;
       };
 
-      if (!document.fullscreenElement && !doc.webkitIsFullScreen) {
+      if (
+        // eslint-disable-next-line tscompat/tscompat
+        !document.fullscreenElement &&
+        !doc.webkitIsFullScreen
+      ) {
         onClose();
       }
     }

web/src/lib/components/assets/thumbnail/thumbnail.svelte

@@ -17,7 +17,7 @@
 
   import { thumbhash } from '$lib/actions/thumbhash';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { mobileDevice } from '$lib/stores/mobile-device.svelte';
   import { moveFocus } from '$lib/utils/focus-util';
   import { currentUrlReplaceAssetId } from '$lib/utils/navigation';
@@ -30,7 +30,7 @@
   import VideoThumbnail from './video-thumbnail.svelte';
 
   interface Props {
-    asset: TimelineAsset;
+    asset: Asset;
     groupIndex?: number;
     thumbnailSize?: number;
     thumbnailWidth?: number;
@@ -45,8 +45,8 @@
     imageClass?: ClassValue;
     brokenAssetClass?: ClassValue;
     dimmed?: boolean;
-    onClick?: (asset: TimelineAsset) => void;
-    onSelect?: (asset: TimelineAsset) => void;
+    onClick?: (asset: Asset) => void;
+    onSelect?: (asset: Asset) => void;
     onMouseEvent?: (event: { isMouseOver: boolean; selectedGroupIndex: number }) => void;
   }
 

web/src/lib/components/memory-page/memory-photo-viewer.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { assetViewerFadeDuration } from '$lib/constants';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { getAssetThumbnailUrl } from '$lib/utils';
   import { getAltText } from '$lib/utils/thumbnail-util';
   import { AssetMediaSize } from '@immich/sdk';
@@ -9,7 +9,7 @@
   import { fade } from 'svelte/transition';
 
   interface Props {
-    asset: TimelineAsset;
+    asset: Asset;
     onImageLoad: () => void;
   }
 

web/src/lib/components/memory-page/memory-video-viewer.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
   import { assetViewerFadeDuration } from '$lib/constants';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
   import { AssetMediaSize } from '@immich/sdk';
   import { onMount } from 'svelte';
   import { fade } from 'svelte/transition';
 
   interface Props {
-    asset: TimelineAsset;
+    asset: Asset;
     videoPlayer: HTMLVideoElement | undefined;
     videoViewerMuted?: boolean;
     videoViewerVolume?: number;

web/src/lib/components/memory-page/memory-viewer.svelte

@@ -27,7 +27,7 @@
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import { AppRoute, QueryParameter } from '$lib/constants';
   import { authManager } from '$lib/managers/auth-manager.svelte';
-  import type { TimelineAsset, Viewport } from '$lib/managers/timeline-manager/types';
+  import type { Asset, Viewport } from '$lib/managers/timeline-manager/types';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { type MemoryAsset, memoryStore } from '$lib/stores/memory.store.svelte';
@@ -35,7 +35,7 @@
   import { preferences } from '$lib/stores/user.store';
   import { getAssetThumbnailUrl, handlePromiseError, memoryLaneTitle } from '$lib/utils';
   import { cancelMultiselect } from '$lib/utils/asset-utils';
-  import { fromISODateTimeUTC, toTimelineAsset } from '$lib/utils/timeline-util';
+  import { fromISODateTimeUTC, toAsset } from '$lib/utils/timeline-util';
   import { AssetMediaSize, getAssetInfo } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
   import {
@@ -71,7 +71,7 @@
   let currentMemoryAssetFull = $derived.by(async () =>
     current?.asset ? await getAssetInfo({ ...authManager.params, id: current.asset.id }) : undefined,
   );
-  let currentTimelineAssets = $derived(current?.memory.assets.map((asset) => toTimelineAsset(asset)) || []);
+  let currentAssets = $derived(current?.memory.assets.map((asset) => toAsset(asset)) || []);
 
   let isSaved = $derived(current?.memory.isSaved);
   let viewerHeight = $state(0);
@@ -97,7 +97,7 @@
     await goto(asHref(asset));
   };
 
-  const setProgressDuration = (asset: TimelineAsset) => {
+  const setProgressDuration = (asset: Asset) => {
     if (asset.isVideo) {
       const timeParts = asset.duration!.split(':').map(Number);
       const durationInMilliseconds = (timeParts[0] * 3600 + timeParts[1] * 60 + timeParts[2]) * 1000;
@@ -116,8 +116,7 @@
   const handleNextMemory = () => handleNavigate(current?.nextMemory?.assets[0]);
   const handlePreviousMemory = () => handleNavigate(current?.previousMemory?.assets[0]);
   const handleEscape = async () => goto(AppRoute.PHOTOS);
-  const handleSelectAll = () =>
-    assetInteraction.selectAssets(current?.memory.assets.map((a) => toTimelineAsset(a)) || []);
+  const handleSelectAll = () => assetInteraction.selectAssets(current?.memory.assets.map((a) => toAsset(a)) || []);
 
   const handleAction = async (callingContext: string, action: 'reset' | 'pause' | 'play') => {
     // leaving these log statements here as comments. Very useful to figure out what's going on during dev!
@@ -658,7 +657,7 @@
       <GalleryViewer
         onNext={handleNextAsset}
         onPrevious={handlePreviousAsset}
-        assets={currentTimelineAssets}
+        assets={currentAssets}
         viewport={galleryViewport}
         {assetInteraction}
         slidingWindowOffset={viewerHeight}

web/src/lib/components/photos-page/memory-lane.svelte

@@ -4,7 +4,7 @@
   import { memoryStore } from '$lib/stores/memory.store.svelte';
   import { getAssetThumbnailUrl, memoryLaneTitle } from '$lib/utils';
   import { getAltText } from '$lib/utils/thumbnail-util';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { Icon } from '@immich/ui';
   import { mdiChevronLeft, mdiChevronRight } from '@mdi/js';
   import { onMount } from 'svelte';
@@ -89,7 +89,7 @@
           <img
             class="h-full w-full rounded-xl object-cover"
             src={getAssetThumbnailUrl(memory.assets[0].id)}
-            alt={$t('memory_lane_title', { values: { title: $getAltText(toTimelineAsset(memory.assets[0])) } })}
+            alt={$t('memory_lane_title', { values: { title: $getAltText(toAsset(memory.assets[0])) } })}
             draggable="false"
           />
           <div

web/src/lib/components/share-page/individual-shared-viewer.svelte

@@ -14,7 +14,7 @@
   import { cancelMultiselect, downloadArchive } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
   import { handleError } from '$lib/utils/handle-error';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { addSharedLinkAssets, getAssetInfo, type SharedLinkResponseDto } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
   import { mdiArrowLeft, mdiDownload, mdiFileImagePlusOutline, mdiSelectAll } from '@mdi/js';
@@ -34,7 +34,7 @@
   const viewport: Viewport = $state({ width: 0, height: 0 });
   const assetInteraction = new AssetInteraction();
 
-  let assets = $derived(sharedLink.assets.map((a) => toTimelineAsset(a)));
+  let assets = $derived(sharedLink.assets.map((a) => toAsset(a)));
 
   dragAndDropFilesStore.subscribe((value) => {
     if (value.isDragging && value.files.length > 0) {

web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte

@@ -5,7 +5,7 @@
   import Thumbnail from '$lib/components/assets/thumbnail/thumbnail.svelte';
   import { AppRoute, AssetAction } from '$lib/constants';
   import Portal from '$lib/elements/Portal.svelte';
-  import type { TimelineAsset, Viewport } from '$lib/managers/timeline-manager/types';
+  import type { Asset, Viewport } from '$lib/managers/timeline-manager/types';
   import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';
   import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
@@ -18,7 +18,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { getJustifiedLayoutFromAssets, type CommonJustifiedLayout } from '$lib/utils/layout-utils';
   import { navigate } from '$lib/utils/navigation';
-  import { isTimelineAsset, toTimelineAsset } from '$lib/utils/timeline-util';
+  import { isAsset, toAsset } from '$lib/utils/timeline-util';
   import { AssetVisibility, type AssetResponseDto } from '@immich/sdk';
   import { modalManager } from '@immich/ui';
   import { debounce } from 'lodash-es';
@@ -28,7 +28,7 @@
 
   interface Props {
     initialAssetId?: string;
-    assets: (TimelineAsset | AssetResponseDto)[];
+    assets: (Asset | AssetResponseDto)[];
     assetInteraction: AssetInteraction;
     disableAssetSelect?: boolean;
     showArchiveIcon?: boolean;
@@ -130,7 +130,7 @@
   }
 
   let shiftKeyIsDown = $state(false);
-  let lastAssetMouseEvent: TimelineAsset | null = $state(null);
+  let lastAssetMouseEvent: Asset | null = $state(null);
   let slidingWindow = $state({ top: 0, bottom: 0 });
 
   const updateSlidingWindow = () => {
@@ -157,14 +157,14 @@
       }
     }
   });
-  const viewAssetHandler = async (asset: TimelineAsset) => {
+  const viewAssetHandler = async (asset: Asset) => {
     currentIndex = assets.findIndex((a) => a.id == asset.id);
     await setAssetId(assets[currentIndex].id);
     await navigate({ targetRoute: 'current', assetId: $viewingAsset.id });
   };
 
   const selectAllAssets = () => {
-    assetInteraction.selectAssets(assets.map((a) => toTimelineAsset(a)));
+    assetInteraction.selectAssets(assets.map((a) => toAsset(a)));
   };
 
   const deselectAllAssets = () => {
@@ -186,7 +186,7 @@
     }
   };
 
-  const handleSelectAssets = (asset: TimelineAsset) => {
+  const handleSelectAssets = (asset: Asset) => {
     if (!asset) {
       return;
     }
@@ -209,14 +209,14 @@
     assetInteraction.setAssetSelectionStart(deselect ? null : asset);
   };
 
-  const handleSelectAssetCandidates = (asset: TimelineAsset | null) => {
+  const handleSelectAssetCandidates = (asset: Asset | null) => {
     if (asset) {
       selectAssetCandidates(asset);
     }
     lastAssetMouseEvent = asset;
   };
 
-  const selectAssetCandidates = (endAsset: TimelineAsset) => {
+  const selectAssetCandidates = (endAsset: Asset) => {
     if (!shiftKeyIsDown) {
       return;
     }
@@ -233,7 +233,7 @@
       [start, end] = [end, start];
     }
 
-    assetInteraction.setAssetSelectionCandidates(assets.slice(start, end + 1).map((a) => toTimelineAsset(a)));
+    assetInteraction.setAssetSelectionCandidates(assets.slice(start, end + 1).map((a) => toAsset(a)));
   };
 
   const onSelectStart = (event: Event) => {
@@ -434,7 +434,7 @@
     }
   };
 
-  const assetMouseEventHandler = (asset: TimelineAsset | null) => {
+  const assetMouseEventHandler = (asset: Asset | null) => {
     if (assetInteraction.selectionActive) {
       handleSelectAssetCandidates(asset);
     }
@@ -496,21 +496,21 @@
             readonly={disableAssetSelect}
             onClick={() => {
               if (assetInteraction.selectionActive) {
-                handleSelectAssets(toTimelineAsset(currentAsset));
+                handleSelectAssets(toAsset(currentAsset));
                 return;
               }
-              void viewAssetHandler(toTimelineAsset(currentAsset));
+              void viewAssetHandler(toAsset(currentAsset));
             }}
-            onSelect={() => handleSelectAssets(toTimelineAsset(currentAsset))}
-            onMouseEvent={() => assetMouseEventHandler(toTimelineAsset(currentAsset))}
+            onSelect={() => handleSelectAssets(toAsset(currentAsset))}
+            onMouseEvent={() => assetMouseEventHandler(toAsset(currentAsset))}
             {showArchiveIcon}
-            asset={toTimelineAsset(currentAsset)}
+            asset={toAsset(currentAsset)}
             selected={assetInteraction.hasSelectedAsset(currentAsset.id)}
             selectionCandidate={assetInteraction.hasSelectionCandidate(currentAsset.id)}
             thumbnailWidth={layout.width}
             thumbnailHeight={layout.height}
           />
-          {#if showAssetName && !isTimelineAsset(currentAsset)}
+          {#if showAssetName && !isAsset(currentAsset)}
             <div
               class="absolute text-center p-1 text-xs font-mono font-semibold w-full bottom-0 bg-linear-to-t bg-slate-50/75 dark:bg-slate-800/75 overflow-clip text-ellipsis whitespace-pre-wrap"
             >

web/src/lib/components/timeline/AssetSelectControlBar.svelte

@@ -4,8 +4,8 @@
 
   export interface AssetControlContext {
     // Wrap assets in a function, because context isn't reactive.
-    getAssets: () => TimelineAsset[]; // All assets includes partners' assets
-    getOwnedAssets: () => TimelineAsset[]; // Only assets owned by the user
+    getAssets: () => Asset[]; // All assets includes partners' assets
+    getOwnedAssets: () => Asset[]; // Only assets owned by the user
     clearSelect: () => void;
   }
 
@@ -14,13 +14,13 @@
 </script>
 
 <script lang="ts">
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { mdiClose } from '@mdi/js';
   import type { Snippet } from 'svelte';
   import ControlAppBar from '../shared-components/control-app-bar.svelte';
 
   interface Props {
-    assets: TimelineAsset[];
+    assets: Asset[];
     clearSelect: () => void;
     ownerId?: string | undefined;
     children?: Snippet;

web/src/lib/components/timeline/Scrubber.svelte

@@ -341,6 +341,7 @@
       scrubberMonthScrollPercent: monthGroupPercentY,
     });
   };
+  /* eslint-disable tscompat/tscompat */
   const getTouch = (event: TouchEvent) => {
     if (event.touches.length === 1) {
       return event.touches[0];
@@ -385,6 +386,7 @@
       isHover = false;
     }
   };
+  /* eslint-enable tscompat/tscompat */
   onMount(() => {
     document.addEventListener('touchmove', onTouchMove, { capture: true, passive: true });
     return () => {

web/src/lib/components/timeline/Timeline.svelte

@@ -3,7 +3,7 @@
   import { page } from '$app/stores';
   import { resizeObserver, type OnResizeCallback } from '$lib/actions/resize-observer';
   import Scrubber from '$lib/components/timeline/Scrubber.svelte';
-  import TimelineAssetViewer from '$lib/components/timeline/TimelineAssetViewer.svelte';
+  import AssetViewer from '$lib/components/timeline/TimelineAssetViewer.svelte';
   import TimelineKeyboardActions from '$lib/components/timeline/actions/TimelineKeyboardActions.svelte';
   import { AssetAction } from '$lib/constants';
   import HotModuleReload from '$lib/elements/HotModuleReload.svelte';
@@ -12,7 +12,7 @@
   import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
   import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
-  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import type { Asset } from '$lib/managers/timeline-manager/types';
   import { assetsSnapshot } from '$lib/managers/timeline-manager/utils.svelte';
   import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
@@ -48,21 +48,16 @@
     album?: AlbumResponseDto | null;
     person?: PersonResponseDto | null;
     isShowDeleteConfirmation?: boolean;
-    onSelect?: (asset: TimelineAsset) => void;
+    onSelect?: (asset: Asset) => void;
     onEscape?: () => void;
     children?: Snippet;
     empty?: Snippet;
-    customLayout?: Snippet<[TimelineAsset]>;
+    customLayout?: Snippet<[Asset]>;
     onThumbnailClick?: (
-      asset: TimelineAsset,
+      asset: Asset,
       timelineManager: TimelineManager,
       dayGroup: DayGroup,
-      onClick: (
-        timelineManager: TimelineManager,
-        assets: TimelineAsset[],
-        groupTitle: string,
-        asset: TimelineAsset,
-      ) => void,
+      onClick: (timelineManager: TimelineManager, assets: Asset[], groupTitle: string, asset: Asset) => void,
     ) => void;
   }
 
@@ -182,7 +177,7 @@
     return true;
   };
 
-  const scrollToAsset = (asset: TimelineAsset) => {
+  const scrollToAsset = (asset: Asset) => {
     const monthGroup = timelineManager.getMonthGroupByAssetId(asset.id);
     if (!monthGroup) {
       return false;
@@ -384,13 +379,13 @@
     }
   };
 
-  const handleSelectAsset = (asset: TimelineAsset) => {
+  const handleSelectAsset = (asset: Asset) => {
     if (!timelineManager.albumAssets.has(asset.id)) {
       assetInteraction.selectAsset(asset);
     }
   };
 
-  let lastAssetMouseEvent: TimelineAsset | null = $state(null);
+  let lastAssetMouseEvent: Asset | null = $state(null);
 
   let shiftKeyIsDown = $state(false);
 
@@ -407,14 +402,14 @@
       shiftKeyIsDown = false;
     }
   };
-  const handleSelectAssetCandidates = (asset: TimelineAsset | null) => {
+  const handleSelectAssetCandidates = (asset: Asset | null) => {
     if (asset) {
       void selectAssetCandidates(asset);
     }
     lastAssetMouseEvent = asset;
   };
 
-  const handleGroupSelect = (timelineManager: TimelineManager, group: string, assets: TimelineAsset[]) => {
+  const handleGroupSelect = (timelineManager: TimelineManager, group: string, assets: Asset[]) => {
     if (assetInteraction.selectedGroup.has(group)) {
       assetInteraction.removeGroupFromMultiselectGroup(group);
       for (const asset of assets) {
@@ -434,7 +429,7 @@
     }
   };
 
-  const handleSelectAssets = async (asset: TimelineAsset) => {
+  const handleSelectAssets = async (asset: Asset) => {
     if (!asset) {
       return;
     }
@@ -518,7 +513,7 @@
     assetInteraction.setAssetSelectionStart(deselect ? null : asset);
   };
 
-  const selectAssetCandidates = async (endAsset: TimelineAsset) => {
+  const selectAssetCandidates = async (endAsset: Asset) => {
     if (!shiftKeyIsDown) {
       return;
     }
@@ -686,7 +681,7 @@
 
 <Portal target="body">
   {#if $showAssetViewer}
-    <TimelineAssetViewer bind:showSkeleton {timelineManager} {removeAction} {withStacked} {isShared} {album} {person} />
+    <AssetViewer bind:showSkeleton {timelineManager} {removeAction} {withStacked} {isShared} {album} {person} />
   {/if}
 </Portal>
 

web/src/lib/components/timeline/TimelineAssetViewer.svelte

@@ -6,7 +6,7 @@
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { updateStackedAssetInTimeline, updateUnstackedAssetInTimeline } from '$lib/utils/actions';
   import { navigate } from '$lib/utils/navigation';
-  import { toTimelineAsset } from '$lib/utils/timeline-util';
+  import { toAsset } from '$lib/utils/timeline-util';
   import { getAssetInfo, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
 
   let { asset: viewingAsset, gridScrollTarget, mutex, preloadAssets } = assetViewingStore;
@@ -135,12 +135,12 @@
         break;
       }
       case AssetAction.REMOVE_ASSET_FROM_STACK: {
-        timelineManager.addAssets([toTimelineAsset(action.asset)]);
+        timelineManager.addAssets([toAsset(action.asset)]);
         if (action.stack) {
           //Have to unstack then restack assets in timeline in order to update the stack count in the timeline.
           updateUnstackedAssetInTimeline(
             timelineManager,
-            action.stack.assets.map((asset) => toTimelineAsset(asset)),
+            action.stack.assets.map((asset) => toAsset(asset)),
           );
           updateStackedAssetInTimeline(timelineManager, {
             stack: action.stack,
@@ -155,7 +155,7 @@
         //Have to unstack then restack assets in timeline in order for the currently removed new primary asset to be made visible.
         updateUnstackedAssetInTimeline(
           timelineManager,
-          action.stack.assets.map((asset) => toTimelineAsset(asset)),
+          action.stack.assets.map((asset) => toAsset(asset)),
         );
         updateStackedAssetInTimeline(timelineManager, {
           stack: action.stack,