@24i/bigscreen-sdk 1.0.54-alpha.2836 → 2.1.1-alpha.2133

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

@@ -320,10 +320,6 @@ export const GUIDE = new Key({
     keyCode: 458,
 });
 
-export const SUBTITLES = new Key({
-    id: 'SUBTITLES',
-});
-
 // MARK: Xbox specials
 export const GAMEPAD_LEFT_THUMBSTICK_UP = new Key({
     id: 'GAMEPAD_LEFT_THUMBSTICK_UP',

package/packages/driver-base/src/KeyMap/interface.ts

@@ -4,5 +4,4 @@ export interface KeyConfig {
     code: string,
     alternativeKeyCodes: number[],
     alternativeCodes: string[],
-    key : string,
 }

package/packages/driver-base/src/KeyMap/overrideValues.ts

@@ -6,12 +6,11 @@ import * as KeyMap from './KeyMap';
 export const overrideValues = (map: Partial<Record<keyof KeycodeKeyMap, Partial<Key>>>) => {
     // @ts-ignore - map and KeyMap have same keys
     forEach(Object.entries(map), ([keyName, {
-        keyCode, code, alternativeKeyCodes, alternativeCodes, key,
+        keyCode, code, alternativeKeyCodes, alternativeCodes,
     }]: [keyof typeof import('./KeyMap'), Partial<Key>]) => {
         if (typeof keyCode === 'number') KeyMap[keyName].keyCode = keyCode;
         if (typeof code === 'string') KeyMap[keyName].code = code;
         if (alternativeKeyCodes) KeyMap[keyName].alternativeKeyCodes = alternativeKeyCodes;
         if (alternativeCodes) KeyMap[keyName].alternativeCodes = alternativeCodes;
-        if (key) KeyMap[keyName].key = key;
     });
 };

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

@@ -1,7 +1,6 @@
 import { DeviceBase as AbstractDeviceBase } from '../DeviceBase';
 import { ScreenSaverStatus } from '../types/ScreenSaverStatus';
 import { ConnectionType } from '../ConnectionType';
-import { IAPPurchaseProductData, IAPSuccessPayload } from '../types/InAppPurchase';
 
 export class DeviceBase extends AbstractDeviceBase {
     volume = 0;
@@ -54,17 +53,6 @@ export class DeviceBase extends AbstractDeviceBase {
         return this.getBaseUuid();
     }
 
-    async getOsLanguage() {
-        return '';
-    }
-
-    async getAdInfo() {
-        const adId = 'uuid';
-        const type = 'id type';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
     async getVolume() {
         return this.volume;
     }
@@ -109,16 +97,4 @@ export class DeviceBase extends AbstractDeviceBase {
     async getMacAddress() {
         return '00:11:22:33:44:55';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -38,5 +38,4 @@ export const KEYMAP = {
     KP_9: 105,
     CHANNEL_UP: 33,
     CHANNEL_DOWN: 34,
-    SUBTITLES: 83,
 };

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

@@ -5,9 +5,6 @@ export { VolumeRange } from './VolumeRange';
 export type { ScreenSize } from './ScreenSize';
 export type { KeycodeKeyMap } from './types/KeycodeKeyMap';
 export type { DeviceEventMap } from './types/DeviceEvent';
-export type {
-    IAPSuccessPayload, IAPErrorPayload, IAPPromiseResolve, IAPPromiseReject, IAPPurchaseProductData,
-} from './types/InAppPurchase';
 export type { ScreenSaverStatus } from './types/ScreenSaverStatus';
 export type { ExitOptions } from './types/ExitOptions';
 export * as KeyMap from './KeyMap';

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

@@ -1,11 +1,9 @@
 type NetworkChangeListener = (payload: { isConnected: boolean }) => void;
 type VisibilityChangeListener = (payload: { isVisible: boolean }) => void;
 type MouseActiveListener = (payload: { isMouseActive: boolean }) => void;
-type CCToggleListener = (payload: { isEnabled: boolean }) => void;
 
 export interface DeviceEventMap {
     'networkchange': NetworkChangeListener,
     'visibilitychange': VisibilityChangeListener,
     'mouseactive': MouseActiveListener,
-    'cctoggle': CCToggleListener,
 }

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

@@ -61,7 +61,6 @@ export type KeycodeKeyMap = {
     EXIT: number,
     INFO: number,
     GUIDE: number,
-    SUBTITLES: number,
 
     // Xbox specials
     GAMEPAD_LEFT_THUMBSTICK_UP: number,

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

@@ -1,10 +1,7 @@
 import {
     DeviceBase, ConnectionType, ScreenSaverStatus, VolumeRange,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } 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';
@@ -117,17 +114,6 @@ export class DeviceBrowser extends DeviceBase {
         return this.getBaseUuid();
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume() {
         return this.volume;
     }
@@ -181,16 +167,4 @@ export class DeviceBrowser extends DeviceBase {
         // for development purpose. Correctly, it should return '' for unknown MAC addr.
         return '00:00:00:00:00:00';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -9,14 +9,6 @@ export const getKeyMap = () => {
         VOL_UP: { code: 'KeyU', keyCode: 85 },
         VOL_DOWN: { code: 'KeyJ', keyCode: 74 },
         MUTE: { code: 'KeyM', keyCode: 77 },
-        PLAY: { code: 'KeyO', keyCode: 79 },
-        PAUSE: { code: 'KeyP', keyCode: 80 },
-        PLAYPAUSE: { code: 'Space', keyCode: 32 },
-        FF: { code: 'Period', keyCode: 190 },
-        REW: { code: 'Comma', keyCode: 188 },
-        STOP: { code: 'Escape', keyCode: 27 },
-        SUBTITLES: { code: 'KeyS', keyCode: 83 },
-        REC: { code: 'KeyI', keyCode: 73 },
     });
     return generateKeyCodeKeyMap();
 };

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

@@ -1,11 +1,4 @@
-import {
-    DeviceBase,
-    IAPPurchaseProductData,
-    IAPSuccessPayload,
-    ScreenSaverStatus,
-    VolumeRange,
-} from '@24i/bigscreen-sdk/driver-base';
-import { generateUuid } from '@24i/bigscreen-sdk/utils';
+import { DeviceBase, ScreenSaverStatus, VolumeRange } from '@24i/bigscreen-sdk/driver-base';
 import { getKeyMap } from './keymap';
 import { EntoneDeviceModelName } from './constants';
 import { IEntone, NetworkEvent } from './IEntone';
@@ -127,17 +120,6 @@ export class DeviceEntone extends DeviceBase {
         return '';
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume() {
         try {
             const { leftVolPercentage, rightVolPercentage } = ENTONE.stb.getAudioVolume();
@@ -247,16 +229,4 @@ export class DeviceEntone extends DeviceBase {
         }
         return macAddress || '';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -51,7 +51,6 @@ export function getKeyMap() {
         EXIT: { keyCode: EntoneInput.KEY_EXIT },
         INFO: { keyCode: EntoneInput.KEY_INFO },
         GUIDE: { keyCode: EntoneInput.KEY_GUIDE },
-        SUBTITLES: { keyCode: EntoneInput.KEY_SUBTITLE },
     });
     return KeyMap.generateKeyCodeKeyMap();
 }

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

@@ -1,9 +1,6 @@
 import {
     DeviceBase, ConnectionType, ScreenSaverStatus, loadObject, VolumeRange,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } 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';
@@ -248,17 +245,6 @@ export class DeviceHbbTV extends DeviceBase {
         return this.getBaseUuid();
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume() {
         // TODO: not yet implemented
         return VolumeRange.UNSUPPORTED;
@@ -324,16 +310,4 @@ export class DeviceHbbTV extends DeviceBase {
             console.warn('[HbbTV] Broadcast tune failed');
         }
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -3,10 +3,7 @@ import {
     ConnectionType,
     ScreenSaverStatus,
     VolumeRange,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } 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';
@@ -162,17 +159,6 @@ export class DeviceKreaTV extends DeviceBase {
         return '';
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     getSupportedAudioConnections() {
         const { audioOutputService } = this.toiInstance;
         const { ToiAudioOutputService } = this.toiInstance.consts;
@@ -282,16 +268,4 @@ export class DeviceKreaTV extends DeviceBase {
     async getMacAddress(): Promise<string> {
         return this.toiResolver.getMacAddress();
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -3,10 +3,7 @@ import {
     ConnectionType,
     ScreenSaverStatus,
     VolumeRange,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } 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';
@@ -84,17 +81,6 @@ export class DeviceSaphi extends DeviceBase {
         return this.getBaseUuid();
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume(): Promise<number> {
         return VolumeRange.UNSUPPORTED;
     }
@@ -155,16 +141,4 @@ export class DeviceSaphi extends DeviceBase {
         // not supported on Saphi platform
         return '';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -4,29 +4,20 @@ import {
     ScreenSaverStatus,
     VolumeRange,
     ExitOptions,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } from '@24i/bigscreen-sdk/driver-base';
 import { Storage } from '@24i/bigscreen-sdk/storage';
 import { runAsync } from '@24i/bigscreen-sdk/utils/timers';
-import { VendorType } from '@24i/smartapps-datalayer/api';
+import { TizenKeys } from './TizenKeys';
 import {
-    type Webapis,
-    BillingBuyData,
+    VENDOR,
     NetworkState,
     NetworkActiveConnectionType,
     AppCommonScreenSaverState,
-    CancelSubscriptionData,
-    CancelSubscriptionAPIResult,
-} from './IWebapis';
-import { Tizen, Application } from './ITizen';
-import { TizenKeys } from './TizenKeys';
-import {
-    VENDOR,
 } from './constants';
+import { IWebapis, ITizen, TizenApplication } from './types';
 
-declare const webapis: Webapis;
-declare const tizen: Tizen;
+declare const webapis: IWebapis;
+declare const tizen: ITizen;
 
 const isNetworkConnected = (state: NetworkState) => {
     switch (state) {
@@ -45,7 +36,7 @@ const isNetworkConnected = (state: NetworkState) => {
 export class DeviceTizen extends DeviceBase {
     // MARK: Properties
 
-    application: Application = tizen.application.getCurrentApplication();
+    application: TizenApplication = tizen.application.getCurrentApplication();
 
     keys: TizenKeys = new TizenKeys();
 
@@ -55,11 +46,6 @@ export class DeviceTizen extends DeviceBase {
 
     screenSaverStatus: AppCommonScreenSaverState = AppCommonScreenSaverState.SCREEN_SAVER_OFF;
 
-    subscriptionFeaturesConfiguration = {
-        purchase: true,
-        management: true,
-    };
-
     // MARK: Initialization
 
     async initDevice(): Promise<void> {
@@ -211,30 +197,6 @@ 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) {
-            latEnabled = true;
-            console.error('[DeviceTizen] Failed getAdInfo', e);
-        }
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return new Promise<string>((resolve) => {
-            tizen.systeminfo.getPropertyValue(
-                'LOCALE',
-                ({ language }) => resolve(language),
-                () => resolve(''),
-            );
-        });
-    }
-
     async getVolume() {
         try {
             const volume = tizen.tvaudiocontrol.getVolume();
@@ -284,7 +246,7 @@ export class DeviceTizen extends DeviceBase {
             ? AppCommonScreenSaverState.SCREEN_SAVER_ON
             : AppCommonScreenSaverState.SCREEN_SAVER_OFF;
         return new Promise((resolve) => {
-            webapis.appcommon.setScreenSaver(
+            webapis.appCommon.setScreenSaver(
                 status,
                 () => {
                     this.screenSaverStatus = status;
@@ -333,85 +295,4 @@ export class DeviceTizen extends DeviceBase {
     async getMacAddress() {
         return webapis.network.getMac();
     }
-
-    async purchaseProduct({
-        sku, product, appId,
-    }: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        return new Promise((resolve, reject) => {
-            if (!product || !appId) reject(new Error('Missing product or appId'));
-            const paymentDetails = {
-                OrderItemID: sku,
-                OrderTitle: product!.title,
-                OrderTotal: product!.price![0].amount,
-                OrderCurrencyID: product!.price![0].currency,
-                OrderCustomID: webapis.sso.getLoginUid(),
-            };
-            const onSuccess = (data: BillingBuyData) => {
-                try {
-                    if (data.payResult !== 'SUCCESS') throw new Error('Purchase failed');
-                    const countryCode = webapis.productinfo.getSystemConfig(
-                        webapis.productinfo.ProductInfoConfigKey.CONFIG_KEY_SERVICE_COUNTRY,
-                    );
-                    const detail = JSON.parse(data.payDetail);
-                    resolve({
-                        platform: VendorType.SAMSUNG,
-                        receiptPayload: {
-                            appId,
-                            samsungInvoiceId: detail.InvoiceID,
-                            samsungCustomId: paymentDetails.OrderCustomID,
-                            countryCode,
-                        },
-                    });
-                } catch (e) {
-                    reject(e);
-                }
-            };
-            webapis.billing.buyItem(
-                appId!, 'PRD', JSON.stringify(paymentDetails), onSuccess, reject,
-            );
-        });
-    }
-
-    async cancelSubscription(
-        { product, appId }: IAPPurchaseProductData,
-    ): Promise<void> {
-        return new Promise((resolve, reject) => {
-            if (!product || !appId) {
-                reject(new Error('Missing product or appId'));
-            }
-            const UID = webapis.sso.getLoginUid();
-            const countryCode = webapis.productinfo.getSystemConfig(
-                webapis.productinfo.ProductInfoConfigKey.CONFIG_KEY_SERVICE_COUNTRY,
-            );
-            try {
-                const vendorTransactionId = product?.vendorTransactionId;
-                if (!vendorTransactionId) {
-                    reject(new Error('Missing vendorTransactionId'));
-                }
-                const onSuccess = (data: CancelSubscriptionData) => {
-                    try {
-                        const result: CancelSubscriptionAPIResult = JSON.parse(data.apiResult);
-                        if (result.CPStatus === '100000') {
-                            resolve();
-                        } else {
-                            reject(new Error(`Cancel subscription failed: ${result.CPStatus}`));
-                        }
-                    } catch (e) {
-                        reject(e);
-                    }
-                };
-                webapis.billing.cancelSubscription(
-                    appId!,
-                    product!.vendorTransactionId!.toString(),
-                    UID,
-                    countryCode,
-                    'PRD',
-                    onSuccess,
-                    reject,
-                );
-            } catch (e) {
-                reject(e);
-            }
-        });
-    }
 }