@jolibox/implement 1.1.11 → 1.1.13-beta.1

package/src/native/js-core/jolibox-js-core.ts

@@ -1,5 +1,5 @@
 import { InternalInvokeNativeError } from '@jolibox/common';
-// import { normalizeParams } from './utils';
+import { normalizeParams } from './utils';
 import { Env } from '@jolibox/types';
 import { reportError } from '@/common/report/errors/report';
 
@@ -23,6 +23,7 @@ declare global {
       invoke: (invokeString: string) => void;
       onDocumentReady: (paramsstr: string) => void;
       doExit: (uuidString: string) => void;
+      publish: (params: { event: string; webviewIds: number[] | '*'; paramsString: string }) => void;
     };
     webkit?: {
       messageHandlers: {
@@ -30,7 +31,7 @@ declare global {
           postMessage: (params: { event: string; callbackId: number; paramsString: string }) => void;
         };
         publish: {
-          postMessage: (params: { event: string; webviewIds: string; paramsString: string }) => void;
+          postMessage: (params: { event: string; webviewIds: number[] | '*'; paramsString: string }) => void;
         };
         onDocumentReady: {
           postMessage: (params: { path: string }) => void;
@@ -47,14 +48,14 @@ export const RuntimeLoader = {
   trigger() {
     // noop
   },
-  exit(): boolean {
+  exit(): Promise<boolean> {
     //noop
-    return false; // 默认不打断退出
+    return Promise.resolve(false); // 默认不打断退出
   },
   onReady(fn: () => void) {
     RuntimeLoader.trigger = fn;
   },
-  doExit(fn: () => boolean) {
+  doExit(fn: () => Promise<boolean>) {
     RuntimeLoader.exit = fn;
   }
 };
@@ -81,9 +82,9 @@ if (window.webkit) {
     RuntimeLoader.trigger();
     _joliboxJSCore.onDocumentReady.postMessage({ path });
   };
-  const doExit = (uuid: string) => {
-    const shouldInterrupt = RuntimeLoader.exit();
-    _joliboxJSCore.doExit.postMessage({ uuid, shouldInterrupt });
+  const doExit = async (uuid: string) => {
+    const shouldInterrupt = await RuntimeLoader.exit();
+    _joliboxJSCore.doExit.postMessage({ uuid, shouldInterrupt: shouldInterrupt });
   };
 
   joliboxJSCore = {
@@ -96,14 +97,17 @@ if (window.webkit) {
         callbackId
       });
     },
-    // publish(event, params, webviewIds) {
-    //   const data = normalizeParams(params as Record<string, unknown>, 'joliboxJSCore');
-    //   _joliboxJSCore.publish.postMessage({
-    //     event,
-    //     paramsString: JSON.stringify(data),
-    //     webviewIds: JSON.stringify(webviewIds)
-    //   });
-    // },
+    publish(event, params, webviewIds) {
+      const data = normalizeParams(params as Record<string, unknown>, 'joliboxJSCore');
+      window.prompt(
+        'publish',
+        JSON.stringify({
+          event,
+          paramsString: JSON.stringify(data),
+          webviewIds
+        })
+      );
+    },
     call(method: string, params: Record<string, unknown>, callbackId) {
       const res = window.prompt(
         'invoke',
@@ -137,8 +141,8 @@ if (window.JoliAndroidSDKBridge) {
     _joliboxJSCore.onDocumentReady(JSON.stringify({ path }));
   };
 
-  const doExit = (uuid: string) => {
-    const shouldInterrupt = RuntimeLoader.exit();
+  const doExit = async (uuid: string) => {
+    const shouldInterrupt = await RuntimeLoader.exit();
     _joliboxJSCore.doExit(JSON.stringify({ uuid, shouldInterrupt }));
   };
 
@@ -154,14 +158,14 @@ if (window.JoliAndroidSDKBridge) {
       );
     },
     doExit,
-    // publish(event, params, webviewIds) {
-    //   const data = normalizeParams(params as Record<string, unknown>, 'joliboxJSCore');
-    //   _joliboxJSCore.publish({
-    //     event,
-    //     paramsString: JSON.stringify(data),
-    //     webviewIds: JSON.stringify(webviewIds)
-    //   });
-    // },
+    publish(event, params, webviewIds) {
+      const data = normalizeParams(params as Record<string, unknown>, 'joliboxJSCore');
+      _joliboxJSCore.publish({
+        event,
+        paramsString: JSON.stringify(data),
+        webviewIds
+      });
+    },
     call(method: string, params: Record<string, unknown>, callbackId) {
       const res = window.prompt(
         'invoke',

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/global.d.ts

@@ -15,6 +15,7 @@ declare global {
       onDocumentReady: (path: string) => void;
       doExit: (uuid: string) => void;
       bind?: (id: number, handler: (...args: unknown[]) => unknown) => void;
+      publish: (event: string, data: unknown, webviewIds: number[] | '*') => void;
     }
 
     type ApplyNativeReturn<T> = T extends Promise<infer U>

package/src/native/types/native-method-map.d.ts

@@ -255,6 +255,30 @@ declare global {
         /** 错误码 */
         errNo?: number;
       };
+
+      openSchemaSync: (params: { schema: string }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+      };
+
+      openPageSync: (params: { url: string }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+        data?: {
+          webviewId: number;
+        };
+      };
+
+      closePageSync: (params: { webviewId: number }) => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+      };
     }
 
     interface NativeEventMap {
@@ -293,6 +317,11 @@ declare global {
           token?: string;
         }
       ];
+      onInfoTapped: [
+        {
+          uuid: string;
+        }
+      ];
     }
   }
 }

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