fix listen to server topics; implement power off; set console.log() to console.debug(); refactoring

Author: coding-lemur

src/index.ts

@@ -33,7 +33,7 @@ let server: Server;
 //process.stdin.resume(); // so the program will not close instantly
 
 exitHook(() => {
-    console.log('Exiting');
+    console.debug('Exiting');
 
     if (server != null) {
         server.shutdown();

src/server.ts

@@ -11,6 +11,7 @@ export class Server {
     private readonly apps: App[] = [];
     private readonly controller: SmartDisplayController;
 
+    private interval: NodeJS.Timeout | null = null;
     private currentAppIndex = 0;
     private appIterations = 0;
 
@@ -22,15 +23,14 @@ export class Server {
                 username: mqttSettings.username,
                 password: mqttSettings.password
             })
+            .subscribe('smartDisplay/server/in/#')
             .on('message', (topic, message) => {
                 if (!topic.startsWith('smartDisplay/server/in/')) {
                     return;
                 }
 
                 const lastPart = MqttHelper.getLastTopicPart(topic);
                 this.processIncomingMessage(lastPart, message.toString());
-
-                console.log('server message', topic, message.toString());
             })
             .on('error', error => {
                 console.error('MQTT', error);
@@ -49,14 +49,22 @@ export class Server {
             return;
         }
 
-        console.log('server cmd', command, message);
+        console.debug('server cmd', command, message);
 
         switch (command) {
             case 'power': {
                 if (message === 'on' || message === 'off') {
                     const powerOn = message === 'on' ? true : false;
 
+                    console.debug('switch power-status', powerOn);
+
                     this.controller.power(powerOn);
+
+                    if (powerOn) {
+                        this.startInterval();
+                    } else {
+                        this.stopInterval();
+                    }
                 }
 
                 break;
@@ -73,15 +81,23 @@ export class Server {
     run(): void {
         this.client.publish('smartDisplay/server/out', 'started');
 
+        this.startInterval();
+    }
+
+    private startInterval(): void {
+        console.debug('startInterval()');
+
         this.appIterations = 0;
 
         this.renderApp();
 
-        setInterval(() => {
+        this.interval = setInterval(() => {
             if (!this.client.connected) {
                 console.error('client not connected');
             }
 
+            console.debug('power-status', this.controller.powerStatus);
+
             this.renderApp();
 
             if (this.appIterations >= 15) {
@@ -90,8 +106,18 @@ export class Server {
         }, 1000);
     }
 
+    private stopInterval(): void {
+        console.debug('stopInterval()');
+
+        if (this.interval == null) {
+            return;
+        }
+
+        clearInterval(this.interval);
+    }
+
     private nextApp(): void {
-        console.log('next app');
+        console.debug('next app');
 
         this.currentAppIndex++;
 
@@ -117,6 +143,8 @@ export class Server {
     }
 
     shutdown(): void {
+        console.debug('shutdown');
+
         this.controller.destroy();
     }
 }

src/smart-display-controller.ts

@@ -22,17 +22,21 @@ export class SmartDisplayController {
         return this._info.value;
     }
 
+    get powerStatus(): boolean {
+        return this._powerStatus;
+    }
+
     constructor(private client: mqtt.Client) {
         client
+            .subscribe('smartDisplay/client/out/#')
             .on('message', (topic, message) => {
                 if (!topic.startsWith('smartDisplay/client/out/')) {
                     return;
                 }
 
                 const lastPart = MqttHelper.getLastTopicPart(topic);
                 this.processIncomingMessage(lastPart, message.toString());
-            })
-            .subscribe('smartDisplay/client/out/#');
+            });
     }
 
     private processIncomingMessage(
@@ -43,32 +47,40 @@ export class SmartDisplayController {
             return;
         }
 
-        console.log(new Date(), 'controller cmd', command, message);
+        console.debug(new Date(), 'controller cmd', command, message);
 
         switch (command) {
             case 'info': {
-                this._info.value = JSON.parse(message);
-
-                const powerOnDevice = this._info.value?.powerOn;
+                try {
+                    this._info.value = JSON.parse(message);
 
-                // check power status
-                if (powerOnDevice !== this._powerStatus) {
-                    // inconsistence detected
-                    console.warn(
-                        'power status inconstistence:',
-                        `server: ${this._powerStatus}`,
-                        `device: ${powerOnDevice}`
-                    );
-
-                    // fix status
-                    this.power(this._powerStatus);
+                    this.checkPowerStatus();
+                } catch (error) {
+                    console.error('error on parse info payload', error);
                 }
 
                 break;
             }
         }
     }
 
+    private checkPowerStatus(): void {
+        const powerOnDevice = this._info.value?.powerOn;
+
+        // check power status
+        if (powerOnDevice !== this._powerStatus) {
+            // inconsistence detected
+            console.warn(
+                'power status inconstistence:',
+                `server: ${this._powerStatus}`,
+                `device: ${powerOnDevice}`
+            );
+
+            // fix status
+            this.power(this._powerStatus);
+        }
+    }
+
     changeSettings(settings: ControllerSettings): void {
         this.client.publish(
             'smartDisplay/client/in/changeSettings',