@zwa73/utils 1.0.121 → 1.0.123

package/dist/UtilFileTools.d.ts

@@ -134,10 +134,6 @@ export declare namespace UtilFT {
      * @returns 文件绝对路径数组
      */
     function fileSearchGlob(dir: string, globPattern: string | string[], opt?: FileSearchGlobOpt): string[];
-    /**
-     * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
-     */
-    function fileSearch(...patams: any[]): void;
     /**是一个有效的文件路径
      * @param filePath - 需要验证的文件路径
      */

package/dist/UtilFileTools.js

@@ -34,7 +34,6 @@ const UtilLogger_1 = require("./UtilLogger");
 const JSON5 = __importStar(require("json5"));
 const glob_1 = require("glob");
 const UtilFunctions_1 = require("./UtilFunctions");
-const QuickFunction_1 = require("./QuickFunction");
 /**文件工具 */
 var UtilFT;
 (function (UtilFT) {
@@ -181,7 +180,7 @@ var UtilFT;
      * @param token    - 所要写入的JToken
      */
     async function writeJSONFile(filePath, token) {
-        let str = UtilFunctions_1.UtilFunc.stringifyJToken(token);
+        const str = UtilFunctions_1.UtilFunc.stringifyJToken(token);
         if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         // 判断文件路径是否存在 不存在则创建
@@ -205,7 +204,7 @@ var UtilFT;
     function stylizePath(filePath, style) {
         if (style === undefined)
             return filePath;
-        return (0, QuickFunction_1.matchProc)(style, {
+        return UtilFunctions_1.UtilFunc.matchProc(style, {
             posix: (nor) => filePath.replaceAll("\\", "/"),
             win32: (nor) => filePath.replaceAll("/", "\\"),
         });
@@ -280,13 +279,6 @@ var UtilFT;
             .map((filePath) => pathe_1.default.normalize(filePath));
     }
     UtilFT.fileSearchGlob = fileSearchGlob;
-    /**
-     * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
-     */
-    function fileSearch(...patams) {
-        UtilFunctions_1.UtilFunc.throwError("请使用 fileSearchRegex 或 fileSearchGlob", 'fatal');
-    }
-    UtilFT.fileSearch = fileSearch;
     /**是一个有效的文件路径
      * @param filePath - 需要验证的文件路径
      */

package/dist/UtilFunctions.d.ts

@@ -55,6 +55,8 @@ export declare class UtilFunc {
      * @returns
      */
     static sleep<T>(timeMs: number, result: T): Promise<T>;
+    /**是否需要检查环境 */
+    static checkEnv: boolean;
     /**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
      * @param command - 指令文本
      * @param opt     - 可选参数
@@ -219,5 +221,9 @@ export declare class UtilFunc {
         filePath: string;
         lineNumber: `${number}:${number}`;
     } | undefined;
+    /**获取当前公网ipv4
+     * @returns undefined 时为错误
+     */
+    static getPublicIpv4(): Promise<string | undefined>;
 }
 export {};

package/dist/UtilFunctions.js

@@ -31,6 +31,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilFunc = void 0;
 const crypto = __importStar(require("crypto"));
@@ -38,6 +41,8 @@ const cp = __importStar(require("child_process"));
 const UtilLogger_1 = require("./UtilLogger");
 const UtilSymbol_1 = require("./UtilSymbol");
 const UtilDecorators_1 = require("./UtilDecorators");
+const path_1 = __importDefault(require("path"));
+const UtilFileTools_1 = require("./UtilFileTools");
 const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 /**永不完成的Promise单例 */
 const NeverResolvedPromise = new Promise(() => { });
@@ -103,6 +108,8 @@ class UtilFunc {
             }, timeMs);
         });
     }
+    /**是否需要检查环境 */
+    static checkEnv = true;
     /**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
      * @param command - 指令文本
      * @param opt     - 可选参数
@@ -110,8 +117,16 @@ class UtilFunc {
      * @param opt.errlvl  - 错误的日志等级
      */
     static exec(command, opt) {
-        return new Promise((resolve, reject) => {
-            const child = cp.spawn(command, { shell: true });
+        return new Promise(async (resolve, reject) => {
+            // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
+            const env = Object.create(process.env);
+            const penv = path_1.default.join(process.cwd(), 'node_modules', '.bin');
+            if (UtilFunc.checkEnv && !await UtilFileTools_1.UtilFT.pathExists(penv)) {
+                UtilLogger_1.SLogger.warn('UtilFunc.exec 错误, 没有检测到 process.cwd()/node_modules/.bin 环境');
+                UtilFunc.checkEnv = false;
+            }
+            env.PATH = penv + path_1.default.delimiter + env.PATH;
+            const child = cp.spawn(command, { shell: true, env });
             let stdout = '';
             let stderr = '';
             child.stdout.on('data', (data) => {
@@ -589,6 +604,18 @@ class UtilFunc {
         }
         return undefined;
     }
+    /**获取当前公网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;
+    }
 }
 exports.UtilFunc = UtilFunc;
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.121",
+	"version": "1.0.123",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -19,13 +19,14 @@
 	"dependencies": {
 		"esm": "^3.2.25",
 		"esm-resolve": "^1.0.8",
-		"fluent-ffmpeg": "^2.1.2",
+		"fluent-ffmpeg": "2.1.2",
 		"glob": "^10.3.10",
 		"html-entities": "^2.3.3",
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",
 		"json5": "^2.2.3",
 		"pathe": "^1.1.2",
+		"public-ip-cli": "^3.0.0",
 		"tiktoken": "^1.0.7",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1"
@@ -34,7 +35,7 @@
 		"@types/fluent-ffmpeg": "^2.1.21",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^18.16.3",
-		"@zwa73/dev-utils": "^1.0.37",
+		"@zwa73/dev-utils": "^1.0.48",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",

package/src/QuickFunction.ts

@@ -1,7 +1,7 @@
 import { UtilFT } from "./UtilFileTools";
 import { UtilFunc } from "./UtilFunctions";
 import { Outcome } from "./UtilInterfaces";
-import { Completed, Failed, FailedLike, None, NoneOut, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
+import { Failed, None, NoneOut, Success } from "./UtilSymbol";
 
 export const {
     outcome,

package/src/UtilFileTools.ts

@@ -6,7 +6,6 @@ import { SLogger } from "@src/UtilLogger";
 import * as JSON5 from 'json5';
 import { globSync } from "glob";
 import { UtilFunc } from "./UtilFunctions";
-import { matchProc } from "./QuickFunction";
 
 /**创建文件选项 */
 type CreatePathOpt = Partial<{
@@ -212,7 +211,7 @@ export async function writeJSONFile(
     filePath: string,
     token: JToken
 ): Promise<void> {
-    let str = UtilFunc.stringifyJToken(token);
+    const str = UtilFunc.stringifyJToken(token);
     if (path.extname(filePath) !== '.json') filePath += '.json';
 
     // 判断文件路径是否存在 不存在则创建
@@ -234,7 +233,7 @@ export async function writeJSONFile(
  */
 export function stylizePath(filePath:string,style?:'win32'|'posix'){
     if(style===undefined) return filePath;
-    return matchProc(style, {
+    return UtilFunc.matchProc(style, {
         posix: (nor) => filePath.replaceAll("\\", "/"),
         win32: (nor) => filePath.replaceAll("/", "\\"),
     });
@@ -308,12 +307,6 @@ export function fileSearchGlob(dir: string, globPattern:string|string[],opt?:Fil
     return globSync(fixedPath, { ignore: opt?.ingore, absolute: true })
         .map((filePath) => path.normalize(filePath));
 }
-/**
- * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
- */
-export function fileSearch(...patams:any[]){
-    UtilFunc.throwError("请使用 fileSearchRegex 或 fileSearchGlob",'fatal');
-}
 /**是一个有效的文件路径
  * @param filePath - 需要验证的文件路径
  */

package/src/UtilFunctions.ts

@@ -4,6 +4,8 @@ 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";
 
 const HashMethodList = ["md5","sha1","sha256","sha512","sha3","blake2","blake3"] as const;
 type HashMethod = typeof HashMethodList[number];
@@ -111,6 +113,8 @@ static async sleep<T>(timeMs: number, result?:T): Promise<T|undefined> {
     });
 }
 
+/**是否需要检查环境 */
+static checkEnv = true;
 /**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
  * @param command - 指令文本
  * @param opt     - 可选参数
@@ -118,8 +122,19 @@ static async sleep<T>(timeMs: number, result?:T): Promise<T|undefined> {
  * @param opt.errlvl  - 错误的日志等级
  */
 static exec(command: string, opt?:ExecOpt) {
-    return new Promise<{ stdout: string, stderr: string }>((resolve, reject) => {
-        const child = cp.spawn(command,{shell:true});
+    return new Promise<{ stdout: string, stderr: string }>(async (resolve, reject) => {
+        // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
+        const env = Object.create(process.env);
+        const penv = opath.join(process.cwd(), 'node_modules', '.bin');
+
+        if(UtilFunc.checkEnv && ! await UtilFT.pathExists(penv)){
+            SLogger.warn('UtilFunc.exec 错误, 没有检测到 process.cwd()/node_modules/.bin 环境');
+            UtilFunc.checkEnv = false;
+        }
+
+        env.PATH = penv + opath.delimiter + env.PATH;
+
+        const child = cp.spawn(command, { shell: true, env });
 
         let stdout = '';
         let stderr = '';
@@ -669,4 +684,17 @@ static getFuncLoc(stack=1) {
     return undefined;
 }
 
+/**获取当前公网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;
+}
+
 }