Merge pull request #69 from MrAsterisco/handle-error-in-mqtt-callback

Handle error in mqtt callback
MrAsterisco · Sep 3, 2024 · 8cbe4a4 · 8cbe4a4
2 parents b244c71 + 0de516b
commit 8cbe4a4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 29 deletions.
diff --git a/src/hisenseMQTTClient.ts b/src/hisenseMQTTClient.ts
@@ -20,7 +20,7 @@ export class HisenseMQTTClient {
 
   public mqttClient: mqtt.MqttClient;
 
-  constructor(public deviceConfig: Pick<DeviceConfig, 'sslmode' | 'ipaddress' | 'sslcertificate' | 'sslprivatekey'>, macaddress: string) {
+  constructor(public deviceConfig: Pick<DeviceConfig, 'sslmode' | 'ipaddress' | 'sslcertificate' | 'sslprivatekey'>, macaddress: string, private log: {error: (message: string) => void}) {
     this._BASE_TOPIC = path.join('/', 'remoteapp', 'mobile');
     this._STATE_TOPIC = path.join(this._BASE_TOPIC, 'broadcast', 'ui_service', 'state');
     this._DEVICE_TOPIC = `${macaddress.toUpperCase()}$normal`;
@@ -52,7 +52,13 @@ export class HisenseMQTTClient {
 
   public callService(service: string, action: string, payload?: string) {
     const topic = path.join('/', 'remoteapp', 'tv', service, this._DEVICE_TOPIC, 'actions', action);
-    this.mqttClient.publish(topic, payload ?? '');
+    if(this.mqttClient.disconnected || this.mqttClient.disconnecting) {
+      this.log.error('Sending message to TV failed - MQTT client is disconnected');
+      this.log.error(Error().stack ?? '');
+      return;
+    }else {
+      this.mqttClient.publish(topic, payload ?? '');
+    }
   }
 
   public changeSource(sourceId: string) {

diff --git a/src/platformAccessory.ts b/src/platformAccessory.ts
@@ -127,7 +127,7 @@ export class HiSenseTVAccessory {
     // Create "Unknown" source.
     this.createHomeSource();
 
-    this.mqttHelper = new HisenseMQTTClient(this.deviceConfig, accessory.context.macaddress);
+    this.mqttHelper = new HisenseMQTTClient(this.deviceConfig, accessory.context.macaddress, this.log);
     this.setupMqtt();
 
     // set the counter threshold based on the polling interval
@@ -163,32 +163,36 @@ export class HiSenseTVAccessory {
     });
 
 
-    //
     this.mqttHelper.mqttClient.on('message', (topic, message) => {
       this.log.debug(`Received message from TV (${topic}):` + message.toString());
-      const parsedMessage = JSON.parse(message.toString());
-      switch (topic) {
-        case this.mqttHelper._STATE_TOPIC:
-          // handle tvType fakeSleep differently as it has a different state
-          if (this.deviceConfig.tvType === 'fakeSleep') {
-            // setCurrentInput will be called in setAlwaysOnFakeSleepState
-            this.setAlwaysOnFakeSleepState(parsedMessage);
-          } else {
-            this.setCurrentInput(parsedMessage);
-          }
-          break;
-        case this.mqttHelper._SOURCE_LIST_TOPIC:
-          this.createSources(parsedMessage, this.availableApps);
-          break;
-        case this.mqttHelper._PICTURE_SETTINGS_TOPIC:
-          this.setAlwaysOnPictureSettingsPowerState(parsedMessage);
-          break;
-        case this.mqttHelper._APP_LIST_TOPIC:
-          this.createSources(this.inputSources, parsedMessage);
-          break;
-        default:
-          this.log.debug('Received unknown message from TV. Topic: ' + topic + ' Message: ' + message.toString());
-          break;
+      try{
+        const parsedMessage = JSON.parse(message.toString());
+        switch (topic) {
+          case this.mqttHelper._STATE_TOPIC:
+            // handle tvType fakeSleep differently as it has a different state
+            if (this.deviceConfig.tvType === 'fakeSleep') {
+              // setCurrentInput will be called in setAlwaysOnFakeSleepState
+              this.setAlwaysOnFakeSleepState(parsedMessage);
+            } else {
+              this.setCurrentInput(parsedMessage);
+            }
+            break;
+          case this.mqttHelper._SOURCE_LIST_TOPIC:
+            this.createSources(parsedMessage, this.availableApps);
+            break;
+          case this.mqttHelper._PICTURE_SETTINGS_TOPIC:
+            this.setAlwaysOnPictureSettingsPowerState(parsedMessage);
+            break;
+          case this.mqttHelper._APP_LIST_TOPIC:
+            this.createSources(this.inputSources, parsedMessage);
+            break;
+          default:
+            this.log.debug('Received unknown message from TV. Topic: ' + topic + ' Message: ' + message.toString());
+            break;
+        }
+      }catch(e: unknown){
+        this.log.error('Error occurred while handling new message from TV: ' + message.toString());
+        this.log.error((e as Error).stack ?? (e as Error).toString());
       }
     });
 

diff --git a/src/scripts/alwaysOnTest.ts b/src/scripts/alwaysOnTest.ts
@@ -47,7 +47,7 @@ let pictureSettingsOff: null|PictureSetting = null;
   await rl.question('Turn your TV off now and press enter when ready: ');
   rl.write('Wait for a few seconds...');
   try {
-    const mqttHelper = new HisenseMQTTClient({sslmode: sslMode, ipaddress: hostname, sslcertificate: sslCertificate, sslprivatekey: sslPrivateKey}, macaddress);
+    const mqttHelper = new HisenseMQTTClient({sslmode: sslMode, ipaddress: hostname, sslcertificate: sslCertificate, sslprivatekey: sslPrivateKey}, macaddress, console);
     const timeout = setTimeout(() => {
       mqttHelper.mqttClient.end(true);
       rl.write('Could not detect always on TV');

diff --git a/src/scripts/authorize.ts b/src/scripts/authorize.ts
@@ -40,7 +40,7 @@ const macaddress = values['mac'] as string;
 const hostname = values['hostname'] as string;
 
 try {
-  const mqttHelper = new HisenseMQTTClient({sslmode: sslMode, ipaddress: hostname, sslcertificate: sslCertificate, sslprivatekey: sslPrivateKey}, macaddress);
+  const mqttHelper = new HisenseMQTTClient({sslmode: sslMode, ipaddress: hostname, sslcertificate: sslCertificate, sslprivatekey: sslPrivateKey}, macaddress, console);
 
   mqttHelper.mqttClient.on('connect', () => {
     mqttHelper.callService('ui_service', 'gettvstate');