@zwa73/utils 1.0.255 → 1.0.257

package/dist/UtilFunctions.d.ts

@@ -45,5 +45,5 @@ declare class _UtilFunc {
     /**获取当前公网ipv4 */
     static getPublicIpv4(): Promise<string>;
 }
-export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "preset" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "checkSharpSchema" | "outcome" | "extractOutcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "preset" | "mergeOption" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "checkSharpSchema" | "outcome" | "extractOutcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilHttp.d.ts

@@ -2,7 +2,7 @@ import { AnyString, JToken, MPromise, PartialOption, StatusVerifyFn } from "./Ut
 import http from 'http';
 import { PromiseRetries } from "./UtilFunctions";
 import FormData from "form-data";
-import { PromiseQueue } from "@zwa73/js-utils";
+import { LogLevel, PromiseQueue } from "@zwa73/js-utils";
 /**网络请求返回值 */
 export type RequestResult<T> = {
     /**响应头 */
@@ -14,6 +14,8 @@ export type RequestResult<T> = {
 };
 /**网络请求选项 */
 export type RequestOption = {
+    /**请求的log等级 默认http 不影响警告 */
+    logLevel?: LogLevel;
     /**请求协议 */
     protocol: 'http:' | 'https:';
     /**超时时间/毫秒  最小为10_000 默认无限 */
@@ -41,7 +43,7 @@ export type QueryRequestData = NodeJS.Dict<string | number | boolean | readonly
 /**请求处理函数 需调用req.end() */
 export type RequestProcFn = (req: http.ClientRequest) => MPromise<void>;
 /**结果处理函数 */
-export type RequestParseFn<D, R> = (result: RequestResult<D> | undefined) => MPromise<R>;
+export type RequestParseFn<D, R> = (result: RequestResult<D> | undefined, opt: RequestOption) => MPromise<R>;
 /**数据处理函数 */
 export type RequestReduceFn<T> = (acc: T, data: string) => MPromise<T>;
 /**数据初始化函数 */

package/dist/UtilHttp.js

@@ -16,6 +16,10 @@ const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
 const js_utils_1 = require("@zwa73/js-utils");
 const fs_1 = __importDefault(require("fs"));
 const pathe_1 = __importDefault(require("pathe"));
+const RequestDefOption = {
+    logLevel: 'http',
+    timeout: 0,
+};
 const SendNoneProc = {
     proc: req => void req.end()
 };
@@ -162,7 +166,7 @@ class UtilHttp {
         const acceptProc = {
             init: () => '',
             reduce: (acc, curr) => acc + curr,
-            parse: result => {
+            parse: (result, opt) => {
                 if (result == undefined) {
                     UtilLogger_1.SLogger.warn(`accept json 接收反馈错误: 响应结果无效`);
                     return undefined;
@@ -174,7 +178,7 @@ class UtilHttp {
                 }
                 try {
                     const obj = JSON.parse(data.trim());
-                    UtilLogger_1.SLogger.http(`accept json 接受信息 data:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }), `result:`, UtilFunctions_1.UtilFunc.stringifyJToken(rest, { compress: true, space: 2 }));
+                    UtilLogger_1.SLogger.log(opt.logLevel, `accept json 接受信息 data:`, UtilFunctions_1.UtilFunc.stringifyJToken(obj, { compress: true, space: 2 }), `result:`, UtilFunctions_1.UtilFunc.stringifyJToken(rest, { compress: true, space: 2 }));
                     return { ...rest, data: obj };
                 }
                 catch (err) {
@@ -352,7 +356,7 @@ class UtilHttp {
      * @param datas  - 数据对象
      */
     async once(arg) {
-        const fullopt = { ...this._data, ...arg.option ?? {} };
+        const fullopt = UtilFunctions_1.UtilFunc.mergeOption(RequestDefOption, { ...this._data, ...arg.option ?? {} });
         const sendProc = typeof this._send === 'function'
             ? await this._send(fullopt, arg)
             : this._send;
@@ -360,7 +364,7 @@ class UtilHttp {
             ? await this._accept(arg)
             : this._accept;
         const res = await UtilHttp.request(fullopt, sendProc, acceptProc);
-        return parse(res);
+        return parse(res, fullopt);
     }
     /**重复发送网络请求
      * @param verify  - 有效性验证函数
@@ -384,7 +388,7 @@ class UtilHttp {
     static async request(option, sendProc, acceptProc) {
         const { reduce: reqReduce, init: reqInit } = acceptProc;
         const { proc: reqProc } = sendProc;
-        const { protocol, timeout = 0, ...baseReqOpt } = option;
+        const { protocol, logLevel, timeout, ...baseReqOpt } = UtilFunctions_1.UtilFunc.mergeOption(RequestDefOption, option);
         const plusTimeout = timeout + 1000;
         const hasTimeLimit = timeout >= 10_000;
         const flagName = `UtilCom.request ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;

package/dist/UtilLogger.js

@@ -241,7 +241,7 @@ class SLogger {
     timeEnd(flag, level = "info") {
         const start = SLogger.timeTable[flag];
         if (start == null) {
-            this.warn("SLogger.timeEnd 错误 flag:" + flag + " 不存在");
+            this.warn(`SLogger.timeEnd 错误 flag:${flag} 不存在`);
             return;
         }
         const timelen = process.hrtime(start);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.255",
+	"version": "1.0.257",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {