@zwa73/utils 1.0.124 → 1.0.126

package/dist/QuickFunction.d.ts

@@ -1,4 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
 import { UtilFunc } from "./UtilFunctions";
-export declare const outcome: typeof UtilFunc.outcome, matchProc: typeof UtilFunc.matchProc, sucesProc: typeof UtilFunc.sucesProc, isFailed: typeof UtilFunc.isFailed, isSafeNumber: typeof UtilFunc.isSafeNumber, isSuccess: typeof UtilFunc.isSuccess, likeNone: typeof UtilFunc.likeNone, expect: typeof UtilFunc.expect, assertType: typeof UtilFunc.assertType, assertLiteral: typeof UtilFunc.assertLiteral, deepClone: typeof UtilFunc.deepClone, sleep: typeof UtilFunc.sleep, stringifyJToken: typeof UtilFunc.stringifyJToken, getTime: typeof UtilFunc.getTime, mapEntries: typeof UtilFunc.mapEntries, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError;
+export declare const outcome: typeof UtilFunc.outcome, matchProc: typeof UtilFunc.matchProc, sucesProc: typeof UtilFunc.sucesProc, isFailed: typeof UtilFunc.isFailed, isSafeNumber: typeof UtilFunc.isSafeNumber, isSuccess: typeof UtilFunc.isSuccess, likeNone: typeof UtilFunc.likeNone, expect: typeof UtilFunc.expect, assertType: typeof UtilFunc.assertType, assertLiteral: typeof UtilFunc.assertLiteral, deepClone: typeof UtilFunc.deepClone, sleep: typeof UtilFunc.sleep, stringifyJToken: typeof UtilFunc.stringifyJToken, getTime: typeof UtilFunc.getTime, mapEntries: typeof UtilFunc.mapEntries, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError, eitherify: typeof UtilFunc.eitherify, taskEitherify: typeof UtilFunc.taskEitherify;
 export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath, currosizePath: typeof UtilFT.currosizePath;

package/dist/QuickFunction.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
+exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.taskEitherify = exports.eitherify = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
 const UtilFileTools_1 = require("./UtilFileTools");
 const UtilFunctions_1 = require("./UtilFunctions");
 const UtilSymbol_1 = require("./UtilSymbol");
-exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError;
+exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError, exports.eitherify = UtilFunctions_1.UtilFunc.eitherify, exports.taskEitherify = UtilFunctions_1.UtilFunc.taskEitherify;
 exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath, exports.currosizePath = UtilFileTools_1.UtilFT.currosizePath;
 if (false) {
     let aaser = (0, exports.assertLiteral)({ a: 1 });

package/dist/UtilCom.d.ts

@@ -1,4 +1,4 @@
-import { JObject, PromiseVerifyFn } from "./UtilInterfaces";
+import { JObject, ReqVerifyFn } from "./UtilInterfaces";
 /**网络工具 */
 export declare namespace UtilCom {
     /**发送一个 https POST请求并接受数据
@@ -27,7 +27,7 @@ export declare namespace UtilCom {
      * @param verifyFn    - 判断有效性函数
      * @returns 结果 null 为未能成功接收
      */
-    function shttpsRepeatPost(json: JObject, options: Object, timeLimit?: number, repeatCount?: number, repeatTime?: number, verifyFn?: PromiseVerifyFn<JObject | null>): Promise<JObject | null>;
+    function shttpsRepeatPost(json: JObject, options: Object, timeLimit?: number, repeatCount?: number, repeatTime?: number, verifyFn?: ReqVerifyFn<JObject | null>): Promise<JObject | null>;
     /**重复一个 http POST请求并接受数据
      * Object ()
      * @async
@@ -39,5 +39,5 @@ export declare namespace UtilCom {
      * @param verifyFn    - 判断有效性函数
      * @returns 结果 null 为未能成功接收
      */
-    function shttpRepeatPost(json: JObject, options: Object, timeLimit?: number, repeatCount?: number, repeatTime?: number, verifyFn?: PromiseVerifyFn<JObject | null>): Promise<JObject | null>;
+    function shttpRepeatPost(json: JObject, options: Object, timeLimit?: number, repeatCount?: number, repeatTime?: number, verifyFn?: ReqVerifyFn<JObject | null>): Promise<JObject | null>;
 }

package/dist/UtilFileTools.d.ts

@@ -23,6 +23,13 @@ type FileSearchRegexOpt = Partial<{
     /**搜索子目录 默认 true */
     relative: boolean;
 }>;
+/**json文件加载选项 */
+type LoadJsonFileOpt<T> = Partial<{
+    /**默认值 默认{} */
+    default: T;
+    /**以json5模式加载 略慢 默认false */
+    json5: boolean;
+}>;
 /**文件工具 */
 export declare namespace UtilFT {
     /**验证路径 文件或文件夹 是否存在 异步
@@ -73,10 +80,12 @@ export declare namespace UtilFT {
     function loadJSONFileSync(filePath: string): JToken;
     /**加载json文件 同步
      * @param filePath - 文件路径
-     * @param def      - 默认值
+     * @param opt      - 可选参数
+     * @param opt.default - 默认值
+     * @param opt.json5   - json5模式
      * @returns 加载完成的对象或默认值
      */
-    function loadJSONFileSync<T extends JToken>(filePath: string, def: T): T;
+    function loadJSONFileSync<T extends JToken>(filePath: string, opt: LoadJsonFileOpt<T>): T;
     /**加载json文件 异步
      * @async
      * @param filePath   - 文件路径
@@ -86,10 +95,12 @@ export declare namespace UtilFT {
     /**加载json文件 异步
      * @async
      * @param filePath - 文件路径
-     * @param def      - 默认值
+     * @param opt      - 可选参数
+     * @param opt.default - 默认值
+     * @param opt.json5   - json5模式
      * @returns 加载完成的对象或默认值
      */
-    function loadJSONFile<T extends JToken>(filePath: string, def: T): Promise<T>;
+    function loadJSONFile<T extends JToken>(filePath: string, opt: LoadJsonFileOpt<T>): Promise<T>;
     /**写入JSON文件
      * void (string,Object)
      * @async

package/dist/UtilFileTools.js

@@ -141,7 +141,7 @@ var UtilFT;
         return createPathSync(filePath, opt);
     }
     UtilFT.ensurePathExistsSync = ensurePathExistsSync;
-    function loadJSONFileSync(filePath, def) {
+    function loadJSONFileSync(filePath, opt) {
         if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         let str = "";
@@ -150,14 +150,16 @@ var UtilFT;
             str = fs.readFileSync(filePath, "utf-8");
         // 如果不存在则返回默认值
         if (str == "" || str == null) {
-            if (def !== undefined)
-                return def;
+            if (opt?.default !== undefined)
+                return opt.default;
             return {};
         }
-        return JSON5.parse(str);
+        if (opt?.json5)
+            return JSON5.parse(str);
+        return JSON.parse(str);
     }
     UtilFT.loadJSONFileSync = loadJSONFileSync;
-    async function loadJSONFile(filePath, def) {
+    async function loadJSONFile(filePath, opt) {
         if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         let str = "";
@@ -166,11 +168,13 @@ var UtilFT;
             str = await fs.promises.readFile(filePath, "utf-8");
         // 如果不存在则返回默认值
         if (str == "" || str == null) {
-            if (def !== undefined)
-                return def;
+            if (opt?.default !== undefined)
+                return opt.default;
             return {};
         }
-        return JSON5.parse(str);
+        if (opt?.json5)
+            return JSON5.parse(str);
+        return JSON.parse(str);
     }
     UtilFT.loadJSONFile = loadJSONFile;
     /**写入JSON文件

package/dist/UtilFunctions.d.ts

@@ -1,6 +1,6 @@
-import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Mixinable, Outcome, PromiseVerifyFn, ProperSubsetCheck, RefMixinable, UnionToIntersection } from "./UtilInterfaces";
+import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Mixinable, Outcome, ReqVerifyFn, ProperSubsetCheck, RefMixinable, UnionToIntersection, Await } from "./UtilInterfaces";
 import { LogLevel } from "./UtilLogger";
-import { FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
+import { Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
 declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 type HashMethod = typeof HashMethodList[number];
 /**执行选项 */
@@ -79,7 +79,7 @@ export declare class UtilFunc {
      * @param repeatTime  - 超时时间/秒  最小为5秒
      * @returns 结果 null 为全部失败/超时
      */
-    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: PromiseVerifyFn<T>, repeatCount?: number, repeatTime?: number): Promise<T | null>;
+    static repeatPromise<T>(procFn: () => Promise<T>, verifyFn?: ReqVerifyFn<T>, repeatCount?: number, repeatTime?: number): Promise<T | null>;
     /**创建一个限时的Promise
      * @param func      - 处理函数
      * @param timeLimit - 毫秒限时
@@ -223,9 +223,36 @@ export declare class UtilFunc {
         filePath: string;
         lineNumber: `${number}:${number}`;
     } | undefined;
+    private static publicIp?;
     /**获取当前公网ipv4
-     * @returns undefined 时为错误
      */
-    static getPublicIpv4(): Promise<string | undefined>;
+    static getPublicIpv4(): Promise<string>;
+    /**将传入函数包装为显示处理错误的函数
+     * @param func - 待转换函数
+     * @returns 转换完成的函数
+     */
+    static eitherify<T extends AnyFunc>(func: T): (...args: Parameters<T>) => Outcome<typeof Success, ReturnType<T>> | Outcome<typeof Failed, Error>;
+    /**将传入的异步函数包装为显示处理错误的函数
+     * @param func - 待转换函数
+     * @returns 转换完成的函数
+     */
+    static taskEitherify<T extends (...args: any) => Promise<any>>(func: T): (...args: Parameters<T>) => Promise<Outcome<typeof Failed, Error> | Outcome<typeof Success, Await<ReturnType<T>>>>;
+    /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
+     * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。
+     * 请注意，这个函数使用了eval()，可能会带来安全风险。
+     *
+     * @param {string} moduleName - 需要导入的模块的名称。
+     * @returns {Promise<any>} 返回一个Promise。当模块被成功导入时，这个Promise会解析为导入的模块。如果导入失败，这个Promise会被拒绝。
+     *
+     * @example
+     * async function main() {
+     *   const pip = (await dynamicImport('public-ip')).default;
+     *   console.log(await pip.v4());
+     * }
+     * main();
+     *
+     * @since Node.js 13.2，Node.js开始支持动态import。
+     */
+    static dynamicImport(moduleName: string): Promise<any>;
 }
 export {};

package/dist/UtilFunctions.js

@@ -43,6 +43,7 @@ const UtilSymbol_1 = require("./UtilSymbol");
 const UtilDecorators_1 = require("./UtilDecorators");
 const path_1 = __importDefault(require("path"));
 const UtilFileTools_1 = require("./UtilFileTools");
+const util_1 = require("util");
 const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 /**永不完成的Promise单例 */
 const NeverResolvedPromise = new Promise(() => { });
@@ -614,17 +615,66 @@ class UtilFunc {
         }
         return undefined;
     }
+    static publicIp;
     /**获取当前公网ipv4
-     * @returns undefined 时为错误
      */
     static async getPublicIpv4() {
-        const { stdout } = await UtilFunc.exec('public-ip -4');
-        const ip = stdout.trim();
-        // 单独的 0-255 的正则表达式
-        const i255regex = /(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/.source;
-        // 使用 .source 属性来拼接正则表达式
-        const ipv4Pattern = new RegExp(`^(${i255regex}\\.){3}${i255regex}$`);
-        return ipv4Pattern.test(ip) ? ip : undefined;
+        if (UtilFunc.publicIp === undefined)
+            UtilFunc.publicIp = await UtilFunc.dynamicImport('public-ip');
+        return UtilFunc.publicIp.publicIpv4();
+    }
+    /**将传入函数包装为显示处理错误的函数
+     * @param func - 待转换函数
+     * @returns 转换完成的函数
+     */
+    static eitherify(func) {
+        return (...args) => {
+            try {
+                const result = func(...args);
+                return UtilFunc.outcome(UtilSymbol_1.Success, result);
+            }
+            catch (error) {
+                if (error instanceof Error)
+                    return UtilFunc.outcome(UtilSymbol_1.Failed, error);
+                return UtilFunc.outcome(UtilSymbol_1.Failed, new Error((0, util_1.inspect)(error)));
+            }
+        };
+    }
+    /**将传入的异步函数包装为显示处理错误的函数
+     * @param func - 待转换函数
+     * @returns 转换完成的函数
+     */
+    static taskEitherify(func) {
+        return async (...args) => {
+            try {
+                const result = await func(...args);
+                return UtilFunc.outcome(UtilSymbol_1.Success, result);
+            }
+            catch (error) {
+                if (error instanceof Error)
+                    return UtilFunc.outcome(UtilSymbol_1.Failed, error);
+                return UtilFunc.outcome(UtilSymbol_1.Failed, new Error((0, util_1.inspect)(error)));
+            }
+        };
+    }
+    /**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。
+     * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。
+     * 请注意，这个函数使用了eval()，可能会带来安全风险。
+     *
+     * @param {string} moduleName - 需要导入的模块的名称。
+     * @returns {Promise<any>} 返回一个Promise。当模块被成功导入时，这个Promise会解析为导入的模块。如果导入失败，这个Promise会被拒绝。
+     *
+     * @example
+     * async function main() {
+     *   const pip = (await dynamicImport('public-ip')).default;
+     *   console.log(await pip.v4());
+     * }
+     * main();
+     *
+     * @since Node.js 13.2，Node.js开始支持动态import。
+     */
+    static async dynamicImport(moduleName) {
+        return await eval(`import('${moduleName}')`);
     }
 }
 exports.UtilFunc = UtilFunc;

package/dist/UtilInterfaces.d.ts

@@ -96,11 +96,11 @@ export type ExclusiveJObject<B extends JObject, T extends JToken, K extends stri
  * 终止 将直接返回  null
  * 失败 将重试
  */
-export type PromiseStat = Success | Failed | Terminated;
-/**promise验证函数 */
-export type PromiseVerifyFn<T> = (obj: T) => Promise<PromiseStat> | PromiseStat;
-/**获取Promise的结果类型 */
-export type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+export type ReqStat = Success | Failed | Terminated;
+/**请求状态验证函数 */
+export type ReqVerifyFn<T> = (obj: T) => Promise<ReqStat> | ReqStat;
+/**获取Promise的结果类型 如同await那样 */
+export type Await<T> = T extends Promise<infer U> ? U : T;
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {
     [K in keyof T]: T[K] extends AnyFunc ? K : never;
@@ -172,6 +172,11 @@ export type Outcome<K extends Keyable, V> = {
     /**值 */
     readonly result: V;
 };
+/**可成功或失败的结果
+ * @template S - 成功时的结果
+ * @template F - 失败时的结果
+ */
+export type Eithercome<S, F> = Outcome<Success, S> | Outcome<Failed, F>;
 /**可进行匹配的 outcome或symbol */
 export type Matchable<T extends Keyable> = T | Outcome<T, unknown>;
 /**可进行匹配的 outcome或symbol 中的状态类型 */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.124",
+	"version": "1.0.126",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -17,8 +17,6 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"esm": "^3.2.25",
-		"esm-resolve": "^1.0.8",
 		"fluent-ffmpeg": "2.1.2",
 		"glob": "^10.3.10",
 		"html-entities": "^2.3.3",
@@ -26,7 +24,7 @@
 		"https-proxy-agent": "^5.0.1",
 		"json5": "^2.2.3",
 		"pathe": "^1.1.2",
-		"public-ip-cli": "^3.0.0",
+		"public-ip": "^6.0.2",
 		"tiktoken": "^1.0.7",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1"
@@ -35,7 +33,7 @@
 		"@types/fluent-ffmpeg": "^2.1.21",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^18.16.3",
-		"@zwa73/dev-utils": "^1.0.48",
+		"@zwa73/dev-utils": "^1.0.50",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",

package/src/QuickFunction.ts

@@ -21,6 +21,8 @@ export const {
     mapEntries,
     dedent,
     throwError,
+    eitherify,
+    taskEitherify,
 } = UtilFunc;
 
 export const {

package/src/UtilCom.ts

@@ -1,4 +1,4 @@
-import { JObject, PromiseVerifyFn } from "@src/UtilInterfaces";
+import { JObject, ReqVerifyFn } from "@src/UtilInterfaces";
 import * as https from 'https';
 import * as http from 'http';
 import { SLogger } from "@src/UtilLogger";
@@ -132,7 +132,7 @@ export function shttpPost(json:JObject,options:Object,timeLimit:number=-1):Promi
  * @returns 结果 null 为未能成功接收
  */
 async function sRepeatPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:number=-1,
-    repeatCount:number=3,repeatTime:number=180,verifyFn?:PromiseVerifyFn<JObject|null>):Promise<JObject|null>{
+    repeatCount:number=3,repeatTime:number=180,verifyFn?:ReqVerifyFn<JObject|null>):Promise<JObject|null>{
     const procFn = ()=>sPost(posttype,json,options,timeLimit);
     return UtilFunc.repeatPromise(procFn,verifyFn,repeatCount,repeatTime);
 }
@@ -149,7 +149,7 @@ async function sRepeatPost(posttype:"http"|"https",json:JObject,options:Object,t
  * @returns 结果 null 为未能成功接收
  */
 export function shttpsRepeatPost(json:JObject,options:Object,timeLimit:number=-1,
-    repeatCount:number=3,repeatTime:number=180,verifyFn?:PromiseVerifyFn<JObject|null>):Promise<JObject|null>{
+    repeatCount:number=3,repeatTime:number=180,verifyFn?:ReqVerifyFn<JObject|null>):Promise<JObject|null>{
     return sRepeatPost("https",json,options,timeLimit,repeatCount,repeatTime,verifyFn);
 }
 
@@ -165,7 +165,7 @@ export function shttpsRepeatPost(json:JObject,options:Object,timeLimit:number=-1
  * @returns 结果 null 为未能成功接收
  */
 export function shttpRepeatPost(json:JObject,options:Object,timeLimit:number=-1,
-    repeatCount:number=3,repeatTime:number=180,verifyFn?:PromiseVerifyFn<JObject|null>):Promise<JObject|null>{
+    repeatCount:number=3,repeatTime:number=180,verifyFn?:ReqVerifyFn<JObject|null>):Promise<JObject|null>{
     return sRepeatPost("http",json,options,timeLimit,repeatCount,repeatTime,verifyFn);
 }
 

package/src/UtilDecorators.ts

@@ -1,5 +1,5 @@
 import { UtilFunc } from "./UtilFunctions";
-import { UnwrapPromise } from "./UtilInterfaces";
+import { Await } from "./UtilInterfaces";
 import { SLogger } from "./UtilLogger";
 
 type TDTg<T> = 

package/src/UtilFileTools.ts

@@ -34,6 +34,14 @@ type FileSearchRegexOpt = Partial<{
     relative:boolean;
 }>
 
+/**json文件加载选项 */
+type LoadJsonFileOpt<T> = Partial<{
+    /**默认值 默认{} */
+    default:T;
+    /**以json5模式加载 略慢 默认false */
+    json5:boolean;
+}>
+
 /**文件工具 */
 export namespace UtilFT{
 
@@ -148,11 +156,13 @@ export function ensurePathExistsSync(filePath: string, opt?:EnsurePathExistsOpt)
 export function loadJSONFileSync(filePath: string): JToken
 /**加载json文件 同步
  * @param filePath - 文件路径
- * @param def      - 默认值
+ * @param opt      - 可选参数
+ * @param opt.default - 默认值
+ * @param opt.json5   - json5模式
  * @returns 加载完成的对象或默认值
  */
-export function loadJSONFileSync<T extends JToken>(filePath: string,def: T): T
-export function loadJSONFileSync<T extends JToken>(filePath: string,def?: T): T {
+export function loadJSONFileSync<T extends JToken>(filePath: string,opt:LoadJsonFileOpt<T>): T
+export function loadJSONFileSync<T extends JToken>(filePath: string,opt?:LoadJsonFileOpt<T>): T {
     if (path.extname(filePath) !== '.json') filePath += '.json';
 
     let str = "";
@@ -163,11 +173,13 @@ export function loadJSONFileSync<T extends JToken>(filePath: string,def?: T): T
 
     // 如果不存在则返回默认值
     if (str == "" || str == null){
-        if(def!==undefined)
-            return def;
+        if(opt?.default!==undefined)
+            return opt.default;
         return {} as T;
     }
-    return JSON5.parse(str);
+    if(opt?.json5)
+        return JSON5.parse(str);
+    return JSON.parse(str);
 }
 
 /**加载json文件 异步
@@ -179,11 +191,13 @@ export async function loadJSONFile(filePath: string): Promise<JToken>
 /**加载json文件 异步
  * @async
  * @param filePath - 文件路径
- * @param def      - 默认值
+ * @param opt      - 可选参数
+ * @param opt.default - 默认值
+ * @param opt.json5   - json5模式
  * @returns 加载完成的对象或默认值
  */
-export async function loadJSONFile<T extends JToken>(filePath: string,def: T): Promise<T>
-export async function loadJSONFile<T extends JToken>(filePath: string,def?: T): Promise<T> {
+export async function loadJSONFile<T extends JToken>(filePath: string,opt:LoadJsonFileOpt<T>): Promise<T>
+export async function loadJSONFile<T extends JToken>(filePath: string,opt?:LoadJsonFileOpt<T>): Promise<T> {
     if (path.extname(filePath) !== '.json') filePath += '.json';
 
     let str = "";
@@ -194,11 +208,13 @@ export async function loadJSONFile<T extends JToken>(filePath: string,def?: T):
 
     // 如果不存在则返回默认值
     if (str == "" || str == null){
-        if(def!==undefined)
-            return def;
+        if(opt?.default!==undefined)
+            return opt.default;
         return {} as T;
     }
-    return JSON5.parse(str);
+    if(opt?.json5)
+        return JSON5.parse(str);
+    return JSON.parse(str);
 }
 
 /**写入JSON文件

package/src/UtilFunctions.ts

@@ -1,11 +1,13 @@
 import * as crypto from "crypto";
-import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Mixinable, Outcome, PromiseStat, PromiseVerifyFn, ProperSubset, ProperSubsetCheck, RefMixinable, UnionToIntersection } from "@src/UtilInterfaces";
+import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, Literal, Matchable, MatchableFlag, Mixinable, Outcome, ReqStat, ReqVerifyFn, ProperSubset, ProperSubsetCheck, RefMixinable, UnionToIntersection, Await } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { LogLevel, SLogger } from "@src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
 import { Catch, DeferAsync, LogTimeAsync } from "./UtilDecorators";
 import opath from 'path';
 import { UtilFT } from "./UtilFileTools";
+import {inspect} from 'util';
+import type * as publicIp from 'public-ip';
 
 const HashMethodList = ["md5","sha1","sha256","sha512","sha3","blake2","blake3"] as const;
 type HashMethod = typeof HashMethodList[number];
@@ -25,7 +27,7 @@ type PromiseResult<T> = {
     /**请求结果 */
     result:T;
     /**请求状态 */
-    stat:PromiseStat;
+    stat:ReqStat;
     /**请求下标/序号 */
     index:number;
 };
@@ -181,7 +183,7 @@ static getNeverResolvedPromise<T>():Promise<T>{
  * @returns 结果 null 为全部失败/超时
  */
 @LogTimeAsync("repeatPromise ",true)
-static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVerifyFn<T>,
+static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:ReqVerifyFn<T>,
     repeatCount:number=3,repeatTime:number=180):Promise<T|null>{
 
     /**是否含有超时时间 */
@@ -695,17 +697,68 @@ static getFuncLoc(stack=1) {
     return undefined;
 }
 
+
+private static publicIp?:typeof publicIp;
+
 /**获取当前公网ipv4
- * @returns undefined 时为错误
  */
 static async getPublicIpv4(){
-    const {stdout} = await UtilFunc.exec('public-ip -4');
-    const ip = stdout.trim();
-    // 单独的 0-255 的正则表达式
-    const i255regex = /(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/.source;
-    // 使用 .source 属性来拼接正则表达式
-    const ipv4Pattern = new RegExp(`^(${i255regex}\\.){3}${i255regex}$`);
-    return ipv4Pattern.test(ip) ? ip : undefined;
+    if(UtilFunc.publicIp===undefined)
+        UtilFunc.publicIp = await UtilFunc.dynamicImport('public-ip') as typeof publicIp;
+    return UtilFunc.publicIp.publicIpv4();
+}
+
+/**将传入函数包装为显示处理错误的函数
+ * @param func - 待转换函数
+ * @returns 转换完成的函数
+ */
+static eitherify<T extends AnyFunc>(func:T) {
+    return (...args: Parameters<T>) => {
+        try {
+            const result:ReturnType<T> = func(...args as any);
+            return UtilFunc.outcome(Success,result);
+        } catch (error) {
+            if(error instanceof Error)
+                return UtilFunc.outcome(Failed,error);
+            return UtilFunc.outcome(Failed,new Error(inspect(error)));
+        }
+    };
+}
+/**将传入的异步函数包装为显示处理错误的函数
+ * @param func - 待转换函数
+ * @returns 转换完成的函数
+ */
+static taskEitherify<T extends (...args:any)=>Promise<any>>(func:T) {
+    return async (...args: Parameters<T>) => {
+        try {
+            const result:Await<ReturnType<T>> = await func(...args as any);
+            return UtilFunc.outcome(Success,result);
+        } catch (error) {
+            if(error instanceof Error)
+                return UtilFunc.outcome(Failed,error);
+            return UtilFunc.outcome(Failed,new Error(inspect(error)));
+        }
+    };
+}
+
+/**动态导入模块的函数。这个函数是为了在TypeScript的模块系统配置为CommonJS时，防止动态import被转译为require而设计的。  
+ * 使用这个函数，你可以在TypeScript中动态地导入模块，而不需要担心import()被转译为require()。  
+ * 请注意，这个函数使用了eval()，可能会带来安全风险。  
+ *
+ * @param {string} moduleName - 需要导入的模块的名称。
+ * @returns {Promise<any>} 返回一个Promise。当模块被成功导入时，这个Promise会解析为导入的模块。如果导入失败，这个Promise会被拒绝。
+ *
+ * @example
+ * async function main() {
+ *   const pip = (await dynamicImport('public-ip')).default;
+ *   console.log(await pip.v4());
+ * }
+ * main();
+ *
+ * @since Node.js 13.2，Node.js开始支持动态import。
+ */
+static async dynamicImport(moduleName:string):Promise<any> {
+    return await eval(`import('${moduleName}')`);
 }
 
 }

package/src/UtilInterfaces.ts

@@ -136,13 +136,12 @@ export type ExclusiveJObject<B extends JObject,T extends JToken,K extends string
  * 终止 将直接返回  null  
  * 失败 将重试  
  */
-export type PromiseStat = Success|Failed|Terminated;
-/**promise验证函数 */
-export type PromiseVerifyFn<T> = (obj:T)=>Promise<PromiseStat>|PromiseStat;
-
-/**获取Promise的结果类型 */
-export type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
+export type ReqStat = Success|Failed|Terminated;
+/**请求状态验证函数 */
+export type ReqVerifyFn<T> = (obj:T)=>Promise<ReqStat>|ReqStat;
 
+/**获取Promise的结果类型 如同await那样 */
+export type Await<T> = T extends Promise<infer U> ? U : T;
 
 /**类型中任意函数的字符串名称 */
 export type FuncPropNames<T> = {
@@ -241,7 +240,7 @@ export type WithPrefix<T,P extends string> = {
             : K
     ]: T[K]
 };
-/**返回结果
+/**返回结果  
  * @template K - 类型键值
  * @template V - 值
  */
@@ -251,6 +250,12 @@ export type Outcome<K extends Keyable,V> = {
     /**值 */
     readonly result:V;
 }
+/**可成功或失败的结果  
+ * @template S - 成功时的结果
+ * @template F - 失败时的结果
+ */
+export type Eithercome<S,F> =
+    Outcome<Success,S>|Outcome<Failed,F>;
 
 /**可进行匹配的 outcome或symbol */
 export type Matchable<T extends Keyable> = T|Outcome<T,unknown>;

package/test - /345/211/257/346/234/254.bat"

@@ -0,0 +1,2 @@
+node dist/test/ip
+pause