Skip to content
Merged
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
11 changes: 9 additions & 2 deletions eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ export default [
],
},
eslint.configs.recommended,
...tseslint.configs.recommended,
preferArrowFunctions.configs?.all ?? [],
...tseslint.configs.strict,
...tseslint.configs.stylistic,
preferArrowFunctions.configs.all,
{
languageOptions: {
parserOptions: {
Expand Down Expand Up @@ -100,6 +101,12 @@ export default [
"@typescript-eslint/no-misused-promises": "error",
"@typescript-eslint/no-misused-new": "error",
"@typescript-eslint/no-namespace": "error",
"@typescript-eslint/no-extraneous-class": "error",
"@typescript-eslint/no-invalid-void-type": "error",
"@typescript-eslint/consistent-type-definitions": [
"error",
"type"
],
"@typescript-eslint/no-parameter-properties": "off",
"@typescript-eslint/no-shadow": [
"error",
Expand Down
168 changes: 162 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"eslint": "^10.1.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-jsdoc": "^62.8.0",
"eslint-plugin-prefer-arrow-functions": "^3.9.1",
"eslint-plugin-prefer-arrow-functions": "^3.10.1",
"globals": "^17.0.0",
"jiti": "^2.6.1",
"nodemon": "^3.0.2",
Expand Down
24 changes: 14 additions & 10 deletions src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { AnyDevice } from './device/device.js';
import WebSocketEvent from './device/webSocketEvent.js';
import AutomationEventType from './automation/automationEventType.js';
import LoggerServiceProvider from './serviceProvider/loggerServiceProvider.js';
import DeviceDiscriminator from './serialization/discriminator/deviceDiscriminator.js';
import deviceDiscriminator from './serialization/discriminator/deviceDiscriminator.js';
import ServiceMap from './serviceMap.js';
import SettingsEventType from './settings/settingsEventType.js';
import type Settings from './settings/settings.js';
Expand All @@ -34,19 +34,23 @@ import fs from 'fs'
import BaseError from 'modern-errors';
import { Server } from 'socket.io';

export type SslConfig = { port: number, keyFile: string, certFile: string };
export type SslConfig = {
port: number;
keyFile: string;
certFile: string;
}

export interface AppOptions {
export type AppOptions = {
allowedOrigins: string[];
dataPath: string;
}

export interface ServeResult {
export type ServeResult = {
httpServer: http.Server;
httpsServer?: https.Server;
}

export interface AppInstance {
export type AppInstance = {
websocket: WebsocketServer;
serve: (httpPort: number, sslConfig?: SslConfig) => ServeResult;
shutdown: () => Promise<void>;
Expand Down Expand Up @@ -83,7 +87,7 @@ const configureWebsocket = (io: WebsocketServer, container: Container<ServiceMap
const logger = container.get('logger.default');
const healthMetricsCollector = container.get('health.metricsCollector');

const deviceDiscriminator = DeviceDiscriminator.createClassTransformerTypeDiscriminator('type');
const deviceDiscriminatorInstance = deviceDiscriminator.createClassTransformerTypeDiscriminator('type');

// Health metrics: start background refresh, broadcast over WebSocket on each collection
healthMetricsCollector.start(1000);
Expand All @@ -105,22 +109,22 @@ const configureWebsocket = (io: WebsocketServer, container: Container<ServiceMap
});

deviceManager.on(DeviceManagerEvent.deviceConnected, (device: AnyDevice) => {
io.emit(WebSocketEvent.deviceConnected, serializer.transform<SerializedDevice>(device, deviceDiscriminator));
io.emit(WebSocketEvent.deviceConnected, serializer.transform<SerializedDevice>(device, deviceDiscriminatorInstance));
void scriptRuntime.runForEvent({ type: DeviceManagerEvent.deviceConnected, device, args: [] });
});

deviceManager.on(DeviceManagerEvent.deviceDisconnected, (device: AnyDevice) => {
io.emit(WebSocketEvent.deviceDisconnected, serializer.transform<SerializedDevice>(device, deviceDiscriminator));
io.emit(WebSocketEvent.deviceDisconnected, serializer.transform<SerializedDevice>(device, deviceDiscriminatorInstance));
void scriptRuntime.runForEvent({ type: DeviceManagerEvent.deviceDisconnected, device, args: [] });
});

deviceManager.on(DeviceManagerEvent.deviceRefreshed, (device: AnyDevice) => {
io.emit(WebSocketEvent.deviceRefreshed, serializer.transform<SerializedDevice>(device, deviceDiscriminator));
io.emit(WebSocketEvent.deviceRefreshed, serializer.transform<SerializedDevice>(device, deviceDiscriminatorInstance));
void scriptRuntime.runForEvent({ type: DeviceManagerEvent.deviceRefreshed, device, args: [] });
});

deviceManager.on(DeviceManagerEvent.deviceNotification, (device: AnyDevice, notification) => {
io.emit(WebSocketEvent.deviceNotification, serializer.transform<SerializedDevice>(device, deviceDiscriminator), notification);
io.emit(WebSocketEvent.deviceNotification, serializer.transform<SerializedDevice>(device, deviceDiscriminatorInstance), notification);
void scriptRuntime.runForEvent({ type: DeviceManagerEvent.deviceNotification, device, args: [notification] });
});

Expand Down
13 changes: 9 additions & 4 deletions src/automation/scriptRuntime.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ export type SupportedDeviceEvent =
| { type: DeviceManagerEvent.deviceNotification; device: AnyDevice; args: [notification: DeviceNotification] };

type ScriptRuntimeEvents = {
[AutomationEventType.consoleLog]: (data: string) => void,
[AutomationEventType.scriptStarted]: () => void,
[AutomationEventType.scriptStopped]: () => void,
[AutomationEventType.consoleLog]: (data: string) => void;
[AutomationEventType.scriptStarted]: () => void;
[AutomationEventType.scriptStopped]: () => void;
}

const AUTOMATION_LOG_FILENAME = 'automation.log';
Expand Down Expand Up @@ -156,7 +156,12 @@ export default class ScriptRuntime
private async processQueue(): Promise<void>
{
while (this.eventQueue.length > 0) {
const task = this.eventQueue.shift()!;
const task = this.eventQueue.shift();

if (undefined === task) {
continue;
}

try {
await task();
} catch (e: unknown) {
Expand Down
2 changes: 1 addition & 1 deletion src/automation/scriptVm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { EventEmitter } from 'events';
export type ScriptVmSignalEvents = {
eventDone: [errMsg: string | null];
lifecycleDone: [errMsg: string | null];
};
}

export const LIFECYCLE_START = 'start';
export const LIFECYCLE_STOP = 'stop';
Expand Down
2 changes: 1 addition & 1 deletion src/automation/scriptVmFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import ScriptVm, { LIFECYCLE_START, ScriptVmSignalEvents } from './scriptVm.js';
export type BridgeDevice = {
id: string;
name: string;
};
}

export const toBridgeDevice = (device: AnyDevice): BridgeDevice => {
return { id: device.getDeviceId, name: device.getDeviceName };
Expand Down
5 changes: 4 additions & 1 deletion src/controller/automation/createScriptController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import ControllerInterface from '../controllerInterface.js';
import AutomationScriptRepositoryInterface from '../../repository/automationScriptRepositoryInterface.js';
import { isValidAutomationScriptFileName } from '../../automation/utils.js';

type RequestParams = { fileName: string };

type RequestParams = {
fileName: string;
}
type RequestBody = string;
type CreateScriptRequest = Request<RequestParams, any, RequestBody>;

Expand Down
3 changes: 2 additions & 1 deletion src/controller/automation/deleteScriptController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import ControllerInterface from '../controllerInterface.js';
import AutomationScriptRepositoryInterface from '../../repository/automationScriptRepositoryInterface.js';
import { isValidAutomationScriptFileName } from '../../automation/utils.js';

type RequestParams = { fileName: string };

type RequestParams = { fileName: string }
type DeleteScriptRequest = Request<RequestParams>;

export default class DeleteScriptController implements ControllerInterface
Expand Down
5 changes: 4 additions & 1 deletion src/controller/automation/getScriptController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import ControllerInterface from '../controllerInterface.js';
import AutomationScriptRepositoryInterface from '../../repository/automationScriptRepositoryInterface.js';
import { isValidAutomationScriptFileName } from '../../automation/utils.js';

type RequestParams = { fileName: string };
type RequestParams = {
fileName: string;
}

type GetScriptRequest = Request<RequestParams>;

export default class GetScriptController implements ControllerInterface
Expand Down
4 changes: 2 additions & 2 deletions src/controller/controllerInterface.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Request, Response } from 'express';

export default interface ControllerInterface
{
type ControllerInterface = {
execute(req: Request, res: Response): void | Promise<void>;
}
export default ControllerInterface
Loading