homebridge-lgwebos-tv 4.2.2-beta.13 → 4.2.2-beta.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "LG webOS TV",
   "name": "homebridge-lgwebos-tv",
-  "version": "4.2.2-beta.13",
+  "version": "4.2.2-beta.3",
   "description": "Homebridge plugin to control LG webOS TV.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/lgwebossocket.js

@@ -32,6 +32,7 @@ class LgWebOsSocket extends EventEmitter {
         this.socketConnected = false;
         this.specializedSocketConnected = false;
         this.cidCount = 0;
+        this.isRegistered = false;
 
         this.power = false;
         this.screenState = 'Suspend';
@@ -67,7 +68,10 @@ class LgWebOsSocket extends EventEmitter {
                     if (this.logDebug) this.emit('debug', `Plugin send heartbeat to TV`);
 
                     const state = await this.functions.ping(this.host, this.webSocketPort);
-                    if (!state.online || this.socketConnected || this.connecting) return;
+                    if (!state.online) {
+                        return;
+                    }
+
                     if (this.logDebug) this.emit('debug', `Plugin received heartbeat from TV`);
 
                     this.connecting = true;
@@ -97,6 +101,7 @@ class LgWebOsSocket extends EventEmitter {
         this.cidCount = 0;
         this.power = false;
         this.screenState = 'Suspend';
+        this.isRegistered = false;
     };
 
     updateTvState() {
@@ -206,10 +211,6 @@ class LgWebOsSocket extends EventEmitter {
                 await this.send('subscribe', ApiUrls.GetForegroundAppMediaInfo, undefined, this.mediaInfoId);
             }
 
-            //Request specjalized socket
-            this.specializedSocketId = await this.getCid();
-            await this.send('request', ApiUrls.SocketUrl, undefined, this.specializedSocketId);
-
             if (this.logDebug) this.emit('debug', `Subscribe tv status successful`);
 
             return true;
@@ -321,7 +322,7 @@ class LgWebOsSocket extends EventEmitter {
                     this.cleanupSocket();
                     this.updateTvState();
                 })
-                .on('open', async () => {
+                .on('open', () => {
                     if (this.logDebug) this.emit('debug', `Plugin received heartbeat from TV`);
 
                     // connect to device success
@@ -329,10 +330,8 @@ class LgWebOsSocket extends EventEmitter {
                     if (!this.socketConnected) this.emit('success', `Socket Connect Success`);
                     this.socketConnected = true;
 
-                    // Register to TV
-                    await this.registerToTv();
-
                     // start heartbeat
+                    if (socket.readyState === socket.OPEN) socket.ping();
                     this.heartbeat = setInterval(() => {
                         if (socket.readyState === socket.OPEN) {
                             if (this.logDebug) this.emit('debug', `Socket send heartbeat`);
@@ -340,8 +339,11 @@ class LgWebOsSocket extends EventEmitter {
                         }
                     }, 5000);
                 })
-                .on('pong', () => {
+                .on('pong', async () => {
                     if (this.logDebug) this.emit('debug', `Socket received heartbeat`);
+
+                    // Register to TV
+                    if (!this.isRegistered) await this.registerToTv();
                 })
                 .on('message', async (message) => {
                     const parsedMessage = JSON.parse(message);
@@ -359,6 +361,7 @@ class LgWebOsSocket extends EventEmitter {
                                     break;
                                 case 'registered':
                                     if (this.logDebug) this.emit('debug', `Registered to TV with key: ${messageData['client-key']}`);
+                                    this.isRegistered = true;
 
                                     //Save key in file if not saved before
                                     const pairingKey = messageData['client-key'];
@@ -367,15 +370,20 @@ class LgWebOsSocket extends EventEmitter {
                                         this.emit('success', 'Pairing key saved');
                                     }
 
-                                    //Send initial power state
-                                    if (!this.power) {
-                                        this.emit('powerState', true, 'Active');
+                                    //Request system info data
+                                    this.systemInfoId = await this.getCid();
+                                    await this.send('request', ApiUrls.GetSystemInfo, undefined, this.systemInfoId);
 
-                                        //Request system info data
-                                        this.systemInfoId = await this.getCid();
-                                        await this.send('request', ApiUrls.GetSystemInfo, undefined, this.systemInfoId);
-                                        this.power = true;
-                                    }
+                                    //Request software info data
+                                    this.softwareInfoId = await this.getCid();
+                                    await this.send('request', ApiUrls.GetSoftwareInfo, undefined, this.softwareInfoId);
+
+                                    //Subscribe tv status
+                                    await this.subscribeTvStatus();
+
+                                    //Request specjalized socket
+                                    this.specializedSocketId = await this.getCid();
+                                    await this.send('request', ApiUrls.SocketUrl, undefined, this.specializedSocketId);
                                     break;
                                 case 'error':
                                     if (this.logError) this.emit('error', `Register to TV error: ${stringifyMessage}, trying again`);
@@ -438,10 +446,6 @@ class LgWebOsSocket extends EventEmitter {
                                     if (this.logDebug) this.emit('debug', `System info: ${stringifyMessage}`);
                                     this.tvInfo.modelName = messageData.modelName ?? 'LG TV';
 
-                                    //Request software info data
-                                    this.softwareInfoId = await this.getCid();
-                                    await this.send('request', ApiUrls.GetSoftwareInfo, undefined, this.softwareInfoId);
-
                                     //restFul
                                     if (this.restFulEnabled) this.emit('restFul', 'systeminfo', messageData);
 
@@ -471,9 +475,6 @@ class LgWebOsSocket extends EventEmitter {
                                     //emit device info
                                     this.emit('deviceInfo', this.tvInfo);
 
-                                    //Subscribe tv status
-                                    await this.subscribeTvStatus();
-
                                     //restFul
                                     if (this.restFulEnabled) this.emit('restFul', 'softwareinfo', messageData);