@theia/request 1.48.1 → 1.48.2

package/lib/node-request-service.js

@@ -1,135 +1,135 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2022 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeRequestService = void 0;
-const http = require("http");
-const https = require("https");
-const proxy_1 = require("./proxy");
-const zlib_1 = require("zlib");
-;
-class NodeRequestService {
-    getNodeRequest(options) {
-        const endpoint = new URL(options.url);
-        const module = endpoint.protocol === 'https:' ? https : http;
-        return module.request;
-    }
-    async getProxyUrl(url) {
-        return this.proxyUrl;
-    }
-    async configure(config) {
-        if (config.proxyUrl !== undefined) {
-            this.proxyUrl = config.proxyUrl;
-        }
-        if (config.strictSSL !== undefined) {
-            this.strictSSL = config.strictSSL;
-        }
-        if (config.proxyAuthorization !== undefined) {
-            this.authorization = config.proxyAuthorization;
-        }
-    }
-    async processOptions(options) {
-        var _a;
-        const { strictSSL } = this;
-        options.strictSSL = (_a = options.strictSSL) !== null && _a !== void 0 ? _a : strictSSL;
-        const agent = options.agent ? options.agent : (0, proxy_1.getProxyAgent)(options.url || '', process.env, {
-            proxyUrl: await this.getProxyUrl(options.url),
-            strictSSL: options.strictSSL
-        });
-        options.agent = agent;
-        const authorization = options.proxyAuthorization || this.authorization;
-        if (authorization) {
-            options.headers = {
-                ...(options.headers || {}),
-                'Proxy-Authorization': authorization
-            };
-        }
-        options.headers = {
-            'Accept-Encoding': 'gzip',
-            ...(options.headers || {}),
-        };
-        return options;
-    }
-    request(options, token) {
-        return new Promise(async (resolve, reject) => {
-            options = await this.processOptions(options);
-            const endpoint = new URL(options.url);
-            const rawRequest = options.getRawRequest
-                ? options.getRawRequest(options)
-                : this.getNodeRequest(options);
-            const opts = {
-                hostname: endpoint.hostname,
-                port: endpoint.port ? parseInt(endpoint.port) : (endpoint.protocol === 'https:' ? 443 : 80),
-                protocol: endpoint.protocol,
-                path: endpoint.pathname + endpoint.search,
-                method: options.type || 'GET',
-                headers: options.headers,
-                agent: options.agent,
-                rejectUnauthorized: !!options.strictSSL
-            };
-            if (options.user && options.password) {
-                opts.auth = options.user + ':' + options.password;
-            }
-            const req = rawRequest(opts, async (res) => {
-                var _a;
-                const followRedirects = (_a = options.followRedirects) !== null && _a !== void 0 ? _a : 3;
-                if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers.location) {
-                    this.request({
-                        ...options,
-                        url: res.headers.location,
-                        followRedirects: followRedirects - 1
-                    }, token).then(resolve, reject);
-                }
-                else {
-                    const chunks = [];
-                    const stream = res.headers['content-encoding'] === 'gzip' ? res.pipe((0, zlib_1.createGunzip)()) : res;
-                    stream.on('data', chunk => {
-                        chunks.push(chunk);
-                    });
-                    stream.on('end', () => {
-                        const buffer = Buffer.concat(chunks);
-                        resolve({
-                            url: options.url,
-                            res: {
-                                headers: res.headers,
-                                statusCode: res.statusCode
-                            },
-                            buffer
-                        });
-                    });
-                    stream.on('error', reject);
-                }
-            });
-            req.on('error', reject);
-            if (options.timeout) {
-                req.setTimeout(options.timeout);
-            }
-            if (options.data) {
-                req.write(options.data);
-            }
-            req.end();
-            token === null || token === void 0 ? void 0 : token.onCancellationRequested(() => {
-                req.abort();
-                reject();
-            });
-        });
-    }
-    async resolveProxy(url) {
-        return undefined;
-    }
-}
-exports.NodeRequestService = NodeRequestService;
+"use strict";
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeRequestService = void 0;
+const http = require("http");
+const https = require("https");
+const proxy_1 = require("./proxy");
+const zlib_1 = require("zlib");
+;
+class NodeRequestService {
+    getNodeRequest(options) {
+        const endpoint = new URL(options.url);
+        const module = endpoint.protocol === 'https:' ? https : http;
+        return module.request;
+    }
+    async getProxyUrl(url) {
+        return this.proxyUrl;
+    }
+    async configure(config) {
+        if (config.proxyUrl !== undefined) {
+            this.proxyUrl = config.proxyUrl;
+        }
+        if (config.strictSSL !== undefined) {
+            this.strictSSL = config.strictSSL;
+        }
+        if (config.proxyAuthorization !== undefined) {
+            this.authorization = config.proxyAuthorization;
+        }
+    }
+    async processOptions(options) {
+        var _a;
+        const { strictSSL } = this;
+        options.strictSSL = (_a = options.strictSSL) !== null && _a !== void 0 ? _a : strictSSL;
+        const agent = options.agent ? options.agent : (0, proxy_1.getProxyAgent)(options.url || '', process.env, {
+            proxyUrl: await this.getProxyUrl(options.url),
+            strictSSL: options.strictSSL
+        });
+        options.agent = agent;
+        const authorization = options.proxyAuthorization || this.authorization;
+        if (authorization) {
+            options.headers = {
+                ...(options.headers || {}),
+                'Proxy-Authorization': authorization
+            };
+        }
+        options.headers = {
+            'Accept-Encoding': 'gzip',
+            ...(options.headers || {}),
+        };
+        return options;
+    }
+    request(options, token) {
+        return new Promise(async (resolve, reject) => {
+            options = await this.processOptions(options);
+            const endpoint = new URL(options.url);
+            const rawRequest = options.getRawRequest
+                ? options.getRawRequest(options)
+                : this.getNodeRequest(options);
+            const opts = {
+                hostname: endpoint.hostname,
+                port: endpoint.port ? parseInt(endpoint.port) : (endpoint.protocol === 'https:' ? 443 : 80),
+                protocol: endpoint.protocol,
+                path: endpoint.pathname + endpoint.search,
+                method: options.type || 'GET',
+                headers: options.headers,
+                agent: options.agent,
+                rejectUnauthorized: !!options.strictSSL
+            };
+            if (options.user && options.password) {
+                opts.auth = options.user + ':' + options.password;
+            }
+            const req = rawRequest(opts, async (res) => {
+                var _a;
+                const followRedirects = (_a = options.followRedirects) !== null && _a !== void 0 ? _a : 3;
+                if (res.statusCode && res.statusCode >= 300 && res.statusCode < 400 && followRedirects > 0 && res.headers.location) {
+                    this.request({
+                        ...options,
+                        url: res.headers.location,
+                        followRedirects: followRedirects - 1
+                    }, token).then(resolve, reject);
+                }
+                else {
+                    const chunks = [];
+                    const stream = res.headers['content-encoding'] === 'gzip' ? res.pipe((0, zlib_1.createGunzip)()) : res;
+                    stream.on('data', chunk => {
+                        chunks.push(chunk);
+                    });
+                    stream.on('end', () => {
+                        const buffer = Buffer.concat(chunks);
+                        resolve({
+                            url: options.url,
+                            res: {
+                                headers: res.headers,
+                                statusCode: res.statusCode
+                            },
+                            buffer
+                        });
+                    });
+                    stream.on('error', reject);
+                }
+            });
+            req.on('error', reject);
+            if (options.timeout) {
+                req.setTimeout(options.timeout);
+            }
+            if (options.data) {
+                req.write(options.data);
+            }
+            req.end();
+            token === null || token === void 0 ? void 0 : token.onCancellationRequested(() => {
+                req.abort();
+                reject();
+            });
+        });
+    }
+    async resolveProxy(url) {
+        return undefined;
+    }
+}
+exports.NodeRequestService = NodeRequestService;
 //# sourceMappingURL=node-request-service.js.map

package/lib/package.spec.d.ts

@@ -1,16 +1,16 @@
-/********************************************************************************
- * Copyright (C) 2022 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
 //# sourceMappingURL=package.spec.d.ts.map

package/lib/package.spec.js

@@ -1,26 +1,26 @@
-/********************************************************************************
- * Copyright (C) 2022 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-/* note: this bogus test file is required so that
-   we are able to run mocha unit tests on this
-   package, without having any actual unit tests in it.
-   This way a coverage report will be generated,
-   showing 0% coverage, instead of no report.
-   This file can be removed once we have real unit
-   tests in place. */
-describe('request package', () => {
-    it('should support code coverage statistics', () => true);
-});
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+/* note: this bogus test file is required so that
+   we are able to run mocha unit tests on this
+   package, without having any actual unit tests in it.
+   This way a coverage report will be generated,
+   showing 0% coverage, instead of no report.
+   This file can be removed once we have real unit
+   tests in place. */
+describe('request package', () => {
+    it('should support code coverage statistics', () => true);
+});
 //# sourceMappingURL=package.spec.js.map

package/lib/proxy.d.ts

@@ -1,24 +1,24 @@
-/********************************************************************************
- * Copyright (C) 2022 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-import * as httpAgent from 'http-proxy-agent';
-import * as httpsAgent from 'https-proxy-agent';
-export declare type ProxyAgent = httpAgent.HttpProxyAgent | httpsAgent.HttpsProxyAgent;
-export interface ProxySettings {
-    proxyUrl?: string;
-    strictSSL?: boolean;
-}
-export declare function getProxyAgent(rawRequestURL: string, env: typeof process.env, options?: ProxySettings): ProxyAgent | undefined;
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+import * as httpAgent from 'http-proxy-agent';
+import * as httpsAgent from 'https-proxy-agent';
+export declare type ProxyAgent = httpAgent.HttpProxyAgent | httpsAgent.HttpsProxyAgent;
+export interface ProxySettings {
+    proxyUrl?: string;
+    strictSSL?: boolean;
+}
+export declare function getProxyAgent(rawRequestURL: string, env: typeof process.env, options?: ProxySettings): ProxyAgent | undefined;
 //# sourceMappingURL=proxy.d.ts.map

package/lib/proxy.js

@@ -1,51 +1,51 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2022 TypeFox and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProxyAgent = void 0;
-const url_1 = require("url");
-const httpAgent = require("http-proxy-agent");
-const httpsAgent = require("https-proxy-agent");
-function getSystemProxyURI(requestURL, env) {
-    if (requestURL.protocol === 'http:') {
-        return env.HTTP_PROXY || env.http_proxy;
-    }
-    else if (requestURL.protocol === 'https:') {
-        return env.HTTPS_PROXY || env.https_proxy || env.HTTP_PROXY || env.http_proxy;
-    }
-    return undefined;
-}
-function getProxyAgent(rawRequestURL, env, options = {}) {
-    const requestURL = (0, url_1.parse)(rawRequestURL);
-    const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL, env);
-    if (!proxyURL) {
-        return undefined;
-    }
-    const proxyEndpoint = (0, url_1.parse)(proxyURL);
-    if (!/^https?:$/.test(proxyEndpoint.protocol || '')) {
-        return undefined;
-    }
-    const opts = {
-        host: proxyEndpoint.hostname || '',
-        port: proxyEndpoint.port || (proxyEndpoint.protocol === 'https' ? '443' : '80'),
-        auth: proxyEndpoint.auth,
-        rejectUnauthorized: !!options.strictSSL,
-    };
-    const createAgent = requestURL.protocol === 'http:' ? httpAgent : httpsAgent;
-    return createAgent(opts);
-}
-exports.getProxyAgent = getProxyAgent;
+"use strict";
+/********************************************************************************
+ * Copyright (C) 2022 TypeFox and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProxyAgent = void 0;
+const url_1 = require("url");
+const httpAgent = require("http-proxy-agent");
+const httpsAgent = require("https-proxy-agent");
+function getSystemProxyURI(requestURL, env) {
+    if (requestURL.protocol === 'http:') {
+        return env.HTTP_PROXY || env.http_proxy;
+    }
+    else if (requestURL.protocol === 'https:') {
+        return env.HTTPS_PROXY || env.https_proxy || env.HTTP_PROXY || env.http_proxy;
+    }
+    return undefined;
+}
+function getProxyAgent(rawRequestURL, env, options = {}) {
+    const requestURL = (0, url_1.parse)(rawRequestURL);
+    const proxyURL = options.proxyUrl || getSystemProxyURI(requestURL, env);
+    if (!proxyURL) {
+        return undefined;
+    }
+    const proxyEndpoint = (0, url_1.parse)(proxyURL);
+    if (!/^https?:$/.test(proxyEndpoint.protocol || '')) {
+        return undefined;
+    }
+    const opts = {
+        host: proxyEndpoint.hostname || '',
+        port: proxyEndpoint.port || (proxyEndpoint.protocol === 'https' ? '443' : '80'),
+        auth: proxyEndpoint.auth,
+        rejectUnauthorized: !!options.strictSSL,
+    };
+    const createAgent = requestURL.protocol === 'http:' ? httpAgent : httpsAgent;
+    return createAgent(opts);
+}
+exports.getProxyAgent = getProxyAgent;
 //# sourceMappingURL=proxy.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theia/request",
-  "version": "1.48.1",
+  "version": "1.48.2",
   "description": "Theia Proxy-Aware Request Service",
   "publishConfig": {
     "access": "public"
@@ -33,5 +33,5 @@
     "https-proxy-agent": "^5.0.0",
     "tslib": "^2.6.2"
   },
-  "gitHead": "04c631933dfd14f58d1df5b9b28dd5596c84ec04"
+  "gitHead": "0e9583d043dde303de7a0f86f68439659f8827b0"
 }