Clean up imports and remove globalThis Hack (#55)

* Only import Transport when needed
* Add Browser.js for Jest
* Add isSynchronousMethod
* include /test with npm artifacts
* adding node fetch
* Removing global.mjs

Author: jlacivita

.npmignore

@@ -1,5 +1,4 @@
 build/*
-test/*
 node_modules/*
 .DS_Store
 merge-script-control-flow.svg

package-lock.json

@@ -46,6 +46,7 @@
     "fs-extra": "^10.1.0",
     "highland": "^2.13.5",
     "mkdirp": "^0.5.6",
+    "node-fetch": "^3.2.10",
     "nopt": "^5.0.0",
     "util": "^0.12.4"
   }

package.json

@@ -16,8 +16,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { default as win } from '../Transport/global.mjs'
-
 let listener
 export const setMockListener = func => { listener = func }
 
@@ -28,8 +26,8 @@ const eventMap = {}
 let callback
 let testHarness
 
-if (win.__firebolt && win.__firebolt.testHarness) {
-  testHarness = win.__firebolt.testHarness
+if (window.__firebolt && window.__firebolt.testHarness) {
+  testHarness = window.__firebolt.testHarness
 }
 
 function send(message) {

src/js/shared/Transport/MockTransport.mjs

@@ -20,7 +20,6 @@ import mock from './MockTransport.mjs'
 import Queue from './queue.mjs'
 import Settings, { initSettings } from '../Settings/index.mjs'
 import LegacyTransport from './LegacyTransport.mjs'
-import win from '../Transport/global.mjs'
 import WebsocketTransport from './WebsocketTransport.mjs'
 
 const LEGACY_TRANSPORT_SERVICE_NAME = 'com.comcast.BridgeObject_1'
@@ -51,8 +50,8 @@ export default class Transport {
   }
 
   _endpoint () {
-    if (win.__firebolt && win.__firebolt.endpoint) {
-      return win.__firebolt.endpoint
+    if (window.__firebolt && window.__firebolt.endpoint) {
+      return window.__firebolt.endpoint
     }
     return null
   }
@@ -64,14 +63,14 @@ export default class Transport {
       transport = new WebsocketTransport(endpoint)
       transport.receive(this.receiveHandler.bind(this))
     } else if (
-      typeof win.ServiceManager !== 'undefined' &&
-      win.ServiceManager &&
-      win.ServiceManager.version
+      typeof window.ServiceManager !== 'undefined' &&
+      window.ServiceManager &&
+      window.ServiceManager.version
     ) {
       // Wire up the queue
       transport = this._queue
       // get the default bridge service, and flush the queue
-      win.ServiceManager.getServiceForJavaScript(LEGACY_TRANSPORT_SERVICE_NAME, service => {
+      window.ServiceManager.getServiceForJavaScript(LEGACY_TRANSPORT_SERVICE_NAME, service => {
         if (LegacyTransport.isLegacy(service)) {
           transport = new LegacyTransport(service)
         } else {
@@ -191,20 +190,20 @@ export default class Transport {
    */
   static get () {
     /** Set up singleton and initialize it */
-    win.__firebolt = win.__firebolt || {}
-    if ((win.__firebolt.transport == null) && (moduleInstance == null)) {
+    window.__firebolt = window.__firebolt || {}
+    if ((window.__firebolt.transport == null) && (moduleInstance == null)) {
       const transport = new Transport()
       transport.init()
       if (transport.isMock) {
         /** We should use the mock transport built with the SDK, not a global */
         moduleInstance = transport
       } else {
-        win.__firebolt = win.__firebolt || {}
-        win.__firebolt.transport = transport
+        window.__firebolt = window.__firebolt || {}
+        window.__firebolt.transport = transport
       }
-      win.__firebolt.setTransportLayer = transport.setTransportLayer.bind(transport)
+      window.__firebolt.setTransportLayer = transport.setTransportLayer.bind(transport)
     }
-    return win.__firebolt.transport ? win.__firebolt.transport : moduleInstance
+    return window.__firebolt.transport ? window.__firebolt.transport : moduleInstance
   }
 
   receiveHandler (message) {
@@ -236,20 +235,20 @@ export default class Transport {
   init () {
     initSettings({}, { log: true })
     this._queue.receive(this.receiveHandler.bind(this))
-    if (win.__firebolt) {
-      if (win.__firebolt.mockTransportLayer === true) {
+    if (window.__firebolt) {
+      if (window.__firebolt.mockTransportLayer === true) {
         this.isMock = true
         this.setTransportLayer(mock)
-      } else if (win.__firebolt.getTransportLayer) {
-        this.setTransportLayer(win.__firebolt.getTransportLayer())
+      } else if (window.__firebolt.getTransportLayer) {
+        this.setTransportLayer(window.__firebolt.getTransportLayer())
       }
     }
     if (this._transport == null) {
       this._transport = this.constructTransportLayer()
     }
   }
 }
-win.__firebolt = win.__firebolt || {}
-win.__firebolt.setTransportLayer = transport => {
+window.__firebolt = window.__firebolt || {}
+window.__firebolt.setTransportLayer = transport => {
   Transport.get().setTransportLayer(transport)
 }

src/js/shared/Transport/global.mjs

@@ -16,7 +16,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Transport from '../Transport/index.mjs'
 /* ${IMPORTS} */
 
 /* ${INITIALIZATION} */