matterbridge-roborock-vacuum-plugin 1.1.0-rc08 → 1.1.0-rc09

package/dist/roborockCommunication/broadcast/abstractClient.js

@@ -14,17 +14,18 @@ export class AbstractClient {
     logger;
     context;
     syncMessageListener;
-    connectionStateListener;
     constructor(logger, context) {
         this.context = context;
         this.serializer = new MessageSerializer(this.context, logger);
         this.deserializer = new MessageDeserializer(this.context, logger);
         this.syncMessageListener = new SyncMessageListener(logger);
         this.messageListeners.register(this.syncMessageListener);
-        this.connectionStateListener = new ConnectionStateListener(logger, this);
-        this.connectionListeners.register(this.connectionStateListener);
         this.logger = logger;
     }
+    initializeConnectionStateListener() {
+        const connectionStateListener = new ConnectionStateListener(this.logger, this, this.clientName, this.shouldReconnect);
+        this.connectionListeners.register(connectionStateListener);
+    }
     async get(duid, request) {
         return new Promise((resolve, reject) => {
             this.syncMessageListener.waitFor(request.messageId, (response) => resolve(response), reject);

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

@@ -7,6 +7,8 @@ import { AbstractClient } from '../abstractClient.js';
 import { Sequence } from '../../helper/sequence.js';
 import { ChunkBuffer } from '../../helper/chunkBuffer.js';
 export class LocalNetworkClient extends AbstractClient {
+    clientName = 'LocalNetworkClient';
+    shouldReconnect = true;
     socket = undefined;
     buffer = new ChunkBuffer();
     messageIdSeq;
@@ -18,6 +20,7 @@ export class LocalNetworkClient extends AbstractClient {
         this.duid = duid;
         this.ip = ip;
         this.messageIdSeq = new Sequence(100000, 999999);
+        this.initializeConnectionStateListener();
     }
     connect() {
         this.socket = new Socket();

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

@@ -3,6 +3,8 @@ import * as CryptoUtils from '../../helper/cryptoHelper.js';
 import { AbstractClient } from '../abstractClient.js';
 import { debugStringify } from 'matterbridge/logger';
 export class MQTTClient extends AbstractClient {
+    clientName = 'MQTTClient';
+    shouldReconnect = false;
     rriot;
     mqttUsername;
     mqttPassword;
@@ -12,6 +14,7 @@ export class MQTTClient extends AbstractClient {
         this.rriot = userdata.rriot;
         this.mqttUsername = CryptoUtils.md5hex(userdata.rriot.u + ':' + userdata.rriot.k).substring(2, 10);
         this.mqttPassword = CryptoUtils.md5hex(userdata.rriot.s + ':' + userdata.rriot.k).substring(16);
+        this.initializeConnectionStateListener();
     }
     connect() {
         if (this.client) {

package/dist/roborockCommunication/broadcast/listener/implementation/connectionStateListener.js

@@ -1,21 +1,29 @@
 export class ConnectionStateListener {
     logger;
     client;
-    constructor(logger, client) {
+    clientName;
+    shouldReconnect;
+    constructor(logger, client, clientName, shouldReconnect = false) {
         this.logger = logger;
         this.client = client;
+        this.clientName = clientName;
+        this.shouldReconnect = shouldReconnect;
     }
     async onConnected(duid) {
-        this.logger.notice(`Device ${duid} connected to MQTT broker`);
+        this.logger.notice(`Device ${duid} connected to ${this.clientName}`);
     }
     async onDisconnected(duid) {
-        this.logger.notice(`Device ${duid} disconnected from MQTT broker`);
+        if (!this.shouldReconnect) {
+            this.logger.notice(`Device ${duid} disconnected from ${this.clientName}, but re-registration is disabled.`);
+            return;
+        }
+        this.logger.notice(`Device ${duid} disconnected from ${this.clientName}`);
         const isInDisconnectingStep = this.client.isInDisconnectingStep;
         if (isInDisconnectingStep) {
             this.logger.info(`Device with DUID ${duid} is in disconnecting step, skipping re-registration.`);
             return;
         }
-        this.logger.info(`Re-registering device with DUID ${duid} to MQTT broker`);
+        this.logger.info(`Re-registering device with DUID ${duid} to ${this.clientName}`);
         this.client.connect();
         this.client.isInDisconnectingStep = false;
     }

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

@@ -1,7 +1,7 @@
 {
   "name": "matterbridge-roborock-vacuum-plugin",
   "type": "DynamicPlatform",
-  "version": "1.1.0-rc08",
+  "version": "1.1.0-rc09",
   "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.1.0-rc08 by https://github.com/RinDevJunior",
+  "description": "matterbridge-roborock-vacuum-plugin v. 1.1.0-rc09 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.1.0-rc08",
+  "version": "1.1.0-rc09",
   "description": "Matterbridge Roborock Vacuum Plugin",
   "author": "https://github.com/RinDevJunior",
   "license": "MIT",

package/src/roborockCommunication/broadcast/abstractClient.ts

@@ -22,9 +22,11 @@ export abstract class AbstractClient implements Client {
   protected connected = false;
   protected logger: AnsiLogger;
 
+  protected abstract clientName: string;
+  protected abstract shouldReconnect: boolean;
+
   private readonly context: MessageContext;
   private readonly syncMessageListener: SyncMessageListener;
-  private readonly connectionStateListener: ConnectionStateListener;
 
   protected constructor(logger: AnsiLogger, context: MessageContext) {
     this.context = context;
@@ -33,13 +35,14 @@ export abstract class AbstractClient implements Client {
 
     this.syncMessageListener = new SyncMessageListener(logger);
     this.messageListeners.register(this.syncMessageListener);
-
-    this.connectionStateListener = new ConnectionStateListener(logger, this);
-    this.connectionListeners.register(this.connectionStateListener);
-
     this.logger = logger;
   }
 
+  protected initializeConnectionStateListener() {
+    const connectionStateListener = new ConnectionStateListener(this.logger, this, this.clientName, this.shouldReconnect);
+    this.connectionListeners.register(connectionStateListener);
+  }
+
   abstract connect(): void;
   abstract disconnect(): Promise<void>;
   abstract send(duid: string, request: RequestMessage): Promise<void>;

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

@@ -9,6 +9,9 @@ import { Sequence } from '../../helper/sequence.js';
 import { ChunkBuffer } from '../../helper/chunkBuffer.js';
 
 export class LocalNetworkClient extends AbstractClient {
+  protected override clientName = 'LocalNetworkClient';
+  protected override shouldReconnect = true;
+
   private socket: Socket | undefined = undefined;
   private buffer: ChunkBuffer = new ChunkBuffer();
   private messageIdSeq: Sequence;
@@ -21,6 +24,8 @@ export class LocalNetworkClient extends AbstractClient {
     this.duid = duid;
     this.ip = ip;
     this.messageIdSeq = new Sequence(100000, 999999);
+
+    this.initializeConnectionStateListener();
   }
 
   public connect(): void {

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

@@ -7,6 +7,9 @@ import { Rriot, UserData } from '../../Zmodel/userData.js';
 import { AnsiLogger, debugStringify } from 'matterbridge/logger';
 
 export class MQTTClient extends AbstractClient {
+  protected override clientName = 'MQTTClient';
+  protected override shouldReconnect = false;
+
   private readonly rriot: Rriot;
   private readonly mqttUsername: string;
   private readonly mqttPassword: string;
@@ -18,6 +21,8 @@ export class MQTTClient extends AbstractClient {
 
     this.mqttUsername = CryptoUtils.md5hex(userdata.rriot.u + ':' + userdata.rriot.k).substring(2, 10);
     this.mqttPassword = CryptoUtils.md5hex(userdata.rriot.s + ':' + userdata.rriot.k).substring(16);
+
+    this.initializeConnectionStateListener();
   }
 
   public connect(): void {

package/src/roborockCommunication/broadcast/listener/implementation/connectionStateListener.ts

@@ -5,17 +5,27 @@ import { AbstractClient } from '../../abstractClient.js';
 export class ConnectionStateListener implements AbstractConnectionListener {
   protected logger: AnsiLogger;
   protected client: AbstractClient;
-  constructor(logger: AnsiLogger, client: AbstractClient) {
+  protected clientName: string;
+  protected shouldReconnect: boolean;
+
+  constructor(logger: AnsiLogger, client: AbstractClient, clientName: string, shouldReconnect = false) {
     this.logger = logger;
     this.client = client;
+    this.clientName = clientName;
+    this.shouldReconnect = shouldReconnect;
   }
 
   public async onConnected(duid: string): Promise<void> {
-    this.logger.notice(`Device ${duid} connected to MQTT broker`);
+    this.logger.notice(`Device ${duid} connected to ${this.clientName}`);
   }
 
   public async onDisconnected(duid: string): Promise<void> {
-    this.logger.notice(`Device ${duid} disconnected from MQTT broker`);
+    if (!this.shouldReconnect) {
+      this.logger.notice(`Device ${duid} disconnected from ${this.clientName}, but re-registration is disabled.`);
+      return;
+    }
+
+    this.logger.notice(`Device ${duid} disconnected from ${this.clientName}`);
 
     const isInDisconnectingStep = this.client.isInDisconnectingStep;
     if (isInDisconnectingStep) {
@@ -23,7 +33,7 @@ export class ConnectionStateListener implements AbstractConnectionListener {
       return;
     }
 
-    this.logger.info(`Re-registering device with DUID ${duid} to MQTT broker`);
+    this.logger.info(`Re-registering device with DUID ${duid} to ${this.clientName}`);
     this.client.connect();
 
     this.client.isInDisconnectingStep = false;