@jolibox/implement 1.1.13-beta.9 → 1.1.14-beta.1

package/esbuild.config.js

@@ -1,5 +1,6 @@
 const esbuild = require('esbuild');
 const fs = require('fs');
+const path = require('path');
 
 function versionPlugin(version) {
   return {
@@ -21,14 +22,14 @@ function parseArgs() {
     const options = {
       format: 'esm',  // 默认值
     };
-  
+    
     for (let i = 0; i < args.length; i++) {
       const arg = args[i];
       
-      if (arg === '--format' || arg === '-f') {
-        const format = args[i + 1];
-        if (['esm', 'cjs', 'iife'].includes(format)) {
-          options.format = format;
+      const [format, value] = arg.split("=");
+      if (format === '--format' || format === '-f') {
+        if (['esm', 'cjs', 'iife'].includes(value)) {
+          options.format = value;
         }
         i++;
       }
@@ -40,8 +41,25 @@ function parseArgs() {
 const options = parseArgs();
 
 function build(format) {
-    return esbuild.build({
-        entryPoints: ['src/index.native.ts', 'src/index.ts'],
+    // native场景支持代码分割
+    const nativeBuild = esbuild.build({
+        entryPoints: ['src/index.native.ts'],
+        bundle: true,
+        outdir: 'dist',
+        target: ['es2015', 'safari14'],
+        format: format,
+        minify: true,
+        loader: { 
+          '.ts': 'ts',
+          '.tsx': 'tsx',
+          '.js': 'jsx'
+        },
+        plugins: [versionPlugin(process.env.BUILD_VERSION || '1.0.0')],
+    });
+
+    // h5 完整bundle
+    const webBuild = esbuild.build({
+        entryPoints: ['src/index.ts'],
         bundle: true,
         outdir: 'dist',
         target: ['es2015', 'safari14'],
@@ -53,7 +71,9 @@ function build(format) {
           '.js': 'jsx'
         },
         plugins: [versionPlugin(process.env.BUILD_VERSION || '1.0.0')],
-      }); 
+    });
+
+    return Promise.all([nativeBuild, webBuild]);
 }
 
 (async ()=>{

package/implement.build.log

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

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.13-beta.9",
+  "version": "1.1.14-beta.1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.13-beta.9",
-    "@jolibox/types": "1.1.13-beta.9",
-    "@jolibox/native-bridge": "1.1.13-beta.9",
+    "@jolibox/common": "1.1.14-beta.1",
+    "@jolibox/types": "1.1.14-beta.1",
+    "@jolibox/native-bridge": "1.1.14-beta.1",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/rewards/fetch-reward.ts

@@ -13,21 +13,27 @@ const priority = () => {
 
 export const createRewardFetcher = (rewardsHelper: RewardsHelper) => {
   rewardsHelper.registerRewardsFetcher(async (httpClient: IHttpClient) => {
-    const defaultRewards: RewardType[] = [];
-    const res = await httpClient.post<IJolicoinRewardOption>('/api/games/unlock-options', {});
-    if (res.code !== 'SUCCESS') {
-      return defaultRewards;
-    }
-    unlockOptionsEmitter.emit(UnlockOptionsEventName, {
-      options: res.data?.unlockOptions || [],
-      userJoliCoin: res.extra?.joliCoin || {
-        balance: 0,
-        enableAutoDeduct: false
+    const defaultRewards: RewardType[] = ['ADS'];
+    try {
+      const res = await httpClient.post<IJolicoinRewardOption>('/api/games/unlock-options', {});
+      if (res.code !== 'SUCCESS') {
+        return defaultRewards;
       }
-    });
+      unlockOptionsEmitter.emit(UnlockOptionsEventName, {
+        options: res.data?.unlockOptions || [],
+        userJoliCoin: res.extra?.joliCoin || {
+          balance: 0,
+          enableAutoDeduct: false
+        }
+      });
 
-    const rewardsTypes = res.data?.unlockOptions?.map((option) => option.type) || Array.from(defaultRewards);
-    // Sort reward types with JOLI_COIN having higher priority than ADS
-    return rewardsTypes.sort(priority());
+      const rewardsTypes =
+        res.data?.unlockOptions?.map((option) => option.type) || Array.from(defaultRewards);
+      // Sort reward types with JOLI_COIN having higher priority than ADS
+      return rewardsTypes.sort(priority());
+    } catch (e) {
+      console.error('getRewardOptions error:', e);
+      return defaultRewards;
+    }
   });
 };

package/src/common/rewards/registers/use-jolicoin.ts

@@ -3,6 +3,7 @@ import { context } from '@/common/context';
 import { uuidv4 } from '@jolibox/common';
 import { canUseJolicoin } from './utils';
 import { unlockOptionsEmitter, UnlockOptionsEventName, IUnlockOptionsEvent } from '..';
+import { IAdBreakParams } from '@/common/ads';
 
 interface IJolicoinUnlockRes {
   code: 'SUCCESS' | 'BALANCE_NOT_ENOUGH' | 'EPISODE_LOCK_JUMP' | 'EPISODE_UNLOCK_ALREADY';
@@ -14,7 +15,7 @@ interface IJolicoinUnlockRes {
   };
 }
 
-export type JolicoinRewardsHandler = () => Promise<boolean>;
+export type JolicoinRewardsHandler = (params: IAdBreakParams) => Promise<boolean>;
 export const createJolicoinRewardHandler = (
   httpClient: IHttpClient,
   {
@@ -50,7 +51,7 @@ export const createJolicoinRewardHandler = (
     }
   });
 
-  return async () => {
+  return async (params: IAdBreakParams) => {
     try {
       if (!unlockOptionsPromise) {
         createUnlockOptionsPromise();
@@ -72,6 +73,15 @@ export const createJolicoinRewardHandler = (
         }
       });
       if (unlockWithJolicoin.code == 'SUCCESS') {
+        params.adBreakDone?.({
+          breakType: params.type,
+          breakName: 'name' in params ? params.name ?? '' : '',
+          breakFormat: 'reward',
+          breakStatus: 'viewed'
+        });
+        if ('adViewed' in params) {
+          params.adViewed?.();
+        }
         onUnlockSuccess?.({
           quantity: unlockWithJolicoin.data.quantity,
           balance: unlockWithJolicoin.data.balance

package/src/h5/api/ads.ts

@@ -18,7 +18,7 @@ rewardsHelper.registerRewardHandler(
         JOLI_COIN: params
       });
     }
-  })
+  }) as unknown as (params?: unknown) => Promise<boolean>
 );
 
 adEventEmitter.on('isAdShowing', (isAdShowing) => {

package/src/native/api/ads.ts

@@ -54,7 +54,7 @@ rewardsHelper.registerRewardHandler(
     onUnlockFailed: () => {
       console.log('onUnlockFailed');
     }
-  })
+  }) as unknown as (params?: unknown) => Promise<boolean>
 );
 const adInit = createSyncAPI('adInit', {
   implement: (config?: IAdsInitParams) => {