@jolibox/implement 1.1.50 → 1.1.52-beta.1

package/implement.build.log

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

package/implementation.build.log

@@ -0,0 +1,9 @@
+Invoking: npm run clean && npm run build:esm && tsc 
+
+> @jolibox/implementation@1.1.4-beta.3 clean
+> rimraf ./dist
+
+
+> @jolibox/implementation@1.1.4-beta.3 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.50",
+  "version": "1.1.52-beta.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.50",
-    "@jolibox/types": "1.1.50",
-    "@jolibox/native-bridge": "1.1.50",
-    "@jolibox/ads": "1.1.50",
+    "@jolibox/common": "1.1.52-beta.1",
+    "@jolibox/types": "1.1.52-beta.1",
+    "@jolibox/native-bridge": "1.1.52-beta.1",
+    "@jolibox/ads": "1.1.52-beta.1",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"
@@ -19,7 +19,7 @@
     "@types/jest": "28.1.1",
     "rimraf": "6.0.1",
     "esbuild": "0.24.2",
-    "@jolibox/eslint-config": "1.0.0"
+    "@jolibox/eslint-config": "1.0.1-beta.6"
   },
   "scripts": {
     "clean": "rimraf ./dist",

package/src/common/report/task-track/index.ts

@@ -9,10 +9,13 @@ type TaskEvent =
   | 'USE_GAME_ITEM' // TODO: deprecate
   | 'IN_GAME_PURCHASES' // 游戏内购
   | 'ADS_UNLOCK_GAME' // 广告解锁
-  | 'GAME_TASK_EVENT'; // 关卡行为
+  | 'GAME_TASK_EVENT' // 关卡行为
+  | 'GAME_ENDED' // 游戏结束
+  | 'GAME_LEVEL_UP'; // 游戏关卡升级
 export type TaskPoint = {
   event: TaskEvent;
   params?: Record<string, unknown>;
+  extraParams?: Record<string, unknown>;
 };
 export abstract class TaskTracker {
   interval: number;

package/src/common/rewards/fetch-reward.ts

@@ -2,14 +2,14 @@ import { IHttpClient } from '../http';
 import { RewardsHelper, RewardType } from './reward-helper';
 import { IJolicoinRewardOption } from './type';
 import {
-  IUseModalFrequencyConfig,
   UnlockOptionsEventName,
   UseModalFrequencyEventName,
   rewardsEmitter,
   DefaltJoliCoinUseAndCharge,
-  DefaltLoginGuide
+  DefaltLoginGuide,
+  IUseModalFrequencyConfig
 } from './reward-emitter';
-import { StandardResponse } from '@jolibox/types';
+import { StandardResponse, GlobalConfig } from '@jolibox/types';
 import { hostEmitter } from '@jolibox/common';
 
 const priority = () => {
@@ -55,7 +55,7 @@ export const createRewardFetcher = (rewardsHelper: RewardsHelper) => {
 
 export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper) => {
   rewardsHelper.registerRewardFrequencyConfigFetcher(async (httpClient: IHttpClient) => {
-    const res = await httpClient.get<StandardResponse<IUseModalFrequencyConfig>>(
+    const res = await httpClient.get<StandardResponse<GlobalConfig & IUseModalFrequencyConfig>>(
       '/api/fe-configs/web-common/global-config',
       {}
     );
@@ -65,9 +65,10 @@ export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper)
       loginGuide: res.data?.loginGuide || DefaltLoginGuide
     });
 
-    hostEmitter.emit('onGlobalConfigChanged', {
-      globalConfig: res.data
-    });
+    res.data &&
+      hostEmitter.emit('onGlobalConfigChanged', {
+        globalConfig: res.data
+      });
 
     return {
       joliCoinUseAndCharge: res.data?.joliCoinUseAndCharge || DefaltJoliCoinUseAndCharge,

package/src/common/rewards/registers/use-ads.ts

@@ -4,8 +4,12 @@ import { JoliboxAdsForGame } from '@jolibox/ads';
 export type AdsRewardsHandler = (params: IRewardParams) => Promise<boolean>;
 export const createAdsRewardHandler = (ads: JoliboxAdsForGame): AdsRewardsHandler => {
   return async (params: IRewardParams) => {
-    console.log('trigger @jolibox/ads reward', params);
-    ads.adBreak(params);
+    try {
+      console.log('trigger @jolibox/ads reward', params);
+      await ads.adBreak(params);
+    } catch (e) {
+      console.error('-----createAdsRewardHandler error-----', e);
+    }
     return true;
   };
 };

package/src/common/rewards/registers/utils/coins/index.ts

@@ -97,15 +97,20 @@ export const createCommonJolicoinRewardHandler = (
 
       console.log('-----unlockWithJolicoin request result-----', unlockWithJolicoin);
       if (unlockWithJolicoin.code == 'SUCCESS') {
-        params.adBreakDone?.({
-          breakType: params.type,
-          breakName: 'name' in params ? params.name ?? '' : '',
-          breakFormat: 'reward',
-          breakStatus: 'viewed'
-        });
-        if ('adViewed' in params) {
-          params.adViewed?.();
+        try {
+          params.adBreakDone?.({
+            breakType: params.type,
+            breakName: 'name' in params ? params.name ?? '' : '',
+            breakFormat: 'reward',
+            breakStatus: 'viewed'
+          });
+          if ('adViewed' in params) {
+            params.adViewed?.();
+          }
+        } catch (e) {
+          console.error('-----unlockWithJolicoin adBreakDone error-----', e);
         }
+
         handleUnlockSuccess?.({
           quantity: unlockWithJolicoin.data.quantity,
           balance: unlockWithJolicoin.data.balance

package/src/h5/api/ads.ts

@@ -127,11 +127,6 @@ const adsContext: IAdsContext<'GAME'> = {
   }
 };
 
-const handleUnlockSuccess = (params: { quantity: number; balance: number }) => {
-  notifyCustomEvent('JOLIBOX_CUSTOM_REWARDS_EVENT', {
-    JOLI_COIN: params
-  });
-};
 
 const adsManager = new H5AdsManager(adsContext);
 const adsHandler = adsManager.getAdsHandler(context.sdkEnvironment);
@@ -140,14 +135,11 @@ rewardsHelper.registerRewardHandler('ADS', createAdsRewardHandler(adsHandler.get
 rewardsHelper.registerRewardHandler(
   'JOLI_COIN',
   createJolicoinRewardHandler(httpClient, {
-    onUnlockSuccess: handleUnlockSuccess.bind(this)
-  }) as unknown as (params?: unknown) => Promise<boolean>
-);
-
-rewardsHelper.registerRewardHandler(
-  'JOLI_COIN_ONLY',
-  createJolicoinOnlyRewardHandler(httpClient, {
-    onUnlockSuccess: handleUnlockSuccess.bind(this)
+    onUnlockSuccess: (params: { quantity: number; balance: number }) => {
+      notifyCustomEvent('JOLIBOX_CUSTOM_REWARDS_EVENT', {
+        JOLI_COIN: params
+      });
+    }
   }) as unknown as (params?: unknown) => Promise<boolean>
 );
 

package/src/h5/api/task.ts

@@ -19,7 +19,15 @@ const onLevelFinished = createAPI('levelFinished', {
     logger.info(`onLevelFinished`, duration, rating, score, variation);
     await Promise.all([
       taskTracker.reporter({
-        event: 'COMPLETE_GAME_LEVEL'
+        event: 'COMPLETE_GAME_LEVEL',
+        extraParams: {
+          inGameInfo: {
+            levelId,
+            duration,
+            rating,
+            score
+          }
+        }
       }),
       taskTracker.tracker('LevelFinished', {
         levelId,
@@ -44,12 +52,24 @@ const onGamePlayEnded = createAPI('gamePlayEnded', {
   implement: async (params) => {
     const { duration, rating, score, variation } = params;
     logger.info(`onGamePlayEnded`, duration, rating, score, variation);
-    return taskTracker.tracker('GamePlayEnded', {
-      duration,
-      rating,
-      score,
-      variation
-    });
+    await Promise.all([
+      taskTracker.tracker('GamePlayEnded', {
+        duration,
+        rating,
+        score,
+        variation
+      }),
+      taskTracker.reporter({
+        event: 'GAME_ENDED',
+        extraParams: {
+          inGameInfo: {
+            duration,
+            rating,
+            score
+          }
+        }
+      })
+    ]);
   }
 });
 
@@ -61,10 +81,21 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
     })
   ),
   implement: async ({ levelId, name }) => {
-    return taskTracker.tracker('LevelUpgrade', {
-      name,
-      levelId
-    });
+    await Promise.all([
+      taskTracker.tracker('LevelUpgrade', {
+        name,
+        levelId
+      }),
+      taskTracker.reporter({
+        event: 'GAME_LEVEL_UP',
+        extraParams: {
+          inGameInfo: {
+            levelId,
+            levelName: name
+          }
+        }
+      })
+    ]);
   }
 });
 

package/src/h5/report/task-tracker.ts

@@ -23,16 +23,20 @@ export class H5TaskTracker extends TaskTracker {
   }
 
   async reporter(point: TaskPoint): Promise<void> {
-    const { event, params } = point;
-    await this.httpClient.post(`/api/base/app-event`, {
-      data: {
-        eventType: event,
-        gameInfo: {
-          gameId: this.gameId,
-          sessionId: this.sessionId,
-          ...params
-        }
+    const { event, params, extraParams } = point;
+    const reportBody = {
+      eventType: event,
+      gameInfo: {
+        gameId: this.gameId,
+        sessionId: this.sessionId,
+        ...params
       }
+    };
+    if (extraParams) {
+      Object.assign(reportBody, extraParams);
+    }
+    await this.httpClient.post(`/api/base/app-event`, {
+      data: reportBody
     });
   }
   tracker(event: TrackEvent, info: Record<string, unknown> | null = null) {

package/src/native/api/base.ts

@@ -9,5 +9,8 @@ import { registerCanIUseContext } from '@jolibox/native-bridge';
 import { context } from '@/common/context';
 export { t };
 
-export const { canIUseNative } = registerCanIUseContext(() => context.sdkInfo.nativeSDKVersionCode);
+export const { canIUseNative } = registerCanIUseContext(
+  () => context.sdkInfo.nativeSDKVersionCode,
+  () => context.platform
+);
 export { convertVersionCodeToVString } from './utils';

package/src/native/api/call-host-method.ts

@@ -1,14 +1,47 @@
-import { createAPI, registerCanIUse, t } from './base';
-import { applyNative, invokeNative } from '@jolibox/native-bridge';
+import { canIUseNative, createAPI, registerCanIUse, t } from './base';
+import { invokeNative } from '@jolibox/native-bridge';
 import { hostEmitter, UserCustomError } from '@jolibox/common';
 import { createCommands } from '@jolibox/common';
+import { context } from '@/common/context';
 
 const commands = createCommands();
 let supportedMethods: string[] = [];
 let isInitialized = false;
 
+const formatSupportedMethods = (
+  methods: (
+    | string
+    | {
+        method: string;
+        platforms?: string[];
+        nativeVersionCode?: number;
+      }
+  )[]
+) => {
+  const platform = context.platform;
+  const nativeVersionCode = context.sdkInfo.nativeSDKVersionCode ?? 0;
+  return methods.reduce((acc, method) => {
+    if (typeof method === 'string') {
+      acc.push(method);
+    } else {
+      const { method: platformMethod, platforms, nativeVersionCode: methodNativeVersionCode } = method;
+      let canUse = true;
+      if (platforms && !platforms.includes(platform)) {
+        canUse = false;
+      }
+      if (methodNativeVersionCode && methodNativeVersionCode > nativeVersionCode) {
+        canUse = false;
+      }
+      if (canUse) {
+        acc.push(platformMethod);
+      }
+    }
+    return acc;
+  }, [] as string[]);
+};
+
 hostEmitter.on('onGlobalConfigChanged', (params) => {
-  supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+  supportedMethods = formatSupportedMethods(params.globalConfig?.supportedHostMethods ?? []);
   isInitialized = true;
 });
 
@@ -18,7 +51,7 @@ const getSupportedMethods = (): Promise<string[]> => {
       resolve(supportedMethods);
     } else {
       const handler = (params: any) => {
-        supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+        supportedMethods = formatSupportedMethods(params.globalConfig.supportedHostMethods ?? []);
         isInitialized = true;
         hostEmitter.off('onGlobalConfigChanged', handler);
         resolve(supportedMethods);

package/src/native/api/task.ts

@@ -29,7 +29,15 @@ const onLevelFinished = createAPI('levelFinished', {
 
     tasks.push(
       taskTracker.reporter({
-        event: 'COMPLETE_GAME_LEVEL'
+        event: 'COMPLETE_GAME_LEVEL',
+        extraParams: {
+          inGameInfo: {
+            levelId,
+            duration,
+            rating,
+            score
+          }
+        }
       })
     );
     await Promise.all(tasks);
@@ -47,12 +55,29 @@ const onGamePlayEnded = createAPI('gamePlayEnded', {
   ),
   implement: async (params) => {
     const { duration, rating, score, variation } = params;
-    return taskTracker.tracker('GamePlayEnded', {
-      duration,
-      rating,
-      score,
-      variation
-    });
+    const tasks = [];
+    tasks.push(
+      taskTracker.tracker('GamePlayEnded', {
+        duration,
+        rating,
+        score,
+        variation
+      })
+    );
+
+    tasks.push(
+      taskTracker.reporter({
+        event: 'GAME_ENDED',
+        extraParams: {
+          inGameInfo: {
+            duration,
+            rating,
+            score
+          }
+        }
+      })
+    );
+    await Promise.all(tasks);
   }
 });
 
@@ -71,6 +96,17 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
         levelId
       })
     );
+    tasks.push(
+      taskTracker.reporter({
+        event: 'GAME_LEVEL_UP',
+        extraParams: {
+          inGameInfo: {
+            levelId,
+            levelName: name
+          }
+        }
+      })
+    );
     await Promise.all(tasks);
   }
 });

package/src/native/report/task-tracker.ts

@@ -41,7 +41,7 @@ export class NativeTaskTracker extends TaskTracker {
       : 'https://api.jolibox.com/api/base/app-event';
   }
   async reporter(point: TaskPoint): Promise<void> {
-    const { event, params } = point;
+    const { event, params, extraParams } = point;
 
     const reportBody = {
       eventType: event,
@@ -51,6 +51,9 @@ export class NativeTaskTracker extends TaskTracker {
         ...params
       }
     };
+    if (extraParams) {
+      Object.assign(reportBody, extraParams);
+    }
     const reportTask =
       context.platform === 'android'
         ? fetch(`/api/base/app-event`, {