@24i/bigscreen-sdk 1.0.50 → 1.0.51-alpha.2783

package/package.json

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

package/packages/driver-androidtv/src/DeviceAndroidTV.ts

@@ -4,6 +4,7 @@ import {
     ScreenSaverStatus,
     VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { IJavaScriptBridge, DeviceInfo } from './types';
 import { getFirmware } from './formatUserAgent';
 import { getKeyMap, AndroidKeyMap } from './keymap';
@@ -162,6 +163,13 @@ export class DeviceAndroidTV extends DeviceBase {
         return this.getBaseUuid();
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume(): Promise<number> {
         return VolumeRange.UNSUPPORTED;
     }

package/packages/driver-androidtv/src/__mocks__/javaScriptBridge.ts

@@ -13,6 +13,7 @@ export const mockJavaScriptBridge: IJavaScriptBridge = {
                 ipLocal: '127.0.0.1',
             })
         ),
+        bridgeJavaScriptToAndroid_GetMediaInfo: () => '{}',
         bridgeJavaScriptToAndroid_Back: () => {},
         bridgeJavaScriptToAndroid_StopVideo: () => {},
         bridgeJavaScriptToAndroid_FullScreenVideo: () => {},

package/packages/driver-androidtv/src/types.ts

@@ -7,6 +7,10 @@ interface JavaScriptBridge {
      * "ipLocal": "fe80::475:3045:2928:3a32%wlan0127.0.0.1", "appVersion": '0.0.1' }'
      */
     bridgeJavaScriptToAndroid_GetDeviceInfo: () => string,
+    /**
+     * It returns media info including statistics
+     */
+    bridgeJavaScriptToAndroid_GetMediaInfo: () => string;
     /**
      * It simulates a native Android back press.
      */

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

@@ -8,6 +8,7 @@ import { ScreenSize } from './ScreenSize';
 import { VolumeRange } from './VolumeRange';
 import { KeycodeKeyMap } from './types/KeycodeKeyMap';
 import { DeviceEventMap } from './types/DeviceEvent';
+import { AdInfo } from './types/AdInfo';
 import { ScreenSaverStatus } from './types/ScreenSaverStatus';
 import { ExitOptions } from './types/ExitOptions';
 import { inRange } from './utils';
@@ -152,6 +153,8 @@ export abstract class DeviceBase<
 
     abstract getUuid(): Promise<string>;
 
+    abstract getAdInfo(): Promise<AdInfo>;
+
     abstract getVolume(): Promise<number>;
 
     abstract setVolume(volumePercentage: number): Promise<void>;

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

@@ -53,6 +53,13 @@ export class DeviceBase extends AbstractDeviceBase {
         return this.getBaseUuid();
     }
 
+    async getAdInfo() {
+        const adId = 'uuid';
+        const type = 'id type';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         return this.volume;
     }

package/packages/driver-base/src/types/AdInfo.ts

@@ -0,0 +1,5 @@
+export type AdInfo = {
+    adId: string | null;
+    type: string;
+    latEnabled: boolean | null;
+};

package/packages/driver-browser/src/DeviceBrowser.ts

@@ -2,6 +2,7 @@ import {
     DeviceBase, ConnectionType, ScreenSaverStatus, VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
 import { runAsync } from '@24i/bigscreen-sdk/utils/timers';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { getKeyMap } from './keymap';
 import { patchSuitestKeys } from './patchSuitestKeys';
 import { getBrowser } from './getBrowser';
@@ -114,6 +115,13 @@ export class DeviceBrowser extends DeviceBase {
         return this.getBaseUuid();
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         return this.volume;
     }

package/packages/driver-entone/src/DeviceEntone.ts

@@ -1,4 +1,5 @@
 import { DeviceBase, ScreenSaverStatus, VolumeRange } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { getKeyMap } from './keymap';
 import { EntoneDeviceModelName } from './constants';
 import { IEntone, NetworkEvent } from './IEntone';
@@ -120,6 +121,13 @@ export class DeviceEntone extends DeviceBase {
         return '';
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         try {
             const { leftVolPercentage, rightVolPercentage } = ENTONE.stb.getAudioVolume();

package/packages/driver-firetv/src/__mocks__/javaScriptBridge.ts

@@ -13,6 +13,7 @@ export const mockJavaScriptBridge: IJavaScriptBridge = {
                 ipLocal: '127.0.0.1',
             })
         ),
+        bridgeJavaScriptToAndroid_GetMediaInfo: () => '{}',
         bridgeJavaScriptToAndroid_Back: () => {},
         bridgeJavaScriptToAndroid_StopVideo: () => {},
         bridgeJavaScriptToAndroid_FullScreenVideo: () => {},

package/packages/driver-hbbtv/src/DeviceHbbTV.ts

@@ -1,6 +1,7 @@
 import {
     DeviceBase, ConnectionType, ScreenSaverStatus, loadObject, VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { getKeyMap } from './keymap';
 import { getVersion } from './getVersion';
 import { getDeviceInfo } from './deviceInfo';
@@ -245,6 +246,13 @@ export class DeviceHbbTV extends DeviceBase {
         return this.getBaseUuid();
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         // TODO: not yet implemented
         return VolumeRange.UNSUPPORTED;

package/packages/driver-kreatv/src/DeviceKreaTV.ts

@@ -4,6 +4,7 @@ import {
     ScreenSaverStatus,
     VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { getKeyMap } from './keymap';
 import { toi2 } from './toi2';
 import { toi3 } from './toi3';
@@ -159,6 +160,13 @@ export class DeviceKreaTV extends DeviceBase {
         return '';
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     getSupportedAudioConnections() {
         const { audioOutputService } = this.toiInstance;
         const { ToiAudioOutputService } = this.toiInstance.consts;

package/packages/driver-saphi/src/DeviceSaphi.ts

@@ -4,6 +4,7 @@ import {
     ScreenSaverStatus,
     VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { getDeviceInfo, getFirmware, getPlatformInfo } from './formatUserAgent';
 import { ISmartTvAApi } from './types';
 import { getKeyMap } from './keymap';
@@ -81,6 +82,13 @@ export class DeviceSaphi extends DeviceBase {
         return this.getBaseUuid();
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume(): Promise<number> {
         return VolumeRange.UNSUPPORTED;
     }

package/packages/driver-smartcast/src/DeviceSmartCast.ts

@@ -265,6 +265,13 @@ export class DeviceSmartCast extends DeviceBase {
         return this.deviceId;
     }
 
+    async getAdInfo() {
+        const adId = this.IFA?.IFA ?? null;
+        const type = this.IFA?.IFA_TYPE ?? 'vida';
+        const latEnabled = this.IFA?.LMT ?? true;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         return VolumeRange.UNSUPPORTED;
     }

package/packages/driver-tizen/src/DeviceTizen.ts

@@ -197,6 +197,19 @@ export class DeviceTizen extends DeviceBase {
         return '';
     }
 
+    async getAdInfo() {
+        let adId = null;
+        let latEnabled = null;
+        const type = 'tifa';
+        try {
+            adId = webapis.adinfo.getTIFA() ?? null;
+            latEnabled = webapis.adinfo.isLATEnabled() ?? true;
+        } catch (e) {
+            console.error('[DeviceTizen] Failed getAdInfo', e);
+        }
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         try {
             const volume = tizen.tvaudiocontrol.getVolume();

package/packages/driver-tizen/src/IWebapis.ts

@@ -88,8 +88,15 @@ export type AppCommon = {
     ) => void,
 };
 
+export type AdInfo = {
+    getVersion: () => string,
+    getTIFA: () => string,
+    isLATEnabled: () => boolean,
+};
+
 export interface IWebapis {
     productinfo: ProductInfo,
     network: Network,
     appCommon: AppCommon,
+    adinfo: AdInfo,
 }

package/packages/driver-tizen/src/__mocks__/tizen.ts

@@ -8,6 +8,10 @@ export const webapis = {
         getModelCode: () => 'model code',
         getFirmware: () => 'firmware',
     },
+    adinfo: {
+        getTIFA: () => 'adid',
+        isLATEnabled: () => true,
+    },
 };
 
 export const application = {

package/packages/driver-vidaa/src/DeviceVidaa.ts

@@ -4,6 +4,7 @@ import {
     ScreenSaverStatus,
     VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
+import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { NetworkConnectionTypeMap } from './constants';
 import { getPlatformInfo } from './formatUserAgent';
 import { HisenseVidaaApi } from './types';
@@ -80,6 +81,13 @@ export class DeviceVidaa extends DeviceBase {
         return window.Hisense_GetDeviceID() || '';
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume(): Promise<number> {
         return VolumeRange.UNSUPPORTED;
     }

package/packages/driver-webos/src/DeviceWebos.ts

@@ -245,6 +245,13 @@ export class DeviceWebos extends DeviceBase {
         return this.duid!;
     }
 
+    async getAdInfo() {
+        const adId = await this.getLgDeviceId() ?? null;
+        const type = 'lgudid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         // TODO: not yet implemented
         return VolumeRange.UNSUPPORTED;

package/packages/driver-xbox/src/DeviceXbox.ts

@@ -152,6 +152,13 @@ export class DeviceXbox extends DeviceBase {
         return uuid;
     }
 
+    async getAdInfo() {
+        const adId = generateUuid();
+        const type = 'sessionid';
+        const latEnabled = null;
+        return { adId, type, latEnabled };
+    }
+
     async getVolume() {
         return VolumeRange.UNSUPPORTED;
     }

package/packages/router/src/utils.ts

@@ -7,7 +7,7 @@ export const isPathVisible = (hash: string, regexpPath?: RegExp) => (
 export const getCurrentHash = () => window.location.href.split('#')[1] || '';
 
 // eslint-disable-next-line no-useless-escape
-const PARAM_REGEX = /([a-zA-Z0-9+\-=.:%_()\[\]{}]+)/;
+const PARAM_REGEX = /([^/]+)/;
 export const PARAM_REGEX_STR = PARAM_REGEX.source;
 
 export const pathToRegExp = (path: string) => {