homebridge-roborock-vacuum 1.2.3 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-roborock-vacuum",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "Roborock Vacuum Cleaner - plugin for Homebridge.",
   "license": "MIT",
   "keywords": [
@@ -33,17 +33,17 @@
   },
   "dependencies": {
     "abstract-things": "0.9.0",
-    "axios": "^1.7.7",
+    "axios": "^1.11.0",
     "binary-parser": "^2.2.1",
     "chalk": "4.1.2",
     "crc-32": "^1.2.2",
     "debug": "4.3.5",
     "deep-equal": "2.2.3",
-    "express": "^4.21.0",
+    "express": "^4.21.2",
     "jszip": "^3.10.1",
-    "mqtt": "^5.10.1",
+    "mqtt": "^5.14.0",
     "node-forge": "^1.3.1",
-    "rxjs": "^7.5.6",
+    "rxjs": "^7.8.2",
     "semver": "7.6.2",
     "tinkerhub-discovery": "0.3.1",
     "yargs": "15.4.1"

package/roborockLib/data/UserData

@@ -1,4 +1,4 @@
 {
-  "val": "{\"uid\":1466357,\"tokentype\":\"\",\"token\":\"rr6238c899155830:1JZxT5AINkUhb5JDyL8S+w==:0197442b8fc07eeab8ec99362de5bcc3\",\"rruid\":\"rr6238c899155830\",\"region\":\"us\",\"countrycode\":\"886\",\"country\":\"TW\",\"nickname\":\"tasict\",\"rriot\":{\"u\":\"1RQsQJ2o8bxMCo6F45pICu\",\"s\":\"DSeoyC\",\"h\":\"A6whcnODPe\",\"k\":\"kmat3nT2\",\"r\":{\"r\":\"US\",\"a\":\"https://api-us.roborock.com\",\"m\":\"ssl://mqtt-us.roborock.com:8883\",\"l\":\"https://wood-us.roborock.com\"}},\"tuyaDeviceState\":0,\"avatarurl\":\"https://files.roborock.com/iottest/default_avatar.png\"}",
+  "val": "{\"uid\":1466357,\"tokentype\":\"\",\"token\":\"rr6238c899155830:1JZxT5AINkUhb5JDyL8S+w==:0198e43aaf3174e3af11c0741cb4d6bc\",\"rruid\":\"rr6238c899155830\",\"region\":\"us\",\"countrycode\":\"886\",\"country\":\"TW\",\"nickname\":\"tasict\",\"rriot\":{\"u\":\"1RQsQJ2o8bxMCo6F45pICu\",\"s\":\"hSvNfL\",\"h\":\"FqZ6lwhKjH\",\"k\":\"HM375uvZ\",\"r\":{\"r\":\"US\",\"a\":\"https://api-us.roborock.com\",\"m\":\"ssl://mqtt-us.roborock.com:8883\",\"l\":\"https://wood-us.roborock.com\"}},\"tuyaDeviceState\":0,\"avatarurl\":\"https://files.roborock.com/iot/default_avatar.png\"}",
   "ack": true
 }

package/roborockLib/lib/localConnector.js

@@ -192,6 +192,12 @@ class localConnector {
 			server.on("message", (msg) => {
 				const parsedMessage = localMessageParser.parse(msg);
 				const decodedMessage = this.decryptECB(parsedMessage.payload, BROADCAST_TOKEN); // this might be decryptCBC for A01. Haven't checked this yet
+				
+				if(decodedMessage == null){
+					this.adapter.log.debug(`getLocalDevices: decodedMessage is null`);
+					return;
+				}
+				
 				const parsedDecodedMessage = JSON.parse(decodedMessage);
 				this.adapter.log.debug(`getLocalDevices parsedDecodedMessage: ${JSON.stringify(parsedDecodedMessage)}`);
 
@@ -224,15 +230,53 @@ class localConnector {
 		});
 	}
 
-	decryptECB(encrypted, aesKey) {
-		const decipher = crypto.createDecipheriv("aes-128-ecb", aesKey, null);
+safeRemovePkcs7(buf) {
+  if (!buf || buf.length === 0) return Buffer.alloc(0);
+  const pad = buf[buf.length - 1];
+  // 僅在 1..16 且最後 pad 個 byte 都等於 pad 時才移除
+  if (pad > 0 && pad <= 16) {
+    for (let i = 0; i < pad; i++) {
+      if (buf[buf.length - 1 - i] !== pad) return buf; // padding 形狀不對，視為無 padding
+    }
+    return buf.slice(0, buf.length - pad);
+  }
+  return buf; // 看起來沒有標準 PKCS#7 padding
+}
+
+decryptECB(encrypted, aesKey) {
+	// --- 1) Key/輸入檢查 ---
+	const key = Buffer.isBuffer(aesKey) ? aesKey : Buffer.from(aesKey);
+	if (key.length !== 16) {
+		// AES-128 需要 16 bytes 的 key
+		return null;
+	}
+
+	const input = Buffer.isBuffer(encrypted) ? encrypted : Buffer.from(encrypted, "latin1"); // "binary" 等同 latin1
+	if (input.length === 0 || (input.length % 16) !== 0) {
+		// 密文長度不是 16 的倍數，多半是封包不完整；丟回 null 讓上層忽略本次
+		return null;
+	}
+
+	try {
+		// --- 2) 固定用 Buffer，關閉自動 padding（你要自己移除） ---
+		const decipher = crypto.createDecipheriv("aes-128-ecb", key, null);
 		decipher.setAutoPadding(false);
-		let decrypted = decipher.update(encrypted, "binary", "utf8");
-		decrypted += decipher.final("utf8");
-		return this.removePadding(decrypted);
+
+		const decryptedBuf = Buffer.concat([decipher.update(input), decipher.final()]);
+		const unpadded = safeRemovePkcs7(decryptedBuf);
+
+		// 若原協定內容是 UTF-8，這裡再轉字串；否則直接回傳 Buffer 讓上層處理
+		return unpadded.toString("utf8");
+	} catch (err) {
+		// 例如 wrong final block length、key 不對等情況
+		// 這裡不要讓程式炸掉，直接忽略這個封包
+		// 你也可以在這裡做一次 debug log
+		// console.debug("decryptECB error:", err);
+		return null;
 	}
+}
 
-	removePadding(str) {
+removePadding(str) {
 		const paddingLength = str.charCodeAt(str.length - 1);
 		return str.slice(0, -paddingLength);
 	}