@jolibox/implement 1.1.13-beta.1 → 1.1.13-beta.11

package/src/native/api/ads.ts

@@ -1,5 +1,6 @@
-import { createCommands, logger } from '@jolibox/common';
+import { createCommands } from '@jolibox/common';
 import { createSyncAPI, registerCanIUse } from './base';
+import { createToast } from '@jolibox/ui';
 
 const commands = createCommands();
 
@@ -7,7 +8,8 @@ import { IAdsInitParams, JoliboxAdsImpl, IAdConfigParams, IAdBreakParams, IAdUni
 import { track } from '../report';
 
 import { innerFetch as fetch } from '../network';
-import { invokeNative } from '../bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
+import { rewardsHelper, createAdsRewardHandler, createJolicoinRewardHandler } from '@/common/rewards';
 
 const checkNetworkStatus = () => {
   const { data } = invokeNative('getNetworkStatusSync');
@@ -34,6 +36,26 @@ const ads = new JoliboxAdsImpl(
   checkNetworkStatus
 );
 
+rewardsHelper.registerRewardHandler('ADS', createAdsRewardHandler(ads));
+rewardsHelper.registerRewardHandler(
+  'JOLI_COIN',
+  createJolicoinRewardHandler(ads.httpClient, {
+    onUnlockSuccess: (params) => {
+      const { quantity, balance } = params;
+      const balanceStr = balance >= 1000 ? '999+' : balance;
+      createToast(`{slot-checkmark}  −${quantity} {slot-coin} | Balance: ${balanceStr} {slot-coin}`, {
+        customStyle: {
+          mark: {
+            marginRight: '8px'
+          }
+        }
+      });
+    },
+    onUnlockFailed: () => {
+      console.log('onUnlockFailed');
+    }
+  }) as unknown as (params?: unknown) => Promise<boolean>
+);
 const adInit = createSyncAPI('adInit', {
   implement: (config?: IAdsInitParams) => {
     ads.init(config);
@@ -48,7 +70,13 @@ const adConfig = createSyncAPI('adConfig', {
 
 const adBreak = createSyncAPI('adBreak', {
   implement: (params: IAdBreakParams) => {
-    ads.adBreak(params);
+    if (params.type === 'reward') {
+      rewardsHelper.getRewardsTypes(ads.httpClient).then((rewardsTypes) => {
+        rewardsHelper.handleReward(rewardsTypes, params);
+      });
+    } else {
+      ads.adBreak(params);
+    }
   }
 });
 

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

@@ -1,6 +1,6 @@
 import { createCommands } from '@jolibox/common';
 import { createSyncAPI, registerCanIUse } from './base';
-import { invokeNative } from '../bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
 
 const commands = createCommands();
 
@@ -13,7 +13,7 @@ const getSystemInfoSync = createSyncAPI(API_GET_SYSTEM_SYNC, {
     const { data } = res;
     return {
       system: data.deviceInfo.system,
-      platform: data.deviceInfo.platform,
+      platform: data.deviceInfo.platform.toLowerCase() as 'h5' | 'android' | 'ios',
       version: data.sdkInfo.jssdkVersion,
       pixelRatio: data.deviceInfo.pixelRatio,
       language: data.deviceInfo.lang,

package/src/native/api/keyboard.ts

@@ -1,5 +1,5 @@
 import { createCommands } from '@jolibox/common';
-import { invokeNative } from '../bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
 import { createSyncAPI, registerCanIUse, t } from './base';
 
 export const showKeyboard = createSyncAPI('showKeyboard', {

package/src/native/api/lifecycle.ts

@@ -1,7 +1,7 @@
 import { BaseError, createCommands, wrapUserFunction, hostEmitter, isBoolean } from '@jolibox/common';
 import { createAPI, createSyncAPI, registerCanIUse, t } from './base';
 import { reportError } from '@/common/report/errors/report';
-import { applyNative, onNative, publish } from '../bootstrap/bridge';
+import { applyNative, onNative, publish } from '@jolibox/native-bridge';
 import { nativeTaskEmitter } from '../report';
 import { context } from '@/common/context';
 

package/src/native/api/login.ts

@@ -1,5 +1,5 @@
 import { context } from '@/common/context';
-import { applyNative, invokeNative, onNative } from '../bootstrap/bridge';
+import { applyNative, invokeNative, onNative } from '@jolibox/native-bridge';
 import { createAPI, t, registerCanIUse } from './base';
 import { createCommands, Deferred, hostEmitter } from '@jolibox/common';
 import { createAPIError } from '@/common/report/errors';

package/src/native/api/navigate.ts

@@ -1,5 +1,5 @@
 import { createCommands, UserCustomError } from '@jolibox/common';
-import { invokeNative } from '../bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
 import { createSyncAPI, t, registerCanIUse } from './base';
 import { context } from '@/common/context';
 

package/src/native/api/storage.ts

@@ -1,5 +1,5 @@
 import { createAPI, createSyncAPI, registerCanIUse, t } from './base';
-import { applyNative, invokeNative } from '../bootstrap/bridge';
+import { applyNative, invokeNative } from '@jolibox/native-bridge';
 import { createCommands } from '@jolibox/common';
 import { innerFetch as fetch } from '../network';
 import { context } from '@/common/context';

package/src/native/bootstrap/index.ts

@@ -1,5 +1,4 @@
-import { invokeNative, onNative, RuntimeLoader } from './bridge';
-import { joliboxJSCore } from '../js-core';
+import { invokeNative, onNative, RuntimeLoader } from '@jolibox/native-bridge';
 import { context } from '@/common/context';
 import { hostEmitter, isBoolean } from '@jolibox/common';
 import { taskTracker, track } from '../report';
@@ -7,11 +6,19 @@ import { initializeNativeEnv } from './init-env';
 import { adEventEmitter } from '@/common/ads';
 import { openRetentionSchema } from '../ui/retention';
 import { innerFetch } from '../network';
-
+import { Env } from '@jolibox/types';
 interface IBasicMetaConfig {
   canShowRecommended: boolean;
 }
 
+declare const globalThis: {
+  joliboxJSCore: {
+    doExit: (uuid: string) => void;
+    onDocumentReady: (path: string) => void;
+    env: (params: { onError: (error: Error) => void }) => Env | undefined;
+  };
+};
+
 /**
  * 全局变量
  */
@@ -58,7 +65,7 @@ function addShowAdListener() {
  */
 function addWebviewReadyListener() {
   hostEmitter.on('onDocumentReady', () => {
-    joliboxJSCore?.onDocumentReady(window.location.href);
+    globalThis.joliboxJSCore?.onDocumentReady(window.location.href);
     track('onDocumentReady', {
       start_timestamp,
       timestamp: Date.now()
@@ -89,7 +96,7 @@ function addGameServiceReadyListener() {
   });
 
   onNative('onBeforeExit', ({ uuid }) => {
-    joliboxJSCore?.doExit(uuid);
+    globalThis.joliboxJSCore?.doExit(uuid);
   });
 }
 
@@ -111,7 +118,7 @@ function addDoExitLoader() {
     taskTracker.close(Date.now() - start_timestamp);
   };
 
-  RuntimeLoader.doExit(async () => {
+  RuntimeLoader.onDoExit(async () => {
     if (isAdShowing) {
       return true; // Forbid exit on watching ads
     }

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

@@ -2,7 +2,7 @@ import { isString, logger, Deferred, isObject, hostEmitter } from '@jolibox/comm
 import { reportNetworkAPI } from './report';
 import { RequestFrom } from './types';
 import { FetchResponse, FetchOptions } from './types';
-import { invokeNative, onNative } from '@/native/bootstrap/bridge';
+import { invokeNative, onNative } from '@jolibox/native-bridge';
 import { AnyFunction } from '@jolibox/types';
 import { reportError } from '@/common/report/errors/report';
 import { createAPIError } from '@/common/report/errors';
@@ -82,7 +82,11 @@ export function createFetch(
 
     if (res.state === 'success') {
       const { requestTaskId, state, ...rest } = res;
-      task.resolve(rest);
+      if (res.statusCode === 200) {
+        task.resolve(rest);
+      } else {
+        task.reject(rest);
+      }
       promiseMap.delete(requestTaskId);
     } else if (res.state === 'fail') {
       const { requestTaskId, state, ...rest } = res;

package/src/native/report/errors/index.ts

@@ -5,7 +5,7 @@ import '@/common/report/errors/report/listeners';
 import { errorReportEmitter } from '@/common/report/errors';
 import { ErrorData } from '@/common/report/errors/report';
 import { logger } from '@jolibox/common';
-import { applyNative, invokeNative } from '@/native/bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
 
 errorReportEmitter.on('GLOBAL_ERROR', (error, errorData: ErrorData) => {
   const extra = {

package/src/native/report/index.ts

@@ -4,7 +4,7 @@ export * from '../../common/report/types';
 import { createTracks, ReportHandler } from '@/common/report';
 import { context } from '@/common/context';
 import { NativeTaskTracker } from './task-tracker';
-import { invokeNative } from '../bootstrap/bridge';
+import { invokeNative } from '@jolibox/native-bridge';
 
 const reportNative: ReportHandler = (event, data, webviewId) => {
   const _data = data as Record<string, unknown>;

package/src/native/report/task-tracker.ts

@@ -6,7 +6,7 @@ import { context } from '@/common/context';
 import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter } from '@jolibox/common';
 import { innerFetch as fetch } from '../network';
-import { applyNative } from '../bootstrap/bridge';
+import { applyNative } from '@jolibox/native-bridge';
 import type { Track } from '.';
 import type { TrackEvent } from '@jolibox/types';
 

package/src/native/ui/retention.ts

@@ -1,5 +1,5 @@
 import { context } from '@/common/context';
-import { invokeNative, subscribe } from '../bootstrap/bridge';
+import { invokeNative, subscribe } from '@jolibox/native-bridge';
 import { Deferred } from '@jolibox/common';
 import { createRecommendModal, IGame, IRecommendationButton, RecommendModalOnCloseParams } from '@jolibox/ui';
 import { innerFetch as fetch } from '../network';
@@ -50,10 +50,11 @@ const openGameSchema = (game: IGame) => {
   // Parse the original URL to preserve its structure
 
   const url = new URL(data.schema);
+  const originalPath = url.pathname;
   const originalSearch = new URLSearchParams(url.search);
 
   // Set or replace gameId and joliSource parameters
-  originalSearch.set('gameId', game.gameId);
+  originalSearch.set('gameId', context.mpId);
   originalSearch.set(
     'joliSource',
     context.encodeJoliSourceQuery({
@@ -64,7 +65,7 @@ const openGameSchema = (game: IGame) => {
 
   const host = `https://${game.gameId}.content.jolibox.com/`;
   // Construct the final schema URL
-  const schema = `${host}index.html?${originalSearch.toString()}`;
+  const schema = `${host}${originalPath}?${originalSearch.toString()}`;
 
   invokeNative('openSchemaSync', {
     schema

package/dist/native/bootstrap/bridge.d.ts

@@ -1,4 +0,0 @@
-import { On } from '../js-bridge';
-export declare const applyNative: jsb.service.ApplyNative, invokeNative: jsb.service.InvokeNative, onNative: jsb.service.OnNative, offNative: jsb.service.OnNative, subscribeHandler: import("../js-bridge").SubscribeHandler, publish: import("../js-bridge").Publish, subscribe: On, unsubscribe: import("../js-bridge").Off;
-export declare const onNativeWithError: On;
-export { RuntimeLoader } from '../js-core';

package/dist/native/js-bridge/const.d.ts

@@ -1,6 +0,0 @@
-export declare const CUSTOM_EVENT_PREFIX = "custom_event_";
-export declare const HOST_EVENT_PREFIX = "host_event_";
-export declare const BUFFER_METHODS: string[];
-export declare const BACKGROUND_FORBIDDEN_METHODS: string[];
-export declare const SYNC_METHODS: string[];
-export declare const BATCH_EVENT = "__batch_event__";

package/dist/native/js-bridge/index.d.ts

@@ -1,2 +0,0 @@
-export { createBridge } from './js-bridge';
-export * from './types';

package/dist/native/js-bridge/invoke.d.ts

@@ -1,21 +0,0 @@
-import { InvokeHandler, On } from './types';
-interface Invokes {
-    /** 暴露给宿主, 触发调用的方法 */
-    invokeHandler: InvokeHandler;
-    /** 基础库内部, 调用宿主的方法, 返回 native 返回对象 */
-    invokeNative: (method: string, args?: Record<string, unknown>, webviewId?: number) => any;
-    /** 基础库内部, 调用宿主的方法, 会根据 errMsg throwError */
-    applyNative: (method: string, args?: Record<string, unknown>, webviewId?: number) => any;
-}
-export declare function createInvoke(jsCore: jsb.JSCore, onNative: On): Invokes;
-export declare function ifThrowError(method: string, res: {
-    errMsg?: string;
-    errNo?: number;
-    errorType?: string;
-    errorCode?: number;
-}): {} | undefined;
-export declare class ApplyNativeError extends Error {
-    readonly errNo?: number | undefined;
-    constructor(message: string, errNo?: number | undefined);
-}
-export {};

package/dist/native/js-bridge/js-bridge.d.ts

@@ -1,6 +0,0 @@
-import { JSBridge } from './types';
-/**
- * build js-bridge
- * @param jsCore jsCore function inject by native
- */
-export declare function createBridge(jsCore: jsb.JSCore): JSBridge;

package/dist/native/js-bridge/publish.d.ts

@@ -1 +0,0 @@
-export declare function createPublish(jsCore: jsb.JSCore): (event: string, data: Record<string, unknown>, webviewId?: number, force?: boolean) => void;

package/dist/native/js-bridge/report.d.ts

@@ -1,63 +0,0 @@
-import { On } from './types';
-type MetricReporter = (points: unknown) => unknown;
-interface MetricCache {
-    [props: string]: MetricCache | (number | string)[];
-}
-interface PVMetricCache {
-    [props: string]: PVMetricCache | number;
-}
-type MetricCacheType = MetricCache | PVMetricCache;
-type MetricType = 'pv' | 'default';
-type Prettier<T> = T extends Record<string, unknown> ? {
-    [K in keyof T]: T[K];
-} : T;
-type MetricPoint<Tag extends string, Name extends string> = Prettier<{
-    [k in Tag]: string;
-} & {
-    [K in Name]: number | string;
-}>;
-interface PVPoint {
-    [props: string]: string | JSON;
-}
-interface MetricConfig<Tag extends string, Name extends string, Type extends string> {
-    reporter: MetricReporter;
-    interval?: number;
-    eventName: string;
-    tagNameOrder: Tag[];
-    metricName: Name;
-    type?: Type;
-}
-export declare class MetricsMonitor<Tag extends string, Name extends string, Type extends string> {
-    reporter: MetricReporter;
-    interval: number;
-    lastReportTime: number;
-    cache: MetricCacheType;
-    eventName: string;
-    tagNameOrder: Tag[];
-    metricName: Name;
-    type: MetricType;
-    constructor(config: MetricConfig<Tag, Name, Type>);
-    report(point: Type extends 'pv' ? PVPoint : MetricPoint<Tag, Name>): void;
-    flush(): void;
-    private tryReport;
-    private addPoint;
-    private addPVPoint;
-    private processPoints;
-    private clearPoints;
-}
-interface InvokeMetrics {
-    errMsg: string;
-    errNo?: number;
-    __timing?: {
-        receiveJSInvoke: number;
-        invokeCallback: number;
-    };
-    method: string;
-    startTime: number;
-    args?: Record<string, unknown>;
-    isForeground: string;
-    [prop: string]: unknown;
-}
-export type reportInvokeFn = (invokeMetrics: InvokeMetrics) => void;
-export declare function createReportInvokeMetrics(jsCore: jsb.JSCore, onNative: On): reportInvokeFn;
-export {};

package/dist/native/js-bridge/subscribe.d.ts

@@ -1,10 +0,0 @@
-import { Off, On } from './types';
-import { AnyFunction } from '@jolibox/types';
-export interface Subscribes {
-    onNative: On;
-    offNative: Off;
-    subscribeHandler: AnyFunction;
-    subscribe: On;
-    unsubscribe: Off;
-}
-export declare function createSubscribe(jsCore: jsb.JSCore): Subscribes;

package/dist/native/js-bridge/types.d.ts

@@ -1,18 +0,0 @@
-export type Listener = (...args: any[]) => any;
-export type On = <T extends string>(event: T, handler: Listener) => void;
-export type Off = <T extends string>(event: T, handler: Listener) => void;
-export type InvokeHandler = (callbackId: string | number, data: string | Record<string, unknown>) => void;
-export type Publish = (event: string, data: Record<string, unknown>, webviewId?: number, force?: boolean) => void;
-export type SubscribeHandler = (event: string, data: string | Record<string, unknown>, webviewId?: number) => void;
-export type AnyFunction = (...args: any[]) => any;
-export interface JSBridge {
-    invokeHandler: InvokeHandler;
-    subscribeHandler: SubscribeHandler;
-    invokeNative: jsb.service.InvokeNative;
-    applyNative: jsb.service.ApplyNative;
-    onNative: jsb.service.OnNative;
-    offNative: jsb.service.OffNative;
-    publish: Publish;
-    subscribe: On;
-    unsubscribe: Off;
-}

package/dist/native/js-bridge/utils.d.ts

@@ -1,17 +0,0 @@
-export interface DataObj {
-    params?: Record<string, unknown>;
-    errorCode?: number;
-    __extra?: {
-        startTime: number;
-        type: string;
-    };
-    __nativeBuffers__?: NativeBufferElement[] | undefined;
-}
-interface NativeBufferElement {
-    key: string;
-    value?: ArrayBuffer;
-    base64?: string;
-}
-export declare function unpack(data: unknown): DataObj;
-export declare function pack(_data?: {}, useArrayBuffer?: boolean): Record<string, unknown>;
-export {};

package/dist/native/js-core/index.d.ts

@@ -1,3 +0,0 @@
-export { joliboxJSCore, RuntimeLoader } from './jolibox-js-core';
-export { messagePort, initMessagePort } from './message-port';
-export { normalizeParams } from './utils';

package/dist/native/js-core/jolibox-js-core.d.ts

@@ -1,50 +0,0 @@
-export declare let joliboxJSCore: jsb.JSCore | undefined;
-declare global {
-    interface Window {
-        JoliAndroidSDKBridge?: {
-            invoke: (invokeString: string) => void;
-            onDocumentReady: (paramsstr: string) => void;
-            doExit: (uuidString: string) => void;
-            publish: (params: {
-                event: string;
-                webviewIds: number[] | '*';
-                paramsString: string;
-            }) => void;
-        };
-        webkit?: {
-            messageHandlers: {
-                invoke: {
-                    postMessage: (params: {
-                        event: string;
-                        callbackId: number;
-                        paramsString: string;
-                    }) => void;
-                };
-                publish: {
-                    postMessage: (params: {
-                        event: string;
-                        webviewIds: number[] | '*';
-                        paramsString: string;
-                    }) => void;
-                };
-                onDocumentReady: {
-                    postMessage: (params: {
-                        path: string;
-                    }) => void;
-                };
-                doExit: {
-                    postMessage: (params: {
-                        uuid: string;
-                        shouldInterrupt: boolean;
-                    }) => void;
-                };
-            };
-        };
-    }
-}
-export declare const RuntimeLoader: {
-    trigger(): void;
-    exit(): Promise<boolean>;
-    onReady(fn: () => void): void;
-    doExit(fn: () => Promise<boolean>): void;
-};

package/dist/native/js-core/message-port.d.ts

@@ -1,12 +0,0 @@
-interface MessageEvent {
-    data: string;
-    ports: MessagePort[];
-}
-interface MessagePort {
-    onmessage: (msg: MessageEvent) => void;
-    postMessage: (msg: string) => void;
-    publish: (event: string, data: Record<string, unknown>) => void;
-}
-export declare let messagePort: MessagePort | undefined;
-export declare function initMessagePort(): void;
-export {};

package/dist/native/js-core/utils.d.ts

@@ -1,7 +0,0 @@
-export declare function normalizeParams(params: Record<string, unknown>, type: string): {
-    params: Record<string, unknown>;
-    __extra: {
-        startTime: number;
-        type: string;
-    };
-};

package/src/native/bootstrap/bridge.ts

@@ -1,68 +0,0 @@
-import { createBridge, On } from '../js-bridge';
-
-import { joliboxJSCore, initMessagePort } from '../js-core';
-
-import { formatErrorCode } from '../../common/report/errors';
-import { AnyFunction } from '@jolibox/types';
-import { InternalJSCoreNotFoundError } from '@jolibox/common';
-
-declare const globalThis: {
-  joliboxJSBridge?: {
-    callHandler: AnyFunction;
-    invokeHandler: AnyFunction;
-    subscribeHandler: AnyFunction;
-  };
-};
-
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-const jsCore = joliboxJSCore!;
-
-if (!jsCore) {
-  throw new InternalJSCoreNotFoundError('No joliboxJScore is found, native bridge not found.');
-}
-
-initMessagePort();
-
-const core: jsb.JSCore = {
-  ...jsCore
-  // publish(event: string, params: Record<string, unknown>, webviewIds: number[]) {
-  //   if (messagePort) {
-  //     messagePort.publish(event, params);
-  //     return;
-  //   }
-  //   jsCore.publish(event, params, webviewIds);
-  // }
-};
-
-const bridge = createBridge(core);
-
-const { invokeHandler } = bridge;
-
-export const {
-  applyNative,
-  invokeNative,
-  onNative,
-  offNative,
-  subscribeHandler,
-  publish,
-  subscribe,
-  unsubscribe
-} = bridge;
-
-export const onNativeWithError: On = (event, handler) => {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onNative(event as keyof jsb.service.NativeEventMap, (...rest: any) => {
-    if (rest[0]?.errorCode) {
-      rest[0].errorCode = formatErrorCode(event, rest[0].errorCode);
-    }
-    handler(...rest);
-  });
-};
-
-globalThis.joliboxJSBridge = {
-  callHandler: invokeHandler,
-  invokeHandler,
-  subscribeHandler
-};
-
-export { RuntimeLoader } from '../js-core';

package/src/native/js-bridge/const.ts

@@ -1,13 +0,0 @@
-export const CUSTOM_EVENT_PREFIX = 'custom_event_';
-
-export const HOST_EVENT_PREFIX = 'host_event_';
-
-//TODO: add buffer supported method
-export const BUFFER_METHODS: string[] = [];
-
-// TODO: add method cannot invoke background
-export const BACKGROUND_FORBIDDEN_METHODS: string[] = [];
-
-export const SYNC_METHODS: string[] = ['env', 'createRequestTask', 'login'];
-
-export const BATCH_EVENT = '__batch_event__';

package/src/native/js-bridge/index.ts

@@ -1,2 +0,0 @@
-export { createBridge } from './js-bridge';
-export * from './types';