@matter/node 0.15.1 → 0.15.2-alpha.0-20250704-2715344f0

package/dist/cjs/behavior/state/managed/values/StructManager.js

@@ -134,8 +134,21 @@ function configureProperty(supervisor, schema) {
     enumerable: true,
     set(value) {
       access.authorizeWrite(this[import_Internal.Internal.session], this[import_Internal.Internal.reference].location);
-      let storedKey = name in this[import_Internal.Internal.reference].value ? name : id !== void 0 && id in this[import_Internal.Internal.reference] ? id : name;
-      const oldValue = this[import_Internal.Internal.reference].value[storedKey];
+      const pk = this[import_Internal.Internal.reference].primaryKey;
+      let key = pk === "id" ? id ?? name : name;
+      let storedKey;
+      if (key in this[import_Internal.Internal.reference].value) {
+        storedKey = key;
+      } else if (pk === "id") {
+        if (name in this[import_Internal.Internal.reference].value) {
+          storedKey = name;
+        }
+      } else if (id !== void 0) {
+        if (id in this[import_Internal.Internal.reference].value) {
+          storedKey = id;
+        }
+      }
+      const oldValue = storedKey === void 0 ? void 0 : this[import_Internal.Internal.reference].value[storedKey];
       const self = this;
       this[import_Internal.Internal.reference].change(() => {
         const struct = this[import_Internal.Internal.reference].value;
@@ -146,7 +159,7 @@ function configureProperty(supervisor, schema) {
             this[import_Internal.Internal.session]
           );
           if (name in properties) {
-            storedKey = name;
+            key = storedKey = name;
             target = properties;
           } else {
             target = struct;
@@ -157,14 +170,17 @@ function configureProperty(supervisor, schema) {
         if (value && value[import_Internal.Internal.reference]) {
           value = value[import_Internal.Internal.reference].value;
         }
-        if (fabricScopedList && Array.isArray(value) && Array.isArray(target[storedKey])) {
+        if (fabricScopedList && Array.isArray(value) && Array.isArray(oldValue)) {
           const proxy = self[name];
           for (let i = 0; i < value.length; i++) {
             proxy[i] = value[i];
           }
           proxy.length = value.length;
         } else {
-          target[storedKey] = value;
+          target[key] = value;
+          if (storedKey !== void 0 && storedKey !== key) {
+            delete target[storedKey];
+          }
         }
         if (!this[import_Internal.Internal.session].acceptInvalid && validate) {
           try {
@@ -173,7 +189,7 @@ function configureProperty(supervisor, schema) {
               siblings: struct
             });
           } catch (e) {
-            target[storedKey] = oldValue;
+            target[key] = oldValue;
             throw e;
           }
         }
@@ -196,11 +212,15 @@ function configureProperty(supervisor, schema) {
             return properties[name];
           }
         }
-        const value = struct[name];
-        if (value !== void 0 || id === void 0) {
-          return value;
+        const key = this[import_Internal.Internal.reference].primaryKey === "id" ? id ?? name : name;
+        if (key in struct) {
+          return struct[key];
         }
-        return struct[id];
+        const key2 = this[import_Internal.Internal.reference].primaryKey === "id" ? name : id;
+        if (key2 !== void 0 && key2 in struct) {
+          return struct[key2];
+        }
+        return void 0;
       }
     };
   } else {
@@ -222,7 +242,9 @@ function configureProperty(supervisor, schema) {
     }
     descriptor.get = function() {
       let value;
+      const pk = this[import_Internal.Internal.reference].primaryKey;
       const struct = this[import_Internal.Internal.reference].value;
+      const key = pk === "id" ? id ?? name : name;
       if (struct[import_protocol.Val.properties]) {
         const properties = struct[import_protocol.Val.properties](
           this[import_Internal.Internal.reference].rootOwner,
@@ -234,9 +256,13 @@ function configureProperty(supervisor, schema) {
           value = struct[name];
         }
       } else {
-        value = struct[name];
-        if (value === void 0 && id !== void 0) {
-          value = struct[id];
+        if (key in struct) {
+          value = struct[key];
+        } else {
+          const key2 = pk === "id" ? id : name;
+          if (key2 !== void 0 && key2 in struct) {
+            value = struct[key2];
+          }
         }
       }
       if (!access.mayRead(this[import_Internal.Internal.session], this[import_Internal.Internal.reference].location)) {
@@ -261,7 +287,7 @@ function configureProperty(supervisor, schema) {
           });
         }
       };
-      const ref = (0, import_ManagedReference.ManagedReference)(this[import_Internal.Internal.reference], name, assertWriteOk, cloneContainer);
+      const ref = (0, import_ManagedReference.ManagedReference)(this[import_Internal.Internal.reference], pk, name, id, assertWriteOk, cloneContainer);
       ref.owner = manage(ref, this[import_Internal.Internal.session]);
       return ref.owner;
     };

package/dist/cjs/behavior/state/managed/values/StructManager.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../../src/behavior/state/managed/values/StructManager.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["name", "StructManager", "value"]
 }

package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Behavior } from "#behavior/Behavior.js";
-import { ServerAddress } from "#general";
+import { Events as BaseEvents } from "#behavior/Events.js";
+import { Observable, ServerAddress } from "#general";
 import { DatatypeModel } from "#model";
 import type { ClientNode } from "#node/ClientNode.js";
-import { CommissioningMode, DiscoveryData, Fabric, FabricAuthority, PeerAddress, SessionParameters } from "#protocol";
+import { CommissioningMode, DiscoveryData, Fabric, FabricAuthority, PeerAddress, SessionParameters, Subscribe } from "#protocol";
 import { DeviceTypeId, DiscoveryCapabilitiesBitmap, NodeId, TypeFromPartialBitSchema, VendorId } from "#types";
 import { RemoteDescriptor } from "./RemoteDescriptor.js";
 /**
@@ -18,6 +19,7 @@ import { RemoteDescriptor } from "./RemoteDescriptor.js";
 export declare class CommissioningClient extends Behavior {
     #private;
     state: CommissioningClient.State;
+    events: CommissioningClient.Events;
     static readonly early = true;
     static readonly id = "commissioning";
     initialize(options: {
@@ -25,11 +27,20 @@ export declare class CommissioningClient extends Behavior {
     }): void;
     commission(passcode: number): Promise<ClientNode>;
     commission(options: CommissioningClient.CommissioningOptions): Promise<ClientNode>;
+    /**
+     * Remove this node from the fabric.
+     *
+     * After removal the {@link ClientNode} remains intact.  You can use {@link ClientNode#delete} to remove the node
+     * permanently.
+     *
+     * Only legal if this node controls the peer's fabric.
+     */
+    decommission(): Promise<void>;
     /**
      * Override to implement CASE commissioning yourself.
      *
-     * If you override, matter.js commissions to the point where over PASE is complete.  You must then complete
-     * commissioning yourself by connecting to the device and invokeint the "CommissioningComplete" command.
+     * If you override, matter.js commissions to the point where commissioning over PASE is complete.  You must then
+     * complete commissioning yourself by connecting to the device and invokeint the "CommissioningComplete" command.
      */
     protected finalizeCommissioning(_address: PeerAddress, _discoveryData?: DiscoveryData): Promise<void>;
     get descriptor(): RemoteDescriptor | undefined;
@@ -53,7 +64,7 @@ export declare namespace CommissioningClient {
         /**
          * Time at which the device was discovered.
          */
-        discoveredAt: number;
+        discoveredAt?: number;
         /**
          * Time at which we discovered the device's current operational addresses.
          */
@@ -119,20 +130,19 @@ export declare namespace CommissioningClient {
          */
         longIdleTimeOperatingMode?: boolean;
     }
+    class Events extends BaseEvents {
+        peerAddress$Changed: Observable<[value: PeerAddress | undefined, oldValue: PeerAddress | undefined], void>;
+    }
     /**
      * Options that control commissioning.
      */
-    interface CommissioningOptions {
-        /**
-         * The device's passcode.
-         */
-        passcode: number;
+    interface BaseCommissioningOptions {
         /**
          * The ID to assign the node during commissioning.  By default the node receives the next available ID.
          */
         nodeId?: NodeId;
         /**
-         * The fabric the joins upon commissioning.  Defaults to the default fabric of the assigned
+         * The fabric the node joins upon commissioning.  Defaults to the default fabric of the assigned
          * {@link FabricAuthority}.
          */
         fabric?: Fabric;
@@ -146,6 +156,47 @@ export declare namespace CommissioningClient {
          * is supported for initial commissioning.
          */
         discoveryCapabilities?: TypeFromPartialBitSchema<typeof DiscoveryCapabilitiesBitmap>;
+        /**
+         * The initial read used to populate node data.
+         *
+         * By default matter.js reads all attributes on the node.  This allows us to efficiently initialize the complete
+         * node structure.
+         *
+         * If you only require a subset of attributes you can replace this with a more discriminative read.  For
+         * example, if you are only interested in interacting with the root endpoint and the On/Off cluster on other
+         * endpoints, you could do:
+         *
+         * ```js
+         * {
+         *     startupSubscription: Read(
+         *         Read.Attribute({ endpoint: 0 }),
+         *         Read.Attribute({ cluster: OnOffCluster })
+         *     )
+         * }
+         * ```
+         *
+         * Note that certain clusters like Descriptor and Basic Information contain critical operational data. If your
+         * read omits them then the node will only be partially functional once initialized.
+         */
+        startupSubscription?: Subscribe | null;
+    }
+    interface PasscodeOptions extends BaseCommissioningOptions {
+        /**
+         * The device's passcode.
+         */
+        passcode: number;
+        /**
+         * The device's long discriminator.
+         */
+        discriminator?: number;
+    }
+    interface PairingCodeOptions extends BaseCommissioningOptions {
+        /**
+         * The device's pairing code.
+         */
+        pairingCode: string;
     }
+    type CommissioningOptions = PasscodeOptions | PairingCodeOptions;
+    function PasscodeOptions<T extends CommissioningOptions>(options: T): T & PasscodeOptions;
 }
 //# sourceMappingURL=CommissioningClient.d.ts.map

package/dist/cjs/behavior/system/commissioning/CommissioningClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CommissioningClient.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAA4C,UAAU,EAAE,aAAa,EAAQ,MAAM,UAAU,CAAC;AACrG,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EACH,iBAAiB,EAEjB,aAAa,EACb,MAAM,EACN,eAAe,EAGf,WAAW,EACX,iBAAiB,EACjB,SAAS,EACZ,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,YAAY,EACZ,2BAA2B,EAE3B,MAAM,EACN,wBAAwB,EACxB,QAAQ,EACX,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IACrC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IAE3C,gBAAyB,KAAK,QAAQ;IAEtC,gBAAyB,EAAE,mBAAmB;IACrC,UAAU,CAAC,OAAO,EAAE;QAAE,UAAU,CAAC,EAAE,gBAAgB,CAAA;KAAE;IAc9D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAEjD,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC;IAuFlF;;;;;;;OAOG;IACG,YAAY;IAclB;;;;;OAKG;cACa,qBAAqB,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,aAAa;IAI3F,IAAI,UAAU,IAIa,gBAAgB,GAAG,SAAS,CAFtD;IAED,IAAI,UAAU,CAAC,UAAU,EAAE,gBAAgB,GAAG,SAAS,EAEtD;IAiBD;;OAEG;IACH,gBAAyB,MAAM,gBA0D5B;CACN;AAED,yBAAiB,mBAAmB,CAAC;IACjC,MAAa,KAAK;QACd;;WAEG;QACH,WAAW,CAAC,EAAE,WAAW,CAAC;QAE1B;;;WAGG;QACH,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;QAE5B;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;QAEtB;;WAEG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC;QAElB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC;QAEb;;WAEG;QACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAE1B;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB;;WAEG;QACH,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;QAEtC;;WAEG;QACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;QAEpB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;QAEnB;;WAEG;QACH,UAAU,CAAC,EAAE,YAAY,CAAC;QAE1B;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAE5B;;WAEG;QACH,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB;;WAEG;QACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAE7B;;WAEG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAE/C;;WAEG;QACH,UAAU,CAAC,EAAE,MAAM,CAAC;QAEpB;;WAEG;QACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;KACvC;IAED,MAAa,MAAO,SAAQ,UAAU;QAClC,mBAAmB,wFAAyF;KAC/G;IAED;;OAEG;IACH,UAAiB,wBAAwB;QACrC;;WAEG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB;;;WAGG;QACH,MAAM,CAAC,EAAE,MAAM,CAAC;QAEhB;;;WAGG;QACH,eAAe,CAAC,EAAE,eAAe,CAAC;QAElC;;;WAGG;QACH,qBAAqB,CAAC,EAAE,wBAAwB,CAAC,OAAO,2BAA2B,CAAC,CAAC;QAErF;;;;;;;;;;;;;;;;;;;;;WAqBG;QACH,mBAAmB,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;KAC1C;IAED,UAAiB,eAAgB,SAAQ,wBAAwB;QAC7D;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;KAC1B;IAED,UAAiB,kBAAmB,SAAQ,wBAAwB;QAChE;;WAEG;QACH,WAAW,EAAE,MAAM,CAAC;KACvB;IAED,KAAY,oBAAoB,GAAG,eAAe,GAAG,kBAAkB,CAAC;IAExE,SAAgB,eAAe,CAAC,CAAC,SAAS,oBAAoB,EAAE,OAAO,EAAE,CAAC,uBAsBzE;CACJ"}

package/dist/cjs/behavior/system/commissioning/CommissioningClient.js

@@ -22,11 +22,15 @@ __export(CommissioningClient_exports, {
 });
 module.exports = __toCommonJS(CommissioningClient_exports);
 var import_Behavior = require("#behavior/Behavior.js");
+var import_Events = require("#behavior/Events.js");
+var import_operational_credentials = require("#behaviors/operational-credentials");
 var import_general = require("#general");
 var import_model = require("#model");
 var import_IdentityService = require("#node/server/IdentityService.js");
 var import_protocol = require("#protocol");
+var import_types = require("#types");
 var import_ControllerBehavior = require("../controller/ControllerBehavior.js");
+var import_NetworkClient = require("../network/NetworkClient.js");
 var import_RemoteDescriptor = require("./RemoteDescriptor.js");
 /**
  * @license
@@ -45,25 +49,29 @@ class CommissioningClient extends import_Behavior.Behavior {
       this.state.discoveredAt = import_general.Time.nowMs();
     }
     this.reactTo(this.endpoint.lifecycle.partsReady, this.#initializeNode);
+    this.reactTo(this.events.peerAddress$Changed, this.#peerAddressChanged);
   }
   async commission(options) {
-    if (typeof options !== "object") {
+    const node = this.endpoint;
+    if (this.state.peerAddress !== void 0) {
+      throw new import_general.ImplementationError(`${node} is already commissioned`);
+    }
+    if (typeof options === "number") {
       options = { passcode: options };
+    } else if (typeof options === "string") {
+      options = { pairingCode: options };
     }
-    let { passcode } = options;
+    const opts = CommissioningClient.PasscodeOptions(options);
+    let { passcode } = opts;
     if (typeof passcode !== "number" || Number.isNaN(passcode)) {
       passcode = Number.parseInt(passcode);
       if (Number.isNaN(passcode)) {
         throw new import_general.ImplementationError(`You must provide the numeric passcode to commission a node`);
       }
     }
-    const node = this.endpoint;
-    if (this.state.peerAddress !== void 0) {
-      throw new import_general.ImplementationError(`${node} is already commissioned`);
-    }
-    await this.endpoint.owner?.act((agent) => agent.load(import_ControllerBehavior.ControllerBehavior));
-    const fabricAuthority = options.fabricAuthority || this.env.get(import_protocol.FabricAuthority);
-    let { fabric } = options;
+    await node.owner?.act((agent) => agent.load(import_ControllerBehavior.ControllerBehavior));
+    const fabricAuthority = opts.fabricAuthority || this.env.get(import_protocol.FabricAuthority);
+    let { fabric } = opts;
     if (fabric === void 0) {
       if (this.context.fabric === void 0) {
         fabric = await fabricAuthority.defaultFabric();
@@ -80,9 +88,9 @@ class CommissioningClient extends import_Behavior.Behavior {
     if (!addresses?.length) {
       throw new import_general.ImplementationError(`Cannot commission ${node} because the node has not been located`);
     }
-    const commissioner = this.endpoint.env.get(import_protocol.ControllerCommissioner);
-    const identityService = this.endpoint.env.get(import_IdentityService.IdentityService);
-    const address = identityService.assignNodeAddress(node, fabric.fabricIndex, options.nodeId);
+    const commissioner = node.env.get(import_protocol.ControllerCommissioner);
+    const identityService = node.env.get(import_IdentityService.IdentityService);
+    const address = identityService.assignNodeAddress(node, fabric.fabricIndex, opts.nodeId);
     const commissioningOptions = {
       addresses,
       fabric,
@@ -96,18 +104,39 @@ class CommissioningClient extends import_Behavior.Behavior {
     try {
       await commissioner.commission(commissioningOptions);
       this.state.peerAddress = address;
-    } finally {
-      if (this.state.peerAddress !== address) {
-        identityService.releaseNodeAddress(address);
-      }
+    } catch (e) {
+      identityService.releaseNodeAddress(address);
+      throw e;
     }
+    await this.context.transaction.commit();
+    const network = this.agent.get(import_NetworkClient.NetworkClient);
+    network.state.startupSubscription = opts.startupSubscription;
+    node.lifecycle.commissioned.emit(this.context);
+    await node.start();
     return node;
   }
+  /**
+   * Remove this node from the fabric.
+   *
+   * After removal the {@link ClientNode} remains intact.  You can use {@link ClientNode#delete} to remove the node
+   * permanently.
+   *
+   * Only legal if this node controls the peer's fabric.
+   */
+  async decommission() {
+    const { peerAddress } = this.state;
+    if (peerAddress === void 0) {
+      throw new import_general.ImplementationError("Cannot decommission node that is not commissioned");
+    }
+    const opcreds = this.agent.get(import_operational_credentials.OperationalCredentialsClient);
+    await opcreds.removeFabric({ fabricIndex: opcreds.state.currentFabricIndex });
+    this.state.peerAddress = void 0;
+  }
   /**
    * Override to implement CASE commissioning yourself.
    *
-   * If you override, matter.js commissions to the point where over PASE is complete.  You must then complete
-   * commissioning yourself by connecting to the device and invokeint the "CommissioningComplete" command.
+   * If you override, matter.js commissions to the point where commissioning over PASE is complete.  You must then
+   * complete commissioning yourself by connecting to the device and invokeint the "CommissioningComplete" command.
    */
   async finalizeCommissioning(_address, _discoveryData) {
     throw new import_general.NotImplementedError();
@@ -122,6 +151,14 @@ class CommissioningClient extends import_Behavior.Behavior {
     const endpoint = this.endpoint;
     endpoint.lifecycle.initialized.emit(this.state.peerAddress !== void 0);
   }
+  #peerAddressChanged(addr) {
+    const node = this.endpoint;
+    if (addr) {
+      node.lifecycle.commissioned.emit(this.context);
+    } else {
+      node.lifecycle.decommissioned.emit(this.context);
+    }
+  }
   /**
    * Define logical schema.  This enables runtime validation, make fields persistent and makes subfields editable.
    */
@@ -198,7 +235,7 @@ class CommissioningClient extends import_Behavior.Behavior {
     /**
      * Time at which the device was discovered.
      */
-    discoveredAt = import_general.Time.nowMs();
+    discoveredAt;
     /**
      * Time at which we discovered the device's current operational addresses.
      */
@@ -265,5 +302,30 @@ class CommissioningClient extends import_Behavior.Behavior {
     longIdleTimeOperatingMode;
   }
   CommissioningClient2.State = State;
+  class Events extends import_Events.Events {
+    peerAddress$Changed = new import_general.Observable();
+  }
+  CommissioningClient2.Events = Events;
+  function PasscodeOptions(options) {
+    let opts;
+    if ("pairingCode" in options) {
+      const decoded = import_types.ManualPairingCodeCodec.decode(options.pairingCode);
+      opts = {
+        ...options,
+        ...decoded
+      };
+    } else {
+      opts = options;
+    }
+    let { passcode } = opts;
+    if (typeof passcode !== "number" || Number.isNaN(passcode)) {
+      passcode = Number.parseInt(passcode);
+      if (Number.isNaN(passcode)) {
+        throw new import_general.ImplementationError("You must provide a pairing code or passcode to pair a node");
+      }
+    }
+    return opts;
+  }
+  CommissioningClient2.PasscodeOptions = PasscodeOptions;
 })(CommissioningClient || (CommissioningClient = {}));
 //# sourceMappingURL=CommissioningClient.js.map

package/dist/cjs/behavior/system/commissioning/CommissioningClient.js.map

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

package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Endpoint } from "#endpoint/Endpoint.js";
-import { AsyncObservable, EventEmitter, Observable } from "#general";
+import { AsyncObservable, EventEmitter, Mutex, Observable } from "#general";
 import { DatatypeModel } from "#model";
 import { ExposedFabricInformation, FabricAction, Val } from "#protocol";
 import { CommissioningFlowType, FabricIndex } from "#types";
@@ -23,17 +23,26 @@ export declare class CommissioningServer extends Behavior {
     internal: CommissioningServer.Internal;
     static early: boolean;
     initialize(): void;
-    [Symbol.asyncDispose](): void;
+    [Symbol.asyncDispose](): Promise<void>;
     handleFabricChange(fabricIndex: FabricIndex, fabricAction: FabricAction): void;
     /**
-     * The server invokes this method when the node is active but not yet commissioned unless you set
-     * {@link CommissioningServer.State#enabled} to false.
-     *
      * An uncommissioned node is not yet associated with fabrics.  It cannot be used until commissioned by a controller.
      *
+     * The server normally invokes this method when the node starts and is not yet commissioned.  You can disable by
+     * setting {@link CommissioningServer.State#enabled} to false.  Then you must invoke yourself.
+     */
+    enterCommissionableMode(): void;
+    /**
+     * The server invokes this method when the node starts and is already commissioned, or immediately after
+     * commissioning.
+     */
+    protected enterOperationalMode(): void;
+    /**
+     * Display instructions on commissioning the device.
+     *
      * The default implementation logs the QR code and credentials.
      */
-    initiateCommissioning(): void;
+    protected initiateCommissioning(): void;
     /**
      * Obtain pairing codes for a node.
      */
@@ -45,6 +54,11 @@ export declare class CommissioningServer extends Behavior {
      * Define logical schema to make passcode and discriminator persistent.
      */
     static readonly schema: DatatypeModel;
+    /**
+     * Advertise and continue advertising at regular intervals until timeout per Matter specification.  If already
+     * advertising, the advertisement timeout resets.
+     */
+    beginAdvertising(): void;
 }
 export declare namespace CommissioningServer {
     interface PairingCodes {
@@ -53,6 +67,15 @@ export declare namespace CommissioningServer {
     }
     class Internal {
         unregisterFailsafeListener?: () => void;
+        /**
+         * We use this to synchronize internal state transitions that would otherwise have race conditions due to the
+         * large number of asynchronous calls.
+         */
+        mutex: Mutex;
+        /**
+         * Passed to the mutex for error handling purposes
+         */
+        name: string;
     }
     class State {
         enabled?: boolean;

package/dist/cjs/behavior/system/commissioning/CommissioningServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommissioningServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACH,eAAe,EAGf,YAAY,EAKZ,UAAU,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAIrD,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAA8C,GAAG,EAAE,MAAM,WAAW,CAAC;AACpH,OAAO,EACH,qBAAqB,EAGrB,WAAW,EAId,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAM/D;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IAC7C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IACnC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,CAAC;IAE/C,OAAgB,KAAK,UAAQ;IAEpB,UAAU;IAgBV,CAAC,MAAM,CAAC,YAAY,CAAC;IAI9B,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY;IA6FvE;;;;;;;OAOG;IACH,qBAAqB;IAoBrB;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ;;;;IA0BrC;;OAEG;IACH,gBAAyB,MAAM,gBAQ5B;CAYN;AAED,yBAAiB,mBAAmB,CAAC;IACjC,UAAiB,YAAY;QACzB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;KACzB;IAED,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAa;KACvD;IAED,MAAa,KAAK;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,UAAS;QACrB,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAM;QAC5D,QAAQ,SAAM;QACd,aAAa,SAAM;QACnB,QAAQ,wBAAkC;QAC1C,8BAA8B,CAAC,EAAE,UAAU,CAAa;QACxD,YAAY,EAAS,YAAY,CAAC;QAElC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,QAAQ;;;;;;;KAkBtC;IAED,MAAa,MAAO,SAAQ,YAAY;QACpC,YAAY,6CAA0C;QACtD,cAAc,6CAA0C;QACxD,cAAc,qEAAkE;QAChF,eAAe,kDAA+C;KACjE;CACJ"}
+{"version":3,"file":"CommissioningServer.d.ts","sourceRoot":"","sources":["../../../../../src/behavior/system/commissioning/CommissioningServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACH,eAAe,EAGf,YAAY,EAKZ,KAAK,EACL,UAAU,EACb,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,aAAa,EAAgB,MAAM,QAAQ,CAAC;AAIrD,OAAO,EAIH,wBAAwB,EACxB,YAAY,EAIZ,GAAG,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EACH,qBAAqB,EAGrB,WAAW,EAId,MAAM,QAAQ,CAAC;AAGhB,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAO/D;;;;GAIG;AACH,qBAAa,mBAAoB,SAAQ,QAAQ;;IAC7C,gBAAyB,EAAE,mBAAmB;IAEtC,KAAK,EAAE,mBAAmB,CAAC,KAAK,CAAC;IACjC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAC;IACnC,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,CAAC;IAE/C,OAAgB,KAAK,UAAQ;IAEpB,UAAU;IA8BJ,CAAC,MAAM,CAAC,YAAY,CAAC;IAQpC,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY;IAgIvE;;;;;OAKG;IACH,uBAAuB;IAkBvB;;;OAGG;IACH,SAAS,CAAC,oBAAoB;IAI9B;;;;OAIG;IACH,SAAS,CAAC,qBAAqB;IAoB/B;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ;;;;IA0BrC;;OAEG;IACH,gBAAyB,MAAM,gBAQ5B;IAEH;;;OAGG;IACH,gBAAgB;CAqBnB;AAED,yBAAiB,mBAAmB,CAAC;IACjC,UAAiB,YAAY;QACzB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,aAAa,EAAE,MAAM,CAAC;KACzB;IAED,MAAa,QAAQ;QACjB,0BAA0B,CAAC,EAAE,MAAM,IAAI,CAAa;QAEpD;;;WAGG;QACH,KAAK,QAEF;QAEH;;WAEG;QACH,IAAI,SAAO;KACd;IAED,MAAa,KAAK;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,YAAY,UAAS;QACrB,OAAO,EAAE,MAAM,CAAC,WAAW,EAAE,wBAAwB,CAAC,CAAM;QAC5D,QAAQ,SAAM;QACd,aAAa,SAAM;QACnB,QAAQ,wBAAkC;QAC1C,8BAA8B,CAAC,EAAE,UAAU,CAAa;QACxD,YAAY,EAAS,YAAY,CAAC;QAElC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,QAAQ;;;;;;;KAkBtC;IAED,MAAa,MAAO,SAAQ,YAAY;QACpC,YAAY,6CAA0C;QACtD,cAAc,6CAA0C;QACxD,cAAc,qEAAkE;QAChF,eAAe,kDAA+C;KACjE;CACJ"}