@jolibox/implement 1.1.29 → 1.1.30

package/dist/native/api/base.d.ts

@@ -11,3 +11,4 @@ export declare const createAPI: <ParamsSchema extends import("@/common/api-facto
 export declare const registerCanIUse: (name: string, config: import("@jolibox/common").CanIUseInfo) => void;
 import { t } from '@/common/api-factory/validator';
 export { t };
+export declare const canIUseNative: (schema: string) => boolean;

package/dist/native/payment/payment-helper.d.ts

@@ -1,8 +1,12 @@
-export type PaymentType = 'JOLI_COIN';
+export type PaymentType = 'JOLI_COIN' | 'JOLI_COIN_IAP';
 import { StandardResponse } from '@jolibox/types';
 type PaymentResult = StandardResponse<void>;
 export interface PaymentHandlerMap {
     JOLI_COIN: (productId: string) => Promise<PaymentResult>;
+    JOLI_COIN_IAP: (params: {
+        productId: string;
+        appStoreProductId: string;
+    }) => Promise<PaymentResult>;
 }
 export type PaymentHandler<T extends PaymentType> = PaymentHandlerMap[T];
 export declare function createPaymentHelper(): {

package/dist/native/payment/registers/base.d.ts

@@ -1,21 +1,23 @@
 import { StandardResponse } from '@jolibox/types';
 import type { IPlaceOrderJoliCoinParamas, IJoliCoinProductInfo, IJolicoinPaymentContext } from './joli-coin';
+import type { IPlaceOrderJoliCoinIAPParamas, IJolicoinPaymentIAPContext } from './jolicoin-iap';
 import type { IPlaceOrderResponse } from './type';
 type PaymentStatus = 'INIT' | 'PENDING' | 'SUCCESS' | 'FAILED';
 import { UserPaymentError, InternalPaymentError } from '@jolibox/common';
-type IPlaceOrderParams = IPlaceOrderJoliCoinParamas;
-type IOrderProductInfo = IJoliCoinProductInfo;
-type IOrderPaymentContext = IJolicoinPaymentContext;
+type IPlaceOrderParams = IPlaceOrderJoliCoinParamas | IPlaceOrderJoliCoinIAPParamas;
+type IOrderProductInfo = IJoliCoinProductInfo | IJolicoinPaymentIAPContext;
+type IOrderPaymentContext = IJolicoinPaymentContext | IJolicoinPaymentIAPContext;
 declare const createPaymentError: (errMsg: string, errNo: number, extra?: Record<string, unknown>) => UserPaymentError | InternalPaymentError, createPaymentInternalError: (errMsg: string, errNo: number, extra?: Record<string, unknown>) => UserPaymentError | InternalPaymentError;
 export { createPaymentError, createPaymentInternalError };
-export declare abstract class BasePaymentRegister<T extends IPlaceOrderParams, E extends IOrderProductInfo> {
+export declare abstract class BasePaymentRegister<T extends IPlaceOrderParams, E extends IOrderProductInfo, R = void> {
     private _orderId;
     private _orderStatus;
-    startPayment: (params: T) => Promise<void>;
+    startPayment: (params: T) => Promise<StandardResponse<R>>;
     cancelOrder: (orderId: string) => Promise<void>;
-    private generateCallbackUrl;
+    protected generateCallbackUrl: () => string;
     abstract placeOrder(params: T): Promise<StandardResponse<IPlaceOrderResponse<E>>>;
     abstract generatePaymentContext(): IOrderPaymentContext;
+    abstract pay(): Promise<StandardResponse<R>>;
     get orderId(): string | null;
     get status(): PaymentStatus;
 }

package/dist/native/payment/registers/const.d.ts

@@ -0,0 +1,3 @@
+type PaymentStatus = jsb.service.NativeEventMap['onPaymentStateChange'][number]['status'];
+export declare const IPaymentIAPFailedStatusMap: Record<PaymentStatus, string>;
+export {};

package/dist/native/payment/registers/jolicoin-iap.d.ts

@@ -0,0 +1,21 @@
+import { ResponseType } from '@jolibox/types';
+export interface IPlaceOrderJoliCoinIAPParamas {
+    productId: string;
+    appStoreProductId: string;
+}
+export interface IJoliCoinProductInfo {
+    quantity: number;
+}
+export interface IJolicoinPaymentIAPContext {
+    type: 'JOLI_COIN_IAP_CONTEXT';
+    state: 'TO_CHECKOUT' | 'TO_VALIDATE';
+    productId: string;
+    appStoreProductId: string;
+}
+export declare const createJolicoinIAPPaymentHandler: () => (params: {
+    productId: string;
+    appStoreProductId: string;
+}) => Promise<{
+    code: ResponseType;
+    message: string;
+}>;

package/implement.build.log

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

package/src/common/context/index.ts

@@ -42,6 +42,11 @@ export enum SDKEnvironment {
   funmax = 'funmax' // 小米
 }
 
+type Viewport = {
+  statusBarHeight: number;
+  navigationBarHeight: number;
+};
+
 function hasMetaTag(name: string, content: string): boolean {
   const metaTag = document?.head.querySelector(`meta[name="${name}"][content="${content}"]`);
   return metaTag !== null;
@@ -65,6 +70,9 @@ const wrapContext = () => {
   const testMode = joliboxEnv === 'staging';
   const channel = headerJson?.channel;
 
+  // default should show stay recommend panel
+  let shouldInterupt = payloadJson?.__shouldInterupt;
+
   return {
     get testMode(): boolean {
       return testMode; // TODO: true test mode
@@ -112,7 +120,7 @@ const wrapContext = () => {
       return env.webviewId ?? -1;
     },
     get shouldInterupt(): boolean | undefined {
-      return payloadJson?.__shouldInterupt;
+      return shouldInterupt;
     },
     get from(): number | undefined {
       return payloadJson?.__from;
@@ -133,7 +141,15 @@ const wrapContext = () => {
       }
       return SDKEnvironment.jolibox;
     },
-
+    get viewport(): Viewport {
+      const pixelRatio = env.deviceInfo.pixelRatio ?? 1;
+      const rawStatusHeight = env.deviceInfo.statusBarHeight ?? payloadJson?.__androidStatusBarHeight;
+      const rawNavHeight = env.deviceInfo.navigationBarHeight ?? payloadJson?.__androidNavigationBarHeight;
+      return {
+        statusBarHeight: rawStatusHeight !== undefined ? rawStatusHeight / pixelRatio : 20,
+        navigationBarHeight: rawNavHeight !== undefined ? rawNavHeight / pixelRatio : 10
+      };
+    },
     onEnvConfigChanged: (newConfig: Partial<Env>) => {
       mergeWith(env, newConfig, mergeArray);
     },
@@ -145,6 +161,9 @@ const wrapContext = () => {
         );
       }
       return urlParams.get('joliSource') ?? '';
+    },
+    setDoExitDirectly: () => {
+      shouldInterupt = false;
     }
   };
 };

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

@@ -4,6 +4,7 @@ import { JoliboxAdsForGame } from '@jolibox/ads';
 export type AdsRewardsHandler = (params: IRewardParams) => Promise<boolean>;
 export const createAdsRewardHandler = (ads: JoliboxAdsForGame): AdsRewardsHandler => {
   return async (params: IRewardParams) => {
+    console.log('trigger @jolibox/ads reward', params);
     ads.adBreak(params);
     return true;
   };

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

@@ -118,7 +118,6 @@ export const createCommonJolicoinRewardHandler = (
           userJoliCoin: unlockOptions?.userJoliCoin,
           joliCoinQuantity
         });
-
         checkIfCancel(paymentResult);
 
         if (paymentResult !== 'SUCCESS') {

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

@@ -24,8 +24,9 @@ export interface IPaymentEvent {
 
 export interface IPaymentChoice {
   productId: string;
-  totalAmountStr: string;
+  totalAmountStr?: string;
   quantity: number;
+  appStoreProductId?: string;
 }
 
 export interface IInvokePaymentEvent {

package/src/native/api/base.ts

@@ -5,4 +5,8 @@ export const { createAPI, createSyncAPI } = createAPIFactory(track);
 
 export const registerCanIUse = registerCanIUseFactory('native');
 import { t } from '@/common/api-factory/validator';
+import { registerCanIUseContext } from '@jolibox/native-bridge';
+import { context } from '@/common/context';
 export { t };
+
+export const { canIUseNative } = registerCanIUseContext(() => context.sdkInfo.nativeSDKVersionCode);

package/src/native/api/lifecycle.ts

@@ -30,6 +30,9 @@ const exitGame = createAPI(EXIT_GAME, {
         true
       );
     }
+    if (!shouldStay) {
+      context.setDoExitDirectly();
+    }
     await applyNative('exitAppAsync');
   }
 });

package/src/native/api/login.ts

@@ -31,11 +31,6 @@ export const login = createAPI('login', {
     if (isLogin) {
       return { isLogin: true, token: context.hostUserInfo?.token };
     }
-    onNative('onLoginStateChange', ({ isLogin, token, uuid }) => {
-      if (uuid == loginUUID) {
-        resolve({ isLogin, token });
-      }
-    });
     const res = invokeNative('loginSync');
 
     const {
@@ -47,6 +42,11 @@ export const login = createAPI('login', {
         msg: 'login failed'
       });
     }
+    onNative('onLoginStateChange', ({ isLogin, token, uuid }) => {
+      if (uuid == loginUUID) {
+        resolve({ isLogin, token });
+      }
+    });
     const { promise, resolve } = new Deferred<{ isLogin: boolean; token?: string }>();
 
     const loginRes = await promise;

package/src/native/api/navigate.ts

@@ -55,7 +55,10 @@ const interceptSystemExitSync = createSyncAPI('interceptSystemExitSync', {
 });
 
 const navigateToNativePage = createSyncAPI('navigateToNativePage', {
-  paramsSchema: t.tuple(t.enum('openHistory'), t.object()),
+  paramsSchema: t.tuple(
+    t.enum('openHistory', 'openDiscover', 'openDiscover', 'openGame', 'openDrama', 'openTopup'),
+    t.object()
+  ),
   implement: (path, params) => {
     const { errNo, errMsg } = invokeNative('callHostMethodAsync', {
       method: path,

package/src/native/api/request.ts

@@ -48,7 +48,7 @@ const request = (_params: unknown) => {
       t.object({
         url: t.string(),
         method: t.string(),
-        headers: t.object(),
+        headers: t.object().optional(),
         data: t.object().optional(),
         query: t.object().optional(),
         dataType: t.string().default('json'),
@@ -73,7 +73,7 @@ const request = (_params: unknown) => {
 
           const { data, dataType, responseType, enableCache, appendHostCookie } = params;
 
-          const header = normalizeHeader(params.headers);
+          const header = normalizeHeader(params.headers ?? {});
           const method = normalizeMethod(params.method);
           const timeout = normalizeTimeout(params.timeout);
           const url = dirtyURL(params.url, method, data);
@@ -81,7 +81,7 @@ const request = (_params: unknown) => {
 
           const _params = Object.assign({}, params, {
             method,
-            header,
+            header: appendHostCookie ? undefined : header,
             data: method === 'GET' || method === 'HEAD' ? undefined : data, // GET HEAD 请求不需要 data 参数
             enableCache,
             query: params.query ?? ({} as Record<string, string>),

package/src/native/bootstrap/init-env.ts

@@ -1,3 +1,5 @@
+import { context } from '@/common/context';
+
 export function initializeNativeEnv() {
   let styleElement: HTMLStyleElement | null = null;
   let viewportMeta: HTMLMetaElement | null = null;
@@ -44,6 +46,12 @@ export function initializeNativeEnv() {
     document.documentElement.setAttribute('data-jolibox-root', '');
   };
 
+  const setupSafeArea = () => {
+    const { statusBarHeight, navigationBarHeight } = context.viewport;
+    document.documentElement.style.setProperty('--status-bar-height', `${statusBarHeight}px`);
+    document.documentElement.style.setProperty('--navigation-bar-height', `${navigationBarHeight}px`);
+  };
+
   const overrideFetch = () => {
     async function fetchWasm(input: string | URL) {
       const url = input instanceof URL ? input.href : input;
@@ -90,11 +98,13 @@ export function initializeNativeEnv() {
       viewportMeta = null;
     }
     document.documentElement.removeAttribute('data-jolibox-root');
+    document.documentElement.style.removeProperty('--status-bar-height');
 
     window.fetch = originalFetch;
   };
   createStyles();
   overrideFetch();
+  setupSafeArea();
 
   // 返回清理函数
   return cleanup;

package/src/native/network/create-fetch.ts

@@ -148,25 +148,12 @@ export function createFetch(
       });
     }
 
-    const report = (state: 'success' | 'fail', response: unknown) => {
-      reportNetworkAPI('request', url, {
-        state,
-        startTime,
-        endTime: Date.now(),
-        params,
-        response: response as FetchResponse,
-        requestId: requestTaskId,
-        requestFrom: type == 'public' ? RequestFrom.PUBLIC : RequestFrom.INNER
-      });
-    };
-
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const { resolve, reject, promise } = new Deferred<FetchResponse<any>>();
     promiseMap.set(requestTaskId, { resolve, reject });
 
     try {
       const res = await promise;
-      report('success', res);
       let { data } = res;
       if (dataType === 'json' && typeof data === 'string') {
         data = parseJSON(data);
@@ -190,11 +177,6 @@ export function createFetch(
       if (isObject(error)) {
         const { errMsg, prefetchDetail, isPrefetch, errNo } = error;
         if (isString(errMsg)) {
-          report('fail', {
-            errMsg,
-            isPrefetch,
-            prefetchDetail
-          });
           reportError(createAPIError({ code: -1, msg: errMsg }, { errNo: errNo as number, errMsg }));
         }
       }

package/src/native/payment/index.ts

@@ -1,5 +1,7 @@
 import { createPaymentHelper } from './payment-helper';
 import { createJolicoinPaymentHandler } from './registers/joli-coin';
+import { createJolicoinIAPPaymentHandler } from './registers/jolicoin-iap';
 
 export const paymentHelper = createPaymentHelper();
 paymentHelper.registerPaymentHandler('JOLI_COIN', createJolicoinPaymentHandler());
+paymentHelper.registerPaymentHandler('JOLI_COIN_IAP', createJolicoinIAPPaymentHandler());

package/src/native/payment/payment-helper.ts

@@ -1,4 +1,4 @@
-export type PaymentType = 'JOLI_COIN'; // current only jolicoin
+export type PaymentType = 'JOLI_COIN' | 'JOLI_COIN_IAP'; // current only jolicoin
 
 import { StandardResponse } from '@jolibox/types';
 import { reportError } from '@/common/report/errors/report';
@@ -8,6 +8,7 @@ type PaymentResult = StandardResponse<void>;
 
 export interface PaymentHandlerMap {
   JOLI_COIN: (productId: string) => Promise<PaymentResult>; // jolicoin
+  JOLI_COIN_IAP: (params: { productId: string; appStoreProductId: string }) => Promise<PaymentResult>; // jolicoin iap
 }
 
 export type PaymentHandler<T extends PaymentType> = PaymentHandlerMap[T];

package/src/native/payment/registers/base.ts

@@ -1,5 +1,6 @@
 import { StandardResponse } from '@jolibox/types';
 import type { IPlaceOrderJoliCoinParamas, IJoliCoinProductInfo, IJolicoinPaymentContext } from './joli-coin';
+import type { IPlaceOrderJoliCoinIAPParamas, IJolicoinPaymentIAPContext } from './jolicoin-iap';
 import type { IPlaceOrderResponse } from './type';
 import { PaymentErrorCodeMap } from './type';
 type PaymentStatus = 'INIT' | 'PENDING' | 'SUCCESS' | 'FAILED';
@@ -7,9 +8,9 @@ import { UserPaymentError, InternalPaymentError } from '@jolibox/common';
 import { context } from '@/common/context';
 import { innerFetch as fetch } from '@/native/network';
 
-type IPlaceOrderParams = IPlaceOrderJoliCoinParamas;
-type IOrderProductInfo = IJoliCoinProductInfo;
-type IOrderPaymentContext = IJolicoinPaymentContext;
+type IPlaceOrderParams = IPlaceOrderJoliCoinParamas | IPlaceOrderJoliCoinIAPParamas;
+type IOrderProductInfo = IJoliCoinProductInfo | IJolicoinPaymentIAPContext;
+type IOrderPaymentContext = IJolicoinPaymentContext | IJolicoinPaymentIAPContext;
 
 const createPaymentErrorFactory = () => {
   const [createPaymentError, createPaymentInternalError] = [UserPaymentError, InternalPaymentError].map(
@@ -30,31 +31,25 @@ export { createPaymentError, createPaymentInternalError };
 
 const CALLBACK_HOST = context.testMode ? 'https://stg-game.jolibox.com' : 'https://game.jolibox.com';
 
-export abstract class BasePaymentRegister<T extends IPlaceOrderParams, E extends IOrderProductInfo> {
+export abstract class BasePaymentRegister<
+  T extends IPlaceOrderParams,
+  E extends IOrderProductInfo,
+  R = void
+> {
   private _orderId: string | null = null;
   private _orderStatus: PaymentStatus = 'INIT';
 
-  startPayment = async (params: T) => {
+  startPayment = async (params: T): Promise<StandardResponse<R>> => {
     if (this._orderId) {
       await this.cancelOrder(this.orderId as string);
     }
 
-    const { data, code, message } = await this.placeOrder(params);
-    if (code !== 'SUCCESS' || !data || !data.orderId) {
+    const { code, message } = await this.placeOrder(params);
+    if (code !== 'SUCCESS') {
       throw createPaymentError(message, PaymentErrorCodeMap.PlaceOrderFailed);
     }
-    if (data?.status !== 'PENDING') {
-      throw createPaymentInternalError(
-        `Place order failed, status: ${data?.status}`,
-        PaymentErrorCodeMap.PlaceOrderFailed
-      );
-    }
-
-    const { orderId } = data;
-    this._orderId = orderId;
     // invoke native payment;
-
-    const callbackUrl = this.generateCallbackUrl();
+    return await this.pay();
     // 回调页
   };
 
@@ -71,7 +66,7 @@ export abstract class BasePaymentRegister<T extends IPlaceOrderParams, E extends
     }
   };
 
-  private generateCallbackUrl = () => {
+  protected generateCallbackUrl = () => {
     // Set or replace gameId and joliSource parameters
     const originalSearch = new URLSearchParams('');
     originalSearch.set('utm_source', context.deviceInfo.platform);
@@ -86,6 +81,7 @@ export abstract class BasePaymentRegister<T extends IPlaceOrderParams, E extends
 
   abstract placeOrder(params: T): Promise<StandardResponse<IPlaceOrderResponse<E>>>;
   abstract generatePaymentContext(): IOrderPaymentContext;
+  abstract pay(): Promise<StandardResponse<R>>;
 
   get orderId(): string | null {
     return this._orderId;

package/src/native/payment/registers/const.ts

@@ -0,0 +1,14 @@
+type PaymentStatus = jsb.service.NativeEventMap['onPaymentStateChange'][number]['status'];
+
+export const IPaymentIAPFailedStatusMap: Record<PaymentStatus, string> = {
+  SUCCESS: 'unlockSuccess',
+  FAIL_NOT_LOGIN: 'unlockFailedNotLogin',
+  FAIL_PAYING: 'unlockFailedPaying',
+  FAIL_PRODUCT_EMPTY: 'unlockFailedProductIdNotFound',
+  FAIL_GET_PRODUCT_INFO: 'unlockFailedProductInvalid',
+  FAIL_LAUNCH_BILLING: 'unlockFailedLaunch',
+  FAIL_TRANSACTION: 'unlockFailedTransaction',
+  FAIL_VERIFY: 'unlockFaileVerify',
+  TRANSACTION_PENDING: 'transactionPending',
+  FAILED: 'unlockFailed'
+} as const;

package/src/native/payment/registers/joli-coin.ts

@@ -63,6 +63,15 @@ class JolicoinPaymentResiter extends BasePaymentRegister<IPlaceOrderJoliCoinPara
       orderId: this.orderId!
     };
   };
+
+  pay = async (): Promise<StandardResponse<void>> => {
+    const callbackUrl = this.generateCallbackUrl();
+    console.info('callbackUrl', callbackUrl);
+    return {
+      code: 'SUCCESS' as ResponseType,
+      message: 'jolicoin payment success'
+    };
+  };
 }
 
 export const createJolicoinPaymentHandler = () => {
@@ -75,6 +84,7 @@ export const createJolicoinPaymentHandler = () => {
     }
 
     await instance.startPayment({ productId });
+    // TODO: need to wait for the payment to be successful
     return {
       code: 'SUCCESS' as ResponseType,
       message: 'jolicoin payment success'