Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/controller/settings/restartController.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { Request, Response } from 'express';
import ControllerInterface from "../controllerInterface.js";

export default class RestartController implements ControllerInterface
{

public execute(req: Request, res: Response): void
{
res.sendStatus(202);

process.exit(0);
}
}
31 changes: 31 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const logger = container.get('logger.default');
const io = container.get('server.websocket');
const deviceManager = container.get('device.manager');
const settingsManager = container.get('settings.manager');
const shutdownManager = container.get('shutdown.manager');
const scriptRuntime = container.get('automation.scriptRuntime');

container.get('device.provider.loader').loadFromSettings();
Expand Down Expand Up @@ -134,6 +135,10 @@ app.put('/settings', (req, res) => {
return controller.execute(req, res)
});

app.get('/restart', (req, res) => {
return container.get('controller.settings.restart').execute(req, res);
});

// Whenever someone connects this gets executed
io.on('connection', socket => {
logger.debug(`Client connected: ${socket.id}`);
Expand Down Expand Up @@ -178,6 +183,32 @@ httpServer.listen(APP_PORT, () => {
logger.info(`SlvCtrl+ server listening on port ${APP_PORT}!`);
});

const gracefulShutdown = async () => {
console.log('Starting graceful shutdown...');
await shutdownManager.runBeforeShutdown();

httpServer.close(() => {
console.log('HTTP server closed');
process.exit(0);
});

setTimeout(() => {
console.error('Forced shutdown after timeout');
process.exit(1);
}, 5000);
}

const handleSignal = (signal: string) => {
console.log(`Received ${signal}`);
gracefulShutdown().catch((err) => {
console.error('Error during graceful shutdown:', err);
process.exit(1);
});
};

process.on('SIGINT', handleSignal);
process.on('SIGTERM', handleSignal);

process.on('uncaughtException', (err: Error) => {
logger.error('Asynchronous error caught.', err);
});
8 changes: 6 additions & 2 deletions src/serviceMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,19 @@ import GetLogController from "./controller/automation/getLogController.js";
import RunScriptController from "./controller/automation/runScriptController.js";
import StopScriptController from "./controller/automation/stopScriptController.js";
import StatusScriptController from "./controller/automation/statusScriptController.js";
import GetSettingsController from "./controller/settings/getSettingsController.js";
import PutSettingsController from "./controller/settings/putSettingsController.js";
import RestartController from "./controller/settings/restartController.js";
import DelegatedVirtualDeviceFactory from "./device/protocol/virtual/delegatedVirtualDeviceFactory.js";
import VirtualDeviceProvider from "./device/protocol/virtual/virtualDeviceProvider.js";
import VirtualDeviceProviderFactory from "./device/protocol/virtual/virtualDeviceProviderFactory.js";
import GenericVirtualDeviceFactory from "./device/protocol/virtual/genericVirtualDeviceFactory.js";
import DisplayVirtualDeviceLogic from "./device/protocol/virtual/display/displayVirtualDeviceLogic.js";
import RandomGeneratorVirtualDeviceLogic from "./device/protocol/virtual/randomGenerator/randomGeneratorVirtualDeviceLogic.js";
import TtsVirtualDeviceLogic from "./device/protocol/virtual/audio/ttsVirtualDeviceLogic.js";
import GetSettingsController from "./controller/settings/getSettingsController.js";
import PutSettingsController from "./controller/settings/putSettingsController.js";
import JsonSchemaValidatorFactory from "./schemaValidation/JsonSchemaValidatorFactory.js";
import JsonSchemaValidator from "./schemaValidation/JsonSchemaValidator.js";
import ShutdownManager from "./settings/shutdownManager.js";
import Ajv from "ajv/dist/2020.js";

/* eslint-disable @typescript-eslint/naming-convention */
Expand Down Expand Up @@ -83,6 +85,7 @@ type ServiceMap = {
'settings': Settings,
'settings.manager': SettingsManager,
'settings.schema.validator': JsonSchemaValidator,
'shutdown.manager': ShutdownManager,

/* automationServiceProvider */
'automation.scriptRuntime': ScriptRuntime,
Expand All @@ -109,6 +112,7 @@ type ServiceMap = {
'controller.automation.statusScript': StatusScriptController,
'controller.settings.get': GetSettingsController,
'controller.settings.put': PutSettingsController,
'controller.settings.restart': RestartController,
}

export default ServiceMap;
3 changes: 3 additions & 0 deletions src/serviceProvider/controllerServiceProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import GetLogController from "../controller/automation/getLogController.js";
import StatusScriptController from "../controller/automation/statusScriptController.js";
import GetSettingsController from "../controller/settings/getSettingsController.js";
import PutSettingsController from "../controller/settings/putSettingsController.js";
import RestartController from "../controller/settings/restartController.js";
import ServiceMap from "../serviceMap.js";

export default class ControllerServiceProvider implements ServiceProvider<ServiceMap>
Expand Down Expand Up @@ -108,5 +109,7 @@ export default class ControllerServiceProvider implements ServiceProvider<Servic
container.get('settings.schema.validator'),
);
});

container.set('controller.settings.restart', () => new RestartController());
}
}
5 changes: 5 additions & 0 deletions src/settings/shutdownEventType.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enum ShutdownEventType {
beforeShutdown = "beforeShutdown",
}

export default ShutdownEventType;
39 changes: 39 additions & 0 deletions src/settings/shutdownManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import EventEmitter from "events";
import Logger from "../logging/Logger";
import ShutdownEventType from "./shutdownEventType.js";

type ShutdownHook = () => Promise<void>;

type ShutdownEvents = {
[ShutdownEventType.beforeShutdown]: ShutdownHook,
}

export default class ShutdownManager {

private readonly eventEmitter: EventEmitter;

private readonly logger: Logger;

public constructor(eventEmitter: EventEmitter) {
this.eventEmitter = eventEmitter;
}

public async runBeforeShutdown(): Promise<void> {
const listeners = this.eventEmitter.listeners(ShutdownEventType.beforeShutdown) as ShutdownHook[];
this.logger.info(`Running ${listeners.length} shutdown hook(s)...`);

const results = await Promise.allSettled(listeners.map(fn => fn()));

for (const [index, result] of results.entries()) {
if (result.status === 'rejected') {
this.logger.error(`Shutdown hook #${index + 1} failed:`, result.reason);
}
}
}

public on<E extends keyof ShutdownEvents> (event: E, listener: ShutdownEvents[E]): this
{
this.eventEmitter.on(event, listener as (...args: any[]) => void);
return this;
}
}