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

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) node-libcurl Ossianaa Project Contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/binding.gyp

@@ -1,20 +1,17 @@
 {
-    'variables': {
-        'libcurl_libraries%': '',
-    },
     "targets": [
         {
             "target_name": "bao_curl_node_addon",
            
             "sources": [
-                "./src/libcurl/bao_curl_node_addon.cpp",
-                "./src/libcurl/bao_curl.cpp",
-                "./src/libcurl/utils.cpp",
-                "./src/libcurl/curlAsyncWorker.cpp",
+                "<(module_root_dir)/src/libcurl/bao_curl_node_addon.cpp",
+                "<(module_root_dir)/src/libcurl/bao_curl.cpp",
+                "<(module_root_dir)/src/libcurl/utils.cpp",
+                "<(module_root_dir)/src/libcurl/curlAsyncWorker.cpp",
             ],
             "include_dirs": [
                 "<!@(node -p \"require('node-addon-api').include\")",
-                "./src/libcurl/include"
+                "<(module_root_dir)/src/libcurl/include"
             ],
             'defines': ["NAPI_CPP_EXCEPTIONS",
                         "CURL_STATICLIB",
@@ -27,7 +24,7 @@
                             'msvs_settings': {
                                 'VCCLCompilerTool': {
                                     'DisableSpecificWarnings':['4530','4819'],
-                                    'RuntimeLibrary': '2',
+                                    'RuntimeLibrary': '1',
                                 }
                             }
                         },
@@ -41,20 +38,20 @@
                         },
                     },
                     'libraries': [
-                        # "<(module_root_dir)/src/libcurl/lib/Debug/libcurl-d_imp.lib"
-                        "<(module_root_dir)/src/libcurl/lib/Release/windows/libcurl_imp.lib"
+                        # "<(module_root_dir)/lib/Debug/libcurl-d_imp.lib"
+                        "<(module_root_dir)/lib/Release/win32-x64/libcurl_imp.lib"
                     ],
                     "copies": [
                         # {
                         #     "destination": "<(module_root_dir)/build/Debug/",
                         #     "files": [
-                        #         "<(module_root_dir)/src/libcurl/lib/Debug/libcurl-d.dll"
+                        #         "<(module_root_dir)/lib/Debug/libcurl-d.dll"
                         #     ]
                         # },
                         {
                             "destination": "<(module_root_dir)/build/Release/",
                             "files": [
-                                "<(module_root_dir)/src/libcurl/lib/Release/windows/libcurl.dll"
+                                "<(module_root_dir)/lib/Release/win32-x64/libcurl.dll"
                             ]
                         }
                     ]
@@ -64,7 +61,7 @@
 
                     "configurations": {
                         'Release': {
-                             'cflags': [ '-std=c++11', '-fexceptions', '-frtti', '-Wno-deprecated', '-Wno-unused-variable', '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized', '-Wno-sign-compare', '-Wno-reorder', '-Wno-extra', '-Wno-switch' ,'-fPIC'],
+                            'cflags': [ '-std=c++11', '-fexceptions', '-frtti', '-Wno-deprecated', '-Wno-unused-variable', '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized', '-Wno-sign-compare', '-Wno-reorder', '-Wno-extra', '-Wno-switch' ,'-fPIC'],
                             'cflags_cc': [ '-std=c++11', '-fexceptions', '-frtti', '-Wno-deprecated', '-Wno-unused-variable', '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized', '-Wno-sign-compare', '-Wno-reorder', '-Wno-extra', '-Wno-switch','-fPIC']
                         },
                         'Debug': {
@@ -72,25 +69,11 @@
                         },
                     },
                     'libraries': [
-                        # "<(module_root_dir)/src/libcurl/lib/Debug/libcurl-d_imp.lib"
-                        "<(module_root_dir)/src/libcurl/lib/Release/linux/libcurl.a",
-                        "<(module_root_dir)/src/libcurl/lib/Release/linux/libssl.a",
-                        "<(module_root_dir)/src/libcurl/lib/Release/linux/libcrypto.a"
+                        "<(module_root_dir)/lib/Release/linux-x64/libcurl.a",
+                        "<(module_root_dir)/lib/Release/linux-x64/libssl.a",
+                        "<(module_root_dir)/lib/Release/linux-x64/libcrypto.a"
                     ],
-                    "copies": [
-                        # {
-                        #     "destination": "<(module_root_dir)/build/Debug/",
-                        #     "files": [
-                        #         "<(module_root_dir)/src/libcurl/lib/Debug/libcurl-d.dll"
-                        #     ]
-                        # },
-                        # {
-                        #     "destination": "<(module_root_dir)/build/Release/",
-                        #     "files": [
-                        #         "<(module_root_dir)/src/libcurl/lib/Release/libcurl.so"
-                        #     ]
-                        # }
-                    ]
+                
                 }],
                 ['OS=="mac"', {
                     "configurations": {
@@ -102,34 +85,12 @@
                     'libraries': [
                         "/System/Library/Frameworks/CoreFoundation.framework",
                         "/System/Library/Frameworks/SystemConfiguration.framework",
-                        "<(module_root_dir)/src/libcurl/lib/Release/darwin/libcurl.a",
-                        "<(module_root_dir)/src/libcurl/lib/Release/darwin/libssl.a",
-                        "<(module_root_dir)/src/libcurl/lib/Release/darwin/libcrypto.a"
+                        "<(module_root_dir)/lib/Release/darwin-x64/libcurl.a",
+                        "<(module_root_dir)/lib/Release/darwin-x64/libssl.a",
+                        "<(module_root_dir)/lib/Release/darwin-x64/libcrypto.a"
                     ],
                 }]
             ],
-
-            # "configurations":{
-            #     "Release": {
-            #         "msvs_settings": {
-            #             "VCCLCompilerTool": {
-            #                 # 多线程 DLL (/MD)
-            #                 #'RuntimeLibrary': '2',
-            #                 'ExceptionHandling': '1',
-            #                 'Optimization': 2,                  # /O2 safe optimization
-            #                 'FavorSizeOrSpeed': 1,              # /Ot, favour speed over size
-            #                 'InlineFunctionExpansion': 2,       # /Ob2, inline anything eligible
-            #                 # /GL, whole program optimization, needed for LTCG
-            #                 'WholeProgramOptimization': 'true',
-            #                 'OmitFramePointers': 'true',
-            #                 'EnableFunctionLevelLinking': 'true',
-            #                 'EnableIntrinsicFunctions': 'true',
-            #                 'AdditionalOptions':[
-            #                 ]
-            #             }
-            #         }
-            #     }
-            # }
         }
     ]
 }

package/dist/export.d.ts

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

package/dist/export.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = exports.LibCurl = void 0;
+exports.requests = exports.fetch = exports.LibCurl = void 0;
 const libcurl_1 = require("./libcurl");
 Object.defineProperty(exports, "LibCurl", { enumerable: true, get: function () { return libcurl_1.LibCurl; } });
 const fetch_1 = require("./fetch");
 Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return fetch_1.fetch; } });
+const requests_1 = require("./requests");
+Object.defineProperty(exports, "requests", { enumerable: true, get: function () { return requests_1.requests; } });
 //# sourceMappingURL=export.js.map

package/dist/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAG3B,wFAHA,iBAAO,OAGA;AAFhB,mCAA+B;AAEb,sFAFT,aAAK,OAES"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAG1B,wFAHA,iBAAO,OAGA;AAFhB,mCAA+B;AAEb,sFAFT,aAAK,OAES;AADvB,yCAAqC;AACZ,yFADhB,mBAAQ,OACgB"}

package/dist/fetch.d.ts

@@ -1,16 +1,6 @@
-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";
 interface LibCurlRequestInfo {
-    method?: string;
+    method?: LibCurlMethodInfo;
     headers?: LibCurlHeadersInfo;
     body?: LibCurlBodyInfo;
     redirect?: boolean;
@@ -25,8 +15,9 @@ 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 declare function fetch(url: string | URL, request?: LibCurlRequestInfo): Promise<LibCurlResponseInfo>;
 export {};

package/dist/fetch.js

@@ -11,79 +11,44 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetch = void 0;
 const libcurl_1 = require("./libcurl");
+const utils_1 = require("./utils");
 function fetch(url, request = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         request.instance || (request.instance = new libcurl_1.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) => {
-                    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);
-                }
-            }
-            let promise;
-            if (body) {
-                promise = curl.send(body);
-            }
-            else {
-                promise = curl.send();
-            }
-            promise.then(() => {
-                resolve({
-                    status: () => curl.getResponseStatus(),
-                    arraybuffer: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseBody().buffer; }),
-                    text: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseString(); }),
-                    json: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseJson(); }),
-                    jsonp: (callbackName) => __awaiter(this, void 0, void 0, function* () { return curl.getResponseJsonp(callbackName); }),
-                    headers: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseHeaders(); }),
-                });
-            });
-        });
+                (0, utils_1.libcurlSetCookies)(curl, cookies, hostname);
+            }
+        }
+        if (proxy) {
+            curl.setProxy(proxy);
+        }
+        yield curl.send(body);
+        return {
+            status: () => curl.getResponseStatus(),
+            arraybuffer: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseBody().buffer; }),
+            text: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseString(); }),
+            json: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseJson(); }),
+            headers: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseHeaders(); }),
+            cookies: () => __awaiter(this, void 0, void 0, function* () { return curl.getCookies(); }),
+            cookiesMap: () => __awaiter(this, void 0, void 0, function* () { return curl.getCookiesMap(); }),
+        };
     });
 }
 exports.fetch = fetch;

package/dist/fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA0D;AAsC1D,SAAsB,KAAK,CAAC,GAAiB,EAAE,UAA8B,EAAE;;QAC3E,OAAO,CAAC,QAAQ,KAAhB,OAAO,CAAC,QAAQ,GAAK,IAAI,iBAAO,EAAE,EAAC;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,MAAM,EAAE,MAAM,GAAG,KAAK,EAClB,OAAO,GAAG,EAAE,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,CAAC,EAC/C,YAAY,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;YAClC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACtC,CAAC,CAAC,CAAC;aACN;iBAAM,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;gBACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;oBACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAA;aACL;iBAAM;gBACH,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;aACnC;YACD,IAAI,QAAQ,EAAE;gBACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aAC1B;YACD,IAAI,WAAW,EAAE;gBACb,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;aACpC;YACD,IAAI,YAAY,EAAE;gBACd,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC3B;YACD,IAAI,OAAO,EAAE;gBACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;gBAClC,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;oBAC5B,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;yBACtB,KAAK,CAAC,GAAG,CAAC;yBACV,OAAO,EAAE;yBACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;yBACzB,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;wBACtB,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;oBACxC,CAAC,CAAC,CAAC;iBACV;qBAAM;oBACH,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;wBAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;oBAChD,CAAC,CAAC,CAAA;iBACL;aACJ;YACD,IAAI,KAAK,EAAE;gBACP,IAAI,OAAO,KAAK,IAAI,QAAQ,EAAE;oBAC1B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACxB;qBAAM;oBACH,MAAM,EACF,KAAK,EAAE,MAAM,EACb,QAAQ,EACR,QAAQ,GACX,GAAG,KAAK,CAAC;oBACV,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;iBAC7C;aACJ;YACD,IAAI,OAA2B,CAAC;YAChC,IAAI,IAAI,EAAE;gBACN,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;iBAAM;gBACH,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;aACzB;YACD,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;gBAEd,OAAO,CACH;oBACI,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;oBACtC,WAAW,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAA,GAAA;oBACtD,IAAI,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,iBAAiB,EAAE,CAAA,GAAA;oBAC1C,IAAI,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,eAAe,EAAE,CAAA,GAAA;oBACxC,KAAK,EAAE,CAAO,YAAqB,EAAE,EAAE,gDAAC,OAAA,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA,GAAA;oBAC3E,OAAO,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,kBAAkB,EAAE,CAAA,GAAA;iBACjD,CACJ,CAAA;YACL,CAAC,CAAC,CAAA;QAEN,CAAC,CAAC,CAAA;IACN,CAAC;CAAA;AA7ED,sBA6EC"}
+{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA8K;AAC9K,mCAA4C;AA2B5C,SAAsB,KAAK,CAAC,GAAiB,EAAE,UAA8B,EAAE;;QAC3E,OAAO,CAAC,QAAQ,KAAhB,OAAO,CAAC,QAAQ,GAAK,IAAI,iBAAO,EAAE,EAAC;QACnC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC9B,MAAM,EAAE,MAAM,GAAG,KAAK,EAClB,OAAO,EAAE,QAAQ,GAAG,KAAK,EAAE,WAAW,GAAG,CAAC,EAC1C,YAAY,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;QAClC,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;SACnC;QACD,IAAI,QAAQ,EAAE;YACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,IAAI,WAAW,EAAE;YACb,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;SACpC;QACD,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC3B;QACD,IAAI,OAAO,EAAE;YACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,OAAO,EAAE;gBACT,IAAA,yBAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;aAC9C;SACJ;QACD,IAAI,KAAK,EAAE;YACP,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxB;QACD,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO;YACH,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;YACtC,WAAW,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM,CAAA,GAAA;YACtD,IAAI,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,iBAAiB,EAAE,CAAA,GAAA;YAC1C,IAAI,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,eAAe,EAAE,CAAA,GAAA;YACxC,OAAO,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,kBAAkB,EAAE,CAAA,GAAA;YAC9C,OAAO,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,UAAU,EAAE,CAAA,GAAA;YACtC,UAAU,EAAE,GAAS,EAAE,gDAAC,OAAA,IAAI,CAAC,aAAa,EAAE,CAAA,GAAA;SACxB,CAAC;IAE7B,CAAC;CAAA;AAvCD,sBAuCC"}

package/dist/libcurl.d.ts

@@ -1,31 +1,84 @@
-export declare enum LibCurl_HTTP_VERSION {
+export declare enum LibCurlHttpVersionInfo {
     http1_1 = 0,
     http2 = 1
 }
+export type LibCurlSetCookieOption = {
+    domain?: string;
+    path?: string;
+    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 declare class LibCurlError extends Error {
+    constructor(e: string);
+}
 export declare class LibCurl {
     private m_libCurl_impl_;
     private m_isAsync_;
     private m_isSending_;
     constructor();
     private checkSending;
-    open(method: string, url: string, async?: boolean): void;
+    open(method: LibCurlMethodInfo, url: LibCurlURLInfo, async?: boolean): void;
     setRequestHeader(key: string, value: string): void;
-    setRequestHeaders(headers: string): void;
-    setProxy(proxy: string, username?: string, password?: string): void;
+    setRequestHeaders(headers: LibCurlHeadersInfo): void;
+    setProxy(proxyOpt: LibCurlProxyInfo): void;
     setTimeout(connectTime: number, sendTime: number): void;
-    setCookie(key: string, value: string, domain: string): void;
-    removeCookie(key: string, domain: string): void;
-    getCookies(): string;
-    getCookie(key: string): string;
+    setCookie(cookieOpt: LibCurlSetCookieOption): void;
+    deleteCookie(cookieOpt: LibCurlGetCookieOption): void;
+    getCookies(cookieOpt?: LibCurlGetCookiesOption): string;
+    getCookiesMap(cookieOpt?: LibCurlGetCookiesOption): LibCurlCookiesAttr;
+    getCookie(cookieOpt: LibCurlGetCookieOption): string;
     getResponseHeaders(): string;
+    getResponseHeadersMap(): LibCurlHeadersAttr;
     getResponseStatus(): number;
     reset(): void;
     setRedirect(isAllow: boolean): void;
     printInnerLogger(): void;
-    setHttpVersion(version: LibCurl_HTTP_VERSION): void;
-    send(body?: string | Uint8Array | any): Promise<undefined> | undefined;
+    setHttpVersion(version: LibCurlHttpVersionInfo): void;
+    send(body?: LibCurlBodyInfo): Promise<undefined> | undefined;
     getResponseBody(): Uint8Array;
     getResponseString(): string;
     getResponseJson(): Object;
-    getResponseJsonp(callbackName?: string): Object;
 }

package/dist/libcurl.js

@@ -3,14 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LibCurl = exports.LibCurl_HTTP_VERSION = void 0;
+exports.LibCurl = exports.LibCurlError = exports.LibCurlHttpVersionInfo = void 0;
 const bindings_1 = __importDefault(require("bindings"));
+const utils_1 = require("./utils");
 const { BaoLibCurl } = (0, bindings_1.default)('bao_curl_node_addon');
-var LibCurl_HTTP_VERSION;
-(function (LibCurl_HTTP_VERSION) {
-    LibCurl_HTTP_VERSION[LibCurl_HTTP_VERSION["http1_1"] = 0] = "http1_1";
-    LibCurl_HTTP_VERSION[LibCurl_HTTP_VERSION["http2"] = 1] = "http2";
-})(LibCurl_HTTP_VERSION = exports.LibCurl_HTTP_VERSION || (exports.LibCurl_HTTP_VERSION = {}));
+var LibCurlHttpVersionInfo;
+(function (LibCurlHttpVersionInfo) {
+    LibCurlHttpVersionInfo[LibCurlHttpVersionInfo["http1_1"] = 0] = "http1_1";
+    LibCurlHttpVersionInfo[LibCurlHttpVersionInfo["http2"] = 1] = "http2";
+})(LibCurlHttpVersionInfo = exports.LibCurlHttpVersionInfo || (exports.LibCurlHttpVersionInfo = {}));
+class LibCurlError extends Error {
+    constructor(e) {
+        super(e);
+    }
+}
+exports.LibCurlError = LibCurlError;
 class LibCurl {
     constructor() {
         this.m_libCurl_impl_ = new BaoLibCurl();
@@ -22,7 +29,7 @@ class LibCurl {
     }
     open(method, url, async = true) {
         this.checkSending();
-        this.m_libCurl_impl_.open(method, url);
+        this.m_libCurl_impl_.open(method, url + '');
         this.m_isAsync_ = async;
     }
     setRequestHeader(key, value) {
@@ -31,15 +38,32 @@ class LibCurl {
     }
     setRequestHeaders(headers) {
         this.checkSending();
-        this.m_libCurl_impl_.setRequestHeaders(headers);
+        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');
+        }
     }
-    setProxy(proxy, username, password) {
+    setProxy(proxyOpt) {
         this.checkSending();
-        if (username && password) {
-            this.m_libCurl_impl_.setProxy(proxy, username, password);
+        if (typeof proxyOpt == 'string') {
+            this.m_libCurl_impl_.setProxy(proxyOpt);
         }
         else {
-            this.m_libCurl_impl_.setProxy(proxy);
+            this.m_libCurl_impl_.setProxy(proxyOpt.proxy, proxyOpt.username, proxyOpt.password);
         }
     }
     setTimeout(connectTime, sendTime) {
@@ -49,26 +73,56 @@ class LibCurl {
         }
         this.m_libCurl_impl_.setTimeout(connectTime, sendTime);
     }
-    setCookie(key, value, domain) {
+    setCookie(cookieOpt) {
+        this.checkSending();
+        this.m_libCurl_impl_.setCookie(cookieOpt.name, cookieOpt.value, cookieOpt.domain, cookieOpt.path);
+    }
+    deleteCookie(cookieOpt) {
         this.checkSending();
-        this.m_libCurl_impl_.setCookie(key, value, domain);
+        this.m_libCurl_impl_.deleteCookie(cookieOpt.name, cookieOpt.domain, cookieOpt.path || "/");
     }
-    removeCookie(key, domain) {
+    getCookies(cookieOpt) {
         this.checkSending();
-        this.m_libCurl_impl_.removeCookie(key, domain);
+        const cookies_ = this.m_libCurl_impl_.getCookies();
+        return (0, utils_1.httpCookiesToArray)(cookies_).filter((0, utils_1.cookieOptFilter)(cookieOpt)).map(e => `${e[5]}=${encodeURIComponent(e[6])}`).join(';');
     }
-    getCookies() {
+    getCookiesMap(cookieOpt) {
         this.checkSending();
-        return this.m_libCurl_impl_.getCookies();
+        const cookies_ = this.m_libCurl_impl_.getCookies();
+        return (0, utils_1.httpCookiesToArray)(cookies_).filter((0, utils_1.cookieOptFilter)(cookieOpt)).reduce((e, t) => {
+            e.set(t[5], {
+                domain: t[0],
+                secure: t[1],
+                path: t[2],
+                cors: t[3],
+                timestamp: t[4],
+                value: t[6],
+            });
+            return e;
+        }, new Map());
     }
-    getCookie(key) {
+    getCookie(cookieOpt) {
         this.checkSending();
-        return this.m_libCurl_impl_.getCookie(key);
+        return this.m_libCurl_impl_.getCookie(cookieOpt.name, cookieOpt.domain || "", cookieOpt.path || "");
     }
     getResponseHeaders() {
         this.checkSending();
         return this.m_libCurl_impl_.getResponseHeaders();
     }
+    getResponseHeadersMap() {
+        this.checkSending();
+        const headers_ = this.m_libCurl_impl_.getResponseHeaders();
+        return headers_.split('\r\n')
+            .slice(1)
+            .reduce((e, t) => {
+            if (!t) {
+                return e;
+            }
+            const [key, value] = t.split(': ');
+            e.set(key, value);
+            return e;
+        }, new Map());
+    }
     getResponseStatus() {
         this.checkSending();
         return this.m_libCurl_impl_.getResponseStatus();
@@ -94,9 +148,14 @@ class LibCurl {
         this.m_isSending_ = true;
         if (this.m_isAsync_) {
             return new Promise((resolve, reject) => {
-                const callback = () => {
+                const callback = (curlcode, curlcodeError) => {
                     this.m_isSending_ = false;
-                    resolve(void 0);
+                    if (curlcode != 0) {
+                        reject(new LibCurlError(curlcodeError));
+                    }
+                    else {
+                        resolve(void 0);
+                    }
                 };
                 if (body) {
                     this.m_libCurl_impl_.sendAsync(body, callback);
@@ -107,7 +166,12 @@ class LibCurl {
             });
         }
         if (body) {
-            this.m_libCurl_impl_.send(body);
+            if (body instanceof URLSearchParams) {
+                this.m_libCurl_impl_.send(body + '');
+            }
+            else {
+                this.m_libCurl_impl_.send(body);
+            }
         }
         else {
             this.m_libCurl_impl_.send();
@@ -125,30 +189,6 @@ class LibCurl {
         this.checkSending();
         return JSON.parse(this.getResponseString());
     }
-    getResponseJsonp(callbackName) {
-        this.checkSending();
-        const str = this.getResponseString();
-        let jsonstr = str;
-        if (callbackName) {
-            [, jsonstr] = new RegExp(`\s*${callbackName}[\s\S]*(.*)[\s\S]*`, 'g').exec(str);
-        }
-        else {
-            try {
-                eval(str);
-                throw new Error('it seem not a jsonp');
-            }
-            catch (error) {
-                try {
-                    [, callbackName] = /(.*) is not defined/g.exec(error.message);
-                    return this.getResponseJsonp(callbackName);
-                }
-                catch (_a) {
-                    throw new Error('it seem not a jsonp');
-                }
-            }
-        }
-        return eval(jsonstr);
-    }
 }
 exports.LibCurl = LibCurl;
 //# sourceMappingURL=libcurl.js.map