homebridge-midea-platform 0.4.3 → 0.4.5

package/homebridge-ui/public/index.html

@@ -187,6 +187,7 @@
       currentConfig.devices = currentConfig.devices || [];
       if (devices) {
         devices.forEach((device) => {
+          const validAuth = device.token && device.key;
           const tr = table.insertRow();
           const td = tr.insertCell();
           td.appendChild(document.createTextNode(device.name));
@@ -195,14 +196,21 @@
           tr.insertCell().appendChild(document.createTextNode(device.displayName));
           tr.insertCell().appendChild(document.createTextNode(device.model));
           tr.insertCell().appendChild(document.createTextNode(device.id));
-          tr.insertCell().appendChild(document.createTextNode(device.token.slice(0, 6) + '...' + device.token.slice(-4) +
-            '\n' + device.key.slice(0, 6) + '...' + device.key.slice(-4)
+          tr.insertCell().appendChild(document.createTextNode(
+            device.token ? 
+              device.token.slice(0, 6) + '...' + device.token.slice(-4) :
+              'token missing' + '\n' + 
+            device.key ? 
+              device.key.slice(0, 6) + '...' + device.key.slice(-4) :
+              'key missing'
           ));
           tr.insertCell().appendChild(document.createTextNode(device.ip));
 
           const addCell = tr.insertCell();
           if (device.displayName === 'Unknown') {
             addCell.appendChild(document.createTextNode('Not supported'));
+          } else if (!validAuth) {
+            addCell.appendChild(document.createTextNode('Invalid credentials'));
           } else if (currentDevice = currentConfig.devices.find((d) => d.id === device.id)) {
             // addCell.appendChild(document.createTextNode('Already added'));
             debugLog(`Existing device:\n${JSON.stringify(currentDevice, null, 2)}`);

package/homebridge-ui/server.js

@@ -87,7 +87,8 @@ class UiServer extends HomebridgePluginUiServer {
         await this.cloud.login();
       } catch (e) {
         const msg = e instanceof Error ? e.stack : e;
-        throw new RequestError(`Login failed:\n${msg}`);
+        this.logger.warn(`Login failed:\n${msg}`);
+        throw new RequestError('Login failed, check credentials.');
       }
     });
 
@@ -98,7 +99,7 @@ class UiServer extends HomebridgePluginUiServer {
       });
       this.config = config;
       this.logger.setDebugEnabled(config.uiDebug ? config.uiDebug : false);
-      this.logger.debug(`Merged config: ${JSON.stringify(config, null, 2)}`);
+      this.logger.debug(`Merged config:\n${JSON.stringify(config, null, 2)}`);
       return config;
     });
 
@@ -112,6 +113,9 @@ class UiServer extends HomebridgePluginUiServer {
     this.onRequest('/discover', async () => {
       try {
         const devices = await this.blockingDiscover();
+        for (const device of devices) {
+          await this.getNewCredentials(device);
+        }
         this.logger.debug(`All devices:\n${JSON.stringify(devices, null, 2)}`);
         return devices
           .filter((a) => Object.keys(a).length > 0)
@@ -155,10 +159,7 @@ class UiServer extends HomebridgePluginUiServer {
       }
       i++;
     }
-    if (!device.token || !device.key) {
-      throw new Error(`[${device.name}] Authentication failed, token/key undefined.`);
-    }
-    this.logger.debug(`Token: ${device.token}, Key: ${device.key}`);
+    this.logger.debug(`[${device.name}] Token: ${device.token}, Key: ${device.key}`);
     return;
   }
 
@@ -179,12 +180,13 @@ class UiServer extends HomebridgePluginUiServer {
       const response = await this.promiseSocket.read();
       if (response) {
         if (response.length < 20) {
-          throw Error(`[${device.name}] Authenticate error when receiving data from ${this.ip}:${this.port}. (Data length mismatch)`);
+          this.logger.debug(`[${device.name}] Authenticate error when receiving data from ${device.ip}:${device.port}. (Data length: ${response.length})\n${JSON.stringify(response)}`);
+          throw Error(`[${device.name}] Authenticate error when receiving data from ${device.ip}:${device.port}. (Data length mismatch)`);
         }
         const resp = response.subarray(8, 72);
         this.security.tcp_key_from_resp(resp, Buffer.from(device.key, 'hex'));
       } else {
-        throw Error(`[${device.name}] Authenticate error when receiving data from ${this.ip}:${this.port}.`);
+        throw Error(`[${device.name}] Authenticate error when receiving data from ${device.ip}:${device.port}.`);
       }
     } finally {
       this.promiseSocket.destroy();
@@ -203,7 +205,6 @@ class UiServer extends HomebridgePluginUiServer {
       this.logger.info('Start device discovery...');
       discover.startDiscover();
       discover.on('device', async (device) => {
-        await this.getNewCredentials(device);
         switch (device.type) {
           case DeviceType.AIR_CONDITIONER:
             device['displayName'] = 'Air Conditioner';

package/package.json

@@ -1,7 +1,7 @@
 {
-  "displayName": "Homebridge Midea",
+  "displayName": "Homebridge Midea Platform",
   "name": "homebridge-midea-platform",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Homebridge plugin for Midea devices",
   "license": "Apache-2.0",
   "repository": {
@@ -12,7 +12,7 @@
     "url": "https://github.com/kovapatrik/homebridge-midea/issues"
   },
   "engines": {
-    "node": "^18.17.0",
+    "node": "^18.17.0 || ^20.9.0",
     "homebridge": "^1.6.0"
   },
   "main": "dist/index.js",