fun with bun

* Update command-line-interface.md

Update documentation for CLI commands.

* chore: update docs

* chore: login-key => login

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>

cli/src/commands/asset.ts

@@ -1,5 +1,7 @@
 import {
+  Action,
   AssetBulkUploadCheckResult,
+  AssetFileUploadResponseDto,
   addAssetsToAlbum,
   checkBulkUpload,
   createAlbum,
@@ -8,445 +10,320 @@ import {
   getSupportedMediaTypes,
 } from '@immich/sdk';
 import byteSize from 'byte-size';
-import cliProgress from 'cli-progress';
-import { chunk, zip } from 'lodash-es';
-import { createHash } from 'node:crypto';
-import fs, { createReadStream } from 'node:fs';
-import { access, constants, stat, unlink } from 'node:fs/promises';
+import { Presets, SingleBar } from 'cli-progress';
+import { chunk } from 'lodash-es';
+import { Stats, createReadStream } from 'node:fs';
+import { stat, unlink } from 'node:fs/promises';
 import os from 'node:os';
-import { basename } from 'node:path';
-import { CrawlService } from 'src/services/crawl.service';
-import { BaseOptions, authenticate } from 'src/utils';
+import path, { basename } from 'node:path';
+import { BaseOptions, authenticate, crawl, sha1 } from 'src/utils';
 
-const zipDefined = zip as <T, U>(a: T[], b: U[]) => [T, U][];
+const s = (count: number) => (count === 1 ? '' : 's');
 
-enum CheckResponseStatus {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  DUPLICATE = 'duplicate',
-}
+// TODO figure out why `id` is missing
+type AssetBulkUploadCheckResults = Array<AssetBulkUploadCheckResult & { id: string }>;
+type Asset = { id: string; filepath: string };
 
-class Asset {
-  readonly path: string;
-
-  id?: string;
-  deviceAssetId?: string;
-  fileCreatedAt?: Date;
-  fileModifiedAt?: Date;
-  sidecarPath?: string;
-  fileSize?: number;
+interface UploadOptionsDto {
+  recursive?: boolean;
+  exclusionPatterns?: string[];
+  dryRun?: boolean;
+  skipHash?: boolean;
+  delete?: boolean;
+  album?: boolean;
   albumName?: string;
+  includeHidden?: boolean;
+  concurrency: number;
+}
 
-  constructor(path: string) {
-    this.path = path;
+class UploadFile extends File {
+  constructor(
+    private filepath: string,
+    private _size: number,
+  ) {
+    super([], basename(filepath));
   }
 
-  async prepare() {
-    const stats = await stat(this.path);
-    this.deviceAssetId = `${basename(this.path)}-${stats.size}`.replaceAll(/\s+/g, '');
-    this.fileCreatedAt = stats.mtime;
-    this.fileModifiedAt = stats.mtime;
-    this.fileSize = stats.size;
-    this.albumName = this.extractAlbumName();
+  get size() {
+    return this._size;
   }
 
-  async getUploadFormData(): Promise<FormData> {
-    if (!this.deviceAssetId) {
-      throw new Error('Device asset id not set');
-    }
-    if (!this.fileCreatedAt) {
-      throw new Error('File created at not set');
-    }
-    if (!this.fileModifiedAt) {
-      throw new Error('File modified at not set');
-    }
-
-    // TODO: doesn't xmp replace the file extension? Will need investigation
-    const sideCarPath = `${this.path}.xmp`;
-    let sidecarData: Blob | undefined = undefined;
-    try {
-      await access(sideCarPath, constants.R_OK);
-      sidecarData = new File([await fs.openAsBlob(sideCarPath)], basename(sideCarPath));
-    } catch {}
-
-    const data: any = {
-      assetData: new File([await fs.openAsBlob(this.path)], basename(this.path)),
-      deviceAssetId: this.deviceAssetId,
-      deviceId: 'CLI',
-      fileCreatedAt: this.fileCreatedAt.toISOString(),
-      fileModifiedAt: this.fileModifiedAt.toISOString(),
-      isFavorite: String(false),
-    };
-    const formData = new FormData();
-
-    for (const property in data) {
-      formData.append(property, data[property]);
-    }
-
-    if (sidecarData) {
-      formData.append('sidecarData', sidecarData);
-    }
-
-    return formData;
-  }
-
-  async delete(): Promise<void> {
-    return unlink(this.path);
-  }
-
-  public async hash(): Promise<string> {
-    const sha1 = (filePath: string) => {
-      const hash = createHash('sha1');
-      return new Promise<string>((resolve, reject) => {
-        const rs = createReadStream(filePath);
-        rs.on('error', reject);
-        rs.on('data', (chunk) => hash.update(chunk));
-        rs.on('end', () => resolve(hash.digest('hex')));
-      });
-    };
-
-    return await sha1(this.path);
-  }
-
-  private extractAlbumName(): string | undefined {
-    return os.platform() === 'win32' ? this.path.split('\\').at(-2) : this.path.split('/').at(-2);
+  stream() {
+    return createReadStream(this.filepath) as any;
   }
 }
 
-class UploadOptionsDto {
-  recursive? = false;
-  exclusionPatterns?: string[] = [];
-  dryRun? = false;
-  skipHash? = false;
-  delete? = false;
-  album? = false;
-  albumName? = '';
-  includeHidden? = false;
-  concurrency? = 4;
-}
+export const upload = async (paths: string[], baseOptions: BaseOptions, options: UploadOptionsDto) => {
+  await authenticate(baseOptions);
 
-export const upload = (paths: string[], baseOptions: BaseOptions, uploadOptions: UploadOptionsDto) =>
-  new UploadCommand().run(paths, baseOptions, uploadOptions);
+  const files = await scan(paths, options);
+  if (files.length === 0) {
+    console.log('No files found, exiting');
+    return;
+  }
 
-// TODO refactor this
-class UploadCommand {
-  public async run(paths: string[], baseOptions: BaseOptions, options: UploadOptionsDto): Promise<void> {
-    await authenticate(baseOptions);
+  const { newFiles, duplicates } = await checkForDuplicates(files, options);
 
-    console.log('Crawling for assets...');
-    const files = await this.getFiles(paths, options);
+  const newAssets = await uploadFiles(newFiles, options);
+  await updateAlbums([...newAssets, ...duplicates], options);
+  await deleteFiles(newFiles, options);
+};
 
-    if (files.length === 0) {
-      console.log('No assets found, exiting');
-      return;
+const scan = async (pathsToCrawl: string[], options: UploadOptionsDto) => {
+  const { image, video } = await getSupportedMediaTypes();
+
+  console.log('Crawling for assets...');
+  const files = await crawl({
+    pathsToCrawl,
+    recursive: options.recursive,
+    exclusionPatterns: options.exclusionPatterns,
+    includeHidden: options.includeHidden,
+    extensions: [...image, ...video],
+  });
+
+  return files;
+};
+
+const checkForDuplicates = async (files: string[], { concurrency }: UploadOptionsDto) => {
+  const progressBar = new SingleBar(
+    { format: 'Checking files | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
+    Presets.shades_classic,
+  );
+
+  progressBar.start(files.length, 0);
+
+  const newFiles: string[] = [];
+  const duplicates: Asset[] = [];
+
+  try {
+    // TODO refactor into a queue
+    for (const items of chunk(files, concurrency)) {
+      const dto = await Promise.all(items.map(async (filepath) => ({ id: filepath, checksum: await sha1(filepath) })));
+      const { results } = await checkBulkUpload({ assetBulkUploadCheckDto: { assets: dto } });
+
+      for (const { id: filepath, assetId, action } of results as AssetBulkUploadCheckResults) {
+        if (action === Action.Accept) {
+          newFiles.push(filepath);
+        } else {
+          // rejects are always duplicates
+          duplicates.push({ id: assetId as string, filepath });
+        }
+        progressBar.increment();
+      }
     }
+  } finally {
+    progressBar.stop();
+  }
 
-    const assetsToCheck = files.map((path) => new Asset(path));
+  console.log(`Found ${newFiles.length} new files and ${duplicates.length} duplicate${s(duplicates.length)}`);
 
-    const { newAssets, duplicateAssets } = await this.checkAssets(assetsToCheck, options.concurrency ?? 4);
+  return { newFiles, duplicates };
+};
 
-    const totalSizeUploaded = await this.upload(newAssets, options);
-    const messageStart = options.dryRun ? 'Would have' : 'Successfully';
-    if (newAssets.length === 0) {
-      console.log('All assets were already uploaded, nothing to do.');
-    } else {
-      console.log(
-        `${messageStart} uploaded ${newAssets.length} asset${newAssets.length === 1 ? '' : 's'} (${byteSize(totalSizeUploaded)})`,
+const uploadFiles = async (files: string[], { dryRun, concurrency }: UploadOptionsDto): Promise<Asset[]> => {
+  if (files.length === 0) {
+    console.log('All assets were already uploaded, nothing to do.');
+    return [];
+  }
+
+  // Compute total size first
+  let totalSize = 0;
+  const statsMap = new Map<string, Stats>();
+  for (const filepath of files) {
+    const stats = await stat(filepath);
+    statsMap.set(filepath, stats);
+    totalSize += stats.size;
+  }
+
+  if (dryRun) {
+    console.log(`Would have uploaded ${files.length} asset${s(files.length)} (${byteSize(totalSize)})`);
+    return [];
+  }
+
+  const uploadProgress = new SingleBar(
+    { format: 'Uploading assets | {bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}' },
+    Presets.shades_classic,
+  );
+  uploadProgress.start(totalSize, 0);
+  uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
+
+  let totalSizeUploaded = 0;
+  const newAssets: Asset[] = [];
+  try {
+    for (const items of chunk(files, concurrency)) {
+      await Promise.all(
+        items.map(async (filepath) => {
+          const stats = statsMap.get(filepath) as Stats;
+          const response = await uploadFile(filepath, stats);
+          totalSizeUploaded += stats.size ?? 0;
+          uploadProgress.update(totalSizeUploaded, { value_formatted: byteSize(totalSizeUploaded) });
+          newAssets.push({ id: response.id, filepath });
+          return response;
+        }),
       );
     }
+  } finally {
+    uploadProgress.stop();
+  }
 
-    if (options.album || options.albumName) {
-      const { createdAlbumCount, updatedAssetCount } = await this.updateAlbums(
-        [...newAssets, ...duplicateAssets],
-        options,
+  console.log(`Successfully uploaded ${newAssets.length} asset${s(newAssets.length)} (${byteSize(totalSizeUploaded)})`);
+  return newAssets;
+};
+
+const uploadFile = async (input: string, stats: Stats): Promise<AssetFileUploadResponseDto> => {
+  const { baseUrl, headers } = defaults;
+
+  const assetPath = path.parse(input);
+  const noExtension = path.join(assetPath.dir, assetPath.name);
+
+  const sidecarsFiles = await Promise.all(
+    // XMP sidecars can come in two filename formats. For a photo named photo.ext, the filenames are photo.ext.xmp and photo.xmp
+    [`${noExtension}.xmp`, `${input}.xmp`].map(async (sidecarPath) => {
+      try {
+        const stats = await stat(sidecarPath);
+        return new UploadFile(sidecarPath, stats.size);
+      } catch {
+        return false;
+      }
+    }),
+  );
+
+  const sidecarData = sidecarsFiles.find((file): file is UploadFile => file !== false);
+
+  const formData = new FormData();
+  formData.append('deviceAssetId', `${basename(input)}-${stats.size}`.replaceAll(/\s+/g, ''));
+  formData.append('deviceId', 'CLI');
+  formData.append('fileCreatedAt', stats.mtime.toISOString());
+  formData.append('fileModifiedAt', stats.mtime.toISOString());
+  formData.append('fileSize', String(stats.size));
+  formData.append('isFavorite', 'false');
+  formData.append('assetData', new UploadFile(input, stats.size));
+
+  if (sidecarData) {
+    formData.append('sidecarData', sidecarData);
+  }
+
+  const response = await fetch(`${baseUrl}/asset/upload`, {
+    method: 'post',
+    redirect: 'error',
+    headers: headers as Record<string, string>,
+    body: formData,
+  });
+  if (response.status !== 200 && response.status !== 201) {
+    throw new Error(await response.text());
+  }
+
+  return response.json();
+};
+
+const deleteFiles = async (files: string[], options: UploadOptionsDto): Promise<void> => {
+  if (!options.delete) {
+    return;
+  }
+
+  if (options.dryRun) {
+    console.log(`Would now have deleted assets, but skipped due to dry run`);
+    return;
+  }
+
+  console.log('Deleting assets that have been uploaded...');
+
+  const deletionProgress = new SingleBar(
+    { format: 'Deleting local assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
+    Presets.shades_classic,
+  );
+  deletionProgress.start(files.length, 0);
+
+  try {
+    for (const assetBatch of chunk(files, options.concurrency)) {
+      await Promise.all(assetBatch.map((input: string) => unlink(input)));
+      deletionProgress.update(assetBatch.length);
+    }
+  } finally {
+    deletionProgress.stop();
+  }
+};
+
+const updateAlbums = async (assets: Asset[], options: UploadOptionsDto) => {
+  if (!options.album && !options.albumName) {
+    return;
+  }
+  const { dryRun, concurrency } = options;
+
+  const albums = await getAllAlbums({});
+  const existingAlbums = new Map(albums.map((album) => [album.albumName, album.id]));
+  const newAlbums: Set<string> = new Set();
+  for (const { filepath } of assets) {
+    const albumName = getAlbumName(filepath, options);
+    if (albumName && !existingAlbums.has(albumName)) {
+      newAlbums.add(albumName);
+    }
+  }
+
+  if (dryRun) {
+    // TODO print asset counts for new albums
+    console.log(`Would have created ${newAlbums.size} new album${s(newAlbums.size)}`);
+    console.log(`Would have updated ${assets.length} asset${s(assets.length)}`);
+    return;
+  }
+
+  const progressBar = new SingleBar(
+    { format: 'Creating albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} albums' },
+    Presets.shades_classic,
+  );
+  progressBar.start(newAlbums.size, 0);
+
+  try {
+    for (const albumNames of chunk([...newAlbums], concurrency)) {
+      const items = await Promise.all(
+        albumNames.map((albumName: string) => createAlbum({ createAlbumDto: { albumName } })),
       );
-      console.log(`${messageStart} created ${createdAlbumCount} new album${createdAlbumCount === 1 ? '' : 's'}`);
-      console.log(`${messageStart} updated ${updatedAssetCount} asset${updatedAssetCount === 1 ? '' : 's'}`);
-    }
-
-    if (!options.delete) {
-      return;
-    }
-
-    if (options.dryRun) {
-      console.log(`Would now have deleted assets, but skipped due to dry run`);
-      return;
-    }
-
-    console.log('Deleting assets that have been uploaded...');
-
-    await this.deleteAssets(newAssets, options);
-  }
-
-  public async checkAssets(
-    assetsToCheck: Asset[],
-    concurrency: number,
-  ): Promise<{ newAssets: Asset[]; duplicateAssets: Asset[]; rejectedAssets: Asset[] }> {
-    for (const assets of chunk(assetsToCheck, concurrency)) {
-      await Promise.all(assets.map((asset: Asset) => asset.prepare()));
-    }
-
-    const checkProgress = new cliProgress.SingleBar(
-      { format: 'Checking assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
-      cliProgress.Presets.shades_classic,
-    );
-    checkProgress.start(assetsToCheck.length, 0);
-
-    const newAssets = [];
-    const duplicateAssets = [];
-    const rejectedAssets = [];
-    try {
-      for (const assets of chunk(assetsToCheck, concurrency)) {
-        const checkedAssets = await this.getStatus(assets);
-        for (const checked of checkedAssets) {
-          if (checked.status === CheckResponseStatus.ACCEPT) {
-            newAssets.push(checked.asset);
-          } else if (checked.status === CheckResponseStatus.DUPLICATE) {
-            duplicateAssets.push(checked.asset);
-          } else {
-            rejectedAssets.push(checked.asset);
-          }
-          checkProgress.increment();
-        }
+      for (const { id, albumName } of items) {
+        existingAlbums.set(albumName, id);
       }
-    } finally {
-      checkProgress.stop();
+      progressBar.increment(albumNames.length);
     }
-
-    return { newAssets, duplicateAssets, rejectedAssets };
+  } finally {
+    progressBar.stop();
   }
 
-  public async upload(assetsToUpload: Asset[], options: UploadOptionsDto): Promise<number> {
-    let totalSize = 0;
+  console.log(`Successfully created ${newAlbums.size} new album${s(newAlbums.size)}`);
+  console.log(`Successfully updated ${assets.length} asset${s(assets.length)}`);
 
-    // Compute total size first
-    for (const asset of assetsToUpload) {
-      totalSize += asset.fileSize ?? 0;
+  const albumToAssets = new Map<string, string[]>();
+  for (const asset of assets) {
+    const albumName = getAlbumName(asset.filepath, options);
+    if (!albumName) {
+      continue;
     }
-
-    if (options.dryRun) {
-      return totalSize;
-    }
-
-    const uploadProgress = new cliProgress.SingleBar(
-      {
-        format: 'Uploading assets | {bar} | {percentage}% | ETA: {eta_formatted} | {value_formatted}/{total_formatted}',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    uploadProgress.start(totalSize, 0);
-    uploadProgress.update({ value_formatted: 0, total_formatted: byteSize(totalSize) });
-
-    let totalSizeUploaded = 0;
-    try {
-      for (const assets of chunk(assetsToUpload, options.concurrency)) {
-        const ids = await this.uploadAssets(assets);
-        for (const [asset, id] of zipDefined(assets, ids)) {
-          asset.id = id;
-          if (asset.fileSize) {
-            totalSizeUploaded += asset.fileSize ?? 0;
-          } else {
-            console.log(`Could not determine file size for ${asset.path}`);
-          }
-        }
-        uploadProgress.update(totalSizeUploaded, { value_formatted: byteSize(totalSizeUploaded) });
+    const albumId = existingAlbums.get(albumName);
+    if (albumId) {
+      if (!albumToAssets.has(albumId)) {
+        albumToAssets.set(albumId, []);
       }
-    } finally {
-      uploadProgress.stop();
+      albumToAssets.get(albumId)?.push(asset.id);
     }
-
-    return totalSizeUploaded;
   }
 
-  public async getFiles(paths: string[], options: UploadOptionsDto): Promise<string[]> {
-    const inputFiles: string[] = [];
-    for (const pathArgument of paths) {
-      const fileStat = await fs.promises.lstat(pathArgument);
-      if (fileStat.isFile()) {
-        inputFiles.push(pathArgument);
+  const albumUpdateProgress = new SingleBar(
+    { format: 'Adding assets to albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets' },
+    Presets.shades_classic,
+  );
+  albumUpdateProgress.start(assets.length, 0);
+
+  try {
+    for (const [albumId, assets] of albumToAssets.entries()) {
+      for (const assetBatch of chunk(assets, Math.min(1000 * concurrency, 65_000))) {
+        await addAssetsToAlbum({ id: albumId, bulkIdsDto: { ids: assetBatch } });
+        albumUpdateProgress.increment(assetBatch.length);
       }
     }
-
-    const files: string[] = await this.crawl(paths, options);
-    files.push(...inputFiles);
-    return files;
+  } finally {
+    albumUpdateProgress.stop();
   }
+};
 
-  public async getAlbums(): Promise<Map<string, string>> {
-    const existingAlbums = await getAllAlbums({});
-
-    const albumMapping = new Map<string, string>();
-    for (const album of existingAlbums) {
-      albumMapping.set(album.albumName, album.id);
-    }
-
-    return albumMapping;
-  }
-
-  public async updateAlbums(
-    assets: Asset[],
-    options: UploadOptionsDto,
-  ): Promise<{ createdAlbumCount: number; updatedAssetCount: number }> {
-    if (options.albumName) {
-      for (const asset of assets) {
-        asset.albumName = options.albumName;
-      }
-    }
-
-    const existingAlbums = await this.getAlbums();
-    const assetsToUpdate = assets.filter(
-      (asset): asset is Asset & { albumName: string; id: string } => !!(asset.albumName && asset.id),
-    );
-
-    const newAlbumsSet: Set<string> = new Set();
-    for (const asset of assetsToUpdate) {
-      if (!existingAlbums.has(asset.albumName)) {
-        newAlbumsSet.add(asset.albumName);
-      }
-    }
-
-    const newAlbums = [...newAlbumsSet];
-
-    if (options.dryRun) {
-      return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
-    }
-
-    const albumCreationProgress = new cliProgress.SingleBar(
-      {
-        format: 'Creating albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} albums',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    albumCreationProgress.start(newAlbums.length, 0);
-
-    try {
-      for (const albumNames of chunk(newAlbums, options.concurrency)) {
-        const newAlbumIds = await Promise.all(
-          albumNames.map((albumName: string) => createAlbum({ createAlbumDto: { albumName } }).then((r) => r.id)),
-        );
-
-        for (const [albumName, albumId] of zipDefined(albumNames, newAlbumIds)) {
-          existingAlbums.set(albumName, albumId);
-        }
-
-        albumCreationProgress.increment(albumNames.length);
-      }
-    } finally {
-      albumCreationProgress.stop();
-    }
-
-    const albumToAssets = new Map<string, string[]>();
-    for (const asset of assetsToUpdate) {
-      const albumId = existingAlbums.get(asset.albumName);
-      if (albumId) {
-        if (!albumToAssets.has(albumId)) {
-          albumToAssets.set(albumId, []);
-        }
-        albumToAssets.get(albumId)?.push(asset.id);
-      }
-    }
-
-    const albumUpdateProgress = new cliProgress.SingleBar(
-      {
-        format: 'Adding assets to albums | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    albumUpdateProgress.start(assetsToUpdate.length, 0);
-
-    try {
-      for (const [albumId, assets] of albumToAssets.entries()) {
-        for (const assetBatch of chunk(assets, Math.min(1000 * (options.concurrency ?? 4), 65_000))) {
-          await addAssetsToAlbum({ id: albumId, bulkIdsDto: { ids: assetBatch } });
-          albumUpdateProgress.increment(assetBatch.length);
-        }
-      }
-    } finally {
-      albumUpdateProgress.stop();
-    }
-
-    return { createdAlbumCount: newAlbums.length, updatedAssetCount: assetsToUpdate.length };
-  }
-
-  public async deleteAssets(assets: Asset[], options: UploadOptionsDto): Promise<void> {
-    const deletionProgress = new cliProgress.SingleBar(
-      {
-        format: 'Deleting local assets | {bar} | {percentage}% | ETA: {eta}s | {value}/{total} assets',
-      },
-      cliProgress.Presets.shades_classic,
-    );
-    deletionProgress.start(assets.length, 0);
-
-    try {
-      for (const assetBatch of chunk(assets, options.concurrency)) {
-        await Promise.all(assetBatch.map((asset: Asset) => asset.delete()));
-        deletionProgress.update(assetBatch.length);
-      }
-    } finally {
-      deletionProgress.stop();
-    }
-  }
-
-  private async getStatus(assets: Asset[]): Promise<{ asset: Asset; status: CheckResponseStatus }[]> {
-    const checkResponse = await this.checkHashes(assets);
-
-    const responses = [];
-    for (const [check, asset] of zipDefined(checkResponse, assets)) {
-      if (check.assetId) {
-        asset.id = check.assetId;
-      }
-
-      if (check.action === 'accept') {
-        responses.push({ asset, status: CheckResponseStatus.ACCEPT });
-      } else if (check.reason === 'duplicate') {
-        responses.push({ asset, status: CheckResponseStatus.DUPLICATE });
-      } else {
-        responses.push({ asset, status: CheckResponseStatus.REJECT });
-      }
-    }
-
-    return responses;
-  }
-
-  private async checkHashes(assetsToCheck: Asset[]): Promise<AssetBulkUploadCheckResult[]> {
-    const checksums = await Promise.all(assetsToCheck.map((asset) => asset.hash()));
-    const assetBulkUploadCheckDto = {
-      assets: zipDefined(assetsToCheck, checksums).map(([asset, checksum]) => ({ id: asset.path, checksum })),
-    };
-    const checkResponse = await checkBulkUpload({ assetBulkUploadCheckDto });
-    return checkResponse.results;
-  }
-
-  private async uploadAssets(assets: Asset[]): Promise<string[]> {
-    const fileRequests = await Promise.all(assets.map((asset) => asset.getUploadFormData()));
-    const results = await Promise.all(fileRequests.map((request) => this.uploadAsset(request)));
-    return results.map((response) => response.id);
-  }
-
-  private async crawl(paths: string[], options: UploadOptionsDto): Promise<string[]> {
-    const formatResponse = await getSupportedMediaTypes();
-    const crawlService = new CrawlService(formatResponse.image, formatResponse.video);
-
-    return crawlService.crawl({
-      pathsToCrawl: paths,
-      recursive: options.recursive,
-      exclusionPatterns: options.exclusionPatterns,
-      includeHidden: options.includeHidden,
-    });
-  }
-
-  private async uploadAsset(data: FormData): Promise<{ id: string }> {
-    const { baseUrl, headers } = defaults;
-
-    const response = await fetch(`${baseUrl}/asset/upload`, {
-      method: 'post',
-      redirect: 'error',
-      headers: headers as Record<string, string>,
-      body: data,
-    });
-    if (response.status !== 200 && response.status !== 201) {
-      throw new Error(await response.text());
-    }
-    return response.json();
-  }
-}
+const getAlbumName = (filepath: string, options: UploadOptionsDto) => {
+  const folderName = os.platform() === 'win32' ? filepath.split('\\').at(-2) : filepath.split('/').at(-2);
+  return options.albumName ?? folderName;
+};

cli/src/commands/auth.ts

@@ -3,12 +3,12 @@ import { existsSync } from 'node:fs';
 import { mkdir, unlink } from 'node:fs/promises';
 import { BaseOptions, connect, getAuthFilePath, logError, withError, writeAuthFile } from 'src/utils';
 
-export const login = async (instanceUrl: string, apiKey: string, options: BaseOptions) => {
-  console.log(`Logging in to ${instanceUrl}`);
+export const login = async (url: string, key: string, options: BaseOptions) => {
+  console.log(`Logging in to ${url}`);
 
   const { configDirectory: configDir } = options;
 
-  await connect(instanceUrl, apiKey);
+  await connect(url, key);
 
   const [error, userInfo] = await withError(getMyUserInfo());
   if (error) {
@@ -27,7 +27,7 @@ export const login = async (instanceUrl: string, apiKey: string, options: BaseOp
     }
   }
 
-  await writeAuthFile(configDir, { instanceUrl, apiKey });
+  await writeAuthFile(configDir, { url, key });
 
   console.log(`Wrote auth info to ${getAuthFilePath(configDir)}`);
 };

cli/src/index.ts

@@ -19,7 +19,7 @@ const program = new Command()
       .default(defaultConfigDirectory),
   )
   .addOption(new Option('-u, --url [url]', 'Immich server URL').env('IMMICH_INSTANCE_URL'))
-  .addOption(new Option('-k, --key [apiKey]', 'Immich API key').env('IMMICH_API_KEY'));
+  .addOption(new Option('-k, --key [key]', 'Immich API key').env('IMMICH_API_KEY'));
 
 program
   .command('login')

cli/src/services/crawl.service.ts

@@ -1,70 +0,0 @@
-import { glob } from 'glob';
-import * as fs from 'node:fs';
-
-export class CrawlOptions {
-  pathsToCrawl!: string[];
-  recursive? = false;
-  includeHidden? = false;
-  exclusionPatterns?: string[];
-}
-
-export class CrawlService {
-  private readonly extensions!: string[];
-
-  constructor(image: string[], video: string[]) {
-    this.extensions = [...image, ...video].map((extension) => extension.replace('.', ''));
-  }
-
-  async crawl(options: CrawlOptions): Promise<string[]> {
-    const { recursive, pathsToCrawl, exclusionPatterns, includeHidden } = options;
-
-    if (!pathsToCrawl) {
-      return [];
-    }
-
-    const patterns: string[] = [];
-    const crawledFiles: string[] = [];
-
-    for await (const currentPath of pathsToCrawl) {
-      try {
-        const stats = await fs.promises.stat(currentPath);
-        if (stats.isFile() || stats.isSymbolicLink()) {
-          crawledFiles.push(currentPath);
-        } else {
-          patterns.push(currentPath);
-        }
-      } catch (error: any) {
-        if (error.code === 'ENOENT') {
-          patterns.push(currentPath);
-        } else {
-          throw error;
-        }
-      }
-    }
-
-    let searchPattern: string;
-    if (patterns.length === 1) {
-      searchPattern = patterns[0];
-    } else if (patterns.length === 0) {
-      return crawledFiles;
-    } else {
-      searchPattern = '{' + patterns.join(',') + '}';
-    }
-
-    if (recursive) {
-      searchPattern = searchPattern + '/**/';
-    }
-
-    searchPattern = `${searchPattern}/*.{${this.extensions.join(',')}}`;
-
-    const globbedFiles = await glob(searchPattern, {
-      absolute: true,
-      nocase: true,
-      nodir: true,
-      dot: includeHidden,
-      ignore: exclusionPatterns,
-    });
-
-    return [...crawledFiles, ...globbedFiles].sort();
-  }
-}

cli/src/utils.spec.ts

@@ -1,14 +1,31 @@
 import mockfs from 'mock-fs';
-import { CrawlOptions, CrawlService } from './crawl.service';
+import { CrawlOptions, crawl } from 'src/utils';
 
 interface Test {
   test: string;
-  options: CrawlOptions;
+  options: Omit<CrawlOptions, 'extensions'>;
   files: Record<string, boolean>;
 }
 
 const cwd = process.cwd();
 
+const extensions = [
+  '.jpg',
+  '.jpeg',
+  '.png',
+  '.heif',
+  '.heic',
+  '.tif',
+  '.nef',
+  '.webp',
+  '.tiff',
+  '.dng',
+  '.gif',
+  '.mov',
+  '.mp4',
+  '.webm',
+];
+
 const tests: Test[] = [
   {
     test: 'should return empty when crawling an empty path list',
@@ -251,12 +268,7 @@ const tests: Test[] = [
   },
 ];
 
-describe(CrawlService.name, () => {
-  const sut = new CrawlService(
-    ['.jpg', '.jpeg', '.png', '.heif', '.heic', '.tif', '.nef', '.webp', '.tiff', '.dng', '.gif'],
-    ['.mov', '.mp4', '.webm'],
-  );
-
+describe('crawl', () => {
   afterEach(() => {
     mockfs.restore();
   });
@@ -266,7 +278,7 @@ describe(CrawlService.name, () => {
       it(test, async () => {
         mockfs(Object.fromEntries(Object.keys(files).map((file) => [file, ''])));
 
-        const actual = await sut.crawl(options);
+        const actual = await crawl({ ...options, extensions });
         const expected = Object.entries(files)
           .filter((entry) => entry[1])
           .map(([file]) => file);

cli/src/utils.ts

@@ -1,48 +1,49 @@
 import { defaults, getMyUserInfo, isHttpError } from '@immich/sdk';
-import { readFile, writeFile } from 'node:fs/promises';
+import { glob } from 'glob';
+import { createHash } from 'node:crypto';
+import { createReadStream } from 'node:fs';
+import { readFile, stat, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import yaml from 'yaml';
 
 export interface BaseOptions {
   configDirectory: string;
-  apiKey?: string;
-  instanceUrl?: string;
+  key?: string;
+  url?: string;
 }
 
-export interface AuthDto {
-  instanceUrl: string;
-  apiKey: string;
-}
+export type AuthDto = { url: string; key: string };
+type OldAuthDto = { instanceUrl: string; apiKey: string };
 
 export const authenticate = async (options: BaseOptions): Promise<void> => {
-  const { configDirectory: configDir, instanceUrl, apiKey } = options;
+  const { configDirectory: configDir, url, key } = options;
 
   // provided in command
-  if (instanceUrl && apiKey) {
-    await connect(instanceUrl, apiKey);
+  if (url && key) {
+    await connect(url, key);
     return;
   }
 
-  // fallback to file
+  // fallback to auth file
   const config = await readAuthFile(configDir);
-  await connect(config.instanceUrl, config.apiKey);
+  await connect(config.url, config.key);
 };
 
-export const connect = async (instanceUrl: string, apiKey: string): Promise<void> => {
-  const wellKnownUrl = new URL('.well-known/immich', instanceUrl);
+export const connect = async (url: string, key: string): Promise<void> => {
+  const wellKnownUrl = new URL('.well-known/immich', url);
   try {
     const wellKnown = await fetch(wellKnownUrl).then((response) => response.json());
-    const endpoint = new URL(wellKnown.api.endpoint, instanceUrl).toString();
-    if (endpoint !== instanceUrl) {
+    const endpoint = new URL(wellKnown.api.endpoint, url).toString();
+    if (endpoint !== url) {
       console.debug(`Discovered API at ${endpoint}`);
     }
-    instanceUrl = endpoint;
+    url = endpoint;
   } catch {
     // noop
   }
 
-  defaults.baseUrl = instanceUrl;
-  defaults.headers = { 'x-api-key': apiKey };
+  defaults.baseUrl = url;
+  defaults.headers = { 'x-api-key': key };
 
   const [error] = await withError(getMyUserInfo());
   if (isHttpError(error)) {
@@ -66,7 +67,12 @@ export const readAuthFile = async (dir: string) => {
   try {
     const data = await readFile(getAuthFilePath(dir));
     // TODO add class-transform/validation
-    return yaml.parse(data.toString()) as AuthDto;
+    const auth = yaml.parse(data.toString()) as AuthDto | OldAuthDto;
+    const { instanceUrl, apiKey } = auth as OldAuthDto;
+    if (instanceUrl && apiKey) {
+      return { url: instanceUrl, key: apiKey };
+    }
+    return auth as AuthDto;
   } catch (error: Error | any) {
     if (error.code === 'ENOENT' || error.code === 'ENOTDIR') {
       console.log('No auth file exists. Please login first.');
@@ -87,3 +93,74 @@ export const withError = async <T>(promise: Promise<T>): Promise<[Error, undefin
     return [error, undefined];
   }
 };
+
+export interface CrawlOptions {
+  pathsToCrawl: string[];
+  recursive?: boolean;
+  includeHidden?: boolean;
+  exclusionPatterns?: string[];
+  extensions: string[];
+}
+export const crawl = async (options: CrawlOptions): Promise<string[]> => {
+  const { extensions: extensionsWithPeriod, recursive, pathsToCrawl, exclusionPatterns, includeHidden } = options;
+  const extensions = extensionsWithPeriod.map((extension) => extension.replace('.', ''));
+
+  if (pathsToCrawl.length === 0) {
+    return [];
+  }
+
+  const patterns: string[] = [];
+  const crawledFiles: string[] = [];
+
+  for await (const currentPath of pathsToCrawl) {
+    try {
+      const stats = await stat(currentPath);
+      if (stats.isFile() || stats.isSymbolicLink()) {
+        crawledFiles.push(currentPath);
+      } else {
+        patterns.push(currentPath);
+      }
+    } catch (error: any) {
+      if (error.code === 'ENOENT') {
+        patterns.push(currentPath);
+      } else {
+        throw error;
+      }
+    }
+  }
+
+  let searchPattern: string;
+  if (patterns.length === 1) {
+    searchPattern = patterns[0];
+  } else if (patterns.length === 0) {
+    return crawledFiles;
+  } else {
+    searchPattern = '{' + patterns.join(',') + '}';
+  }
+
+  if (recursive) {
+    searchPattern = searchPattern + '/**/';
+  }
+
+  searchPattern = `${searchPattern}/*.{${extensions.join(',')}}`;
+
+  const globbedFiles = await glob(searchPattern, {
+    absolute: true,
+    nocase: true,
+    nodir: true,
+    dot: includeHidden,
+    ignore: exclusionPatterns,
+  });
+
+  return [...crawledFiles, ...globbedFiles].sort();
+};
+
+export const sha1 = (filepath: string) => {
+  const hash = createHash('sha1');
+  return new Promise<string>((resolve, reject) => {
+    const rs = createReadStream(filepath);
+    rs.on('error', reject);
+    rs.on('data', (chunk) => hash.update(chunk));
+    rs.on('end', () => resolve(hash.digest('hex')));
+  });
+};

docker/docker-compose.prod.yml

@@ -90,7 +90,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:10.4.0-ubuntu@sha256:c1f582b7cc4c1b9805d187b5600ce7879550a12ef6d29571da133c3d3fc67a9c
+    image: grafana/grafana:10.4.1-ubuntu@sha256:65e0e7d0f0b001cb0478bce5093bff917677dc308dd27a0aa4b3ac38e4fd877c
     volumes:
       - grafana-data:/var/lib/grafana
 

docs/blog/2022/11-10/release-1.36.mdx

@@ -10,8 +10,8 @@ Hello everyone, it is my pleasure to deliver the new release of Immich to you. T
 
 Some notable features are:
 
-- [OAuth integration](#livephoto-ios-support-)
-- [LivePhoto support on iOS](#oauth-integration-)
+- OAuth integration
+- LivePhoto support on iOS
 - User config system
 
 <!--truncate-->

docs/docs/FAQ.mdx

@@ -288,7 +288,11 @@ Immich components are typically deployed using docker. To see logs for deployed
 ### How can I run Immich as a non-root user?
 
 You can change the user in the container by setting the `user` argument in `docker-compose.yml` for each service.
-You may need to add an additional volume to `immich-microservices` that mounts internally to `/usr/src/app/.reverse-geocoding-dump`.
+You may need to add mount points or docker volumes for the following internal container paths:
+
+- `immich-machine-learning:/.config`
+- `immich-machine-learning:/.cache`
+- `redis:/data`
 
 The non-root user/group needs read/write access to the volume mounts, including `UPLOAD_LOCATION`.
 

docs/docs/administration/repair-page.md

@@ -0,0 +1,31 @@
+# Repair Page
+
+The repair page is designed to give information to the system administrator about files that are not tracked, or offline paths.
+
+## Natural State
+
+In this situation, everything is in its place and there is no problem that the system administrator should be aware of.
+
+<img src={require('./img/repair-page.png').default} title="server statistic" />
+
+## Any Other Situation
+
+:::note RAM Usage
+Several users report a situation where the page fails to load. In order to solve this problem you should try to allocate more RAM to Immich, if the problem continues, you should stop using the reverse proxy while loading the page.
+:::
+
+In any other situation, there are 3 different options that can appear:
+
+- MATCHES - These files are matched by their checksums.
+
+- OFFLINE PATHS - These files are the result of manually deleting files in the upload library or a failed file move in the past (losing track of a file).
+
+:::tip
+To get rid of Offline paths you can follow this [guide](/docs/guides/remove-offline-files.md)
+:::
+
+- UNTRACKED FILES - These files are not tracked by the application. They can be the result of failed moves, interrupted uploads, or left behind due to a bug.
+
+In addition, you can download the information from a page, mark everything (in order to check hashing) and correct the problem if a match is found in the hashing.
+
+<img src={require('./img/repair-page-1.png').default} title="server statistic" />

docs/docs/administration/server-stats.md

@@ -0,0 +1,13 @@
+# Server Stats
+
+Server statistics to show the total number of videos, photos, and usage per user.
+
+:::info
+If a storage quota has been defined for the user, the usage number will be displayed as a percentage of the total storage quota allocated to him.
+:::
+
+:::info External library
+External library is not included in the storage quota.
+:::
+
+<img src={require('./img/server-stats.png').default} title="server statistic" />

docs/docs/features/command-line-interface.md

@@ -1,6 +1,6 @@
 # The Immich CLI
 
-Immich has a CLI that allows you to perform certain actions from the command line. This CLI replaces the [legacy CLI](https://github.com/immich-app/CLI) that was previously available. The CLI is hosted in the [cli folder of the the main Immich github repository](https://github.com/immich-app/immich/tree/main/cli).
+Immich has a command line interface (CLI) that allows you to perform certain actions from the command line.
 
 ## Features
 
@@ -54,16 +54,19 @@ Usage: immich [options] [command]
 Command line interface for Immich
 
 Options:
-  -V, --version                     output the version number
-  -d, --config                      Configuration directory (env: IMMICH_CONFIG_DIR)
-  -h, --help                        display help for command
+  -V, --version                       output the version number
+  -d, --config-directory <directory>  Configuration directory where auth.yml will be stored (default: "~/.config/immich/", env:
+                                      IMMICH_CONFIG_DIR)
+  -u, --url [url]                     Immich server URL (env: IMMICH_INSTANCE_URL)
+  -k, --key [key]                     Immich API key (env: IMMICH_API_KEY)
+  -h, --help                          display help for command
 
 Commands:
-  upload [options] [paths...]       Upload assets
-  server-info                       Display server information
-  login-key [instanceUrl] [apiKey]  Login using an API key
-  logout                            Remove stored credentials
-  help [command]                    display help for command
+  login|login-key <url> <key>         Login using an API key
+  logout                              Remove stored credentials
+  server-info                         Display server information
+  upload [options] [paths...]         Upload assets
+  help [command]                      display help for command
 ```
 
 ## Commands
@@ -71,23 +74,24 @@ Commands:
 The upload command supports the following options:
 
 ```
-Usage: immich upload [options] [paths...]
+Usage: immich upload [paths...] [options]
 
 Upload assets
 
 Arguments:
-  paths                    One or more paths to assets to be uploaded
+  paths                       One or more paths to assets to be uploaded
 
 Options:
-  -r, --recursive          Recursive (default: false, env: IMMICH_RECURSIVE)
-  -i, --ignore [paths...]  Paths to ignore (env: IMMICH_IGNORE_PATHS)
-  -h, --skip-hash          Don't hash files before upload (default: false, env: IMMICH_SKIP_HASH)
-  -H, --include-hidden     Include hidden folders (default: false, env: IMMICH_INCLUDE_HIDDEN)
-  -a, --album              Automatically create albums based on folder name (default: false, env: IMMICH_AUTO_CREATE_ALBUM)
-  -A, --album-name <name>  Add all assets to specified album (env: IMMICH_ALBUM_NAME)
-  -n, --dry-run            Don't perform any actions, just show what will be done (default: false, env: IMMICH_DRY_RUN)
-  --delete                 Delete local assets after upload (env: IMMICH_DELETE_ASSETS)
-  --help                   display help for command
+  -r, --recursive             Recursive (default: false, env: IMMICH_RECURSIVE)
+  -i, --ignore [paths...]     Paths to ignore (default: [], env: IMMICH_IGNORE_PATHS)
+  -h, --skip-hash             Don't hash files before upload (default: false, env: IMMICH_SKIP_HASH)
+  -H, --include-hidden        Include hidden folders (default: false, env: IMMICH_INCLUDE_HIDDEN)
+  -a, --album                 Automatically create albums based on folder name (default: false, env: IMMICH_AUTO_CREATE_ALBUM)
+  -A, --album-name <name>     Add all assets to specified album (env: IMMICH_ALBUM_NAME)
+  -n, --dry-run               Don't perform any actions, just show what will be done (default: false, env: IMMICH_DRY_RUN)
+  -c, --concurrency <number>  Number of assets to upload at the same time (default: 4, env: IMMICH_UPLOAD_CONCURRENCY)
+  --delete                    Delete local assets after upload (env: IMMICH_DELETE_ASSETS)
+  --help                      display help for command
 ```
 
 Note that the above options can read from environment variables as well.
@@ -97,13 +101,13 @@ Note that the above options can read from environment variables as well.
 You begin by authenticating to your Immich server.
 
 ```bash
-immich login-key [instanceUrl] [apiKey]
+immich login [url] [key]
 ```
 
 For instance,
 
 ```bash
-immich login-key http://192.168.1.216:2283/api HFEJ38DNSDUEG
+immich login http://192.168.1.216:2283/api HFEJ38DNSDUEG
 ```
 
 This will store your credentials in a `auth.yml` file in the configuration directory which defaults to `~/.config/`. The directory can be set with the `-d` option or the environment variable `IMMICH_CONFIG_DIR`. Please keep the file secure, either by performing the logout command after you are done, or deleting it manually.

e2e/src/cli/specs/login.e2e-spec.ts

@@ -2,25 +2,25 @@ import { stat } from 'node:fs/promises';
 import { app, immichCli, utils } from 'src/utils';
 import { beforeEach, describe, expect, it } from 'vitest';
 
-describe(`immich login-key`, () => {
+describe(`immich login`, () => {
   beforeEach(async () => {
     await utils.resetDatabase();
   });
 
   it('should require a url', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key']);
+    const { stderr, exitCode } = await immichCli(['login']);
     expect(stderr).toBe("error: missing required argument 'url'");
     expect(exitCode).toBe(1);
   });
 
   it('should require a key', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key', app]);
+    const { stderr, exitCode } = await immichCli(['login', app]);
     expect(stderr).toBe("error: missing required argument 'key'");
     expect(exitCode).toBe(1);
   });
 
   it('should require a valid key', async () => {
-    const { stderr, exitCode } = await immichCli(['login-key', app, 'immich-is-so-cool']);
+    const { stderr, exitCode } = await immichCli(['login', app, 'immich-is-so-cool']);
     expect(stderr).toContain('Failed to connect to server');
     expect(stderr).toContain('Invalid API key');
     expect(stderr).toContain('401');
@@ -30,7 +30,7 @@ describe(`immich login-key`, () => {
   it('should login and save auth.yml with 600', async () => {
     const admin = await utils.adminSetup();
     const key = await utils.createApiKey(admin.accessToken);
-    const { stdout, stderr, exitCode } = await immichCli(['login-key', app, `${key.secret}`]);
+    const { stdout, stderr, exitCode } = await immichCli(['login', app, `${key.secret}`]);
     expect(stdout.split('\n')).toEqual([
       'Logging in to http://127.0.0.1:2283/api',
       'Logged in as admin@immich.cloud',
@@ -47,7 +47,7 @@ describe(`immich login-key`, () => {
   it('should login without /api in the url', async () => {
     const admin = await utils.adminSetup();
     const key = await utils.createApiKey(admin.accessToken);
-    const { stdout, stderr, exitCode } = await immichCli(['login-key', app.replaceAll('/api', ''), `${key.secret}`]);
+    const { stdout, stderr, exitCode } = await immichCli(['login', app.replaceAll('/api', ''), `${key.secret}`]);
     expect(stdout.split('\n')).toEqual([
       'Logging in to http://127.0.0.1:2283',
       'Discovered API at http://127.0.0.1:2283/api',

e2e/src/cli/specs/server-info.e2e-spec.ts

@@ -4,7 +4,8 @@ import { beforeAll, describe, expect, it } from 'vitest';
 describe(`immich server-info`, () => {
   beforeAll(async () => {
     await utils.resetDatabase();
-    await utils.cliLogin();
+    const admin = await utils.adminSetup();
+    await utils.cliLogin(admin.accessToken);
   });
 
   it('should return the server info', async () => {

e2e/src/cli/specs/upload.e2e-spec.ts

@@ -1,20 +1,69 @@
-import { getAllAlbums, getAllAssets } from '@immich/sdk';
+import { LoginResponseDto, getAllAlbums, getAllAssets } from '@immich/sdk';
 import { mkdir, readdir, rm, symlink } from 'node:fs/promises';
 import { asKeyAuth, immichCli, testAssetDir, utils } from 'src/utils';
 import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
 
 describe(`immich upload`, () => {
+  let admin: LoginResponseDto;
   let key: string;
 
   beforeAll(async () => {
     await utils.resetDatabase();
-    key = await utils.cliLogin();
+
+    admin = await utils.adminSetup();
+    key = await utils.cliLogin(admin.accessToken);
   });
 
   beforeEach(async () => {
     await utils.resetDatabase(['assets', 'albums']);
   });
 
+  describe(`immich upload /path/to/file.jpg`, () => {
+    it('should upload a single file', async () => {
+      const { stderr, stdout, exitCode } = await immichCli(['upload', `${testAssetDir}/albums/nature/silver_fir.jpg`]);
+      expect(stderr).toBe('');
+      expect(stdout.split('\n')).toEqual(
+        expect.arrayContaining([expect.stringContaining('Successfully uploaded 1 asset')]),
+      );
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(1);
+    });
+
+    it('should skip a duplicate file', async () => {
+      const first = await immichCli(['upload', `${testAssetDir}/albums/nature/silver_fir.jpg`]);
+      expect(first.stderr).toBe('');
+      expect(first.stdout.split('\n')).toEqual(
+        expect.arrayContaining([expect.stringContaining('Successfully uploaded 1 asset')]),
+      );
+      expect(first.exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(1);
+
+      const second = await immichCli(['upload', `${testAssetDir}/albums/nature/silver_fir.jpg`]);
+      expect(second.stderr).toBe('');
+      expect(second.stdout.split('\n')).toEqual(
+        expect.arrayContaining([
+          expect.stringContaining('Found 0 new files and 1 duplicate'),
+          expect.stringContaining('All assets were already uploaded, nothing to do'),
+        ]),
+      );
+      expect(first.exitCode).toBe(0);
+    });
+
+    it('should skip files that do not exist', async () => {
+      const { stderr, stdout, exitCode } = await immichCli(['upload', `/path/to/file`]);
+      expect(stderr).toBe('');
+      expect(stdout.split('\n')).toEqual(expect.arrayContaining([expect.stringContaining('No files found, exiting')]));
+      expect(exitCode).toBe(0);
+
+      const assets = await getAllAssets({}, { headers: asKeyAuth(key) });
+      expect(assets.length).toBe(0);
+    });
+  });
+
   describe('immich upload --recursive', () => {
     it('should upload a folder recursively', async () => {
       const { stderr, stdout, exitCode } = await immichCli(['upload', `${testAssetDir}/albums/nature/`, '--recursive']);

e2e/src/utils.ts

@@ -404,10 +404,9 @@ export const utils = {
       },
     ]),
 
-  cliLogin: async () => {
-    const admin = await utils.adminSetup();
-    const key = await utils.createApiKey(admin.accessToken);
-    await immichCli(['login-key', app, `${key.secret}`]);
+  cliLogin: async (accessToken: string) => {
+    const key = await utils.createApiKey(accessToken);
+    await immichCli(['login', app, `${key.secret}`]);
     return key.secret;
   },
 };

mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,70 +1,27 @@
-<vector android:height="200dp"
-    android:viewportHeight="1300"
-    android:viewportWidth="1300"
-    android:width="200dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#4081ef"
-        android:fillType="nonZero"
-        android:pathData="M578,922.6c-2.2,-0.2 -5.5,-1 -9.7,-2.2c-52.4,-15.7 -99,-46.5 -133.8,-88.5c-8.8,-10.7 -17.2,-22.4 -19.4,-27.5c-8.1,-18.1 -6.3,-38.7 4.8,-55.4c5,-7.5 13.2,-15 20.5,-18.7c1.2,-0.6 54.1,-20 55.8,-20.4c0.5,-0.1 0.5,0.2 -0.3,2.1c-0.7,1.7 -1,3.1 -1.1,5.5l-0.1,3.2l2.8,5.8c8.7,17.9 19.2,32.7 33.2,46.4c6.3,6.2 7.8,7.6 13.8,12.3c22.7,18.1 52,30.7 79.9,34.3c2.5,0.3 5,0.8 5.7,1c2.8,0.9 7.7,-0.8 11,-3.7l1.8,-1.6l-0.2,4.8c-0.1,2.7 -0.6,15.4 -1,28.3c-0.6,20.3 -0.8,24 -1.5,27.5c-3.9,20.7 -18.6,37.5 -38.4,44.1c-4.6,1.5 -8,2.2 -13.1,2.7c-4.6,0.5 -5.9,0.4 -10.7,0Z" />
-    <path
-        android:fillColor="#31a452"
-        android:fillType="nonZero"
-        android:pathData="M707.3,922.4c-4,-0.4 -9.4,-1.6 -13.2,-2.9c-3.4,-1.2 -10,-4.4 -12.5,-6.1c-10.9,-7.4 -19,-17.9 -23.1,-30c-2.2,-6.7 -2.3,-7.5 -3.3,-36.9c-0.5,-14.9 -0.9,-27.9 -0.9,-28.9l-0,-1.9l2.3,1.8c2.6,2 6.6,3.4 8.5,3.1c0.6,-0.1 3,-0.5 5.3,-0.8c37.7,-5.3 71.2,-22.2 97.4,-49.1c12.2,-12.5 21.4,-25.5 29.9,-42.4l3.5,-7l0,-3.6c0,-3.1 -0.1,-3.8 -1,-5.7c-0.5,-1.2 -0.9,-2.1 -0.9,-2.2c0.2,-0.2 55.3,20.1 56.9,20.9c2.6,1.3 6.6,4.1 9.9,7c9.2,7.7 16.1,19.4 18.8,31.8c0.7,3.1 0.8,4.8 0.8,11.3c0,8.6 -0.5,11.7 -2.9,18.7c-1.7,5 -2.9,7.2 -7.1,13.1c-7.6,11 -15.3,20.5 -25.2,31.2c-32.8,35.4 -76.5,62.5 -123.4,76.3c-8,2.5 -12.4,3 -19.8,2.3Z" />
-    <path
-        android:fillColor="#de7fb3"
-        android:fillType="nonZero"
-        android:pathData="M623.1,811c-25.9,-4.2 -50.7,-14.9 -71.7,-31c-5.2,-4 -8.7,-7.1 -14.1,-12.4c-12.7,-12.5 -21.9,-24.9 -30.5,-41.4c-2.3,-4.4 -2.4,-4.7 -2.4,-7.1c0,-8.8 8.5,-15.2 16.9,-12.7c5.6,1.7 9.6,6.8 9.7,12.2c0,2.6 -0.8,4.6 -2.6,6.2c-1.2,1.1 -3.2,1.9 -4.6,1.9c-1.2,0 -3.3,-0.8 -4.3,-1.6c-2.1,-1.8 -2,-1 0.4,3.2c19.3,33.8 52.3,59.1 90,69.1c5.7,1.5 11.5,2.7 11.8,2.4c0.1,-0.1 -0.4,-0.8 -1.3,-1.6c-5.1,-4.5 -2.3,-11.7 5,-12.8c5.4,-0.8 11.4,2.7 13.9,8c0.8,1.7 1,2.5 1,5.3c0,2.8 -0.1,3.5 -1,5.3c-2,4.3 -6.8,7.9 -10.3,7.8c-0.9,-0.1 -3.6,-0.5 -5.9,-0.8Z" />
-    <path
-        android:fillColor="#4081ef"
-        android:fillType="nonZero"
-        android:pathData="M665.1,811.2c-3.4,-1.3 -6.4,-4.3 -7.8,-8.1c-1.1,-2.9 -0.9,-7.3 0.5,-10.2c2.6,-5.3 8.7,-8.5 14.4,-7.5c2.9,0.5 4.7,1.9 6,4.3c0.8,1.6 1,2.2 0.8,3.6c-0.3,2.2 -0.9,3.3 -2.7,4.8c-0.8,0.7 -1.4,1.4 -1.3,1.5c0.5,0.5 13.4,-2.7 21.3,-5.4c33.6,-11.3 62.5,-35.1 80.4,-66.1c2.5,-4.4 2.6,-5 0.5,-3.2c-2.8,2.4 -7,1.9 -9.6,-1c-4,-4.6 -0.7,-13.8 6.1,-16.9c2,-0.9 2.7,-1 5.5,-1c2.9,0 3.5,0.1 5.6,1.1c4.4,2.1 7.4,6.4 7.8,11c0.2,2.2 0.1,2.3 -2.2,6.9c-23,45.9 -67,78.1 -117.2,85.9c-5.5,0.9 -6.3,1 -8.1,0.3Z" />
-    <path
-        android:fillColor="#31a452"
-        android:fillType="nonZero"
-        android:pathData="M578.6,771.5c-4.7,-0.9 -8.7,-2.7 -12.9,-5.9c-10.8,-8.1 -13.5,-22.3 -6.6,-33.7c0.7,-1.2 1.1,-2.2 1,-2.4c-0.2,-0.2 -1.2,-0.6 -2.3,-1.1c-7.6,-3 -13,-10.6 -13.5,-19.1c-0.5,-7.4 3.1,-15 9,-19.4c1,-0.7 2.2,-1.5 2.6,-1.8c0.8,-0.4 68.9,-22.7 69.4,-22.7c0.2,0 0.7,0.7 1.2,1.5c0.5,0.8 1.6,2.3 2.4,3.3c1.2,1.4 1.5,1.9 1.2,2.3c-0.2,0.3 -6.9,9.5 -14.8,20.5c-15.9,21.9 -15.5,21.3 -13.4,23.4c1.3,1.3 2.9,1.4 4.4,0.3c0.6,-0.4 7.5,-9.7 15.5,-20.7c11.2,-15.4 14.6,-19.9 15,-19.7c0.9,0.4 5.5,1.9 6.6,2.1l1,0.2l-0,35.3c-0,39.7 -0,38.8 -2.5,44c-2.6,5.3 -7.2,9.3 -12.7,11.2c-3.7,1.3 -6.8,1.6 -10.2,1c-5.5,-0.9 -9.8,-3.2 -13.7,-7.4l-2.2,-2.4l-0.6,0.9c-3,4.3 -8.6,8.1 -14,9.5c-2.8,0.9 -7.8,1.2 -9.9,0.8Z" />
-    <path
-        android:fillColor="#ffb800"
-        android:fillType="nonZero"
-        android:pathData="M710.4,771.5c-5.5,-0.9 -9.9,-3.2 -14.3,-7.6l-3.2,-3.2l-0.7,1c-2.3,3.3 -6.8,6.5 -11.1,7.9c-3.7,1.2 -9.2,1.4 -12.6,0.3c-7.1,-2.1 -12.7,-7.4 -15.2,-14.3l-0.9,-2.6l0,-74.2l1.8,-0.4c1,-0.2 2.7,-0.8 3.9,-1.2c1.1,-0.5 2.1,-0.8 2.2,-0.7c0.1,0.1 6.5,9 14.4,19.9c7.8,10.9 14.7,20.1 15.2,20.5c2.2,1.9 5.4,0.4 5.4,-2.6c0,-1.4 -1,-2.9 -13.8,-20.5c-7.6,-10.5 -14.2,-19.6 -14.7,-20.4l-0.9,-1.3l1.4,-1.7c0.8,-0.9 1.9,-2.5 2.5,-3.4l1,-1.6l34.4,11.2c18.9,6.2 35.1,11.6 35.9,12.1c6.8,4 11.1,11.3 11.1,19.1c0,4.1 -0.5,6.4 -2.4,10.2c-2,4.1 -5.5,7.6 -9.6,9.7c-1.6,0.8 -3.2,1.5 -3.4,1.5c-1,0 -0.9,0.7 0.3,2.6c2.8,4.3 4,8.5 3.9,13.7c0,8.1 -3.7,15.2 -10.6,20.3c-6.5,4.8 -13.4,6.7 -20,5.7Z" />
-    <path
-        android:fillColor="#de7fb3"
-        android:fillType="nonZero"
-        android:pathData="M421.4,714.9c-0.5,-0.1 -2.3,-0.4 -3.9,-0.7c-15.6,-2.6 -30.4,-12.6 -38.8,-26.2c-3.5,-5.7 -6.4,-13.2 -7.8,-19.9c-1.2,-6.1 -0.8,-28.1 0.8,-43.1c4.5,-43 19,-84.3 42.2,-120.7c6.5,-10.2 14.9,-21.5 18.2,-24.6c17.8,-16.6 43.1,-20.5 64.8,-10c4.3,2.1 8.8,5.1 12.7,8.6c2.8,2.4 5.8,6.1 20.9,25.5c9.7,12.5 17.8,22.8 17.9,23c0.2,0.2 -0.9,0.4 -3.2,0.4c-2.5,0 -4.1,0.2 -5.7,0.7c-2.1,0.7 -2.6,1.1 -7.9,6.3c-8.2,8.1 -14.4,15.3 -20.3,23.9c-15.5,22.2 -25.4,47.7 -28.8,74.8c-2.2,16.9 -1.6,37.5 1.6,52.3c0.3,1.4 0.5,2.8 0.4,3c-0.1,0.2 0.2,1.3 0.8,2.4c1.1,2.4 4.3,5.7 6.5,6.8l1.5,0.8l-1.2,0.4c-0.7,0.2 -13.1,3.8 -27.6,8c-16.4,4.7 -27.7,7.8 -29.8,8.1c-3.1,0.4 -11.1,0.6 -13.3,0.2Z" />
-    <path
-        android:fillColor="#ffb800"
-        android:fillType="nonZero"
-        android:pathData="M862.2,714.7c-2.1,-0.3 -33.8,-9.1 -56.5,-15.8l-2.5,-0.7l1.6,-0.8c3.4,-1.7 7.2,-6.6 7.3,-9.6c0,-0.7 0.4,-3.3 0.8,-5.8c3.9,-22.7 3.1,-46.1 -2.5,-68.4c-6.4,-25.5 -18.6,-49.2 -35.8,-69.1c-4.6,-5.3 -14.8,-15.4 -16.4,-16.1c-2.4,-1.1 -5.1,-1.6 -8,-1.4l-2.7,0.2l1.2,-1.5c0.7,-0.8 8.5,-10.8 17.5,-22.3c8.9,-11.5 17.2,-21.8 18.5,-23.1c2.6,-2.7 7,-6.2 10.3,-8.2c19.3,-11.6 43,-11.1 61.6,1.2c5.4,3.6 8.2,6.2 12.3,11.7c26.4,34.5 44,73.7 52.3,116.2c3.4,17.6 4.9,33.3 5,52.4c0,13 -0.2,14.8 -2.5,21.8c-8.4,26.2 -34.5,42.8 -61.5,39.3Z" />
-    <path
-        android:fillColor="#e64132"
-        android:fillType="nonZero"
-        android:pathData="M501.4,691.5c-2,-0.5 -4.6,-1.9 -6,-3.3c-2.5,-2.4 -3.1,-3.5 -3.7,-7.3c-4.4,-27.3 -2.2,-54 6.7,-79.3c5.3,-15.1 13.5,-30.5 23,-43.1c5.8,-7.8 16.6,-19.5 19,-20.7c4.7,-2.4 11.3,-1.2 15.2,2.7c5.4,5.4 5.2,13.9 -0.3,19.1c-4.3,4 -9.4,4.4 -12.6,0.9c-1.7,-1.9 -2.2,-3.9 -1.7,-6.4c0.2,-1.1 0.3,-2 0.2,-2.2c-0.3,-0.3 -3.6,3.3 -8.3,9.1c-17.6,21.8 -28.5,48 -31.9,76.5c-1.1,9.3 -1,26.4 0.1,34.6c0.3,1.8 0.8,1.9 1.4,0.1c0.9,-2.6 4,-4.7 6.8,-4.7c3,-0 5.9,2.2 7.5,5.7c0.6,1.3 0.8,2.3 0.8,5.2c-0,3.3 -0.1,3.8 -1.1,5.7c-1.4,2.7 -4.6,5.7 -7.1,6.6c-2.5,0.9 -6.1,1.2 -8,0.8Z" />
-    <path
-        android:fillColor="#31a452"
-        android:fillType="nonZero"
-        android:pathData="M790.1,691.5c-3.7,-0.6 -7.7,-3.6 -9.4,-7.1c-3.8,-7.5 0.1,-16.9 6.9,-16.9c3.1,0 5.8,2 6.9,5.2c0.4,1.2 0.5,1.3 0.7,0.7c1.3,-3.7 1.7,-26.4 0.6,-35.7c-3.6,-29.6 -14.5,-55.3 -33,-77.9c-5.5,-6.7 -8.4,-9.4 -7.1,-6.6c0.7,1.4 0.5,4.3 -0.3,5.9c-0.9,1.7 -3.2,3.5 -5,3.8c-3.2,0.6 -7.9,-1.6 -10.2,-4.8c-6.5,-8.8 -0.5,-21.2 10.4,-21.4c4.6,-0.1 5.2,0.3 11.2,6.4c12.1,12.3 21.1,24.9 28.8,40.3c13.2,26.3 18.6,54.9 16.1,84.5c-0.5,5.6 -2,15.7 -2.6,17.1c-1.3,2.8 -4.8,5.5 -8.4,6.5c-2.3,0.4 -3.1,0.4 -5.6,0Z" />
-    <path
-        android:fillColor="#4081ef"
-        android:fillType="nonZero"
-        android:pathData="M545.7,680.2c-6,-1.3 -12.2,-6.2 -14.9,-11.7c-3.4,-7 -3.1,-15.1 0.9,-21.6c0.7,-1.2 1.2,-2.3 1.1,-2.4c-0.1,-0.1 -1.1,-0.6 -2.1,-1c-3.9,-1.5 -8.1,-4.8 -10.7,-8.3c-4.6,-6.2 -6.1,-14.6 -3.9,-22.1c2.9,-10.3 9.4,-16.8 19.1,-19.3c2.8,-0.7 9,-0.8 11.7,-0c1.1,0.3 2.2,0.5 2.4,0.5c0.2,-0 0.3,-0.7 0.3,-1.5c0,-2.9 0.8,-5.8 2.4,-9.2c5.2,-10.8 18.1,-15.5 29,-10.5c2.7,1.2 6.2,3.8 7.8,5.8c0.7,0.8 10.3,14 21.5,29.4l20.3,27.9l-1.5,1.8c-0.8,1 -1.9,2.6 -2.5,3.5c-0.6,1 -1.2,1.7 -1.5,1.6c-4.5,-1.7 -46.7,-15 -47.7,-15c-1.9,0 -3.1,1.3 -3.1,3.2c0,1 0.2,1.7 0.8,2.3c0.6,0.6 7.8,3.1 24.5,8.5l23.7,7.7l-0.2,8.6l-32.6,10.5c-18,5.9 -33.9,10.9 -35.2,11.2c-3.1,0.7 -6.6,0.7 -9.6,0.1Z" />
-    <path
-        android:fillColor="#e64132"
-        android:fillType="nonZero"
-        android:pathData="M740,679.8c-1.8,-0.5 -17.5,-5.6 -35,-11.3l-31.8,-10.4l1,-4.3l0,-4.3l22.6,-7.7c15,-4.9 24,-8 24.6,-8.5c0.7,-0.6 0.9,-1.1 0.9,-2.2c-0,-2 -1.2,-3.3 -3.1,-3.3c-0.9,-0 -10.5,2.9 -24.7,7.5c-12.8,4.1 -23.4,7.5 -23.6,7.5c-0.1,-0 -0.7,-0.8 -1.3,-1.9c-0.6,-1 -1.6,-2.5 -2.2,-3.2c-0.7,-0.7 -1.2,-1.5 -1.2,-1.6c0,-0.2 9.6,-13.5 21.4,-29.6c18.9,-26 21.6,-29.6 23.6,-31.1c5.7,-4.4 13.1,-5.8 19.7,-3.9c9,2.7 16.1,11.6 16.1,20.3c0,2.3 -0.1,2.3 3.1,1.5c4.7,-1.1 11.5,-0.5 16,1.5c4.6,2 9,6 11.5,10.2c2.1,3.6 3.9,9.4 4.2,13.2c0.3,5.2 -1.1,10.7 -4,15.3c-2.6,4.1 -7.8,8.3 -12.1,9.8c-0.9,0.3 -1.7,0.8 -1.7,1c0,0.2 0.4,1 0.9,1.7c2.4,3.6 3.6,7.7 3.5,12.7c0,5.8 -2.1,10.7 -6.4,15.1c-4,4.1 -8.9,6.3 -14.9,6.5c-3.3,0.4 -4.3,0.3 -7.1,-0.5Z" />
-    <path
-        android:fillColor="#f2f5fb"
-        android:fillType="nonZero"
-        android:pathData="M643.7,671.9c-6.1,-1.6 -11.4,-6.8 -13.2,-12.9c-0.7,-2.4 -0.7,-7.5 0,-9.9c1.7,-5.8 6.6,-10.8 12.3,-12.5c2.7,-0.8 7.2,-0.9 10,-0.2c6.2,1.6 11.6,7.1 13.2,13.3c1.6,6 -0.3,12.6 -5,17.3c-4.6,4.6 -11.3,6.5 -17.3,4.9Z" />
-    <path
-        android:fillColor="#de7fb3"
-        android:fillType="nonZero"
-        android:pathData="M615.8,602.8c-13.3,-18.3 -21.2,-29.6 -22,-31.1c-1.4,-3 -1.9,-5.5 -1.9,-9.4c0,-14.1 13.1,-24.4 27.1,-21.4c1.4,0.3 2.6,0.5 2.7,0.5c0.1,0 0.3,-1.3 0.4,-2.8c0.8,-10.7 8.4,-19.6 18.9,-22.4c3.9,-1 10.6,-1 14.5,-0c8.9,2.3 15.9,9.3 18.2,18.2c0.4,1.5 0.7,3.7 0.7,4.9c-0,1.2 0.1,2.1 0.3,2.1c0.2,-0 1.5,-0.3 3,-0.6c7.4,-1.6 15.2,0.7 20.5,6c4.3,4.3 6.6,9.6 6.6,15.6c-0,4 -0.6,6.5 -2.4,10c-0.6,1.2 -10.4,15 -21.7,30.7c-17.8,24.5 -20.8,28.5 -21.4,28.3c-0.4,-0.1 -1.9,-0.6 -3.4,-1.1c-1.5,-0.5 -2.9,-0.9 -3.3,-0.9c-0.7,-0 -0.7,-0.8 -0.3,-25.5l-0,-25.5l-1.4,-0.9c-1,-1.1 -2.5,-1.5 -3.8,-0.9c-2,0.8 -2,-0.5 -1.8,27.2l-0,25.8l-1.2,-0c-0.5,-0.2 -2.4,0.3 -4,0.9c-1.6,0.6 -3.1,1.1 -3.2,1.1c-0.2,-0.1 -9.6,-13 -21.1,-28.8Z" />
-    <path
-        android:fillColor="#ffb800"
-        android:fillType="nonZero"
-        android:pathData="M578.4,537.8c-4.1,-0.9 -7.7,-3.6 -9.6,-7.4c-1.4,-2.8 -1.7,-7.3 -0.5,-10.3c1.7,-4.5 3.9,-6.1 15.6,-11.2c15.8,-7 31.4,-11.1 49.2,-12.9c7.3,-0.8 23.2,-0.8 30.6,0c17.4,1.8 33.3,6 49.1,13c7.3,3.2 12.5,6.1 13.6,7.5c4.3,5.6 3.8,12.7 -1.1,17.6c-5.1,5.1 -12.9,5.4 -18.1,0.7c-2,-1.8 -3,-3.5 -3.4,-5.6c-0.7,-4 2.9,-8.1 7.3,-8.2c1.4,0 1.5,-0.1 1.1,-0.5c-0.3,-0.3 -2.2,-1.2 -4.3,-2.1c-33.2,-14.5 -70.5,-16.4 -105,-5.4c-7.5,2.4 -19,7.2 -18.6,7.7c0.1,0.2 0.8,0.3 1.6,0.3c5.6,0 9.1,6.2 6.1,10.8c-2.9,4.5 -8.6,7.1 -13.6,6Z" />
-    <path
-        android:fillColor="#e64132"
-        android:fillType="nonZero"
-        android:pathData="M542.2,496.4c-8.9,-13.1 -16.8,-25.1 -17.5,-26.6c-1.6,-3.3 -3.6,-9.2 -4.4,-13c-2.6,-12.5 -0.9,-25.8 5,-37.5c4.2,-8.3 11.2,-16.3 18.6,-21.3c5,-3.4 6.1,-3.9 12.8,-6.3c23.1,-8.2 47.2,-13.1 73.4,-15c7.5,-0.6 28.5,-0.6 36.3,-0c25.5,1.8 50.6,6.9 73,14.8c6.4,2.2 8.2,3.1 13.1,6.5c9.8,6.6 18.1,17.5 22,29.2c2.2,6.5 2.7,10 2.7,17.9c0,7.9 -0.5,11.3 -2.7,17.9c-2.3,6.8 -3.7,9.1 -20.3,33.6l-16.1,23.8l-0.4,-2.2c-0.2,-1.2 -0.9,-3 -1.4,-4c-1,-1.8 -4.4,-5.6 -4.7,-5.2c-0.1,0.1 -1.2,-0.4 -2.4,-1.1c-9.1,-5.2 -21.9,-10.5 -33.2,-13.9c-37,-11 -77.2,-8.8 -113,6.1c-4.9,2.1 -17.7,8.4 -19.2,9.5c-2.2,1.6 -5.1,6.8 -5.1,9c0,0.4 -0.1,1 -0.3,1.2c0.1,0.2 -6.2,-8.8 -16.2,-23.4Z" />
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="108dp"
+  android:height="108dp"
+  android:viewportWidth="108"
+  android:viewportHeight="108">
+  <path
+    android:fillColor="#FA2921"
+    android:fillType="nonZero"
+    android:pathData="m52.25,43.55c3.4,3.08 6.15,6.39 7.91,9.5 3.03,-5.55 5.06,-12.14 5.08,-16.34 0,-0.03 0,-0.06 0,-0.08 0,-6.21 -6.06,-8.63 -11.28,-8.63 -5.22,0 -11.28,2.42 -11.28,8.63 0,0.08 0,0.2 0,0.34 2.91,1.32 6.36,3.69 9.56,6.59z" />
+  <path
+    android:fillColor="#ED79B5"
+    android:fillType="nonZero"
+    android:pathData="m33.68,60.5c2.13,-2.42 5.39,-5.05 9.08,-7.27 3.92,-2.36 7.84,-4.01 11.28,-4.76 -4.22,-4.67 -9.72,-8.67 -13.62,-10 -0.03,-0.01 -0.05,-0.02 -0.08,-0.03 -5.78,-1.92 -9.9,3.23 -11.51,8.31 -1.61,5.08 -1.24,11.72 4.54,13.64 0.08,0.03 0.18,0.06 0.31,0.1z" />
+  <path
+    android:fillColor="#FFB400"
+    android:fillType="nonZero"
+    android:pathData="M79.17,46.67C77.56,41.59 73.44,36.44 67.66,38.36c-0.08,0.03 -0.19,0.06 -0.31,0.1 -0.33,3.24 -1.46,7.33 -3.17,11.34 -1.81,4.27 -4.04,7.96 -6.39,10.64 6.1,1.24 12.85,1.17 16.76,-0.1 0.03,-0.01 0.05,-0.02 0.08,-0.03 5.78,-1.92 6.15,-8.56 4.54,-13.64z" />
+  <path
+    android:fillColor="#1E83F7"
+    android:fillType="nonZero"
+    android:pathData="m48.82,65.46c-0.98,-4.54 -1.3,-8.87 -0.94,-12.45 -5.64,2.67 -11.07,6.78 -13.5,10.16 -0.02,0.02 -0.03,0.05 -0.05,0.07 -3.57,5.03 -0.06,10.63 4.16,13.77 4.22,3.14 10.51,4.83 14.09,-0.2 0.05,-0.07 0.11,-0.16 0.19,-0.27 -1.59,-2.82 -3.03,-6.81 -3.95,-11.08z" />
+  <path
+    android:fillColor="#18C249"
+    android:fillType="nonZero"
+    android:pathData="m73.58,62.92c-3.11,0.68 -7.26,0.84 -11.52,0.42 -4.53,-0.45 -8.64,-1.47 -11.86,-2.93 0.73,6.31 2.88,12.87 5.28,16.28 0.02,0.02 0.03,0.05 0.05,0.07 3.57,5.03 9.86,3.34 14.09,0.2 4.22,-3.14 7.74,-8.74 4.16,-13.77 -0.05,-0.07 -0.11,-0.16 -0.19,-0.27z" />
 </vector>

mobile/android/app/src/main/res/drawable/ic_launcher_monochrome.xml

@@ -1,70 +1,27 @@
-<vector android:height="200dp"
-    android:viewportHeight="1300"
-    android:viewportWidth="1300"
-    android:width="200dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M578,922.6c-2.2,-0.2 -5.5,-1 -9.7,-2.2c-52.4,-15.7 -99,-46.5 -133.8,-88.5c-8.8,-10.7 -17.2,-22.4 -19.4,-27.5c-8.1,-18.1 -6.3,-38.7 4.8,-55.4c5,-7.5 13.2,-15 20.5,-18.7c1.2,-0.6 54.1,-20 55.8,-20.4c0.5,-0.1 0.5,0.2 -0.3,2.1c-0.7,1.7 -1,3.1 -1.1,5.5l-0.1,3.2l2.8,5.8c8.7,17.9 19.2,32.7 33.2,46.4c6.3,6.2 7.8,7.6 13.8,12.3c22.7,18.1 52,30.7 79.9,34.3c2.5,0.3 5,0.8 5.7,1c2.8,0.9 7.7,-0.8 11,-3.7l1.8,-1.6l-0.2,4.8c-0.1,2.7 -0.6,15.4 -1,28.3c-0.6,20.3 -0.8,24 -1.5,27.5c-3.9,20.7 -18.6,37.5 -38.4,44.1c-4.6,1.5 -8,2.2 -13.1,2.7c-4.6,0.5 -5.9,0.4 -10.7,0Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M707.3,922.4c-4,-0.4 -9.4,-1.6 -13.2,-2.9c-3.4,-1.2 -10,-4.4 -12.5,-6.1c-10.9,-7.4 -19,-17.9 -23.1,-30c-2.2,-6.7 -2.3,-7.5 -3.3,-36.9c-0.5,-14.9 -0.9,-27.9 -0.9,-28.9l-0,-1.9l2.3,1.8c2.6,2 6.6,3.4 8.5,3.1c0.6,-0.1 3,-0.5 5.3,-0.8c37.7,-5.3 71.2,-22.2 97.4,-49.1c12.2,-12.5 21.4,-25.5 29.9,-42.4l3.5,-7l0,-3.6c0,-3.1 -0.1,-3.8 -1,-5.7c-0.5,-1.2 -0.9,-2.1 -0.9,-2.2c0.2,-0.2 55.3,20.1 56.9,20.9c2.6,1.3 6.6,4.1 9.9,7c9.2,7.7 16.1,19.4 18.8,31.8c0.7,3.1 0.8,4.8 0.8,11.3c0,8.6 -0.5,11.7 -2.9,18.7c-1.7,5 -2.9,7.2 -7.1,13.1c-7.6,11 -15.3,20.5 -25.2,31.2c-32.8,35.4 -76.5,62.5 -123.4,76.3c-8,2.5 -12.4,3 -19.8,2.3Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M623.1,811c-25.9,-4.2 -50.7,-14.9 -71.7,-31c-5.2,-4 -8.7,-7.1 -14.1,-12.4c-12.7,-12.5 -21.9,-24.9 -30.5,-41.4c-2.3,-4.4 -2.4,-4.7 -2.4,-7.1c0,-8.8 8.5,-15.2 16.9,-12.7c5.6,1.7 9.6,6.8 9.7,12.2c0,2.6 -0.8,4.6 -2.6,6.2c-1.2,1.1 -3.2,1.9 -4.6,1.9c-1.2,0 -3.3,-0.8 -4.3,-1.6c-2.1,-1.8 -2,-1 0.4,3.2c19.3,33.8 52.3,59.1 90,69.1c5.7,1.5 11.5,2.7 11.8,2.4c0.1,-0.1 -0.4,-0.8 -1.3,-1.6c-5.1,-4.5 -2.3,-11.7 5,-12.8c5.4,-0.8 11.4,2.7 13.9,8c0.8,1.7 1,2.5 1,5.3c0,2.8 -0.1,3.5 -1,5.3c-2,4.3 -6.8,7.9 -10.3,7.8c-0.9,-0.1 -3.6,-0.5 -5.9,-0.8Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M665.1,811.2c-3.4,-1.3 -6.4,-4.3 -7.8,-8.1c-1.1,-2.9 -0.9,-7.3 0.5,-10.2c2.6,-5.3 8.7,-8.5 14.4,-7.5c2.9,0.5 4.7,1.9 6,4.3c0.8,1.6 1,2.2 0.8,3.6c-0.3,2.2 -0.9,3.3 -2.7,4.8c-0.8,0.7 -1.4,1.4 -1.3,1.5c0.5,0.5 13.4,-2.7 21.3,-5.4c33.6,-11.3 62.5,-35.1 80.4,-66.1c2.5,-4.4 2.6,-5 0.5,-3.2c-2.8,2.4 -7,1.9 -9.6,-1c-4,-4.6 -0.7,-13.8 6.1,-16.9c2,-0.9 2.7,-1 5.5,-1c2.9,0 3.5,0.1 5.6,1.1c4.4,2.1 7.4,6.4 7.8,11c0.2,2.2 0.1,2.3 -2.2,6.9c-23,45.9 -67,78.1 -117.2,85.9c-5.5,0.9 -6.3,1 -8.1,0.3Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M578.6,771.5c-4.7,-0.9 -8.7,-2.7 -12.9,-5.9c-10.8,-8.1 -13.5,-22.3 -6.6,-33.7c0.7,-1.2 1.1,-2.2 1,-2.4c-0.2,-0.2 -1.2,-0.6 -2.3,-1.1c-7.6,-3 -13,-10.6 -13.5,-19.1c-0.5,-7.4 3.1,-15 9,-19.4c1,-0.7 2.2,-1.5 2.6,-1.8c0.8,-0.4 68.9,-22.7 69.4,-22.7c0.2,0 0.7,0.7 1.2,1.5c0.5,0.8 1.6,2.3 2.4,3.3c1.2,1.4 1.5,1.9 1.2,2.3c-0.2,0.3 -6.9,9.5 -14.8,20.5c-15.9,21.9 -15.5,21.3 -13.4,23.4c1.3,1.3 2.9,1.4 4.4,0.3c0.6,-0.4 7.5,-9.7 15.5,-20.7c11.2,-15.4 14.6,-19.9 15,-19.7c0.9,0.4 5.5,1.9 6.6,2.1l1,0.2l-0,35.3c-0,39.7 -0,38.8 -2.5,44c-2.6,5.3 -7.2,9.3 -12.7,11.2c-3.7,1.3 -6.8,1.6 -10.2,1c-5.5,-0.9 -9.8,-3.2 -13.7,-7.4l-2.2,-2.4l-0.6,0.9c-3,4.3 -8.6,8.1 -14,9.5c-2.8,0.9 -7.8,1.2 -9.9,0.8Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M710.4,771.5c-5.5,-0.9 -9.9,-3.2 -14.3,-7.6l-3.2,-3.2l-0.7,1c-2.3,3.3 -6.8,6.5 -11.1,7.9c-3.7,1.2 -9.2,1.4 -12.6,0.3c-7.1,-2.1 -12.7,-7.4 -15.2,-14.3l-0.9,-2.6l0,-74.2l1.8,-0.4c1,-0.2 2.7,-0.8 3.9,-1.2c1.1,-0.5 2.1,-0.8 2.2,-0.7c0.1,0.1 6.5,9 14.4,19.9c7.8,10.9 14.7,20.1 15.2,20.5c2.2,1.9 5.4,0.4 5.4,-2.6c0,-1.4 -1,-2.9 -13.8,-20.5c-7.6,-10.5 -14.2,-19.6 -14.7,-20.4l-0.9,-1.3l1.4,-1.7c0.8,-0.9 1.9,-2.5 2.5,-3.4l1,-1.6l34.4,11.2c18.9,6.2 35.1,11.6 35.9,12.1c6.8,4 11.1,11.3 11.1,19.1c0,4.1 -0.5,6.4 -2.4,10.2c-2,4.1 -5.5,7.6 -9.6,9.7c-1.6,0.8 -3.2,1.5 -3.4,1.5c-1,0 -0.9,0.7 0.3,2.6c2.8,4.3 4,8.5 3.9,13.7c0,8.1 -3.7,15.2 -10.6,20.3c-6.5,4.8 -13.4,6.7 -20,5.7Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M421.4,714.9c-0.5,-0.1 -2.3,-0.4 -3.9,-0.7c-15.6,-2.6 -30.4,-12.6 -38.8,-26.2c-3.5,-5.7 -6.4,-13.2 -7.8,-19.9c-1.2,-6.1 -0.8,-28.1 0.8,-43.1c4.5,-43 19,-84.3 42.2,-120.7c6.5,-10.2 14.9,-21.5 18.2,-24.6c17.8,-16.6 43.1,-20.5 64.8,-10c4.3,2.1 8.8,5.1 12.7,8.6c2.8,2.4 5.8,6.1 20.9,25.5c9.7,12.5 17.8,22.8 17.9,23c0.2,0.2 -0.9,0.4 -3.2,0.4c-2.5,0 -4.1,0.2 -5.7,0.7c-2.1,0.7 -2.6,1.1 -7.9,6.3c-8.2,8.1 -14.4,15.3 -20.3,23.9c-15.5,22.2 -25.4,47.7 -28.8,74.8c-2.2,16.9 -1.6,37.5 1.6,52.3c0.3,1.4 0.5,2.8 0.4,3c-0.1,0.2 0.2,1.3 0.8,2.4c1.1,2.4 4.3,5.7 6.5,6.8l1.5,0.8l-1.2,0.4c-0.7,0.2 -13.1,3.8 -27.6,8c-16.4,4.7 -27.7,7.8 -29.8,8.1c-3.1,0.4 -11.1,0.6 -13.3,0.2Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M862.2,714.7c-2.1,-0.3 -33.8,-9.1 -56.5,-15.8l-2.5,-0.7l1.6,-0.8c3.4,-1.7 7.2,-6.6 7.3,-9.6c0,-0.7 0.4,-3.3 0.8,-5.8c3.9,-22.7 3.1,-46.1 -2.5,-68.4c-6.4,-25.5 -18.6,-49.2 -35.8,-69.1c-4.6,-5.3 -14.8,-15.4 -16.4,-16.1c-2.4,-1.1 -5.1,-1.6 -8,-1.4l-2.7,0.2l1.2,-1.5c0.7,-0.8 8.5,-10.8 17.5,-22.3c8.9,-11.5 17.2,-21.8 18.5,-23.1c2.6,-2.7 7,-6.2 10.3,-8.2c19.3,-11.6 43,-11.1 61.6,1.2c5.4,3.6 8.2,6.2 12.3,11.7c26.4,34.5 44,73.7 52.3,116.2c3.4,17.6 4.9,33.3 5,52.4c0,13 -0.2,14.8 -2.5,21.8c-8.4,26.2 -34.5,42.8 -61.5,39.3Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M501.4,691.5c-2,-0.5 -4.6,-1.9 -6,-3.3c-2.5,-2.4 -3.1,-3.5 -3.7,-7.3c-4.4,-27.3 -2.2,-54 6.7,-79.3c5.3,-15.1 13.5,-30.5 23,-43.1c5.8,-7.8 16.6,-19.5 19,-20.7c4.7,-2.4 11.3,-1.2 15.2,2.7c5.4,5.4 5.2,13.9 -0.3,19.1c-4.3,4 -9.4,4.4 -12.6,0.9c-1.7,-1.9 -2.2,-3.9 -1.7,-6.4c0.2,-1.1 0.3,-2 0.2,-2.2c-0.3,-0.3 -3.6,3.3 -8.3,9.1c-17.6,21.8 -28.5,48 -31.9,76.5c-1.1,9.3 -1,26.4 0.1,34.6c0.3,1.8 0.8,1.9 1.4,0.1c0.9,-2.6 4,-4.7 6.8,-4.7c3,-0 5.9,2.2 7.5,5.7c0.6,1.3 0.8,2.3 0.8,5.2c-0,3.3 -0.1,3.8 -1.1,5.7c-1.4,2.7 -4.6,5.7 -7.1,6.6c-2.5,0.9 -6.1,1.2 -8,0.8Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M790.1,691.5c-3.7,-0.6 -7.7,-3.6 -9.4,-7.1c-3.8,-7.5 0.1,-16.9 6.9,-16.9c3.1,0 5.8,2 6.9,5.2c0.4,1.2 0.5,1.3 0.7,0.7c1.3,-3.7 1.7,-26.4 0.6,-35.7c-3.6,-29.6 -14.5,-55.3 -33,-77.9c-5.5,-6.7 -8.4,-9.4 -7.1,-6.6c0.7,1.4 0.5,4.3 -0.3,5.9c-0.9,1.7 -3.2,3.5 -5,3.8c-3.2,0.6 -7.9,-1.6 -10.2,-4.8c-6.5,-8.8 -0.5,-21.2 10.4,-21.4c4.6,-0.1 5.2,0.3 11.2,6.4c12.1,12.3 21.1,24.9 28.8,40.3c13.2,26.3 18.6,54.9 16.1,84.5c-0.5,5.6 -2,15.7 -2.6,17.1c-1.3,2.8 -4.8,5.5 -8.4,6.5c-2.3,0.4 -3.1,0.4 -5.6,0Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M545.7,680.2c-6,-1.3 -12.2,-6.2 -14.9,-11.7c-3.4,-7 -3.1,-15.1 0.9,-21.6c0.7,-1.2 1.2,-2.3 1.1,-2.4c-0.1,-0.1 -1.1,-0.6 -2.1,-1c-3.9,-1.5 -8.1,-4.8 -10.7,-8.3c-4.6,-6.2 -6.1,-14.6 -3.9,-22.1c2.9,-10.3 9.4,-16.8 19.1,-19.3c2.8,-0.7 9,-0.8 11.7,-0c1.1,0.3 2.2,0.5 2.4,0.5c0.2,-0 0.3,-0.7 0.3,-1.5c0,-2.9 0.8,-5.8 2.4,-9.2c5.2,-10.8 18.1,-15.5 29,-10.5c2.7,1.2 6.2,3.8 7.8,5.8c0.7,0.8 10.3,14 21.5,29.4l20.3,27.9l-1.5,1.8c-0.8,1 -1.9,2.6 -2.5,3.5c-0.6,1 -1.2,1.7 -1.5,1.6c-4.5,-1.7 -46.7,-15 -47.7,-15c-1.9,0 -3.1,1.3 -3.1,3.2c0,1 0.2,1.7 0.8,2.3c0.6,0.6 7.8,3.1 24.5,8.5l23.7,7.7l-0.2,8.6l-32.6,10.5c-18,5.9 -33.9,10.9 -35.2,11.2c-3.1,0.7 -6.6,0.7 -9.6,0.1Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M740,679.8c-1.8,-0.5 -17.5,-5.6 -35,-11.3l-31.8,-10.4l1,-4.3l0,-4.3l22.6,-7.7c15,-4.9 24,-8 24.6,-8.5c0.7,-0.6 0.9,-1.1 0.9,-2.2c-0,-2 -1.2,-3.3 -3.1,-3.3c-0.9,-0 -10.5,2.9 -24.7,7.5c-12.8,4.1 -23.4,7.5 -23.6,7.5c-0.1,-0 -0.7,-0.8 -1.3,-1.9c-0.6,-1 -1.6,-2.5 -2.2,-3.2c-0.7,-0.7 -1.2,-1.5 -1.2,-1.6c0,-0.2 9.6,-13.5 21.4,-29.6c18.9,-26 21.6,-29.6 23.6,-31.1c5.7,-4.4 13.1,-5.8 19.7,-3.9c9,2.7 16.1,11.6 16.1,20.3c0,2.3 -0.1,2.3 3.1,1.5c4.7,-1.1 11.5,-0.5 16,1.5c4.6,2 9,6 11.5,10.2c2.1,3.6 3.9,9.4 4.2,13.2c0.3,5.2 -1.1,10.7 -4,15.3c-2.6,4.1 -7.8,8.3 -12.1,9.8c-0.9,0.3 -1.7,0.8 -1.7,1c0,0.2 0.4,1 0.9,1.7c2.4,3.6 3.6,7.7 3.5,12.7c0,5.8 -2.1,10.7 -6.4,15.1c-4,4.1 -8.9,6.3 -14.9,6.5c-3.3,0.4 -4.3,0.3 -7.1,-0.5Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M643.7,671.9c-6.1,-1.6 -11.4,-6.8 -13.2,-12.9c-0.7,-2.4 -0.7,-7.5 0,-9.9c1.7,-5.8 6.6,-10.8 12.3,-12.5c2.7,-0.8 7.2,-0.9 10,-0.2c6.2,1.6 11.6,7.1 13.2,13.3c1.6,6 -0.3,12.6 -5,17.3c-4.6,4.6 -11.3,6.5 -17.3,4.9Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M615.8,602.8c-13.3,-18.3 -21.2,-29.6 -22,-31.1c-1.4,-3 -1.9,-5.5 -1.9,-9.4c0,-14.1 13.1,-24.4 27.1,-21.4c1.4,0.3 2.6,0.5 2.7,0.5c0.1,0 0.3,-1.3 0.4,-2.8c0.8,-10.7 8.4,-19.6 18.9,-22.4c3.9,-1 10.6,-1 14.5,-0c8.9,2.3 15.9,9.3 18.2,18.2c0.4,1.5 0.7,3.7 0.7,4.9c-0,1.2 0.1,2.1 0.3,2.1c0.2,-0 1.5,-0.3 3,-0.6c7.4,-1.6 15.2,0.7 20.5,6c4.3,4.3 6.6,9.6 6.6,15.6c-0,4 -0.6,6.5 -2.4,10c-0.6,1.2 -10.4,15 -21.7,30.7c-17.8,24.5 -20.8,28.5 -21.4,28.3c-0.4,-0.1 -1.9,-0.6 -3.4,-1.1c-1.5,-0.5 -2.9,-0.9 -3.3,-0.9c-0.7,-0 -0.7,-0.8 -0.3,-25.5l-0,-25.5l-1.4,-0.9c-1,-1.1 -2.5,-1.5 -3.8,-0.9c-2,0.8 -2,-0.5 -1.8,27.2l-0,25.8l-1.2,-0c-0.5,-0.2 -2.4,0.3 -4,0.9c-1.6,0.6 -3.1,1.1 -3.2,1.1c-0.2,-0.1 -9.6,-13 -21.1,-28.8Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M578.4,537.8c-4.1,-0.9 -7.7,-3.6 -9.6,-7.4c-1.4,-2.8 -1.7,-7.3 -0.5,-10.3c1.7,-4.5 3.9,-6.1 15.6,-11.2c15.8,-7 31.4,-11.1 49.2,-12.9c7.3,-0.8 23.2,-0.8 30.6,0c17.4,1.8 33.3,6 49.1,13c7.3,3.2 12.5,6.1 13.6,7.5c4.3,5.6 3.8,12.7 -1.1,17.6c-5.1,5.1 -12.9,5.4 -18.1,0.7c-2,-1.8 -3,-3.5 -3.4,-5.6c-0.7,-4 2.9,-8.1 7.3,-8.2c1.4,0 1.5,-0.1 1.1,-0.5c-0.3,-0.3 -2.2,-1.2 -4.3,-2.1c-33.2,-14.5 -70.5,-16.4 -105,-5.4c-7.5,2.4 -19,7.2 -18.6,7.7c0.1,0.2 0.8,0.3 1.6,0.3c5.6,0 9.1,6.2 6.1,10.8c-2.9,4.5 -8.6,7.1 -13.6,6Z" />
-    <path
-        android:fillColor="#fff"
-        android:fillType="nonZero"
-        android:pathData="M542.2,496.4c-8.9,-13.1 -16.8,-25.1 -17.5,-26.6c-1.6,-3.3 -3.6,-9.2 -4.4,-13c-2.6,-12.5 -0.9,-25.8 5,-37.5c4.2,-8.3 11.2,-16.3 18.6,-21.3c5,-3.4 6.1,-3.9 12.8,-6.3c23.1,-8.2 47.2,-13.1 73.4,-15c7.5,-0.6 28.5,-0.6 36.3,-0c25.5,1.8 50.6,6.9 73,14.8c6.4,2.2 8.2,3.1 13.1,6.5c9.8,6.6 18.1,17.5 22,29.2c2.2,6.5 2.7,10 2.7,17.9c0,7.9 -0.5,11.3 -2.7,17.9c-2.3,6.8 -3.7,9.1 -20.3,33.6l-16.1,23.8l-0.4,-2.2c-0.2,-1.2 -0.9,-3 -1.4,-4c-1,-1.8 -4.4,-5.6 -4.7,-5.2c-0.1,0.1 -1.2,-0.4 -2.4,-1.1c-9.1,-5.2 -21.9,-10.5 -33.2,-13.9c-37,-11 -77.2,-8.8 -113,6.1c-4.9,2.1 -17.7,8.4 -19.2,9.5c-2.2,1.6 -5.1,6.8 -5.1,9c0,0.4 -0.1,1 -0.3,1.2c0.1,0.2 -6.2,-8.8 -16.2,-23.4Z" />
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="108dp"
+  android:height="108dp"
+  android:viewportWidth="108"
+  android:viewportHeight="108">
+  <path
+    android:fillColor="#fff"
+    android:fillType="nonZero"
+    android:pathData="m52.25,43.55c3.4,3.08 6.15,6.39 7.91,9.5 3.03,-5.55 5.06,-12.14 5.08,-16.34 0,-0.03 0,-0.06 0,-0.08 0,-6.21 -6.06,-8.63 -11.28,-8.63 -5.22,0 -11.28,2.42 -11.28,8.63 0,0.08 0,0.2 0,0.34 2.91,1.32 6.36,3.69 9.56,6.59z" />
+  <path
+    android:fillColor="#fff"
+    android:fillType="nonZero"
+    android:pathData="m33.68,60.5c2.13,-2.42 5.39,-5.05 9.08,-7.27 3.92,-2.36 7.84,-4.01 11.28,-4.76 -4.22,-4.67 -9.72,-8.67 -13.62,-10 -0.03,-0.01 -0.05,-0.02 -0.08,-0.03 -5.78,-1.92 -9.9,3.23 -11.51,8.31 -1.61,5.08 -1.24,11.72 4.54,13.64 0.08,0.03 0.18,0.06 0.31,0.1z" />
+  <path
+    android:fillColor="#fff"
+    android:fillType="nonZero"
+    android:pathData="M79.17,46.67C77.56,41.59 73.44,36.44 67.66,38.36c-0.08,0.03 -0.19,0.06 -0.31,0.1 -0.33,3.24 -1.46,7.33 -3.17,11.34 -1.81,4.27 -4.04,7.96 -6.39,10.64 6.1,1.24 12.85,1.17 16.76,-0.1 0.03,-0.01 0.05,-0.02 0.08,-0.03 5.78,-1.92 6.15,-8.56 4.54,-13.64z" />
+  <path
+    android:fillColor="#fff"
+    android:fillType="nonZero"
+    android:pathData="m48.82,65.46c-0.98,-4.54 -1.3,-8.87 -0.94,-12.45 -5.64,2.67 -11.07,6.78 -13.5,10.16 -0.02,0.02 -0.03,0.05 -0.05,0.07 -3.57,5.03 -0.06,10.63 4.16,13.77 4.22,3.14 10.51,4.83 14.09,-0.2 0.05,-0.07 0.11,-0.16 0.19,-0.27 -1.59,-2.82 -3.03,-6.81 -3.95,-11.08z" />
+  <path
+    android:fillColor="#fff"
+    android:fillType="nonZero"
+    android:pathData="m73.58,62.92c-3.11,0.68 -7.26,0.84 -11.52,0.42 -4.53,-0.45 -8.64,-1.47 -11.86,-2.93 0.73,6.31 2.88,12.87 5.28,16.28 0.02,0.02 0.03,0.05 0.05,0.07 3.57,5.03 9.86,3.34 14.09,0.2 4.22,-3.14 7.74,-8.74 4.16,-13.77 -0.05,-0.07 -0.11,-0.16 -0.19,-0.27z" />
 </vector>

mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
 </adaptive-icon>

mobile/ios/Podfile.lock

@@ -17,9 +17,6 @@ PODS:
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - geolocator_apple (1.2.0):
     - Flutter
   - image_picker_ios (0.0.1):
@@ -39,7 +36,7 @@ PODS:
     - FlutterMacOS
   - path_provider_ios (0.0.1):
     - Flutter
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
     - Flutter
   - photo_manager (2.0.0):
     - Flutter
@@ -53,7 +50,7 @@ PODS:
     - FlutterMacOS
   - sqflite (0.0.3):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - Toast (4.0.0)
   - url_launcher_ios (0.0.1):
     - Flutter
@@ -84,14 +81,13 @@ DEPENDENCIES:
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
   trunk:
-    - FMDB
     - MapLibre
     - ReachabilitySwift
     - SAMKeychain
@@ -139,7 +135,7 @@ EXTERNAL SOURCES:
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
@@ -155,24 +151,23 @@ SPEC CHECKSUMS:
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_udid: a2482c67a61b9c806ef59dd82ed8d007f1b7ac04
   flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d
-  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
   geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
   integration_test: 13825b8a9334a850581300559b8839134b124670
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
   MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef
   maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78
   photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
@@ -180,4 +175,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 64c9b5291666c0ca3caabdfe9865c141ac40321d
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -172,7 +172,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

mobile/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

mobile/lib/modules/home/ui/asset_grid/asset_drag_region.dart

@@ -80,7 +80,6 @@ class _AssetDragRegionState extends State<AssetDragRegion> {
     recognizer.onLongPressMoveUpdate = (details) => _onLongPressMove(details);
     recognizer.onLongPressStart = (details) => _onLongPressStart(details);
     recognizer.onLongPressUp = _onLongPressEnd;
-    recognizer.onLongPressCancel = _onLongPressEnd;
   }
 
   AssetIndex? _getValueKeyAtPositon(Offset position) {

mobile/lib/modules/search/providers/recently_added.provider.dart

@@ -1,13 +1,18 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/db.provider.dart';
+import 'package:immich_mobile/shared/providers/user.provider.dart';
 import 'package:isar/isar.dart';
 
 final recentlyAddedProvider = FutureProvider<List<Asset>>((ref) async {
+  final user = ref.read(currentUserProvider);
+  if (user == null) return [];
+
   return ref
       .watch(dbProvider)
       .assets
       .where()
+      .ownerIdEqualToAnyChecksum(user.isarId)
       .sortByFileCreatedAtDesc()
       .findAll();
 });

server/Dockerfile

@@ -46,6 +46,17 @@ WORKDIR /usr/src/app
 ENV NODE_ENV=production \
     NVIDIA_DRIVER_CAPABILITIES=all \
     NVIDIA_VISIBLE_DEVICES=all
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -yqq curl unzip && \
+    curl -fsSL https://bun.sh/install | bash && \
+    apt-get purge -yqq curl unzip && \
+    apt-get autoremove -yqq && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV PATH="${PATH}:~/.bun/bin"
+
 COPY --from=prod /usr/src/app/node_modules ./node_modules
 COPY --from=prod /usr/src/app/dist ./dist
 COPY --from=prod /usr/src/app/bin ./bin

server/bin/immich

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-node /usr/src/app/node_modules/.bin/immich "$@"

server/package-lock.json

@@ -10,7 +10,6 @@
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@babel/runtime": "^7.22.11",
-        "@immich/cli": "^2.0.7",
         "@nestjs/bullmq": "^10.0.1",
         "@nestjs/common": "^10.2.2",
         "@nestjs/config": "^3.0.0",
@@ -1718,20 +1717,6 @@
         "url": "https://opencollective.com/libvips"
       }
     },
-    "node_modules/@immich/cli": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@immich/cli/-/cli-2.1.0.tgz",
-      "integrity": "sha512-3s/8+Js1dAwibzgaRtZ+bsAL9nOtvoEX/qMlOTgbgLf/lT96M88QScqhb+YrU2l3WBugtts6xW76XQTrWGXcmw==",
-      "dependencies": {
-        "lodash-es": "^4.17.21"
-      },
-      "bin": {
-        "immich": "dist/index.js"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
     "node_modules/@ioredis/commands": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz",
@@ -10152,11 +10137,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
     "node_modules/lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -15604,14 +15584,6 @@
       "integrity": "sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==",
       "optional": true
     },
-    "@immich/cli": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@immich/cli/-/cli-2.1.0.tgz",
-      "integrity": "sha512-3s/8+Js1dAwibzgaRtZ+bsAL9nOtvoEX/qMlOTgbgLf/lT96M88QScqhb+YrU2l3WBugtts6xW76XQTrWGXcmw==",
-      "requires": {
-        "lodash-es": "^4.17.21"
-      }
-    },
     "@ioredis/commands": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz",
@@ -21877,11 +21849,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "lodash-es": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
-      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
-    },
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",

server/package.json

@@ -34,7 +34,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.11",
-    "@immich/cli": "^2.0.7",
     "@nestjs/bullmq": "^10.0.1",
     "@nestjs/common": "^10.2.2",
     "@nestjs/config": "^3.0.0",

server/src/app.module.ts

@@ -43,9 +43,9 @@ import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
 import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
 import { IAuditRepository } from 'src/interfaces/audit.interface';
-import { ICommunicationRepository } from 'src/interfaces/communication.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IDatabaseRepository } from 'src/interfaces/database.interface';
+import { IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository } from 'src/interfaces/job.interface';
 import { ILibraryRepository } from 'src/interfaces/library.interface';
 import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
@@ -74,9 +74,9 @@ import { AssetStackRepository } from 'src/repositories/asset-stack.repository';
 import { AssetRepositoryV1 } from 'src/repositories/asset-v1.repository';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { AuditRepository } from 'src/repositories/audit.repository';
-import { CommunicationRepository } from 'src/repositories/communication.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
 import { DatabaseRepository } from 'src/repositories/database.repository';
+import { EventRepository } from 'src/repositories/event.repository';
 import { FilesystemProvider } from 'src/repositories/filesystem.provider';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LibraryRepository } from 'src/repositories/library.repository';
@@ -200,9 +200,9 @@ const repositories: Provider[] = [
   { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
   { provide: IAssetStackRepository, useClass: AssetStackRepository },
   { provide: IAuditRepository, useClass: AuditRepository },
-  { provide: ICommunicationRepository, useClass: CommunicationRepository },
   { provide: ICryptoRepository, useClass: CryptoRepository },
   { provide: IDatabaseRepository, useClass: DatabaseRepository },
+  { provide: IEventRepository, useClass: EventRepository },
   { provide: IJobRepository, useClass: JobRepository },
   { provide: ILibraryRepository, useClass: LibraryRepository },
   { provide: IKeyRepository, useClass: ApiKeyRepository },

server/src/constants.ts

@@ -3,6 +3,8 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { Version } from 'src/utils/version';
 
+export const SALT_ROUNDS = 10;
+
 const { version } = JSON.parse(readFileSync('./package.json', 'utf8'));
 export const serverVersion = Version.fromString(version);
 

server/src/controllers/system-config.controller.ts

@@ -1,8 +1,6 @@
 import { Body, Controller, Get, Put, Query } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { MapThemeDto } from 'src/dtos/system-config-map-theme.dto';
-import { SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config-storage-template.dto';
-import { SystemConfigDto } from 'src/dtos/system-config.dto';
+import { MapThemeDto, SystemConfigDto, SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config.dto';
 import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
 import { SystemConfigService } from 'src/services/system-config.service';
 

server/src/cores/user.core.ts

@@ -1,5 +1,6 @@
 import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import sanitize from 'sanitize-filename';
+import { SALT_ROUNDS } from 'src/constants';
 import { UserResponseDto } from 'src/dtos/user.dto';
 import { LibraryType } from 'src/entities/library.entity';
 import { UserEntity } from 'src/entities/user.entity';
@@ -7,8 +8,6 @@ import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { ILibraryRepository } from 'src/interfaces/library.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 
-const SALT_ROUNDS = 10;
-
 let instance: UserCore | null;
 
 export class UserCore {

server/src/decorators.ts

@@ -1,7 +1,8 @@
 import { SetMetadata } from '@nestjs/common';
-import { OnEvent, OnEventType } from '@nestjs/event-emitter';
+import { OnEvent } from '@nestjs/event-emitter';
 import { OnEventOptions } from '@nestjs/event-emitter/dist/interfaces';
 import _ from 'lodash';
+import { ServerAsyncEvent, ServerEvent } from 'src/interfaces/event.interface';
 import { setUnion } from 'src/utils/set';
 
 // PostgreSQL uses a 16-bit integer to indicate the number of bound parameters. This means that the
@@ -125,5 +126,5 @@ export interface GenerateSqlQueries {
 /** Decorator to enable versioning/tracking of generated Sql */
 export const GenerateSql = (...options: GenerateSqlQueries[]) => SetMetadata(GENERATE_SQL_KEY, options);
 
-export const OnEventInternal = (event: OnEventType, options?: OnEventOptions) =>
+export const OnServerEvent = (event: ServerEvent | ServerAsyncEvent, options?: OnEventOptions) =>
   OnEvent(event, { suppressErrors: false, ...options });

server/src/dtos/server-info.dto.ts

@@ -1,7 +1,7 @@
 import { ApiProperty, ApiResponseProperty } from '@nestjs/swagger';
 import type { DateTime } from 'luxon';
 import { FeatureFlags } from 'src/cores/system-config.core';
-import { SystemConfigThemeDto } from 'src/dtos/system-config-theme.dto';
+import { SystemConfigThemeDto } from 'src/dtos/system-config.dto';
 import { IVersion, VersionType } from 'src/utils/version';
 
 export class ServerPingResponse {

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

@@ -1,103 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsEnum, IsInt, IsString, Max, Min } from 'class-validator';
-import {
-  AudioCodec,
-  CQMode,
-  ToneMapping,
-  TranscodeHWAccel,
-  TranscodePolicy,
-  VideoCodec,
-} from 'src/entities/system-config.entity';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigFFmpegDto {
-  @IsInt()
-  @Min(0)
-  @Max(51)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  crf!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  threads!: number;
-
-  @IsString()
-  preset!: string;
-
-  @IsEnum(VideoCodec)
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec })
-  targetVideoCodec!: VideoCodec;
-
-  @IsEnum(VideoCodec, { each: true })
-  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec, isArray: true })
-  acceptedVideoCodecs!: VideoCodec[];
-
-  @IsEnum(AudioCodec)
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec })
-  targetAudioCodec!: AudioCodec;
-
-  @IsEnum(AudioCodec, { each: true })
-  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec, isArray: true })
-  acceptedAudioCodecs!: AudioCodec[];
-
-  @IsString()
-  targetResolution!: string;
-
-  @IsString()
-  maxBitrate!: string;
-
-  @IsInt()
-  @Min(-1)
-  @Max(16)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  bframes!: number;
-
-  @IsInt()
-  @Min(0)
-  @Max(6)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  refs!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  gopSize!: number;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  npl!: number;
-
-  @ValidateBoolean()
-  temporalAQ!: boolean;
-
-  @IsEnum(CQMode)
-  @ApiProperty({ enumName: 'CQMode', enum: CQMode })
-  cqMode!: CQMode;
-
-  @ValidateBoolean()
-  twoPass!: boolean;
-
-  @IsString()
-  preferredHwDevice!: string;
-
-  @IsEnum(TranscodePolicy)
-  @ApiProperty({ enumName: 'TranscodePolicy', enum: TranscodePolicy })
-  transcode!: TranscodePolicy;
-
-  @IsEnum(TranscodeHWAccel)
-  @ApiProperty({ enumName: 'TranscodeHWAccel', enum: TranscodeHWAccel })
-  accel!: TranscodeHWAccel;
-
-  @IsEnum(ToneMapping)
-  @ApiProperty({ enumName: 'ToneMapping', enum: ToneMapping })
-  tonemap!: ToneMapping;
-}

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

@@ -1,73 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, IsObject, IsPositive, ValidateNested } from 'class-validator';
-import { ConcurrentQueueName, QueueName } from 'src/interfaces/job.interface';
-
-export class JobSettingsDto {
-  @IsInt()
-  @IsPositive()
-  @ApiProperty({ type: 'integer' })
-  concurrency!: number;
-}
-
-export class SystemConfigJobDto implements Record<ConcurrentQueueName, JobSettingsDto> {
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.THUMBNAIL_GENERATION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.METADATA_EXTRACTION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.VIDEO_CONVERSION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SMART_SEARCH]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.MIGRATION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.BACKGROUND_TASK]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SEARCH]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.FACE_DETECTION]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.SIDECAR]!: JobSettingsDto;
-
-  @ApiProperty({ type: JobSettingsDto })
-  @ValidateNested()
-  @IsObject()
-  @Type(() => JobSettingsDto)
-  [QueueName.LIBRARY]!: JobSettingsDto;
-}

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

@@ -1,49 +0,0 @@
-import { Type } from 'class-transformer';
-import {
-  IsNotEmpty,
-  IsObject,
-  IsString,
-  Validate,
-  ValidateIf,
-  ValidateNested,
-  ValidatorConstraint,
-  ValidatorConstraintInterface,
-} from 'class-validator';
-import { ValidateBoolean, validateCronExpression } from 'src/validation';
-
-const isEnabled = (config: SystemConfigLibraryScanDto) => config.enabled;
-
-@ValidatorConstraint({ name: 'cronValidator' })
-class CronValidator implements ValidatorConstraintInterface {
-  validate(expression: string): boolean {
-    return validateCronExpression(expression);
-  }
-}
-
-export class SystemConfigLibraryScanDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @Validate(CronValidator, { message: 'Invalid cron expression' })
-  @IsString()
-  cronExpression!: string;
-}
-
-export class SystemConfigLibraryWatchDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}
-
-export class SystemConfigLibraryDto {
-  @Type(() => SystemConfigLibraryScanDto)
-  @ValidateNested()
-  @IsObject()
-  scan!: SystemConfigLibraryScanDto;
-
-  @Type(() => SystemConfigLibraryWatchDto)
-  @ValidateNested()
-  @IsObject()
-  watch!: SystemConfigLibraryWatchDto;
-}

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

@@ -1,13 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-import { LogLevel } from 'src/entities/system-config.entity';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigLoggingDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ApiProperty({ enum: LogLevel, enumName: 'LogLevel' })
-  @IsEnum(LogLevel)
-  level!: LogLevel;
-}

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

@@ -1,23 +0,0 @@
-import { Type } from 'class-transformer';
-import { IsObject, IsUrl, ValidateIf, ValidateNested } from 'class-validator';
-import { CLIPConfig, RecognitionConfig } from 'src/dtos/model-config.dto';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigMachineLearningDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsUrl({ require_tld: false, allow_underscores: true })
-  @ValidateIf((dto) => dto.enabled)
-  url!: string;
-
-  @Type(() => CLIPConfig)
-  @ValidateNested()
-  @IsObject()
-  clip!: CLIPConfig;
-
-  @Type(() => RecognitionConfig)
-  @ValidateNested()
-  @IsObject()
-  facialRecognition!: RecognitionConfig;
-}

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

@@ -1,13 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsEnum } from 'class-validator';
-
-export enum MapTheme {
-  LIGHT = 'light',
-  DARK = 'dark',
-}
-
-export class MapThemeDto {
-  @IsEnum(MapTheme)
-  @ApiProperty({ enum: MapTheme, enumName: 'MapTheme' })
-  theme!: MapTheme;
-}

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

@@ -1,13 +0,0 @@
-import { IsString } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigMapDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsString()
-  lightStyle!: string;
-
-  @IsString()
-  darkStyle!: string;
-}

server/src/dtos/system-config-new-version-check.dto.ts

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigNewVersionCheckDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

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

@@ -1,58 +0,0 @@
-import { IsNotEmpty, IsNumber, IsString, IsUrl, Min, ValidateIf } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-const isEnabled = (config: SystemConfigOAuthDto) => config.enabled;
-const isOverrideEnabled = (config: SystemConfigOAuthDto) => config.mobileOverrideEnabled;
-
-export class SystemConfigOAuthDto {
-  @ValidateBoolean()
-  autoLaunch!: boolean;
-
-  @ValidateBoolean()
-  autoRegister!: boolean;
-
-  @IsString()
-  buttonText!: string;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  clientId!: string;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  clientSecret!: string;
-
-  @IsNumber()
-  @Min(0)
-  defaultStorageQuota!: number;
-
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateIf(isEnabled)
-  @IsNotEmpty()
-  @IsString()
-  issuerUrl!: string;
-
-  @ValidateBoolean()
-  mobileOverrideEnabled!: boolean;
-
-  @ValidateIf(isOverrideEnabled)
-  @IsUrl()
-  mobileRedirectUri!: string;
-
-  @IsString()
-  scope!: string;
-
-  @IsString()
-  @IsNotEmpty()
-  signingAlgorithm!: string;
-
-  @IsString()
-  storageLabelClaim!: string;
-
-  @IsString()
-  storageQuotaClaim!: string;
-}

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

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigPasswordLoginDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

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

@@ -1,6 +0,0 @@
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigReverseGeocodingDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-}

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

@@ -1,9 +0,0 @@
-import { IsString } from 'class-validator';
-
-export class SystemConfigServerDto {
-  @IsString()
-  externalDomain!: string;
-
-  @IsString()
-  loginPageMessage!: string;
-}

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

@@ -1,25 +0,0 @@
-import { IsNotEmpty, IsString } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigStorageTemplateDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @ValidateBoolean()
-  hashVerificationEnabled!: boolean;
-
-  @IsNotEmpty()
-  @IsString()
-  template!: string;
-}
-
-export class SystemConfigTemplateStorageOptionDto {
-  yearOptions!: string[];
-  monthOptions!: string[];
-  weekOptions!: string[];
-  dayOptions!: string[];
-  hourOptions!: string[];
-  minuteOptions!: string[];
-  secondOptions!: string[];
-  presetOptions!: string[];
-}

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

@@ -1,6 +0,0 @@
-import { IsString } from 'class-validator';
-
-export class SystemConfigThemeDto {
-  @IsString()
-  customCss!: string;
-}

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

@@ -1,29 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsEnum, IsInt, Max, Min } from 'class-validator';
-import { Colorspace } from 'src/entities/system-config.entity';
-
-export class SystemConfigThumbnailDto {
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  webpSize!: number;
-
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  jpegSize!: number;
-
-  @IsInt()
-  @Min(1)
-  @Max(100)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  quality!: number;
-
-  @IsEnum(Colorspace)
-  @ApiProperty({ enumName: 'Colorspace', enum: Colorspace })
-  colorspace!: Colorspace;
-}

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

@@ -1,15 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, Min } from 'class-validator';
-import { ValidateBoolean } from 'src/validation';
-
-export class SystemConfigTrashDto {
-  @ValidateBoolean()
-  enabled!: boolean;
-
-  @IsInt()
-  @Min(0)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  days!: number;
-}

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

@@ -1,11 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { Type } from 'class-transformer';
-import { IsInt, Min } from 'class-validator';
-
-export class SystemConfigUserDto {
-  @IsInt()
-  @Min(1)
-  @Type(() => Number)
-  @ApiProperty({ type: 'integer' })
-  deleteDelay!: number;
-}

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

@@ -1,22 +1,433 @@
+import { ApiProperty } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { IsObject, ValidateNested } from 'class-validator';
-import { SystemConfigFFmpegDto } from 'src/dtos/system-config-ffmpeg.dto';
-import { SystemConfigJobDto } from 'src/dtos/system-config-job.dto';
-import { SystemConfigLibraryDto } from 'src/dtos/system-config-library.dto';
-import { SystemConfigLoggingDto } from 'src/dtos/system-config-logging.dto';
-import { SystemConfigMachineLearningDto } from 'src/dtos/system-config-machine-learning.dto';
-import { SystemConfigMapDto } from 'src/dtos/system-config-map.dto';
-import { SystemConfigNewVersionCheckDto } from 'src/dtos/system-config-new-version-check.dto';
-import { SystemConfigOAuthDto } from 'src/dtos/system-config-oauth.dto';
-import { SystemConfigPasswordLoginDto } from 'src/dtos/system-config-password-login.dto';
-import { SystemConfigReverseGeocodingDto } from 'src/dtos/system-config-reverse-geocoding.dto';
-import { SystemConfigServerDto } from 'src/dtos/system-config-server.dto';
-import { SystemConfigStorageTemplateDto } from 'src/dtos/system-config-storage-template.dto';
-import { SystemConfigThemeDto } from 'src/dtos/system-config-theme.dto';
-import { SystemConfigThumbnailDto } from 'src/dtos/system-config-thumbnail.dto';
-import { SystemConfigTrashDto } from 'src/dtos/system-config-trash.dto';
-import { SystemConfigUserDto } from 'src/dtos/system-config-user.dto';
-import { SystemConfig } from 'src/entities/system-config.entity';
+import {
+  IsEnum,
+  IsInt,
+  IsNotEmpty,
+  IsNumber,
+  IsObject,
+  IsPositive,
+  IsString,
+  IsUrl,
+  Max,
+  Min,
+  Validate,
+  ValidateIf,
+  ValidateNested,
+  ValidatorConstraint,
+  ValidatorConstraintInterface,
+} from 'class-validator';
+import { CLIPConfig, RecognitionConfig } from 'src/dtos/model-config.dto';
+import {
+  AudioCodec,
+  CQMode,
+  Colorspace,
+  LogLevel,
+  SystemConfig,
+  ToneMapping,
+  TranscodeHWAccel,
+  TranscodePolicy,
+  VideoCodec,
+} from 'src/entities/system-config.entity';
+import { ConcurrentQueueName, QueueName } from 'src/interfaces/job.interface';
+import { ValidateBoolean, validateCronExpression } from 'src/validation';
+
+@ValidatorConstraint({ name: 'cronValidator' })
+class CronValidator implements ValidatorConstraintInterface {
+  validate(expression: string): boolean {
+    return validateCronExpression(expression);
+  }
+}
+
+const isLibraryScanEnabled = (config: SystemConfigLibraryScanDto) => config.enabled;
+const isOAuthEnabled = (config: SystemConfigOAuthDto) => config.enabled;
+const isOAuthOverrideEnabled = (config: SystemConfigOAuthDto) => config.mobileOverrideEnabled;
+
+export class SystemConfigFFmpegDto {
+  @IsInt()
+  @Min(0)
+  @Max(51)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  crf!: number;
+
+  @IsInt()
+  @Min(0)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  threads!: number;
+
+  @IsString()
+  preset!: string;
+
+  @IsEnum(VideoCodec)
+  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec })
+  targetVideoCodec!: VideoCodec;
+
+  @IsEnum(VideoCodec, { each: true })
+  @ApiProperty({ enumName: 'VideoCodec', enum: VideoCodec, isArray: true })
+  acceptedVideoCodecs!: VideoCodec[];
+
+  @IsEnum(AudioCodec)
+  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec })
+  targetAudioCodec!: AudioCodec;
+
+  @IsEnum(AudioCodec, { each: true })
+  @ApiProperty({ enumName: 'AudioCodec', enum: AudioCodec, isArray: true })
+  acceptedAudioCodecs!: AudioCodec[];
+
+  @IsString()
+  targetResolution!: string;
+
+  @IsString()
+  maxBitrate!: string;
+
+  @IsInt()
+  @Min(-1)
+  @Max(16)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  bframes!: number;
+
+  @IsInt()
+  @Min(0)
+  @Max(6)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  refs!: number;
+
+  @IsInt()
+  @Min(0)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  gopSize!: number;
+
+  @IsInt()
+  @Min(0)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  npl!: number;
+
+  @ValidateBoolean()
+  temporalAQ!: boolean;
+
+  @IsEnum(CQMode)
+  @ApiProperty({ enumName: 'CQMode', enum: CQMode })
+  cqMode!: CQMode;
+
+  @ValidateBoolean()
+  twoPass!: boolean;
+
+  @IsString()
+  preferredHwDevice!: string;
+
+  @IsEnum(TranscodePolicy)
+  @ApiProperty({ enumName: 'TranscodePolicy', enum: TranscodePolicy })
+  transcode!: TranscodePolicy;
+
+  @IsEnum(TranscodeHWAccel)
+  @ApiProperty({ enumName: 'TranscodeHWAccel', enum: TranscodeHWAccel })
+  accel!: TranscodeHWAccel;
+
+  @IsEnum(ToneMapping)
+  @ApiProperty({ enumName: 'ToneMapping', enum: ToneMapping })
+  tonemap!: ToneMapping;
+}
+
+class JobSettingsDto {
+  @IsInt()
+  @IsPositive()
+  @ApiProperty({ type: 'integer' })
+  concurrency!: number;
+}
+
+class SystemConfigJobDto implements Record<ConcurrentQueueName, JobSettingsDto> {
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.THUMBNAIL_GENERATION]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.METADATA_EXTRACTION]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.VIDEO_CONVERSION]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.SMART_SEARCH]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.MIGRATION]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.BACKGROUND_TASK]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.SEARCH]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.FACE_DETECTION]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.SIDECAR]!: JobSettingsDto;
+
+  @ApiProperty({ type: JobSettingsDto })
+  @ValidateNested()
+  @IsObject()
+  @Type(() => JobSettingsDto)
+  [QueueName.LIBRARY]!: JobSettingsDto;
+}
+
+class SystemConfigLibraryScanDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @ValidateIf(isLibraryScanEnabled)
+  @IsNotEmpty()
+  @Validate(CronValidator, { message: 'Invalid cron expression' })
+  @IsString()
+  cronExpression!: string;
+}
+
+class SystemConfigLibraryWatchDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+}
+
+class SystemConfigLibraryDto {
+  @Type(() => SystemConfigLibraryScanDto)
+  @ValidateNested()
+  @IsObject()
+  scan!: SystemConfigLibraryScanDto;
+
+  @Type(() => SystemConfigLibraryWatchDto)
+  @ValidateNested()
+  @IsObject()
+  watch!: SystemConfigLibraryWatchDto;
+}
+
+class SystemConfigLoggingDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @ApiProperty({ enum: LogLevel, enumName: 'LogLevel' })
+  @IsEnum(LogLevel)
+  level!: LogLevel;
+}
+
+class SystemConfigMachineLearningDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @IsUrl({ require_tld: false, allow_underscores: true })
+  @ValidateIf((dto) => dto.enabled)
+  url!: string;
+
+  @Type(() => CLIPConfig)
+  @ValidateNested()
+  @IsObject()
+  clip!: CLIPConfig;
+
+  @Type(() => RecognitionConfig)
+  @ValidateNested()
+  @IsObject()
+  facialRecognition!: RecognitionConfig;
+}
+
+enum MapTheme {
+  LIGHT = 'light',
+  DARK = 'dark',
+}
+
+export class MapThemeDto {
+  @IsEnum(MapTheme)
+  @ApiProperty({ enum: MapTheme, enumName: 'MapTheme' })
+  theme!: MapTheme;
+}
+
+class SystemConfigMapDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @IsString()
+  lightStyle!: string;
+
+  @IsString()
+  darkStyle!: string;
+}
+
+class SystemConfigNewVersionCheckDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+}
+
+class SystemConfigOAuthDto {
+  @ValidateBoolean()
+  autoLaunch!: boolean;
+
+  @ValidateBoolean()
+  autoRegister!: boolean;
+
+  @IsString()
+  buttonText!: string;
+
+  @ValidateIf(isOAuthEnabled)
+  @IsNotEmpty()
+  @IsString()
+  clientId!: string;
+
+  @ValidateIf(isOAuthEnabled)
+  @IsNotEmpty()
+  @IsString()
+  clientSecret!: string;
+
+  @IsNumber()
+  @Min(0)
+  defaultStorageQuota!: number;
+
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @ValidateIf(isOAuthEnabled)
+  @IsNotEmpty()
+  @IsString()
+  issuerUrl!: string;
+
+  @ValidateBoolean()
+  mobileOverrideEnabled!: boolean;
+
+  @ValidateIf(isOAuthOverrideEnabled)
+  @IsUrl()
+  mobileRedirectUri!: string;
+
+  @IsString()
+  scope!: string;
+
+  @IsString()
+  @IsNotEmpty()
+  signingAlgorithm!: string;
+
+  @IsString()
+  storageLabelClaim!: string;
+
+  @IsString()
+  storageQuotaClaim!: string;
+}
+
+class SystemConfigPasswordLoginDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+}
+
+class SystemConfigReverseGeocodingDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+}
+
+class SystemConfigServerDto {
+  @IsString()
+  externalDomain!: string;
+
+  @IsString()
+  loginPageMessage!: string;
+}
+
+class SystemConfigStorageTemplateDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @ValidateBoolean()
+  hashVerificationEnabled!: boolean;
+
+  @IsNotEmpty()
+  @IsString()
+  template!: string;
+}
+
+export class SystemConfigTemplateStorageOptionDto {
+  yearOptions!: string[];
+  monthOptions!: string[];
+  weekOptions!: string[];
+  dayOptions!: string[];
+  hourOptions!: string[];
+  minuteOptions!: string[];
+  secondOptions!: string[];
+  presetOptions!: string[];
+}
+
+export class SystemConfigThemeDto {
+  @IsString()
+  customCss!: string;
+}
+
+class SystemConfigThumbnailDto {
+  @IsInt()
+  @Min(1)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  webpSize!: number;
+
+  @IsInt()
+  @Min(1)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  jpegSize!: number;
+
+  @IsInt()
+  @Min(1)
+  @Max(100)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  quality!: number;
+
+  @IsEnum(Colorspace)
+  @ApiProperty({ enumName: 'Colorspace', enum: Colorspace })
+  colorspace!: Colorspace;
+}
+
+class SystemConfigTrashDto {
+  @ValidateBoolean()
+  enabled!: boolean;
+
+  @IsInt()
+  @Min(0)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  days!: number;
+}
+
+class SystemConfigUserDto {
+  @IsInt()
+  @Min(1)
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer' })
+  deleteDelay!: number;
+}
 
 export class SystemConfigDto implements SystemConfig {
   @Type(() => SystemConfigFFmpegDto)

server/src/interfaces/asset.interface.ts

@@ -139,7 +139,6 @@ export const IAssetRepository = 'IAssetRepository';
 
 export interface IAssetRepository {
   create(asset: AssetCreate): Promise<AssetEntity>;
-  getByDate(ownerId: string, date: Date): Promise<AssetEntity[]>;
   getByIds(
     ids: string[],
     relations?: FindOptionsRelations<AssetEntity>,

server/src/interfaces/crypto.interface.ts

@@ -8,4 +8,5 @@ export interface ICryptoRepository {
   hashSha1(data: string | Buffer): Buffer;
   hashBcrypt(data: string | Buffer, saltOrRounds: string | number): Promise<string>;
   compareBcrypt(data: string | Buffer, encrypted: string): boolean;
+  newPassword(bytes: number): string;
 }

server/src/interfaces/event.interface.ts

@@ -2,7 +2,7 @@ import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { ReleaseNotification, ServerVersionResponseDto } from 'src/dtos/server-info.dto';
 import { SystemConfig } from 'src/entities/system-config.entity';
 
-export const ICommunicationRepository = 'ICommunicationRepository';
+export const IEventRepository = 'IEventRepository';
 
 export enum ClientEvent {
   UPLOAD_SUCCESS = 'on_upload_success',
@@ -19,18 +19,6 @@ export enum ClientEvent {
   NEW_RELEASE = 'on_new_release',
 }
 
-export enum ServerEvent {
-  CONFIG_UPDATE = 'config:update',
-}
-
-export enum InternalEvent {
-  VALIDATE_CONFIG = 'validate_config',
-}
-
-export interface InternalEventMap {
-  [InternalEvent.VALIDATE_CONFIG]: { newConfig: SystemConfig; oldConfig: SystemConfig };
-}
-
 export interface ClientEventMap {
   [ClientEvent.UPLOAD_SUCCESS]: AssetResponseDto;
   [ClientEvent.USER_DELETE]: string;
@@ -46,15 +34,39 @@ export interface ClientEventMap {
   [ClientEvent.NEW_RELEASE]: ReleaseNotification;
 }
 
-export type OnConnectCallback = (userId: string) => void | Promise<void>;
-export type OnServerEventCallback = () => Promise<void>;
-
-export interface ICommunicationRepository {
-  send<E extends keyof ClientEventMap>(event: E, userId: string, data: ClientEventMap[E]): void;
-  broadcast<E extends keyof ClientEventMap>(event: E, data: ClientEventMap[E]): void;
-  on(event: 'connect', callback: OnConnectCallback): void;
-  on(event: ServerEvent, callback: OnServerEventCallback): void;
-  sendServerEvent(event: ServerEvent): void;
-  emit<E extends keyof InternalEventMap>(event: E, data: InternalEventMap[E]): boolean;
-  emitAsync<E extends keyof InternalEventMap>(event: E, data: InternalEventMap[E]): Promise<any>;
+export enum ServerEvent {
+  CONFIG_UPDATE = 'config.update',
+  WEBSOCKET_CONNECT = 'websocket.connect',
+}
+
+export interface ServerEventMap {
+  [ServerEvent.CONFIG_UPDATE]: null;
+  [ServerEvent.WEBSOCKET_CONNECT]: { userId: string };
+}
+
+export enum ServerAsyncEvent {
+  CONFIG_VALIDATE = 'config.validate',
+}
+
+export interface ServerAsyncEventMap {
+  [ServerAsyncEvent.CONFIG_VALIDATE]: { newConfig: SystemConfig; oldConfig: SystemConfig };
+}
+
+export interface IEventRepository {
+  /**
+   * Send to connected clients for a specific user
+   */
+  clientSend<E extends keyof ClientEventMap>(event: E, userId: string, data: ClientEventMap[E]): void;
+  /**
+   * Send to all connected clients
+   */
+  clientBroadcast<E extends keyof ClientEventMap>(event: E, data: ClientEventMap[E]): void;
+  /**
+   * Notify listeners in this and connected processes. Subscribe to an event with `@OnServerEvent`
+   */
+  serverSend<E extends keyof ServerEventMap>(event: E, data: ServerEventMap[E]): boolean;
+  /**
+   * Notify and wait for responses from listeners in this process. Subscribe to an event with `@OnServerEvent`
+   */
+  serverSendAsync<E extends keyof ServerAsyncEventMap>(event: E, data: ServerAsyncEventMap[E]): Promise<any>;
 }

server/src/interfaces/search.interface.ts

@@ -1,7 +1,6 @@
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { GeodataPlacesEntity } from 'src/entities/geodata-places.entity';
-import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { Paginated } from 'src/utils/pagination';
 
 export const ISearchRepository = 'ISearchRepository';
@@ -188,7 +187,7 @@ export interface ISearchRepository {
   searchMetadata(pagination: SearchPaginationOptions, options: AssetSearchOptions): Paginated<AssetEntity>;
   searchSmart(pagination: SearchPaginationOptions, options: SmartSearchOptions): Paginated<AssetEntity>;
   searchFaces(search: FaceEmbeddingSearch): Promise<FaceSearchResult[]>;
-  upsert(smartInfo: Partial<SmartInfoEntity>, embedding?: Embedding): Promise<void>;
+  upsert(assetId: string, embedding: number[]): Promise<void>;
   searchPlaces(placeName: string): Promise<GeodataPlacesEntity[]>;
   getAssetsByCity(userIds: string[]): Promise<AssetEntity[]>;
   deleteAllSearchEmbeddings(): Promise<void>;

server/src/queries/asset.repository.sql

@@ -1,81 +1,5 @@
 -- NOTE: This file is auto generated by ./sql-generator
 
--- AssetRepository.getByDate
-SELECT
-  "AssetEntity"."id" AS "AssetEntity_id",
-  "AssetEntity"."deviceAssetId" AS "AssetEntity_deviceAssetId",
-  "AssetEntity"."ownerId" AS "AssetEntity_ownerId",
-  "AssetEntity"."libraryId" AS "AssetEntity_libraryId",
-  "AssetEntity"."deviceId" AS "AssetEntity_deviceId",
-  "AssetEntity"."type" AS "AssetEntity_type",
-  "AssetEntity"."originalPath" AS "AssetEntity_originalPath",
-  "AssetEntity"."resizePath" AS "AssetEntity_resizePath",
-  "AssetEntity"."webpPath" AS "AssetEntity_webpPath",
-  "AssetEntity"."thumbhash" AS "AssetEntity_thumbhash",
-  "AssetEntity"."encodedVideoPath" AS "AssetEntity_encodedVideoPath",
-  "AssetEntity"."createdAt" AS "AssetEntity_createdAt",
-  "AssetEntity"."updatedAt" AS "AssetEntity_updatedAt",
-  "AssetEntity"."deletedAt" AS "AssetEntity_deletedAt",
-  "AssetEntity"."fileCreatedAt" AS "AssetEntity_fileCreatedAt",
-  "AssetEntity"."localDateTime" AS "AssetEntity_localDateTime",
-  "AssetEntity"."fileModifiedAt" AS "AssetEntity_fileModifiedAt",
-  "AssetEntity"."isFavorite" AS "AssetEntity_isFavorite",
-  "AssetEntity"."isArchived" AS "AssetEntity_isArchived",
-  "AssetEntity"."isExternal" AS "AssetEntity_isExternal",
-  "AssetEntity"."isReadOnly" AS "AssetEntity_isReadOnly",
-  "AssetEntity"."isOffline" AS "AssetEntity_isOffline",
-  "AssetEntity"."checksum" AS "AssetEntity_checksum",
-  "AssetEntity"."duration" AS "AssetEntity_duration",
-  "AssetEntity"."isVisible" AS "AssetEntity_isVisible",
-  "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
-  "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
-  "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-  "AssetEntity"."stackId" AS "AssetEntity_stackId",
-  "AssetEntity__AssetEntity_exifInfo"."assetId" AS "AssetEntity__AssetEntity_exifInfo_assetId",
-  "AssetEntity__AssetEntity_exifInfo"."description" AS "AssetEntity__AssetEntity_exifInfo_description",
-  "AssetEntity__AssetEntity_exifInfo"."exifImageWidth" AS "AssetEntity__AssetEntity_exifInfo_exifImageWidth",
-  "AssetEntity__AssetEntity_exifInfo"."exifImageHeight" AS "AssetEntity__AssetEntity_exifInfo_exifImageHeight",
-  "AssetEntity__AssetEntity_exifInfo"."fileSizeInByte" AS "AssetEntity__AssetEntity_exifInfo_fileSizeInByte",
-  "AssetEntity__AssetEntity_exifInfo"."orientation" AS "AssetEntity__AssetEntity_exifInfo_orientation",
-  "AssetEntity__AssetEntity_exifInfo"."dateTimeOriginal" AS "AssetEntity__AssetEntity_exifInfo_dateTimeOriginal",
-  "AssetEntity__AssetEntity_exifInfo"."modifyDate" AS "AssetEntity__AssetEntity_exifInfo_modifyDate",
-  "AssetEntity__AssetEntity_exifInfo"."timeZone" AS "AssetEntity__AssetEntity_exifInfo_timeZone",
-  "AssetEntity__AssetEntity_exifInfo"."latitude" AS "AssetEntity__AssetEntity_exifInfo_latitude",
-  "AssetEntity__AssetEntity_exifInfo"."longitude" AS "AssetEntity__AssetEntity_exifInfo_longitude",
-  "AssetEntity__AssetEntity_exifInfo"."projectionType" AS "AssetEntity__AssetEntity_exifInfo_projectionType",
-  "AssetEntity__AssetEntity_exifInfo"."city" AS "AssetEntity__AssetEntity_exifInfo_city",
-  "AssetEntity__AssetEntity_exifInfo"."livePhotoCID" AS "AssetEntity__AssetEntity_exifInfo_livePhotoCID",
-  "AssetEntity__AssetEntity_exifInfo"."autoStackId" AS "AssetEntity__AssetEntity_exifInfo_autoStackId",
-  "AssetEntity__AssetEntity_exifInfo"."state" AS "AssetEntity__AssetEntity_exifInfo_state",
-  "AssetEntity__AssetEntity_exifInfo"."country" AS "AssetEntity__AssetEntity_exifInfo_country",
-  "AssetEntity__AssetEntity_exifInfo"."make" AS "AssetEntity__AssetEntity_exifInfo_make",
-  "AssetEntity__AssetEntity_exifInfo"."model" AS "AssetEntity__AssetEntity_exifInfo_model",
-  "AssetEntity__AssetEntity_exifInfo"."lensModel" AS "AssetEntity__AssetEntity_exifInfo_lensModel",
-  "AssetEntity__AssetEntity_exifInfo"."fNumber" AS "AssetEntity__AssetEntity_exifInfo_fNumber",
-  "AssetEntity__AssetEntity_exifInfo"."focalLength" AS "AssetEntity__AssetEntity_exifInfo_focalLength",
-  "AssetEntity__AssetEntity_exifInfo"."iso" AS "AssetEntity__AssetEntity_exifInfo_iso",
-  "AssetEntity__AssetEntity_exifInfo"."exposureTime" AS "AssetEntity__AssetEntity_exifInfo_exposureTime",
-  "AssetEntity__AssetEntity_exifInfo"."profileDescription" AS "AssetEntity__AssetEntity_exifInfo_profileDescription",
-  "AssetEntity__AssetEntity_exifInfo"."colorspace" AS "AssetEntity__AssetEntity_exifInfo_colorspace",
-  "AssetEntity__AssetEntity_exifInfo"."bitsPerSample" AS "AssetEntity__AssetEntity_exifInfo_bitsPerSample",
-  "AssetEntity__AssetEntity_exifInfo"."fps" AS "AssetEntity__AssetEntity_exifInfo_fps"
-FROM
-  "assets" "AssetEntity"
-  LEFT JOIN "exif" "AssetEntity__AssetEntity_exifInfo" ON "AssetEntity__AssetEntity_exifInfo"."assetId" = "AssetEntity"."id"
-WHERE
-  (
-    (
-      ("AssetEntity"."ownerId" = $1)
-      AND ("AssetEntity"."isVisible" = $2)
-      AND ("AssetEntity"."isArchived" = $3)
-      AND (NOT ("AssetEntity"."resizePath" IS NULL))
-      AND ("AssetEntity"."fileCreatedAt" BETWEEN $4 AND $5)
-    )
-  )
-  AND ("AssetEntity"."deletedAt" IS NULL)
-ORDER BY
-  "AssetEntity"."fileCreatedAt" DESC
-
 -- AssetRepository.getByIds
 SELECT
   "AssetEntity"."id" AS "AssetEntity_id",

server/src/repositories/asset.repository.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { DateTime } from 'luxon';
 import path from 'node:path';
 import { Chunked, ChunkedArray, DummyValue, GenerateSql } from 'src/decorators';
 import { AssetOrder } from 'src/entities/album.entity';
@@ -76,41 +75,6 @@ export class AssetRepository implements IAssetRepository {
     return this.repository.save(asset);
   }
 
-  @GenerateSql({ params: [DummyValue.UUID, DummyValue.DATE] })
-  getByDate(ownerId: string, date: Date): Promise<AssetEntity[]> {
-    // For reference of a correct approach although slower
-
-    // let builder = this.repository
-    //   .createQueryBuilder('asset')
-    //   .leftJoin('asset.exifInfo', 'exifInfo')
-    //   .where('asset.ownerId = :ownerId', { ownerId })
-    //   .andWhere(
-    //     `coalesce(date_trunc('day', asset."fileCreatedAt", "exifInfo"."timeZone") at TIME ZONE "exifInfo"."timeZone", date_trunc('day', asset."fileCreatedAt")) IN (:date)`,
-    //     { date },
-    //   )
-    //   .andWhere('asset.isVisible = true')
-    //   .andWhere('asset.isArchived = false')
-    //   .orderBy('asset.fileCreatedAt', 'DESC');
-
-    // return builder.getMany();
-
-    return this.repository.find({
-      where: {
-        ownerId,
-        isVisible: true,
-        isArchived: false,
-        resizePath: Not(IsNull()),
-        fileCreatedAt: OptionalBetween(date, DateTime.fromJSDate(date).plus({ day: 1 }).toJSDate()),
-      },
-      relations: {
-        exifInfo: true,
-      },
-      order: {
-        fileCreatedAt: 'DESC',
-      },
-    });
-  }
-
   @GenerateSql({ params: [DummyValue.UUID, { day: 1, month: 1 }] })
   getByDayOfYear(ownerIds: string[], { day, month }: MonthDay): Promise<AssetEntity[]> {
     return this.repository

server/src/repositories/crypto.repository.ts

@@ -41,4 +41,8 @@ export class CryptoRepository implements ICryptoRepository {
       stream.on('end', () => resolve(hash.digest()));
     });
   }
+
+  newPassword(bytes: number) {
+    return randomBytes(bytes).toString('base64').replaceAll(/\W/g, '');
+  }
 }

server/src/repositories/event.repository.ts

@@ -8,13 +8,12 @@ import {
 } from '@nestjs/websockets';
 import { Server, Socket } from 'socket.io';
 import {
-  ClientEvent,
-  ICommunicationRepository,
-  InternalEventMap,
-  OnConnectCallback,
-  OnServerEventCallback,
+  ClientEventMap,
+  IEventRepository,
+  ServerAsyncEventMap,
   ServerEvent,
-} from 'src/interfaces/communication.interface';
+  ServerEventMap,
+} from 'src/interfaces/event.interface';
 import { AuthService } from 'src/services/auth.service';
 import { Instrumentation } from 'src/utils/instrumentation';
 import { ImmichLogger } from 'src/utils/logger';
@@ -25,14 +24,8 @@ import { ImmichLogger } from 'src/utils/logger';
   path: '/api/socket.io',
   transports: ['websocket'],
 })
-export class CommunicationRepository
-  implements OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit, ICommunicationRepository
-{
-  private logger = new ImmichLogger(CommunicationRepository.name);
-  private onConnectCallbacks: OnConnectCallback[] = [];
-  private onServerEventCallbacks: Record<ServerEvent, OnServerEventCallback[]> = {
-    [ServerEvent.CONFIG_UPDATE]: [],
-  };
+export class EventRepository implements OnGatewayConnection, OnGatewayDisconnect, OnGatewayInit, IEventRepository {
+  private logger = new ImmichLogger(EventRepository.name);
 
   @WebSocketServer()
   private server?: Server;
@@ -46,38 +39,23 @@ export class CommunicationRepository
     this.logger.log('Initialized websocket server');
 
     for (const event of Object.values(ServerEvent)) {
-      server.on(event, async () => {
+      if (event === ServerEvent.WEBSOCKET_CONNECT) {
+        continue;
+      }
+
+      server.on(event, (data: unknown) => {
         this.logger.debug(`Server event: ${event} (receive)`);
-        const callbacks = this.onServerEventCallbacks[event];
-        for (const callback of callbacks) {
-          await callback();
-        }
+        this.eventEmitter.emit(event, data);
       });
     }
   }
 
-  on(event: 'connect' | ServerEvent, callback: OnConnectCallback | OnServerEventCallback) {
-    switch (event) {
-      case 'connect': {
-        this.onConnectCallbacks.push(callback);
-        break;
-      }
-
-      default: {
-        this.onServerEventCallbacks[event].push(callback as OnServerEventCallback);
-        break;
-      }
-    }
-  }
-
   async handleConnection(client: Socket) {
     try {
       this.logger.log(`Websocket Connect:    ${client.id}`);
       const auth = await this.authService.validate(client.request.headers, {});
       await client.join(auth.user.id);
-      for (const callback of this.onConnectCallbacks) {
-        await callback(auth.user.id);
-      }
+      this.serverSend(ServerEvent.WEBSOCKET_CONNECT, { userId: auth.user.id });
     } catch (error: Error | any) {
       this.logger.error(`Websocket connection error: ${error}`, error?.stack);
       client.emit('error', 'unauthorized');
@@ -90,24 +68,21 @@ export class CommunicationRepository
     await client.leave(client.nsp.name);
   }
 
-  send(event: ClientEvent, userId: string, data: any) {
+  clientSend<E extends keyof ClientEventMap>(event: E, userId: string, data: ClientEventMap[E]) {
     this.server?.to(userId).emit(event, data);
   }
 
-  broadcast(event: ClientEvent, data: any) {
+  clientBroadcast<E extends keyof ClientEventMap>(event: E, data: ClientEventMap[E]) {
     this.server?.emit(event, data);
   }
 
-  sendServerEvent(event: ServerEvent) {
+  serverSend<E extends keyof ServerEventMap>(event: E, data: ServerEventMap[E]) {
     this.logger.debug(`Server event: ${event} (send)`);
-    this.server?.serverSideEmit(event);
-  }
-
-  emit<E extends keyof InternalEventMap>(event: E, data: InternalEventMap[E]): boolean {
+    this.server?.serverSideEmit(event, data);
     return this.eventEmitter.emit(event, data);
   }
 
-  emitAsync<E extends keyof InternalEventMap, R = any[]>(event: E, data: InternalEventMap[E]): Promise<R> {
+  serverSendAsync<E extends keyof ServerAsyncEventMap, R = any[]>(event: E, data: ServerAsyncEventMap[E]): Promise<R> {
     return this.eventEmitter.emitAsync(event, data) as Promise<R>;
   }
 }

server/src/repositories/search.repository.ts

@@ -10,7 +10,6 @@ import { SmartSearchEntity } from 'src/entities/smart-search.entity';
 import { DatabaseExtension } from 'src/interfaces/database.interface';
 import {
   AssetSearchOptions,
-  Embedding,
   FaceEmbeddingSearch,
   FaceSearchResult,
   ISearchRepository,
@@ -247,16 +246,7 @@ export class SearchRepository implements ISearchRepository {
     return items;
   }
 
-  async upsert(smartInfo: Partial<SmartInfoEntity>, embedding?: Embedding): Promise<void> {
-    await this.repository.upsert(smartInfo, { conflictPaths: ['assetId'] });
-    if (!smartInfo.assetId || !embedding) {
-      return;
-    }
-
-    await this.upsertEmbedding(smartInfo.assetId, embedding);
-  }
-
-  private async upsertEmbedding(assetId: string, embedding: number[]): Promise<void> {
+  async upsert(assetId: string, embedding: number[]): Promise<void> {
     await this.smartSearchRepository.upsert(
       { assetId, embedding: () => asVector(embedding, true) },
       { conflictPaths: ['assetId'] },

server/src/services/api-key.service.spec.ts

@@ -27,7 +27,7 @@ describe(APIKeyService.name, () => {
         name: 'Test Key',
         userId: authStub.admin.user.id,
       });
-      expect(cryptoMock.randomBytes).toHaveBeenCalled();
+      expect(cryptoMock.newPassword).toHaveBeenCalled();
       expect(cryptoMock.hashSha256).toHaveBeenCalled();
     });
 
@@ -41,7 +41,7 @@ describe(APIKeyService.name, () => {
         name: 'API Key',
         userId: authStub.admin.user.id,
       });
-      expect(cryptoMock.randomBytes).toHaveBeenCalled();
+      expect(cryptoMock.newPassword).toHaveBeenCalled();
       expect(cryptoMock.hashSha256).toHaveBeenCalled();
     });
   });

server/src/services/api-key.service.ts

@@ -13,7 +13,7 @@ export class APIKeyService {
   ) {}
 
   async create(auth: AuthDto, dto: APIKeyCreateDto): Promise<APIKeyCreateResponseDto> {
-    const secret = this.crypto.randomBytes(32).toString('base64').replaceAll(/\W/g, '');
+    const secret = this.crypto.newPassword(32);
     const entity = await this.repository.create({
       key: this.crypto.hashSha256(secret),
       name: dto.name || 'API Key',

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

@@ -5,7 +5,7 @@ import { AssetJobName, AssetStatsResponseDto, UploadFieldName } from 'src/dtos/a
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
 import { AssetStats, IAssetRepository, TimeBucketSize } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobItem, JobName } from 'src/interfaces/job.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
@@ -20,7 +20,7 @@ import { userStub } from 'test/fixtures/user.stub';
 import { IAccessRepositoryMock, newAccessRepositoryMock } from 'test/repositories/access.repository.mock';
 import { newAssetStackRepositoryMock } from 'test/repositories/asset-stack.repository.mock';
 import { newAssetRepositoryMock } from 'test/repositories/asset.repository.mock';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
 import { newPartnerRepositoryMock } from 'test/repositories/partner.repository.mock';
 import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock';
@@ -152,7 +152,7 @@ describe(AssetService.name, () => {
   let jobMock: jest.Mocked<IJobRepository>;
   let storageMock: jest.Mocked<IStorageRepository>;
   let userMock: jest.Mocked<IUserRepository>;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
   let configMock: jest.Mocked<ISystemConfigRepository>;
   let partnerMock: jest.Mocked<IPartnerRepository>;
   let assetStackMock: jest.Mocked<IAssetStackRepository>;
@@ -164,7 +164,7 @@ describe(AssetService.name, () => {
   beforeEach(() => {
     accessMock = newAccessRepositoryMock();
     assetMock = newAssetRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
+    eventMock = newEventRepositoryMock();
     jobMock = newJobRepositoryMock();
     storageMock = newStorageRepositoryMock();
     userMock = newUserRepositoryMock();
@@ -179,7 +179,7 @@ describe(AssetService.name, () => {
       configMock,
       storageMock,
       userMock,
-      communicationMock,
+      eventMock,
       partnerMock,
       assetStackMock,
     );
@@ -704,7 +704,7 @@ describe(AssetService.name, () => {
         stackParentId: 'parent',
       });
 
-      expect(communicationMock.send).toHaveBeenCalledWith(ClientEvent.ASSET_STACK_UPDATE, authStub.user1.user.id, [
+      expect(eventMock.clientSend).toHaveBeenCalledWith(ClientEvent.ASSET_STACK_UPDATE, authStub.user1.user.id, [
         'asset-1',
         'parent',
       ]);

server/src/services/asset.service.ts

@@ -31,7 +31,7 @@ import { LibraryType } from 'src/entities/library.entity';
 import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
 import { IAssetRepository, TimeBucketOptions } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import {
   IAssetDeletionJob,
   IJobRepository,
@@ -75,7 +75,7 @@ export class AssetService {
     @Inject(ISystemConfigRepository) configRepository: ISystemConfigRepository,
     @Inject(IStorageRepository) private storageRepository: IStorageRepository,
     @Inject(IUserRepository) private userRepository: IUserRepository,
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
     @Inject(IPartnerRepository) private partnerRepository: IPartnerRepository,
     @Inject(IAssetStackRepository) private assetStackRepository: IAssetStackRepository,
   ) {
@@ -395,7 +395,7 @@ export class AssetService {
       .flatMap((stack) => (stack ? [stack] : []))
       .filter((stack) => stack.assets.length < 2);
     await Promise.all(stacksToDelete.map((as) => this.assetStackRepository.delete(as.id)));
-    this.communicationRepository.send(ClientEvent.ASSET_STACK_UPDATE, auth.user.id, ids);
+    this.eventRepository.clientSend(ClientEvent.ASSET_STACK_UPDATE, auth.user.id, ids);
   }
 
   async handleAssetDeletionCheck(): Promise<JobStatus> {
@@ -454,7 +454,7 @@ export class AssetService {
 
     await this.assetRepository.remove(asset);
     await this.userRepository.updateUsage(asset.ownerId, -(asset.exifInfo?.fileSizeInByte || 0));
-    this.communicationRepository.send(ClientEvent.ASSET_DELETE, asset.ownerId, id);
+    this.eventRepository.clientSend(ClientEvent.ASSET_DELETE, asset.ownerId, id);
 
     // TODO refactor this to use cascades
     if (asset.livePhotoVideoId) {
@@ -482,7 +482,7 @@ export class AssetService {
       await this.jobRepository.queueAll(ids.map((id) => ({ name: JobName.ASSET_DELETION, data: { id } })));
     } else {
       await this.assetRepository.softDeleteAll(ids);
-      this.communicationRepository.send(ClientEvent.ASSET_TRASH, auth.user.id, ids);
+      this.eventRepository.clientSend(ClientEvent.ASSET_TRASH, auth.user.id, ids);
     }
   }
 
@@ -513,7 +513,7 @@ export class AssetService {
       primaryAssetId: newParentId,
     });
 
-    this.communicationRepository.send(ClientEvent.ASSET_STACK_UPDATE, auth.user.id, [
+    this.eventRepository.clientSend(ClientEvent.ASSET_STACK_UPDATE, auth.user.id, [
       ...childIds,
       newParentId,
       oldParentId,

server/src/services/auth.service.ts

@@ -146,7 +146,6 @@ export class AuthService {
 
   async adminSignUp(dto: SignUpDto): Promise<UserResponseDto> {
     const adminUser = await this.userRepository.getAdmin();
-
     if (adminUser) {
       throw new BadRequestException('The server already has an admin');
     }
@@ -427,7 +426,7 @@ export class AuthService {
   }
 
   private async createLoginResponse(user: UserEntity, authType: AuthType, loginDetails: LoginDetails) {
-    const key = this.cryptoRepository.randomBytes(32).toString('base64').replaceAll(/\W/g, '');
+    const key = this.cryptoRepository.newPassword(32);
     const token = this.cryptoRepository.hashSha256(key);
 
     await this.userTokenRepository.create({

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

@@ -2,7 +2,7 @@ import { BadRequestException } from '@nestjs/common';
 import { FeatureFlag, SystemConfigCore } from 'src/cores/system-config.core';
 import { SystemConfig, SystemConfigKey } from 'src/entities/system-config.entity';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { IEventRepository } from 'src/interfaces/event.interface';
 import {
   IJobRepository,
   JobCommand,
@@ -17,7 +17,7 @@ import { ISystemConfigRepository } from 'src/interfaces/system-config.interface'
 import { JobService } from 'src/services/job.service';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { newAssetRepositoryMock } from 'test/repositories/asset.repository.mock';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
 import { newPersonRepositoryMock } from 'test/repositories/person.repository.mock';
 import { newSystemConfigRepositoryMock } from 'test/repositories/system-config.repository.mock';
@@ -34,17 +34,17 @@ describe(JobService.name, () => {
   let sut: JobService;
   let assetMock: jest.Mocked<IAssetRepository>;
   let configMock: jest.Mocked<ISystemConfigRepository>;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
   let jobMock: jest.Mocked<IJobRepository>;
   let personMock: jest.Mocked<IPersonRepository>;
 
   beforeEach(() => {
     assetMock = newAssetRepositoryMock();
     configMock = newSystemConfigRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
+    eventMock = newEventRepositoryMock();
     jobMock = newJobRepositoryMock();
     personMock = newPersonRepositoryMock();
-    sut = new JobService(assetMock, communicationMock, jobMock, configMock, personMock);
+    sut = new JobService(assetMock, eventMock, jobMock, configMock, personMock);
   });
 
   it('should work', () => {

server/src/services/job.service.ts

@@ -4,7 +4,7 @@ import { mapAsset } from 'src/dtos/asset-response.dto';
 import { AllJobStatusResponseDto, JobCommandDto, JobStatusDto } from 'src/dtos/job.dto';
 import { AssetType } from 'src/entities/asset.entity';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import {
   ConcurrentQueueName,
   IJobRepository,
@@ -27,7 +27,7 @@ export class JobService {
 
   constructor(
     @Inject(IAssetRepository) private assetRepository: IAssetRepository,
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
     @Inject(ISystemConfigRepository) configRepository: ISystemConfigRepository,
     @Inject(IPersonRepository) private personRepository: IPersonRepository,
@@ -219,7 +219,7 @@ export class JobService {
         if (item.data.source === 'sidecar-write') {
           const [asset] = await this.assetRepository.getByIdsWithAllRelations([item.data.id]);
           if (asset) {
-            this.communicationRepository.send(ClientEvent.ASSET_UPDATE, asset.ownerId, mapAsset(asset));
+            this.eventRepository.clientSend(ClientEvent.ASSET_UPDATE, asset.ownerId, mapAsset(asset));
           }
         }
         await this.jobRepository.queue({ name: JobName.LINK_LIVE_PHOTOS, data: item.data });
@@ -242,7 +242,7 @@ export class JobService {
         const { id } = item.data;
         const person = await this.personRepository.getById(id);
         if (person) {
-          this.communicationRepository.send(ClientEvent.PERSON_THUMBNAIL, person.ownerId, person.id);
+          this.eventRepository.clientSend(ClientEvent.PERSON_THUMBNAIL, person.ownerId, person.id);
         }
         break;
       }
@@ -279,13 +279,13 @@ export class JobService {
 
         // Only live-photo motion part will be marked as not visible immediately on upload. Skip notifying clients
         if (asset && asset.isVisible) {
-          this.communicationRepository.send(ClientEvent.UPLOAD_SUCCESS, asset.ownerId, mapAsset(asset));
+          this.eventRepository.clientSend(ClientEvent.UPLOAD_SUCCESS, asset.ownerId, mapAsset(asset));
         }
         break;
       }
 
       case JobName.USER_DELETION: {
-        this.communicationRepository.broadcast(ClientEvent.USER_DELETE, item.data.id);
+        this.eventRepository.clientBroadcast(ClientEvent.USER_DELETE, item.data.id);
         break;
       }
     }

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

@@ -127,10 +127,10 @@ describe(LibraryService.name, () => {
     });
   });
 
-  describe('validateConfig', () => {
+  describe('onValidateConfig', () => {
     it('should allow a valid cron expression', () => {
       expect(() =>
-        sut.validateConfig({
+        sut.onValidateConfig({
           newConfig: { library: { scan: { cronExpression: '0 0 * * *' } } } as SystemConfig,
           oldConfig: {} as SystemConfig,
         }),
@@ -139,7 +139,7 @@ describe(LibraryService.name, () => {
 
     it('should fail for an invalid cron expression', () => {
       expect(() =>
-        sut.validateConfig({
+        sut.onValidateConfig({
           newConfig: { library: { scan: { cronExpression: 'foo' } } } as SystemConfig,
           oldConfig: {} as SystemConfig,
         }),

server/src/services/library.service.ts

@@ -7,7 +7,7 @@ import path, { basename, parse } from 'node:path';
 import picomatch from 'picomatch';
 import { StorageCore } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { OnEventInternal } from 'src/decorators';
+import { OnServerEvent } from 'src/decorators';
 import {
   CreateLibraryDto,
   LibraryResponseDto,
@@ -23,9 +23,9 @@ import {
 import { AssetType } from 'src/entities/asset.entity';
 import { LibraryEntity, LibraryType } from 'src/entities/library.entity';
 import { IAssetRepository, WithProperty } from 'src/interfaces/asset.interface';
-import { InternalEvent, InternalEventMap } from 'src/interfaces/communication.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';
+import { ServerAsyncEvent, ServerAsyncEventMap } from 'src/interfaces/event.interface';
 import {
   IBaseJob,
   IEntityJob,
@@ -105,8 +105,8 @@ export class LibraryService extends EventEmitter {
     });
   }
 
-  @OnEventInternal(InternalEvent.VALIDATE_CONFIG)
-  validateConfig({ newConfig }: InternalEventMap[InternalEvent.VALIDATE_CONFIG]) {
+  @OnServerEvent(ServerAsyncEvent.CONFIG_VALIDATE)
+  onValidateConfig({ newConfig }: ServerAsyncEventMap[ServerAsyncEvent.CONFIG_VALIDATE]) {
     const { scan } = newConfig.library;
     if (!validateCronExpression(scan.cronExpression)) {
       throw new Error(`Invalid cron expression ${scan.cronExpression}`);

server/src/services/media.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, UnsupportedMediaTypeException } from '@nestjs/common';
 import { StorageCore, StorageFolder } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { SystemConfigFFmpegDto } from 'src/dtos/system-config-ffmpeg.dto';
+import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { AssetPathType } from 'src/entities/move.entity';
 import {

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

@@ -8,9 +8,9 @@ import { ExifEntity } from 'src/entities/exif.entity';
 import { SystemConfigKey } from 'src/entities/system-config.entity';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IDatabaseRepository } from 'src/interfaces/database.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
 import { IMediaRepository } from 'src/interfaces/media.interface';
 import { IMetadataRepository, ImmichTags } from 'src/interfaces/metadata.interface';
@@ -24,9 +24,9 @@ import { fileStub } from 'test/fixtures/file.stub';
 import { probeStub } from 'test/fixtures/media.stub';
 import { newAlbumRepositoryMock } from 'test/repositories/album.repository.mock';
 import { newAssetRepositoryMock } from 'test/repositories/asset.repository.mock';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
 import { newCryptoRepositoryMock } from 'test/repositories/crypto.repository.mock';
 import { newDatabaseRepositoryMock } from 'test/repositories/database.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
 import { newMediaRepositoryMock } from 'test/repositories/media.repository.mock';
 import { newMetadataRepositoryMock } from 'test/repositories/metadata.repository.mock';
@@ -46,7 +46,7 @@ describe(MetadataService.name, () => {
   let mediaMock: jest.Mocked<IMediaRepository>;
   let personMock: jest.Mocked<IPersonRepository>;
   let storageMock: jest.Mocked<IStorageRepository>;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
   let databaseMock: jest.Mocked<IDatabaseRepository>;
   let sut: MetadataService;
 
@@ -59,7 +59,7 @@ describe(MetadataService.name, () => {
     metadataMock = newMetadataRepositoryMock();
     moveMock = newMoveRepositoryMock();
     personMock = newPersonRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
+    eventMock = newEventRepositoryMock();
     storageMock = newStorageRepositoryMock();
     mediaMock = newMediaRepositoryMock();
     databaseMock = newDatabaseRepositoryMock();
@@ -67,7 +67,7 @@ describe(MetadataService.name, () => {
     sut = new MetadataService(
       albumMock,
       assetMock,
-      communicationMock,
+      eventMock,
       cryptoRepository,
       databaseMock,
       jobMock,
@@ -195,7 +195,7 @@ describe(MetadataService.name, () => {
       await expect(sut.handleLivePhotoLinking({ id: assetStub.livePhotoStillAsset.id })).resolves.toBe(
         JobStatus.SUCCESS,
       );
-      expect(communicationMock.send).toHaveBeenCalledWith(
+      expect(eventMock.clientSend).toHaveBeenCalledWith(
         ClientEvent.ASSET_HIDDEN,
         assetStub.livePhotoMotionAsset.ownerId,
         assetStub.livePhotoMotionAsset.id,

server/src/services/metadata.service.ts

@@ -12,9 +12,9 @@ import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { ExifEntity } from 'src/entities/exif.entity';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import {
   IBaseJob,
   IEntityJob,
@@ -105,7 +105,7 @@ export class MetadataService {
   constructor(
     @Inject(IAlbumRepository) private albumRepository: IAlbumRepository,
     @Inject(IAssetRepository) private assetRepository: IAssetRepository,
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
     @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
     @Inject(IDatabaseRepository) private databaseRepository: IDatabaseRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
@@ -185,7 +185,7 @@ export class MetadataService {
     await this.albumRepository.removeAsset(motionAsset.id);
 
     // Notify clients to hide the linked live photo asset
-    this.communicationRepository.send(ClientEvent.ASSET_HIDDEN, motionAsset.ownerId, motionAsset.id);
+    this.eventRepository.clientSend(ClientEvent.ASSET_HIDDEN, motionAsset.ownerId, motionAsset.id);
 
     return JobStatus.SUCCESS;
   }

server/src/services/server-info.service.spec.ts

@@ -1,13 +1,13 @@
 import { serverVersion } from 'src/constants';
 import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
-import { ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { IEventRepository } from 'src/interfaces/event.interface';
 import { IServerInfoRepository } from 'src/interfaces/server-info.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
 import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { ServerInfoService } from 'src/services/server-info.service';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newStorageRepositoryMock } from 'test/repositories/storage.repository.mock';
 import { newSystemConfigRepositoryMock } from 'test/repositories/system-config.repository.mock';
 import { newServerInfoRepositoryMock } from 'test/repositories/system-info.repository.mock';
@@ -16,7 +16,7 @@ import { newUserRepositoryMock } from 'test/repositories/user.repository.mock';
 
 describe(ServerInfoService.name, () => {
   let sut: ServerInfoService;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
   let configMock: jest.Mocked<ISystemConfigRepository>;
   let serverInfoMock: jest.Mocked<IServerInfoRepository>;
   let storageMock: jest.Mocked<IStorageRepository>;
@@ -25,20 +25,13 @@ describe(ServerInfoService.name, () => {
 
   beforeEach(() => {
     configMock = newSystemConfigRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
+    eventMock = newEventRepositoryMock();
     serverInfoMock = newServerInfoRepositoryMock();
     storageMock = newStorageRepositoryMock();
     userMock = newUserRepositoryMock();
     systemMetadataMock = newSystemMetadataRepositoryMock();
 
-    sut = new ServerInfoService(
-      communicationMock,
-      configMock,
-      userMock,
-      serverInfoMock,
-      storageMock,
-      systemMetadataMock,
-    );
+    sut = new ServerInfoService(eventMock, configMock, userMock, serverInfoMock, storageMock, systemMetadataMock);
   });
 
   it('should work', () => {

server/src/services/server-info.service.ts

@@ -3,6 +3,7 @@ import { DateTime } from 'luxon';
 import { isDev, serverVersion } from 'src/constants';
 import { StorageCore, StorageFolder } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
+import { OnServerEvent } from 'src/decorators';
 import {
   ServerConfigDto,
   ServerFeaturesDto,
@@ -13,7 +14,7 @@ import {
   UsageByUserDto,
 } from 'src/dtos/server-info.dto';
 import { SystemMetadataKey } from 'src/entities/system-metadata.entity';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository, ServerEvent, ServerEventMap } from 'src/interfaces/event.interface';
 import { IServerInfoRepository } from 'src/interfaces/server-info.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
@@ -32,7 +33,7 @@ export class ServerInfoService {
   private releaseVersionCheckedAt: DateTime | null = null;
 
   constructor(
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
     @Inject(ISystemConfigRepository) configRepository: ISystemConfigRepository,
     @Inject(IUserRepository) private userRepository: IUserRepository,
     @Inject(IServerInfoRepository) private repository: IServerInfoRepository,
@@ -40,9 +41,10 @@ export class ServerInfoService {
     @Inject(ISystemMetadataRepository) private readonly systemMetadataRepository: ISystemMetadataRepository,
   ) {
     this.configCore = SystemConfigCore.create(configRepository);
-    this.communicationRepository.on('connect', (userId) => this.handleConnect(userId));
   }
 
+  onConnect() {}
+
   async init(): Promise<void> {
     await this.handleVersionCheck();
 
@@ -169,8 +171,9 @@ export class ServerInfoService {
     return true;
   }
 
-  private handleConnect(userId: string) {
-    this.communicationRepository.send(ClientEvent.SERVER_VERSION, userId, serverVersion);
+  @OnServerEvent(ServerEvent.WEBSOCKET_CONNECT)
+  onWebsocketConnection({ userId }: ServerEventMap[ServerEvent.WEBSOCKET_CONNECT]) {
+    this.eventRepository.clientSend(ClientEvent.SERVER_VERSION, userId, serverVersion);
     this.newReleaseNotification(userId);
   }
 
@@ -184,7 +187,7 @@ export class ServerInfoService {
     };
 
     userId
-      ? this.communicationRepository.send(event, userId, payload)
-      : this.communicationRepository.broadcast(event, payload);
+      ? this.eventRepository.clientSend(event, userId, payload)
+      : this.eventRepository.clientBroadcast(event, payload);
   }
 }

server/src/services/smart-info.service.spec.ts

@@ -104,7 +104,6 @@ describe(SmartInfoService.name, () => {
     });
 
     it('should save the returned objects', async () => {
-      searchMock.upsert.mockResolvedValue();
       machineMock.encodeImage.mockResolvedValue([0.01, 0.02, 0.03]);
 
       await sut.handleEncodeClip({ id: asset.id });
@@ -114,12 +113,7 @@ describe(SmartInfoService.name, () => {
         { imagePath: 'path/to/resize.ext' },
         { enabled: true, modelName: 'ViT-B-32__openai' },
       );
-      expect(searchMock.upsert).toHaveBeenCalledWith(
-        {
-          assetId: 'asset-1',
-        },
-        [0.01, 0.02, 0.03],
-      );
+      expect(searchMock.upsert).toHaveBeenCalledWith('asset-1', [0.01, 0.02, 0.03]);
     });
   });
 

server/src/services/smart-info.service.ts

@@ -98,7 +98,7 @@ export class SmartInfoService {
       await this.databaseRepository.wait(DatabaseLock.CLIPDimSize);
     }
 
-    await this.repository.upsert({ assetId: asset.id }, clipEmbedding);
+    await this.repository.upsert(asset.id, clipEmbedding);
 
     return JobStatus.SUCCESS;
   }

server/src/services/storage-template.service.spec.ts

@@ -70,10 +70,10 @@ describe(StorageTemplateService.name, () => {
     SystemConfigCore.create(configMock).config$.next(defaults);
   });
 
-  describe('validate', () => {
+  describe('onValidateConfig', () => {
     it('should allow valid templates', () => {
       expect(() =>
-        sut.validate({
+        sut.onValidateConfig({
           newConfig: {
             storageTemplate: {
               template:
@@ -87,7 +87,7 @@ describe(StorageTemplateService.name, () => {
 
     it('should fail for an invalid template', () => {
       expect(() =>
-        sut.validate({
+        sut.onValidateConfig({
           newConfig: {
             storageTemplate: {
               template: '{{foo}}',

server/src/services/storage-template.service.ts

@@ -14,15 +14,15 @@ import {
 } from 'src/constants';
 import { StorageCore, StorageFolder } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { OnEventInternal } from 'src/decorators';
+import { OnServerEvent } from 'src/decorators';
 import { AssetEntity, AssetType } from 'src/entities/asset.entity';
 import { AssetPathType } from 'src/entities/move.entity';
 import { SystemConfig } from 'src/entities/system-config.entity';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { InternalEvent, InternalEventMap } from 'src/interfaces/communication.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { DatabaseLock, IDatabaseRepository } from 'src/interfaces/database.interface';
+import { ServerAsyncEvent, ServerAsyncEventMap } from 'src/interfaces/event.interface';
 import { IEntityJob, JOBS_ASSET_PAGINATION_SIZE, JobStatus } from 'src/interfaces/job.interface';
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
@@ -86,8 +86,8 @@ export class StorageTemplateService {
     );
   }
 
-  @OnEventInternal(InternalEvent.VALIDATE_CONFIG)
-  validate({ newConfig }: InternalEventMap[InternalEvent.VALIDATE_CONFIG]) {
+  @OnServerEvent(ServerAsyncEvent.CONFIG_VALIDATE)
+  onValidateConfig({ newConfig }: ServerAsyncEventMap[ServerAsyncEvent.CONFIG_VALIDATE]) {
     try {
       const { compiled } = this.compile(newConfig.storageTemplate.template);
       this.render(compiled, {

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

@@ -13,13 +13,13 @@ import {
   TranscodePolicy,
   VideoCodec,
 } from 'src/entities/system-config.entity';
-import { ICommunicationRepository, ServerEvent } from 'src/interfaces/communication.interface';
+import { IEventRepository, ServerEvent } from 'src/interfaces/event.interface';
 import { QueueName } from 'src/interfaces/job.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
 import { SystemConfigService } from 'src/services/system-config.service';
 import { ImmichLogger } from 'src/utils/logger';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newSystemConfigRepositoryMock } from 'test/repositories/system-config.repository.mock';
 
 const updates: SystemConfigEntity[] = [
@@ -152,14 +152,14 @@ const updatedConfig = Object.freeze<SystemConfig>({
 describe(SystemConfigService.name, () => {
   let sut: SystemConfigService;
   let configMock: jest.Mocked<ISystemConfigRepository>;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
   let smartInfoMock: jest.Mocked<ISearchRepository>;
 
   beforeEach(() => {
     delete process.env.IMMICH_CONFIG_FILE;
     configMock = newSystemConfigRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
-    sut = new SystemConfigService(configMock, communicationMock, smartInfoMock);
+    eventMock = newEventRepositoryMock();
+    sut = new SystemConfigService(configMock, eventMock, smartInfoMock);
   });
 
   it('should work', () => {
@@ -330,8 +330,8 @@ describe(SystemConfigService.name, () => {
 
       await expect(sut.updateConfig(updatedConfig)).resolves.toEqual(updatedConfig);
 
-      expect(communicationMock.broadcast).toHaveBeenCalled();
-      expect(communicationMock.sendServerEvent).toHaveBeenCalledWith(ServerEvent.CONFIG_UPDATE);
+      expect(eventMock.clientBroadcast).toHaveBeenCalled();
+      expect(eventMock.serverSend).toHaveBeenCalledWith(ServerEvent.CONFIG_UPDATE, null);
       expect(configMock.saveAll).toHaveBeenCalledWith(updates);
     });
 

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

@@ -12,17 +12,16 @@ import {
   supportedYearTokens,
 } from 'src/constants';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { OnEventInternal } from 'src/decorators';
-import { SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config-storage-template.dto';
-import { SystemConfigDto, mapConfig } from 'src/dtos/system-config.dto';
+import { OnServerEvent } from 'src/decorators';
+import { SystemConfigDto, SystemConfigTemplateStorageOptionDto, mapConfig } from 'src/dtos/system-config.dto';
 import { LogLevel, SystemConfig } from 'src/entities/system-config.entity';
 import {
   ClientEvent,
-  ICommunicationRepository,
-  InternalEvent,
-  InternalEventMap,
+  IEventRepository,
+  ServerAsyncEvent,
+  ServerAsyncEventMap,
   ServerEvent,
-} from 'src/interfaces/communication.interface';
+} from 'src/interfaces/event.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
 import { ImmichLogger } from 'src/utils/logger';
@@ -34,11 +33,10 @@ export class SystemConfigService {
 
   constructor(
     @Inject(ISystemConfigRepository) private repository: ISystemConfigRepository,
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
     @Inject(ISearchRepository) private smartInfoRepository: ISearchRepository,
   ) {
     this.core = SystemConfigCore.create(repository);
-    this.communicationRepository.on(ServerEvent.CONFIG_UPDATE, () => this.handleConfigUpdate());
     this.core.config$.subscribe((config) => this.setLogLevel(config));
   }
 
@@ -61,8 +59,8 @@ export class SystemConfigService {
     return mapConfig(config);
   }
 
-  @OnEventInternal(InternalEvent.VALIDATE_CONFIG)
-  validateConfig({ newConfig, oldConfig }: InternalEventMap[InternalEvent.VALIDATE_CONFIG]) {
+  @OnServerEvent(ServerAsyncEvent.CONFIG_VALIDATE)
+  onValidateConfig({ newConfig, oldConfig }: ServerAsyncEventMap[ServerAsyncEvent.CONFIG_VALIDATE]) {
     if (!_.isEqual(instanceToPlain(newConfig.logging), oldConfig.logging) && this.getEnvLogLevel()) {
       throw new Error('Logging cannot be changed while the environment variable LOG_LEVEL is set.');
     }
@@ -72,7 +70,10 @@ export class SystemConfigService {
     const oldConfig = await this.core.getConfig();
 
     try {
-      await this.communicationRepository.emitAsync(InternalEvent.VALIDATE_CONFIG, { newConfig: dto, oldConfig });
+      await this.eventRepository.serverSendAsync(ServerAsyncEvent.CONFIG_VALIDATE, {
+        newConfig: dto,
+        oldConfig,
+      });
     } catch (error) {
       this.logger.warn(`Unable to save system config due to a validation error: ${error}`);
       throw new BadRequestException(error instanceof Error ? error.message : error);
@@ -80,8 +81,8 @@ export class SystemConfigService {
 
     const newConfig = await this.core.updateConfig(dto);
 
-    this.communicationRepository.broadcast(ClientEvent.CONFIG_UPDATE, {});
-    this.communicationRepository.sendServerEvent(ServerEvent.CONFIG_UPDATE);
+    this.eventRepository.clientBroadcast(ClientEvent.CONFIG_UPDATE, {});
+    this.eventRepository.serverSend(ServerEvent.CONFIG_UPDATE, null);
 
     if (oldConfig.machineLearning.clip.modelName !== newConfig.machineLearning.clip.modelName) {
       await this.smartInfoRepository.init(newConfig.machineLearning.clip.modelName);
@@ -91,7 +92,7 @@ export class SystemConfigService {
 
   // this is only used by the cli on config change, and it's not actually needed anymore
   async refreshConfig() {
-    this.communicationRepository.sendServerEvent(ServerEvent.CONFIG_UPDATE);
+    this.eventRepository.serverSend(ServerEvent.CONFIG_UPDATE, null);
     await this.core.refreshConfig();
     return true;
   }
@@ -127,7 +128,8 @@ export class SystemConfigService {
     return theme.customCss;
   }
 
-  private async handleConfigUpdate() {
+  @OnServerEvent(ServerEvent.CONFIG_UPDATE)
+  async onConfigUpdate() {
     await this.core.refreshConfig();
   }
 

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

@@ -1,13 +1,13 @@
 import { BadRequestException } from '@nestjs/common';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobName } from 'src/interfaces/job.interface';
 import { TrashService } from 'src/services/trash.service';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { IAccessRepositoryMock, newAccessRepositoryMock } from 'test/repositories/access.repository.mock';
 import { newAssetRepositoryMock } from 'test/repositories/asset.repository.mock';
-import { newCommunicationRepositoryMock } from 'test/repositories/communication.repository.mock';
+import { newEventRepositoryMock } from 'test/repositories/event.repository.mock';
 import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
 
 describe(TrashService.name, () => {
@@ -15,7 +15,7 @@ describe(TrashService.name, () => {
   let accessMock: IAccessRepositoryMock;
   let assetMock: jest.Mocked<IAssetRepository>;
   let jobMock: jest.Mocked<IJobRepository>;
-  let communicationMock: jest.Mocked<ICommunicationRepository>;
+  let eventMock: jest.Mocked<IEventRepository>;
 
   it('should work', () => {
     expect(sut).toBeDefined();
@@ -24,10 +24,10 @@ describe(TrashService.name, () => {
   beforeEach(() => {
     accessMock = newAccessRepositoryMock();
     assetMock = newAssetRepositoryMock();
-    communicationMock = newCommunicationRepositoryMock();
+    eventMock = newEventRepositoryMock();
     jobMock = newJobRepositoryMock();
 
-    sut = new TrashService(accessMock, assetMock, jobMock, communicationMock);
+    sut = new TrashService(accessMock, assetMock, jobMock, eventMock);
   });
 
   describe('restoreAssets', () => {
@@ -54,14 +54,14 @@ describe(TrashService.name, () => {
       assetMock.getByUserId.mockResolvedValue({ items: [], hasNextPage: false });
       await expect(sut.restore(authStub.user1)).resolves.toBeUndefined();
       expect(assetMock.restoreAll).not.toHaveBeenCalled();
-      expect(communicationMock.send).not.toHaveBeenCalled();
+      expect(eventMock.clientSend).not.toHaveBeenCalled();
     });
 
     it('should restore and notify', async () => {
       assetMock.getByUserId.mockResolvedValue({ items: [assetStub.image], hasNextPage: false });
       await expect(sut.restore(authStub.user1)).resolves.toBeUndefined();
       expect(assetMock.restoreAll).toHaveBeenCalledWith([assetStub.image.id]);
-      expect(communicationMock.send).toHaveBeenCalledWith(ClientEvent.ASSET_RESTORE, authStub.user1.user.id, [
+      expect(eventMock.clientSend).toHaveBeenCalledWith(ClientEvent.ASSET_RESTORE, authStub.user1.user.id, [
         assetStub.image.id,
       ]);
     });

server/src/services/trash.service.ts

@@ -5,7 +5,7 @@ import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
-import { ClientEvent, ICommunicationRepository } from 'src/interfaces/communication.interface';
+import { ClientEvent, IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JOBS_ASSET_PAGINATION_SIZE, JobName } from 'src/interfaces/job.interface';
 import { usePagination } from 'src/utils/pagination';
 
@@ -16,7 +16,7 @@ export class TrashService {
     @Inject(IAccessRepository) accessRepository: IAccessRepository,
     @Inject(IAssetRepository) private assetRepository: IAssetRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
-    @Inject(ICommunicationRepository) private communicationRepository: ICommunicationRepository,
+    @Inject(IEventRepository) private eventRepository: IEventRepository,
   ) {
     this.access = AccessCore.create(accessRepository);
   }
@@ -60,6 +60,6 @@ export class TrashService {
     }
 
     await this.assetRepository.restoreAll(ids);
-    this.communicationRepository.send(ClientEvent.ASSET_RESTORE, auth.user.id, ids);
+    this.eventRepository.clientSend(ClientEvent.ASSET_RESTORE, auth.user.id, ids);
   }
 }

server/src/services/user.service.ts

@@ -1,6 +1,5 @@
 import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { DateTime } from 'luxon';
-import { randomBytes } from 'node:crypto';
 import { StorageCore, StorageFolder } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
 import { UserCore } from 'src/cores/user.core';
@@ -26,7 +25,7 @@ export class UserService {
 
   constructor(
     @Inject(IAlbumRepository) private albumRepository: IAlbumRepository,
-    @Inject(ICryptoRepository) cryptoRepository: ICryptoRepository,
+    @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
     @Inject(ILibraryRepository) libraryRepository: ILibraryRepository,
     @Inject(IStorageRepository) private storageRepository: IStorageRepository,
@@ -132,7 +131,7 @@ export class UserService {
     }
 
     const providedPassword = await ask(mapUser(admin));
-    const password = providedPassword || randomBytes(24).toString('base64').replaceAll(/\W/g, '');
+    const password = providedPassword || this.cryptoRepository.newPassword(24);
 
     await this.userCore.updateUser(admin, admin.id, { password });
 

server/src/utils/media.ts

@@ -1,4 +1,4 @@
-import { SystemConfigFFmpegDto } from 'src/dtos/system-config-ffmpeg.dto';
+import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
 import { CQMode, ToneMapping, TranscodeHWAccel, TranscodeTarget, VideoCodec } from 'src/entities/system-config.entity';
 import {
   AudioStreamInfo,

server/start.sh

@@ -17,4 +17,4 @@ read_file_and_export "DB_USERNAME_FILE" "DB_USERNAME"
 read_file_and_export "DB_PASSWORD_FILE" "DB_PASSWORD"
 read_file_and_export "REDIS_PASSWORD_FILE" "REDIS_PASSWORD"
 
-exec node /usr/src/app/dist/main "$@"
+exec ~/.bun/bin/bun run /usr/src/app/dist/main "$@"

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

@@ -5,7 +5,6 @@ export const newAssetRepositoryMock = (): jest.Mocked<IAssetRepository> => {
     create: jest.fn(),
     upsertExif: jest.fn(),
     upsertJobStatus: jest.fn(),
-    getByDate: jest.fn(),
     getByDayOfYear: jest.fn(),
     getByIds: jest.fn().mockResolvedValue([]),
     getByIdsWithAllRelations: jest.fn().mockResolvedValue([]),

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

@@ -1,12 +0,0 @@
-import { ICommunicationRepository } from 'src/interfaces/communication.interface';
-
-export const newCommunicationRepositoryMock = (): jest.Mocked<ICommunicationRepository> => {
-  return {
-    send: jest.fn(),
-    broadcast: jest.fn(),
-    on: jest.fn(),
-    sendServerEvent: jest.fn(),
-    emit: jest.fn(),
-    emitAsync: jest.fn(),
-  };
-};

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

@@ -9,5 +9,6 @@ export const newCryptoRepositoryMock = (): jest.Mocked<ICryptoRepository> => {
     hashSha256: jest.fn().mockImplementation((input) => `${input} (hashed)`),
     hashSha1: jest.fn().mockImplementation((input) => Buffer.from(`${input.toString()} (hashed)`)),
     hashFile: jest.fn().mockImplementation((input) => `${input} (file-hashed)`),
+    newPassword: jest.fn().mockReturnValue(Buffer.from('random-bytes').toString('base64')),
   };
 };

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

@@ -0,0 +1,10 @@
+import { IEventRepository } from 'src/interfaces/event.interface';
+
+export const newEventRepositoryMock = (): jest.Mocked<IEventRepository> => {
+  return {
+    clientSend: jest.fn(),
+    clientBroadcast: jest.fn(),
+    serverSend: jest.fn(),
+    serverSendAsync: jest.fn(),
+  };
+};