utils-lib-js 1.0.5 → 1.0.8

package/dist/common/request.d.ts

@@ -1,5 +1,5 @@
-import { IRequest, IRequestBase, IInterceptors } from "./index.js";
-export declare class Interceptors implements IInterceptors {
+import { IRequest, IRequestBase, IRequestInit, IInterceptors } from "./index.js";
+declare class Interceptors implements IInterceptors {
     private requestSuccess;
     private responseSuccess;
     private error;
@@ -8,35 +8,58 @@ export declare class Interceptors implements IInterceptors {
     get resFn(): Function;
     get errFn(): Function;
 }
-export declare abstract class RequestBase extends Interceptors implements IRequestBase {
-    origin: string;
+declare abstract class RequestBase extends Interceptors implements IRequestBase {
+    readonly origin: string;
     constructor(origin: any);
     abstract fetch(url: any, opts: any): Promise<void>;
     abstract http(url: any, opts: any): Promise<void>;
-    chackUrl: (url: any) => any;
+    chackUrl: (url: string) => boolean;
     fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
+    errorFn: (reject: any) => (err: any) => any;
+    clearTimer: (opts: any) => any;
+    initAbort: (params: any) => any;
     requestType: () => (url: any, opts: any) => Promise<void>;
-    initFetchParams: (url: any, { method, query, headers, body, timeout, abort, type, ...others }: {
+    getDataByType: (type: any, response: any) => any;
+}
+declare abstract class RequestInit extends RequestBase implements IRequestInit {
+    constructor(origin: any);
+    abstract fetch(url: any, opts: any): Promise<void>;
+    abstract http(url: any, opts: any): Promise<void>;
+    initDefaultParams: (url: any, { method, query, headers, body, timeout, controller, type, ...others }: {
         [x: string]: any;
         method?: string;
         query?: {};
         headers?: {};
         body?: any;
         timeout?: number;
-        abort?: AbortController;
+        controller?: AbortController;
         type?: string;
-    }) => any;
-    getDataByType: (type: any, response: any) => any;
+    }) => {
+        url: string;
+        method: string;
+        headers: {};
+        body: string;
+        timeout: number;
+        signal: AbortSignal;
+        controller: AbortController;
+        type: string;
+        timer: any;
+    };
+    initFetchParams: (url: any, opts: any) => any;
+    initHttpParams: (url: any, opts: any) => any;
 }
-export declare class Request extends RequestBase implements IRequest {
-    request: Function;
+export declare class Request extends RequestInit implements IRequest {
+    private request;
     constructor(origin: any);
     fetch: (_url: any, _opts: any) => Promise<void>;
-    http: (url: any, opts: any) => Promise<void>;
+    http: (_url: any, _opts: any) => Promise<void>;
     GET: (url: any, query: {}, _: any, opts: any) => any;
     POST: (url: any, query: {}, body: any, opts: any) => any;
     PUT: (url: any, query: {}, body: any, opts: any) => any;
     DELETE: (url: any, query: {}, body: any, opts: any) => any;
-    OPTION: (url: any, query: {}, body: any, opts: any) => any;
+    OPTIONS: (url: any, query: {}, body: any, opts: any) => any;
+    HEAD: (url: any, query: {}, body: any, opts: any) => any;
+    PATCH: (url: any, query: {}, body: any, opts: any) => any;
 }
+export {};

package/dist/common/request.js

@@ -37,8 +37,10 @@ var __rest = this && this.__rest || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Request = exports.RequestBase = exports.Interceptors = void 0;
+exports.Request = void 0;
 var index_js_1 = require("./index.js");
+var node_http_1 = require("node:http");
+var node_url_1 = require("node:url");
 var Interceptors = function () {
     function Interceptors() {}
     Interceptors.prototype.use = function (type, fn) {
@@ -78,7 +80,6 @@ var Interceptors = function () {
     });
     return Interceptors;
 }();
-exports.Interceptors = Interceptors;
 var RequestBase = function (_super) {
     __extends(RequestBase, _super);
     function RequestBase(origin) {
@@ -91,11 +92,28 @@ var RequestBase = function (_super) {
             return fixStr;
         };
         _this.envDesc = function () {
-            if (Window) {
+            if (typeof Window !== "undefined") {
                 return "Window";
             }
             return "Node";
         };
+        _this.errorFn = function (reject) {
+            return function (err) {
+                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
+            };
+        };
+        _this.clearTimer = function (opts) {
+            return !!opts.timer && (clearTimeout(opts.timer), opts.timer = null);
+        };
+        _this.initAbort = function (params) {
+            var controller = params.controller,
+                timer = params.timer,
+                timeout = params.timeout;
+            !!!timer && (params.timer = setTimeout(function () {
+                return controller.abort();
+            }, timeout));
+            return params;
+        };
         _this.requestType = function () {
             switch (_this.envDesc()) {
                 case "Window":
@@ -104,30 +122,6 @@ var RequestBase = function (_super) {
                     return _this.http;
             }
         };
-        _this.initFetchParams = function (url, _a) {
-            var _b, _c;
-            var _d = _a.method,
-                method = _d === void 0 ? "GET" : _d,
-                _e = _a.query,
-                query = _e === void 0 ? {} : _e,
-                _f = _a.headers,
-                headers = _f === void 0 ? {} : _f,
-                _g = _a.body,
-                body = _g === void 0 ? null : _g,
-                _h = _a.timeout,
-                timeout = _h === void 0 ? 30 * 1000 : _h,
-                _j = _a.abort,
-                abort = _j === void 0 ? new AbortController() : _j,
-                _k = _a.type,
-                type = _k === void 0 ? "json" : _k,
-                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "abort", "type"]);
-            url = (0, index_js_1.urlJoin)(_this.fixOrigin(url), query);
-            var timer = setTimeout(function () {
-                return abort.abort();
-            }, timeout);
-            var params = __assign({ url: url, method: method, headers: headers, body: method === "GET" ? null : (0, index_js_1.jsonToString)(body), timeout: timeout, timer: timer, signal: abort.signal, type: type }, others);
-            return (_c = (_b = _this.reqFn) === null || _b === void 0 ? void 0 : _b.call(_this, params)) !== null && _c !== void 0 ? _c : params;
-        };
         _this.getDataByType = function (type, response) {
             switch (type) {
                 case "text":
@@ -145,7 +139,43 @@ var RequestBase = function (_super) {
     }
     return RequestBase;
 }(Interceptors);
-exports.RequestBase = RequestBase;
+var RequestInit = function (_super) {
+    __extends(RequestInit, _super);
+    function RequestInit(origin) {
+        var _this = _super.call(this, origin) || this;
+        _this.initDefaultParams = function (url, _a) {
+            var _b = _a.method,
+                method = _b === void 0 ? "GET" : _b,
+                _c = _a.query,
+                query = _c === void 0 ? {} : _c,
+                _d = _a.headers,
+                headers = _d === void 0 ? {} : _d,
+                _e = _a.body,
+                body = _e === void 0 ? null : _e,
+                _f = _a.timeout,
+                timeout = _f === void 0 ? 30 * 1000 : _f,
+                _g = _a.controller,
+                controller = _g === void 0 ? new AbortController() : _g,
+                _h = _a.type,
+                type = _h === void 0 ? "json" : _h,
+                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "controller", "type"]);
+            return __assign({ url: (0, index_js_1.urlJoin)(_this.fixOrigin(url), query), method: method, headers: headers, body: method === "GET" ? null : (0, index_js_1.jsonToString)(body), timeout: timeout, signal: controller === null || controller === void 0 ? void 0 : controller.signal, controller: controller, type: type, timer: null }, others);
+        };
+        _this.initFetchParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initAbort(_this.initDefaultParams(url, opts));
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, params)) !== null && _b !== void 0 ? _b : params;
+        };
+        _this.initHttpParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initAbort(_this.initDefaultParams(url, opts));
+            var options = (0, node_url_1.parse)(params.url, true);
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : params;
+        };
+        return _this;
+    }
+    return RequestInit;
+}(RequestBase);
 var Request = function (_super) {
     __extends(Request, _super);
     function Request(origin) {
@@ -158,29 +188,47 @@ var Request = function (_super) {
             var _b = _this.initFetchParams(_url, _opts),
                 url = _b.url,
                 opts = __rest(_b, ["url"]);
-            var signal = opts.signal,
-                timer = opts.timer;
-            var errorFn = function (err) {
-                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
-            };
-            signal.addEventListener('abort', errorFn);
+            var signal = opts.signal;
+            signal.addEventListener('abort', function () {
+                return _this.errorFn(reject);
+            });
             fetch(url, opts).then(function (response) {
                 if (response.status >= 200 && response.status < 300) {
                     return _this.getDataByType(opts.type, response);
                 }
-                return errorFn(response.statusText);
+                return _this.errorFn(reject);
             }).then(function (res) {
                 var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
-            }).catch(errorFn).finally(function () {
-                return clearTimeout(timer);
+            }).catch(_this.errorFn(reject)).finally(function () {
+                return _this.clearTimer(opts);
             });
             return promise;
         };
-        _this.http = function (url, opts) {
+        _this.http = function (_url, _opts) {
             var _a = (0, index_js_1.defer)(),
                 promise = _a.promise,
                 resolve = _a.resolve,
                 reject = _a.reject;
+            var params = _this.initHttpParams(_url, _opts);
+            var signal = params.signal;
+            var req = (0, node_http_1.request)(params, function (response) {
+                if (response.statusCode >= 200 && response.statusCode < 300) {
+                    var data_1 = "";
+                    response.setEncoding('utf8');
+                    response.on('data', function (chunk) {
+                        return data_1 += chunk;
+                    });
+                    return response.on("end", function () {
+                        var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, data_1)) !== null && _b !== void 0 ? _b : data_1);
+                    });
+                }
+                return _this.errorFn(reject)(response === null || response === void 0 ? void 0 : response.statusMessage);
+            });
+            signal.addEventListener('abort', function () {
+                return _this.errorFn(reject)(req.destroy(new Error('request timeout')));
+            });
+            req.on('error', _this.errorFn(reject));
+            req.end();
             return promise;
         };
         _this.GET = function (url, query, _, opts) {
@@ -207,15 +255,27 @@ var Request = function (_super) {
             }
             return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
         };
-        _this.OPTION = function (url, query, body, opts) {
+        _this.OPTIONS = function (url, query, body, opts) {
             if (query === void 0) {
                 query = {};
             }
-            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+            return _this.request(url, __assign({ query: query, method: "OPTIONS", body: body }, opts));
+        };
+        _this.HEAD = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "HEAD", body: body }, opts));
+        };
+        _this.PATCH = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "PATCH", body: body }, opts));
         };
         _this.request = _this.requestType();
         return _this;
     }
     return Request;
-}(RequestBase);
+}(RequestInit);
 exports.Request = Request;

package/dist/common/types.d.ts

@@ -16,7 +16,7 @@ export declare type IUrlSplit = (url: string) => IObject<any>;
 export declare type IUrlJoin = (url: string, query: object) => string;
 export declare type IGetType<T> = (data: any) => typeof data | T[keyof T] | "null";
 export declare type IGetTypeByList = (data: any, whiteList: string[]) => boolean;
-export declare type IGetValue = <T>(object: IObject<T> | IObject<T>[IKey], key: string, defaultValue?: any) => IObject<T>[IKey];
+export declare type IGetValue = <T, U = IObject<T> | IObject<T>[IKey]>(object: U, key: string, defaultValue?: any) => U;
 export declare type ISetValue = <T>(object: IObject<T>, key: string, value?: any) => IObject<T>;
 export declare type IMixIn = <U extends IObject<any>>(target?: U, source?: IObject<any>, overwrite?: boolean) => U;
 export declare type IEnumInversion = (target: IObject<string>) => IObject<string>;
@@ -48,18 +48,22 @@ export declare type IStopDefault = (e: Event) => void;
 export declare type IRemoveHandler = <T extends Document>(ele: T, type: string, handler: (e: Event) => void) => void;
 export declare type IDispatchEvent = <T extends Document>(ele: T, data: any) => void;
 export declare type IRequestParams<T> = T | IObject<any> | null;
+export declare type IUrl = string;
+export declare type IEnv = 'Window' | 'Node';
 export declare type IDataType = "text" | "json" | "blob" | "formData" | "arrayBuffer";
 export declare type IRequestMethods = "GET" | "POST" | "DELETE" | "PUT" | "OPTION";
 export declare type IRequestBody = IRequestParams<BodyInit>;
 export declare type IRequestHeaders = IRequestParams<HeadersInit>;
-export declare type IRequestFn = (url: string, params: IObject<any>, body: IRequestBody, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestBaseFn = (url: IUrl, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestFn = (url?: IUrl, params?: IObject<any>, body?: IRequestBody, opts?: IRequestOptions) => Promise<any>;
 export declare type IRequestOptions = {
     method?: IRequestMethods;
     query?: IRequestParams<IObject<any>>;
     body?: IRequestBody;
     headers?: IRequestHeaders;
-    abort?: AbortController;
+    controller?: AbortController;
     timeout?: number;
+    timer?: number | unknown | null;
     [key: string]: any;
 };
 export declare type IInterceptors = {
@@ -69,21 +73,30 @@ export declare type IInterceptors = {
     get errFn(): Function;
 };
 export declare type IRequestBase = {
-    origin: string;
+    readonly origin: string;
+    chackUrl: (url: IUrl) => boolean;
+    envDesc: () => IEnv;
+    errorFn: <Err = any, R = Function>(reject: R) => (err: Err) => R;
+    clearTimer: (opts: IRequestOptions) => void;
+    initAbort: <T = IRequestOptions>(opts: T) => T;
+    requestType: () => IRequestBaseFn;
     fixOrigin: (fixStr: string) => string;
-    envDesc: () => "Window" | "Node";
-    chackUrl: (url: string) => boolean;
-    fetch: (url: string, opts: IRequestOptions) => Promise<any>;
-    http: (url: string, opts: IRequestOptions) => Promise<any>;
-    initFetchParams: (url: string, opts: IRequestOptions) => any;
+    fetch: IRequestBaseFn;
+    http: IRequestBaseFn;
     getDataByType: (type: IDataType, response: Response) => Promise<any>;
 };
+export declare type IRequestInit = {
+    initDefaultParams: (url: IUrl, opts: IRequestOptions) => any;
+    initFetchParams: (url: IUrl, opts: IRequestOptions) => any;
+    initHttpParams: (url: IUrl, opts: IRequestOptions) => any;
+};
 export declare type IRequest = {
-    request: Function;
     GET: IRequestFn;
     POST: IRequestFn;
     DELETE: IRequestFn;
     PUT: IRequestFn;
-    OPTION: IRequestFn;
+    OPTIONS: IRequestFn;
+    HEAD: IRequestFn;
+    PATCH: IRequestFn;
 } & IRequestBase;
 export {};

package/dist/esm/request.d.ts

@@ -1,5 +1,5 @@
-import { IRequest, IRequestBase, IInterceptors } from "./index.js";
-export declare class Interceptors implements IInterceptors {
+import { IRequest, IRequestBase, IRequestInit, IInterceptors } from "./index.js";
+declare class Interceptors implements IInterceptors {
     private requestSuccess;
     private responseSuccess;
     private error;
@@ -8,35 +8,58 @@ export declare class Interceptors implements IInterceptors {
     get resFn(): Function;
     get errFn(): Function;
 }
-export declare abstract class RequestBase extends Interceptors implements IRequestBase {
-    origin: string;
+declare abstract class RequestBase extends Interceptors implements IRequestBase {
+    readonly origin: string;
     constructor(origin: any);
     abstract fetch(url: any, opts: any): Promise<void>;
     abstract http(url: any, opts: any): Promise<void>;
-    chackUrl: (url: any) => any;
+    chackUrl: (url: string) => boolean;
     fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
+    errorFn: (reject: any) => (err: any) => any;
+    clearTimer: (opts: any) => any;
+    initAbort: (params: any) => any;
     requestType: () => (url: any, opts: any) => Promise<void>;
-    initFetchParams: (url: any, { method, query, headers, body, timeout, abort, type, ...others }: {
+    getDataByType: (type: any, response: any) => any;
+}
+declare abstract class RequestInit extends RequestBase implements IRequestInit {
+    constructor(origin: any);
+    abstract fetch(url: any, opts: any): Promise<void>;
+    abstract http(url: any, opts: any): Promise<void>;
+    initDefaultParams: (url: any, { method, query, headers, body, timeout, controller, type, ...others }: {
         [x: string]: any;
         method?: string;
         query?: {};
         headers?: {};
         body?: any;
         timeout?: number;
-        abort?: AbortController;
+        controller?: AbortController;
         type?: string;
-    }) => any;
-    getDataByType: (type: any, response: any) => any;
+    }) => {
+        url: string;
+        method: string;
+        headers: {};
+        body: string;
+        timeout: number;
+        signal: AbortSignal;
+        controller: AbortController;
+        type: string;
+        timer: any;
+    };
+    initFetchParams: (url: any, opts: any) => any;
+    initHttpParams: (url: any, opts: any) => any;
 }
-export declare class Request extends RequestBase implements IRequest {
-    request: Function;
+export declare class Request extends RequestInit implements IRequest {
+    private request;
     constructor(origin: any);
     fetch: (_url: any, _opts: any) => Promise<void>;
-    http: (url: any, opts: any) => Promise<void>;
+    http: (_url: any, _opts: any) => Promise<void>;
     GET: (url: any, query: {}, _: any, opts: any) => any;
     POST: (url: any, query: {}, body: any, opts: any) => any;
     PUT: (url: any, query: {}, body: any, opts: any) => any;
     DELETE: (url: any, query: {}, body: any, opts: any) => any;
-    OPTION: (url: any, query: {}, body: any, opts: any) => any;
+    OPTIONS: (url: any, query: {}, body: any, opts: any) => any;
+    HEAD: (url: any, query: {}, body: any, opts: any) => any;
+    PATCH: (url: any, query: {}, body: any, opts: any) => any;
 }
+export {};

package/dist/esm/request.js

@@ -35,6 +35,8 @@ var __rest = this && this.__rest || function (s, e) {
     return t;
 };
 import { urlJoin, defer, jsonToString } from "./index.js";
+import { request } from "node:http";
+import { parse } from "node:url";
 var Interceptors = function () {
     function Interceptors() {}
     Interceptors.prototype.use = function (type, fn) {
@@ -74,7 +76,6 @@ var Interceptors = function () {
     });
     return Interceptors;
 }();
-export { Interceptors };
 var RequestBase = function (_super) {
     __extends(RequestBase, _super);
     function RequestBase(origin) {
@@ -87,11 +88,28 @@ var RequestBase = function (_super) {
             return fixStr;
         };
         _this.envDesc = function () {
-            if (Window) {
+            if (typeof Window !== "undefined") {
                 return "Window";
             }
             return "Node";
         };
+        _this.errorFn = function (reject) {
+            return function (err) {
+                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
+            };
+        };
+        _this.clearTimer = function (opts) {
+            return !!opts.timer && (clearTimeout(opts.timer), opts.timer = null);
+        };
+        _this.initAbort = function (params) {
+            var controller = params.controller,
+                timer = params.timer,
+                timeout = params.timeout;
+            !!!timer && (params.timer = setTimeout(function () {
+                return controller.abort();
+            }, timeout));
+            return params;
+        };
         _this.requestType = function () {
             switch (_this.envDesc()) {
                 case "Window":
@@ -100,30 +118,6 @@ var RequestBase = function (_super) {
                     return _this.http;
             }
         };
-        _this.initFetchParams = function (url, _a) {
-            var _b, _c;
-            var _d = _a.method,
-                method = _d === void 0 ? "GET" : _d,
-                _e = _a.query,
-                query = _e === void 0 ? {} : _e,
-                _f = _a.headers,
-                headers = _f === void 0 ? {} : _f,
-                _g = _a.body,
-                body = _g === void 0 ? null : _g,
-                _h = _a.timeout,
-                timeout = _h === void 0 ? 30 * 1000 : _h,
-                _j = _a.abort,
-                abort = _j === void 0 ? new AbortController() : _j,
-                _k = _a.type,
-                type = _k === void 0 ? "json" : _k,
-                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "abort", "type"]);
-            url = urlJoin(_this.fixOrigin(url), query);
-            var timer = setTimeout(function () {
-                return abort.abort();
-            }, timeout);
-            var params = __assign({ url: url, method: method, headers: headers, body: method === "GET" ? null : jsonToString(body), timeout: timeout, timer: timer, signal: abort.signal, type: type }, others);
-            return (_c = (_b = _this.reqFn) === null || _b === void 0 ? void 0 : _b.call(_this, params)) !== null && _c !== void 0 ? _c : params;
-        };
         _this.getDataByType = function (type, response) {
             switch (type) {
                 case "text":
@@ -141,7 +135,43 @@ var RequestBase = function (_super) {
     }
     return RequestBase;
 }(Interceptors);
-export { RequestBase };
+var RequestInit = function (_super) {
+    __extends(RequestInit, _super);
+    function RequestInit(origin) {
+        var _this = _super.call(this, origin) || this;
+        _this.initDefaultParams = function (url, _a) {
+            var _b = _a.method,
+                method = _b === void 0 ? "GET" : _b,
+                _c = _a.query,
+                query = _c === void 0 ? {} : _c,
+                _d = _a.headers,
+                headers = _d === void 0 ? {} : _d,
+                _e = _a.body,
+                body = _e === void 0 ? null : _e,
+                _f = _a.timeout,
+                timeout = _f === void 0 ? 30 * 1000 : _f,
+                _g = _a.controller,
+                controller = _g === void 0 ? new AbortController() : _g,
+                _h = _a.type,
+                type = _h === void 0 ? "json" : _h,
+                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "controller", "type"]);
+            return __assign({ url: urlJoin(_this.fixOrigin(url), query), method: method, headers: headers, body: method === "GET" ? null : jsonToString(body), timeout: timeout, signal: controller === null || controller === void 0 ? void 0 : controller.signal, controller: controller, type: type, timer: null }, others);
+        };
+        _this.initFetchParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initAbort(_this.initDefaultParams(url, opts));
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, params)) !== null && _b !== void 0 ? _b : params;
+        };
+        _this.initHttpParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initAbort(_this.initDefaultParams(url, opts));
+            var options = parse(params.url, true);
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, __assign(__assign({}, params), options))) !== null && _b !== void 0 ? _b : params;
+        };
+        return _this;
+    }
+    return RequestInit;
+}(RequestBase);
 var Request = function (_super) {
     __extends(Request, _super);
     function Request(origin) {
@@ -154,29 +184,47 @@ var Request = function (_super) {
             var _b = _this.initFetchParams(_url, _opts),
                 url = _b.url,
                 opts = __rest(_b, ["url"]);
-            var signal = opts.signal,
-                timer = opts.timer;
-            var errorFn = function (err) {
-                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
-            };
-            signal.addEventListener('abort', errorFn);
+            var signal = opts.signal;
+            signal.addEventListener('abort', function () {
+                return _this.errorFn(reject);
+            });
             fetch(url, opts).then(function (response) {
                 if (response.status >= 200 && response.status < 300) {
                     return _this.getDataByType(opts.type, response);
                 }
-                return errorFn(response.statusText);
+                return _this.errorFn(reject);
             }).then(function (res) {
                 var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
-            }).catch(errorFn).finally(function () {
-                return clearTimeout(timer);
+            }).catch(_this.errorFn(reject)).finally(function () {
+                return _this.clearTimer(opts);
             });
             return promise;
         };
-        _this.http = function (url, opts) {
+        _this.http = function (_url, _opts) {
             var _a = defer(),
                 promise = _a.promise,
                 resolve = _a.resolve,
                 reject = _a.reject;
+            var params = _this.initHttpParams(_url, _opts);
+            var signal = params.signal;
+            var req = request(params, function (response) {
+                if (response.statusCode >= 200 && response.statusCode < 300) {
+                    var data_1 = "";
+                    response.setEncoding('utf8');
+                    response.on('data', function (chunk) {
+                        return data_1 += chunk;
+                    });
+                    return response.on("end", function () {
+                        var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, data_1)) !== null && _b !== void 0 ? _b : data_1);
+                    });
+                }
+                return _this.errorFn(reject)(response === null || response === void 0 ? void 0 : response.statusMessage);
+            });
+            signal.addEventListener('abort', function () {
+                return _this.errorFn(reject)(req.destroy(new Error('request timeout')));
+            });
+            req.on('error', _this.errorFn(reject));
+            req.end();
             return promise;
         };
         _this.GET = function (url, query, _, opts) {
@@ -203,15 +251,27 @@ var Request = function (_super) {
             }
             return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
         };
-        _this.OPTION = function (url, query, body, opts) {
+        _this.OPTIONS = function (url, query, body, opts) {
             if (query === void 0) {
                 query = {};
             }
-            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+            return _this.request(url, __assign({ query: query, method: "OPTIONS", body: body }, opts));
+        };
+        _this.HEAD = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "HEAD", body: body }, opts));
+        };
+        _this.PATCH = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "PATCH", body: body }, opts));
         };
         _this.request = _this.requestType();
         return _this;
     }
     return Request;
-}(RequestBase);
+}(RequestInit);
 export { Request };

package/dist/esm/types.d.ts

@@ -16,7 +16,7 @@ export declare type IUrlSplit = (url: string) => IObject<any>;
 export declare type IUrlJoin = (url: string, query: object) => string;
 export declare type IGetType<T> = (data: any) => typeof data | T[keyof T] | "null";
 export declare type IGetTypeByList = (data: any, whiteList: string[]) => boolean;
-export declare type IGetValue = <T>(object: IObject<T> | IObject<T>[IKey], key: string, defaultValue?: any) => IObject<T>[IKey];
+export declare type IGetValue = <T, U = IObject<T> | IObject<T>[IKey]>(object: U, key: string, defaultValue?: any) => U;
 export declare type ISetValue = <T>(object: IObject<T>, key: string, value?: any) => IObject<T>;
 export declare type IMixIn = <U extends IObject<any>>(target?: U, source?: IObject<any>, overwrite?: boolean) => U;
 export declare type IEnumInversion = (target: IObject<string>) => IObject<string>;
@@ -48,18 +48,22 @@ export declare type IStopDefault = (e: Event) => void;
 export declare type IRemoveHandler = <T extends Document>(ele: T, type: string, handler: (e: Event) => void) => void;
 export declare type IDispatchEvent = <T extends Document>(ele: T, data: any) => void;
 export declare type IRequestParams<T> = T | IObject<any> | null;
+export declare type IUrl = string;
+export declare type IEnv = 'Window' | 'Node';
 export declare type IDataType = "text" | "json" | "blob" | "formData" | "arrayBuffer";
 export declare type IRequestMethods = "GET" | "POST" | "DELETE" | "PUT" | "OPTION";
 export declare type IRequestBody = IRequestParams<BodyInit>;
 export declare type IRequestHeaders = IRequestParams<HeadersInit>;
-export declare type IRequestFn = (url: string, params: IObject<any>, body: IRequestBody, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestBaseFn = (url: IUrl, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestFn = (url?: IUrl, params?: IObject<any>, body?: IRequestBody, opts?: IRequestOptions) => Promise<any>;
 export declare type IRequestOptions = {
     method?: IRequestMethods;
     query?: IRequestParams<IObject<any>>;
     body?: IRequestBody;
     headers?: IRequestHeaders;
-    abort?: AbortController;
+    controller?: AbortController;
     timeout?: number;
+    timer?: number | unknown | null;
     [key: string]: any;
 };
 export declare type IInterceptors = {
@@ -69,21 +73,30 @@ export declare type IInterceptors = {
     get errFn(): Function;
 };
 export declare type IRequestBase = {
-    origin: string;
+    readonly origin: string;
+    chackUrl: (url: IUrl) => boolean;
+    envDesc: () => IEnv;
+    errorFn: <Err = any, R = Function>(reject: R) => (err: Err) => R;
+    clearTimer: (opts: IRequestOptions) => void;
+    initAbort: <T = IRequestOptions>(opts: T) => T;
+    requestType: () => IRequestBaseFn;
     fixOrigin: (fixStr: string) => string;
-    envDesc: () => "Window" | "Node";
-    chackUrl: (url: string) => boolean;
-    fetch: (url: string, opts: IRequestOptions) => Promise<any>;
-    http: (url: string, opts: IRequestOptions) => Promise<any>;
-    initFetchParams: (url: string, opts: IRequestOptions) => any;
+    fetch: IRequestBaseFn;
+    http: IRequestBaseFn;
     getDataByType: (type: IDataType, response: Response) => Promise<any>;
 };
+export declare type IRequestInit = {
+    initDefaultParams: (url: IUrl, opts: IRequestOptions) => any;
+    initFetchParams: (url: IUrl, opts: IRequestOptions) => any;
+    initHttpParams: (url: IUrl, opts: IRequestOptions) => any;
+};
 export declare type IRequest = {
-    request: Function;
     GET: IRequestFn;
     POST: IRequestFn;
     DELETE: IRequestFn;
     PUT: IRequestFn;
-    OPTION: IRequestFn;
+    OPTIONS: IRequestFn;
+    HEAD: IRequestFn;
+    PATCH: IRequestFn;
 } & IRequestBase;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-lib-js",
-  "version": "1.0.5",
+  "version": "1.0.8",
   "description": "JavaScript工具函数，封装的一些常用的js函数",
   "main": "./dist/common/index.js",
   "types": "./dist/common/index.d.ts",
@@ -10,10 +10,11 @@
     "require": "./dist/common/index.js"
   },
   "scripts": {
-    "debug": "start cmd /k pnpm run build:hot & pnpm run node:hot",
-    "node:hot": "nodemon ./dist/common/index.js",
+    "debug:esm": "start cmd /k pnpm run build:hot:esm",
+    "debug:node": "start cmd /k pnpm run build:hot:node & pnpm run node:hot",
+    "node:hot": "nodemon ./example/server.js",
     "build:hot:esm": "tsc -p tsconfig.es.json -w",
-    "build:hot": "tsc -p tsconfig.json -w",
+    "build:hot:node": "tsc -p tsconfig.json -w",
     "build": "pnpm run tsc:build && pnpm run babel:mjs &&  pnpm run babel:cjs",
     "tsc:build": "rm -fr dist && tsc -p tsconfig.json && tsc -p tsconfig.es.json",
     "publish": "pnpm run build && pnpm publish",
@@ -25,13 +26,18 @@
     "type": "git",
     "url": "https://gitee.com/DieHunter/utils-lib-js.git"
   },
-  "keywords": ["utils", "tools", "lib"],
+  "keywords": [
+    "utils",
+    "tools",
+    "lib"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "event-message-center": "^1.0.16"
   },
   "devDependencies": {
+    "@types/node": "^18.7.1",
     "babel-cli": "^6.26.0"
   }
 }

package/index.html

@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
-  </head>
-  <body>
-    <script type="module">
-      import { Request } from "./dist/esm/request.js";
-      const resource = new Request("http://127.0.0.1:1024");
-      resource
-        .use("request", (params) => {
-          return params;
-        })
-        .use("response", (params) => {
-          return params;
-        })
-        .use("error", (error) => {
-          console.log(error)
-          return error;
-        });
-      resource
-        .GET(
-          "/getList",
-          {
-            name: "hello",
-            age: 22,
-          },
-          {},
-          {}
-        )
-        .then((res) => console.log(res));
-    </script>
-  </body>
-</html>