@24i/bigscreen-sdk 1.0.34-alpha.2568 → 1.0.34-alpha.2570

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.34-alpha.2568",
+    "version": "1.0.34-alpha.2570",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {

package/packages/driver-base/src/DeviceBase.ts

@@ -18,10 +18,8 @@ import { LEFT, RIGHT, UP, DOWN, ENTER, BACK, ESC } from './KeyMap';
 export const STORAGE_UUID_KEY = '__UUID__';
 
 const DEFAULT_POLLING_INTERVAL = 15000;
-const DEFAULT_POLLING_TIMEOUT = 10000;
-const SUCCESS_STATUS_CODE = 200;
 
-const CHECK_STATE_URL = 'https://8.8.8.8/';
+const CHECKED_URL = 'http://www.google-analytics.com/__utm.gif';
 
 export abstract class DeviceBase<
     CustomEventMap extends EventMapType = {},
@@ -50,8 +48,6 @@ export abstract class DeviceBase<
 
     pollingInterval: number = DEFAULT_POLLING_INTERVAL;
 
-    pollingTimeout: number = DEFAULT_POLLING_TIMEOUT;
-
     // MARK: Initialization
 
     /**
@@ -84,27 +80,25 @@ export abstract class DeviceBase<
     }
 
     doOnlineCheck = () => {
-        const http = new XMLHttpRequest();
-        http.open('HEAD', `${CHECK_STATE_URL}?param=${Date.now()}`);
-        http.timeout = this.pollingTimeout || DEFAULT_POLLING_TIMEOUT;
-        http.onreadystatechange = () => {
-            const isConnected = http.status === SUCCESS_STATUS_CODE;
-            if (http.readyState === XMLHttpRequest.DONE) {
-                this.triggerEvent('networkchange',
-                    { isConnected } as any);
-            }
-        };
-        http.ontimeout = () => {
-            this.triggerEvent('networkchange',
-                { isConnected: false } as any);
-        };
-        http.send();
+        const tester = new Image();
+        tester.onload = this.connectionFound;
+        tester.onerror = this.connectionNotFound;
+        tester.src = `${CHECKED_URL}?ts=${Date.now()}`;
+    };
+
+    connectionFound = () => {
+        this.triggerEvent('networkchange',
+            { isConnected: true } as any);
+    };
+
+    connectionNotFound = () => {
+        this.triggerEvent('networkchange',
+            { isConnected: false } as any);
     };
 
     checkNetworkConnection() {
         const networkConfig: any = config.get('network.checkConnection');
         this.pollingInterval = Number(networkConfig?.pollingInterval);
-        this.pollingTimeout = Number(networkConfig?.pollingTimeout);
         window.setInterval(
             this.doOnlineCheck,
             this.pollingInterval || DEFAULT_POLLING_INTERVAL,