@matterbridge/core 3.10.12-dev-20261002-6a30fb3 → 3.10.12-dev-20261002-857fd9b

package/dist/behaviors/serviceAreaServer.d.ts

@@ -1,7 +1,22 @@
 import { ServiceAreaServer } from '@matter/node/behaviors/service-area';
 import { ServiceArea } from '@matter/types/clusters/service-area';
 import type { MatterbridgeEndpoint } from '../matterbridgeEndpoint.js';
-export declare class MatterbridgeServiceAreaServer extends ServiceAreaServer {
+declare const MatterbridgeServiceAreaServer_base: import("@matter/node").ClusterBehavior.Type<typeof ServiceAreaServer, import("@matter/types").ClusterType.WithSupportedFeatures<import("@matter/types").ClusterType.WithSupportedFeatures<import("@matter/types").ClusterType.WithSupportedFeatures<ServiceArea, {
+    maps: true;
+    progressReporting: true;
+    selectWhileRunning: false;
+}>, {
+    maps: false;
+    progressReporting: false;
+    selectWhileRunning: false;
+}>, {
+    maps: false;
+    progressReporting: true;
+    selectWhileRunning: false;
+}>, import("@matter/types").ClusterType.Concrete, new () => {}, "serviceArea">;
+export declare class MatterbridgeServiceAreaServer extends MatterbridgeServiceAreaServer_base {
     readonly endpoint: MatterbridgeEndpoint;
     selectAreas(request: ServiceArea.SelectAreasRequest): Promise<ServiceArea.SelectAreasResponse>;
+    skipArea(request: ServiceArea.SkipAreaRequest): Promise<ServiceArea.SkipAreaResponse>;
 }
+export {};

package/dist/behaviors/serviceAreaServer.js

@@ -1,7 +1,7 @@
 import { ServiceAreaServer } from '@matter/node/behaviors/service-area';
 import { ServiceArea } from '@matter/types/clusters/service-area';
 import { MatterbridgeServer } from './matterbridgeServer.js';
-export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
+export class MatterbridgeServiceAreaServer extends ServiceAreaServer.with(ServiceArea.Feature.ProgressReporting) {
     async selectAreas(request) {
         const device = this.endpoint.stateOf(MatterbridgeServer);
         device.log.info(`MatterbridgeServiceAreaServer: selecting areas [${request.newAreas.join(', ')}] (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
@@ -19,4 +19,24 @@ export class MatterbridgeServiceAreaServer extends ServiceAreaServer {
             this.endpoint.emitCommand(ServiceArea, 'selectAreas', request, this.context);
         return response;
     }
+    async skipArea(request) {
+        const device = this.endpoint.stateOf(MatterbridgeServer);
+        device.log.info(`MatterbridgeServiceAreaServer: skipping area ${request.skippedArea} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        await device.commandHandler.executeHandler('ServiceArea.skipArea', {
+            command: 'skipArea',
+            request,
+            cluster: ServiceAreaServer.id,
+            attributes: this.state,
+            endpoint: this.endpoint,
+            context: this.context,
+        });
+        device.log.debug(`MatterbridgeServiceAreaServer: skipArea called with ${request.skippedArea} (endpoint ${this.endpoint.maybeId}.${this.endpoint.maybeNumber})`);
+        const response = this.assertSkipServiceArea(request);
+        if (response.status === ServiceArea.SkipAreaStatus.Success && this.state.progress !== undefined) {
+            this.state.progress = this.state.progress.map((area) => area.areaId === request.skippedArea
+                ? { areaId: area.areaId, status: ServiceArea.OperationalStatus.Skipped, totalOperationalTime: area.totalOperationalTime, estimatedTime: area.estimatedTime }
+                : area);
+        }
+        return response;
+    }
 }

package/dist/devices/roboticVacuumCleaner.d.ts

@@ -28,13 +28,14 @@ export interface RoboticVacuumCleanerOptions {
     selectedAreas?: number[];
     currentArea?: number | null;
     supportedMaps?: ServiceArea.Map[];
+    progress?: ServiceArea.Progress[];
 }
 export declare class RoboticVacuumCleaner extends MatterbridgeEndpoint {
     constructor(name: string, serial: string, options?: RoboticVacuumCleanerOptions);
     constructor(name: string, serial: string, mode?: 'server' | 'matter', currentRunMode?: number, supportedRunModes?: RvcRunMode.ModeOption[], currentCleanMode?: number, supportedCleanModes?: RvcCleanMode.ModeOption[], currentPhase?: number | null, phaseList?: string[] | null, operationalState?: RvcOperationalState.OperationalState, operationalStateList?: RvcOperationalState.OperationalStateStruct[], supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number | null, supportedMaps?: ServiceArea.Map[]);
     createDefaultRvcRunModeClusterServer(currentMode?: number, supportedModes?: RvcRunMode.ModeOption[]): this;
     createDefaultRvcCleanModeClusterServer(currentMode?: number, supportedModes?: RvcCleanMode.ModeOption[]): this;
-    createDefaultServiceAreaClusterServer(supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number | null, supportedMaps?: ServiceArea.Map[]): this;
+    createDefaultServiceAreaClusterServer(supportedAreas?: ServiceArea.Area[], selectedAreas?: number[], currentArea?: number | null, supportedMaps?: ServiceArea.Map[], progress?: ServiceArea.Progress[]): this;
     createDefaultRvcOperationalStateClusterServer(phaseList?: string[] | null, currentPhase?: number | null, operationalStateList?: RvcOperationalState.OperationalStateStruct[], operationalState?: RvcOperationalState.OperationalState, operationalError?: RvcOperationalState.ErrorStateStruct): this;
 }
 export declare class MatterbridgeRvcRunModeServer extends RvcRunModeServer {

package/dist/devices/roboticVacuumCleaner.js

@@ -48,7 +48,7 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
             .createDefaultRvcRunModeClusterServer(options.currentRunMode, options.supportedRunModes)
             .createDefaultRvcCleanModeClusterServer(options.currentCleanMode, options.supportedCleanModes)
             .createDefaultRvcOperationalStateClusterServer(options.phaseList, options.currentPhase, options.operationalStateList, options.operationalState)
-            .createDefaultServiceAreaClusterServer(options.supportedAreas, options.selectedAreas, options.currentArea, options.supportedMaps);
+            .createDefaultServiceAreaClusterServer(options.supportedAreas, options.selectedAreas, options.currentArea, options.supportedMaps, options.progress);
     }
     createDefaultRvcRunModeClusterServer(currentMode, supportedModes) {
         this.behaviors.require(MatterbridgeRvcRunModeServer, {
@@ -73,8 +73,8 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
         });
         return this;
     }
-    createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea, supportedMaps) {
-        this.behaviors.require(MatterbridgeServiceAreaServer.with(ServiceArea.Feature.Maps), {
+    createDefaultServiceAreaClusterServer(supportedAreas, selectedAreas, currentArea, supportedMaps, progress) {
+        this.behaviors.require(MatterbridgeServiceAreaServer.with(ServiceArea.Feature.Maps, ...(progress !== undefined ? [ServiceArea.Feature.ProgressReporting] : [])), {
             supportedAreas: supportedAreas ?? [
                 {
                     areaId: 1,
@@ -101,6 +101,7 @@ export class RoboticVacuumCleaner extends MatterbridgeEndpoint {
             currentArea: currentArea !== undefined ? currentArea : 1,
             supportedMaps: supportedMaps ?? [],
             estimatedEndTime: null,
+            progress,
         });
         return this;
     }

package/dist/matterbridgeEndpointCommandHandler.d.ts

@@ -854,6 +854,7 @@ export type CommandHandlerDataMap = {
         endpoint: MatterbridgeEndpoint;
     };
     'selectAreas': CommandHandlerData<'ServiceArea.selectAreas'>;
+    'skipArea': CommandHandlerData<'ServiceArea.skipArea'>;
     'ServiceArea.selectAreas': {
         command: 'selectAreas';
         request: ServiceArea.SelectAreasRequest;
@@ -861,6 +862,13 @@ export type CommandHandlerDataMap = {
         attributes: ClusterAttributeValues<(typeof ServiceArea)['attributes']>;
         endpoint: MatterbridgeEndpoint;
     };
+    'ServiceArea.skipArea': {
+        command: 'skipArea';
+        request: ServiceArea.SkipAreaRequest;
+        cluster: 'serviceArea';
+        attributes: ClusterAttributeValues<(typeof ServiceArea)['attributes']>;
+        endpoint: MatterbridgeEndpoint;
+    };
     'boost': CommandHandlerData<'WaterHeaterManagement.boost'>;
     'cancelBoost': CommandHandlerData<'WaterHeaterManagement.cancelBoost'>;
     'WaterHeaterManagement.boost': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@matterbridge/core",
-  "version": "3.10.12-dev-20261002-6a30fb3",
+  "version": "3.10.12-dev-20261002-857fd9b",
   "description": "Matterbridge core library",
   "author": "https://github.com/Luligu",
   "homepage": "https://matterbridge.io/",
@@ -136,10 +136,10 @@
   },
   "dependencies": {
     "@matter/main": "0.17.9",
-    "@matterbridge/dgram": "3.10.12-dev-20261002-6a30fb3",
-    "@matterbridge/thread": "3.10.12-dev-20261002-6a30fb3",
-    "@matterbridge/types": "3.10.12-dev-20261002-6a30fb3",
-    "@matterbridge/utils": "3.10.12-dev-20261002-6a30fb3",
+    "@matterbridge/dgram": "3.10.12-dev-20261002-857fd9b",
+    "@matterbridge/thread": "3.10.12-dev-20261002-857fd9b",
+    "@matterbridge/types": "3.10.12-dev-20261002-857fd9b",
+    "@matterbridge/utils": "3.10.12-dev-20261002-857fd9b",
     "escape-html": "1.0.3",
     "express": "5.2.1",
     "express-rate-limit": "8.7.0",