matterbridge-roborock-vacuum-plugin 1.0.8-rc07 → 1.0.8-rc08

package/dist/roborockCommunication/broadcast/client/LocalNetworkClient.js

@@ -56,7 +56,7 @@ export class LocalNetworkClient extends AbstractClient {
         await this.connectionListeners.onConnected();
     }
     async onDisconnect() {
-        this.logger.info('Socket has disconnected.');
+        this.logger.notice('LocalNetworkClient: Socket has disconnected.');
         this.connected = false;
         if (this.socket) {
             this.socket.destroy();
@@ -68,7 +68,7 @@ export class LocalNetworkClient extends AbstractClient {
         await this.connectionListeners.onDisconnected();
     }
     async onError(result) {
-        this.logger.error('Socket connection error: ' + result);
+        this.logger.error('LocalNetworkClient: Socket connection error: ' + result);
         this.connected = false;
         if (this.socket) {
             this.socket.destroy();

package/dist/roborockService.js

@@ -158,7 +158,7 @@ export default class RoborockService {
                 await this.messageProcessor.getDeviceStatus(device.duid).then((response) => {
                     if (self.deviceNotify) {
                         const message = { duid: device.duid, ...response.errorStatus, ...response.message };
-                        self.logger.debug('Device status update xxx', debugStringify(message));
+                        self.logger.debug('Device status update', debugStringify(message));
                         self.deviceNotify(NotifyMessageTypes.LocalMessage, message);
                     }
                 });
@@ -332,16 +332,21 @@ export default class RoborockService {
                 this.logger.debug('initializing the local connection for this client towards ' + this.ip);
                 this.localClient = this.messageClient.registerClient(device.duid, this.ip);
                 this.localClient.connect();
-                while (!this.localClient.isConnected()) {
+                let count = 0;
+                while (!this.localClient.isConnected() && count < 20) {
+                    this.logger.debug('Keep waiting for local client to connect');
+                    count++;
                     await this.sleep(500);
                 }
+                if (!this.localClient.isConnected()) {
+                    throw new Error('Local client did not connect after 10 attempts, something is wrong');
+                }
                 this.logger.debug('LocalClient connected');
             }
         }
         catch (error) {
             this.logger.error('Error requesting network info', error);
         }
-        this.logger.debug('Local client connected');
     }
     sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));

package/matterbridge-roborock-vacuum-plugin.config.json

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.0.8-rc07",
+  "version": "1.0.8-rc08",
   "whiteList": [],
   "blackList": [],
   "useInterval": true,

package/matterbridge-roborock-vacuum-plugin.schema.json

@@ -1,6 +1,6 @@
 {
   "title": "Matterbridge Roborock Vacuum Plugin",
-  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc07 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.0.8-rc08 by https://github.com/RinDevJunior",
   "type": "object",
   "required": ["username", "password"],
   "properties": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
-  "version": "1.0.8-rc07",
+  "version": "1.0.8-rc08",
   "description": "Matterbridge Roborock Vacuum Plugin",
   "author": "https://github.com/RinDevJunior",
   "license": "MIT",

package/src/roborockCommunication/broadcast/client/LocalNetworkClient.ts

@@ -67,7 +67,7 @@ export class LocalNetworkClient extends AbstractClient {
   }
 
   private async onDisconnect(): Promise<void> {
-    this.logger.info('Socket has disconnected.');
+    this.logger.notice('LocalNetworkClient: Socket has disconnected.');
     this.connected = false;
 
     if (this.socket) {
@@ -82,7 +82,7 @@ export class LocalNetworkClient extends AbstractClient {
   }
 
   private async onError(result: Error): Promise<void> {
-    this.logger.error('Socket connection error: ' + result);
+    this.logger.error('LocalNetworkClient: Socket connection error: ' + result);
     this.connected = false;
 
     if (this.socket) {

package/src/roborockService.ts

@@ -29,6 +29,7 @@ import type {
   DeviceStatusNotify,
 } from './roborockCommunication/index.js';
 import { ServiceArea } from 'matterbridge/matter/clusters';
+import { LocalNetworkClient } from './roborockCommunication/broadcast/client/LocalNetworkClient.js';
 export type Factory<A, T> = (logger: AnsiLogger, arg: A) => T;
 
 export default class RoborockService {
@@ -227,7 +228,7 @@ export default class RoborockService {
         await this.messageProcessor.getDeviceStatus(device.duid).then((response: DeviceStatus) => {
           if (self.deviceNotify) {
             const message: DeviceStatusNotify = { duid: device.duid, ...response.errorStatus, ...response.message } as DeviceStatusNotify;
-            self.logger.debug('Device status update xxx', debugStringify(message));
+            self.logger.debug('Device status update', debugStringify(message));
             self.deviceNotify(NotifyMessageTypes.LocalMessage, message);
           }
         });
@@ -431,19 +432,25 @@ export default class RoborockService {
 
       if (this.ip) {
         this.logger.debug('initializing the local connection for this client towards ' + this.ip);
-        this.localClient = this.messageClient.registerClient(device.duid, this.ip);
+        this.localClient = this.messageClient.registerClient(device.duid, this.ip) as LocalNetworkClient;
         this.localClient.connect();
 
-        while (!this.localClient.isConnected()) {
+        let count = 0;
+        while (!this.localClient.isConnected() && count < 20) {
+          this.logger.debug('Keep waiting for local client to connect');
+          count++;
           await this.sleep(500);
         }
+
+        if (!this.localClient.isConnected()) {
+          throw new Error('Local client did not connect after 10 attempts, something is wrong');
+        }
+
         this.logger.debug('LocalClient connected');
       }
     } catch (error) {
       this.logger.error('Error requesting network info', error);
     }
-
-    this.logger.debug('Local client connected');
   }
 
   private sleep(ms: number): Promise<void> {