@fastybird/smart-panel-backend 1.1.0-alpha.0 → 1.1.0-alpha.10

package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js

@@ -19,15 +19,30 @@ let TailscaleServeService = class TailscaleServeService {
         this.cli = cli;
         this.logger = (0, logger_1.createExtensionLogger)(remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_PLUGIN_NAME, 'TailscaleServeService');
     }
-    async apply(config, port, status) {
-        const capMap = status.Self?.CapMap ?? {};
-        const hasHttpsCap = Object.hasOwn(capMap, 'https');
-        const hasFunnelCap = Object.hasOwn(capMap, 'funnel');
-        const dnsName = this.stripTrailingDot(status.Self?.DNSName);
-        const desired = this.desiredState(config, hasHttpsCap, hasFunnelCap);
+    async read(config, port, status) {
+        const { hasHttpsCap, hasFunnelCap, dnsName } = this.readCaps(status);
         const { serveActive, funnelActive } = dnsName
-            ? await this.applyHandler(desired, port, `${dnsName}:443`, `http://127.0.0.1:${port}`)
+            ? await this.readHandlerState(`${dnsName}:443`, `http://127.0.0.1:${port}`)
             : { serveActive: false, funnelActive: false };
+        return this.buildResult(config, hasHttpsCap, hasFunnelCap, dnsName, serveActive, funnelActive, false);
+    }
+    async converge(config, port, status) {
+        const { hasHttpsCap, hasFunnelCap, dnsName } = this.readCaps(status);
+        const desired = this.desiredState(config, hasHttpsCap, hasFunnelCap);
+        const { serveActive, funnelActive, permissionDenied } = dnsName
+            ? await this.convergeHandler(desired, port, `${dnsName}:443`, `http://127.0.0.1:${port}`)
+            : { serveActive: false, funnelActive: false, permissionDenied: false };
+        return this.buildResult(config, hasHttpsCap, hasFunnelCap, dnsName, serveActive, funnelActive, permissionDenied);
+    }
+    readCaps(status) {
+        const capMap = status.Self?.CapMap ?? {};
+        return {
+            hasHttpsCap: Object.hasOwn(capMap, 'https'),
+            hasFunnelCap: Object.hasOwn(capMap, 'funnel'),
+            dnsName: this.stripTrailingDot(status.Self?.DNSName),
+        };
+    }
+    buildResult(config, hasHttpsCap, hasFunnelCap, dnsName, serveActive, funnelActive, permissionDenied) {
         const endpoints = [];
         const proxyAddresses = [];
         if (serveActive && dnsName) {
@@ -61,7 +76,7 @@ let TailscaleServeService = class TailscaleServeService {
                 message: 'This node is publicly reachable through Tailscale Funnel. The Smart Panel login is the only gate — multi-factor authentication is not available.',
             });
         }
-        return { endpoints, proxyAddresses, advisories };
+        return { endpoints, proxyAddresses, advisories, permissionDenied };
     }
     desiredState(config, hasHttpsCap, hasFunnelCap) {
         if (!config.serveHttps || !hasHttpsCap) {
@@ -75,9 +90,17 @@ let TailscaleServeService = class TailscaleServeService {
         }
         return funnelActive ? 'public' : 'private';
     }
-    async applyHandler(desired, port, hostPort, targetUrl) {
+    async readHandlerState(hostPort, targetUrl) {
+        const serveStatus = await this.readServeStatus();
+        return {
+            serveActive: this.isServeActive(serveStatus, hostPort, targetUrl),
+            funnelActive: this.isFunnelActive(serveStatus, hostPort),
+        };
+    }
+    async convergeHandler(desired, port, hostPort, targetUrl) {
         let serveStatus = await this.readServeStatus();
         let current = this.currentState(this.isServeActive(serveStatus, hostPort, targetUrl), this.isFunnelActive(serveStatus, hostPort));
+        let permissionDenied = false;
         if (current !== desired) {
             try {
                 if (desired === 'off') {
@@ -93,14 +116,18 @@ let TailscaleServeService = class TailscaleServeService {
                 current = this.currentState(this.isServeActive(serveStatus, hostPort, targetUrl), this.isFunnelActive(serveStatus, hostPort));
             }
             catch (error) {
-                this.logger.warn(`Failed to apply the Tailscale Serve/Funnel handler (wanted "${desired}")`, {
-                    message: error instanceof Error ? error.message : String(error),
-                });
+                permissionDenied = error instanceof tailscale_cli_service_1.TailscaleCliError && error.kind === 'permission-denied';
+                if (!permissionDenied) {
+                    this.logger.warn(`Failed to apply the Tailscale Serve/Funnel handler (wanted "${desired}")`, {
+                        message: error instanceof Error ? error.message : String(error),
+                    });
+                }
             }
         }
         return {
             serveActive: current !== 'off',
             funnelActive: current === 'public',
+            permissionDenied,
         };
     }
     async readServeStatus() {

package/dist/plugins/remote-access-tailscale/services/tailscale-serve.service.js.map

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

package/dist/plugins/remote-access-tailscale/services/tailscale-setup.service.d.ts

@@ -1,8 +1,12 @@
 import { ConfigService as NestConfigService } from '@nestjs/config';
 import { EventEmitter2 } from '@nestjs/event-emitter';
+import { ConfigService } from '../../../modules/config/services/config.service';
+import { ManagedServiceManagerService } from '../../../modules/extensions/services/managed-service-manager.service';
 import { PlatformService } from '../../../modules/platform/services/platform.service';
 import { PrivilegedJobStatus, PrivilegedWorkerService } from '../../../modules/system/services/privileged-worker.service';
+import { TailscaleSetupUnavailableException } from '../remote-access-tailscale.exceptions';
 import { TailscaleNodeManagedService } from './tailscale-node-managed.service';
+export { TailscaleSetupUnavailableException };
 export interface TailscaleSetupProgressEvent {
     type: string;
     job: string;
@@ -10,21 +14,26 @@ export interface TailscaleSetupProgressEvent {
     state: PrivilegedJobStatus['state'];
     message?: string;
 }
-export declare class TailscaleSetupUnavailableException extends Error {
-    constructor(message: string);
-}
 export declare class TailscaleSetupService {
     private readonly privilegedWorker;
     private readonly nestConfigService;
     private readonly nodeManagedService;
     private readonly eventEmitter;
     private readonly platformService;
+    private readonly configService;
+    private readonly managedServiceManager;
     private readonly logger;
-    constructor(privilegedWorker: PrivilegedWorkerService, nestConfigService: NestConfigService, nodeManagedService: TailscaleNodeManagedService, eventEmitter: EventEmitter2, platformService: PlatformService);
+    private lastJob;
+    constructor(privilegedWorker: PrivilegedWorkerService, nestConfigService: NestConfigService, nodeManagedService: TailscaleNodeManagedService, eventEmitter: EventEmitter2, platformService: PlatformService, configService: ConfigService, managedServiceManager: ManagedServiceManagerService);
     install(): Promise<{
         id: string;
     }>;
+    getLastJob(): {
+        id: string;
+        status: PrivilegedJobStatus;
+    } | null;
     private watchJob;
-    private refreshRequirementsAfterSetup;
+    private onSetupComplete;
+    private refreshNodeRequirements;
     private ensureDir;
 }

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

@@ -21,35 +21,39 @@ 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_tailscale_constants_1 = require("../remote-access-tailscale.constants");
+const remote_access_tailscale_exceptions_1 = require("../remote-access-tailscale.exceptions");
+Object.defineProperty(exports, "TailscaleSetupUnavailableException", { enumerable: true, get: function () { return remote_access_tailscale_exceptions_1.TailscaleSetupUnavailableException; } });
 const tailscale_node_managed_service_1 = require("./tailscale-node-managed.service");
-class TailscaleSetupUnavailableException extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'TailscaleSetupUnavailableException';
-    }
-}
-exports.TailscaleSetupUnavailableException = TailscaleSetupUnavailableException;
 let TailscaleSetupService = class TailscaleSetupService {
-    constructor(privilegedWorker, nestConfigService, nodeManagedService, eventEmitter, platformService) {
+    constructor(privilegedWorker, nestConfigService, nodeManagedService, eventEmitter, platformService, configService, managedServiceManager) {
         this.privilegedWorker = privilegedWorker;
         this.nestConfigService = nestConfigService;
         this.nodeManagedService = nodeManagedService;
         this.eventEmitter = eventEmitter;
         this.platformService = platformService;
+        this.configService = configService;
+        this.managedServiceManager = managedServiceManager;
         this.logger = (0, logger_1.createExtensionLogger)(remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_PLUGIN_NAME, 'TailscaleSetupService');
+        this.lastJob = null;
     }
     async install() {
         const allowDev = (0, config_utils_1.getEnvValue)(this.nestConfigService, remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_ALLOW_DEV_ENV, false);
         if (allowDev) {
-            throw new TailscaleSetupUnavailableException(`Tailscale setup is unavailable while ${remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_ALLOW_DEV_ENV} is set. Prepare tailscale manually on the development platform: install it, run tailscaled, and grant the current user as operator.`);
+            throw new remote_access_tailscale_exceptions_1.TailscaleSetupUnavailableException(`Tailscale setup is unavailable while ${remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_ALLOW_DEV_ENV} is set. Prepare tailscale manually on the development platform: install it, run tailscaled, and grant the current user as operator.`, 'platform-unsupported');
         }
-        const supportsPrivilegedWorkers = await this.platformService.supportsPrivilegedWorkers();
-        if (!supportsPrivilegedWorkers) {
-            throw new TailscaleSetupUnavailableException(`Tailscale setup requires a platform with privileged-worker support; the '${this.platformService.getPlatformType()}' platform does not have it.`);
+        const privilegedWorkerSupport = await this.platformService.getPrivilegedWorkerSupport();
+        if (!privilegedWorkerSupport.supported) {
+            if (!this.platformService.isPlatformCapableOfPrivilegedWorkers()) {
+                throw new remote_access_tailscale_exceptions_1.TailscaleSetupUnavailableException(`Tailscale 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_tailscale_exceptions_1.TailscaleSetupUnavailableException(`${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_tailscale_constants_1.TAILSCALE_DATA_SUBDIR);
@@ -73,11 +77,21 @@ let TailscaleSetupService = class TailscaleSetupService {
             statusFile,
         });
         this.logger.log(`Tailscale 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_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_PLUGIN_NAME,
                 job: id,
@@ -91,7 +105,7 @@ let TailscaleSetupService = class TailscaleSetupService {
             }
             if (status.state === 'complete') {
                 this.logger.log(`Tailscale setup job completed (job: ${id})`);
-                void this.refreshRequirementsAfterSetup();
+                void this.onSetupComplete();
             }
             else {
                 this.logger.error(`Tailscale setup job did not complete (job: ${id}, state: ${status.state})`, {
@@ -102,15 +116,34 @@ let TailscaleSetupService = class TailscaleSetupService {
             unsubscribe();
         });
     }
-    async refreshRequirementsAfterSetup() {
+    async onSetupComplete() {
         try {
-            await this.nodeManagedService.evaluateRequirements();
+            await this.refreshNodeRequirements();
         }
         catch (error) {
             this.logger.warn('Failed to refresh Tailscale requirements after setup', {
                 message: error instanceof Error ? error.message : String(error),
             });
         }
+        try {
+            const pluginConfig = this.configService.getPluginConfig(remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_PLUGIN_NAME);
+            if (pluginConfig.enabled) {
+                await this.managedServiceManager.restartService('plugin', remote_access_tailscale_constants_1.REMOTE_ACCESS_TAILSCALE_PLUGIN_NAME, 'node');
+            }
+        }
+        catch (error) {
+            this.logger.warn('Failed to restart the Tailscale node service after setup', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+    }
+    async refreshNodeRequirements() {
+        const nodeManagedService = this.nodeManagedService;
+        if (typeof nodeManagedService.refreshRequirements === 'function') {
+            await nodeManagedService.refreshRequirements('setup-complete');
+            return;
+        }
+        await this.nodeManagedService.evaluateRequirements();
     }
     ensureDir(dir) {
         if (!(0, fs_1.existsSync)(dir)) {
@@ -125,6 +158,8 @@ exports.TailscaleSetupService = TailscaleSetupService = __decorate([
         config_1.ConfigService,
         tailscale_node_managed_service_1.TailscaleNodeManagedService,
         event_emitter_1.EventEmitter2,
-        platform_service_1.PlatformService])
+        platform_service_1.PlatformService,
+        config_service_1.ConfigService,
+        managed_service_manager_service_1.ManagedServiceManagerService])
 ], TailscaleSetupService);
 //# sourceMappingURL=tailscale-setup.service.js.map

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

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

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

@@ -15,6 +15,7 @@ const event_emitter_1 = require("@nestjs/event-emitter");
 const extension_logger_service_1 = require("../../../common/logger/extension-logger.service");
 const transform_utils_1 = require("../../../common/utils/transform.utils");
 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 intent_timeseries_service_1 = require("../../../modules/intents/services/intent-timeseries.service");
 const intents_service_1 = require("../../../modules/intents/services/intents.service");
@@ -28,10 +29,11 @@ const space_context_snapshot_service_1 = require("./space-context-snapshot.servi
 const space_intent_base_service_1 = require("./space-intent-base.service");
 const space_undo_history_service_1 = require("./space-undo-history.service");
 let ClimateIntentService = class ClimateIntentService extends space_intent_base_service_1.SpaceIntentBaseService {
-    constructor(spacesService, platformRegistryService, climateStateService, contextSnapshotService, undoHistoryService, intentTimeseriesService, eventEmitter, intentSpecLoaderService, intentsService) {
+    constructor(spacesService, platformRegistryService, propertyCommandDispatchService, climateStateService, contextSnapshotService, undoHistoryService, intentTimeseriesService, eventEmitter, intentSpecLoaderService, intentsService) {
         super();
         this.spacesService = spacesService;
         this.platformRegistryService = platformRegistryService;
+        this.propertyCommandDispatchService = propertyCommandDispatchService;
         this.climateStateService = climateStateService;
         this.contextSnapshotService = contextSnapshotService;
         this.undoHistoryService = undoHistoryService;
@@ -324,7 +326,7 @@ let ClimateIntentService = class ClimateIntentService extends space_intent_base_
             return true;
         }
         try {
-            const success = await platform.processBatch(commands);
+            const { success } = await this.propertyCommandDispatchService.dispatchBatch(commands);
             if (!success) {
                 this.logger.error(`Mode command execution failed for device id=${device.device.id}`);
                 return false;
@@ -500,7 +502,7 @@ let ClimateIntentService = class ClimateIntentService extends space_intent_base_
                 this.logger.error(`Setpoint command preparation failed for device id=${device.device.id}`);
                 return { success: false, heatingSetpoint: null, coolingSetpoint: null };
             }
-            const success = await platform.processBatch(preparedCommands);
+            const { success } = await this.propertyCommandDispatchService.dispatchBatch(preparedCommands, { prepared: true });
             if (!success) {
                 this.logger.error(`Setpoint command execution failed for device id=${device.device.id}`);
                 return { success: false, heatingSetpoint: null, coolingSetpoint: null };
@@ -710,6 +712,7 @@ exports.ClimateIntentService = ClimateIntentService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [spaces_service_1.SpacesService,
         platform_registry_service_1.PlatformRegistryService,
+        property_command_dispatch_service_1.PropertyCommandDispatchService,
         space_climate_state_service_1.SpaceClimateStateService,
         space_context_snapshot_service_1.SpaceContextSnapshotService,
         space_undo_history_service_1.SpaceUndoHistoryService,