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

package/dist/plugins/devices-zigbee2mqtt/services/wizard.service.js

@@ -0,0 +1,361 @@
+"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 Z2mWizardService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Z2mWizardService = 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_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constants");
+const devices_zigbee2mqtt_exceptions_1 = require("../devices-zigbee2mqtt.exceptions");
+const mapping_preview_dto_1 = require("../dto/mapping-preview.dto");
+const device_adoption_service_1 = require("./device-adoption.service");
+const mapping_preview_service_1 = require("./mapping-preview.service");
+const zigbee2mqtt_service_1 = require("./zigbee2mqtt.service");
+let Z2mWizardService = Z2mWizardService_1 = class Z2mWizardService {
+    constructor(zigbee2mqttService, deviceAdoptionService, mappingPreviewService, devicesService) {
+        this.zigbee2mqttService = zigbee2mqttService;
+        this.deviceAdoptionService = deviceAdoptionService;
+        this.mappingPreviewService = mappingPreviewService;
+        this.devicesService = devicesService;
+        this.logger = (0, logger_1.createExtensionLogger)(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME, 'Z2mWizardService');
+        this.sessions = new Map();
+    }
+    async start() {
+        const id = (0, crypto_1.randomUUID)();
+        const session = {
+            id,
+            startedAt: new Date(),
+            permitJoin: { active: false, expiresAt: null },
+            devices: new Map(),
+        };
+        this.sessions.set(id, session);
+        this.refreshIdleTimer(session);
+        session.unsubscribeJoined = this.zigbee2mqttService.subscribeToDeviceJoined((device) => {
+            void this.handleDeviceJoined(session, device);
+        });
+        await this.populateInitialDevices(session);
+        return this.toSnapshot(session);
+    }
+    get(id) {
+        const session = this.sessions.get(id);
+        if (!session) {
+            return null;
+        }
+        this.refreshIdleTimer(session);
+        return this.toSnapshot(session);
+    }
+    async end(id) {
+        const session = this.sessions.get(id);
+        if (!session) {
+            return;
+        }
+        await this.cleanupSession(session);
+        this.sessions.delete(id);
+    }
+    async onModuleDestroy() {
+        for (const session of this.sessions.values()) {
+            await this.cleanupSession(session);
+        }
+        this.sessions.clear();
+    }
+    async enablePermitJoin(id) {
+        const session = this.sessions.get(id);
+        if (!session) {
+            return null;
+        }
+        this.refreshIdleTimer(session);
+        const ok = await this.zigbee2mqttService.setPermitJoin(Z2mWizardService_1.PERMIT_JOIN_DURATION_S);
+        if (!ok) {
+            this.logger.warn('Failed to enable permit_join', { session: id });
+            throw new devices_zigbee2mqtt_exceptions_1.Zigbee2mqttBridgeOfflineException();
+        }
+        if (session.permitJoin.timer) {
+            clearTimeout(session.permitJoin.timer);
+        }
+        session.permitJoin = {
+            active: true,
+            expiresAt: new Date(Date.now() + Z2mWizardService_1.PERMIT_JOIN_DURATION_S * 1_000),
+            timer: setTimeout(() => {
+                session.permitJoin = { active: false, expiresAt: null };
+            }, Z2mWizardService_1.PERMIT_JOIN_DURATION_S * 1_000),
+        };
+        return this.toSnapshot(session);
+    }
+    async disablePermitJoin(id) {
+        const session = this.sessions.get(id);
+        if (!session) {
+            return null;
+        }
+        this.refreshIdleTimer(session);
+        await this.disablePermitJoinInternal(session);
+        return this.toSnapshot(session);
+    }
+    async cleanupSession(session) {
+        await this.disablePermitJoinInternal(session);
+        session.unsubscribeJoined?.();
+        if (session.idleTimer) {
+            clearTimeout(session.idleTimer);
+        }
+    }
+    toSnapshot(session) {
+        return {
+            id: session.id,
+            bridgeOnline: this.zigbee2mqttService.isBridgeOnline(),
+            startedAt: session.startedAt.toISOString(),
+            permitJoin: {
+                active: session.permitJoin.active,
+                expiresAt: session.permitJoin.expiresAt?.toISOString() ?? null,
+                remainingSeconds: session.permitJoin.expiresAt
+                    ? Math.max(0, Math.ceil((session.permitJoin.expiresAt.getTime() - Date.now()) / 1_000))
+                    : 0,
+            },
+            devices: Array.from(session.devices.values()),
+        };
+    }
+    refreshIdleTimer(session) {
+        if (session.idleTimer) {
+            clearTimeout(session.idleTimer);
+        }
+        session.idleTimer = setTimeout(() => {
+            void this.end(session.id);
+        }, Z2mWizardService_1.IDLE_TTL_MS);
+    }
+    async disablePermitJoinInternal(session) {
+        if (!session.permitJoin.active) {
+            return;
+        }
+        if (session.permitJoin.timer) {
+            clearTimeout(session.permitJoin.timer);
+        }
+        try {
+            await this.zigbee2mqttService.setPermitJoin(0);
+        }
+        catch (e) {
+            this.logger.warn('Failed to disable permit_join during cleanup', { message: e.message });
+        }
+        session.permitJoin = { active: false, expiresAt: null };
+    }
+    async populateInitialDevices(session) {
+        if (!this.zigbee2mqttService.isBridgeOnline())
+            return;
+        const z2mDevices = this.zigbee2mqttService.getRegisteredDevices();
+        const adopted = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
+        for (const z2mDevice of z2mDevices) {
+            const snapshot = await this.computeSnapshot(z2mDevice, adopted);
+            session.devices.set(snapshot.ieeeAddress, snapshot);
+        }
+    }
+    async handleDeviceJoined(session, z2mDevice) {
+        try {
+            const adopted = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
+            const snapshot = await this.computeSnapshot(z2mDevice, adopted);
+            session.devices.set(snapshot.ieeeAddress, snapshot);
+        }
+        catch (e) {
+            this.logger.warn('Failed to handle device-joined event', {
+                session: session.id,
+                ieeeAddress: z2mDevice?.ieeeAddress,
+                message: e.message,
+            });
+        }
+    }
+    async computeSnapshot(z2mDevice, adopted) {
+        const adoptedRecord = adopted.find((d) => d.identifier === z2mDevice.friendlyName) ?? null;
+        let preview = null;
+        let previewError = null;
+        try {
+            preview = await this.mappingPreviewService.generatePreview(z2mDevice.ieeeAddress);
+        }
+        catch (e) {
+            previewError = e.message;
+        }
+        const suggestedCategory = preview?.suggestedDevice?.category ?? null;
+        const channelCategories = new Set();
+        for (const expose of preview?.exposes ?? []) {
+            if (expose.status === 'skipped' || expose.status === 'unmapped')
+                continue;
+            if (!expose.suggestedChannel)
+                continue;
+            if (expose.suggestedChannel.category === 'generic')
+                continue;
+            if (!expose.suggestedProperties || expose.suggestedProperties.length === 0)
+                continue;
+            channelCategories.add(expose.suggestedChannel.category);
+        }
+        const previewChannelIdentifiers = Array.from(channelCategories);
+        const previewChannelCount = previewChannelIdentifiers.length;
+        let status;
+        if (previewError) {
+            status = 'failed';
+        }
+        else if (adoptedRecord) {
+            status = 'already_registered';
+        }
+        else if (previewChannelCount === 0) {
+            status = 'unsupported';
+        }
+        else {
+            status = 'ready';
+        }
+        return {
+            ieeeAddress: z2mDevice.ieeeAddress,
+            friendlyName: z2mDevice.friendlyName,
+            manufacturer: z2mDevice.definition?.vendor ?? null,
+            model: z2mDevice.definition?.model ?? null,
+            description: z2mDevice.definition?.description ?? null,
+            status,
+            suggestedCategory,
+            previewChannelCount,
+            previewChannelIdentifiers,
+            registeredDeviceId: adoptedRecord?.id ?? null,
+            registeredDeviceName: adoptedRecord?.name ?? null,
+            registeredDeviceCategory: adoptedRecord?.category ?? null,
+            error: previewError,
+            lastSeenAt: new Date().toISOString(),
+        };
+    }
+    async adopt(id, requests) {
+        const session = this.sessions.get(id);
+        if (!session)
+            return null;
+        this.refreshIdleTimer(session);
+        const adopted = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
+        for (const z2mDevice of this.zigbee2mqttService.getRegisteredDevices()) {
+            const refreshed = await this.computeSnapshot(z2mDevice, adopted);
+            const existing = session.devices.get(refreshed.ieeeAddress);
+            if (existing?.status === 'already_registered' && existing.registeredDeviceId) {
+                session.devices.set(refreshed.ieeeAddress, {
+                    ...refreshed,
+                    status: 'already_registered',
+                    registeredDeviceId: existing.registeredDeviceId,
+                    registeredDeviceName: existing.registeredDeviceName,
+                    registeredDeviceCategory: existing.registeredDeviceCategory,
+                });
+            }
+            else {
+                session.devices.set(refreshed.ieeeAddress, refreshed);
+            }
+        }
+        const results = [];
+        for (const req of requests) {
+            const current = session.devices.get(req.ieeeAddress);
+            if (!current) {
+                results.push({
+                    ieeeAddress: req.ieeeAddress,
+                    name: req.name,
+                    status: 'failed',
+                    error: 'Device not in session',
+                });
+                continue;
+            }
+            try {
+                if (current.status === 'already_registered' && current.registeredDeviceId) {
+                    await this.devicesService.update(current.registeredDeviceId, {
+                        type: devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE,
+                        name: req.name,
+                        category: req.category,
+                    });
+                    session.devices.set(req.ieeeAddress, {
+                        ...current,
+                        registeredDeviceName: req.name,
+                        registeredDeviceCategory: req.category,
+                    });
+                    results.push({
+                        ieeeAddress: req.ieeeAddress,
+                        name: req.name,
+                        status: 'updated',
+                        error: null,
+                    });
+                    continue;
+                }
+                const adoptRequest = await this.buildAdoptRequest(req.ieeeAddress, req.name, req.category);
+                const created = await this.deviceAdoptionService.adoptDevice(adoptRequest);
+                session.devices.set(req.ieeeAddress, {
+                    ...current,
+                    status: 'already_registered',
+                    registeredDeviceId: created.id,
+                    registeredDeviceName: req.name,
+                    registeredDeviceCategory: req.category,
+                });
+                results.push({
+                    ieeeAddress: req.ieeeAddress,
+                    name: req.name,
+                    status: 'created',
+                    error: null,
+                });
+            }
+            catch (e) {
+                results.push({
+                    ieeeAddress: req.ieeeAddress,
+                    name: req.name,
+                    status: 'failed',
+                    error: e.message,
+                });
+            }
+        }
+        return results;
+    }
+    async buildAdoptRequest(ieeeAddress, name, category) {
+        const preview = await this.mappingPreviewService.generatePreview(ieeeAddress);
+        const channelMap = new Map();
+        for (const expose of preview.exposes) {
+            if (expose.status === 'skipped' || expose.status === 'unmapped')
+                continue;
+            if (!expose.suggestedChannel)
+                continue;
+            const channelCategory = expose.suggestedChannel.category;
+            if (channelCategory === 'generic')
+                continue;
+            if (!expose.suggestedProperties || expose.suggestedProperties.length === 0)
+                continue;
+            let channel = channelMap.get(channelCategory);
+            if (!channel) {
+                channel = {
+                    category: channelCategory,
+                    name: expose.suggestedChannel.name || channelCategory,
+                    identifier: channelCategory,
+                    properties: [],
+                };
+                channelMap.set(channelCategory, channel);
+            }
+            for (const prop of expose.suggestedProperties) {
+                if (channel.properties.find((p) => p.category === prop.category))
+                    continue;
+                channel.properties.push({
+                    category: prop.category,
+                    z2mProperty: prop.z2mProperty,
+                    dataType: prop.dataType,
+                    permissions: prop.permissions,
+                    format: (prop.format ?? null),
+                });
+            }
+        }
+        const request = new mapping_preview_dto_1.AdoptDeviceRequestDto();
+        request.ieeeAddress = ieeeAddress;
+        request.name = name;
+        request.category = category;
+        request.channels = Array.from(channelMap.values());
+        return request;
+    }
+};
+exports.Z2mWizardService = Z2mWizardService;
+Z2mWizardService.IDLE_TTL_MS = 10 * 60_000;
+Z2mWizardService.PERMIT_JOIN_DURATION_S = 254;
+exports.Z2mWizardService = Z2mWizardService = Z2mWizardService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [zigbee2mqtt_service_1.Zigbee2mqttService,
+        device_adoption_service_1.Z2mDeviceAdoptionService,
+        mapping_preview_service_1.Z2mMappingPreviewService,
+        devices_service_1.DevicesService])
+], Z2mWizardService);
+//# sourceMappingURL=wizard.service.js.map

package/dist/plugins/devices-zigbee2mqtt/services/wizard.service.js.map

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

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.d.ts

@@ -7,6 +7,7 @@ export declare class Z2mWsClientAdapterService extends Z2mBaseClientAdapter {
     connect(config: Z2mWsConfig): Promise<void>;
     disconnect(): Promise<void>;
     publishCommand(friendlyName: string, payload: Z2mSetPayload): Promise<boolean>;
+    setPermitJoin(seconds: number): Promise<boolean>;
     requestState(friendlyName: string, properties?: string[]): Promise<boolean>;
     private buildWsUrl;
     private handleWsMessage;

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js

@@ -137,6 +137,29 @@ let Z2mWsClientAdapterService = class Z2mWsClientAdapterService extends base_cli
             });
         });
     }
+    async setPermitJoin(seconds) {
+        if (!this.ws || !this.connected) {
+            this.logger.warn('Cannot toggle permit_join: not connected to Zigbee2MQTT WebSocket');
+            return false;
+        }
+        const topic = 'bridge/request/permit_join';
+        const value = seconds > 0;
+        const payload = { value, time: seconds };
+        const message = { topic, payload };
+        this.logger.debug(`Sending WS permit_join to ${topic}: ${JSON.stringify(payload)}`);
+        return new Promise((resolve) => {
+            this.ws?.send(JSON.stringify(message), (error) => {
+                if (error) {
+                    this.logger.error(`Failed to send WS permit_join to ${topic}`, {
+                        message: error.message,
+                    });
+                    resolve(false);
+                    return;
+                }
+                resolve(true);
+            });
+        });
+    }
     async requestState(friendlyName, properties = []) {
         if (!this.ws || !this.connected) {
             return false;

package/dist/plugins/devices-zigbee2mqtt/services/ws-client-adapter.service.js.map

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

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.d.ts

@@ -1,13 +1,15 @@
 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 { Z2mRegisteredDevice } from '../interfaces/zigbee2mqtt.interface';
 import { Z2mBaseClientAdapter } from './base-client-adapter';
 import { Z2mDeviceMapperService } from './device-mapper.service';
 import { Z2mMqttClientAdapterService } from './mqtt-client-adapter.service';
 import { Z2mWsClientAdapterService } from './ws-client-adapter.service';
-export declare class Zigbee2mqttService implements IManagedPluginService {
+export declare class Zigbee2mqttService extends BaseManagedPluginService {
     private readonly configService;
     private readonly mqttAdapter;
     private readonly wsAdapter;
@@ -19,24 +21,26 @@ export declare class Zigbee2mqttService implements IManagedPluginService {
     readonly pluginName = "devices-zigbee2mqtt-plugin";
     readonly serviceId = "connector";
     private pluginConfig;
-    private state;
-    private startStopLock;
     private deviceSyncPending;
     private bridgeOnline;
     private pendingDevices;
     private isSyncing;
     private transformersRestored;
     private activeAdapter;
+    private readonly deviceJoinedSubscribers;
+    private readonly pendingJoinedIeeeAddresses;
     constructor(configService: ConfigService, mqttAdapter: Z2mMqttClientAdapterService, wsAdapter: Z2mWsClientAdapterService, deviceMapper: Z2mDeviceMapperService, devicesService: DevicesService, deviceConnectivityService: DeviceConnectivityService, pluginServiceManager: PluginServiceManagerService);
     getActiveAdapter(): Z2mBaseClientAdapter;
     start(): Promise<void>;
     stop(): Promise<void>;
-    getState(): ServiceState;
     onConfigChanged(): Promise<ConfigChangeResult>;
     restart(): Promise<void>;
     isBridgeOnline(): boolean;
-    getRegisteredDevices(): import("../interfaces/zigbee2mqtt.interface").Z2mRegisteredDevice[];
+    getRegisteredDevices(): Z2mRegisteredDevice[];
     requestDeviceState(friendlyName: string): Promise<boolean>;
+    setPermitJoin(seconds: number): Promise<boolean>;
+    subscribeToDeviceJoined(cb: (device: Z2mRegisteredDevice) => void): () => void;
+    private notifyDeviceJoined;
     getCachedState(friendlyName: string): Record<string, unknown>;
     private initialize;
     private doStart;
@@ -53,6 +57,5 @@ export declare class Zigbee2mqttService implements IManagedPluginService {
     private handleDeviceJoined;
     private handleDeviceLeft;
     private get config();
-    private withLock;
     private waitUntil;
 }

package/dist/plugins/devices-zigbee2mqtt/services/zigbee2mqtt.service.js

@@ -16,13 +16,15 @@ const config_service_1 = require("../../../modules/config/services/config.servic
 const devices_constants_1 = require("../../../modules/devices/devices.constants");
 const device_connectivity_service_1 = require("../../../modules/devices/services/device-connectivity.service");
 const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const base_managed_plugin_service_1 = require("../../../modules/extensions/services/base-managed-plugin.service");
 const plugin_service_manager_service_1 = require("../../../modules/extensions/services/plugin-service-manager.service");
 const devices_zigbee2mqtt_constants_1 = require("../devices-zigbee2mqtt.constants");
 const device_mapper_service_1 = require("./device-mapper.service");
 const mqtt_client_adapter_service_1 = require("./mqtt-client-adapter.service");
 const ws_client_adapter_service_1 = require("./ws-client-adapter.service");
-let Zigbee2mqttService = class Zigbee2mqttService {
+let Zigbee2mqttService = class Zigbee2mqttService extends base_managed_plugin_service_1.BaseManagedPluginService {
     constructor(configService, mqttAdapter, wsAdapter, deviceMapper, devicesService, deviceConnectivityService, pluginServiceManager) {
+        super();
         this.configService = configService;
         this.mqttAdapter = mqttAdapter;
         this.wsAdapter = wsAdapter;
@@ -34,13 +36,13 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         this.pluginName = devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_PLUGIN_NAME;
         this.serviceId = 'connector';
         this.pluginConfig = null;
-        this.state = 'stopped';
-        this.startStopLock = Promise.resolve();
         this.deviceSyncPending = false;
         this.bridgeOnline = false;
         this.pendingDevices = null;
         this.isSyncing = false;
         this.transformersRestored = false;
+        this.deviceJoinedSubscribers = new Set();
+        this.pendingJoinedIeeeAddresses = new Set();
         this.activeAdapter = this.mqttAdapter;
         this.registerCallbacks(this.activeAdapter);
     }
@@ -90,9 +92,6 @@ let Zigbee2mqttService = class Zigbee2mqttService {
             }
         });
     }
-    getState() {
-        return this.state;
-    }
     onConfigChanged() {
         if (this.state === 'started' && this.pluginConfig) {
             const oldConfig = this.pluginConfig;
@@ -150,6 +149,33 @@ let Zigbee2mqttService = class Zigbee2mqttService {
     async requestDeviceState(friendlyName) {
         return this.activeAdapter.requestState(friendlyName);
     }
+    async setPermitJoin(seconds) {
+        if (!this.isBridgeOnline()) {
+            return false;
+        }
+        if (!this.activeAdapter) {
+            return false;
+        }
+        return this.activeAdapter.setPermitJoin(seconds);
+    }
+    subscribeToDeviceJoined(cb) {
+        this.deviceJoinedSubscribers.add(cb);
+        return () => {
+            this.deviceJoinedSubscribers.delete(cb);
+        };
+    }
+    notifyDeviceJoined(device) {
+        for (const cb of this.deviceJoinedSubscribers) {
+            try {
+                cb(device);
+            }
+            catch (e) {
+                this.logger.warn('Device-joined subscriber threw', {
+                    message: e instanceof Error ? e.message : String(e),
+                });
+            }
+        }
+    }
     getCachedState(friendlyName) {
         return this.activeAdapter.getCachedState(friendlyName);
     }
@@ -280,6 +306,7 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         this.pendingDevices = null;
         this.isSyncing = false;
         this.transformersRestored = false;
+        this.pendingJoinedIeeeAddresses.clear();
         try {
             const devices = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
             for (const device of devices) {
@@ -305,6 +332,16 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         const registeredDevices = this.activeAdapter.getRegisteredDevices();
         await this.deviceMapper.restoreTransformersForExistingDevices(registeredDevices);
         this.transformersRestored = true;
+        if (this.pendingJoinedIeeeAddresses.size > 0) {
+            const registryByIeee = new Map(registeredDevices.map((d) => [d.ieeeAddress, d]));
+            for (const ieeeAddress of [...this.pendingJoinedIeeeAddresses]) {
+                const registered = registryByIeee.get(ieeeAddress);
+                if (registered) {
+                    this.pendingJoinedIeeeAddresses.delete(ieeeAddress);
+                    this.notifyDeviceJoined(registered);
+                }
+            }
+        }
         const existingDevices = await this.devicesService.findAll(devices_zigbee2mqtt_constants_1.DEVICES_ZIGBEE2MQTT_TYPE);
         for (const device of existingDevices) {
             const cachedState = this.activeAdapter.getCachedState(device.identifier);
@@ -370,8 +407,9 @@ let Zigbee2mqttService = class Zigbee2mqttService {
             });
         }
     }
-    handleDeviceJoined(_ieeeAddress, friendlyName) {
-        this.logger.log(`Device joined: ${friendlyName}`);
+    handleDeviceJoined(ieeeAddress, friendlyName) {
+        this.logger.log(`Device joined: ${friendlyName} (${ieeeAddress})`);
+        this.pendingJoinedIeeeAddresses.add(ieeeAddress);
     }
     async handleDeviceLeft(_ieeeAddress, friendlyName) {
         this.logger.log(`Device left: ${friendlyName}`);
@@ -390,20 +428,6 @@ let Zigbee2mqttService = class Zigbee2mqttService {
         }
         return this.pluginConfig;
     }
-    async withLock(fn) {
-        const previousLock = this.startStopLock;
-        let releaseLock;
-        this.startStopLock = new Promise((resolve) => {
-            releaseLock = resolve;
-        });
-        try {
-            await previousLock;
-            return await fn();
-        }
-        finally {
-            releaseLock();
-        }
-    }
     async waitUntil(...states) {
         const maxWait = 10000;
         const interval = 100;