@jolibox/implement 1.3.7 → 1.3.9

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

@@ -12,6 +12,7 @@ export declare class NativeTaskTracker extends TaskTracker {
     private sessionId;
     private track;
     private taskUrl;
+    private started;
     constructor(track: Track, eventEmitter: EventEmitter<{
         visible: [boolean];
     }>, interval?: number);

package/implement.build.log

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

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.3.7",
-    "@jolibox/types": "1.3.7",
-    "@jolibox/native-bridge": "1.3.7",
-    "@jolibox/ads": "1.3.7",
+    "@jolibox/common": "1.3.9",
+    "@jolibox/types": "1.3.9",
+    "@jolibox/native-bridge": "1.3.9",
+    "@jolibox/ads": "1.3.9",
     "localforage": "1.10.0",
-    "@jolibox/ui": "1.3.7",
+    "@jolibox/ui": "1.3.9",
     "web-vitals": "4.2.4"
   },
   "devDependencies": {

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

@@ -12,6 +12,8 @@ type TaskEvent =
   | 'GAME_TASK_EVENT' // 关卡行为
   | 'GAME_ENDED' // 游戏结束
   | 'GAME_LEVEL_UP' // 游戏关卡升级
+  | 'GAME_LEVEL_START' // 游戏关卡开始
+  | 'GAME_LEVEL_FAIL' // 游戏关卡失败
   | 'COMPLETE_WATCH_ADS'; // 完成观看广告
 export type TaskPoint = {
   event: TaskEvent;

package/src/common/utils/index.ts

@@ -15,6 +15,7 @@ const JOLIBOX_SUB_EVENT = 'JOLIBOX_SUB_EVENT';
 
 const CP_LOAD_FINISH = 'CP_LOAD_FINISH';
 const CP_LOAD_PROGRESS = 'CP_LOAD_PROGRESS';
+const CP_GAME_TTI = 'CP_GAME_TTI';
 
 interface JoliboxCustomEvent {
   [JOLIBOX_CUSTOM_ADS_EVENT_TYPE]: {
@@ -61,6 +62,9 @@ interface JoliboxCustomEvent {
   [CP_LOAD_PROGRESS]: {
     progress: number;
   };
+  [CP_GAME_TTI]: {
+    duration?: number;
+  };
 }
 
 const notifyCustomEvent = <T extends keyof JoliboxCustomEvent>(eventName: T, data: JoliboxCustomEvent[T]) => {

package/src/h5/api/platformAdsHandle/HuaweiQuickAdsHandler.ts

@@ -7,6 +7,7 @@ import {
   IPlacementInfo
 } from '@jolibox/ads';
 import { IAdsHandler } from '../ads';
+import { track } from '../../report';
 
 enum HuaweiQuickAdsEventEnum {
   INIT = 'huawei_quick_ads_init',
@@ -155,6 +156,11 @@ export default class HuaweiQuickAdsHandler implements IAdsHandler {
                     isBreakDone = false;
                     break;
                   case 'beforeAd':
+                    track('HuaweiQuickAdsAdBreakBeforeAd', {
+                      type: 'beforeAd',
+                      format: callbacks?.breakType === 'reward' ? 'reward' : 'interstitial'
+                    });
+
                     callbacks?.beforeAd?.();
                     isBreakDone = false;
                     break;
@@ -230,6 +236,11 @@ export default class HuaweiQuickAdsHandler implements IAdsHandler {
 
       this.callbackMap.set(callbackId, callbacks);
 
+      track('HuaweiQuickAdsAdBreak', {
+        type: params.type,
+        format: params.type === 'reward' ? 'reward' : 'interstitial'
+      });
+
       this.sendPostMessage(HuaweiQuickAdsEventEnum.AD_BREAK, callbackId, params);
     } catch (e) {
       params.adBreakDone?.({

package/src/h5/api/runtime.ts

@@ -17,3 +17,12 @@ commands.registerCommand('RuntimeSDK.loadProgressEvent', (progress) => {
   notifyCustomEvent('CP_LOAD_PROGRESS', { progress });
   console.log('RuntimeSDK.loadProgressEvent', progress);
 });
+
+commands.registerCommand('RuntimeSDK.gameTTIEvent', () => {
+  notifyCustomEvent('CP_GAME_TTI', {
+    duration: performance.now()
+  });
+  track('gameTTI', {
+    duration: performance.now()
+  });
+});

package/src/h5/api/task.ts

@@ -5,7 +5,9 @@ import { taskTracker } from '../report';
 enum ECrossFrameEvent {
   JOLIBOX_GAME_TASK_LEVEL_FINISHED = 'JOLIBOX_GAME_TASK_LEVEL_FINISHED',
   JOLIBOX_GAME_TASK_GAME_PLAY_ENDED = 'JOLIBOX_GAME_TASK_GAME_PLAY_ENDED',
-  JOLIBOX_GAME_TASK_LEVEL_UPGRADE = 'JOLIBOX_GAME_TASK_LEVEL_UPGRADE'
+  JOLIBOX_GAME_TASK_LEVEL_UPGRADE = 'JOLIBOX_GAME_TASK_LEVEL_UPGRADE',
+  JOLIBOX_GAME_TASK_LEVEL_START = 'JOLIBOX_GAME_TASK_LEVEL_START',
+  JOLIBOX_GAME_TASK_LEVEL_FAILED = 'JOLIBOX_GAME_TASK_LEVEL_FAILED'
 }
 
 const notifyIframeGameTaskEvent = (eventName: string, data: any) => {
@@ -135,9 +137,60 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
   }
 });
 
+const onLevelStart = createAPI('levelStart', {
+  paramsSchema: t.tuple(
+    t.object({
+      levelId: t.or(t.string(), t.number())
+    })
+  ),
+  implement: async (params) => {
+    const { levelId } = params;
+    logger.info(`onLevelStart`, levelId);
+
+    notifyIframeGameTaskEvent(ECrossFrameEvent.JOLIBOX_GAME_TASK_LEVEL_START, {
+      levelId
+    });
+
+    await taskTracker.tracker('LevelStart', {
+      levelId
+    });
+  }
+});
+
+const onLevelFailed = createAPI('levelFailed', {
+  paramsSchema: t.tuple(
+    t.object({
+      levelId: t.or(t.string(), t.number()),
+      score: t.number().optional(),
+      rating: t.number().optional(),
+      duration: t.number().optional()
+    })
+  ),
+  implement: async (params) => {
+    const { levelId, score, rating, duration } = params;
+    logger.info(`onLevelFailed`, levelId, score, rating, duration);
+
+    notifyIframeGameTaskEvent(ECrossFrameEvent.JOLIBOX_GAME_TASK_LEVEL_FAILED, {
+      levelId,
+      score,
+      rating,
+      duration
+    });
+
+    await taskTracker.tracker('LevelFailed', {
+      levelId,
+      score,
+      rating,
+      duration
+    });
+  }
+});
+
 commands.registerCommand('TaskTrackerSDK.levelFinished', onLevelFinished);
 commands.registerCommand('TaskTrackerSDK.gamePlayEnded', onGamePlayEnded);
 commands.registerCommand('TaskTrackerSDK.levelUpgrade', onLevelUpgrade);
+commands.registerCommand('TaskTrackerSDK.levelStart', onLevelStart);
+commands.registerCommand('TaskTrackerSDK.levelFailed', onLevelFailed);
 
 registerCanIUse('TaskTrackerSDK.onLevelFinished', {
   version: '1.1.25',
@@ -173,3 +226,24 @@ registerCanIUse('TaskTrackerSDK.onLevelUpgrade', {
     }
   }
 });
+
+registerCanIUse('TaskTrackerSDK.onLevelStart', {
+  version: '1.3.8',
+  properties: {
+    params: {
+      levelId: '1.3.8'
+    }
+  }
+});
+
+registerCanIUse('TaskTrackerSDK.onLevelFailed', {
+  version: '1.3.8',
+  properties: {
+    params: {
+      levelId: '1.3.8',
+      score: '1.3.8',
+      rating: '1.3.8',
+      duration: '1.3.8'
+    }
+  }
+});

package/src/native/api/ads.ts

@@ -2,6 +2,7 @@ import { createCommands } from '@jolibox/common';
 import { canIUseNative, createSyncAPI, registerCanIUse } from './base';
 import { createToast } from '@jolibox/ui';
 import '../rewards';
+import { notifyCustomEvent } from '@/common/utils';
 
 const commands = createCommands();
 
@@ -195,6 +196,10 @@ const showUnlockSuccessToast = (params: { quantity: number; balance: number }) =
 warmupRewardCache(httpClient);
 warmupGemBalanceCache(httpClient);
 
+adEventEmitter.on('isAdShowing', (isAdShowing) => {
+  notifyCustomEvent('JOLIBOX_ADS_EVENT', { isAdShowing });
+});
+
 export const showGemSuccessToast = (params: { quantity: number; balance: number }) => {
   const { quantity } = params;
   const toastTemplate = `{slot-correct} ${quantity * -1} {slot-gem}`;

package/src/native/api/payment.ts

@@ -71,19 +71,14 @@ const flushSubInfoCache = createAPI('flushSubInfoCache', {
   }
 });
 
-const subscribe = createAPI('subscribe', {
-  paramsSchema: t.tuple(
-    t.object({
-      productId: t.string()
-    })
-  ),
-  implement: async (params: {
-    productId: string;
-  }): Promise<{
-    subPlanId: string;
-    errMsg: string;
-    result: 'SUCCESS' | 'FAILED' | 'FAILURE_SUBSCRIPTED';
-  }> => {
+// base subscribe
+const internalSubscribe = async (params: { productId: string; appStoreProductId?: string }) => {
+  const { productId } = params;
+  let basePlanId = params.appStoreProductId;
+  let appStoreProductId = params.appStoreProductId;
+  let nativeProductId = productId;
+
+  if (!params.appStoreProductId) {
     const tier = await subscriptionService.getTierByProductId(params.productId);
     if (!tier) {
       throw createAPIError({
@@ -91,20 +86,53 @@ const subscribe = createAPI('subscribe', {
         msg: '[JoliboxSDK]: product not found'
       });
     }
-    const { basePlanId, appStoreProductId, nativeProductId } = tier;
+    basePlanId = tier.basePlanId;
+    appStoreProductId = tier.appStoreProductId;
+    nativeProductId = tier.nativeProductId;
+  }
 
-    // Use subscription service with built-in compensation polling
-    const result = await subscriptionService.subscribe({
-      basePlanId,
-      nativeProductId,
-      appStoreProductId
+  if (!basePlanId || !appStoreProductId || !nativeProductId) {
+    throw createAPIError({
+      code: -1,
+      msg: '[JoliboxSDK]: product not found'
     });
+  }
 
-    return {
-      result: result.result,
-      subPlanId: result.subPlanId,
-      errMsg: result.message ?? ''
-    };
+  const result = await subscriptionService.subscribe({
+    basePlanId,
+    nativeProductId,
+    appStoreProductId
+  });
+
+  return {
+    result: result.result,
+    subPlanId: result.subPlanId,
+    errMsg: result.message ?? ''
+  };
+};
+
+// origin subscribe
+const subscribe = createAPI('subscribe', {
+  paramsSchema: t.tuple(
+    t.object({
+      productId: t.string(),
+      appStoreProductId: t.string().optional()
+    })
+  ),
+  implement: internalSubscribe // 直接引用
+});
+
+const subscribeSpin = createAPI('subscribeSpin', {
+  paramsSchema: t.tuple(
+    t.object({
+      appStoreProductId: t.string().optional()
+    })
+  ),
+  implement: async (params) => {
+    return internalSubscribe({
+      ...params,
+      productId: 'jolibox_app_spin_sub'
+    });
   }
 });
 
@@ -113,6 +141,7 @@ commands.registerCommand('PaymentSDK.getGemProducts', getGemProducts);
 
 commands.registerCommand('PaymentSDK.getSubscriptionPlans', getSubscriptionPlans);
 commands.registerCommand('PaymentSDK.subscribe', subscribe);
+commands.registerCommand('PaymentSDK.subscribeSpin', subscribeSpin);
 
 commands.registerCommand('PaymentSDK.flushSubInfoCache', flushSubInfoCache);
 
@@ -135,3 +164,7 @@ registerCanIUse('payment.subscribe', {
 registerCanIUse('payment.flushSubInfoCache', {
   version: '1.2.9'
 });
+
+registerCanIUse('payment.subscribeSpin', {
+  version: '1.3.7'
+});

package/src/native/api/runtime.ts

@@ -3,12 +3,16 @@ import { t, createSyncAPI } from './base';
 import { emitNative } from '@jolibox/native-bridge';
 import { context } from '@/common/context';
 import { track } from '../report';
+import { notifyCustomEvent } from '@/common/utils';
 
 const commands = createCommands();
 
 const onLoadFinished = createSyncAPI('onLoadFinished', {
   implement: () => {
     emitNative('cpLoadFinishEvent', {}, context.webviewId, true);
+    notifyCustomEvent('CP_LOAD_FINISH', {
+      duration: performance.now()
+    });
     track('loadFinished', {
       duration: performance.now()
     });
@@ -22,6 +26,7 @@ const THROTTLE_INTERVAL = 200;
 
 function notifyProgress(progress: number) {
   emitNative('cpLoadProgressEvent', { progress }, context.webviewId, true);
+  notifyCustomEvent('CP_LOAD_PROGRESS', { progress });
 }
 
 const onLoadProgress = createSyncAPI('onLoadProgress', {
@@ -47,6 +52,28 @@ const onLoadProgress = createSyncAPI('onLoadProgress', {
   }
 });
 
+const onGameTTI = createSyncAPI('onGameTTI', {
+  paramsSchema: t.tuple(t.number().optional()),
+  implement: () => {
+    emitNative(
+      'cpGameTTIEvent',
+      {
+        duration: performance.now()
+      },
+      context.webviewId,
+      true
+    );
+    notifyCustomEvent('CP_GAME_TTI', {
+      duration: performance.now()
+    });
+    track('gameTTI', {
+      duration: performance.now()
+    });
+  }
+});
+
 commands.registerCommand('RuntimeSDK.loadFinishedEvent', onLoadFinished);
 
 commands.registerCommand('RuntimeSDK.loadProgressEvent', onLoadProgress);
+
+commands.registerCommand('RuntimeSDK.gameTTIEvent', onGameTTI);

package/src/native/api/task.ts

@@ -111,9 +111,47 @@ const onLevelUpgrade = createAPI('levelUpgrade', {
   }
 });
 
+const onLevelStart = createAPI('levelStart', {
+  paramsSchema: t.tuple(
+    t.object({
+      levelId: t.or(t.string(), t.number())
+    })
+  ),
+  implement: async (params) => {
+    const { levelId } = params;
+
+    await taskTracker.tracker('LevelStart', {
+      levelId
+    });
+  }
+});
+
+const onLevelFailed = createAPI('levelFailed', {
+  paramsSchema: t.tuple(
+    t.object({
+      levelId: t.or(t.string(), t.number()),
+      score: t.number().optional(),
+      rating: t.number().optional(),
+      duration: t.number().optional()
+    })
+  ),
+  implement: async (params) => {
+    const { levelId, score, rating, duration } = params;
+
+    await taskTracker.tracker('LevelFailed', {
+      levelId,
+      score,
+      rating,
+      duration
+    });
+  }
+});
+
 commands.registerCommand('TaskTrackerSDK.levelFinished', onLevelFinished);
 commands.registerCommand('TaskTrackerSDK.gamePlayEnded', onGamePlayEnded);
 commands.registerCommand('TaskTrackerSDK.levelUpgrade', onLevelUpgrade);
+commands.registerCommand('TaskTrackerSDK.levelStart', onLevelStart);
+commands.registerCommand('TaskTrackerSDK.levelFailed', onLevelFailed);
 
 registerCanIUse('TaskTrackerSDK.onLevelFinished', {
   version: '1.1.25',
@@ -149,3 +187,24 @@ registerCanIUse('TaskTrackerSDK.onLevelUpgrade', {
     }
   }
 });
+
+registerCanIUse('TaskTrackerSDK.onLevelStart', {
+  version: '1.3.8',
+  properties: {
+    params: {
+      levelId: '1.3.8'
+    }
+  }
+});
+
+registerCanIUse('TaskTrackerSDK.onLevelFailed', {
+  version: '1.3.8',
+  properties: {
+    params: {
+      levelId: '1.3.8',
+      score: '1.3.8',
+      rating: '1.3.8',
+      duration: '1.3.8'
+    }
+  }
+});

package/src/native/bootstrap/index.ts

@@ -10,6 +10,8 @@ import { Env } from '@jolibox/types';
 import { registerLanguageHandler } from '@jolibox/ui';
 import { createIframeModal, registerIframeModalToGlobal } from '../ui/modal-iframe';
 import { onFCP, onLCP, onTTFB } from 'web-vitals';
+import { canIUseNative } from '../utils/can-iuse-native';
+
 interface IBasicMetaConfig {
   canShowRecommended: boolean;
 }
@@ -147,8 +149,11 @@ function addGameServiceReadyListener() {
       timestamp: Date.now()
     });
 
-    // 任务上报
-    handleTaskTracker(loadDuration);
+    // 任务上报,1.7.3 版本以下在onReady时机开始计算埋点
+    if (!canIUseNative('onJoliboxHideLoading')) {
+      handleTaskTracker(loadDuration);
+    }
+
     registerLanguageHandler(() => context.language);
   });
 
@@ -156,6 +161,10 @@ function addGameServiceReadyListener() {
     updateDisableExitRecommendDialog(disableExitRecommendDialog);
     globalThis.joliboxJSCore?.doExit(uuid);
   });
+
+  onNative('onJoliboxHideLoading', ({ duration }) => {
+    handleTaskTracker(duration);
+  });
 }
 
 function addDoExitLoader() {

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

@@ -33,6 +33,7 @@ export class NativeTaskTracker extends TaskTracker {
   private sessionId: string;
   private track: Track;
   private taskUrl: string;
+  private started = false;
 
   constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {
     super(eventEmitter, interval);
@@ -76,8 +77,13 @@ export class NativeTaskTracker extends TaskTracker {
   }
 
   start(duration?: number) {
+    if (this.started) {
+      console.info('[JoliboxSDK] taskTrakcer has started');
+      return;
+    }
     super.start(duration);
     this.tryReportOpenGamePlus();
+    this.started = true;
   }
 
   private tryReportOpenGamePlus() {