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

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/bootstrap/index.ts

@@ -5,7 +5,7 @@ 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';
 
 let cleanStyles: () => void;
 RuntimeLoader.onReady(() => {
@@ -42,11 +42,11 @@ RuntimeLoader.doExit(async () => {
     return context.shouldInterupt;
   }
 
-  // const stay = await openRetentionSchema();
-  // if (stay) {
-  //   // 挽留成功，打断退出
-  //   return true;
-  // }
+  const stay = await openRetentionSchema();
+  if (stay) {
+    // 挽留成功，打断退出
+    return true;
+  }
 
   // 退出，对应上报
   //埋点上报

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/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;
-}