@theia/request 1.53.0 → 1.53.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-request-service.d.ts","sourceRoot":"","sources":["../src/node-request-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAW,oBAAoB,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG5I,MAAM,WAAW,kBAAkB;IAC/B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC;CACtG;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAAC;CACnE;AAED,qBAAa,kBAAmB,YAAW,cAAc;
|
|
1
|
+
{"version":3,"file":"node-request-service.d.ts","sourceRoot":"","sources":["../src/node-request-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAW,oBAAoB,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG5I,MAAM,WAAW,kBAAkB;IAC/B,CAAC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC;CACtG;AAED,MAAM,WAAW,kBAAmB,SAAQ,cAAc;IACtD,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,CAAC,OAAO,EAAE,kBAAkB,GAAG,kBAAkB,CAAC;CACnE;AAED,qBAAa,kBAAmB,YAAW,cAAc;IACrD,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC9B,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEjC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB;cAMrD,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAI/D,SAAS,CAAC,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;cAY5C,cAAc,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAyBxF,OAAO,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IAwFlF,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAG/D"}
|
|
@@ -83,10 +83,14 @@ class NodeRequestService {
|
|
|
83
83
|
if (options.user && options.password) {
|
|
84
84
|
opts.auth = options.user + ':' + options.password;
|
|
85
85
|
}
|
|
86
|
+
const timeoutHandler = () => {
|
|
87
|
+
reject('timeout');
|
|
88
|
+
};
|
|
86
89
|
const req = rawRequest(opts, async (res) => {
|
|
87
90
|
var _a;
|
|
88
91
|
const followRedirects = (_a = options.followRedirects) !== null && _a !== void 0 ? _a : 3;
|
|
89
92
|
if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers.location) {
|
|
93
|
+
req.off('timeout', timeoutHandler);
|
|
90
94
|
this.request({
|
|
91
95
|
...options,
|
|
92
96
|
url: res.headers.location,
|
|
@@ -100,6 +104,7 @@ class NodeRequestService {
|
|
|
100
104
|
chunks.push(chunk);
|
|
101
105
|
});
|
|
102
106
|
stream.on('end', () => {
|
|
107
|
+
req.off('timeout', timeoutHandler);
|
|
103
108
|
const buffer = Buffer.concat(chunks);
|
|
104
109
|
resolve({
|
|
105
110
|
url: options.url,
|
|
@@ -118,9 +123,7 @@ class NodeRequestService {
|
|
|
118
123
|
req.on('error', err => {
|
|
119
124
|
reject(err);
|
|
120
125
|
});
|
|
121
|
-
req.on('timeout',
|
|
122
|
-
reject('timeout');
|
|
123
|
-
});
|
|
126
|
+
req.on('timeout', timeoutHandler);
|
|
124
127
|
if (options.timeout) {
|
|
125
128
|
req.setTimeout(options.timeout);
|
|
126
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-request-service.js","sourceRoot":"","sources":["../src/node-request-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,6BAA6B;AAC7B,+BAA+B;AAC/B,mCAAoD;AAEpD,+BAAoC;AAUnC,CAAC;AAEF,MAAa,kBAAkB;
|
|
1
|
+
{"version":3,"file":"node-request-service.js","sourceRoot":"","sources":["../src/node-request-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/request",
|
|
3
|
-
"version": "1.53.
|
|
3
|
+
"version": "1.53.2",
|
|
4
4
|
"description": "Theia Proxy-Aware Request Service",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -33,5 +33,5 @@
|
|
|
33
33
|
"https-proxy-agent": "^5.0.0",
|
|
34
34
|
"tslib": "^2.6.2"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "4f6f158bd27c5dd608dddc036910698a51d8c953"
|
|
37
37
|
}
|
|
@@ -31,7 +31,6 @@ export interface NodeRequestOptions extends RequestOptions {
|
|
|
31
31
|
};
|
|
32
32
|
|
|
33
33
|
export class NodeRequestService implements RequestService {
|
|
34
|
-
|
|
35
34
|
protected proxyUrl?: string;
|
|
36
35
|
protected strictSSL?: boolean;
|
|
37
36
|
protected authorization?: string;
|
|
@@ -107,9 +106,14 @@ export class NodeRequestService implements RequestService {
|
|
|
107
106
|
opts.auth = options.user + ':' + options.password;
|
|
108
107
|
}
|
|
109
108
|
|
|
109
|
+
const timeoutHandler = () => {
|
|
110
|
+
reject('timeout');
|
|
111
|
+
};
|
|
112
|
+
|
|
110
113
|
const req = rawRequest(opts, async res => {
|
|
111
114
|
const followRedirects = options.followRedirects ?? 3;
|
|
112
115
|
if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers.location) {
|
|
116
|
+
req.off('timeout', timeoutHandler);
|
|
113
117
|
this.request({
|
|
114
118
|
...options,
|
|
115
119
|
url: res.headers.location,
|
|
@@ -125,6 +129,7 @@ export class NodeRequestService implements RequestService {
|
|
|
125
129
|
});
|
|
126
130
|
|
|
127
131
|
stream.on('end', () => {
|
|
132
|
+
req.off('timeout', timeoutHandler);
|
|
128
133
|
const buffer = Buffer.concat(chunks);
|
|
129
134
|
resolve({
|
|
130
135
|
url: options.url,
|
|
@@ -146,9 +151,7 @@ export class NodeRequestService implements RequestService {
|
|
|
146
151
|
reject(err);
|
|
147
152
|
});
|
|
148
153
|
|
|
149
|
-
req.on('timeout',
|
|
150
|
-
reject('timeout');
|
|
151
|
-
});
|
|
154
|
+
req.on('timeout', timeoutHandler);
|
|
152
155
|
|
|
153
156
|
if (options.timeout) {
|
|
154
157
|
req.setTimeout(options.timeout);
|