@zwa73/utils 1.0.201 → 1.0.203

package/src/UtilCom_bak.txt

@@ -1,345 +0,0 @@
-import { AnyString,JToken, MPromise, StatusVerifyFn } from "@/src/UtilInterfaces";
-import https from 'https';
-import http from 'http';
-import { SLogger } from "@/src/UtilLogger";
-import { RepeatPromiseOpt, UtilFunc } from "@/src/UtilFunctions";
-import qs from "querystring";
-
-/**网络请求返回值 */
-export type ComResp<T> = {
-    /**响应头 */
-    headers: http.IncomingHttpHeaders;
-    /**响应状态码 */
-    statusCode?: number;
-    /**响应数据 */
-    data: T;
-}
-
-/**网络请求选项 */
-export type ComRequestOption = {
-    /**请求协议 */
-    protocol: 'http:'|'https:';
-    /**超时时间/毫秒  最小为10_000 默认无限 */
-    timeout?:number;
-    /**请求域名 */
-    hostname: string;
-    /**请求路径 */
-    path?: string;
-    /**请求方式 post 为 */
-    method: 'POST'|'GET';
-    /**端口 */
-    port?:number;
-    /**请求头 */
-    headers?: {
-        /**内容类型 */
-        'Content-Type'?: 'application/json'|AnyString;
-        /**内容长度 一般无需填写 应为buffer长度而非字符串长度 */
-        'Content-Length'?: number;
-    };
-}&http.RequestOptions;
-
-/**get请求所允许的数据 */
-export type GetReqData = NodeJS.Dict<
-| string
-| number
-| boolean
-| readonly string[]
-| readonly number[]
-| readonly boolean[]
-| null
->;
-
-/**请求处理函数 需调用req.end() */
-export type ProcReqFn = ((req:http.ClientRequest)=>MPromise<void>);
-/**数据处理函数 */
-export type ReduceDataFn<T> = (acc:T,data:string)=>MPromise<T>;
-
-/**网络工具 */
-export namespace UtilCom{
-
-
-/**网络请求
- * @param comReqOpt  - 网络请求选项
- * @param procReq    - 请求处理函数 需调用req.end()
- * @param reduceData - 数据处理函数
- * @param initData   - 初始数据
- */
-export async function comReq<T>(
-    comReqOpt:ComRequestOption,
-    procReq:ProcReqFn,
-    reduceData:ReduceDataFn<T>,
-    initData:T,
-){
-    const {protocol,timeout,...baseReqOpt} = comReqOpt;
-
-    const hasTimeLimit = (timeout ? timeout>=10_000 : false );
-
-    const flagName = `${comReq.name}.${protocol}${baseReqOpt.method}`;
-
-    return new Promise<ComResp<T>|undefined>(async (resolve, rejecte)=>{
-        const resFunc = (res:http.IncomingMessage)=>{
-            try{
-                //请求超时
-                if(hasTimeLimit){
-                    res.setTimeout(timeout!, ()=>{
-                        SLogger.warn(`${flagName} 接收反馈超时: ${timeout} ms`);
-                        resolve(undefined);
-                    });
-                }
-
-                let mergedata:T = initData;
-                res.setEncoding('utf8');
-                res.on('data', async chunk => mergedata=await reduceData(mergedata,chunk));
-
-                res.on('error',(e)=>{
-                    SLogger.warn(`${flagName} 接收反馈错误:${e}`);
-                    resolve(undefined);
-                });
-
-                res.on('end',()=>{
-                    resolve({
-                        headers: res.headers,
-                        statusCode: res.statusCode,
-                        data: mergedata,
-                    });
-                });
-            }catch(err){
-                SLogger.warn(`${flagName} 未知错误:${err}`);
-                resolve(undefined);
-                return;
-            }
-        };
-        //路由 http/https
-        const req:http.ClientRequest= protocol=="https:"
-            ? https.request(baseReqOpt as http.RequestOptions, resFunc)
-            : http.request(baseReqOpt  as http.RequestOptions, resFunc);
-
-        //请求超时
-        if(hasTimeLimit){
-            req.setTimeout(timeout!, ()=>{
-                SLogger.warn(`${flagName} 发送请求超时: ${timeout} ms`);
-                req.destroy();
-            });
-            //req.on('timeout', ()=>{
-            //    SLogger.warn(`${flagName} 发送请求超时(timeout): ${timeLimit} ms`);
-            //    req.destroy();
-            //});
-        }
-
-        req.on('error', (e)=>{
-            SLogger.warn(`${flagName} 发送请求错误:${e}`);
-            resolve(undefined);
-        });
-
-        await procReq(req);
-    });
-}
-
-/**发送json的网络请求  
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @returns 结果 undefined 为未能成功接收
- */
-async function jsonReq<T extends ComRequestOption>(
-    comReqOpt:T,
-    reqData?:T['method'] extends "POST" ? JToken :GetReqData
-){
-    const {method} = comReqOpt;
-    const isPost = (method=="POST");
-
-    if (!isPost && reqData != undefined) {
-        const queryString = qs.stringify(reqData as GetReqData);
-        if (queryString) {
-            // 检查当前路径是否已经包含问号
-            const separator = comReqOpt?.path?.includes('?') ? '&' : '?';
-            comReqOpt.path += separator + queryString;
-        }
-    }
-
-    const procReq = (req:http.ClientRequest)=>{
-        if(isPost) req.write(JSON.stringify(reqData));
-        req.end();
-    }
-
-    const reduceData = (acc:string,data:string)=>acc+data;
-    const result = await comReq(comReqOpt,procReq,reduceData,"");
-    if(result==undefined) return undefined;
-    const {data,...rest} = result;
-
-    if(data.trim()==""){
-        SLogger.warn(`${jsonReq.name} 接收反馈错误: 原始字符串为空`);
-        return {...result,raw:"",data:null};
-    }
-
-    try{
-        const obj = JSON.parse(data.trim()) as JToken;
-        SLogger.http(`${jsonReq.name} 接受信息:`,UtilFunc.stringifyJToken(obj,{compress:true,space:2}));
-        return{...rest,data:obj};
-    }
-    catch(e){
-        SLogger.warn(`${jsonReq.name} 接收反馈错误:${e}\n原始字符串:${data}`);
-        return {...result,raw:data,data:null};
-    }
-}
-
-/**重复发送json的网络请求  
- * @async
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @param verifyFn  - 有效性验证函数
- * @param repeatOpt - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为未能成功接收
- */
-async function repeatJsonComReq<T extends ComRequestOption>(
-    comReqOpt:T,
-    reqData?:T['method'] extends "POST" ? JToken :GetReqData,
-    verifyFn?:StatusVerifyFn<ComResp<JToken>|undefined>,
-    repeatOpt:RepeatPromiseOpt={},
-){
-    repeatOpt.tryDelay    = repeatOpt.tryDelay??1000;
-    const procFn = ()=>jsonReq(comReqOpt,reqData);
-    return UtilFunc.repeatPromise(procFn,verifyFn,repeatOpt);
-}
-
-/**发送一个 https POST 请求并接受数据  
- * @async
- * @param comReqOpt   - 请求参数
- * @param reqData     - 数据对象
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpsPost(comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,reqData?:JToken){
-    return jsonReq({
-        ...comReqOpt,
-        method:"POST",
-        protocol:"https:",
-    },reqData);
-}
-
-/**发送一个 http POST 请求并接受数据  
- * @async
- * @param comReqOpt   - 请求参数
- * @param reqData 	  - 数据对象
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpPost(comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,reqData?:JToken){
-    return jsonReq({
-        ...comReqOpt,
-        method:"POST",
-        protocol:"http:",
-    },reqData);
-}
-
-/**发送一个 https GET 请求并接受数据  
- * @async
- * @param comReqOpt   - 请求参数
- * @param reqData     - 数据对象
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpsGet(comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,reqData?:GetReqData){
-    return jsonReq({
-        ...comReqOpt,
-        method:"GET",
-        protocol:"https:",
-    },reqData);
-}
-
-/**发送一个 http GET 请求并接受数据  
- * @async
- * @param comReqOpt   - 请求参数
- * @param reqData 	  - 数据对象
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpGet(comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,reqData?:GetReqData){
-    return jsonReq({
-        ...comReqOpt,
-        method:"GET",
-        protocol:"http:",
-    },reqData);
-}
-
-
-/**重复一个 https POST请求并接受数据  
- * @async
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @param verifyFn  - 有效性验证函数
- * @param repeatOpt - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpsRepeatPost(
-    comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,
-    reqData?:JToken,
-    verifyFn?:StatusVerifyFn<JToken|undefined>,
-    repeatOpt?:RepeatPromiseOpt
-){
-    return repeatJsonComReq({
-        ...comReqOpt,
-        method:"POST",
-        protocol:"https:",
-    },reqData,verifyFn,repeatOpt);
-}
-
-/**重复一个 http POST请求并接受数据  
- * @async
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @param verifyFn  - 有效性验证函数
- * @param repeatOpt - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpRepeatPost(
-    comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,
-    reqData?:JToken,
-    verifyFn?:StatusVerifyFn<JToken|undefined>,
-    repeatOpt?:RepeatPromiseOpt
-){
-    return repeatJsonComReq({
-        ...comReqOpt,
-        method:"POST",
-        protocol:"http:",
-    },reqData,verifyFn,repeatOpt);
-}
-
-/**重复一个 https GET 请求并接受数据  
- * @async
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @param verifyFn  - 有效性验证函数
- * @param repeatOpt - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpsRepeatGet(
-    comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,
-    reqData?:GetReqData,
-    verifyFn?:StatusVerifyFn<JToken|undefined>,
-    repeatOpt?:RepeatPromiseOpt
-){
-    return repeatJsonComReq({
-        ...comReqOpt,
-        method:"GET",
-        protocol:"https:",
-    },reqData,verifyFn,repeatOpt);
-}
-
-/**重复一个 http GET 请求并接受数据  
- * @async
- * @param comReqOpt - 网络请求选项
- * @param reqData   - 数据对象
- * @param verifyFn  - 有效性验证函数
- * @param repeatOpt - 重试选项 默认 延迟:1000ms 间隔:180_000ms 重试:3次
- * @returns 结果 undefined 为未能成功接收
- */
-export function httpRepeatGet(
-    comReqOpt:Omit<ComRequestOption,'protocol'|'method'>,
-    reqData?:GetReqData,
-    verifyFn?:StatusVerifyFn<JToken|undefined>,
-    repeatOpt?:RepeatPromiseOpt
-){
-    return repeatJsonComReq({
-        ...comReqOpt,
-        method:"GET",
-        protocol:"http:",
-    },reqData,verifyFn,repeatOpt);
-}
-
-}

package/src/UtilDecorators.ts

@@ -1,223 +0,0 @@
-import { UtilFunc } from "./UtilFunctions";
-import { NeedInit } from "./UtilInterfaces";
-import { SLogger } from "./UtilLogger";
-
-type TDTg<T> = 
-    (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<T>)=>
-    TypedPropertyDescriptor<T>;
-type DTg = (target:Object, propertyKey:string, descriptor:PropertyDescriptor)=>
-    PropertyDescriptor;
-
-/**用于打印方法运行时间  
- * @param flag      - 时间标签
- * @param suffixUID - 是否尾随uid
- */
-export function LogTime(flag:string,suffixUID?:boolean):DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = function(...args:any[]){
-            const uid = suffixUID ? UtilFunc.genUUID() : "";
-            SLogger.time(flag+uid);
-            let result = originalMethod.apply(this, args);
-            SLogger.timeEnd(flag+uid);
-            return result;
-        }
-        return descriptor;
-    }
-}
-/**用于打印异步方法运行时间  
- * @param flag      - 时间标签
- * @param suffixUID - 是否尾随uid
- */
-export function LogTimeAsync(flag:string,suffixUID?:boolean):DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = async function(...args:any[]){
-            const uid = suffixUID ? UtilFunc.genUUID() : "";
-            SLogger.time(flag+uid);
-            let result = await originalMethod.apply(this, args);
-            SLogger.timeEnd(flag+uid);
-            return result;
-        }
-        return descriptor;
-    }
-}
-
-/**用于打印方法的调用 */
-export function LogCall():DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = function(...args:any[]){
-            let result = originalMethod.apply(this, args);
-            SLogger.info(`调用函数: ${propertyKey}(${args}) => ${result}`);
-            return result;
-        }
-        return descriptor;
-    }
-}
-
-/**用于打印异步方法的调用 */
-export function LogCallAsync():DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = async function(...args:any[]){
-            let result = await originalMethod.apply(this, args);
-            SLogger.info(`调用函数: ${propertyKey}(${args}) => ${result}`);
-            return result;
-        }
-        return descriptor;
-    }
-}
-
-/**用于打印方法的调用 */
-export function LogErr():DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = function(...args:any[]){
-            try {
-                const result = originalMethod.apply(this, args);
-                return result;
-            } catch(err) {
-                UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`,'warn');
-            }
-        }
-        return descriptor;
-    }
-}
-
-/**用于打印异步方法的调用 */
-export function LogErrAsync():DTg{
-    return function (target, propertyKey, descriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = async function(...args:any[]){
-            try {
-                const result = await originalMethod.apply(this, args);
-                return result;
-            } catch(err) {
-                UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`,'warn');
-            }
-        }
-        return descriptor;
-    }
-}
-
-/**try-finally包装 */
-export function Defer<T extends (...args:any)=>any>
-    (deferLogic:(...args:Parameters<T>)=>any):TDTg<T> {
-    return function(target, propertyKey, descriptor) {
-        const originalMethod = descriptor.value!;
-        (descriptor as any).value = function (...args:any) {
-            try {
-                const result = originalMethod.apply(this, args);
-                return result;
-            } finally {
-                deferLogic(...args);
-            }
-        };
-        return descriptor;
-    };
-}
-/**异步的try-finally包装 */
-export function DeferAsync<T extends (...args:any)=>Promise<any>>
-    (deferLogic:(...args:Parameters<T>)=>any|Promise<any>):TDTg<T> {
-    return function(target, propertyKey, descriptor) {
-        const originalMethod = descriptor.value!;
-        (descriptor as any).value = async function (...args:any) {
-            try {
-                const result = await originalMethod.apply(this, args);
-                await deferLogic(...args);
-                return result;
-            } finally {
-                await deferLogic(...args);
-            }
-        };
-        return descriptor;
-    };
-}
-/**try-catch包装 */
-export function Catch<T extends (...args:any)=>any>
-    (catchLogic:(error: any, ...args:Parameters<T>)=>ReturnType<T>):TDTg<T> {
-    return function(target, propertyKey, descriptor) {
-        const originalMethod = descriptor.value!;
-        (descriptor as any).value = function (...args:any) {
-            try {
-                const result = originalMethod.apply(this, args);
-                return result;
-            } catch(err) {
-                //SLogger.warn(`一个函数出现了错误 ${propertyKey}: ${err}`);
-                return catchLogic(err, ...args);
-            }
-        };
-        return descriptor;
-    };
-}
-/**异步的try-catch包装 */
-export function CatchAsync<T extends (...args:any)=>Promise<any>>
-    (catchLogic:(error: any, ...args:Parameters<T>)=>ReturnType<T>):TDTg<T> {
-    return function(target, propertyKey, descriptor) {
-        const originalMethod = descriptor.value!;
-        (descriptor as any).value = async function (...args:any) {
-            try {
-                const result = await originalMethod.apply(this, args);
-                return result;
-            } catch(err) {
-                //SLogger.warn(`一个函数出现了错误 ${propertyKey}: ${err}`);
-                return await catchLogic(err, ...args);
-            }
-        };
-        return descriptor;
-    };
-}
-
-/**等待完成init */
-export function AwaitInited<T extends NeedInit>
-    (target:T, propertyKey: string, descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>) {
-    const originalMethod = descriptor.value!;
-
-    descriptor.value = async function(this:T,...args: any[]) {
-        await this.inited;
-        return await originalMethod.apply(this, args);
-    };
-
-    return descriptor;
-}
-
-
-function AddNumberDecorator(n: number) {
-    type NumberToNumberFunc = (num: number) => number;
-    return function(
-        this:any,
-        target: Object,
-        propertyKey: string,
-        descriptor: TypedPropertyDescriptor<NumberToNumberFunc>
-    ) {
-        const originalMethod = descriptor.value!;
-        descriptor.value = function (num: number) {
-            const result = originalMethod.apply(this, [num]);
-            return result + n;
-        };
-        return descriptor;
-    };
-}
-
-
-
-
-class Example {
-    @AddNumberDecorator(10)
-    myMethod(num: number): number {
-        return num;
-    }
-    @LogCall()
-    @Defer((a,b)=>null)
-    @CatchAsync(async (a,b)=>123)
-    static async myMethod1(num: number,ss:string) {
-        return 312;
-    }
-}
-//let e = new Example();
-//e.myMethod1(1,"");
-
-//console.log(123);
-//let a = new Example();
-//a.myMethod(10);//?

package/src/UtilFP.macro.ts

@@ -1,29 +0,0 @@
-import {regionMacro} from '@zwa73/dev-utils';
-
-const N = 20;
-const R = (n:number)=>n===0?`I`:`R${n}`;
-const prefix = (str:string,prefix?:string)=> str.length>0?`${prefix}${str}`:str;
-const suffix = (str:string,suffix?:string)=> str.length>0?`${str}${suffix}`:str;
-
-regionMacro("flow重载",()=>{
-    const result:string[] = [];
-    for (let i = 0; i <= N; i++) {
-        const template = Array.from({length: i+1}, (_, k) => R(k)).join(', ');
-        const args = suffix(Array.from({length: i}, (_, k) =>
-            `f${k+1}: CompFunc<${R(k)}, ${R(k+1)}>`
-        ).join(', '),", ");
-        result.push(`export function flow<${template}>(${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): CompFunc<I, ${R(i)}>;`);
-    }
-    return result.reverse().join('\n').trim();
-});
-regionMacro("pipe重载",()=>{
-    const result:string[] = [];
-    for (let i = 0; i <= N; i++) {
-        const template = Array.from({length: i+1}, (_, k) => R(k)).join(', ');
-        const args = suffix(Array.from({length: i}, (_, k) =>
-            `f${k+1}: CompFunc<${R(k)}, ${R(k+1)}>`
-        ).join(', '),", ");
-        result.push(`export function pipe<${template}>(input: I, ${args}...fs: CompFunc<${R(i)}, ${R(i)}>[]): ${R(i)};`);
-    }
-    return result.reverse().join('\n').trim();
-});