@zwa73/utils 1.0.219 → 1.0.221

package/dist/UtilFileTools.js

@@ -279,23 +279,27 @@ var UtilFT;
      * @returns 文件名路径数组
      */
     async function fileSearchRegex(dir, traitRegex, opt) {
-        const recursive = opt?.recursive ?? true;
-        const outArray = [];
-        const subFiles = await fs.promises.readdir(dir, { withFileTypes: true });
+        const fixopt = Object.assign({ recursive: true }, opt);
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
         const regex = new RegExp(traitRegex);
-        await Promise.all(subFiles.map(async (subFile) => {
-            const subFilePath = pathe_1.default.join(dir, subFile.name);
-            //判断是否是文件夹，递归调用
-            if (subFile.isDirectory()) {
-                if (recursive)
-                    outArray.push(...await UtilFT.fileSearchRegex(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
-                return;
-            }
-            if (regex.test(subFilePath))
-                outArray.push(subFilePath);
-        }));
-        return outArray.map((filePath) => pathe_1.default.normalize(filePath));
+        const recursive = async (curPath) => {
+            const subDir = pathe_1.default.join(dir, curPath);
+            const subFiles = await fs.promises.readdir(subDir, { withFileTypes: true });
+            const matchFiles = await Promise.all(subFiles.map(async (subFile) => {
+                const subFilePath = pathe_1.default.join(subDir, subFile.name);
+                const nextPath = pathe_1.default.join(curPath, subFile.name);
+                //判断是否是文件夹，递归调用
+                if (subFile.isDirectory() && fixopt.recursive)
+                    return recursive(nextPath);
+                if (regex.test(nextPath))
+                    return [subFilePath];
+                return [undefined];
+            }));
+            return matchFiles.flat()
+                .filter(v => v != undefined)
+                .map(fp => pathe_1.default.normalize(fp));
+        };
+        return recursive('');
     }
     UtilFT.fileSearchRegex = fileSearchRegex;
     /**搜索路径符合正则表达式的文件 同步版本
@@ -306,23 +310,27 @@ var UtilFT;
      * @returns 文件名路径数组
      */
     function fileSearchRegexSync(dir, traitRegex, opt) {
-        const recursive = opt?.recursive ?? true;
-        const outArray = [];
-        const subFiles = fs.readdirSync(dir, { withFileTypes: true });
+        const fixopt = Object.assign({ recursive: true }, opt);
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
         const regex = new RegExp(traitRegex);
-        for (const subFile of subFiles) {
-            const subFilePath = pathe_1.default.join(dir, subFile.name);
-            //判断是否是文件夹，递归调用
-            if (subFile.isDirectory()) {
-                if (recursive)
-                    outArray.push(...fileSearchRegexSync(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
-                continue;
-            }
-            if (regex.test(subFilePath))
-                outArray.push(subFilePath);
-        }
-        return outArray.map((filePath) => pathe_1.default.normalize(filePath));
+        const recursive = (curPath) => {
+            const subDir = pathe_1.default.join(dir, curPath);
+            const subFiles = fs.readdirSync(subDir, { withFileTypes: true });
+            const matchFiles = subFiles.map(subFile => {
+                const subFilePath = pathe_1.default.join(subDir, subFile.name);
+                const nextPath = pathe_1.default.join(curPath, subFile.name);
+                //判断是否是文件夹，递归调用
+                if (subFile.isDirectory() && fixopt.recursive)
+                    return recursive(nextPath);
+                if (regex.test(nextPath))
+                    return [subFilePath];
+                return [undefined];
+            });
+            return matchFiles.flat()
+                .filter(v => v != undefined)
+                .map(fp => pathe_1.default.normalize(fp));
+        };
+        return recursive('');
     }
     UtilFT.fileSearchRegexSync = fileSearchRegexSync;
     /**搜索符合Glob匹配的文件

package/dist/UtilHttp.d.ts

@@ -192,7 +192,7 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
     acceptNone(): UtilHttp<D, S, typeof AcceptNoneProc>;
     /**自定的接收数据类型*/
     acceptRaw<AD, AT>(proc: AcceptProc<AD, AT>): UtilHttp<D, S, typeof proc>;
-    /**预设的发送数据类型*/
+    /**预设的发送数据类型 */
     send<T extends SendType>(t: T): {
         readonly json: UtilHttp<D & {
             headers: {
@@ -205,30 +205,62 @@ export declare class UtilHttp<D extends Partial<RequestOption> & Required<Pick<R
                 "Content-Type": "multipart/form-data";
             };
         }, SendProc<[FormData]>, A>;
+        readonly form: UtilHttp<D & {
+            headers: {
+                "Content-Type": "application/x-www-form-urlencoded";
+            };
+        }, SendProc<[QueryRequestData]>, A>;
+        readonly file: UtilHttp<D & {
+            headers: {
+                "Content-Type": "multipart/form-data";
+            };
+        }, SendProc<[string, (string | undefined)?]>, A>;
         readonly none: UtilHttp<D, SendProc<[]>, A>;
     }[T];
-    /**利用 req.write 发送一段json */
+    /**发送json
+     * 请求参数为 (token:JToken)
+     */
     sendJson(): UtilHttp<D & {
         headers: {
             "Content-Type": "application/json";
         };
     }, SendProc<[JToken]>, A>;
-    /**利用 appendQuery 直接将数据附加在path上发送请求 */
+    /**利用 appendQuery 直接将数据附加在path上发送请求
+     * 请求参数为 (form:QueryRequestData)
+     */
     sendQuery(): UtilHttp<D, SendProc<[QueryRequestData]>, A>;
+    /**发送表单数据
+     * 请求参数为 (formData: FormData)
+     */
     sendFormData(): UtilHttp<D & {
         headers: {
             "Content-Type": "multipart/form-data";
         };
     }, SendProc<[FormData]>, A>;
+    /**发送表单
+     * 请求参数为 (form:QueryRequestData)
+     */
+    sendForm(): UtilHttp<D & {
+        headers: {
+            "Content-Type": "application/x-www-form-urlencoded";
+        };
+    }, SendProc<[QueryRequestData]>, A>;
+    /**发送文件
+     * 请求参数为 (filepath:string, filename?: string)
+     */
+    sendFile(): UtilHttp<D & {
+        headers: {
+            "Content-Type": "multipart/form-data";
+        };
+    }, SendProc<[string, (string | undefined)?]>, A>;
     sendNone(): UtilHttp<D, typeof SendNoneProc, A>;
-    /**自定的发送数据类型*/
+    /**自定的发送数据类型 */
     sendRaw<T extends any[]>(proc: SendProc<T>): UtilHttp<D, typeof proc, A>;
     /**发送请求
      * @param datas  - 数据对象
      */
     once(...datas: {} extends RequiredOnly<PartialOption<RequestOption, D>> ? SendParams<S> : [Error & "RequestOption不完整, 请使用 finalize 完成必要项"]): Promise<ParseResult<A>>;
     /**重复发送网络请求
-     * @param option  - 网络请求选项
      * @param verify  - 有效性验证函数
      * @param retries - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
      * @param datas   - 数据对象

package/dist/UtilHttp.js

@@ -10,9 +10,12 @@ const url_1 = require("url");
 const UtilLogger_1 = require("./UtilLogger");
 const UtilFunctions_1 = require("./UtilFunctions");
 const querystring_1 = __importDefault(require("querystring"));
+const form_data_1 = __importDefault(require("form-data"));
 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 fs_1 = __importDefault(require("fs"));
+const pathe_1 = __importDefault(require("pathe"));
 const AcceptTypeList = ["json", "string"];
 const SendTypeList = ["json", "query", "formData", "none"];
 const SendNoneProc = {
@@ -206,27 +209,32 @@ class UtilHttp {
     }
     //#endregion
     //#region 发送数据类型
-    /**预设的发送数据类型*/
+    /**预设的发送数据类型 */
     send(t) {
         const map = {
             'json': this.sendJson(),
             'query': this.sendQuery(),
             'formData': this.sendFormData(),
+            'form': this.sendForm(),
+            'file': this.sendFile(),
             'none': this.sendNone(),
         };
         return map[t];
     }
-    /**利用 req.write 发送一段json */
+    /**发送json
+     * 请求参数为 (token:JToken)
+     */
     sendJson() {
         const proc = {
-            proc: (opt, reqData) => {
+            proc: (opt, token) => {
                 const { method } = opt;
                 const isPost = (method == "POST");
+                const data = JSON.stringify(token);
                 this._data.headers ??= {};
-                this._data.headers['Content-Length'] = Buffer.byteLength(JSON.stringify(reqData));
+                this._data.headers['Content-Length'] = Buffer.byteLength(data);
                 const procReq = (req) => {
                     if (isPost)
-                        req.write(JSON.stringify(reqData));
+                        req.write(data);
                     req.end();
                 };
                 return procReq;
@@ -237,11 +245,13 @@ class UtilHttp {
         this._data.headers['Content-Type'] = 'application/json';
         return this;
     }
-    /**利用 appendQuery 直接将数据附加在path上发送请求 */
+    /**利用 appendQuery 直接将数据附加在path上发送请求
+     * 请求参数为 (form:QueryRequestData)
+     */
     sendQuery() {
         const proc = {
-            proc: (opt, reqData) => {
-                opt.path = UtilHttp.buildQuery(opt.path ?? '', reqData);
+            proc: (opt, form) => {
+                opt.path = UtilHttp.buildQuery(opt.path ?? '', form);
                 const procReq = (req) => void req.end();
                 return procReq;
             }
@@ -249,15 +259,62 @@ class UtilHttp {
         this._send = proc;
         return this;
     }
+    /**发送表单数据
+     * 请求参数为 (formData: FormData)
+     */
     sendFormData() {
         const proc = {
             proc: (opt, formData) => {
                 opt.headers = formData.getHeaders();
                 const procReq = (req) => {
                     formData.pipe(req);
+                };
+                return procReq;
+            },
+        };
+        this._send = proc;
+        this._data.headers ??= {};
+        this._data.headers['Content-Type'] = 'multipart/form-data';
+        return this;
+    }
+    /**发送表单
+     * 请求参数为 (form:QueryRequestData)
+     */
+    sendForm() {
+        const proc = {
+            proc: (opt, form) => {
+                const { method } = opt;
+                const isPost = (method == "POST");
+                const data = querystring_1.default.stringify(form);
+                this._data.headers ??= {};
+                this._data.headers['Content-Length'] = Buffer.byteLength(data);
+                const procReq = (req) => {
+                    if (isPost)
+                        req.write(data);
                     req.end();
                 };
                 return procReq;
+            }
+        };
+        this._send = proc;
+        this._data.headers ??= {};
+        this._data.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+        return this;
+    }
+    /**发送文件
+     * 请求参数为 (filepath:string, filename?: string)
+     */
+    sendFile() {
+        const proc = {
+            proc: (opt, filepath, filename) => {
+                const formData = new form_data_1.default();
+                filename = filename ?? pathe_1.default.basename(filepath);
+                formData.append(filename, fs_1.default.createReadStream(filepath));
+                opt.headers = formData.getHeaders();
+                const procReq = (req) => {
+                    formData.pipe(req);
+                };
+                return procReq;
             },
         };
         this._send = proc;
@@ -269,7 +326,7 @@ class UtilHttp {
         this._send = SendNoneProc;
         return this;
     }
-    /**自定的发送数据类型*/
+    /**自定的发送数据类型 */
     sendRaw(proc) {
         this._send = proc;
         return this;
@@ -286,7 +343,6 @@ class UtilHttp {
         return parse(res);
     }
     /**重复发送网络请求
-     * @param option  - 网络请求选项
      * @param verify  - 有效性验证函数
      * @param retries - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
      * @param datas   - 数据对象
@@ -387,10 +443,40 @@ class UtilHttp {
 exports.UtilHttp = UtilHttp;
 if (false)
     void ((async () => {
-        const t = await UtilHttp
+        const tool = UtilHttp
             .url('https://httpbin.org/post')
-            .postJson()
-            .finalize({ timeout: 10000 })
+            .post()
+            .finalize({ timeout: 10000 });
+        //json
+        const sj = await tool.clone()
+            .sendJson()
+            .acceptJson()
+            .once({ test: 1 });
+        console.log(sj);
+        //form
+        const sf = await tool.clone()
+            .sendForm()
+            .acceptJson()
+            .once({ test: 1 });
+        console.log(sf);
+        //query
+        const sq = await tool.clone()
+            .sendQuery()
+            .acceptJson()
             .once({ test: 1 });
-        console.log(t);
+        console.log(sq);
+        const filepath = pathe_1.default.join(__dirname, '..', 'input.wav');
+        //formData
+        //const form = new FormData();
+        //form.append('name', 'input.wav');
+        //form.append('file', fs.createReadStream(path.join(__dirname,'..','input.wav')));
+        //const sfd = await tool.clone()
+        //    .sendFormData()
+        //    .acceptJson()
+        //    .once(form);
+        const sfile = await tool.clone()
+            .sendFile()
+            .acceptJson()
+            .once(filepath);
+        console.log(sfile);
     })());

package/package.json

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