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

package/implement.build.log

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.11-beta.10",
+  "version": "1.1.11-beta.11",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.11-beta.10",
-    "@jolibox/types": "1.1.11-beta.10",
+    "@jolibox/common": "1.1.11-beta.11",
+    "@jolibox/types": "1.1.11-beta.11",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"

package/src/common/context/index.ts

@@ -100,6 +100,9 @@ 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);
     },

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,4 +1,4 @@
-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';
@@ -6,65 +6,52 @@ import { taskTracker, track } from '../report';
 import { initializeNativeEnv } from './init-env';
 import { adEventEmitter } from '@/common/ads';
 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/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;
 }