@ossiana/node-libcurl 1.1.0-alpha-1 → 1.1.0-alpha-5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/fetch.js +34 -45
- package/dist/fetch.js.map +1 -1
- package/dist/libcurl.d.ts +13 -6
- package/dist/libcurl.js +6 -3
- package/dist/libcurl.js.map +1 -1
- package/dist/requests.d.ts +2 -1
- package/dist/requests.js +105 -132
- package/dist/requests.js.map +1 -1
- package/dist/utils.js +9 -5
- package/dist/utils.js.map +1 -1
- package/package.json +5 -4
- package/src/libcurl/bao_curl.cpp +12 -4
- package/tsconfig.json +0 -32
package/dist/fetch.js
CHANGED
|
@@ -1,55 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.fetch = void 0;
|
|
13
4
|
const libcurl_1 = require("./libcurl");
|
|
14
5
|
const utils_1 = require("./utils");
|
|
15
|
-
function fetch(url, request = {}) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
6
|
+
async function fetch(url, request = {}) {
|
|
7
|
+
request.instance ||= new libcurl_1.LibCurl();
|
|
8
|
+
const curl = request.instance;
|
|
9
|
+
const { method = "GET", headers, redirect = false, httpVersion = 0, openInnerLog = false, proxy, body, cookies } = request;
|
|
10
|
+
curl.open(method, url + '', true);
|
|
11
|
+
if (headers) {
|
|
12
|
+
curl.setRequestHeaders(headers);
|
|
13
|
+
}
|
|
14
|
+
if (redirect) {
|
|
15
|
+
curl.setRedirect(true);
|
|
16
|
+
}
|
|
17
|
+
if (httpVersion) {
|
|
18
|
+
curl.setHttpVersion(httpVersion);
|
|
19
|
+
}
|
|
20
|
+
if (openInnerLog) {
|
|
21
|
+
curl.printInnerLogger();
|
|
22
|
+
}
|
|
23
|
+
if (cookies) {
|
|
24
|
+
const { hostname } = new URL(url);
|
|
33
25
|
if (cookies) {
|
|
34
|
-
|
|
35
|
-
if (cookies) {
|
|
36
|
-
(0, utils_1.libcurlSetCookies)(curl, cookies, hostname);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
if (proxy) {
|
|
40
|
-
curl.setProxy(proxy);
|
|
26
|
+
(0, utils_1.libcurlSetCookies)(curl, cookies, hostname);
|
|
41
27
|
}
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
28
|
+
}
|
|
29
|
+
if (proxy) {
|
|
30
|
+
curl.setProxy(proxy);
|
|
31
|
+
}
|
|
32
|
+
await curl.send(body);
|
|
33
|
+
return {
|
|
34
|
+
status: () => curl.getResponseStatus(),
|
|
35
|
+
arraybuffer: async () => curl.getResponseBody().buffer,
|
|
36
|
+
text: async () => curl.getResponseString(),
|
|
37
|
+
json: async () => curl.getResponseJson(),
|
|
38
|
+
headers: async () => curl.getResponseHeaders(),
|
|
39
|
+
cookies: async () => curl.getCookies(),
|
|
40
|
+
cookiesMap: async () => curl.getCookiesMap(),
|
|
41
|
+
};
|
|
53
42
|
}
|
|
54
43
|
exports.fetch = fetch;
|
|
55
44
|
//# sourceMappingURL=fetch.js.map
|
package/dist/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;AAAA,uCAA8K;AAC9K,mCAA4C;AA2BrC,KAAK,UAAU,KAAK,CAAC,GAAiB,EAAE,UAA8B,EAAE;IAC3E,OAAO,CAAC,QAAQ,KAAK,IAAI,iBAAO,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC9B,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;IAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,OAAO,EAAE;QACT,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;KACnC;IACD,IAAI,QAAQ,EAAE;QACV,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;KAC1B;IACD,IAAI,WAAW,EAAE;QACb,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;KACpC;IACD,IAAI,YAAY,EAAE;QACd,IAAI,CAAC,gBAAgB,EAAE,CAAC;KAC3B;IACD,IAAI,OAAO,EAAE;QACT,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,OAAO,EAAE;YACT,IAAA,yBAAiB,EAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SAC9C;KACJ;IACD,IAAI,KAAK,EAAE;QACP,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KACxB;IACD,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtB,OAAO;QACH,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QACtC,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,MAAM;QACtD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC1C,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE;QACxC,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE;QAC9C,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE;QACtC,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE;KACxB,CAAC;AAE7B,CAAC;AAvCD,sBAuCC"}
|
package/dist/libcurl.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ export declare enum LibCurlHttpVersionInfo {
|
|
|
3
3
|
http2 = 1
|
|
4
4
|
}
|
|
5
5
|
export type LibCurlSetCookieOption = {
|
|
6
|
-
domain
|
|
6
|
+
domain: string;
|
|
7
7
|
path?: string;
|
|
8
8
|
name: string;
|
|
9
9
|
value: string;
|
|
@@ -22,26 +22,32 @@ export type LibCurlGetCookieOption = {
|
|
|
22
22
|
};
|
|
23
23
|
export type LibCurlCookieAttrArray = [
|
|
24
24
|
domain: string,
|
|
25
|
-
|
|
25
|
+
subDomain: boolean,
|
|
26
26
|
path: string,
|
|
27
|
-
|
|
27
|
+
secure: boolean,
|
|
28
28
|
timestamp: number,
|
|
29
29
|
name: string,
|
|
30
30
|
value: string
|
|
31
31
|
];
|
|
32
32
|
export type LibCurlCookieAttrObject = {
|
|
33
33
|
domain: string;
|
|
34
|
-
|
|
34
|
+
subDomain: boolean;
|
|
35
35
|
path: string;
|
|
36
|
-
|
|
36
|
+
secure: boolean;
|
|
37
37
|
timestamp: number;
|
|
38
38
|
value: string;
|
|
39
39
|
};
|
|
40
40
|
export type LibCurlCookiesAttr = Map<string, LibCurlCookieAttrObject>;
|
|
41
41
|
export type LibCurlHeadersAttr = Map<string, string>;
|
|
42
|
+
interface LibCurlCommonHeaders {
|
|
43
|
+
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36' | 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/110.0';
|
|
44
|
+
'Content-Type': 'application/x-www-form-urlencoded' | 'application/json' | 'application/octet-stream' | 'application/protobuf' | 'text/plain';
|
|
45
|
+
'Host': string;
|
|
46
|
+
'Referer': string;
|
|
47
|
+
}
|
|
42
48
|
export type LibCurlHeadersInfo = string | {
|
|
43
49
|
[key: string]: [value: string];
|
|
44
|
-
} | LibCurlHeadersAttr;
|
|
50
|
+
} | LibCurlHeadersAttr | LibCurlCommonHeaders;
|
|
45
51
|
export type LibCurlBodyInfo = string | Uint8Array | URLSearchParams | object;
|
|
46
52
|
export type LibCurlMethodInfo = 'GET' | 'POST' | 'HEAD' | 'PUT' | 'DELETE' | 'CONNECT' | 'OPTIONS' | 'TRACE' | 'PATCH';
|
|
47
53
|
export type LibCurlProxyWithAccountInfo = {
|
|
@@ -82,3 +88,4 @@ export declare class LibCurl {
|
|
|
82
88
|
getResponseString(): string;
|
|
83
89
|
getResponseJson(): Object;
|
|
84
90
|
}
|
|
91
|
+
export {};
|
package/dist/libcurl.js
CHANGED
|
@@ -19,6 +19,9 @@ class LibCurlError extends Error {
|
|
|
19
19
|
}
|
|
20
20
|
exports.LibCurlError = LibCurlError;
|
|
21
21
|
class LibCurl {
|
|
22
|
+
m_libCurl_impl_;
|
|
23
|
+
m_isAsync_;
|
|
24
|
+
m_isSending_;
|
|
22
25
|
constructor() {
|
|
23
26
|
this.m_libCurl_impl_ = new BaoLibCurl();
|
|
24
27
|
}
|
|
@@ -92,9 +95,9 @@ class LibCurl {
|
|
|
92
95
|
return (0, utils_1.httpCookiesToArray)(cookies_).filter((0, utils_1.cookieOptFilter)(cookieOpt)).reduce((e, t) => {
|
|
93
96
|
e.set(t[5], {
|
|
94
97
|
domain: t[0],
|
|
95
|
-
|
|
98
|
+
subDomain: t[1],
|
|
96
99
|
path: t[2],
|
|
97
|
-
|
|
100
|
+
secure: t[3],
|
|
98
101
|
timestamp: t[4],
|
|
99
102
|
value: t[6],
|
|
100
103
|
});
|
|
@@ -103,7 +106,7 @@ class LibCurl {
|
|
|
103
106
|
}
|
|
104
107
|
getCookie(cookieOpt) {
|
|
105
108
|
this.checkSending();
|
|
106
|
-
return this.m_libCurl_impl_.getCookie(cookieOpt.name, cookieOpt.domain || "", cookieOpt.path || "");
|
|
109
|
+
return this.m_libCurl_impl_.getCookie(cookieOpt.name, cookieOpt.domain || ".", cookieOpt.path || "/");
|
|
107
110
|
}
|
|
108
111
|
getResponseHeaders() {
|
|
109
112
|
this.checkSending();
|
package/dist/libcurl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libcurl.js","sourceRoot":"","sources":["../src/libcurl.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAC/B,mCAA8D;AAE9D,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,kBAAQ,EAAC,qBAAqB,CAAC,CAAC;AAEvD,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAC9B,yEAAO,CAAA;IACP,qEAAK,CAAA;AACT,CAAC,EAHW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAGjC;
|
|
1
|
+
{"version":3,"file":"libcurl.js","sourceRoot":"","sources":["../src/libcurl.ts"],"names":[],"mappings":"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"}
|
package/dist/requests.d.ts
CHANGED
|
@@ -46,6 +46,7 @@ interface requestsStaticOption extends Omit<requestsInitOption, 'body' | 'instan
|
|
|
46
46
|
}
|
|
47
47
|
export declare class requests {
|
|
48
48
|
private option;
|
|
49
|
+
private needSetCookies;
|
|
49
50
|
constructor(option?: requestsInitOption);
|
|
50
51
|
static session(option?: requestsInitOption): requests;
|
|
51
52
|
static get(url: requestsURLInfo, requestOpt?: requestsStaticOption): Promise<requestsResponse>;
|
|
@@ -60,7 +61,7 @@ export declare class requests {
|
|
|
60
61
|
patch(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
|
|
61
62
|
trace(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
|
|
62
63
|
head(url: requestsURLInfo, requestOpt?: requestsOption): Promise<requestsResponse>;
|
|
63
|
-
setCookie(key: string, value: string, domain
|
|
64
|
+
setCookie(key: string, value: string, domain: string, path?: string): void;
|
|
64
65
|
getCookie(key: string, domain?: string, path?: string): string;
|
|
65
66
|
getCookies(domain?: string, path?: string): string;
|
|
66
67
|
getCookiesMap(domain?: string, path?: string): LibCurlCookiesAttr;
|
package/dist/requests.js
CHANGED
|
@@ -1,18 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.requests = void 0;
|
|
13
4
|
const libcurl_1 = require("./libcurl");
|
|
14
5
|
const utils_1 = require("./utils");
|
|
15
6
|
class requestsResponse {
|
|
7
|
+
curl;
|
|
16
8
|
constructor(curl) {
|
|
17
9
|
this.curl = curl;
|
|
18
10
|
}
|
|
@@ -41,13 +33,14 @@ const assignURLSearchParam = (target, source) => {
|
|
|
41
33
|
});
|
|
42
34
|
};
|
|
43
35
|
class requests {
|
|
36
|
+
option;
|
|
37
|
+
needSetCookies;
|
|
44
38
|
constructor(option = {}) {
|
|
45
|
-
|
|
46
|
-
this.option = Object.assign({}, option);
|
|
39
|
+
this.option = { ...option };
|
|
47
40
|
const { cookies, timeout, verbose } = option;
|
|
48
|
-
const curl =
|
|
41
|
+
const curl = this.option.instance ||= new libcurl_1.LibCurl();
|
|
49
42
|
if (cookies) {
|
|
50
|
-
|
|
43
|
+
this.needSetCookies = !!cookies;
|
|
51
44
|
}
|
|
52
45
|
if (timeout) {
|
|
53
46
|
curl.setTimeout(timeout, timeout);
|
|
@@ -59,67 +52,43 @@ class requests {
|
|
|
59
52
|
static session(option = {}) {
|
|
60
53
|
return new requests(option);
|
|
61
54
|
}
|
|
62
|
-
static get(url, requestOpt) {
|
|
63
|
-
return
|
|
64
|
-
return requests.sendRequestStaic('GET', url, requestOpt);
|
|
65
|
-
});
|
|
55
|
+
static async get(url, requestOpt) {
|
|
56
|
+
return requests.sendRequestStaic('GET', url, requestOpt);
|
|
66
57
|
}
|
|
67
|
-
static post(url, requestOpt) {
|
|
68
|
-
return
|
|
69
|
-
return requests.sendRequestStaic('POST', url, requestOpt);
|
|
70
|
-
});
|
|
58
|
+
static async post(url, requestOpt) {
|
|
59
|
+
return requests.sendRequestStaic('POST', url, requestOpt);
|
|
71
60
|
}
|
|
72
|
-
static put(url, requestOpt) {
|
|
73
|
-
return
|
|
74
|
-
return requests.sendRequestStaic('PUT', url, requestOpt);
|
|
75
|
-
});
|
|
61
|
+
static async put(url, requestOpt) {
|
|
62
|
+
return requests.sendRequestStaic('PUT', url, requestOpt);
|
|
76
63
|
}
|
|
77
|
-
static patch(url, requestOpt) {
|
|
78
|
-
return
|
|
79
|
-
return requests.sendRequestStaic('PATCH', url, requestOpt);
|
|
80
|
-
});
|
|
64
|
+
static async patch(url, requestOpt) {
|
|
65
|
+
return requests.sendRequestStaic('PATCH', url, requestOpt);
|
|
81
66
|
}
|
|
82
|
-
static trace(url, requestOpt) {
|
|
83
|
-
return
|
|
84
|
-
return requests.sendRequestStaic('TRACE', url, requestOpt);
|
|
85
|
-
});
|
|
67
|
+
static async trace(url, requestOpt) {
|
|
68
|
+
return requests.sendRequestStaic('TRACE', url, requestOpt);
|
|
86
69
|
}
|
|
87
|
-
static head(url, requestOpt) {
|
|
88
|
-
return
|
|
89
|
-
return requests.sendRequestStaic('HEAD', url, requestOpt);
|
|
90
|
-
});
|
|
70
|
+
static async head(url, requestOpt) {
|
|
71
|
+
return requests.sendRequestStaic('HEAD', url, requestOpt);
|
|
91
72
|
}
|
|
92
|
-
get(url, requestOpt) {
|
|
93
|
-
return
|
|
94
|
-
return this.sendRequest('GET', url, requestOpt);
|
|
95
|
-
});
|
|
73
|
+
async get(url, requestOpt) {
|
|
74
|
+
return this.sendRequest('GET', url, requestOpt);
|
|
96
75
|
}
|
|
97
|
-
post(url, requestOpt) {
|
|
98
|
-
return
|
|
99
|
-
return this.sendRequest('POST', url, requestOpt);
|
|
100
|
-
});
|
|
76
|
+
async post(url, requestOpt) {
|
|
77
|
+
return this.sendRequest('POST', url, requestOpt);
|
|
101
78
|
}
|
|
102
|
-
put(url, requestOpt) {
|
|
103
|
-
return
|
|
104
|
-
return this.sendRequest('PUT', url, requestOpt);
|
|
105
|
-
});
|
|
79
|
+
async put(url, requestOpt) {
|
|
80
|
+
return this.sendRequest('PUT', url, requestOpt);
|
|
106
81
|
}
|
|
107
|
-
patch(url, requestOpt) {
|
|
108
|
-
return
|
|
109
|
-
return this.sendRequest('PATCH', url, requestOpt);
|
|
110
|
-
});
|
|
82
|
+
async patch(url, requestOpt) {
|
|
83
|
+
return this.sendRequest('PATCH', url, requestOpt);
|
|
111
84
|
}
|
|
112
|
-
trace(url, requestOpt) {
|
|
113
|
-
return
|
|
114
|
-
return this.sendRequest('TRACE', url, requestOpt);
|
|
115
|
-
});
|
|
85
|
+
async trace(url, requestOpt) {
|
|
86
|
+
return this.sendRequest('TRACE', url, requestOpt);
|
|
116
87
|
}
|
|
117
|
-
head(url, requestOpt) {
|
|
118
|
-
return
|
|
119
|
-
return this.sendRequest('HEAD', url, requestOpt);
|
|
120
|
-
});
|
|
88
|
+
async head(url, requestOpt) {
|
|
89
|
+
return this.sendRequest('HEAD', url, requestOpt);
|
|
121
90
|
}
|
|
122
|
-
setCookie(key, value, domain
|
|
91
|
+
setCookie(key, value, domain, path = '') {
|
|
123
92
|
this.option.instance.setCookie({
|
|
124
93
|
name: key,
|
|
125
94
|
value,
|
|
@@ -159,91 +128,95 @@ class requests {
|
|
|
159
128
|
path: path || "/",
|
|
160
129
|
});
|
|
161
130
|
}
|
|
162
|
-
sendRequest(method, url, requestOpt) {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
131
|
+
async sendRequest(method, url, requestOpt) {
|
|
132
|
+
const { instance: curl, redirect = false, proxy, httpVersion, cookies } = this.option;
|
|
133
|
+
const { headers, data, json, params } = requestOpt || {};
|
|
134
|
+
if (data && json) {
|
|
135
|
+
throw new libcurl_1.LibCurlError('both data and json exist');
|
|
136
|
+
}
|
|
137
|
+
const url_ = new URL(url);
|
|
138
|
+
if (this.needSetCookies) {
|
|
139
|
+
this.needSetCookies = false;
|
|
140
|
+
(0, utils_1.libcurlSetCookies)(curl, cookies, url_.hostname.split('.').slice(-2).join('.'));
|
|
141
|
+
}
|
|
142
|
+
if (params) {
|
|
143
|
+
assignURLSearchParam(url_.searchParams, new URLSearchParams(params));
|
|
144
|
+
}
|
|
145
|
+
curl.open(method, url_, true);
|
|
146
|
+
if (headers) {
|
|
147
|
+
curl.setRequestHeaders(headers);
|
|
148
|
+
}
|
|
149
|
+
if (redirect) {
|
|
150
|
+
curl.setRedirect(true);
|
|
151
|
+
}
|
|
152
|
+
if (httpVersion) {
|
|
153
|
+
curl.setHttpVersion(httpVersion);
|
|
154
|
+
}
|
|
155
|
+
if (proxy) {
|
|
156
|
+
curl.setProxy(proxy);
|
|
157
|
+
}
|
|
158
|
+
let hasContentType = false;
|
|
159
|
+
if (headers && (data || json)) {
|
|
160
|
+
const contentTypeFilter = (e) => e.some(e => e.toLocaleLowerCase() == 'content-type');
|
|
161
|
+
if (typeof headers == 'string') {
|
|
162
|
+
hasContentType = /content-type/i.test(headers);
|
|
176
163
|
}
|
|
177
|
-
if (
|
|
178
|
-
|
|
164
|
+
else if (headers instanceof Map) {
|
|
165
|
+
hasContentType = contentTypeFilter([...headers.keys()]);
|
|
179
166
|
}
|
|
180
|
-
|
|
181
|
-
|
|
167
|
+
else {
|
|
168
|
+
hasContentType = contentTypeFilter(Object.keys(headers));
|
|
182
169
|
}
|
|
183
|
-
|
|
184
|
-
|
|
170
|
+
}
|
|
171
|
+
if (json) {
|
|
172
|
+
if (!hasContentType) {
|
|
173
|
+
curl.setRequestHeader('Content-Type', 'application/json');
|
|
185
174
|
}
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
hasContentType = contentTypeFilter([...headers.keys()]);
|
|
175
|
+
await curl.send(json);
|
|
176
|
+
}
|
|
177
|
+
else if (data) {
|
|
178
|
+
let sendData = data;
|
|
179
|
+
if (!hasContentType) {
|
|
180
|
+
if (typeof data == 'string') {
|
|
181
|
+
curl.setRequestHeader('Content-Type', 'text/plain');
|
|
194
182
|
}
|
|
195
|
-
else {
|
|
196
|
-
|
|
183
|
+
else if (data instanceof URLSearchParams) {
|
|
184
|
+
curl.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
|
|
197
185
|
}
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
if (!hasContentType) {
|
|
201
|
-
curl.setRequestHeader('Content-Type', 'application/json');
|
|
186
|
+
else if (data instanceof Uint8Array) {
|
|
187
|
+
curl.setRequestHeader('Content-Type', 'application/octet-stream');
|
|
202
188
|
}
|
|
203
|
-
yield curl.send(json);
|
|
204
189
|
}
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
190
|
+
if (typeof data == 'object' && data != null) {
|
|
191
|
+
curl.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
|
|
192
|
+
sendData = Object.keys(data).map((e) => {
|
|
193
|
+
const value = data[e];
|
|
194
|
+
const type = typeof value;
|
|
195
|
+
if (['object', 'boolean'].includes(type)) {
|
|
196
|
+
return [e, JSON.stringify(value)];
|
|
210
197
|
}
|
|
211
|
-
else if (
|
|
212
|
-
|
|
198
|
+
else if (type == 'undefined') {
|
|
199
|
+
return [e, ''];
|
|
213
200
|
}
|
|
214
|
-
else if (
|
|
215
|
-
|
|
201
|
+
else if (['string', 'number'].includes(type)) {
|
|
202
|
+
return [e, value + ''];
|
|
216
203
|
}
|
|
217
204
|
else {
|
|
218
|
-
|
|
219
|
-
const value = data[e];
|
|
220
|
-
const type = typeof value;
|
|
221
|
-
if (['object', 'boolean', 'number']) {
|
|
222
|
-
return [e, JSON.stringify(value)];
|
|
223
|
-
}
|
|
224
|
-
else if (type == 'undefined') {
|
|
225
|
-
return [e, ''];
|
|
226
|
-
}
|
|
227
|
-
else if (type == 'string') {
|
|
228
|
-
return [e, value];
|
|
229
|
-
}
|
|
230
|
-
else {
|
|
231
|
-
throw new libcurl_1.LibCurlError(`data unkown type ${type}`);
|
|
232
|
-
}
|
|
233
|
-
})
|
|
234
|
-
.map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
|
|
235
|
-
.join('&');
|
|
205
|
+
throw new libcurl_1.LibCurlError(`data unkown type ${type}`);
|
|
236
206
|
}
|
|
237
|
-
}
|
|
238
|
-
|
|
207
|
+
})
|
|
208
|
+
.map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
|
|
209
|
+
.join('&');
|
|
239
210
|
}
|
|
240
|
-
|
|
241
|
-
}
|
|
211
|
+
await curl.send(sendData);
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
await curl.send();
|
|
215
|
+
}
|
|
216
|
+
return new requestsResponse(curl);
|
|
242
217
|
}
|
|
243
|
-
static sendRequestStaic(method, url, requestStaticOpt) {
|
|
244
|
-
return
|
|
245
|
-
return requests.session(requestStaticOpt).sendRequest(method, url, requestStaticOpt);
|
|
246
|
-
});
|
|
218
|
+
static async sendRequestStaic(method, url, requestStaticOpt) {
|
|
219
|
+
return requests.session(requestStaticOpt).sendRequest(method, url, requestStaticOpt);
|
|
247
220
|
}
|
|
248
221
|
}
|
|
249
222
|
exports.requests = requests;
|
package/dist/requests.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"requests.js","sourceRoot":"","sources":["../src/requests.ts"],"names":[],"mappings":"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"}
|
package/dist/utils.js
CHANGED
|
@@ -36,11 +36,11 @@ const getSubdomains = (domain) => {
|
|
|
36
36
|
return subdomainList;
|
|
37
37
|
};
|
|
38
38
|
const cookieOptFilter = (cookieOpt) => {
|
|
39
|
-
const domainArr =
|
|
39
|
+
const domainArr = cookieOpt?.domain && getSubdomains(cookieOpt.domain);
|
|
40
40
|
return (e) => {
|
|
41
41
|
if (domainArr && !domainArr.find(t => e[0] === t))
|
|
42
42
|
return false;
|
|
43
|
-
if (cookieOpt
|
|
43
|
+
if (cookieOpt?.path) {
|
|
44
44
|
if (cookieOpt.path != e[2])
|
|
45
45
|
return false;
|
|
46
46
|
}
|
|
@@ -50,10 +50,14 @@ const cookieOptFilter = (cookieOpt) => {
|
|
|
50
50
|
exports.cookieOptFilter = cookieOptFilter;
|
|
51
51
|
const libcurlSetCookies = (curl, cookies, domain) => {
|
|
52
52
|
if (typeof cookies == 'string') {
|
|
53
|
-
cookies
|
|
53
|
+
cookies
|
|
54
|
+
.replace(/\s+/g, '')
|
|
54
55
|
.split(';')
|
|
55
|
-
.
|
|
56
|
-
.map(e =>
|
|
56
|
+
.filter(Boolean)
|
|
57
|
+
.map(e => {
|
|
58
|
+
const pos = e.indexOf('=');
|
|
59
|
+
return [e.slice(0, pos), e.slice(pos + 1, e.length)];
|
|
60
|
+
})
|
|
57
61
|
.forEach(([key, value]) => {
|
|
58
62
|
curl.setCookie({
|
|
59
63
|
name: key,
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ossiana/node-libcurl",
|
|
3
|
-
"version": "1.1.0-alpha-
|
|
3
|
+
"version": "1.1.0-alpha-5",
|
|
4
4
|
"dependencies": {
|
|
5
5
|
"@mapbox/node-pre-gyp": "^1.0.10",
|
|
6
6
|
"bindings": "^1.5.0",
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
},
|
|
9
9
|
"scripts": {
|
|
10
10
|
"test": "node ./test/libcurl_test.js",
|
|
11
|
-
"install": "node-pre-gyp install &&
|
|
12
|
-
"
|
|
11
|
+
"install": "node-pre-gyp install --fallback-to-build --update-binary && node-gyp rebuild --update-binary",
|
|
12
|
+
"rebuild": "node-gyp rebuild --update-binary",
|
|
13
13
|
"unittest": "mocha",
|
|
14
14
|
"tsc": "tsc -p tsconfig.json"
|
|
15
15
|
},
|
|
@@ -18,12 +18,13 @@
|
|
|
18
18
|
"module_path": "./lib/{configuration}/{platform}-{arch}/",
|
|
19
19
|
"package_name": "{module_name}-{platform}-{arch}-release.tar.gz",
|
|
20
20
|
"host": "https://ossianaa.github.io/static/github/release/node-libcurl/",
|
|
21
|
-
"remote_path": "v1.0.
|
|
21
|
+
"remote_path": "v1.0.1"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/node": "^18.11.18",
|
|
25
25
|
"body-parser": "^1.20.1",
|
|
26
26
|
"chai": "^4.3.7",
|
|
27
|
+
"cookie-parser": "^1.4.6",
|
|
27
28
|
"express": "^4.18.2",
|
|
28
29
|
"mocha": "^10.2.0",
|
|
29
30
|
"node-gyp": "^9.3.1",
|
package/src/libcurl/bao_curl.cpp
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
#define CHECK_CURLOK(e) \
|
|
4
4
|
{ \
|
|
5
5
|
CURLcode code = (e); \
|
|
6
|
-
this->m_lastCode = code;
|
|
6
|
+
this->m_lastCode = code; \
|
|
7
7
|
if (this->m_verbose && code != CURLcode::CURLE_OK) \
|
|
8
8
|
{ \
|
|
9
9
|
printf("CURL Error:%s\n", curl_easy_strerror(code)); \
|
|
@@ -179,14 +179,22 @@ void BaoCurl::sendByte(const char *data, const int len)
|
|
|
179
179
|
this->m_pHeaders = NULL;
|
|
180
180
|
}
|
|
181
181
|
|
|
182
|
+
/* Hostname */
|
|
183
|
+
/* Include subdomains */
|
|
184
|
+
/* Path */
|
|
185
|
+
/* Secure */
|
|
186
|
+
/* Expiry in epoch time format. 0 == Session */
|
|
187
|
+
/* Name */
|
|
188
|
+
/* Value */
|
|
182
189
|
void BaoCurl::setCookie(std::string &key, std::string &value, std::string &domain, std::string &path)
|
|
183
190
|
{
|
|
184
|
-
CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIELIST, StringFormat("%s\
|
|
191
|
+
CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIELIST, StringFormat("%s\tTRUE\t%s\tFALSE\t0\t%s\t%s", domain.c_str(), path.c_str(), key.c_str(), value.c_str()).c_str()));
|
|
192
|
+
// CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIELIST, StringFormat("Set-Cookie: %s=%s; domain=%s; path=%s;", key.c_str(), value.c_str(), domain.c_str(), path.c_str()).c_str()));
|
|
185
193
|
}
|
|
186
194
|
|
|
187
195
|
void BaoCurl::deleteCookie(std::string &key, std::string &domain, std::string &path)
|
|
188
196
|
{
|
|
189
|
-
CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIELIST, StringFormat("%s\
|
|
197
|
+
CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIELIST, StringFormat("%s\tTURE\t%s\tFALSE\t1600000000\t%s\t%s", domain.c_str(), path.c_str(), key.c_str(), "").c_str()));
|
|
190
198
|
}
|
|
191
199
|
|
|
192
200
|
std::string BaoCurl::getCookies()
|
|
@@ -294,7 +302,7 @@ unsigned int BaoCurl::getLastCurlCode()
|
|
|
294
302
|
return this->m_lastCode;
|
|
295
303
|
}
|
|
296
304
|
|
|
297
|
-
const char*
|
|
305
|
+
const char *BaoCurl::getLastCurlCodeError()
|
|
298
306
|
{
|
|
299
307
|
return curl_easy_strerror(this->m_lastCode);
|
|
300
308
|
}
|
package/tsconfig.json
DELETED
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"compilerOptions": {
|
|
3
|
-
"target": "es6",
|
|
4
|
-
"module": "commonjs",
|
|
5
|
-
"declaration": true,
|
|
6
|
-
"removeComments": true,
|
|
7
|
-
"noImplicitAny": false,
|
|
8
|
-
"sourceMap": true,
|
|
9
|
-
"rootDir": "src",
|
|
10
|
-
"outDir": "dist",
|
|
11
|
-
"typeRoots": [
|
|
12
|
-
"./typings"
|
|
13
|
-
],
|
|
14
|
-
"experimentalDecorators": true,
|
|
15
|
-
"emitDecoratorMetadata": true,
|
|
16
|
-
"watch": true,
|
|
17
|
-
"esModuleInterop": true
|
|
18
|
-
},
|
|
19
|
-
"lib": [
|
|
20
|
-
"es2019",
|
|
21
|
-
"es2017",
|
|
22
|
-
"es7",
|
|
23
|
-
"es6",
|
|
24
|
-
"dom"
|
|
25
|
-
],
|
|
26
|
-
"include": [
|
|
27
|
-
"src/*"
|
|
28
|
-
],
|
|
29
|
-
"exclude": [
|
|
30
|
-
|
|
31
|
-
]
|
|
32
|
-
}
|