@zwa73/utils 1.0.214 → 1.0.216

package/dist/UtilClass.d.ts

@@ -1 +1 @@
-export { Piper, Stream, Hbs, BridgeInterface, Bridge, SmartCache, DListMiddleNode, DLinkedList } from "@zwa73/js-utils";
+export { Piper, Stream, Hbs, BridgeInterface, Bridge, SmartCache, DListMiddleNode, DLinkedList, PromiseQueue } from "@zwa73/js-utils";

package/dist/UtilClass.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DLinkedList = exports.SmartCache = exports.Bridge = exports.Hbs = exports.Stream = exports.Piper = void 0;
+exports.PromiseQueue = exports.DLinkedList = exports.SmartCache = exports.Bridge = exports.Hbs = exports.Stream = exports.Piper = void 0;
 //#region UtilClass转导
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
@@ -9,4 +9,5 @@ Object.defineProperty(exports, "Hbs", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "Bridge", { enumerable: true, get: function () { return js_utils_1.Bridge; } });
 Object.defineProperty(exports, "SmartCache", { enumerable: true, get: function () { return js_utils_1.SmartCache; } });
 Object.defineProperty(exports, "DLinkedList", { enumerable: true, get: function () { return js_utils_1.DLinkedList; } });
+Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });
 //#endregion

package/dist/UtilCom.d.ts

@@ -216,7 +216,7 @@ export declare class UtilCom<D extends Partial<RequestOption> & Required<Pick<Re
         option: PartialOption<RequestOption, D>;
         verify?: StatusVerifyFn<ParseResult<A>>;
         retries?: PromiseRetries;
-    }, ...datas: SendParams<S>): Promise<import("./UtilFunctions").PromiseRetryResult<ParseResult<A>>>;
+    }, ...datas: SendParams<S>): Promise<import("@zwa73/js-utils").PromiseRetryResult<ParseResult<A>>>;
     /**发送网络请求
      * @param option  - 网络请求选项
      * @param proc    - 请求处理函数 需调用req.end()

package/dist/UtilCom.js

@@ -11,6 +11,7 @@ const UtilFunctions_1 = require("./UtilFunctions");
 const querystring_1 = __importDefault(require("querystring"));
 const http_proxy_agent_1 = __importDefault(require("http-proxy-agent"));
 const https_proxy_agent_1 = __importDefault(require("https-proxy-agent"));
+const js_utils_1 = require("@zwa73/js-utils");
 const AcceptTypeList = ["json", "string"];
 const SendTypeList = ["json", "query", "formData", "none"];
 const SendNoneProc = {
@@ -286,7 +287,7 @@ class UtilCom {
                     let mergedata = init;
                     res.setEncoding('utf8');
                     res.on('data', chunk => {
-                        dataPromise = UtilFunctions_1.UtilFunc.queueProc(flagName, async () => mergedata = await reduce(mergedata, chunk));
+                        dataPromise = js_utils_1.PromiseQueue.enqueue(flagName, async () => mergedata = await reduce(mergedata, chunk));
                     });
                     res.on('error', (e) => {
                         UtilLogger_1.SLogger.warn(`${flagName} 接收反馈错误:${e}`);

package/dist/UtilFileTools.d.ts

@@ -115,7 +115,7 @@ export declare namespace UtilFT {
      * @param opt.forceExt - 不自动修改扩展名为json
      * @returns 加载完成的对象或默认值
      */
-    function loadJSONFile<T extends JToken>(filePath: string, opt: LoadJsonFileOpt<T>): Promise<T>;
+    function loadJSONFile<T extends JToken>(filePath: string, opt?: LoadJsonFileOpt<T>): Promise<T>;
     /**写入JSON文件
      * @async
      * @param filePath - 文件路径

package/dist/UtilFileTools.js

@@ -142,37 +142,49 @@ var UtilFT;
     }
     UtilFT.ensurePathExistsSync = ensurePathExistsSync;
     function loadJSONFileSync(filePath, opt) {
-        if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
-            filePath += '.json';
-        const str = pathExistsSync(filePath)
-            ? fs.readFileSync(filePath, "utf-8")
-            : "";
-        // 如果不存在则返回默认值
-        if (str == "" || str == null) {
-            if (opt?.default !== undefined)
-                return opt.default;
-            return {};
+        try {
+            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
+                filePath += '.json';
+            const str = pathExistsSync(filePath)
+                ? fs.readFileSync(filePath, "utf-8")
+                : "";
+            // 如果不存在则返回默认值
+            if (str == "" || str == null) {
+                if (opt?.default !== undefined)
+                    return opt.default;
+                return {};
+            }
+            if (opt?.json5)
+                return JSON5.parse(str);
+            return JSON.parse(str);
+        }
+        catch (e) {
+            UtilLogger_1.SLogger.error(`loadJSONFileSync 错误 filePath:${filePath}`);
+            throw e;
         }
-        if (opt?.json5)
-            return JSON5.parse(str);
-        return JSON.parse(str);
     }
     UtilFT.loadJSONFileSync = loadJSONFileSync;
     async function loadJSONFile(filePath, opt) {
-        if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
-            filePath += '.json';
-        const str = (await pathExists(filePath))
-            ? await fs.promises.readFile(filePath, "utf-8")
-            : "";
-        // 如果不存在则返回默认值
-        if (str == "" || str == null) {
-            if (opt?.default !== undefined)
-                return opt.default;
-            return {};
+        try {
+            if (opt?.forceExt !== true && pathe_1.default.extname(filePath) !== '.json')
+                filePath += '.json';
+            const str = (await pathExists(filePath))
+                ? await fs.promises.readFile(filePath, "utf-8")
+                : "";
+            // 如果不存在则返回默认值
+            if (str == "" || str == null) {
+                if (opt?.default !== undefined)
+                    return opt.default;
+                return {};
+            }
+            if (opt?.json5)
+                return JSON5.parse(str);
+            return JSON.parse(str);
+        }
+        catch (e) {
+            UtilLogger_1.SLogger.error(`loadJSONFile 错误 filePath:${filePath}`);
+            throw e;
         }
-        if (opt?.json5)
-            return JSON5.parse(str);
-        return JSON.parse(str);
     }
     UtilFT.loadJSONFile = loadJSONFile;
     /**写入JSON文件

package/dist/UtilFunctions.d.ts

@@ -58,5 +58,5 @@ declare class _UtilFunc {
      */
     static dynamicImport(moduleName: string): Promise<any>;
 }
-export declare const UtilFunc: ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "pendingMap" | "queueProc" | "queueLength" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
+export declare const UtilFunc: ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "failed" | "success" | "prototype" | "genUUID" | "range" | "getTime" | "initField" | "initObject" | "unifyApply" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "splitToChunk" | "mergeFromChunk" | "concurrencyProc" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/package.json

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