@wutiange/log-listener-plugin 1.3.0-alpha.0 → 1.3.0-alpha.2

package/src/logPlugin.ts

@@ -1,229 +1,238 @@
-import Server from './server';
-import Logger from '../packages/network-logger/Logger';
-import NetworkRequestInfo from '../packages/network-logger/NetworkRequestInfo';
-import { extractDomain } from './utils';
-import CompatibilityManager from './CompatibilityManager';
-
-class LogPlugin {
-  private server: Server | null = null;
-  private baseData: Record<string, any> = {};
-  private timeout: number | null = null;
-  private networkLogger = new Logger();
-  private host = '';
-  private isAuto = false
-
-  auto() {
-    if (this.host) {
-      this.startRecordNetwork();
-      this.startRecordLog();
-    }
-    this.isAuto = true
-  }
-
-  unAuto() {
-    this.stopRecordLog()
-    this.networkLogger.disableXHRInterception()
-    this.isAuto = false
-  }
-
-  startRecordLog() {
-    const common = require('./common')
-    console.log = (...data: any[]) => {
-      this.log(...data);
-      common.log(...data);
-    };
-
-    console.warn = (...data: any[]) => {
-      this.warn(...data);
-      common.warn(...data);
-    };
-
-    console.error = (...data: any[]) => {
-      this.error(...data);
-      common.error(...data);
-    };
-  }
-
-  stopRecordLog() {
-    const common = require('./common')
-    console.log = common.log
-    console.warn = common.warn
-    console.error = common.error
-  }
-
-  startRecordNetwork() {
-    this.networkLogger.setCallback(async (data: NetworkRequestInfo[]) => {
-      const sendData = await CompatibilityManager.interceptionToNetwork(data);
-      sendData.forEach(e => {
-        this.server?.network({
-          ...this.baseData,
-          ...e
-        });
-      })
-    });
-
-    this.networkLogger.enableXHRInterception({
-      ignoredHosts: [extractDomain(this.host)],
-    });
-  }
-
-  setBaseUrl(url: string) {
-    if (!url?.trim()) {
-      this.networkLogger.disableXHRInterception()
-      this.stopRecordLog()
-      return
-    }
-    this.host = url.includes("http") ? url : `http://${url}`;
-    if (this.server) {
-      this.server.updateUrl(url);
-    } else {
-      this.server = new Server(url);
-    }
-    if (this.isAuto) {
-      this.startRecordNetwork();
-      this.startRecordLog()
-    }
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  setTimeout(timeout: number) {
-    if (typeof timeout === 'number') {
-      this.timeout = timeout;
-      this.server?.updateTimeout(this.timeout);
-    }
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  getTimeout() {
-    if (typeof this.timeout === 'number') {
-      return this.timeout;
-    }
-    return null;
-  }
-
-  setBaseData(data: Record<string, any> = {}) {
-    this.baseData = data;
-  }
-
-  private _log(level: string, tag: string, ...data: any[]) {
-    const sendData = {
-      ...this.baseData,
-      message: data,
-      tag,
-      level: level ?? 'log',
-      createTime: Date.now(),
-    };
-    this.server?.log(sendData);
-  }
-
-  tag(tag: string, ...data: any[]) {
-    this._log('log', tag, ...data);
-  }
-
-  log(...data: any[]) {
-    this._log('log', 'default', ...data);
-  }
-
-  warn(...data: any[]) {
-    this._log('warn', 'default', ...data);
-  }
-
-  error(...data: any[]) {
-    this._log('error', 'default', ...data);
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async uniqueReq(
-    uniqueId: string | undefined,
-    input: RequestInfo | URL,
-    init?: RequestInit
-  ) {
-    let url: string | null = null;
-    let method = init?.method ?? 'get';
-    let headers = init?.headers;
-    let body = init?.body;
-    if (input instanceof Request) {
-      url = input.url;
-      method = input.method ?? 'get';
-      headers = (input.headers as Record<string, any>).map;
-      body = input.body;
-    } else if (input instanceof URL) {
-      url = input.href;
-    } else {
-      url = input;
-    }
-    return this.server?.network({
-      ...this.baseData,
-      url,
-      id: uniqueId,
-      method,
-      headers,
-      body,
-      createTime: Date.now(),
-    });
-  }
-
-  private async _res(uniqueId?: string, id?: number, response?: Response) {
-    const body = await response?.text();
-    return this.server?.network({
-      ...this.baseData,
-      headers: (response?.headers as Record<string, any>).map,
-      body,
-      requestId: uniqueId ?? Number(id),
-      statusCode: response?.status,
-      endTime: Date.now(),
-    });
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async resTimeout(uniqueId: string) {
-    return this.server?.network({
-      ...this.baseData,
-      isTimeout: true,
-      requestId: uniqueId,
-    });
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async resResponseError(uniqueId: string) {
-    return this.server?.network({
-      ...this.baseData,
-      isResponseError: true,
-      requestId: uniqueId,
-    });
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async uniqueRes(uniqueId: string, response?: Response) {
-    return this._res(uniqueId, undefined, response);
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async req(input: RequestInfo | URL, init?: RequestInit) {
-    return this.uniqueReq(undefined, input, init);
-  }
-
-  /**
-   * @deprecated 不需要手动上报，日志插件会自动收集日志
-   */
-  async res(id: number, response?: Response) {
-    return this._res(undefined, id, response);
-  }
-}
-const logPlugin = new LogPlugin();
-export { LogPlugin };
-export default logPlugin;
+import Server from './server';
+import { extractDomain } from './utils';
+import { httpInterceptor } from './HTTPInterceptor';
+
+class LogPlugin {
+  private server: Server | null = null;
+  private baseData: Record<string, any> = {};
+  private timeout: number | null = null;
+  private host = '';
+  private isAuto = false
+
+  auto = () => {
+    if (this.host) {
+      this.startRecordNetwork();
+      this.startRecordLog();
+    }
+    this.isAuto = true
+  }
+
+  unAuto = () => {
+    this.stopRecordLog()
+    httpInterceptor.disable()
+    httpInterceptor.removeAllListener()
+    this.isAuto = false
+  }
+
+  startRecordLog = () => {
+    const common = require('./common')
+    console.log = (...data: any[]) => {
+      this.log(...data);
+      common.log(...data);
+    };
+
+    console.warn = (...data: any[]) => {
+      this.warn(...data);
+      common.warn(...data);
+    };
+
+    console.error = (...data: any[]) => {
+      this.error(...data);
+      common.error(...data);
+    };
+  }
+
+  stopRecordLog = () => {
+    const common = require('./common')
+    console.log = common.log
+    console.warn = common.warn
+    console.error = common.error
+  }
+
+  startRecordNetwork = () => {
+    httpInterceptor.addListener("send", (data) => {
+      this.server?.network({
+        ...this.baseData,
+        url: data.url,
+        id: data.id,
+        method: data.method,
+        headers: data.requestHeaders,
+        body: data.requestData,
+        createTime: data.startTime
+      })
+    })
+    httpInterceptor.addListener("response", (data) => {
+      this.server?.network({
+        ...this.baseData,
+        headers: data.responseHeaders,
+        body: data.responseData,
+        requestId: data.id,
+        statusCode: data.status,
+        endTime: data.endTime
+      })
+    })
+    httpInterceptor.enable({
+      ignoredHosts: [extractDomain(this.host)]
+    })
+  }
+
+  setBaseUrl = (url: string) => {
+    if (!url?.trim()) {
+      httpInterceptor.disable()
+      this.stopRecordLog()
+      return
+    }
+    this.host = url.includes("http") ? url : `http://${url}`;
+    if (this.server) {
+      this.server.updateUrl(url);
+    } else {
+      this.server = new Server(url);
+    }
+    if (this.isAuto) {
+      this.startRecordNetwork();
+      this.startRecordLog()
+    }
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  setTimeout = (timeout: number) => {
+    if (typeof timeout === 'number') {
+      this.timeout = timeout;
+      this.server?.updateTimeout(this.timeout);
+    }
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  getTimeout = () => {
+    if (typeof this.timeout === 'number') {
+      return this.timeout;
+    }
+    return null;
+  }
+
+  setBaseData = (data: Record<string, any> = {}) => {
+    this.baseData = data;
+  }
+
+  private _log = (level: string, tag: string, ...data: any[]) => {
+    const sendData = {
+      ...this.baseData,
+      message: data,
+      tag,
+      level: level ?? 'log',
+      createTime: Date.now(),
+    };
+    this.server?.log(sendData);
+  }
+
+  tag = (tag: string, ...data: any[]) => {
+    this._log('log', tag, ...data);
+  }
+
+  log = (...data: any[]) => {
+    this._log('log', 'default', ...data);
+  }
+
+  warn = (...data: any[]) => {
+    this._log('warn', 'default', ...data);
+  }
+
+  error = (...data: any[]) => {
+    this._log('error', 'default', ...data);
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  uniqueReq = async (
+    uniqueId: string | undefined,
+    input: RequestInfo | URL,
+    init?: RequestInit
+  ) => {
+    let url: string | null = null;
+    let method = init?.method ?? 'get';
+    let headers = init?.headers;
+    let body = init?.body;
+    if (input instanceof Request) {
+      url = input.url;
+      method = input.method ?? 'get';
+      headers = (input.headers as Record<string, any>).map;
+      body = input.body;
+    } else if (input instanceof URL) {
+      url = input.href;
+    } else {
+      url = input;
+    }
+    return this.server?.network({
+      ...this.baseData,
+      url,
+      id: uniqueId,
+      method,
+      headers,
+      body,
+      createTime: Date.now(),
+    });
+  }
+
+  private _res = async (uniqueId?: string, id?: number, response?: Response) => {
+    const body = await response?.text();
+    return this.server?.network({
+      ...this.baseData,
+      headers: (response?.headers as Record<string, any>).map,
+      body,
+      requestId: uniqueId ?? Number(id),
+      statusCode: response?.status,
+      endTime: Date.now(),
+    });
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  resTimeout = async (uniqueId: string) => {
+    return this.server?.network({
+      ...this.baseData,
+      isTimeout: true,
+      requestId: uniqueId,
+    });
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  resResponseError = async (uniqueId: string) => {
+    return this.server?.network({
+      ...this.baseData,
+      isResponseError: true,
+      requestId: uniqueId,
+    });
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  uniqueRes = async (uniqueId: string, response?: Response) => {
+    return this._res(uniqueId, undefined, response);
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  req = async (input: RequestInfo | URL, init?: RequestInit) => {
+    return this.uniqueReq(undefined, input, init);
+  }
+
+  /**
+   * @deprecated 不需要手动上报，日志插件会自动收集日志
+   */
+  res = async (id: number, response?: Response) => {
+    return this._res(undefined, id, response);
+  }
+}
+const logPlugin = new LogPlugin();
+export { LogPlugin };
+export default logPlugin;

package/src/server.ts

@@ -1,66 +1,66 @@
-import {hasPort, sleep} from './utils';
-const DEFAULT_PORT = 27751
-class Server {
-  private baseUrl = '';
-  private timeout: number;
-
-  constructor(url: string, timeout: number = 3000) {
-    this.updateUrl(url);
-    this.timeout = timeout;
-  }
-
-  updateTimeout(timeout = 3000) {
-    this.timeout = timeout;
-  }
-
-  private getPort() {
-    if (hasPort(this.baseUrl)) {
-      return ''
-    }
-    return DEFAULT_PORT;
-  }
-
-  private async send(path: string, data: Record<string, any>) {
-    try {
-      if (!this.baseUrl) {
-        return null;
-      }
-      const common = require('./common');
-      const result = await Promise.race([
-        common.tempFetch(`${this.baseUrl}:${this.getPort()}/${path}`, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json;charset=utf-8',
-          },
-          body: JSON.stringify(data, (_, val) => {
-            if (val instanceof Error) {
-              return val.toString();
-            }
-            return val;
-          }),
-        }),
-        sleep(this.timeout, true),
-      ]);
-      if (result instanceof Response) {
-        return result.text();
-      }
-      return null;
-    } catch (error) {
-      return null;
-    }
-  }
-
-  updateUrl(url: string) {
-    this.baseUrl = url;
-  }
-
-  async log(data: Record<string, any>) {
-    return this.send('log', data);
-  }
-
-  async network(data: Record<string, any>) {
-    return this.send('network', data);
-  }
-}
-
-export default Server;
+import {hasPort, sleep} from './utils';
+const DEFAULT_PORT = 27751
+class Server {
+  private baseUrl = '';
+  private timeout: number;
+
+  constructor(url: string, timeout: number = 3000) {
+    this.updateUrl(url);
+    this.timeout = timeout;
+  }
+
+  updateTimeout(timeout = 3000) {
+    this.timeout = timeout;
+  }
+
+  private getPort() {
+    if (hasPort(this.baseUrl)) {
+      return ''
+    }
+    return DEFAULT_PORT;
+  }
+
+  private async send(path: string, data: Record<string, any>) {
+    try {
+      if (!this.baseUrl) {
+        return null;
+      }
+      const common = require('./common');
+      const result = await Promise.race([
+        common.tempFetch(`${this.baseUrl}:${this.getPort()}/${path}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json;charset=utf-8',
+          },
+          body: JSON.stringify(data, (_, val) => {
+            if (val instanceof Error) {
+              return val.toString();
+            }
+            return val;
+          }),
+        }),
+        sleep(this.timeout, true),
+      ]);
+      if (result instanceof Response) {
+        return result.text();
+      }
+      return null;
+    } catch (error) {
+      return null;
+    }
+  }
+
+  updateUrl(url: string) {
+    this.baseUrl = url;
+  }
+
+  async log(data: Record<string, any>) {
+    return this.send('log', data);
+  }
+
+  async network(data: Record<string, any>) {
+    return this.send('network', data);
+  }
+}
+
+export default Server;