@jolibox/implement 1.1.12 → 1.1.13-beta.2

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

@@ -1,7 +1,7 @@
 export declare const showKeyboard: (params: {
     defaultValue?: string | undefined;
-    maxLength?: unknown;
     multiple?: boolean | undefined;
+    maxLength?: unknown;
 }) => import("@jolibox/types").StandardResponse<void>;
 export declare const updateKeyboard: (params: {
     value: string;

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

@@ -0,0 +1 @@
+export {};

package/dist/native/network/create-fetch.d.ts

@@ -15,6 +15,7 @@ type PublicFetch = <T>(url: string, options?: FetchOptions) => Promise<{
 }>;
 export declare function createFetch(createMethod: 'createRequestTaskSync', operateMethod: 'operateRequestTaskSync', options?: {
     baseUrl?: string;
+    defaultHeaders?: Record<string, string>;
     type: 'public';
 }): PublicFetch;
 export declare function createFetch(createMethod: 'createRequestTaskSync', operateMethod: 'operateRequestTaskSync', options?: {

package/dist/native/ui/retention.d.ts

@@ -0,0 +1 @@
+export declare function openRetentionSchema(): Promise<boolean>;

package/implement.build.log

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

package/package.json

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

package/src/common/context/index.ts

@@ -1,7 +1,7 @@
 import { mergeArray, mergeWith } from '@jolibox/common';
 import { DeviceInfo, HostInfo, HostUserInfo, SdkInfo } from './types';
 import { Env } from '@jolibox/types';
-import { parseUrlQuery } from './url-parse';
+import { parseUrlQuery, encodeJoliSourceQuery, QueryParams } from './url-parse';
 import { getAppVersion } from '../http/xua';
 import { getDeviceId } from '@jolibox/common';
 
@@ -36,12 +36,13 @@ const env = Object.assign({}, nativeEnv?.() ?? defaultEnv);
 type MPType = 'game' | 'miniApp';
 
 const wrapContext = () => {
-  const { payloadJson, headerJson } = env.schema.length ? parseUrlQuery(env.schema) : {};
+  const { payloadJson, headerJson, signature } = env.schema.length ? parseUrlQuery(env.schema) : {};
   const defaultSessionId = `${env.deviceInfo.did}-${new Date().getTime()}`;
   const url = new URL(env.schema.length ? env.schema : window.location.href);
   const urlParams = url.searchParams;
   const defaultGameID = urlParams.get('mpId') ?? urlParams.get('appId') ?? urlParams.get('gameId') ?? '';
-  const sessionId = payloadJson?.sessionId ?? urlParams.get('sessionId') ?? defaultSessionId;
+  const sessionId =
+    env.clientSessionId ?? payloadJson?.sessionId ?? urlParams.get('sessionId') ?? defaultSessionId;
   const testAdsMode = !!(payloadJson?.testAdsMode ?? urlParams.get('testAdsMode') === 'true');
   const joliboxEnv = payloadJson?.joliboxEnv ?? urlParams.get('joliboxEnv') ?? 'production';
   const testMode = joliboxEnv === 'staging';
@@ -93,8 +94,26 @@ const wrapContext = () => {
     get webviewId(): number {
       return env.webviewId ?? -1;
     },
+    get shouldInterupt(): boolean | undefined {
+      return payloadJson?.__shouldInterupt;
+    },
+    get from(): number | undefined {
+      return payloadJson?.__from;
+    },
+    get baseApiHost(): string {
+      return testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+    },
     onEnvConfigChanged: (newConfig: Partial<Env>) => {
       mergeWith(env, newConfig, mergeArray);
+    },
+    encodeJoliSourceQuery: (newPayloadJson: QueryParams['payloadJson']) => {
+      if (headerJson && signature) {
+        return encodeJoliSourceQuery(
+          { ...payloadJson, ...newPayloadJson },
+          urlParams.get('joliSource') ?? ''
+        );
+      }
+      return urlParams.get('joliSource') ?? '';
     }
   };
 };

package/src/common/context/url-parse.ts

@@ -14,6 +14,12 @@ interface PayloadJson {
   joliboxEnv?: 'staging' | 'production';
   sessionId?: string;
   __mpType?: 'game' | 'miniApp';
+  __orientation?: 'HORIZONTAL' | 'VERTICAL';
+  __transparent?: boolean;
+  __entryPath?: string;
+  __showStatusBar?: boolean;
+  __shouldInterupt?: boolean;
+  __from?: number; // 从哪个小程序打开的
 }
 
 interface Signature {
@@ -21,7 +27,7 @@ interface Signature {
   payloadSig?: string;
 }
 
-interface QueryParams {
+export interface QueryParams {
   headerJson: HeaderJson;
   payloadJson: PayloadJson;
   signature: Signature;
@@ -38,6 +44,12 @@ const base64UrlDecode = <T>(input: string): T => {
   }
 };
 
+const base64UrlEncode = <T>(input: T): string => {
+  const jsonStr = JSON.stringify(input);
+  const base64 = btoa(jsonStr);
+  return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+};
+
 export const parseUrlQuery = (url: string): QueryParams => {
   try {
     const urlObj = new URL(url);
@@ -63,3 +75,14 @@ export const parseUrlQuery = (url: string): QueryParams => {
     };
   }
 };
+
+export const encodeJoliSourceQuery = (payloadJson: PayloadJson, originJoliSource: string): string => {
+  const joli_source = originJoliSource.split('.');
+  if (joli_source && joli_source.length === 3) {
+    const headerJsonStr = joli_source[0];
+    const payloadJsonStr = base64UrlEncode(payloadJson);
+    const signatureJsonStr = joli_source[2];
+    return `${headerJsonStr}.${payloadJsonStr}.${signatureJsonStr}`;
+  }
+  return originJoliSource;
+};

package/src/native/api/ads.ts

@@ -7,7 +7,7 @@ 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';
 
 const checkNetworkStatus = () => {
   const { data } = invokeNative('getNetworkStatusSync');

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();
 

package/src/native/api/index.ts

@@ -6,3 +6,4 @@ import './keyboard';
 import './task';
 import './login';
 import './ads';
+import './navigate';

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,8 +1,9 @@
-import { BaseError, createCommands, wrapUserFunction, hostEmitter } from '@jolibox/common';
+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 } from '../bootstrap/bridge';
+import { applyNative, onNative, publish } from '@jolibox/native-bridge';
 import { nativeTaskEmitter } from '../report';
+import { context } from '@/common/context';
 
 const EXIT_GAME = 'exitGame';
 const ON_READY = 'onReady';
@@ -13,11 +14,22 @@ const commands = createCommands();
 
 const safeCallbackWrapper = wrapUserFunction(reportError as (err: Error | BaseError) => void);
 const exitGame = createAPI(EXIT_GAME, {
-  paramsSchema: t.tuple(t.function()),
-  implement: async (onBeforeExit: () => void) => {
+  paramsSchema: t.tuple(t.function(), t.boolean().optional().default(false)),
+  implement: async (onBeforeExit: () => void, shouldStay = false) => {
     const safeCallback = safeCallbackWrapper(onBeforeExit);
     // 集中上报
     safeCallback.call(this);
+    // 透传context.shouldInterupt 且值为false时，为内部小程序。广播onRetentionResult
+    if (isBoolean(context.shouldInterupt) && !context.shouldInterupt && context.from) {
+      publish(
+        'onRetentionResult',
+        {
+          shouldStay
+        },
+        context.from,
+        true
+      );
+    }
     await applyNative('exitAppAsync');
   }
 });

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

@@ -0,0 +1,61 @@
+import { createCommands, UserCustomError } from '@jolibox/common';
+import { invokeNative } from '@jolibox/native-bridge';
+import { createSyncAPI, t, registerCanIUse } from './base';
+import { context } from '@/common/context';
+
+const commands = createCommands();
+
+const openSchemaSync = createSyncAPI('openSchemaSync', {
+  paramsSchema: t.tuple(t.string()),
+  implement: (schema) => {
+    // Add compatibility logic for incomplete URLs
+    let finalSchema = schema;
+    if (!schema.match(/^https?:\/\//)) {
+      finalSchema = `https://${context.mpId}.app.jolibox.com${schema.startsWith('/') ? '' : '/'}${schema}`;
+    }
+
+    const res = invokeNative('openSchemaSync', {
+      schema: finalSchema
+    });
+    if (res.errNo !== 0) {
+      throw new UserCustomError(res.errMsg, res.errNo);
+    }
+  }
+});
+
+const openPageSync = createSyncAPI('openPageSync', {
+  paramsSchema: t.tuple(t.string()),
+  implement: (page) => {
+    const { errNo, errMsg, data } = invokeNative('openPageSync', { url: page });
+    if (errNo !== 0 || !data) {
+      throw new UserCustomError(errMsg, errNo);
+    }
+    return { webviewId: data.webviewId };
+  }
+});
+
+const closePageSync = createSyncAPI('closePageSync', {
+  paramsSchema: t.tuple(t.number()),
+  implement: (webviewId) => {
+    const { errNo, errMsg } = invokeNative('closePageSync', { webviewId });
+    if (errNo !== 0) {
+      throw new UserCustomError(errMsg, errNo);
+    }
+  }
+});
+
+commands.registerCommand('RouterSDK.openSchema', openSchemaSync);
+commands.registerCommand('RouterSDK.openPage', openPageSync);
+commands.registerCommand('RouterSDK.closePage', closePageSync);
+
+registerCanIUse('router.openSchema', {
+  version: '1.1.10'
+});
+
+registerCanIUse('router.openPage', {
+  version: '1.1.10'
+});
+
+registerCanIUse('router.closePage', {
+  version: '1.1.10'
+});

package/src/native/api/request.ts

@@ -1,16 +1,18 @@
 import { createAPIError } from '@/common/report/errors';
 import { createFetch } from '../network/create-fetch';
-import { createAPI, registerCanIUse, t } from './base';
+import { createSyncAPI, registerCanIUse, t } from './base';
 import { dirtyURL, normalizeHeader, normalizeMethod, normalizeTimeout } from '../network/utils';
 import { BaseError, createCommands, Deferred, wrapUserFunction } from '@jolibox/common';
 import { AnyFunction, ResponseType } from '@jolibox/types';
 import { reportError } from '@/common/report/errors/report';
 import { FetchOptions } from '../network/types';
+import { context } from '@/common/context';
 
 const LIMIT = 15;
 
 const publicFetch = createFetch('createRequestTaskSync', 'operateRequestTaskSync', {
-  type: 'public'
+  type: 'public',
+  baseUrl: context.baseApiHost
 });
 
 /** current active count */
@@ -41,12 +43,12 @@ const request = (_params: unknown) => {
     // noop
   };
 
-  const _request = createAPI('request', {
+  const _request = createSyncAPI('request', {
     paramsSchema: t.tuple(
       t.object({
         url: t.string(),
         method: t.string(),
-        header: t.object(),
+        headers: t.object(),
         data: t.object().optional(),
         query: t.object().optional(),
         dataType: t.string().default('json'),
@@ -68,9 +70,10 @@ const request = (_params: unknown) => {
           if (deferred.state !== 'pending') {
             return;
           }
+
           const { data, dataType, responseType, enableCache, appendHostCookie } = params;
 
-          const header = normalizeHeader(params.header);
+          const header = normalizeHeader(params.headers);
           const method = normalizeMethod(params.method);
           const timeout = normalizeTimeout(params.timeout);
           const url = dirtyURL(params.url, method, data);
@@ -89,15 +92,21 @@ const request = (_params: unknown) => {
 
           if (timeout) _params['timeout'] = timeout;
 
-          const task = publicFetch<string | ArrayBuffer | JSON>(url, _params);
-
+          const task = publicFetch<
+            string | ArrayBuffer | JSON | { status: number; data: string | ArrayBuffer | JSON }
+          >(url, _params);
           {
             const { response } = await task;
             const { code, data, message } = response;
-
+            if (data && typeof data === 'object' && 'status' in data && data.status !== 200) {
+              throw createAPIError({
+                code: data.status || -1,
+                msg: `request:fail status ${data.status}`
+              });
+            }
             deferred.resolve({
               code: (code ?? 'SUCCESS') as ResponseType,
-              data,
+              data: data as string | ArrayBuffer | JSON,
               message: message ?? 'request:ok'
             });
 
@@ -132,7 +141,7 @@ const request = (_params: unknown) => {
     }
   });
 
-  _request(_params);
+  _request(_params as Parameters<typeof _request>[0]);
 
   return {
     /**

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,39 +1,63 @@
-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';
 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;
+  };
+};
+
+/**
+ * 全局变量
+ */
 
+/**
+ * 清除safari jolibox样式
+ */
 let cleanStyles: () => void;
+
+/**
+ * 启动时间戳
+ */
+let start_timestamp: number;
+
+/**
+ * 是否展示广告
+ */
+let isAdShowing = false;
+
+let baskcMeta: IBasicMetaConfig | null = null;
+
 RuntimeLoader.onReady(() => {
   // TODO: merge some env config
 });
 
-RuntimeLoader.doExit(() => {
-  //埋点上报
-  track('onBeforeExit', {
-    timestamp: Date.now()
+/**
+ * 添加广告展示监听
+ */
+function addShowAdListener() {
+  adEventEmitter.on('isAdShowing', (isShowing) => {
+    isAdShowing = isShowing;
+    if (isBoolean(isAdShowing)) {
+      invokeNative('updateContainerConfigSync', {
+        displayCapsuleButton: !isAdShowing,
+        webviewId: context.webviewId
+      });
+    }
   });
-  cleanStyles?.();
-  taskTracker.close(Date.now() - start_timestamp);
-  if (isAdShowing) {
-    return true; // Forbid exit on watching ads
-  }
-  return false;
-});
-
-let isAdShowing = false;
-adEventEmitter.on('isAdShowing', (isShowing) => {
-  isAdShowing = isShowing;
-  if (isBoolean(isAdShowing)) {
-    invokeNative('updateContainerConfigSync', {
-      displayCapsuleButton: !isAdShowing,
-      webviewId: context.webviewId
-    });
-  }
-});
+}
 
 /**
  * The DOMContentLoaded event might be triggered very early,
@@ -41,7 +65,7 @@ adEventEmitter.on('isAdShowing', (isShowing) => {
  */
 function addWebviewReadyListener() {
   hostEmitter.on('onDocumentReady', () => {
-    joliboxJSCore?.onDocumentReady(window.location.href);
+    globalThis.joliboxJSCore?.onDocumentReady(window.location.href);
     track('onDocumentReady', {
       start_timestamp,
       timestamp: Date.now()
@@ -72,14 +96,74 @@ function addGameServiceReadyListener() {
   });
 
   onNative('onBeforeExit', ({ uuid }) => {
-    joliboxJSCore?.doExit(uuid);
+    globalThis.joliboxJSCore?.doExit(uuid);
   });
 }
-let start_timestamp: number;
+
+function addDoExitLoader() {
+  /**
+   * 退出逻辑
+   * 1. 如果正在展示广告，则禁止退出
+   * 2. 如果指定退出挽留逻辑，则按照指定逻辑运行
+   * 3. 如果退出挽留逻辑返回 true，则按照指定逻辑运行
+   * 4. 否则，按照默认逻辑运行
+   */
+
+  const doActualExit = () => {
+    //埋点上报
+    track('onBeforeExit', {
+      timestamp: Date.now()
+    });
+    cleanStyles?.();
+    taskTracker.close(Date.now() - start_timestamp);
+  };
+
+  RuntimeLoader.onDoExit(async () => {
+    if (isAdShowing) {
+      return true; // Forbid exit on watching ads
+    }
+
+    // 指定退出挽留逻辑，则按照指定逻辑运行
+    if (isBoolean(context.shouldInterupt)) {
+      // 不需要打断退出，上报埋点
+      if (!context.shouldInterupt) {
+        doActualExit();
+      }
+      return context.shouldInterupt;
+    }
+
+    if (baskcMeta?.canShowRecommended) {
+      const stay = await openRetentionSchema();
+      if (stay) {
+        // 挽留成功，打断退出
+        return true;
+      }
+    }
+
+    // 退出，对应上报
+    //埋点上报
+    doActualExit();
+    return false;
+  });
+}
+
+async function fetchMetaConfig() {
+  const url = `${context.baseApiHost}/api/fe-configs/js-sdk/basic-meta`;
+  const {
+    response: { data }
+  } = await innerFetch<IBasicMetaConfig>(url);
+
+  if (data) {
+    baskcMeta = data;
+  }
+}
 
 export function config(): void {
   start_timestamp = Date.now();
   addGameServiceReadyListener();
+  addShowAdListener();
+  addDoExitLoader();
   addWebviewReadyListener();
+  fetchMetaConfig();
   cleanStyles = initializeNativeEnv();
 }

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';
@@ -46,6 +46,7 @@ export function createFetch(
   operateMethod: 'operateRequestTaskSync',
   options?: {
     baseUrl?: string;
+    defaultHeaders?: Record<string, string>;
     type: 'public';
   }
 ): PublicFetch;

package/src/native/network/utils.ts

@@ -79,12 +79,19 @@ export function dirtyURL(url: string, method: HTTPMethod, data?: unknown) {
 
   if (!isObject(data)) return url;
 
-  const [_url, search = ''] = url.split('?');
+  const [baseUrl, search = ''] = url.split('?');
 
-  const query = JSON.stringify({
-    ...JSON.parse(search),
-    ...data
-  });
+  // Parse existing query parameters
+  const dataParams = new URLSearchParams(search);
 
-  return `${_url}?${query}`;
+  // Add new parameters from data object
+  for (const [key, value] of Object.entries(data)) {
+    if (value !== undefined && value !== null) {
+      dataParams.append(key, String(value));
+    }
+  }
+
+  const queryString = dataParams.toString();
+
+  return queryString ? `${baseUrl}?${queryString}` : baseUrl;
 }

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';