homebridge-eosstb 2.2.0 → 2.2.2

package/CHANGELOG.md

@@ -10,6 +10,18 @@ Please restart Homebridge after every plugin update.
 * Implement refreshToken capabilities
 
 
+## 2.2.2 (2023-02-18)
+* Fixed bug causing 401 unauthorized when refreshing the master channel list
+* Bumped dependency "axios": "^1.3.3"
+
+
+## 2.2.1 (2023-02-11)
+* Fixed issue #96 with failled mqtt session not reconnecting automatically
+* Cleaned up and optimized some code
+* Bumped dependency "axios": "^1.3.2"
+* Improved readme content and layout
+
+
 ## 2.2.0 (2023-01-28)
 * Added support for new ARRIS VIP5002W set-top box as seen in NL in January 2023
 * Added support for households which do not have recording entitlements

package/README.md

@@ -64,8 +64,9 @@ This plugin was written and tested on the author's set-top box (ARRIS mediabox m
 ## Why I chose the Name EOSSTB
 I tried to find a good common name that works for this plugin for all countries. Each country uses a different marketing name for the box, so I could not use the local name. The EOS system, also known as the Horizon platform, originally used an ARRIS DCX960, but even this box comes in different types and with different firmware, so I decided not to use the model name. I stuck with the box identifier that appears in the mqtt messages: EOSSTB. 
 
-In March 2022, a newer version of the set-top box has started to appear in Telenet in Belgium: a HUMAX 2008C-STB-TN, which identifies itself as EOS2STB. This has since been seen in NL as a HUMAX 2008C-STB-ZG, and in CH as a HUMAX 2008C-STB-UPC/CH. 
-In January 2023, an ARRIS VIP5002W appeared, which identifies itself as an APLSTB.  However, I will keep the plugin name unchanged at EOSSTB. 
+In March 2022, a newer version of the set-top box has started to appear in Telenet in Belgium: a HUMAX 2008C-STB-TN, which identifies itself as EOS2STB. This has since been seen in NL as a HUMAX 2008C-STB-ZG, and in CH as a HUMAX 2008C-STB-UPC/CH.
+
+In January 2023, an ARRIS VIP5002W appeared, which identifies itself as an APLSTB. However, I will keep the plugin name unchanged at EOSSTB. 
 
 ## Disclaimer (The Legal Stuff)
 This plugin is not provided by Magenta or Telenet or Sunrise or Virgin Media or Ziggo any other affiliate of [UPC](https://en.wikipedia.org/wiki/UPC_Broadband). It is neither endorsed nor supported nor developed by [UPC](https://en.wikipedia.org/wiki/UPC_Broadband) or any affiliates. [UPC](https://en.wikipedia.org/wiki/UPC_Broadband) can change their systems at any time and that might break this plugin. But I hope not.
@@ -86,9 +87,9 @@ This plugin is not provided by Magenta or Telenet or Sunrise or Virgin Media or
 
 * **Powerful Key Macros**: You can program key macros to control your set-top box. Key macros are powerful ways of accessing any content such as radio channels that cannot be accessed directly via a channel number.
 
-* **Siri Support** You can control your box with Siri (to the extent of what Apple Siri supports).
+* **Siri Support** You can control your set-top box with Siri (to the extent of what Apple Siri supports).
 
-* **Shortcuts Support** You can read and control your box with Shortcuts and HomeKit automations (to the extent of what Apple supports), allowing you to control switch-on and channel selection in Home Automations, Shortcuts and Personal Automations.
+* **Shortcuts Support** You can read and control your set-top box with Shortcuts and HomeKit automations (to the extent of what Apple supports), allowing you to control switch-on and channel selection in Home Automations, Shortcuts and Personal Automations, as well as read a lot of status information from your set-top box.
 
 * **Synchronised Set-Top Box Name**: Changing the name of the set-top box in the Home app changes it on the TV and backend systems in real time, and vice-versa. No reboot required. You can turn off the sync if desired in the config.
 
@@ -100,7 +101,7 @@ This plugin is not provided by Magenta or Telenet or Sunrise or Virgin Media or
 
 * **Master Channel List Refreshed Daily**: The master channel list is refreshed daily, ensuring it is always up to date.
 
-* **Ignores Non-Subscribed Channels**: Only the channels you subscribe to are shown in the Home app, saving you valuable slots in the limited Home app channel list.
+* **Ignores Non-Subscribed Channels**: Only the channels you subscribe to are shown in the Home app, saving you valuable slots in the Home app channel list.
 
 * **Optional Channel Numbers**: If you wish, you can display a channel number before the channel name. As this consumes some space on the Home app tile, it is off by default.
 

package/index.js

@@ -123,7 +123,7 @@ const NO_CHANNEL_ID = 'ID_UNKNOWN'; // id for a channel not in the channel list,
 const NO_CHANNEL_NAME = 'UNKNOWN'; // name for a channel not in the channel list
 const MAX_INPUT_SOURCES = 95; // max input services. Default = 95. Cannot be more than 96 (100 - all other services)
 const SESSION_WATCHDOG_INTERVAL_MS = 15000; // session watchdog interval in millisec. Default = 15000 (15s)
-const MASTER_CHANNEL_LIST_VALID_FOR_S = 86400; // master channel list starts valid for 24 hours from last refresh = 86400 seconds
+const MASTER_CHANNEL_LIST_VALID_FOR_S = 86400; // master channel list stays valid for 24 hours from last refresh. 24hr = 86400 seconds
 const MASTER_CHANNEL_LIST_REFRESH_CHECK_INTERVAL_S = 3600; // master channel list refresh check interval, in seconds. Default = 3600 (1hr) (increased from 600)
 const SETTOPBOX_NAME_MINLEN = 3; // min len of the set-top box name
 const SETTOPBOX_NAME_MAXLEN = 14; // max len of the set-top box name
@@ -132,13 +132,11 @@ const SETTOPBOX_NAME_MAXLEN = 14; // max len of the set-top box name
 
 // state constants. Need to add an array for any characteristic that is not an array, or the array is not contiguous
 const sessionState = { DISCONNECTED: 0, LOADING: 1, LOGGING_IN: 2, AUTHENTICATING: 3, VERIFYING: 4, AUTHENTICATED: 5, CONNECTED: 6 }; // custom
-const mqttState = { DISCONNECTED: 0, OFFLINE: 1, CLOSED: 2, CONNECTED: 3, RECONNECTED: 4, ERROR: 5, END: 6, MESSAGERECEIVED: 7, PACKETSENT: 8, PACKETRECEIVED: 9 }; // custom
 const powerStateName = ["OFF", "ON"]; // custom
 const recordingState = { IDLE: 0, ONGOING_NDVR: 1, ONGOING_LOCALDVR: 2 }; // custom
 const statusActiveName = ["NOT_ACTIVE", "ACTIVE"]; // ccustom, haracteristic is boolean, not an array
 
 Object.freeze(sessionState);
-Object.freeze(mqttState);
 Object.freeze(powerStateName);
 Object.freeze(recordingState);
 Object.freeze(statusActiveName);
@@ -318,7 +316,6 @@ class stbPlatform {
 		// session flags
 		currentSessionState = sessionState.DISCONNECTED;
 		mqttClient.connected = false;
-		this.currentMqttState = mqttState.DISCONNECTED;
 		this.sessionWatchdogRunning = false;
 		this.watchdogCounter = 0;
 		this.mqttClientConnecting = false;
@@ -433,38 +430,36 @@ class stbPlatform {
 		// If no session exists: prepares the session, then prepares the device
 		this.watchdogCounter++; // increment global counter by 1
 		let watchdogInstance = 'sessionWatchdog(' + this.watchdogCounter + ')'; // set a log prefix for this instance of the watchdog to allow differentiation in the logs
-		let statusOverview = watchdogInstance + ':';
+		let statusOverview = '';
 		callback = true;
 		//this.log('++++ SESSION WATCHDOG STARTED ++++');
 
 		// standard debugging
 		let debugPrefix='\x1b[33msessionWatchdog :: ' // 33=yellow
 		debug(debugPrefix + 'started')
-		if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > started', watchdogInstance); }
+		if (this.config.debugLevel > 2) { this.log.warn('%s: Started watchdog instance %s', watchdogInstance, this.watchdogCounter); }
 
 		//robustness: if session state ever gets disconnected due to session creation problems, ensure the mqtt status is always disconnected
 		if (currentSessionState == sessionState.DISCONNECTED) { 
 			this.mqttClientConnecting = false;
-			this.currentMqttState = mqttState.DISCONNECTED;
 		}
 
 
 		if (this.config.debugLevel > 0) { 
 			statusOverview = statusOverview + ' sessionState=' + Object.keys(sessionState)[currentSessionState]
-			statusOverview = statusOverview + ' mqttState=' + Object.keys(mqttState)[this.currentMqttState]
 			statusOverview = statusOverview + ' mqttClient.connected=' + mqttClient.connected
 			statusOverview = statusOverview + ' sessionWatchdogRunning=' + this.sessionWatchdogRunning
 		}
 
 		// exit if shutting down
 		if (isShuttingDown) { 
-			if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Homebridge is shutting down, exiting %s without action', watchdogInstance); }
+			if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Homebridge is shutting down, exiting %s without action', watchdogInstance); }
 			return;
 		}
 
 		// exit if a previous session is still running
 		if (this.sessionWatchdogRunning) { 
-			if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Previous sessionWatchdog still working, exiting %s without action', watchdogInstance); }
+			if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Previous sessionWatchdog still working, exiting %s without action', watchdogInstance); }
 			return;
 
 		// as we are called regularly by setInterval, check connection status and exit without action if required
@@ -472,29 +467,29 @@ class stbPlatform {
 			// session is connected, check mqtt state
 
 			if (mqttClient.connected) { 
-				if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Session and mqtt connected, exiting %s without action', watchdogInstance); }
+				if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Session and mqtt connected, exiting %s without action', watchdogInstance); }
 				return; 
 			} else if (this.mqttClientConnecting) { 
-				if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Session connected but mqtt still connecting, exiting %s without action', watchdogInstance); }
+				if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Session connected but mqtt still connecting, exiting %s without action', watchdogInstance); }
 				return; 
 			} else {
-				if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Session connected but mqtt not connected, %s will try to reconnect mqtt now...', watchdogInstance); }
+				if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Session connected but mqtt not connected, %s will try to reconnect mqtt now...', watchdogInstance); }
 			}
 
 		} else if (currentSessionState != sessionState.DISCONNECTED) { 
 			// session is not disconnected, meaning it is between connected and disconnected, ie: a connection is in progress
-			if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Session still connecting, exiting %s without action', watchdogInstance); }
+			if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Session still connecting, exiting %s without action', watchdogInstance); }
 			return;
 
 		} else { 
 			// session is not connected and is not in a state between connected and disconnected, so it is disconnected. ContinuecurrentMediaStateName(
-			if (this.config.debugLevel > 2) { this.log.warn(statusOverview + ' > Session and mqtt not connected, %s will try to connect now...', watchdogInstance); }
+			if (this.config.debugLevel > 2) { this.log.warn(watchdogInstance + ': Session and mqtt not connected, %s will try to connect now...', watchdogInstance); }
 
 		}
 
 		// the watchdog will now attempt to reconnect the session. Flag that the watchdog is running
 		this.sessionWatchdogRunning = true;
-		if (this.config.debugLevel > 2) { this.log.warn('%s: sessionWatchdogRunning=%s', watchdogInstance, this.sessionWatchdogRunning); }
+		if (this.config.debugLevel > 2) { this.log.warn('%s: Status: sessionWatchdogRunning=%s', watchdogInstance, this.sessionWatchdogRunning); }
 		
 
 		// detect if running on development environment
@@ -507,73 +502,73 @@ class stbPlatform {
 		let errorTitle;
 		if (currentSessionState == sessionState.DISCONNECTED ) { 
 			this.log('Session %s. Starting session connection process', Object.keys(sessionState)[currentSessionState]);
-			if (this.config.debugLevel > 2) { this.log.warn('%s: attempting to create session', watchdogInstance); }
+			if (this.config.debugLevel > 2) { this.log.warn('%s: Attempting to create session', watchdogInstance); }
 
 			// asnyc startup sequence with chain of promises
-			this.log.debug('sessionWatchdog: ++++ step 1: calling createSession')
+			this.log.debug('%s: ++++ step 1: calling createSession', watchdogInstance)
 			errorTitle = 'Failed to create session';
 			debug(debugPrefix + 'calling createSession')
 			await this.createSession(this.config.country.toLowerCase()) // returns householdId, stores session in this.session
 				.then((sessionHouseholdId) => {
-					this.log.debug('sessionWatchdog: ++++++ step 2: session was created, connected to sessionHouseholdId %s', sessionHouseholdId)
-					this.log.debug('sessionWatchdog: ++++++ step 2: calling getPersonalizationData with sessionHouseholdId %s ',sessionHouseholdId)
+					this.log.debug('%s: ++++++ step 2: session was created, connected to sessionHouseholdId %s', watchdogInstance, sessionHouseholdId)
+					this.log.debug('%s: ++++++ step 2: calling getPersonalizationData with sessionHouseholdId %s ', watchdogInstance, sessionHouseholdId)
 					this.log('Discovering platform...');
 					errorTitle = 'Failed to discover platform';
 					debug(debugPrefix + 'calling getPersonalizationData')
 					return this.getPersonalizationData(this.session.householdId) // returns customer object, with devices and profiles, stores object in this.customer
 				})
 				.then((objCustomer) => {
-					this.log.debug('sessionWatchdog: ++++++ step 3: personalization data was retrieved, customerId %s customerStatus %s',objCustomer.customerId, objCustomer.customerStatus)
-					this.log.debug('sessionWatchdog: ++++++ step 3: calling getEntitlements with customerId %s ',objCustomer.customerId)
+					this.log.debug('%s: ++++++ step 3: personalization data was retrieved, customerId %s customerStatus %s', watchdogInstance, objCustomer.customerId, objCustomer.customerStatus)
+					this.log.debug('%s: ++++++ step 3: calling getEntitlements with customerId %s ', watchdogInstance, objCustomer.customerId)
 					debug(debugPrefix + 'calling getEntitlements')
 					return this.getEntitlements(this.customer.customerId) // returns customer object
 				})
 				.then((objEntitlements) => {
-					this.log.debug('sessionWatchdog: ++++++ step 4: entitlements data was retrieved, objEntitlements.token %s',objEntitlements.token)
-					this.log.debug('sessionWatchdog: ++++++ step 4: calling refreshMasterChannelList')
+					this.log.debug('%s: ++++++ step 4: entitlements data was retrieved, objEntitlements.token %s', watchdogInstance, objEntitlements.token)
+					this.log.debug('%s: ++++++ step 4: calling refreshMasterChannelList', watchdogInstance)
 					debug(debugPrefix + 'calling refreshMasterChannelList')
 					return this.refreshMasterChannelList() // returns entitlements object
 				})
 				.then((objChannels) => {
-					this.log.debug('sessionWatchdog: ++++++ step 5: masterchannelList data was retrieved, channels found: %s',objChannels.length)
+					this.log.debug('%s: ++++++ step 5: masterchannelList data was retrieved, channels found: %s', watchdogInstance, objChannels.length)
 					// Recording needs entitlements of PVR or LOCALDVR
 					const pvrFeatureFound = this.entitlements.features.find(feature => (feature === 'PVR' || feature === 'LOCALDVR'));
-					this.log.debug('sessionWatchdog: ++++++ step 5: foundPvrEntitlement %s', pvrFeatureFound);
+					this.log.debug('%s: ++++++ step 5: foundPvrEntitlement %s', watchdogInstance, pvrFeatureFound);
 					if (pvrFeatureFound) {
-						this.log.debug('sessionWatchdog: ++++++ step 5: calling getRecordingState with householdId %s', this.session.householdId)
+						this.log.debug('%s: ++++++ step 5: calling getRecordingState with householdId %s', watchdogInstance, this.session.householdId)
 						this.getRecordingState(this.session.householdId) // returns true when successful
 					}
 					return true
 				})
 				.then((objRecordingStateFound) => {
-					this.log.debug('sessionWatchdog: ++++++ step 6: recording state data was retrieved, objRecordingStateFound: %s',objRecordingStateFound)
+					this.log.debug('%s: ++++++ step 6: recording state data was retrieved, objRecordingStateFound: %s', watchdogInstance, objRecordingStateFound)
 					// Recording needs entitlements of PVR or LOCALDVR
 					const pvrFeatureFound = this.entitlements.features.find(feature => (feature === 'PVR' || feature === 'LOCALDVR'));
-					this.log.debug('sessionWatchdog: ++++++ step 6: foundPvrEntitlement %s', pvrFeatureFound);
+					this.log.debug('%s: ++++++ step 6: foundPvrEntitlement %s', watchdogInstance, pvrFeatureFound);
 					if (pvrFeatureFound) {
-						this.log.debug('sessionWatchdog: ++++++ step 6: calling getRecordingBookings with householdId %s', this.session.householdId)
+						this.log.debug('%s: ++++++ step 6: calling getRecordingBookings with householdId %s', watchdogInstance, this.session.householdId)
 						this.getRecordingBookings(this.session.householdId) // returns true when successful
 					}
 					return true
 				})
 				.then((objRecordingBookingsFound) => {
-					this.log.debug('sessionWatchdog: ++++++ step 7: recording bookings data was retrieved, objRecordingBookingsFound: %s',objRecordingBookingsFound)
-					this.log.debug('sessionWatchdog: ++++++ step 7: calling discoverDevices')
+					this.log.debug('%s: ++++++ step 7: recording bookings data was retrieved, objRecordingBookingsFound: %s', watchdogInstance, objRecordingBookingsFound)
+					this.log.debug('%s: ++++++ step 7: calling discoverDevices', watchdogInstance)
 					errorTitle = 'Failed to discover devices';
 					debug(debugPrefix + 'calling discoverDevices')
 					return this.discoverDevices() // returns stbDevices object 
 				})
 				.then((objStbDevices) => {
 					this.log('Discovery completed');
-					this.log.debug('sessionWatchdog: ++++++ step 8: devices found:', this.devices.length )
-					this.log.debug('sessionWatchdog: ++++++ step 8: calling getJwtToken')
+					this.log.debug('%s: ++++++ step 8: devices found:', watchdogInstance, this.devices.length)
+					this.log.debug('%s: ++++++ step 8: calling getJwtToken', watchdogInstance)
 					errorTitle = 'Failed to start mqtt session';
 					debug(debugPrefix + 'calling getJwtToken')
 					return this.getJwtToken(this.session.username, this.session.accessToken, this.session.householdId);
 				})
 				.then((jwToken) => {
-					this.log.debug('sessionWatchdog: ++++++ step 9: getJwtToken token was retrieved, token %s',jwToken)
-					this.log.debug('sessionWatchdog: ++++++ step 9: start mqtt client')
+					this.log.debug('%s: ++++++ step 9: getJwtToken token was retrieved, token %s', watchdogInstance, jwToken)
+					this.log.debug('%s: ++++++ step 9: start mqtt client', watchdogInstance)
 					debug(debugPrefix + 'calling startMqttClient')
 					return this.startMqttClient(this, this.session.householdId, jwToken);  // returns true
 				})				
@@ -585,10 +580,11 @@ class stbPlatform {
 					return true
 				});	
 			debug(debugPrefix + 'end of promise chain')
-			//this.log.debug('sessionWatchdog: ++++++ end of promise chain')
-			//this.log.debug('sessionWatchdog: ++++ create session promise chain completed')
+			this.log.debug('%s: ++++++ End of promise chain', watchdogInstance)
+			//this.log.debug('%s: ++++ create session promise chain completed', watchdogInstance)
 		}
 
+		if (this.config.debugLevel > 2) { this.log.warn('%s: Exiting sessionWatchdog', watchdogInstance,); }
 		debug(debugPrefix + 'exiting sessionWatchdog')
 		//this.log('Exiting sessionWatchdog')
 		this.sessionWatchdogRunning = false;
@@ -672,7 +668,7 @@ class stbPlatform {
 					}	
 
 				};
-				resolve( this.stbDevices ); // resolve the promise with the stbDevices object
+				resolve(this.stbDevices); // resolve the promise with the stbDevices object
 			}
 
 			//this.log.debug('discoverDevices: end of code block')
@@ -1331,13 +1327,15 @@ class stbPlatform {
 			// exit immediately if the session does not exist
 			if (currentSessionState != sessionState.CONNECTED) { 
 				if (this.config.debugLevel > 1) { this.log.warn('refreshMasterChannelList: Session does not exist, exiting'); }
-				return false;
+				resolve(true);
+				return
 			}
 
 			// exit immediately if channel list has not expired
 			if (this.masterChannelListExpiryDate > Date.now()) {
 				if (this.config.debugLevel > 1) { this.log.warn('refreshMasterChannelList: Master channel list has not expired yet. Next refresh will occur after %s', this.masterChannelListExpiryDate.toLocaleString()); }
-				return false;
+				resolve(true);
+				return
 			}
 
 			this.log('Refreshing master channel list');
@@ -1366,7 +1364,11 @@ class stbPlatform {
 			// call the webservice to get all available channels
 			const axiosConfig = {
 				method: 'GET',
-				url: url
+				url: url,
+				headers: {
+					accept: '*/*',
+					'x-oesp-username': this.session.username
+				}
 			};
 			axiosWS(axiosConfig)
 				.then(response => {
@@ -1398,7 +1400,7 @@ class stbPlatform {
 					if (this.config.debugLevel > 0) {
 						this.log.warn('refreshMasterChannelList: Master channel list refreshed with %s channels, valid until %s', this.masterChannelList.length, this.masterChannelListExpiryDate.toLocaleString());
 					}
-					resolve( this.masterChannelList ); // resolve the promise with the masterChannelList object
+					resolve(this.masterChannelList); // resolve the promise with the masterChannelList object
 
 				})
 				.catch(error => {
@@ -1436,17 +1438,19 @@ class stbPlatform {
 					.then(() => {
 						this.log.debug('refreshRecordings: ++++++ step 2: calling getRecordingBookings with householdId %s ', householdId)
 						this.getRecordingBookings(householdId) // returns customer object, with devices and profiles, stores object in this.customer
-						resolve( true ); // resolve the promise
+						resolve(true); // resolve the promise
+						return;
 					})
 					.catch(errorReason => {
 						// log any errors and set the currentSessionState
 						this.log.warn(errorTitle + ' - %s', errorReason);
 						reject(errorReason);
+						return;
 					});
 			} else {
 				this.log.debug('refreshRecordings: no recordings entitlement found');
 			}
-			return true
+			resolve(true); // resolve the promise
 
 		})
 	}
@@ -1545,7 +1549,7 @@ class stbPlatform {
 					//this.refreshMasterChannelList(); // async function, processing continues, must load after customer data is loaded
 
 					//this.log.warn('getPersonalizationData: all done, returnng customerStatus: %s', this.customer.customerStatus);
-					resolve( this.customer ); // resolve the promise with the customer object
+					resolve(this.customer); // resolve the promise with the customer object
 				})
 				.catch(error => {
 					let errReason;
@@ -1629,7 +1633,7 @@ class stbPlatform {
 						this.log.warn('getEntitlements: entitlements found:', this.entitlements.entitlements.length);
 					}
 					//his.log('getEntitlements: returning entitlements object');
-					resolve( this.entitlements ); // resolve the promise with the customer object
+					resolve(this.entitlements); // resolve the promise with the customer object
 				})
 				.catch(error => {
 					let errReason;
@@ -1743,7 +1747,7 @@ class stbPlatform {
 
 						});
 					}
-					resolve( this.currentRecordingState ); // resolve the promise
+					resolve(this.currentRecordingState); // resolve the promise
 				})
 
 				.catch(error => {
@@ -1871,7 +1875,7 @@ class stbPlatform {
 
 						});
 					}
-					resolve( this.currentRecordingState ); // resolve the promise
+					resolve(this.currentRecordingState); // resolve the promise
 				})
 
 				.catch(error => {
@@ -1893,7 +1897,7 @@ class stbPlatform {
 						this.log.warn(error)
 					}
 					reject(errReason);
-					});		
+				});		
 		})
 	}
 
@@ -1923,7 +1927,7 @@ class stbPlatform {
 					this.log.warn('getExperimentalEndpoint: response: %s %s', response.status, response.statusText);
 					this.log.warn(response.data);
 					return true
-					//resolve( true ); // resolve the promise with the customer object
+					//resolve(true); // resolve the promise with the customer object
 				})
 				.catch(error => {
 					let errReason;
@@ -1994,7 +1998,7 @@ class stbPlatform {
 					}
 					//this.jwtToken = response.data.token; // store the token
 					mqttUsername = householdId; // used in sendKey to ensure that mqtt is connected
-					resolve( response.data.token ); // resolve with the tokwn
+					resolve(response.data.token); // resolve with the tokwn
 					//this.startMqttClient(this, householdId, response.data.token);  // this starts the mqtt session
 					
 				})
@@ -2057,8 +2061,7 @@ class stbPlatform {
 				// https://github.com/mqttjs/MQTT.js#event-connect
 				mqttClient.on('connect', function () {
 					try {
-						parent.log("mqttClient: Connected: %s", mqttClient.connected);
-						parent.currentMqttState = mqttState.CONNECTED;
+						parent.log("mqttClient: %s", mqttClient.connected ? 'Connected' : 'Disconnected' ); // Conditional (ternary) operator: condition ? trueValue : FalseValue
 						parent.mqttClientConnecting = false;
 
 						// https://prod.spark.sunrisetv.ch/eng/web/personalization-service/v1/customer/107xxxx_ch/profiles
@@ -2123,7 +2126,6 @@ class stbPlatform {
 							try {
 
 								// store some mqtt diagnostic data
-								parent.currentMqttState = mqttState.CONNECTED; // set to connected on every message received event
 								parent.lastMqttMessageReceived = Date.now();
 
 								let mqttMessage = JSON.parse(message);
@@ -2372,7 +2374,6 @@ class stbPlatform {
 						mqttClient.on('close', function () {
 							try {
 								// mqttDeviceStateHandler(deviceId, powerState, mediaState, recordingState, channelId, eventId, sourceType, profileDataChanged, statusFault, programMode, statusActive, currInputDeviceType, currInputSourceType)
-								parent.currentMqttState = mqttState.CLOSED;
 								parent.log('mqttClient: Connection closed');
 								currentSessionState = sessionState.DISCONNECTED; // to force a session reconnect
 								if (!isShuttingDown) {
@@ -2390,7 +2391,6 @@ class stbPlatform {
 						mqttClient.on('reconnect', function () {
 							try {
 								// mqttDeviceStateHandler(deviceId, powerState, mediaState, recordingState, channelId, eventId, sourceType, profileDataChanged, statusFault, programMode, statusActive, currInputDeviceType, currInputSourceType)
-								parent.currentMqttState = mqttState.RECONNECTED;
 								parent.log('mqttClient: Reconnect started');
 								parent.mqttDeviceStateHandler(null,	null, null,	null, null, null, null, null, Characteristic.StatusFault.GENERAL_FAULT); // set statusFault to GENERAL_FAULT
 							} catch (err) {
@@ -2405,7 +2405,6 @@ class stbPlatform {
 						mqttClient.on('disconnect', function () {
 							try {
 								// mqttDeviceStateHandler(deviceId, powerState, mediaState, recordingState, channelId, eventId, sourceType, profileDataChanged, statusFault, programMode, statusActive, currInputDeviceType, currInputSourceType)
-								parent.currentMqttState = mqttState.DISCONNECTED;
 								parent.log('mqttClient: Disconnect command received');
 								currentSessionState = sessionState.DISCONNECTED; // to force a session reconnect
 								parent.mqttDeviceStateHandler(null,	null, null,	null, null, null, null, null, Characteristic.StatusFault.GENERAL_FAULT); // set statusFault to GENERAL_FAULT
@@ -2421,7 +2420,6 @@ class stbPlatform {
 						mqttClient.on('offline', function () {
 							try {
 								// mqttDeviceStateHandler(deviceId, powerState, mediaState, recordingState, channelId, eventId, sourceType, profileDataChanged, statusFault, programMode, statusActive, currInputDeviceType, currInputSourceType)
-								parent.currentMqttState = mqttState.OFFLINE;
 								parent.log('mqttClient: Client is offline');
 								currentSessionState = sessionState.DISCONNECTED; // to force a session reconnect
 								parent.mqttDeviceStateHandler(null,	null, null,	null, null, null, null, null, Characteristic.StatusFault.GENERAL_FAULT); // set statusFault to GENERAL_FAULT
@@ -2437,9 +2435,8 @@ class stbPlatform {
 						mqttClient.on('error', function(err) {
 							try {
 								// mqttDeviceStateHandler(deviceId, powerState, mediaState, recordingState, channelId, eventId, sourceType, profileDataChanged, statusFault, programMode, statusActive, currInputDeviceType, currInputSourceType)
-								parent.currentMqttState = mqttState.ERROR;
 								parent.log.warn('mqttClient: Error', (err.syscall || '') + ' ' + (err.code || '') + ' ' + (err.hostname || ''));
-								parent.log.warn('mqttClient: Error object:', err); 
+								parent.log.debug('mqttClient: Error object:', err); 
 								currentSessionState = sessionState.DISCONNECTED; // to force a session reconnect
 								parent.mqttDeviceStateHandler(null,	null, null,	null, null, null, null, null, Characteristic.StatusFault.GENERAL_FAULT); // set statusFault to GENERAL_FAULT
 								mqttClient.end();

package/package.json

@@ -3,11 +3,11 @@
   "displayName": "Homebridge EOSSTB",
   "description": "homebridge-plugin - Add your set-top box to Homekit (for Magenta AT, Telenet BE, Sunrise CH, Virgin Media GB & IE, Ziggo NL)",
   "author": "Jochen Siegenthaler (https://github.com/jsiegenthaler/)",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "platformname": "eosstb",
   "dependencies": {
     "axios-cookiejar-support": "^4.0.6",
-    "axios": "^1.2.5",
+    "axios": "^1.3.3",
     "debug": "^4.3.4",
     "mqtt": "^4.3.7",
     "qs": "^6.11.0",
@@ -66,9 +66,11 @@
     "VIP5002W",
     "HUMAX",
     "2008C",
+    "2008CSTB",
     "2008C-STB",
     "2008C-STB-TN",
-    "EOS1008R"
+    "EOS1008R",
+    "APLSTB"
   ],
   "license": "MIT",
   "main": "index.js",