@fastybird/smart-panel-backend 1.1.0-alpha.5 → 1.1.0-alpha.6

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js

@@ -0,0 +1,147 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudflareTunnelSetupService = exports.CloudflareTunnelSetupUnavailableException = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const event_emitter_1 = require("@nestjs/event-emitter");
+const logger_1 = require("../../../common/logger");
+const config_utils_1 = require("../../../common/utils/config.utils");
+const config_service_1 = require("../../../modules/config/services/config.service");
+const managed_service_manager_service_1 = require("../../../modules/extensions/services/managed-service-manager.service");
+const platform_service_1 = require("../../../modules/platform/services/platform.service");
+const remote_access_constants_1 = require("../../../modules/remote-access/remote-access.constants");
+const privileged_worker_service_1 = require("../../../modules/system/services/privileged-worker.service");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+const remote_access_cloudflare_tunnel_exceptions_1 = require("../remote-access-cloudflare-tunnel.exceptions");
+Object.defineProperty(exports, "CloudflareTunnelSetupUnavailableException", { enumerable: true, get: function () { return remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException; } });
+const cloudflare_tunnel_managed_service_1 = require("./cloudflare-tunnel-managed.service");
+let CloudflareTunnelSetupService = class CloudflareTunnelSetupService {
+    constructor(privilegedWorker, nestConfigService, tunnelManagedService, eventEmitter, platformService, configService, managedServiceManager) {
+        this.privilegedWorker = privilegedWorker;
+        this.nestConfigService = nestConfigService;
+        this.tunnelManagedService = tunnelManagedService;
+        this.eventEmitter = eventEmitter;
+        this.platformService = platformService;
+        this.configService = configService;
+        this.managedServiceManager = managedServiceManager;
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflareTunnelSetupService');
+        this.lastJob = null;
+    }
+    async install() {
+        const privilegedWorkerSupport = await this.platformService.getPrivilegedWorkerSupport();
+        if (!privilegedWorkerSupport.supported) {
+            if (!this.platformService.isPlatformCapableOfPrivilegedWorkers()) {
+                throw new remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException(`Cloudflare Tunnel setup requires a platform with privileged-worker support; the '${this.platformService.getPlatformType()}' platform does not have it.`, 'platform-unsupported');
+            }
+            const reason = privilegedWorkerSupport.reason ?? 'Privileged jobs are currently unavailable on this installation.';
+            throw new remote_access_cloudflare_tunnel_exceptions_1.CloudflareTunnelSetupUnavailableException(`${reason} Re-run \`sudo smart-panel-service install\`, or add the sudoers grant from the installation guide.`, 'privileged-worker-unavailable');
+        }
+        const dataDir = (0, config_utils_1.getEnvValue)(this.nestConfigService, 'FB_DATA_DIR', '/var/lib/smart-panel');
+        const remoteAccessDir = (0, path_1.join)(dataDir, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_DATA_SUBDIR);
+        this.ensureDir(remoteAccessDir);
+        const statusFile = (0, path_1.join)(remoteAccessDir, remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_SETUP_STATUS_FILENAME);
+        const script = (0, path_1.join)(__dirname, '..', 'scripts', 'cloudflared-setup.sh');
+        if (!(0, fs_1.existsSync)(script)) {
+            throw new Error(`Cloudflare Tunnel setup script not found at ${script}`);
+        }
+        const { id } = await this.privilegedWorker.run({
+            unit: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARE_TUNNEL_SETUP_WORKER_UNIT,
+            script,
+            args: [],
+            env: {
+                STATUS_FILE: statusFile,
+                HOME: process.env.HOME ?? '/root',
+                PATH: process.env.PATH ?? '/usr/local/bin:/usr/bin:/bin',
+            },
+            statusFile,
+        });
+        this.logger.log(`Cloudflare Tunnel setup job spawned (job: ${id})`);
+        const initialStatus = this.privilegedWorker.getStatus(id) ?? {
+            id,
+            state: 'running',
+            updatedAt: new Date().toISOString(),
+        };
+        this.lastJob = { id, status: initialStatus };
+        this.watchJob(id);
+        return { id };
+    }
+    getLastJob() {
+        return this.lastJob;
+    }
+    watchJob(id) {
+        const unsubscribe = this.privilegedWorker.onStatus(id, (status) => {
+            this.lastJob = { id, status };
+            const event = {
+                type: remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME,
+                job: id,
+                step: status.step,
+                state: status.state,
+                message: status.message,
+            };
+            this.eventEmitter.emit(remote_access_constants_1.EventType.SETUP_PROGRESS, event);
+            if (status.state === 'running') {
+                return;
+            }
+            if (status.state === 'complete') {
+                this.logger.log(`Cloudflare Tunnel setup job completed (job: ${id})`);
+                void this.onSetupComplete();
+            }
+            else {
+                this.logger.error(`Cloudflare Tunnel setup job did not complete (job: ${id}, state: ${status.state})`, {
+                    step: status.step,
+                    message: status.message,
+                });
+            }
+            unsubscribe();
+        });
+    }
+    async onSetupComplete() {
+        try {
+            await this.tunnelManagedService.refreshRequirements();
+        }
+        catch (error) {
+            this.logger.warn('Failed to refresh Cloudflare Tunnel requirements after setup', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+        try {
+            const pluginConfig = this.configService.getPluginConfig(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME);
+            if (pluginConfig.enabled) {
+                await this.managedServiceManager.restartService('plugin', remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'tunnel');
+            }
+        }
+        catch (error) {
+            this.logger.warn('Failed to restart the Cloudflare Tunnel service after setup', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    ensureDir(dir) {
+        if (!(0, fs_1.existsSync)(dir)) {
+            (0, fs_1.mkdirSync)(dir, { recursive: true, mode: 0o700 });
+        }
+    }
+};
+exports.CloudflareTunnelSetupService = CloudflareTunnelSetupService;
+exports.CloudflareTunnelSetupService = CloudflareTunnelSetupService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [privileged_worker_service_1.PrivilegedWorkerService,
+        config_1.ConfigService,
+        cloudflare_tunnel_managed_service_1.CloudflareTunnelManagedService,
+        event_emitter_1.EventEmitter2,
+        platform_service_1.PlatformService,
+        config_service_1.ConfigService,
+        managed_service_manager_service_1.ManagedServiceManagerService])
+], CloudflareTunnelSetupService);
+//# sourceMappingURL=cloudflare-tunnel-setup.service.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflare-tunnel-setup.service.js.map

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

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.d.ts

@@ -0,0 +1,15 @@
+export type CloudflaredCliErrorKind = 'not-installed' | 'unknown';
+export declare class CloudflaredCliError extends Error {
+    readonly kind: CloudflaredCliErrorKind;
+    readonly cause?: unknown;
+    constructor(kind: CloudflaredCliErrorKind, message: string, cause?: unknown);
+}
+export interface CloudflaredVersionInfo {
+    version: string;
+    raw: string;
+}
+export declare class CloudflaredCliService {
+    private readonly logger;
+    getVersion(): Promise<CloudflaredVersionInfo>;
+    private exec;
+}

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js

@@ -0,0 +1,67 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudflaredCliService = exports.CloudflaredCliError = void 0;
+const node_child_process_1 = require("node:child_process");
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+class CloudflaredCliError extends Error {
+    constructor(kind, message, cause) {
+        super(message);
+        this.kind = kind;
+        this.cause = cause;
+        this.name = 'CloudflaredCliError';
+    }
+}
+exports.CloudflaredCliError = CloudflaredCliError;
+const VERSION_PATTERN = /(\d+\.\d+\.\d+)/;
+let CloudflaredCliService = class CloudflaredCliService {
+    constructor() {
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredCliService');
+    }
+    async getVersion() {
+        const { stdout, stderr, exitCode } = await this.exec(['--version']);
+        if (exitCode !== 0) {
+            const detail = stderr.trim() || stdout.trim();
+            throw new CloudflaredCliError('unknown', `cloudflared --version exited with code ${exitCode}${detail ? `: ${detail}` : ''}`);
+        }
+        const match = VERSION_PATTERN.exec(stdout);
+        if (!match) {
+            throw new CloudflaredCliError('unknown', '`cloudflared --version` did not include a recognizable version number.');
+        }
+        return { version: match[1], raw: stdout.trim() };
+    }
+    exec(args) {
+        const argv = [...args];
+        this.logger.debug(`Running: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${argv.join(' ')}`);
+        return new Promise((resolve, reject) => {
+            (0, node_child_process_1.execFile)(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY, argv, { timeout: remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_CLI_DEFAULT_TIMEOUT_MS }, (error, stdout, stderr) => {
+                const out = stdout ?? '';
+                const err = stderr ?? '';
+                if (error) {
+                    const nodeError = error;
+                    if (nodeError.code === 'ENOENT') {
+                        this.logger.warn(`cloudflared binary not found: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${argv.join(' ')}`);
+                        reject(new CloudflaredCliError('not-installed', 'The cloudflared CLI is not installed or not on PATH.', error));
+                        return;
+                    }
+                    const exitCode = typeof nodeError.code === 'number' ? nodeError.code : -1;
+                    resolve({ stdout: out, stderr: err, exitCode });
+                    return;
+                }
+                resolve({ stdout: out, stderr: err, exitCode: 0 });
+            });
+        });
+    }
+};
+exports.CloudflaredCliService = CloudflaredCliService;
+exports.CloudflaredCliService = CloudflaredCliService = __decorate([
+    (0, common_1.Injectable)()
+], CloudflaredCliService);
+//# sourceMappingURL=cloudflared-cli.service.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cloudflared-cli.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-cli.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.d.ts

@@ -0,0 +1,8 @@
+export interface CloudflaredReadyInfo {
+    readyConnections: number;
+    connectorId: string;
+}
+export declare class CloudflaredMetricsService {
+    private readonly logger;
+    fetchReady(address: string): Promise<CloudflaredReadyInfo | null>;
+}

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js

@@ -0,0 +1,46 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudflaredMetricsService = void 0;
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+let CloudflaredMetricsService = class CloudflaredMetricsService {
+    constructor() {
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredMetricsService');
+    }
+    async fetchReady(address) {
+        try {
+            const response = await fetch(`http://${address}/ready`, {
+                signal: AbortSignal.timeout(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_METRICS_TIMEOUT_MS),
+            });
+            if (!response.ok) {
+                return null;
+            }
+            const data = (await response.json());
+            const readyConnections = typeof data.readyConnections === 'number' ? data.readyConnections : 0;
+            const connectorId = typeof data.connectorId === 'string'
+                ? data.connectorId
+                : typeof data.connectorID === 'string'
+                    ? data.connectorID
+                    : '';
+            return { readyConnections, connectorId };
+        }
+        catch (error) {
+            this.logger.debug('Failed to fetch the cloudflared /ready endpoint', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+            return null;
+        }
+    }
+};
+exports.CloudflaredMetricsService = CloudflaredMetricsService;
+exports.CloudflaredMetricsService = CloudflaredMetricsService = __decorate([
+    (0, common_1.Injectable)()
+], CloudflaredMetricsService);
+//# sourceMappingURL=cloudflared-metrics.service.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cloudflared-metrics.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-metrics.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,mDAA+D;AAC/D,4GAGsD;AAe/C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QACW,WAAM,GAAG,IAAA,8BAAqB,EAC9C,uFAA2C,EAC3C,2BAA2B,CAC3B,CAAC;IA+BH,CAAC;IA7BA,KAAK,CAAC,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC;YACJ,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,OAAO,QAAQ,EAAE;gBACvD,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,0EAA8B,CAAC;aAC3D,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YACb,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA4B,CAAC;YAEhE,MAAM,gBAAgB,GAAG,OAAO,IAAI,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/F,MAAM,WAAW,GAChB,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;gBACnC,CAAC,CAAC,IAAI,CAAC,WAAW;gBAClB,CAAC,CAAC,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ;oBACrC,CAAC,CAAC,IAAI,CAAC,WAAW;oBAClB,CAAC,CAAC,EAAE,CAAC;YAER,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,EAAE;gBACpE,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;CACD,CAAA;AAnCY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CAmCrC"}

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.d.ts

@@ -0,0 +1,27 @@
+export interface CloudflaredProcessOptions {
+    token: string;
+    protocol: string;
+    metricsAddress: string;
+}
+export interface CloudflaredExitInfo {
+    code: number | null;
+    signal: NodeJS.Signals | null;
+}
+export declare class CloudflaredProcessService {
+    private readonly logger;
+    private child;
+    private startedAt;
+    private currentToken;
+    private stderrRing;
+    private stderrCarry;
+    private lastExit;
+    isRunning(): boolean;
+    getStartedAt(): number | null;
+    getLastExit(): CloudflaredExitInfo | null;
+    getLastStderrLine(): string | null;
+    getStderrLines(): readonly string[];
+    start(options: CloudflaredProcessOptions): void;
+    stop(graceMs?: number): Promise<void>;
+    private appendStderr;
+    private redact;
+}

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.js

@@ -0,0 +1,139 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudflaredProcessService = void 0;
+const node_child_process_1 = require("node:child_process");
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const remote_access_cloudflare_tunnel_constants_1 = require("../remote-access-cloudflare-tunnel.constants");
+let CloudflaredProcessService = class CloudflaredProcessService {
+    constructor() {
+        this.logger = (0, logger_1.createExtensionLogger)(remote_access_cloudflare_tunnel_constants_1.REMOTE_ACCESS_CLOUDFLARE_TUNNEL_PLUGIN_NAME, 'CloudflaredProcessService');
+        this.child = null;
+        this.startedAt = null;
+        this.currentToken = '';
+        this.stderrRing = [];
+        this.stderrCarry = '';
+        this.lastExit = null;
+    }
+    isRunning() {
+        return this.child !== null;
+    }
+    getStartedAt() {
+        return this.startedAt;
+    }
+    getLastExit() {
+        return this.lastExit;
+    }
+    getLastStderrLine() {
+        for (let i = this.stderrRing.length - 1; i >= 0; i--) {
+            if (this.stderrRing[i].length > 0) {
+                return this.stderrRing[i];
+            }
+        }
+        return null;
+    }
+    getStderrLines() {
+        return this.stderrRing;
+    }
+    start(options) {
+        if (this.child) {
+            return;
+        }
+        this.currentToken = options.token;
+        this.stderrRing = [];
+        this.stderrCarry = '';
+        this.lastExit = null;
+        const args = [
+            'tunnel',
+            '--no-autoupdate',
+            '--metrics',
+            options.metricsAddress,
+            '--protocol',
+            options.protocol,
+            'run',
+        ];
+        this.logger.log(`Spawning: ${remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY} ${args.join(' ')}`);
+        const child = (0, node_child_process_1.spawn)(remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_BINARY, args, {
+            env: {
+                TUNNEL_TOKEN: options.token,
+                HOME: process.env.HOME ?? '',
+                PATH: process.env.PATH ?? '',
+            },
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        this.child = child;
+        this.startedAt = Date.now();
+        child.stderr?.on('data', (chunk) => {
+            this.appendStderr(chunk.toString('utf8'));
+        });
+        child.once('exit', (code, signal) => {
+            this.lastExit = { code, signal };
+            this.child = null;
+            this.startedAt = null;
+        });
+        child.once('error', (error) => {
+            this.appendStderr(`${error.message}\n`);
+            this.lastExit = { code: null, signal: null };
+            this.child = null;
+            this.startedAt = null;
+            this.logger.warn(`cloudflared failed to spawn: ${error.message}`);
+        });
+    }
+    async stop(graceMs = remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_STOP_GRACE_MS) {
+        const child = this.child;
+        if (!child) {
+            return;
+        }
+        await new Promise((resolve) => {
+            const timer = setTimeout(() => {
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch {
+                }
+            }, graceMs);
+            timer.unref?.();
+            child.once('exit', () => {
+                clearTimeout(timer);
+                resolve();
+            });
+            try {
+                child.kill('SIGTERM');
+            }
+            catch {
+                clearTimeout(timer);
+                resolve();
+            }
+        });
+        this.child = null;
+        this.startedAt = null;
+    }
+    appendStderr(text) {
+        this.stderrCarry += text;
+        const lines = this.stderrCarry.split('\n');
+        this.stderrCarry = lines.pop() ?? '';
+        for (const rawLine of lines) {
+            this.stderrRing.push(this.redact(rawLine));
+            if (this.stderrRing.length > remote_access_cloudflare_tunnel_constants_1.CLOUDFLARED_STDERR_RING_SIZE) {
+                this.stderrRing.shift();
+            }
+        }
+    }
+    redact(line) {
+        if (!this.currentToken) {
+            return line;
+        }
+        return line.split(this.currentToken).join('***redacted***');
+    }
+};
+exports.CloudflaredProcessService = CloudflaredProcessService;
+exports.CloudflaredProcessService = CloudflaredProcessService = __decorate([
+    (0, common_1.Injectable)()
+], CloudflaredProcessService);
+//# sourceMappingURL=cloudflared-process.service.js.map

package/dist/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cloudflared-process.service.js","sourceRoot":"","sources":["../../../../src/plugins/remote-access-cloudflare-tunnel/services/cloudflared-process.service.ts"],"names":[],"mappings":"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"}

package/dist/plugins/scenes-local/platforms/local-scene.platform.d.ts

@@ -3,6 +3,7 @@ import { ChannelsPropertiesService } from '../../../modules/devices/services/cha
 import { ChannelsService } from '../../../modules/devices/services/channels.service';
 import { DevicesService } from '../../../modules/devices/services/devices.service';
 import { PlatformRegistryService } from '../../../modules/devices/services/platform.registry.service';
+import { PropertyCommandDispatchService } from '../../../modules/devices/services/property-command-dispatch.service';
 import { SceneActionEntity, SceneEntity } from '../../../modules/scenes/entities/scenes.entity';
 import { ActionExecutionResultModel } from '../../../modules/scenes/models/scenes.model';
 import { IScenePlatform } from '../../../modules/scenes/services/scene-executor.service';
@@ -19,9 +20,10 @@ export declare class LocalScenePlatform implements IScenePlatform {
     private readonly channelsService;
     private readonly channelsPropertiesService;
     private readonly platformRegistryService;
+    private readonly propertyCommandDispatchService;
     private readonly spacesService;
     private readonly logger;
-    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, platformRegistryService: PlatformRegistryService, spacesService: SpacesService);
+    constructor(devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, platformRegistryService: PlatformRegistryService, propertyCommandDispatchService: PropertyCommandDispatchService, spacesService: SpacesService);
     getType(): string;
     getCommandTtlMs(actions: readonly SceneActionEntity[]): Promise<number>;
     validateSpace(spaceId: string): Promise<void>;

package/dist/plugins/scenes-local/platforms/local-scene.platform.js

@@ -17,6 +17,7 @@ const channels_properties_service_1 = require("../../../modules/devices/services
 const channels_service_1 = require("../../../modules/devices/services/channels.service");
 const devices_service_1 = require("../../../modules/devices/services/devices.service");
 const platform_registry_service_1 = require("../../../modules/devices/services/platform.registry.service");
+const property_command_dispatch_service_1 = require("../../../modules/devices/services/property-command-dispatch.service");
 const intents_constants_1 = require("../../../modules/intents/intents.constants");
 const scenes_exceptions_1 = require("../../../modules/scenes/scenes.exceptions");
 const spaces_service_1 = require("../../../modules/spaces/services/spaces.service");
@@ -26,11 +27,12 @@ function isLocalSceneAction(action) {
     return action.type === scenes_local_constants_1.SCENES_LOCAL_TYPE && 'deviceId' in action && 'propertyId' in action && 'value' in action;
 }
 let LocalScenePlatform = class LocalScenePlatform {
-    constructor(devicesService, channelsService, channelsPropertiesService, platformRegistryService, spacesService) {
+    constructor(devicesService, channelsService, channelsPropertiesService, platformRegistryService, propertyCommandDispatchService, spacesService) {
         this.devicesService = devicesService;
         this.channelsService = channelsService;
         this.channelsPropertiesService = channelsPropertiesService;
         this.platformRegistryService = platformRegistryService;
+        this.propertyCommandDispatchService = propertyCommandDispatchService;
         this.spacesService = spacesService;
         this.logger = (0, logger_1.createExtensionLogger)(scenes_local_constants_1.SCENES_LOCAL_PLUGIN_NAME, 'LocalScenePlatform');
     }
@@ -192,12 +194,14 @@ let LocalScenePlatform = class LocalScenePlatform {
                     });
                     continue;
                 }
-                const success = await platform.process({
-                    device,
-                    channel,
-                    property,
-                    value: action.value,
-                });
+                const { success } = await this.propertyCommandDispatchService.dispatchBatch([
+                    {
+                        device,
+                        channel,
+                        property,
+                        value: action.value,
+                    },
+                ]);
                 results.push({
                     actionId: action.id,
                     success,
@@ -234,6 +238,7 @@ exports.LocalScenePlatform = LocalScenePlatform = __decorate([
         channels_service_1.ChannelsService,
         channels_properties_service_1.ChannelsPropertiesService,
         platform_registry_service_1.PlatformRegistryService,
+        property_command_dispatch_service_1.PropertyCommandDispatchService,
         spaces_service_1.SpacesService])
 ], LocalScenePlatform);
 //# sourceMappingURL=local-scene.platform.js.map

package/dist/plugins/scenes-local/platforms/local-scene.platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"local-scene.platform.js","sourceRoot":"","sources":["../../../../src/plugins/scenes-local/platforms/local-scene.platform.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,mDAA+D;AAC/D,kFAA4E;AAE5E,+GAA0G;AAC1G,yFAAqF;AACrF,uFAAmF;AACnF,2GAAsG;AACtG,kFAA+E;AAG/E,iFAGmD;AAEnD,oFAAgF;AAChF,+EAAqE;AAErE,sEAAwF;AAaxF,SAAS,kBAAkB,CAAC,MAAyB;IACpD,OAAO,MAAM,CAAC,IAAI,KAAK,0CAAiB,IAAI,UAAU,IAAI,MAAM,IAAI,YAAY,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,CAAC;AACjH,CAAC;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG9B,YACkB,cAA8B,EAC9B,eAAgC,EAChC,yBAAoD,EACpD,uBAAgD,EAChD,aAA4B;QAJ5B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,kBAAa,GAAb,aAAa,CAAe;QAP7B,WAAM,GAAG,IAAA,8BAAqB,EAAC,iDAAwB,EAAE,oBAAoB,CAAC,CAAC;IAQ7F,CAAC;IAEJ,OAAO;QACN,OAAO,0CAAiB,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAqC;QAC1D,MAAM,UAAU,GAAG,EAAE,CAAC;QAEtB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;YAEhE,IAAI,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzD,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC;YACjE,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,UAAU,EAAE,qCAAiB,CAAC,CAAC;IACpF,CAAC;IAKD,KAAK,CAAC,aAAa,CAAC,OAAe;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAExD,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,IAAI,kDAA8B,CAAC,iBAAiB,OAAO,aAAa,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,4BAAS,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,kDAA8B,CACvC,iBAAiB,OAAO,uDAAuD,CAC/E,CAAC;QACH,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,cAAc,CAAC,MAAyB;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO,MAAM,CAAC,KAAK,CAAC;IACrB,CAAC;IAKD,KAAK,CAAC,yBAAyB,CAAC,MAAyB;QAExD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,wFAAwF;aAC/F,CAAC;QACH,CAAC;QAGD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAElE,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,oCAAoC;aAC3C,CAAC;QACH,CAAC;QAGD,IAAI,OAAO,GAAyB,IAAI,CAAC;QAEzC,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;YAEhF,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,qCAAqC;iBAC5C,CAAC;YACH,CAAC;QACF,CAAC;aAAM,CAAC;YAEP,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAErE,KAAK,MAAM,EAAE,IAAI,QAAQ,EAAE,CAAC;gBAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEpF,IAAI,IAAI,EAAE,CAAC;oBACV,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM;gBACP,CAAC;YACF,CAAC;YAED,IAAI,CAAC,OAAO,EAAE,CAAC;gBACd,OAAO;oBACN,KAAK,EAAE,KAAK;oBACZ,KAAK,EAAE,qCAAqC;iBAC5C,CAAC;YACH,CAAC;QACF,CAAC;QAGD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAE7F,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,sCAAsC;aAC7C,CAAC;QACH,CAAC;QAGD,MAAM,UAAU,GAAG,QAAQ,CAAC,WAAW,EAAE,IAAI,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,kCAAc,CAAC,UAAU,IAAI,CAAC,KAAK,kCAAc,CAAC,UAAU,CACzE,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,qCAAqC;aAC5C,CAAC;QACH,CAAC;QAGD,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAEtE,IAAI,CAAC,cAAc,EAAE,CAAC;YACrB,OAAO;gBACN,KAAK,EAAE,KAAK;gBACZ,KAAK,EAAE,iCAAiC,QAAQ,CAAC,QAAQ,GAAG;aAC5D,CAAC;QACH,CAAC;QAED,OAAO;YACN,KAAK,EAAE,IAAI;YACX,MAAM;YACN,OAAO;YACP,QAAQ;SACR,CAAC;IACH,CAAC;IAKO,iBAAiB,CAAC,QAA+B,EAAE,KAAgC;QAC1F,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;QAElD,QAAQ,QAAQ,EAAE,CAAC;YAClB,KAAK,MAAM,CAAC;YACZ,KAAK,SAAS;gBACb,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;YACnC,KAAK,KAAK,CAAC;YACX,KAAK,MAAM,CAAC;YACZ,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ,CAAC;YACd,KAAK,MAAM,CAAC;YACZ,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACX,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YAClC,KAAK,QAAQ;gBACZ,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;YAClC,KAAK,MAAM;gBAEV,IAAI,OAAO,KAAK,KAAK,QAAQ;oBAAE,OAAO,KAAK,CAAC;gBAC5C,IAAI,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvD,OAAQ,QAAQ,CAAC,MAAoB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACvD,CAAC;gBACD,OAAO,IAAI,CAAC;YACb;gBAEC,OAAO,IAAI,CAAC;QACd,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,KAAkB,EAAE,OAA4B;QAC7D,MAAM,OAAO,GAAiC,EAAE,CAAC;QAEjD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE7B,IAAI,CAAC;gBAEJ,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC;oBACjC,OAAO,CAAC,IAAI,CAAC;wBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;wBACnB,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,wFAAwF;wBAC/F,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;qBACvC,CAAC,CAAC;oBACH,SAAS;gBACV,CAAC;gBAGD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;gBAEhE,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACrE,OAAO,CAAC,IAAI,CAAC;wBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;wBACnB,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,UAAU,CAAC,KAAK,IAAI,mBAAmB;wBAC9C,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;qBACvC,CAAC,CAAC;oBACH,SAAS;gBACV,CAAC;gBAED,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;gBACjC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;gBACnC,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;gBAGrC,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE1D,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC;wBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;wBACnB,OAAO,EAAE,KAAK;wBACd,KAAK,EAAE,8CAA8C,MAAM,CAAC,IAAI,EAAE;wBAClE,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;qBACvC,CAAC,CAAC;oBACH,SAAS;gBACV,CAAC;gBAGD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;oBACtC,MAAM;oBACN,OAAO;oBACP,QAAQ;oBACR,KAAK,EAAE,MAAM,CAAC,KAAK;iBACnB,CAAC,CAAC;gBAEH,OAAO,CAAC,IAAI,CAAC;oBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,OAAO;oBACP,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,0BAA0B;oBAClD,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBACvC,CAAC,CAAC;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,MAAM,CAAC,EAAE,YAAY,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAE1E,OAAO,CAAC,IAAI,CAAC;oBACZ,QAAQ,EAAE,MAAM,CAAC,EAAE;oBACnB,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,GAAG,CAAC,OAAO;oBAClB,eAAe,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS;iBACvC,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,oBAAoB,CAAC,OAA4B;QACtD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;YAE5D,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBACnB,MAAM,IAAI,mDAA+B,CAAC,MAAM,CAAC,KAAK,IAAI,0BAA0B,CAAC,CAAC;YACvF,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAA;AApRY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;qCAKsB,gCAAc;QACb,kCAAe;QACL,uDAAyB;QAC3B,mDAAuB;QACjC,8BAAa;GARlC,kBAAkB,CAoR9B"}
+{"version":3,"file":"local-scene.platform.js","sourceRoot":"","sources":["../../../../src/plugins/scenes-local/platforms/local-scene.platform.ts"],"names":[],"mappings":"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"}

package/dist/plugins/spaces-home-control/services/climate-intent.service.d.ts

@@ -1,5 +1,6 @@
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { PlatformRegistryService } from '../../../modules/devices/services/platform.registry.service';
+import { PropertyCommandDispatchService } from '../../../modules/devices/services/property-command-dispatch.service';
 import { IntentTimeseriesService } from '../../../modules/intents/services/intent-timeseries.service';
 import { IntentsService } from '../../../modules/intents/services/intents.service';
 import { SpacesService } from '../../../modules/spaces/services/spaces.service';
@@ -19,6 +20,7 @@ export interface ClimateIntentResult extends IntentExecutionResult {
 export declare class ClimateIntentService extends SpaceIntentBaseService {
     private readonly spacesService;
     private readonly platformRegistryService;
+    private readonly propertyCommandDispatchService;
     private readonly climateStateService;
     private readonly contextSnapshotService;
     private readonly undoHistoryService;
@@ -27,7 +29,7 @@ export declare class ClimateIntentService extends SpaceIntentBaseService {
     private readonly intentSpecLoaderService;
     private readonly intentsService;
     private readonly logger;
-    constructor(spacesService: SpacesService, platformRegistryService: PlatformRegistryService, climateStateService: SpaceClimateStateService, contextSnapshotService: SpaceContextSnapshotService, undoHistoryService: SpaceUndoHistoryService, intentTimeseriesService: IntentTimeseriesService, eventEmitter: EventEmitter2, intentSpecLoaderService: IntentSpecLoaderService, intentsService: IntentsService);
+    constructor(spacesService: SpacesService, platformRegistryService: PlatformRegistryService, propertyCommandDispatchService: PropertyCommandDispatchService, climateStateService: SpaceClimateStateService, contextSnapshotService: SpaceContextSnapshotService, undoHistoryService: SpaceUndoHistoryService, intentTimeseriesService: IntentTimeseriesService, eventEmitter: EventEmitter2, intentSpecLoaderService: IntentSpecLoaderService, intentsService: IntentsService);
     getClimateState(spaceId: string): Promise<ClimateState | null>;
     executeClimateIntent(spaceId: string, intent: ClimateIntentDto): Promise<ClimateIntentResult | null>;
     private filterOfflineClimateDevices;