@24i/bigscreen-sdk 1.0.34 → 1.0.35-alpha.2586

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.34",
+    "version": "1.0.35-alpha.2586",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {
@@ -40,7 +40,7 @@
         "@24i/appstage-shared-analytics": "1.0.20-alpha.70",
         "@24i/appstage-shared-events-manager": "1.0.11",
         "@24i/appstage-shared-perf-utils": "1.0.11",
-        "@24i/bigscreen-players-engine-base": "3.0.2",
+        "@24i/bigscreen-players-engine-base": "3.1.1",
         "@24i/smartapps-datalayer": "3.0.11",
         "@sentry/browser": "7.35.0",
         "@sentry/types": "7.35.0",
@@ -53,14 +53,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.23.7",
-        "@babel/preset-env": "^7.23.7",
+        "@babel/core": "^7.23.9",
+        "@babel/preset-env": "^7.23.9",
         "@types/fs-extra": "^11.0.4",
         "@types/gtag.js": "^0.0.18",
         "@types/inquirer": "^9.0.7",
         "@types/jest": "^29.5.11",
         "@types/minimist": "^1.2.5",
-        "@types/node": "^20.10.6",
+        "@types/node": "^20.11.14",
         "@types/prop-types": "^15.7.11",
         "@types/react": "18.0.33",
         "@types/scheduler": "^0.16.8",
@@ -71,16 +71,16 @@
         "fs-extra": "^11.2.0",
         "full-icu": "^1.5.0",
         "identity-obj-proxy": "^3.0.0",
-        "inquirer": "^9.2.12",
+        "inquirer": "^9.2.13",
         "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.69.6",
+        "sass": "^1.70.0",
         "sass-true": "^6.1.0",
-        "ts-jest": "^29.1.1",
+        "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
         "tsconfig-paths-jest": "0.0.1",
         "typescript": "^5.1.6"

package/packages/driver-smartcast/src/DeviceSmartCast.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 { ipify } from '@24i/bigscreen-sdk/ipify';
 import { getKeyMap } from './keymap';
 import { ISmartCastApi, IFA, DEFAULT_TTS_TIMEOUT, DevicePlaybackQuality } from './types';
 
@@ -32,6 +33,8 @@ export class DeviceSmartCast extends DeviceBase {
 
     IFA?: IFA;
 
+    publicIpAddress?: string;
+
     async initDevice() {
         this.initNetworkChangeListener();
         this.initVisibilityChangeListener();
@@ -206,12 +209,14 @@ export class DeviceSmartCast extends DeviceBase {
     /**
      * Returns filled in Vast Tag URL.
      */
-    getVastTagUrl(template: string): null | string {
+    async getVastTagUrl(template: string): Promise<null | string> {
         const IFAObject = this.IFA;
         const resolution = this.getResolution();
 
         if (!IFAObject) return null;
 
+        this.publicIpAddress = this.publicIpAddress ?? await ipify();
+
         return template
             .replace('{{width}}', String(resolution.width))
             .replace('{{height}}', String(resolution.height))
@@ -219,6 +224,7 @@ export class DeviceSmartCast extends DeviceBase {
             .replace('{{user_agent}}', encodeURIComponent(window.navigator.userAgent))
             .replace('{{ifa}}', IFAObject.IFA)
             .replace('{{ifa_type}}', IFAObject.IFA_TYPE)
+            .replace('{{ip_address}}', this.publicIpAddress!)
             .replace('{{lmt}}', String(IFAObject.LMT));
     }
 

package/packages/driver-smartcast/src/__mocks__/api.ts

@@ -9,7 +9,7 @@ export const deeplinkUrl = 'https://smartapps-bigscreen.24i.com/#/detail/SERIES/
 // eslint-disable-next-line max-len
 export const deeplinkUrl2 = 'https://smartapps-bigscreen.24i.com/#/detail/SERIES/Ge1sO4gBXRsigNB1TBwy/undefined/undefined/';
 // eslint-disable-next-line max-len
-export const vastTagTemplate = 'w={{width}}&h={{height}}&did={{ifa}}&ifa_type={{ifa_type}}&lmt={{lmt}}';
+export const vastTagTemplate = 'w={{width}}&h={{height}}&did={{ifa}}&ifa_type={{ifa_type}}&lmt={{lmt}}&ip={{ip_address}}';
 
 export const SmartCastMockApi: ISmartCastApi = {
     deviceModel,

package/packages/router/src/utils.ts

@@ -6,14 +6,16 @@ export const isPathVisible = (hash: string, regexpPath?: RegExp) => (
 
 export const getCurrentHash = () => window.location.href.split('#')[1] || '';
 
-const PARAM = '([a-zA-Z0-9+-=.:%_()\\[\\]{}]+)';
+// eslint-disable-next-line no-useless-escape
+const PARAM_REGEX = /([a-zA-Z0-9+\-=.:%_()\[\]{}]+)/;
+export const PARAM_REGEX_STR = PARAM_REGEX.source;
 
 export const pathToRegExp = (path: string) => {
     const regexpParts: string[] = [];
     const paramNames: string[] = [];
     forEach(path.split('/'), (pathPart) => {
         if (pathPart.indexOf(':') === 0) {
-            regexpParts.push(PARAM);
+            regexpParts.push(PARAM_REGEX_STR);
             paramNames.push(pathPart.replace(':', ''));
         } else regexpParts.push(pathPart);
     });