@project-chip/matter.js 0.16.0-alpha.0-20251020-3f6e46245 → 0.16.0-alpha.0-20251022-5a69ce65a

package/dist/esm/PaseCommissioner.js

@@ -3,14 +3,11 @@
  * Copyright 2022-2025 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ImplementationError, Logger, Minutes, Network } from "#general";
+import { ImplementationError, Logger, Minutes } from "#general";
 import {
   ControllerDiscovery,
   MdnsService
 } from "#protocol";
-import {
-  configureNetwork as configureControllerNetwork
-} from "./CommissioningController.js";
 import { MatterController } from "./MatterController.js";
 const logger = new Logger("PaseCommissioner");
 class PaseCommissioner {
@@ -46,26 +43,17 @@ class PaseCommissioner {
       return this.controllerInstance;
     }
     const { certificateAuthorityConfig: rootCertificateData, fabricConfig } = this.options;
-    let mdnsClient;
-    let ipv4Disabled = false;
     try {
-      const mdnsService = await this.environment.load(MdnsService);
-      ipv4Disabled = !mdnsService.enableIpv4;
-      mdnsClient = mdnsService.client;
+      await this.environment.load(MdnsService);
     } catch {
       logger.debug("No networking available, using only BLE");
     }
-    const { scanners, netInterfaces } = await configureControllerNetwork({
-      network: this.environment.get(Network),
-      mdnsClient,
-      ipv4Disabled,
-      ...this.options
-    });
     return await MatterController.createAsPaseCommissioner({
+      id: "PaseCommissioner",
+      // In Memory anyway
+      environment: this.environment,
       certificateAuthorityConfig: rootCertificateData,
       fabricConfig,
-      scanners,
-      transports: netInterfaces,
       adminFabricLabel: this.options.fabricConfig.label
     });
   }

package/dist/esm/PaseCommissioner.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/PaseCommissioner.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,SAAsB,qBAAqB,QAAQ,SAAS,eAAe;AAC3E;AAAA,EAII;AAAA,EAIA;AAAA,OAEG;AAEP;AAAA,EAEI,oBAAoB;AAAA,OAGjB;AACP,SAAS,wBAAwB;AAEjC,MAAM,SAAS,IAAI,OAAO,kBAAkB;AAkBrC,MAAM,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAS1B,YAA6B,SAAkC;AAAlC;AACzB,QAAI,QAAQ,gBAAgB,QAAW;AACnC,YAAM,IAAI,oBAAoB,wDAAwD;AAAA,IAC1F;AACA,UAAM,EAAE,YAAY,IAAI,QAAQ;AAChC,SAAK,cAAc;AAAA,EACvB;AAAA,EAdiB;AAAA,EACT;AAAA,EAeR,IAAI,SAAS;AACT,WAAO,KAAK,oBAAoB;AAAA,EACpC;AAAA,EAEA,0BAA0B,WAAoB;AAC1C,QAAI,KAAK,uBAAuB,QAAW;AACvC,YAAM,IAAI;AAAA,QACN,aAAa;AAAA,MACjB;AAAA,IACJ;AACA,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA,EAGA,MAAc,uBAAuB;AACjC,QAAI,KAAK,uBAAuB,QAAW;AACvC,aAAO,KAAK;AAAA,IAChB;AAEA,UAAM,EAAE,4BAA4B,qBAAqB,aAA2B,IAAI,KAAK;AAE7F,QAAI;AACJ,QAAI,eAAe;AAEnB,QAAI;AACA,YAAM,cAAc,MAAM,KAAK,YAAY,KAAK,WAAW;AAC3D,qBAAe,CAAC,YAAY;AAC5B,mBAAa,YAAY;AAAA,IAC7B,QAAQ;AACJ,aAAO,MAAM,yCAAyC;AAAA,IAC1D;AAEA,UAAM,EAAE,UAAU,cAAc,IAAI,MAAM,2BAA2B;AAAA,MACjE,SAAS,KAAK,YAAY,IAAI,OAAO;AAAA,MACrC;AAAA,MACA;AAAA,MACA,GAAG,KAAK;AAAA,IACZ,CAAC;AAED,WAAO,MAAM,iBAAiB,yBAAyB;AAAA,MACnD,4BAA4B;AAAA,MAC5B;AAAA,MACA;AAAA,MACA,YAAY;AAAA,MACZ,kBAAkB,KAAK,QAAQ,aAAa;AAAA,IAChD,CAAC;AAAA,EACL;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,eACF,aACA,+BACF;AACE,UAAM,aAAa,KAAK,0BAA0B;AAElD,WAAO,MAAM,WAAW,WAAW,aAAa,EAAE,8BAA8B,CAAC;AAAA,EACrF;AAAA;AAAA,EAGA,MAAM,QAAQ;AACV,UAAM,KAAK,oBAAoB,MAAM;AACrC,SAAK,qBAAqB;AAAA,EAC9B;AAAA;AAAA,EAGA,MAAM,QAAQ;AACV,UAAM,UAAU,KAAK,YAAY;AACjC,YAAQ,IAAI,IAAI;AAChB,QAAI,KAAK,uBAAuB,QAAW;AACvC,WAAK,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,IAC9D;AAAA,EACJ;AAAA,EAEA,oCACI,gBACA,uBACF;AACE,UAAM,aAAa,KAAK,0BAA0B;AAClD,eACK,gBAAgB,qBAAqB,EACrC;AAAA,MAAQ,CAAC,YACN,oBAAoB,oCAAoC,SAAS,cAAc;AAAA,IACnF;AAAA,EACR;AAAA,EAEA,MAAM,8BACF,gBACA,uBACA,oBACA,UAAU,QAAQ,EAAE,GACtB;AACE,UAAM,aAAa,KAAK,0BAA0B;AAClD,WAAO,MAAM,oBAAoB;AAAA,MAC7B,WAAW,gBAAgB,qBAAqB;AAAA,MAChD;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,SAAsB,qBAAqB,QAAQ,eAAe;AAClE;AAAA,EAII;AAAA,EAGA;AAAA,OAEG;AAOP,SAAS,wBAAwB;AAEjC,MAAM,SAAS,IAAI,OAAO,kBAAkB;AAkBrC,MAAM,iBAAiB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAS1B,YAA6B,SAAkC;AAAlC;AACzB,QAAI,QAAQ,gBAAgB,QAAW;AACnC,YAAM,IAAI,oBAAoB,wDAAwD;AAAA,IAC1F;AACA,UAAM,EAAE,YAAY,IAAI,QAAQ;AAChC,SAAK,cAAc;AAAA,EACvB;AAAA,EAdiB;AAAA,EACT;AAAA,EAeR,IAAI,SAAS;AACT,WAAO,KAAK,oBAAoB;AAAA,EACpC;AAAA,EAEA,0BAA0B,WAAoB;AAC1C,QAAI,KAAK,uBAAuB,QAAW;AACvC,YAAM,IAAI;AAAA,QACN,aAAa;AAAA,MACjB;AAAA,IACJ;AACA,WAAO,KAAK;AAAA,EAChB;AAAA;AAAA,EAGA,MAAc,uBAAuB;AACjC,QAAI,KAAK,uBAAuB,QAAW;AACvC,aAAO,KAAK;AAAA,IAChB;AAEA,UAAM,EAAE,4BAA4B,qBAAqB,aAA2B,IAAI,KAAK;AAE7F,QAAI;AACA,YAAM,KAAK,YAAY,KAAK,WAAW;AAAA,IAC3C,QAAQ;AACJ,aAAO,MAAM,yCAAyC;AAAA,IAC1D;AAEA,WAAO,MAAM,iBAAiB,yBAAyB;AAAA,MACnD,IAAI;AAAA;AAAA,MACJ,aAAa,KAAK;AAAA,MAClB,4BAA4B;AAAA,MAC5B;AAAA,MACA,kBAAkB,KAAK,QAAQ,aAAa;AAAA,IAChD,CAAC;AAAA,EACL;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,MAAM,eACF,aACA,+BACF;AACE,UAAM,aAAa,KAAK,0BAA0B;AAElD,WAAO,MAAM,WAAW,WAAW,aAAa,EAAE,8BAA8B,CAAC;AAAA,EACrF;AAAA;AAAA,EAGA,MAAM,QAAQ;AACV,UAAM,KAAK,oBAAoB,MAAM;AACrC,SAAK,qBAAqB;AAAA,EAC9B;AAAA;AAAA,EAGA,MAAM,QAAQ;AACV,UAAM,UAAU,KAAK,YAAY;AACjC,YAAQ,IAAI,IAAI;AAChB,QAAI,KAAK,uBAAuB,QAAW;AACvC,WAAK,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,IAC9D;AAAA,EACJ;AAAA,EAEA,oCACI,gBACA,uBACF;AACE,UAAM,aAAa,KAAK,0BAA0B;AAClD,eACK,gBAAgB,qBAAqB,EACrC;AAAA,MAAQ,CAAC,YACN,oBAAoB,oCAAoC,SAAS,cAAc;AAAA,IACnF;AAAA,EACR;AAAA,EAEA,MAAM,8BACF,gBACA,uBACA,oBACA,UAAU,QAAQ,EAAE,GACtB;AACE,UAAM,aAAa,KAAK,0BAA0B;AAClD,WAAO,MAAM,oBAAoB;AAAA,MAC7B,WAAW,gBAAgB,qBAAqB;AAAA,MAChD;AAAA,MACA;AAAA,MACA;AAAA,IACJ;AAAA,EACJ;AACJ;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@project-chip/matter.js",
-    "version": "0.16.0-alpha.0-20251020-3f6e46245",
+    "version": "0.16.0-alpha.0-20251022-5a69ce65a",
     "description": "Matter protocol in pure js",
     "keywords": [
         "iot",
@@ -44,15 +44,15 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.16.0-alpha.0-20251020-3f6e46245",
-        "@matter/model": "0.16.0-alpha.0-20251020-3f6e46245",
-        "@matter/node": "0.16.0-alpha.0-20251020-3f6e46245",
-        "@matter/protocol": "0.16.0-alpha.0-20251020-3f6e46245",
-        "@matter/types": "0.16.0-alpha.0-20251020-3f6e46245"
+        "@matter/general": "0.16.0-alpha.0-20251022-5a69ce65a",
+        "@matter/model": "0.16.0-alpha.0-20251022-5a69ce65a",
+        "@matter/node": "0.16.0-alpha.0-20251022-5a69ce65a",
+        "@matter/protocol": "0.16.0-alpha.0-20251022-5a69ce65a",
+        "@matter/types": "0.16.0-alpha.0-20251022-5a69ce65a"
     },
     "devDependencies": {
-        "@matter/tools": "0.16.0-alpha.0-20251020-3f6e46245",
-        "@matter/testing": "0.16.0-alpha.0-20251020-3f6e46245"
+        "@matter/tools": "0.16.0-alpha.0-20251022-5a69ce65a",
+        "@matter/testing": "0.16.0-alpha.0-20251022-5a69ce65a"
     },
     "files": [
         "dist/**/*",

package/src/CommissioningController.ts

@@ -8,22 +8,20 @@ import { OperationalCredentials } from "#clusters";
 import { ControllerStore } from "#ControllerStore.js";
 import {
     ClassExtends,
-    ConnectionlessTransportSet,
     Crypto,
     Environment,
     ImplementationError,
     InternalError,
     Logger,
     Minutes,
-    Network,
-    NoAddressAvailableError,
     StorageContext,
-    UdpInterface,
     UnexpectedDataError,
 } from "#general";
 import { LegacyControllerStore } from "#LegacyControllerStore.js";
 import {
+    ActiveSessionInformation,
     Ble,
+    CertificateAuthority,
     CommissionableDevice,
     CommissionableDeviceIdentifiers,
     ControllerCommissioningFlow,
@@ -31,14 +29,11 @@ import {
     DecodedAttributeReportValue,
     DiscoveryAndCommissioningOptions,
     DiscoveryData,
+    Fabric,
+    FabricGroups,
     InteractionClient,
-    MdnsAdvertiser,
-    MdnsClient,
-    MdnsServer,
-    MdnsService,
     MessageChannel,
     NodeDiscoveryType,
-    ScannerSet,
 } from "#protocol";
 import {
     CaseAuthenticatedTag,
@@ -49,7 +44,6 @@ import {
     TypeFromPartialBitSchema,
     VendorId,
 } from "#types";
-import { CertificateAuthority, Fabric, MdnsScannerTargetCriteria } from "@matter/protocol";
 import { CommissioningControllerNodeOptions, NodeStates, PairedNode } from "./device/PairedNode.js";
 import { MatterController } from "./MatterController.js";
 
@@ -163,20 +157,16 @@ export class CommissioningController {
     readonly #listeningAddressIpv6?: string;
 
     readonly #options: CommissioningControllerOptions;
+    #id: string;
 
     #environment: Environment; // Set when new API was initialized correctly
     #storage?: StorageContext;
 
-    #mdnsClient?: MdnsClient;
-    #mdnsServer?: MdnsServer;
-
     #controllerInstance?: MatterController;
     readonly #initializedNodes = new Map<NodeId, PairedNode>();
     readonly #nodeUpdateLabelHandlers = new Map<NodeId, (nodeState: NodeStates) => Promise<void>>();
     readonly #sessionDisconnectedHandler = new Map<NodeId, () => Promise<void>>();
 
-    #mdnsTargetCriteria?: MdnsScannerTargetCriteria;
-
     /**
      * Creates a new CommissioningController instance
      *
@@ -189,6 +179,7 @@ export class CommissioningController {
 
         const { environment, id } = options.environment;
         this.#environment = new Environment(id, environment);
+        this.#id = id;
 
         this.#options = options;
         this.#crypto = this.#environment.get(Crypto);
@@ -216,10 +207,10 @@ export class CommissioningController {
     }
 
     #assertDependencies() {
-        if (this.#mdnsClient === undefined || (this.#storage === undefined && this.#environment === undefined)) {
+        if (this.#storage === undefined && this.#environment === undefined) {
             throw new ImplementationError("Add the node to the Matter instance before.");
         }
-        return { mdnsClient: this.#mdnsClient, storage: this.#storage, environment: this.#environment };
+        return { storage: this.#storage, environment: this.#environment };
     }
 
     #assertControllerIsStarted(errorText?: string) {
@@ -248,7 +239,7 @@ export class CommissioningController {
             rootFabric,
         } = this.#options;
 
-        const { mdnsClient, storage, environment } = this.#assertDependencies();
+        const { storage, environment } = this.#assertDependencies();
 
         // Initialize the Storage in a compatible way for the legacy API and new style for new API
         // TODO: clean this up when we really implement ControllerNode/ClientNode concepts in new API
@@ -256,20 +247,9 @@ export class CommissioningController {
             ? environment.get(ControllerStore)
             : new LegacyControllerStore(storage!);
 
-        const { netInterfaces, scanners, port } = await configureNetwork({
-            network: environment?.maybeGet(Network) ?? Environment.default.get(Network),
-            ble: environment?.maybeGet(Ble) ?? Environment.default.maybeGet(Ble),
-            ipv4Disabled: this.#ipv4Disabled,
-            mdnsClient,
-            localPort,
-            listeningAddressIpv4: this.#listeningAddressIpv4,
-            listeningAddressIpv6: this.#listeningAddressIpv6,
-        });
-
         const controller = await MatterController.create({
+            id: this.#id,
             controllerStore,
-            scanners,
-            transports: netInterfaces,
             sessionClosedCallback: peerNodeId => {
                 logger.info(`Session for peer node ${peerNodeId} disconnected ...`);
                 const handler = this.#sessionDisconnectedHandler.get(peerNodeId);
@@ -285,9 +265,16 @@ export class CommissioningController {
             rootNodeId,
             rootCertificateAuthority,
             rootFabric,
+            ble: !!(environment?.maybeGet(Ble) ?? Environment.default.maybeGet(Ble)),
+            ipv4: !this.#ipv4Disabled,
+            listeningAddressIpv4: this.#listeningAddressIpv4,
+            listeningAddressIpv6: this.#listeningAddressIpv6,
+            localPort,
+            environment: this.#environment,
         });
-        if (this.#mdnsServer) {
-            controller.addAdvertiser(new MdnsAdvertiser(this.#crypto, this.#mdnsServer, { port }));
+
+        if (!controller.ble) {
+            logger.warn("BLE is not enabled on this platform");
         }
         return controller;
     }
@@ -486,26 +473,6 @@ export class CommissioningController {
         return Array.from(this.#initializedNodes.values());
     }
 
-    /**
-     * Set the MDNS Scanner instance. Should be only used internally
-     *
-     * @param mdnsServer MdnsScanner instance
-     * @private
-     */
-    setMdnsClient(mdnsServer: MdnsClient) {
-        this.#mdnsClient = mdnsServer;
-    }
-
-    /**
-     * Set the MDNS Broadcaster instance. Should be only used internally
-     *
-     * @param mdnsServer MdnsBroadcaster instance
-     * @private
-     */
-    setMdnsServer(mdnsServer: MdnsServer) {
-        this.#mdnsServer = mdnsServer;
-    }
-
     /** Returns true if t least one node is commissioned/paired with this controller instance. */
     isCommissioned() {
         const controller = this.#assertControllerIsStarted();
@@ -572,10 +539,6 @@ export class CommissioningController {
         }
         await this.#controllerInstance?.close();
 
-        if (this.#mdnsClient !== undefined && this.#mdnsTargetCriteria !== undefined) {
-            this.#mdnsClient.targetCriteriaProviders.delete(this.#mdnsTargetCriteria);
-        }
-
         this.#controllerInstance = undefined;
         this.#initializedNodes.clear();
         this.#ipv4Disabled = undefined;
@@ -622,12 +585,6 @@ export class CommissioningController {
                 await this.initializeControllerStore();
             }
 
-            // Load the MDNS service from the environment and set onto the controller
-            const mdnsService = await env.load(MdnsService);
-            this.#ipv4Disabled = !mdnsService.enableIpv4;
-            this.setMdnsServer(mdnsService.server);
-            this.setMdnsClient(mdnsService.client);
-
             this.#environment = env;
             const runtime = env.runtime;
             runtime.add(this);
@@ -638,17 +595,7 @@ export class CommissioningController {
             this.#controllerInstance = await this.#initializeController();
         }
 
-        this.#mdnsTargetCriteria = {
-            commissionable: true,
-            operationalTargets: [
-                {
-                    operationalId: this.#controllerInstance.fabricConfig.operationalId,
-                },
-            ],
-        };
-        this.#mdnsClient?.targetCriteriaProviders.add(this.#mdnsTargetCriteria);
-
-        this.#controllerInstance.announce();
+        await this.#controllerInstance.start();
         if (this.#options.autoConnect !== false && this.#controllerInstance.isCommissioned()) {
             await this.connect();
         }
@@ -709,7 +656,7 @@ export class CommissioningController {
     }
 
     /** Returns active session information for all connected nodes. */
-    getActiveSessionInformation() {
+    getActiveSessionInformation(): ActiveSessionInformation[] {
         return this.#controllerInstance?.getActiveSessionInformation() ?? [];
     }
 
@@ -791,59 +738,8 @@ export class CommissioningController {
         }
     }
 
-    get groups() {
+    get groups(): FabricGroups {
         const controllerInstance = this.#assertControllerIsStarted();
         return controllerInstance.getFabrics()[0].groups;
     }
 }
-
-export async function configureNetwork(options: {
-    network: Network;
-    ble?: Ble;
-    ipv4Disabled?: boolean;
-    mdnsClient?: MdnsClient;
-    localPort?: number;
-    listeningAddressIpv6?: string;
-    listeningAddressIpv4?: string;
-}) {
-    const { network, ble, ipv4Disabled, mdnsClient, localPort, listeningAddressIpv6, listeningAddressIpv4 } = options;
-
-    const netInterfaces = new ConnectionlessTransportSet();
-    const scanners = new ScannerSet();
-
-    let udpInterface: UdpInterface;
-    try {
-        udpInterface = await UdpInterface.create(network, "udp6", localPort, listeningAddressIpv6);
-        netInterfaces.add(udpInterface);
-    } catch (error) {
-        NoAddressAvailableError.accept(error);
-        logger.info(`IPv6 UDP interface not created because IPv6 is not available, but required my Matter.`);
-        throw error;
-    }
-
-    if (!ipv4Disabled) {
-        // TODO: Add option to transport different ports to broadcaster
-        try {
-            netInterfaces.add(await UdpInterface.create(network, "udp4", udpInterface.port, listeningAddressIpv4));
-        } catch (error) {
-            NoAddressAvailableError.accept(error);
-            logger.info(`IPv4 UDP interface not created because IPv4 is not available`);
-        }
-    }
-    if (mdnsClient) {
-        scanners.add(mdnsClient);
-    }
-
-    if (ble === undefined) {
-        logger.warn("BLE is not supported on this platform");
-    } else {
-        try {
-            netInterfaces.add(ble.centralInterface);
-            scanners.add(ble.scanner);
-        } catch (e) {
-            logger.error("Disabling BLE due to initialization error:", e);
-        }
-    }
-
-    return { netInterfaces, scanners, port: udpInterface.port };
-}