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

package/src/common/context/index.ts

@@ -100,16 +100,18 @@ const wrapContext = () => {
     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({
-          headerJson,
-          payloadJson: { ...payloadJson, ...newPayloadJson },
-          signature
-        });
+        return encodeJoliSourceQuery(
+          { ...payloadJson, ...newPayloadJson },
+          urlParams.get('joliSource') ?? ''
+        );
       }
       return urlParams.get('joliSource') ?? '';
     }

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

@@ -76,10 +76,13 @@ export const parseUrlQuery = (url: string): QueryParams => {
   }
 };
 
-export const encodeJoliSourceQuery = (queryParams: QueryParams): string => {
-  const { headerJson, payloadJson, signature } = queryParams;
-  const headerJsonStr = base64UrlEncode(headerJson);
-  const payloadJsonStr = base64UrlEncode(payloadJson);
-  const signatureJsonStr = base64UrlEncode(signature);
-  return `${headerJsonStr}.${payloadJsonStr}.${signatureJsonStr}`;
+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

@@ -22,6 +22,13 @@ const ads = new JoliboxAdsImpl(
         responseType: 'json',
         appendHostCookie: true,
         ...options
+      }).then((res) => res.response.data as T),
+    post: <T>(url: string, data: any, options?: any) =>
+      fetch<T>(url, {
+        method: 'POST',
+        responseType: 'json',
+        appendHostCookie: true,
+        ...options
       }).then((res) => res.response.data as T)
   },
   checkNetworkStatus

package/src/native/api/navigate.ts

@@ -1,14 +1,21 @@
 import { createCommands, UserCustomError } from '@jolibox/common';
 import { invokeNative } from '../bootstrap/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
+      schema: finalSchema
     });
     if (res.errNo !== 0) {
       throw new UserCustomError(res.errMsg, res.errNo);
@@ -16,8 +23,39 @@ const openSchemaSync = createSyncAPI('openSchemaSync', {
   }
 });
 
-commands.registerCommand('API.openSchemaSync', openSchemaSync);
+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('openSchemaSync', {
-  version: '1.1.9'
+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/bootstrap/index.ts

@@ -1,70 +1,57 @@
-import { invokeNative, onNative, RuntimeLoader, subscribe } from './bridge';
+import { invokeNative, onNative, RuntimeLoader } from './bridge';
 import { joliboxJSCore } from '../js-core';
 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 './retention';
+import { openRetentionSchema } from '../ui/retention';
+import { innerFetch } from '../network';
 
-let cleanStyles: () => void;
-RuntimeLoader.onReady(() => {
-  // TODO: merge some env config
-});
+interface IBasicMetaConfig {
+  canShowRecommended: boolean;
+}
 
-const doActualExit = () => {
-  //埋点上报
-  track('onBeforeExit', {
-    timestamp: Date.now()
-  });
-  cleanStyles?.();
-  taskTracker.close(Date.now() - start_timestamp);
-};
+/**
+ * 全局变量
+ */
 
 /**
- * 退出逻辑
- * 1. 如果正在展示广告，则禁止退出
- * 2. 如果指定退出挽留逻辑，则按照指定逻辑运行
- * 3. 如果退出挽留逻辑返回 true，则按照指定逻辑运行
- * 4. 否则，按照默认逻辑运行
+ * 清除safari jolibox样式
  */
-RuntimeLoader.doExit(async () => {
-  if (isAdShowing) {
-    return true; // Forbid exit on watching ads
-  }
+let cleanStyles: () => void;
 
-  // 指定退出挽留逻辑，则按照指定逻辑运行
-  if (isBoolean(context.shouldInterupt)) {
-    // 不需要打断退出，上报埋点
-    if (!context.shouldInterupt) {
-      doActualExit();
-    }
-    return context.shouldInterupt;
-  }
+/**
+ * 启动时间戳
+ */
+let start_timestamp: number;
 
-  // const stay = await openRetentionSchema();
-  // if (stay) {
-  //   // 挽留成功，打断退出
-  //   return true;
-  // }
+/**
+ * 是否展示广告
+ */
+let isAdShowing = false;
 
-  // 退出，对应上报
-  //埋点上报
-  doActualExit();
-  return false;
-});
+let baskcMeta: IBasicMetaConfig | null = null;
 
-let isAdShowing = false;
-adEventEmitter.on('isAdShowing', (isShowing) => {
-  isAdShowing = isShowing;
-  if (isBoolean(isAdShowing)) {
-    invokeNative('updateContainerConfigSync', {
-      displayCapsuleButton: !isAdShowing,
-      webviewId: context.webviewId
-    });
-  }
+RuntimeLoader.onReady(() => {
+  // TODO: merge some env config
 });
 
+/**
+ * 添加广告展示监听
+ */
+function addShowAdListener() {
+  adEventEmitter.on('isAdShowing', (isShowing) => {
+    isAdShowing = isShowing;
+    if (isBoolean(isAdShowing)) {
+      invokeNative('updateContainerConfigSync', {
+        displayCapsuleButton: !isAdShowing,
+        webviewId: context.webviewId
+      });
+    }
+  });
+}
+
 /**
  * The DOMContentLoaded event might be triggered very early,
  * so the global loaded listener should be executed during the bootstrap process.
@@ -105,11 +92,71 @@ function addGameServiceReadyListener() {
     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.doExit(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/js-core/jolibox-js-core.ts

@@ -84,7 +84,7 @@ if (window.webkit) {
   };
   const doExit = async (uuid: string) => {
     const shouldInterrupt = await RuntimeLoader.exit();
-    _joliboxJSCore.doExit.postMessage({ uuid, shouldInterrupt });
+    _joliboxJSCore.doExit.postMessage({ uuid, shouldInterrupt: shouldInterrupt });
   };
 
   joliboxJSCore = {

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

@@ -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/types/native-method-map.d.ts

@@ -262,6 +262,23 @@ declare global {
         /** 错误码 */
         errNo?: number;
       };
+
+      openPageSync: (params: { url: string }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+        data?: {
+          webviewId: number;
+        };
+      };
+
+      closePageSync: (params: { webviewId: number }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+      };
     }
 
     interface NativeEventMap {

package/src/native/ui/retention.ts

@@ -0,0 +1,152 @@
+import { context } from '@/common/context';
+import { invokeNative, subscribe } from '../bootstrap/bridge';
+import { Deferred } from '@jolibox/common';
+import { createRecommendModal, IGame, IRecommendationButton, RecommendModalOnCloseParams } from '@jolibox/ui';
+import { innerFetch as fetch } from '../network';
+
+let exitRecommendationsCache: {
+  code: string;
+  data: {
+    gameListInfo: {
+      games: IGame[];
+    };
+    title: string;
+    buttons: IRecommendationButton[];
+  };
+} | null = null;
+
+/**
+ * Fetches exit recommendations data from the API
+ */
+async function fetchExitRecommendations() {
+  if (exitRecommendationsCache) {
+    return exitRecommendationsCache;
+  }
+  const host = context.testMode ? `https://stg-game.jolibox.com` : `https://game.jolibox.com`;
+  const url = `${host}/api/user-retention/exit-recommendations?objectId=${context.mpId}&from=GAME_DETAIL`;
+  const {
+    response: { data }
+  } = await fetch<{
+    code: string;
+    data: {
+      gameListInfo: {
+        games: IGame[];
+      };
+      title: string;
+      buttons: IRecommendationButton[];
+    };
+  }>(url);
+
+  exitRecommendationsCache = data;
+  return data;
+}
+
+//prefetch
+fetchExitRecommendations();
+
+const openGameSchema = (game: IGame) => {
+  const { data } = invokeNative('envSync');
+
+  // Parse the original URL to preserve its structure
+
+  const url = new URL(data.schema);
+  const originalSearch = new URLSearchParams(url.search);
+
+  // Set or replace gameId and joliSource parameters
+  originalSearch.set('gameId', game.gameId);
+  originalSearch.set(
+    'joliSource',
+    context.encodeJoliSourceQuery({
+      __mpType: 'game',
+      __orientation: game.orientation ?? 'VERTICAL'
+    })
+  );
+
+  const host = `https://${game.gameId}.content.jolibox.com/`;
+  // Construct the final schema URL
+  const schema = `${host}index.html?${originalSearch.toString()}`;
+
+  invokeNative('openSchemaSync', {
+    schema
+  });
+};
+
+export async function openRetentionSchema() {
+  // const { data } = invokeNative('envSync');
+  // const { orientation, webviewId } = data;
+  // let joliPayload: Record<string, unknown> = {
+  //   __mpType: 'miniApp',
+  //   __transparent: true,
+  //   // set entryPath
+  //   __orientation: orientation ?? 'VERTICAL', // 默认竖屏
+  //   __showStatusBar: false,
+  //   __shouldInterupt: false,
+  //   __showCapsuleButton: false
+  // };
+  // if (webviewId) {
+  //   joliPayload = {
+  //     ...joliPayload,
+  //     __from: webviewId
+  //   };
+  // }
+
+  // const joliSource = context.encodeJoliSourceQuery(joliPayload);
+
+  // const host = context.testMode
+  //   ? `https://G32115508989327465281365749294.app.jolibox.com`
+  //   : `https://G32115508989327465281365749294.app.jolibox.com`;
+  // const retentionSchema = `${host}/recommended-guide/${context.mpId}?appId=${context.mpId}&joliSource=${joliSource}&navigationStyle=present`;
+
+  const quitResultDeffer = new Deferred<boolean>();
+  // 小程序不走挽留逻辑
+  if (context.mpType !== 'game') {
+    quitResultDeffer.resolve(false);
+    return quitResultDeffer.promise;
+  }
+
+  const data = await fetchExitRecommendations();
+
+  if (data.code !== 'SUCCESS') {
+    quitResultDeffer.resolve(false);
+    return quitResultDeffer.promise;
+  }
+
+  const { gameListInfo, title, buttons } = data.data;
+
+  const modal = createRecommendModal({
+    games: gameListInfo.games,
+    title,
+    buttons,
+    onClose: (params: RecommendModalOnCloseParams) => {
+      switch (params.type) {
+        case 'quit':
+          quitResultDeffer.resolve(false);
+          break;
+        case 'dismiss':
+          quitResultDeffer.resolve(true);
+          modal.hide();
+          break;
+        case 'navigate':
+          // TODO: 跳转游戏
+          if (params.data?.game) {
+            openGameSchema(params.data.game);
+          } else {
+            quitResultDeffer.resolve(true);
+          }
+          modal.hide();
+          break;
+        default:
+          // 关闭弹框，留在当前游戏
+          quitResultDeffer.resolve(true);
+          break;
+      }
+    }
+  });
+  // // 异步
+  // setTimeout(() => {
+  //   invokeNative('openSchemaSync', {
+  //     schema: retentionSchema
+  //   });
+  // }, 0);
+  return quitResultDeffer.promise;
+}

package/src/native/bootstrap/retention.ts

@@ -1,40 +0,0 @@
-import { context } from '@/common/context';
-import { invokeNative, subscribe } from './bridge';
-import { Deferred } from '@jolibox/common';
-
-export async function openRetentionSchema() {
-  const { data } = invokeNative('envSync');
-  const { orientation, webviewId } = data;
-  let joliPayload: Record<string, unknown> = {
-    __mpType: 'miniApp',
-    __transparent: true,
-    // set entryPath
-    __orientation: orientation ?? 'VERTICAL', // 默认竖屏
-    __showStatusBar: false,
-    __shouldInterupt: false
-  };
-  if (webviewId) {
-    joliPayload = {
-      ...joliPayload,
-      __from: webviewId
-    };
-  }
-
-  const joliSource = context.encodeJoliSourceQuery(joliPayload);
-
-  const host = context.testMode ? 'stg-game.jolibox.com' : 'game.jolibox.com';
-  const retentionSchema = `https://${host}/game/G32115508989327465281365749294/?appId=G32115508989327465281365749294&joliSource=${joliSource}`;
-
-  const quitResultDeffer = new Deferred<boolean>();
-
-  subscribe('onRetentionResult', ({ shouldStay }) => {
-    quitResultDeffer.resolve(shouldStay);
-  });
-  // 异步
-  setTimeout(() => {
-    invokeNative('openSchemaSync', {
-      schema: retentionSchema
-    });
-  }, 0);
-  return quitResultDeffer.promise;
-}