@e-mc/request 0.13.3 → 0.13.5

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.3/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.5/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -252,9 +252,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.3/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.5/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.5/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.5/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -79,13 +79,21 @@ class HttpAdapter {
                     return;
                 }
                 const statusCode = headers[':status'];
-                if (statusCode < 300) {
-                    this.acceptResponse(headers);
+                if (statusCode === 204 || statusCode === 304) {
+                    this.acceptResponse(headers, true);
                 }
-                else if (statusCode < 400) {
+                else if (statusCode < 300) {
+                    this.acceptResponse(headers, false);
+                }
+                else if (statusCode === 301 ||
+                    statusCode === 302 ||
+                    statusCode === 303 ||
+                    statusCode === 307 ||
+                    statusCode === 308) {
                     this.redirectResponse(statusCode, headers.location);
                 }
-                else if (statusCode === 401 ||
+                else if (statusCode === 305 ||
+                    statusCode === 401 ||
                     statusCode === 402 ||
                     statusCode === 403 ||
                     statusCode === 404 ||
@@ -151,10 +159,17 @@ class HttpAdapter {
                     return;
                 }
                 const statusCode = res.statusCode;
-                if (statusCode < 300) {
-                    this.acceptResponse(res.headers);
+                if (statusCode === 204 || statusCode === 304) {
+                    this.acceptResponse(res.headers, true);
+                }
+                else if (statusCode < 300) {
+                    this.acceptResponse(res.headers, false);
                 }
-                else if (statusCode < 400) {
+                else if (statusCode === 301 ||
+                    statusCode === 302 ||
+                    statusCode === 303 ||
+                    statusCode === 307 ||
+                    statusCode === 308) {
                     this.redirectResponse(statusCode, res.headers.location);
                 }
                 else if (this.isRetry(statusCode)) {
@@ -226,7 +241,7 @@ class HttpAdapter {
         this.opts.httpVersion = 1;
         this.init();
     }
-    acceptResponse(headers) {
+    acceptResponse(headers, empty = false) {
         const opts = this.opts;
         if ('outHeaders' in opts) {
             opts.outHeaders = headers;
@@ -238,7 +253,7 @@ class HttpAdapter {
         const enabled = opts.connected?.call(this.client, headers) !== false && !pipeline;
         const maxBufferSize = opts.maxBufferSize ? (0, types_1.alignSize)(opts.maxBufferSize) : 0;
         this.contentLength = parseInt(headers['content-length'] || '0');
-        const updating = opts.progressId !== undefined && !!this.instance.host && this.contentLength > 0;
+        const updating = opts.progressId !== undefined && !!this.instance.host && this.contentLength > 0 && !empty;
         const readTimeout = this.instance.readTimeout;
         let log = this.state.log, buffer = null, dataLength = 0;
         this.client.once('readable', () => {
@@ -267,7 +282,7 @@ class HttpAdapter {
                 this.updateProgress(0, 0);
             }
         });
-        if (enabled) {
+        if (enabled && !empty) {
             const encoding = opts.encoding;
             this.client.on('data', (chunk) => {
                 if (buffer) {
@@ -366,7 +381,7 @@ class HttpAdapter {
                 if (updating) {
                     this.updateProgress(0, this.contentLength);
                 }
-                if (enabled && this.instance.readExpect === 'always') {
+                if (enabled && this.instance.readExpect === 'always' && !empty) {
                     this.terminate("No data received");
                     return;
                 }

package/index.js

@@ -166,7 +166,8 @@ function getProxySettings(request, agentTimeout) {
             if ((0, types_1.isArray)(proxy.exclude)) {
                 exclude = proxy.exclude;
             }
-            return { host, include, exclude, keepAlive: proxy.keep_alive, agentTimeout };
+            const keepAliveMsecs = (0, util_1.asInt)(proxy.keep_alive_interval);
+            return { host, include, exclude, keepAlive: proxy.keep_alive, keepAliveMsecs: keepAliveMsecs > 0 ? keepAliveMsecs : undefined, agentTimeout };
         }
         catch {
         }
@@ -300,6 +301,8 @@ function checkEncoding(request, response, statusCode, outStream, contentEncoding
         case 206:
             request.emit('error', (0, types_1.errorValue)("Aborted", 'Partial content'));
         case 204:
+        case 205:
+        case 304:
             return;
     }
     if (!contentEncoding) {
@@ -496,6 +499,16 @@ function addAria2Proxy(args, protocol, host) {
         args.push(`--${protocol}-proxy-passwd="${escapeShellQuote(decodeURIComponent(password))}"`);
     }
 }
+function createAgentOptions(options) {
+    const { keepAlive, keepAliveMsecs, maxFreeSockets, timeout, maxSockets, maxTotalSockets, proxyEnv } = options;
+    if (keepAlive === true) {
+        return { keepAlive: true, timeout, maxSockets, maxTotalSockets, proxyEnv, keepAliveMsecs, maxFreeSockets };
+    }
+    if (keepAlive === false || typeof timeout === 'number' || typeof maxSockets === 'number' || typeof maxTotalSockets === 'number' || proxyEnv) {
+        return { keepAlive: false, timeout, maxSockets, maxTotalSockets, proxyEnv };
+    }
+}
+const hasResponse = (value) => value >= 200 && (value < 300 || value === 304);
 const isDirEnd = (value) => value.endsWith('/') || value.endsWith(path.sep);
 const trimCharEnd = (value) => value.substring(0, value.length - 1);
 const configureDns = (family, options) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
@@ -674,7 +687,7 @@ class Request extends module_1 {
                 READ_TIMEOUT = read_timeout;
             }
             if ((0, types_1.isObject)(agent)) {
-                let { keep_alive, timeout } = agent;
+                let { keep_alive, timeout, proxy_env } = agent;
                 if ((agent_timeout = (0, util_1.fromSeconds)(timeout)) > 0) {
                     AGENT_TIMEOUT = agent_timeout;
                 }
@@ -687,7 +700,8 @@ class Request extends module_1 {
                 else {
                     keep_alive = undefined;
                 }
-                this.defineHttpAgent({ keepAlive: keep_alive, timeout: agent_timeout });
+                const keepAliveMsecs = (0, util_1.asInt)(agent.keep_alive_interval);
+                this.defineHttpAgent({ keepAlive: keep_alive, timeout: agent_timeout, proxyEnv: proxy_env, keepAliveMsecs: keepAliveMsecs > 0 ? keepAliveMsecs : undefined });
             }
             if (use) {
                 let { http_version, accept_encoding } = use;
@@ -730,24 +744,18 @@ class Request extends module_1 {
         return typeof value === 'string' && (value = value.trim()).length > 0 && /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s.test(value);
     }
     static defineHttpAgent(options) {
-        const { keepAlive, timeout = 0 } = options;
+        const agentOptions = createAgentOptions(options);
         if (options.http instanceof http.Agent) {
             http.globalAgent = options.http;
         }
-        else if (timeout > 0) {
-            http.globalAgent = new http.Agent({ keepAlive, timeout });
-        }
-        else if (typeof keepAlive === 'boolean') {
-            http.globalAgent = new http.Agent({ keepAlive });
+        else if (agentOptions) {
+            http.globalAgent = new http.Agent(agentOptions);
         }
         if (options.https instanceof https.Agent) {
             https.globalAgent = options.https;
         }
-        else if (timeout > 0) {
-            https.globalAgent = new https.Agent({ keepAlive, timeout });
-        }
-        else if (typeof keepAlive === 'boolean') {
-            https.globalAgent = new https.Agent({ keepAlive });
+        else if (agentOptions) {
+            https.globalAgent = new https.Agent(agentOptions);
         }
     }
     static defineDnsLookup({ family, expires, resolve }, reset) {
@@ -1857,7 +1865,7 @@ class Request extends module_1 {
                         return;
                     }
                     connected = true;
-                    if (this.matchStatus(statusCode, url, response, request, options) && statusCode >= 200 && statusCode < 300) {
+                    if (this.matchStatus(statusCode, url, response, request, options) && hasResponse(statusCode)) {
                         if (emitter = checkEncoding(request, request, statusCode, outStream, response['content-encoding'])) {
                             for (const event in listenerMap) {
                                 const [name, type] = event.split('-');
@@ -1930,14 +1938,14 @@ class Request extends module_1 {
         else {
             let agent;
             if (!socketPath) {
-                let { keepAlive, agentTimeout } = options;
+                let { keepAlive, agentOptions, agentTimeout = agentOptions?.timeout } = options;
                 if (proxy) {
                     keepAlive ??= proxy.keepAlive;
                     agentTimeout ??= proxy.agentTimeout;
                     const proxyHeaders = this.#headers && getBaseHeaders(proxy.host.href, this.#headers) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        agent = require(pkg)(proxy.host, (typeof keepAlive === 'boolean' || agentTimeout > 0) && agentTimeout !== 0 ? { keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : { headers: proxyHeaders });
+                        agent = require(pkg)(proxy.host, keepAlive === true || keepAlive === false && agentTimeout !== 0 || agentTimeout > 0 ? { ...agentOptions, keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : { ...agentOptions, headers: proxyHeaders });
                     }
                     catch (err) {
                         if (!SUPPORTED_PROXY || proxyHeaders) {
@@ -1947,19 +1955,19 @@ class Request extends module_1 {
                 }
                 if (!agent) {
                     let proxyEnv;
-                    if (proxy && SUPPORTED_PROXY) {
+                    if (SUPPORTED_PROXY && !(proxyEnv = agentOptions?.proxyEnv) && proxy) {
                         const http_proxy = proxy.host.toString();
                         proxyEnv = { http_proxy, https_proxy: http_proxy };
                     }
                     if (keepAlive === false) {
-                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: false, proxyEnv });
+                        agent = new (secure ? https.Agent : http.Agent)({ ...agentOptions, keepAlive: false, proxyEnv });
                     }
                     else if (keepAlive === true || agentTimeout > 0) {
-                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: true, timeout: agentTimeout, proxyEnv });
+                        agent = new (secure ? https.Agent : http.Agent)({ ...agentOptions, keepAlive: true, timeout: agentTimeout, proxyEnv });
                     }
-                    else if (agentTimeout !== 0 || proxyEnv) {
+                    else if (agentOptions || proxyEnv) {
                         agentTimeout ??= this.agentTimeout;
-                        agent = new (secure ? https.Agent : http.Agent)({ keepAlive: this.keepAlive ?? true, timeout: agentTimeout || undefined, proxyEnv });
+                        agent = new (secure ? https.Agent : http.Agent)({ ...agentOptions, keepAlive: this.keepAlive ?? true, timeout: agentTimeout || undefined, proxyEnv });
                     }
                 }
             }
@@ -1984,7 +1992,7 @@ class Request extends module_1 {
             }, response => {
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
-                if (!expectContinue && this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 && statusCode < 300) {
+                if (!expectContinue && this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && hasResponse(statusCode)) {
                     let source = checkEncoding(request, response, statusCode, outStream, incoming['content-encoding']);
                     if (source) {
                         source.once('finish', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,10 +19,10 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.13.3",
-    "@e-mc/types": "0.13.3",
+    "@e-mc/module": "0.13.5",
+    "@e-mc/types": "0.13.5",
     "combined-stream": "^1.0.8",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "picomatch": "^4.0.3",
     "which": "^4.0.0"
   }