High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: serve map tile styles from tiles.immich.cloud (#12858)
Zack Pollardbcd416477b0d
diff --git a/e2e/package-lock.json b/e2e/package-lock.jsonindex 865f154d6b..ab4fd53fbf 100644--- a/e2e/package-lock.json+++ b/e2e/package-lock.json@@ -5016,9 +5016,9 @@}},"node_modules/path-to-regexp": {- "version": "6.2.2",- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",- "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==",+ "version": "6.3.0",+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",+ "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==","dev": true},"node_modules/pathe": {diff --git a/e2e/src/api/specs/map.e2e-spec.ts b/e2e/src/api/specs/map.e2e-spec.tsindex 343a7c91d0..da5f779cff 100644--- a/e2e/src/api/specs/map.e2e-spec.ts+++ b/e2e/src/api/specs/map.e2e-spec.ts@@ -1,8 +1,7 @@-import { AssetMediaResponseDto, LoginResponseDto, SharedLinkType } from '@immich/sdk';+import { LoginResponseDto } from '@immich/sdk';import { readFile } from 'node:fs/promises';import { basename, join } from 'node:path';import { Socket } from 'socket.io-client';-import { createUserDto } from 'src/fixtures';import { errorDto } from 'src/responses';import { app, testAssetDir, utils } from 'src/utils';import request from 'supertest';@@ -11,18 +10,13 @@ import { afterAll, beforeAll, describe, expect, it } from 'vitest';describe('/map', () => {let websocket: Socket;let admin: LoginResponseDto;- let nonAdmin: LoginResponseDto;- let asset: AssetMediaResponseDto;beforeAll(async () => {await utils.resetDatabase();admin = await utils.adminSetup({ onboarding: false });- nonAdmin = await utils.userSetup(admin.accessToken, createUserDto.user1);websocket = await utils.connectWebsocket(admin.accessToken);- asset = await utils.createAsset(admin.accessToken);-const files = ['formats/heic/IMG_2682.heic', 'metadata/gps-position/thompson-springs.jpg'];utils.resetEvents();const uploadFile = async (input: string) => {@@ -103,63 +97,6 @@ describe('/map', () => {});});- describe('GET /map/style.json', () => {- it('should require authentication', async () => {- const { status, body } = await request(app).get('/map/style.json');- expect(status).toBe(401);- expect(body).toEqual(errorDto.unauthorized);- });-- it('should allow shared link access', async () => {- const sharedLink = await utils.createSharedLink(admin.accessToken, {- type: SharedLinkType.Individual,- assetIds: [asset.id],- });- const { status, body } = await request(app).get(`/map/style.json?key=${sharedLink.key}`).query({ theme: 'dark' });-- expect(status).toBe(200);- expect(body).toEqual(expect.objectContaining({ id: 'immich-map-dark' }));- });-- it('should throw an error if a theme is not light or dark', async () => {- for (const theme of ['dark1', true, 123, '', null, undefined]) {- const { status, body } = await request(app)- .get('/map/style.json')- .query({ theme })- .set('Authorization', `Bearer ${admin.accessToken}`);- expect(status).toBe(400);- expect(body).toEqual(errorDto.badRequest(['theme must be one of the following values: light, dark']));- }- });-- it('should return the light style.json', async () => {- const { status, body } = await request(app)- .get('/map/style.json')- .query({ theme: 'light' })- .set('Authorization', `Bearer ${admin.accessToken}`);- expect(status).toBe(200);- expect(body).toEqual(expect.objectContaining({ id: 'immich-map-light' }));- });-- it('should return the dark style.json', async () => {- const { status, body } = await request(app)- .get('/map/style.json')- .query({ theme: 'dark' })- .set('Authorization', `Bearer ${admin.accessToken}`);- expect(status).toBe(200);- expect(body).toEqual(expect.objectContaining({ id: 'immich-map-dark' }));- });-- it('should not require admin authentication', async () => {- const { status, body } = await request(app)- .get('/map/style.json')- .query({ theme: 'dark' })- .set('Authorization', `Bearer ${nonAdmin.accessToken}`);- expect(status).toBe(200);- expect(body).toEqual(expect.objectContaining({ id: 'immich-map-dark' }));- });- });-describe('GET /map/reverse-geocode', () => {it('should require authentication', async () => {const { status, body } = await request(app).get('/map/reverse-geocode');diff --git a/e2e/src/api/specs/server-info.e2e-spec.ts b/e2e/src/api/specs/server-info.e2e-spec.tsindex 571d98cda7..1ef8d8602a 100644--- a/e2e/src/api/specs/server-info.e2e-spec.ts+++ b/e2e/src/api/specs/server-info.e2e-spec.ts@@ -128,6 +128,8 @@ describe('/server-info', () => {isInitialized: true,externalDomain: '',isOnboarded: false,+ mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',+ mapLightStyleUrl: 'https://tiles.immich.cloud/v1/style/light.json',});});});diff --git a/e2e/src/api/specs/server.e2e-spec.ts b/e2e/src/api/specs/server.e2e-spec.tsindex b19e6d85c4..3133460ada 100644--- a/e2e/src/api/specs/server.e2e-spec.ts+++ b/e2e/src/api/specs/server.e2e-spec.ts@@ -134,6 +134,8 @@ describe('/server', () => {isInitialized: true,externalDomain: '',isOnboarded: false,+ mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',+ mapLightStyleUrl: 'https://tiles.immich.cloud/v1/style/light.json',});});});diff --git a/mobile/.vscode/settings.json b/mobile/.vscode/settings.jsonindex aa43dab3fb..ceaf9a6ab8 100644--- a/mobile/.vscode/settings.json+++ b/mobile/.vscode/settings.json@@ -1,5 +1,5 @@{- "dart.flutterSdkPath": ".fvm/versions/3.24.0",+ "dart.flutterSdkPath": ".fvm/versions/3.24.3","search.exclude": {"**/.fvm": true},diff --git a/mobile/lib/models/server_info/server_config.model.dart b/mobile/lib/models/server_info/server_config.model.dartindex 8936939135..f07ffde522 100644--- a/mobile/lib/models/server_info/server_config.model.dart+++ b/mobile/lib/models/server_info/server_config.model.dart@@ -4,11 +4,15 @@ class ServerConfig {final int trashDays;final String oauthButtonText;final String externalDomain;+ final String mapDarkStyleUrl;+ final String mapLightStyleUrl;const ServerConfig({required this.trashDays,required this.oauthButtonText,required this.externalDomain,+ required this.mapDarkStyleUrl,+ required this.mapLightStyleUrl,});ServerConfig copyWith({@@ -20,6 +24,8 @@ class ServerConfig {trashDays: trashDays ?? this.trashDays,oauthButtonText: oauthButtonText ?? this.oauthButtonText,externalDomain: externalDomain ?? this.externalDomain,+ mapDarkStyleUrl: mapDarkStyleUrl,+ mapLightStyleUrl: mapLightStyleUrl,);}@@ -30,7 +36,9 @@ class ServerConfig {ServerConfig.fromDto(ServerConfigDto dto): trashDays = dto.trashDays,oauthButtonText = dto.oauthButtonText,- externalDomain = dto.externalDomain;+ externalDomain = dto.externalDomain,+ mapDarkStyleUrl = dto.mapDarkStyleUrl,+ mapLightStyleUrl = dto.mapLightStyleUrl;@overridebool operator ==(covariant ServerConfig other) {diff --git a/mobile/lib/pages/search/map/map.page.dart b/mobile/lib/pages/search/map/map.page.dartindex d226ea55a3..3be7e9b3e5 100644--- a/mobile/lib/pages/search/map/map.page.dart+++ b/mobile/lib/pages/search/map/map.page.dart@@ -1,4 +1,5 @@import 'dart:math';+import 'package:auto_route/auto_route.dart';import 'package:collection/collection.dart';import 'package:easy_localization/easy_localization.dart';@@ -7,27 +8,27 @@ import 'package:flutter_hooks/flutter_hooks.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:geolocator/geolocator.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';+import 'package:immich_mobile/entities/asset.entity.dart';import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/latlngbounds_extension.dart';import 'package:immich_mobile/extensions/maplibrecontroller_extensions.dart';import 'package:immich_mobile/models/map/map_event.model.dart';import 'package:immich_mobile/models/map/map_marker.model.dart';+import 'package:immich_mobile/providers/db.provider.dart';import 'package:immich_mobile/providers/map/map_marker.provider.dart';import 'package:immich_mobile/providers/map/map_state.provider.dart';+import 'package:immich_mobile/routing/router.dart';+import 'package:immich_mobile/utils/debounce.dart';+import 'package:immich_mobile/utils/immich_loading_overlay.dart';import 'package:immich_mobile/utils/map_utils.dart';import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';+import 'package:immich_mobile/widgets/common/immich_toast.dart';import 'package:immich_mobile/widgets/map/map_app_bar.dart';import 'package:immich_mobile/widgets/map/map_asset_grid.dart';import 'package:immich_mobile/widgets/map/map_bottom_sheet.dart';import 'package:immich_mobile/widgets/map/map_theme_override.dart';import 'package:immich_mobile/widgets/map/positioned_asset_marker_icon.dart';-import 'package:immich_mobile/routing/router.dart';-import 'package:immich_mobile/entities/asset.entity.dart';-import 'package:immich_mobile/providers/db.provider.dart';-import 'package:immich_mobile/widgets/common/immich_toast.dart';-import 'package:immich_mobile/utils/immich_loading_overlay.dart';-import 'package:immich_mobile/utils/debounce.dart';import 'package:maplibre_gl/maplibre_gl.dart';@RoutePage()@@ -304,7 +305,7 @@ class MapPage extends HookConsumerWidget {),Positioned(right: 0,- bottom: MediaQuery.of(context).padding.bottom + 16,+ bottom: MediaQuery.paddingOf(context).bottom + 16,child: ElevatedButton(onPressed: onZoomToLocation,style: ElevatedButton.styleFrom(diff --git a/mobile/lib/providers/map/map_state.provider.dart b/mobile/lib/providers/map/map_state.provider.dartindex 6d1630bba2..189a23cd0a 100644--- a/mobile/lib/providers/map/map_state.provider.dart+++ b/mobile/lib/providers/map/map_state.provider.dart@@ -1,28 +1,23 @@-import 'dart:io';-import 'package:flutter/material.dart';-import 'package:immich_mobile/extensions/response_extensions.dart';import 'package:immich_mobile/models/map/map_state.model.dart';import 'package:immich_mobile/providers/app_settings.provider.dart';+import 'package:immich_mobile/providers/server_info.provider.dart';import 'package:immich_mobile/services/app_settings.service.dart';-import 'package:immich_mobile/providers/api.provider.dart';-import 'package:logging/logging.dart';-import 'package:openapi/api.dart';-import 'package:path_provider/path_provider.dart';import 'package:riverpod_annotation/riverpod_annotation.dart';part 'map_state.provider.g.dart';@Riverpod(keepAlive: true)class MapStateNotifier extends _$MapStateNotifier {- final _log = Logger("MapStateNotifier");-@overrideMapState build() {final appSettingsProvider = ref.read(appSettingsServiceProvider);- // Fetch and save the Style JSONs- loadStyles();+ final lightStyleUrl =+ ref.read(serverInfoProvider).serverConfig.mapLightStyleUrl;+ final darkStyleUrl =+ ref.read(serverInfoProvider).serverConfig.mapDarkStyleUrl;+return MapState(themeMode: ThemeMode.values[appSettingsProvider.getSetting<int>(AppSettingsEnum.mapThemeMode)],@@ -34,65 +29,11 @@ class MapStateNotifier extends _$MapStateNotifier {appSettingsProvider.getSetting<bool>(AppSettingsEnum.mapwithPartners),relativeTime:appSettingsProvider.getSetting<int>(AppSettingsEnum.mapRelativeDate),+ lightStyleFetched: AsyncData(lightStyleUrl),+ darkStyleFetched: AsyncData(darkStyleUrl),);}- void loadStyles() async {- final documents = (await getApplicationDocumentsDirectory()).path;-- // Set to loading- state = state.copyWith(lightStyleFetched: const AsyncLoading());-- // Fetch and save light theme- final lightResponse = await ref- .read(apiServiceProvider)- .mapApi- .getMapStyleWithHttpInfo(MapTheme.light);-- if (lightResponse.statusCode >= HttpStatus.badRequest) {- state = state.copyWith(- lightStyleFetched: AsyncError(lightResponse.body, StackTrace.current),- );- _log.severe(- "Cannot fetch map light style",- lightResponse.toLoggerString(),- );- return;- }-- final lightJSON = lightResponse.body;- final lightFile = await File("$documents/map-style-light.json")- .writeAsString(lightJSON, flush: true);-- // Update state with path- state =- state.copyWith(lightStyleFetched: AsyncData(lightFile.absolute.path));-- // Set to loading- state = state.copyWith(darkStyleFetched: const AsyncLoading());-- // Fetch and save dark theme- final darkResponse = await ref- .read(apiServiceProvider)- .mapApi- .getMapStyleWithHttpInfo(MapTheme.dark);-- if (darkResponse.statusCode >= HttpStatus.badRequest) {- state = state.copyWith(- darkStyleFetched: AsyncError(darkResponse.body, StackTrace.current),- );- _log.severe("Cannot fetch map dark style", darkResponse.toLoggerString());- return;- }-- final darkJSON = darkResponse.body;- final darkFile = await File("$documents/map-style-dark.json")- .writeAsString(darkJSON, flush: true);-- // Update state with path- state = state.copyWith(darkStyleFetched: AsyncData(darkFile.absolute.path));- }-void switchTheme(ThemeMode mode) {ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapThemeMode,diff --git a/mobile/lib/providers/server_info.provider.dart b/mobile/lib/providers/server_info.provider.dartindex 6327f992f5..14521b06f6 100644--- a/mobile/lib/providers/server_info.provider.dart+++ b/mobile/lib/providers/server_info.provider.dart@@ -34,6 +34,9 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {trashDays: 30,oauthButtonText: '',externalDomain: '',+ mapLightStyleUrl:+ 'https://tiles.immich.cloud/v1/style/light.json',+ mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',),serverDiskInfo: const ServerDiskInfo(diskAvailable: "0",diff --git a/mobile/lib/utils/openapi_patching.dart b/mobile/lib/utils/openapi_patching.dartindex c473fbb833..255ad01247 100644--- a/mobile/lib/utils/openapi_patching.dart+++ b/mobile/lib/utils/openapi_patching.dart@@ -12,6 +12,19 @@ dynamic upgradeDto(dynamic value, String targetType) {addDefault(value, 'tags', TagsResponse().toJson());}break;+ case 'ServerConfigDto':+ if (value is Map) {+ addDefault(+ value,+ 'mapLightStyleUrl',+ 'https://tiles.immich.cloud/v1/style/light.json',+ );+ addDefault(+ value,+ 'mapDarkStyleUrl',+ 'https://tiles.immich.cloud/v1/style/dark.json',+ );+ }case 'UserResponseDto':if (value is Map) {addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());diff --git a/mobile/openapi/README.md b/mobile/openapi/README.mdindex c8135519de..285514e11c 100644--- a/mobile/openapi/README.md+++ b/mobile/openapi/README.md@@ -138,7 +138,6 @@ Class | Method | HTTP request | Description*LibrariesApi* | [**updateLibrary**](doc//LibrariesApi.md#updatelibrary) | **PUT** /libraries/{id} |*LibrariesApi* | [**validate**](doc//LibrariesApi.md#validate) | **POST** /libraries/{id}/validate |*MapApi* | [**getMapMarkers**](doc//MapApi.md#getmapmarkers) | **GET** /map/markers |-*MapApi* | [**getMapStyle**](doc//MapApi.md#getmapstyle) | **GET** /map/style.json |*MapApi* | [**reverseGeocode**](doc//MapApi.md#reversegeocode) | **GET** /map/reverse-geocode |*MemoriesApi* | [**addMemoryAssets**](doc//MemoriesApi.md#addmemoryassets) | **PUT** /memories/{id}/assets |*MemoriesApi* | [**createMemory**](doc//MemoriesApi.md#creatememory) | **POST** /memories |@@ -348,7 +347,6 @@ Class | Method | HTTP request | Description- [ManualJobName](doc//ManualJobName.md)- [MapMarkerResponseDto](doc//MapMarkerResponseDto.md)- [MapReverseGeocodeResponseDto](doc//MapReverseGeocodeResponseDto.md)- - [MapTheme](doc//MapTheme.md)- [MemoriesResponse](doc//MemoriesResponse.md)- [MemoriesUpdate](doc//MemoriesUpdate.md)- [MemoryCreateDto](doc//MemoryCreateDto.md)diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dartindex 7fa06b0487..fc0224a8c2 100644--- a/mobile/openapi/lib/api.dart+++ b/mobile/openapi/lib/api.dart@@ -159,7 +159,6 @@ part 'model/logout_response_dto.dart';part 'model/manual_job_name.dart';part 'model/map_marker_response_dto.dart';part 'model/map_reverse_geocode_response_dto.dart';-part 'model/map_theme.dart';part 'model/memories_response.dart';part 'model/memories_update.dart';part 'model/memory_create_dto.dart';diff --git a/mobile/openapi/lib/api/map_api.dart b/mobile/openapi/lib/api/map_api.dartindex 2846dae6c3..9644fbfc5c 100644--- a/mobile/openapi/lib/api/map_api.dart+++ b/mobile/openapi/lib/api/map_api.dart@@ -105,62 +105,6 @@ class MapApi {return null;}- /// Performs an HTTP 'GET /map/style.json' operation and returns the [Response].- /// Parameters:- ///- /// * [MapTheme] theme (required):- ///- /// * [String] key:- Future<Response> getMapStyleWithHttpInfo(MapTheme theme, { String? key, }) async {- // ignore: prefer_const_declarations- final path = r'/map/style.json';-- // ignore: prefer_final_locals- Object? postBody;-- final queryParams = <QueryParam>[];- final headerParams = <String, String>{};- final formParams = <String, String>{};-- if (key != null) {- queryParams.addAll(_queryParams('', 'key', key));- }- queryParams.addAll(_queryParams('', 'theme', theme));-- const contentTypes = <String>[];--- return apiClient.invokeAPI(- path,- 'GET',- queryParams,- postBody,- headerParams,- formParams,- contentTypes.isEmpty ? null : contentTypes.first,- );- }-- /// Parameters:- ///- /// * [MapTheme] theme (required):- ///- /// * [String] key:- Future<Object?> getMapStyle(MapTheme theme, { String? key, }) async {- final response = await getMapStyleWithHttpInfo(theme, key: key, );- if (response.statusCode >= HttpStatus.badRequest) {- throw ApiException(response.statusCode, await _decodeBodyBytes(response));- }- // When a remote server returns no body with a status of 204, we shall not decode it.- // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"- // FormatException when trying to decode an empty string.- if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {- return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'Object',) as Object;-- }- return null;- }-/// Performs an HTTP 'GET /map/reverse-geocode' operation and returns the [Response]./// Parameters:///diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dartindex e857f51e3a..828c0b9ed9 100644--- a/mobile/openapi/lib/api_client.dart+++ b/mobile/openapi/lib/api_client.dart@@ -372,8 +372,6 @@ class ApiClient {return MapMarkerResponseDto.fromJson(value);case 'MapReverseGeocodeResponseDto':return MapReverseGeocodeResponseDto.fromJson(value);- case 'MapTheme':- return MapThemeTypeTransformer().decode(value);case 'MemoriesResponse':return MemoriesResponse.fromJson(value);case 'MemoriesUpdate':diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dartindex 0f3cc41097..b7c6ad5e01 100644--- a/mobile/openapi/lib/api_helper.dart+++ b/mobile/openapi/lib/api_helper.dart@@ -100,9 +100,6 @@ String parameterToString(dynamic value) {if (value is ManualJobName) {return ManualJobNameTypeTransformer().encode(value).toString();}- if (value is MapTheme) {- return MapThemeTypeTransformer().encode(value).toString();- }if (value is MemoryType) {return MemoryTypeTypeTransformer().encode(value).toString();}diff --git a/mobile/openapi/lib/model/map_theme.dart b/mobile/openapi/lib/model/map_theme.dartdeleted file mode 100644index e2553790c6..0000000000--- a/mobile/openapi/lib/model/map_theme.dart+++ /dev/null@@ -1,85 +0,0 @@-//-// AUTO-GENERATED FILE, DO NOT MODIFY!-//-// @dart=2.18--// ignore_for_file: unused_element, unused_import-// ignore_for_file: always_put_required_named_parameters_first-// ignore_for_file: constant_identifier_names-// ignore_for_file: lines_longer_than_80_chars--part of openapi.api;---class MapTheme {- /// Instantiate a new enum with the provided [value].- const MapTheme._(this.value);-- /// The underlying value of this enum member.- final String value;-- @override- String toString() => value;-- String toJson() => value;-- static const light = MapTheme._(r'light');- static const dark = MapTheme._(r'dark');-- /// List of all possible values in this [enum][MapTheme].- static const values = <MapTheme>[- light,- dark,- ];-- static MapTheme? fromJson(dynamic value) => MapThemeTypeTransformer().decode(value);-- static List<MapTheme> listFromJson(dynamic json, {bool growable = false,}) {- final result = <MapTheme>[];- if (json is List && json.isNotEmpty) {- for (final row in json) {- final value = MapTheme.fromJson(row);- if (value != null) {- result.add(value);- }- }- }- return result.toList(growable: growable);- }-}--/// Transformation class that can [encode] an instance of [MapTheme] to String,-/// and [decode] dynamic data back to [MapTheme].-class MapThemeTypeTransformer {- factory MapThemeTypeTransformer() => _instance ??= const MapThemeTypeTransformer._();-- const MapThemeTypeTransformer._();-- String encode(MapTheme data) => data.value;-- /// Decodes a [dynamic value][data] to a MapTheme.- ///- /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,- /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]- /// cannot be decoded successfully, then an [UnimplementedError] is thrown.- ///- /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,- /// and users are still using an old app with the old code.- MapTheme? decode(dynamic data, {bool allowNull = true}) {- if (data != null) {- switch (data) {- case r'light': return MapTheme.light;- case r'dark': return MapTheme.dark;- default:- if (!allowNull) {- throw ArgumentError('Unknown enum value to decode: $data');- }- }- }- return null;- }-- /// Singleton [MapThemeTypeTransformer] instance.- static MapThemeTypeTransformer? _instance;-}-diff --git a/mobile/openapi/lib/model/server_config_dto.dart b/mobile/openapi/lib/model/server_config_dto.dartindex c45ed32ac0..bd5c2405e2 100644--- a/mobile/openapi/lib/model/server_config_dto.dart+++ b/mobile/openapi/lib/model/server_config_dto.dart@@ -17,6 +17,8 @@ class ServerConfigDto {required this.isInitialized,required this.isOnboarded,required this.loginPageMessage,+ required this.mapDarkStyleUrl,+ required this.mapLightStyleUrl,required this.oauthButtonText,required this.trashDays,required this.userDeleteDelay,@@ -30,6 +32,10 @@ class ServerConfigDto {String loginPageMessage;+ String mapDarkStyleUrl;++ String mapLightStyleUrl;+String oauthButtonText;int trashDays;@@ -42,6 +48,8 @@ class ServerConfigDto {other.isInitialized == isInitialized &&other.isOnboarded == isOnboarded &&other.loginPageMessage == loginPageMessage &&+ other.mapDarkStyleUrl == mapDarkStyleUrl &&+ other.mapLightStyleUrl == mapLightStyleUrl &&other.oauthButtonText == oauthButtonText &&other.trashDays == trashDays &&other.userDeleteDelay == userDeleteDelay;@@ -53,12 +61,14 @@ class ServerConfigDto {(isInitialized.hashCode) +(isOnboarded.hashCode) +(loginPageMessage.hashCode) ++ (mapDarkStyleUrl.hashCode) ++ (mapLightStyleUrl.hashCode) +(oauthButtonText.hashCode) +(trashDays.hashCode) +(userDeleteDelay.hashCode);@override- String toString() => 'ServerConfigDto[externalDomain=$externalDomain, isInitialized=$isInitialized, isOnboarded=$isOnboarded, loginPageMessage=$loginPageMessage, oauthButtonText=$oauthButtonText, trashDays=$trashDays, userDeleteDelay=$userDeleteDelay]';+ String toString() => 'ServerConfigDto[externalDomain=$externalDomain, isInitialized=$isInitialized, isOnboarded=$isOnboarded, loginPageMessage=$loginPageMessage, mapDarkStyleUrl=$mapDarkStyleUrl, mapLightStyleUrl=$mapLightStyleUrl, oauthButtonText=$oauthButtonText, trashDays=$trashDays, userDeleteDelay=$userDeleteDelay]';Map<String, dynamic> toJson() {final json = <String, dynamic>{};@@ -66,6 +76,8 @@ class ServerConfigDto {json[r'isInitialized'] = this.isInitialized;json[r'isOnboarded'] = this.isOnboarded;json[r'loginPageMessage'] = this.loginPageMessage;+ json[r'mapDarkStyleUrl'] = this.mapDarkStyleUrl;+ json[r'mapLightStyleUrl'] = this.mapLightStyleUrl;json[r'oauthButtonText'] = this.oauthButtonText;json[r'trashDays'] = this.trashDays;json[r'userDeleteDelay'] = this.userDeleteDelay;@@ -85,6 +97,8 @@ class ServerConfigDto {isInitialized: mapValueOfType<bool>(json, r'isInitialized')!,isOnboarded: mapValueOfType<bool>(json, r'isOnboarded')!,loginPageMessage: mapValueOfType<String>(json, r'loginPageMessage')!,+ mapDarkStyleUrl: mapValueOfType<String>(json, r'mapDarkStyleUrl')!,+ mapLightStyleUrl: mapValueOfType<String>(json, r'mapLightStyleUrl')!,oauthButtonText: mapValueOfType<String>(json, r'oauthButtonText')!,trashDays: mapValueOfType<int>(json, r'trashDays')!,userDeleteDelay: mapValueOfType<int>(json, r'userDeleteDelay')!,@@ -139,6 +153,8 @@ class ServerConfigDto {'isInitialized','isOnboarded','loginPageMessage',+ 'mapDarkStyleUrl',+ 'mapLightStyleUrl','oauthButtonText','trashDays','userDeleteDelay',diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.jsonindex 706ff5b8fb..4e7c711978 100644--- a/open-api/immich-openapi-specs.json+++ b/open-api/immich-openapi-specs.json@@ -3167,55 +3167,6 @@]}},- "/map/style.json": {- "get": {- "operationId": "getMapStyle",- "parameters": [- {- "name": "key",- "required": false,- "in": "query",- "schema": {- "type": "string"- }- },- {- "name": "theme",- "required": true,- "in": "query",- "schema": {- "$ref": "#/components/schemas/MapTheme"- }- }- ],- "responses": {- "200": {- "content": {- "application/json": {- "schema": {- "type": "object"- }- }- },- "description": ""- }- },- "security": [- {- "bearer": []- },- {- "cookie": []- },- {- "api_key": []- }- ],- "tags": [- "Map"- ]- }- },"/memories": {"get": {"operationId": "searchMemories",@@ -5356,8 +5307,8 @@"name": "password","required": false,"in": "query",- "example": "password","schema": {+ "example": "password","type": "string"}},@@ -9695,13 +9646,6 @@],"type": "object"},- "MapTheme": {- "enum": [- "light",- "dark"- ],- "type": "string"- },"MemoriesResponse": {"properties": {"enabled": {@@ -10917,6 +10861,12 @@"loginPageMessage": {"type": "string"},+ "mapDarkStyleUrl": {+ "type": "string"+ },+ "mapLightStyleUrl": {+ "type": "string"+ },"oauthButtonText": {"type": "string"},@@ -10932,6 +10882,8 @@"isInitialized","isOnboarded","loginPageMessage",+ "mapDarkStyleUrl",+ "mapLightStyleUrl","oauthButtonText","trashDays","userDeleteDelay"diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.tsindex 8e607f7570..d1b88afabb 100644--- a/open-api/typescript-sdk/src/fetch-client.ts+++ b/open-api/typescript-sdk/src/fetch-client.ts@@ -928,6 +928,8 @@ export type ServerConfigDto = {isInitialized: boolean;isOnboarded: boolean;loginPageMessage: string;+ mapDarkStyleUrl: string;+ mapLightStyleUrl: string;oauthButtonText: string;trashDays: number;userDeleteDelay: number;@@ -2138,20 +2140,6 @@ export function reverseGeocode({ lat, lon }: {...opts}));}-export function getMapStyle({ key, theme }: {- key?: string;- theme: MapTheme;-}, opts?: Oazapfts.RequestOpts) {- return oazapfts.ok(oazapfts.fetchJson<{- status: 200;- data: object;- }>(`/map/style.json${QS.query(QS.explode({- key,- theme- }))}`, {- ...opts- }));-}export function searchMemories(opts?: Oazapfts.RequestOpts) {return oazapfts.ok(oazapfts.fetchJson<{status: 200;@@ -3469,10 +3457,6 @@ export enum JobCommand {Empty = "empty",ClearFailed = "clear-failed"}-export enum MapTheme {- Light = "light",- Dark = "dark"-}export enum MemoryType {OnThisDay = "on_this_day"}diff --git a/server/package-lock.json b/server/package-lock.jsonindex ee432b9e06..9abfc6b5ce 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -733,9 +733,9 @@}},"node_modules/@esbuild/aix-ppc64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",- "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",+ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==","cpu": ["ppc64"],@@ -749,9 +749,9 @@}},"node_modules/@esbuild/android-arm": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",- "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",+ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==","cpu": ["arm"],@@ -765,9 +765,9 @@}},"node_modules/@esbuild/android-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",- "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",+ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==","cpu": ["arm64"],@@ -781,9 +781,9 @@}},"node_modules/@esbuild/android-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",- "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",+ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==","cpu": ["x64"],@@ -797,9 +797,9 @@}},"node_modules/@esbuild/darwin-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",- "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",+ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==","cpu": ["arm64"],@@ -813,9 +813,9 @@}},"node_modules/@esbuild/darwin-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",- "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",+ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==","cpu": ["x64"],@@ -829,9 +829,9 @@}},"node_modules/@esbuild/freebsd-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",- "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",+ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==","cpu": ["arm64"],@@ -845,9 +845,9 @@}},"node_modules/@esbuild/freebsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",- "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",+ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==","cpu": ["x64"],@@ -861,9 +861,9 @@}},"node_modules/@esbuild/linux-arm": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",- "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",+ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==","cpu": ["arm"],@@ -877,9 +877,9 @@}},"node_modules/@esbuild/linux-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",- "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",+ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==","cpu": ["arm64"],@@ -893,9 +893,9 @@}},"node_modules/@esbuild/linux-ia32": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",- "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",+ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==","cpu": ["ia32"],@@ -909,9 +909,9 @@}},"node_modules/@esbuild/linux-loong64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",- "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",+ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==","cpu": ["loong64"],@@ -925,9 +925,9 @@}},"node_modules/@esbuild/linux-mips64el": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",- "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",+ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==","cpu": ["mips64el"],@@ -941,9 +941,9 @@}},"node_modules/@esbuild/linux-ppc64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",- "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",+ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==","cpu": ["ppc64"],@@ -957,9 +957,9 @@}},"node_modules/@esbuild/linux-riscv64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",- "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",+ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==","cpu": ["riscv64"],@@ -973,9 +973,9 @@}},"node_modules/@esbuild/linux-s390x": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",- "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",+ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==","cpu": ["s390x"],@@ -989,9 +989,9 @@}},"node_modules/@esbuild/linux-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",- "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",+ "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==","cpu": ["x64"],@@ -1005,9 +1005,9 @@}},"node_modules/@esbuild/netbsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",- "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",+ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==","cpu": ["x64"],@@ -1021,9 +1021,9 @@}},"node_modules/@esbuild/openbsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",- "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",+ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==","cpu": ["x64"],@@ -1037,9 +1037,9 @@}},"node_modules/@esbuild/sunos-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",- "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",+ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==","cpu": ["x64"],@@ -1053,9 +1053,9 @@}},"node_modules/@esbuild/win32-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",- "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",+ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==","cpu": ["arm64"],@@ -1069,9 +1069,9 @@}},"node_modules/@esbuild/win32-ia32": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",- "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",+ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==","cpu": ["ia32"],@@ -1085,9 +1085,9 @@}},"node_modules/@esbuild/win32-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",- "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",+ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==","cpu": ["x64"],@@ -2085,16 +2085,16 @@}},"node_modules/@nestjs/core": {- "version": "10.4.1",- "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.4.1.tgz",- "integrity": "sha512-9I1WdfOBCCHdUm+ClBJupOuZQS6UxzIWHIq6Vp1brAA5ZKl/Wq6BVwSsbnUJGBy3J3PM2XHmR0EQ4fwX3nR7lA==",+ "version": "10.4.4",+ "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.4.4.tgz",+ "integrity": "sha512-y9tjmAzU6LTh1cC/lWrRsCcOd80khSR0qAHAqwY2svbW+AhsR/XCzgpZrAAKJrm/dDfjLCZKyxJSayeirGcW5Q==","hasInstallScript": true,"dependencies": {"@nuxtjs/opencollective": "0.3.2","fast-safe-stringify": "2.1.1","iterare": "1.2.1",- "path-to-regexp": "3.2.0",- "tslib": "2.6.3",+ "path-to-regexp": "3.3.0",+ "tslib": "2.7.0","uid": "2.0.2"},"funding": {@@ -2121,6 +2121,11 @@}}},+ "node_modules/@nestjs/core/node_modules/tslib": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="+ },"node_modules/@nestjs/event-emitter": {"version": "2.0.4","resolved": "https://registry.npmjs.org/@nestjs/event-emitter/-/event-emitter-2.0.4.tgz",@@ -2153,15 +2158,15 @@}},"node_modules/@nestjs/platform-express": {- "version": "10.4.1",- "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-10.4.1.tgz",- "integrity": "sha512-ccfqIDAq/bg1ShLI5KGtaLaYGykuAdvCi57ohewH7eKJSIpWY1DQjbgKlFfXokALYUq1YOMGqjeZ244OWHfDQg==",+ "version": "10.4.4",+ "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-10.4.4.tgz",+ "integrity": "sha512-y52q1MxhbHaT3vAgWd08RgiYon0lJgtTa8U6g6gV0KI0IygwZhDQFJVxnrRDUdxQGIP5CKHmfQu3sk9gTNFoEA==","dependencies": {- "body-parser": "1.20.2",+ "body-parser": "1.20.3","cors": "2.8.5",- "express": "4.19.2",+ "express": "4.21.0","multer": "1.4.4-lts.1",- "tslib": "2.6.3"+ "tslib": "2.7.0"},"funding": {"type": "opencollective",@@ -2172,6 +2177,11 @@"@nestjs/core": "^10.0.0"}},+ "node_modules/@nestjs/platform-express/node_modules/tslib": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="+ },"node_modules/@nestjs/platform-socket.io": {"version": "10.4.1","resolved": "https://registry.npmjs.org/@nestjs/platform-socket.io/-/platform-socket.io-10.4.1.tgz",@@ -2238,15 +2248,15 @@"dev": true},"node_modules/@nestjs/swagger": {- "version": "7.4.0",- "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.4.0.tgz",- "integrity": "sha512-dCiwKkRxcR7dZs5jtrGspBAe/nqJd1AYzOBTzw9iCdbq3BGrLpwokelk6lFZPe4twpTsPQqzNKBwKzVbI6AR/g==",+ "version": "7.4.2",+ "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.4.2.tgz",+ "integrity": "sha512-Mu6TEn1M/owIvAx2B4DUQObQXqo2028R2s9rSZ/hJEgBK95+doTwS0DjmVA2wTeZTyVtXOoN7CsoM5pONBzvKQ==","dependencies": {"@microsoft/tsdoc": "^0.15.0","@nestjs/mapped-types": "2.0.5","js-yaml": "4.1.0","lodash": "4.17.21",- "path-to-regexp": "3.2.0",+ "path-to-regexp": "3.3.0","swagger-ui-dist": "5.17.14"},"peerDependencies": {@@ -4551,9 +4561,9 @@}},"node_modules/@rollup/rollup-android-arm-eabi": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz",- "integrity": "sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",+ "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==","cpu": ["arm"],@@ -4564,9 +4574,9 @@]},"node_modules/@rollup/rollup-android-arm64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz",- "integrity": "sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",+ "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==","cpu": ["arm64"],@@ -4577,9 +4587,9 @@]},"node_modules/@rollup/rollup-darwin-arm64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz",- "integrity": "sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",+ "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==","cpu": ["arm64"],@@ -4590,9 +4600,9 @@]},"node_modules/@rollup/rollup-darwin-x64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz",- "integrity": "sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",+ "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==","cpu": ["x64"],@@ -4603,9 +4613,9 @@]},"node_modules/@rollup/rollup-linux-arm-gnueabihf": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz",- "integrity": "sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",+ "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==","cpu": ["arm"],@@ -4616,9 +4626,9 @@]},"node_modules/@rollup/rollup-linux-arm-musleabihf": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz",- "integrity": "sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",+ "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==","cpu": ["arm"],@@ -4629,9 +4639,9 @@]},"node_modules/@rollup/rollup-linux-arm64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz",- "integrity": "sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",+ "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==","cpu": ["arm64"],@@ -4642,9 +4652,9 @@]},"node_modules/@rollup/rollup-linux-arm64-musl": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz",- "integrity": "sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",+ "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==","cpu": ["arm64"],@@ -4655,9 +4665,9 @@]},"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz",- "integrity": "sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",+ "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==","cpu": ["ppc64"],@@ -4668,9 +4678,9 @@]},"node_modules/@rollup/rollup-linux-riscv64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz",- "integrity": "sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",+ "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==","cpu": ["riscv64"],@@ -4681,9 +4691,9 @@]},"node_modules/@rollup/rollup-linux-s390x-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz",- "integrity": "sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",+ "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==","cpu": ["s390x"],@@ -4694,9 +4704,9 @@]},"node_modules/@rollup/rollup-linux-x64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz",- "integrity": "sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",+ "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==","cpu": ["x64"],@@ -4707,9 +4717,9 @@]},"node_modules/@rollup/rollup-linux-x64-musl": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz",- "integrity": "sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",+ "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==","cpu": ["x64"],@@ -4720,9 +4730,9 @@]},"node_modules/@rollup/rollup-win32-arm64-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz",- "integrity": "sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",+ "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==","cpu": ["arm64"],@@ -4733,9 +4743,9 @@]},"node_modules/@rollup/rollup-win32-ia32-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz",- "integrity": "sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",+ "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==","cpu": ["ia32"],@@ -4746,9 +4756,9 @@]},"node_modules/@rollup/rollup-win32-x64-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz",- "integrity": "sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",+ "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==","cpu": ["x64"],@@ -6689,9 +6699,9 @@}},"node_modules/body-parser": {- "version": "1.20.2",- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",- "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",+ "version": "1.20.3",+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",+ "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==","dependencies": {"bytes": "3.1.2","content-type": "~1.0.5",@@ -6701,7 +6711,7 @@"http-errors": "2.0.0","iconv-lite": "0.4.24","on-finished": "2.4.1",- "qs": "6.11.0",+ "qs": "6.13.0","raw-body": "2.5.2","type-is": "~1.6.18","unpipe": "1.0.0"@@ -7995,9 +8005,9 @@"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="},"node_modules/encodeurl": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",- "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==","engines": {"node": ">= 0.8"}@@ -8012,9 +8022,9 @@}},"node_modules/engine.io": {- "version": "6.5.2",- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.2.tgz",- "integrity": "sha512-IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA==",+ "version": "6.5.5",+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",+ "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==","dependencies": {"@types/cookie": "^0.4.1","@types/cors": "^2.8.12",@@ -8025,7 +8035,7 @@"cors": "~2.8.5","debug": "~4.3.1","engine.io-parser": "~5.2.1",- "ws": "~8.11.0"+ "ws": "~8.17.1"},"engines": {"node": ">=10.2.0"@@ -8097,9 +8107,9 @@"dev": true},"node_modules/esbuild": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",- "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",+ "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==","dev": true,"hasInstallScript": true,"bin": {@@ -8109,29 +8119,29 @@"node": ">=12"},"optionalDependencies": {- "@esbuild/aix-ppc64": "0.20.2",- "@esbuild/android-arm": "0.20.2",- "@esbuild/android-arm64": "0.20.2",- "@esbuild/android-x64": "0.20.2",- "@esbuild/darwin-arm64": "0.20.2",- "@esbuild/darwin-x64": "0.20.2",- "@esbuild/freebsd-arm64": "0.20.2",- "@esbuild/freebsd-x64": "0.20.2",- "@esbuild/linux-arm": "0.20.2",- "@esbuild/linux-arm64": "0.20.2",- "@esbuild/linux-ia32": "0.20.2",- "@esbuild/linux-loong64": "0.20.2",- "@esbuild/linux-mips64el": "0.20.2",- "@esbuild/linux-ppc64": "0.20.2",- "@esbuild/linux-riscv64": "0.20.2",- "@esbuild/linux-s390x": "0.20.2",- "@esbuild/linux-x64": "0.20.2",- "@esbuild/netbsd-x64": "0.20.2",- "@esbuild/openbsd-x64": "0.20.2",- "@esbuild/sunos-x64": "0.20.2",- "@esbuild/win32-arm64": "0.20.2",- "@esbuild/win32-ia32": "0.20.2",- "@esbuild/win32-x64": "0.20.2"+ "@esbuild/aix-ppc64": "0.21.5",+ "@esbuild/android-arm": "0.21.5",+ "@esbuild/android-arm64": "0.21.5",+ "@esbuild/android-x64": "0.21.5",+ "@esbuild/darwin-arm64": "0.21.5",+ "@esbuild/darwin-x64": "0.21.5",+ "@esbuild/freebsd-arm64": "0.21.5",+ "@esbuild/freebsd-x64": "0.21.5",+ "@esbuild/linux-arm": "0.21.5",+ "@esbuild/linux-arm64": "0.21.5",+ "@esbuild/linux-ia32": "0.21.5",+ "@esbuild/linux-loong64": "0.21.5",+ "@esbuild/linux-mips64el": "0.21.5",+ "@esbuild/linux-ppc64": "0.21.5",+ "@esbuild/linux-riscv64": "0.21.5",+ "@esbuild/linux-s390x": "0.21.5",+ "@esbuild/linux-x64": "0.21.5",+ "@esbuild/netbsd-x64": "0.21.5",+ "@esbuild/openbsd-x64": "0.21.5",+ "@esbuild/sunos-x64": "0.21.5",+ "@esbuild/win32-arm64": "0.21.5",+ "@esbuild/win32-ia32": "0.21.5",+ "@esbuild/win32-x64": "0.21.5"}},"node_modules/escalade": {@@ -8524,36 +8534,36 @@]},"node_modules/express": {- "version": "4.19.2",- "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",- "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",+ "version": "4.21.0",+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",+ "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==","dependencies": {"accepts": "~1.3.8","array-flatten": "1.1.1",- "body-parser": "1.20.2",+ "body-parser": "1.20.3","content-disposition": "0.5.4","content-type": "~1.0.4","cookie": "0.6.0","cookie-signature": "1.0.6","debug": "2.6.9","depd": "2.0.0",- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","etag": "~1.8.1",- "finalhandler": "1.2.0",+ "finalhandler": "1.3.1","fresh": "0.5.2","http-errors": "2.0.0",- "merge-descriptors": "1.0.1",+ "merge-descriptors": "1.0.3","methods": "~1.1.2","on-finished": "2.4.1","parseurl": "~1.3.3",- "path-to-regexp": "0.1.7",+ "path-to-regexp": "0.1.10","proxy-addr": "~2.0.7",- "qs": "6.11.0",+ "qs": "6.13.0","range-parser": "~1.2.1","safe-buffer": "5.2.1",- "send": "0.18.0",- "serve-static": "1.15.0",+ "send": "0.19.0",+ "serve-static": "1.16.2","setprototypeof": "1.2.0","statuses": "2.0.1","type-is": "~1.6.18",@@ -8586,9 +8596,9 @@"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="},"node_modules/express/node_modules/path-to-regexp": {- "version": "0.1.7",- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",- "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",+ "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="},"node_modules/extend": {"version": "3.0.2",@@ -8719,12 +8729,12 @@}},"node_modules/finalhandler": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",- "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",+ "version": "1.3.1",+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",+ "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==","dependencies": {"debug": "2.6.9",- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","on-finished": "2.4.1","parseurl": "~1.3.3",@@ -10281,9 +10291,12 @@}},"node_modules/merge-descriptors": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",- "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",+ "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }},"node_modules/merge-stream": {"version": "2.0.0",@@ -10308,11 +10321,11 @@}},"node_modules/micromatch": {- "version": "4.0.5",- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",+ "version": "4.0.8",+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==","dependencies": {- "braces": "^3.0.2",+ "braces": "^3.0.3","picomatch": "^2.3.1"},"engines": {@@ -10928,9 +10941,12 @@}},"node_modules/object-inspect": {- "version": "1.12.3",- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",+ "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",+ "engines": {+ "node": ">= 0.4"+ },"funding": {"url": "https://github.com/sponsors/ljharb"}@@ -11247,9 +11263,9 @@}},"node_modules/path-to-regexp": {- "version": "3.2.0",- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",- "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA=="+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",+ "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw=="},"node_modules/path-type": {"version": "4.0.0",@@ -11384,9 +11400,9 @@}},"node_modules/picocolors": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",+ "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="},"node_modules/picomatch": {"version": "4.0.2",@@ -11433,9 +11449,9 @@"integrity": "sha512-3hTIM2j/v9Lio+wOyur3kckD4NxruZhpowUbEgmyikW+a2Kppjtu1eN+AhnMQtoHW46zld88JiYWv6fxpsDrTQ=="},"node_modules/postcss": {- "version": "8.4.38",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",- "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",+ "version": "8.4.47",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",+ "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==","funding": [{"type": "opencollective",@@ -11452,8 +11468,8 @@],"dependencies": {"nanoid": "^3.3.7",- "picocolors": "^1.0.0",- "source-map-js": "^1.2.0"+ "picocolors": "^1.1.0",+ "source-map-js": "^1.2.1"},"engines": {"node": "^10 || ^12 || >=14"@@ -11806,11 +11822,11 @@}},"node_modules/qs": {- "version": "6.11.0",- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",+ "version": "6.13.0",+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",+ "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==","dependencies": {- "side-channel": "^1.0.4"+ "side-channel": "^1.0.6"},"engines": {"node": ">=0.6"@@ -12862,9 +12878,9 @@}},"node_modules/rollup": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.3.tgz",- "integrity": "sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",+ "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==","dev": true,"dependencies": {"@types/estree": "1.0.5"@@ -12877,22 +12893,22 @@"npm": ">=8.0.0"},"optionalDependencies": {- "@rollup/rollup-android-arm-eabi": "4.14.3",- "@rollup/rollup-android-arm64": "4.14.3",- "@rollup/rollup-darwin-arm64": "4.14.3",- "@rollup/rollup-darwin-x64": "4.14.3",- "@rollup/rollup-linux-arm-gnueabihf": "4.14.3",- "@rollup/rollup-linux-arm-musleabihf": "4.14.3",- "@rollup/rollup-linux-arm64-gnu": "4.14.3",- "@rollup/rollup-linux-arm64-musl": "4.14.3",- "@rollup/rollup-linux-powerpc64le-gnu": "4.14.3",- "@rollup/rollup-linux-riscv64-gnu": "4.14.3",- "@rollup/rollup-linux-s390x-gnu": "4.14.3",- "@rollup/rollup-linux-x64-gnu": "4.14.3",- "@rollup/rollup-linux-x64-musl": "4.14.3",- "@rollup/rollup-win32-arm64-msvc": "4.14.3",- "@rollup/rollup-win32-ia32-msvc": "4.14.3",- "@rollup/rollup-win32-x64-msvc": "4.14.3",+ "@rollup/rollup-android-arm-eabi": "4.22.4",+ "@rollup/rollup-android-arm64": "4.22.4",+ "@rollup/rollup-darwin-arm64": "4.22.4",+ "@rollup/rollup-darwin-x64": "4.22.4",+ "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",+ "@rollup/rollup-linux-arm-musleabihf": "4.22.4",+ "@rollup/rollup-linux-arm64-gnu": "4.22.4",+ "@rollup/rollup-linux-arm64-musl": "4.22.4",+ "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",+ "@rollup/rollup-linux-riscv64-gnu": "4.22.4",+ "@rollup/rollup-linux-s390x-gnu": "4.22.4",+ "@rollup/rollup-linux-x64-gnu": "4.22.4",+ "@rollup/rollup-linux-x64-musl": "4.22.4",+ "@rollup/rollup-win32-arm64-msvc": "4.22.4",+ "@rollup/rollup-win32-ia32-msvc": "4.22.4",+ "@rollup/rollup-win32-x64-msvc": "4.22.4","fsevents": "~2.3.2"}},@@ -13047,9 +13063,9 @@}},"node_modules/send": {- "version": "0.18.0",- "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",- "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",+ "version": "0.19.0",+ "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",+ "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==","dependencies": {"debug": "2.6.9","depd": "2.0.0",@@ -13082,6 +13098,14 @@"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz","integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="},+ "node_modules/send/node_modules/encodeurl": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",+ "engines": {+ "node": ">= 0.8"+ }+ },"node_modules/serialize-javascript": {"version": "6.0.2","resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",@@ -13092,14 +13116,14 @@}},"node_modules/serve-static": {- "version": "1.15.0",- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",- "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",+ "version": "1.16.2",+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",+ "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==","dependencies": {- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","parseurl": "~1.3.3",- "send": "0.18.0"+ "send": "0.19.0"},"engines": {"node": ">= 0.8.0"@@ -13228,13 +13252,17 @@"integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="},"node_modules/side-channel": {- "version": "1.0.4",- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",+ "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==","dependencies": {- "call-bind": "^1.0.0",- "get-intrinsic": "^1.0.2",- "object-inspect": "^1.9.0"+ "call-bind": "^1.0.7",+ "es-errors": "^1.3.0",+ "get-intrinsic": "^1.2.4",+ "object-inspect": "^1.13.1"+ },+ "engines": {+ "node": ">= 0.4"},"funding": {"url": "https://github.com/sponsors/ljharb"@@ -13314,26 +13342,6 @@"ws": "~8.17.1"}},- "node_modules/socket.io-adapter/node_modules/ws": {- "version": "8.17.1",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",- "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",- "engines": {- "node": ">=10.0.0"- },- "peerDependencies": {- "bufferutil": "^4.0.1",- "utf-8-validate": ">=5.0.2"- },- "peerDependenciesMeta": {- "bufferutil": {- "optional": true- },- "utf-8-validate": {- "optional": true- }- }- },"node_modules/socket.io-parser": {"version": "4.2.4","resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",@@ -13356,9 +13364,9 @@}},"node_modules/source-map-js": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",- "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==","engines": {"node": ">=0.10.0"}@@ -13820,9 +13828,9 @@}},"node_modules/tar": {- "version": "6.2.0",- "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",- "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",+ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==","dependencies": {"chownr": "^2.0.0","fs-minipass": "^2.0.0",@@ -14794,14 +14802,14 @@}},"node_modules/vite": {- "version": "5.2.11",- "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",- "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",+ "version": "5.4.7",+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",+ "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==","dev": true,"dependencies": {- "esbuild": "^0.20.1",- "postcss": "^8.4.38",- "rollup": "^4.13.0"+ "esbuild": "^0.21.3",+ "postcss": "^8.4.43",+ "rollup": "^4.20.0"},"bin": {"vite": "bin/vite.js"@@ -14820,6 +14828,7 @@"less": "*","lightningcss": "^1.21.0","sass": "*",+ "sass-embedded": "*","stylus": "*","sugarss": "*","terser": "^5.4.0"@@ -14837,6 +14846,9 @@"sass": {"optional": true},+ "sass-embedded": {+ "optional": true+ },"stylus": {"optional": true},@@ -15167,15 +15179,15 @@"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="},"node_modules/ws": {- "version": "8.11.0",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",+ "version": "8.17.1",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",+ "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==","engines": {"node": ">=10.0.0"},"peerDependencies": {"bufferutil": "^4.0.1",- "utf-8-validate": "^5.0.2"+ "utf-8-validate": ">=5.0.2"},"peerDependenciesMeta": {"bufferutil": {@@ -15779,163 +15791,163 @@}},"@esbuild/aix-ppc64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",- "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",+ "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==","dev": true,"optional": true},"@esbuild/android-arm": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",- "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",+ "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==","dev": true,"optional": true},"@esbuild/android-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",- "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",+ "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==","dev": true,"optional": true},"@esbuild/android-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",- "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",+ "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==","dev": true,"optional": true},"@esbuild/darwin-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",- "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",+ "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==","dev": true,"optional": true},"@esbuild/darwin-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",- "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",+ "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==","dev": true,"optional": true},"@esbuild/freebsd-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",- "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",+ "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==","dev": true,"optional": true},"@esbuild/freebsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",- "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",+ "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==","dev": true,"optional": true},"@esbuild/linux-arm": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",- "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",+ "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==","dev": true,"optional": true},"@esbuild/linux-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",- "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",+ "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==","dev": true,"optional": true},"@esbuild/linux-ia32": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",- "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",+ "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==","dev": true,"optional": true},"@esbuild/linux-loong64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",- "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",+ "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==","dev": true,"optional": true},"@esbuild/linux-mips64el": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",- "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",+ "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==","dev": true,"optional": true},"@esbuild/linux-ppc64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",- "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",+ "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==","dev": true,"optional": true},"@esbuild/linux-riscv64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",- "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",+ "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==","dev": true,"optional": true},"@esbuild/linux-s390x": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",- "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",+ "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==","dev": true,"optional": true},"@esbuild/linux-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",- "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",+ "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==","dev": true,"optional": true},"@esbuild/netbsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",- "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",+ "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==","dev": true,"optional": true},"@esbuild/openbsd-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",- "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",+ "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==","dev": true,"optional": true},"@esbuild/sunos-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",- "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",+ "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==","dev": true,"optional": true},"@esbuild/win32-arm64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",- "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",+ "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==","dev": true,"optional": true},"@esbuild/win32-ia32": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",- "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",+ "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==","dev": true,"optional": true},"@esbuild/win32-x64": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",- "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",+ "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==","dev": true,"optional": true},@@ -16520,16 +16532,23 @@}},"@nestjs/core": {- "version": "10.4.1",- "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.4.1.tgz",- "integrity": "sha512-9I1WdfOBCCHdUm+ClBJupOuZQS6UxzIWHIq6Vp1brAA5ZKl/Wq6BVwSsbnUJGBy3J3PM2XHmR0EQ4fwX3nR7lA==",+ "version": "10.4.4",+ "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.4.4.tgz",+ "integrity": "sha512-y9tjmAzU6LTh1cC/lWrRsCcOd80khSR0qAHAqwY2svbW+AhsR/XCzgpZrAAKJrm/dDfjLCZKyxJSayeirGcW5Q==","requires": {"@nuxtjs/opencollective": "0.3.2","fast-safe-stringify": "2.1.1","iterare": "1.2.1",- "path-to-regexp": "3.2.0",- "tslib": "2.6.3",+ "path-to-regexp": "3.3.0",+ "tslib": "2.7.0","uid": "2.0.2"+ },+ "dependencies": {+ "tslib": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="+ }}},"@nestjs/event-emitter": {@@ -16547,15 +16566,22 @@"requires": {}},"@nestjs/platform-express": {- "version": "10.4.1",- "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-10.4.1.tgz",- "integrity": "sha512-ccfqIDAq/bg1ShLI5KGtaLaYGykuAdvCi57ohewH7eKJSIpWY1DQjbgKlFfXokALYUq1YOMGqjeZ244OWHfDQg==",+ "version": "10.4.4",+ "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-10.4.4.tgz",+ "integrity": "sha512-y52q1MxhbHaT3vAgWd08RgiYon0lJgtTa8U6g6gV0KI0IygwZhDQFJVxnrRDUdxQGIP5CKHmfQu3sk9gTNFoEA==","requires": {- "body-parser": "1.20.2",+ "body-parser": "1.20.3","cors": "2.8.5",- "express": "4.19.2",+ "express": "4.21.0","multer": "1.4.4-lts.1",- "tslib": "2.6.3"+ "tslib": "2.7.0"+ },+ "dependencies": {+ "tslib": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",+ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="+ }}},"@nestjs/platform-socket.io": {@@ -16605,15 +16631,15 @@}},"@nestjs/swagger": {- "version": "7.4.0",- "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.4.0.tgz",- "integrity": "sha512-dCiwKkRxcR7dZs5jtrGspBAe/nqJd1AYzOBTzw9iCdbq3BGrLpwokelk6lFZPe4twpTsPQqzNKBwKzVbI6AR/g==",+ "version": "7.4.2",+ "resolved": "https://registry.npmjs.org/@nestjs/swagger/-/swagger-7.4.2.tgz",+ "integrity": "sha512-Mu6TEn1M/owIvAx2B4DUQObQXqo2028R2s9rSZ/hJEgBK95+doTwS0DjmVA2wTeZTyVtXOoN7CsoM5pONBzvKQ==","requires": {"@microsoft/tsdoc": "^0.15.0","@nestjs/mapped-types": "2.0.5","js-yaml": "4.1.0","lodash": "4.17.21",- "path-to-regexp": "3.2.0",+ "path-to-regexp": "3.3.0","swagger-ui-dist": "5.17.14"}},@@ -18061,114 +18087,114 @@}},"@rollup/rollup-android-arm-eabi": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.3.tgz",- "integrity": "sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",+ "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==","dev": true,"optional": true},"@rollup/rollup-android-arm64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.3.tgz",- "integrity": "sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",+ "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==","dev": true,"optional": true},"@rollup/rollup-darwin-arm64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.3.tgz",- "integrity": "sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",+ "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==","dev": true,"optional": true},"@rollup/rollup-darwin-x64": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.3.tgz",- "integrity": "sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",+ "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==","dev": true,"optional": true},"@rollup/rollup-linux-arm-gnueabihf": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.3.tgz",- "integrity": "sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",+ "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==","dev": true,"optional": true},"@rollup/rollup-linux-arm-musleabihf": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.14.3.tgz",- "integrity": "sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",+ "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==","dev": true,"optional": true},"@rollup/rollup-linux-arm64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.3.tgz",- "integrity": "sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",+ "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==","dev": true,"optional": true},"@rollup/rollup-linux-arm64-musl": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.3.tgz",- "integrity": "sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",+ "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==","dev": true,"optional": true},"@rollup/rollup-linux-powerpc64le-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.3.tgz",- "integrity": "sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",+ "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==","dev": true,"optional": true},"@rollup/rollup-linux-riscv64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.3.tgz",- "integrity": "sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",+ "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==","dev": true,"optional": true},"@rollup/rollup-linux-s390x-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.3.tgz",- "integrity": "sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",+ "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==","dev": true,"optional": true},"@rollup/rollup-linux-x64-gnu": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.3.tgz",- "integrity": "sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",+ "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==","dev": true,"optional": true},"@rollup/rollup-linux-x64-musl": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.3.tgz",- "integrity": "sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",+ "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==","dev": true,"optional": true},"@rollup/rollup-win32-arm64-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.3.tgz",- "integrity": "sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",+ "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==","dev": true,"optional": true},"@rollup/rollup-win32-ia32-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.3.tgz",- "integrity": "sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",+ "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==","dev": true,"optional": true},"@rollup/rollup-win32-x64-msvc": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.3.tgz",- "integrity": "sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",+ "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==","dev": true,"optional": true},@@ -19691,9 +19717,9 @@}},"body-parser": {- "version": "1.20.2",- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",- "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",+ "version": "1.20.3",+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",+ "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==","requires": {"bytes": "3.1.2","content-type": "~1.0.5",@@ -19703,7 +19729,7 @@"http-errors": "2.0.0","iconv-lite": "0.4.24","on-finished": "2.4.1",- "qs": "6.11.0",+ "qs": "6.13.0","raw-body": "2.5.2","type-is": "~1.6.18","unpipe": "1.0.0"@@ -20626,9 +20652,9 @@"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="},"encodeurl": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",- "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",+ "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="},"end-of-stream": {"version": "1.4.4",@@ -20640,9 +20666,9 @@}},"engine.io": {- "version": "6.5.2",- "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.2.tgz",- "integrity": "sha512-IXsMcGpw/xRfjra46sVZVHiSWo/nJ/3g1337q9KNXtS6YRzbW5yIzTCb9DjhrBe7r3GZQR0I4+nq+4ODk5g/cA==",+ "version": "6.5.5",+ "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",+ "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==","requires": {"@types/cookie": "^0.4.1","@types/cors": "^2.8.12",@@ -20653,7 +20679,7 @@"cors": "~2.8.5","debug": "~4.3.1","engine.io-parser": "~5.2.1",- "ws": "~8.11.0"+ "ws": "~8.17.1"}},"engine.io-parser": {@@ -20704,34 +20730,34 @@"dev": true},"esbuild": {- "version": "0.20.2",- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",- "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",- "dev": true,- "requires": {- "@esbuild/aix-ppc64": "0.20.2",- "@esbuild/android-arm": "0.20.2",- "@esbuild/android-arm64": "0.20.2",- "@esbuild/android-x64": "0.20.2",- "@esbuild/darwin-arm64": "0.20.2",- "@esbuild/darwin-x64": "0.20.2",- "@esbuild/freebsd-arm64": "0.20.2",- "@esbuild/freebsd-x64": "0.20.2",- "@esbuild/linux-arm": "0.20.2",- "@esbuild/linux-arm64": "0.20.2",- "@esbuild/linux-ia32": "0.20.2",- "@esbuild/linux-loong64": "0.20.2",- "@esbuild/linux-mips64el": "0.20.2",- "@esbuild/linux-ppc64": "0.20.2",- "@esbuild/linux-riscv64": "0.20.2",- "@esbuild/linux-s390x": "0.20.2",- "@esbuild/linux-x64": "0.20.2",- "@esbuild/netbsd-x64": "0.20.2",- "@esbuild/openbsd-x64": "0.20.2",- "@esbuild/sunos-x64": "0.20.2",- "@esbuild/win32-arm64": "0.20.2",- "@esbuild/win32-ia32": "0.20.2",- "@esbuild/win32-x64": "0.20.2"+ "version": "0.21.5",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",+ "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",+ "dev": true,+ "requires": {+ "@esbuild/aix-ppc64": "0.21.5",+ "@esbuild/android-arm": "0.21.5",+ "@esbuild/android-arm64": "0.21.5",+ "@esbuild/android-x64": "0.21.5",+ "@esbuild/darwin-arm64": "0.21.5",+ "@esbuild/darwin-x64": "0.21.5",+ "@esbuild/freebsd-arm64": "0.21.5",+ "@esbuild/freebsd-x64": "0.21.5",+ "@esbuild/linux-arm": "0.21.5",+ "@esbuild/linux-arm64": "0.21.5",+ "@esbuild/linux-ia32": "0.21.5",+ "@esbuild/linux-loong64": "0.21.5",+ "@esbuild/linux-mips64el": "0.21.5",+ "@esbuild/linux-ppc64": "0.21.5",+ "@esbuild/linux-riscv64": "0.21.5",+ "@esbuild/linux-s390x": "0.21.5",+ "@esbuild/linux-x64": "0.21.5",+ "@esbuild/netbsd-x64": "0.21.5",+ "@esbuild/openbsd-x64": "0.21.5",+ "@esbuild/sunos-x64": "0.21.5",+ "@esbuild/win32-arm64": "0.21.5",+ "@esbuild/win32-ia32": "0.21.5",+ "@esbuild/win32-x64": "0.21.5"}},"escalade": {@@ -20995,36 +21021,36 @@"optional": true},"express": {- "version": "4.19.2",- "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",- "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",+ "version": "4.21.0",+ "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz",+ "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==","requires": {"accepts": "~1.3.8","array-flatten": "1.1.1",- "body-parser": "1.20.2",+ "body-parser": "1.20.3","content-disposition": "0.5.4","content-type": "~1.0.4","cookie": "0.6.0","cookie-signature": "1.0.6","debug": "2.6.9","depd": "2.0.0",- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","etag": "~1.8.1",- "finalhandler": "1.2.0",+ "finalhandler": "1.3.1","fresh": "0.5.2","http-errors": "2.0.0",- "merge-descriptors": "1.0.1",+ "merge-descriptors": "1.0.3","methods": "~1.1.2","on-finished": "2.4.1","parseurl": "~1.3.3",- "path-to-regexp": "0.1.7",+ "path-to-regexp": "0.1.10","proxy-addr": "~2.0.7",- "qs": "6.11.0",+ "qs": "6.13.0","range-parser": "~1.2.1","safe-buffer": "5.2.1",- "send": "0.18.0",- "serve-static": "1.15.0",+ "send": "0.19.0",+ "serve-static": "1.16.2","setprototypeof": "1.2.0","statuses": "2.0.1","type-is": "~1.6.18",@@ -21051,9 +21077,9 @@"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="},"path-to-regexp": {- "version": "0.1.7",- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",- "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",+ "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="}}},@@ -21167,12 +21193,12 @@}},"finalhandler": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",- "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",+ "version": "1.3.1",+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",+ "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==","requires": {"debug": "2.6.9",- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","on-finished": "2.4.1","parseurl": "~1.3.3",@@ -22320,9 +22346,9 @@}},"merge-descriptors": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",- "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",+ "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ=="},"merge-stream": {"version": "2.0.0",@@ -22341,11 +22367,11 @@"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="},"micromatch": {- "version": "4.0.5",- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",+ "version": "4.0.8",+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==","requires": {- "braces": "^3.0.2",+ "braces": "^3.0.3","picomatch": "^2.3.1"},"dependencies": {@@ -22784,9 +22810,9 @@"integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="},"object-inspect": {- "version": "1.12.3",- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",- "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="+ "version": "1.13.2",+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",+ "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g=="},"obuf": {"version": "1.1.2",@@ -23022,9 +23048,9 @@}},"path-to-regexp": {- "version": "3.2.0",- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.2.0.tgz",- "integrity": "sha512-jczvQbCUS7XmS7o+y1aEO9OBVFeZBQ1MDSEqmO7xSoPgOPoowY/SxLpZ6Vh97/8qHZOteiCKb7gkG9gA2ZUxJA=="+ "version": "3.3.0",+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",+ "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw=="},"path-type": {"version": "4.0.0",@@ -23123,9 +23149,9 @@}},"picocolors": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",- "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",+ "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="},"picomatch": {"version": "4.0.2",@@ -23156,13 +23182,13 @@"integrity": "sha512-3hTIM2j/v9Lio+wOyur3kckD4NxruZhpowUbEgmyikW+a2Kppjtu1eN+AhnMQtoHW46zld88JiYWv6fxpsDrTQ=="},"postcss": {- "version": "8.4.38",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",- "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",+ "version": "8.4.47",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",+ "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==","requires": {"nanoid": "^3.3.7",- "picocolors": "^1.0.0",- "source-map-js": "^1.2.0"+ "picocolors": "^1.1.0",+ "source-map-js": "^1.2.1"}},"postcss-import": {@@ -23389,11 +23415,11 @@"dev": true},"qs": {- "version": "6.11.0",- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",- "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",+ "version": "6.13.0",+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",+ "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==","requires": {- "side-channel": "^1.0.4"+ "side-channel": "^1.0.6"}},"queue-microtask": {@@ -24051,27 +24077,27 @@}},"rollup": {- "version": "4.14.3",- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.3.tgz",- "integrity": "sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==",- "dev": true,- "requires": {- "@rollup/rollup-android-arm-eabi": "4.14.3",- "@rollup/rollup-android-arm64": "4.14.3",- "@rollup/rollup-darwin-arm64": "4.14.3",- "@rollup/rollup-darwin-x64": "4.14.3",- "@rollup/rollup-linux-arm-gnueabihf": "4.14.3",- "@rollup/rollup-linux-arm-musleabihf": "4.14.3",- "@rollup/rollup-linux-arm64-gnu": "4.14.3",- "@rollup/rollup-linux-arm64-musl": "4.14.3",- "@rollup/rollup-linux-powerpc64le-gnu": "4.14.3",- "@rollup/rollup-linux-riscv64-gnu": "4.14.3",- "@rollup/rollup-linux-s390x-gnu": "4.14.3",- "@rollup/rollup-linux-x64-gnu": "4.14.3",- "@rollup/rollup-linux-x64-musl": "4.14.3",- "@rollup/rollup-win32-arm64-msvc": "4.14.3",- "@rollup/rollup-win32-ia32-msvc": "4.14.3",- "@rollup/rollup-win32-x64-msvc": "4.14.3",+ "version": "4.22.4",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",+ "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",+ "dev": true,+ "requires": {+ "@rollup/rollup-android-arm-eabi": "4.22.4",+ "@rollup/rollup-android-arm64": "4.22.4",+ "@rollup/rollup-darwin-arm64": "4.22.4",+ "@rollup/rollup-darwin-x64": "4.22.4",+ "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",+ "@rollup/rollup-linux-arm-musleabihf": "4.22.4",+ "@rollup/rollup-linux-arm64-gnu": "4.22.4",+ "@rollup/rollup-linux-arm64-musl": "4.22.4",+ "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",+ "@rollup/rollup-linux-riscv64-gnu": "4.22.4",+ "@rollup/rollup-linux-s390x-gnu": "4.22.4",+ "@rollup/rollup-linux-x64-gnu": "4.22.4",+ "@rollup/rollup-linux-x64-musl": "4.22.4",+ "@rollup/rollup-win32-arm64-msvc": "4.22.4",+ "@rollup/rollup-win32-ia32-msvc": "4.22.4",+ "@rollup/rollup-win32-x64-msvc": "4.22.4","@types/estree": "1.0.5","fsevents": "~2.3.2"}@@ -24176,9 +24202,9 @@"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="},"send": {- "version": "0.18.0",- "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",- "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",+ "version": "0.19.0",+ "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",+ "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==","requires": {"debug": "2.6.9","depd": "2.0.0",@@ -24209,6 +24235,11 @@"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="}}+ },+ "encodeurl": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="}}},@@ -24222,14 +24253,14 @@}},"serve-static": {- "version": "1.15.0",- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",- "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",+ "version": "1.16.2",+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",+ "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==","requires": {- "encodeurl": "~1.0.2",+ "encodeurl": "~2.0.0","escape-html": "~1.0.3","parseurl": "~1.3.3",- "send": "0.18.0"+ "send": "0.19.0"}},"set-blocking": {@@ -24332,13 +24363,14 @@"integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="},"side-channel": {- "version": "1.0.4",- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",- "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",+ "version": "1.0.6",+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",+ "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==","requires": {- "call-bind": "^1.0.0",- "get-intrinsic": "^1.0.2",- "object-inspect": "^1.9.0"+ "call-bind": "^1.0.7",+ "es-errors": "^1.3.0",+ "get-intrinsic": "^1.2.4",+ "object-inspect": "^1.13.1"}},"siginfo": {@@ -24403,14 +24435,6 @@"requires": {"debug": "~4.3.4","ws": "~8.17.1"- },- "dependencies": {- "ws": {- "version": "8.17.1",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",- "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",- "requires": {}- }}},"socket.io-parser": {@@ -24429,9 +24453,9 @@"dev": true},"source-map-js": {- "version": "1.2.0",- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",- "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",+ "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="},"source-map-support": {"version": "0.5.21",@@ -24766,9 +24790,9 @@"dev": true},"tar": {- "version": "6.2.0",- "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",- "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",+ "version": "6.2.1",+ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",+ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==","requires": {"chownr": "^2.0.0","fs-minipass": "^2.0.0",@@ -25399,15 +25423,15 @@"integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="},"vite": {- "version": "5.2.11",- "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz",- "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==",+ "version": "5.4.7",+ "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.7.tgz",+ "integrity": "sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==","dev": true,"requires": {- "esbuild": "^0.20.1",+ "esbuild": "^0.21.3","fsevents": "~2.3.3",- "postcss": "^8.4.38",- "rollup": "^4.13.0"+ "postcss": "^8.4.43",+ "rollup": "^4.20.0"}},"vite-node": {@@ -25627,9 +25651,9 @@"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="},"ws": {- "version": "8.11.0",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",- "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",+ "version": "8.17.1",+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",+ "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==","requires": {}},"xtend": {diff --git a/server/src/config.ts b/server/src/config.tsindex 057c9a69e2..03ea3f111b 100644--- a/server/src/config.ts+++ b/server/src/config.ts@@ -285,8 +285,8 @@ export const defaults = Object.freeze<SystemConfig>({},map: {enabled: true,- lightStyle: '',- darkStyle: '',+ lightStyle: 'https://tiles.immich.cloud/v1/style/light.json',+ darkStyle: 'https://tiles.immich.cloud/v1/style/dark.json',},reverseGeocoding: {enabled: true,diff --git a/server/src/controllers/map.controller.ts b/server/src/controllers/map.controller.tsindex d6c26c58a0..88104e6b58 100644--- a/server/src/controllers/map.controller.ts+++ b/server/src/controllers/map.controller.ts@@ -7,7 +7,6 @@ import {MapReverseGeocodeDto,MapReverseGeocodeResponseDto,} from 'src/dtos/map.dto';-import { MapThemeDto } from 'src/dtos/system-config.dto';import { Auth, Authenticated } from 'src/middleware/auth.guard';import { MapService } from 'src/services/map.service';@@ -22,12 +21,6 @@ export class MapController {return this.service.getMapMarkers(auth, options);}- @Authenticated({ sharedLink: true })- @Get('style.json')- getMapStyle(@Query() dto: MapThemeDto) {- return this.service.getMapStyle(dto.theme);- }-@Authenticated()@Get('reverse-geocode')@HttpCode(HttpStatus.OK)diff --git a/server/src/dtos/server.dto.ts b/server/src/dtos/server.dto.tsindex 78e59e4d1a..aafadff478 100644--- a/server/src/dtos/server.dto.ts+++ b/server/src/dtos/server.dto.ts@@ -121,6 +121,8 @@ export class ServerConfigDto {isInitialized!: boolean;isOnboarded!: boolean;externalDomain!: string;+ mapDarkStyleUrl!: string;+ mapLightStyleUrl!: string;}export class ServerFeaturesDto {diff --git a/server/src/dtos/system-config.dto.ts b/server/src/dtos/system-config.dto.tsindex 14027aa16a..336f50f39b 100644--- a/server/src/dtos/system-config.dto.ts+++ b/server/src/dtos/system-config.dto.ts@@ -296,10 +296,12 @@ class SystemConfigMapDto {@ValidateBoolean()enabled!: boolean;- @IsString()+ @IsNotEmpty()+ @IsUrl()lightStyle!: string;- @IsString()+ @IsNotEmpty()+ @IsUrl()darkStyle!: string;}diff --git a/server/src/services/map.service.ts b/server/src/services/map.service.tsindex ffd84a3e02..5836505e54 100644--- a/server/src/services/map.service.ts+++ b/server/src/services/map.service.ts@@ -43,17 +43,6 @@ export class MapService {return this.mapRepository.getMapMarkers(userIds, albumIds, options);}- async getMapStyle(theme: 'light' | 'dark') {- const { map } = await this.configCore.getConfig({ withCache: false });- const styleUrl = theme === 'dark' ? map.darkStyle : map.lightStyle;-- if (styleUrl) {- return this.mapRepository.fetchStyle(styleUrl);- }-- return JSON.parse(await this.systemMetadataRepository.readFile(`./resources/style-${theme}.json`));- }-async reverseGeocode(dto: MapReverseGeocodeDto) {const { lat: latitude, lon: longitude } = dto;// eventually this should probably return an array of resultsdiff --git a/server/src/services/server.service.spec.ts b/server/src/services/server.service.spec.tsindex ac899f7b13..4e6a8972b0 100644--- a/server/src/services/server.service.spec.ts+++ b/server/src/services/server.service.spec.ts@@ -186,6 +186,8 @@ describe(ServerService.name, () => {isInitialized: undefined,isOnboarded: false,externalDomain: '',+ mapDarkStyleUrl: 'https://tiles.immich.cloud/v1/style/dark.json',+ mapLightStyleUrl: 'https://tiles.immich.cloud/v1/style/light.json',});expect(systemMock.get).toHaveBeenCalled();});diff --git a/server/src/services/server.service.ts b/server/src/services/server.service.tsindex e57a206765..9db90e41b3 100644--- a/server/src/services/server.service.ts+++ b/server/src/services/server.service.ts@@ -129,6 +129,8 @@ export class ServerService {isInitialized,isOnboarded: onboarding?.isOnboarded || false,externalDomain: config.server.externalDomain,+ mapDarkStyleUrl: config.map.darkStyle,+ mapLightStyleUrl: config.map.lightStyle,};}diff --git a/server/src/services/system-config.service.spec.ts b/server/src/services/system-config.service.spec.tsindex 7e25e0cd46..52ad6d276b 100644--- a/server/src/services/system-config.service.spec.ts+++ b/server/src/services/system-config.service.spec.ts@@ -100,8 +100,8 @@ const updatedConfig = Object.freeze<SystemConfig>({},map: {enabled: true,- lightStyle: '',- darkStyle: '',+ lightStyle: 'https://tiles.immich.cloud/v1/style/light.json',+ darkStyle: 'https://tiles.immich.cloud/v1/style/dark.json',},reverseGeocoding: {enabled: true,diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelteindex 83ea3016fd..4f60131d69 100644--- a/web/src/lib/components/shared-components/map/map.svelte+++ b/web/src/lib/components/shared-components/map/map.svelte@@ -6,8 +6,8 @@import Icon from '$lib/components/elements/icon.svelte';import { Theme } from '$lib/constants';import { colorTheme, mapSettings } from '$lib/stores/preferences.store';- import { getAssetThumbnailUrl, getKey, handlePromiseError } from '$lib/utils';- import { getMapStyle, MapTheme, type MapMarkerResponseDto } from '@immich/sdk';+ import { getAssetThumbnailUrl, handlePromiseError } from '$lib/utils';+ import { getServerConfig, type MapMarkerResponseDto } from '@immich/sdk';import mapboxRtlUrl from '@mapbox/mapbox-gl-rtl-text?url';import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js';import type { Feature, GeoJsonProperties, Geometry, Point } from 'geojson';@@ -57,11 +57,13 @@let map: maplibregl.Map;let marker: maplibregl.Marker | null = null;- $: style = (() =>- getMapStyle({- theme: ($mapSettings.allowDarkMode ? $colorTheme.value : Theme.LIGHT) as unknown as MapTheme,- key: getKey(),- }) as Promise<StyleSpecification>)();+ $: style = (async () => {+ const config = await getServerConfig();+ const theme = $mapSettings.allowDarkMode ? $colorTheme.value : Theme.LIGHT;+ const styleUrl = theme === Theme.DARK ? config.mapDarkStyleUrl : config.mapLightStyleUrl;+ const style = await fetch(styleUrl).then((response) => response.json());+ return style as StyleSpecification;+ })();function handleAssetClick(assetId: string, map: Map | null) {if (!map) {diff --git a/web/src/lib/stores/server-config.store.ts b/web/src/lib/stores/server-config.store.tsindex 14d1e4e66e..358765fe0b 100644--- a/web/src/lib/stores/server-config.store.ts+++ b/web/src/lib/stores/server-config.store.ts@@ -32,6 +32,8 @@ export const serverConfig = writable<ServerConfig>({isInitialized: false,isOnboarded: false,externalDomain: '',+ mapDarkStyleUrl: '',+ mapLightStyleUrl: '',});export const retrieveServerConfig = async () => {