eufy-security-client 3.6.0 → 3.7.1

package/build/p2p/utils.js

@@ -36,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLockP2PCommand = exports.getSmartSafeP2PCommand = exports.decodeSmartSafeData = exports.decodeP2PCloudIPs = exports.buildTalkbackAudioFrameHeader = exports.getLockV12Key = exports.getAdvancedLockKey = exports.eufyKDF = exports.decryptPayloadData = exports.encryptPayloadData = exports.buildVoidCommandPayload = exports.checkT8420 = exports.getVideoCodec = exports.generateAdvancedLockAESKey = exports.eslTimestamp = exports.decodeBase64 = exports.decodeLockPayload = exports.getLockVectorBytes = exports.encodeLockPayload = exports.generateLockSequence = exports.getCurrentTimeInSeconds = exports.generateBasicLockAESKey = exports.encryptLockAESData = exports.decryptLockAESData = exports.isIFrame = exports.findStartCode = exports.decryptAESData = exports.getNewRSAPrivateKey = exports.getRSAPrivateKey = exports.sortP2PMessageParts = exports.buildCommandWithStringTypePayload = exports.buildCommandHeader = exports.hasHeader = exports.sendMessage = exports.buildIntStringCommandPayload = exports.buildStringTypeCommandPayload = exports.buildIntCommandPayload = exports.buildCheckCamPayload2 = exports.buildCheckCamPayload = exports.buildLookupWithKeyPayload3 = exports.buildLookupWithKeyPayload2 = exports.buildLookupWithKeyPayload = exports.paddingP2PData = exports.decryptP2PData = exports.encryptP2PData = exports.getP2PCommandEncryptionKey = exports.isP2PCommandEncrypted = exports.getLocalIpAddress = exports.isPrivateIp = exports.MAGIC_WORD = void 0;
-exports.readNullTerminatedBuffer = exports.getSmartLockP2PCommand = exports.generateSmartLockAESKey = exports.getSmartLockCurrentTimeInSeconds = exports.isCharging = exports.isPlugSolarCharging = exports.isSolarCharging = exports.isUsbCharging = exports.getNullTerminatedString = exports.RGBColorToDecimal = exports.DecimalToRGBColor = exports.getLockV12P2PCommand = void 0;
+exports.getSmartSafeP2PCommand = exports.decodeSmartSafeData = exports.decodeP2PCloudIPs = exports.buildTalkbackAudioFrameHeader = exports.decryptP2PKeyECDH = exports.getLockV12Key = exports.getAdvancedLockKey = exports.eufyKDF = exports.decryptPayloadData = exports.encryptPayloadData = exports.buildVoidCommandPayload = exports.checkT8420 = exports.getVideoCodec = exports.generateAdvancedLockAESKey = exports.eslTimestamp = exports.decodeBase64 = exports.decodeLockPayload = exports.getLockVectorBytes = exports.encodeLockPayload = exports.generateLockSequence = exports.getCurrentTimeInSeconds = exports.generateBasicLockAESKey = exports.encryptLockAESData = exports.decryptLockAESData = exports.isIFrame = exports.findStartCode = exports.decryptAESData = exports.getNewRSAPrivateKey = exports.getRSAPrivateKey = exports.sortP2PMessageParts = exports.buildCommandWithStringTypePayload = exports.buildCommandHeader = exports.hasHeader = exports.sendMessage = exports.buildIntStringCommandPayload = exports.buildStringTypeCommandPayload = exports.buildIntCommandPayload = exports.buildCheckCamPayload2 = exports.buildCheckCamPayload = exports.buildLookupWithKeyPayload3 = exports.buildLookupWithKeyPayload2 = exports.buildLookupWithKeyPayload = exports.paddingP2PData = exports.decryptP2PData = exports.encryptP2PData = exports.getP2PCommandEncryptionKey = exports.isP2PCommandEncrypted = exports.getLocalIpAddress = exports.isPrivateIp = exports.MAGIC_WORD = void 0;
+exports.readNullTerminatedBuffer = exports.getSmartLockP2PCommand = exports.generateSmartLockAESKey = exports.getSmartLockCurrentTimeInSeconds = exports.isCharging = exports.isPlugSolarCharging = exports.isSolarCharging = exports.isUsbCharging = exports.getNullTerminatedString = exports.RGBColorToDecimal = exports.DecimalToRGBColor = exports.getLockV12P2PCommand = exports.getLockP2PCommand = void 0;
 exports.isP2PQueueMessage = isP2PQueueMessage;
 const node_rsa_1 = __importDefault(require("node-rsa"));
 const CryptoJS = __importStar(require("crypto-js"));
@@ -60,7 +60,9 @@ const isPrivateIp = (ip) => /^(::f{4}:)?10\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1
 exports.isPrivateIp = isPrivateIp;
 const stringWithLength = (input, chunkLength = 128) => {
     const stringAsBuffer = Buffer.from(input);
-    const bufferSize = stringAsBuffer.byteLength < chunkLength ? chunkLength : Math.ceil(stringAsBuffer.byteLength / chunkLength) * chunkLength;
+    const bufferSize = stringAsBuffer.byteLength < chunkLength
+        ? chunkLength
+        : Math.ceil(stringAsBuffer.byteLength / chunkLength) * chunkLength;
     const result = Buffer.alloc(bufferSize);
     stringAsBuffer.copy(result);
     return result;
@@ -89,7 +91,16 @@ const p2pDidToBuffer = (p2pDid) => {
     return Buffer.concat([buf1, buf2, buf3], 20);
 };
 const isP2PCommandEncrypted = function (cmd) {
-    return [1001, 1002, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1015, 1017, 1019, 1035, 1045, 1056, 1145, 1146, 1152, 1200, 1207, 1210, 1213, 1214, 1226, 1227, 1229, 1230, 1233, 1236, 1240, 1241, 1243, 1246, 1272, 1273, 1275, 1400, 1401, 1402, 1403, 1408, 1409, 1410, 1412, 1413, 1506, 1507, 1607, 1609, 1610, 1611, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709, 1013, 1202, 1205, 1206, 1024, 1025, 1132, 1215, 1216, 1217, 1414, 1026, 1164, 1201, 1027, 1047, 1048, 1029, 1034, 1036, 1043, 1057, 1203, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1232, 1234, 1235, 1237, 1238, 1248, 1253, 1257, 1269, 1800, 1037, 1040, 1038, 1049, 1050, 1051, 1054, 1060, 1204, 1254, 1255, 1256, 1258, 1259, 1260, 1261, 1262, 1264, 1271, 1350, 1404, 1101, 1106, 1108, 1110, 1111, 1112, 1113, 1114, 1116, 1117, 1118, 1119, 1121, 1103, 1129, 1211, 1228, 1231, 1242, 1249, 1250, 1251, 1252, 1405, 1406, 1407, 1700].includes(cmd);
+    return [
+        1001, 1002, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1015, 1017, 1019, 1035, 1045, 1056, 1145, 1146, 1152,
+        1200, 1207, 1210, 1213, 1214, 1226, 1227, 1229, 1230, 1233, 1236, 1240, 1241, 1243, 1246, 1272, 1273, 1275, 1400,
+        1401, 1402, 1403, 1408, 1409, 1410, 1412, 1413, 1506, 1507, 1607, 1609, 1610, 1611, 1702, 1703, 1704, 1705, 1706,
+        1707, 1708, 1709, 1013, 1202, 1205, 1206, 1024, 1025, 1132, 1215, 1216, 1217, 1414, 1026, 1164, 1201, 1027, 1047,
+        1048, 1029, 1034, 1036, 1043, 1057, 1203, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1232, 1234, 1235, 1237, 1238,
+        1248, 1253, 1257, 1269, 1800, 1037, 1040, 1038, 1049, 1050, 1051, 1054, 1060, 1204, 1254, 1255, 1256, 1258, 1259,
+        1260, 1261, 1262, 1264, 1271, 1350, 1404, 1101, 1106, 1108, 1110, 1111, 1112, 1113, 1114, 1116, 1117, 1118, 1119,
+        1121, 1103, 1129, 1211, 1228, 1231, 1242, 1249, 1250, 1251, 1252, 1405, 1406, 1407, 1700,
+    ].includes(cmd);
 };
 exports.isP2PCommandEncrypted = isP2PCommandEncrypted;
 const getP2PCommandEncryptionKey = function (serialNumber, p2pDid) {
@@ -99,19 +110,13 @@ exports.getP2PCommandEncryptionKey = getP2PCommandEncryptionKey;
 const encryptP2PData = (data, key) => {
     const cipher = (0, crypto_1.createCipheriv)("aes-128-ecb", key, null);
     cipher.setAutoPadding(false);
-    return Buffer.concat([
-        cipher.update(data),
-        cipher.final()
-    ]);
+    return Buffer.concat([cipher.update(data), cipher.final()]);
 };
 exports.encryptP2PData = encryptP2PData;
 const decryptP2PData = (data, key) => {
     const decipher = (0, crypto_1.createDecipheriv)("aes-128-ecb", key, null);
     decipher.setAutoPadding(false);
-    return Buffer.concat([
-        decipher.update(data),
-        decipher.final()
-    ]);
+    return Buffer.concat([decipher.update(data), decipher.final()]);
 };
 exports.decryptP2PData = decryptP2PData;
 const paddingP2PData = (data, blocksize = 16) => {
@@ -130,7 +135,9 @@ const buildLookupWithKeyPayload = (socket, p2pDid, dskKey) => {
     //const ip = socket.address().address;
     const ip = (0, exports.getLocalIpAddress)(addressInfo.address);
     const temp_buff = [];
-    ip.split(".").reverse().forEach(element => {
+    ip.split(".")
+        .reverse()
+        .forEach((element) => {
         temp_buff.push(Number.parseInt(element));
     });
     const ipAsBuffer = Buffer.from(temp_buff);
@@ -153,7 +160,10 @@ const buildLookupWithKeyPayload3 = (p2pDid, address, data) => {
     const portAsBuffer = Buffer.allocUnsafe(2);
     portAsBuffer.writeUInt16LE(address.port, 0);
     const temp_buff = [];
-    address.host.split(".").reverse().forEach(element => {
+    address.host
+        .split(".")
+        .reverse()
+        .forEach((element) => {
         temp_buff.push(Number.parseInt(element));
     });
     const ipAsBuffer = Buffer.from(temp_buff);
@@ -183,10 +193,7 @@ const buildIntCommandPayload = (encryptionType, encryptionKey, serialNumber, p2p
     valueBuffer.writeUInt32LE(value, 0);
     const headerBuffer = Buffer.allocUnsafe(2);
     const strValueBuffer = strValue.length === 0 ? Buffer.from([]) : stringWithLength(strValue);
-    const tmpDataBuffer = Buffer.concat([
-        valueBuffer,
-        strValueBuffer
-    ]);
+    const tmpDataBuffer = Buffer.concat([valueBuffer, strValueBuffer]);
     const dataBuffer = encrypted ? (0, exports.paddingP2PData)(tmpDataBuffer) : tmpDataBuffer;
     headerBuffer.writeUInt16LE(dataBuffer.length, 0);
     return Buffer.concat([
@@ -195,7 +202,7 @@ const buildIntCommandPayload = (encryptionType, encryptionKey, serialNumber, p2p
         magicBuffer,
         channelBuffer,
         emptyBuffer,
-        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer
+        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer,
     ]);
 };
 exports.buildIntCommandPayload = buildIntCommandPayload;
@@ -208,11 +215,7 @@ const buildStringTypeCommandPayload = (encryptionType, encryptionKey, serialNumb
     const strValueBuffer = stringWithLength(strValue);
     const strValueSubBuffer = stringWithLength(strValueSub);
     const headerBuffer = Buffer.allocUnsafe(2);
-    const tmpDataBuffer = Buffer.concat([
-        someBuffer,
-        strValueBuffer,
-        strValueSubBuffer
-    ]);
+    const tmpDataBuffer = Buffer.concat([someBuffer, strValueBuffer, strValueSubBuffer]);
     const dataBuffer = encrypted ? (0, exports.paddingP2PData)(tmpDataBuffer) : tmpDataBuffer;
     headerBuffer.writeUInt16LE(dataBuffer.length, 0);
     return Buffer.concat([
@@ -221,7 +224,7 @@ const buildStringTypeCommandPayload = (encryptionType, encryptionKey, serialNumb
         magicBuffer,
         channelBuffer,
         emptyBuffer,
-        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer
+        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer,
     ]);
 };
 exports.buildStringTypeCommandPayload = buildStringTypeCommandPayload;
@@ -237,12 +240,7 @@ const buildIntStringCommandPayload = (encryptionType, encryptionKey, serialNumbe
     const strValueBuffer = strValue.length === 0 ? Buffer.from([]) : stringWithLength(strValue);
     const strValueSubBuffer = strValueSub.length === 0 ? Buffer.from([]) : stringWithLength(strValueSub);
     const headerBuffer = Buffer.allocUnsafe(2);
-    const tmpDataBuffer = Buffer.concat([
-        someintBuffer,
-        valueBuffer,
-        strValueBuffer,
-        strValueSubBuffer
-    ]);
+    const tmpDataBuffer = Buffer.concat([someintBuffer, valueBuffer, strValueBuffer, strValueSubBuffer]);
     const dataBuffer = encrypted ? (0, exports.paddingP2PData)(tmpDataBuffer) : tmpDataBuffer;
     headerBuffer.writeUInt16LE(dataBuffer.length, 0);
     return Buffer.concat([
@@ -251,7 +249,7 @@ const buildIntStringCommandPayload = (encryptionType, encryptionKey, serialNumbe
         magicBuffer,
         channelBuffer,
         emptyBuffer,
-        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer
+        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer,
     ]);
 };
 exports.buildIntStringCommandPayload = buildIntStringCommandPayload;
@@ -305,13 +303,14 @@ const buildCommandWithStringTypePayload = (encryptionType, encryptionKey, serial
         magicBuffer,
         channelBuffer,
         emptyBuffer,
-        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer
+        encrypted ? (0, exports.encryptP2PData)(dataBuffer, encryptionKey) : dataBuffer,
     ]);
 };
 exports.buildCommandWithStringTypePayload = buildCommandWithStringTypePayload;
 const sortP2PMessageParts = (messages) => {
     let completeMessage = Buffer.from([]);
-    Object.keys(messages).map(Number)
+    Object.keys(messages)
+        .map(Number)
         .sort((a, b) => {
         if (Math.abs(a - b) > 65000) {
             if (a < b) {
@@ -339,7 +338,7 @@ const getRSAPrivateKey = (pem, enableEmbeddedPKCS1Support = false) => {
     }
     key.importKey(pem, "pkcs8");
     const options = {
-        encryptionScheme: "pkcs1"
+        encryptionScheme: "pkcs1",
     };
     if (enableEmbeddedPKCS1Support) {
         options.environment = "browser";
@@ -351,7 +350,7 @@ exports.getRSAPrivateKey = getRSAPrivateKey;
 const getNewRSAPrivateKey = (enableEmbeddedPKCS1Support = false) => {
     const key = new node_rsa_1.default({ b: 1024 });
     const options = {
-        encryptionScheme: "pkcs1"
+        encryptionScheme: "pkcs1",
     };
     if (enableEmbeddedPKCS1Support) {
         options.environment = "browser";
@@ -363,11 +362,11 @@ exports.getNewRSAPrivateKey = getNewRSAPrivateKey;
 const decryptAESData = (hexkey, data) => {
     const key = CryptoJS.enc.Hex.parse(hexkey);
     const cipherParams = CryptoJS.lib.CipherParams.create({
-        ciphertext: CryptoJS.enc.Hex.parse(data.toString("hex"))
+        ciphertext: CryptoJS.enc.Hex.parse(data.toString("hex")),
     });
     const decrypted = CryptoJS.AES.decrypt(cipherParams, key, {
         mode: CryptoJS.mode.ECB,
-        padding: CryptoJS.pad.NoPadding
+        padding: CryptoJS.pad.NoPadding,
     });
     return Buffer.from(CryptoJS.enc.Hex.stringify(decrypted), "hex");
 };
@@ -376,12 +375,13 @@ const findStartCode = (data) => {
     if (data !== undefined && data.length > 0) {
         if (data.length >= 4) {
             const startcode = [...data.subarray(0, 4)];
-            if ((startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 1) || (startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 0 && startcode[3] === 1))
+            if ((startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 1) ||
+                (startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 0 && startcode[3] === 1))
                 return true;
         }
         else if (data.length === 3) {
             const startcode = [...data.subarray(0, 3)];
-            if ((startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 1))
+            if (startcode[0] === 0 && startcode[1] === 0 && startcode[2] === 1)
                 return true;
         }
     }
@@ -404,12 +404,12 @@ const decryptLockAESData = (key, iv, data) => {
     const ekey = CryptoJS.enc.Hex.parse(key);
     const eiv = CryptoJS.enc.Hex.parse(iv);
     const cipherParams = CryptoJS.lib.CipherParams.create({
-        ciphertext: CryptoJS.enc.Hex.parse(data.toString("hex"))
+        ciphertext: CryptoJS.enc.Hex.parse(data.toString("hex")),
     });
     const decrypted = CryptoJS.AES.decrypt(cipherParams, ekey, {
         iv: eiv,
         mode: CryptoJS.mode.CBC,
-        padding: CryptoJS.pad.Pkcs7
+        padding: CryptoJS.pad.Pkcs7,
     });
     return Buffer.from(CryptoJS.enc.Hex.stringify(decrypted), "hex");
 };
@@ -420,7 +420,7 @@ const encryptLockAESData = (key, iv, data) => {
     const encrypted = CryptoJS.AES.encrypt(CryptoJS.enc.Hex.parse(data.toString("hex")), ekey, {
         iv: eiv,
         mode: CryptoJS.mode.CBC,
-        padding: CryptoJS.pad.Pkcs7
+        padding: CryptoJS.pad.Pkcs7,
     });
     return Buffer.from(CryptoJS.enc.Hex.stringify(encrypted.ciphertext), "hex");
 };
@@ -431,7 +431,8 @@ const generateBasicLockAESKey = (adminID, stationSN) => {
     const encStationSerial = encoder.encode(stationSN);
     const array = [104, -83, -72, 38, -107, 99, -110, 17, -95, -121, 54, 57, -46, -98, -111, 89];
     for (let i = 0; i < 16; i++) {
-        array[i] = (array[i] + encStationSerial[((encStationSerial[i] * 3) + 5) % 16] + encOwnerID[((encOwnerID[i] * 3) + 5) % 40]);
+        array[i] =
+            array[i] + encStationSerial[(encStationSerial[i] * 3 + 5) % 16] + encOwnerID[(encOwnerID[i] * 3 + 5) % 40];
     }
     return Buffer.from(array).toString("hex");
 };
@@ -487,7 +488,7 @@ exports.decodeBase64 = decodeBase64;
 const eslTimestamp = function (timestamp_in_sec = new Date().getTime() / 1000) {
     const array = [];
     for (let pos = 0; pos < 4; pos++) {
-        array[pos] = ((timestamp_in_sec >> (pos * 8)) & 255);
+        array[pos] = (timestamp_in_sec >> (pos * 8)) & 255;
     }
     return array;
 };
@@ -520,7 +521,12 @@ const getVideoCodec = (data) => {
 };
 exports.getVideoCodec = getVideoCodec;
 const checkT8420 = (serialNumber) => {
-    if (!(serialNumber !== undefined && serialNumber !== null && serialNumber.length > 0 && serialNumber.startsWith("T8420")) || serialNumber.length <= 7 || serialNumber[6] != "6") {
+    if (!(serialNumber !== undefined &&
+        serialNumber !== null &&
+        serialNumber.length > 0 &&
+        serialNumber.startsWith("T8420")) ||
+        serialNumber.length <= 7 ||
+        serialNumber[6] != "6") {
         return false;
     }
     return true;
@@ -531,13 +537,7 @@ const buildVoidCommandPayload = (channel = 255) => {
     const emptyBuffer = Buffer.from([0x00, 0x00]);
     const magicBuffer = Buffer.from([0x01, 0x00]);
     const channelBuffer = Buffer.from([channel, 0x00]);
-    return Buffer.concat([
-        headerBuffer,
-        emptyBuffer,
-        magicBuffer,
-        channelBuffer,
-        emptyBuffer
-    ]);
+    return Buffer.concat([headerBuffer, emptyBuffer, magicBuffer, channelBuffer, emptyBuffer]);
 };
 exports.buildVoidCommandPayload = buildVoidCommandPayload;
 function isP2PQueueMessage(type) {
@@ -545,18 +545,12 @@ function isP2PQueueMessage(type) {
 }
 const encryptPayloadData = (data, key, iv) => {
     const cipher = (0, crypto_1.createCipheriv)("aes-128-cbc", key, iv);
-    return Buffer.concat([
-        cipher.update(data),
-        cipher.final()
-    ]);
+    return Buffer.concat([cipher.update(data), cipher.final()]);
 };
 exports.encryptPayloadData = encryptPayloadData;
 const decryptPayloadData = (data, key, iv) => {
     const cipher = (0, crypto_1.createDecipheriv)("aes-128-cbc", key, iv);
-    return Buffer.concat([
-        cipher.update(data),
-        cipher.final()
-    ]);
+    return Buffer.concat([cipher.update(data), cipher.final()]);
 };
 exports.decryptPayloadData = decryptPayloadData;
 const eufyKDF = (key) => {
@@ -568,7 +562,9 @@ const eufyKDF = (key) => {
     let tmpBuffer = staticBuffer;
     for (let step = 0; step < steps; ++step) {
         tmpBuffer = (0, crypto_1.createHmac)("sha256", key).update(tmpBuffer).digest();
-        const digest = (0, crypto_1.createHmac)("sha256", key).update(Buffer.concat([tmpBuffer, staticBuffer])).digest();
+        const digest = (0, crypto_1.createHmac)("sha256", key)
+            .update(Buffer.concat([tmpBuffer, staticBuffer]))
+            .digest();
         digest.copy(buffer, hash_length * step);
     }
     return buffer.subarray(0, digest_length);
@@ -585,7 +581,12 @@ const getAdvancedLockKey = (key, publicKey) => {
     hmac.update(randomValue);
     hmac.update(encryptedData);
     const hmacDigest = hmac.digest();
-    return Buffer.concat([Buffer.from(ecdh.getPublicKey("hex", "compressed"), "hex"), randomValue, encryptedData, hmacDigest]).toString("hex");
+    return Buffer.concat([
+        Buffer.from(ecdh.getPublicKey("hex", "compressed"), "hex"),
+        randomValue,
+        encryptedData,
+        hmacDigest,
+    ]).toString("hex");
 };
 exports.getAdvancedLockKey = getAdvancedLockKey;
 const getLockV12Key = (key, publicKey) => {
@@ -599,9 +600,75 @@ const getLockV12Key = (key, publicKey) => {
     hmac.update(randomValue);
     hmac.update(encryptedData);
     const hmacDigest = hmac.digest();
-    return Buffer.concat([Buffer.from(ecdh.getPublicKey("hex", "compressed"), "hex"), randomValue, encryptedData, hmacDigest]).toString("hex");
+    return Buffer.concat([
+        Buffer.from(ecdh.getPublicKey("hex", "compressed"), "hex"),
+        randomValue,
+        encryptedData,
+        hmacDigest,
+    ]).toString("hex");
 };
 exports.getLockV12Key = getLockV12Key;
+/**
+ * Derive P2P session key using ECDH (for devices like E340 that use ECC instead of RSA).
+ *
+ * The `encryptedKey` buffer from CMD_GATEWAYINFO likely contains:
+ *   - Device's ECDH public key (either compressed 33 bytes or uncompressed 65 bytes)
+ *   - Possibly followed by encrypted session key data
+ *
+ * The `eccPrivateKey` is the 32-byte hex string from the cipher API response.
+ */
+const decryptP2PKeyECDH = (encryptedKey, eccPrivateKey) => {
+    const ecdh = (0, crypto_1.createECDH)("prime256v1");
+    ecdh.setPrivateKey(Buffer.from(eccPrivateKey, "hex"));
+    // Determine pubkey format and extract the device's public key
+    const firstByte = encryptedKey[0];
+    let devicePubKey;
+    let pubKeyLen;
+    if (firstByte === 0x04) {
+        // Uncompressed public key (65 bytes)
+        pubKeyLen = 65;
+    }
+    else if (firstByte === 0x02 || firstByte === 0x03) {
+        // Compressed public key (33 bytes)
+        pubKeyLen = 33;
+    }
+    else {
+        // Unknown format — try treating first 33 bytes as pubkey
+        pubKeyLen = 33;
+    }
+    // Scenario A/B: encryptedKey IS just the device's public key (no ECIES envelope)
+    if (encryptedKey.length <= pubKeyLen + 1) {
+        devicePubKey = encryptedKey.subarray(0, pubKeyLen);
+        const sharedSecret = ecdh.computeSecret(devicePubKey);
+        return sharedSecret.subarray(0, 16);
+    }
+    // Scenario C: ECIES envelope — pubkey + iv(16) + ciphertext(48) + hmac(32) = 96 bytes after pubkey
+    devicePubKey = encryptedKey.subarray(0, pubKeyLen);
+    const remainder = encryptedKey.subarray(pubKeyLen);
+    const sharedSecret = ecdh.computeSecret(devicePubKey);
+    const derivedKey = (0, exports.eufyKDF)(sharedSecret);
+    const aesKey = derivedKey.subarray(0, 16);
+    // ECIES standard layout: iv(16) + ciphertext(N*16, typically 48) + hmac(32)
+    // Minimum valid: iv(16) + ciphertext(16) + hmac(32) = 64 bytes
+    if (remainder.length >= 64) {
+        const iv = remainder.subarray(0, 16);
+        const hmacLen = 32;
+        const ciphertext = remainder.subarray(16, remainder.length - hmacLen);
+        // Ensure ciphertext length is a multiple of 16 (AES block size)
+        const alignedLen = Math.floor(ciphertext.length / 16) * 16;
+        if (alignedLen > 0) {
+            const alignedCiphertext = ciphertext.subarray(0, alignedLen);
+            const decipher = (0, crypto_1.createDecipheriv)("aes-128-cbc", aesKey, iv);
+            decipher.setAutoPadding(false);
+            const decrypted = Buffer.concat([decipher.update(alignedCiphertext), decipher.final()]);
+            // Return first 16 bytes as the P2P session key (AES-128-ECB requires 16-byte key)
+            return decrypted.subarray(0, 16);
+        }
+    }
+    // Fallback: if remainder is too small for ECIES, try using raw shared secret
+    return sharedSecret.subarray(0, 16);
+};
+exports.decryptP2PKeyECDH = decryptP2PKeyECDH;
 const buildTalkbackAudioFrameHeader = (audioData, channel = 0) => {
     const audioDataLength = Buffer.allocUnsafe(4);
     audioDataLength.writeUInt32LE(audioData.length);
@@ -615,13 +682,7 @@ const buildTalkbackAudioFrameHeader = (audioData, channel = 0) => {
     const magicBuffer = Buffer.from([0x01, 0x00]);
     const channelBuffer = Buffer.from([channel, 0x00]);
     const emptyBuffer = Buffer.from([0x00, 0x00]);
-    return Buffer.concat([
-        bytesToRead,
-        magicBuffer,
-        channelBuffer,
-        emptyBuffer,
-        audioDataHeader
-    ]);
+    return Buffer.concat([bytesToRead, magicBuffer, channelBuffer, emptyBuffer, audioDataHeader]);
 };
 exports.buildTalkbackAudioFrameHeader = buildTalkbackAudioFrameHeader;
 const decodeP2PCloudIPs = (data) => {
@@ -633,12 +694,15 @@ const decodeP2PCloudIPs = (data) => {
         for (let j = 0; j < i; j++) {
             z = z ^ output[j];
         }
-        const x = (data.charCodeAt(i * 2 + 1) - "A".charCodeAt(0));
+        const x = data.charCodeAt(i * 2 + 1) - "A".charCodeAt(0);
         const y = (data.charCodeAt(i * 2) - "A".charCodeAt(0)) * 0x10;
-        output[i] = z ^ lookupTable[i % lookupTable.length] ^ x + y;
+        output[i] = z ^ lookupTable[i % lookupTable.length] ^ (x + y);
     }
     const result = [];
-    output.toString("utf8").split(",").forEach((ip) => {
+    output
+        .toString("utf8")
+        .split(",")
+        .forEach((ip) => {
         if (ip !== "") {
             result.push({ host: ip, port: 32100 });
         }
@@ -654,7 +718,7 @@ const decodeSmartSafeData = function (deviceSN, data) {
         commandCode: response.getCommandCode(),
         packageFlag: response.getPackageFlag(),
         responseCode: response.getResponseCode(),
-        data: (0, exports.decryptPayloadData)(response.getData(), Buffer.from(deviceSN), Buffer.from(device_1.SmartSafe.IV, "hex"))
+        data: (0, exports.decryptPayloadData)(response.getData(), Buffer.from(deviceSN), Buffer.from(device_1.SmartSafe.IV, "hex")),
     };
 };
 exports.decodeSmartSafeData = decodeSmartSafeData;
@@ -666,7 +730,15 @@ const getSmartSafeP2PCommand = function (deviceSN, user_id, command, intCommand,
         .setDataType(-1)
         .setData(encPayload)
         .getSmartSafeCommand();
-    logging_1.rootP2PLogger.debug(`Generate smart safe command`, { deviceSN: deviceSN, userId: user_id, command: command, intCommand: intCommand, channel: channel, sequence: sequence, data: data.toString("hex") });
+    logging_1.rootP2PLogger.debug(`Generate smart safe command`, {
+        deviceSN: deviceSN,
+        userId: user_id,
+        command: command,
+        intCommand: intCommand,
+        channel: channel,
+        sequence: sequence,
+        data: data.toString("hex"),
+    });
     return {
         commandType: types_1.CommandType.CMD_SET_PAYLOAD,
         value: JSON.stringify({
@@ -678,9 +750,9 @@ const getSmartSafeP2PCommand = function (deviceSN, user_id, command, intCommand,
                 data: bleCommand.toString("hex"),
                 prj_id: command,
                 seq_num: sequence,
-            }
+            },
         }),
-        channel: channel
+        channel: channel,
     };
 };
 exports.getSmartSafeP2PCommand = getSmartSafeP2PCommand;
@@ -689,7 +761,13 @@ const getLockP2PCommand = function (deviceSN, user_id, command, channel, lockPub
     const ecdhKey = (0, exports.getAdvancedLockKey)(key, lockPublicKey);
     const iv = (0, exports.getLockVectorBytes)(deviceSN);
     const encPayload = (0, exports.encryptLockAESData)(key, iv, Buffer.from(JSON.stringify(payload)));
-    logging_1.rootP2PLogger.debug(`Generate lock command`, { deviceSN: deviceSN, userId: user_id, command: command, channel: channel, data: JSON.stringify(payload) });
+    logging_1.rootP2PLogger.debug(`Generate lock command`, {
+        deviceSN: deviceSN,
+        userId: user_id,
+        command: command,
+        channel: channel,
+        data: JSON.stringify(payload),
+    });
     return {
         commandType: types_1.CommandType.CMD_SET_PAYLOAD,
         value: JSON.stringify({
@@ -698,10 +776,10 @@ const getLockP2PCommand = function (deviceSN, user_id, command, channel, lockPub
             cmd: command,
             mChannel: channel,
             mValue3: 0,
-            payload: encPayload.toString("base64")
+            payload: encPayload.toString("base64"),
         }).replace(/=/g, "\\u003d"),
         channel: channel,
-        aesKey: key
+        aesKey: key,
     };
 };
 exports.getLockP2PCommand = getLockP2PCommand;
@@ -710,7 +788,14 @@ const getLockV12P2PCommand = function (deviceSN, user_id, command, channel, lock
     const encryptedAesKey = (0, exports.getLockV12Key)(key, lockPublicKey);
     const iv = (0, exports.getLockVectorBytes)(deviceSN);
     const encPayload = (0, exports.encryptPayloadData)(data, Buffer.from(key, "hex"), Buffer.from(iv, "hex"));
-    logging_1.rootP2PLogger.debug(`Generate smart lock v12 command`, { deviceSN: deviceSN, userId: user_id, command: command, channel: channel, sequence: sequence, data: data.toString("hex") });
+    logging_1.rootP2PLogger.debug(`Generate smart lock v12 command`, {
+        deviceSN: deviceSN,
+        userId: user_id,
+        command: command,
+        channel: channel,
+        sequence: sequence,
+        data: data.toString("hex"),
+    });
     const bleCommand = new ble_1.BleCommandFactory()
         .setVersionCode(device_1.Lock.VERSION_CODE_LOCKV12)
         .setCommandCode(Number.parseInt(types_1.ESLBleCommand[types_1.ESLCommand[command]])) //TODO: Change internal command identification?
@@ -731,9 +816,9 @@ const getLockV12P2PCommand = function (deviceSN, user_id, command, channel, lock
                     apiCommand: command,
                     lock_payload: bleCommand.getLockV12Command().toString("hex"),
                     seq_num: sequence,
-                }
-            })
-        }
+                },
+            }),
+        },
     };
 };
 exports.getLockV12P2PCommand = getLockV12P2PCommand;
@@ -746,7 +831,7 @@ const DecimalToRGBColor = function (color) {
 };
 exports.DecimalToRGBColor = DecimalToRGBColor;
 const RGBColorToDecimal = function (color) {
-    return (color.red << 16) + (color.green << 8) + (color.blue);
+    return (color.red << 16) + (color.green << 8) + color.blue;
 };
 exports.RGBColorToDecimal = RGBColorToDecimal;
 const getNullTerminatedString = function (data, encoding) {
@@ -785,7 +870,15 @@ const getSmartLockP2PCommand = function (deviceSN, user_id, command, channel, se
     const key = (0, exports.generateSmartLockAESKey)(user_id, time);
     const iv = (0, exports.getLockVectorBytes)(deviceSN);
     const encPayload = (0, exports.encryptPayloadData)(data, key, Buffer.from(iv, "hex"));
-    logging_1.rootP2PLogger.debug(`Generate smart lock command`, { deviceSN: deviceSN, userId: user_id, command: command, channel: channel, sequence: sequence, data: data.toString("hex"), functionType: functionType });
+    logging_1.rootP2PLogger.debug(`Generate smart lock command`, {
+        deviceSN: deviceSN,
+        userId: user_id,
+        command: command,
+        channel: channel,
+        sequence: sequence,
+        data: data.toString("hex"),
+        functionType: functionType,
+    });
     let commandCode = 0;
     if (functionType === types_1.SmartLockFunctionType.TYPE_1) {
         commandCode = Number.parseInt(types_1.SmartLockBleCommandFunctionType1[types_1.SmartLockCommand[command]]);
@@ -812,9 +905,9 @@ const getSmartLockP2PCommand = function (deviceSN, user_id, command, channel, se
                     lock_payload: bleCommand.getSmartLockCommand().toString("hex"),
                     seq_num: sequence,
                     time: time,
-                }
-            })
-        }
+                },
+            }),
+        },
     };
 };
 exports.getSmartLockP2PCommand = getSmartLockP2PCommand;