@ossiana/node-libcurl 1.0.7-alpha-3 → 1.0.8-alpha-2

package/dist/requests.d.ts

@@ -0,0 +1,66 @@
+import { LibCurl, LibCurlBodyInfo, LibCurlCookiesAttr, LibCurlCookiesInfo, LibCurlHeadersAttr, LibCurlHeadersInfo, LibCurlProxyInfo, LibCurlHttpVersionInfo, LibCurlURLInfo } from "./libcurl";
+type requestsHttpVersionInfo = LibCurlHttpVersionInfo;
+type requestsHeadersInfo = LibCurlHeadersInfo;
+type requestsBodyInfo = LibCurlBodyInfo;
+type requestsCookiesInfo = LibCurlCookiesInfo;
+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;
+}
+declare class requestsResponse implements requestsResponseImp {
+    private curl;
+    constructor(curl: LibCurl);
+    get text(): string;
+    get json(): object;
+    get buffer(): Uint8Array;
+    get headers(): string;
+    get headersMap(): LibCurlHeadersAttr;
+    get status(): number;
+}
+interface requestsInitOption {
+    redirect?: boolean;
+    cookies?: requestsCookiesInfo;
+    proxy?: requestsProxyInfo;
+    body?: requestsBodyInfo;
+    httpVersion?: requestsHttpVersionInfo;
+    timeout?: number;
+    instance?: LibCurl;
+}
+type requestsParamsInfo = URLSearchParams | string | {
+    [key: string]: string;
+};
+interface requestsOption {
+    headers?: requestsHeadersInfo;
+    body?: requestsBodyInfo;
+    params?: requestsParamsInfo;
+}
+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>;
+    get(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    post(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    put(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    patch(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    trace(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    head(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
+    setCookie(key: string, value: string, domain?: string, path?: string): void;
+    getCookie(key: string, domain?: string, path?: string): string;
+    getCookies(domain?: string, path?: string): string;
+    getCookiesMap(domain?: string, path?: string): LibCurlCookiesAttr;
+    deleteCookie(key: string, domain: string, path?: string): void;
+    private sendRequest;
+}
+export {};

package/dist/requests.js

@@ -0,0 +1,186 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requests = void 0;
+const libcurl_1 = require("./libcurl");
+const utils_1 = require("./utils");
+class requestsResponse {
+    constructor(curl) {
+        this.curl = curl;
+    }
+    get text() {
+        return this.curl.getResponseString();
+    }
+    get json() {
+        return this.curl.getResponseJson();
+    }
+    get buffer() {
+        return this.curl.getResponseBody();
+    }
+    get headers() {
+        return this.curl.getResponseHeaders();
+    }
+    get headersMap() {
+        return this.curl.getResponseHeadersMap();
+    }
+    get status() {
+        return this.curl.getResponseStatus();
+    }
+}
+const assignURLSearchParam = (target, source) => {
+    source.forEach((value, key) => {
+        target.append(key, value);
+    });
+};
+class requests {
+    constructor(option = {}) {
+        var _a;
+        this.option = Object.assign({}, option);
+        const { cookies, timeout } = option;
+        const curl = (_a = this.option).instance || (_a.instance = new libcurl_1.LibCurl());
+        if (cookies) {
+            (0, utils_1.libcurlSetCookies)(curl, cookies, '.');
+        }
+        if (timeout) {
+            curl.setTimeout(timeout, timeout);
+        }
+    }
+    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);
+        });
+    }
+    static post(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session().sendRequest('POST', url, requestOpt);
+        });
+    }
+    static put(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session().sendRequest('PUT', url, requestOpt);
+        });
+    }
+    static patch(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session().sendRequest('PATCH', url, requestOpt);
+        });
+    }
+    static trace(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session().sendRequest('TRACE', url, requestOpt);
+        });
+    }
+    static head(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return requests.session().sendRequest('HEAD', url, requestOpt);
+        });
+    }
+    get(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('GET', url, requestOpt);
+        });
+    }
+    post(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('POST', url, requestOpt);
+        });
+    }
+    put(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('PUT', url, requestOpt);
+        });
+    }
+    patch(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('PATCH', url, requestOpt);
+        });
+    }
+    trace(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('TRACE', url, requestOpt);
+        });
+    }
+    head(url, requestOpt) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.sendRequest('HEAD', url, requestOpt);
+        });
+    }
+    setCookie(key, value, domain = '', path = '') {
+        this.option.instance.setCookie({
+            name: key,
+            value,
+            domain,
+            path,
+        });
+    }
+    getCookie(key, domain, path) {
+        return this.option.instance.getCookie({
+            name: key,
+            domain: domain || "",
+            path: path || "",
+        });
+    }
+    getCookies(domain, path) {
+        if (arguments.length == 0) {
+            return this.option.instance.getCookies();
+        }
+        return this.option.instance.getCookies({
+            domain: domain || "",
+            path: path || "",
+        });
+    }
+    getCookiesMap(domain, path) {
+        if (arguments.length == 0) {
+            return this.option.instance.getCookiesMap();
+        }
+        return this.option.instance.getCookiesMap({
+            domain: domain || "",
+            path: path || "",
+        });
+    }
+    deleteCookie(key, domain, path) {
+        this.option.instance.deleteCookie({
+            name: key,
+            domain: domain,
+            path: path || "/",
+        });
+    }
+    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 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);
+            }
+            yield curl.send(body);
+            return new requestsResponse(curl);
+        });
+    }
+}
+exports.requests = requests;
+//# sourceMappingURL=requests.js.map

package/dist/requests.js.map

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

package/dist/utils.d.ts

@@ -0,0 +1,4 @@
+import { LibCurl, LibCurlCookieAttrArray, LibCurlCookiesInfo, LibCurlGetCookiesOption } from "./libcurl";
+export declare const httpCookiesToArray: (cookies: string) => LibCurlCookieAttrArray[];
+export declare const cookieOptFilter: (cookieOpt: LibCurlGetCookiesOption) => (e: LibCurlCookieAttrArray) => boolean;
+export declare const libcurlSetCookies: (curl: LibCurl, cookies: LibCurlCookiesInfo, domain: string) => void;

package/dist/utils.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.libcurlSetCookies = exports.cookieOptFilter = exports.httpCookiesToArray = void 0;
+const httpCookiesToArray = (cookies) => {
+    const stringBooleanToJsBoolean = (e) => {
+        switch (e) {
+            case 'TRUE':
+                return true;
+            case 'FALSE':
+                return false;
+            default:
+                throw new Error(`unkonw type ${e}`);
+        }
+    };
+    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, stringBooleanToJsBoolean(secure), path, stringBooleanToJsBoolean(cors), parseInt(timestamp), name, value]);
+    }
+    return cookies_;
+};
+exports.httpCookiesToArray = httpCookiesToArray;
+const cookieOptFilter = (cookieOpt) => {
+    return (e) => {
+        if (cookieOpt) {
+            if (cookieOpt.domain) {
+                if (cookieOpt.domain != e[0])
+                    return false;
+            }
+            if (cookieOpt.path) {
+                if (cookieOpt.path != e[2])
+                    return false;
+            }
+        }
+        return true;
+    };
+};
+exports.cookieOptFilter = cookieOptFilter;
+const libcurlSetCookies = (curl, cookies, domain) => {
+    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: '/',
+            });
+        });
+    }
+};
+exports.libcurlSetCookies = libcurlSetCookies;
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +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,EAAE,wBAAwB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,wBAAwB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;KACpI;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"}

package/package.json

@@ -1,15 +1,23 @@
 {
   "name": "@ossiana/node-libcurl",
-  "version": "1.0.7-alpha-3",
+  "version": "1.0.8-alpha-2",
   "dependencies": {
     "bindings": "^1.5.0",
-    "node-addon-api": "^5.0.0",
-    "node-gyp": "^9.3.1"
+    "node-addon-api": "^5.0.0"
   },
   "scripts": {
-    "test": "node ./test/requests_tls.js",
-    "build:dev": "node-gyp configure --node_use_openssl=false --openssl_quic=false --node_shared_openssl=false && node-gyp -j 16 build --release",
-    "unittest": "mocha"
+    "test": "node ./test/libcurl_test.js",
+    "install": "node-pre-gyp install && npm run build:dev",
+    "build:dev": "node-pre-gyp configure --node_use_openssl=false --openssl_quic=false --node_shared_openssl=false && node-pre-gyp -j 16 build --release",
+    "unittest": "mocha",
+    "tsc":"tsc -p tsconfig.json"
+  },
+  "binary": {
+    "module_name": "node-libcurl",
+    "module_path": "./lib/{configuration}/{platform}-{arch}/",
+    "package_name": "{module_name}-{platform}-{arch}-release.tar.gz",
+    "host": "https://ossianaa.github.io/static/github/release/node-libcurl/",
+    "remote_path": "v1.0.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.18",
@@ -17,11 +25,13 @@
     "chai": "^4.3.7",
     "express": "^4.18.2",
     "mocha": "^10.2.0",
+    "node-gyp": "^9.3.1",
     "typescript": "^4.9.4"
   },
   "author": {
     "name": "Ossian"
   },
+  "main": "./dist/index.js",
   "repository": {
     "type": "git",
     "url": "git@github.com/Ossianaa/node-libcurl.git"

package/readme.md

@@ -1,22 +1,22 @@
 # node-libcurl
 
-## different with Nodejs fetch api
+## Different with Nodejs fetch api
 * JA3 FingerPrint is the same as chrome 108,it modified the BoringSSL extension, set the custom cipher suite with Libcurl
 ------------
 
 ## Build Status
 
-| Platform                              | Support |
-|:-----------------------------:|:---------:|
-| __Windows (x64)__             |__Yes__|
-| __Windows (x86)__             |__No__|
-| __Windows (ARM)__             |__No__|
-| __Ubuntu (x86_64)__             |__Yes__|
-| __MacOS (x86_64)__             |__Yes__|
-| __MacOS (arm64)__             |__No__|
+|      Platform       | Support |
+| :-----------------: | :-----: |
+|  __Windows (x64)__  | __Yes__ |
+|  __Windows (x86)__  | __No__  |
+|  __Windows (ARM)__  | __No__  |
+| __Ubuntu (x86_64)__ | __Yes__ |
+| __MacOS (x86_64)__  | __Yes__ |
+|  __MacOS (arm64)__  | __No__  |
 ------------
 
-## how to build
+## How to build
 > npm i -g @ossiana/node-libcurl
 
 #### Some Problems on Windows
@@ -30,15 +30,15 @@ You should install Python 3.x and the Visual Studio compiler;
 
 ### import
 ```javascript
-import { LibCurl, fetch } from '@ossiana/node-libcurl'
+import { LibCurl, fetch, requests} from '@ossiana/node-libcurl'
 ```
 
 ### browser fetch  style
 ```javascript
 fetch("https://xxx.io/api/graphql/", {
-     proxy: "127.0.0.1:8888",
+    proxy: "127.0.0.1:8888",
 	method: "POST",
-     headers: {
+    headers: {
         "Host": "xxx.io",
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36",
         "Content-Type": "application/json",
@@ -59,6 +59,21 @@ fetch("https://xxx.io/api/graphql/", {
 	console.error('fetch error : %s', err.message);
 });
 ```
+### requests  style
+```javascript
+const session = requests.session();
+
+session.setCookie('ua', '123=/1a', '.baidu.com', '/');
+
+const res = await session.get('https://www.baidu.com', {
+    headers: {
+        "user-Agent": "1"
+    }
+});
+console.log(res.headersMap);
+console.log(session.getCookiesMap().get('ua'));
+console.log(res.text);
+```
 
 
 

package/src/export.ts

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

package/src/fetch.ts

@@ -1,19 +1,8 @@
-import { LibCurl, LibCurl_HTTP_VERSION } from "./libcurl";
-
-type LibCurlHeadersInfo = [string, string][] | object | string;
-type LibCurlBodyInfo = string | Uint8Array | any;
-type LibCurlCookiesInfo = string | object;
-type LibCurlHttpVersionInfo = LibCurl_HTTP_VERSION;
-
-type LibCurlProxyWithAccountInfo = {
-    proxy: string;
-    username: string;
-    password: string;
-};
-type LibCurlProxyInfo = string | LibCurlProxyWithAccountInfo;
+import { LibCurl, LibCurlBodyInfo, LibCurlMethodInfo, LibCurlHeadersInfo, LibCurlCookiesAttr, LibCurlHttpVersionInfo, LibCurlProxyInfo, LibCurlCookiesInfo } from "./libcurl";
+import { libcurlSetCookies } from "./utils";
 
 interface LibCurlRequestInfo {
-    method?: string;
+    method?: LibCurlMethodInfo;
     headers?: LibCurlHeadersInfo;
     body?: LibCurlBodyInfo;
     redirect?: boolean;
@@ -32,85 +21,48 @@ interface LibCurlResponseInfo {
     arraybuffer: () => Promise<ArrayBuffer>;
     text: () => Promise<string>;
     json: () => Promise<object>;
-    jsonp: (callbackName?: string) => 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;
-    return new Promise((resolve, reject) => {
-        const { method = "GET",
-            headers = [], redirect = false, httpVersion = 0,
-            openInnerLog = false, proxy, body, cookies } = request;
-        curl.open(method, url + '', true);
-        if (Array.isArray(headers)) {
-            headers.forEach(([key, value]) => {
-                curl.setRequestHeader(key, value);
-            });
-        } else if (typeof headers == 'object') {
-            Object.keys(headers).forEach((key: string) => {
-                curl.setRequestHeader(key, headers[key]);
-            })
-        } else {
-            curl.setRequestHeaders(headers);
-        }
-        if (redirect) {
-            curl.setRedirect(true);
-        }
-        if (httpVersion) {
-            curl.setHttpVersion(httpVersion);
-        }
-        if (openInnerLog) {
-            curl.printInnerLogger();
-        }
+    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) {
-            const { hostname } = new URL(url);
-            if (typeof cookies == 'string') {
-                cookies.replace(/\s+/g, '')
-                    .split(';')
-                    .reverse()//保证顺序不颠倒
-                    .map(e => e.split('=', 2))
-                    .forEach(([key, value]) => {
-                        curl.setCookie(key, value, hostname)
-                    });
-            } else {
-                Object.keys(cookies).forEach(key => {
-                    curl.setCookie(key, cookies[key], hostname);
-                })
-            }
-        }
-        if (proxy) {
-            if (typeof proxy == "string") {
-                curl.setProxy(proxy);
-            } else {
-                const {
-                    proxy: proxy_,
-                    username,
-                    password,
-                } = proxy;
-                curl.setProxy(proxy_, username, password);
-            }
+            libcurlSetCookies(curl, cookies, hostname);
         }
-        let promise: Promise<undefined>;
-        if (body) {
-            promise = curl.send(body);
-        } else {
-            promise = curl.send();
-        }
-        promise.then(() => {
-
-            resolve(
-                {
-                    status: () => curl.getResponseStatus(),
-                    arraybuffer: async () => curl.getResponseBody().buffer,
-                    text: async () => curl.getResponseString(),
-                    json: async () => curl.getResponseJson(),
-                    jsonp: async (callbackName?: string) => curl.getResponseJsonp(callbackName),
-                    headers: async () => curl.getResponseHeaders(),
-                }
-            )
-        })
+    }
+    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;
 
-    })
 }