@wutiange/log-listener-plugin 2.0.1-alpha.2 → 2.0.1-alpha.4

package/src/Server.ts

@@ -1,164 +1,178 @@
-import { hasPort, sleep } from "./utils";
-import Zeroconf from "react-native-zeroconf";
-import { getBaseData, getErrMsg, LOG_KEY } from "./common";
-import logger from "./logger";
-import md5 from 'crypto-js/md5';
-
-
-const DEFAULT_PORT = 27751;
-class Server {
-  private baseUrlObj: Record<string, string> = {};
-  private timeout: number;
-  private baseData: Record<string, any> = {};
-  private urlsListener: (
-    urls: string[],
-    urlsObj: Record<string, string>
-  ) => void;
-  private innerBaseData: Record<string, string> = {};
-
-  constructor(url?: string | Record<string, string>, timeout: number = 30000) {
-    if (typeof url === "string") {
-      this.updateUrl(url);
-    } else {
-      this.setBaseUrlObj(url ?? {});
-    }
-    this.timeout = timeout;
-    this.innerBaseData = getBaseData();
-    this.handleZeroConf();
-  }
-
-  addUrlsListener = (
-    onNewUrlCallback: (urls: string[], urlsObj: Record<string, string>) => void
-  ) => {
-    this.urlsListener = onNewUrlCallback;
-  };
-
-  private requestJoin = async (url: string, token: string) => {
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json;charset=utf-8",
-      },
-      body: JSON.stringify({
-        token,
-        model: this.innerBaseData.Model,
-        id: md5(JSON.stringify(this.innerBaseData)).toString(),
-      }),
-    });
-    if (response.status !== 200) {
-      return false;
-    }
-    const json = await response.json();
-
-    if (json.code !== 0) {
-      return false;
-    }
-    return true
-  }
-
-  private async handleZeroConf() {
-    try {
-      const Zeroconf = require("react-native-zeroconf")?.default;
-      if (!Zeroconf) {
-        return;
-      }
-      // @ts-ignore
-      const zeroconf: Zeroconf = new Zeroconf();
-      zeroconf.on("resolved", async (service) => {
-        try {
-          const { path, token } = service.txt ?? {};
-          if (!(path && token) || this.baseUrlObj[token]) {
-            return;
-          }
-          const url = `http://${service.host}:${service.port}`;
-          if (!(await this.requestJoin(`${url}${path}`, token))) {
-            return;
-          }
-          this.baseUrlObj[token] = url;
-          if (this.urlsListener) {
-            this.urlsListener(this.getUrls(), this.baseUrlObj);
-          }
-        } catch (error) {
-          logger.warn(LOG_KEY, "加入日志系统失败---", error);
-        }
-      });
-      zeroconf.scan("http", "tcp");
-    } catch (error: any) {
-      logger.warn(LOG_KEY, "zeroconf扫描或处理相关逻辑失败或者您根本就没有安装 react-native-zeroconf ，如果您没有安装，那么您将无法使用发现功能", error);
-    }
-  }
-
-  updateTimeout(timeout = 3000) {
-    this.timeout = timeout;
-  }
-
-  getUrls() {
-    return Object.values(this.baseUrlObj).map((e) => {
-      if (hasPort(e)) {
-        return e;
-      }
-      return `${e}:${DEFAULT_PORT}`;
-    });
-  }
-
-  private send = async (
-    path: string,
-    data: Record<string, any>
-  ): Promise<void> => {
-    const request = async (url: string, _data: Record<string, any>) => {
-      await Promise.race([
-        fetch(`${url}/${path}`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json;charset=utf-8",
-          },
-          body: JSON.stringify(
-            { ...this.innerBaseData, ...this.baseData, ..._data },
-            (_, val) => {
-              if (val instanceof Error) {
-                return val.toString();
-              }
-              return val;
-            }
-          ),
-        }),
-        sleep(this.timeout, true),
-      ]);
-    };
-    try {
-      if (Object.keys(this.baseUrlObj).length === 0) {
-        return;
-      }
-      await Promise.all(this.getUrls().map(async (e) => request(e, data)));
-    } catch (error: any) {
-      logger.warn(LOG_KEY, "上报日志失败", error)
-    }
-  };
-
-  updateUrl(url: string) {
-    const tempUrl = url.includes("http") ? url : `http://${url}`;
-    if (!url) {
-      delete this.baseUrlObj["Default"];
-    } else {
-      this.baseUrlObj["Default"] = tempUrl;
-    }
-  }
-
-  setBaseUrlObj(urlObj: Record<string, string>) {
-    this.baseUrlObj = urlObj;
-  }
-
-  updateBaseData(data: Record<string, any>) {
-    this.baseData = data;
-  }
-
-  log = async (data: Record<string, any>) => {
-    return this.send("log", data);
-  };
-
-  network = async (data: Record<string, any>) => {
-    return this.send("network", data);
-  };
-}
-
-export default Server;
+import { hasPort, sleep } from "./utils";
+import Zeroconf from "react-native-zeroconf";
+import { getBaseData, getErrMsg, LOG_KEY } from "./common";
+import logger from "./logger";
+import md5 from 'crypto-js/md5';
+
+
+const DEFAULT_PORT = 27751;
+class Server {
+  private baseUrlArr: Set<string> = new Set();
+  private urlsObj: Map<string, string> = new Map();
+  private timeout: number;
+  private baseData: Record<string, any> = {};
+  private urlsListener: (urls: Set<string>) => void;
+  private innerBaseData: Record<string, string> = {};
+
+  constructor(url?: string | Set<string>, timeout: number = 30000) {
+    if (typeof url === "string") {
+      this.updateUrl(url);
+    } else {
+      this.setBaseUrlArr(url ?? new Set());
+    }
+    this.timeout = timeout;
+    this.innerBaseData = getBaseData();
+    this.handleZeroConf();
+  }
+
+  addUrlsListener = (
+    onNewUrlCallback: (urls: Set<string>) => void
+  ) => {
+    this.urlsListener = onNewUrlCallback;
+  };
+
+  private requestJoin = async (url: string, token: string) => {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json;charset=utf-8",
+      },
+      body: JSON.stringify({
+        token,
+        model: this.innerBaseData.Model ?? `${this.innerBaseData.systemName}v${this.innerBaseData.osVersion}`,
+        id: md5(JSON.stringify(this.innerBaseData)).toString(),
+      }),
+    });
+    if (response.status !== 200) {
+      return false;
+    }
+    const json = await response.json();
+    if (json.code !== 0) {
+      return false;
+    }
+    return true
+  }
+
+  private async handleZeroConf() {
+    try {
+      const Zeroconf = require("react-native-zeroconf")?.default;
+      if (!Zeroconf) {
+        return;
+      }
+      // @ts-ignore
+      const zeroconf: Zeroconf = new Zeroconf();
+      zeroconf.on("resolved", async (service) => {
+        try {
+          const { path, token } = service.txt ?? {};
+          const url = `http://${service.host}:${service.port}`;
+          if (!(path && token) || this.baseUrlArr.has(url)) {
+            return;
+          }
+          if (!(await this.requestJoin(`${url}${path}`, token))) {
+            return;
+          }
+          this.baseUrlArr.add(url);
+          this.urlsObj.set(service.name, url)
+          if (this.urlsListener) {
+            this.urlsListener(this.baseUrlArr);
+          }
+        } catch (error) {
+          logger.warn(LOG_KEY, "加入日志系统失败---", error);
+        }
+      });
+      zeroconf.on("remove", (name) => {
+        const currentUrl = this.urlsObj.get(name);
+        this.baseUrlArr.delete(currentUrl)
+        this.urlsObj.delete(name)
+        if (this.urlsListener) {
+          this.urlsListener(this.baseUrlArr);
+        }
+      });
+      zeroconf.on("error", (err) => {
+        logger.warn(LOG_KEY, "zeroconf出现错误", err);
+      })
+      zeroconf.scan("http", "tcp");
+    } catch (error: any) {
+      logger.warn(LOG_KEY, "zeroconf扫描或处理相关逻辑失败或者您根本就没有安装 react-native-zeroconf ，如果您没有安装，那么您将无法使用发现功能", error);
+    }
+  }
+
+  updateTimeout(timeout = 3000) {
+    this.timeout = timeout;
+  }
+
+  private send = async (
+    path: string,
+    data: Record<string, any>
+  ): Promise<void> => {
+    const request = async (url: string, _data: Record<string, any>) => {
+      await Promise.race([
+        fetch(`${url}/${path}`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json;charset=utf-8",
+          },
+          body: JSON.stringify(
+            { ...this.innerBaseData, ...this.baseData, ..._data },
+            (_, val) => {
+              if (val instanceof Error) {
+                return val.toString();
+              }
+              return val;
+            }
+          ),
+        }),
+        sleep(this.timeout, true),
+      ]);
+    };
+    if (this.baseUrlArr.size === 0) {
+      return;
+    }
+    this.baseUrlArr.forEach(async (e) => {
+      try {
+        await request(e, data)
+      } catch (error: any) {
+        if (error?.message?.includes("Network request failed") || error?.message?.includes("Timeout")) {
+          return
+        }
+        logger.warn(LOG_KEY, "上报日志失败", error)
+      }
+    })
+  };
+
+  updateUrl(url: string = '') {
+    const tempUrl = url.includes("http") ? url : `http://${url}`;
+    if (!url) {
+      const currentUrl = this.urlsObj.get("Default");
+      this.baseUrlArr.delete(currentUrl);
+      this.urlsObj.delete("Default");
+    } else if (!hasPort(tempUrl)) {
+      this.updateUrl(`${tempUrl}:${DEFAULT_PORT}`);
+    } else {
+      this.baseUrlArr.add(tempUrl);
+      this.urlsObj.set("Default", tempUrl);
+    }
+  }
+
+  setBaseUrlArr(urlArr: Set<string> = new Set()) {
+    this.baseUrlArr = urlArr;
+  }
+
+  getBaseUrlArr() {
+    return this.baseUrlArr;
+  }
+
+  updateBaseData(data: Record<string, any> = {}) {
+    this.baseData = data;
+  }
+
+  log = async (data: Record<string, any>) => {
+    return this.send("log", data);
+  };
+
+  network = async (data: Record<string, any>) => {
+    return this.send("network", data);
+  };
+}
+
+export default Server;

package/src/__mocks__/react-native/Libraries/Blob/FileReader.js

@@ -1,45 +1,45 @@
-class FileReader {
-  constructor() {
-    this.result = null;
-    this.error = null;
-    this.readyState = FileReader.EMPTY;
-  }
-
-  static EMPTY = 0;
-  static LOADING = 1;
-  static DONE = 2;
-
-  addEventListener(event, callback) {
-    this[`on${event}`] = callback;
-  }
-
-  removeEventListener(event, callback) {
-    if (this[`on${event}`] === callback) {
-      this[`on${event}`] = null;
-    }
-  }
-
-  readAsText(blob) {
-    this._read(blob, 'text');
-  }
-
-  readAsArrayBuffer(blob) {
-    this._read(blob, 'arraybuffer');
-  }
-
-  _read(blob, resultType) {
-    this.readyState = FileReader.LOADING;
-    setTimeout(() => {
-      this.readyState = FileReader.DONE;
-      if (resultType === 'text') {
-        this.result = blob.text();
-      } else if (resultType === 'arraybuffer') {
-        // 这里我们简单地返回一个空的 ArrayBuffer
-        this.result = new ArrayBuffer(0);
-      }
-      if (this.onload) this.onload({target: this});
-    }, 0);
-  }
-}
-
+class FileReader {
+  constructor() {
+    this.result = null;
+    this.error = null;
+    this.readyState = FileReader.EMPTY;
+  }
+
+  static EMPTY = 0;
+  static LOADING = 1;
+  static DONE = 2;
+
+  addEventListener(event, callback) {
+    this[`on${event}`] = callback;
+  }
+
+  removeEventListener(event, callback) {
+    if (this[`on${event}`] === callback) {
+      this[`on${event}`] = null;
+    }
+  }
+
+  readAsText(blob) {
+    this._read(blob, 'text');
+  }
+
+  readAsArrayBuffer(blob) {
+    this._read(blob, 'arraybuffer');
+  }
+
+  _read(blob, resultType) {
+    this.readyState = FileReader.LOADING;
+    setTimeout(() => {
+      this.readyState = FileReader.DONE;
+      if (resultType === 'text') {
+        this.result = blob.text();
+      } else if (resultType === 'arraybuffer') {
+        // 这里我们简单地返回一个空的 ArrayBuffer
+        this.result = new ArrayBuffer(0);
+      }
+      if (this.onload) this.onload({target: this});
+    }, 0);
+  }
+}
+
 module.exports = FileReader;

package/src/__mocks__/react-native/Libraries/Network/XHRInterceptor.js

@@ -1,39 +1,39 @@
-// __mocks__/react-native/Libraries/XHRInterceptor.js
-
-class XHRInterceptor {
-  static _isInterceptorEnabled = false
-  static openCallback = null
-  static requestHeaderCallback = null
-  static headerReceivedCallback = null
-  static sendCallback = null
-  static responseCallback = null
-  
-  static setOpenCallback = jest.fn((callback) => {
-    XHRInterceptor.openCallback = callback;
-  })
-  static setRequestHeaderCallback = jest.fn((callback) => {
-    XHRInterceptor.requestHeaderCallback = callback;
-  })
-  static setHeaderReceivedCallback = jest.fn((callback) => {
-    XHRInterceptor.headerReceivedCallback = callback;
-  })
-  static setSendCallback = jest.fn((callback) => {
-    XHRInterceptor.sendCallback = callback;
-  })
-  static setResponseCallback = jest.fn((callback) => {
-    XHRInterceptor.responseCallback = callback;
-  })
-  
-  static enableInterception = jest.fn(() => {
-    XHRInterceptor._isInterceptorEnabled = true;
-  })
-  
-  static disableInterception = jest.fn(() => {
-    XHRInterceptor._isInterceptorEnabled = false;
-  })
-  
-  static isInterceptorEnabled = jest.fn(() => XHRInterceptor._isInterceptorEnabled)
-};
-
-module.exports = XHRInterceptor;
-
+// __mocks__/react-native/Libraries/XHRInterceptor.js
+
+class XHRInterceptor {
+  static _isInterceptorEnabled = false
+  static openCallback = null
+  static requestHeaderCallback = null
+  static headerReceivedCallback = null
+  static sendCallback = null
+  static responseCallback = null
+  
+  static setOpenCallback = jest.fn((callback) => {
+    XHRInterceptor.openCallback = callback;
+  })
+  static setRequestHeaderCallback = jest.fn((callback) => {
+    XHRInterceptor.requestHeaderCallback = callback;
+  })
+  static setHeaderReceivedCallback = jest.fn((callback) => {
+    XHRInterceptor.headerReceivedCallback = callback;
+  })
+  static setSendCallback = jest.fn((callback) => {
+    XHRInterceptor.sendCallback = callback;
+  })
+  static setResponseCallback = jest.fn((callback) => {
+    XHRInterceptor.responseCallback = callback;
+  })
+  
+  static enableInterception = jest.fn(() => {
+    XHRInterceptor._isInterceptorEnabled = true;
+  })
+  
+  static disableInterception = jest.fn(() => {
+    XHRInterceptor._isInterceptorEnabled = false;
+  })
+  
+  static isInterceptorEnabled = jest.fn(() => XHRInterceptor._isInterceptorEnabled)
+};
+
+module.exports = XHRInterceptor;
+