helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2026-08-22 13:13:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove Websocket#restartApp in favour of individual methods

Browse source
This commit is contained in:
izzy 2025-11-14 15:55:18 +00:00
parent aad47ce45a
commit 30d2707cec
No known key found for this signature in database
GPG key ID: 5059F398521BB0F6
2 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/src/maintenance/maintenance-websocket.repository.ts
View file

@ -8,7 +8,7 @@ import {
} from '@nestjs/websockets';
import { Server, Socket } from 'socket.io';
import { AppRepository } from 'src/repositories/app.repository';
import { AppRestartEvent } from 'src/repositories/event.repository';
import { AppRestartEvent, ArgsOf } from 'src/repositories/event.repository';
import { LoggingRepository } from 'src/repositories/logging.repository';
export const serverEvents = ['AppRestart'] as const;
@ -30,23 +30,23 @@ export class MaintenanceWebsocketRepository implements OnGatewayConnection, OnGa
constructor(
private logger: LoggingRepository,
private maintenanceRepository: AppRepository,
private appRepository: AppRepository,
) {
this.logger.setContext(MaintenanceWebsocketRepository.name);
}
afterInit(websocketServer: Server) {
this.logger.log('Initialized websocket server');
websocketServer.on('AppRestart', () => this.maintenanceRepository.exitApp());
websocketServer.on('AppRestart', () => this.appRepository.exitApp());
}
restartApp(state: AppRestartEvent) {
// => corresponds to notification.service.ts#onAppRestart
this.websocketServer?.emit('AppRestartV1', state, () => {
this.websocketServer!.serverSideEmit('AppRestart', state, () => {
this.maintenanceRepository.exitApp();
});
});
clientBroadcast<T extends keyof ClientEventMap>(event: T, ...data: ClientEventMap[T]) {
this.websocketServer?.emit(event, ...data);
}
serverSend<T extends ServerEvents>(event: T, ...args: ArgsOf<T>): void {
this.logger.debug(`Server event: ${event} (send)`);
this.websocketServer?.serverSideEmit(event, ...args);
}
handleConnection(client: Socket) {

6
server/src/maintenance/maintenance-worker.service.spec.ts
View file

@ -115,7 +115,11 @@ describe(MaintenanceWorkerService.name, () => {
isMaintenanceMode: false,
});
expect(maintenanceWorkerRepositoryMock.restartApp).toHaveBeenCalledWith({
expect(maintenanceWorkerRepositoryMock.clientBroadcast).toHaveBeenCalledWith('AppRestartV1', {
isMaintenanceMode: false,
});
expect(maintenanceWorkerRepositoryMock.serverSend).toHaveBeenCalledWith('AppRestart', {
isMaintenanceMode: false,
});
});