homebridge-roborock-vacuum 1.2.3 → 1.3.0

package/homebridge-ui/public/index.js

@@ -0,0 +1,250 @@
+const elements = {
+  email: document.getElementById('email'),
+  password: document.getElementById('password'),
+  passwordRow: document.getElementById('password-row'),
+  baseUrl: document.getElementById('base-url'),
+  skipDevices: document.getElementById('skip-devices'),
+  debugMode: document.getElementById('debug-mode'),
+  code: document.getElementById('two-factor-code'),
+  login: document.getElementById('login'),
+  logout: document.getElementById('logout'),
+  send2fa: document.getElementById('send-2fa'),
+  verify2fa: document.getElementById('verify-2fa'),
+  twoFactorSection: document.getElementById('two-factor-section'),
+  toastContainer: document.getElementById('toast-container'),
+};
+
+function showToast(type, message) {
+  if (window.homebridge && window.homebridge.toast && typeof window.homebridge.toast[type] === 'function') {
+    window.homebridge.toast[type](message);
+    return;
+  }
+
+  const toast = document.createElement('div');
+  toast.className = `toast ${type}`;
+  toast.textContent = message;
+  elements.toastContainer.appendChild(toast);
+
+  setTimeout(() => {
+    toast.remove();
+  }, 4000);
+}
+
+async function request(path, body) {
+  try {
+    return await window.homebridge.request(path, body);
+  } catch (error) {
+    return { ok: false, message: error.message || 'Request failed.' };
+  }
+}
+
+async function loadConfig() {
+  if (!window.homebridge || typeof window.homebridge.getPluginConfig !== 'function') {
+    return;
+  }
+
+  const configs = await window.homebridge.getPluginConfig();
+  const config = configs.find((entry) => entry.platform === 'RoborockVacuumPlatform');
+  if (!config) {
+    return;
+  }
+
+  if (config.email) {
+    elements.email.value = config.email;
+  }
+  elements.baseUrl.value = normalizeBaseUrl(config.baseURL || 'https://usiot.roborock.com');
+  if (config.skipDevices) {
+    elements.skipDevices.value = config.skipDevices;
+  }
+  elements.debugMode.checked = Boolean(config.debugMode);
+
+  setLoggedInState(Boolean(config.encryptedToken));
+}
+
+function getEmail() {
+  return elements.email.value.trim();
+}
+
+function getPassword() {
+  return elements.password.value;
+}
+
+function getBaseUrl() {
+  return elements.baseUrl.value;
+}
+
+function getSkipDevices() {
+  return elements.skipDevices.value.trim();
+}
+
+function getDebugMode() {
+  return Boolean(elements.debugMode.checked);
+}
+
+function getCode() {
+  return elements.code.value.trim();
+}
+
+async function saveCredentials() {
+  const email = getEmail();
+  const baseURL = getBaseUrl();
+  const skipDevices = getSkipDevices();
+  const debugMode = getDebugMode();
+  if (!email) {
+    showToast('error', 'Email is required.');
+    return;
+  }
+
+  await updatePluginConfig({
+    email,
+    baseURL,
+    skipDevices,
+    debugMode,
+  });
+}
+
+async function login() {
+  const email = getEmail();
+  const password = getPassword();
+  const baseURL = getBaseUrl();
+  const result = await request('/auth/login', { email, password, baseURL });
+
+  if (result.ok) {
+    await updatePluginConfig({
+      email,
+      password,
+      baseURL,
+      encryptedToken: result.encryptedToken,
+    });
+    showToast('success', result.message || 'Login successful.');
+    setLoggedInState(true);
+    return;
+  }
+
+  if (result.twoFactorRequired) {
+    showToast('warning', result.message || 'Two-factor authentication required.');
+    return;
+  }
+
+  showToast('error', result.message || 'Login failed.');
+}
+
+async function sendTwoFactorEmail() {
+  const email = getEmail();
+  const baseURL = getBaseUrl();
+  if (!email) {
+    showToast('error', 'Email is required.');
+    return;
+  }
+
+  const result = await request('/auth/send-2fa-email', { email, baseURL });
+  if (result.ok) {
+    showToast('success', result.message || 'Verification email sent.');
+  } else {
+    showToast('error', result.message || 'Failed to send verification email.');
+  }
+}
+
+async function verifyTwoFactorCode() {
+  const email = getEmail();
+  const code = getCode();
+  const baseURL = getBaseUrl();
+  if (!email) {
+    showToast('error', 'Email is required.');
+    return;
+  }
+  if (!code) {
+    showToast('error', 'Verification code is required.');
+    return;
+  }
+
+  const result = await request('/auth/verify-2fa-code', { email, code, baseURL });
+  if (result.ok) {
+    await updatePluginConfig({
+      email,
+      baseURL,
+      encryptedToken: result.encryptedToken,
+    });
+    showToast('success', result.message || 'Verification successful.');
+    setLoggedInState(true);
+  } else {
+    showToast('error', result.message || 'Verification failed.');
+  }
+}
+
+async function logout() {
+  const result = await request('/auth/logout');
+  if (result.ok) {
+    await updatePluginConfig({ encryptedToken: undefined });
+    showToast('success', result.message || 'Logged out.');
+    setLoggedInState(false);
+  } else {
+    showToast('error', result.message || 'Logout failed.');
+  }
+}
+
+function normalizeBaseUrl(value) {
+  if (!value) {
+    return 'https://usiot.roborock.com';
+  }
+  if (value.startsWith('http://') || value.startsWith('https://')) {
+    return value.replace(/\/+$/, '');
+  }
+  return `https://${value.replace(/\/+$/, '')}`;
+}
+
+function setLoggedInState(isLoggedIn) {
+  elements.logout.classList.toggle('hidden', !isLoggedIn);
+  elements.login.classList.toggle('hidden', isLoggedIn);
+  elements.passwordRow.classList.toggle('hidden', isLoggedIn);
+  elements.twoFactorSection.classList.toggle('hidden', isLoggedIn);
+  elements.email.readOnly = isLoggedIn;
+  elements.email.parentElement.classList.toggle('readonly', isLoggedIn);
+}
+
+async function updatePluginConfig(patch) {
+  if (!window.homebridge || typeof window.homebridge.getPluginConfig !== 'function') {
+    return;
+  }
+
+  const configs = await window.homebridge.getPluginConfig();
+  let config = configs.find((entry) => entry.platform === 'RoborockVacuumPlatform');
+  if (!config) {
+    config = { platform: 'RoborockVacuumPlatform', name: 'Roborock Vacuum' };
+    configs.push(config);
+  }
+
+  Object.keys(patch).forEach((key) => {
+    const value = patch[key];
+    if (value === undefined) {
+      delete config[key];
+    } else {
+      config[key] = value;
+    }
+  });
+
+  await window.homebridge.updatePluginConfig(configs);
+  await window.homebridge.savePluginConfig();
+}
+
+function init() {
+  loadConfig().catch(() => {
+    showToast('error', 'Failed to load current config.');
+  });
+  elements.login.addEventListener('click', login);
+  elements.send2fa.addEventListener('click', sendTwoFactorEmail);
+  elements.verify2fa.addEventListener('click', verifyTwoFactorCode);
+  elements.logout.addEventListener('click', logout);
+  elements.baseUrl.addEventListener('change', saveCredentials);
+  elements.skipDevices.addEventListener('change', saveCredentials);
+  elements.debugMode.addEventListener('change', saveCredentials);
+  elements.email.addEventListener('change', saveCredentials);
+}
+
+if (window.homebridge) {
+  window.homebridge.addEventListener('ready', () => {
+    init();
+  });
+} else {
+  document.addEventListener('DOMContentLoaded', init);
+}

package/homebridge-ui/public/styles.css

@@ -0,0 +1,184 @@
+@import url('https://fonts.googleapis.com/css2?family=Space+Grotesk:wght@400;600&display=swap');
+
+:root {
+  --bg: #0f172a;
+  --card: #111c33;
+  --text: #e2e8f0;
+  --muted: #94a3b8;
+  --primary: #38bdf8;
+  --secondary: #1e293b;
+  --border: #1f2a44;
+  --shadow: 0 20px 40px rgba(15, 23, 42, 0.35);
+}
+
+* {
+  box-sizing: border-box;
+}
+
+body {
+  margin: 0;
+  font-family: "Space Grotesk", "Segoe UI", sans-serif;
+  background: radial-gradient(circle at top, #1e3a8a, #0b1120 55%, #020617);
+  color: var(--text);
+}
+
+.container {
+  max-width: 860px;
+  margin: 0 auto;
+  padding: 32px 24px 24px;
+  display: grid;
+  gap: 24px;
+}
+
+header h1 {
+  font-size: 2.6rem;
+  margin-bottom: 8px;
+}
+
+.subtitle {
+  margin: 0;
+  color: var(--muted);
+}
+
+.card {
+  background: var(--card);
+  border: 1px solid var(--border);
+  border-radius: 18px;
+  padding: 24px;
+  box-shadow: var(--shadow);
+}
+
+.card h2 {
+  margin-top: 0;
+  font-size: 1.4rem;
+}
+
+.help {
+  color: var(--muted);
+  margin-top: 0;
+}
+
+label {
+  display: block;
+  margin-top: 16px;
+  font-size: 0.95rem;
+  color: var(--muted);
+}
+
+select,
+input {
+  width: 100%;
+  margin-top: 8px;
+  padding: 12px 14px;
+  border-radius: 10px;
+  border: 1px solid var(--border);
+  background: #0b1328;
+  color: var(--text);
+  font-size: 1rem;
+}
+
+input::placeholder {
+  color: #64748b;
+}
+
+.checkbox {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-top: 18px;
+}
+
+.checkbox input {
+  width: auto;
+  margin: 0;
+}
+
+.hidden {
+  display: none;
+}
+
+.readonly input {
+  background: #111827;
+  opacity: 0.75;
+}
+
+.actions {
+  display: flex;
+  gap: 12px;
+  flex-wrap: wrap;
+  margin-top: 20px;
+}
+
+button {
+  border: none;
+  border-radius: 999px;
+  padding: 12px 20px;
+  font-size: 0.95rem;
+  cursor: pointer;
+  transition: transform 0.15s ease, box-shadow 0.15s ease;
+}
+
+button:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 12px 24px rgba(56, 189, 248, 0.18);
+}
+
+.primary {
+  background: var(--primary);
+  color: #041826;
+}
+
+.secondary {
+  background: var(--secondary);
+  color: var(--text);
+  border: 1px solid var(--border);
+}
+
+.toast-container {
+  position: fixed;
+  right: 24px;
+  bottom: 24px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  z-index: 9999;
+}
+
+.toast {
+  background: #0f172a;
+  border: 1px solid var(--border);
+  border-radius: 12px;
+  padding: 12px 16px;
+  box-shadow: var(--shadow);
+  min-width: 220px;
+  animation: slide-in 0.2s ease-out;
+}
+
+.toast.success {
+  border-color: #22c55e;
+}
+
+.toast.error {
+  border-color: #ef4444;
+}
+
+.toast.warning {
+  border-color: #f59e0b;
+}
+
+@keyframes slide-in {
+  from {
+    transform: translateY(10px);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+@media (max-width: 640px) {
+  header h1 {
+    font-size: 2.1rem;
+  }
+}

package/homebridge-ui/server.js

@@ -0,0 +1,3 @@
+"use strict";
+
+require("../dist/ui/index.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "homebridge-roborock-vacuum",
-  "version": "1.2.3",
+  "version": "1.3.0",
   "description": "Roborock Vacuum Cleaner - plugin for Homebridge.",
   "license": "MIT",
   "keywords": [
@@ -20,11 +20,12 @@
   "main": "dist/index.js",
   "engines": {
     "homebridge": "^1.6.0 || ^2.0.0-beta.0",
-    "node": "^18.20.4 || ^20.15.1 || ^22"
+    "node": "^18.20.4 || ^20.15.1 || ^22 || ^24"
   },
   "scripts": {
     "clean": "rimraf ./dist",
     "build": "rimraf ./dist && tsc",
+    "prepare": "npm run build",
     "prepublishOnly": "npm run build",
     "postpublish": "npm run clean",
     "lint": "prettier --check .",
@@ -32,18 +33,19 @@
     "test": "jest"
   },
   "dependencies": {
+    "@homebridge/plugin-ui-utils": "^2.0.0",
     "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/lib/deviceFeatures.js

@@ -595,6 +595,8 @@ class deviceFeatures {
 				"roborock.vacuum.a117", // Qrevo Master
 				"roborock.vacuum.a21", // Qrevo Slim
 				"roborock.vacuum.a144", // Saros 10R
+				"roborock.vacuum.a140",
+				"roborock.vacuum.ss07",
 			].includes(robotModel),
 			// isShakeMopStrengthSupported: p.DMM.currentProduct == p.Products.TanosS || p.DMM.currentProduct == p.Products.TanosSPlus || p.DMM.isGarnet || p.DMM.isTopazSV || p.DMM.isPearlPlus || p.DMM.isCoral || p.DMM.isTopazS || p.DMM.isTopazSPlus || p.DMM.isTopazSC || p.DMM.isTopazSV || p.DMM.isPearlPlus || p.DMM.isTanosSMax || p.DMM.isUltron || p.DMM.isUltronSPlus || p.DMM.isUltronSMop || p.DMM.isUltronSV || p.DMM.isPearl
 			isShakeMopStrengthSupported: [
@@ -615,6 +617,8 @@ class deviceFeatures {
 				"roborock.vacuum.a87", // Qrevo MaxV
 				"roborock.vacuum.a101", // Q Revo Pro
 				"roborock.vacuum.a144", // Saros 10R
+				"roborock.vacuum.a140",
+				"roborock.vacuum.ss07",
 			].includes(robotModel),
 			// isWaterBoxSupported: [p.Products.Tanos_CE, p.Products.Tanos_CN].hasElement(p.DMM.currentProduct)
 			isWaterBoxSupported: [
@@ -641,6 +645,8 @@ class deviceFeatures {
 				"roborock.vacuum.a117", // Qrevo Master
 				"roborock.vacuum.a21", // Qrevo Slim
 				"roborock.vacuum.a144", // Saros 10R
+				"roborock.vacuum.a140",
+				"roborock.vacuum.ss07",
 
 			].includes(robotModel),
 			isCustomWaterBoxDistanceSupported: !!(2147483648 & this.features),
@@ -665,6 +671,8 @@ class deviceFeatures {
 				"roborock.vacuum.a135", // Qrevo Curv
 				"roborock.vacuum.a117", // Qrevo Master
 				"roborock.vacuum.a144", // Saros 10R
+				"roborock.vacuum.a140",
+				"roborock.vacuum.ss07",
 
 			].includes(robotModel),
 			// this isn't the correct way to use this. This code must be from a different robot
@@ -965,6 +973,38 @@ class deviceFeatures {
 					"set_switch_status",
 					"set_last_clean_t",
 				],
+				"roborock.vacuum.a140": [
+					"setCleaningRecordsString",
+					"setConsumablesInt",
+					"set_common_status",
+					"set_dss",
+					"set_rss",
+					"set_kct",
+					"set_in_warmup",
+					"set_last_clean_t",
+					"set_map_flag",
+					"set_back_type",
+					"set_charge_status",
+					"set_clean_percent",
+					"set_cleaned_area",
+					"set_switch_status",
+				],
+				"roborock.vacuum.ss07": [
+					"setCleaningRecordsString",
+					"setConsumablesInt",
+					"set_common_status",
+					"set_dss",
+					"set_rss",
+					"set_kct",
+					"set_in_warmup",
+					"set_last_clean_t",
+					"set_map_flag",
+					"set_back_type",
+					"set_charge_status",
+					"set_clean_percent",
+					"set_cleaned_area",
+					"set_switch_status",
+				],
 
 			};
 

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);
 	}