@matter-server/ws-controller 0.5.4 → 0.5.5

package/dist/esm/controller/MatterController.d.ts

@@ -3,8 +3,8 @@
  * Copyright 2025-2026 Open Home Foundation
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Bytes, Crypto, Environment, SharedEnvironmentServices, Timestamp } from "@matter/main";
-import { DclCertificateService, DclVendorInfoService, VendorInfo } from "@matter/main/protocol";
+import { Bytes, Crypto, Environment, Timestamp } from "@matter/main";
+import { VendorInfo } from "@matter/main/protocol";
 import { ConfigStorage } from "../server/ConfigStorage.js";
 import { ControllerCommandHandler } from "./ControllerCommandHandler.js";
 import { LegacyServerData } from "./LegacyDataInjector.js";
@@ -24,20 +24,21 @@ export declare class MatterController {
     constructor(environment: Environment, config: ConfigStorage, options: MatterControllerOptions, serverId: string);
     protected initialize(vendorId?: number, fabricId?: number | bigint, legacyCommissionedDates?: Map<string, Timestamp>): Promise<void>;
     get commandHandler(): ControllerCommandHandler;
-    /**
-     * Get the shared environment services instance.
-     */
-    get services(): SharedEnvironmentServices;
     /**
      * Get the DCL vendor info service instance.
      * Lazily initializes the service if not already present.
      */
-    get vendorInfoService(): DclVendorInfoService;
+    vendorInfoService(): Promise<import("@matter/main/protocol").DclVendorInfoService>;
     /**
      * Get the DCL certificate service instance
      * Lazily initializes the service if not already present.
      */
-    get certificateService(): DclCertificateService;
+    certificateService(): Promise<import("@matter/main/protocol").DclCertificateService>;
+    /**
+     * Get the DCL OTA update service instance
+     * Lazily initializes the service if not already present.
+     */
+    otaUpdateService(): Promise<import("@matter/main/protocol").DclOtaUpdateService>;
     /**
      * Get vendor information by vendor ID.
      * Returns undefined if the vendor is not found.
@@ -55,9 +56,5 @@ export declare class MatterController {
      * @returns true if stored successfully
      */
     storeOtaImageFromFile(filePath: string): Promise<boolean>;
-    /**
-     * Close the services when shutting down.
-     */
-    closeServices(): Promise<void>;
 }
 //# sourceMappingURL=MatterController.d.ts.map

package/dist/esm/controller/MatterController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../../src/controller/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EACN,WAAW,EAKX,yBAAyB,EAEzB,SAAS,EACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,qBAAqB,EAAuB,oBAAoB,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAIrH,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAsB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,OAAO,oBAAoB,CAAC;AAI5B,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,KAAK,EAAE,KAAK,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,MAAM,WAAW,uBAAuB;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+HAA+H;IAC/H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmBD,qBAAa,gBAAgB;;WAYZ,MAAM,CACf,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,uBAAuB,EAChC,UAAU,CAAC,EAAE,gBAAgB;gBA2DrB,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM;cAS/F,UAAU,CACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAC1B,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IAgCpD,IAAI,cAAc,6BAuBjB;IAED;;OAEG;IACH,IAAI,QAAQ,IAAI,yBAAyB,CAKxC;IAED;;;OAGG;IACH,IAAI,iBAAiB,IAAI,oBAAoB,CAK5C;IAED;;;OAGG;IACH,IAAI,kBAAkB,0BAKrB;IAED;;;OAGG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKtE;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAKzD,uBAAuB;IAkBvB,IAAI;IAmBV;;;;OAIG;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB/D;;OAEG;IACG,aAAa;CAGtB"}
+{"version":3,"file":"MatterController.d.ts","sourceRoot":"","sources":["../../../src/controller/MatterController.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EAEL,MAAM,EAEN,WAAW,EAOX,SAAS,EACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAsB,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG/E,OAAO,oBAAoB,CAAC;AAI5B,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,KAAK,EAAE,KAAK,GACb,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,MAAM,WAAW,uBAAuB;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+HAA+H;IAC/H,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B;AAmBD,qBAAa,gBAAgB;;WAWZ,MAAM,CACf,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,uBAAuB,EAChC,UAAU,CAAC,EAAE,gBAAgB;gBA2DrB,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,MAAM;cAS/F,UAAU,CACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,EAC1B,uBAAuB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC;IA0BpD,IAAI,cAAc,6BAuCjB;IAED;;;OAGG;IACG,iBAAiB;IASvB;;;OAGG;IACG,kBAAkB;IASxB;;;OAGG;IACG,gBAAgB;IAStB;;;OAGG;IACG,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAItE;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAIzD,uBAAuB;IAkBvB,IAAI;IAkBV;;;;OAIG;IACG,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAoBlE"}

package/dist/esm/controller/MatterController.js

@@ -6,14 +6,15 @@
 import {
   CommissioningClient,
   Crypto,
+  DclBehavior,
   FabricId,
   GlobalFabricId,
   Logger,
+  MatterAggregateError,
   NodeId,
   SoftwareUpdateManager,
   Timestamp
 } from "@matter/main";
-import { DclCertificateService, DclOtaUpdateService, DclVendorInfoService } from "@matter/main/protocol";
 import { VendorId } from "@matter/main/types";
 import { CommissioningController } from "@project-chip/matter.js";
 import { Readable } from "node:stream";
@@ -35,7 +36,6 @@ function parseVersionToNumber(version) {
 }
 class MatterController {
   #env;
-  #services;
   #controllerInstance;
   #commandHandler;
   #config;
@@ -125,8 +125,6 @@ class MatterController {
         // Base version without alpha/beta suffix
       }
     });
-    this.vendorInfoService;
-    this.certificateService;
   }
   get commandHandler() {
     if (this.#controllerInstance === void 0) {
@@ -139,59 +137,75 @@ class MatterController {
         !this.#disableOtaProvider
       );
       this.#commandHandler.events.started.once(async () => {
+        this.#controllerInstance.node.behaviors.require(DclBehavior, {
+          fetchTestCertificates: this.#enableTestNetDcl
+        });
+        const initPromises = new Array();
         if (this.#legacyCommissionedDates !== void 0) {
-          await this.injectCommissionedDates();
+          initPromises.push(this.injectCommissionedDates());
         }
+        initPromises.push(this.vendorInfoService());
+        initPromises.push(this.certificateService());
         if (!this.#disableOtaProvider && this.#enableTestNetDcl) {
-          await this.#enableTestOtaImages();
+          initPromises.push(this.#enableTestOtaImages());
+        }
+        try {
+          await MatterAggregateError.allSettled(initPromises);
+        } catch (error) {
+          logger.error("Error initializing controller additional services", error);
         }
       });
     }
     return this.#commandHandler;
   }
   /**
-   * Get the shared environment services instance.
+   * Get the DCL vendor info service instance.
+   * Lazily initializes the service if not already present.
    */
-  get services() {
-    if (this.#services === void 0) {
-      this.#services = this.#env.asDependent();
+  async vendorInfoService() {
+    if (this.#controllerInstance === void 0) {
+      throw new Error("Controller not initialized");
     }
-    return this.#services;
+    const service = await this.#controllerInstance.node.act((agent) => agent.get(DclBehavior).vendorInfoService);
+    await service.construction;
+    return service;
   }
   /**
-   * Get the DCL vendor info service instance.
+   * Get the DCL certificate service instance
    * Lazily initializes the service if not already present.
    */
-  get vendorInfoService() {
-    if (!this.#env.has(DclVendorInfoService)) {
-      new DclVendorInfoService(this.#env);
+  async certificateService() {
+    if (this.#controllerInstance === void 0) {
+      throw new Error("Controller not initialized");
     }
-    return this.services.get(DclVendorInfoService);
+    const service = await this.#controllerInstance.node.act((agent) => agent.get(DclBehavior).certificateService);
+    await service.construction;
+    return service;
   }
   /**
-   * Get the DCL certificate service instance
+   * Get the DCL OTA update service instance
    * Lazily initializes the service if not already present.
    */
-  get certificateService() {
-    if (!this.#env.has(DclCertificateService)) {
-      new DclCertificateService(this.#env, { fetchTestCertificates: this.#enableTestNetDcl });
+  async otaUpdateService() {
+    if (this.#controllerInstance === void 0) {
+      throw new Error("Controller not initialized");
     }
-    return this.services.get(DclCertificateService);
+    const service = await this.#controllerInstance.node.act((agent) => agent.get(DclBehavior).otaUpdateService);
+    await service.construction;
+    return service;
   }
   /**
    * Get vendor information by vendor ID.
    * Returns undefined if the vendor is not found.
    */
   async getVendorInfo(vendorId) {
-    await this.vendorInfoService.construction;
-    return this.vendorInfoService.infoFor(vendorId);
+    return (await this.vendorInfoService()).infoFor(vendorId);
   }
   /**
    * Get all vendor information from the DCL service.
    */
   async getAllVendors() {
-    await this.vendorInfoService.construction;
-    return this.vendorInfoService.vendors;
+    return (await this.vendorInfoService()).vendors;
   }
   async injectCommissionedDates() {
     if (this.#controllerInstance === void 0 || this.#legacyCommissionedDates === void 0) {
@@ -212,7 +226,6 @@ class MatterController {
   }
   async stop() {
     await this.#commandHandler?.close();
-    await this.#services?.close();
   }
   /**
    * Enable test OTA images (test-net DCL).
@@ -235,7 +248,7 @@ class MatterController {
   async storeOtaImageFromFile(filePath) {
     const { createReadStream } = await import("node:fs");
     const { pathToFileURL } = await import("node:url");
-    const otaService = this.services.get(DclOtaUpdateService);
+    const otaService = await this.otaUpdateService();
     const fileUrl = pathToFileURL(filePath).href;
     const infoStream = Readable.toWeb(createReadStream(filePath));
     const updateInfo = await otaService.updateInfoFromStream(infoStream, fileUrl);
@@ -246,12 +259,6 @@ class MatterController {
     await otaService.store(storeStream, updateInfo, "local");
     return true;
   }
-  /**
-   * Close the services when shutting down.
-   */
-  async closeServices() {
-    await this.#services?.close();
-  }
 }
 export {
   MatterController,

package/dist/esm/controller/MatterController.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/controller/MatterController.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter-server/ws-controller",
-    "version": "0.5.4",
+    "version": "0.5.5",
     "type": "module",
     "description": "matter.js based Matter controller library",
     "bugs": {
@@ -22,15 +22,15 @@
         "node": ">=20.19.0 <22.0.0 || >=22.13.0"
     },
     "optionalDependencies": {
-        "@matter/nodejs-ble": "0.17.0-alpha.0-20260308-2d3759f3b"
+        "@matter/nodejs-ble": "0.17.0-alpha.0-20260311-5fb2f183e"
     },
     "dependencies": {
-        "@matter/main": "0.17.0-alpha.0-20260308-2d3759f3b",
-        "@project-chip/matter.js": "0.17.0-alpha.0-20260308-2d3759f3b",
+        "@matter/main": "0.17.0-alpha.0-20260311-5fb2f183e",
+        "@project-chip/matter.js": "0.17.0-alpha.0-20260311-5fb2f183e",
         "ws": "^8.19.0"
     },
     "devDependencies": {
-        "@types/node": "^25.3.3",
+        "@types/node": "^25.4.0",
         "@types/ws": "^8.18.1"
     },
     "files": [

package/src/controller/MatterController.ts

@@ -8,16 +8,17 @@ import {
     Bytes,
     CommissioningClient,
     Crypto,
+    DclBehavior,
     Environment,
     FabricId,
     GlobalFabricId,
     Logger,
+    MatterAggregateError,
     NodeId,
-    SharedEnvironmentServices,
     SoftwareUpdateManager,
     Timestamp,
 } from "@matter/main";
-import { DclCertificateService, DclOtaUpdateService, DclVendorInfoService, VendorInfo } from "@matter/main/protocol";
+import { VendorInfo } from "@matter/main/protocol";
 import { VendorId } from "@matter/main/types";
 import { CommissioningController } from "@project-chip/matter.js";
 import { Readable } from "node:stream";
@@ -66,7 +67,6 @@ function parseVersionToNumber(version: string): number {
 
 export class MatterController {
     #env: Environment;
-    #services?: SharedEnvironmentServices;
     #controllerInstance?: CommissioningController;
     #commandHandler?: ControllerCommandHandler;
     #config: ConfigStorage;
@@ -175,12 +175,6 @@ export class MatterController {
                 softwareVersionString: this.#serverVersion.split("-")[0], // Base version without alpha/beta suffix
             },
         });
-
-        // Start loading and initialization of meta data
-        /* eslint-disable @typescript-eslint/no-unused-expressions */
-        this.vendorInfoService;
-        /* eslint-disable @typescript-eslint/no-unused-expressions */
-        this.certificateService;
     }
 
     get commandHandler() {
@@ -195,12 +189,28 @@ export class MatterController {
             );
 
             this.#commandHandler.events.started.once(async () => {
+                this.#controllerInstance!.node.behaviors.require(DclBehavior, {
+                    fetchTestCertificates: this.#enableTestNetDcl,
+                });
+
+                const initPromises = new Array<Promise<unknown>>();
+
                 if (this.#legacyCommissionedDates !== undefined) {
-                    await this.injectCommissionedDates();
+                    initPromises.push(this.injectCommissionedDates());
                 }
 
+                // Start loading and initialization of meta data
+                initPromises.push(this.vendorInfoService());
+                initPromises.push(this.certificateService());
+
                 if (!this.#disableOtaProvider && this.#enableTestNetDcl) {
-                    await this.#enableTestOtaImages();
+                    initPromises.push(this.#enableTestOtaImages());
+                }
+
+                try {
+                    await MatterAggregateError.allSettled(initPromises);
+                } catch (error) {
+                    logger.error("Error initializing controller additional services", error);
                 }
             });
         }
@@ -209,35 +219,42 @@ export class MatterController {
     }
 
     /**
-     * Get the shared environment services instance.
+     * Get the DCL vendor info service instance.
+     * Lazily initializes the service if not already present.
      */
-    get services(): SharedEnvironmentServices {
-        if (this.#services === undefined) {
-            this.#services = this.#env.asDependent();
+    async vendorInfoService() {
+        if (this.#controllerInstance === undefined) {
+            throw new Error("Controller not initialized");
         }
-        return this.#services;
+        const service = await this.#controllerInstance.node.act(agent => agent.get(DclBehavior).vendorInfoService);
+        await service.construction;
+        return service;
     }
 
     /**
-     * Get the DCL vendor info service instance.
+     * Get the DCL certificate service instance
      * Lazily initializes the service if not already present.
      */
-    get vendorInfoService(): DclVendorInfoService {
-        if (!this.#env.has(DclVendorInfoService)) {
-            new DclVendorInfoService(this.#env);
+    async certificateService() {
+        if (this.#controllerInstance === undefined) {
+            throw new Error("Controller not initialized");
         }
-        return this.services.get(DclVendorInfoService);
+        const service = await this.#controllerInstance.node.act(agent => agent.get(DclBehavior).certificateService);
+        await service.construction;
+        return service;
     }
 
     /**
-     * Get the DCL certificate service instance
+     * Get the DCL OTA update service instance
      * Lazily initializes the service if not already present.
      */
-    get certificateService() {
-        if (!this.#env.has(DclCertificateService)) {
-            new DclCertificateService(this.#env, { fetchTestCertificates: this.#enableTestNetDcl });
+    async otaUpdateService() {
+        if (this.#controllerInstance === undefined) {
+            throw new Error("Controller not initialized");
         }
-        return this.services.get(DclCertificateService);
+        const service = await this.#controllerInstance.node.act(agent => agent.get(DclBehavior).otaUpdateService);
+        await service.construction;
+        return service;
     }
 
     /**
@@ -245,16 +262,14 @@ export class MatterController {
      * Returns undefined if the vendor is not found.
      */
     async getVendorInfo(vendorId: number): Promise<VendorInfo | undefined> {
-        await this.vendorInfoService.construction;
-        return this.vendorInfoService.infoFor(vendorId);
+        return (await this.vendorInfoService()).infoFor(vendorId);
     }
 
     /**
      * Get all vendor information from the DCL service.
      */
     async getAllVendors(): Promise<ReadonlyMap<number, VendorInfo>> {
-        await this.vendorInfoService.construction;
-        return this.vendorInfoService.vendors;
+        return (await this.vendorInfoService()).vendors;
     }
 
     async injectCommissionedDates() {
@@ -277,7 +292,6 @@ export class MatterController {
 
     async stop() {
         await this.#commandHandler?.close(); // This closes also the controller instance if started
-        await this.#services?.close();
     }
 
     /**
@@ -302,7 +316,7 @@ export class MatterController {
     async storeOtaImageFromFile(filePath: string): Promise<boolean> {
         const { createReadStream } = await import("node:fs");
         const { pathToFileURL } = await import("node:url");
-        const otaService = this.services.get(DclOtaUpdateService);
+        const otaService = await this.otaUpdateService();
 
         // Convert file path to file:// URL for the OTA service
         const fileUrl = pathToFileURL(filePath).href;
@@ -319,11 +333,4 @@ export class MatterController {
         await otaService.store(storeStream, updateInfo, "local");
         return true;
     }
-
-    /**
-     * Close the services when shutting down.
-     */
-    async closeServices() {
-        await this.#services?.close();
-    }
 }