RDKEAPPRT-886: clean-up - remove RDKShell, Alexa, plugin based app state logics, legacy Network & WiFi plugin dependencies

accelerator-home-ui/package.json

@@ -2,8 +2,6 @@
   "name": "accelerator-home-ui",
   "description": "accelerator-home-ui",
   "dependencies": {
-    "@firebolt-js/sdk": "0.15.0",
-    "@firebolt-js/manage-sdk": "1.1.0",
     "@hendt/xml2json": "^1.0.3",
     "@lightningjs/sdk": "^4.8.1",
     "@lightningjs/ui": "^1.3.7",
@@ -25,7 +23,7 @@
   "devDependencies": {
     "@babel/core": "^7.21.5",
     "babel-eslint": "^10.0.3",
-    "esbuild": "^0.17.18",
+    "esbuild": "^0.28.1",
     "eslint": "^8.39.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",

accelerator-home-ui/settings.json

@@ -7,7 +7,7 @@
     "debug": false
   },
   "platformSettings": {
-    "id": "UIv3",
+    "id": "UIv6",
     "inspector": false,
     "path": "./static",
     "log": true,

accelerator-home-ui/src/AppController.js

@@ -66,6 +66,7 @@ export default class AppController {
 
   async init() {
     const mainAppId = GLOBALS.selfclientAppName;
+    this.LOG('Initializing AppController for mainAppId:', mainAppId);
     let mainClientId;
 
     try {
@@ -92,6 +93,7 @@ export default class AppController {
       this.LOG('selfClientId:', GLOBALS.selfClientId);
 
       try {
+        this.LOG('Adding key intercepts for mainClientId:' + JSON.stringify(this.mainClientId));
         await keyIntercept(this.mainClientId);
       } catch (err) {
         this.WARN(new ThunderError("RDKWindowManager.addKeyIntercepts()", err).toString());

accelerator-home-ui/src/Config/Config.js

@@ -60,7 +60,6 @@ export var CONFIG = {
     versions: {
       default: 1,
       ControlSettings: 2,
-      'org.rdk.UsbAccess': 2,
       'org.rdk.DisplaySettings': 2,
     }
   }
@@ -79,23 +78,31 @@ export const GLOBALS = {
   _Miracastclientdevicedetails:{mac: null,name: null,reason_code: null,state:null},
   _previousapp_onActiveSourceStatusUpdated:null,
   _previousapp_onDisplayConnectionChanged:null,
-  _constantselfClientName: window.__firebolt && window.__firebolt.endpoint !== undefined ? "FireboltMainApp-refui" : "ResidentApp",
-  _selfclientId: window.__firebolt && window.__firebolt.endpoint !== undefined ? "FireboltMainApp-refui" : null,
   _LocalDeviceDiscoveryStatus:false,
   _EnergySaverMode:false,
+  _selfclientAppName: 'com.rdkcentral.refui',
+  _selfClientId: null,
+  set selfclientAppName(name)
+  {
+    this._selfclientAppName = name
+  },
+  get selfclientAppName()
+  {
+    return this._selfclientAppName
+  },
   get selfClientName() {
-    return this._constantselfClientName;
+    return this._selfclientAppName;
   },
   set selfClientName(value) {
-    this._constantselfClientName = value;
+    this._selfclientAppName = value;
   },
   get selfClientId() {
-    return this._selfclientId;
+    return this._selfClientId;
   },
   set selfClientId(value) {
-   this._selfclientId = value;
+    this._selfClientId = value;
   },
-  _currentTopMostApp: localStorage.getItem('topmostApp') || (window.__firebolt && window.__firebolt.endpoint !== undefined ? "FireboltMainApp-refui" : "ResidentApp"),
+  _currentTopMostApp: localStorage.getItem('topmostApp') || 'com.rdkcentral.refui',
   get topmostApp() {
     return this._currentTopMostApp;
   },
@@ -221,14 +228,5 @@ export const GLOBALS = {
   get refreshMyApps()
   {
     return this._refreshMyApps
-  },
-  _selfclientAppName: 'com.rdkcentral.refui',
-  set selfclientAppName(name)
-  {
-    this._selfclientAppName = name
-  },
-  get selfclientAppName()
-  {
-    return this._selfclientAppName
   }
 }

accelerator-home-ui/src/MediaPlayer/AAMPVideoPlayer.js

@@ -20,7 +20,6 @@ import { Lightning, Router } from '@lightningjs/sdk'
 import LightningPlayerControls from './LightningPlayerControl';
 import { CONFIG } from '../Config/Config';
 import ChannelOverlay from './ChannelOverlay';
-import {Metrics} from'@firebolt-js/sdk'
 
 let player = null
 let position = null
@@ -65,7 +64,6 @@ export default class AAMPVideoPlayer extends Lightning.Component {
       this.setVideoRect(0, 0, 1920, 1080)
     } catch (error) {
       this.ERR('Playback Failed ' + JSON.stringify(error))
-      Metrics.error(Metrics.ErrorType.MEDIA,"PlaybackError", "Playback Failed"+JSON.stringify(error), false, null)
     }
   }
 
@@ -288,7 +286,6 @@ export default class AAMPVideoPlayer extends Lightning.Component {
       this.playerState = this.playerStatesEnum.idle
     } catch (error) {
       this.ERR('AAMPMediaPlayer is not defined ' + JSON.stringify(error))
-      Metrics.error(Metrics.ErrorType.MEDIA,"PlaybackError", "AAMPMediaPlayer is not defined" +JSON.stringify(error), false, null)
     }
   }
 
@@ -348,7 +345,6 @@ export default class AAMPVideoPlayer extends Lightning.Component {
       this.setVideoRect(0, 0, 1920, 1080)
     } catch (error) {
       this.ERR('Playback Failed ' + JSON.stringify(error))
-      Metrics.error(Metrics.ErrorType.MEDIA,"PlaybackError", "Playback Failed "+JSON.stringify(error), false, null)
     }
   }
 
@@ -379,7 +375,6 @@ export default class AAMPVideoPlayer extends Lightning.Component {
         this.setVideoRect(0, 0, 1920, 1080)
       } catch (error) {
         this.ERR('Playback Failed ' + JSON.stringify(error))
-        Metrics.error(Metrics.ErrorType.MEDIA,"PlaybackError", 'Playback Failed ' + JSON.stringify(error), false, null)
       }
     }
   }
@@ -399,7 +394,6 @@ export default class AAMPVideoPlayer extends Lightning.Component {
         this.setVideoRect(0, 0, 1920, 1080)
       } catch (error) {
         this.ERR('Playback Failed ' + JSON.stringify(error))
-        Metrics.error(Metrics.ErrorType.MEDIA,"PlaybackError", 'Playback Failed '+JSON.stringify(error), false, null)
       }
     }
   }

accelerator-home-ui/src/MediaPlayer/ChannelOverlay.js

@@ -156,15 +156,8 @@ export default class ChannelOverlay extends Lightning.Component {
     let focusedChannelIdx = this.tag("Channels").index;
     let channel = this.options[focusedChannelIdx];
     if (channel.dvburi === "OTT") {
-      let params = {
-        launchLocation: "epgScreen",
-        url: channel.url
-      }
-      this.appApi.launchApp(channel.callsign, params).then(() => {
-        this.dtvApi.exitChannel()
-      }).catch(() => {
-        this.dtvApi.exitChannel() //to exit previous channel regardless the app launch succeeds or fails
-      })
+      // FIXME: Implement DVB OTT channel launch logic here.
+      this.WARN("DVB OTT channel launch not implemented.");
     } else if (channel.dvburi.startsWith("C_")) {
       if (!Router.isNavigating()) {
         let playerParams = {