mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-18 21:16:47 +00:00
c0d90d57b2
The seven files in services/memories/ become injectable services. Every SQL statement, error string, status code and header moves verbatim; what changes is who owns what. photoResolverService was two files in one, so it stayed two: the trek_photos rows are a repository under photos/, the provider dispatch is PhotoResolverService under memories/. That is the photos/ vs memories/ boundary — storage there, dispatch here — and it is also why the module graph is a straight line: TrekPhotosModule is a leaf both halves import, so neither needs a forwardRef. pipeAsset and the ServiceResult envelope stay free functions over the Express response. pipeAsset is deliberately not a StreamableFile: it forwards the upstream 206 and Content-Range so a <video> can seek (#823), swaps Cache-Control to no-store on an error status, and answers differently once headers are sent. The trek-photo cache keeps its in-flight map at module scope. That map is the stampede guard, and the scheduler builds its own instance through a lazy require outside the container — a per-instance map would give them separate guards and ten tiles would fetch the same asset ten times, silently. journeyService's dynamic import() of synologyService is gone: it existed only to duck the import cycle, which no longer exists. MemoriesModule imports RealtimeModule explicitly even though it is @Global, so a single-domain e2e TestingModule can still resolve the broadcast. The providers arrived at 60% branch coverage or less, because services/memories/ sits outside the gate and the integration suites drive the domain over HTTP without reaching the failure paths. New suites cover what had no case at all: the access checks that decide who may fetch someone else's photo, the stampede guard, the thumbnail mtime check, the poster-less-video 404, and Immich end to end with safeFetch stubbed — including the hidden-asset filter older servers depend on (#1474) and the http -> https canonical detection that must NOT rewrite a changed host.
205 lines
9.1 KiB
TypeScript
205 lines
9.1 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
|
|
// The MemoriesService is a thin pass-through over the legacy services/memories/*
|
|
// helpers. Mock each legacy module so we can assert the wrapper forwards every
|
|
// argument unchanged (and exercise the optional-param call sites).
|
|
|
|
const unified = vi.hoisted(() => ({
|
|
listTripPhotos: vi.fn(() => ({ data: [] })),
|
|
listTripAlbumLinks: vi.fn(() => ({ data: [] })),
|
|
createTripAlbumLink: vi.fn(() => ({ data: {} })),
|
|
removeAlbumLink: vi.fn(() => ({ data: {} })),
|
|
addTripPhotos: vi.fn(async () => ({ data: { added: 0 } })),
|
|
syncImmichAlbum: vi.fn(async () => ({ success: true, added: 0, total: 0 })),
|
|
syncSynologyAlbum: vi.fn(async () => ({ success: true, data: { added: 0, total: 0 } })),
|
|
removeTripPhoto: vi.fn(() => ({ data: {} })),
|
|
setTripPhotoSharing: vi.fn(async () => ({ data: {} })),
|
|
}));
|
|
|
|
const immich = vi.hoisted(() => ({
|
|
getConnectionSettings: vi.fn(() => ({})),
|
|
saveImmichSettings: vi.fn(async () => ({ success: true })),
|
|
setImmichAutoUpload: vi.fn(),
|
|
testConnection: vi.fn(async () => ({ connected: true })),
|
|
getConnectionStatus: vi.fn(async () => ({ connected: true })),
|
|
browseTimeline: vi.fn(async () => ({ buckets: [] })),
|
|
searchPhotos: vi.fn(async () => ({ assets: [] })),
|
|
streamImmichAsset: vi.fn(async () => undefined),
|
|
listAlbums: vi.fn(async () => ({ albums: [] })),
|
|
getAlbumPhotos: vi.fn(async () => ({ assets: [] })),
|
|
collectAlbumSelection: vi.fn(async () => ({ selection: { provider: 'immich', asset_ids: [] }, total: 0 })),
|
|
getAssetInfo: vi.fn(async () => ({ data: {} })),
|
|
isValidAssetId: vi.fn(() => true),
|
|
}));
|
|
|
|
const synology = vi.hoisted(() => ({
|
|
getSynologySettings: vi.fn(async () => ({ success: true, data: {} })),
|
|
updateSynologySettings: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyStatus: vi.fn(async () => ({ success: true, data: {} })),
|
|
testSynologyConnection: vi.fn(async () => ({ success: true, data: {} })),
|
|
listSynologyAlbums: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyAlbumPhotos: vi.fn(async () => ({ success: true, data: {} })),
|
|
collectSynologyAlbumSelection: vi.fn(async () => ({ success: true, data: { selection: { provider: 'synologyphotos', asset_ids: [] }, total: 0 } })),
|
|
searchSynologyPhotos: vi.fn(async () => ({ success: true, data: {} })),
|
|
getSynologyAssetInfo: vi.fn(async () => ({ success: true, data: {} })),
|
|
streamSynologyAsset: vi.fn(async () => undefined),
|
|
}));
|
|
|
|
const helpers = vi.hoisted(() => ({ canAccessUserPhoto: vi.fn(() => true) }));
|
|
|
|
const ws = vi.hoisted(() => ({ broadcast: vi.fn() }));
|
|
vi.mock('../../../src/websocket', () => ws);
|
|
|
|
import { MemoriesService } from '../../../src/nest/memories/memories.service';
|
|
import { RealtimeService } from '../../../src/nest/realtime/realtime.service';
|
|
import type { UnifiedMemoriesService } from '../../../src/nest/memories/unified-memories.service';
|
|
import type { ImmichService } from '../../../src/nest/memories/immich.service';
|
|
import type { SynologyService } from '../../../src/nest/memories/synology.service';
|
|
import type { MemoriesAccessService } from '../../../src/nest/memories/memories-access.service';
|
|
|
|
const res = {} as import('express').Response;
|
|
|
|
describe('MemoriesService (delegation wrapper over services/memories/*)', () => {
|
|
let svc: MemoriesService;
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
svc = new MemoriesService(
|
|
new RealtimeService(),
|
|
unified as unknown as UnifiedMemoriesService,
|
|
immich as unknown as ImmichService,
|
|
synology as unknown as SynologyService,
|
|
helpers as unknown as MemoriesAccessService,
|
|
);
|
|
});
|
|
|
|
it('access check + broadcast forward verbatim', () => {
|
|
helpers.canAccessUserPhoto.mockReturnValue(false);
|
|
expect(svc.canAccessUserPhoto(1, 2, '5', 'a', 'immich')).toBe(false);
|
|
expect(helpers.canAccessUserPhoto).toHaveBeenCalledWith(1, 2, '5', 'a', 'immich');
|
|
|
|
svc.broadcast('5', 'memories:updated', { userId: 1 }, 'sock');
|
|
expect(ws.broadcast).toHaveBeenCalledWith('5', 'memories:updated', { userId: 1 }, 'sock');
|
|
});
|
|
|
|
it('broadcast forwards an absent socket id as undefined', () => {
|
|
svc.broadcast('5', 'memories:updated', { userId: 1 });
|
|
expect(ws.broadcast).toHaveBeenCalledWith('5', 'memories:updated', { userId: 1 }, undefined);
|
|
});
|
|
|
|
it('unified methods delegate', async () => {
|
|
svc.listTripPhotos('5', 7);
|
|
expect(unified.listTripPhotos).toHaveBeenCalledWith('5', 7);
|
|
|
|
const selections = [{ provider: 'immich', asset_ids: ['a'] }];
|
|
await svc.addTripPhotos('5', 7, true, selections, 'sock');
|
|
expect(unified.addTripPhotos).toHaveBeenCalledWith('5', 7, true, selections, 'sock');
|
|
|
|
await svc.setTripPhotoSharing('5', 7, 9, false);
|
|
expect(unified.setTripPhotoSharing).toHaveBeenCalledWith('5', 7, 9, false);
|
|
|
|
svc.removeTripPhoto('5', 7, 9);
|
|
expect(unified.removeTripPhoto).toHaveBeenCalledWith('5', 7, 9);
|
|
|
|
svc.listTripAlbumLinks('5', 7);
|
|
expect(unified.listTripAlbumLinks).toHaveBeenCalledWith('5', 7);
|
|
|
|
svc.removeAlbumLink('5', 'l1', 7);
|
|
expect(unified.removeAlbumLink).toHaveBeenCalledWith('5', 'l1', 7);
|
|
});
|
|
|
|
it('createTripAlbumLink forwards a passphrase when present and omits it when absent', () => {
|
|
svc.createTripAlbumLink('5', 7, 'immich', 'a1', 'Trip', 'secret');
|
|
expect(unified.createTripAlbumLink).toHaveBeenCalledWith('5', 7, 'immich', 'a1', 'Trip', 'secret');
|
|
|
|
svc.createTripAlbumLink('5', 7, 'immich', 'a1', 'Trip');
|
|
expect(unified.createTripAlbumLink).toHaveBeenLastCalledWith('5', 7, 'immich', 'a1', 'Trip', undefined);
|
|
});
|
|
|
|
it('immich methods delegate', async () => {
|
|
svc.immichGetConnectionSettings(7);
|
|
expect(immich.getConnectionSettings).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichSaveSettings(7, 'u', 'k', '1.2.3.4');
|
|
expect(immich.saveImmichSettings).toHaveBeenCalledWith(7, 'u', 'k', '1.2.3.4');
|
|
|
|
svc.immichSetAutoUpload(7, true);
|
|
expect(immich.setImmichAutoUpload).toHaveBeenCalledWith(7, true);
|
|
|
|
await svc.immichGetConnectionStatus(7);
|
|
expect(immich.getConnectionStatus).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichTestConnection('u', 'k');
|
|
expect(immich.testConnection).toHaveBeenCalledWith('u', 'k');
|
|
|
|
await svc.immichBrowseTimeline(7);
|
|
expect(immich.browseTimeline).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichSearchPhotos(7, 'f', 't', 2, 50);
|
|
expect(immich.searchPhotos).toHaveBeenCalledWith(7, 'f', 't', 2, 50);
|
|
|
|
expect(svc.immichIsValidAssetId('abc')).toBe(true);
|
|
expect(immich.isValidAssetId).toHaveBeenCalledWith('abc');
|
|
|
|
await svc.immichGetAssetInfo(7, 'a', 2);
|
|
expect(immich.getAssetInfo).toHaveBeenCalledWith(7, 'a', 2);
|
|
|
|
await svc.immichStreamAsset(res, 7, 'a', 'thumbnail', 2);
|
|
expect(immich.streamImmichAsset).toHaveBeenCalledWith(res, 7, 'a', 'thumbnail', 2);
|
|
|
|
await svc.immichListAlbums(7);
|
|
expect(immich.listAlbums).toHaveBeenCalledWith(7);
|
|
|
|
await svc.immichGetAlbumPhotos(7, 'al1');
|
|
expect(immich.getAlbumPhotos).toHaveBeenCalledWith(7, 'al1');
|
|
|
|
await svc.immichSyncAlbumAssets('5', 'l1', 7, 'sock');
|
|
expect(unified.syncImmichAlbum).toHaveBeenCalledWith('5', 'l1', 7, 'sock');
|
|
});
|
|
|
|
it('synology methods delegate', async () => {
|
|
await svc.synologyGetSettings(7);
|
|
expect(synology.getSynologySettings).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologyUpdateSettings(7, 'u', 'a', 'p', true);
|
|
expect(synology.updateSynologySettings).toHaveBeenCalledWith(7, 'u', 'a', 'p', true);
|
|
|
|
await svc.synologyGetStatus(7);
|
|
expect(synology.getSynologyStatus).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologyTestConnection(7, 'u', 'a', 'p', '123', false);
|
|
expect(synology.testSynologyConnection).toHaveBeenCalledWith(7, 'u', 'a', 'p', '123', false);
|
|
|
|
await svc.synologyListAlbums(7);
|
|
expect(synology.listSynologyAlbums).toHaveBeenCalledWith(7);
|
|
|
|
await svc.synologySyncAlbumLink(7, '5', 'l1', 'sock');
|
|
expect(unified.syncSynologyAlbum).toHaveBeenCalledWith(7, '5', 'l1', 'sock');
|
|
|
|
await svc.synologySearchPhotos(7, 'f', 't', 0, 100);
|
|
expect(synology.searchSynologyPhotos).toHaveBeenCalledWith(7, 'f', 't', 0, 100);
|
|
});
|
|
|
|
it('synology album-photos forwards a passphrase when present and omits it when absent', async () => {
|
|
await svc.synologyGetAlbumPhotos(7, 'al1', 'secret');
|
|
expect(synology.getSynologyAlbumPhotos).toHaveBeenCalledWith(7, 'al1', 'secret');
|
|
|
|
await svc.synologyGetAlbumPhotos(7, 'al1');
|
|
expect(synology.getSynologyAlbumPhotos).toHaveBeenLastCalledWith(7, 'al1', undefined);
|
|
});
|
|
|
|
it('synology asset-info + stream forward a passphrase when present and omit it when absent', async () => {
|
|
await svc.synologyGetAssetInfo(7, 'p1', 2, 'secret');
|
|
expect(synology.getSynologyAssetInfo).toHaveBeenCalledWith(7, 'p1', 2, 'secret');
|
|
|
|
await svc.synologyGetAssetInfo(7, 'p1', 2);
|
|
expect(synology.getSynologyAssetInfo).toHaveBeenLastCalledWith(7, 'p1', 2, undefined);
|
|
|
|
await svc.synologyStreamAsset(res, 7, 2, 'p1', 'thumbnail', 'sm', 'secret');
|
|
expect(synology.streamSynologyAsset).toHaveBeenCalledWith(res, 7, 2, 'p1', 'thumbnail', 'sm', 'secret');
|
|
|
|
await svc.synologyStreamAsset(res, 7, 2, 'p1', 'original', 'xl');
|
|
expect(synology.streamSynologyAsset).toHaveBeenLastCalledWith(res, 7, 2, 'p1', 'original', 'xl', undefined);
|
|
});
|
|
});
|