homebridge-lgwebos-tv 4.3.0 → 4.3.2

package/package.json

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

package/src/lgwebossocket.js

@@ -2,7 +2,7 @@ import WebSocket from 'ws';
 import EventEmitter from 'events';
 import ImpulseGenerator from './impulsegenerator.js';
 import Functions from './functions.js';
-import { ApiUrls, Pairing } from './constants.js';
+import { ApiUrls, PairingOld, PairingNew } from './constants.js';
 
 class LgWebOsSocket extends EventEmitter {
     constructor(config, keyFile, devInfoFile, inputsFile, channelsFile, restFulEnabled, mqttEnabled) {
@@ -139,11 +139,11 @@ class LgWebOsSocket extends EventEmitter {
         }
     }
 
-    async registerToTv() {
+    async registerToTv(PairingData) {
         try {
-            Pairing['client-key'] = this.pairingKey;
+            PairingData['client-key'] = this.pairingKey;
             this.registerId = await this.getCid();
-            await this.send('register', undefined, Pairing, this.registerId);
+            await this.send('register', undefined, PairingData, this.registerId);
             return;
         } catch (err) {
             if (this.logError) this.emit('error', `Socket register error: ${err}`);
@@ -172,10 +172,9 @@ class LgWebOsSocket extends EventEmitter {
 
     async applySoftwareInfoFallback() {
         // Called when getCurrentSWInformation returns 401 (webOS 26+).
-        // If the endpoint is blocked, the TV is new enough to be treated as the latest webOS.
         this.tvInfo.webOS = 26.0;
         this.tvInfo.productName = 'webOSTV 26.0';
-        this.tvInfo.firmwareRevision = this.tvInfo.firmwareRevision || 'N/A';
+        this.tvInfo.firmwareRevision = this.tvInfo.firmwareRevision || '40.xx.xx';
         // deviceId was already filled from serialNumber in the systemInfo handler
 
         if (this.logDebug) this.emit('debug', `Software info fallback (webOS 26+): deviceId=${this.tvInfo.deviceId}, model=${this.tvInfo.modelName}`);
@@ -342,6 +341,7 @@ class LgWebOsSocket extends EventEmitter {
                     this.socket = socket;
                     this.emit('success', `Socket Connect Success`);
                     this.socketConnected = true;
+                    await this.getSystemInfo();
 
                     this.heartbeat = setInterval(() => {
                         if (socket.readyState === socket.OPEN) {
@@ -354,8 +354,7 @@ class LgWebOsSocket extends EventEmitter {
                     if (this.logDebug) this.emit('debug', `Socket received heartbeat`);
                     if (!this.socketOpen) {
                         this.socketOpen = true;
-                        await this.getSystemInfo();
-                        await this.registerToTv();
+                        await this.registerToTv(PairingOld);
                     }
                 })
                 .on('message', async (message) => {
@@ -380,12 +379,13 @@ class LgWebOsSocket extends EventEmitter {
                                         this.emit('success', 'Pairing key saved');
                                     }
                                     await this.getSpecjalizedSocket();
+                                    await this.getSoftwareInfo();
                                     break;
                                 }
                                 case 'error':
-                                    if (this.logError) this.emit('error', `Register to TV error: ${stringifyMessage}, trying again`);
+                                    if (this.logDebug) this.emit('debug', `Register to TV error: ${stringifyMessage}, trying new pairing method`);
                                     await new Promise(resolve => setTimeout(resolve, 5000));
-                                    await this.registerToTv();
+                                    await this.registerToTv(PairingNew);
                                     break;
                                 default:
                                     if (this.logDebug) this.emit('debug', `Register to TV unknown message, type: ${messageType}, id: ${messageId}, data: ${stringifyMessage}`);
@@ -436,9 +436,7 @@ class LgWebOsSocket extends EventEmitter {
                                     if (this.logDebug) this.emit('debug', `System info: ${stringifyMessage}`);
                                     this.tvInfo.modelName = messageData.modelName ?? 'LG TV';
                                     // webOS 26+: getSystemInfo returns serialNumber instead of deviceId;
-                                    // store it now so the softwareInfo fallback has real data
                                     this.tvInfo.deviceId = messageData.deviceId ?? messageData.serialNumber ?? this.tvInfo.deviceId;
-                                    await this.getSoftwareInfo();
                                     if (this.restFulEnabled) this.emit('restFul', 'systeminfo', messageData);
                                     if (this.mqttEnabled) this.emit('mqtt', 'System info', messageData);
                                     break;
@@ -467,8 +465,6 @@ class LgWebOsSocket extends EventEmitter {
                                 case 'error':
                                     // webOS 26+ blocks getCurrentSWInformation with 401 insufficient permissions.
                                     // Fall back to data already harvested from getSystemInfo and derive
-                                    // the webOS version from the model name (e.g. C31 → 2023 → webOS 23,
-                                    // but firmware 40.x is shipped with webOS 26 via the Re:New program).
                                     if (this.logDebug) this.emit('debug', `Software info blocked (likely webOS 26+ 401), applying fallback: ${stringifyMessage}`);
                                     await this.applySoftwareInfoFallback();
                                     break;