@ossiana/node-libcurl 1.0.6-alpha-2 → 1.0.6-alpha-3
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/src/fetch.d.ts +6 -6
- package/dist/src/fetch.js +6 -6
- package/dist/src/fetch.js.map +1 -1
- package/dist/src/libcurl.js +7 -2
- package/dist/src/libcurl.js.map +1 -1
- package/index.d.ts +1 -0
- package/package.json +1 -1
- package/src/fetch.ts +11 -11
- package/src/libcurl/bao_curl_node_addon.cpp +4 -4
- package/src/libcurl/curlAsyncWorker.cpp +12 -5
- package/src/libcurl/include/curlAysncWorker.h +5 -3
- package/src/libcurl.ts +6 -2
package/dist/src/fetch.d.ts
CHANGED
|
@@ -22,11 +22,11 @@ interface LibCurlRequestInfo {
|
|
|
22
22
|
}
|
|
23
23
|
interface LibCurlResponseInfo {
|
|
24
24
|
status: () => number;
|
|
25
|
-
arraybuffer: () => ArrayBuffer
|
|
26
|
-
text: () => string
|
|
27
|
-
json: () => object
|
|
28
|
-
jsonp: (callbackName?: string) => object
|
|
29
|
-
headers: () => string
|
|
25
|
+
arraybuffer: () => Promise<ArrayBuffer>;
|
|
26
|
+
text: () => Promise<string>;
|
|
27
|
+
json: () => Promise<object>;
|
|
28
|
+
jsonp: (callbackName?: string) => Promise<object>;
|
|
29
|
+
headers: () => Promise<string>;
|
|
30
30
|
}
|
|
31
|
-
export declare function fetch(url: string | URL, request
|
|
31
|
+
export declare function fetch(url: string | URL, request?: LibCurlRequestInfo): Promise<LibCurlResponseInfo>;
|
|
32
32
|
export {};
|
package/dist/src/fetch.js
CHANGED
|
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.fetch = void 0;
|
|
13
13
|
const libcurl_1 = require("./libcurl");
|
|
14
|
-
function fetch(url, request) {
|
|
14
|
+
function fetch(url, request = {}) {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
request.instance || (request.instance = new libcurl_1.LibCurl());
|
|
17
17
|
const curl = request.instance;
|
|
@@ -76,11 +76,11 @@ function fetch(url, request) {
|
|
|
76
76
|
promise.then(() => {
|
|
77
77
|
resolve({
|
|
78
78
|
status: () => curl.getResponseStatus(),
|
|
79
|
-
arraybuffer: () => curl.getResponseBody().buffer,
|
|
80
|
-
text: () => curl.getResponseString(),
|
|
81
|
-
json: () => curl.getResponseJson(),
|
|
82
|
-
jsonp: (callbackName) => curl.getResponseJsonp(callbackName),
|
|
83
|
-
headers: () => curl.getResponseHeaders(),
|
|
79
|
+
arraybuffer: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseBody().buffer; }),
|
|
80
|
+
text: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseString(); }),
|
|
81
|
+
json: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseJson(); }),
|
|
82
|
+
jsonp: (callbackName) => __awaiter(this, void 0, void 0, function* () { return curl.getResponseJsonp(callbackName); }),
|
|
83
|
+
headers: () => __awaiter(this, void 0, void 0, function* () { return curl.getResponseHeaders(); }),
|
|
84
84
|
});
|
|
85
85
|
});
|
|
86
86
|
});
|
package/dist/src/fetch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA0D;AAsC1D,SAAsB,KAAK,CAAC,GAAiB,EAAE,
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../src/fetch.ts"],"names":[],"mappings":"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"}
|
package/dist/src/libcurl.js
CHANGED
|
@@ -138,8 +138,13 @@ class LibCurl {
|
|
|
138
138
|
throw new Error('it seem not a jsonp');
|
|
139
139
|
}
|
|
140
140
|
catch (error) {
|
|
141
|
-
|
|
142
|
-
|
|
141
|
+
try {
|
|
142
|
+
[, callbackName] = /(.*) is not defined/g.exec(error.message);
|
|
143
|
+
return this.getResponseJsonp(callbackName);
|
|
144
|
+
}
|
|
145
|
+
catch (_a) {
|
|
146
|
+
throw new Error('it seem not a jsonp');
|
|
147
|
+
}
|
|
143
148
|
}
|
|
144
149
|
}
|
|
145
150
|
return eval(jsonstr);
|
package/dist/src/libcurl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"libcurl.js","sourceRoot":"","sources":["../../src/libcurl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"libcurl.js","sourceRoot":"","sources":["../../src/libcurl.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA+B;AAE/B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,kBAAQ,EAAC,qBAAqB,CAAC,CAAC;AAEvD,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC5B,qEAAO,CAAA;IACP,iEAAK,CAAA;AACT,CAAC,EAHW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAG/B;AAED,MAAa,OAAO;IAIhB;QACI,IAAI,CAAC,eAAe,GAAG,IAAI,UAAU,EAAE,CAAC;IAC5C,CAAC;IACO,YAAY;QAChB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,4EAA4E,CAAC,CAAA;SAChG;IACL,CAAC;IACM,IAAI,CAAC,MAAc,EAAE,GAAW,EAAE,QAAiB,IAAI;QAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC5B,CAAC;IAEM,gBAAgB,CAAC,GAAW,EAAE,KAAa;QAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAMM,iBAAiB,CAAC,OAAe;QACpC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAQM,QAAQ,CAAC,KAAa,EAAE,QAAiB,EAAE,QAAiB;QAC/D,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,QAAQ,IAAI,QAAQ,EAAE;YACtB,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;SAC5D;aAAM;YACH,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;SACxC;IACL,CAAC;IAQM,UAAU,CAAC,WAAmB,EAAE,QAAgB;QACnD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,WAAW,GAAG,QAAQ,EAAE;YACxB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAQM,SAAS,CAAC,GAAW,EAAE,KAAa,EAAE,MAAc;QACvD,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAOM,YAAY,CAAC,GAAW,EAAE,MAAc;QAC3C,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAQM,UAAU;QACb,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC;IAC7C,CAAC;IAQM,SAAS,CAAC,GAAW;QACxB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAMM,kBAAkB;QACrB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,CAAC;IACrD,CAAC;IAOM,iBAAiB;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;IACpD,CAAC;IAKM,KAAK;QACR,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAMM,WAAW,CAAC,OAAgB;QAC/B,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAKM,gBAAgB;QACnB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;IAC5C,CAAC;IAOM,cAAc,CAAC,OAA6B;QAC/C,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAOM,IAAI,CAAC,IAAgC;QACxC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,MAAM,QAAQ,GAAG,GAAG,EAAE;oBAClB,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;oBAC1B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpB,CAAC,CAAC;gBACF,IAAI,IAAI,EAAE;oBACN,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;iBAClD;qBAAM;oBACH,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;iBAC5C;YACL,CAAC,CAAC,CAAA;SACL;QACD,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnC;aAAM;YACH,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;SAC/B;IACL,CAAC;IAEM,eAAe;QAClB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC;IAClD,CAAC;IAEM,iBAAiB;QACpB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;IACpD,CAAC;IAEM,eAAe;QAClB,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAChD,CAAC;IASM,gBAAgB,CAAC,YAAqB;QACzC,IAAI,CAAC,YAAY,EAAE,CAAC;QACpB,MAAM,GAAG,GAAW,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7C,IAAI,OAAO,GAAW,GAAG,CAAC;QAC1B,IAAI,YAAY,EAAE;YACd,CAAC,EAAE,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,YAAY,oBAAoB,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;SAClF;aAAM;YACH,IAAI;gBACA,IAAI,CAAC,GAAG,CAAC,CAAA;gBACT,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;aAC1C;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI;oBACA,CAAC,EAAE,YAAY,CAAC,GAAG,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBAC9D,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;iBAC9C;gBAAC,WAAM;oBACJ,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAA;iBACzC;aACJ;SACJ;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;CACJ;AArOD,0BAqOC"}
|
package/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
declare module '@ossiana/node-libcurl'
|
package/package.json
CHANGED
package/src/fetch.ts
CHANGED
|
@@ -29,14 +29,14 @@ interface LibCurlRequestInfo {
|
|
|
29
29
|
|
|
30
30
|
interface LibCurlResponseInfo {
|
|
31
31
|
status: () => number;
|
|
32
|
-
arraybuffer: () => ArrayBuffer
|
|
33
|
-
text: () => string
|
|
34
|
-
json: () => object
|
|
35
|
-
jsonp: (callbackName?: string) => object
|
|
36
|
-
headers: () => string
|
|
32
|
+
arraybuffer: () => Promise<ArrayBuffer>;
|
|
33
|
+
text: () => Promise<string>;
|
|
34
|
+
json: () => Promise<object>;
|
|
35
|
+
jsonp: (callbackName?: string) => Promise<object>;
|
|
36
|
+
headers: () => Promise<string>;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
export async function fetch(url: string | URL, request: LibCurlRequestInfo): Promise<LibCurlResponseInfo> {
|
|
39
|
+
export async function fetch(url: string | URL, request: LibCurlRequestInfo = {}): Promise<LibCurlResponseInfo> {
|
|
40
40
|
request.instance ||= new LibCurl();
|
|
41
41
|
const curl = request.instance;
|
|
42
42
|
return new Promise((resolve, reject) => {
|
|
@@ -103,11 +103,11 @@ export async function fetch(url: string | URL, request: LibCurlRequestInfo): Pro
|
|
|
103
103
|
resolve(
|
|
104
104
|
{
|
|
105
105
|
status: () => curl.getResponseStatus(),
|
|
106
|
-
arraybuffer: () => curl.getResponseBody().buffer,
|
|
107
|
-
text: () => curl.getResponseString(),
|
|
108
|
-
json: () => curl.getResponseJson(),
|
|
109
|
-
jsonp: (callbackName?: string) => curl.getResponseJsonp(callbackName),
|
|
110
|
-
headers: () => curl.getResponseHeaders(),
|
|
106
|
+
arraybuffer: async () => curl.getResponseBody().buffer,
|
|
107
|
+
text: async () => curl.getResponseString(),
|
|
108
|
+
json: async () => curl.getResponseJson(),
|
|
109
|
+
jsonp: async (callbackName?: string) => curl.getResponseJsonp(callbackName),
|
|
110
|
+
headers: async () => curl.getResponseHeaders(),
|
|
111
111
|
}
|
|
112
112
|
)
|
|
113
113
|
})
|
|
@@ -347,7 +347,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
|
|
|
347
347
|
curlAsyncWorker *workerPtr;
|
|
348
348
|
if (argsLen == 1 || info[0].IsFunction())
|
|
349
349
|
{
|
|
350
|
-
workerPtr = new curlAsyncWorker(info[0].As<Napi::Function>(), this->m_curl,
|
|
350
|
+
workerPtr = new curlAsyncWorker(info[0].As<Napi::Function>(), this->m_curl, nullptr, 0);
|
|
351
351
|
workerPtr->Queue();
|
|
352
352
|
return env.Undefined();
|
|
353
353
|
}
|
|
@@ -359,7 +359,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
|
|
|
359
359
|
if (info[0].IsTypedArray())
|
|
360
360
|
{
|
|
361
361
|
Napi::Uint8Array u8Arr = info[0].As<Napi::Uint8Array>();
|
|
362
|
-
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, u8Arr);
|
|
362
|
+
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, (const char *)u8Arr.Data(), u8Arr.ElementLength());
|
|
363
363
|
workerPtr->Queue();
|
|
364
364
|
// this->m_curl.sendByte(reinterpret_cast<const char *>(utf8Buffer), u8Arr.ByteLength());
|
|
365
365
|
return env.Undefined();
|
|
@@ -370,7 +370,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
|
|
|
370
370
|
size_t strLen = str.size();
|
|
371
371
|
Napi::Uint8Array u8buffer = Napi::Uint8Array::New(env, strLen);
|
|
372
372
|
memcpy_s(u8buffer.Data(), strLen, str.c_str(), strLen);
|
|
373
|
-
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, u8buffer);
|
|
373
|
+
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, (const char *)u8buffer.Data(),u8buffer.ElementLength());
|
|
374
374
|
workerPtr->Queue();
|
|
375
375
|
return env.Undefined();
|
|
376
376
|
}
|
|
@@ -379,7 +379,7 @@ Napi::Value BaoLibCurlWarp::sendAsync(const Napi::CallbackInfo &info)
|
|
|
379
379
|
size_t strLen = jsonStr.size();
|
|
380
380
|
Napi::Uint8Array u8buffer = Napi::Uint8Array::New(env, strLen);
|
|
381
381
|
memcpy_s(u8buffer.Data(), strLen, jsonStr.c_str(), strLen);
|
|
382
|
-
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, u8buffer);
|
|
382
|
+
workerPtr = new curlAsyncWorker(info[1].As<Napi::Function>(), this->m_curl, (const char *)u8buffer.Data(),u8buffer.ElementLength());
|
|
383
383
|
workerPtr->Queue();
|
|
384
384
|
return env.Undefined();
|
|
385
385
|
}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
1
|
#include "curlAysncWorker.h"
|
|
2
2
|
|
|
3
|
-
curlAsyncWorker::curlAsyncWorker(Napi::Function &callback, BaoCurl &baoCurlInstance,
|
|
4
|
-
: Napi::AsyncWorker(callback), m_baoCurlInstance(baoCurlInstance)
|
|
3
|
+
curlAsyncWorker::curlAsyncWorker(Napi::Function &callback, BaoCurl &baoCurlInstance, const char *body, size_t bodySize)
|
|
4
|
+
: Napi::AsyncWorker(callback), m_baoCurlInstance(baoCurlInstance)
|
|
5
|
+
{
|
|
6
|
+
this->m_sendBody = (char *)malloc(bodySize);
|
|
7
|
+
this->m_bodySize = bodySize;
|
|
8
|
+
memcpy_s(this->m_sendBody, bodySize, body, bodySize);
|
|
9
|
+
}
|
|
5
10
|
|
|
6
|
-
curlAsyncWorker::~curlAsyncWorker()
|
|
11
|
+
curlAsyncWorker::~curlAsyncWorker()
|
|
12
|
+
{
|
|
13
|
+
free(m_sendBody);
|
|
14
|
+
}
|
|
7
15
|
|
|
8
16
|
// Executed inside the worker-thread.
|
|
9
17
|
// It is not safe to access JS engine data structure
|
|
@@ -11,7 +19,7 @@ curlAsyncWorker::~curlAsyncWorker() {}
|
|
|
11
19
|
// should go on `this`.
|
|
12
20
|
void curlAsyncWorker::Execute()
|
|
13
21
|
{
|
|
14
|
-
this->m_baoCurlInstance.sendByte(
|
|
22
|
+
this->m_baoCurlInstance.sendByte(this->m_sendBody, this->m_bodySize);
|
|
15
23
|
}
|
|
16
24
|
|
|
17
25
|
// Executed when the async work is complete
|
|
@@ -28,4 +36,3 @@ void curlAsyncWorker::OnOK()
|
|
|
28
36
|
/* u8buffer */
|
|
29
37
|
});
|
|
30
38
|
}
|
|
31
|
-
|
|
@@ -4,11 +4,13 @@
|
|
|
4
4
|
class curlAsyncWorker : public Napi::AsyncWorker
|
|
5
5
|
{
|
|
6
6
|
public:
|
|
7
|
-
|
|
7
|
+
curlAsyncWorker(Napi::Function &callback, BaoCurl &baoCurlInstance, const char *sendBody, size_t bodySize);
|
|
8
8
|
~curlAsyncWorker();
|
|
9
9
|
void Execute();
|
|
10
10
|
void OnOK();
|
|
11
|
+
|
|
11
12
|
private:
|
|
12
|
-
BaoCurl&
|
|
13
|
-
|
|
13
|
+
BaoCurl &m_baoCurlInstance;
|
|
14
|
+
char* m_sendBody = nullptr;
|
|
15
|
+
size_t m_bodySize;
|
|
14
16
|
};
|
package/src/libcurl.ts
CHANGED
|
@@ -226,8 +226,12 @@ export class LibCurl {
|
|
|
226
226
|
eval(str)
|
|
227
227
|
throw new Error('it seem not a jsonp');
|
|
228
228
|
} catch (error) {
|
|
229
|
-
|
|
230
|
-
|
|
229
|
+
try {
|
|
230
|
+
[, callbackName] = /(.*) is not defined/g.exec(error.message);
|
|
231
|
+
return this.getResponseJsonp(callbackName);
|
|
232
|
+
} catch {
|
|
233
|
+
throw new Error('it seem not a jsonp')
|
|
234
|
+
}
|
|
231
235
|
}
|
|
232
236
|
}
|
|
233
237
|
return eval(jsonstr);
|