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

package/dist/index.native.js

@@ -1384,7 +1384,7 @@ var init_xua = __esm({
         return "PC";
       }
     };
-    jssdkVersion = "1.1.4-beta.7";
+    jssdkVersion = "1.1.4-beta.8";
     getAppVersion = () => {
       return jssdkVersion;
     };
@@ -1431,20 +1431,14 @@ var init_context = __esm({
     init_xua();
     defaultEnv = {
       deviceInfo: {
-        brand: "",
-        model: "",
+        brand: "UnknownBrand",
+        model: "UnknownModel",
         did: getDeviceId(),
         pixelRatio: window.devicePixelRatio || 1,
         platform: "h5",
-        system: "",
+        system: "UnknownSystemVersion",
         lang: "zh"
       },
-      hostInfo: {
-        appName: "",
-        version: getAppVersion(),
-        aid: "",
-        channel: ""
-      },
       sdkInfo: {
         nativeSDKVersion: "",
         jssdkVersion: getAppVersion()
@@ -1473,11 +1467,11 @@ var init_context = __esm({
         get joliboxEnv() {
           return joliboxEnv;
         },
-        get game_id() {
+        get mpId() {
           return defaultGameID ?? payloadJson["id"];
         },
-        get game_version() {
-          return headerJson.ver ?? "";
+        get mpVersion() {
+          return headerJson.ver ?? getAppVersion();
         },
         get platform() {
           return env2.platform;
@@ -1494,7 +1488,7 @@ var init_context = __esm({
         get hostUserInfo() {
           return env2.hostUserInfo;
         },
-        get session_id() {
+        get sessionId() {
           return env2.clientSessionId ?? sessionId ?? defaultSessionId;
         },
         onEnvConfigChanged: (newConfig) => {
@@ -1702,7 +1696,7 @@ var init_task_track = __esm({
           });
           this.tracker("PlayGame", { duration: duration / 1e3 });
         });
-        this.interval = interval ?? 10 * 1e3;
+        this.interval = interval ?? 5 * 1e3;
         eventEmitter.on("visible", (visible) => {
           this.visible = visible;
         });
@@ -1993,8 +1987,8 @@ var init_task_tracker = __esm({
     NativeTaskTracker = class extends TaskTracker {
       constructor(track2, eventEmitter, interval) {
         super(eventEmitter, interval);
-        this.gameId = context.game_id;
-        this.sessionId = context.session_id;
+        this.gameId = context.mpId;
+        this.sessionId = context.sessionId;
         this.track = track2;
       }
       async reporter(point) {
@@ -2049,8 +2043,8 @@ var init_report5 = __esm({
       const originExtra = ie(_data.extra) ? _data.extra : b(_data.extra) ? JSON.parse(_data.extra) : {};
       const extra = {
         ...originExtra,
-        source_id: _data.source_id ?? "",
-        source_version: _data.source_version ?? ""
+        mp_id: _data.mp_id ?? "",
+        mp_version: _data.mp_version ?? ""
       };
       invokeNative("trackAsync", {
         event,
@@ -2062,8 +2056,8 @@ var init_report5 = __esm({
       type: "app-sdk" /* 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
     }));
     commands = Vn();
     commands.registerCommand("ReportSDK.traceSystemTimeline", ({ event, duration }) => {
@@ -2816,9 +2810,9 @@ var require_lifecycle = __commonJS({
     init_report5();
     var EXIT_GAME = "exitGame";
     var ON_READY = "onReady";
-    var ON_GAME_SHOW = "onGameShow";
-    var ON_GAME_HIDE = "onGameHide";
-    var commands8 = Vn();
+    var ON_SHOW = "onJoliboxShow";
+    var ON_HIDE = "onJoliboxHide";
+    var commands9 = Vn();
     var safeCallbackWrapper2 = He(reportError);
     var exitGame = createAPI(EXIT_GAME, {
       paramsSchema: t.tuple(t.function()),
@@ -2828,7 +2822,7 @@ var require_lifecycle = __commonJS({
         await applyNative("exitAppAsync");
       }
     });
-    var onGameShow = createSyncAPI(ON_GAME_SHOW, {
+    var onShow = createSyncAPI(ON_SHOW, {
       paramsSchema: t.tuple(t.function()),
       implement(callback) {
         const safeCallback = safeCallbackWrapper2(callback);
@@ -2838,7 +2832,7 @@ var require_lifecycle = __commonJS({
         });
       }
     });
-    var onGameHide = createSyncAPI(ON_GAME_HIDE, {
+    var onHide = createSyncAPI(ON_HIDE, {
       paramsSchema: t.tuple(t.function()),
       implement(callback) {
         const safeCallback = safeCallbackWrapper2(callback);
@@ -2857,10 +2851,10 @@ var require_lifecycle = __commonJS({
         });
       }
     });
-    commands8.registerCommand("LifecycleSDK.exit", exitGame);
-    commands8.registerCommand("LifecycleSDK.onReady", onReadyHandler);
-    commands8.registerCommand("LifecycleSDK.onJoliboxShow", onGameShow);
-    commands8.registerCommand("LifecycleSDK.onJoliboxHide", onGameHide);
+    commands9.registerCommand("LifecycleSDK.exit", exitGame);
+    commands9.registerCommand("LifecycleSDK.onReady", onReadyHandler);
+    commands9.registerCommand("LifecycleSDK.onJoliboxShow", onShow);
+    commands9.registerCommand("LifecycleSDK.onJoliboxHide", onHide);
     registerCanIUse("lifeCycle.exit", {
       version: "1.0.0"
       // mock
@@ -2869,11 +2863,11 @@ var require_lifecycle = __commonJS({
       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
     });
@@ -2892,6 +2886,7 @@ RuntimeLoader.doExit(() => {
   track("onBeforeExit", {
     timestamp: Date.now()
   });
+  taskTracker.close(Date.now() - start_timestamp);
   return false;
 });
 function addWebviewReadyListener() {
@@ -3143,7 +3138,7 @@ var commands4 = Vn();
 var getStorage2 = createAPI("getLocalStorage", {
   paramsSchema: t.tuple(t.string()),
   async implement(key) {
-    const { response } = await innerFetch(`/api/games/user-storage/${context.game_id}`, {
+    const { response } = await innerFetch(`/api/games/user-storage/${context.mpId}`, {
       method: "GET",
       responseType: "json",
       appendHostCookie: true,
@@ -3191,7 +3186,7 @@ registerCanIUse("storage.getItem", {
 var 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 innerFetch(`/api/games/user-storage/${gameId}`, {
       method: "POST",
@@ -3236,7 +3231,7 @@ registerCanIUse("storage.setItem", {
 var removeStorage = createAPI("removeStorage", {
   paramsSchema: t.tuple(t.string()),
   async implement(key) {
-    const gameId = context.game_id;
+    const gameId = context.mpId;
     const { response } = await innerFetch(`/api/games/user-storage/${gameId}/remove`, {
       method: "POST",
       responseType: "json",
@@ -3271,7 +3266,7 @@ registerCanIUse("storage.removeItem", {
 });
 var clearStorage = createAPI("clearStorage", {
   async implement() {
-    const gameId = context.game_id;
+    const gameId = context.mpId;
     const { response } = await innerFetch(`/api/games/user-storage/${gameId}/clear`, {
       method: "POST",
       appendHostCookie: true
@@ -3452,18 +3447,15 @@ var 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);
@@ -3479,7 +3471,7 @@ var onTaskFinished = createAPI("taskFinished", {
   implement: async (taskId, params) => {
     const { duration } = params;
     return await taskTracker.reportToNative({
-      event: "TASK_FINISHED",
+      event: "TaskFinished",
       params: {
         duration,
         taskId
@@ -3491,14 +3483,9 @@ var 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
@@ -3512,7 +3499,7 @@ var onHistoryUserLevel = createAPI("onHistoryUserLevel", {
   paramsSchema: t.tuple(t.number()),
   implement: async (level) => {
     return await taskTracker.reportToNative({
-      event: "HISTORY_USER_LEVEL",
+      event: "HistoryUserLevel",
       params: {
         level
       }
@@ -3523,7 +3510,7 @@ var onHistoryUserScore = createAPI("onHistoryUserScore", {
   paramsSchema: t.tuple(t.number()),
   implement: async (score) => {
     return await taskTracker.reportToNative({
-      event: "HISTORY_USER_SCORE",
+      event: "HistoryUserScore",
       params: {
         score
       }
@@ -3558,7 +3545,7 @@ var onTaskEvent = createAPI("taskEvent", {
     const tasks = [];
     tasks.push(
       taskTracker.reportToNative({
-        event: "TASK_EVENT",
+        event: "TaskEvent",
         params: {
           taskId,
           ...params
@@ -3571,45 +3558,25 @@ var onTaskEvent = createAPI("taskEvent", {
           event: "USE_GAME_ITEM"
         })
       );
+      tasks.push(
+        taskTracker.reportToNative({
+          event: "UseGameItem",
+          params: {
+            taskId,
+            ...params
+          }
+        })
+      );
     }
     await Promise.all(tasks);
   }
 });
-var 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);
-  }
-});
 commands6.registerCommand("TaskTrackerSDK.levelFinished", onLevelFinished);
 commands6.registerCommand("TaskTrackerSDK.taskFinished", onTaskFinished);
 commands6.registerCommand("TaskTrackerSDK.levelUpgrade", onLevelUpgrade);
 commands6.registerCommand("TaskTrackerSDK.historyUserLevel", onHistoryUserLevel);
 commands6.registerCommand("TaskTrackerSDK.historyUserScore", onHistoryUserScore);
 commands6.registerCommand("TaskTrackerSDK.taskEvent", onTaskEvent);
-commands6.registerCommand("TaskTrackerSDK.taskPayment", onTaskPayment);
 registerCanIUse("TaskTrackerSDK.onLevelFinished", {
   version: "1.0.0",
   properties: {
@@ -3668,16 +3635,6 @@ registerCanIUse("TaskTrackerSDK.onTaskEvent", {
     }
   }
 });
-registerCanIUse("TaskTrackerSDK.onTaskPayment", {
-  version: "1.0.0",
-  properties: {
-    taskId: "1.0.0",
-    params: {
-      amount: "1.0.0",
-      unit: "1.0.0"
-    }
-  }
-});
 
 // src/native/api/login.ts
 init_context();
@@ -3705,7 +3662,9 @@ registerCanIUse("checkSession", {
 });
 var 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 };
     }
@@ -3745,6 +3704,47 @@ var commands7 = Vn();
 commands7.registerCommand("API.login", login);
 commands7.registerCommand("API.checkSession", checkSession);
 
+// src/native/api/ads.ts
+init_index_es();
+init_base();
+var commands8 = Vn();
+var adInit = createSyncAPI("adInit", {
+  implement: (config2) => {
+    q.log("[JoliboxAdsSDK] adInit", config2);
+  }
+});
+var adConfig = createSyncAPI("adConfig", {
+  implement: (params) => {
+    q.log("[JoliboxAdsSDK] adConfig", params);
+  }
+});
+var adBreak = createSyncAPI("adBreak", {
+  implement: (params) => {
+    q.log("[JoliboxAdsSDK] adBreak", params);
+  }
+});
+var adUnit = createSyncAPI("adUnit", {
+  implement: (params) => {
+    q.log("[JoliboxAdsSDK] adUnit", params);
+  }
+});
+commands8.registerCommand("AdsSDK.init", adInit);
+commands8.registerCommand("AdsSDK.adConfig", adConfig);
+commands8.registerCommand("AdsSDK.adBreak", adBreak);
+commands8.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"
+});
+
 // src/index.native.ts
 init_report5();
 config();

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

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

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

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

package/dist/native/report/task-tracker.d.ts

@@ -5,7 +5,7 @@ import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter } from '@jolibox/common';
 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';
+type NativeTaskPointEvent = 'OpenGame' | 'CloseGame' | 'LevelFinished' | 'TaskFinished' | 'LevelUpgrade' | 'HistoryUserLevel' | 'HistoryUserScore' | 'UseGameItem' | 'TaskEvent';
 export type NativeTaskPoint = {
     event: NativeTaskPointEvent;
     params: Record<string, unknown>;

package/implement.build.log

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.4-beta.7",
+  "version": "1.1.4-beta.8",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.4-beta.7",
-    "@jolibox/types": "1.1.4-beta.7",
+    "@jolibox/common": "1.1.4-beta.8",
+    "@jolibox/types": "1.1.4-beta.8",
     "localforage": "1.10.0"
   },
   "devDependencies": {

package/src/common/context/index.ts

@@ -12,20 +12,14 @@ declare const globalThis: {
 
 const defaultEnv: Env = {
   deviceInfo: {
-    brand: '',
-    model: '',
+    brand: 'UnknownBrand',
+    model: 'UnknownModel',
     did: getDeviceId(),
     pixelRatio: window.devicePixelRatio || 1,
     platform: 'h5',
-    system: '',
+    system: 'UnknownSystemVersion',
     lang: 'zh'
   },
-  hostInfo: {
-    appName: '',
-    version: getAppVersion(),
-    aid: '',
-    channel: ''
-  },
   sdkInfo: {
     nativeSDKVersion: '',
     jssdkVersion: getAppVersion()
@@ -58,11 +52,11 @@ const wrapContext = () => {
     get joliboxEnv() {
       return joliboxEnv;
     },
-    get game_id(): string {
+    get mpId(): string {
       return defaultGameID ?? payloadJson['id'];
     },
-    get game_version(): string {
-      return headerJson.ver ?? '';
+    get mpVersion(): string {
+      return headerJson.ver ?? getAppVersion();
     },
     get platform(): Env['platform'] {
       return env.platform;
@@ -79,7 +73,7 @@ const wrapContext = () => {
     get hostUserInfo(): HostUserInfo {
       return env.hostUserInfo;
     },
-    get session_id(): string {
+    get sessionId(): string {
       return env.clientSessionId ?? sessionId ?? defaultSessionId;
     },
     onEnvConfigChanged: (newConfig: Partial<Env>) => {

package/src/common/report/base-tracker.ts

@@ -76,7 +76,7 @@ export abstract class EventTracker {
       platform: 1000,
       os: context.deviceInfo.platform,
       appVersion: nativeSDKVersion ?? jssdkVersion ?? '1.0.0', // mock
-      appId: '1',
+      appId: context.hostInfo?.aid ?? '1',
       model: context.deviceInfo.model ?? 'UnknownModel',
       brand: context.deviceInfo.brand ?? 'UnknownBrand',
       uuid: context.deviceInfo.did,

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

@@ -5,7 +5,7 @@ type TaskEvent =
   | 'OPEN_GAME'
   | 'PLAY_GAME'
   | 'CLOSE_GAME'
-  | 'COMPLETE_QUEST'
+  | 'COMPLETE_GAME_LEVEL'
   | 'USE_GAME_ITEM' // 使用道具
   | 'IN_GAME_PURCHASES' // 游戏内购
   | 'ADS_UNLOCK_GAME'; // 广告解锁
@@ -31,7 +31,7 @@ export abstract class TaskTracker {
   abstract reporter(point: TaskPoint): void;
   abstract tracker(point: TrackEvent, info: Record<string, unknown> | null): void;
   constructor(eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
-    this.interval = interval ?? 10 * 1000;
+    this.interval = interval ?? 5 * 1000;
 
     eventEmitter.on('visible', (visible) => {
       this.visible = visible;

package/src/common/report/types.ts

@@ -21,8 +21,8 @@ export interface CommonReportConfig {
   type: EProject;
   platform: 'native' | 'h5';
   jssdk_version: string;
-  source_id: string;
-  source_version: string;
+  mp_id: string;
+  mp_version: string;
   trace_id?: number;
 }
 

package/src/h5/api/get-system-info.ts

@@ -1,5 +1,5 @@
 import { context } from '@/common/context';
-import { createAPI, createSyncAPI, registerCanIUse } from './base';
+import { createSyncAPI, registerCanIUse } from './base';
 import { createCommands } from '@jolibox/common';
 import { ISystemInfo } from '@jolibox/types';
 

package/src/h5/api/lifecycle.ts

@@ -1,25 +1,15 @@
-import { BaseError, createCommands, EventEmitter, hostEmitter, wrapUserFunction } from '@jolibox/common';
-import { createAPI, createSyncAPI, registerCanIUse, t } from './base';
+import { BaseError, createCommands, hostEmitter, wrapUserFunction } from '@jolibox/common';
+import { createSyncAPI, registerCanIUse, t } from './base';
 import { reportError } from '@/common/report/errors/report';
 import { h5TaskEmitter } from '../report';
 
-const EXIT_GAME = 'exitGame';
-const ON_GAME_SHOW = 'onGameShow';
-const ON_GAME_HIDE = 'onGameHide';
+const ON_SHOW = 'onJoliboxShow';
+const ON_HIDE = 'onJoliboxHide';
 const ON_READY = 'onReady';
 
 const commands = createCommands();
 
 const safeCallbackWrapper = wrapUserFunction(reportError as (err: Error | BaseError) => void);
-const exitGame = createAPI(EXIT_GAME, {
-  async implement(onBeforeExit: () => void) {
-    const safeCallback = safeCallbackWrapper(onBeforeExit);
-    // 集中上报
-    safeCallback.call(this);
-
-    //exit
-  }
-});
 
 let isPageVisible = true;
 let isPageFocused = true;
@@ -58,7 +48,7 @@ document.addEventListener('visibilitychange', handleVisibilityChange);
 window.addEventListener('focus', () => handleFocusBlur('focus'));
 window.addEventListener('blur', () => handleFocusBlur('blur'));
 
-const onGameShow = createSyncAPI(ON_GAME_SHOW, {
+const onShow = createSyncAPI(ON_SHOW, {
   paramsSchema: t.tuple(t.function()),
   implement(callback) {
     const safeCallback = safeCallbackWrapper(callback);
@@ -68,7 +58,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);
@@ -88,23 +78,18 @@ 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);
-
-registerCanIUse('lifeCycle.exitGame', {
-  version: '1.0.0' // mock
-});
+commands.registerCommand('LifecycleSDK.onJoliboxShow', onShow);
+commands.registerCommand('LifecycleSDK.onJoliboxHide', onHide);
 
 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/h5/api/storage.ts

@@ -24,7 +24,7 @@ export class JoliboxCloudStorage {
   /**
    *  Cloud storage getItem api
    */
-  private getGameId = () => context.game_id;
+  private getGameId = () => context.mpId;
   /**
    *
    * @param key getItem key