@jolibox/implement 1.1.51 → 1.1.52

package/implement.build.log

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

package/package.json

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

package/src/common/context/index.ts

@@ -162,6 +162,9 @@ const wrapContext = () => {
         navigationBarHeight: rawNavHeight !== undefined ? rawNavHeight / pixelRatio : 10
       };
     },
+    get abTests(): string[] {
+      return env.abValues?.split(',') ?? [];
+    },
     onEnvConfigChanged: (newConfig: Partial<Env>) => {
       mergeWith(env, newConfig, mergeArray);
     },

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

@@ -2,14 +2,14 @@ import { IHttpClient } from '../http';
 import { RewardsHelper, RewardType } from './reward-helper';
 import { IJolicoinRewardOption } from './type';
 import {
-  IUseModalFrequencyConfig,
   UnlockOptionsEventName,
   UseModalFrequencyEventName,
   rewardsEmitter,
   DefaltJoliCoinUseAndCharge,
-  DefaltLoginGuide
+  DefaltLoginGuide,
+  IUseModalFrequencyConfig
 } from './reward-emitter';
-import { StandardResponse } from '@jolibox/types';
+import { StandardResponse, GlobalConfig } from '@jolibox/types';
 import { hostEmitter } from '@jolibox/common';
 
 const priority = () => {
@@ -55,7 +55,7 @@ export const createRewardFetcher = (rewardsHelper: RewardsHelper) => {
 
 export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper) => {
   rewardsHelper.registerRewardFrequencyConfigFetcher(async (httpClient: IHttpClient) => {
-    const res = await httpClient.get<StandardResponse<IUseModalFrequencyConfig>>(
+    const res = await httpClient.get<StandardResponse<GlobalConfig & IUseModalFrequencyConfig>>(
       '/api/fe-configs/web-common/global-config',
       {}
     );
@@ -65,9 +65,10 @@ export const createRewardFrequencyConfigFetcher = (rewardsHelper: RewardsHelper)
       loginGuide: res.data?.loginGuide || DefaltLoginGuide
     });
 
-    hostEmitter.emit('onGlobalConfigChanged', {
-      globalConfig: res.data
-    });
+    res.data &&
+      hostEmitter.emit('onGlobalConfigChanged', {
+        globalConfig: res.data
+      });
 
     return {
       joliCoinUseAndCharge: res.data?.joliCoinUseAndCharge || DefaltJoliCoinUseAndCharge,

package/src/common/rewards/registers/utils/coins/index.ts

@@ -61,16 +61,21 @@ export const createCommonJolicoinRewardHandler = (
   registerUseJolicoinCommand(type, {
     showUnlockWithJolicoinModal: showUnlockWithJolicoinModal
   });
+
+  const targetABTest = context.abTests.find((abTest) => abTest.startsWith('coinOpt_v1'));
+  let commands = [];
+  if (targetABTest) {
+    commands = [`Rewards.${type}.usePayment`, `Rewards.${type}.useJolicoin`];
+  } else {
+    commands = [
+      `Rewards.${type}.useUnloginModal`,
+      `Rewards.${type}.usePayment`,
+      `Rewards.${type}.useJolicoin`
+    ];
+  }
   return async (params: IAdBreakParams) => {
     try {
       let result = true;
-
-      const commands = [
-        `Rewards.${type}.useUnloginModal`,
-        `Rewards.${type}.usePayment`,
-        `Rewards.${type}.useJolicoin`
-      ];
-
       for (const command of commands) {
         const commandResult = await rewardsCommands.executeCommand(command as RewardsCommandType);
         result = result && commandResult.result !== 'FAILED';

package/src/native/api/base.ts

@@ -9,5 +9,8 @@ import { registerCanIUseContext } from '@jolibox/native-bridge';
 import { context } from '@/common/context';
 export { t };
 
-export const { canIUseNative } = registerCanIUseContext(() => context.sdkInfo.nativeSDKVersionCode);
+export const { canIUseNative } = registerCanIUseContext(
+  () => context.sdkInfo.nativeSDKVersionCode,
+  () => context.platform
+);
 export { convertVersionCodeToVString } from './utils';

package/src/native/api/call-host-method.ts

@@ -1,14 +1,47 @@
-import { createAPI, registerCanIUse, t } from './base';
-import { applyNative, invokeNative } from '@jolibox/native-bridge';
+import { canIUseNative, createAPI, registerCanIUse, t } from './base';
+import { invokeNative } from '@jolibox/native-bridge';
 import { hostEmitter, UserCustomError } from '@jolibox/common';
 import { createCommands } from '@jolibox/common';
+import { context } from '@/common/context';
 
 const commands = createCommands();
 let supportedMethods: string[] = [];
 let isInitialized = false;
 
+const formatSupportedMethods = (
+  methods: (
+    | string
+    | {
+        method: string;
+        platforms?: string[];
+        nativeVersionCode?: number;
+      }
+  )[]
+) => {
+  const platform = context.platform;
+  const nativeVersionCode = context.sdkInfo.nativeSDKVersionCode ?? 0;
+  return methods.reduce((acc, method) => {
+    if (typeof method === 'string') {
+      acc.push(method);
+    } else {
+      const { method: platformMethod, platforms, nativeVersionCode: methodNativeVersionCode } = method;
+      let canUse = true;
+      if (platforms && !platforms.includes(platform)) {
+        canUse = false;
+      }
+      if (methodNativeVersionCode && methodNativeVersionCode > nativeVersionCode) {
+        canUse = false;
+      }
+      if (canUse) {
+        acc.push(platformMethod);
+      }
+    }
+    return acc;
+  }, [] as string[]);
+};
+
 hostEmitter.on('onGlobalConfigChanged', (params) => {
-  supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+  supportedMethods = formatSupportedMethods(params.globalConfig?.supportedHostMethods ?? []);
   isInitialized = true;
 });
 
@@ -18,7 +51,7 @@ const getSupportedMethods = (): Promise<string[]> => {
       resolve(supportedMethods);
     } else {
       const handler = (params: any) => {
-        supportedMethods = params.globalConfig.supportedHostMethods ?? [];
+        supportedMethods = formatSupportedMethods(params.globalConfig.supportedHostMethods ?? []);
         isInitialized = true;
         hostEmitter.off('onGlobalConfigChanged', handler);
         resolve(supportedMethods);