@zwa73/utils 1.0.239 → 1.0.241

package/dist/UtilClass/index.d.ts

@@ -1,3 +1,3 @@
 export * from './Hbs';
-export type { PromoseQueueOption, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, BridgeInterface } from "@zwa73/js-utils";
-export { Stream, Spool, SmartCache, PromiseQueue, Piper, DLinkedList, Bridge } from "@zwa73/js-utils";
+export type { PromoseQueueOption, EventData, DListMiddleNode, DListHeadNode, DListTailNode, DListNode, DListMaybeNode, BridgeInterface } from "@zwa73/js-utils";
+export { Stream, Spool, SmartCache, PromiseQueue, Piper, EventSystem, DLinkedList, Bridge } from "@zwa73/js-utils";

package/dist/UtilClass/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Bridge = exports.DLinkedList = exports.Piper = exports.PromiseQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
+exports.Bridge = exports.DLinkedList = exports.EventSystem = exports.Piper = exports.PromiseQueue = exports.SmartCache = exports.Spool = exports.Stream = void 0;
 __exportStar(require("./Hbs"), exports);
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return js_utils_1.Stream; } });
@@ -22,6 +22,7 @@ Object.defineProperty(exports, "Spool", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "SmartCache", { enumerable: true, get: function () { return js_utils_1.SmartCache; } });
 Object.defineProperty(exports, "PromiseQueue", { enumerable: true, get: function () { return js_utils_1.PromiseQueue; } });
 Object.defineProperty(exports, "Piper", { enumerable: true, get: function () { return js_utils_1.Piper; } });
+Object.defineProperty(exports, "EventSystem", { enumerable: true, get: function () { return js_utils_1.EventSystem; } });
 Object.defineProperty(exports, "DLinkedList", { enumerable: true, get: function () { return js_utils_1.DLinkedList; } });
 Object.defineProperty(exports, "Bridge", { enumerable: true, get: function () { return js_utils_1.Bridge; } });
 //#endregion

package/dist/UtilFileTools.d.ts

@@ -47,6 +47,11 @@ type WriteJsonFileOpt = Partial<{
     compressThreshold: number;
     /**不自动修改扩展名为json */
     forceExt: boolean;
+    /**检查重复, 避免重复写入
+     * 只在第一次尝试写入时读取一次文件内容, 后续将会使用缓存判断是否重复
+     * 若是其他进程改动了文件内容, 将无法检测到
+     */
+    checkDuplicate: boolean;
 }>;
 /**文件工具 */
 export declare namespace UtilFT {
@@ -129,8 +134,10 @@ export declare namespace UtilFT {
      * @param opt.compress          - 使用紧凑风格 将会用/\uF121\uF122\uF123.+\uF121\uF122\uF123/作为特殊标记, 原始文本内若出现相同格式将会产生错误
      * @param opt.forceExt          - 不自动修改扩展名为json
      * @param opt.compressThreshold - 紧凑风格 压缩阈值 默认100
+     * @param opt.checkDuplicate    - 检查重复输出 避免重复输出
+     * @returns 是否完成写入, 出错或检出重复均会返回false
      */
-    function writeJSONFile(filePath: string, token: JToken, opt?: WriteJsonFileOpt): Promise<void>;
+    function writeJSONFile(filePath: string, token: JToken, opt?: WriteJsonFileOpt): Promise<boolean>;
     /**保证路径为某个风格
      * @param filePath - 输入路径
      * @param style    - 目标风格 undefined 时不改变

package/dist/UtilFileTools.js

@@ -188,6 +188,7 @@ var UtilFT;
         }
     }
     UtilFT.loadJSONFile = loadJSONFile;
+    const writeJSONFileDupMap = {};
     /**写入JSON文件
      * @async
      * @param filePath - 文件路径
@@ -196,6 +197,8 @@ var UtilFT;
      * @param opt.compress          - 使用紧凑风格 将会用/\uF121\uF122\uF123.+\uF121\uF122\uF123/作为特殊标记, 原始文本内若出现相同格式将会产生错误
      * @param opt.forceExt          - 不自动修改扩展名为json
      * @param opt.compressThreshold - 紧凑风格 压缩阈值 默认100
+     * @param opt.checkDuplicate    - 检查重复输出 避免重复输出
+     * @returns 是否完成写入, 出错或检出重复均会返回false
      */
     async function writeJSONFile(filePath, token, opt) {
         const str = UtilFunctions_1.UtilFunc.stringifyJToken(token, opt);
@@ -204,13 +207,24 @@ var UtilFT;
         // 判断文件路径是否存在 不存在则创建
         if (!(await pathExists(filePath)))
             await createPath(filePath);
+        // 检查内容是否重复
+        if (opt?.checkDuplicate) {
+            if (writeJSONFileDupMap[filePath] === undefined)
+                writeJSONFileDupMap[filePath] = await fs.promises.readFile(filePath, 'utf-8');
+            if (writeJSONFileDupMap[filePath] == str)
+                return false;
+            else
+                writeJSONFileDupMap[filePath] = str;
+        }
         // 写入文件
         try {
             await fs.promises.writeFile(filePath, str);
             UtilLogger_1.SLogger.verbose(`${filePath} writeJSONFile 成功`);
+            return true;
         }
         catch (err) {
             UtilLogger_1.SLogger.error(`${filePath} writeJSONFile 错误`, err);
+            return false;
         }
     }
     UtilFT.writeJSONFile = writeJSONFile;

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" | "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" | "outcome" | "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" | "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" | "outcome" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;

package/dist/UtilHttp.d.ts

@@ -14,8 +14,9 @@ export type RequestResult<T> = {
 };
 /**网络请求选项 */
 export type RequestOption = {
-    /**请求之间的间隔, 单位毫秒 默认 1
-     * 如果用promise并发请求可能会导致req.write提前中断, 为避免此问题需要设置请求间隔
+    /**请求之间的间隔, 单位毫秒 默认 0
+     * 如果用promise并发请求可能会因缓冲区溢出导致req.write提前中断
+     * 为避免此问题需要设置请求间隔
      */
     interval?: number;
     /**请求协议 */

package/dist/UtilHttp.js

@@ -242,9 +242,12 @@ class UtilHttp {
             this._data.headers ??= {};
             this._data.headers['Content-Length'] = Buffer.byteLength(data);
             return {
-                proc: req => {
-                    if (isPost)
-                        req.write(data);
+                proc: async (req) => {
+                    if (isPost) {
+                        const flushed = req.write(data);
+                        if (!flushed)
+                            await new Promise((resolve) => req.once('drain', resolve));
+                    }
                     req.end();
                 }
             };
@@ -294,9 +297,12 @@ class UtilHttp {
             this._data.headers ??= {};
             this._data.headers['Content-Length'] = Buffer.byteLength(data);
             return {
-                proc: req => {
-                    if (isPost)
-                        req.write(data);
+                proc: async (req) => {
+                    if (isPost) {
+                        const flushed = req.write(data);
+                        if (!flushed)
+                            await new Promise((resolve) => req.once('drain', resolve));
+                    }
                     req.end();
                 }
             };
@@ -376,14 +382,14 @@ class UtilHttp {
     static async request(option, sendProc, acceptProc) {
         const { reduce: reqReduce, init: reqInit } = acceptProc;
         const { proc: reqProc } = sendProc;
-        const { protocol, timeout = 0, interval = 1, ...baseReqOpt } = option;
+        const { protocol, timeout = 0, interval = 0, ...baseReqOpt } = option;
         const plusTimeout = timeout + 1000;
         const hasTimeLimit = timeout >= 10_000;
         const flagName = `UtilCom.request ${protocol}${baseReqOpt.method} ${UtilFunctions_1.UtilFunc.genUUID()}`;
         const reduceQueue = new js_utils_1.PromiseQueue();
         let dataPromise = null;
         //等待间隔
-        if (UtilHttp.requestQueue.length > 0)
+        if (UtilHttp.requestQueue.length > 0 && interval > 0)
             await UtilHttp.requestQueue.enqueue(async () => UtilFunctions_1.UtilFunc.sleep(interval));
         return new Promise(async (resolve, rejecte) => {
             const finallyTimeout = hasTimeLimit

package/dist/UtilInterfaces.d.ts

@@ -1 +1 @@
-export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize } from "@zwa73/js-utils";
+export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize } from "@zwa73/js-utils";

package/package.json

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