@fastybird/smart-panel-backend 1.1.0-alpha.2 → 1.1.0-alpha.4

package/dist/modules/system/services/privileged-worker.service.js

@@ -20,6 +20,10 @@ const system_constants_1 = require("../system.constants");
 const system_exceptions_1 = require("../system.exceptions");
 const STATUS_POLL_INTERVAL_MS = 3_000;
 const DEFAULT_TIMEOUT_MS = 10 * 60 * 1000;
+const STDERR_CAPTURE_LIMIT_BYTES = 4 * 1024;
+const IS_ACTIVE_PROBE_TIMEOUT_MS = 2_000;
+const STOP_ATTEMPT_TIMEOUT_MS = 15_000;
+const PRUNE_AFTER_MS = 5 * 60_000;
 const VALID_TICK_STATES = new Set(['running', 'complete', 'failed']);
 function isValidTickState(value) {
     return typeof value === 'string' && VALID_TICK_STATES.has(value);
@@ -40,6 +44,11 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
             throw new system_exceptions_1.PrivilegedWorkerUnavailableException(`Privileged workers are not supported on this platform (${this.platformService.getPlatformType()}).`);
         }
         if (this.busyUnits.has(spec.unit)) {
+            const busyJobId = this.busyUnits.get(spec.unit);
+            const busyRecord = busyJobId ? this.jobs.get(busyJobId) : undefined;
+            if (busyRecord?.lastStatus.state === 'timeout') {
+                throw new system_exceptions_1.PrivilegedWorkerUnavailableException(`Privileged worker unit "${spec.unit}" timed out previously and is still running after a stop attempt; it cannot be reused until the process is confirmed stopped.`);
+            }
             throw new system_exceptions_1.PrivilegedWorkerUnavailableException(`Privileged worker unit "${spec.unit}" is already busy.`);
         }
         const id = (0, node_crypto_1.randomUUID)();
@@ -54,22 +63,34 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
             lastStatus: { id, state: 'running', updatedAt: new Date().toISOString() },
             handlers: new Set(),
             mapStatus: spec.mapStatus,
+            redact: spec.redact,
+            stderrBuffer: Buffer.alloc(0),
             loggedInvalidStatus: false,
+            pruneTimer: null,
         };
         this.jobs.set(id, record);
         this.busyUnits.set(spec.unit, id);
         try {
             const setenvArgs = Object.entries(spec.env ?? {}).flatMap(([key, value]) => ['--setenv', `${key}=${value}`]);
-            const child = (0, node_child_process_1.spawn)('sudo', ['-n', 'systemd-run', '--scope', `--unit=${spec.unit}`, ...setenvArgs, 'bash', spec.script, ...spec.args], { detached: true, stdio: 'ignore' });
+            const child = (0, node_child_process_1.spawn)('sudo', ['-n', 'systemd-run', '--scope', `--unit=${spec.unit}`, ...setenvArgs, 'bash', spec.script, ...spec.args], { detached: true, stdio: ['ignore', 'ignore', 'pipe'] });
+            child.stderr?.unref?.();
+            child.stderr?.on('data', (chunk) => {
+                if (record.stderrBuffer.length >= STDERR_CAPTURE_LIMIT_BYTES) {
+                    return;
+                }
+                record.stderrBuffer = Buffer.concat([record.stderrBuffer, chunk]).subarray(0, STDERR_CAPTURE_LIMIT_BYTES);
+            });
             child.on('error', (error) => {
                 if (record.lastStatus.state !== 'running') {
                     return;
                 }
-                this.logger.error(`Privileged worker unit "${spec.unit}" failed to spawn: ${error.message}`);
+                const stderr = this.getCapturedStderr(record);
+                this.logger.error(`Privileged worker unit "${spec.unit}" failed to spawn: ${error.message}${stderr ? ` (${stderr})` : ''}`);
                 this.finishJob(record, {
                     id,
                     state: 'failed',
-                    message: error.message,
+                    message: this.buildFailureMessage(error.message, stderr),
+                    stderr,
                     updatedAt: new Date().toISOString(),
                 });
             });
@@ -81,11 +102,13 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
                     return;
                 }
                 const reason = signal ? `was terminated by signal ${signal}` : `exited with code ${code}`;
-                this.logger.error(`Privileged worker unit "${spec.unit}" ${reason} before reporting completion`);
+                const stderr = this.getCapturedStderr(record);
+                this.logger.error(`Privileged worker unit "${spec.unit}" ${reason} before reporting completion${stderr ? ` (${stderr})` : ''}`);
                 this.finishJob(record, {
                     id,
                     state: 'failed',
-                    message: `Worker process ${reason}`,
+                    message: this.buildGenericFailureMessage(`Worker process ${reason} before reporting completion`, stderr),
+                    stderr,
                     updatedAt: new Date().toISOString(),
                 });
             });
@@ -124,11 +147,34 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
             record.handlers.delete(handler);
         };
     }
+    getCapturedStderr(record) {
+        if (record.stderrBuffer.length === 0) {
+            return undefined;
+        }
+        const text = record.stderrBuffer.toString('utf-8');
+        const redact = record.redact;
+        if (!redact) {
+            return text;
+        }
+        return text
+            .split('\n')
+            .map((line) => redact(line))
+            .join('\n');
+    }
+    buildFailureMessage(summary, stderr) {
+        const detail = stderr ? ` (${stderr})` : '';
+        return `The smart-panel user cannot start privileged jobs: ${summary}${detail}. Re-run \`sudo smart-panel-service install\`, or add the sudoers grant from the installation guide.`;
+    }
+    buildGenericFailureMessage(summary, stderr) {
+        const detail = stderr ? ` (${stderr})` : '';
+        return `${summary}${detail}.`;
+    }
     startPolling(record) {
         record.pollTimer = setInterval(() => {
             if (Date.now() - record.startedAt > record.timeoutMs) {
-                this.logger.error(`Privileged worker unit "${record.unit}" timed out after ${record.timeoutMs}ms`);
-                this.finishJob(record, { id: record.id, state: 'timeout', updatedAt: new Date().toISOString() });
+                clearInterval(record.pollTimer);
+                record.pollTimer = null;
+                void this.handleTimeout(record);
                 return;
             }
             if (!(0, fs_1.existsSync)(record.statusFile)) {
@@ -157,14 +203,79 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
                 updatedAt: new Date().toISOString(),
             };
             record.lastStatus = status;
-            for (const handler of [...record.handlers]) {
-                handler(status);
-            }
+            this.notifyHandlers(record, status);
             if (status.state === 'complete' || status.state === 'failed') {
                 this.stopPolling(record);
             }
         }, STATUS_POLL_INTERVAL_MS);
     }
+    stopUnit(unit) {
+        return new Promise((resolve) => {
+            let settled = false;
+            let timer = null;
+            const settle = () => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                if (timer) {
+                    clearTimeout(timer);
+                    timer = null;
+                }
+                resolve();
+            };
+            try {
+                const child = (0, node_child_process_1.spawn)('sudo', ['-n', 'systemd-run', '--scope', '--quiet', `--unit=${unit}-stop`, 'systemctl', 'stop', unit], { stdio: 'ignore' });
+                child.on('exit', settle);
+                child.on('error', settle);
+                timer = setTimeout(settle, STOP_ATTEMPT_TIMEOUT_MS);
+                timer.unref();
+                child.unref();
+            }
+            catch {
+                settle();
+            }
+        });
+    }
+    isUnitActive(unit) {
+        return new Promise((resolve) => {
+            (0, node_child_process_1.execFile)('systemctl', ['is-active', unit], { timeout: IS_ACTIVE_PROBE_TIMEOUT_MS }, (error, stdout) => {
+                if (error) {
+                    resolve(false);
+                    return;
+                }
+                resolve((stdout ?? '').trim() === 'active');
+            });
+        });
+    }
+    async handleTimeout(record) {
+        this.logger.error(`Privileged worker unit "${record.unit}" timed out after ${record.timeoutMs}ms`);
+        await this.stopUnit(record.unit);
+        const stillActive = await this.isUnitActive(record.unit);
+        const stderr = this.getCapturedStderr(record);
+        if (record.lastStatus.state !== 'running') {
+            return;
+        }
+        if (stillActive) {
+            this.logger.error(`Privileged worker unit "${record.unit}" is still running after a timeout stop attempt; keeping it reserved.`);
+            const status = {
+                id: record.id,
+                state: 'timeout',
+                message: `Privileged worker unit "${record.unit}" timed out and is still running after a stop attempt; it remains reserved until confirmed stopped.`,
+                stderr,
+                updatedAt: new Date().toISOString(),
+            };
+            record.lastStatus = status;
+            this.notifyHandlers(record, status);
+            return;
+        }
+        this.finishJob(record, {
+            id: record.id,
+            state: 'timeout',
+            stderr,
+            updatedAt: new Date().toISOString(),
+        });
+    }
     logInvalidStatusOnce(record, reason) {
         if (record.loggedInvalidStatus) {
             return;
@@ -177,10 +288,13 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
             return;
         }
         record.lastStatus = status;
+        this.notifyHandlers(record, status);
+        this.stopPolling(record);
+    }
+    notifyHandlers(record, status) {
         for (const handler of [...record.handlers]) {
             handler(status);
         }
-        this.stopPolling(record);
     }
     stopPolling(record) {
         if (record.pollTimer) {
@@ -189,7 +303,19 @@ let PrivilegedWorkerService = class PrivilegedWorkerService {
         }
         if (this.busyUnits.get(record.unit) === record.id) {
             this.busyUnits.delete(record.unit);
+            this.schedulePrune(record);
+        }
+    }
+    schedulePrune(record) {
+        if (record.pruneTimer) {
+            return;
         }
+        record.pruneTimer = setTimeout(() => {
+            record.pruneTimer = null;
+            record.handlers.clear();
+            this.jobs.delete(record.id);
+        }, PRUNE_AFTER_MS);
+        record.pruneTimer.unref();
     }
 };
 exports.PrivilegedWorkerService = PrivilegedWorkerService;

package/dist/modules/system/services/privileged-worker.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"privileged-worker.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/privileged-worker.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"privileged-worker.service.js","sourceRoot":"","sources":["../../../../src/modules/system/services/privileged-worker.service.ts"],"names":[],"mappings":"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"}

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

@@ -58,6 +58,8 @@ export declare class DelegatesManagerService {
     private applyTransformer;
     private handleChange;
     private setDefaultPropertyValue;
+    private wireElectricalChannels;
+    private wireMeterProperty;
     private determineCategory;
     private handleNumericChange;
     private scheduleWrite;

package/dist/plugins/devices-shelly-ng/delegates/delegates-manager.service.js

@@ -199,60 +199,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                 await comp.set(val);
                 return true;
             });
-            if (typeof comp.aenergy !== 'undefined') {
-                const electricalEnergy = await this.channelsService.findOneBy('identifier', `energy:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-                if (electricalEnergy === null) {
-                }
-                else {
-                    const consumption = await this.channelsPropertiesService.findOneBy('identifier', 'aenergy', electricalEnergy.id);
-                    if (consumption === null) {
-                    }
-                    else {
-                        await this.setDefaultPropertyValue(device.id, consumption, (0, transform_utils_2.toEnergy)(comp.aenergy));
-                        this.changeHandlers.set(`${delegate.id}|${comp.key}|aenergy`, (val) => {
-                            this.handleNumericChange(comp.key, 'aenergy', consumption.id, val, (n) => this.handleChange(consumption, (0, transform_utils_2.toEnergy)(n), false));
-                        });
-                    }
-                }
-            }
-            if (typeof comp.apower !== 'undefined') {
-                const electricalPower = await this.channelsService.findOneBy('identifier', `power:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-                if (electricalPower === null) {
-                }
-                else {
-                    const power = await this.channelsPropertiesService.findOneBy('identifier', 'apower', electricalPower.id);
-                    if (power === null) {
-                    }
-                    else {
-                        await this.setDefaultPropertyValue(device.id, power, Math.max(0, comp.apower));
-                        this.changeHandlers.set(`${delegate.id}|${comp.key}|apower`, (val) => {
-                            this.handleNumericChange(comp.key, 'apower', power.id, val, (n) => this.handleChange(power, Math.max(0, n), false));
-                        });
-                        if (typeof comp.voltage !== 'undefined') {
-                            const voltage = await this.channelsPropertiesService.findOneBy('identifier', 'voltage', electricalPower.id);
-                            if (voltage === null) {
-                            }
-                            else {
-                                await this.setDefaultPropertyValue(device.id, voltage, comp.voltage);
-                                this.changeHandlers.set(`${delegate.id}|${comp.key}|voltage`, (val) => {
-                                    this.handleNumericChange(comp.key, 'voltage', voltage.id, val, (n) => this.handleChange(voltage, n, false));
-                                });
-                            }
-                        }
-                        if (typeof comp.current !== 'undefined') {
-                            const current = await this.channelsPropertiesService.findOneBy('identifier', 'current', electricalPower.id);
-                            if (current === null) {
-                            }
-                            else {
-                                await this.setDefaultPropertyValue(device.id, current, comp.current);
-                                this.changeHandlers.set(`${delegate.id}|${comp.key}|current`, (val) => {
-                                    this.handleNumericChange(comp.key, 'current', current.id, val, (n) => this.handleChange(current, n, false));
-                                });
-                            }
-                        }
-                    }
-                }
-            }
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -314,6 +261,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                     await comp.stop();
                 return true;
             });
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -362,6 +310,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                     return true;
                 });
             }
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -495,6 +444,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                 ]);
                 return true;
             });
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -653,6 +603,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                 ], Math.round((0, transform_utils_1.clampNumber)(whiteValue, 0, 255)));
                 return true;
             });
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -746,6 +697,7 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
                 await comp.set(outputValue, Math.round((0, transform_utils_1.clampNumber)(brightnessValue, 0, 100)), Math.round((0, transform_utils_1.clampNumber)(ctValue, 2_700, 6_500)));
                 return true;
             });
+            await this.wireElectricalChannels(delegate, device, comp);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -800,54 +752,59 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
         for (const comp of delegate.pm1.values()) {
-            const electricalPower = await this.channelsService.findOneBy('identifier', `power:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-            if (electricalPower === null) {
-                continue;
-            }
-            const power = await this.channelsPropertiesService.findOneBy('identifier', 'apower', electricalPower.id);
-            if (power === null) {
-                throw new devices_shelly_ng_exceptions_1.DevicesShellyNgNotFoundException('Failed to load electrical power channel property');
-            }
-            await this.setDefaultPropertyValue(device.id, power, Math.max(0, comp.apower));
-            this.changeHandlers.set(`${delegate.id}|${comp.key}|apower`, (val) => {
-                this.handleNumericChange(comp.key, 'apower', power.id, val, (n) => this.handleChange(power, Math.max(0, n), false));
-            });
-            if (typeof comp.voltage !== 'undefined') {
-                const voltage = await this.channelsPropertiesService.findOneBy('identifier', 'voltage', electricalPower.id);
-                if (voltage === null) {
-                    throw new devices_shelly_ng_exceptions_1.DevicesShellyNgNotFoundException('Failed to load electrical power voltage channel property');
-                }
-                await this.setDefaultPropertyValue(device.id, voltage, comp.voltage);
-                this.changeHandlers.set(`${delegate.id}|${comp.key}|voltage`, (val) => {
-                    this.handleNumericChange(comp.key, 'voltage', voltage.id, val, (n) => this.handleChange(voltage, n, false));
-                });
-            }
-            if (typeof comp.current !== 'undefined') {
-                const current = await this.channelsPropertiesService.findOneBy('identifier', 'current', electricalPower.id);
-                if (current === null) {
-                    throw new devices_shelly_ng_exceptions_1.DevicesShellyNgNotFoundException('Failed to load electrical power current channel property');
-                }
-                await this.setDefaultPropertyValue(device.id, current, comp.current);
-                this.changeHandlers.set(`${delegate.id}|${comp.key}|current`, (val) => {
-                    this.handleNumericChange(comp.key, 'current', current.id, val, (n) => this.handleChange(current, n, false));
-                });
-            }
-            if (typeof comp.aenergy !== 'undefined') {
-                const electricalEnergy = await this.channelsService.findOneBy('identifier', `energy:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
-                if (electricalEnergy === null) {
-                }
-                else {
-                    const consumption = await this.channelsPropertiesService.findOneBy('identifier', 'aenergy', electricalEnergy.id);
-                    if (consumption === null) {
-                    }
-                    else {
-                        await this.setDefaultPropertyValue(device.id, consumption, (0, transform_utils_2.toEnergy)(comp.aenergy));
-                        this.changeHandlers.set(`${delegate.id}|${comp.key}|aenergy`, (val) => {
-                            this.handleNumericChange(comp.key, 'aenergy', consumption.id, val, (n) => this.handleChange(consumption, (0, transform_utils_2.toEnergy)(n), false));
-                        });
-                    }
-                }
-            }
+            await this.wireElectricalChannels(delegate, device, comp);
+        }
+        if (this.insertGeneration.get(shelly.id) !== generation)
+            return delegate;
+        for (const comp of delegate.em.values()) {
+            const phases = [
+                { id: 'a', power: comp.a_act_power, voltage: comp.a_voltage, current: comp.a_current, freq: comp.a_freq },
+                { id: 'b', power: comp.b_act_power, voltage: comp.b_voltage, current: comp.b_current, freq: comp.b_freq },
+                { id: 'c', power: comp.c_act_power, voltage: comp.c_voltage, current: comp.c_current, freq: comp.c_freq },
+            ];
+            for (const phase of phases) {
+                const channelIdentifier = `power:${comp.id}:${phase.id}`;
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_act_power`, `${phase.id}_act_power`, phase.power, true);
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_voltage`, `${phase.id}_voltage`, phase.voltage, true);
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_current`, `${phase.id}_current`, phase.current, true);
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_freq`, `${phase.id}_freq`, phase.freq, true);
+            }
+            const totalChannelIdentifier = `power:${comp.id}:total`;
+            await this.wireMeterProperty(delegate, device, comp.key, totalChannelIdentifier, 'total_act_power', 'total_act_power', comp.total_act_power, true);
+            await this.wireMeterProperty(delegate, device, comp.key, totalChannelIdentifier, 'total_current', 'total_current', comp.total_current, true);
+        }
+        if (this.insertGeneration.get(shelly.id) !== generation)
+            return delegate;
+        for (const comp of delegate.emData.values()) {
+            const phases = [
+                { id: 'a', energy: comp.a_total_act_energy, returned: comp.a_total_act_ret_energy },
+                { id: 'b', energy: comp.b_total_act_energy, returned: comp.b_total_act_ret_energy },
+                { id: 'c', energy: comp.c_total_act_energy, returned: comp.c_total_act_ret_energy },
+            ];
+            for (const phase of phases) {
+                const channelIdentifier = `energy:${comp.id}:${phase.id}`;
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_total_act_energy`, `${phase.id}_total_act_energy`, phase.energy, false);
+                await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, `${phase.id}_total_act_ret_energy`, `${phase.id}_total_act_ret_energy`, phase.returned, false);
+            }
+            const totalChannelIdentifier = `energy:${comp.id}:total`;
+            await this.wireMeterProperty(delegate, device, comp.key, totalChannelIdentifier, 'total_act', 'total_act', comp.total_act, false);
+            await this.wireMeterProperty(delegate, device, comp.key, totalChannelIdentifier, 'total_act_ret', 'total_act_ret', comp.total_act_ret, false);
+        }
+        if (this.insertGeneration.get(shelly.id) !== generation)
+            return delegate;
+        for (const comp of delegate.em1.values()) {
+            const channelIdentifier = `power:${comp.id}`;
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'act_power', 'act_power', comp.act_power, true);
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'voltage', 'voltage', comp.voltage, true);
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'current', 'current', comp.current, true);
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'freq', 'freq', comp.freq, true);
+        }
+        if (this.insertGeneration.get(shelly.id) !== generation)
+            return delegate;
+        for (const comp of delegate.em1Data.values()) {
+            const channelIdentifier = `energy:${comp.id}`;
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'total_act_energy', 'total_act_energy', comp.total_act_energy, false);
+            await this.wireMeterProperty(delegate, device, comp.key, channelIdentifier, 'total_act_ret_energy', 'total_act_ret_energy', comp.total_act_ret_energy, false);
         }
         if (this.insertGeneration.get(shelly.id) !== generation)
             return delegate;
@@ -1142,6 +1099,87 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
         }
         set.add(property.id);
     }
+    async wireElectricalChannels(delegate, device, comp) {
+        if (typeof comp.aenergy !== 'undefined') {
+            const electricalEnergy = await this.channelsService.findOneBy('identifier', `energy:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            if (electricalEnergy === null) {
+            }
+            else {
+                const consumption = await this.channelsPropertiesService.findOneBy('identifier', 'aenergy', electricalEnergy.id);
+                if (consumption === null) {
+                }
+                else {
+                    await this.setDefaultPropertyValue(device.id, consumption, (0, transform_utils_2.toEnergy)(comp.aenergy));
+                    this.changeHandlers.set(`${delegate.id}|${comp.key}|aenergy.total`, (val) => {
+                        this.handleNumericChange(comp.key, 'aenergy.total', consumption.id, val, (n) => this.handleChange(consumption, (0, transform_utils_2.toEnergy)(n), false));
+                    });
+                }
+            }
+        }
+        if (typeof comp.apower !== 'undefined' ||
+            typeof comp.voltage !== 'undefined' ||
+            typeof comp.current !== 'undefined') {
+            const electricalPower = await this.channelsService.findOneBy('identifier', `power:${comp.id}`, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+            if (electricalPower === null) {
+            }
+            else {
+                if (typeof comp.apower !== 'undefined') {
+                    const power = await this.channelsPropertiesService.findOneBy('identifier', 'apower', electricalPower.id);
+                    if (power === null) {
+                    }
+                    else {
+                        await this.setDefaultPropertyValue(device.id, power, Math.max(0, comp.apower));
+                        this.changeHandlers.set(`${delegate.id}|${comp.key}|apower`, (val) => {
+                            this.handleNumericChange(comp.key, 'apower', power.id, val, (n) => this.handleChange(power, Math.max(0, n), false));
+                        });
+                    }
+                }
+                if (typeof comp.voltage !== 'undefined') {
+                    const voltage = await this.channelsPropertiesService.findOneBy('identifier', 'voltage', electricalPower.id);
+                    if (voltage === null) {
+                    }
+                    else {
+                        await this.setDefaultPropertyValue(device.id, voltage, comp.voltage);
+                        this.changeHandlers.set(`${delegate.id}|${comp.key}|voltage`, (val) => {
+                            this.handleNumericChange(comp.key, 'voltage', voltage.id, val, (n) => this.handleChange(voltage, n, false));
+                        });
+                    }
+                }
+                if (typeof comp.current !== 'undefined') {
+                    const current = await this.channelsPropertiesService.findOneBy('identifier', 'current', electricalPower.id);
+                    if (current === null) {
+                    }
+                    else {
+                        await this.setDefaultPropertyValue(device.id, current, comp.current);
+                        this.changeHandlers.set(`${delegate.id}|${comp.key}|current`, (val) => {
+                            this.handleNumericChange(comp.key, 'current', current.id, val, (n) => this.handleChange(current, n, false));
+                        });
+                    }
+                }
+            }
+        }
+    }
+    async wireMeterProperty(delegate, device, compKey, channelIdentifier, attr, propertyIdentifier, value, allowNull) {
+        if (typeof value === 'undefined') {
+            return;
+        }
+        const channel = await this.channelsService.findOneBy('identifier', channelIdentifier, device.id, devices_shelly_ng_constants_1.DEVICES_SHELLY_NG_TYPE);
+        if (channel === null) {
+            return;
+        }
+        const property = await this.channelsPropertiesService.findOneBy('identifier', propertyIdentifier, channel.id);
+        if (property === null) {
+            return;
+        }
+        if (value !== null) {
+            await this.setDefaultPropertyValue(device.id, property, value);
+        }
+        this.changeHandlers.set(`${delegate.id}|${compKey}|${attr}`, (val) => {
+            this.handleNumericChange(compKey, attr, property.id, val, (n) => this.handleChange(property, n, false), {
+                allowNull,
+            });
+        });
+    }
     determineCategory(delegate) {
         if (delegate.descriptor && delegate.descriptor.categories.length > 0) {
             return delegate.descriptor.categories[0];
@@ -1164,6 +1202,9 @@ let DelegatesManagerService = DelegatesManagerService_1 = class DelegatesManager
         return devices_constants_1.DeviceCategory.GENERIC;
     }
     handleNumericChange(compKey, attr, propertyId, val, write, opts) {
+        if (val === null && opts?.allowNull) {
+            return;
+        }
         const n = (0, transform_utils_1.coerceNumberSafe)(val, opts);
         if (n === null || Number.isNaN(n)) {
             this.logger.warn(`Dropping invalid numeric update for ${compKey}.${attr} -> ${(0, transform_utils_1.safeToString)(val)} (property=${propertyId})`);