@e-mc/request 0.13.5 → 0.13.6

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.5/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.6/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.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.unpkg.com/@e-mc/types@0.13.6/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -417,6 +417,9 @@ class HttpAdapter {
             }
             else if (++this.redirects <= this.redirectLimit) {
                 this.abortResponse();
+                if (this.opts.method?.toUpperCase() === 'PUT' && statusCode !== 307 && statusCode !== 308) {
+                    this.#options.method = 'GET';
+                }
                 this.setOpts((0, util_1.fromURL)(this.opts.url, location));
                 this.init();
             }

package/http/host/index.js

@@ -6,14 +6,11 @@ const HOST_STREAM = new Map();
 const HOST_HTTP_1_1 = [];
 const HOST_ALPN_H2C = [];
 const HOST_ALPN_H2 = [];
-(function () {
-    const nic = require('node:os').networkInterfaces();
-    for (const name in nic) {
-        for (const { address } of nic[name].filter(item => item.internal)) {
-            HOST_LOCAL.add(address);
-        }
+for (const network of Object.entries(require('node:os').networkInterfaces())) {
+    for (const { address } of network[1].filter(item => item.internal)) {
+        HOST_LOCAL.add(address);
     }
-})();
+}
 class HttpHost {
     static normalizeOrigin(value) {
         return (value = value.trim()).replace(/\/+$/, '') + (!/:\d+$/.test(value) ? ':' + (value.startsWith('https') ? '443' : '80') : '');

package/index.js

@@ -850,9 +850,6 @@ class Request extends module_1 {
             this.readTimeout = (value = (0, util_1.fromSeconds)(read_timeout)) >= 0 ? value : READ_TIMEOUT;
             this.keepAlive = typeof (value = agent?.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
             this.acceptEncoding = typeof (value = use?.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
-            if ((value = (0, util_1.asInt)(use?.http_version)) === 1 || value === 2) {
-                this.#httpVersion = value;
-            }
             this.#ipVersion = (value = (0, util_1.asInt)(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
             if ((value = (0, util_1.fromSeconds)(agent?.timeout)) >= 0) {
                 this.#agentTimeout = value;
@@ -861,6 +858,9 @@ class Request extends module_1 {
                 this.#agentTimeout = AGENT_TIMEOUT;
                 value = undefined;
             }
+            if ((value = (0, util_1.asInt)(use?.http_version)) === 1 || value === 2) {
+                this.#httpVersion = value;
+            }
             const proxy = getProxySettings(data, value);
             if (proxy) {
                 this.proxy = proxy;
@@ -890,8 +890,8 @@ class Request extends module_1 {
             this.readTimeout = READ_TIMEOUT;
             this.keepAlive = KEEP_ALIVE;
             this.acceptEncoding = ACCEPT_ENCODING;
-            this.#agentTimeout = AGENT_TIMEOUT;
             this.#ipVersion = DNS.FAMILY;
+            this.#agentTimeout = AGENT_TIMEOUT;
         }
         this.module = data;
     }
@@ -1739,7 +1739,7 @@ class Request extends module_1 {
         return { ...options, host, url };
     }
     open(uri, options) {
-        let { host, url, httpVersion, method = 'GET', search, encoding, format, headers: outgoing, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(outgoing), getting = false, posting = false;
+        let { host, url, httpVersion, method = 'GET', search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(options.headers), getting = false, posting = false;
         switch (method = method.toUpperCase()) {
             case 'GET':
             case 'DELETE':
@@ -2196,7 +2196,7 @@ class Request extends module_1 {
                     }
                 }
                 for (let { name, data: target, value, contentType: type, filename } of parts) {
-                    if (!(0, types_1.isString)(name)) {
+                    if (!name) {
                         continue;
                     }
                     if (target) {
@@ -2282,10 +2282,9 @@ class Request extends module_1 {
         }
         const singleton = this.#singleton;
         const verbose = !opts.silent && !singleton || opts.silent === false;
-        const log = verbose && LOG_HTTP && LOG_TIMEPROCESS;
         const state = Object.freeze({
             verbose,
-            log,
+            log: verbose && LOG_HTTP && LOG_TIMEPROCESS,
             singleton,
             config: this._config
         });
@@ -2302,10 +2301,11 @@ class Request extends module_1 {
                 this.#downloading.delete(ac);
                 adapter.abortController = null;
             }
-            return;
         }
-        this.#pendingDns = Object.create(null);
-        this.#downloading.clear();
+        else {
+            this.#pendingDns = Object.create(null);
+            this.#downloading.clear();
+        }
     }
     close() {
         const session = this.#session;

package/package.json

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