Watch settings file external changes

docker/dev/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18-alpine
+FROM node:24-alpine
 
 RUN apk --no-cache upgrade && \
     apk --no-cache add bash git sudo openssh make

eslint.config.ts

@@ -90,7 +90,12 @@ export default [
             "@typescript-eslint/no-empty-function": "error",
             "@typescript-eslint/no-empty-interface": "off",
             "@typescript-eslint/no-explicit-any": "off",
-            "@typescript-eslint/no-floating-promises": "warn",
+            "@typescript-eslint/no-floating-promises": [
+                "warn",
+                {
+                    "checkThenables": true
+                }
+            ],
             "@typescript-eslint/unbound-method": "error",
             "@typescript-eslint/no-misused-promises": "error",
             "@typescript-eslint/no-misused-new": "error",

package.json

@@ -10,6 +10,7 @@
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "buttplug": "^3.2.2",
+    "chokidar": "^5.0.0",
     "class-transformer": "^0.5.1",
     "cors": "^2.8.5",
     "dotenv": "^17.2.0",
@@ -22,7 +23,7 @@
     "read-last-lines": "^1.8.0",
     "reflect-metadata": "^0.1.13",
     "say": "^0.16.0",
-    "@timesplinter/sequential-task-queue": "^1.3.1",
+    "@timesplinter/sequential-task-queue": "^1.4.0",
     "serialport": "^13.0.0",
     "socket.io": "^4.8.3",
     "speaker": "https://github.com/SlvCtrlPlus/node-speaker/releases/download/v0.1.0/speaker-v0.1.0.tgz",

src/app.ts

@@ -207,6 +207,10 @@ export const createApp = (container: Container<ServiceMap>, options: AppOptions)
         .use(express.text())
     ;
 
+    const settingsManager = container.get('settings.manager');
+    settingsManager.load();
+    settingsManager.startWatching();
+
     configureRoutes(app, container);
     configureWebsocket(websocketServer, container);
     startDeviceProviders(container);
@@ -262,14 +266,24 @@ export const createApp = (container: Container<ServiceMap>, options: AppOptions)
             const logger = container.get('logger.default');
             logger.info('Shutting down...');
 
-            await container.get('automation.scriptRuntime').stop();
+            try {
+                await container.get('settings.manager').stopWatching();
+            } catch (e: unknown) {
+                logError(logger, 'Failed to stop settings file watcher during shutdown', e);
+            }
 
             try {
-                await container.get('device.provider.manager').stopProviders();
+                await container.get('automation.scriptRuntime').stop();
             } catch (e: unknown) {
-                logError(logger, 'Failed to stop device providers during shutdown', e);
+                logError(logger, 'Failed to stop automation script runtime during shutdown', e);
             }
 
+            try {
+                    await container.get('device.provider.manager').stopProviders();
+                } catch (e: unknown) {
+                    logError(logger, 'Failed to stop device providers during shutdown', e);
+                }
+
             container.get('health.metricsCollector').stop();
 
             await websocketServer.close();

src/device/bleDevice.ts

@@ -26,8 +26,6 @@ export default abstract class BleDevice<
     @Expose()
     private rssi: number;
 
-    protected logger: Logger;
-
     protected constructor(
         deviceId: DeviceId,
         deviceName: string,
@@ -40,9 +38,7 @@ export default abstract class BleDevice<
         eventEmitter: EventEmitter,
         logger: Logger,
     ) {
-        super(deviceId, deviceName, provider, connectedSince, controllable, attributes, config, eventEmitter);
-
-        this.logger = logger.child({ name: this.constructor.name });
+        super(deviceId, deviceName, provider, connectedSince, controllable, attributes, config, eventEmitter, logger);
 
         this.peripheral = peripheral;
         this.rssi = peripheral.rssi;

src/device/detectedDeviceOfferQueue.ts

@@ -4,6 +4,7 @@ import { DeviceDetectionInfo } from './deviceManager.js';
 import DeviceOfferRejectedError from './deviceOfferRejectedError.js';
 import Logger from '../logging/Logger.js';
 import { logError } from '../util/error.js';
+import { DetectionId } from './deviceId.js';
 
 export type OfferResult<D extends AnyDevice> =
     | { successful: true, device: D }
@@ -13,15 +14,15 @@ type DeviceOffer<D extends AnyDevice> = (cancellationToken: CancellationToken) =
 
 export default class DetectedDeviceOfferQueue
 {
-    private readonly queues: Map<string, SequentialTaskQueue> = new Map();
+    private readonly queues: Map<DetectionId, SequentialTaskQueue> = new Map();
 
     private readonly logger: Logger;
 
     public constructor(logger: Logger) {
         this.logger = logger;
     }
 
-    private getOrCreateQueue(detectionId: string): SequentialTaskQueue
+    private getOrCreateQueue(detectionId: DetectionId): SequentialTaskQueue
     {
         let queue = this.queues.get(detectionId);
 
@@ -58,7 +59,7 @@ export default class DetectedDeviceOfferQueue
 
         const task = queue.push((cancellationToken: CancellationToken) => this.runOffer(deviceOffer, cancellationToken));
 
-        return Promise.resolve(task.then(
+        return task.then(
             (result: OfferResult<D>): OfferResult<D> => {
                 if (result.successful) {
                     // Reject every other still-queued offer for this detection id without them
@@ -75,7 +76,7 @@ export default class DetectedDeviceOfferQueue
                 successful: false,
                 reason: reason,
             })
-        ));
+        );
     }
 
     private async runOffer<D extends AnyDevice>(
@@ -111,12 +112,12 @@ export default class DetectedDeviceOfferQueue
      * callers that need "is a fresh announce still blocked by a past revoke" must call
      * dropIfRevoked() first.
      */
-    public has(detectionId: string): boolean
+    public has(detectionId: DetectionId): boolean
     {
         return this.queues.has(detectionId);
     }
 
-    public dropIfRevoked(detectionId: string): void
+    public dropIfRevoked(detectionId: DetectionId): void
     {
         const queue = this.queues.get(detectionId);
 
@@ -125,7 +126,7 @@ export default class DetectedDeviceOfferQueue
         }
     }
 
-    private close(detectionId: string, reason: DeviceOfferRejectedError): void
+    private close(detectionId: DetectionId, reason: DeviceOfferRejectedError): void
     {
         const queue = this.queues.get(detectionId);
 
@@ -136,7 +137,7 @@ export default class DetectedDeviceOfferQueue
         this.queues.delete(detectionId);
     }
 
-    public revoke(detectionId: string, reason: DeviceOfferRejectedError): void
+    public revoke(detectionId: DetectionId, reason: DeviceOfferRejectedError): void
     {
         const queue = this.getOrCreateQueue(detectionId);