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

package/.rush/temp/package-deps_build.json

@@ -4,7 +4,7 @@
     "packages/implement/.eslintrc.js": "7a3d2747dc887655ca9e2d3ff621f7dfd98500b9",
     "packages/implement/README.md": "5660cd88848b7a5428394cc34d881a35dd402188",
     "packages/implement/esbuild.config.js": "a55a01edf7475b868f9a946b93eb05b6b1bf756a",
-    "packages/implement/package.json": "0ee7dc2d98ab2c9afa752e001300d41070065757",
+    "packages/implement/package.json": "b4965993e329dd738a1dcb25b2de86c7bcde816b",
     "packages/implement/src/common/api-factory/index.ts": "b1c4018f18db700c80826d70465c79f0adf10a8c",
     "packages/implement/src/common/api-factory/validator/__tests__/validate/any.test.ts": "6e225e09fce401b374221ad2e4fe33bc91df4152",
     "packages/implement/src/common/api-factory/validator/__tests__/validate/array.test.ts": "8a9cc32be03e952f1176a970fea033d597c176cb",
@@ -39,7 +39,7 @@
     "packages/implement/src/common/report/errors/report/index.ts": "bee6f5f324ebddcc423c3549916a0eee04e880cf",
     "packages/implement/src/common/report/errors/report/listeners.ts": "794e5731d27b073c0576d03a6fa4c2a8bfd3b87a",
     "packages/implement/src/common/report/index.ts": "6d94d6985cb79a460ab9e2e84fa1b77b5db2b25a",
-    "packages/implement/src/common/report/task-track/index.ts": "51f0d57336b8f1d45a820693522e24c033a05bfc",
+    "packages/implement/src/common/report/task-track/index.ts": "29824a4ac5573227516ec78f4cfd627b5f4ca67a",
     "packages/implement/src/common/report/track.ts": "b20618f24668a625164300cf8d6629c0cea9e95d",
     "packages/implement/src/common/report/types.ts": "9c8a3e532d4ac3add61a79b6a3e4938c90537e5d",
     "packages/implement/src/h5/ads/ads-action-detection.ts": "ad06449b7471e27b505c8688c0dd014b9e0a6a0f",
@@ -58,9 +58,9 @@
     "packages/implement/src/h5/http/utils/index.ts": "05f4d94be09b9bfdcbb1365b31a5559e44a74991",
     "packages/implement/src/h5/http/utils/session.ts": "f6873cbd413a1de02a481179b18100b7e6100abf",
     "packages/implement/src/h5/report/errors/index.ts": "8221eee1dde2599bf644046f6cd1cb5466e5c74a",
-    "packages/implement/src/h5/report/event-tracker.ts": "850e04e35ddeb0ab4904bdccec12691724457744",
-    "packages/implement/src/h5/report/index.ts": "b81f05b8fbee77c5d70946c3539271cc2ed0bf5e",
-    "packages/implement/src/h5/report/task-tracker.ts": "a355ce8c6542d81b2b540bbf859626fe9fee2849",
+    "packages/implement/src/h5/report/event-tracker.ts": "8cabdba89106b72f98a8a4d7bb9a232340609942",
+    "packages/implement/src/h5/report/index.ts": "8269b38f705af0c4968d31d5bfb808107e94c6a0",
+    "packages/implement/src/h5/report/task-tracker.ts": "96af1920b72abcb5dd85ca2e1c73d4abd478e17f",
     "packages/implement/src/index.native.ts": "39f7832965ef86a4bae707db859f64e9eb50b8af",
     "packages/implement/src/index.ts": "4e3f5e86c83b36beda5b9609f7e35f3ff69e6ae6",
     "packages/implement/src/native/api/base.ts": "c4c4d04519cdbc3a08226c620f6314ee3b151435",
@@ -92,8 +92,8 @@
     "packages/implement/src/native/network/types.ts": "4e8eb72bf0b0b26a5298ce42d96855d27769be51",
     "packages/implement/src/native/network/utils.ts": "cc94ff34d8cda8e8a2a4731185c1d57c7dd04b92",
     "packages/implement/src/native/report/errors/index.ts": "d2cd492f07c9b98bd8d469d4a5a84bb8520a3dd2",
-    "packages/implement/src/native/report/index.ts": "db858a3285faa77d820ba2bafcca51cf95485671",
-    "packages/implement/src/native/report/task-tracker.ts": "30b5a5d88fffa490ae085b7571fb3c1ef526a3ee",
+    "packages/implement/src/native/report/index.ts": "60d503f20d1d6449a9080ed1678666bf65c7c043",
+    "packages/implement/src/native/report/task-tracker.ts": "da64af492d7a5727e32e009037af8a1c5eafd0a8",
     "packages/implement/src/native/types/global.d.ts": "065076bbecdd9a0ffe7a71c19475356a6f816cee",
     "packages/implement/src/native/types/native-method-map.d.ts": "b3e1d9f245accca3a12f821a1bbd9fc67bd8d4ab",
     "packages/implement/src/native/types/native-method.d.ts": "e4e22c921a5b54d4e10fe5ca18158d691fbfe3e7",

package/dist/common/report/task-track/index.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from '@jolibox/common';
+import { TrackEvent } from '@jolibox/types';
 type TaskEvent = 'OPEN_GAME' | 'PLAY_GAME' | 'CLOSE_GAME' | 'COMPLETE_QUEST' | 'USE_GAME_ITEM' | 'IN_GAME_PURCHASES' | 'ADS_UNLOCK_GAME';
 export type TaskPoint = {
     event: TaskEvent;
@@ -13,6 +14,7 @@ export declare abstract class TaskTracker {
         stop(): void;
     };
     abstract reporter(point: TaskPoint): void;
+    abstract tracker(point: TrackEvent, info: Record<string, unknown> | null): void;
     constructor(eventEmitter: EventEmitter<{
         visible: [boolean];
     }>, interval?: number);

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

@@ -3,12 +3,16 @@
  */
 import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter } from '@jolibox/common';
+import type { Track } from '.';
+import type { TrackEvent } from '@jolibox/types';
 export declare class H5TaskTracker extends TaskTracker {
     private gameId;
     private sessionId;
     private httpClient;
-    constructor(eventEmitter: EventEmitter<{
+    private track;
+    constructor(track: Track, eventEmitter: EventEmitter<{
         visible: [boolean];
     }>, interval?: number);
     reporter(point: TaskPoint): Promise<void>;
+    tracker(event: TrackEvent, info?: Record<string, unknown> | null): void;
 }

package/dist/index.js

@@ -2700,7 +2700,7 @@ var getPlatform = () => {
     return "PC";
   }
 };
-var jssdkVersion = "1.1.4-beta.5";
+var jssdkVersion = "1.1.4-beta.7";
 var getAppVersion = () => {
   return jssdkVersion;
 };
@@ -3185,6 +3185,10 @@ var H5EventTracker = class extends EventTracker {
     return context.testMode ?? false ? api.test : api.prod;
   }
   doReport(event) {
+    this.httpClient.post("/report", {
+      data: event,
+      timeout: 5e3
+    });
     q.info("Track", event);
   }
 };
@@ -3229,6 +3233,7 @@ var TaskTracker = class {
           // second
         }
       });
+      this.tracker("PlayGame", { duration: duration / 1e3 });
     });
     this.interval = interval ?? 10 * 1e3;
     eventEmitter.on("visible", (visible) => {
@@ -3244,6 +3249,7 @@ var TaskTracker = class {
         // second
       }
     });
+    this.tracker("OpenGame", { duration: duration ?? 0 / 1e3 });
     this.timer.start();
   }
   close(duration) {
@@ -3255,6 +3261,7 @@ var TaskTracker = class {
         // second
       }
     });
+    this.tracker("CloseGame", { duration: duration / 1e3 });
     this.timer.stop();
   }
   createRAFTimer(callback) {
@@ -3294,16 +3301,30 @@ var TaskTracker = class {
 
 // src/h5/report/task-tracker.ts
 var H5TaskTracker = class extends TaskTracker {
-  constructor(eventEmitter, interval) {
+  constructor(track2, eventEmitter, interval) {
     super(eventEmitter, interval);
     this.httpClient = new http_default();
     this.gameId = context.game_id;
     this.sessionId = context.session_id;
+    this.track = track2;
   }
   async reporter(point) {
     const { event, params } = point;
+    await this.httpClient.post(`/api/base/app-event`, {
+      data: {
+        eventType: event,
+        gameInfo: {
+          gameId: this.gameId,
+          sessionId: this.sessionId,
+          ...params
+        }
+      }
+    });
     q.log("-----task tracker-----", event, params);
   }
+  tracker(event, info = null) {
+    this.track(event, info);
+  }
 };
 
 // src/h5/report/index.ts
@@ -3342,7 +3363,7 @@ commands.registerCommand("ReportSDK.traceSystem", ({ event, info }) => {
   track(event, info);
 });
 var h5TaskEmitter = new _();
-var taskTracker = new H5TaskTracker(h5TaskEmitter);
+var taskTracker = new H5TaskTracker(track, h5TaskEmitter);
 
 // src/common/can-i-use.ts
 function registerCanIUseFactory(platform2) {

package/dist/index.native.js

@@ -1384,7 +1384,7 @@ var init_xua = __esm({
         return "PC";
       }
     };
-    jssdkVersion = "1.1.4-beta.5";
+    jssdkVersion = "1.1.4-beta.7";
     getAppVersion = () => {
       return jssdkVersion;
     };
@@ -1700,6 +1700,7 @@ var init_task_track = __esm({
               // second
             }
           });
+          this.tracker("PlayGame", { duration: duration / 1e3 });
         });
         this.interval = interval ?? 10 * 1e3;
         eventEmitter.on("visible", (visible) => {
@@ -1715,6 +1716,7 @@ var init_task_track = __esm({
             // second
           }
         });
+        this.tracker("OpenGame", { duration: duration ?? 0 / 1e3 });
         this.timer.start();
       }
       close(duration) {
@@ -1726,6 +1728,7 @@ var init_task_track = __esm({
             // second
           }
         });
+        this.tracker("CloseGame", { duration: duration / 1e3 });
         this.timer.stop();
       }
       createRAFTimer(callback) {
@@ -1988,10 +1991,11 @@ var init_task_tracker = __esm({
     init_network();
     init_bridge();
     NativeTaskTracker = class extends TaskTracker {
-      constructor(eventEmitter, interval) {
+      constructor(track2, eventEmitter, interval) {
         super(eventEmitter, interval);
         this.gameId = context.game_id;
         this.sessionId = context.session_id;
+        this.track = track2;
       }
       async reporter(point) {
         const { event, params } = point;
@@ -2021,6 +2025,9 @@ var init_task_tracker = __esm({
           gameId: this.gameId
         });
       }
+      tracker(event, info = null) {
+        this.track(event, info);
+      }
     };
   }
 });
@@ -2066,7 +2073,7 @@ var init_report5 = __esm({
       track(event, info);
     });
     nativeTaskEmitter = new _();
-    taskTracker = new NativeTaskTracker(nativeTaskEmitter);
+    taskTracker = new NativeTaskTracker(track, nativeTaskEmitter);
   }
 });
 

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

@@ -3,6 +3,8 @@
  */
 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';
 export type NativeTaskPoint = {
     event: NativeTaskPointEvent;
@@ -11,10 +13,12 @@ export type NativeTaskPoint = {
 export declare class NativeTaskTracker extends TaskTracker {
     private gameId;
     private sessionId;
-    constructor(eventEmitter: EventEmitter<{
+    private track;
+    constructor(track: Track, eventEmitter: EventEmitter<{
         visible: [boolean];
     }>, interval?: number);
     reporter(point: TaskPoint): Promise<void>;
     reportToNative(point: NativeTaskPoint): Promise<void>;
+    tracker(event: TrackEvent, info?: Record<string, unknown> | null): void;
 }
 export {};

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.4-beta.5 clean
+> @jolibox/implement@1.1.4-beta.7 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.4-beta.5 build:esm
+> @jolibox/implement@1.1.4-beta.7 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.5",
+  "version": "1.1.4-beta.7",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.4-beta.5",
-    "@jolibox/types": "1.1.4-beta.5",
+    "@jolibox/common": "1.1.4-beta.7",
+    "@jolibox/types": "1.1.4-beta.7",
     "localforage": "1.10.0"
   },
   "devDependencies": {

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

@@ -1,4 +1,5 @@
 import { EventEmitter } from '@jolibox/common';
+import { TrackEvent } from '@jolibox/types';
 
 type TaskEvent =
   | 'OPEN_GAME'
@@ -24,9 +25,11 @@ export abstract class TaskTracker {
         duration: duration / 1000 // second
       }
     });
+    this.tracker('PlayGame', { duration: duration / 1000 });
   });
 
   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;
 
@@ -43,6 +46,7 @@ export abstract class TaskTracker {
         duration: duration ?? 0 / 1000 // second
       }
     });
+    this.tracker('OpenGame', { duration: duration ?? 0 / 1000 });
     this.timer.start();
   }
 
@@ -54,6 +58,7 @@ export abstract class TaskTracker {
         duration: duration / 1000 // second
       }
     });
+    this.tracker('CloseGame', { duration: duration / 1000 });
     this.timer.stop();
   }
 

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

@@ -29,10 +29,10 @@ export class H5EventTracker extends EventTracker {
   });
 
   doReport(event: unknown[]): void {
-    // this.httpClient.post("/report", {
-    //     data: event,
-    //     timeout: 5000,
-    //   });
+    this.httpClient.post('/report', {
+      data: event,
+      timeout: 5000
+    });
     logger.info('Track', event);
   }
 }

package/src/h5/report/index.ts

@@ -53,4 +53,4 @@ commands.registerCommand('ReportSDK.traceSystem', ({ event, info }) => {
 });
 
 export const h5TaskEmitter = new EventEmitter<{ visible: [boolean] }>();
-export const taskTracker = new H5TaskTracker(h5TaskEmitter);
+export const taskTracker = new H5TaskTracker(track, h5TaskEmitter);

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

@@ -6,30 +6,37 @@ import { context } from '@/common/context';
 import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter, logger } from '@jolibox/common';
 import JoliboxHttpClient from '../http';
+import type { Track } from '.';
+import type { TrackEvent } from '@jolibox/types';
 
 export class H5TaskTracker extends TaskTracker {
   private gameId: string;
   private sessionId: string;
   private httpClient = new JoliboxHttpClient();
+  private track: Track;
 
-  constructor(eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
+  constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     super(eventEmitter, interval);
     this.gameId = context.game_id;
     this.sessionId = context.session_id;
+    this.track = track;
   }
 
   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
-    //     }
-    //   }
-    // });
+    await this.httpClient.post(`/api/base/app-event`, {
+      data: {
+        eventType: event,
+        gameInfo: {
+          gameId: this.gameId,
+          sessionId: this.sessionId,
+          ...params
+        }
+      }
+    });
     logger.log('-----task tracker-----', event, params);
   }
+  tracker(event: TrackEvent, info: Record<string, unknown> | null = null) {
+    this.track(event, info);
+  }
 }

package/src/native/report/index.ts

@@ -48,4 +48,4 @@ commands.registerCommand('ReportSDK.traceSystem', ({ event, info }) => {
 // 任务上报
 
 export const nativeTaskEmitter = new EventEmitter<{ visible: [boolean] }>();
-export const taskTracker = new NativeTaskTracker(nativeTaskEmitter);
+export const taskTracker = new NativeTaskTracker(track, nativeTaskEmitter);

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

@@ -7,6 +7,8 @@ import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter } from '@jolibox/common';
 import { innerFetch as fetch } from '../network';
 import { applyNative } from '../bootstrap/bridge';
+import type { Track } from '.';
+import type { TrackEvent } from '@jolibox/types';
 
 type NativeTaskPointEvent =
   | 'OPEN_GAME'
@@ -26,11 +28,13 @@ export type NativeTaskPoint = {
 export class NativeTaskTracker extends TaskTracker {
   private gameId: string;
   private sessionId: string;
+  private track: Track;
 
-  constructor(eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
+  constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     super(eventEmitter, interval);
     this.gameId = context.game_id;
     this.sessionId = context.session_id;
+    this.track = track;
   }
   async reporter(point: TaskPoint): Promise<void> {
     const { event, params } = point;
@@ -61,4 +65,8 @@ export class NativeTaskTracker extends TaskTracker {
       gameId: this.gameId
     });
   }
+
+  tracker(event: TrackEvent, info: Record<string, unknown> | null = null) {
+    this.track(event, info);
+  }
 }