@e-mc/request 0.8.27 → 0.8.29

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/index.d.ts
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -82,9 +82,9 @@ interface RequestConstructor extends ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/settings.d.ts
 
 ## LICENSE
 

package/http/adapter/index.js

@@ -5,28 +5,28 @@ const yaml = require("js-yaml");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/request/util");
+const kHttpAdapter = Symbol.for('request:http:adapter:constructor');
 let LOG_TIMEFORMAT = 'readable';
+const isConstructor = (value) => typeof value === 'function' && !!value.prototype?.constructor.name;
 class HttpAdapter {
     instance;
     state;
     uri;
+    static [kHttpAdapter] = true;
+    static constructorOf(value) {
+        return isConstructor(value) && value[kHttpAdapter] === true;
+    }
     static isUnsupported(value) {
         return value === 421 || value === 505;
     }
     static isDowngrade(err) {
-        return err instanceof Error && (err.code === 'ERR_HTTP2_ERROR' || this.isUnsupported(Math.abs(err.errno)));
+        return (0, types_1.isErrorCode)(err, 'ERR_HTTP2_ERROR') || err instanceof Error && this.isUnsupported(Math.abs(err.errno));
     }
     static wasAborted(err) {
         return err instanceof Error && err.message.startsWith("Aborted");
     }
     static isConnectionError(err) {
-        switch (err instanceof Error && err.code) {
-            case 'ETIMEDOUT':
-            case 'ECONNRESET':
-                return true;
-            default:
-                return false;
-        }
+        return (0, types_1.isErrorCode)(err, 'ETIMEDOUT', 'ECONNRESET');
     }
     static defineHostConfig({ settings }) {
         const time_format = settings?.time_format;
@@ -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 < 300) {
+                    this.acceptResponse(headers, false);
                 }
-                else if (statusCode < 400) {
+                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 < 400) {
+                else if (statusCode < 300) {
+                    this.acceptResponse(res.headers, false);
+                }
+                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) {
@@ -340,7 +355,12 @@ class HttpAdapter {
                                     result = new (require(packageName = 'fast-xml-parser').XMLParser)(parser).parse(buffer);
                                     break;
                                 case 'toml':
-                                    result = require(packageName = 'toml').parse(buffer);
+                                    try {
+                                        result = require('smol-toml').parse(buffer);
+                                    }
+                                    catch {
+                                        result = require(packageName = 'toml').parse(buffer);
+                                    }
                                     break;
                                 default:
                                     result = JSON.parse(buffer);
@@ -366,7 +386,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;
                 }
@@ -402,6 +422,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/altsvc/index.js

@@ -0,0 +1,92 @@
+"use strict";
+class HttpHostAltSvc {
+    host;
+    #location = {};
+    #available = [];
+    #errors = [];
+    #versionData;
+    constructor(host, versionData) {
+        this.host = host;
+        this.#versionData = versionData;
+    }
+    did(version) {
+        return this.#versionData[version].status !== -1;
+    }
+    next() {
+        const queue = this.#available.shift();
+        if (queue) {
+            const { hostname, port, version, expires } = queue;
+            const ms = expires - Date.now();
+            if (ms < 0) {
+                return this.next();
+            }
+            let timeout = null;
+            if (!isNaN(ms)) {
+                timeout = setTimeout(() => {
+                    if (!this.next()) {
+                        this.host.version = 1;
+                    }
+                }, ms);
+            }
+            this.#location = { hostname, port, version, timeout, origin: this.host.protocol + '//' + hostname + ':' + port };
+            return true;
+        }
+        return false;
+    }
+    close(error) {
+        const { hostname, port, version, timeout } = this.#location;
+        if (hostname) {
+            this.#location = {};
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            if (error) {
+                this.#errors.push({ hostname, port, version });
+                return this.next();
+            }
+        }
+        return false;
+    }
+    clear(version) {
+        if (version) {
+            if (this.#available.length === 0) {
+                this.flag(version, 0);
+            }
+            else if (!this.close(true)) {
+                this.flag(version, -1);
+            }
+        }
+        else {
+            this.close();
+            this.#available = [];
+            this.#errors = [];
+            for (const item of this.#versionData) {
+                if (item.alpn !== 0) {
+                    item.status = -1;
+                }
+            }
+        }
+    }
+    flag(version, value) {
+        this.#versionData[version - 1].status = value;
+    }
+    valid(hostname, port, version) {
+        return !this.errors.find(item => item.hostname === hostname && item.port === port && item.version === version);
+    }
+    set available(value) {
+        this.#available = value;
+    }
+    get errors() {
+        return this.#errors;
+    }
+    get hostname() {
+        return this.#location.hostname;
+    }
+    get port() {
+        return this.#location.port;
+    }
+    get origin() {
+        return this.#location.origin;
+    }
+}
+module.exports = HttpHostAltSvc;

package/index.js

@@ -159,11 +159,17 @@ function getProxySettings(request, agentTimeout) {
     return null;
 }
 function closeTorrent(pid) {
-    const index = ARIA2.PID_QUEUE.findIndex(value => pid === value[0]);
+    const index = ARIA2.PID_QUEUE.findIndex(value => value[0] === pid);
     if (index !== -1) {
         ARIA2.PID_QUEUE.splice(index, 1);
     }
 }
+function resetAria2() {
+    if (ARIA2.PID_TIMER) {
+        clearInterval(ARIA2.PID_TIMER);
+        ARIA2.PID_TIMER = null;
+    }
+}
 function clearDnsLookup() {
     DNS.CACHE = Object.create(null);
     DNS.TIMEOUT.forEach(value => clearTimeout(value));
@@ -181,7 +187,7 @@ function resetHttpHost(version) {
                 const host = HTTP.HOST[origin];
                 if (host.secure && host.version === 1) {
                     const failed = host.failed(2, true);
-                    if (failed === 0 && host.failed(2, true) < 10 || failed < 3 && host.success(2, true) > 0) {
+                    if (failed === 0 && host.error(2, true) < 10 || failed < 3 && host.success(2, true) > 0) {
                         host.version = version;
                     }
                 }
@@ -266,6 +272,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;
         default:
             contentEncoding = contentEncoding.trim();
@@ -666,7 +674,7 @@ class Request extends module_1.default {
                 break;
         }
         if (expires !== undefined) {
-            if (typeof expires === 'string') {
+            if ((0, types_1.isString)(expires)) {
                 expires = (0, types_1.parseExpires)(expires);
             }
             if (expires >= 0) {
@@ -897,8 +905,12 @@ class Request extends module_1.default {
                     }
                     break;
                 case 'readExpect':
-                    if ((0, types_1.isString)(value)) {
-                        this[name] = value;
+                    switch (value) {
+                        case 'string':
+                        case 'always':
+                        case 'none':
+                            this[name] = value;
+                            break;
                     }
                     break;
             }
@@ -1368,13 +1380,9 @@ class Request extends module_1.default {
             stderr.setEncoding('utf-8').on('data', (value) => message += value);
             if (pid !== undefined && module_1.default.isFile(uri, 'torrent')) {
                 if (!ARIA2.PID_TIMER) {
-                    const clearTimer = () => {
-                        clearInterval(ARIA2.PID_TIMER);
-                        ARIA2.PID_TIMER = null;
-                    };
                     ARIA2.PID_TIMER = setInterval(() => {
                         if (ARIA2.PID_QUEUE.length === 0) {
-                            clearTimer();
+                            resetAria2();
                             return;
                         }
                         for (const item of ARIA2.PID_QUEUE) {
@@ -1409,7 +1417,7 @@ class Request extends module_1.default {
                                 ARIA2.PID_QUEUE.push(item);
                             }
                             else {
-                                clearTimer();
+                                resetAria2();
                             }
                         }
                     }, (ARIA2.UPDATE_STATUS || 30) * 1000);
@@ -1942,7 +1950,7 @@ class Request extends module_1.default {
                         formatWarning(`Connection timeout (${retries} / ${this._config.retryLimit})`);
                         downloadUri.call(this, href);
                     };
-                    const acceptResponse = (headers) => {
+                    const acceptResponse = (headers, empty) => {
                         var _o;
                         if ('outHeaders' in opts) {
                             opts.outHeaders = headers;
@@ -1976,7 +1984,7 @@ class Request extends module_1.default {
                                 }
                             });
                         }
-                        if (enabled) {
+                        if (enabled && !empty) {
                             client.on('data', (chunk) => {
                                 if (buffer) {
                                     if (typeof buffer === 'string') {
@@ -2067,7 +2075,7 @@ class Request extends module_1.default {
                                     result = buffer;
                                 }
                             }
-                            else if (enabled && this.readExpect === 'always') {
+                            else if (enabled && !empty && this.readExpect === 'always') {
                                 throwError('No data received');
                                 return;
                             }
@@ -2166,13 +2174,21 @@ class Request extends module_1.default {
                                 return;
                             }
                             const statusCode = headers[':status'];
-                            if (statusCode < 300) {
-                                acceptResponse(headers);
+                            if (statusCode === 204 || statusCode === 304) {
+                                acceptResponse(headers, true);
+                            }
+                            else if (statusCode < 300) {
+                                acceptResponse(headers, false);
                             }
-                            else if (statusCode < 400) {
+                            else if (statusCode === 301 ||
+                                statusCode === 302 ||
+                                statusCode === 303 ||
+                                statusCode === 307 ||
+                                statusCode === 308) {
                                 redirectResponse(statusCode, headers.location);
                             }
-                            else if (statusCode === 401 ||
+                            else if (statusCode === 305 ||
+                                statusCode === 401 ||
                                 statusCode === 402 ||
                                 statusCode === 403 ||
                                 statusCode === 404 ||
@@ -2236,10 +2252,17 @@ class Request extends module_1.default {
                                 return;
                             }
                             const statusCode = res.statusCode;
-                            if (statusCode < 300) {
-                                acceptResponse(res.headers);
+                            if (statusCode === 204 || statusCode === 304) {
+                                acceptResponse(res.headers, true);
+                            }
+                            else if (statusCode < 300) {
+                                acceptResponse(res.headers, false);
                             }
-                            else if (statusCode < 400) {
+                            else if (statusCode === 301 ||
+                                statusCode === 302 ||
+                                statusCode === 303 ||
+                                statusCode === 307 ||
+                                statusCode === 308) {
                                 redirectResponse(statusCode, res.headers.location);
                             }
                             else if (isRetry(statusCode)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.27",
+  "version": "0.8.29",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.27",
-    "@e-mc/types": "0.8.27",
+    "@e-mc/module": "0.8.29",
+    "@e-mc/types": "0.8.29",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",