matter-all-in-one-addon 2.3.13 → 2.3.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/README.md +18 -12
  2. package/dist/camera/browser-preview.js +12 -10
  3. package/dist/camera/browser-preview.js.map +1 -1
  4. package/dist/camera/homekit/homekit-camera-recording.delegate.d.ts +5 -0
  5. package/dist/camera/homekit/homekit-camera-recording.delegate.js +14 -0
  6. package/dist/camera/homekit/homekit-camera-recording.delegate.js.map +1 -1
  7. package/dist/camera/homekit/homekit-camera-stream.delegate.d.ts +8 -2
  8. package/dist/camera/homekit/homekit-camera-stream.delegate.js +113 -49
  9. package/dist/camera/homekit/homekit-camera-stream.delegate.js.map +1 -1
  10. package/dist/camera/homekit/homekit-camera.accessory.js +17 -3
  11. package/dist/camera/homekit/homekit-camera.accessory.js.map +1 -1
  12. package/dist/camera/homekit/tuya-hap-talkback.d.ts +1 -0
  13. package/dist/camera/homekit/tuya-hap-talkback.js +11 -8
  14. package/dist/camera/homekit/tuya-hap-talkback.js.map +1 -1
  15. package/dist/camera/matter/camera-endpoint.builder.js +31 -18
  16. package/dist/camera/matter/camera-endpoint.builder.js.map +1 -1
  17. package/dist/converters/binary_sensor.converter.d.ts +1 -1
  18. package/dist/converters/binary_sensor.converter.js +2 -2
  19. package/dist/converters/climate.converter.d.ts +14 -1
  20. package/dist/converters/climate.converter.js +44 -2
  21. package/dist/converters/climate.converter.js.map +1 -1
  22. package/dist/converters/sensor.converter.js +6 -6
  23. package/dist/converters/sensor.converter.js.map +1 -1
  24. package/dist/device-profiles.js +33 -2
  25. package/dist/device-profiles.js.map +1 -1
  26. package/dist/device-registry.js +12 -0
  27. package/dist/device-registry.js.map +1 -1
  28. package/dist/entities/air_quality.entity.js +24 -1
  29. package/dist/entities/air_quality.entity.js.map +1 -1
  30. package/dist/entities/base.entity.js +25 -5
  31. package/dist/entities/base.entity.js.map +1 -1
  32. package/dist/entities/climate.entity.d.ts +23 -0
  33. package/dist/entities/climate.entity.js +174 -0
  34. package/dist/entities/climate.entity.js.map +1 -0
  35. package/dist/entities/closure.entity.js +24 -1
  36. package/dist/entities/closure.entity.js.map +1 -1
  37. package/dist/entities/composite-device.entity.js +23 -7
  38. package/dist/entities/composite-device.entity.js.map +1 -1
  39. package/dist/entities/cooktop.entity.d.ts +1 -0
  40. package/dist/entities/cooktop.entity.js +18 -3
  41. package/dist/entities/cooktop.entity.js.map +1 -1
  42. package/dist/entities/energy_tariff.entity.js +16 -4
  43. package/dist/entities/energy_tariff.entity.js.map +1 -1
  44. package/dist/entities/humidifier.entity.d.ts +3 -0
  45. package/dist/entities/humidifier.entity.js +61 -45
  46. package/dist/entities/humidifier.entity.js.map +1 -1
  47. package/dist/entities/lock.entity.js +9 -5
  48. package/dist/entities/lock.entity.js.map +1 -1
  49. package/dist/entities/oven.entity.d.ts +2 -0
  50. package/dist/entities/oven.entity.js +50 -8
  51. package/dist/entities/oven.entity.js.map +1 -1
  52. package/dist/entities/soil_sensor.entity.js +2 -1
  53. package/dist/entities/soil_sensor.entity.js.map +1 -1
  54. package/dist/entities/vacuum.entity.js +4 -4
  55. package/dist/entities/vacuum.entity.js.map +1 -1
  56. package/dist/entities/valve.entity.js +29 -5
  57. package/dist/entities/valve.entity.js.map +1 -1
  58. package/dist/frontend/assets/CameraConfigModal-DnDZbkpj.js +6 -0
  59. package/dist/frontend/assets/CameraUiModal-DVCgRtyT.js +1 -0
  60. package/dist/frontend/assets/DeviceModal-DFgXDEzB.js +5 -0
  61. package/dist/frontend/assets/QRCodeDisplay-B3RFLtWz.js +8 -0
  62. package/dist/frontend/assets/ScryptedModal-DZ4B2NLt.js +1 -0
  63. package/dist/frontend/assets/SettingsModal-BBflJWuJ.js +2 -0
  64. package/dist/frontend/assets/clipboard-CnKYMNaq.js +1 -0
  65. package/dist/frontend/assets/index-CONl6ATp.js +10 -0
  66. package/dist/frontend/index.html +1 -1
  67. package/dist/hap/hap-generic-accessory.d.ts +6 -0
  68. package/dist/hap/hap-generic-accessory.js +641 -26
  69. package/dist/hap/hap-generic-accessory.js.map +1 -1
  70. package/dist/homeAssistant.d.ts +1 -0
  71. package/dist/homeAssistant.js +40 -1
  72. package/dist/homeAssistant.js.map +1 -1
  73. package/dist/mqtt/mqtt-client.d.ts +2 -0
  74. package/dist/mqtt/mqtt-client.js +44 -2
  75. package/dist/mqtt/mqtt-client.js.map +1 -1
  76. package/dist/mqtt/mqtt.entity.d.ts +12 -0
  77. package/dist/mqtt/mqtt.entity.js +231 -82
  78. package/dist/mqtt/mqtt.entity.js.map +1 -1
  79. package/dist/platform.d.ts +2 -0
  80. package/dist/platform.js +111 -37
  81. package/dist/platform.js.map +1 -1
  82. package/dist/proxy.js +13 -1
  83. package/dist/proxy.js.map +1 -1
  84. package/dist/utils/hap-firmware.js +1 -1
  85. package/dist/utils/hap-firmware.js.map +1 -1
  86. package/dist/utils/matter-command-response.js +64 -44
  87. package/dist/utils/matter-command-response.js.map +1 -1
  88. package/dist/utils/matter-reset-storage.d.ts +2 -0
  89. package/dist/utils/matter-reset-storage.js +74 -0
  90. package/dist/utils/matter-reset-storage.js.map +1 -0
  91. package/dist/utils/measurements.d.ts +8 -0
  92. package/dist/utils/measurements.js +42 -0
  93. package/dist/utils/measurements.js.map +1 -0
  94. package/package.json +17 -17
  95. package/dist/frontend/assets/index-1k-iTL-m.js +0 -26
package/dist/proxy.js CHANGED
@@ -11,7 +11,6 @@ const ALLOWED_INGRESS_CLIENTS = new Set([
11
11
  ]);
12
12
  const server = http.createServer((req, res) => {
13
13
  const remoteAddress = req.socket.remoteAddress ?? "";
14
- const url = req.url || "";
15
14
  if (!ALLOWED_INGRESS_CLIENTS.has(remoteAddress)) {
16
15
  res.writeHead(403, { "Content-Type": "text/plain; charset=utf-8" });
17
16
  res.end("Forbidden");
@@ -30,10 +29,23 @@ const server = http.createServer((req, res) => {
30
29
  }, (proxyRes) => {
31
30
  // Set the response headers and status from the target response
32
31
  res.writeHead(proxyRes.statusCode ?? 200, proxyRes.headers);
32
+ proxyRes.on("error", () => res.destroy());
33
33
  proxyRes.pipe(res);
34
34
  });
35
+ // A closed browser tab must also release SSE subscribers and preview streams.
36
+ res.once("close", () => {
37
+ if (!res.writableFinished)
38
+ proxyReq.destroy();
39
+ });
40
+ req.once("error", () => proxyReq.destroy());
35
41
  // Handle errors (e.g. target server not started yet)
36
42
  proxyReq.on("error", () => {
43
+ if (res.destroyed || res.writableEnded)
44
+ return;
45
+ if (res.headersSent) {
46
+ res.destroy();
47
+ return;
48
+ }
37
49
  const url = req.url || "";
38
50
  if (req.method !== "GET" || url.includes("/api/")) {
39
51
  res.writeHead(503, { "Content-Type": "application/json; charset=utf-8" });
package/dist/proxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,UAAU,GAAG,IAAI,CAAC;AACxB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,EAAE,CAAC;AAC7D,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC;IACtC,WAAW;IACX,KAAK;IACL,kBAAkB;IAClB,aAAa;IACb,oBAAoB;CACrB,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC5C,MAAM,aAAa,GAAG,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;IACrD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;IAC1B,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAChD,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,2BAA2B,EAAE,CAAC,CAAC;QACpE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IACD,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAC3B;QACE,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,WAAW;QACjB,IAAI,EAAE,GAAG,CAAC,GAAG;QACb,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,OAAO,EAAE;YACP,GAAG,GAAG,CAAC,OAAO;YACd,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9D;KACF,EACD,CAAC,QAAQ,EAAE,EAAE;QACX,+DAA+D;QAC/D,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,IAAI,GAAG,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC5D,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC,CACF,CAAC;IAEF,qDAAqD;IACrD,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACxB,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,iCAAiC,EAAE,CAAC,CAAC;YAC1E,GAAG,CAAC,GAAG,CACL,IAAI,CAAC,SAAS,CAAC;gBACb,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,qCAAqC;aAC7C,CAAC,CACH,CAAC;YACF,OAAO;QACT,CAAC;QACD,wFAAwF;QACxF,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,0BAA0B,EAAE,CAAC,CAAC;QACnE,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,6CAA6C;IAC7C,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE;IACxC,OAAO,CAAC,GAAG,CACT,yCAAyC,UAAU,+BAA+B,WAAW,EAAE,CAChG,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,SAAS,cAAc;IACrB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA6JD,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { createRequire } from "node:module";
2
2
  const require = createRequire(import.meta.url);
3
3
  /** Version resolved from the hap-nodejs package actually installed at runtime. */
4
- export const HAP_NODEJS_VERSION = String(require("@homebridge/hap-nodejs/package.json").version || "2.2.3");
4
+ export const HAP_NODEJS_VERSION = String(require("@homebridge/hap-nodejs/package.json").version);
5
5
  /**
6
6
  * HAP FirmwareRevision must be a plain version string for Apple Casa to expose
7
7
  * it in accessory settings. The descriptive runtime is published separately as
@@ -1 +1 @@
1
- {"version":3,"file":"hap-firmware.js","sourceRoot":"","sources":["../../src/utils/hap-firmware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,kFAAkF;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CACtC,OAAO,CAAC,qCAAqC,CAAC,CAAC,OAAO,IAAI,OAAO,CAClE,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,cAAc,kBAAkB,EAAE,CAAC;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC"}
1
+ {"version":3,"file":"hap-firmware.js","sourceRoot":"","sources":["../../src/utils/hap-firmware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AAE/C,kFAAkF;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CACtC,OAAO,CAAC,qCAAqC,CAAC,CAAC,OAAO,CACvD,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACxD,MAAM,CAAC,MAAM,qBAAqB,GAAG,cAAc,kBAAkB,EAAE,CAAC;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,qBAAqB,CAAC"}
@@ -9,58 +9,78 @@ const installedPolicies = new WeakMap();
9
9
  */
10
10
  export function installMatterCommandResponsePolicy(endpoint, policy) {
11
11
  const commandHandler = endpoint?.commandHandler;
12
- if (!commandHandler || typeof commandHandler.executeHandler !== "function")
12
+ if (!commandHandler ||
13
+ typeof commandHandler.addHandler !== "function" ||
14
+ !Array.isArray(commandHandler.handler))
13
15
  return;
14
16
  const installed = installedPolicies.get(commandHandler);
15
17
  if (installed) {
16
18
  installed.policy = policy;
17
19
  return;
18
20
  }
19
- const originalExecuteHandler = commandHandler.executeHandler.bind(commandHandler);
20
- const installedPolicy = { policy };
21
- installedPolicies.set(commandHandler, installedPolicy);
22
- commandHandler.executeHandler = async (command, ...args) => {
23
- const startedAt = Date.now();
24
- installedPolicy.policy.onCommandStart?.(command);
25
- const operation = Promise.resolve()
26
- .then(() => originalExecuteHandler(command, ...args))
27
- .then((result) => ({ kind: "result", result }), (error) => ({ kind: "error", error }));
28
- let timer;
29
- const timeoutMs = installedPolicy.policy.timeoutMs ?? MATTER_COMMAND_ACK_BUDGET_MS;
30
- const outcome = await Promise.race([
31
- operation,
32
- new Promise((resolve) => {
33
- timer = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs);
34
- }),
35
- ]);
36
- if (outcome.kind === "timeout") {
37
- installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "handler_returned_pending");
38
- void operation.then(async (lateOutcome) => {
39
- const durationMs = Date.now() - startedAt;
40
- installedPolicy.policy.onCommandOutcome?.(command, durationMs, lateOutcome.kind === "error" ? "failed" : "completed", true);
41
- if (lateOutcome.kind === "error") {
42
- try {
43
- await installedPolicy.policy.onFailure?.(command, lateOutcome.error, true);
44
- }
45
- catch {
46
- // A diagnostic failure must not leak into Matter's already-sent ACK.
47
- }
21
+ const installedPolicy = {
22
+ policy,
23
+ wrapHandler: (command, handler) => {
24
+ const execute = async (...args) => {
25
+ const startedAt = Date.now();
26
+ installedPolicy.policy.onCommandStart?.(command);
27
+ const operation = Promise.resolve()
28
+ .then(() => handler(...args))
29
+ .then((result) => ({ kind: "result", result }), (error) => ({ kind: "error", error }));
30
+ let timer;
31
+ const timeoutMs = installedPolicy.policy.timeoutMs ?? MATTER_COMMAND_ACK_BUDGET_MS;
32
+ const outcome = await Promise.race([
33
+ operation,
34
+ new Promise((resolve) => {
35
+ timer = setTimeout(() => resolve({ kind: "timeout" }), timeoutMs);
36
+ }),
37
+ ]);
38
+ if (outcome.kind === "timeout") {
39
+ installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "handler_returned_pending");
40
+ void operation.then(async (lateOutcome) => {
41
+ const durationMs = Date.now() - startedAt;
42
+ installedPolicy.policy.onCommandOutcome?.(command, durationMs, lateOutcome.kind === "error" ? "failed" : "completed", true);
43
+ if (lateOutcome.kind === "error") {
44
+ try {
45
+ await installedPolicy.policy.onFailure?.(command, lateOutcome.error, true);
46
+ }
47
+ catch {
48
+ // A diagnostic failure must not leak into Matter's already-sent ACK.
49
+ }
50
+ }
51
+ else {
52
+ installedPolicy.policy.onSlowCompletion?.(command, durationMs);
53
+ }
54
+ });
55
+ return undefined;
48
56
  }
49
- else {
50
- installedPolicy.policy.onSlowCompletion?.(command, durationMs);
57
+ if (timer)
58
+ clearTimeout(timer);
59
+ if (outcome.kind === "error") {
60
+ installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "failed");
61
+ void Promise.resolve(installedPolicy.policy.onFailure?.(command, outcome.error, false)).catch(() => undefined);
62
+ throw outcome.error;
51
63
  }
52
- });
53
- return undefined;
54
- }
55
- if (timer)
56
- clearTimeout(timer);
57
- if (outcome.kind === "error") {
58
- installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "failed");
59
- void Promise.resolve(installedPolicy.policy.onFailure?.(command, outcome.error, false)).catch(() => undefined);
60
- throw outcome.error;
61
- }
62
- installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "completed");
63
- return outcome.result;
64
+ installedPolicy.policy.onCommandOutcome?.(command, Date.now() - startedAt, "completed");
65
+ return outcome.result;
66
+ };
67
+ return execute;
68
+ },
64
69
  };
70
+ installedPolicies.set(commandHandler, installedPolicy);
71
+ // Matterbridge 3.11.1 freezes core prototypes. Wrap the registered callbacks
72
+ // through CommandHandler's instance registration API instead of replacing its
73
+ // frozen executeHandler method. The private list is needed for handlers that
74
+ // the endpoint registered before this policy was installed.
75
+ for (const entry of commandHandler.handler) {
76
+ if (typeof entry?.handler === "function")
77
+ entry.handler = installedPolicy.wrapHandler(entry.command, entry.handler);
78
+ }
79
+ const originalAddHandler = commandHandler.addHandler.bind(commandHandler);
80
+ Object.defineProperty(commandHandler, "addHandler", {
81
+ configurable: true,
82
+ writable: true,
83
+ value: (command, handler) => originalAddHandler(command, installedPolicy.wrapHandler(command, handler)),
84
+ });
65
85
  }
66
86
  //# sourceMappingURL=matter-command-response.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"matter-command-response.js","sourceRoot":"","sources":["../../src/utils/matter-command-response.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AA4BhD,MAAM,iBAAiB,GAAG,IAAI,OAAO,EAA2B,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,UAAU,kCAAkC,CAChD,QAAa,EACb,MAAmC;IAEnC,MAAM,cAAc,GAAG,QAAQ,EAAE,cAAc,CAAC;IAChD,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,CAAC,cAAc,KAAK,UAAU;QACxE,OAAO;IAET,MAAM,SAAS,GAAG,iBAAiB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxD,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,MAAM,sBAAsB,GAC1B,cAAc,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,eAAe,GAAoB,EAAE,MAAM,EAAE,CAAC;IACpD,iBAAiB,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IAEvD,cAAc,CAAC,cAAc,GAAG,KAAK,EACnC,OAAe,EACf,GAAG,IAAe,EAClB,EAAE;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,eAAe,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,SAAS,GAA4B,OAAO,CAAC,OAAO,EAAE;aACzD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;aACpD,IAAI,CACH,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EACxC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CACtC,CAAC;QACJ,IAAI,KAAgD,CAAC;QACrD,MAAM,SAAS,GACb,eAAe,CAAC,MAAM,CAAC,SAAS,IAAI,4BAA4B,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACjC,SAAS;YACT,IAAI,OAAO,CAAiB,CAAC,OAAO,EAAE,EAAE;gBACtC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YACpE,CAAC,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC/B,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,CACvC,OAAO,EACP,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EACtB,0BAA0B,CAC3B,CAAC;YACF,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;gBACxC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;gBAC1C,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,CACvC,OAAO,EACP,UAAU,EACV,WAAW,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EACrD,IAAI,CACL,CAAC;gBACF,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBACjC,IAAI,CAAC;wBACH,MAAM,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CACtC,OAAO,EACP,WAAW,CAAC,KAAK,EACjB,IAAI,CACL,CAAC;oBACJ,CAAC;oBAAC,MAAM,CAAC;wBACP,qEAAqE;oBACvE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC7B,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,CACvC,OAAO,EACP,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EACtB,QAAQ,CACT,CAAC;YACF,KAAK,OAAO,CAAC,OAAO,CAClB,eAAe,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAClE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACzB,MAAM,OAAO,CAAC,KAAK,CAAC;QACtB,CAAC;QAED,eAAe,CAAC,MAAM,CAAC,gBAAgB,EAAE,CACvC,OAAO,EACP,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,EACtB,WAAW,CACZ,CAAC;QAEF,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"matter-command-response.js","sourceRoot":"","sources":["../../src/utils/matter-command-response.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare function recoverMatterReset(directory: string): Promise<void>;
2
+ export declare function stageMatterReset(directory: string): Promise<string>;
@@ -0,0 +1,74 @@
1
+ import fs from "node:fs/promises";
2
+ import path from "node:path";
3
+ const stagingPrefix = ".matter-reset-stage-";
4
+ const committedPrefix = ".matter-reset-done-";
5
+ const resetEntries = [
6
+ "device-overrides.json",
7
+ "exported-devices.json",
8
+ ".matterbridge",
9
+ ];
10
+ async function exists(file) {
11
+ try {
12
+ await fs.lstat(file);
13
+ return true;
14
+ }
15
+ catch (error) {
16
+ if (error.code === "ENOENT")
17
+ return false;
18
+ throw error;
19
+ }
20
+ }
21
+ async function restoreMatterReset(directory, staging) {
22
+ for (const entry of [...resetEntries].reverse()) {
23
+ const backup = path.join(staging, entry);
24
+ if (!(await exists(backup)))
25
+ continue;
26
+ const active = path.join(directory, entry);
27
+ if (await exists(active)) {
28
+ throw new Error(`Active reset data already exists. Recovery directory: ${staging}`);
29
+ }
30
+ await fs.rename(backup, active);
31
+ }
32
+ await fs.rmdir(staging);
33
+ }
34
+ export async function recoverMatterReset(directory) {
35
+ const entries = await fs.readdir(directory, { withFileTypes: true });
36
+ for (const entry of entries) {
37
+ if (!entry.isDirectory())
38
+ continue;
39
+ const location = path.join(directory, entry.name);
40
+ if (entry.name.startsWith(stagingPrefix)) {
41
+ await restoreMatterReset(directory, location);
42
+ }
43
+ else if (entry.name.startsWith(committedPrefix)) {
44
+ await fs.rm(location, { recursive: true, force: true });
45
+ }
46
+ }
47
+ }
48
+ export async function stageMatterReset(directory) {
49
+ const staging = await fs.mkdtemp(path.join(directory, stagingPrefix));
50
+ const committed = path.join(directory, committedPrefix + path.basename(staging).slice(stagingPrefix.length));
51
+ try {
52
+ for (const entry of resetEntries) {
53
+ try {
54
+ await fs.rename(path.join(directory, entry), path.join(staging, entry));
55
+ }
56
+ catch (error) {
57
+ if (error.code !== "ENOENT")
58
+ throw error;
59
+ }
60
+ }
61
+ await fs.rename(staging, committed);
62
+ return committed;
63
+ }
64
+ catch (error) {
65
+ try {
66
+ await restoreMatterReset(directory, staging);
67
+ }
68
+ catch (rollbackError) {
69
+ throw new AggregateError([error, rollbackError], `Unable to restore reset data. Recovery directory: ${staging}`);
70
+ }
71
+ throw error;
72
+ }
73
+ }
74
+ //# sourceMappingURL=matter-reset-storage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"matter-reset-storage.js","sourceRoot":"","sources":["../../src/utils/matter-reset-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,aAAa,GAAG,sBAAsB,CAAC;AAC7C,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAC9C,MAAM,YAAY,GAAG;IACnB,uBAAuB;IACvB,uBAAuB;IACvB,eAAe;CAChB,CAAC;AAEF,KAAK,UAAU,MAAM,CAAC,IAAY;IAChC,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,KAAK,CAAC;QACrE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,SAAiB,EAAE,OAAe;IAClE,KAAK,MAAM,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;YAAE,SAAS;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,yDAAyD,OAAO,EAAE,CACnE,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,SAAiB;IACxD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACzC,MAAM,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAClD,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,SAAiB;IACtD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IACtE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CACzB,SAAS,EACT,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CACrE,CAAC;IACF,IAAI,CAAC;QACH,KAAK,MAAM,KAAK,IAAI,YAAY,EAAE,CAAC;YACjC,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;oBAAE,MAAM,KAAK,CAAC;YACtE,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QACpC,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,kBAAkB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,aAAa,EAAE,CAAC;YACvB,MAAM,IAAI,cAAc,CACtB,CAAC,KAAK,EAAE,aAAa,CAAC,EACtB,qDAAqD,OAAO,EAAE,CAC/D,CAAC;QACJ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
@@ -0,0 +1,8 @@
1
+ /** Home Assistant temperatures follow the entity's configured unit; Matter/HAP use Celsius. */
2
+ export declare function toCelsius(value: number, unit?: unknown): number;
3
+ export declare function fromCelsius(value: number, unit?: unknown): number;
4
+ export declare function illuminance(lux: number): number;
5
+ export declare function sensorMeasurement(state: any): {
6
+ cluster: number;
7
+ value: number;
8
+ } | undefined;
@@ -0,0 +1,42 @@
1
+ /** Home Assistant temperatures follow the entity's configured unit; Matter/HAP use Celsius. */
2
+ export function toCelsius(value, unit) {
3
+ return String(unit ?? "").includes("F") ? ((value - 32) * 5) / 9 : value;
4
+ }
5
+ export function fromCelsius(value, unit) {
6
+ return String(unit ?? "").includes("F") ? (value * 9) / 5 + 32 : value;
7
+ }
8
+ export function illuminance(lux) {
9
+ return lux <= 0
10
+ ? 0
11
+ : Math.max(1, Math.min(65534, Math.round(10000 * Math.log10(lux) + 1)));
12
+ }
13
+ export function sensorMeasurement(state) {
14
+ const n = Number(state.state);
15
+ if (!Number.isFinite(n) || String(state.state).trim() === "")
16
+ return;
17
+ const unit = String(state.attributes?.unit_of_measurement ?? "");
18
+ switch (state.attributes?.device_class) {
19
+ case "temperature":
20
+ return { cluster: 0x0402, value: Math.round(toCelsius(n, unit) * 100) };
21
+ case "humidity":
22
+ case "moisture":
23
+ return {
24
+ cluster: 0x0405,
25
+ value: Math.round(Math.max(0, Math.min(100, n)) * 100),
26
+ };
27
+ case "illuminance":
28
+ return { cluster: 0x0400, value: illuminance(n) };
29
+ case "pressure":
30
+ case "atmospheric_pressure":
31
+ return {
32
+ cluster: 0x0403,
33
+ value: Math.round(unit === "Pa" ? n / 100 : unit === "kPa" ? n * 10 : n),
34
+ };
35
+ case "volume_flow_rate":
36
+ return {
37
+ cluster: 0x0404,
38
+ value: Math.round(n * (unit === "L/min" ? 0.6 : unit === "L/h" ? 0.01 : 10)),
39
+ };
40
+ }
41
+ }
42
+ //# sourceMappingURL=measurements.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"measurements.js","sourceRoot":"","sources":["../../src/utils/measurements.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAC/F,MAAM,UAAU,SAAS,CAAC,KAAa,EAAE,IAAc;IACrD,OAAO,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3E,CAAC;AACD,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,IAAc;IACvD,OAAO,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AACzE,CAAC;AACD,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,OAAO,GAAG,IAAI,CAAC;QACb,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC;AACD,MAAM,UAAU,iBAAiB,CAC/B,KAAU;IAEV,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,OAAO;IACrE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,mBAAmB,IAAI,EAAE,CAAC,CAAC;IACjE,QAAQ,KAAK,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC;QACvC,KAAK,aAAa;YAChB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC;QAC1E,KAAK,UAAU,CAAC;QAChB,KAAK,UAAU;YACb,OAAO;gBACL,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;aACvD,CAAC;QACJ,KAAK,aAAa;YAChB,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,KAAK,UAAU,CAAC;QAChB,KAAK,sBAAsB;YACzB,OAAO;gBACL,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK,CACf,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CACtD;aACF,CAAC;QACJ,KAAK,kBAAkB;YACrB,OAAO;gBACL,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE,IAAI,CAAC,KAAK,CACf,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAC1D;aACF,CAAC;IACN,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "matter-all-in-one-addon",
3
- "version": "2.3.13",
3
+ "version": "2.3.18",
4
4
  "description": "Matterbridge all-in-one addon with local storage, web UI and Home Assistant Ingress support with complete Scrypted, BLE, Smart Dimmers, Vacuum, AC, Climate, Lock and Multi-Platform ecosystem compatibility",
5
5
  "author": "chrisalvir",
6
6
  "license": "Apache-2.0",
@@ -11,7 +11,7 @@
11
11
  "access": "public"
12
12
  },
13
13
  "engines": {
14
- "node": ">=26.13.0 <27"
14
+ "node": ">=26.13.1 <27"
15
15
  },
16
16
  "type": "module",
17
17
  "main": "dist/index.js",
@@ -23,16 +23,16 @@
23
23
  "@homebridge/hap-nodejs": "2.3.0",
24
24
  "@scrypted/client": "^1.3.26",
25
25
  "@scrypted/types": "^0.5.55",
26
- "lucide-react": "^1.66.0",
26
+ "lucide-react": "^1.73.0",
27
27
  "mqtt": "^5.16.1",
28
28
  "react": "^19.3.1",
29
29
  "react-dom": "^19.3.1",
30
- "undici": "^8.12.3",
31
- "werift": "^0.26.0",
32
- "ws": "^8.22.1"
30
+ "undici": "^8.12.4",
31
+ "werift": "^0.27.0",
32
+ "ws": "^8.23.0"
33
33
  },
34
34
  "peerDependencies": {
35
- "matterbridge": ">=3.11.1"
35
+ "matterbridge": ">=3.11.3"
36
36
  },
37
37
  "devDependencies": {
38
38
  "@types/node": "^26.6.6",
@@ -40,13 +40,13 @@
40
40
  "@types/react": "^19.3.0",
41
41
  "@types/react-dom": "^19.3.0",
42
42
  "@types/ws": "^8.18.2",
43
- "@vitejs/plugin-react": "^6.2.1",
43
+ "@vitejs/plugin-react": "^6.3.0",
44
44
  "@vitest/coverage-v8": "^5.1.0",
45
- "matterbridge": "3.11.1",
46
- "prettier": "^3.9.10",
45
+ "matterbridge": "3.11.3",
46
+ "prettier": "^3.10.1",
47
47
  "qrcode": "^1.5.4",
48
48
  "typescript": "^7.0.2",
49
- "vite": "^8.3.5",
49
+ "vite": "^8.3.8",
50
50
  "vitest": "^5.1.0"
51
51
  },
52
52
  "scripts": {
@@ -78,20 +78,20 @@
78
78
  ],
79
79
  "matterbridge": {
80
80
  "name": "matter-all-in-one-chrisalvir",
81
- "version": "2.3.13",
81
+ "version": "2.3.18",
82
82
  "author": "chrisalvir",
83
83
  "description": "Standards-based Matter 1.6.1 bridge for Home Assistant"
84
84
  },
85
85
  "overrides": {
86
- "brace-expansion": "5.0.12",
87
- "ip-address": "10.7.5",
88
- "follow-redirects": "1.16.2",
86
+ "brace-expansion": "5.0.13",
87
+ "ip-address": "10.7.6",
88
+ "follow-redirects": "1.16.3",
89
89
  "multer": "^2.5.0",
90
90
  "rimraf": {
91
- "glob": "^14.0.3"
91
+ "glob": "^14.0.6"
92
92
  }
93
93
  },
94
- "packageManager": "npm@12.2.1",
94
+ "packageManager": "npm@12.2.2",
95
95
  "allowScripts": {
96
96
  "fsevents": false
97
97
  }