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] Fixes race condition at startup (#18830)

Browse Source 
Signed-off-by: Dan Cunningham <dan@digitaldan.com>
This commit is contained in:
Dan Cunningham
2025-06-22 12:38:19 +02:00
committed by GitHub
parent 6dbd1bab96
commit 1524ac1ed8
1 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundles/org.openhab.binding.matter/matter-server/src/app.ts
+56 -46
View File
@@ -133,63 +133,73 @@ wss.on("connection", (ws: WebSocketSession, req: IncomingMessage) => {
logger.error(`WebSocket error: ${error} ${error.stack}`);
});
if (!req.url) {
logger.error("No URL in the request");
ws.close(1002, "No URL in the request");
return;
}
// Support async init in a non async function
void (async () => {
if (!req.url) {
logger.error("No URL in the request");
ws.close(1002, "No URL in the request");
return;
}
const params = new URLSearchParams(req.url.slice(req.url.indexOf("?")));
const service = params.get("service") === "bridge" ? "bridge" : "client";
const params = new URLSearchParams(req.url.slice(req.url.indexOf("?")));
const service = params.get("service") === "bridge" ? "bridge" : "client";
if (service === "client") {
const controllerName = params.get("controllerName");
try {
if (controllerName == null) {
throw new Error("No controllerName parameter in the request");
}
wss.clients.forEach((client: WebSocket) => {
const session = client as WebSocketSession;
if (session.controller && session.controller.id() === `client-${controllerName}`) {
throw new Error(`Controller with name ${controllerName} already exists!`);
if (service === "client") {
const controllerName = params.get("controllerName");
try {
if (controllerName == null) {
throw new Error("No controllerName parameter in the request");
}
});
ws.controller = new ClientController(ws, params);
void ws.controller.init().catch(error => {
wss.clients.forEach((client: WebSocket) => {
const session = client as WebSocketSession;
if (session.controller && session.controller.id() === `client-${controllerName}`) {
throw new Error(`Controller with name ${controllerName} already exists!`);
}
});
ws.controller = new ClientController(ws, params);
try {
await ws.controller.init();
ws.sendEvent("ready", "Controller initialized");
} catch (error: any) {
printError(logger, error, "ClientController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
return;
}
} catch (error: any) {
printError(logger, error, "ClientController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
});
} catch (error: any) {
printError(logger, error, "ClientController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
return;
}
} else {
// For now we only support one bridge
const uniqueId = "0";
try {
wss.clients.forEach((client: WebSocket) => {
const session = client as WebSocketSession;
if (session.controller && session.controller.id() === `bridge-${uniqueId}`) {
throw new Error(`Bridge with uniqueId ${uniqueId} already exists!`);
return;
}
} else {
// For now we only support one bridge
const uniqueId = "0";
try {
wss.clients.forEach((client: WebSocket) => {
const session = client as WebSocketSession;
if (session.controller && session.controller.id() === `bridge-${uniqueId}`) {
throw new Error(`Bridge with uniqueId ${uniqueId} already exists!`);
}
});
ws.controller = new BridgeController(ws, params);
try {
await ws.controller.init();
ws.sendEvent("ready", "Controller initialized");
} catch (error: any) {
printError(logger, error, "BridgeController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
return;
}
});
ws.controller = new BridgeController(ws, params);
void ws.controller.init().catch(error => {
} catch (error: any) {
printError(logger, error, "BridgeController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
});
} catch (error: any) {
printError(logger, error, "BridgeController.init()");
logger.error("returning error", error.message);
ws.close(1002, error.message);
return;
return;
}
}
}
ws.sendEvent("ready", "Controller initialized");
})();
});
logger.info(`CHIP Controller Server listening on port ${socketPort}`);