homebridge-plugin-klares4 2.1.1 → 2.1.2
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.
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [2.1.2] - 2026-05-19
|
|
11
|
+
|
|
12
|
+
### Fixed (Matter, critical)
|
|
13
|
+
|
|
14
|
+
- Always call `registerPlatformAccessories` for every device on every boot, including UUIDs already loaded via `configureMatterAccessory`. The 2.1.0 "cache resume" optimisation (skip register for cached UUIDs) was wrong: the Homebridge MatterServer keeps a runtime accessory map populated only on register; the matter.js storage holds fabric/ACL/endpoint state but is not enough on its own. Without re-register at boot, every subsequent `updateAccessoryState` failed with `Accessory <UUID> not found or not registered` and Apple Home saw no devices. Apple Home rooms/automations are preserved because the same UUID is reused.
|
|
15
|
+
|
|
10
16
|
## [2.1.1] - 2026-05-19
|
|
11
17
|
|
|
12
18
|
### Fixed (Matter)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matter-accessory-registry.d.ts","sourceRoot":"","sources":["../../src/platform/matter-accessory-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAkBjE,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEvF,MAAM,WAAW,kBAAkB;IAC/B,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,qBAAqB,GAAG,SAAS,CAAC;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8C;IAC5E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,qBAAqB,CAA0B;IACvD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA0B;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;gBAExC,IAAI,EAAE,kBAAkB;IAgBpC,IAAW,SAAS,IAAI,OAAO,CAE9B;IAEM,wBAAwB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAK1D,mBAAmB,IAAI,IAAI;IAIrB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzD,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5C,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAI7D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI5C,OAAO,CAAC,UAAU;YASJ,iBAAiB;YAoCjB,oBAAoB;
|
|
1
|
+
{"version":3,"file":"matter-accessory-registry.d.ts","sourceRoot":"","sources":["../../src/platform/matter-accessory-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,UAAU,CAAC;AAE/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAkBjE,MAAM,MAAM,wBAAwB,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEvF,MAAM,WAAW,kBAAkB;IAC/B,GAAG,EAAE,GAAG,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,qBAAqB,GAAG,SAAS,CAAC;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,qBAAa,uBAAuB;IAChC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0C;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA0B;IACtD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA8C;IAC5E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,OAAO,CAAC,qBAAqB,CAA0B;IACvD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA0B;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;gBAExC,IAAI,EAAE,kBAAkB;IAgBpC,IAAW,SAAS,IAAI,OAAO,CAE9B;IAEM,wBAAwB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAK1D,mBAAmB,IAAI,IAAI;IAIrB,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBzD,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAYzD,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5C,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,wBAAwB,GAAG,SAAS;IAI7D,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI5C,OAAO,CAAC,UAAU;YASJ,iBAAiB;YAoCjB,oBAAoB;IAqBlC,OAAO,CAAC,mBAAmB;YAKb,qBAAqB;IAuBnC,OAAO,CAAC,eAAe;YAcT,wBAAwB;IAWtC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,YAAY;CAavB"}
|
|
@@ -128,13 +128,14 @@ class MatterAccessoryRegistry {
|
|
|
128
128
|
};
|
|
129
129
|
this.registrations.set(device.id, reg);
|
|
130
130
|
const fromCache = this.cachedUUIDs.has(device.id);
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
131
|
+
this.log.info(`[Matter] register requested: ${device.name} (${device.type})${fromCache ? ' [cache restore]' : ''}${persistedFallback ? ' [fallback]' : ''}`);
|
|
132
|
+
// We must always call registerPlatformAccessories — the MatterServer keeps
|
|
133
|
+
// a runtime accessory map that is populated only on register. The Homebridge
|
|
134
|
+
// accessory cache (configureMatterAccessory) is necessary but NOT sufficient:
|
|
135
|
+
// without register, `updateAccessoryState` will fail with
|
|
136
|
+
// `Accessory <UUID> not found or not registered` even though the matter.js
|
|
137
|
+
// storage still holds the fabric/ACL. The same UUID is reused, so Apple Home
|
|
138
|
+
// rooms and automations survive the re-register.
|
|
138
139
|
try {
|
|
139
140
|
await this.api.matter.registerPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [matterAccessory]);
|
|
140
141
|
}
|
|
@@ -144,28 +145,10 @@ class MatterAccessoryRegistry {
|
|
|
144
145
|
}
|
|
145
146
|
void this.completeRegistration(device.id);
|
|
146
147
|
}
|
|
147
|
-
async completeRegistration(uuid
|
|
148
|
+
async completeRegistration(uuid) {
|
|
148
149
|
const reg = this.registrations.get(uuid);
|
|
149
150
|
if (!reg || reg.status !== 'pending')
|
|
150
151
|
return;
|
|
151
|
-
// Cache-resume path: trust the Homebridge accessory cache. The Matter
|
|
152
|
-
// storage holds the endpoint — even if matter.js hasn't restored it yet
|
|
153
|
-
// at the moment we probe, it will, and our updates go through the
|
|
154
|
-
// state-update queue anyway (which retries naturally on first failure).
|
|
155
|
-
// We do a quick best-effort probe to surface the rare "endpoint really
|
|
156
|
-
// gone" case, but never re-register on a soft timeout.
|
|
157
|
-
if (skipRegister) {
|
|
158
|
-
await (0, matter_register_probe_1.probeUntilQueryable)(this.api, this.log, (e) => this.fmtErr(e), reg, {
|
|
159
|
-
timeoutMs: 2000,
|
|
160
|
-
initialDelayMs: 200,
|
|
161
|
-
maxDelayMs: 500,
|
|
162
|
-
});
|
|
163
|
-
reg.status = 'registered';
|
|
164
|
-
reg.registeredAt = Date.now();
|
|
165
|
-
this.stateUpdateQueue.markReadyAfterBootstrap(reg);
|
|
166
|
-
this.stateUpdateQueue.scheduleFlush(uuid);
|
|
167
|
-
return;
|
|
168
|
-
}
|
|
169
152
|
const queryable = await (0, matter_register_probe_1.probeUntilQueryable)(this.api, this.log, (e) => this.fmtErr(e), reg);
|
|
170
153
|
if (!queryable) {
|
|
171
154
|
await (0, matter_registration_recovery_1.handleMissingRegisteredAccessory)(reg, this.recoveryDeps());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matter-accessory-registry.js","sourceRoot":"","sources":["../../src/platform/matter-accessory-registry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"matter-accessory-registry.js","sourceRoot":"","sources":["../../src/platform/matter-accessory-registry.ts"],"names":[],"mappings":"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"}
|