@matter/protocol 0.12.0-alpha.0-20250107-af5a068c3 → 0.12.0-alpha.0-20250110-6349da2f0

package/src/protocol/DeviceAdvertiser.ts

@@ -65,6 +65,9 @@ export class DeviceAdvertiser {
             if (this.#context.fabrics.length === 0) {
                 // Last fabric got removed, so expire all announcements
                 await this.#exitOperationalMode();
+            } else {
+                // At least one fabric is still present, so re-announce
+                await this.advertise(true);
             }
         });
 
@@ -164,7 +167,10 @@ export class DeviceAdvertiser {
                 const session = this.#context.sessions.getSessionForNode(fabric.addressOf(fabric.rootNodeId));
                 if (session === undefined || !session.isSecure || session.subscriptions.size === 0) {
                     fabricsWithoutSessions++;
-                    logger.debug("Announcing", Diagnostic.dict({ fabric: fabric.fabricId }));
+                    logger.debug(
+                        "Announcing",
+                        Diagnostic.dict({ fabricIndex: fabric.fabricIndex, fabricId: fabric.fabricId }),
+                    );
                 }
             }
             for (const broadcaster of this.#broadcasters) {

package/src/protocol/DeviceCommissioner.ts

@@ -65,8 +65,17 @@ export class DeviceCommissioner {
 
         this.#observers.on(this.#context.advertiser.timedOut, this.endCommissioning);
 
-        // If a commissioning window is open then we reannounce this because it was ended as fabric got added
-        this.#observers.on(this.#context.fabrics.events.deleted, this.reactivateAdvertiser);
+        // If a commissioning window is open then we re-announce this because it was ended as fabric got added
+        this.#observers.on(this.#context.fabrics.events.deleted, async () => {
+            // If a commissioning window is open, or we removed the last fabric, then we re-announce this
+            // because it was ended as fabric got added
+            if (
+                this.#context.fabrics.length === 0 ||
+                this.#windowStatus !== AdministratorCommissioning.CommissioningWindowStatus.WindowNotOpen
+            ) {
+                this.reactivateAdvertiser();
+            }
+        });
 
         // No fabric paired yet, so announce as "ready for commissioning"
         this.#observers.on(this.#context.advertiser.operationalModeEnded, this.allowBasicCommissioning);