@project-chip/matter.js 0.4.0 → 0.5.0

package/dist/es/MatterDevice.d.ts

@@ -4,33 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
- * Important note: This file is part of the legacy matter-node (internal) API and should not be used anymore!
+ * Important note: This file is part of the legacy matter-node (internal) API and should not be used anymore directly!
  * Please use the new API classes!
  * @deprecated
  */
-import { Session } from "./session/Session.js";
-import { ResumptionRecord } from "./session/SessionManager.js";
-import { Fabric } from "./fabric/Fabric.js";
-import { Channel } from "./net/Channel.js";
-import { NetInterface } from "./net/NetInterface.js";
-import { ProtocolHandler } from "./protocol/ProtocolHandler.js";
-import { Broadcaster } from "./common/Broadcaster.js";
+import { Channel } from "./common/Channel.js";
+import { InstanceBroadcaster } from "./common/InstanceBroadcaster.js";
 import { Scanner } from "./common/Scanner.js";
-import { VendorId } from "./datatype/VendorId.js";
+import { TransportInterface } from "./common/TransportInterface.js";
+import { DeviceTypeId } from "./datatype/DeviceTypeId.js";
 import { FabricIndex } from "./datatype/FabricIndex.js";
 import { NodeId } from "./datatype/NodeId.js";
+import { VendorId } from "./datatype/VendorId.js";
+import { Fabric } from "./fabric/Fabric.js";
+import { ProtocolHandler } from "./protocol/ProtocolHandler.js";
+import { Session } from "./session/Session.js";
+import { ResumptionRecord } from "./session/SessionManager.js";
+import { StorageContext } from "./storage/StorageContext.js";
 import { ByteArray } from "./util/ByteArray.js";
-import { StorageManager } from "./storage/StorageManager.js";
 export declare class MatterDevice {
     private readonly deviceName;
     private readonly deviceType;
     private readonly vendorId;
     private readonly productId;
     private readonly discriminator;
-    private readonly storageManager;
+    private readonly storage;
+    private readonly initialCommissioningCallback;
     private readonly scanners;
     private readonly broadcasters;
-    private readonly netInterfaces;
+    private readonly transportInterfaces;
     private readonly fabricManager;
     private readonly sessionManager;
     private readonly channelManager;
@@ -38,18 +40,20 @@ export declare class MatterDevice {
     private announceInterval;
     private announcementStartedTime;
     private commissioningWindowOpened;
-    constructor(deviceName: string, deviceType: number, vendorId: VendorId, productId: number, discriminator: number, storageManager: StorageManager);
+    private commissioningWindowTimeout?;
+    private isClosing;
+    constructor(deviceName: string, deviceType: DeviceTypeId, vendorId: VendorId, productId: number, discriminator: number, storage: StorageContext, initialCommissioningCallback: () => void);
     addScanner(scanner: Scanner): this;
-    addBroadcaster(broadcaster: Broadcaster): this;
-    addNetInterface(netInterface: NetInterface): this;
+    addBroadcaster(broadcaster: InstanceBroadcaster): this;
+    addTransportInterface(netInterface: TransportInterface): this;
     addProtocolHandler(protocol: ProtocolHandler<MatterDevice>): this;
     start(): Promise<void>;
-    startAnnouncement(): void;
-    announce(announceOnce?: boolean): void;
+    startAnnouncement(): Promise<void>;
+    announce(announceOnce?: boolean): Promise<void>;
     getNextAvailableSessionId(): any;
     createSecureSession(sessionId: number, fabric: Fabric | undefined, peerNodeId: NodeId, peerSessionId: number, sharedSecret: ByteArray, salt: ByteArray, isInitiator: boolean, isResumption: boolean, idleRetransTimeoutMs?: number, activeRetransTimeoutMs?: number): any;
     findFabricFromDestinationId(destinationId: ByteArray, peerRandom: ByteArray): any;
-    addFabric(fabric: Fabric): FabricIndex;
+    addFabric(fabric: Fabric): Promise<FabricIndex>;
     getFabricByIndex(fabricIndex: FabricIndex): any;
     initiateExchange(fabric: Fabric, nodeId: NodeId, protocolId: number): any;
     findResumptionRecordById(resumptionId: ByteArray): any;
@@ -59,11 +63,12 @@ export declare class MatterDevice {
     getFabrics(): any;
     completeCommission(): any;
     isCommissioned(): boolean;
-    openCommissioningModeWindow(mode: number, discriminator: number, timeout: number): void;
+    openCommissioningModeWindow(mode: number, discriminator: number | undefined, timeout: number): Promise<void>;
     findDevice(fabric: Fabric, nodeId: NodeId, timeOutSeconds?: number): Promise<undefined | {
         session: Session<MatterDevice>;
         channel: Channel<ByteArray>;
     }>;
     stop(): Promise<void>;
+    getActiveSessionInformation(): any;
 }
 //# sourceMappingURL=MatterDevice.d.ts.map

package/dist/es/MatterDevice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MatterDevice.d.ts","sourceRoot":"","sources":["../../src/MatterDevice.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAkB,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,qBAAa,YAAY;IAajB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAjBnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA4B;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;IACjC,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,uBAAuB,CAAsB;IACrD,OAAO,CAAC,yBAAyB,CAAS;gBAGrB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,cAAc;IAUnD,UAAU,CAAC,OAAO,EAAE,OAAO;IAK3B,cAAc,CAAC,WAAW,EAAE,WAAW;IAKvC,eAAe,CAAC,YAAY,EAAE,YAAY;IAM1C,kBAAkB,CAAC,QAAQ,EAAE,eAAe,CAAC,YAAY,CAAC;IAKpD,KAAK;IAQX,iBAAiB;IAMjB,QAAQ,CAAC,YAAY,UAAQ;IA2C7B,yBAAyB;IAIzB,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,oBAAoB,CAAC,EAAE,MAAM,EAAE,sBAAsB,CAAC,EAAE,MAAM;IAInQ,2BAA2B,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS;IAI3E,SAAS,CAAC,MAAM,EAAE,MAAM;IASxB,gBAAgB,CAAC,WAAW,EAAE,WAAW;IAIzC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAInE,wBAAwB,CAAC,YAAY,EAAE,SAAS;IAIhD,oBAAoB,CAAC,gBAAgB,EAAE,gBAAgB;IAIvD,WAAW;IAIX,gBAAgB;IAIhB,UAAU;IAIV,kBAAkB;IAKlB,cAAc;IAId,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAU1E,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,SAAI,GAAG,OAAO,CAAC,SAAS,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;KAAE,CAAC;IAWpJ,IAAI;CAMb"}
+{"version":3,"file":"MatterDevice.d.ts","sourceRoot":"","sources":["../../src/MatterDevice.ts"],"names":[],"mappings":"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"}

package/dist/es/MatterDevice.js

@@ -12,34 +12,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SessionManager } from "./session/SessionManager.js";
+import { InternalError } from "./common/MatterError.js";
 import { FabricManager } from "./fabric/FabricManager.js";
+import { Logger } from "./log/Logger.js";
+import { isNetworkInterface } from "./net/NetInterface.js";
+import { NetworkError } from "./net/Network.js";
 import { ChannelManager } from "./protocol/ChannelManager.js";
 import { ExchangeManager } from "./protocol/ExchangeManager.js";
-import { Logger } from "./log/Logger.js";
+import { SessionManager } from "./session/SessionManager.js";
 import { Time } from "./time/Time.js";
 const logger = Logger.get("MatterDevice");
 const DEVICE_ANNOUNCEMENT_DURATION = 15 * 60 * 1000; /** 15 minutes */
 const DEVICE_ANNOUNCEMENT_INTERVAL = 60 * 1000; /** 1 minute */
 export class MatterDevice {
-    constructor(deviceName, deviceType, vendorId, productId, discriminator, storageManager) {
+    constructor(deviceName, deviceType, vendorId, productId, discriminator, storage, initialCommissioningCallback) {
         this.deviceName = deviceName;
         this.deviceType = deviceType;
         this.vendorId = vendorId;
         this.productId = productId;
         this.discriminator = discriminator;
-        this.storageManager = storageManager;
+        this.storage = storage;
+        this.initialCommissioningCallback = initialCommissioningCallback;
         this.scanners = new Array();
         this.broadcasters = new Array();
-        this.netInterfaces = new Array();
+        this.transportInterfaces = new Array();
         this.channelManager = new ChannelManager();
-        this.announceInterval = null;
         this.announcementStartedTime = null;
         this.commissioningWindowOpened = false;
-        this.fabricManager = new FabricManager(this.storageManager);
-        this.sessionManager = new SessionManager(this, this.storageManager);
+        this.isClosing = false;
+        this.fabricManager = new FabricManager(this.storage);
+        this.sessionManager = new SessionManager(this, this.storage);
         this.sessionManager.initFromStorage(this.fabricManager.getFabrics());
         this.exchangeManager = new ExchangeManager(this.sessionManager, this.channelManager);
+        this.announceInterval = Time.getPeriodicTimer(DEVICE_ANNOUNCEMENT_INTERVAL, () => this.announce());
     }
     addScanner(scanner) {
         this.scanners.push(scanner);
@@ -49,9 +54,9 @@ export class MatterDevice {
         this.broadcasters.push(broadcaster);
         return this;
     }
-    addNetInterface(netInterface) {
-        this.exchangeManager.addNetInterface(netInterface);
-        this.netInterfaces.push(netInterface);
+    addTransportInterface(netInterface) {
+        this.exchangeManager.addTransportInterface(netInterface);
+        this.transportInterfaces.push(netInterface);
         return this;
     }
     addProtocolHandler(protocol) {
@@ -60,81 +65,99 @@ export class MatterDevice {
     }
     start() {
         return __awaiter(this, void 0, void 0, function* () {
-            /*for (const broadcaster of this.broadcasters) {
-                broadcaster.setCommissionMode(0, this.deviceName, this.deviceType, this.vendorId, this.productId, this.discriminator);
-                broadcaster.announce();
-            }*/
-            this.startAnnouncement();
+            yield this.startAnnouncement();
         });
     }
     startAnnouncement() {
-        this.announcementStartedTime = Time.nowMs();
-        this.announceInterval = Time.getPeriodicTimer(DEVICE_ANNOUNCEMENT_INTERVAL, () => this.announce()).start();
-        this.announce();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isClosing)
+                return;
+            if (this.announceInterval.isRunning) {
+                this.announceInterval.stop();
+            }
+            this.announcementStartedTime = Time.nowMs();
+            this.announceInterval.start();
+            yield this.announce();
+        });
     }
     announce(announceOnce = false) {
-        var _a;
-        if (!announceOnce) {
-            // Stop announcement if duration is reached
-            if (this.announcementStartedTime !== null && Time.nowMs() - this.announcementStartedTime > DEVICE_ANNOUNCEMENT_DURATION) {
-                (_a = this.announceInterval) === null || _a === void 0 ? void 0 : _a.stop();
-                this.announcementStartedTime = null;
-                logger.debug("Announcement duration reached, stop announcing");
-                return;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!announceOnce) {
+                // Stop announcement if duration is reached
+                if (this.announcementStartedTime !== null &&
+                    Time.nowMs() - this.announcementStartedTime > DEVICE_ANNOUNCEMENT_DURATION) {
+                    this.announceInterval.stop();
+                    this.announcementStartedTime = null;
+                    logger.debug("Announcement duration reached, stop announcing");
+                    return;
+                }
+                if (this.commissioningWindowOpened) {
+                    // Re-Announce but do not re-set Fabrics
+                    for (const broadcaster of this.broadcasters) {
+                        yield broadcaster.announce();
+                    }
+                    return;
+                }
             }
-            if (this.commissioningWindowOpened) {
-                // Re-Announce but do not re-set Fabrics
+            const fabrics = this.fabricManager.getFabrics();
+            if (fabrics.length) {
+                const fabricsToAnnounce = [];
+                for (const fabric of fabrics) {
+                    const session = this.sessionManager.getSessionForNode(fabric, fabric.rootNodeId);
+                    if (session) {
+                        // We have a session, no need to re-announce
+                        logger.debug("Skipping announce for fabric", fabric.fabricId, "because we have a session", session.getId());
+                        continue;
+                    }
+                    logger.debug("Announcing", Logger.dict({ fabric: fabric.fabricId }));
+                    fabricsToAnnounce.push(fabric);
+                }
                 for (const broadcaster of this.broadcasters) {
-                    broadcaster.announce();
+                    yield broadcaster.setFabrics(fabricsToAnnounce);
+                    yield broadcaster.announce();
                 }
-                return;
             }
-        }
-        const fabrics = this.fabricManager.getFabrics();
-        if (fabrics.length) {
-            const fabricsToAnnounce = [];
-            for (const fabric of fabrics) {
-                const session = this.sessionManager.getSessionForNode(fabric, fabric.rootNodeId);
-                if (session) {
-                    // We have a session, no need to re-announce
-                    logger.debug("Skipping announce for fabric", fabric.fabricId.id, "because we have a session", session.getId());
-                    continue;
+            else {
+                // No fabric paired yeet, so announce as "ready for commissioning"
+                for (const broadcaster of this.broadcasters) {
+                    yield broadcaster.setCommissionMode(1, {
+                        deviceName: this.deviceName,
+                        deviceType: this.deviceType,
+                        vendorId: this.vendorId,
+                        productId: this.productId,
+                        discriminator: this.discriminator,
+                    });
+                    yield broadcaster.announce();
                 }
-                logger.debug("Announcing", Logger.dict({ fabric: fabric.fabricId.id }));
-                fabricsToAnnounce.push(fabric);
-            }
-            for (const broadcaster of this.broadcasters) {
-                broadcaster.setFabrics(fabricsToAnnounce);
-                broadcaster.announce();
-            }
-        }
-        else {
-            // No fabric paired yeet, so announce as "ready for commissioning"
-            for (const broadcaster of this.broadcasters) {
-                broadcaster.setCommissionMode(1, this.deviceName, this.deviceType, this.vendorId, this.productId, this.discriminator);
-                broadcaster.announce();
             }
-        }
+        });
     }
     getNextAvailableSessionId() {
         return this.sessionManager.getNextAvailableSessionId();
     }
     createSecureSession(sessionId, fabric, peerNodeId, peerSessionId, sharedSecret, salt, isInitiator, isResumption, idleRetransTimeoutMs, activeRetransTimeoutMs) {
-        return this.sessionManager.createSecureSession(sessionId, fabric, peerNodeId, peerSessionId, sharedSecret, salt, isInitiator, isResumption, idleRetransTimeoutMs, activeRetransTimeoutMs);
+        return this.sessionManager.createSecureSession(sessionId, fabric, peerNodeId, peerSessionId, sharedSecret, salt, isInitiator, isResumption, idleRetransTimeoutMs, activeRetransTimeoutMs, () => __awaiter(this, void 0, void 0, function* () { return yield this.startAnnouncement(); }));
     }
     findFabricFromDestinationId(destinationId, peerRandom) {
         return this.fabricManager.findFabricFromDestinationId(destinationId, peerRandom);
     }
     addFabric(fabric) {
-        this.fabricManager.addFabric(fabric);
-        this.broadcasters.forEach(broadcaster => {
-            broadcaster.setFabrics([fabric]);
-            broadcaster.announce();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.fabricManager.getFabrics().length === 0) {
+                // Inform upper layer to add MDNS Broadcaster delayed if we limited announcements to BLE till now
+                // TODO Change when refactoring MatterDevice away
+                this.initialCommissioningCallback();
+            }
+            this.fabricManager.addFabric(fabric);
+            for (const broadcaster of this.broadcasters) {
+                yield broadcaster.setFabrics([fabric]);
+                yield broadcaster.announce();
+            }
+            return fabric.fabricIndex;
         });
-        return fabric.fabricIndex;
     }
     getFabricByIndex(fabricIndex) {
-        return this.fabricManager.getFabrics().find(fabric => fabric.fabricIndex.index === fabricIndex.index);
+        return this.fabricManager.getFabrics().find(fabric => fabric.fabricIndex === fabricIndex);
     }
     initiateExchange(fabric, nodeId, protocolId) {
         return this.exchangeManager.initiateExchange(fabric, nodeId, protocolId);
@@ -162,34 +185,69 @@ export class MatterDevice {
         return !!this.fabricManager.getFabrics().length;
     }
     openCommissioningModeWindow(mode, discriminator, timeout) {
-        this.commissioningWindowOpened = true;
-        this.broadcasters.forEach(broadcaster => {
-            broadcaster.setCommissionMode(mode, this.deviceName, this.deviceType, this.vendorId, this.productId, discriminator);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (discriminator === undefined) {
+                if (mode === 1) {
+                    discriminator = this.discriminator;
+                }
+                else {
+                    throw new InternalError("Discriminator must be set for mode 2");
+                }
+            }
+            this.commissioningWindowOpened = true;
+            for (const broadcaster of this.broadcasters) {
+                yield broadcaster.setCommissionMode(mode, {
+                    deviceName: this.deviceName,
+                    deviceType: this.deviceType,
+                    vendorId: this.vendorId,
+                    productId: this.productId,
+                    discriminator,
+                });
+            }
+            yield this.startAnnouncement();
+            if (this.commissioningWindowTimeout !== undefined) {
+                this.commissioningWindowTimeout.stop();
+            }
+            this.commissioningWindowTimeout = Time.getTimer(timeout * 1000, () => {
+                this.commissioningWindowTimeout = undefined;
+                this.commissioningWindowOpened = false;
+            }).start();
         });
-        this.startAnnouncement();
-        Time.getTimer(timeout * 1000, () => this.commissioningWindowOpened = false).start();
     }
     findDevice(fabric, nodeId, timeOutSeconds = 5) {
         return __awaiter(this, void 0, void 0, function* () {
             // TODO: return the first not undefined answer or undefined
-            const matterServer = yield this.scanners[0].findDevice(fabric, nodeId, timeOutSeconds);
-            if (matterServer === undefined)
+            const matterServer = yield this.scanners[0].findOperationalDevice(fabric, nodeId, timeOutSeconds);
+            if (matterServer.length === 0)
                 return undefined;
-            const { ip, port } = matterServer;
             const session = this.sessionManager.getSessionForNode(fabric, nodeId);
             if (session === undefined)
                 return undefined;
             // TODO: have the interface and scanner linked
-            return { session, channel: yield this.netInterfaces[0].openChannel(ip, port) };
+            const networkInterface = this.transportInterfaces.find(netInterface => isNetworkInterface(netInterface));
+            if (networkInterface === undefined || !isNetworkInterface(networkInterface)) {
+                throw new NetworkError("No network interface found");
+            } // TODO meeehhh
+            return { session, channel: yield networkInterface.openChannel(matterServer[0]) };
         });
     }
     stop() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.exchangeManager.close();
-            (_a = this.announceInterval) === null || _a === void 0 ? void 0 : _a.stop();
-            this.broadcasters.forEach(broadcaster => broadcaster.close());
+            this.isClosing = true;
+            this.announceInterval.stop();
+            this.announcementStartedTime = null;
+            yield this.exchangeManager.close();
+            yield this.sessionManager.close();
+            yield this.channelManager.close();
+            for (const transportInterface of this.transportInterfaces) {
+                yield transportInterface.close();
+            }
+            (_a = this.commissioningWindowTimeout) === null || _a === void 0 ? void 0 : _a.stop();
         });
     }
+    getActiveSessionInformation() {
+        return this.sessionManager.getActiveSessionInformation();
+    }
 }
 //# sourceMappingURL=MatterDevice.js.map

package/dist/es/MatterDevice.js.map

@@ -1 +1 @@
-{"version":3,"file":"MatterDevice.js","sourceRoot":"","sources":["../../src/MatterDevice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MatterDevice.js","sourceRoot":"","sources":["../../src/MatterDevice.ts"],"names":[],"mappings":"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"}

package/dist/es/MatterNode.d.ts

@@ -3,13 +3,15 @@
  * Copyright 2022 The matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+import { ClusterClientObj } from "./cluster/client/ClusterClientTypes.js";
+import { Attributes, Cluster, Commands, Events } from "./cluster/Cluster.js";
+import { ClusterServerObj } from "./cluster/server/ClusterServerTypes.js";
+import { EndpointNumber } from "./datatype/EndpointNumber.js";
 import { RootEndpoint } from "./device/Device.js";
 import { Endpoint } from "./device/Endpoint.js";
-import { BitSchema, TypeFromBitSchema } from "./schema/BitmapSchema.js";
-import { Attributes, Cluster, Commands, Events } from "./cluster/Cluster.js";
-import { ClusterClientObj } from "./cluster/client/ClusterClient.js";
-import { ClusterServerObj } from "./cluster/server/ClusterServer.js";
-import { InteractionClient } from "./protocol/interaction/InteractionClient.js";
+import { MdnsBroadcaster } from "./mdns/MdnsBroadcaster.js";
+import { MdnsScanner } from "./mdns/MdnsScanner.js";
+import { BitSchema, TypeFromPartialBitSchema } from "./schema/BitmapSchema.js";
 /**
  * Abstract base class that represents a node in the matter ecosystem.
  */
@@ -20,27 +22,25 @@ export declare abstract class MatterNode {
      *
      * @param cluster ClusterServer object to add
      */
-    addRootClusterServer<A extends Attributes, C extends Commands>(cluster: ClusterServerObj<A, C>): void;
+    addRootClusterServer<A extends Attributes, E extends Events>(cluster: ClusterServerObj<A, E>): void;
     /**
      * Get a cluster server from the root endpoint. This is mainly used internally and not needed to be called by the user.
      *
      * @param cluster ClusterServer to get or undefined if not existing
      */
-    getRootClusterServer<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, C> | undefined;
+    getRootClusterServer<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterServerObj<A, E> | undefined;
     /**
      * Add a cluster client to the root endpoint. This is mainly used internally and not needed to be called by the user.
      *
      * @param cluster ClusterClient object to add
      */
-    addRootClusterClient<A extends Attributes, C extends Commands>(cluster: ClusterClientObj<A, C>): void;
+    addRootClusterClient<F extends BitSchema, A extends Attributes, C extends Commands, E extends Events>(cluster: ClusterClientObj<F, A, C, E>): void;
     /**
      * Get a cluster client from the root endpoint. This is mainly used internally and not needed to be called by the user.
      *
      * @param cluster ClusterClient to get or undefined if not existing
-     * @param interactionClient Optional InteractionClient to use for the cluster client. If not provided, the default
-     *                          InteractionClient of the root endpoint is used.
      */
-    getRootClusterClient<F extends BitSchema, SF extends TypeFromBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>, interactionClient?: InteractionClient): ClusterClientObj<A, C> | undefined;
+    getRootClusterClient<F extends BitSchema, SF extends TypeFromPartialBitSchema<F>, A extends Attributes, C extends Commands, E extends Events>(cluster: Cluster<F, SF, A, C, E>): ClusterClientObj<F, A, C, E> | undefined;
     /**
      * Get the root endpoint of the node.
      */
@@ -58,7 +58,11 @@ export declare abstract class MatterNode {
      * @param endpointId Endpoint ID of the child endpoint to get
      * @protected
      */
-    protected getChildEndpoint(endpointId: number): Endpoint | undefined;
+    protected getChildEndpoint(endpointId: EndpointNumber): Endpoint | undefined;
     abstract close(): Promise<void>;
+    abstract getPort(): number | undefined;
+    abstract start(): Promise<void>;
+    abstract setMdnsBroadcaster(mdnsBroadcaster: MdnsBroadcaster): void;
+    abstract setMdnsScanner(mdnsScanner: MdnsScanner): void;
 }
 //# sourceMappingURL=MatterNode.d.ts.map

package/dist/es/MatterNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MatterNode.d.ts","sourceRoot":"","sources":["../../src/MatterNode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAEhF;;GAEG;AACH,8BAAsB,UAAU;IAC5B,SAAS,CAAC,QAAQ,CAAC,YAAY,eAAsB;IAErD;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;IAI9F;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,SAAS,SAAS,EAAE,EAAE,SAAS,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,MAAM,EACjI,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GACjC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS;IAIrC;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;IAI9F;;;;;;OAMG;IACH,oBAAoB,CAAC,CAAC,SAAS,SAAS,EAAE,EAAE,SAAS,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,MAAM,EACjI,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAChC,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS;IAIrC;;OAEG;IACH,eAAe;IAIf;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAIpE,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAClC"}
+{"version":3,"file":"MatterNode.d.ts","sourceRoot":"","sources":["../../src/MatterNode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE/E;;GAEG;AACH,8BAAsB,UAAU;IAC5B,SAAS,CAAC,QAAQ,CAAC,YAAY,eAAsB;IAErD;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC;IAI5F;;;;OAIG;IACH,oBAAoB,CAChB,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,wBAAwB,CAAC,CAAC,CAAC,EACtC,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,MAAM,EAClB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS;IAIvE;;;;OAIG;IACH,oBAAoB,CAAC,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,MAAM,EAChG,OAAO,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAKzC;;;;OAIG;IACH,oBAAoB,CAChB,CAAC,SAAS,SAAS,EACnB,EAAE,SAAS,wBAAwB,CAAC,CAAC,CAAC,EACtC,CAAC,SAAS,UAAU,EACpB,CAAC,SAAS,QAAQ,EAClB,CAAC,SAAS,MAAM,EAClB,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS;IAI7E;;OAEG;IACH,eAAe;IAIf;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAIxC;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE,cAAc,GAAG,QAAQ,GAAG,SAAS;IAI5E,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B,QAAQ,CAAC,OAAO,IAAI,MAAM,GAAG,SAAS;IAEtC,QAAQ,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAE/B,QAAQ,CAAC,kBAAkB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IAEnE,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,IAAI;CAC1D"}

package/dist/es/MatterNode.js

@@ -39,11 +39,9 @@ export class MatterNode {
      * Get a cluster client from the root endpoint. This is mainly used internally and not needed to be called by the user.
      *
      * @param cluster ClusterClient to get or undefined if not existing
-     * @param interactionClient Optional InteractionClient to use for the cluster client. If not provided, the default
-     *                          InteractionClient of the root endpoint is used.
      */
-    getRootClusterClient(cluster, interactionClient) {
-        return this.rootEndpoint.getClusterClient(cluster, interactionClient);
+    getRootClusterClient(cluster) {
+        return this.rootEndpoint.getClusterClient(cluster);
     }
     /**
      * Get the root endpoint of the node.

package/dist/es/MatterNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"MatterNode.js","sourceRoot":"","sources":["../../src/MatterNode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD;;GAEG;AACH,MAAM,OAAgB,UAAU;IAAhC;QACuB,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAyEzD,CAAC;IAvEG;;;;OAIG;IACH,oBAAoB,CAA2C,OAA+B;QAC1F,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAChB,OAAgC;QAEhC,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAA2C,OAA+B;QAC1F,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAChB,OAAgC,EAChC,iBAAqC;QAErC,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAC1E,CAAC;IAED;;OAEG;IACH,eAAe;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACO,WAAW,CAAC,QAAkB;QACpC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED;;;;;OAKG;IACO,gBAAgB,CAAC,UAAkB;QACzC,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;CAGJ"}
+{"version":3,"file":"MatterNode.js","sourceRoot":"","sources":["../../src/MatterNode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMlD;;GAEG;AACH,MAAM,OAAgB,UAAU;IAAhC;QACuB,iBAAY,GAAG,IAAI,YAAY,EAAE,CAAC;IAwFzD,CAAC;IAtFG;;;;OAIG;IACH,oBAAoB,CAAyC,OAA+B;QACxF,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAMlB,OAAgC;QAC9B,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAChB,OAAqC;QAErC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,oBAAoB,CAMlB,OAAgC;QAC9B,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvD,CAAC;IAED;;OAEG;IACH,eAAe;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED;;;;;OAKG;IACO,WAAW,CAAC,QAAkB;QACpC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAED;;;;;OAKG;IACO,gBAAgB,CAAC,UAA0B;QACjD,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;CAWJ"}

package/dist/es/MatterServer.d.ts

@@ -3,17 +3,23 @@
  * Copyright 2022 The matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { StorageManager } from "./storage/StorageManager.js";
-import { CommissioningServer } from "./CommissioningServer.js";
 import { CommissioningController } from "./CommissioningController.js";
+import { CommissioningServer } from "./CommissioningServer.js";
+import { StorageManager } from "./storage/StorageManager.js";
+export type NodeOptions = {
+    /** Unique node id to use for the storage context of this node. If not provided the order of node addition is used. */
+    uniqueNodeId?: string;
+};
 /**
  * Main Matter server class that represents the process on the host allowing to commission and pair multiple devices
- * by reusing MDNS scanner and Broadcaster
+ * by reusing MDNS scanner and broadcaster
  */
 export declare class MatterServer {
     private storageManager;
     private mdnsAnnounceInterface?;
     private readonly nodes;
+    private mdnsScanner?;
+    private mdnsBroadcaster?;
     /**
      * Create a new Matter server instance
      *
@@ -25,20 +31,23 @@ export declare class MatterServer {
     /**
      * Add a CommissioningServer node to the server
      *
-     * @param commisioningServer CommissioningServer node to add
+     * @param commissioningServer CommissioningServer node to add
+     * @param nodeOptions Optional options for the node (e.g. unique node id)
      */
-    addCommissioningServer(commisioningServer: CommissioningServer): void;
+    addCommissioningServer(commissioningServer: CommissioningServer, nodeOptions?: NodeOptions): void;
     /**
      * Add a Controller node to the server
      *
      * @param commissioningController Controller node to add
+     * @param nodeOptions Optional options for the node (e.g. unique node id)
      */
-    addCommissioningController(commissioningController: CommissioningController): void;
+    addCommissioningController(commissioningController: CommissioningController, nodeOptions?: NodeOptions): void;
     /**
      * Start the server and all nodes. If the nodes do not have specified a delayed announcement or pairing they will
      * be announced/paired immediately.
      */
     start(): Promise<void>;
+    private prepareNode;
     /**
      * Close the server and all nodes
      */

package/dist/es/MatterServer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MatterServer.d.ts","sourceRoot":"","sources":["../../src/MatterServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAKvE;;;GAGG;AACH,qBAAa,YAAY;IAWjB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,qBAAqB,CAAC;IAXlC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAE1C;;;;;;OAMG;gBAES,cAAc,EAAE,cAAc,EAC9B,qBAAqB,CAAC,oBAAQ;IAG1C;;;;OAIG;IACH,sBAAsB,CAAC,kBAAkB,EAAE,mBAAmB;IAmB9D;;;;OAIG;IACH,0BAA0B,CAAC,uBAAuB,EAAE,uBAAuB;IAS3E;;;OAGG;IACG,KAAK;IAkBX;;OAEG;IACG,KAAK;CAMd"}
+{"version":3,"file":"MatterServer.d.ts","sourceRoot":"","sources":["../../src/MatterServer.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAM/D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAO7D,MAAM,MAAM,WAAW,GAAG;IACtB,sHAAsH;IACtH,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY;IAcjB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,qBAAqB,CAAC;IAdlC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoB;IAE1C,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,eAAe,CAAC,CAAkB;IAE1C;;;;;;OAMG;gBAES,cAAc,EAAE,cAAc,EAC9B,qBAAqB,CAAC,oBAAQ;IAG1C;;;;;OAKG;IACH,sBAAsB,CAAC,mBAAmB,EAAE,mBAAmB,EAAE,WAAW,CAAC,EAAE,WAAW;IAkB1F;;;;;OAKG;IACH,0BAA0B,CAAC,uBAAuB,EAAE,uBAAuB,EAAE,WAAW,CAAC,EAAE,WAAW;IAQtG;;;OAGG;IACG,KAAK;IAcX,OAAO,CAAC,WAAW;IASnB;;OAEG;IACG,KAAK;CASd"}