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

package/binding.gyp

@@ -5,8 +5,7 @@
     "targets": [
         {
             "target_name": "bao_curl_node_addon",
-            "cflags!": [],
-            "cflags_cc!": [],
+           
             "sources": [
                 "./src/libcurl/bao_curl_node_addon.cpp",
                 "./src/libcurl/bao_curl.cpp",
@@ -43,7 +42,7 @@
                     },
                     'libraries': [
                         # "<(module_root_dir)/src/libcurl/lib/Debug/libcurl-d_imp.lib"
-                        "<(module_root_dir)/src/libcurl/lib/Release/libcurl_imp.lib"
+                        "<(module_root_dir)/src/libcurl/lib/Release/windows/libcurl_imp.lib"
                     ],
                     "copies": [
                         # {
@@ -55,11 +54,58 @@
                         {
                             "destination": "<(module_root_dir)/build/Release/",
                             "files": [
-                                "<(module_root_dir)/src/libcurl/lib/Release/libcurl.dll"
+                                "<(module_root_dir)/src/libcurl/lib/Release/windows/libcurl.dll"
                             ]
                         }
                     ]
 
+                }],
+                ['OS=="linux"', {
+
+                    "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_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': {
+                            
+                        },
+                    },
+                    '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"
+                    ],
+                    "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": {
+                        '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_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'],
+                        },
+                    },
+                    '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"
+                    ],
                 }]
             ],
 

package/dist/export.d.ts

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

package/dist/export.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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; } });
+//# sourceMappingURL=export.js.map

package/dist/export.js.map

@@ -0,0 +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"}

package/dist/fetch.d.ts

@@ -0,0 +1,32 @@
+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;
+interface LibCurlRequestInfo {
+    method?: string;
+    headers?: LibCurlHeadersInfo;
+    body?: LibCurlBodyInfo;
+    redirect?: boolean;
+    cookies?: LibCurlCookiesInfo;
+    httpVersion?: LibCurlHttpVersionInfo;
+    openInnerLog?: boolean;
+    proxy?: LibCurlProxyInfo;
+    instance?: LibCurl;
+}
+interface LibCurlResponseInfo {
+    status: () => number;
+    arraybuffer: () => Promise<ArrayBuffer>;
+    text: () => Promise<string>;
+    json: () => Promise<object>;
+    jsonp: (callbackName?: string) => Promise<object>;
+    headers: () => Promise<string>;
+}
+export declare function fetch(url: string | URL, request?: LibCurlRequestInfo): Promise<LibCurlResponseInfo>;
+export {};

package/dist/fetch.js

@@ -0,0 +1,90 @@
+"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.fetch = void 0;
+const libcurl_1 = require("./libcurl");
+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();
+            }
+            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(); }),
+                });
+            });
+        });
+    });
+}
+exports.fetch = fetch;
+//# sourceMappingURL=fetch.js.map

package/dist/fetch.js.map

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

package/dist/index.d.ts

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

package/dist/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./export"), exports);
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB"}

package/dist/libcurl.d.ts

@@ -0,0 +1,31 @@
+export declare enum LibCurl_HTTP_VERSION {
+    http1_1 = 0,
+    http2 = 1
+}
+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;
+    setRequestHeader(key: string, value: string): void;
+    setRequestHeaders(headers: string): void;
+    setProxy(proxy: string, username?: string, password?: string): 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;
+    getResponseHeaders(): string;
+    getResponseStatus(): number;
+    reset(): void;
+    setRedirect(isAllow: boolean): void;
+    printInnerLogger(): void;
+    setHttpVersion(version: LibCurl_HTTP_VERSION): void;
+    send(body?: string | Uint8Array | any): Promise<undefined> | undefined;
+    getResponseBody(): Uint8Array;
+    getResponseString(): string;
+    getResponseJson(): Object;
+    getResponseJsonp(callbackName?: string): Object;
+}

package/dist/libcurl.js

@@ -0,0 +1,154 @@
+"use strict";
+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;
+const bindings_1 = __importDefault(require("bindings"));
+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 = {}));
+class LibCurl {
+    constructor() {
+        this.m_libCurl_impl_ = new BaoLibCurl();
+    }
+    checkSending() {
+        if (this.m_isSending_) {
+            throw new Error('the last request is sending, don\'t send one more request on one instance!');
+        }
+    }
+    open(method, url, async = true) {
+        this.checkSending();
+        this.m_libCurl_impl_.open(method, url);
+        this.m_isAsync_ = async;
+    }
+    setRequestHeader(key, value) {
+        this.checkSending();
+        this.m_libCurl_impl_.setRequestHeader(key, value);
+    }
+    setRequestHeaders(headers) {
+        this.checkSending();
+        this.m_libCurl_impl_.setRequestHeaders(headers);
+    }
+    setProxy(proxy, username, password) {
+        this.checkSending();
+        if (username && password) {
+            this.m_libCurl_impl_.setProxy(proxy, username, password);
+        }
+        else {
+            this.m_libCurl_impl_.setProxy(proxy);
+        }
+    }
+    setTimeout(connectTime, sendTime) {
+        this.checkSending();
+        if (connectTime > sendTime) {
+            throw new Error('连接时间大于发送等待时间.');
+        }
+        this.m_libCurl_impl_.setTimeout(connectTime, sendTime);
+    }
+    setCookie(key, value, domain) {
+        this.checkSending();
+        this.m_libCurl_impl_.setCookie(key, value, domain);
+    }
+    removeCookie(key, domain) {
+        this.checkSending();
+        this.m_libCurl_impl_.removeCookie(key, domain);
+    }
+    getCookies() {
+        this.checkSending();
+        return this.m_libCurl_impl_.getCookies();
+    }
+    getCookie(key) {
+        this.checkSending();
+        return this.m_libCurl_impl_.getCookie(key);
+    }
+    getResponseHeaders() {
+        this.checkSending();
+        return this.m_libCurl_impl_.getResponseHeaders();
+    }
+    getResponseStatus() {
+        this.checkSending();
+        return this.m_libCurl_impl_.getResponseStatus();
+    }
+    reset() {
+        this.checkSending();
+        this.m_libCurl_impl_.reset();
+    }
+    setRedirect(isAllow) {
+        this.checkSending();
+        this.m_libCurl_impl_.setRedirect(isAllow);
+    }
+    printInnerLogger() {
+        this.checkSending();
+        this.m_libCurl_impl_.printInnerLogger();
+    }
+    setHttpVersion(version) {
+        this.checkSending();
+        this.m_libCurl_impl_.setHttpVersion(version);
+    }
+    send(body) {
+        this.checkSending();
+        this.m_isSending_ = true;
+        if (this.m_isAsync_) {
+            return new Promise((resolve, reject) => {
+                const callback = () => {
+                    this.m_isSending_ = false;
+                    resolve(void 0);
+                };
+                if (body) {
+                    this.m_libCurl_impl_.sendAsync(body, callback);
+                }
+                else {
+                    this.m_libCurl_impl_.sendAsync(callback);
+                }
+            });
+        }
+        if (body) {
+            this.m_libCurl_impl_.send(body);
+        }
+        else {
+            this.m_libCurl_impl_.send();
+        }
+    }
+    getResponseBody() {
+        this.checkSending();
+        return this.m_libCurl_impl_.getResponseBody();
+    }
+    getResponseString() {
+        this.checkSending();
+        return this.m_libCurl_impl_.getResponseString();
+    }
+    getResponseJson() {
+        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

package/dist/libcurl.js.map

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

package/dist/src/index.d.ts

@@ -1,2 +1 @@
-import { LibCurl } from './libcurl';
-export { LibCurl };
+export * from './export';

package/dist/src/index.js

@@ -1,5 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const libcurl_1 = require("./libcurl");
-exports.default = libcurl_1.LibCurl;
+__exportStar(require("./export"), exports);
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;AAAA,uCAAmC;AAEnC,kBAAe,iBAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB"}

package/index.js

@@ -1 +1 @@
-module.exports = require('./dist/src/export.js')
+module.exports = require('./dist/src/index')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossiana/node-libcurl",
-  "version": "1.0.6-alpha-3",
+  "version": "1.0.7-alpha-2",
   "dependencies": {
     "bindings": "^1.5.0",
     "node-addon-api": "^5.0.0",

package/src/index.ts

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

package/src/libcurl/bao_curl.cpp

@@ -97,7 +97,7 @@ void BaoCurl::setProxy(std::string proxy, std::string username,
 					   std::string password)
 {
 	CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_PROXY, proxy.c_str()));
-	CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_PROXYUSERPWD, username + ":" + password));
+	CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_PROXYUSERPWD, (username + ":" + password).c_str()));
 	this->m_bProxy = true;
 }
 

package/src/libcurl/bao_curl_node_addon.cpp

@@ -213,7 +213,7 @@ Napi::Value BaoLibCurlWarp::removeCookie(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::getCookies(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 
 	return Napi::String::New(env, this->m_curl.getCookies());
 }
@@ -237,7 +237,7 @@ Napi::Value BaoLibCurlWarp::getCookie(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::getResponseStatus(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 
 	return Napi::Number::New(env, this->m_curl.getResponseStatus());
 }
@@ -248,7 +248,7 @@ Napi::Value BaoLibCurlWarp::getResponseStatus(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::reset(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 
 	this->m_curl.reset();
 	return env.Undefined();
@@ -274,7 +274,7 @@ Napi::Value BaoLibCurlWarp::setRedirect(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::printInnerLogger(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 	this->m_curl.printInnerLogger();
 	return env.Undefined();
 }
@@ -369,7 +369,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
 		string str = info[0].As<Napi::String>().Utf8Value();
 		size_t strLen = str.size();
 		Napi::Uint8Array u8buffer = Napi::Uint8Array::New(env, strLen);
-		memcpy_s(u8buffer.Data(), strLen, str.c_str(), strLen);
+		memcpy(u8buffer.Data(), str.c_str(), strLen);
 		workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, (const char *)u8buffer.Data(),u8buffer.ElementLength());
 		workerPtr->Queue();
 		return env.Undefined();
@@ -378,7 +378,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
 	string jsonStr = env.Global().Get("JSON").As<Napi::Object>().Get("stringify").As<Napi::Function>().Call(argsList).As<Napi::String>().Utf8Value();
 	size_t strLen = jsonStr.size();
 	Napi::Uint8Array u8buffer = Napi::Uint8Array::New(env, strLen);
-	memcpy_s(u8buffer.Data(), strLen, jsonStr.c_str(), strLen);
+	memcpy(u8buffer.Data(), jsonStr.c_str(), strLen);
 	workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, (const char *)u8buffer.Data(),u8buffer.ElementLength());
 	workerPtr->Queue();
 	return env.Undefined();
@@ -390,7 +390,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::getResponseHeaders(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 	return Napi::String::New(env, this->m_curl.getResponseHeaders());
 }
 /*
@@ -399,11 +399,11 @@ Napi::Value BaoLibCurlWarp::getResponseHeaders(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::getResponseBody(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 	string utf8Str = this->m_curl.getResponseBody();
 	size_t utf8Size = utf8Str.size();
 	Napi::Uint8Array uint8buffer = Napi::Uint8Array::New(env, utf8Size);
-	memcpy_s((void *)uint8buffer.Data(), utf8Size, utf8Str.c_str(), utf8Size);
+	memcpy((void *)uint8buffer.Data(), utf8Str.c_str(), utf8Size);
 	return uint8buffer;
 }
 
@@ -413,7 +413,7 @@ Napi::Value BaoLibCurlWarp::getResponseBody(const Napi::CallbackInfo &info)
 Napi::Value BaoLibCurlWarp::getResponseString(const Napi::CallbackInfo &info)
 {
 	Napi::Env env = info.Env();
-	size_t argsLen = info.Length();
+	// size_t argsLen = info.Length();
 	return Napi::String::New(env, this->m_curl.getResponseBody());
 }
 

package/src/libcurl/curlAsyncWorker.cpp

@@ -1,11 +1,11 @@
 #include "curlAysncWorker.h"
 
-curlAsyncWorker::curlAsyncWorker(Napi::Function &callback, BaoCurl &baoCurlInstance, const char *body, size_t bodySize)
+curlAsyncWorker::curlAsyncWorker(const Napi::Function &callback, BaoCurl &baoCurlInstance, const char *body, size_t bodySize)
     : Napi::AsyncWorker(callback), m_baoCurlInstance(baoCurlInstance)
 {
     this->m_sendBody = (char *)malloc(bodySize);
     this->m_bodySize = bodySize;
-    memcpy_s(this->m_sendBody, bodySize, body, bodySize);
+    memcpy(this->m_sendBody,  body, bodySize);
 }
 
 curlAsyncWorker::~curlAsyncWorker()
@@ -31,7 +31,7 @@ void curlAsyncWorker::OnOK()
     /* std::string str = this->m_baoCurlInstance.getResponseBody();
     size_t strLen = str.size();
     Napi::Uint8Array u8buffer = Napi::Uint8Array::New(Env(), strLen);
-    memcpy_s(u8buffer.Data(), strLen, str.c_str(), strLen); */
+    memcpy(u8buffer.Data(), strLen, str.c_str(), strLen); */
     Callback().Call({
         /* u8buffer */
     });

package/src/libcurl/include/bao_curl.h

@@ -72,7 +72,7 @@ private:
 	struct curl_slist* m_pHeaders = NULL;
 	std::string m_method = "GET";
 	struct Stream_st m_stream;
-	struct curl_slist* m_cookies = NULL;
+	// struct curl_slist* m_cookies = NULL;
 	bool m_bProxy = false;
 	bool m_bIsHttps = false;
 

package/src/libcurl/include/curlAysncWorker.h

@@ -4,7 +4,7 @@
 class curlAsyncWorker : public Napi::AsyncWorker
 {
 public:
-    curlAsyncWorker(Napi::Function &callback, BaoCurl &baoCurlInstance, const char *sendBody, size_t bodySize);
+    curlAsyncWorker(const Napi::Function &callback, BaoCurl &baoCurlInstance, const char *sendBody, size_t bodySize);
     ~curlAsyncWorker();
     void Execute();
     void OnOK();

package/src/libcurl/include/request_tls_utils.h

@@ -1,30 +1,30 @@
 #define REQUEST_TLS_METHOD_THROW(env,className,methodName,reason) {\
-    Napi::TypeError::New(##env,StringFormat("Failed to execute '%s' on '%s': %s",##methodName,##className,##reason)).ThrowAsJavaScriptException();\
-    return (##env).Undefined();\
+    Napi::TypeError::New(env,StringFormat("Failed to execute '%s' on '%s': %s",methodName,className,reason)).ThrowAsJavaScriptException();\
+    return (env).Undefined();\
 }
 
 #define REQUEST_TLS_METHOD_ARGS_CHECK(env,className,methodName,needLen,getLen) {\
-    if ( ##getLen !=  ##needLen){\
-        Napi::TypeError::New(##env,StringFormat("Failed to execute '%s' on '%s': %d arguments required, but only %d present.",##methodName,##className,##needLen,##getLen)).ThrowAsJavaScriptException();\
-        return (##env).Undefined();\
+    if (getLen !=  needLen){\
+        Napi::TypeError::New(env,StringFormat("Failed to execute '%s' on '%s': %d arguments required, but only %d present.",methodName,className,needLen,getLen)).ThrowAsJavaScriptException();\
+        return (env).Undefined();\
 	}\
 }
 
 #define REQUEST_TLS_METHOD_ARGS_TOO_MUCH_CHECK(env,className,methodName,maxLen,getLen) {\
-    if ( ##getLen >  ##maxLen){\
-        Napi::TypeError::New(##env,StringFormat("Failed to execute '%s' on '%s': maximum of %d arguments required, but only %d present.",##methodName,##className,##maxLen,##getLen)).ThrowAsJavaScriptException();\
-        return (##env).Undefined();\
+    if (getLen >  maxLen){\
+        Napi::TypeError::New(env,StringFormat("Failed to execute '%s' on '%s': maximum of %d arguments required, but only %d present.",methodName,className,maxLen,getLen)).ThrowAsJavaScriptException();\
+        return (env).Undefined();\
 	}\
 }
 
 #define REQUEST_TLS_METHOD_ARGS_NO_CONFIG(env,className,methodName,reqNums,getLen) {\
-    Napi::TypeError::New(##env,StringFormat("Failed to execute '%s' on '%s': [%s] arguments required, but only %d present.",##methodName,##className,##reqNums,##getLen)).ThrowAsJavaScriptException();\
-    return (##env).Undefined();\
+    Napi::TypeError::New(env,StringFormat("Failed to execute '%s' on '%s': [%s] arguments required, but only %d present.",methodName,className,reqNums,getLen)).ThrowAsJavaScriptException();\
+    return (env).Undefined();\
 }
 
 #define REQUEST_TLS_METHOD_CHECK(env,condition,message) {\
     if (!(condition)){\
-        Napi::TypeError::New(##env,##message).ThrowAsJavaScriptException();\
-        return (##env).Undefined();\
+        Napi::TypeError::New(env,message).ThrowAsJavaScriptException();\
+        return (env).Undefined();\
 	}\
-}
+}

package/src/libcurl/include/utils.h

@@ -7,7 +7,14 @@
 #include <iostream>
 #include <stdlib.h> 
 #include <time.h> 
-
+#include <memory>
 
 std::vector<std::string> StringSplit(const std::string& str, const std::string& pattern);
-std::string StringFormat(const char* lpcszFormat, ...);
+template<typename ... Args>
+std::string StringFormat(const std::string& format, Args ... args){
+    size_t size = 1 + snprintf(nullptr, 0, format.c_str(), args ...);  // Extra space for \0
+    std::unique_ptr<char[]> bytes(new char[size]);
+    // char bytes[size];
+    snprintf(bytes.get(), size, format.c_str(), args ...);
+    return std::string(bytes.get());
+}

package/src/libcurl/utils.cpp

@@ -5,7 +5,7 @@ std::vector<std::string> StringSplit(const std::string& str, const std::string&
 	std::string::size_type pos;
 	std::vector<std::string> result;
 	std::string _str(str);
-	_str += pattern;//��չ�ַ����Է������
+	_str += pattern;//��չ�ַ����Է������
 	size_t size = _str.size();
 	for (size_t i = 0; i < size; i++)
 	{
@@ -21,21 +21,23 @@ std::vector<std::string> StringSplit(const std::string& str, const std::string&
 }
 
 
-std::string StringFormat(const char* lpcszFormat, ...)
-{
-	std::string strResult;
-	if (NULL != lpcszFormat)
-	{
-		va_list marker = NULL;
-		va_start(marker, lpcszFormat); //��ʼ����������
-		size_t nLength = _vscprintf(lpcszFormat, marker) + 1; //��ȡ��ʽ���ַ�������
-		std::vector<char> vBuffer(nLength, '\0'); //�������ڴ洢��ʽ���ַ������ַ�����
-		int nWritten = _vsnprintf_s(&vBuffer[0], vBuffer.size(), nLength, lpcszFormat, marker);
-		if (nWritten > 0)
-		{
-			strResult = &vBuffer[0];
-		}
-		va_end(marker); //��������
-	}
-	return strResult;
-}
+
+
+// std::string StringFormat(const char* lpcszFormat, ...)
+// {
+// 	std::string strResult;
+// 	if (NULL != lpcszFormat)
+// 	{
+// 		va_list marker = {};
+// 		va_start(marker, lpcszFormat); //��ʼ����������
+// 		size_t nLength = vsnprintf(lpcszFormat, marker) + 1; //��ȡ��ʽ���ַ�������
+// 		std::vector<char> vBuffer(nLength, '\0'); //�������ڴ洢��ʽ���ַ������ַ�����
+// 		int nWritten = vsnprintf(&vBuffer[0], nLength, lpcszFormat, marker);
+// 		if (nWritten > 0)
+// 		{
+// 			strResult = &vBuffer[0];
+// 		}
+// 		va_end(marker); //��������
+// 	}
+// 	return strResult;
+// }

package/tsconfig.json

@@ -6,7 +6,7 @@
     "removeComments": true,
     "noImplicitAny": false,
     "sourceMap": true,
-    "rootDir": ".",
+    "rootDir": "src",
     "outDir": "dist",
     "typeRoots": [
       "./typings"
@@ -26,6 +26,6 @@
     "src/*"
   ],
   "exclude": [
-  
+    
   ]
 }

package/index.d.ts

@@ -1 +0,0 @@
-declare module '@ossiana/node-libcurl'