@jolibox/implement 1.1.43 → 1.1.45

package/implement.build.log

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

package/package.json

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

package/src/common/context/index.ts

@@ -148,6 +148,9 @@ const wrapContext = () => {
       if (hasMetaTag('gamedistribution', 'jolibox')) {
         return SDKEnvironment.gamedistribution;
       }
+      if (hasMetaTag('funmax', 'jolibox')) {
+        return SDKEnvironment.funmax;
+      }
       return SDKEnvironment.jolibox;
     },
     get viewport(): Viewport {

package/src/h5/api/ads.ts

@@ -21,6 +21,8 @@ import '../rewards';
 import DlightekAdsHandler from './platformAdsHandle/DlightekAdsHandler';
 import HuaweiQuickAdsHandler from './platformAdsHandle/HuaweiQuickAdsHandler';
 import GamedistributionAdsHandler from './platformAdsHandle/GamedistributionAdsHandler';
+import FunmaxAdsHandler from './platformAdsHandle/FunmaxAdsHandler';
+import JoliboxAdsHandler from './platformAdsHandle/JoliboxAdsHandler';
 
 declare global {
   interface Window {
@@ -39,44 +41,6 @@ export interface IAdsHandler {
   adUnit(params: IAdUnitParams): void;
   getAdsInstance(): JoliboxAdsForGame;
 }
-class JoliboxAdsHandler implements IAdsHandler {
-  constructor(private ads: JoliboxAdsForGame) {}
-
-  getAdsInstance(): JoliboxAdsForGame {
-    return this.ads;
-  }
-
-  init(config?: IAdsInitParams): void {
-    this.ads.init(config);
-  }
-
-  adConfig(params: IAdConfigParams): void {
-    this.ads.adConfig(params);
-  }
-
-  async adBreak(params: IAdBreakParams): Promise<void> {
-    if (params.type === 'reward') {
-      try {
-        const rewardsTypes = await rewardsHelper.getRewardsTypes(httpClient);
-        await rewardsHelper.handleReward(rewardsTypes, params);
-      } catch (e) {
-        console.info('handleReward failed', e);
-        params.adBreakDone?.({
-          breakType: params.type,
-          breakFormat: params.type === 'reward' ? 'reward' : 'interstitial',
-          breakStatus: 'noAdPreloaded'
-        });
-      }
-    } else {
-      this.ads.adBreak(params);
-    }
-  }
-
-  adUnit(params: IAdUnitParams): void {
-    this.ads.adUnit(params);
-  }
-}
-
 class H5AdsManager {
   private context: IAdsContext<'GAME'>;
   private cacheHandler: IAdsHandler | null = null;
@@ -103,9 +67,14 @@ class H5AdsManager {
         this.cacheHandler = GamedistributionAdsHandler.getInstance();
         break;
       }
+      case SDKEnvironment.funmax: {
+        const joliboxAds = new JoliboxAdsForGame(this.context);
+        this.cacheHandler = new FunmaxAdsHandler(joliboxAds, httpClient);
+        break;
+      }
       default: {
         const joliboxAds = new JoliboxAdsForGame(this.context);
-        this.cacheHandler = new JoliboxAdsHandler(joliboxAds);
+        this.cacheHandler = new JoliboxAdsHandler(joliboxAds, httpClient);
         break;
       }
     }

package/src/h5/api/platformAdsHandle/FunmaxAdsHandler.ts

@@ -0,0 +1,40 @@
+import { IAdBreakParams, JoliboxAdsForGame } from '@jolibox/ads';
+import JoliboxAdsHandler from './JoliboxAdsHandler';
+import { JoliboxHttpClient } from '@/h5/http';
+
+export default class FunmaxAdsHandler extends JoliboxAdsHandler {
+  private startTimes: number;
+
+  constructor(ads: JoliboxAdsForGame, httpClient: JoliboxHttpClient) {
+    super(ads, httpClient);
+    this.startTimes = Date.now();
+  }
+
+  async adBreak(params: IAdBreakParams): Promise<void> {
+    if (params.type !== 'reward') {
+      if (params.type === 'preroll') {
+        params.adBreakDone?.({
+          breakType: params.type,
+          breakFormat: 'interstitial',
+          breakStatus: 'noAdPreloaded'
+        });
+        return;
+      }
+
+      const now = Date.now();
+
+      console.log('FunmaxAdsHandler time => ', now - this.startTimes);
+
+      if (now - this.startTimes < 40000) {
+        params.adBreakDone?.({
+          breakType: params.type,
+          breakFormat: 'interstitial',
+          breakStatus: 'noAdPreloaded'
+        });
+        return;
+      }
+    }
+
+    super.adBreak(params);
+  }
+}

package/src/h5/api/platformAdsHandle/JoliboxAdsHandler.ts

@@ -0,0 +1,48 @@
+import { rewardsHelper } from '@/common/rewards';
+import {
+  JoliboxAdsForGame,
+  IAdsInitParams,
+  IAdConfigParams,
+  IAdBreakParams,
+  IAdUnitParams
+} from '@jolibox/ads';
+import { IAdsHandler } from '../ads';
+import { JoliboxHttpClient } from '@/h5/http';
+
+export default class JoliboxAdsHandler implements IAdsHandler {
+  constructor(private ads: JoliboxAdsForGame, private httpClient: JoliboxHttpClient) {}
+
+  getAdsInstance(): JoliboxAdsForGame {
+    return this.ads;
+  }
+
+  init(config?: IAdsInitParams): void {
+    this.ads.init(config);
+  }
+
+  adConfig(params: IAdConfigParams): void {
+    this.ads.adConfig(params);
+  }
+
+  async adBreak(params: IAdBreakParams): Promise<void> {
+    if (params.type === 'reward') {
+      try {
+        const rewardsTypes = await rewardsHelper.getRewardsTypes(this.httpClient);
+        await rewardsHelper.handleReward(rewardsTypes, params);
+      } catch (e) {
+        console.info('handleReward failed', e);
+        params.adBreakDone?.({
+          breakType: params.type,
+          breakFormat: params.type === 'reward' ? 'reward' : 'interstitial',
+          breakStatus: 'noAdPreloaded'
+        });
+      }
+    } else {
+      this.ads.adBreak(params);
+    }
+  }
+
+  adUnit(params: IAdUnitParams): void {
+    this.ads.adUnit(params);
+  }
+}

package/src/h5/http/index.ts

@@ -59,7 +59,7 @@ export class HttpClientManager {
   };
 }
 
-class JoliboxHttpClient implements IHttpClient {
+export class JoliboxHttpClient implements IHttpClient {
   private baseUrl: string;
   protected xua = xUserAgent();
 

package/src/native/api/navigate.ts

@@ -56,7 +56,7 @@ const interceptSystemExitSync = createSyncAPI('interceptSystemExitSync', {
 
 const navigateToNativePage = createSyncAPI('navigateToNativePage', {
   paramsSchema: t.tuple(
-    t.enum('openHistory', 'openDiscover', 'openDiscover', 'openGame', 'openDrama', 'openTopup'),
+    t.enum('openHistory', 'openDiscover', 'openDiscover', 'openGame', 'openDrama', 'openTopup', 'openFeed'),
     t.object()
   ),
   implement: (path, params) => {

package/src/native/bootstrap/index.ts

@@ -54,6 +54,17 @@ let isInterceptSystemExit = false;
  */
 let isInterceptBackPress = false;
 
+/**
+ * 是否使用退出挽留
+ */
+let disableExitRecommendDialog = false;
+
+const updateDisableExitRecommendDialog = (disable?: boolean) => {
+  if (isBoolean(disable)) {
+    disableExitRecommendDialog = disable;
+  }
+};
+
 RuntimeLoader.onReady(() => {
   // TODO: merge some env config
 });
@@ -90,7 +101,8 @@ function addBackPressListener() {
     isInterceptBackPress = intercept;
   });
 
-  onNative('onBeforeBackPress', ({ uuid }) => {
+  onNative('onBeforeBackPress', ({ uuid, disableExitRecommendDialog }) => {
+    updateDisableExitRecommendDialog(disableExitRecommendDialog);
     hostEmitter.emit('onBackPress', {});
     globalThis.joliboxJSCore?.doBackPress?.(uuid);
   });
@@ -139,7 +151,8 @@ function addGameServiceReadyListener() {
     registerLanguageHandler(() => context.language);
   });
 
-  onNative('onBeforeExit', ({ uuid }) => {
+  onNative('onBeforeExit', ({ uuid, disableExitRecommendDialog }) => {
+    updateDisableExitRecommendDialog(disableExitRecommendDialog);
     globalThis.joliboxJSCore?.doExit(uuid);
   });
 }
@@ -148,6 +161,7 @@ function addDoExitLoader() {
   /**
    * 退出逻辑
    * 1. 如果正在展示广告，则禁止退出
+   * 2. 如果
    * 2. 如果指定退出挽留逻辑，则按照指定逻辑运行
    * 3. 如果退出挽留逻辑返回 true，则按照指定逻辑运行
    * 4. 否则，按照默认逻辑运行
@@ -181,7 +195,7 @@ function addDoExitLoader() {
       return context.shouldInterupt;
     }
 
-    if (baskcMeta?.canShowRecommended) {
+    if (baskcMeta?.canShowRecommended && !disableExitRecommendDialog) {
       const stay = await openRetentionSchema();
       if (stay) {
         // 挽留成功，打断退出

package/src/native/network/create-fetch.ts

@@ -1,6 +1,4 @@
 import { isString, logger, Deferred, isObject, hostEmitter, isUndefined, uuidv4 } from '@jolibox/common';
-import { reportNetworkAPI } from './report';
-import { RequestFrom } from './types';
 import { FetchResponse, FetchOptions } from './types';
 import { invokeNative, onNative } from '@jolibox/native-bridge';
 import { AnyFunction } from '@jolibox/types';
@@ -98,6 +96,9 @@ export function createFetch(
   });
 
   hostEmitter.on('onLoginComplete', ({ isLogin, token }) => {
+    if (type === 'public') {
+      return;
+    }
     if (isLogin && token) {
       defaultHeaders['X-JOLI-TOKEN'] = token;
     }