@homebridge-plugins/homebridge-tuya 2.2.1 → 3.0.0-beta.1

package/dist/local/protocol/ProtocolV31V32.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolV31V32 = void 0;
+const ProtocolUtilities_1 = require("./ProtocolUtilities");
+/** Version header bytes prepended to v3.1 plaintext payloads */
+const VERSION_HEADER_31 = Buffer.from('3.1' + '\x00'.repeat(12), 'latin1');
+class ProtocolV31V32 {
+    constructor(version = '3.1') {
+        this.isV31 = version === '3.1';
+    }
+    encodeFrame(cmd, data, seqNo, _sessionKey, deviceKey) {
+        let payload;
+        if (this.isV31) {
+            // v3.1 CONTROL cmd: prefix + MD5 hash + base64-encrypted data
+            // For the persistent-socket model used here we just send plaintext JSON
+            // (devices accept it; encryption is optional for local LAN control on v3.1)
+            payload = data;
+        }
+        else {
+            // v3.2: AES-128-ECB encrypt
+            payload = deviceKey ? (0, ProtocolUtilities_1.encryptECB)(data, deviceKey) : data;
+            // Prepend 3.x version header (15 bytes) for non-heartbeat payloads
+            if (payload.length > 0) {
+                const versionHeader = Buffer.from('3.2' + '\x00'.repeat(12), 'latin1');
+                payload = Buffer.concat([versionHeader, payload]);
+            }
+        }
+        return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, payload);
+    }
+    isFrameComplete(buffer) {
+        return (0, ProtocolUtilities_1.isFrameComplete)(buffer);
+    }
+    extractFrame(buffer) {
+        return (0, ProtocolUtilities_1.extractFrame)(buffer);
+    }
+    decodeFrame(frame, deviceKey) {
+        const msg = (0, ProtocolUtilities_1.unpackMessage55AA)(frame, undefined, false);
+        if (!msg)
+            return null;
+        if (!msg.hmacOk)
+            return null;
+        let payload = msg.payload;
+        // Strip v3.x version header if present (first 15 bytes: e.g. "3.1\x00…")
+        if (payload.length >= 15 && payload[0] === 0x33 /* '3' */) {
+            payload = payload.subarray(15);
+        }
+        // Decrypt v3.2 ECB payload
+        if (!this.isV31 && payload.length > 0) {
+            try {
+                payload = (0, ProtocolUtilities_1.decryptECB)(payload, deviceKey);
+            }
+            catch {
+                return null;
+            }
+        }
+        return { cmd: msg.cmd, payload };
+    }
+}
+exports.ProtocolV31V32 = ProtocolV31V32;
+//# sourceMappingURL=ProtocolV31V32.js.map

package/dist/local/protocol/ProtocolV31V32.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtocolV31V32.js","sourceRoot":"","sources":["../../../src/local/protocol/ProtocolV31V32.ts"],"names":[],"mappings":";;;AAgBA,2DAI6B;AAE7B,gEAAgE;AAChE,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;AAE3E,MAAa,cAAc;IAGzB,YAAY,UAAyB,KAAK;QACxC,IAAI,CAAC,KAAK,GAAG,OAAO,KAAK,KAAK,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,KAAa,EAAE,WAAoB,EAAE,SAAkB;QAC5F,IAAI,OAAe,CAAC;QAEpB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,8DAA8D;YAC9D,wEAAwE;YACxE,4EAA4E;YAC5E,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;aAAM,CAAC;YACN,4BAA4B;YAC5B,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAU,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACzD,mEAAmE;YACnE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;gBACvE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAED,OAAO,IAAA,mCAAe,EAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,eAAe,CAAC,MAAc;QAC5B,OAAO,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAA,gCAAY,EAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,SAAiB;QAC1C,MAAM,GAAG,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAE7B,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,yEAAyE;QACzE,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YAC1D,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC;gBACH,OAAO,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAC3C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;IACnC,CAAC;CACF;AA3DD,wCA2DC"}

package/dist/local/protocol/ProtocolV33.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolV33 = void 0;
+const ProtocolUtilities_1 = require("./ProtocolUtilities");
+/** 15-byte header prepended to v3.3 encrypted payloads */
+const VERSION_HEADER_33 = Buffer.from('3.3' + '\x00'.repeat(12), 'latin1');
+class ProtocolV33 {
+    encodeFrame(cmd, data, seqNo, _sessionKey, deviceKey) {
+        let payload = data;
+        if (deviceKey) {
+            payload = (0, ProtocolUtilities_1.encryptECB)(data, deviceKey);
+        }
+        // Prepend version header for commands that need it
+        if (!ProtocolUtilities_1.NO_VERSION_HEADER_CMDS.has(cmd) && payload.length > 0) {
+            payload = Buffer.concat([VERSION_HEADER_33, payload]);
+        }
+        // v3.3 uses CRC32 (no hmacKey)
+        return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, payload);
+    }
+    isFrameComplete(buffer) {
+        return (0, ProtocolUtilities_1.isFrameComplete)(buffer);
+    }
+    extractFrame(buffer) {
+        return (0, ProtocolUtilities_1.extractFrame)(buffer);
+    }
+    decodeFrame(frame, deviceKey) {
+        const msg = (0, ProtocolUtilities_1.unpackMessage55AA)(frame, undefined, false);
+        if (!msg)
+            return null;
+        if (!msg.hmacOk)
+            return null;
+        let payload = msg.payload;
+        // Strip version header ("3.3\x00…", 15 bytes)
+        if (payload.length >= 15 && payload[0] === 0x33 /* '3' */) {
+            payload = payload.subarray(15);
+        }
+        if (payload.length === 0) {
+            // Heartbeat or empty ACK — return as-is
+            return { cmd: msg.cmd, payload };
+        }
+        // Decrypt ECB
+        try {
+            payload = (0, ProtocolUtilities_1.decryptECB)(payload, deviceKey);
+        }
+        catch {
+            return null;
+        }
+        return { cmd: msg.cmd, payload };
+    }
+}
+exports.ProtocolV33 = ProtocolV33;
+//# sourceMappingURL=ProtocolV33.js.map

package/dist/local/protocol/ProtocolV33.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtocolV33.js","sourceRoot":"","sources":["../../../src/local/protocol/ProtocolV33.ts"],"names":[],"mappings":";;;AASA,2DAK6B;AAE7B,0DAA0D;AAC1D,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;AAE3E,MAAa,WAAW;IACtB,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,KAAa,EAAE,WAAoB,EAAE,SAAkB;QAC5F,IAAI,OAAO,GAAG,IAAI,CAAC;QAEnB,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,GAAG,IAAA,8BAAU,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACxC,CAAC;QAED,mDAAmD;QACnD,IAAI,CAAC,0CAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3D,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,+BAA+B;QAC/B,OAAO,IAAA,mCAAe,EAAC,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,eAAe,CAAC,MAAc;QAC5B,OAAO,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAA,gCAAY,EAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,SAAiB;QAC1C,MAAM,GAAG,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAE7B,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,8CAA8C;QAC9C,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YAC1D,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,wCAAwC;YACxC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;QACnC,CAAC;QAED,cAAc;QACd,IAAI,CAAC;YACH,OAAO,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;IACnC,CAAC;CACF;AAnDD,kCAmDC"}

package/dist/local/protocol/ProtocolV34.js

@@ -0,0 +1,104 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolV34 = void 0;
+const ProtocolUtilities_1 = require("./ProtocolUtilities");
+/** 15-byte version header prepended to v3.4 payloads before ECB encryption */
+const VERSION_HEADER_34 = Buffer.from('3.4' + '\x00'.repeat(12), 'latin1');
+class ProtocolV34 {
+    encodeFrame(cmd, data, seqNo, sessionKey, deviceKey) {
+        let payload = data;
+        if (sessionKey) {
+            // Post-exchange: encrypt with session key and sign with session key
+            if (!ProtocolUtilities_1.NO_VERSION_HEADER_CMDS.has(cmd)) {
+                payload = Buffer.concat([VERSION_HEADER_34, payload]);
+            }
+            payload = (0, ProtocolUtilities_1.encryptECB)(payload, sessionKey);
+            return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, payload, sessionKey);
+        }
+        if (deviceKey) {
+            // During key exchange (cmd 3 / cmd 5): ECB-encrypt payload with real device key
+            // and HMAC-sign the frame with the real device key (mirrors tinytuya _encode_message)
+            payload = (0, ProtocolUtilities_1.encryptECB)(payload, deviceKey);
+            return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, payload, deviceKey);
+        }
+        // Fallback: unencrypted + CRC32 (should not normally reach here for v3.4)
+        return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, payload);
+    }
+    isFrameComplete(buffer) {
+        return (0, ProtocolUtilities_1.isFrameComplete)(buffer);
+    }
+    extractFrame(buffer) {
+        return (0, ProtocolUtilities_1.extractFrame)(buffer);
+    }
+    decodeFrame(frame, deviceKey, sessionKey) {
+        // v3.4 uses HMAC-SHA256 (sessionKey for normal frames, deviceKey during key exchange)
+        const hmacKey = sessionKey ?? deviceKey;
+        const msg = (0, ProtocolUtilities_1.unpackMessage55AA)(frame, hmacKey, false);
+        if (!msg)
+            return null;
+        if (!msg.hmacOk)
+            return null;
+        let payload = msg.payload;
+        if (payload.length === 0) {
+            return { cmd: msg.cmd, payload };
+        }
+        // Decrypt ECB with session key
+        const decryptKey = sessionKey ?? deviceKey;
+        try {
+            payload = (0, ProtocolUtilities_1.decryptECB)(payload, decryptKey);
+        }
+        catch {
+            return null;
+        }
+        // Only strip version header for commands that include it.
+        // Key exchange cmds (3,4,5) and heartbeats (9) are in NO_VERSION_HEADER_CMDS
+        // – their payloads must NOT be sliced or the nonce/HMAC bytes get corrupted.
+        if (!ProtocolUtilities_1.NO_VERSION_HEADER_CMDS.has(msg.cmd) && payload.length >= 15 && payload[0] === 0x33 /* '3' */) {
+            payload = payload.subarray(15);
+        }
+        return { cmd: msg.cmd, payload };
+    }
+    /**
+     * Key exchange step 1: build the payload client sends to device (cmd 3).
+     * Returns an encrypted 16-byte nonce; stores localNonce for later.
+     *
+     * Matches TinyTuya _negotiate_session_key_generate_step_1:
+     *   local_nonce = b'0123456789abcdef'
+     *   payload = MessagePayload(SESS_KEY_NEG_START, local_nonce)
+     */
+    buildKeyExchangeStep1(localNonce, _deviceKey) {
+        // The nonce is sent as-is (no encryption at the payload level for cmd 3;
+        // the frame itself carries the real key's HMAC wrapper).
+        return localNonce;
+    }
+    /**
+     * Key exchange step 3 + finalize.
+     *
+     * @param step2Payload  Decrypted 48-byte payload from device cmd-4 frame.
+     * @param localNonce    The 16-byte nonce we sent in step 1.
+     * @param realKey       The device's real local key (pre-exchange).
+     * @returns { step3Payload, sessionKey } or null on verification failure.
+     *
+     * Matches TinyTuya _negotiate_session_key_generate_step_3 + _generate_finalize.
+     */
+    processKeyExchangeStep2(step2Payload, localNonce, realKey) {
+        if (step2Payload.length < 48)
+            return null;
+        const remoteNonce = step2Payload.subarray(0, 16);
+        const receivedHmac = step2Payload.subarray(16, 48);
+        // Verify HMAC(localNonce, realKey)
+        const expectedHmac = (0, ProtocolUtilities_1.hmac)(localNonce, realKey);
+        if (!receivedHmac.equals(expectedHmac))
+            return null;
+        // Step 3 payload: HMAC(remoteNonce, realKey)
+        const step3Payload = (0, ProtocolUtilities_1.hmac)(remoteNonce, realKey);
+        // Finalise: sessionKey = AES-ECB-encrypt(localNonce XOR remoteNonce, realKey)
+        const xored = Buffer.allocUnsafe(16);
+        for (let i = 0; i < 16; i++)
+            xored[i] = localNonce[i] ^ remoteNonce[i];
+        const sessionKey = (0, ProtocolUtilities_1.encryptECBNoPad)(xored, realKey);
+        return { step3Payload, sessionKey };
+    }
+}
+exports.ProtocolV34 = ProtocolV34;
+//# sourceMappingURL=ProtocolV34.js.map

package/dist/local/protocol/ProtocolV34.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtocolV34.js","sourceRoot":"","sources":["../../../src/local/protocol/ProtocolV34.ts"],"names":[],"mappings":"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"}

package/dist/local/protocol/ProtocolV35.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProtocolV35 = void 0;
+const ProtocolUtilities_1 = require("./ProtocolUtilities");
+/** 15-byte version header prepended to v3.5 payloads before GCM encryption */
+const VERSION_HEADER_35 = Buffer.from('3.5' + '\x00'.repeat(12), 'latin1');
+class ProtocolV35 {
+    encodeFrame(cmd, data, seqNo, sessionKey, _deviceKey) {
+        if (!sessionKey) {
+            // During key exchange (before session key exists), send as 0x55AA plain
+            return (0, ProtocolUtilities_1.packMessage55AA)(seqNo, cmd, data);
+        }
+        let plaintext = data;
+        if (!ProtocolUtilities_1.NO_VERSION_HEADER_CMDS.has(cmd)) {
+            plaintext = Buffer.concat([VERSION_HEADER_35, plaintext]);
+        }
+        return (0, ProtocolUtilities_1.packMessage6699)(seqNo, cmd, plaintext, sessionKey);
+    }
+    isFrameComplete(buffer) {
+        return (0, ProtocolUtilities_1.isFrameComplete)(buffer);
+    }
+    extractFrame(buffer) {
+        return (0, ProtocolUtilities_1.extractFrame)(buffer);
+    }
+    decodeFrame(frame, deviceKey, sessionKey) {
+        // Use deviceKey as fallback during key exchange (before session key is established)
+        const key = sessionKey ?? deviceKey;
+        const msg = (0, ProtocolUtilities_1.unpackMessage6699)(frame, key);
+        if (!msg)
+            return null;
+        let payload = msg.payload;
+        // Only strip version header for commands that include it.
+        // Key exchange cmds (3,4,5) and heartbeats are in NO_VERSION_HEADER_CMDS.
+        if (!ProtocolUtilities_1.NO_VERSION_HEADER_CMDS.has(msg.cmd) && payload.length >= 15 && payload[0] === 0x33 /* '3' */) {
+            payload = payload.subarray(15);
+        }
+        return { cmd: msg.cmd, payload };
+    }
+    /**
+     * Key exchange step 1 payload (cmd 3): just the local nonce.
+     * Matches TinyTuya _negotiate_session_key_generate_step_1.
+     */
+    buildKeyExchangeStep1(localNonce, _realKey) {
+        return localNonce;
+    }
+    /**
+     * Process step-2 response and derive session key.
+     * For v3.5 the finalize differs from v3.4: uses GCM encrypt.
+     * Matches TinyTuya _negotiate_session_key_generate_finalize for version 3.5.
+     */
+    processKeyExchangeStep2(step2Payload, localNonce, realKey) {
+        if (step2Payload.length < 48)
+            return null;
+        const remoteNonce = step2Payload.subarray(0, 16);
+        const receivedHmac = step2Payload.subarray(16, 48);
+        // Verify HMAC(localNonce, realKey)
+        const expectedHmac = (0, ProtocolUtilities_1.hmac)(localNonce, realKey);
+        if (!receivedHmac.equals(expectedHmac))
+            return null;
+        // Step 3: HMAC(remoteNonce, realKey)
+        const step3Payload = (0, ProtocolUtilities_1.hmac)(remoteNonce, realKey);
+        // Finalize (v3.5 path):
+        //   xored = localNonce XOR remoteNonce
+        //   iv    = localNonce[:12]
+        //   encrypted = GCM-encrypt(xored, realKey, iv=iv)
+        //   sessionKey = encrypted[12:28]  (first 16 bytes of ciphertext, after IV)
+        const xored = Buffer.allocUnsafe(16);
+        for (let i = 0; i < 16; i++)
+            xored[i] = localNonce[i] ^ remoteNonce[i];
+        const iv = localNonce.subarray(0, 12);
+        const { ciphertext } = (0, ProtocolUtilities_1.encryptGCM)(xored, realKey, iv);
+        const sessionKey = ciphertext.subarray(0, 16);
+        return { step3Payload, sessionKey };
+    }
+}
+exports.ProtocolV35 = ProtocolV35;
+//# sourceMappingURL=ProtocolV35.js.map

package/dist/local/protocol/ProtocolV35.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProtocolV35.js","sourceRoot":"","sources":["../../../src/local/protocol/ProtocolV35.ts"],"names":[],"mappings":";;;AAqBA,2DAK6B;AAE7B,8EAA8E;AAC9E,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;AAE3E,MAAa,WAAW;IACtB,WAAW,CAAC,GAAW,EAAE,IAAY,EAAE,KAAa,EAAE,UAAmB,EAAE,UAAmB;QAC5F,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,wEAAwE;YACxE,OAAO,IAAA,mCAAe,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,0CAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,IAAA,mCAAe,EAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IAED,eAAe,CAAC,MAAc;QAC5B,OAAO,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,OAAO,IAAA,gCAAY,EAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,WAAW,CAAC,KAAa,EAAE,SAAiB,EAAE,UAAmB;QAC/D,oFAAoF;QACpF,MAAM,GAAG,GAAG,UAAU,IAAI,SAAS,CAAC;QACpC,MAAM,GAAG,GAAG,IAAA,qCAAiB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QAEtB,IAAI,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE1B,0DAA0D;QAC1D,0EAA0E;QAC1E,IAAI,CAAC,0CAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YAClG,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,qBAAqB,CAAC,UAAkB,EAAE,QAAgB;QACxD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;OAIG;IACH,uBAAuB,CACrB,YAAoB,EACpB,UAAkB,EAClB,OAAe;QAEf,IAAI,YAAY,CAAC,MAAM,GAAG,EAAE;YAAE,OAAO,IAAI,CAAC;QAE1C,MAAM,WAAW,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAEnD,mCAAmC;QACnC,MAAM,YAAY,GAAG,IAAA,wBAAI,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC;YAAE,OAAO,IAAI,CAAC;QAEpD,qCAAqC;QACrC,MAAM,YAAY,GAAG,IAAA,wBAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAEhD,wBAAwB;QACxB,uCAAuC;QACvC,4BAA4B;QAC5B,mDAAmD;QACnD,4EAA4E;QAC5E,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE;YAAE,KAAK,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACvE,MAAM,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,8BAAU,EAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAE9C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;IACtC,CAAC;CACF;AAnFD,kCAmFC"}

package/dist/platform.js

@@ -40,24 +40,46 @@ exports.TuyaPlatform = void 0;
 const jsonschema_1 = require("jsonschema");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const TuyaDeviceManager_1 = __importDefault(require("./device/TuyaDeviceManager"));
-const TuyaCustomDeviceManager_1 = __importDefault(require("./device/TuyaCustomDeviceManager"));
-const TuyaHomeDeviceManager_1 = __importDefault(require("./device/TuyaHomeDeviceManager"));
+const TuyaDeviceManager_1 = __importDefault(require("./cloud/device/TuyaDeviceManager"));
+const TuyaCustomDeviceManager_1 = __importDefault(require("./cloud/device/TuyaCustomDeviceManager"));
+const TuyaHomeDeviceManager_1 = __importDefault(require("./cloud/device/TuyaHomeDeviceManager"));
+const TuyaOpenAPI_1 = __importStar(require("./cloud/api/TuyaOpenAPI"));
+// Local imports (from src/local/)
+const LocalDeviceManager_1 = __importDefault(require("./local/LocalDeviceManager"));
+// Shared imports (from src/shared/)
+const AccessoryFactory_1 = __importDefault(require("./shared/accessories/AccessoryFactory"));
+const util_1 = require("./shared/util/util");
+const ConfigHash_1 = require("./shared/util/ConfigHash");
 const settings_1 = require("./settings");
 const config_1 = require("./config");
-const AccessoryFactory_1 = __importDefault(require("./accessory/AccessoryFactory"));
-const util_1 = require("./util/util");
-const TuyaOpenAPI_1 = __importStar(require("./core/TuyaOpenAPI"));
 /**
- * HomebridgePlatform
- * This class is the main constructor for your plugin, this is where you should
- * parse the user config and discover/register accessories with Homebridge.
+ * TuyaPlatform — unified Homebridge platform supporting both Tuya Cloud (REST/MQTT)
+ * and Tuya Local (direct LAN TCP) device communication.
+ *
+ * Set `mode` in your config to:
+ *   "cloud"  — cloud only (default, backward-compatible)
+ *   "local"  — local LAN only
+ *   "both"   — cloud + local simultaneously
  */
 class TuyaPlatform {
     validate() {
+        // Local-only mode does not need cloud options
+        if (this.mode === 'local') {
+            if (!this.platformConfig.local) {
+                this.log.error('mode is "local" but no "local" config block found.');
+                return false;
+            }
+            return true;
+        }
+        // Both mode requires a local block in addition to cloud options
+        if (this.mode === 'both' && !this.platformConfig.local) {
+            this.log.error('mode is "both" but no "local" config block found.');
+            return false;
+        }
+        // Cloud or "both" mode requires cloud options
         let result;
         if (!this.options) {
-            this.log.error('Not configured, exit.');
+            this.log.error('Not configured — "options" block is required for cloud mode, exit.');
             return false;
         }
         else if (this.options.projectType === '1') {
@@ -132,9 +154,15 @@ class TuyaPlatform {
         this.api = api;
         this.Service = this.api.hap.Service;
         this.Characteristic = this.api.hap.Characteristic;
+        /** Cast config to our typed shape for easy access. */
+        this.platformConfig = this.config;
+        /** Cloud credentials block (options.projectType, accessId, etc.) */
         this.options = this.config.options;
+        /** Active communication mode. Defaults to "cloud" for backward compatibility. */
+        this.mode = this.config.mode ?? 'cloud';
         // this is used to track restored cached accessories
         this.cachedAccessories = [];
+        /** All active accessory handler instances. */
         this.accessoryHandlers = [];
         if (!this.validate()) {
             return;
@@ -166,71 +194,111 @@ class TuyaPlatform {
      * must not be registered again to prevent "duplicate UUID" errors.
      */
     async initDevices() {
-        let devices;
-        if (this.options.projectType === '1') {
-            devices = await this.initCustomProject();
-        }
-        else if (this.options.projectType === '2') {
-            devices = await this.initHomeProject();
-        }
-        else {
-            this.log.warn(`Unsupported projectType: ${this.config.options.projectType}.`);
-        }
-        if (!devices || !this.deviceManager) {
-            return;
-        }
-        // override device category
-        for (const device of devices) {
-            const deviceConfig = this.getDeviceConfig(device);
-            if (!deviceConfig || !deviceConfig.category) {
-                continue;
+        const cloudEnabled = this.mode === 'cloud' || this.mode === 'both';
+        const localEnabled = this.mode === 'local' || this.mode === 'both';
+        // ── Local devices ────────────────────────────────────────────────────────
+        if (localEnabled && this.platformConfig.local) {
+            this.log.info('[Local] Initialising local device manager…');
+            this.localDeviceManager = new LocalDeviceManager_1.default(this.platformConfig.local, this.log, this.api.user.storagePath());
+            await this.localDeviceManager.initLocalDevices();
+            this.localDeviceManager.connectAllDevices();
+            this.localDeviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_ADD, (device) => this.addAccessory(device, 'local'));
+            this.localDeviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_INFO_UPDATE, this.updateAccessoryInfo.bind(this));
+            this.localDeviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_STATUS_UPDATE, this.updateAccessoryStatus.bind(this));
+            this.localDeviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_DELETE, this.removeAccessory.bind(this));
+            const localDevices = [...this.localDeviceManager.devices.values()];
+            this.log.info(`[Local] Registered ${localDevices.length} local device(s).`);
+            for (const device of localDevices) {
+                this.addAccessory(device, 'local');
             }
-            this.log.warn('Override %o category from %o to %o', device.name, device.category, deviceConfig.category);
-            device.category = deviceConfig.category;
         }
-        // override device bridged
-        for (const device of devices) {
-            const deviceConfig = this.getDeviceConfig(device);
-            if (!deviceConfig || !deviceConfig.unbridged) {
-                continue;
+        // ── Cloud devices ────────────────────────────────────────────────────────
+        if (cloudEnabled && this.options) {
+            let devices;
+            if (this.options.projectType === '1') {
+                devices = await this.initCustomProject();
+            }
+            else if (this.options.projectType === '2') {
+                devices = await this.initHomeProject();
+            }
+            else {
+                this.log.warn(`Unsupported projectType: ${this.options['projectType']}.`);
+            }
+            if (devices && this.deviceManager) {
+                // Initialize config hash tracker for cloud devices
+                this.configHash = new ConfigHash_1.ConfigHash(this.api.user.storagePath(), 'tuya-cloud-configs');
+                // Apply device config overrides
+                for (const device of devices) {
+                    const deviceConfig = this.getDeviceConfig(device, 'cloud');
+                    if (deviceConfig?.category) {
+                        this.log.warn('Override %o category from %o to %o', device.name, device.category, deviceConfig.category);
+                        device.category = deviceConfig.category;
+                    }
+                    if (deviceConfig?.unbridged) {
+                        this.log.warn('Unbridge %o category %o', device.name, device.category);
+                        device.unbridged = deviceConfig.unbridged;
+                    }
+                    // Check if config has changed since last run
+                    // Hash the device override fields that affect accessory structure
+                    const configToHash = {
+                        deviceId: device.id,
+                        customCategory: deviceConfig?.category,
+                        unbridged: deviceConfig?.unbridged ?? false,
+                        schemaOverrides: deviceConfig?.schema ? JSON.stringify(deviceConfig.schema) : undefined,
+                        adaptiveLighting: deviceConfig?.adaptiveLighting ?? false,
+                    };
+                    const { changed: configChanged } = this.configHash.hasConfigChanged(device.id, configToHash);
+                    device.configChanged = configChanged;
+                    if (configChanged) {
+                        this.log.info(`[Cloud] Device config changed for "${device.name}" (${device.id}), will rebuild services`);
+                    }
+                }
+                await this.deviceManager.updateInfraredRemotes(devices);
+                this.log.info(`[Cloud] Got ${devices.length} device(s) and scene(s).`);
+                const file = path_1.default.join(this.api.user.persistPath(), `TuyaDeviceList.${this.deviceManager.api.tokenInfo.uid}.json`);
+                this.log.info('Device list saved at %s', file);
+                if (!fs_1.default.existsSync(this.api.user.persistPath())) {
+                    await fs_1.default.promises.mkdir(this.api.user.persistPath());
+                }
+                await fs_1.default.promises.writeFile(file, JSON.stringify(devices, null, 2));
+                for (const device of devices) {
+                    this.addAccessory(device, 'cloud');
+                }
+                this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_ADD, (device) => this.addAccessory(device, 'cloud'));
+                this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_INFO_UPDATE, this.updateAccessoryInfo.bind(this));
+                this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_STATUS_UPDATE, this.updateAccessoryStatus.bind(this));
+                this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_DELETE, this.removeAccessory.bind(this));
             }
-            this.log.warn('Unbridge %o category %o', device.name, device.category);
-            device.unbridged = deviceConfig.unbridged;
-        }
-        await this.deviceManager.updateInfraredRemotes(devices);
-        this.log.info(`Got ${devices.length} device(s) and scene(s).`);
-        const file = path_1.default.join(this.api.user.persistPath(), `TuyaDeviceList.${this.deviceManager.api.tokenInfo.uid}.json`);
-        this.log.info('Device list saved at %s', file);
-        if (!fs_1.default.existsSync(this.api.user.persistPath())) {
-            await fs_1.default.promises.mkdir(this.api.user.persistPath());
-        }
-        await fs_1.default.promises.writeFile(file, JSON.stringify(devices, null, 2));
-        // add accessories
-        for (const device of devices) {
-            this.addAccessory(device);
         }
-        // remove unused accessories
+        // Remove stale cached accessories not claimed by any device
         for (const cachedAccessory of this.cachedAccessories) {
             this.log.warn('Removing unused accessory from cache:', cachedAccessory.displayName);
             this.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, [cachedAccessory]);
         }
         this.cachedAccessories = [];
-        this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_ADD, this.addAccessory.bind(this));
-        this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_INFO_UPDATE, this.updateAccessoryInfo.bind(this));
-        this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_STATUS_UPDATE, this.updateAccessoryStatus.bind(this));
-        this.deviceManager.on(TuyaDeviceManager_1.default.Events.DEVICE_DELETE, this.removeAccessory.bind(this));
     }
-    getDeviceConfig(device) {
+    getDeviceConfig(device, source) {
         if (!this.options.deviceOverrides) {
             return undefined;
         }
-        const deviceConfig = this.options.deviceOverrides.find(config => config.id === device.id || config.id === device.uuid);
-        const productConfig = this.options.deviceOverrides.find(config => config.id === device.product_id);
-        const globalConfig = this.options.deviceOverrides.find(config => config.id === 'global');
-        return deviceConfig || productConfig || globalConfig;
+        // Find matching override, respecting source filtering
+        // Since deviceOverrides are in the cloud config, they default to cloud-only
+        const effectiveSource = source || 'cloud';
+        const matches = this.options.deviceOverrides.filter(config => {
+            const sourceMatch = config.source
+                ? (config.source === 'both' || config.source === effectiveSource) // explicit source
+                : effectiveSource === 'cloud'; // default: cloud-only
+            const idMatch = config.id === device.id || config.id === device.uuid ||
+                config.id === device.product_id || config.id === 'global';
+            return sourceMatch && idMatch;
+        });
+        // Return device-specific config, then product, then global
+        return matches.find(config => config.id === device.id || config.id === device.uuid) ||
+            matches.find(config => config.id === device.product_id) ||
+            matches.find(config => config.id === 'global');
     }
-    getDeviceSchemaConfig(device, code) {
-        const deviceConfig = this.getDeviceConfig(device);
+    getDeviceSchemaConfig(device, code, source) {
+        const deviceConfig = this.getDeviceConfig(device, source);
         if (!deviceConfig || !deviceConfig.schema) {
             return undefined;
         }
@@ -242,13 +310,15 @@ class TuyaPlatform {
                 item['oldCode'] = undefined;
             }
         });
-        // ignore case - guard against undefined codes
+        // ignore case - allow both old (code) and migrated (newCode) names
         const schemaConfig = deviceConfig.schema.find(item => {
-            const itemCode = (item.newCode ?? item.code);
-            if (!itemCode || !code) {
+            if (!code) {
                 return false;
             }
-            return itemCode.toString().toLowerCase() === code.toString().toLowerCase();
+            const target = code.toString().toLowerCase();
+            const legacyCode = item.code?.toString().toLowerCase();
+            const migratedCode = item.newCode?.toString().toLowerCase();
+            return legacyCode === target || migratedCode === target;
         });
         if (!schemaConfig) {
             return undefined;
@@ -316,7 +386,7 @@ class TuyaPlatform {
         res = await api.customLogin(DEFAULT_USER, DEFAULT_USER);
         if (res.success === false) {
             this.log.error(`Login failed. code=${res.code}, msg=${res.msg}`);
-            if (TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]) {
+            if (res.code && TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]) {
                 this.log.error(TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]);
             }
             return undefined;
@@ -342,7 +412,7 @@ class TuyaPlatform {
         res = await api.homeLogin(countryCode, username, password, appSchema);
         if (res.success === false) {
             this.log.error(`Login failed. code=${res.code}, msg=${res.msg}`);
-            if (TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]) {
+            if (res.code && TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]) {
                 this.log.error(TuyaOpenAPI_1.LOGIN_ERROR_MESSAGES[res.code]);
             }
             return undefined;
@@ -394,7 +464,17 @@ class TuyaPlatform {
         }
         return devices;
     }
-    addAccessory(device) {
+    addAccessory(device, source) {
+        // Apply device override config before checking if hidden
+        const deviceConfig = this.getDeviceConfig(device, source);
+        if (deviceConfig?.category) {
+            this.log.warn('Override %o category from %o to %o', device.name, device.category, deviceConfig.category);
+            device.category = deviceConfig.category;
+        }
+        if (deviceConfig?.unbridged) {
+            this.log.warn('Unbridge %o category %o', device.name, device.category);
+            device.unbridged = deviceConfig.unbridged;
+        }
         if (device.category === 'hidden') {
             this.log.info('Hide Accessory:', device.name);
             return;
@@ -466,7 +546,7 @@ class TuyaPlatform {
         this.log.info('Removing existing accessory from cache:', handler.accessory.displayName);
     }
     getAccessoryHandler(deviceID) {
-        return this.accessoryHandlers.find(handler => handler.device.id === deviceID);
+        return this.accessoryHandlers.find(handler => handler.device?.id === deviceID);
     }
     createWeatherDevice(device, result) {
         const key = `weather-${device.owner_id}`;