@ossiana/node-libcurl 1.0.9-alpha-2 → 1.0.9-alpha-5

package/dist/libcurl.d.ts

@@ -42,7 +42,7 @@ export type LibCurlHeadersAttr = Map<string, string>;
 export type LibCurlHeadersInfo = string | {
     [key: string]: [value: string];
 } | LibCurlHeadersAttr;
-export type LibCurlBodyInfo = string | Uint8Array | URLSearchParams | any;
+export type LibCurlBodyInfo = string | Uint8Array | URLSearchParams | object;
 export type LibCurlMethodInfo = 'GET' | 'POST' | 'HEAD' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
 export type LibCurlProxyWithAccountInfo = {
     proxy: string;

package/dist/requests.d.ts

@@ -29,6 +29,7 @@ interface requestsInitOption {
     proxy?: requestsProxyInfo;
     body?: requestsBodyInfo;
     httpVersion?: requestsHttpVersionInfo;
+    verbose?: boolean;
     timeout?: number;
     instance?: LibCurl;
 }
@@ -37,19 +38,22 @@ type requestsParamsInfo = URLSearchParams | string | {
 };
 interface requestsOption {
     headers?: requestsHeadersInfo;
-    body?: requestsBodyInfo;
     params?: requestsParamsInfo;
+    json?: object;
+    data?: requestsBodyInfo;
+}
+interface requestsStaticOption extends Omit<requestsInitOption, 'body' | 'instance'>, requestsOption {
 }
 export declare class requests {
     private option;
     constructor(option?: requestsInitOption);
     static session(option?: requestsInitOption): requests;
-    static get(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
-    static post(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
-    static put(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
-    static patch(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
-    static trace(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
-    static head(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    static get(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
+    static post(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
+    static put(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
+    static patch(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
+    static trace(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
+    static head(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
     get(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
     post(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
     put(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
@@ -62,5 +66,6 @@ export declare class requests {
     getCookiesMap(domain?: string, path?: string): LibCurlCookiesAttr;
     deleteCookie(key: string, domain: string, path?: string): void;
     private sendRequest;
+    private static sendRequestStaic;
 }
 export {};

package/dist/requests.js

@@ -44,7 +44,7 @@ class requests {
     constructor(option = {}) {
         var _a;
         this.option = Object.assign({}, option);
-        const { cookies, timeout } = option;
+        const { cookies, timeout, verbose } = option;
         const curl = (_a = this.option).instance || (_a.instance = new libcurl_1.LibCurl());
         if (cookies) {
             (0, utils_1.libcurlSetCookies)(curl, cookies, '.');
@@ -52,38 +52,41 @@ class requests {
         if (timeout) {
             curl.setTimeout(timeout, timeout);
         }
+        if (verbose) {
+            curl.printInnerLogger();
+        }
     }
     static session(option = {}) {
         return new requests(option);
     }
     static get(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('GET', url, requestOpt);
+            return requests.sendRequestStaic('GET', url, requestOpt);
         });
     }
     static post(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('POST', url, requestOpt);
+            return requests.sendRequestStaic('POST', url, requestOpt);
         });
     }
     static put(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('PUT', url, requestOpt);
+            return requests.sendRequestStaic('PUT', url, requestOpt);
         });
     }
     static patch(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('PATCH', url, requestOpt);
+            return requests.sendRequestStaic('PATCH', url, requestOpt);
         });
     }
     static trace(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('TRACE', url, requestOpt);
+            return requests.sendRequestStaic('TRACE', url, requestOpt);
         });
     }
     static head(url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
-            return requests.session().sendRequest('HEAD', url, requestOpt);
+            return requests.sendRequestStaic('HEAD', url, requestOpt);
         });
     }
     get(url, requestOpt) {
@@ -159,7 +162,10 @@ class requests {
     sendRequest(method, url, requestOpt) {
         return __awaiter(this, void 0, void 0, function* () {
             const { instance: curl, redirect = false, proxy, httpVersion } = this.option;
-            const { headers, body, params } = requestOpt || {};
+            const { headers, data, json, params } = requestOpt || {};
+            if (data && json) {
+                throw new libcurl_1.LibCurlError('both data and json exist');
+            }
             const url_ = new URL(url);
             if (params) {
                 assignURLSearchParam(url_.searchParams, new URLSearchParams(params));
@@ -177,10 +183,68 @@ class requests {
             if (proxy) {
                 curl.setProxy(proxy);
             }
-            yield curl.send(body);
+            let hasContentType = false;
+            if (data || json) {
+                const contentTypeFilter = (e) => e.some(e => e.toLocaleLowerCase() == 'content-type');
+                if (typeof headers == 'string') {
+                    hasContentType = /content-type/i.test(headers);
+                }
+                else if (headers instanceof Map) {
+                    hasContentType = contentTypeFilter([...headers.keys()]);
+                }
+                else {
+                    hasContentType = contentTypeFilter(Object.keys(headers));
+                }
+            }
+            if (json) {
+                if (!hasContentType) {
+                    curl.setRequestHeader('Content-Type', 'application/json');
+                }
+                yield curl.send(json);
+            }
+            else if (data) {
+                let sendData = data;
+                if (!hasContentType) {
+                    if (typeof data == 'string') {
+                        curl.setRequestHeader('Content-Type', 'text/plain');
+                    }
+                    else if (data instanceof URLSearchParams) {
+                        curl.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+                    }
+                    else if (data instanceof Uint8Array) {
+                        curl.setRequestHeader('Content-Type', 'application/octet-stream');
+                    }
+                    else {
+                        sendData = Object.keys(data).map((e) => {
+                            const value = data[e];
+                            const type = typeof value;
+                            if (['object', 'boolean', 'number']) {
+                                return [e, JSON.stringify(value)];
+                            }
+                            else if (type == 'undefined') {
+                                return [e, ''];
+                            }
+                            else if (type == 'string') {
+                                return [e, value];
+                            }
+                            else {
+                                throw new libcurl_1.LibCurlError(`data unkown type ${type}`);
+                            }
+                        })
+                            .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
+                            .join('&');
+                    }
+                }
+                yield curl.send(sendData);
+            }
             return new requestsResponse(curl);
         });
     }
+    static sendRequestStaic(method, url, requestStaticOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session(requestStaticOpt).sendRequest(method, url, requestStaticOpt);
+        });
+    }
 }
 exports.requests = requests;
 //# sourceMappingURL=requests.js.map

package/dist/requests.js.map

@@ -1 +1 @@
-{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":"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"}

package/dist/utils.js

@@ -23,17 +23,26 @@ const httpCookiesToArray = (cookies) => {
     return cookies_;
 };
 exports.httpCookiesToArray = httpCookiesToArray;
+const getSubdomains = (domain) => {
+    const subdomains = domain.split('.');
+    const subdomainList = [];
+    for (let i = 0; i < subdomains.length - 1; i++) {
+        const domain_ = subdomains.slice(i).join('.');
+        subdomainList.push(domain_);
+        if (!domain_.startsWith('.')) {
+            subdomainList.push(`.${domain_}`);
+        }
+    }
+    return subdomainList;
+};
 const cookieOptFilter = (cookieOpt) => {
+    const domainArr = (cookieOpt === null || cookieOpt === void 0 ? void 0 : cookieOpt.domain) && getSubdomains(cookieOpt.domain);
     return (e) => {
-        if (cookieOpt) {
-            if (cookieOpt.domain) {
-                if (cookieOpt.domain != e[0])
-                    return false;
-            }
-            if (cookieOpt.path) {
-                if (cookieOpt.path != e[2])
-                    return false;
-            }
+        if (domainArr && !domainArr.find(t => e[0] === t))
+            return false;
+        if (cookieOpt === null || cookieOpt === void 0 ? void 0 : cookieOpt.path) {
+            if (cookieOpt.path != e[2])
+                return false;
         }
         return true;
     };

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEO,MAAM,kBAAkB,GAAkD,CAAC,OAAO,EAAE,EAAE;IACzF,MAAM,wBAAwB,GAAG,CAAC,CAAS,EAAE,EAAE;QAC3C,QAAQ,CAAC,EAAE;YACP,KAAK,MAAM;gBACP,OAAO,IAAI,CAAC;YAChB,KAAK,OAAO;gBACR,OAAO,KAAK,CAAC;YACjB;gBACI,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAA;SAC1C;IACL,CAAC,CAAA;IAMD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,EAAE,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAClC,IAAI,CAAC,EAAE,EAAE;YACL,SAAS;SACZ;QACD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5E,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;KAC/J;IACD,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAA;AAzBY,QAAA,kBAAkB,sBAyB9B;AAEM,MAAM,eAAe,GAAG,CAAC,SAAkC,EAAE,EAAE;IAClE,OAAO,CAAC,CAAyB,EAAE,EAAE;QACjC,IAAI,SAAS,EAAE;YACX,IAAI,SAAS,CAAC,MAAM,EAAE;gBAClB,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;oBACxB,OAAO,KAAK,CAAC;aACpB;YACD,IAAI,SAAS,CAAC,IAAI,EAAE;gBAChB,IAAI,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;oBACtB,OAAO,KAAK,CAAC;aACpB;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAA;AACL,CAAC,CAAA;AAdY,QAAA,eAAe,mBAc3B;AAGM,MAAM,iBAAiB,GAAG,CAAC,IAAa,EAAE,OAA2B,EAAE,MAAc,EAAE,EAAE;IAC5F,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;QAC5B,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;aACtB,KAAK,CAAC,GAAG,CAAC;aACV,OAAO,EAAE;aACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aACzB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtB,IAAI,CAAC,SAAS,CAAC;gBACX,IAAI,EAAE,GAAG;gBACT,KAAK;gBACL,MAAM;gBACN,IAAI,EAAE,GAAG;aACZ,CAAC,CAAA;QACN,CAAC,CAAC,CAAC;KACV;SAAM;QACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/B,IAAI,CAAC,SAAS,CAAC;gBACX,IAAI,EAAE,GAAG;gBACT,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC;gBACnB,MAAM;gBACN,IAAI,EAAE,GAAG;aACZ,CAAC,CAAC;QACP,CAAC,CAAC,CAAA;KACL;AACL,CAAC,CAAA;AAxBY,QAAA,iBAAiB,qBAwB7B"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossiana/node-libcurl",
-  "version": "1.0.9-alpha-2",
+  "version": "1.0.9-alpha-5",
   "dependencies": {
     "@mapbox/node-pre-gyp": "^1.0.10",
     "bindings": "^1.5.0",

package/src/export.ts

@@ -1,4 +0,0 @@
-import { LibCurl } from "./libcurl"
-import { fetch } from "./fetch"
-import { requests } from './requests'
-export { LibCurl, fetch, requests };

package/src/fetch.ts

@@ -1,68 +0,0 @@
-import { LibCurl, LibCurlBodyInfo, LibCurlMethodInfo, LibCurlHeadersInfo, LibCurlCookiesAttr, LibCurlHttpVersionInfo, LibCurlProxyInfo, LibCurlCookiesInfo } from "./libcurl";
-import { libcurlSetCookies } from "./utils";
-
-interface LibCurlRequestInfo {
-    method?: LibCurlMethodInfo;
-    headers?: LibCurlHeadersInfo;
-    body?: LibCurlBodyInfo;
-    redirect?: boolean;
-    cookies?: LibCurlCookiesInfo;
-    httpVersion?: LibCurlHttpVersionInfo;
-    openInnerLog?: boolean;
-    proxy?: LibCurlProxyInfo;
-    /**
-     * 传入LibCurl实例可以做持久化连接
-     */
-    instance?: LibCurl;
-}
-
-interface LibCurlResponseInfo {
-    status: () => number;
-    arraybuffer: () => Promise<ArrayBuffer>;
-    text: () => Promise<string>;
-    json: () => Promise<object>;
-    headers: () => Promise<string>;
-    cookies: () => Promise<string>;
-    cookiesMap: () => Promise<LibCurlCookiesAttr>;
-}
-
-export async function fetch(url: string | URL, request: LibCurlRequestInfo = {}): Promise<LibCurlResponseInfo> {
-    request.instance ||= new LibCurl();
-    const curl = request.instance;
-    const { method = "GET",
-        headers, redirect = false, httpVersion = 0,
-        openInnerLog = false, proxy, body, cookies } = request;
-    curl.open(method, url + '', true);
-    if (headers) {
-        curl.setRequestHeaders(headers);
-    }
-    if (redirect) {
-        curl.setRedirect(true);
-    }
-    if (httpVersion) {
-        curl.setHttpVersion(httpVersion);
-    }
-    if (openInnerLog) {
-        curl.printInnerLogger();
-    }
-    if (cookies) {
-        const { hostname } = new URL(url);
-        if (cookies) {
-            libcurlSetCookies(curl, cookies, hostname);
-        }
-    }
-    if (proxy) {
-        curl.setProxy(proxy);
-    }
-    await curl.send(body);
-    return {
-        status: () => curl.getResponseStatus(),
-        arraybuffer: async () => curl.getResponseBody().buffer,
-        text: async () => curl.getResponseString(),
-        json: async () => curl.getResponseJson(),
-        headers: async () => curl.getResponseHeaders(),
-        cookies: async () => curl.getCookies(),
-        cookiesMap: async () => curl.getCookiesMap(),
-    } as LibCurlResponseInfo;
-
-}

package/src/index.ts

@@ -1 +0,0 @@
-export * from './export'

package/src/libcurl.ts

@@ -1,334 +0,0 @@
-import bindings from 'bindings'
-import { httpCookiesToArray, cookieOptFilter } from './utils';
-
-const { BaoLibCurl } = bindings('bao_curl_node_addon');
-
-export enum LibCurlHttpVersionInfo {
-    http1_1,
-    http2,
-}
-
-//Domain         Secure  Path    CORS    TimeStamp       Name    Value
-export type LibCurlSetCookieOption = {
-    domain?: string;
-    // secure?: boolean;
-    path?: string;
-    // cors?: boolean;
-    name: string;
-    value: string;
-}
-
-export type LibCurlCookiesInfo = string | { [key: string]: string };
-
-
-export type LibCurlGetCookiesOption = {
-    domain?: string;
-    path?: string;
-}
-
-export type LibCurlGetCookieOption = {
-    name: string;
-    domain: string;
-    path?: string;
-}
-
-export type LibCurlCookieAttrArray = [
-    domain: string, secure: boolean, path: string, cors: boolean, timestamp: number, name: string, value: string
-]
-
-export type LibCurlCookieAttrObject = {
-    domain: string, secure: boolean, path: string, cors: boolean, timestamp: number, value: string
-}
-
-export type LibCurlCookiesAttr = Map<string, LibCurlCookieAttrObject>
-
-export type LibCurlHeadersAttr = Map<string, string>
-
-export type LibCurlHeadersInfo = string | { [key: string]: [value: string] } | LibCurlHeadersAttr
-
-export type LibCurlBodyInfo = string | Uint8Array | URLSearchParams | any;
-
-export type LibCurlMethodInfo = 'GET' | 'POST' | 'HEAD' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH'
-
-export type LibCurlProxyWithAccountInfo = {
-    proxy: string;
-    username: string;
-    password: string;
-};
-
-export type LibCurlProxyInfo = string | LibCurlProxyWithAccountInfo;
-
-export type LibCurlURLInfo = string | URL;
-
-export class LibCurlError extends Error {
-    constructor(e: string) {
-        super(e)
-    }
-}
-
-export class LibCurl {
-    private m_libCurl_impl_: any;
-    private m_isAsync_: boolean;
-    private m_isSending_: boolean;
-    constructor() {
-        this.m_libCurl_impl_ = new BaoLibCurl();
-    }
-    private checkSending(): void {
-        if (this.m_isSending_) {
-            throw new Error('the last request is sending, don\'t send one more request on one instance!')
-        }
-    }
-    public open(method: LibCurlMethodInfo, url: LibCurlURLInfo, async: boolean = true): void {
-        this.checkSending();
-        this.m_libCurl_impl_.open(method, url + '');
-        this.m_isAsync_ = async;
-    }
-
-    public setRequestHeader(key: string, value: string): void {
-        this.checkSending();
-        this.m_libCurl_impl_.setRequestHeader(key, value);
-    }
-
-    /**
-     * 
-     * @param headers
-     */
-    public setRequestHeaders(headers: LibCurlHeadersInfo): void {
-        this.checkSending();
-        if (!headers) {
-            return;
-        }
-        if (headers instanceof Map) {
-            headers.forEach((value, key) => this.m_libCurl_impl_.setRequestHeader(key, value))
-        } else if (typeof headers == 'string') {
-            this.m_libCurl_impl_.setRequestHeaders(headers);
-        } else if (typeof headers == 'object') {
-            Object.keys(headers).forEach((key) => {
-                const value = headers[key];
-                this.m_libCurl_impl_.setRequestHeader(key, value);
-            })
-        } else {
-            throw new TypeError('unkown type')
-        }
-    }
-
-    /**
-     * 
-     * @param proxy host:port sample:127.0.0.1:8888
-     * @param username 
-     * @param password 
-     */
-    public setProxy(proxyOpt: LibCurlProxyInfo): void {
-        this.checkSending();
-        if (typeof proxyOpt == 'string') {
-            this.m_libCurl_impl_.setProxy(proxyOpt);
-        } else {
-            this.m_libCurl_impl_.setProxy(proxyOpt.proxy, proxyOpt.username, proxyOpt.password);
-        }
-    }
-
-    /**
-     * 
-     * @param connectTime 连接上远程服务器的最长等待时间
-     * @param sendTime 发送最长等待时间
-     * sendTime时长包含connectTime 所以sendTime要大于connectTime
-     */
-    public setTimeout(connectTime: number, sendTime: number): void {
-        this.checkSending();
-        if (connectTime > sendTime) {
-            throw new Error('连接时间大于发送等待时间.');
-        }
-        this.m_libCurl_impl_.setTimeout(connectTime, sendTime);
-    }
-
-    /**
-     * 
-     * @param key 
-     * @param value 
-     * @param domain cookie作用域 sample: .baidu.com  baike.baidu.com
-     */
-    public setCookie(cookieOpt: LibCurlSetCookieOption): void {
-        this.checkSending();
-        this.m_libCurl_impl_.setCookie(cookieOpt.name, cookieOpt.value, cookieOpt.domain, cookieOpt.path);
-    }
-
-    /**
-     * 
-     * @param cookieOpt 
-     * @param domain cookie作用域 sample: .baidu.com  baike.baidu.com
-     */
-    public deleteCookie(cookieOpt: LibCurlGetCookieOption): void {
-        this.checkSending();
-        this.m_libCurl_impl_.deleteCookie(cookieOpt.name, cookieOpt.domain, cookieOpt.path || "/");
-    }
-
-    /**
-     * @param {LibCurlGetCookiesOption}cookieOpt
-     * @returns 返回所有Cookies sample:'a=b;c=d;'
-     */
-    public getCookies(cookieOpt?: LibCurlGetCookiesOption): string {
-        this.checkSending();
-        const cookies_ = this.m_libCurl_impl_.getCookies();
-        return httpCookiesToArray(cookies_).filter(cookieOptFilter(cookieOpt)).map(e => `${e[5]}=${encodeURIComponent(e[6])}`).join(';');
-    }
-
-    /**
-     * @param {LibCurlGetCookiesOption}cookieOpt
-     * @returns 返回所有Cookie的Map
-     */
-    public getCookiesMap(cookieOpt?: LibCurlGetCookiesOption): LibCurlCookiesAttr {
-        this.checkSending();
-        const cookies_ = this.m_libCurl_impl_.getCookies();
-        return httpCookiesToArray(cookies_).filter(cookieOptFilter(cookieOpt)).reduce((e: LibCurlCookiesAttr, t: LibCurlCookieAttrArray) => {
-            e.set(t[5], {
-                domain: t[0],
-                secure: t[1],
-                path: t[2],
-                cors: t[3],
-                timestamp: t[4],
-                value: t[6],
-            } as LibCurlCookieAttrObject)
-            return e;
-        }, new Map<string, LibCurlCookieAttrObject>());
-    }
-
-    /**
-     * 
-     * @param cookieOpt
-     * @returns 返回该cookieOpt对应的cookieValue
-     * sample: 
-     */
-    public getCookie(cookieOpt: LibCurlGetCookieOption): string {
-        this.checkSending();
-        return this.m_libCurl_impl_.getCookie(cookieOpt.name, cookieOpt.domain || "", cookieOpt.path || "");
-    }
-
-    /**
-     * 
-     * @returns 返回响应头
-     */
-    public getResponseHeaders(): string {
-        this.checkSending();
-        return this.m_libCurl_impl_.getResponseHeaders();
-    }
-
-    /**
-     * @returns 返回响应头 Map
-     */
-    public getResponseHeadersMap(): LibCurlHeadersAttr {
-        this.checkSending();
-        const headers_ = this.m_libCurl_impl_.getResponseHeaders();
-        return headers_.split('\r\n')
-            .slice(1)//HTTP/1.1 200 OK
-            .reduce((e: LibCurlHeadersAttr, t: string) => {
-                if (!t) {
-                    return e;
-                }
-                const [key, value] = t.split(': ');
-                e.set(key, value);
-                return e;
-            }, new Map<string, string>());
-    }
-
-    /**
-     * 
-     * @returns 返回状态码
-     * sample: 200 403 404
-     */
-    public getResponseStatus(): number {
-        this.checkSending();
-        return this.m_libCurl_impl_.getResponseStatus();
-    }
-
-    /**
-     * 重置curl 包括之前的所有设定
-     */
-    public reset(): void {
-        this.checkSending();
-        this.m_libCurl_impl_.reset();
-    }
-
-    /**
-     * 
-     * @param isAllow 是否允许重定向
-     */
-    public setRedirect(isAllow: boolean): void {
-        this.checkSending();
-        this.m_libCurl_impl_.setRedirect(isAllow);
-    }
-
-    /**
-     * 打印libcurl内部的 解析信息、连接信息、tls信息等等
-     */
-    public printInnerLogger(): void {
-        this.checkSending();
-        this.m_libCurl_impl_.printInnerLogger();
-    }
-
-    /**
-     * 
-     * @param version 
-     * 设置http版本号
-     */
-    public setHttpVersion(version: LibCurlHttpVersionInfo): void {
-        this.checkSending();
-        this.m_libCurl_impl_.setHttpVersion(version);
-    }
-
-    /**
-     * 
-     * @param body POST PUT PATCH时 发送的body
-     * 当body不为string或uint8array时 此函数将用JSON.stringify转换对象
-     */
-    public send(body?: LibCurlBodyInfo): Promise<undefined> | undefined {
-        this.checkSending();
-        this.m_isSending_ = true;
-        if (this.m_isAsync_) {
-            return new Promise((resolve, reject) => {
-                const callback = (curlcode: number, curlcodeError: string) => {
-                    this.m_isSending_ = false;
-                    if (curlcode != 0) {
-                        reject(new LibCurlError(curlcodeError));
-                    } else {
-                        resolve(void 0);
-                    }
-                };
-                if (body) {
-                    if (body instanceof URLSearchParams) {
-                        this.m_libCurl_impl_.sendAsync(body + '', callback);
-                    } else {
-                        this.m_libCurl_impl_.sendAsync(body, callback);
-                    }
-                } else {
-                    this.m_libCurl_impl_.sendAsync(callback);
-                }
-            })
-        }
-        if (body) {
-            if (body instanceof URLSearchParams) {
-                this.m_libCurl_impl_.send(body + '');
-            } else {
-                this.m_libCurl_impl_.send(body);
-            }
-        } else {
-            this.m_libCurl_impl_.send();
-        }
-    }
-
-    public getResponseBody(): Uint8Array {
-        this.checkSending();
-        return this.m_libCurl_impl_.getResponseBody();
-    }
-
-    public getResponseString(): string {
-        this.checkSending();
-        return this.m_libCurl_impl_.getResponseString();
-    }
-
-    public getResponseJson(): Object {
-        this.checkSending();
-        return JSON.parse(this.getResponseString());
-    }
-
-
-}

package/src/requests.ts

@@ -1,211 +0,0 @@
-import { LibCurl, LibCurlBodyInfo, LibCurlCookiesAttr, LibCurlCookiesInfo, LibCurlHeadersAttr, LibCurlHeadersInfo, LibCurlMethodInfo, LibCurlProxyInfo, LibCurlHttpVersionInfo, LibCurlURLInfo } from "./libcurl"
-import { libcurlSetCookies } from "./utils";
-
-type requestsHttpVersionInfo = LibCurlHttpVersionInfo;
-type requestsHeadersInfo = LibCurlHeadersInfo;
-type requestsBodyInfo = LibCurlBodyInfo;
-type requestsCookiesInfo = LibCurlCookiesInfo;
-type requestsMethodInfo = LibCurlMethodInfo;
-
-type requestsProxyInfo = LibCurlProxyInfo;
-type requestsURLInfo = LibCurlURLInfo
-
-interface requestsResponseImp {
-    readonly text: string;
-    readonly json: object;
-    readonly buffer: Uint8Array;
-    readonly headers: string;
-    readonly headersMap: LibCurlHeadersAttr;
-    readonly status: number;
-}
-
-class requestsResponse implements requestsResponseImp {
-    private curl: LibCurl;
-    constructor(curl: LibCurl) {
-        this.curl = curl;
-    }
-
-    public get text(): string {
-        return this.curl.getResponseString();
-    }
-
-    public get json(): object {
-        return this.curl.getResponseJson();
-    }
-
-    public get buffer(): Uint8Array {
-        return this.curl.getResponseBody();
-    }
-
-    public get headers(): string {
-        return this.curl.getResponseHeaders();
-    }
-
-    public get headersMap(): LibCurlHeadersAttr {
-        return this.curl.getResponseHeadersMap();
-    }
-
-    public get status(): number {
-        return this.curl.getResponseStatus();
-    }
-
-
-}
-
-interface requestsInitOption {
-    redirect?: boolean;
-    cookies?: requestsCookiesInfo;
-    proxy?: requestsProxyInfo;
-    body?: requestsBodyInfo;
-    httpVersion?: requestsHttpVersionInfo;
-
-    /**
-     * 单位(秒)
-     */
-    timeout?: number;
-    /**
-     * 传入LibCurl实例可以做持久化连接
-     */
-    instance?: LibCurl;
-}
-
-type requestsParamsInfo = URLSearchParams | string | { [key: string]: string };
-
-interface requestsOption {
-    headers?: requestsHeadersInfo;
-    body?: requestsBodyInfo;
-    params?: requestsParamsInfo;
-}
-
-const assignURLSearchParam = (target: URLSearchParams, source: URLSearchParams) => {
-    source.forEach((value, key) => {
-        target.append(key, value);
-    })
-}
-
-export class requests {
-    private option: requestsInitOption;
-    constructor(option: requestsInitOption = {}) {
-        this.option = { ...option };
-        const { cookies, timeout } = option;
-        const curl = this.option.instance ||= new LibCurl();
-
-        if (cookies) {
-            libcurlSetCookies(curl, cookies, '.');
-        }
-        if (timeout) {
-            curl.setTimeout(timeout, timeout);
-        }
-    }
-
-    static session(option: requestsInitOption = {}): requests {
-        return new requests(option);
-    }
-
-
-    //暂定6种常用方法
-    static async get(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('GET', url, requestOpt);
-    }
-    static async post(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('POST', url, requestOpt);
-    }
-    static async put(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('PUT', url, requestOpt);
-    }
-    static async patch(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('PATCH', url, requestOpt);
-    }
-    static async trace(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('TRACE', url, requestOpt);
-    }
-    static async head(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return requests.session().sendRequest('HEAD', url, requestOpt);
-    }
-    async get(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('GET', url, requestOpt);
-    }
-    async post(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('POST', url, requestOpt);
-    }
-    async put(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('PUT', url, requestOpt);
-    }
-    async patch(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('PATCH', url, requestOpt);
-    }
-    async trace(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('TRACE', url, requestOpt);
-    }
-    async head(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        return this.sendRequest('HEAD', url, requestOpt);
-    }
-
-    setCookie(key: string, value: string, domain: string = '', path: string = '') {
-        this.option.instance.setCookie({
-            name: key,
-            value,
-            domain,
-            path,
-        });
-    }
-
-    getCookie(key: string, domain?: string, path?: string): string {
-        return this.option.instance.getCookie({
-            name: key,
-            domain: domain || "",
-            path: path || "",
-        })
-    }
-
-    getCookies(domain?: string, path?: string): string {
-        if (arguments.length == 0) {
-            return this.option.instance.getCookies();
-        }
-        return this.option.instance.getCookies({
-            domain: domain || "",
-            path: path || "",
-        })
-    }
-    getCookiesMap(domain?: string, path?: string): LibCurlCookiesAttr {
-        if (arguments.length == 0) {
-            return this.option.instance.getCookiesMap();
-        }
-        return this.option.instance.getCookiesMap({
-            domain: domain || "",
-            path: path || "",
-        })
-    }
-
-    deleteCookie(key: string, domain: string, path?: string) {
-        this.option.instance.deleteCookie({
-            name: key,
-            domain: domain,
-            path: path || "/",
-        })
-    }
-
-    private async sendRequest(method: requestsMethodInfo, url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse> {
-        const { instance: curl, redirect = false, proxy, httpVersion } = this.option;
-        const { headers, body, params } = requestOpt || {};
-        const url_ = new URL(url);
-        if (params) {
-            assignURLSearchParam(url_.searchParams, new URLSearchParams(params));
-        }
-        curl.open(method, url_, true);
-        if (headers) {
-            curl.setRequestHeaders(headers);
-        }
-        if (redirect) {
-            curl.setRedirect(true);
-        }
-        if (httpVersion) {
-            curl.setHttpVersion(httpVersion);
-        }
-        if (proxy) {
-            curl.setProxy(proxy);
-        }
-        await curl.send(body);
-        return new requestsResponse(curl);
-    }
-}

package/src/utils.ts

@@ -1,71 +0,0 @@
-import { LibCurl, LibCurlCookieAttrArray, LibCurlCookiesInfo, LibCurlGetCookiesOption } from "./libcurl";
-
-export const httpCookiesToArray: (cookies: string) => LibCurlCookieAttrArray[] = (cookies) => {
-    const stringBooleanToJsBoolean = (e: string) => {
-        switch (e) {
-            case 'TRUE':
-                return true;
-            case 'FALSE':
-                return false;
-            default:
-                throw new Error(`unkonw type ${e}`)
-        }
-    }
-    /*
-     *          Domain         Secure  Path    CORS    TimeStamp       Name    Value
-     * sample: .127.0.0.1      TRUE    /       FALSE   3000000000      a       b
-     *         .127.0.0.1      TRUE    /api    FALSE   3000000000      c       d
-     */
-    const cookies_ = [];
-    for (const it of cookies.split('\n')) {
-        if (!it) {
-            continue;
-        }
-        const [domain, secure, path, cors, timestamp, name, value] = it.split('\t');
-        cookies_.push([domain.replace(/#HttpOnly_/i, ''), stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value])
-    }
-    return cookies_;
-}
-
-export const cookieOptFilter = (cookieOpt: LibCurlGetCookiesOption) => {
-    return (e: LibCurlCookieAttrArray) => {
-        if (cookieOpt) {
-            if (cookieOpt.domain) {
-                if (cookieOpt.domain != e[0])
-                    return false;
-            }
-            if (cookieOpt.path) {
-                if (cookieOpt.path != e[2])
-                    return false;
-            }
-        }
-        return true;
-    }
-}
-
-
-export const libcurlSetCookies = (curl: LibCurl, cookies: LibCurlCookiesInfo, domain: string) => {
-    if (typeof cookies == 'string') {
-        cookies.replace(/\s+/g, '')
-            .split(';')
-            .reverse()//保证顺序不颠倒
-            .map(e => e.split('=', 2))
-            .forEach(([key, value]) => {
-                curl.setCookie({
-                    name: key,
-                    value,
-                    domain,
-                    path: '/',
-                })
-            });
-    } else {
-        Object.keys(cookies).forEach(key => {
-            curl.setCookie({
-                name: key,
-                value: cookies[key],
-                domain,
-                path: '/',
-            });
-        })
-    }
-}