fix: test

.devcontainer/server/container-compose-overrides.yml

@@ -12,7 +12,8 @@ services:
       - ${UPLOAD_LOCATION:-upload2-devcontainer-volume}${UPLOAD_LOCATION:+/photos/upload}:/data/upload
       - /etc/localtime:/etc/localtime:ro
       - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
+      - server-node-modules:/usr/src/app/server/node_modules
+      - server-dist:/usr/src/app/server/dist
       - web-node_modules:/usr/src/app/web/node_modules
       - github-node_modules:/usr/src/app/.github/node_modules
       - cli-node_modules:/usr/src/app/cli/node_modules

docker/docker-compose.dev.yml

@@ -33,7 +33,8 @@ services:
       - ${UPLOAD_LOCATION}/photos/upload:/data/upload
       - /etc/localtime:/etc/localtime:ro
       - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
+      - server-node-modules:/usr/src/app/server/node_modules
+      - server-dist:/usr/src/app/server/dist
       - web-node_modules:/usr/src/app/web/node_modules
       - github-node_modules:/usr/src/app/.github/node_modules
       - cli-node_modules:/usr/src/app/cli/node_modules
@@ -96,7 +97,8 @@ services:
     volumes:
       - ..:/usr/src/app
       - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
+      - server-node-modules:/usr/src/app/server/node_modules
+      - server-dist:/usr/src/app/server/dist
       - web-node_modules:/usr/src/app/web/node_modules
       - github-node_modules:/usr/src/app/.github/node_modules
       - cli-node_modules:/usr/src/app/cli/node_modules
@@ -192,7 +194,8 @@ services:
     command: sh -c 'for path in /usr/src/app/.pnpm-store /usr/src/app/server/node_modules /usr/src/app/server/dist /usr/src/app/.github/node_modules /usr/src/app/cli/node_modules /usr/src/app/docs/node_modules /usr/src/app/e2e/node_modules /usr/src/app/open-api/typescript-sdk/node_modules /usr/src/app/web/.svelte-kit /usr/src/app/web/coverage /usr/src/app/node_modules /usr/src/app/web/node_modules; do [ -e "$$path" ] && chown -R ${UID:-1000}:${GID:-1000} "$$path" || true; done'
     volumes:
       - pnpm-store:/usr/src/app/.pnpm-store
-      - server-node_modules:/usr/src/app/server/node_modules
+      - server-node-modules:/usr/src/app/server/node_modules
+      - server-dist:/usr/src/app/server/dist
       - web-node_modules:/usr/src/app/web/node_modules
       - github-node_modules:/usr/src/app/.github/node_modules
       - cli-node_modules:/usr/src/app/cli/node_modules
@@ -207,7 +210,8 @@ volumes:
   prometheus-data:
   grafana-data:
   pnpm-store:
-  server-node_modules:
+  server-node-modules:
+  server-dist:
   web-node_modules:
   github-node_modules:
   cli-node_modules:

docs/docs/administration/oauth.md

@@ -88,7 +88,7 @@ The `.well-known/openid-configuration` part of the url is optional and will be a
 ## Auto Launch
 
 When Auto Launch is enabled, the login page will automatically redirect the user to the OAuth authorization url, to login with OAuth. To access the login screen again, use the browser's back button, or navigate directly to `/auth/login?autoLaunch=0`.
-Auto Launch can also be enabled on a per-request basis by navigating to `/auth/login?autoLaunch=1`, this can be useful in situations where Immich is called from e.g. Nextcloud using the _External sites_ app and the _oidc_ app so as to enable users to directly interact with a logged-in instance of Immich.
+Auto Launch can also be enabled on a per-request basis by navigating to `/auth/login?authLaunch=1`, this can be useful in situations where Immich is called from e.g. Nextcloud using the _External sites_ app and the _oidc_ app so as to enable users to directly interact with a logged-in instance of Immich.
 
 ## Mobile Redirect URI
 

server/Dockerfile

@@ -91,7 +91,11 @@ FROM prod-builder-base AS server-prod
 WORKDIR /usr/src/app
 COPY ./package* ./pnpm* .pnpmfile.cjs ./
 COPY ./server ./server/
-RUN SHARP_IGNORE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile build && \
+## Build server with sharp linked against system (global) libvips instead of vendored copy.
+## Using SHARP_IGNORE_GLOBAL_LIBVIPS previously caused arm64 (e.g. Raspberry Pi) illegal instruction
+## crashes due to the prebuilt vendored libvips targeting newer ARM features. Force global libvips
+## during build so the already-present distro libvips (built with conservative flags) is used.
+RUN SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile build && \
   SHARP_FORCE_GLOBAL_LIBVIPS=true pnpm --filter immich --frozen-lockfile --prod --no-optional deploy /output/server-pruned
 
 # web production build

server/src/queries/shared.link.repository.sql

@@ -38,11 +38,7 @@ from
     select
       "album".*,
       coalesce(
-        json_agg(
-          "assets"
-          order by
-            "assets"."fileCreatedAt" asc
-        ) filter (
+        json_agg("assets") filter (
           where
             "assets"."id" is not null
         ),

server/src/repositories/shared-link.repository.ts

@@ -86,16 +86,7 @@ export class SharedLinkRepository {
               (join) => join.onTrue(),
             )
             .select((eb) =>
-              eb.fn
-                .coalesce(
-                  eb.fn
-                    .jsonAgg('assets')
-                    .orderBy('assets.fileCreatedAt', 'asc')
-                    .filterWhere('assets.id', 'is not', null),
-
-                  sql`'[]'`,
-                )
-                .as('assets'),
+              eb.fn.coalesce(eb.fn.jsonAgg('assets').filterWhere('assets.id', 'is not', null), sql`'[]'`).as('assets'),
             )
             .select((eb) => eb.fn.toJson('owner').as('owner'))
             .groupBy(['album.id', sql`"owner".*`])

server/test/medium.factory.ts

@@ -33,7 +33,6 @@ import { PartnerRepository } from 'src/repositories/partner.repository';
 import { PersonRepository } from 'src/repositories/person.repository';
 import { SearchRepository } from 'src/repositories/search.repository';
 import { SessionRepository } from 'src/repositories/session.repository';
-import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
 import { StackRepository } from 'src/repositories/stack.repository';
 import { StorageRepository } from 'src/repositories/storage.repository';
 import { SyncCheckpointRepository } from 'src/repositories/sync-checkpoint.repository';
@@ -287,7 +286,6 @@ const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
     case PersonRepository:
     case SearchRepository:
     case SessionRepository:
-    case SharedLinkRepository:
     case StackRepository:
     case SyncRepository:
     case SyncCheckpointRepository:
@@ -393,7 +391,7 @@ const assetInsert = (asset: Partial<Insertable<AssetTable>> = {}) => {
     checksum: randomBytes(32),
     type: AssetType.Image,
     originalPath: '/path/to/something.jpg',
-    ownerId: 'not-a-valid-uuid',
+    ownerId: '@immich.cloud',
     isFavorite: false,
     fileCreatedAt: now,
     fileModifiedAt: now,

server/test/medium/specs/services/shared-link.service.spec.ts

@@ -1,65 +0,0 @@
-import { Kysely } from 'kysely';
-import { randomBytes } from 'node:crypto';
-import { SharedLinkType } from 'src/enum';
-import { AccessRepository } from 'src/repositories/access.repository';
-import { DatabaseRepository } from 'src/repositories/database.repository';
-import { LoggingRepository } from 'src/repositories/logging.repository';
-import { SharedLinkRepository } from 'src/repositories/shared-link.repository';
-import { StorageRepository } from 'src/repositories/storage.repository';
-import { DB } from 'src/schema';
-import { SharedLinkService } from 'src/services/shared-link.service';
-import { newMediumService } from 'test/medium.factory';
-import { factory } from 'test/small.factory';
-import { getKyselyDB } from 'test/utils';
-
-let defaultDatabase: Kysely<DB>;
-
-const setup = (db?: Kysely<DB>) => {
-  return newMediumService(SharedLinkService, {
-    database: db || defaultDatabase,
-    real: [AccessRepository, DatabaseRepository, SharedLinkRepository],
-    mock: [LoggingRepository, StorageRepository],
-  });
-};
-
-beforeAll(async () => {
-  defaultDatabase = await getKyselyDB();
-});
-
-describe(SharedLinkService.name, () => {
-  describe('get', () => {
-    it('should return the correct dates on the shared link album', async () => {
-      const { sut, ctx } = setup();
-
-      const { user } = await ctx.newUser();
-      const auth = factory.auth({ user });
-      const { album } = await ctx.newAlbum({ ownerId: user.id });
-
-      const dates = ['2021-01-01T00:00:00.000Z', '2022-01-01T00:00:00.000Z', '2020-01-01T00:00:00.000Z'];
-
-      for (const date of dates) {
-        const { asset } = await ctx.newAsset({ fileCreatedAt: date, localDateTime: date, ownerId: user.id });
-        await ctx.newExif({ assetId: asset.id, make: 'Canon' });
-        await ctx.newAlbumAsset({ albumId: album.id, assetId: asset.id });
-      }
-
-      const sharedLinkRepo = ctx.get(SharedLinkRepository);
-
-      const sharedLink = await sharedLinkRepo.create({
-        key: randomBytes(16),
-        id: factory.uuid(),
-        userId: user.id,
-        albumId: album.id,
-        allowUpload: true,
-        type: SharedLinkType.Album,
-      });
-
-      await expect(sut.get(auth, sharedLink.id)).resolves.toMatchObject({
-        album: expect.objectContaining({
-          startDate: '2020-01-01T00:00:00+00:00',
-          endDate: '2022-01-01T00:00:00+00:00',
-        }),
-      });
-    });
-  });
-});

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

@@ -5,7 +5,7 @@
   import { getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
   import { timeToSeconds } from '$lib/utils/date-time';
   import { getAltText } from '$lib/utils/thumbnail-util';
-  import { AssetMediaSize, AssetVisibility, type UserResponseDto } from '@immich/sdk';
+  import { AssetMediaSize, AssetVisibility } from '@immich/sdk';
   import {
     mdiArchiveArrowDownOutline,
     mdiCameraBurst,
@@ -45,7 +45,6 @@
     imageClass?: ClassValue;
     brokenAssetClass?: ClassValue;
     dimmed?: boolean;
-    albumUsers?: UserResponseDto[];
     onClick?: (asset: TimelineAsset) => void;
     onSelect?: (asset: TimelineAsset) => void;
     onMouseEvent?: (event: { isMouseOver: boolean; selectedGroupIndex: number }) => void;
@@ -64,7 +63,6 @@
     readonly = false,
     showArchiveIcon = false,
     showStackedIcon = true,
-    albumUsers = [],
     onClick = undefined,
     onSelect = undefined,
     onMouseEvent = undefined,
@@ -86,8 +84,6 @@
   let width = $derived(thumbnailSize || thumbnailWidth || 235);
   let height = $derived(thumbnailSize || thumbnailHeight || 235);
 
-  let assetOwner = $derived(albumUsers?.find((user) => user.id === asset.ownerId) ?? null);
-
   const onIconClickedHandler = (e?: MouseEvent) => {
     e?.stopPropagation();
     e?.preventDefault();
@@ -271,12 +267,6 @@
           </div>
         {/if}
 
-        {#if !!assetOwner}
-          <div class="absolute bottom-0 end-1">
-            <span class="text-white font-light text-sm">{assetOwner.name}</span>
-          </div>
-        {/if}
-
         {#if !authManager.isSharedLink && showArchiveIcon && asset.visibility === AssetVisibility.Archive}
           <div class={['absolute start-2', asset.isFavorite ? 'bottom-10' : 'bottom-2']}>
             <Icon path={mdiArchiveArrowDownOutline} size="24" class="text-white" />

web/src/lib/components/photos-page/asset-date-group.svelte

@@ -9,7 +9,6 @@
   import { isSelectingAllAssets } from '$lib/stores/assets-store.svelte';
   import { uploadAssetsStore } from '$lib/stores/upload';
   import { navigate } from '$lib/utils/navigation';
-  import type { UserResponseDto } from '@immich/sdk';
 
   import { mdiCheckCircle, mdiCircleOutline } from '@mdi/js';
 
@@ -26,7 +25,7 @@
     monthGroup: MonthGroup;
     timelineManager: TimelineManager;
     assetInteraction: AssetInteraction;
-    albumUsers?: UserResponseDto[];
+
     onSelect: ({ title, assets }: { title: string; assets: TimelineAsset[] }) => void;
     onSelectAssets: (asset: TimelineAsset) => void;
     onSelectAssetCandidates: (asset: TimelineAsset | null) => void;
@@ -41,7 +40,6 @@
     monthGroup = $bindable(),
     assetInteraction,
     timelineManager,
-    albumUsers = [],
     onSelect,
     onSelectAssets,
     onSelectAssetCandidates,
@@ -191,7 +189,6 @@
             showStackedIcon={withStacked}
             {showArchiveIcon}
             {asset}
-            {albumUsers}
             {groupIndex}
             onClick={(asset) => onClick(timelineManager, dayGroup.getAssets(), dayGroup.groupTitle, asset)}
             onSelect={(asset) => assetSelectHandler(timelineManager, asset, dayGroup.getAssets(), dayGroup.groupTitle)}

web/src/lib/components/photos-page/asset-grid.svelte

@@ -30,13 +30,7 @@
   import { archiveAssets, cancelMultiselect, selectAllAssets, stackAssets } from '$lib/utils/asset-utils';
   import { navigate } from '$lib/utils/navigation';
   import { getTimes, toTimelineAsset, type ScrubberListener, type TimelineYearMonth } from '$lib/utils/timeline-util';
-  import {
-    AssetVisibility,
-    getAssetInfo,
-    type AlbumResponseDto,
-    type PersonResponseDto,
-    type UserResponseDto,
-  } from '@immich/sdk';
+  import { AssetVisibility, getAssetInfo, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';
   import { modalManager } from '@immich/ui';
   import { DateTime } from 'luxon';
   import { onMount, type Snippet } from 'svelte';
@@ -65,7 +59,6 @@
     showArchiveIcon?: boolean;
     isShared?: boolean;
     album?: AlbumResponseDto | null;
-    albumUsers?: UserResponseDto[];
     person?: PersonResponseDto | null;
     isShowDeleteConfirmation?: boolean;
     onSelect?: (asset: TimelineAsset) => void;
@@ -85,7 +78,6 @@
     showArchiveIcon = false,
     isShared = false,
     album = null,
-    albumUsers = [],
     person = null,
     isShowDeleteConfirmation = $bindable(false),
     onSelect = () => {},
@@ -96,12 +88,6 @@
 
   let { isViewing: showAssetViewer, asset: viewingAsset, preloadAssets, gridScrollTarget, mutex } = assetViewingStore;
 
-  // const albumUsers = $derived(
-  //   album?.shared && album.albumUsers.some(({ role }) => role === AlbumUserRole.Editor)
-  //     ? [album.owner, ...album.albumUsers.map(({ user }) => user)]
-  //     : [],
-  // );
-
   let element: HTMLElement | undefined = $state();
 
   let timelineElement: HTMLElement | undefined = $state();
@@ -950,7 +936,6 @@
             {isSelectionMode}
             {singleSelect}
             {monthGroup}
-            {albumUsers}
             onSelect={({ title, assets }) => handleGroupSelect(timelineManager, title, assets)}
             onSelectAssetCandidates={handleSelectAssetCandidates}
             onSelectAssets={handleSelectAssets}

web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte

@@ -71,7 +71,6 @@
   } from '@immich/sdk';
   import { Button, IconButton, modalManager } from '@immich/ui';
   import {
-    mdiAccountEyeOutline,
     mdiArrowLeft,
     mdiCogOutline,
     mdiDeleteOutline,
@@ -105,7 +104,6 @@
   let isCreatingSharedAlbum = $state(false);
   let isShowActivity = $state(false);
   let albumOrder: AssetOrder | undefined = $state(data.album.order);
-  let showAlbumUsers = $state(false);
 
   const assetInteraction = new AssetInteraction();
   const timelineInteraction = new AssetInteraction();
@@ -323,11 +321,6 @@
 
   let album = $derived(data.album);
   let albumId = $derived(album.id);
-  const albumUsers = $derived(
-    showAlbumUsers && album?.shared && album.albumUsers.some(({ role }) => role === AlbumUserRole.Editor)
-      ? [album.owner, ...album.albumUsers.map(({ user }) => user)]
-      : [],
-  );
 
   $effect(() => {
     if (!album.isActivityEnabled && activityManager.commentCount === 0) {
@@ -452,7 +445,6 @@
       <AssetGrid
         enableRouting={viewMode === AlbumPageViewMode.SELECT_ASSETS ? false : true}
         {album}
-        {albumUsers}
         {timelineManager}
         assetInteraction={currentAssetIntersection}
         {isShared}
@@ -623,15 +615,6 @@
           {#snippet trailing()}
             <CastButton />
 
-            <IconButton
-              variant="ghost"
-              shape="round"
-              color="secondary"
-              aria-label="view asset owners"
-              icon={mdiAccountEyeOutline}
-              onclick={() => (showAlbumUsers = !showAlbumUsers)}
-            />
-
             {#if isEditor}
               <IconButton
                 variant="ghost"

web/src/service-worker/broadcast-channel.ts

@@ -1,4 +1,4 @@
-import { handleCancel, handlePreload } from './request';
+import { cancelRequest, handleRequest } from './request';
 
 export const installBroadcastChannelListener = () => {
   const broadcast = new BroadcastChannel('immich');
@@ -7,19 +7,12 @@ export const installBroadcastChannelListener = () => {
     if (!event.data) {
       return;
     }
-
-    const url = new URL(event.data.url, event.origin);
-
-    switch (event.data.type) {
-      case 'preload': {
-        handlePreload(url);
-        break;
-      }
-
-      case 'cancel': {
-        handleCancel(url);
-        break;
-      }
+    const urlString = event.data.url;
+    const url = new URL(urlString, event.origin);
+    if (event.data.type === 'cancel') {
+      cancelRequest(url);
+    } else if (event.data.type === 'preload') {
+      handleRequest(url);
     }
   };
 };

web/src/service-worker/request.ts

@@ -1,7 +1,5 @@
 import { get, put } from './cache';
 
-const pendingRequests = new Map<string, AbortController>();
-
 const isURL = (request: URL | RequestInfo): request is URL => (request as URL).href !== undefined;
 const isRequest = (request: RequestInfo): request is Request => (request as Request).url !== undefined;
 
@@ -23,16 +21,11 @@ const getCacheKey = (request: URL | Request) => {
   throw new Error(`Invalid request: ${request}`);
 };
 
-export const handlePreload = async (request: URL | Request) => {
-  try {
-    return await handleRequest(request);
-  } catch (error) {
-    console.error(`Preload failed: ${error}`);
-  }
-};
+const pendingRequests = new Map<string, AbortController>();
 
 export const handleRequest = async (request: URL | Request) => {
   const cacheKey = getCacheKey(request);
+
   const cachedResponse = await get(cacheKey);
   if (cachedResponse) {
     return cachedResponse;
@@ -48,26 +41,23 @@ export const handleRequest = async (request: URL | Request) => {
 
     return response;
   } catch (error) {
-    if (error.name === 'AbortError') {
-      // dummy response avoids network errors in the console for these requests
-      return new Response(undefined, { status: 204 });
-    }
-
-    console.log('Not an abort error', error);
-
-    throw error;
+    console.log(error);
+    return new Response(undefined, {
+      status: 499,
+      statusText: `Request canceled: Instructions unclear, accidentally interrupted myself (${error})`,
+    });
   } finally {
     pendingRequests.delete(cacheKey);
   }
 };
 
-export const handleCancel = (url: URL) => {
+export const cancelRequest = (url: URL) => {
   const cacheKey = getCacheKey(url);
-  const pendingRequest = pendingRequests.get(cacheKey);
-  if (!pendingRequest) {
+  const pending = pendingRequests.get(cacheKey);
+  if (!pending) {
     return;
   }
 
-  pendingRequest.abort();
+  pending.abort();
   pendingRequests.delete(cacheKey);
 };