@jolibox/implement 1.1.4-beta.16 → 1.1.4-beta.18

package/src/common/report/track.ts

@@ -1,7 +1,7 @@
 import { debounce } from '@jolibox/common';
 import { ReportHandler, Track, TrackPerformance, CommonReportConfig } from './types';
 import { PerformanceType, TrackEvent } from '@jolibox/types';
-import { InternalContextError } from '@jolibox/common';
+import { InternalGlobalJSError } from '@jolibox/common';
 import { reportError } from './errors/report';
 
 // Track system event, wrap common config
@@ -15,7 +15,7 @@ export function createTrack(reportHandler: ReportHandler, common: CommonReportCo
       }
     };
     if (tag == 'globalJsError') {
-      reportError(new InternalContextError(JSON.stringify(data), 'P0')); // window.onerror, 白屏
+      reportError(new InternalGlobalJSError(JSON.stringify(data))); // window.onerror, 白屏
     } else {
       reportHandler('systemLog', data, webviewId);
     }

package/src/h5/http/index.ts

@@ -25,8 +25,7 @@ export class JoliboxHttpClient implements IHttpClient {
   private xua = xUserAgent();
 
   private getJoliSource = () => {
-    const urlParams = new URLSearchParams(window.location.search);
-    return urlParams.get('joliSource') ?? null;
+    return context.joliSource;
   };
 
   // private getApiBaseURL = () => {
@@ -41,24 +40,22 @@ export class JoliboxHttpClient implements IHttpClient {
 
   async get<T>(
     path: string,
-    {
-      query,
-      headers,
-      timeout
-    }: {
+    configs?: {
       query?: Record<string, string>;
       headers?: Record<string, string>;
       timeout?: number;
     }
   ) {
-    const searchParams = new URLSearchParams(query);
-    const search = searchParams.toString();
+    const { query, timeout } = configs ?? {};
+    let { headers } = configs ?? {};
+    const searchParams = query ? new URLSearchParams(query) : null;
+    const search = searchParams?.toString();
     const url = `${this.baseUrl}${path}${search ? `?${search}` : ''}`;
     const xua = this.xua;
     const joliSource = this.getJoliSource();
     headers = Object.assign(
       {},
-      headers,
+      headers ?? {},
       xua ? { 'x-user-agent': xua } : {},
       joliSource ? { 'x-joli-source': joliSource } : {}
     );
@@ -73,26 +70,23 @@ export class JoliboxHttpClient implements IHttpClient {
 
   async post<T = any>(
     path: string,
-    {
-      data,
-      query,
-      headers,
-      timeout
-    }: {
+    configs?: {
       data?: any;
       query?: Record<string, string>;
       headers?: Record<string, string>;
       timeout?: number;
     }
   ) {
-    const searchParams = new URLSearchParams(query);
-    const search = searchParams.toString();
+    const { data, query, timeout } = configs ?? {};
+    let { headers } = configs ?? {};
+    const searchParams = query ? new URLSearchParams(query) : null;
+    const search = searchParams?.toString();
     const url = `${this.baseUrl}${path}${search ? `?${search}` : ''}`;
     const xua = this.xua;
     const joliSource = this.getJoliSource();
     headers = Object.assign(
       {},
-      headers,
+      headers ?? {},
       { 'Content-Type': 'application/json' },
       xua ? { 'x-user-agent': xua } : {},
       joliSource ? { 'x-joli-source': joliSource } : {}
@@ -143,11 +137,7 @@ export class JoliboxHttpClient implements IHttpClient {
 
   async put<T>(
     path: string,
-    {
-      data,
-      query,
-      headers
-    }: {
+    configs?: {
       data?: any;
       query?: Record<string, string>;
       headers?: Record<string, string>;
@@ -155,14 +145,16 @@ export class JoliboxHttpClient implements IHttpClient {
     }
   ) {
     try {
-      const searchParams = new URLSearchParams(query);
-      const search = searchParams.toString();
+      const { data, query, timeout } = configs ?? {};
+      let { headers } = configs ?? {};
+      const searchParams = query ? new URLSearchParams(query) : null;
+      const search = searchParams?.toString();
       const url = `${this.baseUrl}${path}${search ? `?${search}` : ''}`;
       const xua = this.xua;
       const joliSource = this.getJoliSource();
       headers = Object.assign(
         {},
-        headers,
+        headers ?? {},
         { 'Content-Type': 'application/json' },
         xua ? { 'x-user-agent': xua } : {},
         joliSource ? { 'x-joli-source': joliSource } : {}

package/src/h5/report/index.ts

@@ -32,7 +32,7 @@ const { track, trackPerformance } = createTracks((...args) => {
     mp_id: (_data.mp_id as string) ?? '',
     mp_version: (_data.mp_version as string) ?? ''
   };
-  //TODO: 根据上报重要性做聚合
+  //TODO: 根据上报重要性做采样
   const eventBody: IEvent = {
     name: data.tag,
     type: EventType.System,

package/src/native/api/ads.ts

@@ -7,8 +7,12 @@ import { IAdsInitParams, JoliboxAdsImpl, IAdConfigParams, IAdBreakParams, IAdUni
 import { track } from '../report';
 
 import { innerFetch as fetch } from '../network';
+import { invokeNative } from '../bootstrap/bridge';
 
-// TODO: 从network中获取isOK
+const checkNetworkStatus = () => {
+  const { data } = invokeNative('getNetworkStatusSync');
+  return !!data?.isConnected;
+};
 const ads = new JoliboxAdsImpl(
   track,
   {
@@ -20,7 +24,7 @@ const ads = new JoliboxAdsImpl(
         ...options
       }).then((res) => res.response.data as T)
   },
-  () => true
+  checkNetworkStatus
 );
 
 const adInit = createSyncAPI('adInit', {

package/src/native/network/index.ts

@@ -5,11 +5,18 @@ import { context } from '@/common/context';
 /**
  * inner fetch
  */
+const defaultHeaders: Record<string, string> = {
+  'x-user-agent': xUserAgent()
+};
+if (context.hostUserInfo?.token) {
+  defaultHeaders['x-joli-token'] = context.hostUserInfo.token;
+}
+if (context.joliSource) {
+  defaultHeaders['x-joli-source'] = context.joliSource;
+}
+
 export const innerFetch = createFetch('createRequestTaskSync', 'operateRequestTaskSync', {
   type: 'inner',
   baseUrl: context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com',
-  defaultHeaders: {
-    'x-user-agent': xUserAgent(),
-    'X-JOLI-TOKEN': context.hostUserInfo?.token ?? ''
-  }
+  defaultHeaders
 });

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

@@ -237,6 +237,17 @@ declare global {
           realNameAuthenticationStatus?: 'uncertified' | 'certified';
         };
       }>;
+
+      getNetworkStatusSync: () => {
+        /** 错误消息 */
+        errMsg: string;
+        /** 错误码 */
+        errNo?: number;
+        data: {
+          isConnected: boolean;
+          networkType: 'wifi' | '4g' | '5g' | '3g' | '2g' | 'unknown';
+        };
+      };
     }
 
     interface NativeEventMap {