@wutiange/log-listener-plugin 1.0.1 → 1.1.10

package/dist/__tests__/console.test.d.ts

@@ -0,0 +1 @@
+import '../console';

package/dist/__tests__/console.test.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../console");
+const index_1 = __importDefault(require("../index"));
+describe("重写日志", () => {
+    it("log 没有提前设置 url", () => {
+        console.log("log 是否正常打印");
+        expect(1).toBe(1);
+    });
+    it("log 提前设置了 url", () => {
+        index_1.default.setBaseUrl("http://192.168.118.103");
+        console.log("log 是否正常打印");
+        expect(1).toBe(1);
+    });
+    it('warn', () => {
+        index_1.default.setBaseUrl("http://192.168.118.103");
+        console.warn("warn 是否正常打印");
+        expect(1).toBe(1);
+    });
+    it('error', () => {
+        index_1.default.setBaseUrl("http://192.168.118.103");
+        console.error("error 是否正常打印");
+        expect(1).toBe(1);
+    });
+});
+//# sourceMappingURL=console.test.js.map

package/dist/__tests__/console.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"console.test.js","sourceRoot":"","sources":["../../src/__tests__/console.test.ts"],"names":[],"mappings":";;;;;AAAA,sBAAmB;AACnB,qDAA6B;AAC7B,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACzB,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,eAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACzB,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACd,eAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAA;QAC3C,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC3B,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACf,eAAM,CAAC,UAAU,CAAC,wBAAwB,CAAC,CAAA;QAC3C,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/common.d.ts

@@ -0,0 +1,11 @@
+export declare const log: {
+    (...data: any[]): void;
+    (message?: any, ...optionalParams: any[]): void;
+}, warn: {
+    (...data: any[]): void;
+    (message?: any, ...optionalParams: any[]): void;
+}, error: {
+    (...data: any[]): void;
+    (message?: any, ...optionalParams: any[]): void;
+};
+export declare const tempFetch: typeof fetch;

package/dist/common.js

@@ -0,0 +1,7 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tempFetch = exports.error = exports.warn = exports.log = void 0;
+_a = [console.log, console.warn, console.error], exports.log = _a[0], exports.warn = _a[1], exports.error = _a[2];
+exports.tempFetch = global.fetch;
+//# sourceMappingURL=common.js.map

package/dist/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../src/common.ts"],"names":[],"mappings":";;;;AAAa,KAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,EAA9D,WAAG,UAAE,YAAI,UAAE,aAAK,SAA8C;AAI/D,QAAA,SAAS,GAAG,MAAM,CAAC,KAAqB,CAAA"}

package/dist/console.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/console.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = __importDefault(require("./index"));
+import('./common.js').then(common => {
+    console.log = (...data) => {
+        index_1.default.log(...data);
+        common.log(...data);
+    };
+    console.warn = (...data) => {
+        index_1.default.warn(...data);
+        common.warn(...data);
+    };
+    console.error = (...data) => {
+        index_1.default.error(...data);
+        common.error(...data);
+    };
+});
+//# sourceMappingURL=console.js.map

package/dist/console.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"console.js","sourceRoot":"","sources":["../src/console.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAE5B,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IAClC,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QAC/B,eAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;QACnB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAA;IACrB,CAAC,CAAA;IAED,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QAChC,eAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;QACpB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;IACtB,CAAC,CAAA;IAED,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;QACjC,eAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;QACrB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAA;IACvB,CAAC,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/fetch.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/fetch.js

@@ -0,0 +1,48 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const index_1 = __importDefault(require("./index"));
+const utils_1 = require("./utils");
+import('./common.js').then(common => {
+    global.fetch = (input, init) => __awaiter(void 0, void 0, void 0, function* () {
+        const uniqueId = (Date.now() + Math.random()).toString(16);
+        index_1.default.uniqueReq(uniqueId, input, init);
+        let isFetchFinished = false;
+        let isTimeout = false;
+        if (index_1.default.getTimeout() !== null) {
+            (0, utils_1.sleep)(index_1.default.getTimeout()).then(() => {
+                if (!isFetchFinished) {
+                    isTimeout = true;
+                    index_1.default.resTimeout(uniqueId);
+                }
+            });
+        }
+        try {
+            const response = yield common.tempFetch(input, init);
+            isFetchFinished = true;
+            if (response instanceof Response && !isTimeout) {
+                index_1.default.uniqueRes(uniqueId, response.clone());
+            }
+            return response;
+        }
+        catch (error) {
+            isFetchFinished = true;
+            if (!isTimeout) {
+                index_1.default.resResponseError(uniqueId);
+            }
+            throw new Error(error);
+        }
+    });
+});
+//# sourceMappingURL=fetch.js.map

package/dist/fetch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,mCAA+B;AAE/B,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IAElC,MAAM,CAAC,KAAK,GAAG,CAAO,KAAwB,EAAE,IAAkB,EAAE,EAAE;QACpE,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;QAC1D,eAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;QACvC,IAAI,eAAe,GAAG,KAAK,CAAA;QAC3B,IAAI,SAAS,GAAG,KAAK,CAAA;QACrB,IAAI,eAAM,CAAC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC;YACjC,IAAA,aAAK,EAAC,eAAM,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnC,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,SAAS,GAAG,IAAI,CAAA;oBAChB,eAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;gBAC7B,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YACpD,eAAe,GAAG,IAAI,CAAA;YACtB,IAAI,QAAQ,YAAY,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC/C,eAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;YAC9C,CAAC;YACD,OAAO,QAAQ,CAAA;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAe,GAAG,IAAI,CAAA;YACtB,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,eAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;YACnC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;QACxB,CAAC;IACH,CAAC,CAAA,CAAA;AACH,CAAC,CAAC,CAAA"}

package/dist/index.d.ts

@@ -1,16 +1,23 @@
 declare class Logger {
     private server;
     private baseData;
+    private timeout;
     setBaseUrl(url: string): void;
-    setBaseData(data: Record<string, any>): void;
-    private throwNotSetBaseUrl;
-    private throwNotSetBaseData;
+    setTimeout(timeout: number): void;
+    getTimeout(): number;
+    setBaseData(data?: Record<string, any>): void;
     private _log;
+    tag(tag: string, ...data: any[]): void;
     log(...data: any[]): void;
     warn(...data: any[]): void;
     error(...data: any[]): void;
+    uniqueReq(uniqueId: string, input: RequestInfo | URL, init?: RequestInit): Promise<string>;
+    private _res;
+    resTimeout(uniqueId: string): Promise<string>;
+    resResponseError(uniqueId: string): Promise<string>;
+    uniqueRes(uniqueId: string, response?: Response): Promise<string>;
     req(input: RequestInfo | URL, init?: RequestInit): Promise<string>;
-    res(id: number, response?: Response, isTimeout?: boolean): Promise<string>;
+    res(id: number, response?: Response): Promise<string>;
 }
 declare const _default: Logger;
 export default _default;

package/dist/index.js

@@ -16,6 +16,8 @@ const server_1 = __importDefault(require("./server"));
 class Logger {
     constructor() {
         this.server = null;
+        this.baseData = {};
+        this.timeout = null;
     }
     setBaseUrl(url) {
         if (this.server) {
@@ -25,44 +27,77 @@ class Logger {
             this.server = new server_1.default(url);
         }
     }
-    setBaseData(data) {
-        this.baseData = data;
-    }
-    throwNotSetBaseUrl() {
-        if (!this.server) {
-            throw new Error("请先设置 baseUrl ，用于将数据上传到日志系统中，一般是日志系统打开所在的电脑端口号");
+    setTimeout(timeout) {
+        var _a;
+        if (typeof timeout === 'number') {
+            this.timeout = timeout;
+            (_a = this.server) === null || _a === void 0 ? void 0 : _a.updateTimeout(this.timeout);
         }
     }
-    throwNotSetBaseData() {
-        if (!this.server) {
-            throw new Error("请先设置基础数据，也就是每一条日志都包含的数据");
+    getTimeout() {
+        if (typeof this.timeout === 'number') {
+            return this.timeout;
         }
+        return null;
+    }
+    setBaseData(data = {}) {
+        this.baseData = data;
+    }
+    _log(level, tag, ...data) {
+        var _a;
+        const sendData = Object.assign(Object.assign({}, this.baseData), { message: data, tag, level: level !== null && level !== void 0 ? level : 'log', createTime: Date.now() });
+        (_a = this.server) === null || _a === void 0 ? void 0 : _a.log(sendData);
     }
-    _log(level, ...data) {
-        this.throwNotSetBaseUrl();
-        this.throwNotSetBaseData();
-        const sendData = Object.assign(Object.assign({}, this.baseData), { message: data, level: level !== null && level !== void 0 ? level : 'log', createTime: Date.now() });
-        this.server.log(sendData);
+    tag(tag, ...data) {
+        this._log('log', tag, ...data);
     }
     log(...data) {
-        this._log('log', ...data);
+        this._log('log', 'default', ...data);
     }
     warn(...data) {
-        this._log('warn', ...data);
+        this._log('warn', 'default', ...data);
     }
     error(...data) {
-        this._log('error', ...data);
+        this._log('error', 'default', ...data);
     }
-    req(input, init) {
-        var _a;
+    uniqueReq(uniqueId, input, init) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.server.network(Object.assign(Object.assign({}, this.baseData), { url: input, method: (_a = init === null || init === void 0 ? void 0 : init.method) !== null && _a !== void 0 ? _a : "get", headers: init === null || init === void 0 ? void 0 : init.headers, body: init === null || init === void 0 ? void 0 : init.body, createTime: Date.now() }));
+            return (_a = this.server) === null || _a === void 0 ? void 0 : _a.network(Object.assign(Object.assign({}, this.baseData), { url: input, id: uniqueId, method: (_b = init === null || init === void 0 ? void 0 : init.method) !== null && _b !== void 0 ? _b : "get", headers: init === null || init === void 0 ? void 0 : init.headers, body: init === null || init === void 0 ? void 0 : init.body, createTime: Date.now() }));
         });
     }
-    res(id, response, isTimeout = false) {
+    _res(uniqueId, id, response) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const body = yield response.text();
-            return this.server.network(Object.assign(Object.assign({}, this.baseData), { headers: (response === null || response === void 0 ? void 0 : response.headers)['map'], body, requestId: Number(id), statusCode: response === null || response === void 0 ? void 0 : response.status, endTime: Date.now(), isTimeout, isResponseError: id === undefined || id === null }));
+            return (_a = this.server) === null || _a === void 0 ? void 0 : _a.network(Object.assign(Object.assign({}, this.baseData), { headers: (response === null || response === void 0 ? void 0 : response.headers)['map'], body, requestId: uniqueId !== null && uniqueId !== void 0 ? uniqueId : Number(id), statusCode: response === null || response === void 0 ? void 0 : response.status, endTime: Date.now() }));
+        });
+    }
+    resTimeout(uniqueId) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return (_a = this.server) === null || _a === void 0 ? void 0 : _a.network(Object.assign(Object.assign({}, this.baseData), { isTimeout: true, requestId: uniqueId }));
+        });
+    }
+    resResponseError(uniqueId) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            return (_a = this.server) === null || _a === void 0 ? void 0 : _a.network(Object.assign(Object.assign({}, this.baseData), { isResponseError: true, requestId: uniqueId }));
+        });
+    }
+    uniqueRes(uniqueId, response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._res(uniqueId, undefined, response);
+        });
+    }
+    req(input, init) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.uniqueReq(undefined, input, init);
+        });
+    }
+    res(id, response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._res(undefined, id, response);
         });
     }
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/server.d.ts

@@ -1,7 +1,9 @@
 declare class Server {
     private baseUrl;
     private port;
-    constructor(url: string);
+    private timeout;
+    constructor(url: string, timeout?: number);
+    updateTimeout(timeout?: number): void;
     private send;
     updateUrl(url: string): void;
     log(data: Record<string, any>): Promise<string>;

package/dist/server.js

@@ -9,23 +9,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
 class Server {
-    constructor(url) {
+    constructor(url, timeout = 3000) {
         this.baseUrl = '';
         this.port = 27751;
         this.updateUrl(url);
+        this.timeout = timeout;
+    }
+    updateTimeout(timeout = 3000) {
+        this.timeout = timeout;
     }
     send(path, data) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const result = yield fetch(`${this.baseUrl}:${this.port}/${path}`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json;charset=utf-8'
-                    },
-                    body: JSON.stringify(data)
-                });
-                return result.text();
+                if (!this.baseUrl) {
+                    return null;
+                }
+                const common = yield import('./common.js');
+                const result = yield Promise.race([
+                    common.tempFetch(`${this.baseUrl}:${this.port}/${path}`, {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json;charset=utf-8'
+                        },
+                        body: JSON.stringify(data)
+                    }),
+                    (0, utils_1.sleep)(this.timeout, true)
+                ]);
+                if (result instanceof Response) {
+                    return result.text();
+                }
+                return null;
             }
             catch (error) {
                 return null;

package/dist/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,MAAM,MAAM;IAGV,YAAY,GAAW;QAFf,YAAO,GAAG,EAAE,CAAC;QACb,SAAI,GAAG,KAAK,CAAA;QAElB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IACrB,CAAC;IAEa,IAAI,CAAC,IAAY,EAAE,IAAyB;;YACxD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,EAAE;oBACjE,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE;wBACP,cAAc,EAAE,gCAAgC;qBACjD;oBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;iBAC3B,CAAC,CAAA;gBACF,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;KAAA;IAED,SAAS,CAAC,GAAW;QACnB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA;IACpB,CAAC;IAEK,GAAG,CAAC,IAAyB;;YACjC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;KAAA;IAEK,OAAO,CAAC,IAAyB;;YACrC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;CACF;AAED,kBAAe,MAAM,CAAA"}
+{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAAgC;AAEhC,MAAM,MAAM;IAMV,YAAY,GAAW,EAAE,UAAkB,IAAI;QALvC,YAAO,GAAG,EAAE,CAAC;QACb,SAAI,GAAG,KAAK,CAAA;QAKlB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,aAAa,CAAC,OAAO,GAAG,IAAI;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEa,IAAI,CAAC,IAAY,EAAE,IAAyB;;YACxD,IAAI,CAAC;gBACH,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBAClB,OAAO,IAAI,CAAA;gBACb,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAA;gBAC1C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oBAChC,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,EAAE;wBACvD,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE;4BACP,cAAc,EAAE,gCAAgC;yBACjD;wBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;qBAC3B,CAAC;oBACF,IAAA,aAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;iBAC1B,CAAC,CAAA;gBACF,IAAI,MAAM,YAAY,QAAQ,EAAE,CAAC;oBAC/B,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;gBACtB,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;KAAA;IAED,SAAS,CAAC,GAAW;QACnB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAA;IACpB,CAAC;IAEK,GAAG,CAAC,IAAyB;;YACjC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;KAAA;IAEK,OAAO,CAAC,IAAyB;;YACrC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACnC,CAAC;KAAA;CACF;AAED,kBAAe,MAAM,CAAA"}

package/dist/utils.d.ts

@@ -0,0 +1 @@
+export declare function sleep(ms: number, isReject?: boolean): Promise<unknown>;

package/dist/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sleep = void 0;
+function sleep(ms, isReject = false) {
+    return new Promise((resolve, reject) => {
+        setTimeout(isReject ? () => reject({
+            code: 11001,
+            key: '@wutiange/log-listener-plugin%%timeout',
+            msg: 'Timeout'
+        }) : resolve, ms);
+    });
+}
+exports.sleep = sleep;
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,KAAK,CAAC,EAAU,EAAE,WAAoB,KAAK;IACzD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;YACjC,IAAI,EAAE,KAAK;YACX,GAAG,EAAE,wCAAwC;YAC7C,GAAG,EAAE,SAAS;SACf,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IACnB,CAAC,CAAC,CAAA;AACJ,CAAC;AARD,sBAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wutiange/log-listener-plugin",
-  "version": "1.0.1",
+  "version": "1.1.10",
   "description": "这是log-record的插件，如果需要使用这个日志监听，那么就需要把这个插件安装到项目中",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,10 +10,22 @@
   "private": false,
   "scripts": {
     "build": "tsc",
-    "dev": "ts-node ./src/index.ts"
+    "dev": "ts-node ./src/index.ts",
+    "test": "jest"
   },
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
+    "@types/jest": "^29.5.12",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3"
-  }
+  },
+  "files": [
+    "src",
+    "package.json",
+    "README.md",
+    "LICENSE",
+    "dist"
+  ]
 }

package/src/__tests__/console.test.ts

@@ -0,0 +1,26 @@
+import '../console'
+import logger from '../index'
+describe("重写日志", () => {
+  it("log 没有提前设置 url", () => {
+    console.log("log 是否正常打印")
+    expect(1).toBe(1)
+  })
+
+  it("log 提前设置了 url", () => {
+    logger.setBaseUrl("http://192.168.118.103")
+    console.log("log 是否正常打印")
+    expect(1).toBe(1)
+  })
+
+  it('warn', () => {
+    logger.setBaseUrl("http://192.168.118.103")
+    console.warn("warn 是否正常打印")
+    expect(1).toBe(1)
+  })
+
+  it('error', () => {
+    logger.setBaseUrl("http://192.168.118.103")
+    console.error("error 是否正常打印")
+    expect(1).toBe(1)
+  })
+})

package/src/common.ts

@@ -0,0 +1,5 @@
+export const [log, warn, error] = [console.log, console.warn, console.error]
+
+
+// @ts-ignore
+export const tempFetch = global.fetch as typeof fetch

package/src/console.ts

@@ -0,0 +1,19 @@
+import logger from './index'
+
+import('./common.js').then(common => {
+  console.log = (...data: any[]) => {
+    logger.log(...data)
+    common.log(...data)
+  }
+  
+  console.warn = (...data: any[]) => {
+    logger.warn(...data)
+    common.warn(...data)
+  }
+  
+  console.error = (...data: any[]) => {
+    logger.error(...data)
+    common.error(...data)
+  }
+})
+

package/src/fetch.ts

@@ -0,0 +1,35 @@
+import logger from './index'
+import { sleep } from './utils'
+
+import('./common.js').then(common => {
+  // @ts-ignore
+  global.fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
+    const uniqueId = (Date.now() + Math.random()).toString(16)
+    logger.uniqueReq(uniqueId, input, init)
+    let isFetchFinished = false
+    let isTimeout = false
+    if (logger.getTimeout() !== null) {
+      sleep(logger.getTimeout()).then(() => {
+        if (!isFetchFinished) {
+          isTimeout = true
+          logger.resTimeout(uniqueId)
+        }
+      })
+    }
+
+    try {
+      const response = await common.tempFetch(input, init)
+      isFetchFinished = true
+      if (response instanceof Response && !isTimeout) {
+        logger.uniqueRes(uniqueId, response.clone())
+      }
+      return response
+    } catch (error) {
+      isFetchFinished = true
+      if (!isTimeout) {
+        logger.resResponseError(uniqueId)
+      }
+      throw new Error(error)
+    }
+  }
+})

package/src/index.ts

@@ -4,7 +4,8 @@ import Server from "./server"
 class Logger {
 
   private server: Server | null = null
-  private baseData: Record<string, any>
+  private baseData: Record<string, any> = {}
+  private timeout: number | null = null
 
   setBaseUrl(url: string) {
     if (this.server) {
@@ -14,50 +15,56 @@ class Logger {
     }
   }
 
-  setBaseData(data: Record<string, any>) {
-    this.baseData = data
+  setTimeout(timeout: number) {
+    if (typeof timeout === 'number') {
+      this.timeout = timeout
+      this.server?.updateTimeout(this.timeout)
+    }
   }
 
-  private throwNotSetBaseUrl() {
-    if (!this.server) {
-      throw new Error("请先设置 baseUrl ，用于将数据上传到日志系统中，一般是日志系统打开所在的电脑端口号")
+  getTimeout() {
+    if (typeof this.timeout === 'number') {
+      return this.timeout
     }
+    return null
   }
 
-  private throwNotSetBaseData() {
-    if (!this.server) {
-      throw new Error("请先设置基础数据，也就是每一条日志都包含的数据")
-    }
+  setBaseData(data: Record<string, any> = {}) {
+    this.baseData = data
   }
 
-  private _log(level: string, ...data: any[]) {
-    this.throwNotSetBaseUrl()
-    this.throwNotSetBaseData()
+  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)
+    this.server?.log(sendData)
+  }
+
+  tag(tag: string, ...data: any[]) {
+    this._log('log', tag, ...data)
   }
 
   log(...data: any[]) {
-    this._log('log', ...data)
+    this._log('log', 'default', ...data)
   }
 
   warn(...data: any[]) {
-    this._log('warn', ...data)
+    this._log('warn', 'default', ...data)
   }
 
   error(...data: any[]) {
-    this._log('error', ...data)
+    this._log('error', 'default', ...data)
   }
 
-  async req(input: RequestInfo | URL, init?: RequestInit) {
-    return this.server.network({
+  async uniqueReq(uniqueId: string, input: RequestInfo | URL, init?: RequestInit) {
+    return this.server?.network({
       ...this.baseData,
       url: input,
+      id: uniqueId,
       method: init?.method ?? "get",
       headers: init?.headers,
       body: init?.body,
@@ -65,19 +72,45 @@ class Logger {
     })
   }
 
-  async res(id: number, response?: Response, isTimeout = false) {
+  private async _res(uniqueId?: string, id?: number, response?: Response) {
     const body = await response.text()
-    return this.server.network({
+    return this.server?.network({
       ...this.baseData,
       headers: (response?.headers as Record<string, any>)['map'],
       body,
-      requestId: Number(id),
+      requestId: uniqueId ?? Number(id),
       statusCode: response?.status,
       endTime: Date.now(),
-      isTimeout,
-      isResponseError: id === undefined || id === null
     })
   }
+
+  async resTimeout(uniqueId: string) {
+    return this.server?.network({
+      ...this.baseData,
+      isTimeout: true,
+      requestId: uniqueId,
+    })
+  }
+
+  async resResponseError(uniqueId: string) {
+    return this.server?.network({
+      ...this.baseData,
+      isResponseError: true,
+      requestId: uniqueId,
+    }) 
+  }
+
+  async uniqueRes(uniqueId: string, response?: Response) {
+    return this._res(uniqueId, undefined, response)
+  }
+
+  async req(input: RequestInfo | URL, init?: RequestInit) {
+    return this.uniqueReq(undefined, input, init)
+  }
+
+  async res(id: number, response?: Response) {
+    return this._res(undefined, id, response)
+  }
 }
 
 

package/src/server.ts

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

package/src/utils.ts

@@ -0,0 +1,9 @@
+export function sleep(ms: number, isReject: boolean = false) {
+  return new Promise((resolve, reject) => {
+    setTimeout(isReject ? () => reject({
+      code: 11001,
+      key: '@wutiange/log-listener-plugin%%timeout',
+      msg: 'Timeout'
+    }) : resolve, ms)
+  })
+}

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "noImplicitAny": true,
-    "removeComments": true,
-    "preserveConstEnums": true,
-    "outDir": "dist",
-    "sourceMap": true,
-    "esModuleInterop": true,
-    "target": "es6"
-  },
-  "exclude": ["node_modules", "**/*.spec.ts"],
-  "include": ["src/**/*"]
-}