refactor: infra folder

.github/workflows/test.yml

@@ -354,7 +354,7 @@ jobs:
         id: verify-changed-sql-files
         with:
           files: |
-            server/src/infra/sql
+            server/src/queries
 
       - name: Verify SQL files have not changed
         if: steps.verify-changed-sql-files.outputs.files_changed == 'true'

docs/docs/developer/database-migrations.md

@@ -5,7 +5,7 @@ After making any changes in the `server/src/entities`, a database migration need
 1. Run the command
 
 ```bash
-npm run typeorm:migrations:generate ./src/infra/<migration-name>
+npm run typeorm:migrations:generate <migration-name>
 ```
 
 2. Check if the migration file makes sense.

server/package.json

@@ -25,12 +25,12 @@
     "e2e:jobs": "jest --config e2e/jobs/jest-e2e.json --runInBand",
     "typeorm": "typeorm",
     "typeorm:migrations:create": "typeorm migration:create",
-    "typeorm:migrations:generate": "typeorm migration:generate -d ./dist/infra/database.config.js",
-    "typeorm:migrations:run": "typeorm migration:run -d ./dist/infra/database.config.js",
-    "typeorm:migrations:revert": "typeorm migration:revert -d ./dist/infra/database.config.js",
-    "typeorm:schema:drop": "typeorm query -d ./dist/infra/database.config.js 'DROP schema public cascade; CREATE schema public;'",
+    "typeorm:migrations:generate": "typeorm migration:generate -d ./dist/database.config.js",
+    "typeorm:migrations:run": "typeorm migration:run -d ./dist/database.config.js",
+    "typeorm:migrations:revert": "typeorm migration:revert -d ./dist/database.config.js",
+    "typeorm:schema:drop": "typeorm query -d ./dist/database.config.js 'DROP schema public cascade; CREATE schema public;'",
     "typeorm:schema:reset": "npm run typeorm:schema:drop && npm run typeorm:migrations:run",
-    "sql:generate": "node ./dist/infra/sql-generator/"
+    "sql:generate": "node ./dist/utils/sql.js"
   },
   "dependencies": {
     "@babel/runtime": "^7.22.11",
@@ -146,15 +146,16 @@
       "^.+\\.ts$": "ts-jest"
     },
     "collectCoverageFrom": [
-      "<rootDir>/src/**/*.(t|j)s",
-      "!<rootDir>/src/infra/**/*",
-      "!<rootDir>/src/migrations/**/*",
-      "!<rootDir>/src/subscribers/**/*",
-      "!<rootDir>/src/immich/controllers/**/*"
+      "<rootDir>/src/cores/*.(t|j)s",
+      "<rootDir>/src/dtos/*.(t|j)s",
+      "<rootDir>/src/interfaces/*.(t|j)s",
+      "<rootDir>/src/services/*.(t|j)s",
+      "<rootDir>/src/utils/*.(t|j)s",
+      "<rootDir>/src/*.t|j)s"
     ],
     "coverageDirectory": "./coverage",
     "coverageThreshold": {
-      "./src/domain/": {
+      "./src/": {
         "branches": 75,
         "functions": 80,
         "lines": 85,

server/src/apps/api.main.ts

@@ -7,11 +7,11 @@ import sirv from 'sirv';
 import { ApiModule } from 'src/apps/api.module';
 import { ApiService } from 'src/apps/api.service';
 import { excludePaths } from 'src/config';
-import { WEB_ROOT, envName, isDev, serverVersion } from 'src/domain/domain.constant';
+import { WEB_ROOT, envName, isDev, serverVersion } from 'src/constants';
 import { useSwagger } from 'src/immich/app.utils';
-import { otelSDK } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
-import { WebSocketAdapter } from 'src/infra/websocket.adapter';
+import { WebSocketAdapter } from 'src/middleware/websocket.adapter';
+import { otelSDK } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
 
 const logger = new ImmichLogger('ImmichServer');
 const port = Number(process.env.SERVER_PORT) || 3001;

server/src/apps/api.service.ts

@@ -3,16 +3,16 @@ import { Cron, CronExpression, Interval } from '@nestjs/schedule';
 import { NextFunction, Request, Response } from 'express';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { ONE_HOUR, WEB_ROOT } from 'src/domain/domain.constant';
-import { ImmichLogger } from 'src/infra/logger';
+import { ONE_HOUR, WEB_ROOT } from 'src/constants';
 import { AuthService } from 'src/services/auth.service';
 import { DatabaseService } from 'src/services/database.service';
 import { JobService } from 'src/services/job.service';
 import { ServerInfoService } from 'src/services/server-info.service';
 import { SharedLinkService } from 'src/services/shared-link.service';
 import { StorageService } from 'src/services/storage.service';
 import { SystemConfigService } from 'src/services/system-config.service';
-import { OpenGraphTags } from 'src/utils';
+import { ImmichLogger } from 'src/utils/logger';
+import { OpenGraphTags } from 'src/utils/misc';
 
 const render = (index: string, meta: OpenGraphTags) => {
   const tags = `

server/src/apps/app.module.ts

@@ -6,10 +6,8 @@ import { ScheduleModule, SchedulerRegistry } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { OpenTelemetryModule } from 'nestjs-otel';
 import { bullConfig, bullQueues, immichAppConfig } from 'src/config';
+import { databaseConfig } from 'src/database.config';
 import { databaseEntities } from 'src/entities';
-import { databaseConfig } from 'src/infra/database.config';
-import { otelConfig } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
 import { IAccessRepository } from 'src/interfaces/access.repository';
 import { IActivityRepository } from 'src/interfaces/activity.repository';
 import { IAlbumRepository } from 'src/interfaces/album.repository';
@@ -88,6 +86,8 @@ import { SystemConfigService } from 'src/services/system-config.service';
 import { TagService } from 'src/services/tag.service';
 import { TrashService } from 'src/services/trash.service';
 import { UserService } from 'src/services/user.service';
+import { otelConfig } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
 
 const services: Provider[] = [
   APIKeyService,

server/src/apps/microservices.main.ts

@@ -1,9 +1,9 @@
 import { NestFactory } from '@nestjs/core';
 import { MicroservicesModule } from 'src/apps/microservices.module';
-import { envName, serverVersion } from 'src/domain/domain.constant';
-import { otelSDK } from 'src/infra/instrumentation';
-import { ImmichLogger } from 'src/infra/logger';
-import { WebSocketAdapter } from 'src/infra/websocket.adapter';
+import { envName, serverVersion } from 'src/constants';
+import { WebSocketAdapter } from 'src/middleware/websocket.adapter';
+import { otelSDK } from 'src/utils/instrumentation';
+import { ImmichLogger } from 'src/utils/logger';
 
 const logger = new ImmichLogger('ImmichMicroservice');
 const port = Number(process.env.MICROSERVICES_PORT) || 3002;

server/src/apps/microservices.service.ts

@@ -1,7 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { JobName } from 'src/domain/job/job.constants';
-import { IDeleteFilesJob } from 'src/domain/job/job.interface';
-import { otelSDK } from 'src/infra/instrumentation';
+import { IDeleteFilesJob, JobName } from 'src/interfaces/job.repository';
 import { AssetService } from 'src/services/asset.service';
 import { AuditService } from 'src/services/audit.service';
 import { DatabaseService } from 'src/services/database.service';
@@ -15,6 +13,7 @@ import { StorageTemplateService } from 'src/services/storage-template.service';
 import { StorageService } from 'src/services/storage.service';
 import { SystemConfigService } from 'src/services/system-config.service';
 import { UserService } from 'src/services/user.service';
+import { otelSDK } from 'src/utils/instrumentation';
 
 @Injectable()
 export class MicroservicesService {

server/src/config.ts

@@ -3,8 +3,8 @@ import { ConfigModuleOptions } from '@nestjs/config';
 import { QueueOptions } from 'bullmq';
 import { RedisOptions } from 'ioredis';
 import Joi from 'joi';
-import { QueueName } from 'src/domain/job/job.constants';
 import { LogLevel } from 'src/entities/system-config.entity';
+import { QueueName } from 'src/interfaces/job.repository';
 
 const WHEN_DB_URL_SET = Joi.when('DB_URL', {
   is: Joi.exist(),

server/src/constants.ts

@@ -0,0 +1,105 @@
+import { Duration } from 'luxon';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { Version } from 'src/utils/version';
+
+const { version } = JSON.parse(readFileSync('./package.json', 'utf8'));
+export const serverVersion = Version.fromString(version);
+
+export const AUDIT_LOG_MAX_DURATION = Duration.fromObject({ days: 100 });
+export const ONE_HOUR = Duration.fromObject({ hours: 1 });
+
+export const envName = (process.env.NODE_ENV || 'development').toUpperCase();
+export const isDev = process.env.NODE_ENV === 'development';
+export const APP_MEDIA_LOCATION = process.env.IMMICH_MEDIA_LOCATION || './upload';
+export const WEB_ROOT = process.env.IMMICH_WEB_ROOT || '/usr/src/app/www';
+
+const GEODATA_ROOT_PATH = process.env.IMMICH_REVERSE_GEOCODING_ROOT || '/usr/src/resources';
+
+export const citiesFile = 'cities500.txt';
+export const geodataDatePath = join(GEODATA_ROOT_PATH, 'geodata-date.txt');
+export const geodataAdmin1Path = join(GEODATA_ROOT_PATH, 'admin1CodesASCII.txt');
+export const geodataAdmin2Path = join(GEODATA_ROOT_PATH, 'admin2Codes.txt');
+export const geodataCities500Path = join(GEODATA_ROOT_PATH, citiesFile);
+
+export const MOBILE_REDIRECT = 'app.immich:/';
+export const LOGIN_URL = '/auth/login?autoLaunch=0';
+export const IMMICH_ACCESS_COOKIE = 'immich_access_token';
+export const IMMICH_IS_AUTHENTICATED = 'immich_is_authenticated';
+export const IMMICH_AUTH_TYPE_COOKIE = 'immich_auth_type';
+export const IMMICH_API_KEY_NAME = 'api_key';
+export const IMMICH_API_KEY_HEADER = 'x-api-key';
+export const IMMICH_SHARED_LINK_ACCESS_COOKIE = 'immich_shared_link_token';
+export enum AuthType {
+  PASSWORD = 'password',
+  OAUTH = 'oauth',
+}
+
+export const FACE_THUMBNAIL_SIZE = 250;
+
+export const supportedYearTokens = ['y', 'yy'];
+export const supportedMonthTokens = ['M', 'MM', 'MMM', 'MMMM'];
+export const supportedWeekTokens = ['W', 'WW'];
+export const supportedDayTokens = ['d', 'dd'];
+export const supportedHourTokens = ['h', 'hh', 'H', 'HH'];
+export const supportedMinuteTokens = ['m', 'mm'];
+export const supportedSecondTokens = ['s', 'ss', 'SSS'];
+export const supportedPresetTokens = [
+  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MMMM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{MM}}/{{filename}}',
+  '{{y}}/{{MMM}}/{{filename}}',
+  '{{y}}/{{MMMM}}/{{filename}}',
+  '{{y}}/{{MM}}/{{dd}}/{{filename}}',
+  '{{y}}/{{MMMM}}/{{dd}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}/{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MMM}}-{{dd}}/{{filename}}',
+  '{{y}}-{{MMMM}}-{{dd}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}/{{filename}}',
+  '{{y}}/{{y}}-{{WW}}/{{filename}}',
+  '{{y}}/{{y}}-{{MM}}-{{dd}}/{{assetId}}',
+  '{{y}}/{{y}}-{{MM}}/{{assetId}}',
+  '{{y}}/{{y}}-{{WW}}/{{assetId}}',
+  '{{album}}/{{filename}}',
+];
+
+type ModelInfo = { dimSize: number };
+export const CLIP_MODEL_INFO: Record<string, ModelInfo> = {
+  RN50__openai: { dimSize: 1024 },
+  RN50__yfcc15m: { dimSize: 1024 },
+  RN50__cc12m: { dimSize: 1024 },
+  RN101__openai: { dimSize: 512 },
+  RN101__yfcc15m: { dimSize: 512 },
+  RN50x4__openai: { dimSize: 640 },
+  RN50x16__openai: { dimSize: 768 },
+  RN50x64__openai: { dimSize: 1024 },
+  'ViT-B-32__openai': { dimSize: 512 },
+  'ViT-B-32__laion2b_e16': { dimSize: 512 },
+  'ViT-B-32__laion400m_e31': { dimSize: 512 },
+  'ViT-B-32__laion400m_e32': { dimSize: 512 },
+  'ViT-B-32__laion2b-s34b-b79k': { dimSize: 512 },
+  'ViT-B-16__openai': { dimSize: 512 },
+  'ViT-B-16__laion400m_e31': { dimSize: 512 },
+  'ViT-B-16__laion400m_e32': { dimSize: 512 },
+  'ViT-B-16-plus-240__laion400m_e31': { dimSize: 640 },
+  'ViT-B-16-plus-240__laion400m_e32': { dimSize: 640 },
+  'ViT-L-14__openai': { dimSize: 768 },
+  'ViT-L-14__laion400m_e31': { dimSize: 768 },
+  'ViT-L-14__laion400m_e32': { dimSize: 768 },
+  'ViT-L-14__laion2b-s32b-b82k': { dimSize: 768 },
+  'ViT-L-14-336__openai': { dimSize: 768 },
+  'ViT-L-14-quickgelu__dfn2b': { dimSize: 768 },
+  'ViT-H-14__laion2b-s32b-b79k': { dimSize: 1024 },
+  'ViT-H-14-quickgelu__dfn5b': { dimSize: 1024 },
+  'ViT-H-14-378-quickgelu__dfn5b': { dimSize: 1024 },
+  'ViT-g-14__laion2b-s12b-b42k': { dimSize: 1024 },
+  'LABSE-Vit-L-14': { dimSize: 768 },
+  'XLM-Roberta-Large-Vit-B-32': { dimSize: 512 },
+  'XLM-Roberta-Large-Vit-B-16Plus': { dimSize: 640 },
+  'XLM-Roberta-Large-Vit-L-14': { dimSize: 768 },
+  'XLM-Roberta-Large-ViT-H-14__frozen_laion5b_s13b_b90k': { dimSize: 1024 },
+  'nllb-clip-base-siglip__v1': { dimSize: 768 },
+  'nllb-clip-large-siglip__v1': { dimSize: 1152 },
+};

server/src/controllers/auth.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
-import { IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE, IMMICH_IS_AUTHENTICATED } from 'src/domain/auth/auth.constant';
+import { IMMICH_ACCESS_COOKIE, IMMICH_AUTH_TYPE_COOKIE, IMMICH_IS_AUTHENTICATED } from 'src/constants';
 import {
   AuthDeviceResponseDto,
   AuthDto,

server/src/controllers/shared-link.controller.ts

@@ -1,7 +1,7 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post, Put, Query, Req, Res } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
-import { IMMICH_SHARED_LINK_ACCESS_COOKIE } from 'src/domain/auth/auth.constant';
+import { IMMICH_SHARED_LINK_ACCESS_COOKIE } from 'src/constants';
 import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
 import { AssetIdsDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';

server/src/cores/access.core.ts

@@ -2,7 +2,7 @@ import { BadRequestException, UnauthorizedException } from '@nestjs/common';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { IAccessRepository } from 'src/interfaces/access.repository';
-import { setDifference, setIsEqual, setUnion } from 'src/utils';
+import { setDifference, setIsEqual, setUnion } from 'src/utils/set';
 
 export enum Permission {
   ACTIVITY_CREATE = 'activity.create',

server/src/cores/storage.core.ts

@@ -1,16 +1,16 @@
 import { dirname, join, resolve } from 'node:path';
+import { APP_MEDIA_LOCATION } from 'src/constants';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { APP_MEDIA_LOCATION } from 'src/domain/domain.constant';
 import { AssetEntity } from 'src/entities/asset.entity';
 import { AssetPathType, PathType, PersonPathType } from 'src/entities/move.entity';
 import { PersonEntity } from 'src/entities/person.entity';
-import { ImmichLogger } from 'src/infra/logger';
 import { IAssetRepository } from 'src/interfaces/asset.repository';
 import { ICryptoRepository } from 'src/interfaces/crypto.repository';
 import { IMoveRepository } from 'src/interfaces/move.repository';
 import { IPersonRepository } from 'src/interfaces/person.repository';
 import { IStorageRepository } from 'src/interfaces/storage.repository';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
+import { ImmichLogger } from 'src/utils/logger';
 
 export enum StorageFolder {
   ENCODED_VIDEO = 'encoded-video',

server/src/cores/system-config.core.ts

@@ -5,7 +5,6 @@ import { validate } from 'class-validator';
 import { load as loadYaml } from 'js-yaml';
 import * as _ from 'lodash';
 import { Subject } from 'rxjs';
-import { QueueName } from 'src/domain/job/job.constants';
 import { SystemConfigDto } from 'src/dtos/system-config.dto';
 import {
   AudioCodec,
@@ -21,8 +20,9 @@ import {
   TranscodePolicy,
   VideoCodec,
 } from 'src/entities/system-config.entity';
-import { ImmichLogger } from 'src/infra/logger';
+import { QueueName } from 'src/interfaces/job.repository';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.repository';
+import { ImmichLogger } from 'src/utils/logger';
 
 export type SystemConfigValidator = (config: SystemConfig, newConfig: SystemConfig) => void | Promise<void>;
 

server/src/infra/database.config.ts → server/src/database.config.ts

@@ -16,9 +16,9 @@ const urlOrParts = url
 /* eslint unicorn/prefer-module: "off" -- We can fix this when migrating to ESM*/
 export const databaseConfig: PostgresConnectionOptions = {
   type: 'postgres',
-  entities: [__dirname + '/../entities/*.entity.{js,ts}'],
-  migrations: [__dirname + '/../migrations/*.{js,ts}'],
-  subscribers: [__dirname + '/../subscribers/*.{js,ts}'],
+  entities: [__dirname + '/entities/*.entity.{js,ts}'],
+  migrations: [__dirname + '/migrations/*.{js,ts}'],
+  subscribers: [__dirname + '/subscribers/*.{js,ts}'],
   migrationsRun: false,
   synchronize: false,
   connectTimeoutMS: 10_000, // 10 seconds

server/src/decorators.ts

@@ -1,6 +1,6 @@
 import { SetMetadata } from '@nestjs/common';
 import _ from 'lodash';
-import { setUnion } from 'src/utils';
+import { setUnion } from 'src/utils/set';
 
 // PostgreSQL uses a 16-bit integer to indicate the number of bound parameters. This means that the
 // maximum number of parameters is 65535. Any query that tries to bind more than that (e.g. searching