@jolibox/implement 1.3.8 → 1.4.0

package/esbuild.config.js

@@ -65,7 +65,8 @@ function build(format) {
         target: ['es2015', 'safari14'],
         format: format,
         minify: true,
-        loader: { 
+        external: ['@jolibox/native-bridge'],  // 排除 native-bridge，H5 不需要
+        loader: {
           '.ts': 'ts',
           '.tsx': 'tsx',
           '.js': 'jsx'

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.3.8 clean
+> @jolibox/implement@1.4.0 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.3.8 build:esm
+> @jolibox/implement@1.4.0 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.8",
+  "version": "1.4.0",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.3.8",
-    "@jolibox/types": "1.3.8",
-    "@jolibox/native-bridge": "1.3.8",
-    "@jolibox/ads": "1.3.8",
+    "@jolibox/common": "1.4.0",
+    "@jolibox/types": "1.4.0",
+    "@jolibox/native-bridge": "1.4.0",
+    "@jolibox/ads": "1.4.0",
     "localforage": "1.10.0",
-    "@jolibox/ui": "1.3.8",
+    "@jolibox/ui": "1.4.0",
     "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/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/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/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'
+    }
+  }
+});