@jolibox/implement 1.1.4-beta.7 → 1.1.4-beta.8

package/src/h5/api/task.ts

@@ -16,9 +16,16 @@ const onLevelFinished = createAPI('levelFinished', {
   implement: async (levelId, parmas) => {
     const { result, duration } = parmas;
     logger.info(`onLevelFinished`, result, duration);
-    return taskTracker.reporter({
-      event: 'COMPLETE_QUEST'
-    });
+    await Promise.all([
+      taskTracker.reporter({
+        event: 'COMPLETE_GAME_LEVEL'
+      }),
+      taskTracker.tracker('LevelFinished', {
+        levelId,
+        result,
+        duration
+      })
+    ]);
   }
 });
 
@@ -31,15 +38,19 @@ const onTaskFinished = createAPI('taskFinished', {
   ),
   implement: async (taskId, params) => {
     const { duration } = params;
-    logger.info(`onTaskFinished`, duration);
+    await taskTracker.tracker('TaskFinished', {
+      duration,
+      taskId
+    });
   }
 });
 
 const onLevelUpgrade = createAPI('levelUpgrade', {
   paramsSchema: t.tuple(t.string(), t.string()),
   implement: async (levelId, name) => {
-    return await taskTracker.reporter({
-      event: 'COMPLETE_QUEST'
+    return await taskTracker.tracker('LevelUpgrade', {
+      name,
+      levelId
     });
   }
 });
@@ -47,14 +58,18 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
 const onHistoryUserLevel = createAPI('onHistoryUserLevel', {
   paramsSchema: t.tuple(t.number()),
   implement: async (level) => {
-    logger.info('onHistoryUserLevel', level);
+    return await taskTracker.tracker('HistoryUserLevel', {
+      level
+    });
   }
 });
 
 const onHistoryUserScore = createAPI('onHistoryUserScore', {
   paramsSchema: t.tuple(t.number()),
   implement: async (score) => {
-    logger.info('onHistoryUserScore', score);
+    return await taskTracker.tracker('HistoryUserScore', {
+      score
+    });
   }
 });
 
@@ -90,36 +105,25 @@ const onTaskEvent = createAPI('taskEvent', {
   ),
   implement: async (taskId, params) => {
     if (params.tools?.length) {
-      return await taskTracker.reporter({
-        event: 'USE_GAME_ITEM'
-      });
+      await Promise.all([
+        taskTracker.reporter({
+          event: 'USE_GAME_ITEM'
+        }),
+        taskTracker.tracker('UseGameItem', {
+          taskId,
+          ...params
+        })
+      ]);
     }
   }
 });
 
-const onTaskPayment = createAPI('taskPayment', {
-  paramsSchema: t.tuple(
-    t.string(),
-    t.object({
-      id: t.string(),
-      amount: t.number(),
-      unit: t.string()
-    })
-  ),
-  implement: async () => {
-    return await taskTracker.reporter({
-      event: 'IN_GAME_PURCHASES'
-    });
-  }
-});
-
 commands.registerCommand('TaskTrackerSDK.levelFinished', onLevelFinished);
 commands.registerCommand('TaskTrackerSDK.taskFinished', onTaskFinished);
 commands.registerCommand('TaskTrackerSDK.levelUpgrade', onLevelUpgrade);
 commands.registerCommand('TaskTrackerSDK.historyUserLevel', onHistoryUserLevel);
 commands.registerCommand('TaskTrackerSDK.historyUserScore', onHistoryUserScore);
 commands.registerCommand('TaskTrackerSDK.taskEvent', onTaskEvent);
-commands.registerCommand('TaskTrackerSDK.taskPayment', onTaskPayment);
 
 registerCanIUse('TaskTrackerSDK.onLevelFinished', {
   version: '1.0.0',
@@ -184,14 +188,3 @@ registerCanIUse('TaskTrackerSDK.onTaskEvent', {
     }
   }
 });
-
-registerCanIUse('TaskTrackerSDK.onTaskPayment', {
-  version: '1.0.0',
-  properties: {
-    taskId: '1.0.0',
-    params: {
-      amount: '1.0.0',
-      unit: '1.0.0'
-    }
-  }
-});

package/src/h5/report/index.ts

@@ -12,8 +12,8 @@ const commonParams: CommonReportConfig = {
   type: EProject.WebSDK,
   platform: 'h5',
   jssdk_version: context.sdkInfo.jssdkVersion,
-  source_id: context.game_id,
-  source_version: context.game_version
+  mp_id: context.mpId,
+  mp_version: context.mpVersion
 };
 
 const { track, trackPerformance } = createTracks((...args) => {
@@ -28,8 +28,8 @@ const { track, trackPerformance } = createTracks((...args) => {
     : {};
   const extra = {
     ...originExtra,
-    source_id: (_data.source_id as string) ?? '',
-    source_version: (_data.source_version as string) ?? ''
+    mp_id: (_data.mp_id as string) ?? '',
+    mp_version: (_data.mp_version as string) ?? ''
   };
   const eventBody: IEvent = {
     name: data.tag,

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

@@ -17,8 +17,8 @@ export class H5TaskTracker extends TaskTracker {
 
   constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     super(eventEmitter, interval);
-    this.gameId = context.game_id;
-    this.sessionId = context.session_id;
+    this.gameId = context.mpId;
+    this.sessionId = context.sessionId;
     this.track = track;
   }
 

package/src/native/api/ads.ts

@@ -0,0 +1,52 @@
+import { createCommands, logger } from '@jolibox/common';
+import { createSyncAPI, registerCanIUse } from './base';
+
+const commands = createCommands();
+
+const adInit = createSyncAPI('adInit', {
+  implement: (config) => {
+    logger.log('[JoliboxAdsSDK] adInit', config);
+  }
+});
+
+const adConfig = createSyncAPI('adConfig', {
+  implement: (params) => {
+    logger.log('[JoliboxAdsSDK] adConfig', params);
+  }
+});
+
+const adBreak = createSyncAPI('adBreak', {
+  implement: (params) => {
+    logger.log('[JoliboxAdsSDK] adBreak', params);
+  }
+});
+
+const adUnit = createSyncAPI('adUnit', {
+  implement: (params) => {
+    logger.log('[JoliboxAdsSDK] adUnit', params);
+  }
+});
+
+commands.registerCommand('AdsSDK.init', adInit);
+
+commands.registerCommand('AdsSDK.adConfig', adConfig);
+
+commands.registerCommand('AdsSDK.adBreak', adBreak);
+
+commands.registerCommand('AdsSDK.adUnit', adUnit);
+
+registerCanIUse('AdsSDK.init', {
+  version: '1.0.0'
+});
+
+registerCanIUse('AdsSDK.adConfig', {
+  version: '1.0.0'
+});
+
+registerCanIUse('AdsSDK.adBreak', {
+  version: '1.0.0'
+});
+
+registerCanIUse('AdsSDK.adUnit', {
+  version: '1.0.0'
+});

package/src/native/api/index.ts

@@ -5,3 +5,4 @@ import './storage';
 import './keyboard';
 import './task';
 import './login';
+import './ads';

package/src/native/api/lifecycle.ts

@@ -6,8 +6,8 @@ import { nativeTaskEmitter } from '../report';
 
 const EXIT_GAME = 'exitGame';
 const ON_READY = 'onReady';
-const ON_GAME_SHOW = 'onGameShow';
-const ON_GAME_HIDE = 'onGameHide';
+const ON_SHOW = 'onJoliboxShow';
+const ON_HIDE = 'onJoliboxHide';
 
 const commands = createCommands();
 
@@ -22,7 +22,7 @@ const exitGame = createAPI(EXIT_GAME, {
   }
 });
 
-const onGameShow = createSyncAPI(ON_GAME_SHOW, {
+const onShow = createSyncAPI(ON_SHOW, {
   paramsSchema: t.tuple(t.function()),
   implement(callback) {
     const safeCallback = safeCallbackWrapper(callback);
@@ -33,7 +33,7 @@ const onGameShow = createSyncAPI(ON_GAME_SHOW, {
   }
 });
 
-const onGameHide = createSyncAPI(ON_GAME_HIDE, {
+const onHide = createSyncAPI(ON_HIDE, {
   paramsSchema: t.tuple(t.function()),
   implement(callback) {
     const safeCallback = safeCallbackWrapper(callback);
@@ -56,8 +56,8 @@ const onReadyHandler = createSyncAPI(ON_READY, {
 
 commands.registerCommand('LifecycleSDK.exit', exitGame);
 commands.registerCommand('LifecycleSDK.onReady', onReadyHandler);
-commands.registerCommand('LifecycleSDK.onJoliboxShow', onGameShow);
-commands.registerCommand('LifecycleSDK.onJoliboxHide', onGameHide);
+commands.registerCommand('LifecycleSDK.onJoliboxShow', onShow);
+commands.registerCommand('LifecycleSDK.onJoliboxHide', onHide);
 
 registerCanIUse('lifeCycle.exit', {
   version: '1.0.0' // mock
@@ -67,10 +67,10 @@ registerCanIUse('lifeCycle.onReady', {
   version: '1.0.0' // mock
 });
 
-registerCanIUse('lifeCycle.onGameShow', {
+registerCanIUse('lifeCycle.onJoliboxShow', {
   version: '1.0.0' // mock
 });
 
-registerCanIUse('lifeCycle.onGameHide', {
+registerCanIUse('lifeCycle.onJoliboxHide', {
   version: '1.0.0' // mock
 });

package/src/native/api/login.ts

@@ -25,7 +25,9 @@ registerCanIUse('checkSession', {
 
 const login = createAPI('login', {
   async implement() {
-    const isLogin = await applyNative('checkLoginAsync');
+    const {
+      data: { isLogin }
+    } = await applyNative('checkLoginAsync');
     if (isLogin) {
       return { isLogin: true, token: context.hostUserInfo?.token };
     }

package/src/native/api/storage.ts

@@ -15,7 +15,7 @@ const getStorage = createAPI('getLocalStorage', {
         key: string;
         value: string | null;
       }>
-    >(`/api/games/user-storage/${context.game_id}`, {
+    >(`/api/games/user-storage/${context.mpId}`, {
       method: 'GET',
       responseType: 'json',
       appendHostCookie: true,
@@ -68,7 +68,7 @@ registerCanIUse('storage.getItem', {
 const setStorage = createAPI('setStorage', {
   paramsSchema: t.tuple(t.string(), t.or(t.string(), t.boolean(), t.number())),
   async implement(key, value) {
-    const gameId = context.game_id;
+    const gameId = context.mpId;
     const valueToStore = typeof value == 'string' ? value : String(value);
     const { response } = await fetch<StorageResponse<void>>(`/api/games/user-storage/${gameId}`, {
       method: 'POST',
@@ -122,7 +122,7 @@ registerCanIUse('storage.setItem', {
 export const removeStorage = createAPI('removeStorage', {
   paramsSchema: t.tuple(t.string()),
   async implement(key) {
-    const gameId = context.game_id;
+    const gameId = context.mpId;
     const { response } = await fetch<StorageResponse<void>>(`/api/games/user-storage/${gameId}/remove`, {
       method: 'POST',
       responseType: 'json',
@@ -164,7 +164,7 @@ registerCanIUse('storage.removeItem', {
  */
 const clearStorage = createAPI('clearStorage', {
   async implement() {
-    const gameId = context.game_id;
+    const gameId = context.mpId;
     const { response } = await fetch<StorageResponse<void>>(`/api/games/user-storage/${gameId}/clear`, {
       method: 'POST',
       appendHostCookie: true

package/src/native/api/task.ts

@@ -17,19 +17,16 @@ const onLevelFinished = createAPI('levelFinished', {
     const { result, duration } = parmas;
     const tasks = [];
     tasks.push(
-      taskTracker.reportToNative({
-        event: 'LEVEL_FINISHED',
-        params: {
-          levelId,
-          result,
-          duration
-        }
+      taskTracker.tracker('LevelFinished', {
+        levelId,
+        result,
+        duration
       })
     );
 
     tasks.push(
       taskTracker.reporter({
-        event: 'COMPLETE_QUEST'
+        event: 'COMPLETE_GAME_LEVEL'
       })
     );
     await Promise.all(tasks);
@@ -46,7 +43,7 @@ const onTaskFinished = createAPI('taskFinished', {
   implement: async (taskId, params) => {
     const { duration } = params;
     return await taskTracker.reportToNative({
-      event: 'TASK_FINISHED',
+      event: 'TaskFinished',
       params: {
         duration,
         taskId
@@ -59,14 +56,9 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
   paramsSchema: t.tuple(t.string(), t.string()),
   implement: async (levelId, name) => {
     const tasks = [];
-    tasks.push(
-      taskTracker.reporter({
-        event: 'COMPLETE_QUEST'
-      })
-    );
     tasks.push(
       taskTracker.reportToNative({
-        event: 'LEVEL_UPGRADE',
+        event: 'LevelUpgrade',
         params: {
           name,
           levelId
@@ -81,7 +73,7 @@ const onHistoryUserLevel = createAPI('onHistoryUserLevel', {
   paramsSchema: t.tuple(t.number()),
   implement: async (level) => {
     return await taskTracker.reportToNative({
-      event: 'HISTORY_USER_LEVEL',
+      event: 'HistoryUserLevel',
       params: {
         level
       }
@@ -93,7 +85,7 @@ const onHistoryUserScore = createAPI('onHistoryUserScore', {
   paramsSchema: t.tuple(t.number()),
   implement: async (score) => {
     return await taskTracker.reportToNative({
-      event: 'HISTORY_USER_SCORE',
+      event: 'HistoryUserScore',
       params: {
         score
       }
@@ -135,7 +127,7 @@ const onTaskEvent = createAPI('taskEvent', {
     const tasks = [];
     tasks.push(
       taskTracker.reportToNative({
-        event: 'TASK_EVENT',
+        event: 'TaskEvent',
         params: {
           taskId,
           ...params
@@ -149,47 +141,26 @@ const onTaskEvent = createAPI('taskEvent', {
           event: 'USE_GAME_ITEM'
         })
       );
+      tasks.push(
+        taskTracker.reportToNative({
+          event: 'UseGameItem',
+          params: {
+            taskId,
+            ...params
+          }
+        })
+      );
     }
     await Promise.all(tasks);
   }
 });
 
-const onTaskPayment = createAPI('taskPayment', {
-  paramsSchema: t.tuple(
-    t.string(),
-    t.object({
-      id: t.string(),
-      amount: t.number(),
-      unit: t.string()
-    })
-  ),
-  implement: async (taskId, params) => {
-    const tasks = [];
-    tasks.push(
-      taskTracker.reportToNative({
-        event: 'TASK_PAYMENT',
-        params: {
-          taskId,
-          params
-        }
-      })
-    );
-    tasks.push(
-      taskTracker.reporter({
-        event: 'IN_GAME_PURCHASES'
-      })
-    );
-    await Promise.all(tasks);
-  }
-});
-
 commands.registerCommand('TaskTrackerSDK.levelFinished', onLevelFinished);
 commands.registerCommand('TaskTrackerSDK.taskFinished', onTaskFinished);
 commands.registerCommand('TaskTrackerSDK.levelUpgrade', onLevelUpgrade);
 commands.registerCommand('TaskTrackerSDK.historyUserLevel', onHistoryUserLevel);
 commands.registerCommand('TaskTrackerSDK.historyUserScore', onHistoryUserScore);
 commands.registerCommand('TaskTrackerSDK.taskEvent', onTaskEvent);
-commands.registerCommand('TaskTrackerSDK.taskPayment', onTaskPayment);
 
 registerCanIUse('TaskTrackerSDK.onLevelFinished', {
   version: '1.0.0',
@@ -254,14 +225,3 @@ registerCanIUse('TaskTrackerSDK.onTaskEvent', {
     }
   }
 });
-
-registerCanIUse('TaskTrackerSDK.onTaskPayment', {
-  version: '1.0.0',
-  properties: {
-    taskId: '1.0.0',
-    params: {
-      amount: '1.0.0',
-      unit: '1.0.0'
-    }
-  }
-});

package/src/native/bootstrap/index.ts

@@ -14,6 +14,7 @@ RuntimeLoader.doExit(() => {
   track('onBeforeExit', {
     timestamp: Date.now()
   });
+  taskTracker.close(Date.now() - start_timestamp);
   return false; // 默认不打断退出
 });
 

package/src/native/report/index.ts

@@ -15,8 +15,8 @@ const reportNative: ReportHandler = (event, data, webviewId) => {
     : {};
   const extra = {
     ...originExtra,
-    source_id: (_data.source_id as string) ?? '',
-    source_version: (_data.source_version as string) ?? ''
+    mp_id: (_data.mp_id as string) ?? '',
+    mp_version: (_data.mp_version as string) ?? ''
   };
   invokeNative('trackAsync', {
     event,
@@ -29,8 +29,8 @@ const { track, trackPerformance } = createTracks(reportNative, {
   type: EProject.AppSDK,
   platform: 'native',
   jssdk_version: context.sdkInfo?.jssdkVersion ?? '1.0.0',
-  source_id: context.game_id,
-  source_version: context.game_version
+  mp_id: context.mpId,
+  mp_version: context.mpVersion
 });
 
 export { track, trackPerformance };

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

@@ -11,15 +11,15 @@ import type { Track } from '.';
 import type { TrackEvent } from '@jolibox/types';
 
 type NativeTaskPointEvent =
-  | 'OPEN_GAME'
-  | 'CLOSE_GAME'
-  | 'LEVEL_FINISHED'
-  | 'TASK_FINISHED'
-  | 'LEVEL_UPGRADE'
-  | 'HISTORY_USER_LEVEL'
-  | 'HISTORY_USER_SCORE'
-  | 'TASK_PAYMENT'
-  | 'TASK_EVENT';
+  | 'OpenGame'
+  | 'CloseGame'
+  | 'LevelFinished'
+  | 'TaskFinished'
+  | 'LevelUpgrade'
+  | 'HistoryUserLevel'
+  | 'HistoryUserScore'
+  | 'UseGameItem'
+  | 'TaskEvent';
 
 export type NativeTaskPoint = {
   event: NativeTaskPointEvent;
@@ -32,8 +32,8 @@ export class NativeTaskTracker extends TaskTracker {
 
   constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     super(eventEmitter, interval);
-    this.gameId = context.game_id;
-    this.sessionId = context.session_id;
+    this.gameId = context.mpId;
+    this.sessionId = context.sessionId;
     this.track = track;
   }
   async reporter(point: TaskPoint): Promise<void> {

package/src/native/types/native-method-map.d.ts

@@ -3,15 +3,15 @@ import { Env, ISystemInfo } from '@jolibox/types';
 declare global {
   namespace jsb.service {
     type NativeTaskPointEvent =
-      | 'OPEN_GAME'
-      | 'CLOSE_GAME'
-      | 'LEVEL_FINISHED'
-      | 'TASK_FINISHED'
-      | 'LEVEL_UPGRADE'
-      | 'HISTORY_USER_LEVEL'
-      | 'HISTORY_USER_SCORE'
-      | 'TASK_PAYMENT'
-      | 'TASK_EVENT';
+      | 'OpenGame'
+      | 'CloseGame'
+      | 'LevelFinished'
+      | 'TaskFinished'
+      | 'LevelUpgrade'
+      | 'HistoryUserLevel'
+      | 'HistoryUserScore'
+      | 'UseGameItem'
+      | 'TaskEvent';
     interface NativeMethodMap {
       prefetchImages: (params: {
         /** 需要预下载的图片 url */