homebridge-eosstb 2.4.0-alpha.4 → 2.4.0-alpha.6

package/index.js

@@ -106,7 +106,7 @@ 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
 
 // state constants. Need to add an array for any characteristic that is not an array, or the array is not contiguous
-const sessionState = {
+const sessionState = Object.freeze({
   DISCONNECTED: 0,
   LOADING: 1,
   LOGGING_IN: 2,
@@ -114,15 +114,14 @@ const sessionState = {
   VERIFYING: 4,
   AUTHENTICATED: 5,
   CONNECTED: 6,
-}; // custom
-const powerStateName = ["OFF", "ON"]; // custom
-const recordingState = { IDLE: 0, ONGOING_NDVR: 1, ONGOING_LOCALDVR: 2 }; // custom
-const statusActiveName = ["NOT_ACTIVE", "ACTIVE"]; // custom, characteristic is boolean, not an array
-
-Object.freeze(sessionState);
-Object.freeze(powerStateName);
-Object.freeze(recordingState);
-Object.freeze(statusActiveName);
+});
+const powerStateName = Object.freeze(["OFF", "ON"]); // custom
+const recordingState = Object.freeze({
+  IDLE: 0,
+  ONGOING_NDVR: 1,
+  ONGOING_LOCALDVR: 2,
+}); // custom
+const statusActiveName = Object.freeze(["NOT_ACTIVE", "ACTIVE"]); // custom, characteristic is boolean, not an array
 
 // exec spawns child process to run a bash script
 const exec = require("child_process").exec;
@@ -136,6 +135,7 @@ let currentSessionState;
 let isShuttingDown = false; // to handle reboots cleanly
 
 let Accessory, Characteristic, Service, Categories, UUID;
+let CHAR_NAMES; // declared here, populated once Characteristic is available
 
 // Returns the path to the system Chromium/Chrome executable.
 // Used by getSessionCH() which requires puppeteer-core (no bundled browser).
@@ -190,10 +190,48 @@ function getTimestampInSeconds() {
 // transform current media state of 0,1,2,4,5 to 1,2,3,4,5 to work with Object.keys
 function currentMediaStateName(currentMediaState) {
   let i = currentMediaState + 1; // get the new index
+  // modify if > 3 to get 1,2,3,4,5
   if (i > 3) {
     i = i - 1;
-  } // modify if > 3 to get 1,2,3,4,5
-  return Object.keys(Characteristic.CurrentMediaState)[i];
+  }
+  return CHAR_NAMES.CurrentMediaState[i];
+}
+
+// helper function to create consistent log text for set-to vs changed-from
+function logCharValueChange(
+  log,
+  name,
+  label,
+  input,
+  previousValue,
+  previousLabel,
+  currentValue,
+  currentLabel,
+) {
+  if (previousValue === null || previousValue === undefined) {
+    log("%s: %s set to %s [%s]", name, label, currentValue, currentLabel);
+  } else if (input === null || input === undefined) {
+    log(
+      "%s: %s changed from %s [%s] to %s [%s]",
+      name,
+      label,
+      previousValue,
+      previousLabel,
+      currentValue,
+      currentLabel,
+    );
+  } else {
+    log(
+      "%s: %s changed on input %s from %s [%s] to %s [%s]",
+      name,
+      label,
+      input,
+      previousValue,
+      previousLabel,
+      currentValue,
+      currentLabel,
+    );
+  }
 }
 
 // clean a name so it is acceptable for HomeKit
@@ -271,7 +309,24 @@ module.exports = (api) => {
   Service = api.hap.Service;
   Categories = api.hap.Categories;
   UUID = api.hap.uuid;
+
+  // Build CHAR_NAMES here, now that Characteristic is assigned
+  // Cached key name arrays for logging. These enums never change at runtime so build them once.
+  CHAR_NAMES = Object.freeze({
+    StatusFault: Object.keys(Characteristic.StatusFault),
+    ProgramMode: Object.keys(Characteristic.ProgramMode),
+    InputDeviceType: Object.keys(Characteristic.InputDeviceType),
+    InputSourceType: Object.keys(Characteristic.InputSourceType),
+    ClosedCaptions: Object.keys(Characteristic.ClosedCaptions),
+    PictureMode: Object.keys(Characteristic.PictureMode),
+    InUse: Object.keys(Characteristic.InUse),
+    CurrentVisibilityState: Object.keys(Characteristic.CurrentVisibilityState),
+    CurrentMediaState: Object.keys(Characteristic.CurrentMediaState),
+    TargetMediaState: Object.keys(Characteristic.TargetMediaState),
+  });
+
   const isDynamicPlatform = true;
+
   api.registerPlatform(
     PLUGIN_NAME,
     PLATFORM_NAME,
@@ -291,6 +346,7 @@ class StbPlatform {
     this.stbDevices = []; // store stbDevice in this.stbDevices
     this.masterChannelList = [];
     this.isDev = config.devMode === true;
+    this.debugLevel = this.config.debugLevel || 0; // debugLevel defaults to 0 (minimum)
 
     // show some useful version info
     this.log.info(
@@ -349,7 +405,7 @@ class StbPlatform {
      */
     //this.api.on('didFinishLaunching', () => {
     this.api.on("didFinishLaunching", async () => {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn("API event: didFinishLaunching");
       }
       debug("StbPlatform:apievent :: didFinishLaunching");
@@ -374,20 +430,20 @@ class StbPlatform {
       // check for a channel list update every MASTER_CHANNEL_LIST_REFRESH_CHECK_INTERVAL_S seconds
       this.checkChannelListInterval = setInterval(() => {
         // check if master channel list has expired. If it has, refresh auth token, then refresh channel list
-        if (this.config.debugLevel >= 1) {
+        if (this.debugLevel >= 1) {
           this.log.warn("StbPlatform: checkChannelListInterval Start");
         }
         if (this.masterChannelListExpiryDate <= Date.now()) {
           // must check and refresh auth token before each call to refresh master channel list
           this.refreshAccessToken()
             .then((response) => {
-              if (this.config.debugLevel >= 1) {
+              if (this.debugLevel >= 1) {
                 this.log.warn("StbPlatform: refreshAccessToken completed OK");
               }
               return this.refreshMasterChannelList();
             })
             .then((response) => {
-              if (this.config.debugLevel >= 1) {
+              if (this.debugLevel >= 1) {
                 this.log.warn(
                   "StbPlatform: refreshMasterChannelList completed OK",
                 );
@@ -411,7 +467,7 @@ class StbPlatform {
                 );
               }
             });
-          if (this.config.debugLevel >= 1) {
+          if (this.debugLevel >= 1) {
             this.log.warn("StbPlatform: checkChannelListInterval End");
           }
         }
@@ -426,7 +482,7 @@ class StbPlatform {
      */
     this.api.on("shutdown", () => {
       debug("StbPlatform:apievent :: shutdown");
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn("API event: shutdown");
       }
       isShuttingDown = true;
@@ -521,7 +577,7 @@ class StbPlatform {
     const debugPrefix = "\x1b[33msessionWatchdog :: "; // 33=yellow
 
     debug(debugPrefix + "started");
-    if (this.config.debugLevel > 2) {
+    if (this.debugLevel > 2) {
       this.log.warn(
         "%s: Started watchdog instance %s",
         watchdogInstance,
@@ -539,7 +595,7 @@ class StbPlatform {
 
     // Build a status snapshot for debug logging (only when needed to avoid the
     // string allocation cost on every tick at lower debug levels).
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       const statusOverview = [
         `sessionState=${Object.keys(sessionState)[currentSessionState]}`,
         `mqttClient.connected=${mqttClient.connected}`,
@@ -551,7 +607,7 @@ class StbPlatform {
     // ── Early-exit checks (in order of likelihood) ───────────────────────────
 
     if (isShuttingDown) {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: Homebridge is shutting down, exiting without action",
           watchdogInstance,
@@ -563,7 +619,7 @@ class StbPlatform {
     // A previous watchdog invocation is still executing its startup sequence.
     // Return immediately — the running instance will reset the flag when done.
     if (this.sessionWatchdogRunning) {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: Previous watchdog still running, exiting without action",
           watchdogInstance,
@@ -577,7 +633,7 @@ class StbPlatform {
       currentSessionState === sessionState.CONNECTED &&
       mqttClient.connected
     ) {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: Session and mqtt fully connected, exiting without action",
           watchdogInstance,
@@ -592,7 +648,7 @@ class StbPlatform {
       currentSessionState === sessionState.CONNECTED &&
       this.mqttClientConnecting
     ) {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: Session connected, mqtt still connecting, exiting without action",
           watchdogInstance,
@@ -607,7 +663,7 @@ class StbPlatform {
       currentSessionState !== sessionState.DISCONNECTED &&
       currentSessionState !== sessionState.CONNECTED
     ) {
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: Session is connecting (state=%s), exiting without action",
           watchdogInstance,
@@ -631,7 +687,7 @@ class StbPlatform {
     // IMPORTANT: this must be set BEFORE any await so that a concurrent watchdog
     // tick that fires before the first await sees the flag and exits early.
     this.sessionWatchdogRunning = true;
-    if (this.config.debugLevel > 2) {
+    if (this.debugLevel > 2) {
       this.log.warn(
         "%s: sessionWatchdogRunning set to true, beginning reconnect",
         watchdogInstance,
@@ -643,9 +699,7 @@ class StbPlatform {
     // Uses config.json "devMode": true or NODE_ENV
     // Uses NODE_ENV so any developer can activate it without touching the code.
     if (!PLUGIN_ENV) {
-      if (
-        this.isDev || process.env.NODE_ENV === "development"
-      ) {
+      if (this.isDev || process.env.NODE_ENV === "development") {
         PLUGIN_ENV = " DEV";
       }
     }
@@ -671,7 +725,7 @@ class StbPlatform {
     } finally {
       // Reset the running flag so the next watchdog tick can proceed.
       this.sessionWatchdogRunning = false;
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         this.log.warn(
           "%s: sessionWatchdogRunning reset to false, exiting",
           watchdogInstance,
@@ -1076,7 +1130,7 @@ class StbPlatform {
   async refreshAccessToken() {
     // robustness: exit immediately if no session expiry exists yet (session not yet established)
     if (!this.session.accessTokenExpiry) {
-      if (this.config.debugLevel >= 1) {
+      if (this.debugLevel >= 1) {
         this.log.warn(
           "refreshAccessToken: No access token expiry set yet, session not yet established. Exiting.",
         );
@@ -1086,7 +1140,7 @@ class StbPlatform {
 
     // exit immediately if access token has not expired
     if (this.session.accessTokenExpiry > Date.now()) {
-      if (this.config.debugLevel >= 1) {
+      if (this.debugLevel >= 1) {
         this.log.warn(
           "refreshAccessToken: Access token has not expired yet. Next refresh will occur after %s",
           this.session.accessTokenExpiry.toLocaleString(),
@@ -1095,7 +1149,7 @@ class StbPlatform {
       return true;
     }
 
-    if (this.config.debugLevel >= 1) {
+    if (this.debugLevel >= 1) {
       this.log.warn(
         "refreshAccessToken: Access token has expired at %s. Requesting refresh",
         this.session.accessTokenExpiry.toLocaleString(),
@@ -1124,7 +1178,7 @@ class StbPlatform {
       },
     };
 
-    if (this.config.debugLevel >= 1) {
+    if (this.debugLevel >= 1) {
       this.log.warn(
         "refreshAccessToken: Post auth refresh request to",
         axiosConfig.url,
@@ -1134,7 +1188,7 @@ class StbPlatform {
     // throws on HTTP/network error → caller's catch or .catch() handles it
     const response = await axiosWS(axiosConfig);
 
-    if (this.config.debugLevel >= 2) {
+    if (this.debugLevel >= 2) {
       this.log(
         "refreshAccessToken: auth refresh response:",
         response.status,
@@ -1294,7 +1348,7 @@ class StbPlatform {
         "&language=en";
 
       this.log("Step 1 of 7: get authentication details");
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "Step 1 of 7: get authentication details from",
           apiAuthorizationUrl,
@@ -1591,7 +1645,7 @@ class StbPlatform {
                                       "Cookies for the session:",
                                       cookieJar.getCookies(sessionUrl),
                                     );
-                                    if (this.config.debugLevel > 2) {
+                                    if (this.debugLevel > 2) {
                                       this.log(
                                         "getSessionGB: response data (saved to this.session):",
                                       );
@@ -1753,7 +1807,7 @@ class StbPlatform {
         "Step 1 of 1: logging in with username %s",
         this.config.username,
       );
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 1 of 1: post login to", axiosConfig.url);
       }
       axiosWS(axiosConfig)
@@ -1763,7 +1817,7 @@ class StbPlatform {
             response.status,
             response.statusText,
           );
-          if (this.config.debugLevel > 2) {
+          if (this.debugLevel > 2) {
             this.log("getSession: response data (saved to this.session):");
             this.log(response.data);
           }
@@ -1900,7 +1954,7 @@ class StbPlatform {
       let apiAuthorizationUrl =
         this.configsvc.authorizationService.URL + "/v1/sso/authorization";
       this.log("Step 1 of 6: get authentication details");
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "Step 1 of 6: get authentication details from",
           apiAuthorizationUrl,
@@ -2122,7 +2176,7 @@ class StbPlatform {
                                   response.status,
                                   response.statusText,
                                 );
-                                if (this.config.debugLevel > 2) {
+                                if (this.debugLevel > 2) {
                                   this.log(
                                     "getSessionBE: response data (saved to this.session):",
                                   );
@@ -2278,7 +2332,7 @@ class StbPlatform {
         this.configsvc.authorizationService.URL + "/v1/sso/authorization";
 
       this.log("Step 1 of 5: get authentication details");
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 1 of 5: GET", apiAuthorizationUrl);
       }
 
@@ -2294,12 +2348,14 @@ class StbPlatform {
         },
       });
 
-      this.log.warn(
-        "Step 1 of 5: response:",
-        step1Response.status,
-        step1Response.statusText,
-      );
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 1) {
+        this.log.warn(
+          "Step 1 of 5: response:",
+          step1Response.status,
+          step1Response.statusText,
+        );
+      }
+      if (this.debugLevel > 2) {
         this.log.warn("Step 1 of 5: response data:", step1Response.data);
       }
 
@@ -2377,7 +2433,7 @@ class StbPlatform {
         }
       });
 
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         page.on("framenavigated", (frame) => {
           if (frame === page.mainFrame()) {
             this.log.warn("Step 2: navigated to:", frame.url());
@@ -2399,8 +2455,8 @@ class StbPlatform {
       //
       // waitUntil: "networkidle2" waits until there are no more than 2
       // in-flight requests for 500ms, giving Akamai JS time to initialise.
-      this.log.warn("Step 2 of 5: navigate to Keycloak login page");
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
+        this.log.warn("Step 2 of 5: navigate to Keycloak login page");
         this.log.warn("Step 2 of 5: navigating to:", authorizationUri);
       }
 
@@ -2417,7 +2473,7 @@ class StbPlatform {
       try {
         await page.waitForSelector(usernameSelector, { timeout: 10000 });
       } catch (e) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           const html = await page.content();
           this.log.warn(
             "Step 2 of 5: unexpected page content (first 1000 chars):",
@@ -2442,7 +2498,7 @@ class StbPlatform {
       await page.type(usernameSelector, this.config.username, { delay: 50 });
       await page.type(passwordSelector, this.config.password, { delay: 50 });
 
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 3 of 5: credentials entered, submitting form");
       }
 
@@ -2466,7 +2522,7 @@ class StbPlatform {
       ]);
 
       if (!submitSelector) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           const html = await page.content();
           this.log.warn(
             "Step 3 of 5: page HTML (first 2000 chars):",
@@ -2479,7 +2535,7 @@ class StbPlatform {
         );
       }
 
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 3 of 5: submit button found:", submitSelector);
       }
 
@@ -2491,7 +2547,7 @@ class StbPlatform {
       ]);
 
       const finalUrl = page.url();
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 3 of 5: post-submit URL:", finalUrl);
       }
 
@@ -2503,7 +2559,7 @@ class StbPlatform {
       this.log("Step 4 of 5: extract authorization code");
 
       if (!finalUrl.startsWith(CH_LOGIN_SUCCESS_URL)) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           const html = await page.content();
           this.log.warn(
             "Step 4 of 5: unexpected final URL:",
@@ -2525,8 +2581,8 @@ class StbPlatform {
         );
       }
 
-      this.log.warn("Step 4 of 5: authorization code OK");
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
+        this.log.warn("Step 4 of 5: authorization code OK");
         this.log.warn("Step 4 of 5: authorizationCode:", authorizationCode);
       }
 
@@ -2538,7 +2594,7 @@ class StbPlatform {
       this.log("Step 5 of 5: exchange authorization code");
       currentSessionState = sessionState.AUTHENTICATING;
 
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("Step 5 of 5: POST to", apiAuthorizationUrl);
       }
 
@@ -2561,12 +2617,12 @@ class StbPlatform {
         },
       );
 
-      this.log.warn(
-        "Step 5 of 5: response:",
-        step5Response.status,
-        step5Response.statusText,
-      );
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
+        this.log.warn(
+          "Step 5 of 5: response:",
+          step5Response.status,
+          step5Response.statusText,
+        );
         this.log.warn("Step 5 of 5: response data:", step5Response.data);
       }
 
@@ -2639,7 +2695,7 @@ class StbPlatform {
       // const GB_AUTH_OESP_URL = 'https://web-api-prod-obo.horizon.tv/oesp/v4/GB/eng/web';
       let apiAuthorizationUrl = GB_AUTH_OESP_URL + "/authorization";
       this.log("Step 1 of 7: get authentication details");
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "Step 1 of 7: get authentication details from",
           apiAuthorizationUrl,
@@ -2922,7 +2978,7 @@ class StbPlatform {
                                       "Cookies for the session:",
                                       cookieJar.getCookies(sessionUrl),
                                     );
-                                    if (this.config.debugLevel > 2) {
+                                    if (this.debugLevel > 2) {
                                       this.log(
                                         "getSessionGB: response data (saved to this.session):",
                                       );
@@ -3033,7 +3089,7 @@ class StbPlatform {
 
       // exit immediately if the session does not exist
       if (currentSessionState !== sessionState.CONNECTED) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           this.log.warn(
             "refreshMasterChannelList: Session does not exist, exiting",
           );
@@ -3044,7 +3100,7 @@ class StbPlatform {
 
       // exit immediately if channel list has not expired
       if (this.masterChannelListExpiryDate > Date.now()) {
-        if (this.config.debugLevel >= 1) {
+        if (this.debugLevel >= 1) {
           this.log.warn(
             "refreshMasterChannelList: Master channel list has not expired yet. Next refresh will occur after %s",
             this.masterChannelListExpiryDate.toLocaleString(),
@@ -3076,7 +3132,7 @@ class StbPlatform {
       url = url + "&language=en"; // language
       url = url + "&productClass=Orion-DASH"; // productClass, must be Orion-DASH
       //url = url + '&includeNotEntitled=false' // includeNotEntitled testing to see if this parameter is accepted
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("refreshMasterChannelList: GET %s", url);
       }
       // call the webservice to get all available channels
@@ -3091,7 +3147,7 @@ class StbPlatform {
       };
       axiosWS(axiosConfig)
         .then((response) => {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "refreshMasterChannelList: response: %s %s",
               response.status,
@@ -3119,7 +3175,7 @@ class StbPlatform {
           this.log.debug("Channels to process:", channels.length);
           for (let i = 0; i < channels.length; i++) {
             const channel = channels[i];
-            if (this.config.debugLevel > 2) {
+            if (this.debugLevel > 2) {
               this.log(
                 "Processing channel:",
                 i,
@@ -3129,8 +3185,8 @@ class StbPlatform {
               );
             } // for debug purposes
             // log the detail of logicalChannelNumber 60 nicktoons, for which I have no subscription, as a test of entitlements
-            //if (this.config.debugLevel > 0) { if (channel.logicalChannelNumber === 60){ this.log('DEV: Logging Channel 60 to check entitlements :',channel); } }
-            //if (this.config.debugLevel > 0) { if (channel.logicalChannelNumber === 60){ this.log('DEV: Logging Channel 60 to check entitlements :',channel); } }
+            //if (this.debugLevel > 0) { if (channel.logicalChannelNumber === 60){ this.log('DEV: Logging Channel 60 to check entitlements :',channel); } }
+            //if (this.debugLevel > 0) { if (channel.logicalChannelNumber === 60){ this.log('DEV: Logging Channel 60 to check entitlements :',channel); } }
             this.masterChannelList.push({
               id: channel.id,
               name: cleanNameForHomeKit(channel.name),
@@ -3138,8 +3194,12 @@ class StbPlatform {
               linearProducts: channel.linearProducts,
             });
           }
+          // add a map for faster access to the master channel list
+          this.masterChannelMap = new Map(
+            this.masterChannelList.map((ch) => [ch.id, ch]),
+          );
 
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "refreshMasterChannelList: Master channel list refreshed with %s channels, valid until %s",
               this.masterChannelList.length,
@@ -3209,20 +3269,20 @@ class StbPlatform {
         "/" +
         ctryCodeForUrl +
         "/en/config-service/conf/web/backoffice.json";
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getConfig: GET %s", url);
       }
       axiosWS
         .get(url)
         .then((response) => {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getConfig: response: %s %s",
               response.status,
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 2) {
+          if (this.debugLevel > 2) {
             this.log.warn(
               "getConfig: response data (saved to this.configsvc):",
             );
@@ -3289,21 +3349,21 @@ class StbPlatform {
           },
         };
       }
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getPersonalizationData: GET %s", url);
       }
       // this.log('getPersonalizationData: GET %s', url);
       axiosWS
         .get(url, config)
         .then((response) => {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getPersonalizationData: response: %s %s",
               response.status,
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 2) {
+          if (this.debugLevel > 2) {
             // DEBUG
             this.log.warn(
               "getPersonalizationData: response data (saved to this.customer):",
@@ -3319,7 +3379,7 @@ class StbPlatform {
           //this.log('getPersonalizationData: this.stbDevices.length:', this.stbDevices.length)
           if (this.stbDevices.length > 0) {
             this.devices.forEach((device) => {
-              if (this.config.debugLevel > 2) {
+              if (this.debugLevel > 2) {
                 // DEBUG
                 this.log.warn(
                   "getPersonalizationData: device settings for device %s:",
@@ -3411,7 +3471,7 @@ class StbPlatform {
 
   // set the Personalization Data for the current device via web request PUT
   async setPersonalizationDataForDevice(deviceId, deviceSettings) {
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       this.log.warn(
         "setPersonalizationDataForDevice: deviceSettings:",
         deviceSettings,
@@ -3446,14 +3506,14 @@ class StbPlatform {
         },
       };
     }
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       this.log.warn("setPersonalizationDataForDevice: PUT %s", url);
     }
     axiosWS
       .put(url, data, config)
       .then((response) => {
         // returns 204 No Content when successful
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log.warn(
             "setPersonalizationDataForDevice: response: %s %s",
             response.status,
@@ -3507,28 +3567,28 @@ class StbPlatform {
           },
         };
       }
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getEntitlements: GET %s", url);
       }
       // this.log('getEntitlements: GET %s', url);
       axiosWS
         .get(url, config)
         .then((response) => {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getEntitlements: response: %s %s",
               response.status,
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 2) {
+          if (this.debugLevel > 2) {
             this.log.warn(
               "getEntitlements: response data (saved to this.entitlements):",
             );
             this.log.warn(response.data);
           }
           this.entitlements = response.data; // store the entire entitlements data for future use in this.customer.entitlements
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getEntitlements: entitlements found:",
               this.entitlements.entitlements.length,
@@ -3591,21 +3651,21 @@ class StbPlatform {
         "/customers/" +
         householdId +
         "/recordings/state"; // limit to 20 recordings for performance
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getRecordingState: GET %s", url);
       }
       axiosWS
         .get(url, config)
         .then((response) => {
           // log at level 1, 2
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getRecordingState: response: %s %s",
               response.status,
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 1) {
+          if (this.debugLevel > 1) {
             this.log.warn("getRecordingState: response data:");
             this.log.warn(response.data);
           }
@@ -3622,7 +3682,7 @@ class StbPlatform {
             // mostRelevantEpisode.recordingState: 'ongoing',
             // mostRelevantEpisode.recordingType: 'nDVR',
             // logging at level 2
-            if (this.config.debugLevel > 1) {
+            if (this.debugLevel > 1) {
               this.log.warn(
                 "getRecordingState: Recordings length %s:",
                 response.data.data.length,
@@ -3642,7 +3702,7 @@ class StbPlatform {
               networkOngoingRecordings = 0;
 
             // look for planned network single recordings: (type = "single" = one object, type = "season" = array)
-            if (this.config.debugLevel > 0) {
+            if (this.debugLevel > 0) {
               this.log.warn(
                 "getRecordingState: searching for ongoing network recordings",
               );
@@ -3658,7 +3718,7 @@ class StbPlatform {
 
             // find if any local device recordings are ongoing, for each device, as each device can have a HDD
             this.devices.forEach((device) => {
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn(
                   "getRecordingState: Checking device %s for ongoing local HDD recordings",
                   device.deviceId,
@@ -3667,7 +3727,7 @@ class StbPlatform {
               if (device.capabilities.hasHDD) {
                 // device has HDD, look for local recordings
                 // look for ongoing local single recordings: (type = "single" = one object, type = "season" = array)
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn(
                     "getRecordingState: %s: searching for ongoing local recordings for this device",
                     device.deviceId,
@@ -3803,21 +3863,21 @@ class StbPlatform {
         "/customers/" +
         householdId +
         "/bookings?limit=10&sort=time&sortOrder=asc"; // limit to 10 recordings for performance
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getRecordingBookings: GET %s", url);
       }
       axiosWS
         .get(url, config)
         .then((response) => {
           // log at level 1, 2
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getRecordingBookings: response: %s %s",
               response.status,
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 1) {
+          if (this.debugLevel > 1) {
             this.log.warn("getRecordingBookings: response data:");
             this.log.warn(response.data);
           }
@@ -3834,7 +3894,7 @@ class StbPlatform {
             // mostRelevantEpisode.recordingState: 'ongoing',
             // mostRelevantEpisode.recordingType: 'nDVR',
             // logging at level 2
-            if (this.config.debugLevel > 1) {
+            if (this.debugLevel > 1) {
               this.log.warn(
                 "getRecordingBookings: Recordings length %s:",
                 response.data.data.length,
@@ -3856,7 +3916,7 @@ class StbPlatform {
               networkPlannedRecordings = 0;
 
             // look for planned network recordings: (type = "single" = one object, type = "season" = array)
-            if (this.config.debugLevel > 0) {
+            if (this.debugLevel > 0) {
               this.log.warn(
                 "getRecordingBookings: searching for planned network recordings",
               );
@@ -3881,7 +3941,7 @@ class StbPlatform {
 
             // find if any local recordings are booked, for each device, as each device can have a HDD
             this.devices.forEach((device) => {
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn(
                   "getRecordingBookings: Checking device %s for planned local HDD recordings",
                   device.deviceId,
@@ -3890,7 +3950,7 @@ class StbPlatform {
               if (device.capabilities.hasHDD) {
                 // device has HDD, look for local recordings
                 // look for planned local single recordings: (type = "single")
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn(
                     "getRecordingBookings: %s: searching for planned local recordings for this device",
                     device.deviceId,
@@ -3930,7 +3990,7 @@ class StbPlatform {
                 localPlannedRecordings,
                 networkPlannedRecordings,
                 currProgramMode,
-                Object.keys(Characteristic.ProgramMode)[currProgramMode + 1],
+                CHAR_NAMES.ProgramMode[currProgramMode + 1],
               );
               //   mqttDeviceStateHandler(deviceId, 			powerState, mediaState, recordingState, 	channelId, 	eventId, 	sourceType, profileDataChanged, statusFault, 							programMode, statusActive, currInputDeviceType, currInputSourceType) {
               this.mqttDeviceStateHandler(
@@ -4051,7 +4111,7 @@ class StbPlatform {
   async getMqttToken(oespUsername, accessToken, householdId) {
     this.log.debug("Getting mqtt token for householdId %s", householdId);
     // get a JSON web token from the supplied accessToken and householdId
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("getMqttToken");
     }
     // robustness checks
@@ -4095,7 +4155,7 @@ class StbPlatform {
 
     try {
       const response = await axiosWS(mqttAxiosConfig);
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getMqttToken: response.data:", response.data);
       }
       mqttUsername = householdId;
@@ -4115,7 +4175,7 @@ class StbPlatform {
   startMqttClient(mqttUsername, mqttPassword) {
     return new Promise((resolve, reject) => {
       try {
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log("Starting mqttClient...");
         }
         if (currentSessionState !== sessionState.CONNECTED) {
@@ -4134,7 +4194,7 @@ class StbPlatform {
 
         // connect to the MQTT broker
         const mqttBrokerUrl = this.configsvc.mqttBroker.URL;
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log.warn("startMqttClient: mqttBrokerUrl:", mqttBrokerUrl);
           this.log.warn(
             "startMqttClient: Creating mqttClient with username %s, password %s",
@@ -4168,7 +4228,7 @@ class StbPlatform {
           username: mqttUsername,
           password: mqttPassword,
         });
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log.warn(
             "startMqttClient: mqttBroker connect request sent using mqttClientId %s, waiting for connect event",
             mqttClientId,
@@ -4267,7 +4327,7 @@ class StbPlatform {
             this.lastMqttMessageReceived = Date.now();
 
             let mqttMessage = JSON.parse(message);
-            if (this.config.debugLevel > 0) {
+            if (this.debugLevel > 0) {
               this.log.warn(
                 "mqttClient: Received Message: \r\nTopic: %s\r\nMessage: (next log entry)",
                 topic,
@@ -4294,14 +4354,14 @@ class StbPlatform {
             // Message: { action: 'OPS.getProfilesUpdate', source: '3C36E4-EOSSTB-00365657xxxx', ... }
             // Message: { action: 'OPS.getDeviceUpdate', source: '3C36E4-EOSSTB-00365657xxxx', deviceId: '3C36E4-EOSSTB-00365657xxxx' }
             if (topic.includes(mqttUsername + "/personalizationService")) {
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn("mqttClient: %s: action", mqttMessage.action);
               }
               if (
                 mqttMessage.action === "OPS.getProfilesUpdate" ||
                 mqttMessage.action === "OPS.getDeviceUpdate"
               ) {
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn(
                     "mqttClient: %s, calling getPersonalizationData",
                     mqttMessage.action,
@@ -4317,7 +4377,7 @@ class StbPlatform {
             // Topic: Topic: 107xxxx_ch/recordingStatus
             // Message: {"id":"crid:~~2F~~2Fgn.tv~~2F2004781~~2FEP019440730003,imi:2d369682b865679f2e5182ea52a93410171cfdc8","event":"scheduleEvent","transactionId":"/CH/eng/web/networkdvrrecordings - 013f12fc-23ef-4b77-a244-eeeea0c6901c"}
             if (topic.includes(mqttUsername + "/recordingStatus")) {
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn("mqttClient: event: %s", mqttMessage.event);
               }
               this.refreshRecordings(this.session.householdId); // request a refresh of recording data
@@ -4328,7 +4388,7 @@ class StbPlatform {
             // Message: {"deviceType":"STB","source":"3C36E4-EOSSTB-00365657xxxx","state":"ONLINE_RUNNING","mac":"F8:F5:32:45:DE:52","ipAddress":"192.168.0.33/255.255.255.0"}
             if (topic.includes("/status")) {
               if (mqttMessage.deviceType === "STB") {
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn(
                     "mqttClient: STB status: Detecting Power State: Received Message of deviceType %s for %s",
                     mqttMessage.deviceType,
@@ -4373,7 +4433,7 @@ class StbPlatform {
                     );
                     break;
                 }
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn("mqttClient: %s %s", deviceId, stbState);
                 }
               }
@@ -4399,7 +4459,7 @@ class StbPlatform {
                 uiStatusFingerprint === this.lastUiStatusFingerprint &&
                 now - this.lastUiStatusFingerprintTime < 500
               ) {
-                if (this.config.debugLevel > 0) {
+                if (this.debugLevel > 0) {
                   this.log.warn(
                     "mqttClient: CPE.uiStatus: duplicate state fingerprint within 500ms, skipping",
                   );
@@ -4409,7 +4469,7 @@ class StbPlatform {
               this.lastUiStatusFingerprint = uiStatusFingerprint;
               this.lastUiStatusFingerprintTime = now;
 
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn(
                   "mqttClient: CPE.uiStatus received from %s",
                   mqttMessage.source,
@@ -4424,7 +4484,7 @@ class StbPlatform {
                 );
               }
               // if we have this message, then the power is on. Sometimes the message arrives before the status topic with the power state
-              currStatusActive = Characteristic.Active.ACTIVE; // ensure statusActive is set to Active
+              currStatusActive = Characteristic.Active.ACTIVE; // ensure StatusActive is set to Active
               currPowerState = Characteristic.Active.ACTIVE; // ensure power is set to ON
 
               this.lastMqttUiStatusMessageReceived = now;
@@ -4432,7 +4492,7 @@ class StbPlatform {
               const cpeUiStatus = mqttMessage.status;
               // normal TV: 	cpeUiStatus = mainUI
               // app: 		cpeUiStatus = apps (YouTube, Netflix, etc)
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn(
                   "mqttClient: CPE.uiStatus: cpeUiStatus:",
                   cpeUiStatus,
@@ -4449,7 +4509,7 @@ class StbPlatform {
                   // destructure playerState for cleaner access to nested properties
                   const playerState = cpeUiStatus.playerState;
                   currSourceType = playerState.sourceType;
-                  if (this.config.debugLevel > 1) {
+                  if (this.debugLevel > 1) {
                     this.log.warn(
                       "mqttClient: mainUI: Detected mqtt playerState.speed:",
                       playerState.speed,
@@ -4519,11 +4579,10 @@ class StbPlatform {
                     currChannelId =
                       playerState.source.channelId || NO_CHANNEL_ID; // must be a string
                     currEventId = playerState.source.eventId; // the title (program) id
-                    if (this.config.debugLevel > 0 && this.masterChannelList) {
+                    if (this.debugLevel > 0 && this.masterChannelList) {
                       let currentChannelName; // let is scoped to the current {} block
-                      let curChannel = this.masterChannelList.find(
-                        (channel) => channel.id === currChannelId,
-                      );
+                      let curChannel =
+                        this.masterChannelMap?.get(currChannelId);
                       if (curChannel) {
                         currentChannelName = curChannel.name;
                       }
@@ -4567,11 +4626,7 @@ class StbPlatform {
                     default:
                       // check if the app channel exists in the master channel list, if not, push it, using the user-defined name if one exists
                       currChannelId = cpeUiStatus.appsState.id;
-                      if (
-                        this.masterChannelList.findIndex(
-                          (channel) => channel.id === currChannelId,
-                        ) === -1
-                      ) {
+                      if (!this.masterChannelMap.has(currChannelId)) {
                         this.log(
                           "App %s detected. Adding to the master channel list at index %s with channelId %s",
                           cpeUiStatus.appsState.appName,
@@ -4581,16 +4636,17 @@ class StbPlatform {
                         const entitlementId =
                           this.entitlements.entitlements[0].id;
                         // for easy identification, make the logicalChannelNumber and channelNumber app10000 + the index number
-                        this.masterChannelList.push({
+                        const newAppChannel = {
                           id: currChannelId,
                           name: cleanNameForHomeKit(
                             cpeUiStatus.appsState.appName,
                           ),
                           logicalChannelNumber:
-                            10000 + this.masterChannelList.length, // integer
-                          linearProducts: entitlementId, // must be a valid entitlement id
-                          //channelNumber: 'app' + (10000 + this.masterChannelList.length)
-                        });
+                            10000 + this.masterChannelList.length,
+                          linearProducts: entitlementId,
+                        };
+                        this.masterChannelList.push(newAppChannel);
+                        this.masterChannelMap.set(currChannelId, newAppChannel);
                       }
                   }
                   break;
@@ -4606,7 +4662,7 @@ class StbPlatform {
             // there's also a pullFromTV
             // {"source":"7028f103-8494-4f79-9b76-beb67a2e5caa","type":"CPE.pullFromTV","runtimeType":"pull"}
             if (mqttMessage.type === "CPE.pushToTV.rsp") {
-              if (this.config.debugLevel > 0) {
+              if (this.debugLevel > 0) {
                 this.log.warn(
                   "mqttClient: CPE.pushToTV.rsp: received from %s",
                   mqttMessage.source,
@@ -4804,7 +4860,7 @@ class StbPlatform {
   // end the mqtt session cleanly
   endMqttSession() {
     return new Promise((resolve, reject) => {
-      if (this.config.debugLevel > -1) {
+      if (this.debugLevel > -1) {
         this.log("Shutting down mqttClient...");
       }
       // https://github.com/mqttjs/MQTT.js#end
@@ -4834,7 +4890,7 @@ class StbPlatform {
     currInputSourceType,
   ) {
     try {
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "mqttDeviceStateHandler: calling updateDeviceState with deviceId %s, powerState %s, mediaState %s, channelId %s, eventId %s, sourceType %s, profileDataChanged %s, statusFault %s, programMode %s, statusActive %s, currInputDeviceType %s, currInputSourceType %s",
           deviceId,
@@ -4882,7 +4938,7 @@ class StbPlatform {
   mqttPublishMessage(Topic, Message, Options) {
     try {
       // Syntax: {'test1': {qos: 0}, 'test2': {qos: 1}}
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn(
           "mqttPublishMessage: Publish Message:\r\nTopic: %s\r\nMessage: %s\r\nOptions: %s",
           Topic,
@@ -4901,7 +4957,7 @@ class StbPlatform {
             errDetail,
           );
         } else {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn("mqttPublishMessage: Published OK to %s", Topic);
           }
         }
@@ -4914,7 +4970,7 @@ class StbPlatform {
 
   // subscribe to an mqtt topic, with logging, to help in debugging
   mqttSubscribeToTopic(Topic) {
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       this.log.warn("mqttSubscribeToTopic: Subscribe to topic:", Topic);
     }
     mqttClient.subscribe(Topic, (err, granted) => {
@@ -4939,11 +4995,13 @@ class StbPlatform {
             Topic,
           );
         } else {
-          this.log.warn(
-            "mqttSubscribeToTopic: Subscribed OK to %s (granted QoS: %s)",
-            Topic,
-            grantedQos,
-          );
+          if (this.debugLevel > 0) {
+            this.log.warn(
+              "mqttSubscribeToTopic: Subscribed OK to %s (granted QoS: %s)",
+              Topic,
+              grantedQos,
+            );
+          }
         }
       }
     });
@@ -4951,7 +5009,7 @@ class StbPlatform {
 
   // unsubscribe to an mqtt topic, with logging, to help in debugging
   mqttUnsubscribeToTopic(Topic) {
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       this.log.warn("mqttUnsubscribeToTopic: Unsubscribe from topic:", Topic);
     }
     mqttClient.unsubscribe(Topic, (err) => {
@@ -4965,7 +5023,7 @@ class StbPlatform {
           errDetail,
         );
       } else {
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log.warn(
             "mqttUnsubscribeToTopic: Unsubscribed OK from %s",
             Topic,
@@ -4986,7 +5044,7 @@ class StbPlatform {
       mac: "",
       ipAddress: "",
     });
-    if (this.config.debugLevel > 0) {
+    if (this.debugLevel > 0) {
       this.log.warn("setHgoOnlineRunning: publishing to topic:", topic);
     }
     this.mqttPublishMessage(topic, message, { qos: 2, retain: true });
@@ -4997,7 +5055,7 @@ class StbPlatform {
   // the friendlyDeviceName appears on the TV in a popup window
   switchChannel(deviceId, deviceName, channelId, channelName) {
     try {
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn(
           "switchChannel: channelId %s %s on %s %s",
           channelId,
@@ -5029,7 +5087,7 @@ class StbPlatform {
             speed: 1,
           },
         });
-        if (this.config.debugLevel > 0) {
+        if (this.debugLevel > 0) {
           this.log.warn("switchChannel: publishing to topic:", topic);
         }
         this.mqttPublishMessage(topic, payload, {
@@ -5050,7 +5108,7 @@ class StbPlatform {
   // speed can be one of: -64 -30 -6 -2 0 2 6 30 64. 0=Paused, 1=Play, >1=FastForward, <0=Rewind
   setMediaState(deviceId, deviceName, channelId, speed) {
     try {
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn(
           "setMediaState: set state to %s for channelId %s on %s %s",
           speed,
@@ -5094,7 +5152,7 @@ class StbPlatform {
   // Retain: false, QOS: 0
   setPlayerPosition(deviceId, deviceName, relativePosition) {
     try {
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("setPlayerPosition: deviceId:", deviceId);
       }
       if (mqttUsername) {
@@ -5125,7 +5183,7 @@ class StbPlatform {
   // send a remote control keySequence to the settopbox via mqtt
   async sendKey(deviceId, deviceName, keySequence) {
     try {
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn(
           "sendKey: keySequence %s, deviceName %s, deviceId %s",
           keySequence,
@@ -5350,7 +5408,7 @@ class StbPlatform {
                 "eventType": "keyDownUp"
               }
             }
-            */            
+            */
             const payload = JSON.stringify({
               source: mqttClientId,
               type: "CPE.KeyEvent",
@@ -5362,9 +5420,7 @@ class StbPlatform {
                 eventType: "keyDownUp",
               },
             });
-            this.mqttPublishMessage(topic,payload,
-              { qos: 2, retain: true },
-            );
+            this.mqttPublishMessage(topic, payload, { qos: 2, retain: true });
             this.log.debug("sendKey: key %s: send %s done", i + 1, keyName);
 
             // set the Target Media State after key has been sent
@@ -5431,7 +5487,7 @@ class StbPlatform {
   // get the settopbox UI status from the settopbox via mqtt
   getUiStatus(deviceId, mqttClientId) {
     try {
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getUiStatus for deviceId %s", deviceId);
       }
       if (mqttUsername) {
@@ -5475,6 +5531,7 @@ class StbDevice {
     this.entitlements = this.platform.entitlements;
 
     this.deviceId = this.device.deviceId;
+    this._configDevice = this._getConfigDevice(); // cache it once, never changes
     this.profileId = -1; // default -1
 
     // set default name on restart, max 14 char
@@ -5487,9 +5544,7 @@ class StbDevice {
 
     // allow user override of device name via config, but limit to max 14 char
     if (this.config.devices) {
-      const configDevice = this.config.devices.find(
-        (device) => device.deviceId === this.deviceId,
-      );
+      const configDevice = this._configDevice;
       if (configDevice && configDevice.name) {
         this.name = configDevice.name.substring(0, SETTOPBOX_NAME_MAXLEN);
       }
@@ -5507,29 +5562,28 @@ class StbDevice {
     this.accessoryConfigured; // true when the accessory is configured
 
     // initial states. Will be updated by mqtt messages
+    this.currentStatusFault = Characteristic.StatusFault.NO_FAULT;
+    this.currentInUse = Characteristic.InUse.NOT_IN_USE;
     this.currentPowerState = Characteristic.Active.INACTIVE;
-    this.previousPowerState = Characteristic.Active.INACTIVE;
+    this.currentStatusActive = Characteristic.Active.INACTIVE;
+
     this.currentChannelId = NO_CHANNEL_ID; // string eg SV09038
-    this.lastKeyMacroChannelId = null; // string eg $KeyMacro1
-    this.currentClosedCaptionsState = Characteristic.ClosedCaptions.DISABLED;
-    this.previousClosedCaptionsState = Characteristic.ClosedCaptions.DISABLED;
+    this.currentClosedCaptions = Characteristic.ClosedCaptions.DISABLED;
     this.currentMediaState = Characteristic.CurrentMediaState.STOP;
     this.targetMediaState = Characteristic.TargetMediaState.STOP;
     this.currentPictureMode = Characteristic.PictureMode.STANDARD;
-    this.previousPictureMode = null;
     this.currentRecordingState = recordingState.IDLE;
-    this.previousRecordingState = null;
-    this.customPictureMode = 0; // default 0
-    this.currentSourceType = "UNKNOWN";
-    // custom characteristics, default values must be legal values otherwise Homebridge shows a warning
-    this.currentStatusFault = Characteristic.StatusFault.NO_FAULT;
-    this.currentInUse = Characteristic.InUse.NOT_IN_USE;
-    this.previousInUse = Characteristic.InUse.NOT_IN_USE; 
     this.currentProgramMode = Characteristic.ProgramMode.NO_PROGRAM_SCHEDULED;
-    this.currentStatusActive = Characteristic.Active.ACTIVE; // bool,  use o=NotStatusActive, 1=StatusActive
     this.currentInputSourceType = Characteristic.InputSourceType.TUNER;
     this.currentInputDeviceType = Characteristic.InputDeviceType.TV;
 
+    this.lastKeyMacroChannelId = null; // string eg $KeyMacro1
+
+    this.customPictureMode = 0; // default 0
+    this.currentSourceType = "UNKNOWN";
+
+    // set defaults for the monitored characteristics
+
     this.lastRemoteKeyPressed = -1; // holds the last key pressed, -1 = no key
     this.lastRemoteKeyPress0 = []; // holds the time value of the last remote button press for key index i
     this.lastRemoteKeyPress1 = []; // holds the time value of the last-1 remote button press for key index i
@@ -5570,7 +5624,7 @@ class StbDevice {
    */
   prepareAccessory() {
     // Trace-level debug logging (level 3+)
-    if (this.config.debugLevel > 2) {
+    if (this.debugLevel > 2) {
       this.log.warn("prepareAccessory");
     }
 
@@ -5615,14 +5669,16 @@ class StbDevice {
 
     // --- Post-publish Characteristic Defaults ---
     // Set DisplayOrder after publish (TLV8 base64-encoded byte array)
-    this.televisionService.getCharacteristic(
+    this.televisionService.updateCharacteristic(
       Characteristic.DisplayOrder,
-    ).value = Buffer.from(this.displayOrder).toString("base64");
+      Buffer.from(this.displayOrder).toString("base64"),
+    );
 
     // Default to no active input on startup
-    this.televisionService
-      .getCharacteristic(Characteristic.ActiveIdentifier)
-      .updateValue(NO_INPUT_ID);
+    this.televisionService.updateCharacteristic(
+      Characteristic.ActiveIdentifier,
+      NO_INPUT_ID,
+    );
 
     this.accessoryConfigured = true;
   }
@@ -5688,7 +5744,7 @@ class StbDevice {
    * FirmwareRevision MUST be a numeric string (e.g. "1.2.3") or it won't display in Home app.
    */
   prepareAccessoryInformationService() {
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("prepareAccessoryInformationService");
     }
 
@@ -5800,7 +5856,7 @@ class StbDevice {
    * These appear as "Custom" in the Shortcuts app.
    */
   prepareTelevisionService() {
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("prepareTelevisionService");
     }
 
@@ -6001,7 +6057,7 @@ class StbDevice {
    * Must be linked to the Television service so HomeKit associates them.
    */
   prepareTelevisionSpeakerService() {
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("prepareTelevisionSpeakerService");
     }
 
@@ -6054,7 +6110,7 @@ class StbDevice {
    *   Terminated with:  [0x00, 0x00]
    */
   prepareInputSourceServices() {
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("prepareInputSourceServices");
     }
 
@@ -6087,7 +6143,7 @@ class StbDevice {
       let chId = `HIDDEN_${i}`;
       let visState = Characteristic.CurrentVisibilityState.HIDDEN;
       let configState = Characteristic.IsConfigured.NOT_CONFIGURED;
-      this.log.warn(
+      this.log.debug(
         "prepareInputSourceServices loading channelList index %s input %s: %s",
         i,
         i + 1,
@@ -6118,7 +6174,7 @@ class StbDevice {
         chFixedName = chName;
       }
 
-      if (this.config.debugLevel > 2) {
+      if (this.debugLevel > 2) {
         // log 1 of 95 to 95 of 95 (1-based)
         this.log.warn(
           "prepareInputSourceServices Adding service %s of %s: %s",
@@ -6185,9 +6241,9 @@ class StbDevice {
 
       // --- Build TLV8 DisplayOrder entry ---
       // Format: [type=0x01, length=0x01, value=identifier & 0xFF]
-      // The identifier is masked to 8 bits; supports up to 255 inputs.
+      // The identifier (1-based) is masked to 8 bits; supports up to 255 inputs.
       // Reference: https://github.com/homebridge/HAP-NodeJS/issues/644
-      this.displayOrder.push(0x01, 0x01, i & 0xff);
+      this.displayOrder.push(0x01, 0x01, (i + 1) & 0xff);
 
       // Register and link the service
       this.accessory.addService(inputService);
@@ -6227,7 +6283,7 @@ class StbDevice {
       // runs at the very start, and then every few seconds, so don't log it unless debugging
       // doesn't get the data direct from the settop box, but rather: gets it from the this.currentPowerState and this.currentChannelId variables
       // which are received by the mqtt messages, which occurs very often
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn(
           "%s: updateDeviceState: powerState %s, mediaState %s [%s], recState %s [%s], channelId %s, eventId %s, sourceType %s, profileDataChanged %s, statusFault %s [%s], programMode %s [%s], statusActive %s [%s], inputDeviceType %s [%s], inputSourceType %s [%s]",
           this.name,
@@ -6241,25 +6297,20 @@ class StbDevice {
           sourceType,
           profileDataChanged,
           statusFault,
-          Object.keys(Characteristic.StatusFault)[statusFault + 1],
+          CHAR_NAMES.StatusFault[statusFault + 1],
           programMode,
-          Object.keys(Characteristic.ProgramMode)[programMode + 1],
+          CHAR_NAMES.ProgramMode[programMode + 1],
           statusActive,
           statusActiveName[statusActive],
           inputDeviceType,
-          Object.keys(Characteristic.InputDeviceType)[inputDeviceType + 1],
+          CHAR_NAMES.InputDeviceType[inputDeviceType + 1],
           inputSourceType,
-          Object.keys(Characteristic.InputSourceType)[inputSourceType + 1],
+          CHAR_NAMES.InputSourceType[inputSourceType + 1],
         );
       }
 
       // get the config for the device, needed for a few status checks
-      let configDevice;
-      if (this.config.devices) {
-        configDevice = this.config.devices.find(
-          (device) => device.deviceId === this.deviceId,
-        );
-      }
+      const configDevice = this._configDevice;
 
       // grab the input variables
       // A small helper — reads clearly at point of use
@@ -6298,30 +6349,30 @@ class StbDevice {
       }
 
       // profile data is stored on the platform
-      // get the currentClosedCaptionsState from the currently selected profile (stored in this.profileId)
+      // get the currentClosedCaptions from the currently selected profile (stored in this.profileId)
       if (
         this.customer.profiles[this.profileId] &&
         this.customer.profiles[this.profileId].options.showSubtitles
       ) {
-        this.currentClosedCaptionsState = Characteristic.ClosedCaptions.ENABLED;
+        this.currentClosedCaptions = Characteristic.ClosedCaptions.ENABLED;
       } else {
-        this.currentClosedCaptionsState =
+        this.currentClosedCaptions =
           Characteristic.ClosedCaptions.DISABLED;
       }
 
       // debugging, helps a lot to see channelName
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         let curChannel, currentChannelName;
         if (this.platform.masterChannelList) {
-          curChannel = this.platform.masterChannelList.find(
-            (channel) => channel.id === this.currentChannelId,
-          ); // this.currentChannelId is a string eg SV09038
+          curChannel = this.platform.masterChannelMap?.get(
+            this.currentChannelId,
+          );
           if (curChannel) {
             currentChannelName = curChannel.name;
           }
         }
         this.log.warn(
-          "%s: updateDeviceState: currentPowerState %s, currentMediaState %s [%s], currentRecordingState %s [%s], currentChannelId %s [%s], currentSourceType %s, currentClosedCaptionsState %s [%s], currentPictureMode %s [%s], profileDataChanged %s, currentStatusFault %s [%s], currentProgramMode %s [%s], currentStatusActive %s",
+          "%s: updateDeviceState: currentPowerState %s, currentMediaState %s [%s], currentRecordingState %s [%s], currentChannelId %s [%s], currentSourceType %s, currentClosedCaptions %s [%s], currentPictureMode %s [%s], profileDataChanged %s, currentStatusFault %s [%s], currentProgramMode %s [%s], currentStatusActive %s",
           this.name,
           this.currentPowerState,
           this.currentMediaState,
@@ -6331,17 +6382,15 @@ class StbDevice {
           this.currentChannelId,
           currentChannelName,
           this.currentSourceType,
-          this.currentClosedCaptionsState,
-          Object.keys(Characteristic.ClosedCaptions)[
-            this.currentClosedCaptionsState + 1
-          ],
+          this.currentClosedCaptions,
+          CHAR_NAMES.ClosedCaptions[this.currentClosedCaptions + 1],
           this.currentPictureMode,
-          Object.keys(Characteristic.PictureMode)[this.currentPictureMode + 1],
+          CHAR_NAMES.PictureMode[this.currentPictureMode + 1],
           this.profileDataChanged,
           this.currentStatusFault,
-          Object.keys(Characteristic.StatusFault)[this.currentStatusFault + 1],
+          CHAR_NAMES.StatusFault[this.currentStatusFault + 1],
           this.currentProgramMode,
-          Object.keys(Characteristic.ProgramMode)[this.currentProgramMode + 1],
+          CHAR_NAMES.ProgramMode[this.currentProgramMode + 1],
           this.currentStatusActive,
         );
       }
@@ -6375,46 +6424,49 @@ class StbDevice {
             currentDeviceName,
           );
           this.name = currentDeviceName;
-          this.televisionService
-            .getCharacteristic(Characteristic.ConfiguredName)
-            .updateValue(currentDeviceName);
+          this.televisionService.updateCharacteristic(
+            Characteristic.ConfiguredName,
+            currentDeviceName,
+          );
         }
 
         // check for change of StatusFault state
         if (this.previousStatusFault !== this.currentStatusFault) {
-          this.log(
-            "%s: Status Fault changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            this.previousStatusFault || "-",
-            Object.keys(Characteristic.StatusFault)[
-              this.previousStatusFault + 1
-            ] || "unknown",
+            "Status Fault",
+            null,
+            this.previousStatusFault,
+            CHAR_NAMES.StatusFault[this.previousStatusFault + 1],
+            this.currentStatusFault,
+            CHAR_NAMES.StatusFault[this.currentStatusFault + 1],
+          );
+          this.televisionService.updateCharacteristic(
+            Characteristic.StatusFault,
             this.currentStatusFault,
-            Object.keys(Characteristic.StatusFault)[
-              this.currentStatusFault + 1
-            ],
           );
+          this.previousStatusFault = this.currentStatusFault;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.StatusFault)
-          .updateValue(this.currentStatusFault);
-        this.previousStatusFault = this.currentStatusFault;
 
         // check for change of StatusActive state
         if (this.previousStatusActive !== this.currentStatusActive) {
-          this.log(
-            "%s: Status Active changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            this.previousStatusActive || "-",
-            statusActiveName[this.previousStatusActive] || "unknown",
+            "Status Active",
+            null,
+            this.previousStatusActive,
+            statusActiveName[this.previousStatusActive],
             this.currentStatusActive,
             statusActiveName[this.currentStatusActive],
           );
+          this.televisionService.updateCharacteristic(
+            Characteristic.StatusActive,
+            this.currentStatusActive,
+          );
+          this.previousStatusActive = this.currentStatusActive;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.StatusActive)
-          .updateValue(this.currentStatusActive);
-        this.previousStatusActive = this.currentStatusActive;
 
         // check for change of power state
         // The accessory changes state immediately, and the box takes time to catch up
@@ -6424,133 +6476,103 @@ class StbDevice {
         //this.log("Wanted device power state: %s %s", this.currentPowerState, powerStateName[this.currentPowerState]);
         //let oldPowerState = this.televisionService.getCharacteristic(Characteristic.Active).value;
         if (this.previousPowerState !== this.currentPowerState) {
-          this.log(
-            "%s: Power changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
+            "Power",
+            null,
             this.previousPowerState,
-            powerStateName[this.previousPowerState] || "unknown",
+            powerStateName[this.previousPowerState],
             this.currentPowerState,
             powerStateName[this.currentPowerState],
           );
+          this.televisionService.updateCharacteristic(
+            Characteristic.Active,
+            this.currentPowerState,
+          );
+          this.previousPowerState = this.currentPowerState;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.Active)
-          .updateValue(this.currentPowerState);
-        this.previousPowerState = this.currentPowerState;
 
         // check for change of InUse state
         if (this.previousInUse !== this.currentInUse) {
-          this.log(
-            "%s: In Use changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
+            "In Use",
+            null,
             this.previousInUse,
-            Object.keys(Characteristic.InUse)[this.previousInUse + 1],
+            CHAR_NAMES.InUse[this.previousInUse + 1],
+            this.currentInUse,
+            CHAR_NAMES.InUse[this.currentInUse + 1],
+          );
+          this.televisionService.updateCharacteristic(
+            Characteristic.InUse,
             this.currentInUse,
-            Object.keys(Characteristic.InUse)[this.currentInUse + 1],
           );
+          this.previousInUse = this.currentInUse;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.InUse)
-          .updateValue(this.currentInUse);
-        this.previousInUse = this.currentInUse;
 
         // check for change of closed captions state
-        //this.log("Previous closed captions state: %s %s", this.previousClosedCaptionsState, closedCaptionsStateName[this.previousClosedCaptionsState]);
-        //this.log("Current closed captions state: %s %s", this.televisionService.getCharacteristic(Characteristic.ClosedCaptions).value, closedCaptionsStateName[this.televisionService.getCharacteristic(Characteristic.ClosedCaptions).value]);
-        //this.log("Wanted closed captions state: %s %s", this.currentClosedCaptionsState, closedCaptionsStateName[this.currentClosedCaptionsState]);
         if (
-          this.previousClosedCaptionsState !== this.currentClosedCaptionsState
+          this.previousClosedCaptionsState !== this.currentClosedCaptions
         ) {
-          this.log(
-            "%s: Closed Captions state changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            this.previousClosedCaptionsState || "-",
-            Object.keys(Characteristic.ClosedCaptions)[
-              this.previousClosedCaptionsState + 1
-            ] || "unknown",
-            this.currentClosedCaptionsState,
-            Object.keys(Characteristic.ClosedCaptions)[
-              this.currentClosedCaptionsState + 1
-            ],
+            "Closed Captions",
+            null,
+            this.previousClosedCaptionsState,
+            CHAR_NAMES.ClosedCaptions[this.previousClosedCaptionsState + 1],
+            this.currentClosedCaptions,
+            CHAR_NAMES.ClosedCaptions[this.currentClosedCaptions + 1],
+          );
+          this.televisionService.updateCharacteristic(
+            Characteristic.ClosedCaptions,
+            this.currentClosedCaptions,
           );
+          this.previousClosedCaptionsState = this.currentClosedCaptions;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.ClosedCaptions)
-          .updateValue(this.currentClosedCaptionsState);
-        this.previousClosedCaptionsState = this.currentClosedCaptionsState;
 
         // check for change of picture mode or recordingState (both stored in picture mode)
-        // customPictureMode deprecated from v2.0.0 and removed from config.json, as its function is handled by inUse.
-        // Nov 2022: disabled code, will remove in a future version
-        if (
-          (configDevice || {}).customPictureMode === "recordingState" &&
-          1 === 0
-        ) {
-          // PictureMode is used for recordingState function, this is a custom characteristic, not supported by HomeKit. we can use values 0...7
-          //this.log("previousRecordingState", this.previousRecordingState);
-          //this.log("currentRecordingState", this.currentRecordingState);
-          if (this.previousRecordingState !== this.currentRecordingState) {
-            this.log(
-              "%s: Recording State changed from %s [%s] to %s [%s]",
-              this.name,
-              this.previousRecordingState || "-",
-              Object.keys(recordingState)[this.previousRecordingState] ||
-                "unknown",
-              this.currentRecordingState,
-              Object.keys(recordingState)[this.currentRecordingState],
-            );
-          }
-          //this.log("configDevice.customPictureMode found %s, setting PictureMode to %s", (configDevice || {}).customPictureMode, this.currentRecordingState);
-          this.customPictureMode = this.currentRecordingState;
-          this.previousRecordingState = this.currentRecordingState;
-        } else {
-          // PictureMode is used for default function: pictureMode
-          //this.log("previousPictureMode", this.previousPictureMode);
-          //this.log("currentPictureMode", this.currentPictureMode);
-          if (this.previousPictureMode !== this.currentPictureMode) {
-            this.log(
-              "%s: Picture Mode changed from %s [%s] to %s [%s]",
-              this.name,
-              this.previousPictureMode || "-",
-              Object.keys(Characteristic.PictureMode)[
-                this.previousPictureMode + 1
-              ] || "unknown",
-              this.currentPictureMode,
-              Object.keys(Characteristic.PictureMode)[
-                this.currentPictureMode + 1
-              ],
-            );
-          }
-          //this.log("configDevice.customPictureMode not found %s, setting PictureMode to %s", (configDevice || {}).customPictureMode, this.currentPictureMode);
-          this.customPictureMode = this.currentPictureMode;
+        // PictureMode is used for default function: pictureMode
+        if (this.previousPictureMode !== this.currentPictureMode) {
+          logCharValueChange(
+            this.log,
+            this.name,
+            "Picture Mode",
+            null,
+            this.previousPictureMode,
+            CHAR_NAMES.PictureMode[this.previousPictureMode + 1],
+            this.currentPictureMode,
+            CHAR_NAMES.PictureMode[this.currentPictureMode + 1],
+          );
+          this.televisionService.updateCharacteristic(
+            Characteristic.PictureMode,
+            this.customPictureMode,
+          );
           this.previousPictureMode = this.currentPictureMode;
         }
-        //this.log("setting PictureMode to %s", this.customPictureMode);
-        this.televisionService
-          .getCharacteristic(Characteristic.PictureMode)
-          .updateValue(this.customPictureMode);
 
-        // check for change of ProgramMode state
+        // check for change of ProgramMode
         if (this.previousProgramMode !== this.currentProgramMode) {
-          this.log(
-            "%s: Program Mode changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            this.previousProgramMode || "-",
-            Object.keys(Characteristic.ProgramMode)[
-              this.previousProgramMode + 1
-            ] || "unknown",
+            "Program Mode",
+            null,
+            this.previousProgramMode,
+            CHAR_NAMES.ProgramMode[this.previousProgramMode + 1],
             this.currentProgramMode,
-            Object.keys(Characteristic.ProgramMode)[
-              this.currentProgramMode + 1
-            ],
+            CHAR_NAMES.ProgramMode[this.currentProgramMode + 1],
           );
+          this.televisionService.updateCharacteristic(
+            Characteristic.ProgramMode,
+            this.currentProgramMode,
+          );
+          this.previousProgramMode = this.currentProgramMode;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.ProgramMode)
-          .updateValue(this.currentProgramMode);
-        this.previousProgramMode = this.currentProgramMode;
 
-        // check for change of active identifier (channel)
+        // check for change of ActiveIdentifier (channel, 1-based)
         // temporarily wrapped this in a try-catch to capture any errors
         //this.log("Before error trap");
         let searchChannelId = this.currentChannelId; // this.currentChannelId is a string eg SV09038
@@ -6564,9 +6586,8 @@ class StbDevice {
               searchChannelId,
             );
             // get the name from the master channel list
-            let masterChannelApp = this.platform.masterChannelList.find(
-              (channel) => channel.id === searchChannelId,
-            );
+            let masterChannelApp =
+              this.platform.masterChannelMap.get(searchChannelId);
             //this.log("found masterChannelApp", masterChannelApp)
             // now look again in the master channel list to find this channel with the same name but not an app id
             if (masterChannelApp) {
@@ -6597,34 +6618,30 @@ class StbDevice {
         //this.log("After error trap. searchChannelId:", searchChannelId);
 
         // search by subtype in the inputServices array, index 0 = input 1, subtype: 'input_SV09038',
-        const oldActiveIdentifier = this.televisionService.getCharacteristic(
-          Characteristic.ActiveIdentifier,
-        ).value;
-        //this.log("updateDeviceState: oldActiveIdentifier %s, currentActiveIdentifier %s, searchChannelId %s", oldActiveIdentifier, currentActiveIdentifier, searchChannelId)
-        //this.log("this.inputServices")
-        //this.log(this.inputServices)
         // ActiveIdentifier: 1-based: 1=Input1, 2=Input2, etc
         // channelList:      0-based: 0=index0, 1=index1, etc
+        // Single scan: reused for both ActiveIdentifier and InputDeviceType/InputSourceType updates below.
+        // searchChannelId equals this.currentChannelId except when an app ID has been remapped,
+        // in which case the remapped ID is the correct one to locate in inputServices.
+        let currInputIndex = this.inputServices.findIndex(
+          (InputSource) => InputSource.subtype === "input_" + searchChannelId,
+        );
+        // if nothing found, set to NO_INPUT_ID to clear the name from the Home app tile
         currentActiveIdentifier =
-          this.inputServices.findIndex(
-            (InputSource) => InputSource.subtype === "input_" + searchChannelId,
-          ) + 1;
-        //this.log("found searchChannelId %s at currentActiveIdentifier %s", 'input_' + searchChannelId , currentActiveIdentifier)
-        if (currentActiveIdentifier <= 0) {
-          currentActiveIdentifier = NO_INPUT_ID;
-        } // if nothing found, set to NO_INPUT_ID to clear the name from the Home app tile
-        //this.log("found searchChannelId at currentActiveIdentifier ", currentActiveIdentifier)
-
-        if (oldActiveIdentifier !== currentActiveIdentifier) {
+          currInputIndex >= 0 ? currInputIndex + 1 : NO_INPUT_ID;
+        let currInputNumber = currInputIndex >= 0 ? currInputIndex + 1 : null;
+        if (currInputIndex < 0) currInputIndex = null;
+
+        if (this.previousActiveIdentifier !== currentActiveIdentifier) {
           // get names from loaded channel list. Using Ch Up/Ch Down buttons on the remote rolls around the profile channel list
           // what happens if the TV is changed to another profile?
           let oldName = NO_CHANNEL_NAME,
             newName = oldName; // default to UNKNOWN
           if (
-            oldActiveIdentifier !== NO_INPUT_ID &&
-            this.channelList[oldActiveIdentifier - 1]
+            this.previousActiveIdentifier !== NO_INPUT_ID &&
+            this.channelList[this.previousActiveIdentifier - 1]
           ) {
-            oldName = this.channelList[oldActiveIdentifier - 1].name;
+            oldName = this.channelList[this.previousActiveIdentifier - 1].name;
           }
 
           if (
@@ -6633,18 +6650,21 @@ class StbDevice {
           ) {
             newName = this.channelList[currentActiveIdentifier - 1].name;
           }
-          this.log(
-            "%s: Channel changed from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            oldActiveIdentifier || "-",
-            oldName || "unknown",
+            "Channel",
+            null,
+            this.previousActiveIdentifier,
+            oldName,
             currentActiveIdentifier,
             newName,
           );
-          this.televisionService
-            .getCharacteristic(Characteristic.ActiveIdentifier)
-            .updateValue(currentActiveIdentifier);
-          this.previousActiveIdentifier = this.currentActiveIdentifier;
+          this.televisionService.updateCharacteristic(
+            Characteristic.ActiveIdentifier,
+            currentActiveIdentifier,
+          );
+          this.previousActiveIdentifier = currentActiveIdentifier;
         }
 
         // +++++++++++++++ Input Service characteristics ++++++++++++++
@@ -6660,97 +6680,76 @@ class StbDevice {
 				.setCharacteristic(Characteristic.TargetVisibilityState, visState);
 				*/
         // check for change of InputDeviceType state: (a characteristic of Input Source)
-
-        //this.log('looking for input subtype ', 'input_' + this.currentChannelId)
-        let currInputIndex = this.inputServices.findIndex(
-          (InputSource) =>
-            InputSource.subtype === "input_" + this.currentChannelId,
-        );
-        let currInputNumber = currInputIndex + 1;
-        if (currInputIndex < 0) {
-          currInputIndex = null;
-          currInputNumber = null;
-        }
         //this.log('found input index %s input %s subtype %s', currInputIndex, currInputIndex+1, (this.inputServices[currInputIndex] || {}).subtype)
         if (this.previousInputDeviceType !== this.currentInputDeviceType) {
-          this.log(
-            "%s: Input Device Type changed on input %s %s from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            currInputNumber,
-            this.currentChannelId,
-            this.previousInputDeviceType || "-",
-            Object.keys(Characteristic.InputDeviceType)[
-              this.previousInputDeviceType + 1
-            ] || "unknown",
+            "Input Device Type",
+            currInputNumber + " " +this.currentChannelId,
+            this.previousInputDeviceType,
+            CHAR_NAMES.InputDeviceType[this.previousInputDeviceType + 1],
             this.currentInputDeviceType,
-            Object.keys(Characteristic.InputDeviceType)[
-              this.currentInputDeviceType + 1
-            ],
-          );
-        }
-        //this.televisionService.getCharacteristic(Characteristic.InputDeviceType).updateValue(this.currentInputDeviceType);
-        if (currInputIndex) {
-          this.inputServices[currInputIndex]
-            .getCharacteristic(Characteristic.InputDeviceType)
-            .updateValue(this.currentInputDeviceType);
+            CHAR_NAMES.InputDeviceType[this.currentInputDeviceType + 1],
+          );          
+          if (currInputIndex !== null) {
+            this.inputServices[currInputIndex].updateCharacteristic(
+              Characteristic.InputDeviceType,
+              this.currentInputDeviceType,
+            );
+          }
+          this.previousInputDeviceType = this.currentInputDeviceType;
         }
-        this.previousInputDeviceType = this.currentInputDeviceType;
 
         // check for change of InputSourceType state: (a characteristic of Input Source)
         if (this.previousInputSourceType !== this.currentInputSourceType) {
-          this.log(
-            "%s: Input Source Type changed on input %s %s from %s [%s] to %s [%s]",
+          logCharValueChange(
+            this.log,
             this.name,
-            currInputNumber,
-            this.currentChannelId,
-            this.previousInputSourceType || "-",
-            Object.keys(Characteristic.InputSourceType)[
-              this.previousInputSourceType + 1
-            ] || "unknown",
+            "Input Source Type",
+            currInputNumber + " " +this.currentChannelId,
+            this.previousInputSourceType,
+            CHAR_NAMES.InputSourceType[this.previousInputSourceType + 1],
             this.currentInputSourceType,
-            Object.keys(Characteristic.InputSourceType)[
-              this.currentInputSourceType + 1
-            ],
-          );
+            CHAR_NAMES.InputSourceType[this.currentInputSourceType + 1],
+          );          
+          if (currInputIndex !== null) {
+            this.inputServices[currInputIndex].updateCharacteristic(
+              Characteristic.InputSourceType,
+              this.currentInputSourceType,
+            );
+          } // generates Homebridge warning
+          this.previousInputSourceType = this.currentInputSourceType;
         }
-        // [12/11/2022, 12:22:37] [homebridge-eosstb] This plugin generated a warning from the characteristic 'Input Source Type': Characteristic not in required or optional characteristic section for service Television. Adding anyway.. See https://homebridge.io/w/JtMGR for more info.
-        if (currInputIndex) {
-          this.inputServices[currInputIndex]
-            .getCharacteristic(Characteristic.InputSourceType)
-            .updateValue(this.currentInputSourceType);
-        } // generates Homebridge warning
-        this.previousInputSourceType = this.currentInputSourceType;
-        //this.log('++++DEBUG: this.inputServices[currInputIndex]')
-        //this.log(this.inputServices[currInputIndex])
 
         // +++++++++++++++ end of Input Service characteristics ++++++++++++++
 
         // check for change of current media state
-        let prevCurrentMediaState = this.televisionService.getCharacteristic(
-          Characteristic.CurrentMediaState,
-        ).value;
-        if (prevCurrentMediaState !== this.currentMediaState) {
-          this.log(
-            "%s: Current Media state changed from %s [%s] to %s [%s]",
+        if (this.previousMediaState !== this.currentMediaState) {
+          logCharValueChange(
+            this.log,
             this.name,
-            prevCurrentMediaState,
-            currentMediaStateName(prevCurrentMediaState),
+            "Media State",
+            null,
+            this.previousMediaState,
+            currentMediaStateName(this.previousMediaState),
             this.currentMediaState,
             currentMediaStateName(this.currentMediaState),
           );
-
           // set targetMediaState to same as currentMediaState as long as currentMediaState is <= 2 (supports 0 PLAY, 1 PAUSE, 2 STOP)
           if (this.currentMediaState <= Characteristic.TargetMediaState.STOP) {
             this.targetMediaState = this.currentMediaState;
-            this.televisionService
-              .getCharacteristic(Characteristic.TargetMediaState)
-              .updateValue(this.targetMediaState);
+            this.televisionService.updateCharacteristic(
+              Characteristic.TargetMediaState,
+              this.targetMediaState,
+            );
           }
+          this.televisionService.updateCharacteristic(
+            Characteristic.CurrentMediaState,
+            this.currentMediaState,
+          );
+          this.previousMediaState = this.currentMediaState;
         }
-        this.televisionService
-          .getCharacteristic(Characteristic.CurrentMediaState)
-          .updateValue(this.currentMediaState);
-        this.previousMediaState = this.currentMediaState;
 
         // check for change of profile
         if (this.profileDataChanged) {
@@ -6775,7 +6774,7 @@ class StbDevice {
   // refresh the channel list that shows in the Home app
   async refreshDeviceChannelList(callback) {
     try {
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("%s: refreshDeviceChannelList", this.name);
       }
       this.log("%s: Refreshing device channel list...", this.name);
@@ -6802,24 +6801,15 @@ class StbDevice {
 
       // limit the amount of max channels to load as Apple HomeKit is limited to 100 services per accessory.
       // if a config exists for this device, read the users configured maxSources, if it exists
-      let maxSources = MAX_INPUT_SOURCES;
-      let configDevice = {};
-      if (this.config.devices) {
-        configDevice = this.config.devices.find(
-          (device) => device.deviceId === this.deviceId,
-        );
-        if (configDevice) {
-          // homebridge config for this device exists, read maxSources (if exists)
-          maxSources = Math.min(
-            configDevice.maxChannels || maxSources,
-            maxSources,
-          );
-        }
-      }
+      const configDevice = this._configDevice;
+      const maxChannels = configDevice.maxChannels;
+      const maxSources = maxChannels
+        ? Math.min(maxChannels, MAX_INPUT_SOURCES)
+        : MAX_INPUT_SOURCES;
 
       // get a user configured Profile, if it exists, otherwise we will use the default Profile for the channel list
       let wantedProfile;
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn("%s: Getting profile data from config", this.name);
       }
       if (configDevice) {
@@ -6828,7 +6818,7 @@ class StbDevice {
           (profile) => profile.name === configDevice.profile,
         );
         if (wantedProfile) {
-          if (this.config.debugLevel > 1) {
+          if (this.debugLevel > 1) {
             this.log.warn(
               "%s: Configured profile found: '%s'",
               this.name,
@@ -6843,7 +6833,7 @@ class StbDevice {
         wantedProfile = this.customer.profiles.find(
           (profile) => profile.profileId === this.device.defaultProfileId,
         );
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           this.log.warn(
             "%s: No user-configured profile found, reverting to default profile: '%s'",
             this.name,
@@ -6875,7 +6865,7 @@ class StbDevice {
       );
       let subscribedChIds = []; // an array of channelIds: SV00302, SV09091, etc
       if (wantedProfile.favoriteChannels.length > 0) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           this.log.warn(
             "%s: Loading channels from profile '%s' into the subscribedChIds",
             this.name,
@@ -6896,7 +6886,7 @@ class StbDevice {
           (this.mostWatched || []).length > 0
         ) {
           // load by mostWatched sort order
-          if (this.config.debugLevel > 1) {
+          if (this.debugLevel > 1) {
             this.log.warn(
               "%s: Loading channel using most watched sort order",
               this.name,
@@ -6906,7 +6896,7 @@ class StbDevice {
           const favoriteChannelsSet = new Set(wantedProfile.favoriteChannels);
           this.mostWatched.forEach((mostWatchedChannelId) => {
             if (favoriteChannelsSet.has(mostWatchedChannelId)) {
-              if (this.config.debugLevel > 2) {
+              if (this.debugLevel > 2) {
                 this.log.warn(
                   "%s: Loading channel using most watched sort order. Channel %s found, loading at index %s",
                   this.name,
@@ -6919,14 +6909,14 @@ class StbDevice {
           });
         } else {
           // load by standard sort order
-          if (this.config.debugLevel > 1) {
+          if (this.debugLevel > 1) {
             this.log.warn(
               "%s: Loading channel using standard sort order",
               this.name,
             );
           }
           wantedProfile.favoriteChannels.forEach((channel) => {
-            if (this.config.debugLevel > 1) {
+            if (this.debugLevel > 1) {
               this.log.warn(
                 "%s: Loading channel using standard sort order. Channel %s found, loading at index %s",
                 this.name,
@@ -6938,7 +6928,7 @@ class StbDevice {
           });
         }
       }
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "%s: subscribedChIds.length: %s",
           this.name,
@@ -6954,11 +6944,11 @@ class StbDevice {
 
       // if the subscribedChIds is empty, load the channels from the master channel list
       // sorted by logicalChannelNumber, including only entitled channels
-      //if (this.config.debugLevel > 1) { this.log.warn("%s: Checking if subscribed channel list is needed", this.name); }
+      //if (this.debugLevel > 1) { this.log.warn("%s: Checking if subscribed channel list is needed", this.name); }
       //this.log.warn("%s: this.customer.profiles", this.name, this.customer.profiles);
       //wantedProfile = this.customer.profiles.find(profile => profile.profileId === this.device.defaultProfileId);
       if (subscribedChIds.length === 0) {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           this.log(
             "%s: Profile '%s' contains 0 favorite channels. Channel list will be loaded from master channel list",
             this.name,
@@ -6967,13 +6957,18 @@ class StbDevice {
         }
         // get a clean list of entitled channels (will not be in correct order)
         // some entitlements are not in the masterchannelList, these must be ignored
-        //if (this.config.debugLevel > 1) { this.log.warn("%s: Checking %s entitlements within %s channels in the master channel list", this.name, this.platform.session.entitlements.length, this.platform.masterChannelList.length); }
+        //if (this.debugLevel > 1) { this.log.warn("%s: Checking %s entitlements within %s channels in the master channel list", this.name, this.platform.session.entitlements.length, this.platform.masterChannelList.length); }
 
         // entitlements needs to be reworked, currently load everything
         //this.log.warn("%s: Loading all channels into the subscribedChIds", this.name)
         //this.log.warn("%s: masterChannelList.length", this.name, this.platform.masterChannelList.length)
         //this.log.warn("%s: this.entitlements %s", this.name, this.entitlements)
         //this.log.warn("%s: this.platform.entitlements.entitlements %s", this.name, this.platform.entitlements.entitlements)
+        // build Set once BEFORE the masterChannelList.forEach loop:
+        const entitlementIdSet = new Set(
+          this.platform.entitlements.entitlements.map((e) => e.id),
+        );
+
         this.platform.masterChannelList.forEach((channel) => {
           // check entitlements of this channel
           // channel.linearProducts is an array of entitlement codes assigned to a channel, each channel can have multiple entitlement codes
@@ -6982,7 +6977,6 @@ class StbDevice {
           // [{ casIndicator: 0, id: '600000001' }, { casIndicator: 0, id: '600000080' }, { casIndicator: 1, id: '600000070' }, { casIndicator: 1, id: '600000300' }]
           // control channel: SV09038 SRF 1 HD (entitled), with "linearProducts": [ '100000000', '100000001', '600000300'	],
           // control channel: SV06321 Nicktoons (not entitled), with linearProducts: [ '601007005' ],
-          let isEntitled = false;
           this.log.debug(
             "%s: checking entitlements for %s %s",
             this.name,
@@ -6994,18 +6988,8 @@ class StbDevice {
             this.name,
             channel.linearProducts,
           );
-          this.platform.entitlements.entitlements.forEach(
-            (subscribedlEntitlement) => {
-              if (channel.linearProducts.includes(subscribedlEntitlement.id)) {
-                this.log.debug(
-                  "%s: channel channelId %s, linearProducts includes subscribedlEntitlement.id %s, channel is entitled",
-                  this.name,
-                  channel.id,
-                  subscribedlEntitlement.id,
-                );
-                isEntitled = true;
-              }
-            },
+          const isEntitled = channel.linearProducts.some((id) =>
+            entitlementIdSet.has(id),
           );
           if (isEntitled) {
             subscribedChIds.push(channel.id);
@@ -7024,7 +7008,7 @@ class StbDevice {
           subscribedChIds.length,
         );
       }
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log(
           "%s: Subscribed channel list loaded with %s channels",
           this.name,
@@ -7033,7 +7017,7 @@ class StbDevice {
       }
 
       // recently viewed apps
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log.warn(
           "%s: refreshDeviceChannelList: recentlyUsedApps",
           this.name,
@@ -7041,24 +7025,6 @@ class StbDevice {
         );
       }
 
-      // grab the current ActiveIdentifier, and currentChannel, it might change during the channel refresh
-      /*
-			let currentActiveIdentifier = NO_INPUT_ID, currentChannel, currentChannelName = NO_CHANNEL_NAME;
-			if (this.accessoryConfigured) { 
-				currentActiveIdentifier = this.televisionService.getCharacteristic(Characteristic.ActiveIdentifier).value;
-			}
-			if (currentActiveIdentifier !== NO_INPUT_ID) {
-				currentChannel = this.inputServices[currentActiveIdentifier - 1];
-				currentChannelName = this.inputServices[currentActiveIdentifier - 1].getCharacteristic(Characteristic.ConfiguredName).value;
-			}
-			if (this.config.debugLevel > 0) { 
-				this.log.warn("%s: refreshDeviceChannelList: before channel refresh: this.currentChannelId %s currentActiveIdentifier %s currentChannelName %s", this.name, this.currentChannelId, currentActiveIdentifier, currentChannelName);
-			}
-			*/
-
-      //const currentInpIndex = this.inputServices.findIndex(channel => channel.subtype === 'input_' + this.currentChannelId);
-      //this.log("Found before channel load: this.currentChannelId %s found at currentInpIndex %s", this.currentChannelId, currentInpIndex);
-
       ////////////////////////////////////////////////////////
       // load the input list
       ////////////////////////////////////////////////////////
@@ -7144,30 +7110,26 @@ class StbDevice {
             i,
             subscribedChIds[i],
           );
-          channel = this.platform.masterChannelList.find(
-            (channel) => channel.id === subscribedChIds[i],
-          );
+          channel = this.platform.masterChannelMap.get(subscribedChIds[i]);
           if (!channel) {
-            const newChName =
-              customChannel.name || "Channel " + subscribedChIds[i];
+            const newChannel = {
+              id: subscribedChIds[i],
+              name: customChannel.name || "Channel " + subscribedChIds[i],
+              logicalChannelNumber:
+                10000 + this.platform.masterChannelList.length,
+              linearProducts: this.platform.entitlements.entitlements[0].id,
+            };
+            newChannel.configuredName = newChannel.name;
             this.log(
               "%s: Unknown channel %s [%s] discovered. Adding to the master channel list",
               this.name,
-              subscribedChIds[i],
-              newChName,
+              newChannel.id,
+              newChannel.name,
             );
-            this.platform.masterChannelList.push({
-              id: subscribedChIds[i],
-              name: newChName,
-              logicalChannelNumber:
-                10000 + this.platform.masterChannelList.length, // integer
-              linearProducts: this.platform.entitlements.entitlements[0].id, // must be a valid entitlement id
-            });
             // refresh channel as the not found channel will now be in the masterChannelList
-            channel = this.platform.masterChannelList.find(
-              (channel) => channel.id === subscribedChIds[i],
-            );
-            channel.configuredName = channel.name; // set a configured name same as name
+            this.platform.masterChannelList.push(newChannel);
+            this.platform.masterChannelMap.set(subscribedChIds[i], newChannel);
+            channel = newChannel;
           } else {
             // show some useful debug data
             this.log.debug(
@@ -7256,7 +7218,7 @@ class StbDevice {
           // update accessory only when configured, as this.inputServices[i] can only be updated when it exists
           if (this.accessoryConfigured) {
             // update existing services
-            if (this.config.debugLevel > 2) {
+            if (this.debugLevel > 2) {
               this.log.warn(
                 "Adding %s %s to input %s at index %s",
                 channel.id,
@@ -7303,9 +7265,10 @@ class StbDevice {
       //this.log("DEBUG: this.currentChannelId %s", this.currentChannelId)
       //this.log("DEBUG: currentInput %s", currentInput)
       if (currentInput) {
+        const currentInputIndex = this.inputServices.indexOf(currentInput);
         this.televisionService.updateCharacteristic(
-          Characteristic.ActiveIdentifier, // 1-based
-          currentInput.getCharacteristic(Characteristic.Identifier).value,
+          Characteristic.ActiveIdentifier,
+          currentInputIndex + 1, // Identifier is always index + 1
         );
       } else {
         // not found, set to NO_INPUT_ID
@@ -7317,40 +7280,6 @@ class StbDevice {
         }
       }
 
-      // save to disk
-      // not yet active
-      // this.platform.persistConfig(this.deviceId, this.channelList);
-
-      // add the recently used apps, if we are loading from a user profile
-      /*
-					if (this.profileId > 0) {
-						// apps have a channel number starting with "app"
-						let appsToload = this.platform.profiles[this.profileId].recentlyUsedApps;
-						appsToload.forEach( (appId, i) => {
-							this.log("loading app", i, appId);
-							if (i <= maxChs) {
-								// get the channel
-								let foundIndex = this.platform.masterChannelList.findIndex(channel => channel.id === appId);
-								//this.log("foundIndex", foundIndex);
-								if (foundIndex >= 0) {
-									let channel = this.platform.masterChannelList[foundIndex];
-									this.log("loading app", channel);
-		
-									// update existing services
-
-									const inputService = this.inputServices[i];
-									inputService
-										.updateCharacteristic(Characteristic.ConfiguredName, channel.name)
-										.updateCharacteristic(Characteristic.IsConfigured, Characteristic.IsConfigured.CONFIGURED)
-										.updateCharacteristic(Characteristic.CurrentVisibilityState, Characteristic.CurrentVisibilityState.SHOWN)
-										.updateCharacteristic(Characteristic.TargetVisibilityState, Characteristic.TargetVisibilityState.SHOWN);
-		
-								}
-							}
-						});
-					}
-					*/
-
       // for any remaining inputs that may have been previously visible, set to not configured and hidden
       //this.log("channelList pre filter:", this.channelList);
       //let loadedChs = Math.min(chs, MAX_INPUT_SOURCES);
@@ -7404,7 +7333,7 @@ class StbDevice {
   // this is for the web session type as of 13.10.2022
   async getMostWatchedChannels(profileId, callback) {
     try {
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log(
           "%s: getMostWatchedChannels started with %s",
           this.name,
@@ -7434,14 +7363,14 @@ class StbDevice {
           "x-profile": profile.profileId,
         },
       };
-      if (this.config.debugLevel > 0) {
+      if (this.debugLevel > 0) {
         this.log.warn("getMostWatchedChannels: GET %s", url);
       }
       // this.log('getMostWatchedChannels: GET %s', url);
       axiosWS
         .get(url, config)
         .then((response) => {
-          if (this.config.debugLevel > 0) {
+          if (this.debugLevel > 0) {
             this.log.warn(
               "getMostWatchedChannels: Profile %s: response: %s %s",
               profile.name,
@@ -7449,7 +7378,7 @@ class StbDevice {
               response.statusText,
             );
           }
-          if (this.config.debugLevel > 2) {
+          if (this.debugLevel > 2) {
             this.log.warn(
               "getMostWatchedChannels: %s: response data:",
               profile.name,
@@ -7494,21 +7423,10 @@ class StbDevice {
   getMaxSources(callback) {
     // limit the amount of max channels to load as Apple HomeKit is limited to 100 services per accessory.
     // if a config exists for this device, read the users configured maxSources, if it exists
-    let maxSources = MAX_INPUT_SOURCES;
-    let configDevice = {};
-    if (this.config.devices) {
-      configDevice = this.config.devices.find(
-        (device) => device.deviceId === this.deviceId,
-      );
-      if (configDevice) {
-        // homebridge config for this device exists, read maxSources (if exists)
-        maxSources = Math.min(
-          configDevice.maxChannels || maxSources,
-          maxSources,
-        );
-      }
-    }
-    return maxSources;
+    const maxChannels = this._configDevice.maxChannels;
+    return maxChannels
+      ? Math.min(maxChannels, MAX_INPUT_SOURCES)
+      : MAX_INPUT_SOURCES;
     //this.log("%s: Setting maxSources to %s", this.name, maxSources);
   }
 
@@ -7522,12 +7440,12 @@ class StbDevice {
   //+++++++++++++++++++++++++++++++++++++++++++++++++++++
 
   // get power state
-  async getPower(callback) {
+  getPower(callback) {
     // fired when the user clicks away from the Remote Control, regardless of which TV was selected
     // fired when the Home app wants to refresh the TV tile. Refresh occurs when tile is displayed.
     // this.currentPowerState is updated by the polling mechanism
     //this.log('getPowerState current power state:', this.currentPowerState);
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getPower returning %s [%s]",
         this.name,
@@ -7539,12 +7457,12 @@ class StbDevice {
   }
 
   // set power state
-  async setPower(targetPowerState, callback) {
+  setPower(targetPowerState, callback) {
     // fired when the user clicks the power button in the TV accessory in the Home app
     // fired when the user clicks the TV tile in the Home app
     // fired when the first key is pressed after opening the Remote Control
     // wantedPowerState is the wanted power state: 0=off, 1=on
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setPower targetPowerState:",
         this.name,
@@ -7560,29 +7478,21 @@ class StbDevice {
   }
 
   // get device name (the accessory visible name)
-  async getDeviceName(callback) {
+  getDeviceName(callback) {
     // fired by the user changing a the accessory name in Home app accessory setup
     // a user can rename any box at any time
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("%s: getDeviceName returning '%s'", this.name, this.name);
     }
     callback(null, this.name);
   }
 
   // set device name (change the accessory visible name)
-  async setDeviceName(deviceName, callback) {
+  setDeviceName(deviceName, callback) {
     // fired by the user changing the accessory name in Home app accessory setup
 
     // check if user wants to sync the box name
-    let syncName = true; // default true
-    if (this.config.devices) {
-      const configDevice = this.config.devices.find(
-        (device) => device.deviceId === this.deviceId,
-      );
-      if (configDevice && configDevice.syncName === false) {
-        syncName = configDevice.syncName;
-      }
-    }
+    const syncName = this._configDevice.syncName !== false; // default true
 
     // sync name to physical device if enabled
     if (syncName) {
@@ -7617,7 +7527,7 @@ class StbDevice {
           deviceName,
         );
       } else {
-        if (this.config.debugLevel > 1) {
+        if (this.debugLevel > 1) {
           this.log.warn(
             "%s: setDeviceName: deviceName %s",
             this.name,
@@ -7635,20 +7545,11 @@ class StbDevice {
     callback(null);
   }
 
-  // get mute state
-  async getMute(callback) {
-    // not supported, but might use somehow in the future
-    if (this.config.debugLevel > 1) {
-      this.log.warn("getMute");
-    }
-    callback(null);
-  }
-
   // set mute state
-  async setMute(muteState, callback) {
+  setMute(muteState, callback) {
     // sends the mute command. Mute is boolean
     // works for TVs that accept a mute toggle command
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("%s: setMute muteState: %s", this.name, muteState);
     }
 
@@ -7660,43 +7561,27 @@ class StbDevice {
     this.log("Send key Mute to %s ", this.name);
 
     // Execute command to toggle mute
-    if (this.config.devices) {
-      const device = this.config.devices.find(
-        (device) => device.deviceId === this.deviceId,
-      );
-      if (device && device.muteCommand) {
-        // assumes the end device toggles between mute on and mute off with each command
-        exec(device.muteCommand, (error, stdout, stderr) => {
-          // Error detection. error is true when an exec error occured
-          if (error) {
-            this.log.warn("setMute Error:", stderr.trim());
-          }
-        });
-      } else {
-        this.log("%s: Mute command not configured", this.name);
-      }
+    if (this._configDevice.muteCommand) {
+      // assumes the end device toggles between mute on and mute off with each command
+      exec(this._configDevice.muteCommand, (error, stdout, stderr) => {
+        // Error detection. error is true when an exec error occured
+        if (error) {
+          this.log.warn("setMute Error:", stderr.trim());
+        }
+      });
     } else {
       this.log("%s: Mute command not configured", this.name);
     }
   }
 
-  // get volume
-  async getVolume(callback) {
-    // not supported, but might use somehow in the future
-    if (this.config.debugLevel > 1) {
-      this.log.warn("getVolume");
-    }
-    callback(null);
-  }
-
   // set volume
-  async setVolume(volumeSelectorValue, callback) {
+  setVolume(volumeSelectorValue, callback) {
     // set the volume of the TV using bash scripts
     // the ARRIS box remote control communicates with the stereo via IR commands, not over mqtt
     // so volume must be handled over a different method
     // here we send execute a bash command on the raspberry pi using the samsungctl command
     // to control the authors samsung stereo at 192.168.0.152
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setVolume volumeSelectorValue:",
         this.name,
@@ -7751,29 +7636,23 @@ class StbDevice {
       return false;
     } else {
       // Execute command to change volume, but only if command exists
-      if (this.config.devices) {
-        const device = this.config.devices.find(
-          (device) => device.deviceId === this.deviceId,
+      if (this._configDevice.volUpCommand) {
+        // assumes the end device toggles between mute on and mute off with each command
+        exec(
+          volumeSelectorValue === Characteristic.VolumeSelector.DECREMENT
+            ? this._configDevice.volDownCommand
+            : this._configDevice.volUpCommand,
+          (error, _stdout, stderr) => {
+            // Error detection. error is true when an exec error occured
+            if (error) {
+              this.log.warn(
+                "%s: setVolume Error: %s",
+                this.name,
+                stderr.trim(),
+              );
+            }
+          },
         );
-        if (device && device.volUpCommand && device.volDownCommand) {
-          exec(
-            volumeSelectorValue === Characteristic.VolumeSelector.DECREMENT
-              ? device.volDownCommand
-              : device.volUpCommand,
-            (error, _stdout, stderr) => {
-              // Error detection. error is true when an exec error occured
-              if (error) {
-                this.log.warn(
-                  "%s: setVolume Error: %s",
-                  this.name,
-                  stderr.trim(),
-                );
-              }
-            },
-          );
-        } else {
-          this.log("%s: Volume commands not configured", this.name);
-        }
       } else {
         this.log("%s: Volume commands not configured", this.name);
       }
@@ -7781,39 +7660,20 @@ class StbDevice {
   }
 
   // get input (TV channel)
-  async getInput(callback) {
+  getInput(callback) {
     // fired when the user clicks away from the iOS Device TV Remote Control, regardless of which TV was selected
     // fired when the icon is clicked in the Home app and HomeKit requests a refresh
     // fired when the Home app is opened
-    // this.currentChannelId is updated by mqtt
-    // must return a valid index, and must never return null
-    //if (this.config.debugLevel > 1) { this.log.warn('%s: getInput currentChannelId %s',this.name, this.currentChannelId); }
-
-    // find the this.currentChannelId (eg SV09038) in the accessory inputs and return the inputindex once found
-    // this allows HomeKit to show the selected current channel
-    // as we cannot guarantee the list order due to personalizationServices changing it at any time
-    // we must search by input_channelId within the current accessory InputSource.subtype
-    //this.log.warn('%s: getInput looking for this.currentChannelId %s in this.inputServices', this.name, this.currentChannelId);
-    let currentChannelName = NO_CHANNEL_NAME;
-    let currentInputIndex = this.inputServices.findIndex(
-      (InputSource) => InputSource.subtype === "input_" + this.currentChannelId,
-    );
-    if (currentInputIndex === -1) {
-      currentInputIndex = NO_INPUT_ID - 1;
-    } // if nothing found, set to NO_INPUT_ID to clear the name from the Home app tile
-    if (currentInputIndex > -1 && currentInputIndex !== NO_INPUT_ID - 1) {
-      currentChannelName = this.inputServices[
-        currentInputIndex
-      ].getCharacteristic(Characteristic.ConfiguredName).value;
-    }
-    const currentActiveInput = currentInputIndex + 1;
-    if (this.config.debugLevel > 1) {
+    // polled by HomeKit every 2-15 minutes
+    const currentActiveInput = this.previousActiveIdentifier ?? NO_INPUT_ID;
+    if (this.debugLevel > 1) {
+      const ch = this.channelList[currentActiveInput - 1];
       this.log.warn(
         "%s: getInput returning input %s %s [%s]",
         this.name,
         currentActiveInput,
         this.currentChannelId,
-        currentChannelName,
+        (ch || {}).configuredName || NO_CHANNEL_NAME,
       );
     }
 
@@ -7821,9 +7681,9 @@ class StbDevice {
   }
 
   // set input (change the TV channel)
-  async setInput(input, callback) {
+  setInput(input, callback) {
     input = input ?? {}; // ensure input is never null or undefined
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setInput input %s %s",
         this.name,
@@ -7833,25 +7693,16 @@ class StbDevice {
     }
     callback(); // for rapid response
     // get current channel, also finds keyMacro channels
-    let channel = this.channelList.find(
-      (channel) => channel.id === this.currentChannelId,
-    );
-    // if not found look in the master channel list
-    if (!channel) {
-      channel = this.platform.masterChannelList.find(
-        (channel) => channel.id === this.currentChannelId,
-      );
-    }
-
-    // robustness: only try to switch channel if an input.id exists. Handle KeyMacros
+    const prevChannel = this.channelList[this.previousActiveIdentifier - 1];
     this.log(
       "%s: Change channel from %s [%s] to %s [%s]",
       this.name,
       this.currentChannelId,
-      (channel || {}).name || NO_CHANNEL_NAME,
+      (prevChannel || {}).name || NO_CHANNEL_NAME,
       input.id,
       input.name,
     );
+    // robustness: only try to switch channel if an input.id exists. Handle KeyMacros
     if (input.id && input.id.startsWith("$KeyMacro")) {
       this.lastKeyMacroChannelId = input.id; // remember last keyMacro id
       this.platform.sendKey(this.deviceId, this.name, input.keyMacro);
@@ -7869,11 +7720,11 @@ class StbDevice {
   }
 
   // get input name (the TV channel name)
-  async getInputName(inputId, callback) {
+  getInputName(inputId, callback) {
     // fired by the user changing a channel name in Home app accessory setup
-    //if (this.config.debugLevel > 1) { this.log.warn('%s: getInputName inputId %s', this.name, inputId); }
+    //if (this.debugLevel > 1) { this.log.warn('%s: getInputName inputId %s', this.name, inputId); }
     const inputName = (this.channelList[inputId] || {}).configuredName || ""; // Empty string if not found
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getInputName for input %s returning '%s'",
         this.name,
@@ -7885,7 +7736,7 @@ class StbDevice {
   }
 
   // set input name (change the TV channel name)
-  async setInputName(inputId, newInputName, callback) {
+  setInputName(inputId, newInputName, callback) {
     // fired by the user changing a channel name in Home app accessory setup
     // we cannot handle this as we don't know which channel got renamed
     // as user could name multiple channels to xxx
@@ -7893,7 +7744,7 @@ class StbDevice {
     // channel 3 renamed from BBC Four/Cbeebies HD to BBC Four Cbeebies HD (valid only for HomeKit)
     // inputId is an integer of the input
 
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setInputName for input %s to inputName %s",
         this.name,
@@ -7904,7 +7755,7 @@ class StbDevice {
 
     // store in channelList array and write to disk at every change
     // ensure that this.channelList bounds are not exceeded!
-    //if (this.config.debugLevel > 1) { this.log('%s: DEBUG setInputName inputId %s, this.channelList.length %s', this.name, inputId, this.channelList.length);	}
+    //if (this.debugLevel > 1) { this.log('%s: DEBUG setInputName inputId %s, this.channelList.length %s', this.name, inputId, this.channelList.length);	}
     // not yet working, sometimes causes errors when channelList is not full of data, so commented out
     /*
 		this.log.warn('%s: setInputName inputId %s, this.channelList.length %s', this.name, inputId, this.channelList.length);
@@ -7918,7 +7769,7 @@ class StbDevice {
     //this.platform.persistConfig(this.deviceId, this.channelList);
 
     // maybe suppress
-    if (this.config.debugLevel > 2) {
+    if (this.debugLevel > 2) {
       //this.log('%s: Renamed channel %s from %s to %s (valid only for HomeKit)', this.name, inputId+1, oldInputName, newInputName);
       this.log(
         "%s: Renamed channel %s to %s (valid only for HomeKit)",
@@ -7933,13 +7784,13 @@ class StbDevice {
   // get current channel id (the TV channel identifier, a string)
   // added in v2.1.0
   // custom characteristic, returns a string, the event updates the characteristic value automatically
-  async getCurrentChannelId(callback, currentChannelId) {
+  getCurrentChannelId(callback, currentChannelId) {
     // fired by the user reading the Custom characteristic in Shortcuts
     // fired when the accessory is first created and HomeKit requests a refresh
     // fired when the icon is clicked in the Home app and HomeKit requests a refresh
     // fired when the Home app is opened
     currentChannelId = this.currentChannelId || ""; // this.currentChannelId is a string eg SV09038. Empty string if not found
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getCurrentChannelId returning '%s'",
         this.name,
@@ -7952,17 +7803,17 @@ class StbDevice {
   // get current channel name (the TV channel name)
   // added in v2.1.0
   // custom characteristic, returns a string, the event updates the characteristic value automatically
-  async getCurrentChannelName(callback, currentChannelName) {
+  getCurrentChannelName(callback, currentChannelName) {
     // fired by the user reading the Custom characteristic in Shortcuts
     // fired when the accessory is first created and HomeKit requests a refresh
     // fired when the icon is clicked in the Home app and HomeKit requests a refresh
     // fired when the Home app is opened
-    const curChannel = this.platform.masterChannelList.find(
-      (channel) => channel.id === this.currentChannelId,
-    ); // this.currentChannelId is a string eg SV09038
+    const curChannel = this.platform.masterChannelMap?.get(
+      this.currentChannelId,
+    );
     // consider setting to Radio if radio is playing
     currentChannelName = (curChannel || {}).name || ""; // Empty string if not found
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getCurrentChannelName returning '%s'",
         this.name,
@@ -7973,9 +7824,9 @@ class StbDevice {
   }
 
   // get input visibility state (of the TV channel in the accessory)
-  async getInputVisibilityState(inputId, callback) {
+  getInputVisibilityState(inputId, callback) {
     // fired when ??
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getInputVisibilityState inputId %s",
         this.name,
@@ -7986,36 +7837,37 @@ class StbDevice {
     //if (this.channelList[inputId-1].name === 'HIDDEN') {
     //	visibilityState = Characteristic.CurrentVisibilityState.HIDDEN;
     // }
-    const visibilityState = this.inputServices[inputId].getCharacteristic(
-      Characteristic.CurrentVisibilityState,
-    ).value;
-    if (this.config.debugLevel > 2) {
+    const visibilityState =
+      (this.channelList[inputId] || {}).visibilityState ??
+      Characteristic.CurrentVisibilityState.HIDDEN;
+    if (this.debugLevel > 2) {
       this.log.warn(
         "%s: getInputVisibilityState input %s returning %s [%s]",
         this.name,
         inputId,
         visibilityState,
-        Object.keys(Characteristic.CurrentVisibilityState)[visibilityState + 1],
+        CHAR_NAMES.CurrentVisibilityState[visibilityState + 1],
       );
     }
     callback(null, visibilityState);
   }
 
   // set input visibility state (show or hide the TV channel)
-  async setInputVisibilityState(inputId, visibilityState, callback) {
+  setInputVisibilityState(inputId, visibilityState, callback) {
     // fired when ??
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setInputVisibilityState for input %s inputVisibilityState %s [%s]",
         this.name,
         inputId,
         visibilityState,
-        Object.keys(Characteristic.CurrentVisibilityState)[visibilityState + 1],
+        CHAR_NAMES.CurrentVisibilityState[visibilityState + 1],
       );
     }
-    this.inputServices[inputId]
-      .getCharacteristic(Characteristic.CurrentVisibilityState)
-      .updateValue(visibilityState);
+    this.inputServices[inputId].updateCharacteristic(
+      Characteristic.CurrentVisibilityState,
+      visibilityState,
+    );
 
     // store in channelList array and write to disk at every change
     this.channelList[inputId].visibilityState = visibilityState;
@@ -8026,54 +7878,42 @@ class StbDevice {
   }
 
   // get closed captions state
-  async getClosedCaptions(callback) {
+  getClosedCaptions(callback) {
     // fired when the Home app wants to refresh the TV tile. Refresh occurs when tile is displayed.
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getClosedCaptions returning %s [%s]",
         this.name,
-        this.currentClosedCaptionsState,
-        Object.keys(Characteristic.ClosedCaptions)[
-          this.currentClosedCaptionsState + 1
-        ],
+        this.currentClosedCaptions,
+        CHAR_NAMES.ClosedCaptions[this.currentClosedCaptions + 1],
       );
     }
-    callback(null, this.currentClosedCaptionsState); // return current state
+    callback(null, this.currentClosedCaptions); // return current state
   }
 
   // set closed captions state
-  async setClosedCaptions(targetClosedCaptionsState, callback) {
+  setClosedCaptions(targetClosedCaptionsState, callback) {
     // fired when ?? Apple HomeKit has no ability to control setClosedCaptions
     // targetClosedCaptionsState is the wanted state
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setClosedCaptions targetClosedCaptionsState:",
         this.name,
         targetClosedCaptionsState,
-        Object.keys(Characteristic.ClosedCaptions)[
-          targetClosedCaptionsState + 1
-        ],
+        CHAR_NAMES.ClosedCaptions[targetClosedCaptionsState + 1],
       );
     }
-    if (this.currentClosedCaptionsState !== targetClosedCaptionsState) {
+    if (this.currentClosedCaptions !== targetClosedCaptionsState) {
       this.log("setClosedCaptions: not yet implemented");
     }
     callback();
   }
 
   // get picture mode state
-  async getPictureMode(callback) {
+  getPictureMode(callback) {
     // fired when the Home app wants to refresh the TV tile. Refresh occurs when tile is displayed.
-    if (this.config.debugLevel > 1) {
-      //this.log.warn('%s: getPictureMode', this.name);
-      // get the config for the device, needed for a few status checks
-      let configDevice;
-      if (this.config.devices) {
-        configDevice = this.config.devices.find(
-          (device) => device.deviceId === this.deviceId,
-        );
-      }
-      if ((configDevice || {}).customPictureMode === "recordingState") {
+    if (this.debugLevel > 1) {
+      if (this._configDevice.customPictureMode === "recordingState") {
         this.log.warn(
           "%s: getPictureMode returning %s [%s]",
           this.name,
@@ -8085,7 +7925,7 @@ class StbDevice {
           "%s: getPictureMode returning %s [%s]",
           this.name,
           this.customPictureMode,
-          Object.keys(Characteristic.PictureMode)[this.customPictureMode + 1],
+          CHAR_NAMES.PictureMode[this.customPictureMode + 1],
         );
       }
     }
@@ -8093,15 +7933,15 @@ class StbDevice {
   }
 
   // set picture mode state
-  async setPictureMode(targetPictureMode, callback) {
+  setPictureMode(targetPictureMode, callback) {
     // The current Home app (iOS 16.0) does not support setting this characteristic, thus is never fired
     // targetClosedCaptionsState is the wanted state
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setPictureMode targetPictureMode:",
         this.name,
         targetPictureMode,
-        Object.keys(Characteristic.PictureMode)[targetPictureMode + 1],
+        CHAR_NAMES.PictureMode[targetPictureMode + 1],
       );
     }
     if (this.customPictureMode !== targetPictureMode) {
@@ -8111,12 +7951,11 @@ class StbDevice {
   }
 
   // set power mode selection (View TV Settings menu option)
-  async setPowerModeSelection(state, callback) {
+  setPowerModeSelection(state, callback) {
     // fired by the View TV Settings command in the Home app TV accessory Settings
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("%s: setPowerModeSelection state:", this.name, state);
     }
-    callback(false); // for rapid response
     this.log("Menu command: View TV Settings");
     // only send the keys if the power is on
     if (this.currentPowerState === Characteristic.Active.ACTIVE) {
@@ -8130,10 +7969,10 @@ class StbDevice {
   }
 
   // get current media state
-  async getCurrentMediaState(callback) {
+  getCurrentMediaState(callback) {
     // The current Home app (iOS 16.0) does not support setting this characteristic, thus is never fired
     // cannot be controlled by Apple Home app, but could be controlled by other HomeKit apps
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getCurrentMediaState returning %s [%s]",
         this.name,
@@ -8145,11 +7984,11 @@ class StbDevice {
   }
 
   // get target media state
-  async getTargetMediaState(callback) {
+  getTargetMediaState(callback) {
     // The current Home app (iOS 16.0) does not support getting this characteristic, thus is never fired
     // cannot be controlled by Apple Home app, but could be controlled by other HomeKit apps
     // must never return null, so send STOP as default value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getTargetMediaState returning %s [%s]",
         this.name,
@@ -8161,34 +8000,20 @@ class StbDevice {
   }
 
   // set target media state
-  async setTargetMediaState(targetMediaState, logChangeOnly, callback) {
+  setTargetMediaState(targetMediaState, logChangeOnly, callback) {
     // The current Home app (iOS 16.0) does not support setting this characteristic, thus is never fired
     // cannot be controlled by Apple Home app, but could be controlled by other HomeKit apps
     // can be controlled by the Apple TV Remote Control, and is called when changing Play / Pause / Stop
     // logChangeOnly = TRUE: only the changes are logged, no media state change occurs. Needed when sending remote keypresses to prevent double commands
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setTargetMediaState targetMediaState:",
         this.name,
         targetMediaState,
-        Object.keys(Characteristic.TargetMediaState)[targetMediaState + 1],
+        CHAR_NAMES.TargetMediaState[targetMediaState + 1],
       );
     }
 
-    let prevTargetMediaState = this.televisionService.getCharacteristic(
-      Characteristic.TargetMediaState,
-    ).value;
-    if (prevTargetMediaState !== targetMediaState) {
-      this.targetMediaState = targetMediaState;
-      this.log(
-        "%s: Target Media state changed from %s [%s] to %s [%s]",
-        this.name,
-        prevTargetMediaState,
-        Object.keys(Characteristic.TargetMediaState)[prevTargetMediaState + 1],
-        targetMediaState,
-        Object.keys(Characteristic.TargetMediaState)[targetMediaState + 1],
-      );
-    }
     if (!logChangeOnly) {
       // send the setMediaState command if we are not just logging the change
       const boxMediaStatePAUSE = 0,
@@ -8205,10 +8030,10 @@ class StbDevice {
           newBoxMediaState = boxMediaStatePAUSE;
           break;
       }
-      if (this.config.debugLevel > 1) {
+      if (this.debugLevel > 1) {
         this.log(
           "setTargetMediaState: Set media to %s for",
-          Object.keys(Characteristic.TargetMediaState)[targetMediaState + 1],
+          CHAR_NAMES.TargetMediaState[targetMediaState + 1],
           this.currentChannelId,
         );
       }
@@ -8221,11 +8046,11 @@ class StbDevice {
     }
     if (callback && typeof callback === "function") {
       callback();
-    } // for rapid response
+    }
   }
 
   // get display order
-  async getDisplayOrder(callback) {
+  getDisplayOrder(callback) {
     // fired when the user clicks away from the iOS Device TV Remote Control, regardless of which TV was selected
     // fired when the icon is clicked in the Home app and the Home app requests a refresh
 
@@ -8233,17 +8058,17 @@ class StbDevice {
     let dispOrder = this.televisionService.getCharacteristic(
       Characteristic.DisplayOrder,
     ).value;
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn("%s: getDisplayOrder returning '%s'", this.name, dispOrder);
     }
     callback(null, dispOrder);
   }
 
   // set display order
-  async setDisplayOrder(displayOrder, callback) {
+  setDisplayOrder(displayOrder, callback) {
     // fired when the user clicks away from the iOS Device TV Remote Control, regardless of which TV was selected
     // fired when the icon is clicked in the Home app and the Home app requests a refresh
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: setDisplayOrder displayOrder",
         this.name,
@@ -8254,40 +8079,40 @@ class StbDevice {
   }
 
   // get in use
-  async getInUse(callback) {
+  getInUse(callback) {
     // useful in Shortcuts and Automations
     // log the inUse value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getInUse returning %s [%s]",
         this.name,
         this.currentInUse,
-        Object.keys(Characteristic.InUse)[this.currentInUse + 1],
+        CHAR_NAMES.InUse[this.currentInUse + 1],
       );
     }
     callback(null, this.currentInUse);
   }
 
   // get program mode (recording scheduled, not scheduled)
-  async getProgramMode(callback) {
+  getProgramMode(callback) {
     // useful in Shortcuts and Automations
     // log the programMode value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getProgramMode returning %s [%s]",
         this.name,
         this.currentProgramMode,
-        Object.keys(Characteristic.ProgramMode)[this.currentProgramMode + 1],
+        CHAR_NAMES.ProgramMode[this.currentProgramMode + 1],
       );
     }
     callback(null, this.currentProgramMode);
   }
 
   // get StatusActive state
-  async getStatusActive(callback) {
+  getStatusActive(callback) {
     // useful in Shortcuts and Automations
     // log the StatusActive value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getStatusActive returning %s [%s]",
         this.name,
@@ -8299,57 +8124,53 @@ class StbDevice {
   }
 
   // get status fault
-  async getStatusFault(callback) {
+  getStatusFault(callback) {
     // useful in Shortcuts and Automations
     // log the StatusFault
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getStatusFault returning %s [%s]",
         this.name,
         this.currentStatusFault,
-        Object.keys(Characteristic.StatusFault)[this.currentStatusFault + 1],
+        CHAR_NAMES.StatusFault[this.currentStatusFault + 1],
       );
     }
     callback(null, this.currentStatusFault);
   }
 
   // get InputSourceType state
-  async getInputSourceType(callback) {
+  getInputSourceType(callback) {
     // useful in Shortcuts and Automations
     // log the InputSourceType value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getInputSourceType returning %s [%s]",
         this.name,
         this.currentInputSourceType,
-        Object.keys(Characteristic.InputSourceType)[
-          this.currentInputSourceType + 1
-        ],
+        CHAR_NAMES.InputSourceType[this.currentInputSourceType + 1],
       );
     }
     callback(null, this.currentInputSourceType);
   }
 
   // get InputDeviceType state
-  async getInputDeviceType(callback) {
+  getInputDeviceType(callback) {
     // useful in Shortcuts and Automations
     // log the InputDeviceType value
-    if (this.config.debugLevel > 1) {
+    if (this.debugLevel > 1) {
       this.log.warn(
         "%s: getInputDeviceType returning %s [%s]",
         this.name,
         this.currentInputDeviceType,
-        Object.keys(Characteristic.InputDeviceType)[
-          this.currentInputDeviceType + 1
-        ],
+        CHAR_NAMES.InputDeviceType[this.currentInputDeviceType + 1],
       );
     }
     callback(null, this.currentInputDeviceType);
   }
 
   // set remote key
-  async setRemoteKey(remoteKey, callback) {
-    if (this.config.debugLevel > 1) {
+  setRemoteKey(remoteKey, callback) {
+    if (this.debugLevel > 1) {
       this.log.warn("%s: setRemoteKey remoteKey:", this.name, remoteKey);
     }
     callback(null); // for rapid response
@@ -8378,13 +8199,7 @@ class StbDevice {
     //this.log.debug("%s: setRemoteKey: remoteKey %s, lastKeyPressTime %s",this.name, remoteKey, lastKeyPressTime);
 
     // get the config for this device
-    let configDevice;
-    if (this.config.devices) {
-      configDevice = this.config.devices.find(
-        (device) => device.deviceId === this.deviceId,
-      );
-    }
-
+    const configDevice = this._configDevice;
     const DEFAULT_DOUBLE_PRESS_DELAY_TIME = 300; // default, in case config missing
     const DEFAULT_TRIPLE_PRESS_DELAY_TIME = 800; // default, in case config missing