@jolibox/implement 1.1.49 → 1.1.51

package/dist/native/api/call-host-method.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/native/api/index.d.ts

@@ -9,3 +9,4 @@ import './ads';
 import './navigate';
 import './runtime';
 import './is-native-support';
+import './call-host-method';

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.49 clean
+> @jolibox/implement@1.1.51 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.49 build:esm
+> @jolibox/implement@1.1.51 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.49",
+  "version": "1.1.51",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.49",
-    "@jolibox/types": "1.1.49",
-    "@jolibox/native-bridge": "1.1.49",
-    "@jolibox/ads": "1.1.49",
+    "@jolibox/common": "1.1.51",
+    "@jolibox/types": "1.1.51",
+    "@jolibox/native-bridge": "1.1.51",
+    "@jolibox/ads": "1.1.51",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/api-factory/index.ts

@@ -100,7 +100,7 @@ export const createAPIFactory = (track: Track) => {
         };
       } finally {
         const duration = Date.now() - startTime;
-        track('apiInvoked', { ...reportExtra, duration, status });
+        // track('apiInvoked', { ...reportExtra, duration, status });
       }
     };
   }
@@ -179,7 +179,7 @@ export const createAPIFactory = (track: Track) => {
         return res;
       } finally {
         const duration = Date.now() - startTime;
-        track('apiInvoked', { ...reportExtra, duration, status });
+        // track('apiInvoked', { ...reportExtra, duration, status });
       }
     };
   }

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

@@ -10,6 +10,7 @@ import {
   DefaltLoginGuide
 } from './reward-emitter';
 import { StandardResponse } from '@jolibox/types';
+import { hostEmitter } from '@jolibox/common';
 
 const priority = () => {
   return (a: RewardType, b: RewardType) => {
@@ -64,6 +65,10 @@ export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper)
       loginGuide: res.data?.loginGuide || DefaltLoginGuide
     });
 
+    hostEmitter.emit('onGlobalConfigChanged', {
+      globalConfig: res.data
+    });
+
     return {
       joliCoinUseAndCharge: res.data?.joliCoinUseAndCharge || DefaltJoliCoinUseAndCharge,
       loginGuide: res.data?.loginGuide || DefaltLoginGuide

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/task.ts

@@ -10,21 +10,31 @@ const onLevelFinished = createAPI('levelFinished', {
       levelId: t.or(t.string(), t.number()),
       duration: t.number().optional(),
       rating: t.number().optional(),
-      score: t.number().optional()
+      score: t.number().optional(),
+      variation: t.string().optional()
     })
   ),
   implement: async (parmas) => {
-    const { levelId, duration, rating, score } = parmas;
-    logger.info(`onLevelFinished`, duration, rating, score);
+    const { levelId, duration, rating, score, variation } = parmas;
+    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,
         duration,
         rating,
-        score
+        score,
+        variation
       })
     ]);
   }
@@ -35,17 +45,31 @@ const onGamePlayEnded = createAPI('gamePlayEnded', {
     t.object({
       duration: t.number().optional(),
       rating: t.number().optional(),
-      score: t.number()
+      score: t.number(),
+      variation: t.string().optional()
     })
   ),
   implement: async (params) => {
-    const { duration, rating, score } = params;
-    logger.info(`onGamePlayEnded`, duration, rating, score);
-    return taskTracker.tracker('GamePlayEnded', {
-      duration,
-      rating,
-      score
-    });
+    const { duration, rating, score, variation } = params;
+    logger.info(`onGamePlayEnded`, duration, rating, score, variation);
+    await Promise.all([
+      taskTracker.tracker('GamePlayEnded', {
+        duration,
+        rating,
+        score,
+        variation
+      }),
+      taskTracker.reporter({
+        event: 'GAME_ENDED',
+        extraParams: {
+          inGameInfo: {
+            duration,
+            rating,
+            score
+          }
+        }
+      })
+    ]);
   }
 });
 
@@ -57,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
+          }
+        }
+      })
+    ]);
   }
 });
 
@@ -75,7 +110,8 @@ registerCanIUse('TaskTrackerSDK.onLevelFinished', {
       levelId: '1.1.25',
       duration: '1.1.25',
       rating: '1.1.25',
-      score: '1.1.25'
+      score: '1.1.25',
+      variation: '1.1.50'
     }
   }
 });
@@ -86,7 +122,8 @@ registerCanIUse('TaskTrackerSDK.onGamePlayEnded', {
     params: {
       duration: '1.1.25',
       rating: '1.1.25',
-      score: '1.1.25'
+      score: '1.1.25',
+      variation: '1.1.50'
     }
   }
 });

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/call-host-method.ts

@@ -0,0 +1,64 @@
+import { createAPI, registerCanIUse, t } from './base';
+import { applyNative, invokeNative } from '@jolibox/native-bridge';
+import { hostEmitter, UserCustomError } from '@jolibox/common';
+import { createCommands } from '@jolibox/common';
+
+const commands = createCommands();
+let supportedMethods: string[] = [];
+let isInitialized = false;
+
+hostEmitter.on('onGlobalConfigChanged', (params) => {
+  supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+  isInitialized = true;
+});
+
+const getSupportedMethods = (): Promise<string[]> => {
+  return new Promise((resolve) => {
+    if (isInitialized) {
+      resolve(supportedMethods);
+    } else {
+      const handler = (params: any) => {
+        supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+        isInitialized = true;
+        hostEmitter.off('onGlobalConfigChanged', handler);
+        resolve(supportedMethods);
+      };
+      hostEmitter.on('onGlobalConfigChanged', handler);
+    }
+  });
+};
+
+const callHostMethodAsync = createAPI('callHostMethod', {
+  paramsSchema: t.tuple(
+    t.object({
+      method: t.string(),
+      params: t.object().optional().default({})
+    })
+  ),
+  implement: async ({ method, params }) => {
+    const supportedMethods = await getSupportedMethods();
+    if (!supportedMethods.includes(method)) {
+      throw new UserCustomError('Method not supported', 10001);
+    }
+    const { errNo, errMsg, data } = await invokeNative('callHostMethodAsync', {
+      method,
+      params: {
+        ...params
+      }
+    });
+    if (errNo !== 0) {
+      throw new UserCustomError(errMsg, errNo);
+    }
+
+    const { callHostMethodId, ...rest } = data;
+    return {
+      ...rest
+    };
+  }
+});
+
+commands.registerCommand('API.callHostMethod', callHostMethodAsync);
+
+registerCanIUse('callHostMethod', {
+  version: '1.1.49'
+});

package/src/native/api/index.ts

@@ -9,3 +9,4 @@ import './ads';
 import './navigate';
 import './runtime';
 import './is-native-support';
+import './call-host-method';

package/src/native/api/navigate.ts

@@ -60,15 +60,12 @@ const navigateToNativePage = createSyncAPI('navigateToNativePage', {
     t.object()
   ),
   implement: (path, params) => {
-    const { errNo, errMsg } = invokeNative('callHostMethodAsync', {
+    invokeNative('callHostMethodAsync', {
       method: path,
       params: {
         ...params
       }
     });
-    if (errNo !== 0) {
-      throw new UserCustomError(errMsg, errNo);
-    }
   }
 });
 

package/src/native/api/task.ts

@@ -10,24 +10,34 @@ const onLevelFinished = createAPI('levelFinished', {
       levelId: t.or(t.string(), t.number()),
       duration: t.number().optional(),
       rating: t.number().optional(),
-      score: t.number().optional()
+      score: t.number().optional(),
+      variation: t.string().optional()
     })
   ),
   implement: async (parmas) => {
-    const { levelId, duration, rating, score } = parmas;
+    const { levelId, duration, rating, score, variation } = parmas;
     const tasks = [];
     tasks.push(
       taskTracker.tracker('LevelFinished', {
         levelId,
         duration,
         rating,
-        score
+        score,
+        variation
       })
     );
 
     tasks.push(
       taskTracker.reporter({
-        event: 'COMPLETE_GAME_LEVEL'
+        event: 'COMPLETE_GAME_LEVEL',
+        extraParams: {
+          inGameInfo: {
+            levelId,
+            duration,
+            rating,
+            score
+          }
+        }
       })
     );
     await Promise.all(tasks);
@@ -39,16 +49,35 @@ const onGamePlayEnded = createAPI('gamePlayEnded', {
     t.object({
       duration: t.number().optional(),
       rating: t.number().optional(),
-      score: t.number()
+      score: t.number(),
+      variation: t.string().optional()
     })
   ),
   implement: async (params) => {
-    const { duration, rating, score } = params;
-    return taskTracker.tracker('GamePlayEnded', {
-      duration,
-      rating,
-      score
-    });
+    const { duration, rating, score, variation } = params;
+    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);
   }
 });
 
@@ -67,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);
   }
 });
@@ -82,7 +122,8 @@ registerCanIUse('TaskTrackerSDK.onLevelFinished', {
       levelId: '1.1.25',
       duration: '1.1.25',
       rating: '1.1.25',
-      score: '1.1.25'
+      score: '1.1.25',
+      variation: '1.1.50'
     }
   }
 });
@@ -93,7 +134,8 @@ registerCanIUse('TaskTrackerSDK.onGamePlayEnded', {
     params: {
       duration: '1.1.25',
       rating: '1.1.25',
-      score: '1.1.25'
+      score: '1.1.25',
+      variation: '1.1.50'
     }
   }
 });

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`, {

package/src/native/rewards/ui/unlogin-modal.ts

@@ -48,7 +48,13 @@ rewardsEmitter.on(InvokeUnloginModalEventName, async (type: 'JOLI_COIN' | 'ADS-J
       return;
     }
 
-    track('LoginGuideModal', {}, EventType.Expose);
+    track(
+      'LoginGuideModal',
+      {
+        eventType: EventType.Expose
+      },
+      EventType.Expose
+    );
     const modal = createUnloginJolicoinModal({
       data: {
         rewardType: type,
@@ -58,14 +64,18 @@ rewardsEmitter.on(InvokeUnloginModalEventName, async (type: 'JOLI_COIN' | 'ADS-J
         confirm: {
           text: params.confirmButtonText,
           onPress: async () => {
-            track('LoginGuideModal', { type: 'click_confirm' }, EventType.Click);
+            track('LoginGuideModal', { type: 'click_confirm', eventType: EventType.Click }, EventType.Click);
             const { isLogin, extra, isFirstLogin } = await loginImplement({}, true);
             if (!isLogin) {
               console.log('login failed');
               return;
             }
 
-            track('LoginGuideModal', { type: 'click_confirm_login', isFirstLogin }, EventType.Click);
+            track(
+              'LoginGuideModal',
+              { type: 'click_confirm_login', isFirstLogin, eventType: EventType.Click },
+              EventType.Click
+            );
             if (isFirstLogin && extra?.firstLogin?.reward) {
               const { rewardValue } = extra.firstLogin.reward;
               createToast(`{slot-i18ntran-loginGuide.rewardTips}`, {
@@ -94,10 +104,10 @@ rewardsEmitter.on(InvokeUnloginModalEventName, async (type: 'JOLI_COIN' | 'ADS-J
         cancel: {
           text: params.cancelButtonText,
           onPress: ({ type }) => {
-            track('LoginGuideModal', {}, EventType.Hide);
+            track('LoginGuideModal', { eventType: EventType.Hide }, EventType.Hide);
 
             const trackType = type === 'CANCEL' ? 'click_close' : 'click_watch_ads';
-            track('LoginGuideModal', { type: trackType }, EventType.Click);
+            track('LoginGuideModal', { type: trackType, eventType: EventType.Click }, EventType.Click);
             rewardsEmitter.emit(UseUnloginModalResultEventName, { result: 'FAILED' });
             modal.destroy();
           }