Merge pull request #6 from rdkcentral/dev/thunder-token-fixes

- Move to window.thunder or options.thunder for token usage.

.eslintrc.js

@@ -41,6 +41,6 @@ module.exports = {
     sourceType: "module",
   },
   globals: {
-    globalThis: true,
+    window: true,
   }
 }

module/thunderJS.js

@@ -256,25 +256,15 @@ const unregister = function(plugin, event) {
   }
 };
 
-(function (Object) {
-  typeof globalThis !== 'object' && (
-    this ?
-      get() :
-      (Object.defineProperty(Object.prototype, '_T_', {
-        configurable: true,
-        get: get
-      }), _T_)
-  );
-  function get() {
-    this.globalThis = this;
-    delete Object.prototype._T_;
-  }
-}(Object));
-
 let api;
 var thunderJS = options => {
-  if (globalThis.thunder && typeof globalThis.thunder.token === 'function') {
-    options.token = globalThis.thunder.token();
+  if (
+    options.token === undefined &&
+    typeof window !== 'undefined' &&
+    window.thunder &&
+    typeof window.thunder.token === 'function'
+  ) {
+    options.token = window.thunder.token();
   }
   api = API(options);
   return wrapper({ ...thunder(options), ...plugins })

package.json

@@ -4,7 +4,7 @@
     "Metrological, Wouter <[email protected]>"
   ],
   "name": "ThunderJS",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "license": "apache",
   "browser": "dist/thunderJS.js",
   "main": "src/thunderJS.js",
@@ -60,7 +60,6 @@
     "tape": "^4.13.2"
   },
   "dependencies": {
-    "@ungap/global-this": "^0.3.1",
     "ws": "^7.2.3"
   }
 }

src/thunderJS.js

@@ -20,14 +20,18 @@
 import API from './api'
 import plugins from './plugins/index'
 import listener from './listener'
-import '@ungap/global-this'
 
 let api
 
 export default options => {
   // add extra option with token when thunder.token() is available
-  if (globalThis.thunder && typeof globalThis.thunder.token === 'function') {
-    options.token = globalThis.thunder.token()
+  if (
+    options.token === undefined &&
+    typeof window !== 'undefined' &&
+    window.thunder &&
+    typeof window.thunder.token === 'function'
+  ) {
+    options.token = window.thunder.token()
   }
 
   api = API(options)

tests/thunderJS.api.spec.js

@@ -26,12 +26,19 @@ import * as ws from 'ws'
 
 let wsStub
 
-test('Setup - thunderJS - api', assert => {
-  wsStub = sinon.stub(ws, 'default').callsFake(address => {
-    return {
+const makeWsStub = () => {
+  return sinon.stub(ws, 'default').callsFake(address => {
+    const websocket = {
       addEventListener() {},
+      readyState: 1,
     }
+
+    return websocket
   })
+}
+
+test('Setup - thunderJS - api', assert => {
+  wsStub = makeWsStub()
 
   assert.end()
 })
@@ -68,11 +75,10 @@ test('makeWebsocketAddress - unit test', assert => {
   assert.end()
 })
 
-test('thunderJS - api - custom websocket connection', assert => {
-  wsStub.resetHistory()
-
+test('thunderJS - api - window.thunder.token() websocket connection', assert => {
   // make thunder.token() available
-  globalThis.thunder = {
+  global.window = {}
+  window.thunder = {
     token() {
       return 'thundertoken123'
     },
@@ -94,6 +100,28 @@ test('thunderJS - api - custom websocket connection', assert => {
     'Websocket with default custom address should be initiated'
   )
 
+  delete global.window
+  assert.end()
+})
+
+test('thunderJS - api - options.token websocket connection', assert => {
+  const options = {
+    host: '192.168.1.100',
+    port: 2020,
+    endpoint: '/api',
+    protocol: 'wss://',
+    token: 'thundertoken123',
+  }
+  let thunderJS = ThunderJS(options)
+
+  // make a call, to initiate a (stubbed) websocket connection
+  thunderJS.DeviceInfo.systeminfo()
+
+  assert.ok(
+    wsStub.calledWith('wss://192.168.1.100:2020/api?token=thundertoken123'),
+    'Websocket with default custom address should be initiated'
+  )
+
   assert.end()
 })