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

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "cSpell.words": [
+        "MEDIAPAYLOAD",
+        "Tealium"
+    ]
+}

package/README.md

@@ -6,8 +6,9 @@ sidebar_label: README
 ---
 
 # SmartApps BIGscreen SDK
-[![Build Status](https://github.com/24i/smartapps-bigscreen-sdk/actions/workflows/pull-request.yml/badge.svg)](https://github.com/24i/smartapps-bigscreen-sdk/actions/workflows/pull-request.yml)
-[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=24i_smartapps-bigscreen-sdk&metric=coverage&token=3d35c42d12a876ed9fde3dd5adba282b14656069)](https://sonarcloud.io/summary/new_code?id=24i_smartapps-bigscreen-sdk)
+
+[![Build Status](https://travis-ci.com/24i/smartapps-bigscreen-sdk.svg?token=TvpGGSB2Z1L12QwPagEp&branch=development)](https://travis-ci.com/24i/smartapps-bigscreen-sdk)
+[![Coverage Status](https://coveralls.io/repos/github/24i/smartapps-bigscreen-sdk/badge.svg?branch=development&t=8n9LTd&kill_cache=1)](https://coveralls.io/github/24i/smartapps-bigscreen-sdk?branch=development)
 
 * [GitHub](https://github.com/24i/smartapps-bigscreen-sdk)
 * [Confluence](https://24imedia.atlassian.net/wiki/spaces/PRDNGBIGSCR/overview)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.54-alpha.2836",
+    "version": "1.1.0",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {
@@ -38,11 +38,11 @@
     },
     "homepage": "https://github.com/24i/smartapps-bigscreen-sdk#readme",
     "dependencies": {
-        "@24i/appstage-shared-analytics": "1.0.24",
+        "@24i/appstage-shared-analytics": "1.0.20-alpha.72",
         "@24i/appstage-shared-events-manager": "1.0.11",
         "@24i/appstage-shared-perf-utils": "1.0.11",
-        "@24i/bigscreen-players-engine-base": "4.1.0",
-        "@24i/smartapps-datalayer": "3.0.24",
+        "@24i/bigscreen-players-engine-base": "4.0.8",
+        "@24i/smartapps-datalayer": "3.0.15",
         "@sentry/browser": "7.35.0",
         "@sentry/types": "7.35.0",
         "csstype": "^3.1.3",
@@ -54,14 +54,14 @@
         "@24i/bigscreen-sdk": "file:.",
         "@24i/eslint-config-smartapps-bigscreen-linters": "file:./libs/linters",
         "@24i/smartapps-bigscreen-changelog-generator": "0.17.0",
-        "@babel/core": "^7.24.6",
-        "@babel/preset-env": "^7.24.6",
+        "@babel/core": "^7.24.5",
+        "@babel/preset-env": "^7.24.5",
         "@types/fs-extra": "^11.0.4",
         "@types/gtag.js": "^0.0.19",
         "@types/inquirer": "^9.0.7",
         "@types/jest": "^29.5.12",
         "@types/minimist": "^1.2.5",
-        "@types/node": "^20.13.0",
+        "@types/node": "^20.12.7",
         "@types/prop-types": "^15.7.12",
         "@types/react": "18.0.33",
         "@types/scheduler": "^0.23.0",
@@ -72,16 +72,16 @@
         "fs-extra": "^11.2.0",
         "full-icu": "^1.5.0",
         "identity-obj-proxy": "^3.0.0",
-        "inquirer": "^9.2.23",
+        "inquirer": "^9.2.20",
         "jest": "^29.7.0",
         "jest-canvas-mock": "^2.5.2",
         "jest-environment-jsdom": "^29.7.0",
         "jest-sonar": "^0.2.15",
         "minimist": "^1.2.8",
         "patch-package": "^8.0.0",
-        "sass": "^1.77.4",
+        "sass": "^1.76.0",
         "sass-true": "^8.0.0",
-        "ts-jest": "^29.1.4",
+        "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths-jest": "0.0.1",
         "typescript": "^5.4.5"

package/packages/analytics/src/clients/GoogleAnalytics/GoogleAnalytics.ts

@@ -5,7 +5,7 @@ import { createTimeout } from '@24i/bigscreen-sdk/utils/timers';
 import { MINUTE_IN_MS } from '@24i/bigscreen-sdk/utils/timeConstants';
 import { generateUuid } from '@24i/bigscreen-sdk/utils/generateUuid';
 import { i18n } from '@24i/bigscreen-sdk/i18n';
-import type { AnalyticsClient, AnalyticsEventsMap, AnyPayload } from '../../interface';
+import type { AnalyticsClient, AnalyticsEventsMap, SceneInfo } from '../../interface';
 import { mapEventParamsToUrlParams, mapPayload } from './mapPayload';
 import { prepareBody } from './prepareBody';
 import { getUrl } from './getUrl';
@@ -74,7 +74,7 @@ export class GoogleAnalytics implements AnalyticsClient {
             params.cid = generateUuid();
             await Storage.setItem(GA_CLIENT_ID, params.cid);
         }
-        this.firstVisit = !(await Storage.getItem(GA_FIRST_VISIT));
+        this.firstVisit = !(await Storage.getItem(GA_FIRST_VISIT)) ?? true;
         if (this.firstVisit) {
             await Storage.setItem(GA_FIRST_VISIT, '0');
         }
@@ -123,10 +123,18 @@ export class GoogleAnalytics implements AnalyticsClient {
         this.lastOnEvent = now;
         await Promise.all(events.map(async (event, index) => {
             const sessionInfo = await this.getSessionInfo(
-                payload!, index === 0 ? engagementTime : undefined,
+                index === 0 ? engagementTime : undefined,
             );
-            const gtagPayload = mapPayload(event, triggerName, { ...payload, ...sessionInfo });
-            const urlParams = mapEventParamsToUrlParams({ ...sessionInfo, ...payload });
+            const gtagPayload = mapPayload(
+                event, triggerName, {
+                    ...payload,
+                    ...sessionInfo,
+                },
+            );
+            const urlParams = mapEventParamsToUrlParams({
+                ...sessionInfo as SessionInfo,
+                ...payload as SceneInfo,
+            });
             this.send(event, gtagPayload, urlParams);
         }));
     }
@@ -169,10 +177,7 @@ export class GoogleAnalytics implements AnalyticsClient {
 
     private sendQueueWithDelay = debounce(this.sendQueue, SEND_DEBOUNCE_MS);
 
-    private async getSessionInfo(
-        payload: AnyPayload,
-        engagementTime: number | undefined,
-    ): Promise<SessionInfo> {
+    private async getSessionInfo(engagementTime: number | undefined): Promise<SessionInfo> {
         const sessionStarted = !this.sessionStartSent;
         this.sessionStartSent = true;
         const { firstEvent } = this;
@@ -189,7 +194,6 @@ export class GoogleAnalytics implements AnalyticsClient {
             sessionStarted,
             engagementTime,
             firstEvent,
-            isAuthenticated: payload?.userId ? '1' : '0',
             firstVisit: firstVisit as boolean,
         };
     }

package/packages/analytics/src/clients/GoogleAnalytics/constants.ts

@@ -31,12 +31,8 @@ export const GOOGLE_ANALYTICS_TRIGGERS = [
     AnalyticsTriggers.SEARCH,
     AnalyticsTriggers.RATE_CONTENT,
     // ads triggers
-    AnalyticsTriggers.AD_BUFFERING,
-    AnalyticsTriggers.AD_COMPLETE,
-    AnalyticsTriggers.AD_ERROR,
+    AnalyticsTriggers.AD_LOADED,
     AnalyticsTriggers.AD_SKIPPED,
-    AnalyticsTriggers.AD_START,
-    AnalyticsTriggers.AD_STOP,
     // user triggers
     AnalyticsTriggers.LOGIN,
     AnalyticsTriggers.LOGOUT,
@@ -91,12 +87,8 @@ export const TRIGGER_NAME_TO_GA_EVENTS: Record<
     [AnalyticsTriggers.RATE_CONTENT]: ['rate_content'],
 
     // ads triggers
-    [AnalyticsTriggers.AD_BUFFERING]: ['ad_buffering'],
-    [AnalyticsTriggers.AD_COMPLETE]: ['ad_complete'],
-    [AnalyticsTriggers.AD_ERROR]: ['ad_error'],
+    [AnalyticsTriggers.AD_LOADED]: ['ad_loaded'],
     [AnalyticsTriggers.AD_SKIPPED]: ['ad_skipped'],
-    [AnalyticsTriggers.AD_START]: ['ad_start'],
-    [AnalyticsTriggers.AD_STOP]: ['ad_stop'],
 
     // user triggers
     [AnalyticsTriggers.LOGIN]: ['login'],

package/packages/analytics/src/clients/GoogleAnalytics/interface.ts

@@ -17,12 +17,8 @@ export type GAEventsNames = (
     | 'favorite_add' // When a user add asset to favorites
     | 'favorite_remove' // When a user remove asset froms favorites
     | 'user_engagement' // Periodically, while the app is in the foreground
-    | 'ad_buffering' // When advertisement is buffering
-    | 'ad_complete' // When advertisement has been completed
-    | 'ad_error' // When advertisement has an error
+    | 'ad_loaded' // When advertisement has been loaded
     | 'ad_skipped' // When user skipped current advertisement
-    | 'ad_start' // When advertisement has been started
-    | 'ad_stop' // When advertisement has been stopped
     | 'app_exception' // When application throws an error
     | 'rate_content' // When user rates an asset
 );
@@ -42,7 +38,6 @@ export type SessionInfo = {
     referrer: string,
     engagementTime: number | undefined,
     sessionStarted: boolean,
-    isAuthenticated: '0' | '1',
     firstEvent: boolean,
     firstVisit: boolean,
 };

package/packages/analytics/src/clients/GoogleAnalytics/mapPayload.ts

@@ -8,7 +8,6 @@ const map: Record<string, string> = {
     referrer: 'dr',
     sceneId: 'dl',
     sceneName: 'dt',
-    isAuthenticated: 'up.is_authenticated',
 };
 
 export const mapEventParamsToUrlParams = (eventParams: Record<string, any>)

package/packages/analytics/src/clients/TealiumAnalytics/TealiumAnalytics.ts

@@ -2,7 +2,7 @@ import { Storage } from '@24i/bigscreen-sdk/storage';
 import { MINUTE_IN_MS } from '@24i/bigscreen-sdk/utils/timeConstants';
 import { createTimeout } from '@24i/bigscreen-sdk/utils/timers';
 import { AnalyticsTriggers } from '@24i/appstage-shared-analytics';
-import { findForLanguage } from './findForLanguage';
+import { findIdForLanguage } from './findIdForLanguage';
 import {
     BIGSCREEN_APP_TYPE,
     BIGSCREEN_OTT_TYPE,
@@ -18,8 +18,8 @@ import type {
     TealiumAnalyticsConfiguration,
     TeaResult,
     TealiumDataMapper,
+    TealiumCustomConfiguration,
     CustomMappers,
-    TeaDynamicCoreResult,
 } from './types';
 
 // eslint-disable-next-line no-magic-numbers
@@ -30,7 +30,11 @@ const TEALIUM_BASE_URL = 'https://collect.tealiumiq.com/event';
 const DEFAULT_PAYLOAD: TeaStaticCoreResult = {
     tealium_account: '',
     tealium_profile: '',
+    language: '',
+    language_service: '',
     entity: '',
+    property_id: '',
+    short_language_service: '',
     platform_short: BIGSCREEN_PLATFORM_SHORT,
     platform_type: BIGSCREEN_PLATFORM_TYPE,
     app_type: BIGSCREEN_APP_TYPE,
@@ -74,38 +78,32 @@ export class TealiumAnalytics implements AnalyticsClient {
             datasource,
             customMappers,
             dataMapper = {} as TealiumDataMapper,
-        } = this.config;
-        const { entity, platformShort, platformType, appType } = dataMapper;
+        } = this.config || {} as TealiumCustomConfiguration;
+        const {
+            entity,
+            property_ids: propertyIds,
+            language,
+            short_language_service: shortLanguageService,
+            platform_short: platformShort,
+            platform_type: platformType,
+            app_type: appType,
+        } = dataMapper || {} as TealiumDataMapper;
         this.customMappers = customMappers;
         this.constantPayload = {
             tealium_account: account,
             tealium_profile: profile,
             tealium_environment: environment,
-            entity,
             ...(datasource && { tealium_datasource: datasource }),
+            language: language || '',
+            language_service: `${entity} ${language}`,
+            entity,
+            property_id: findIdForLanguage(propertyIds, language || '').toString(),
+            short_language_service: shortLanguageService || '',
             platform_short: platformShort ?? BIGSCREEN_PLATFORM_SHORT,
             platform_type: platformType ?? BIGSCREEN_PLATFORM_TYPE,
             app_type: appType ?? BIGSCREEN_APP_TYPE,
             ott_type: BIGSCREEN_OTT_TYPE,
-            app_id: `${entity} ${appType ?? BIGSCREEN_APP_TYPE} : ${this.appVersion}`,
-        };
-    }
-
-    getDynamicPayload({ language: payloadLanguage }: AnyPayload): TeaDynamicCoreResult {
-        if (!this.config || !this.config.dataMapper) {
-            console.warn(`[${this.name}] getDynamicPayload missing configuration`);
-            return {
-                language: '', language_service: '', property_id: '', short_language_service: '',
-            };
-        }
-        const { dataMapper } = this.config;
-        const { entity, languageMap, propertyIdsMap, shortLanguageServiceMap } = dataMapper;
-        const tealiumLanguage = findForLanguage(languageMap, payloadLanguage) || '';
-        return {
-            language: tealiumLanguage || '',
-            language_service: `${entity} ${tealiumLanguage}`,
-            property_id: findForLanguage(propertyIdsMap, payloadLanguage) || '',
-            short_language_service: findForLanguage(shortLanguageServiceMap, payloadLanguage) || '',
+            app_id: `${entity} ${language}:${this.appVersion}`,
         };
     }
 
@@ -159,19 +157,9 @@ export class TealiumAnalytics implements AnalyticsClient {
                     }
                     const eventBody = {
                         ...this.constantPayload,
-                        ...this.getDynamicPayload(payload),
-                        ...mappingFunction(triggerName, payload as Payload, this.config),
+                        ...mappingFunction(triggerName, payload as Payload),
                     };
-                    const filteredEventBody: TeaResult = Object.entries(eventBody).reduce(
-                        (acc: any, [key, value]) => {
-                            if (value != null && value !== '') {
-                                acc[key] = value;
-                            }
-                            return acc;
-                        },
-                        {} as TeaResult,
-                    );
-                    if (eventBody) await this.sendEvent(filteredEventBody);
+                    if (eventBody) await this.sendEvent(eventBody);
                 } catch (e) {
                     console.warn(`[${this.name}] Error onEvent: `, e);
                 }

package/packages/analytics/src/clients/TealiumAnalytics/constants.ts

@@ -10,7 +10,6 @@ export const BIGSCREEN_PLATFORM_TYPE = 'ott';
 
 export const TEALIUM_TRIGGERS = [
     // App
-    AnalyticsTriggers.APP_OPEN,
     AnalyticsTriggers.APP_CLOSE,
     AnalyticsTriggers.APP_ERROR,
 
@@ -43,7 +42,6 @@ export const TEALIUM_TRIGGERS = [
 ];
 
 export const AppEvents = {
-    [AnalyticsTriggers.APP_OPEN]: '',
     [AnalyticsTriggers.SCENE_VIEW]: '',
     [AnalyticsTriggers.PLAYBACK_10]: 'media_milestone_10_video',
     [AnalyticsTriggers.PLAYBACK_50]: 'media_milestone_50_video',
@@ -52,7 +50,7 @@ export const AppEvents = {
     [AnalyticsTriggers.PLAYBACK_PAUSE]: 'video_pause',
     [AnalyticsTriggers.PLAYBACK_UNPAUSE]: 'video_resume',
     [AnalyticsTriggers.PLAYBACK_START]: 'video_play',
-    [AnalyticsTriggers.PLAYER_OPEN]: 'player_open',
+    [AnalyticsTriggers.PLAYER_OPEN]: 'player_x',
     [AnalyticsTriggers.PLAYER_CLOSE]: 'player_x',
     [AnalyticsTriggers.FAVORITE_ADD]: 'subscribe_to_fav',
     [AnalyticsTriggers.FAVORITE_REMOVE]: 'subscribe_to_fav',
@@ -63,7 +61,6 @@ export const AppEvents = {
 } as const;
 
 export enum EVENTS {
-    APP_OPEN = 'app_open',
     SCENE_VIEW = 'scene_view',
     VIDEO_PROGRESS = 'video_progress',
     VIDEO_START = 'video_start',
@@ -85,7 +82,6 @@ export enum TrackEventType {
 }
 
 export const TRIGGER_NAME_TO_TEALIUM_EVENTS: { [K in AnalyticsTriggers]?: EVENTS[]; } = {
-    [AnalyticsTriggers.APP_OPEN]: [EVENTS.APP_OPEN],
     [AnalyticsTriggers.SCENE_VIEW]: [EVENTS.SCENE_VIEW],
     [AnalyticsTriggers.PLAYBACK_10]: [EVENTS.VIDEO_PROGRESS],
     [AnalyticsTriggers.PLAYBACK_50]: [EVENTS.VIDEO_PROGRESS],

package/packages/analytics/src/clients/TealiumAnalytics/findIdForLanguage.ts

@@ -0,0 +1,9 @@
+import { PropertyIds } from '@24i/bigscreen-sdk/analytics/TealiumAnalytics';
+
+export const findIdForLanguage = (
+    property_ids: PropertyIds = {},
+    language: string,
+): number => {
+    const languageKey = Object.keys(property_ids).find((key) => key.endsWith(language));
+    return languageKey ? property_ids[languageKey] : -1;
+};

package/packages/analytics/src/clients/TealiumAnalytics/index.ts

@@ -1,4 +1,4 @@
 export { TealiumAnalytics } from './TealiumAnalytics';
-export { findForLanguage } from './findForLanguage';
+export { findIdForLanguage } from './findIdForLanguage';
 export * from './constants';
 export * from './types';

package/packages/analytics/src/clients/TealiumAnalytics/interface.ts

@@ -13,12 +13,10 @@ import { mapFavoriteRemove } from './mappers/mapFavoriteRemove';
 import { mapVideoResume } from './mappers/mapVideoResume';
 import { mapSearchSuccess } from './mappers/mapSearchSuccess';
 import { mapSearchFailed } from './mappers/mapSearchFailed';
-import { mapAppError } from './mappers/mapAppError';
-import { mapAppOpen } from './mappers/mapAppOpen';
 import { EventMappingFunction } from './types';
+import { mapAppError } from './mappers/mapAppError';
 
 export const EVENTS_MAPPING: Record<EVENTS, EventMappingFunction> = {
-    [EVENTS.APP_OPEN]: mapAppOpen,
     [EVENTS.SCENE_VIEW]: mapSceneView,
     [EVENTS.PLAYER_OPEN]: mapPlayerOpen,
     [EVENTS.PLAYER_CLOSE]: mapPlayerClose,

package/packages/analytics/src/clients/TealiumAnalytics/mappers/__mocks__/mediaPayload.ts

@@ -6,14 +6,15 @@ export const MEDIA_PAYLOAD: Payload = {
     title: 'Test Video',
     url: 'https://example.com/video',
     contentType: 'video/mp4',
+    externalId: '',
     percent: 2,
     provider: 'provider',
     assetId: '12345',
     app_id: 'app_id',
     app_type: 'html5',
-    sceneName: 'pageName',
-    sceneId: 'categories',
-    sceneType: 'vod',
+    sceneName: '',
+    sceneId: '',
+    sceneType: '',
     sessionId: 1,
     sessionNumber: 1,
     userId: '10',
@@ -24,22 +25,18 @@ export const MEDIA_PAYLOAD: Payload = {
     deviceType: 'smarttv',
     searchTerm: '',
     itemId: '',
-    pubDate: '2012/02/12',
     message: 'error message',
     section: 'BROWSE',
-    subcontentType: 'section',
-    seriesTitle: 'section',
-    language: 'en',
-    resolution: '1920x1080',
+    subcontentType: '',
 };
 
 export const TEALIUM_PAGEINFO_PAYLOAD = {
-    categories: 'categories',
+    categories: '',
     content_type: 'video',
-    page_name: 'pageName',
-    page_title: 'pageName',
-    section: 'section',
-    subcontent_type: 'section',
+    page_name: '',
+    page_title: '',
+    section: '',
+    subcontent_type: '',
 };
 
 export const TEALIUM_STATIC_CORE_PAYLOAD = {
@@ -47,7 +44,7 @@ export const TEALIUM_STATIC_CORE_PAYLOAD = {
     tealium_profile: 'main',
     tealium_environment: 'dev',
     tealium_datasource: 'abc',
-    app_id: 'auto html5 : v1.0-test',
+    app_id: 'auto english:v1.0-test',
     app_type: 'html5',
     entity: 'auto',
     language: 'english',
@@ -64,9 +61,10 @@ export const TEALIUM_MEDIA_PAYLOAD = {
     byline: 'N/A',
     canonical_url: 'https://example.com/video',
     media_type: 'video/mp4',
-    pub_date: '2012/02/12',
+    pub_date: '',
+    tags: '',
     video_length: 120,
     video_name: 'Test Video',
     video_position: 60,
-    video_series_title: 'section',
+    video_series_title: '',
 };

package/packages/analytics/src/clients/TealiumAnalytics/mappers/mapSceneView.ts

@@ -3,7 +3,7 @@ import { Payload, TeaSceneViewResult } from '../types';
 import { TrackEventType } from '../constants';
 
 export const mapSceneView = (
-    _: AnalyticsTriggers,
+    triggerName: AnalyticsTriggers,
     payload: Payload,
 ): TeaSceneViewResult => ({
     app_events: '',

package/packages/analytics/src/clients/TealiumAnalytics/types.ts

@@ -1,7 +1,7 @@
 import { AnalyticsTriggers } from '@24i/appstage-shared-analytics';
 import { AppEvents, EVENTS, TrackEventType as TrackEventTypeEnum } from './constants';
 import type {
-    UserInfo, GeneralAppData, AppInfo, VideoProgress, SceneInfo, PlayerSession, ErrorInfo,
+    UserInfo, AppInfo, VideoProgress, SceneInfo, PlayerSession, ErrorInfo,
 } from '../../interface';
 
 export type TeaEventType = 'view' | 'link';
@@ -12,20 +12,20 @@ type TeaTrackEventType = `${TrackEventTypeEnum}`;
 type TeaAppEventValues = typeof AppEvents[keyof typeof AppEvents];
 type TeaAnalyticsTriggerValues = `${AnalyticsTriggers}`;
 
-export interface LanguageMapper {
-    [key: string]: string;
+export interface PropertyIds {
+    [key: string]: number;
 }
 
 export type CustomMappers = Partial<Record<EVENTS, EventMappingFunction>>;
 
 export type TealiumDataMapper = {
-    appType?: TeaAppType,
+    app_type: TeaAppType, // e.g. 'html5' for bigscreen
     entity: string, // e.g: 'rfe'
-    platformShort?: string,
-    platformType?: string,
-    languageMap: LanguageMapper, // e.g: 'english'
-    propertyIdsMap: LanguageMapper, // e.g: 414
-    shortLanguageServiceMap: LanguageMapper, // e.g: 'eng'
+    property_ids: PropertyIds, // e.g: 414
+    language?: string, // e.g: 'english'
+    platform_short?: string,
+    platform_type?: string,
+    short_language_service?: string, // e.g: 'eng'
 };
 
 export type TealiumCustomConfiguration = {
@@ -71,7 +71,6 @@ export type SubPageInfo = {
 };
 
 export type Payload = CorePayload &
-GeneralAppData &
 AppInfo &
 SceneInfo &
 SubPageInfo &
@@ -84,17 +83,9 @@ ErrorInfo;
 
 export type EventMappingFunction = (
     triggerName: AnalyticsTriggers,
-    payload: Payload,
-    config?: TealiumAnalyticsConfiguration,
+    payload: Payload
 ) => TeaResult;
 
-export type TeaDynamicCoreResult = {
-    language: string;
-    language_service: string;
-    property_id: string;
-    short_language_service: string;
-};
-
 export type TeaStaticCoreResult = {
     tealium_account: string,
     tealium_profile: string,
@@ -104,9 +95,13 @@ export type TeaStaticCoreResult = {
     app_id: string;
     app_type: TeaAppType;
     entity: string;
+    language: string;
+    language_service: string;
     ott_type: TeaOttType;
     platform_short: string;
     platform_type: string;
+    property_id: string;
+    short_language_service: string;
 };
 
 export type TeaCoreResult = {

package/packages/analytics/src/clients/TwentyFourIQ/TwentyFourIQClient.ts

@@ -14,19 +14,25 @@ import { CorePayload, DeviceInfo, EventBody, Payload, SessionInfo } from './type
 // eslint-disable-next-line no-magic-numbers
 const SESSION_TIMEOUT = 30 * MINUTE_IN_MS;
 
-const TWENTY_FOUR_IQ_SESSION_COUNTER = '24iQ_session_counter';
+const TWENYFOURIQ_SESSION_COUNTER = '24iQ_session_counter';
 
 export class TwentyFourIQClient implements AnalyticsClient {
     name = '24iQ';
 
+    deviceInfo = {
+        manufacturer: '',
+        platform: '',
+        platformVersion: '',
+        deviceId: '',
+        appVersion: '',
+        applicationId: '',
+        deviceType: '',
+    };
+
     constantPayload: CorePayload & SessionInfo & DeviceInfo = {
         sessionNumber: 0,
         sessionId: 0,
-        appVersion: '',
-        deviceId: '',
-        manufacturer: '',
-        platform: '',
-        deviceModel: '',
+        ...this.deviceInfo,
     };
 
     sessionTimeout = createTimeout();
@@ -40,21 +46,24 @@ export class TwentyFourIQClient implements AnalyticsClient {
     }
 
     async init() {
-        this.constantPayload.deviceId = await device.getUuid();
-        this.constantPayload.manufacturer = await device.getManufacturerName();
-        this.constantPayload.platform = await device.getPlatformName();
-        this.constantPayload.deviceModel = await device.getModelName();
-        this.constantPayload.appVersion = this.appVersion;
+        this.deviceInfo.manufacturer = await device.getManufacturerName();
+        this.deviceInfo.platform = await device.getPlatformName();
+        this.deviceInfo.platformVersion = await device.getPlatformVersion();
+        this.deviceInfo.deviceId = await device.getUuid();
         await this.startSession();
     }
 
     async startSession() {
         const sessionNumber = parseInt(
-            await Storage.getItem(TWENTY_FOUR_IQ_SESSION_COUNTER) ?? '0', 10,
+            await Storage.getItem(TWENYFOURIQ_SESSION_COUNTER) ?? '0', 10,
         ) + 1;
         this.constantPayload.sessionNumber = sessionNumber;
         this.constantPayload.sessionId = generateSessionId();
-        await Storage.setItem(TWENTY_FOUR_IQ_SESSION_COUNTER, sessionNumber.toString());
+        this.constantPayload.manufacturer = this.deviceInfo.manufacturer;
+        this.constantPayload.platform = this.deviceInfo.platform;
+        this.constantPayload.platformVersion = this.deviceInfo.platformVersion;
+        this.constantPayload.appVersion = this.appVersion;
+        await Storage.setItem(TWENYFOURIQ_SESSION_COUNTER, sessionNumber.toString());
         this.isSessionActive = true;
         this.setSessionTimeout();
     }

package/packages/analytics/src/clients/TwentyFourIQ/constants.ts

@@ -54,12 +54,8 @@ export const TWENTY_FOUR_IQ_TRIGGERS = [
     AnalyticsTriggers.SCROLL_90,
 
     // Ads
-    AnalyticsTriggers.AD_BUFFERING,
-    AnalyticsTriggers.AD_COMPLETE,
-    AnalyticsTriggers.AD_ERROR,
+    AnalyticsTriggers.AD_LOADED,
     AnalyticsTriggers.AD_SKIPPED,
-    AnalyticsTriggers.AD_START,
-    AnalyticsTriggers.AD_STOP,
 ];
 
 export enum EVENTS {
@@ -73,12 +69,8 @@ export enum EVENTS {
     PLAYER_CLOSE = 'player_close',
     PLAYER_OPEN = 'player_open',
     SCROLL = 'scroll',
-    AD_BUFFERING = 'ad_buffering',
-    AD_COMPLETE = 'ad_complete',
-    AD_ERROR = 'ad_error',
+    AD_LOADED = 'ad_loaded',
     AD_SKIPPED = 'ad_skipped',
-    AD_START = 'ad_start',
-    AD_STOP = 'ad_stop',
 }
 
 export const TRIGGER_NAME_TO_24IQ_EVENTS: { [K in AnalyticsTriggers]?: EVENTS[]; } = {
@@ -100,12 +92,8 @@ export const TRIGGER_NAME_TO_24IQ_EVENTS: { [K in AnalyticsTriggers]?: EVENTS[];
     [AnalyticsTriggers.SCROLL_75]: [EVENTS.SCROLL],
     [AnalyticsTriggers.SCROLL_90]: [EVENTS.SCROLL],
     [AnalyticsTriggers.APP_CLOSE]: [EVENTS.VIDEO_STOP, EVENTS.PLAYER_CLOSE],
-    [AnalyticsTriggers.AD_BUFFERING]: [EVENTS.AD_BUFFERING],
-    [AnalyticsTriggers.AD_COMPLETE]: [EVENTS.AD_COMPLETE],
-    [AnalyticsTriggers.AD_ERROR]: [EVENTS.AD_ERROR],
+    [AnalyticsTriggers.AD_LOADED]: [EVENTS.AD_LOADED],
     [AnalyticsTriggers.AD_SKIPPED]: [EVENTS.AD_SKIPPED],
-    [AnalyticsTriggers.AD_START]: [EVENTS.AD_START],
-    [AnalyticsTriggers.AD_STOP]: [EVENTS.AD_STOP],
 };
 
 export const HUNDRED_PERCENT = 100;