@jolibox/implement 1.1.9 → 1.1.10

package/src/h5/http/index.ts

@@ -20,19 +20,52 @@ const timeoutFn = (ms: number) => {
 
 (AbortSignal as any).timeout ??= timeoutFn;
 
-export class JoliboxHttpClient implements IHttpClient {
+export class HttpClientManager {
+  private static _instance: HttpClientManager;
+  private httpClients = new WeakSet<JoliboxHttpClient>();
+  private networkRequests: boolean[] = [];
+  private maxRequestsToTrack = 20;
+
+  static getInstance(): HttpClientManager {
+    if (!HttpClientManager._instance) {
+      HttpClientManager._instance = new HttpClientManager();
+    }
+    return HttpClientManager._instance;
+  }
+
+  create(config?: IHttpClientInitParams): JoliboxHttpClient {
+    const client = new JoliboxHttpClient(config);
+    HttpClientManager.getInstance().httpClients.add(client);
+    return client;
+  }
+
+  recordNetworkRequest(success: boolean): void {
+    this.networkRequests.push(success);
+    if (this.networkRequests.length > this.maxRequestsToTrack) {
+      this.networkRequests.shift();
+    }
+  }
+
+  getNetworkStatus(): boolean {
+    if (this.networkRequests.length === 0) {
+      return true;
+    }
+
+    const successCount = this.networkRequests.filter((success) => success).length;
+    const successRate = successCount / this.networkRequests.length;
+
+    return successRate >= 0.6;
+  }
+}
+
+class JoliboxHttpClient implements IHttpClient {
   private baseUrl: string;
-  private xua = xUserAgent();
+  protected xua = xUserAgent();
 
   private getJoliSource = () => {
     return context.joliSource;
   };
 
-  // private getApiBaseURL = () => {
-  //   const urlParams = new URLSearchParams(window.location.search);
-  //   return urlParams.get('apiBaseURL') ?? null;
-  // };
-
   constructor(config?: IHttpClientInitParams) {
     const defaultUrl = context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
     this.baseUrl = config?.baseUrl ?? defaultUrl;
@@ -46,26 +79,34 @@ export class JoliboxHttpClient implements IHttpClient {
       timeout?: number;
     }
   ) {
-    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 ?? {},
-      xua ? { 'x-user-agent': xua } : {},
-      joliSource ? { 'x-joli-source': joliSource } : {}
-    );
-    const response = await fetch(url, {
-      method: 'GET',
-      headers,
-      credentials: 'include',
-      signal: timeoutFn(timeout ?? 30000)
-    });
-    return (await response.json()) as T;
+    try {
+      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 ?? {},
+        xua ? { 'x-user-agent': xua } : {},
+        joliSource ? { 'x-joli-source': joliSource } : {}
+      );
+      const response = await fetch(url, {
+        method: 'GET',
+        headers,
+        credentials: 'include',
+        signal: timeoutFn(timeout ?? 30000)
+      });
+
+      HttpClientManager.getInstance().recordNetworkRequest(true);
+
+      return (await response.json()) as T;
+    } catch (error) {
+      HttpClientManager.getInstance().recordNetworkRequest(false);
+      throw error;
+    }
   }
 
   async post<T = any>(
@@ -77,62 +118,65 @@ export class JoliboxHttpClient implements IHttpClient {
       timeout?: number;
     }
   ) {
-    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 ?? {},
-      { 'Content-Type': 'application/json' },
-      xua ? { 'x-user-agent': xua } : {},
-      joliSource ? { 'x-joli-source': joliSource } : {}
-    );
-    const response = await fetch(url, {
-      method: 'POST',
-      headers,
-      body: JSON.stringify(data),
-      signal: timeoutFn(timeout ?? 30000),
-      credentials: 'include'
-    });
-
-    const responseContentType = response.headers.get('content-type');
-
-    // return blob
-    if (responseContentType?.includes('application/octet-stream')) {
-      try {
-        return response.blob() as unknown as T;
-      } catch (e) {
-        return (await response.arrayBuffer()) as unknown as T;
+    try {
+      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 ?? {},
+        { 'Content-Type': 'application/json' },
+        xua ? { 'x-user-agent': xua } : {},
+        joliSource ? { 'x-joli-source': joliSource } : {}
+      );
+      const response = await fetch(url, {
+        method: 'POST',
+        headers,
+        body: JSON.stringify(data),
+        signal: timeoutFn(timeout ?? 30000),
+        credentials: 'include'
+      });
+
+      HttpClientManager.getInstance().recordNetworkRequest(true);
+
+      const responseContentType = response.headers.get('content-type');
+
+      if (responseContentType?.includes('application/octet-stream')) {
+        try {
+          return response.blob() as unknown as T;
+        } catch (e) {
+          return (await response.arrayBuffer()) as unknown as T;
+        }
       }
-    }
 
-    // return form data
-    if (
-      responseContentType?.includes('multipart/form-data') ||
-      responseContentType?.includes('application/x-www-form-urlencoded')
-    ) {
-      try {
-        return response.formData() as unknown as T;
-      } catch (e) {
-        return (await response.text()) as unknown as T;
+      if (
+        responseContentType?.includes('multipart/form-data') ||
+        responseContentType?.includes('application/x-www-form-urlencoded')
+      ) {
+        try {
+          return response.formData() as unknown as T;
+        } catch (e) {
+          return (await response.text()) as unknown as T;
+        }
       }
-    }
 
-    // return json
-    if (responseContentType?.includes('application/json')) {
-      try {
-        return (await response.json()) as T;
-      } catch (e) {
-        return (await response.text()) as unknown as T;
+      if (responseContentType?.includes('application/json')) {
+        try {
+          return (await response.json()) as T;
+        } catch (e) {
+          return (await response.text()) as unknown as T;
+        }
       }
-    }
 
-    // return text
-    return response as unknown as T;
+      return response as unknown as T;
+    } catch (error) {
+      HttpClientManager.getInstance().recordNetworkRequest(false);
+      throw error;
+    }
   }
 
   async put<T>(
@@ -163,14 +207,15 @@ export class JoliboxHttpClient implements IHttpClient {
         method: 'PUT',
         headers,
         credentials: 'include',
-        body: JSON.stringify(data ?? {}) // 将数据转换为 JSON 字符串
+        body: JSON.stringify(data ?? {})
       });
 
-      // 检查响应状态
       if (!response.ok) {
+        HttpClientManager.getInstance().recordNetworkRequest(false);
         throw new Error(`HTTP error! status: ${response.status}`);
       }
 
+      HttpClientManager.getInstance().recordNetworkRequest(true);
       const result = (await response.json()) as T;
       return result;
     } catch (error) {
@@ -182,4 +227,4 @@ export class JoliboxHttpClient implements IHttpClient {
 
 window.JoliboxHttpClient = JoliboxHttpClient;
 
-export default JoliboxHttpClient;
+export const httpClientManager = HttpClientManager.getInstance();

package/src/h5/report/event-tracker.ts

@@ -1,7 +1,6 @@
 import { context } from '@/common/context';
-import { logger } from '@jolibox/common';
 import { EventTracker } from '@/common/report';
-import JoliboxHttpClient from '@/h5/http';
+import { httpClientManager } from '@/h5/http';
 
 export class H5EventTracker extends EventTracker {
   private hostToApiMap: Record<string | 'default', { test: string; prod: string }> = {
@@ -24,15 +23,19 @@ export class H5EventTracker extends EventTracker {
     return context.testMode ?? false ? api.test : api.prod;
   }
 
-  private httpClient = new JoliboxHttpClient({
+  private httpClient = httpClientManager.create({
     baseUrl: this.apiBaseURL
   });
 
   doReport(event: unknown[]): void {
-    this.httpClient.post('/report', {
-      data: event,
-      timeout: 5000
-    });
+    this.httpClient
+      .post('/report', {
+        data: event,
+        timeout: 5000
+      })
+      .catch((e) => {
+        console.info('report error', e);
+      });
   }
 }
 

package/src/h5/report/task-tracker.ts

@@ -5,14 +5,14 @@
 import { context } from '@/common/context';
 import { TaskTracker, TaskPoint } from '@/common/report/task-track';
 import { EventEmitter, logger } from '@jolibox/common';
-import JoliboxHttpClient from '../http';
+import { httpClientManager } from '../http';
 import type { Track } from '.';
 import type { TrackEvent } from '@jolibox/types';
 
 export class H5TaskTracker extends TaskTracker {
   private gameId: string;
   private sessionId: string;
-  private httpClient = new JoliboxHttpClient();
+  private httpClient = httpClientManager.create();
   private track: Track;
 
   constructor(track: Track, eventEmitter: EventEmitter<{ visible: [boolean] }>, interval?: number) {

package/src/native/bootstrap/index.ts

@@ -50,7 +50,10 @@ function addWebviewReadyListener() {
 }
 
 function handleTaskTracker(duration?: number) {
-  taskTracker.start(duration);
+  // 只有小游戏场景需要上报进度
+  if (context.mpType === 'game') {
+    taskTracker.start(duration);
+  }
 }
 
 function addGameServiceReadyListener() {