increase buffer

.github/workflows/test.yml

@@ -8,99 +8,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 permissions: {}
-
-x-e2e-server-job: &e2e-server-job
-  needs: [pre-job, build-e2e-images]
-  if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).server == true || fromJSON(needs.pre-job.outputs.should_run).cli == true }}
-  runs-on: ${{ matrix.runner }}
-  permissions:
-    contents: read
-  defaults:
-    run:
-      working-directory: ./e2e
-  strategy:
-    matrix:
-      runner: [ubuntu-latest, ubuntu-24.04-arm]
-
-x-e2e-web-job: &e2e-web-job
-  needs: [pre-job, build-e2e-images]
-  if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).web == true }}
-  runs-on: ${{ matrix.runner }}
-  permissions:
-    contents: read
-  defaults:
-    run:
-      working-directory: ./e2e
-  strategy:
-    matrix:
-      runner: [ubuntu-latest, ubuntu-24.04-arm]
-
-x-e2e-steps:
-  token: &e2e-token-step
-    id: token
-    uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
-    with:
-      app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
-      private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
-  checkout: &e2e-checkout-step
-    name: Checkout code
-    uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-    with:
-      persist-credentials: false
-      submodules: 'recursive'
-      token: ${{ steps.token.outputs.token }}
-  setup-pnpm: &e2e-setup-pnpm-step
-    name: Setup pnpm
-    uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4.3.0
-  setup-node: &e2e-setup-node-step
-    name: Setup Node
-    uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
-    with:
-      node-version-file: './e2e/.nvmrc'
-      cache: 'pnpm'
-      cache-dependency-path: '**/pnpm-lock.yaml'
-  setup-sdk: &e2e-setup-sdk-step
-    name: Run setup typescript-sdk
-    run: pnpm install --frozen-lockfile && pnpm build
-    working-directory: ./open-api/typescript-sdk
-    if: ${{ !cancelled() }}
-  setup-web: &e2e-setup-web-step
-    name: Run setup web
-    run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
-    working-directory: ./web
-    if: ${{ !cancelled() }}
-  setup-cli: &e2e-setup-cli-step
-    name: Run setup cli
-    run: pnpm install --frozen-lockfile && pnpm build
-    working-directory: ./cli
-    if: ${{ !cancelled() }}
-  install-deps: &e2e-install-deps-step
-    name: Install dependencies
-    run: pnpm install --frozen-lockfile
-    if: ${{ !cancelled() }}
-  install-playwright: &e2e-install-playwright-step
-    name: Install Playwright Browsers
-    run: pnpm exec playwright install chromium --only-shell
-    if: ${{ !cancelled() }}
-  download-images: &e2e-download-images-step
-    name: Download Docker images
-    uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
-    with:
-      name: docker-images-${{ matrix.runner }}
-      path: e2e
-  load-images: &e2e-load-images-step
-    name: Load Docker images
-    run: docker load < docker-images.tar.gz
-  docker-compose-up: &e2e-docker-compose-up-step
-    name: Start Docker Compose
-    run: docker compose up -d --renew-anon-volumes --force-recreate --remove-orphans --wait --wait-timeout 300
-    if: ${{ !cancelled() }}
-  capture-docker-logs: &e2e-capture-docker-logs-step
-    name: Capture Docker logs
-    if: always()
-    run: docker compose logs --no-color > docker-compose-logs.txt
-    working-directory: ./e2e
-
 jobs:
   pre-job:
     runs-on: ubuntu-latest
@@ -490,10 +397,10 @@ jobs:
       - name: Run medium tests
         run: pnpm test:medium
         if: ${{ !cancelled() }}
-  build-e2e-images:
-    name: Build E2E Docker Images
+  e2e-tests-server-cli:
+    name: End-to-End Tests (Server & CLI)
     needs: pre-job
-    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).server == true || fromJSON(needs.pre-job.outputs.should_run).cli == true || fromJSON(needs.pre-job.outputs.should_run).web == true }}
+    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).server == true || fromJSON(needs.pre-job.outputs.should_run).cli == true }}
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
@@ -504,86 +411,111 @@ jobs:
       matrix:
         runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - name: Build Docker images
-        run: docker compose build
-      - name: Save Docker images
-        run: docker save immich-server:latest immich-e2e-e2e-auth-server | gzip > docker-images.tar.gz
-      - name: Upload Docker images
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - id: token
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
         with:
-          name: docker-images-${{ matrix.runner }}
-          path: e2e/docker-images.tar.gz
-          retention-days: 1
-  e2e-tests-server-cli:
-    <<: *e2e-server-job
-    name: End-to-End Tests (Server & CLI)
-    steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - *e2e-setup-pnpm-step
-      - *e2e-setup-node-step
-      - *e2e-setup-sdk-step
-      - *e2e-setup-web-step
-      - *e2e-setup-cli-step
-      - *e2e-install-deps-step
-      - *e2e-download-images-step
-      - *e2e-load-images-step
-      - *e2e-docker-compose-up-step
+          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          submodules: 'recursive'
+          token: ${{ steps.token.outputs.token }}
+      - name: Setup pnpm
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4.3.0
+      - name: Setup Node
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version-file: './e2e/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
+      - name: Run setup typescript-sdk
+        run: pnpm install --frozen-lockfile && pnpm build
+        working-directory: ./open-api/typescript-sdk
+        if: ${{ !cancelled() }}
+      - name: Run setup web
+        run: pnpm install --frozen-lockfile && pnpm exec svelte-kit sync
+        working-directory: ./web
+        if: ${{ !cancelled() }}
+      - name: Run setup cli
+        run: pnpm install --frozen-lockfile && pnpm build
+        working-directory: ./cli
+        if: ${{ !cancelled() }}
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+        if: ${{ !cancelled() }}
+      - name: Start Docker Compose
+        run: docker compose up -d --build --renew-anon-volumes --force-recreate --remove-orphans --wait --wait-timeout 300
+        if: ${{ !cancelled() }}
       - name: Run e2e tests (api & cli)
         env:
           VITEST_DISABLE_DOCKER_SETUP: true
         run: pnpm test
         if: ${{ !cancelled() }}
-      - *e2e-capture-docker-logs-step
+      - name: Run e2e tests (maintenance)
+        env:
+          VITEST_DISABLE_DOCKER_SETUP: true
+        run: pnpm test:maintenance
+        if: ${{ !cancelled() }}
+      - name: Capture Docker logs
+        if: always()
+        run: docker compose logs --no-color > docker-compose-logs.txt
+        working-directory: ./e2e
       - name: Archive Docker logs
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: always()
         with:
           name: e2e-server-docker-logs-${{ matrix.runner }}
           path: e2e/docker-compose-logs.txt
-  e2e-tests-server-maintenance:
-    <<: *e2e-server-job
-    name: End-to-End Tests (Server Maintenance)
-    steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - *e2e-setup-pnpm-step
-      - *e2e-setup-node-step
-      - *e2e-setup-sdk-step
-      - *e2e-setup-web-step
-      - *e2e-setup-cli-step
-      - *e2e-install-deps-step
-      - *e2e-download-images-step
-      - *e2e-load-images-step
-      - *e2e-docker-compose-up-step
-      - name: Run e2e tests (maintenance)
-        env:
-          VITEST_DISABLE_DOCKER_SETUP: true
-        run: pnpm test:maintenance
-        if: ${{ !cancelled() }}
-      - *e2e-capture-docker-logs-step
-      - name: Archive Docker logs
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        if: always()
-        with:
-          name: e2e-server-maintenance-docker-logs-${{ matrix.runner }}
-          path: e2e/docker-compose-logs.txt
   e2e-tests-web:
-    <<: *e2e-web-job
     name: End-to-End Tests (Web)
+    needs: pre-job
+    if: ${{ fromJSON(needs.pre-job.outputs.should_run).e2e == true || fromJSON(needs.pre-job.outputs.should_run).web == true }}
+    runs-on: ${{ matrix.runner }}
+    permissions:
+      contents: read
+    defaults:
+      run:
+        working-directory: ./e2e
+    strategy:
+      matrix:
+        runner: [ubuntu-latest, ubuntu-24.04-arm]
     steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - *e2e-setup-pnpm-step
-      - *e2e-setup-node-step
-      - *e2e-setup-sdk-step
-      - *e2e-install-deps-step
-      - *e2e-install-playwright-step
-      - *e2e-download-images-step
-      - *e2e-load-images-step
-      - *e2e-docker-compose-up-step
+      - id: token
+        uses: immich-app/devtools/actions/create-workflow-token@05e16407c0a5492138bb38139c9d9bf067b40886 # create-workflow-token-action-v1.0.1
+        with:
+          app-id: ${{ secrets.PUSH_O_MATIC_APP_ID }}
+          private-key: ${{ secrets.PUSH_O_MATIC_APP_KEY }}
+
+      - name: Checkout code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+          submodules: 'recursive'
+          token: ${{ steps.token.outputs.token }}
+      - name: Setup pnpm
+        uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1 # v4.3.0
+      - name: Setup Node
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version-file: './e2e/.nvmrc'
+          cache: 'pnpm'
+          cache-dependency-path: '**/pnpm-lock.yaml'
+      - name: Run setup typescript-sdk
+        run: pnpm install --frozen-lockfile && pnpm build
+        working-directory: ./open-api/typescript-sdk
+        if: ${{ !cancelled() }}
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+        if: ${{ !cancelled() }}
+      - name: Install Playwright Browsers
+        run: pnpm exec playwright install chromium --only-shell
+        if: ${{ !cancelled() }}
+      - name: Docker build
+        run: docker compose up -d --build --renew-anon-volumes --force-recreate --remove-orphans --wait --wait-timeout 300
+        if: ${{ !cancelled() }}
       - name: Run e2e tests (web)
         env:
           PLAYWRIGHT_DISABLE_WEBSERVER: true
@@ -595,27 +527,6 @@ jobs:
         with:
           name: e2e-web-test-results-${{ matrix.runner }}
           path: e2e/playwright-report/
-      - *e2e-capture-docker-logs-step
-      - name: Archive Docker logs
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        if: always()
-        with:
-          name: e2e-web-docker-logs-${{ matrix.runner }}
-          path: e2e/docker-compose-logs.txt
-  e2e-tests-web-ui:
-    <<: *e2e-web-job
-    name: End-to-End Tests (Web UI)
-    steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - *e2e-setup-pnpm-step
-      - *e2e-setup-node-step
-      - *e2e-setup-sdk-step
-      - *e2e-install-deps-step
-      - *e2e-install-playwright-step
-      - *e2e-download-images-step
-      - *e2e-load-images-step
-      - *e2e-docker-compose-up-step
       - name: Run ui tests (web)
         env:
           PLAYWRIGHT_DISABLE_WEBSERVER: true
@@ -627,27 +538,6 @@ jobs:
         with:
           name: e2e-ui-test-results-${{ matrix.runner }}
           path: e2e/playwright-report/
-      - *e2e-capture-docker-logs-step
-      - name: Archive Docker logs
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        if: always()
-        with:
-          name: e2e-web-ui-docker-logs-${{ matrix.runner }}
-          path: e2e/docker-compose-logs.txt
-  e2e-tests-web-maintenance:
-    <<: *e2e-web-job
-    name: End-to-End Tests (Web Maintenance)
-    steps:
-      - *e2e-token-step
-      - *e2e-checkout-step
-      - *e2e-setup-pnpm-step
-      - *e2e-setup-node-step
-      - *e2e-setup-sdk-step
-      - *e2e-install-deps-step
-      - *e2e-install-playwright-step
-      - *e2e-download-images-step
-      - *e2e-load-images-step
-      - *e2e-docker-compose-up-step
       - name: Run maintenance tests
         env:
           PLAYWRIGHT_DISABLE_WEBSERVER: true
@@ -659,16 +549,19 @@ jobs:
         with:
           name: e2e-maintenance-isolated-test-results-${{ matrix.runner }}
           path: e2e/playwright-report/
-      - *e2e-capture-docker-logs-step
+      - name: Capture Docker logs
+        if: always()
+        run: docker compose logs --no-color > docker-compose-logs.txt
+        working-directory: ./e2e
       - name: Archive Docker logs
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         if: always()
         with:
-          name: e2e-web-maintenance-docker-logs-${{ matrix.runner }}
+          name: e2e-web-docker-logs-${{ matrix.runner }}
           path: e2e/docker-compose-logs.txt
   success-check-e2e:
     name: End-to-End Tests Success
-    needs: [e2e-tests-server-cli, e2e-tests-server-maintenance, e2e-tests-web, e2e-tests-web-ui, e2e-tests-web-maintenance]
+    needs: [e2e-tests-server-cli, e2e-tests-web]
     permissions: {}
     runs-on: ubuntu-latest
     if: always()

mobile/android/app/src/main/kotlin/app/alextran/immich/core/HttpClientManager.kt

@@ -23,18 +23,10 @@ import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import org.chromium.net.CronetEngine
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import java.io.ByteArrayInputStream
 import java.io.File
-import java.io.IOException
-import java.nio.file.FileVisitResult
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.SimpleFileVisitor
-import java.nio.file.attribute.BasicFileAttributes
 import java.net.Authenticator
 import java.net.CookieHandler
 import java.net.PasswordAuthentication
@@ -285,13 +277,10 @@ object HttpClientManager {
     return result
   }
 
-  suspend fun rebuildCronetEngine(): Result<Long> {
-    return runCatching {
-      cronetEngine?.shutdown()
-      val deletionResult = deleteFolderAndGetSize(cronetStoragePath.toPath())
-      cronetEngine = buildCronetEngine()
-      deletionResult
-    }
+  fun rebuildCronetEngine(): CronetEngine {
+    val old = cronetEngine!!
+    cronetEngine = buildCronetEngine()
+    return old
   }
 
   val cronetStoragePath: File get() = cronetStorageDir
@@ -312,7 +301,7 @@ object HttpClientManager {
     }
   }
 
-  fun buildCronetEngine(): CronetEngine {
+  private fun buildCronetEngine(): CronetEngine {
     return CronetEngine.Builder(appContext)
       .enableHttp2(true)
       .enableQuic(true)
@@ -323,27 +312,6 @@ object HttpClientManager {
       .build()
   }
 
-  private suspend fun deleteFolderAndGetSize(root: Path): Long = withContext(Dispatchers.IO) {
-    var totalSize = 0L
-
-    Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
-      override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
-        totalSize += attrs.size()
-        Files.delete(file)
-        return FileVisitResult.CONTINUE
-      }
-
-      override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult {
-        if (dir != root) {
-          Files.delete(dir)
-        }
-        return FileVisitResult.CONTINUE
-      }
-    })
-
-    totalSize
-  }
-
   private fun build(cacheDir: File): OkHttpClient {
     val connectionPool = ConnectionPool(
       maxIdleConnections = KEEP_ALIVE_CONNECTIONS,

mobile/android/app/src/main/kotlin/app/alextran/immich/images/RemoteImagesImpl.kt

@@ -21,6 +21,11 @@ import java.io.EOFException
 import java.io.File
 import java.io.IOException
 import java.nio.ByteBuffer
+import java.nio.file.FileVisitResult
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.SimpleFileVisitor
+import java.nio.file.attribute.BasicFileAttributes
 import java.util.concurrent.ConcurrentHashMap
 
 private class RemoteRequest(val cancellationSignal: CancellationSignal)
@@ -200,15 +205,18 @@ private class CronetImageFetcher : ImageFetcher {
 
   private fun onDrained() {
     val onCacheCleared = synchronized(stateLock) {
-      val onCacheCleared = this.onCacheCleared
+      val onCacheCleared = onCacheCleared
       this.onCacheCleared = null
       onCacheCleared
-    } ?: return
-
-    CoroutineScope(Dispatchers.IO).launch {
-      val result = HttpClientManager.rebuildCronetEngine()
-      synchronized(stateLock) { draining = false }
-      onCacheCleared(result)
+    }
+    if (onCacheCleared != null) {
+      val oldEngine = HttpClientManager.rebuildCronetEngine()
+      oldEngine.shutdown()
+      CoroutineScope(Dispatchers.IO).launch {
+        val result = runCatching { deleteFolderAndGetSize(HttpClientManager.cronetStoragePath.toPath()) }
+        synchronized(stateLock) { draining = false }
+        onCacheCleared(result)
+      }
     }
   }
 
@@ -298,6 +306,26 @@ private class CronetImageFetcher : ImageFetcher {
     }
   }
 
+  suspend fun deleteFolderAndGetSize(root: Path): Long = withContext(Dispatchers.IO) {
+    var totalSize = 0L
+
+    Files.walkFileTree(root, object : SimpleFileVisitor<Path>() {
+      override fun visitFile(file: Path, attrs: BasicFileAttributes): FileVisitResult {
+        totalSize += attrs.size()
+        Files.delete(file)
+        return FileVisitResult.CONTINUE
+      }
+
+      override fun postVisitDirectory(dir: Path, exc: IOException?): FileVisitResult {
+        if (dir != root) {
+          Files.delete(dir)
+        }
+        return FileVisitResult.CONTINUE
+      }
+    })
+
+    totalSize
+  }
 }
 
 private class OkHttpImageFetcher private constructor(

mobile/pubspec.lock

@@ -1218,8 +1218,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: cdf621bdb7edaf996e118a58a48f6441187d79c6
-      resolved-ref: cdf621bdb7edaf996e118a58a48f6441187d79c6
+      ref: "2f38a2a84184141ec3ae708ada5d7dda87b5a409"
+      resolved-ref: "2f38a2a84184141ec3ae708ada5d7dda87b5a409"
       url: "https://github.com/immich-app/native_video_player"
     source: git
     version: "1.3.1"

mobile/pubspec.yaml

@@ -56,7 +56,7 @@ dependencies:
   native_video_player:
     git:
       url: https://github.com/immich-app/native_video_player
-      ref: 'cdf621bdb7edaf996e118a58a48f6441187d79c6'
+      ref: '2f38a2a84184141ec3ae708ada5d7dda87b5a409'
   network_info_plus: ^6.1.3
   octo_image: ^2.1.0
   openapi: