@jolibox/implement 1.1.31 → 1.1.33

package/dist/native/rewards/check-frequency.d.ts

@@ -6,7 +6,10 @@
 export declare const checkUseModalFrequency: (config: {
     dailyMaxPopUps: number;
     minInterval: number;
-}) => Promise<boolean>;
+}) => Promise<{
+    canShow: boolean;
+    isFirst: boolean;
+}>;
 export declare const updateUseModalFrequency: () => Promise<void>;
 /**
  * check can show paymentModal
@@ -14,7 +17,10 @@ export declare const updateUseModalFrequency: () => Promise<void>;
 export declare const checkPaymentFrequency: (config: {
     dailyMaxPopUps: number;
     minInterval: number;
-}) => Promise<boolean>;
+}) => Promise<{
+    canShow: boolean;
+    isFirst: boolean;
+}>;
 /**
  * update paymentFrequency
  */

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.31 clean
+> @jolibox/implement@1.1.33 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.31 build:esm
+> @jolibox/implement@1.1.33 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.31",
+  "version": "1.1.33",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.31",
-    "@jolibox/types": "1.1.31",
-    "@jolibox/native-bridge": "1.1.31",
-    "@jolibox/ads": "1.1.31",
+    "@jolibox/common": "1.1.33",
+    "@jolibox/types": "1.1.33",
+    "@jolibox/native-bridge": "1.1.33",
+    "@jolibox/ads": "1.1.33",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/report/track.ts

@@ -1,4 +1,4 @@
-import { debounce } from '@jolibox/common';
+import { debounce, EventType } from '@jolibox/common';
 import { ReportHandler, Track, TrackPerformance, CommonReportConfig } from './types';
 import { PerformanceType, TrackEvent } from '@jolibox/types';
 import { InternalGlobalJSError } from '@jolibox/common';
@@ -7,11 +7,13 @@ import { reportError } from './errors/report';
 // Track system event, wrap common config
 export function createTrack(reportHandler: ReportHandler, common: CommonReportConfig): Track {
   const track = (tag: TrackEvent, info: Record<string, unknown> | null, webviewId?: number): void => {
+    const { eventType, ...rest } = info ?? {};
     const data = {
       tag,
+      eventType: (eventType ?? EventType.Other) as number,
       ...common,
       extra: {
-        ...info
+        ...rest
       }
     };
     if (tag == 'globalJsError') {

package/src/common/report/types.ts

@@ -1,8 +1,8 @@
 import { PerformanceType, TrackEvent } from '@jolibox/types';
-import { EProject } from '@jolibox/common';
+import { EProject, EventType } from '@jolibox/common';
 
 export interface Track {
-  (tag: TrackEvent, info: Record<string, unknown> | null): void;
+  (tag: TrackEvent, info: Record<string, unknown> | null, eventType?: number): void;
   debounce: (tag: TrackEvent, info: Record<string, unknown>) => void;
 }
 
@@ -13,7 +13,7 @@ export interface TrackPerformance {
 
 export type ReportHandler = (
   event: string,
-  data: { tag: TrackEvent; data?: Record<string, string | number | boolean | null> },
+  data: { tag: TrackEvent; eventType?: number; data?: Record<string, string | number | boolean | null> },
   webviewId?: number
 ) => void;
 

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

@@ -81,9 +81,7 @@ export const createShowUnlockWithJolicoinModal = (
 };
 
 const checkIfCancel = (result: IPaymentResult | IUseModalResult) => {
-  if (result == 'CANCEL') {
-    throw new Error('CANCEL');
-  }
+  return result == 'CANCEL';
 };
 
 export const createCommonJolicoinRewardHandler = (
@@ -118,7 +116,6 @@ export const createCommonJolicoinRewardHandler = (
           userJoliCoin: unlockOptions?.userJoliCoin,
           joliCoinQuantity
         });
-        checkIfCancel(paymentResult);
 
         if (paymentResult !== 'SUCCESS') {
           handleUnlockFailed?.(params);
@@ -137,7 +134,6 @@ export const createCommonJolicoinRewardHandler = (
           joliCoinQuantity
         });
 
-        checkIfCancel(shouldUnlock);
         if (shouldUnlock !== 'CONFIRM') {
           handleUnlockFailed?.(params);
           return false;

package/src/native/api/get-system-info.ts

@@ -1,6 +1,7 @@
 import { createCommands } from '@jolibox/common';
 import { createSyncAPI, registerCanIUse } from './base';
 import { invokeNative } from '@jolibox/native-bridge';
+import { context } from '@/common/context';
 
 const commands = createCommands();
 
@@ -19,7 +20,11 @@ const getSystemInfoSync = createSyncAPI(API_GET_SYSTEM_SYNC, {
       language: data.deviceInfo.lang,
       brand: data.deviceInfo.brand,
       appName: data.hostInfo?.appName,
-      SDKVersion: data.sdkInfo.jssdkVersion
+      SDKVersion: data.sdkInfo.jssdkVersion,
+      viewport: {
+        statusBarHeight: context.viewport.statusBarHeight,
+        navigationBarHeight: context.viewport.navigationBarHeight
+      }
     };
   }
 });
@@ -40,5 +45,8 @@ registerCanIUse('env', {
 });
 
 registerCanIUse('getSystemInfoSync', {
-  version: '1.0.0'
+  version: '1.0.0',
+  properties: {
+    viewport: '1.0.33'
+  }
 });

package/src/native/payment/registers/jolicoin-iap.ts

@@ -58,11 +58,13 @@ onNative('onPaymentStateChange', (data) => {
         );
       }
     }
-    const failedStatus = IPaymentIAPFailedStatusMap[status] ?? 'unlockFailed';
-    createToast(`{slot-error} {slot-i18n-jolicoin.${failedStatus}}`, {
-      position: 'center',
-      duration: 3000
-    });
+    const failedStatus = IPaymentIAPFailedStatusMap[status];
+    if (failedStatus) {
+      createToast(`{slot-error} {slot-i18n-jolicoin.${failedStatus}}`, {
+        position: 'center',
+        duration: 3000
+      });
+    }
     deferred.resolve({
       code: 'FAILED' as ResponseType,
       message: 'jolicoin payment failed'

package/src/native/report/index.ts

@@ -1,5 +1,5 @@
 import './errors';
-import { createCommands, isObject, isString, EventEmitter, EProject } from '@jolibox/common';
+import { createCommands, isObject, isString, EventEmitter, EProject, EventType } from '@jolibox/common';
 export * from '../../common/report/types';
 import { createTracks, ReportHandler } from '@/common/report';
 import { context } from '@/common/context';
@@ -20,10 +20,13 @@ const reportNative: ReportHandler = (event, data, webviewId) => {
     session_id: context.sessionId,
     user_id: context.hostUserInfo?.uid ?? ''
   };
+  const eventType = (_data.eventType ?? EventType.Other) as number;
+
   invokeNative('trackAsync', {
     event: data.tag ?? event,
     data: extra,
-    webviewId
+    webviewId,
+    eventType
   });
 };
 

package/src/native/rewards/check-frequency.ts

@@ -22,19 +22,31 @@ export const checkUseModalFrequency = async (config: { dailyMaxPopUps: number; m
   const res = (await getGlobalStorage('joli_coin_use_modal_frequency')) as StandardResponse<string>;
   console.log('checkUseModalFrequency', res.data);
   if (!res.data) {
-    return true;
+    return {
+      canShow: true,
+      isFirst: true
+    };
   }
 
   const fequeycies = parseFrequency(res.data);
   const todayFequencies = filterTodayTimestamps(fequeycies);
   if (todayFequencies.length >= dailyMaxPopUps) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
   const now = Date.now();
   if (now - todayFequencies[todayFequencies.length - 1] < minInterval) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
-  return true;
+  return {
+    canShow: true,
+    isFirst: false
+  };
 };
 
 export const updateUseModalFrequency = async () => {
@@ -56,18 +68,30 @@ export const checkPaymentFrequency = async (config: { dailyMaxPopUps: number; mi
   const res = (await getGlobalStorage('joli_coin_payment_frequency')) as StandardResponse<string>;
   console.log('checkPaymentFrequency', res.data);
   if (!res.data) {
-    return true;
+    return {
+      canShow: true,
+      isFirst: true
+    };
   }
   const frequencies = parseFrequency(res.data);
   const todayFequencies = filterTodayTimestamps(frequencies);
   if (todayFequencies.length >= dailyMaxPopUps) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
   const now = Date.now();
   if (now - todayFequencies[todayFequencies.length - 1] < minInterval) {
-    return false;
+    return {
+      canShow: false,
+      isFirst: false
+    };
   }
-  return true;
+  return {
+    canShow: true,
+    isFirst: false
+  };
 };
 
 /**

package/src/native/rewards/index.ts

@@ -19,6 +19,7 @@ import { innerFetch as fetch } from '../network';
 import { StandardResponse } from '@jolibox/types';
 import { context } from '@/common/context';
 import { login } from '../api/login';
+import { EventType } from '@jolibox/common';
 
 import { createEventPromiseHandler } from '@/common/rewards/registers/utils/event-listener';
 import {
@@ -32,6 +33,7 @@ import { createLoading } from '@jolibox/ui';
 import { canIUseNative } from '../api/base';
 import { applyNative } from '@jolibox/native-bridge';
 import { isUndefinedOrNull } from '@jolibox/common';
+import { track } from '../report';
 
 const modalUseFrequencyConfig = createEventPromiseHandler<
   IUseModalFrequencyConfig,
@@ -77,15 +79,33 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       duration: 3000
     });
     const config = await modalUseFrequencyConfig.getData();
-    const canShowUseModal = await checkUseModalFrequency(config.joliCoinUseAndCharge.useJolicoin);
-    console.log('use modal show by frequency', canShowUseModal);
+    const { canShow: canShowUseModal, isFirst: isFirstUseModal } = await checkUseModalFrequency(
+      config.joliCoinUseAndCharge.useJolicoin
+    );
+    console.log('use modal show by frequency', canShowUseModal, isFirstUseModal);
     loading.hide();
+
+    // First, check for direct use: sufficient balance, auto-deduct enabled, and not the first modal.
+    const { balance } = params.userJoliCoin;
+    const useDirectly = balance >= params.joliCoinQuantity && params.enableAutoDeduct;
+    if (useDirectly && !isFirstUseModal) {
+      rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
+      return;
+    }
+
+    // If not used directly, then check frequency control.
     if (!canShowUseModal) {
-      // return by frequency control
+      // confirm by frequency control
       rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
       return;
     }
   }
+
+  track('unlock_popup_show', {
+    eventType: EventType.View,
+    targetType: 'game'
+  });
+
   const modal = createConfirmJolicoinModal({
     data: {
       enableAutoDeduct: params.enableAutoDeduct,
@@ -96,6 +116,12 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       confirm: {
         text: params.confirmButtonText,
         onPress: () => {
+          track('coin_unlock_click', {
+            targetType: 'game',
+            eventType: EventType.Click,
+            coinConsume: params.joliCoinQuantity,
+            ifAutoUnlock: params.enableAutoDeduct
+          });
           rewardsEmitter.emit(UseModalResultEventName, { useModalResult: 'CONFIRM' });
           modal.destroy();
         }
@@ -103,6 +129,12 @@ rewardsEmitter.on(UseModalEventName, async (type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
       cancel: {
         text: params.cancelButtonText,
         onPress: ({ type }) => {
+          if (type === 'FAILED') {
+            track('ad_unlock_click', {
+              targetType: 'game',
+              eventType: EventType.Click
+            });
+          }
           rewardsEmitter.emit(UseModalResultEventName, {
             useModalResult: (type ?? '') === 'CANCEL' ? 'CANCEL' : 'FAILED'
           });
@@ -140,7 +172,9 @@ rewardsEmitter.on(
           duration: 3000
         });
         const config = await modalUseFrequencyConfig.getData();
-        const canShowPaymentModal = await checkPaymentFrequency(config.joliCoinUseAndCharge.charge);
+        const { canShow: canShowPaymentModal } = await checkPaymentFrequency(
+          config.joliCoinUseAndCharge.charge
+        );
         console.log('use payment show by frequency', canShowPaymentModal);
         loading.hide();
         if (!canShowPaymentModal) {
@@ -164,6 +198,12 @@ rewardsEmitter.on(
         rewardsEmitter.emit(PaymentResultEventName, { paymentResult: 'FAILED' });
         return;
       }
+
+      track('coinorder_show', {
+        targetType: 'game',
+        eventType: EventType.View
+      });
+
       const modal = createPaymentJolicoinModal({
         data: {
           userJolicoin: params.userJoliCoin,
@@ -179,6 +219,15 @@ rewardsEmitter.on(
           confirm: {
             text: params.confirmButtonText,
             onPress: async (productId: string) => {
+              track('order_pay_ensure', {
+                targetType: 'game',
+                eventType: EventType.Click,
+                payWay: 'app_iap',
+                coinAmount: params.joliCoinQuantity,
+                orderPrice:
+                  balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                    ?.totalAmountStr ?? ''
+              });
               if (!context.hostUserInfo?.isLogin) {
                 const { data } = await login();
                 if (!data?.isLogin) {
@@ -211,6 +260,16 @@ rewardsEmitter.on(
                 appStoreProductId
               });
               loading.hide();
+              track('order_pay_result', {
+                eventType: EventType.Other,
+                targetType: 'game',
+                payWay: 'app_iap',
+                coinAmount: params.joliCoinQuantity,
+                orderPrice:
+                  balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                    ?.totalAmountStr ?? '',
+                payResult: code
+              });
               if (code !== 'SUCCESS') {
                 /** add timeout for google panel closed */
                 console.info('[JoliboxSDK] payment failed in payment.invokePaymet');
@@ -226,12 +285,26 @@ rewardsEmitter.on(
               rewardsEmitter.emit(PaymentResultEventName, {
                 paymentResult: (type ?? '') === 'CANCEL' ? 'CANCEL' : 'FAILED'
               });
+              track('ad_unlock_click', {
+                targetType: 'game',
+                eventType: EventType.Click
+              });
               modal.destroy();
             }
           },
           onEnableDeductChanged: async (enabled: boolean) => {
             await updateAutoDeductConfig(enabled);
           }
+        },
+        onSelect: (productId: string) => {
+          track('coinorder_click', {
+            targetType: 'game',
+            eventType: EventType.Click,
+            coinAmount: params.joliCoinQuantity,
+            orderPrice:
+              balenceDetails.paymentChoices.find((choice) => choice.productId === productId)
+                ?.totalAmountStr ?? ''
+          });
         }
       });
 
@@ -292,5 +365,8 @@ const getBalenceDetails = async (): Promise<
     mergeResponseData(response.data?.data, data);
   }
   console.info('productDetails', response.data?.data);
+  if (response.data?.data?.paymentChoices.length === 0) {
+    throw new Error('paymentChoices is empty');
+  }
   return response.data?.data;
 };

package/src/native/ui/retention.ts

@@ -1,8 +1,15 @@
 import { context } from '@/common/context';
 import { invokeNative, subscribe } from '@jolibox/native-bridge';
-import { Deferred } from '@jolibox/common';
+import { Deferred, EventType } from '@jolibox/common';
 import { createRecommendModal, IGame, IRecommendationButton, RecommendModalOnCloseParams } from '@jolibox/ui';
 import { innerFetch as fetch } from '../network';
+import { track } from '../report';
+
+enum RecommendGuideType {
+  Hide = 'Hide',
+  View = 'View',
+  Click = 'Click'
+}
 
 let exitRecommendationsCache: {
   code: string;
@@ -96,6 +103,17 @@ export async function openRetentionSchema() {
   const { gameListInfo, title, buttons } = data.data;
 
   isOpenRetentionSchema = true;
+
+  const modalContentForReport = {
+    domain: 'GAME',
+    buttons: data.data.buttons.map((btn) => `${btn.type}-${btn.text}`).join(','),
+    list: gameListInfo.games.map((game) => game.gameId).join(',')
+  };
+
+  track('RecommendedGuide', {
+    eventType: EventType.View,
+    ...modalContentForReport
+  });
   const modal = createRecommendModal({
     games: gameListInfo.games,
     title,
@@ -104,17 +122,33 @@ export async function openRetentionSchema() {
       isOpenRetentionSchema = false;
       switch (params.type) {
         case 'quit':
+          track('RecommendedGuide', {
+            eventType: EventType.Click,
+            type: 'QUIT',
+            domain: 'GAME'
+          });
           quitResultDeffer.resolve(false);
           break;
         case 'dismiss':
+          track('RecommendedGuide', {
+            eventType: EventType.Hide,
+            ...modalContentForReport
+          });
           quitResultDeffer.resolve(true);
           modal.destroy();
+
           break;
         case 'navigate':
           // TODO: 跳转游戏
           if (params.data?.game) {
             const game = params.data.game;
             openGameSchema(game);
+            track('GameItem', {
+              eventType: EventType.Click,
+              gameId: game.gameId,
+              layerName: 'RecommendedGuide',
+              domain: 'GAME'
+            });
             setTimeout(() => {
               quitResultDeffer.resolve(false);
             }, 0);
@@ -125,6 +159,10 @@ export async function openRetentionSchema() {
           break;
         default:
           // 关闭弹框，留在当前游戏
+          track('RecommendedGuide', {
+            eventType: EventType.Hide,
+            ...modalContentForReport
+          });
           quitResultDeffer.resolve(true);
           break;
       }