demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-addons synced 2026-07-29 12:34:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

[matter] Fix for infinite loop at bridge startup (#18977)

Browse Source 
Also cleans up commissioning window updates

Signed-off-by: Dan Cunningham <dan@digitaldan.com>
This commit is contained in:
Dan Cunningham
2025-07-17 10:22:40 +02:00
committed by GitHub
parent 0b002e84b7
commit 4ba2e777f5
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.matter/matter-server/src/bridge/DeviceNode.ts
+7 -12
View File
@@ -99,12 +99,13 @@ export class DeviceNode {
if (this.server.lifecycle.isOnline) {
throw new Error("Server is already started, not starting");
}
this.server.events.commissioning.enabled$Changed.on(async () => {
logger.info(`Commissioning state changed to ${this.server?.state.commissioning.enabled}`);
this.#sendCommissioningStatus();
});
this.server.lifecycle.online.on(() => {
this.server.lifecycle.online.once(() => {
logger.info(`Bridge online`);
this.server?.events.commissioning.enabled$Changed.on(async () => {
logger.info(`Commissioning state changed to ${this.server?.state.commissioning.enabled}`);
this.inCommissioning = this.server?.state.commissioning.enabled ?? false;
this.#sendCommissioningStatus();
});
this.#sendCommissioningStatus();
});
logger.info(this.server);
@@ -193,20 +194,14 @@ export class DeviceNode {
logger.debug("opening basic commissioning window");
await dc.allowBasicCommissioning(() => {
logger.debug("commissioning window closed");
this.inCommissioning = false;
this.#sendCommissioningStatus();
});
this.inCommissioning = true;
logger.debug("basic commissioning window open");
this.#sendCommissioningStatus();
}
async closeCommissioningWindow() {
const server = this.#getStartedServer();
if (!server.state.commissioning.commissioned) {
logger.debug("bridge is not commissioned, not closing commissioning window");
this.#sendCommissioningStatus();
return;
throw new Error("Bridge is not commissioned, not closing commissioning window");
}
const dc = server.env.get(DeviceCommissioner);
logger.debug("closing basic commissioning window");
bundles/org.openhab.binding.matter/src/main/java/org/openhab/binding/matter/internal/bridge/MatterBridge.java
+14 -3
View File
@@ -104,6 +104,7 @@ public class MatterBridge implements MatterClientListener {
private @Nullable ScheduledFuture<?> modifyFuture;
private @Nullable ScheduledFuture<?> reconnectFuture;
private RunningState runningState = RunningState.Stopped;
private boolean commissioningWindowOpen = false;
@Activate
public MatterBridge(final @Reference ItemRegistry itemRegistry, final @Reference MetadataRegistry metadataRegistry,
@@ -228,7 +229,9 @@ public class MatterBridge implements MatterClientListener {
stopClient();
scheduleConnect();
} else {
manageCommissioningWindow(settings.openCommissioningWindow);
if (settings.openCommissioningWindow != commissioningWindowOpen) {
manageCommissioningWindow(settings.openCommissioningWindow);
}
}
}
@@ -276,9 +279,11 @@ public class MatterBridge implements MatterClientListener {
} else if (message instanceof BridgeEventTriggered bridgeEventTriggered) {
switch (bridgeEventTriggered.data.eventName) {
case "commissioningWindowOpen":
commissioningWindowOpen = true;
updateConfig(Map.of("openCommissioningWindow", true));
break;
case "commissioningWindowClosed":
commissioningWindowOpen = false;
updateConfig(Map.of("openCommissioningWindow", false));
break;
default:
@@ -497,24 +502,28 @@ public class MatterBridge implements MatterClientListener {
if (runningState != RunningState.Running) {
return;
}
if (open) {
if (open && !commissioningWindowOpen) {
try {
client.openCommissioningWindow().get();
commissioningWindowOpen = true;
} catch (CancellationException | InterruptedException | ExecutionException e) {
logger.debug("Could not open commissioning window", e);
}
} else {
} else if (!open && commissioningWindowOpen) {
try {
client.closeCommissioningWindow().get();
commissioningWindowOpen = false;
} catch (CancellationException | InterruptedException | ExecutionException e) {
logger.debug("Could not close commissioning window", e);
}
}
updateConfig(Map.of("openCommissioningWindow", commissioningWindowOpen));
}
private void updatePairingCodes() {
try {
BridgeCommissionState state = client.getCommissioningState().get();
commissioningWindowOpen = state.commissioningWindowOpen;
updateConfig(Map.of("manualPairingCode", state.pairingCodes.manualPairingCode, "qrCode",
state.pairingCodes.qrPairingCode, "openCommissioningWindow", state.commissioningWindowOpen));
} catch (CancellationException | InterruptedException | ExecutionException | JsonParseException e) {
@@ -540,6 +549,8 @@ public class MatterBridge implements MatterClientListener {
private void updateRunningState(RunningState newState, @Nullable String message) {
runningState = newState;
updateConfig(Map.of("runningState", runningState.toString() + (message != null ? ": " + message : "")));
// log to INFO here as there is not many places for feedback for IO services
logger.info("Matter Bridge State: {} {}", runningState, message != null ? ": " + message : "");
}
/**