@jolibox/implement 1.1.13-beta.2 → 1.1.13-beta.4

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.13-beta.2 clean
+> @jolibox/implement@1.1.13-beta.4 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.13-beta.2 build:esm
+> @jolibox/implement@1.1.13-beta.4 build:esm
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=esm
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.13-beta.2",
+  "version": "1.1.13-beta.4",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.13-beta.2",
-    "@jolibox/types": "1.1.13-beta.2",
-    "@jolibox/native-bridge": "1.0.0",
+    "@jolibox/common": "1.1.13-beta.4",
+    "@jolibox/types": "1.1.13-beta.4",
+    "@jolibox/native-bridge": "1.1.13-beta.4",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/ads/anti-cheating.test.ts

@@ -20,7 +20,9 @@ describe('createLeadingNotifiableDebounce', () => {
   };
 
   it('should ban initial call', async () => {
-    localStorage.clear();
+    (window as any).__joliboxLocalStorage__ = window.localStorage;
+
+    (window as any).__joliboxLocalStorage__.clear();
 
     const adsAntiCheating = new AdsAntiCheating(track, http, () => true, config);
     await new Promise((resolve) => setTimeout(resolve, 10));
@@ -32,7 +34,7 @@ describe('createLeadingNotifiableDebounce', () => {
   });
 
   it('should ban continous calling', async () => {
-    localStorage.clear();
+    (window as any).__joliboxLocalStorage__.clear();
 
     const adsAntiCheating = new AdsAntiCheating(track, http, () => true, config);
     await new Promise((resolve) => setTimeout(resolve, 100));

package/src/common/ads/anti-cheating.ts

@@ -24,6 +24,12 @@ export interface IAdsAntiCheatingConfig {
   highFreqThreshold?: number; // default 2000 (2s)
 }
 
+declare global {
+  interface Window {
+    __joliboxLocalStorage__: Storage;
+  }
+}
+
 export class AdsAntiCheating {
   private checkShouldBanInitial: ReturnType<typeof createInitialStrategy>;
   private checkShouldBanHighFreq: ReturnType<typeof createHighFreqStrategy>;
@@ -177,7 +183,7 @@ const createBanForTimeStrategy = (
     _records: [] as CallAdsHistory[],
     init() {
       try {
-        const fromStorage = JSON.parse(window.localStorage.getItem(TIMESTAMP_STORAGE_KEY) ?? '[]');
+        const fromStorage = JSON.parse(window.__joliboxLocalStorage__.getItem(TIMESTAMP_STORAGE_KEY) ?? '[]');
         if (Array.isArray(fromStorage)) {
           this._records = fromStorage;
         } else {
@@ -192,7 +198,7 @@ const createBanForTimeStrategy = (
     },
     set values(value: CallAdsHistory[]) {
       try {
-        window.localStorage.setItem(TIMESTAMP_STORAGE_KEY, JSON.stringify(value));
+        window.__joliboxLocalStorage__.setItem(TIMESTAMP_STORAGE_KEY, JSON.stringify(value));
       } catch {
         // console.error('Failed to save timestamps');
         // do nothing
@@ -205,7 +211,7 @@ const createBanForTimeStrategy = (
     _record: false,
     init() {
       try {
-        const fromStorage = JSON.parse(window.localStorage.getItem(BAN_FOR_TIME_KEY) ?? 'false');
+        const fromStorage = JSON.parse(window.__joliboxLocalStorage__.getItem(BAN_FOR_TIME_KEY) ?? 'false');
         if (typeof fromStorage === 'boolean') {
           this._record = fromStorage;
         }
@@ -228,7 +234,7 @@ const createBanForTimeStrategy = (
     },
     set value(value: boolean) {
       try {
-        window.localStorage.setItem(BAN_FOR_TIME_KEY, JSON.stringify(value));
+        window.__joliboxLocalStorage__.setItem(BAN_FOR_TIME_KEY, JSON.stringify(value));
       } catch {
         // do nothing
       }

package/src/common/ads/index.ts

@@ -377,6 +377,55 @@ export class JoliboxAdsImpl {
    * @returns IAdBreakParams
    */
   private wrapAdBreakParams = (params: IAdBreakParams): IAdBreakParams => {
+    let googleHasResponse = false;
+
+    /* hook adBreakDone to track adBreakDone event -- start */
+    const originAdBreakDone = params.adBreakDone;
+    const adBreakDone = (placementInfo: IPlacementInfo) => {
+      googleHasResponse = true;
+      this.adsActionDetection.adBreakIsShowing = false;
+      this.track('CallAdBreakDone', {
+        breakType: placementInfo.breakType,
+        breakName: placementInfo.breakName ?? '',
+        breakFormat: placementInfo.breakFormat,
+        breakStatus: placementInfo.breakStatus
+      });
+      if (originAdBreakDone) {
+        originAdBreakDone(placementInfo);
+      }
+    };
+    params.adBreakDone = adBreakDone;
+    /* hook adBreakDone to track adBreakDone event -- end */
+
+    /* hook for reward -- start */
+    if (params.type === 'reward') {
+      const originBeforeReward = params.beforeReward;
+      const wrapShowAdFn = (originShowAdFn: () => void) => () => {
+        this.track('CallShowAdFn', null);
+        originShowAdFn();
+      };
+      const beforeReward = (originShowAdFn: () => void) => {
+        googleHasResponse = true;
+        if (originBeforeReward) {
+          originBeforeReward(wrapShowAdFn(originShowAdFn));
+        }
+      };
+      params.beforeReward = beforeReward;
+
+      window.setTimeout(() => {
+        if (!googleHasResponse) {
+          this.track('CallAdBreakTimeout', { type: params.type });
+          params.adBreakDone?.({
+            breakType: params.type,
+            breakName: params.name ?? '',
+            breakFormat: 'reward',
+            breakStatus: 'timeout'
+          });
+        }
+      }, 10000); // Timeout duration in milliseconds, 10 seconds
+    }
+    /* hook for reward -- end */
+
     const isPreroll = (params: IAdBreakParams): params is IPrerollParams => {
       return params.type === 'preroll';
     };
@@ -396,6 +445,7 @@ export class JoliboxAdsImpl {
       const originAfterAd = params.afterAd;
 
       const beforeAd = () => {
+        googleHasResponse = true;
         adEventEmitter.emit('isAdShowing', true);
         this.track('CallBeforeAd', {
           type: params.type,
@@ -407,6 +457,7 @@ export class JoliboxAdsImpl {
       };
 
       const afterAd = () => {
+        googleHasResponse = true;
         adEventEmitter.emit('isAdShowing', false);
         this.track('CallAfterAd', {
           type: params.type,
@@ -529,39 +580,6 @@ export class JoliboxAdsImpl {
 
     const type = params.type;
 
-    /* hook adBreakDone to track adBreakDone event -- start */
-    const originAdBreakDone = params.adBreakDone;
-    const adBreakDone = (placementInfo: IPlacementInfo) => {
-      this.adsActionDetection.adBreakIsShowing = false;
-      this.track('CallAdBreakDone', {
-        breakType: placementInfo.breakType,
-        breakName: placementInfo.breakName ?? '',
-        breakFormat: placementInfo.breakFormat,
-        breakStatus: placementInfo.breakStatus
-      });
-      if (originAdBreakDone) {
-        originAdBreakDone(placementInfo);
-      }
-    };
-    params.adBreakDone = adBreakDone;
-    /* hook adBreakDone to track adBreakDone event -- end */
-
-    /* hook beforeAd to track beforeAd event -- start */
-    if (params.type === 'reward') {
-      const originBeforeReward = params.beforeReward;
-      const wrapShowAdFn = (originShowAdFn: () => void) => () => {
-        this.track('CallShowAdFn', null);
-        originShowAdFn();
-      };
-      const beforeReward = (originShowAdFn: () => void) => {
-        if (originBeforeReward) {
-          originBeforeReward(wrapShowAdFn(originShowAdFn));
-        }
-      };
-      params.beforeReward = beforeReward;
-    }
-    /* hook beforeAd to track beforeAd event -- end */
-
     let paramsToTrack;
     switch (type) {
       case 'preroll':

package/src/h5/http/utils/__tests__/xua.test.ts

@@ -4,7 +4,7 @@ import { isValidUUIDV4 } from '@jolibox/common';
 
 describe('xua', () => {
   it('test xua', () => {
-    // window.__JOLIBOX_LOCAL_SDK_VERSION__ = '1.0.0';
+    (window as any).__joliboxLocalStorage__ = window.localStorage;
     const xua = xUserAgent();
     const deviceInfoRegex = /.* (\(.*\) ).*/;
     const deviceInfoMatch = xua.match(deviceInfoRegex);

package/src/native/api/ads.ts

@@ -1,4 +1,4 @@
-import { createCommands, logger } from '@jolibox/common';
+import { createCommands } from '@jolibox/common';
 import { createSyncAPI, registerCanIUse } from './base';
 
 const commands = createCommands();