@jolibox/implement 1.1.16-beta.2 → 1.1.16-beta.4

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

@@ -25,4 +25,11 @@ export declare function createFetch(createMethod: 'createRequestTaskSync', opera
 }): Fetch;
 export declare function parseJSON(data: string): any;
 export declare function normalizeData(data: unknown, contentType?: string): string | ArrayBuffer;
+export declare const sendRequestBodyToNative: (data: unknown, contentType: string) => {
+    errMsg: string;
+    errNo?: number;
+    data: {
+        requestId: string;
+    };
+};
 export {};

package/implement.build.log

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

package/package.json

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

package/src/common/context/index.ts

@@ -43,8 +43,13 @@ const wrapContext = () => {
   const defaultGameID = urlParams.get('mpId') ?? urlParams.get('appId') ?? urlParams.get('gameId') ?? '';
   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 testAdsMode = !!(
+    payloadJson?.testAdsMode ??
+    payloadJson?.__testAdsMode ??
+    urlParams.get('testAdsMode') === 'true'
+  );
+  const joliboxEnv =
+    payloadJson?.joliboxEnv ?? payloadJson?.__joliboxEnv ?? urlParams.get('joliboxEnv') ?? 'production';
   const testMode = joliboxEnv === 'staging';
   const channel = headerJson?.channel;
 

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

@@ -10,8 +10,8 @@ interface HeaderJson {
 
 interface PayloadJson {
   id?: string;
-  testAdsMode?: boolean;
-  joliboxEnv?: 'staging' | 'production';
+  testAdsMode?: boolean; // deprecated
+  joliboxEnv?: 'staging' | 'production'; //  deprecated
   sessionId?: string;
   __mpType?: 'game' | 'miniApp';
   __orientation?: 'HORIZONTAL' | 'VERTICAL';
@@ -20,6 +20,8 @@ interface PayloadJson {
   __showStatusBar?: boolean;
   __shouldInterupt?: boolean;
   __from?: number; // 从哪个小程序打开的
+  __testAdsMode?: boolean;
+  __joliboxEnv?: 'staging' | 'production';
 }
 
 interface Signature {

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

@@ -1,4 +1,4 @@
-import { isString, logger, Deferred, isObject, hostEmitter } from '@jolibox/common';
+import { isString, logger, Deferred, isObject, hostEmitter, isUndefined } from '@jolibox/common';
 import { reportNetworkAPI } from './report';
 import { RequestFrom } from './types';
 import { FetchResponse, FetchOptions } from './types';
@@ -136,6 +136,7 @@ export function createFetch(
     if (timeout) {
       Object.assign(params, { timeout });
     }
+
     const {
       data: { requestTaskId }
     } = invokeNative(createMethod, params);
@@ -240,3 +241,49 @@ export function normalizeData(data: unknown, contentType = 'application/json') {
 
   return String(data);
 }
+
+const normalizeRequestBody = (
+  data: unknown,
+  contentType = 'application/json'
+): {
+  body: JSON | string;
+  dataType: 'json' | 'text';
+} => {
+  if (isUndefined(data) || data instanceof ArrayBuffer) {
+    return {
+      body: '{}',
+      dataType: 'json'
+    };
+  }
+
+  if (typeof data === 'string') {
+    return {
+      body: data,
+      dataType: 'text'
+    };
+  }
+
+  const type = contentType.toLowerCase();
+  if (
+    (type.includes('application/x-www-form-urlencoded') || type.includes('application/json')) &&
+    typeof data === 'object'
+  ) {
+    return {
+      body: JSON.parse(JSON.stringify(data)),
+      dataType: 'json'
+    };
+  }
+
+  return {
+    body: String(data),
+    dataType: 'text'
+  };
+};
+
+export const sendRequestBodyToNative = (data: unknown, contentType: string) => {
+  const { body, dataType } = normalizeRequestBody(data, contentType);
+  return invokeNative('sendRequestBodySync', {
+    body,
+    dataType
+  });
+};