@fastybird/smart-panel-backend 0.12.0-alpha.0 → 1.0.0-beta.2

package/dist/plugins/devices-shelly-ng/services/shelly-ng-discovery.service.d.ts

@@ -0,0 +1,64 @@
+import { DeviceCategory } from '../../../modules/devices/devices.constants';
+import { DevicesService } from '../../../modules/devices/services/devices.service';
+import { DeviceManagerService } from './device-manager.service';
+import { ShellyNgService } from './shelly-ng.service';
+export type ShellyNgDiscoverySessionStatus = 'running' | 'finished' | 'failed';
+export type ShellyNgDiscoveryDeviceStatus = 'checking' | 'ready' | 'needs_password' | 'already_registered' | 'unsupported' | 'failed';
+export type ShellyNgDiscoveryDeviceSource = 'mdns' | 'manual';
+export interface ShellyNgDiscoveryDeviceSnapshot {
+    identifier: string | null;
+    hostname: string;
+    name: string | null;
+    model: string | null;
+    displayName: string | null;
+    firmware: string | null;
+    status: ShellyNgDiscoveryDeviceStatus;
+    source: ShellyNgDiscoveryDeviceSource;
+    categories: DeviceCategory[];
+    suggestedCategory: DeviceCategory | null;
+    authentication: {
+        enabled: boolean;
+        domain: string | null;
+    };
+    registeredDeviceId: string | null;
+    registeredDeviceName: string | null;
+    registeredDeviceCategory: DeviceCategory | null;
+    error: string | null;
+    lastSeenAt: string;
+}
+export interface ShellyNgDiscoverySessionSnapshot {
+    id: string;
+    status: ShellyNgDiscoverySessionStatus;
+    startedAt: string;
+    expiresAt: string;
+    remainingSeconds: number;
+    devices: ShellyNgDiscoveryDeviceSnapshot[];
+}
+export declare class ShellyNgDiscoveryService {
+    private readonly deviceManagerService;
+    private readonly devicesService;
+    private readonly shellyNgService;
+    private static readonly FINISHED_SESSION_TTL_MS;
+    private readonly logger;
+    private readonly sessions;
+    constructor(deviceManagerService: DeviceManagerService, devicesService: DevicesService, shellyNgService: ShellyNgService);
+    start({ duration }: {
+        duration: number;
+    }): Promise<ShellyNgDiscoverySessionSnapshot>;
+    get(id: string): ShellyNgDiscoverySessionSnapshot | null;
+    manual(id: string, { hostname, password }: {
+        hostname: string;
+        password?: string | null;
+    }): Promise<ShellyNgDiscoverySessionSnapshot | null>;
+    private finish;
+    private unsubscribeFromAdded;
+    private scheduleCleanup;
+    private clearTimers;
+    private clearTimer;
+    private clearCleanupTimer;
+    private storePassword;
+    private handleLibDevice;
+    private inspectDevice;
+    private findDescriptor;
+    private toSnapshot;
+}

package/dist/plugins/devices-shelly-ng/services/shelly-ng-discovery.service.js

@@ -0,0 +1,301 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ShellyNgDiscoveryService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellyNgDiscoveryService = void 0;
+const crypto_1 = require("crypto");
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const devices_shelly_ng_constants_1 = require("../devices-shelly-ng.constants");
+const device_manager_service_1 = require("./device-manager.service");
+const shelly_ng_service_1 = require("./shelly-ng.service");
+let ShellyNgDiscoveryService = ShellyNgDiscoveryService_1 = class ShellyNgDiscoveryService {
+    constructor(deviceManagerService, devicesService, shellyNgService) {
+        this.deviceManagerService = deviceManagerService;
+        this.devicesService = devicesService;
+        this.shellyNgService = shellyNgService;
+        this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_PLUGIN_NAME, 'ShellyNgDiscoveryService');
+        this.sessions = new Map();
+    }
+    async start({ duration }) {
+        const id = (0, crypto_1.randomUUID)();
+        const startedAt = new Date();
+        const expiresAt = new Date(startedAt.getTime() + duration * 1_000);
+        const session = {
+            id,
+            status: 'running',
+            startedAt,
+            expiresAt,
+            devices: new Map(),
+            passwords: new Map(),
+        };
+        session.unsubscribeAdded = this.shellyNgService.subscribeToAddedDevice((device) => {
+            void this.handleLibDevice(session, device);
+        });
+        for (const device of this.shellyNgService.getKnownDevices()) {
+            await this.handleLibDevice(session, device);
+        }
+        session.timer = setTimeout(() => {
+            void this.finish(id);
+        }, duration * 1_000);
+        this.sessions.set(id, session);
+        return this.toSnapshot(session);
+    }
+    get(id) {
+        const session = this.sessions.get(id);
+        if (session === undefined) {
+            return null;
+        }
+        return this.toSnapshot(session);
+    }
+    async manual(id, { hostname, password }) {
+        const session = this.sessions.get(id);
+        if (session === undefined) {
+            return null;
+        }
+        const discoveredDevice = await this.inspectDevice(session, hostname, 'manual', password ?? null);
+        if (password !== null && typeof password !== 'undefined' && discoveredDevice?.status === 'ready') {
+            this.storePassword(session, discoveredDevice, password);
+        }
+        return this.toSnapshot(session);
+    }
+    async finish(id) {
+        const session = this.sessions.get(id);
+        if (session === undefined || session.status !== 'running') {
+            return;
+        }
+        session.status = 'finished';
+        this.clearTimer(session);
+        this.unsubscribeFromAdded(session);
+        this.scheduleCleanup(session);
+        await Promise.resolve();
+    }
+    unsubscribeFromAdded(session) {
+        if (typeof session.unsubscribeAdded === 'function') {
+            try {
+                session.unsubscribeAdded();
+            }
+            catch (error) {
+                const err = error;
+                this.logger.warn('Failed to detach Shelly NG discovery listener', {
+                    session: session.id,
+                    message: err.message,
+                    stack: err.stack,
+                });
+            }
+            session.unsubscribeAdded = undefined;
+        }
+    }
+    scheduleCleanup(session) {
+        this.clearCleanupTimer(session);
+        session.cleanupTimer = setTimeout(() => {
+            this.sessions.delete(session.id);
+        }, ShellyNgDiscoveryService_1.FINISHED_SESSION_TTL_MS);
+    }
+    clearTimers(session) {
+        this.clearTimer(session);
+        this.clearCleanupTimer(session);
+        this.unsubscribeFromAdded(session);
+    }
+    clearTimer(session) {
+        if (session.timer !== undefined) {
+            clearTimeout(session.timer);
+            session.timer = undefined;
+        }
+    }
+    clearCleanupTimer(session) {
+        if (session.cleanupTimer !== undefined) {
+            clearTimeout(session.cleanupTimer);
+            session.cleanupTimer = undefined;
+        }
+    }
+    storePassword(session, device, password) {
+        session.passwords.set(device.hostname, password);
+        if (device.identifier !== null) {
+            session.passwords.set(device.identifier, password);
+        }
+    }
+    async handleLibDevice(session, device) {
+        const hostname = device.wifi?.sta_ip ?? device.ethernet?.ip ?? null;
+        if (typeof hostname !== 'string' || hostname.length === 0) {
+            return;
+        }
+        const existing = session.devices.get(hostname);
+        if (existing && existing.source === 'manual') {
+            return;
+        }
+        try {
+            const registeredDevice = await this.devicesService.findOneBy('identifier', device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            const descriptor = this.findDescriptor(device.model);
+            const categories = descriptor?.categories ?? [];
+            let status;
+            if (registeredDevice !== null) {
+                status = 'already_registered';
+            }
+            else if (descriptor === null) {
+                status = 'unsupported';
+            }
+            else {
+                status = 'ready';
+            }
+            const snapshot = {
+                identifier: device.id,
+                hostname,
+                name: device.system?.config?.device?.name ?? null,
+                model: device.model,
+                displayName: descriptor?.name ?? device.modelName ?? device.model,
+                firmware: device.firmware?.version ?? null,
+                status,
+                source: 'mdns',
+                categories,
+                suggestedCategory: categories.length > 0 ? categories[0] : null,
+                authentication: { enabled: false, domain: null },
+                registeredDeviceId: registeredDevice?.id ?? null,
+                registeredDeviceName: registeredDevice?.name ?? null,
+                registeredDeviceCategory: registeredDevice?.category ?? null,
+                error: null,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, snapshot);
+        }
+        catch (error) {
+            const err = error;
+            this.logger.warn('Failed to build discovery snapshot for device from main connector', {
+                session: session.id,
+                hostname,
+                message: err.message,
+                stack: err.stack,
+            });
+            session.devices.set(hostname, {
+                identifier: device.id,
+                hostname,
+                name: device.system?.config?.device?.name ?? null,
+                model: device.model,
+                displayName: device.modelName ?? device.model,
+                firmware: device.firmware?.version ?? null,
+                status: 'failed',
+                source: 'mdns',
+                categories: [],
+                suggestedCategory: null,
+                authentication: { enabled: false, domain: null },
+                registeredDeviceId: null,
+                registeredDeviceName: null,
+                registeredDeviceCategory: null,
+                error: err.message,
+                lastSeenAt: new Date().toISOString(),
+            });
+        }
+    }
+    async inspectDevice(session, hostname, source, password) {
+        if (hostname.length === 0) {
+            return null;
+        }
+        const existing = session.devices.get(hostname);
+        session.devices.set(hostname, {
+            identifier: existing?.identifier ?? null,
+            hostname,
+            name: existing?.name ?? null,
+            model: existing?.model ?? null,
+            displayName: existing?.displayName ?? null,
+            firmware: existing?.firmware ?? null,
+            status: 'checking',
+            source,
+            categories: existing?.categories ?? [],
+            suggestedCategory: existing?.suggestedCategory ?? null,
+            authentication: existing?.authentication ?? { enabled: false, domain: null },
+            registeredDeviceId: existing?.registeredDeviceId ?? null,
+            registeredDeviceName: existing?.registeredDeviceName ?? null,
+            registeredDeviceCategory: existing?.registeredDeviceCategory ?? null,
+            error: null,
+            lastSeenAt: new Date().toISOString(),
+        });
+        try {
+            const deviceInfo = await this.deviceManagerService.getDeviceInfo(hostname, password);
+            const descriptor = this.findDescriptor(deviceInfo.model);
+            const registeredDevice = await this.devicesService.findOneBy('identifier', deviceInfo.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            const categories = descriptor?.categories ?? [];
+            const authentication = {
+                enabled: deviceInfo.auth_en,
+                domain: deviceInfo.auth_domain,
+            };
+            let status = 'ready';
+            if (registeredDevice !== null) {
+                status = 'already_registered';
+            }
+            else if (descriptor === null) {
+                status = 'unsupported';
+            }
+            else if (deviceInfo.auth_en && password === null) {
+                status = 'needs_password';
+            }
+            const discoveredDevice = {
+                identifier: deviceInfo.id,
+                hostname,
+                name: deviceInfo.name ?? null,
+                model: deviceInfo.model,
+                displayName: descriptor?.name ?? deviceInfo.model,
+                firmware: deviceInfo.ver,
+                status,
+                source,
+                categories,
+                suggestedCategory: categories.length > 0 ? categories[0] : null,
+                authentication,
+                registeredDeviceId: registeredDevice?.id ?? null,
+                registeredDeviceName: registeredDevice?.name ?? null,
+                registeredDeviceCategory: registeredDevice?.category ?? null,
+                error: null,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, discoveredDevice);
+            return discoveredDevice;
+        }
+        catch (error) {
+            const err = error;
+            const currentDevice = session.devices.get(hostname);
+            if (currentDevice === undefined) {
+                return null;
+            }
+            const failedDevice = {
+                ...currentDevice,
+                status: 'failed',
+                source,
+                error: err.message,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, failedDevice);
+            return failedDevice;
+        }
+    }
+    findDescriptor(model) {
+        const normalizedModel = model.toUpperCase();
+        return (Object.values(devices_shelly_ng_constants_1.DESCRIPTORS).find((descriptor) => descriptor.models.some((descriptorModel) => descriptorModel.toUpperCase() === normalizedModel)) ?? null);
+    }
+    toSnapshot(session) {
+        return {
+            id: session.id,
+            status: session.status,
+            startedAt: session.startedAt.toISOString(),
+            expiresAt: session.expiresAt.toISOString(),
+            remainingSeconds: Math.max(0, Math.ceil((session.expiresAt.getTime() - Date.now()) / 1_000)),
+            devices: Array.from(session.devices.values()),
+        };
+    }
+};
+exports.ShellyNgDiscoveryService = ShellyNgDiscoveryService;
+ShellyNgDiscoveryService.FINISHED_SESSION_TTL_MS = 5 * 60_000;
+exports.ShellyNgDiscoveryService = ShellyNgDiscoveryService = ShellyNgDiscoveryService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [device_manager_service_1.DeviceManagerService,
+        devices_service_1.DevicesService,
+        shelly_ng_service_1.ShellyNgService])
+], ShellyNgDiscoveryService);
+//# sourceMappingURL=shelly-ng-discovery.service.js.map

package/dist/plugins/devices-shelly-ng/services/shelly-ng-discovery.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shelly-ng-discovery.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-ng/services/shelly-ng-discovery.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/devices-shelly-ng/services/shelly-ng.service.d.ts

@@ -2,12 +2,14 @@ import { Device, DeviceId } from 'shellies-ds9';
 import { ConfigService } from '../../../modules/config/services/config.service';
 import { DeviceConnectivityService } from '../../../modules/devices/services/device-connectivity.service';
 import { DevicesService } from '../../../modules/devices/services/devices.service';
-import { ConfigChangeResult, IManagedPluginService, ServiceState } from '../../../modules/extensions/services/managed-plugin-service.interface';
+import { BaseManagedPluginService } from '../../../modules/extensions/services/base-managed-plugin.service';
+import { ConfigChangeResult } from '../../../modules/extensions/services/managed-plugin-service.interface';
 import { PluginServiceManagerService } from '../../../modules/extensions/services/plugin-service-manager.service';
 import { DelegatesManagerService } from '../delegates/delegates-manager.service';
 import { DatabaseDiscovererService } from './database-discoverer.service';
 import { DeviceManagerService } from './device-manager.service';
-export declare class ShellyNgService implements IManagedPluginService {
+import { ShellyWsServerService } from './shelly-ws-server.service';
+export declare class ShellyNgService extends BaseManagedPluginService {
     private readonly configService;
     private readonly databaseDiscovererService;
     private readonly delegatesRegistryService;
@@ -15,26 +17,27 @@ export declare class ShellyNgService implements IManagedPluginService {
     private readonly devicesService;
     private readonly deviceConnectivityService;
     private readonly pluginServiceManager;
+    private readonly wsServer;
     private readonly logger;
     readonly pluginName = "devices-shelly-ng-plugin";
     readonly serviceId = "connector";
     private shellies?;
     private pluginConfig;
-    private state;
-    private startStopLock;
     private pendingRestart;
     private restartTimer;
+    private healthCheckTimer;
+    private healthCheckRunning;
+    private statusPollTimer;
+    private statusPollRunning;
     private readonly discoveryQueue;
     private processingDiscovery;
     private discoveryGeneration;
-    constructor(configService: ConfigService, databaseDiscovererService: DatabaseDiscovererService, delegatesRegistryService: DelegatesManagerService, deviceManagerService: DeviceManagerService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService, pluginServiceManager: PluginServiceManagerService);
+    constructor(configService: ConfigService, databaseDiscovererService: DatabaseDiscovererService, delegatesRegistryService: DelegatesManagerService, deviceManagerService: DeviceManagerService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService, pluginServiceManager: PluginServiceManagerService, wsServer: ShellyWsServerService);
     start(): Promise<void>;
     stop(): Promise<void>;
-    getState(): ServiceState;
     onConfigChanged(): Promise<ConfigChangeResult>;
     restart(): Promise<void>;
     requestRestart(delayMs?: number): Promise<void>;
-    private withLock;
     private doStart;
     private doStop;
     private get config();
@@ -45,6 +48,13 @@ export declare class ShellyNgService implements IManagedPluginService {
     protected handleExcludedDevice: (deviceId: DeviceId) => void;
     protected handleUnknownDevice: (deviceId: DeviceId, model: string) => void;
     protected handleError: (deviceId: DeviceId, error: Error) => void;
+    private readonly addSubscribers;
+    getKnownDevices(): Device[];
+    subscribeToAddedDevice(handler: (device: Device) => void): () => void;
     private initialize;
+    private startHealthCheck;
+    private stopHealthCheck;
+    private startStatusPoll;
+    private stopStatusPoll;
     private waitUntil;
 }