@e-mc/request 0.13.10 → 0.14.1

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/request
 
-* NodeJS 18.20 LTS
+* NodeJS 20 (Minimum 18)
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.10/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.1/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -253,9 +253,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.10/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.10/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.1/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -1,10 +1,11 @@
 "use strict";
-const fs = require("node:fs");
-const http2 = require("node:http2");
-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 fs = require('node:fs');
+const http2 = require('node:http2');
+const { load } = require('js-yaml');
+const { alignSize, convertTime, createAbortError, errorValue, isError, isErrorCode, isObject, isString } = require('@e-mc/types');
+const Module = require('@e-mc/module');
+const { checkRetryable, cleanupStream, fromStatusCode, fromURL, getSize, getTransferRate, isRetryable, parseHeader } = 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;
@@ -20,13 +21,13 @@ class HttpAdapter {
         return value === 421 || value === 505;
     }
     static isDowngrade(err) {
-        return (0, types_1.isErrorCode)(err, 'ERR_HTTP2_ERROR') || err instanceof Error && this.isUnsupported(Math.abs(err.errno));
+        return isErrorCode(err, 'ERR_HTTP2_ERROR') || isError(err) && this.isUnsupported(Math.abs(err.errno));
     }
     static wasAborted(err) {
-        return err instanceof Error && err.message.startsWith("Aborted");
+        return isError(err) && err.message.startsWith("Aborted");
     }
     static isConnectionError(err) {
-        return (0, types_1.isErrorCode)(err, 'ETIMEDOUT', 'ECONNRESET');
+        return isErrorCode(err, 'ETIMEDOUT', 'ECONNRESET');
     }
     static defineHostConfig({ settings }) {
         const time_format = settings?.time_format;
@@ -128,7 +129,7 @@ class HttpAdapter {
             })
                 .on('aborted', () => {
                 this.aborted = true;
-                this.terminate((0, types_1.createAbortError)());
+                this.terminate(createAbortError());
             })
                 .on('error', async (err) => {
                 if (this.aborted) {
@@ -181,7 +182,7 @@ class HttpAdapter {
             })
                 .on('abort', () => {
                 this.aborted = true;
-                this.terminate((0, types_1.createAbortError)());
+                this.terminate(createAbortError());
             })
                 .on('error', err => {
                 if (this.aborted) {
@@ -247,14 +248,14 @@ class HttpAdapter {
             opts.outHeaders = headers;
         }
         if ('outFilename' in opts) {
-            opts.outFilename = (0, util_1.parseHeader)(headers, 'content-disposition');
+            opts.outFilename = parseHeader(headers, 'content-disposition');
         }
         if ('outContentType' in opts) {
             opts.outContentType = headers['content-type'];
         }
-        const pipeline = this.pipeTo ? !(0, types_1.isString)(this.pipeTo) : false;
+        const pipeline = this.pipeTo ? !isString(this.pipeTo) : false;
         const enabled = opts.connected?.call(this.client, headers) !== false && !pipeline;
-        const maxBufferSize = opts.maxBufferSize ? (0, types_1.alignSize)(opts.maxBufferSize) : 0;
+        const maxBufferSize = opts.maxBufferSize ? alignSize(opts.maxBufferSize) : 0;
         this.contentLength = parseInt(headers['content-length'] || '0');
         const updating = opts.progressId !== undefined && !!this.instance.host && this.contentLength > 0 && !empty;
         const readTimeout = this.instance.readTimeout;
@@ -262,7 +263,7 @@ class HttpAdapter {
         this.client.once('readable', () => {
             if (readTimeout > 0) {
                 this.timeout = setTimeout(() => {
-                    this.terminate((0, types_1.errorValue)("Timeout was exceeded", this.uri.toString()));
+                    this.terminate(errorValue("Timeout was exceeded", this.uri.toString()));
                 }, readTimeout);
             }
             if (log) {
@@ -311,7 +312,7 @@ class HttpAdapter {
                         dataLength += Buffer.byteLength(chunk, encoding);
                     }
                     if (dataLength > maxBufferSize) {
-                        this.terminate((0, types_1.errorValue)("Size limit was exceeded", this.uri.toString()));
+                        this.terminate(errorValue("Size limit was exceeded", this.uri.toString()));
                     }
                 }
             });
@@ -341,7 +342,7 @@ class HttpAdapter {
                 }
                 if (typeof buffer === 'string') {
                     if (buffer.startsWith('\uFEFF') && encoding !== 'utf16le' && encoding !== 'utf-16le') {
-                        buffer = buffer.substring(1);
+                        buffer = buffer.slice(1);
                     }
                     if (opts.outFormat) {
                         const { out: format, parser } = opts.outFormat;
@@ -349,7 +350,7 @@ class HttpAdapter {
                         try {
                             switch (format) {
                                 case 'yaml':
-                                    result = yaml.load(buffer, parser);
+                                    result = load(buffer, parser);
                                     break;
                                 case 'json5':
                                     result = require(packageName = 'json5').parse(buffer);
@@ -358,18 +359,13 @@ class HttpAdapter {
                                     result = new (require(packageName = 'fast-xml-parser').XMLParser)(parser).parse(buffer);
                                     break;
                                 case 'toml':
-                                    try {
-                                        result = require('smol-toml').parse(buffer, parser);
-                                    }
-                                    catch {
-                                        result = require(packageName = 'toml').parse(buffer);
-                                    }
+                                    result = require(packageName = 'toml').parse(buffer);
                                     break;
                                 default:
                                     result = JSON.parse(buffer);
                                     break;
                             }
-                            if (!(0, types_1.isObject)(result)) {
+                            if (!isObject(result)) {
                                 result = null;
                             }
                         }
@@ -396,7 +392,7 @@ class HttpAdapter {
                     this.terminate("No data received");
                     return;
                 }
-                dataLength = this.contentLength || (typeof this.pipeTo === 'string' ? (0, util_1.getSize)(this.pipeTo) : 0);
+                dataLength = this.contentLength || (typeof this.pipeTo === 'string' ? getSize(this.pipeTo) : 0);
                 result = encoding && !pipeline ? '' : null;
             }
             this.endResponse(result, dataLength, log);
@@ -416,7 +412,7 @@ class HttpAdapter {
                 messageUnit: this.formatMibs(dataLength),
                 messageUnitMinWidth: 9,
                 delayTime: this.delayTime,
-                bypassLog: module_1.hasLogType(32768)
+                bypassLog: Module.hasLogType(32768)
             });
         }
         this.resolve(result);
@@ -431,7 +427,7 @@ class HttpAdapter {
                 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.setOpts(fromURL(this.opts.url, location));
                 this.init();
             }
             else {
@@ -455,7 +451,7 @@ class HttpAdapter {
         if (HttpAdapter.wasAborted(err)) {
             this.terminate(err);
         }
-        else if ((0, util_1.checkRetryable)(err) && ++this.retries <= this.retryLimit) {
+        else if (checkRetryable(err) && ++this.retries <= this.retryLimit) {
             this.abortResponse();
             if (HttpAdapter.isConnectionError(err)) {
                 this.retryTimeout();
@@ -494,8 +490,8 @@ class HttpAdapter {
                 return;
             }
         }
-        this.sendWarning(this.#formatRetry((0, util_1.fromStatusCode)(statusCode)));
-        if ((0, util_1.isRetryable)(statusCode, true)) {
+        this.sendWarning(this.#formatRetry(fromStatusCode(statusCode)));
+        if (isRetryable(statusCode, true)) {
             setImmediate(this.init.bind(this));
         }
         else {
@@ -505,7 +501,7 @@ class HttpAdapter {
         }
     }
     isRetry(value) {
-        return (0, util_1.isRetryable)(value) && ++this.retries <= this.retryLimit;
+        return isRetryable(value) && ++this.retries <= this.retryLimit;
     }
     retryTimeout() {
         this.sendWarning(this.#formatRetry("HTTP connection timeout"));
@@ -522,15 +518,15 @@ class HttpAdapter {
     sendWarning(message) {
         if (this.state.verbose) {
             const { host, url } = this.opts;
-            this.instance.formatMessage(1024, 'HTTP' + this.httpVersion, [message, host.origin], url.toString(), { ...module_1.LOG_STYLE_WARN });
+            this.instance.formatMessage(1024, 'HTTP' + this.httpVersion, [message, host.origin], url.toString(), { ...Module.LOG_STYLE_WARN });
         }
     }
     formatStatus(value, hint) {
-        return value + ': ' + (hint || (0, util_1.fromStatusCode)(value)) + ` (${this.uri.toString()})`;
+        return value + ': ' + (hint || fromStatusCode(value)) + ` (${this.uri.toString()})`;
     }
     formatMibs(dataLength) {
         if (dataLength > 0 && this.dataTime) {
-            return (0, util_1.getTransferRate)(dataLength, Math.max(1, (0, types_1.convertTime)(process.hrtime.bigint() - this.dataTime, false) * 1000));
+            return getTransferRate(dataLength, Math.max(1, convertTime(process.hrtime.bigint() - this.dataTime, false) * 1000));
         }
     }
     close() {
@@ -541,8 +537,8 @@ class HttpAdapter {
         }
     }
     cleanup() {
-        if ((0, types_1.isString)(this.pipeTo) && this.outStream) {
-            (0, util_1.cleanupStream)(this.outStream, this.pipeTo);
+        if (isString(this.pipeTo) && this.outStream) {
+            cleanupStream(this.outStream, this.pipeTo);
             this.outStream = null;
         }
     }
@@ -595,4 +591,5 @@ class HttpAdapter {
         return this.state.config.redirectLimit;
     }
 }
+
 module.exports = HttpAdapter;

package/http/host/altsvc/index.d.ts

@@ -0,0 +1,5 @@
+import type { HttpHostAltSvcConstructor } from '@e-mc/types/lib/request';
+
+declare const HttpHostAltSvc: HttpHostAltSvcConstructor;
+
+export = HttpHostAltSvc;

package/http/host/altsvc/index.js

@@ -1,4 +1,5 @@
 "use strict";
+
 class HttpHostAltSvc {
     host;
     #location = {};
@@ -89,4 +90,5 @@ class HttpHostAltSvc {
         return this.#location.origin;
     }
 }
+
 module.exports = HttpHostAltSvc;

package/http/host/index.js

@@ -1,7 +1,8 @@
 "use strict";
-const tls = require("node:tls");
-const types_1 = require("@e-mc/types");
-const altsvc_1 = require("@e-mc/request/http/host/altsvc");
+
+const tls = require('node:tls');
+const { alignSize, isArray } = require('@e-mc/types');
+const HttpHostAltSvc = require('@e-mc/request/http/host/altsvc');
 const HOST_LOCAL = new Set(['localhost']);
 const HOST_STREAM = new Map();
 const HOST_HTTP_1_1 = [];
@@ -47,13 +48,13 @@ class HttpHost {
     }
     static defineHostConfig({ write_stream, localhost, protocol }) {
         for (const host in write_stream) {
-            const size = (0, types_1.alignSize)(+write_stream[host], 1, 1);
+            const size = alignSize(+write_stream[host], 1, 1);
             if (size > 0) {
                 const [hostname, port = '443'] = host.split(/\s*:\s*/).map((item, index) => index === 1 ? parseInt(item) > 0 ? parseInt(item).toString() : '443' : item);
                 HOST_STREAM.set(hostname + ':' + port, size);
             }
         }
-        if ((0, types_1.isArray)(localhost)) {
+        if (isArray(localhost)) {
             this.defineLocalHost(localhost);
         }
         if (protocol) {
@@ -83,7 +84,7 @@ class HttpHost {
         this.#origin = url.origin;
         this.localhost = HOST_LOCAL.has(hostname);
         this.#streamSize = HOST_STREAM.get(address) || (this.localhost ? 65536 : 4096);
-        this.#altSvc = new altsvc_1(this, this.#versionData);
+        this.#altSvc = new HttpHostAltSvc(this, this.#versionData);
         if (protocol !== 'file:' && !HOST_HTTP_1_1.includes(address = protocol + '//' + address)) {
             if (secure) {
                 this.#version = HOST_ALPN_H2.includes(address) ? 2 : httpVersion;
@@ -233,21 +234,6 @@ class HttpHost {
             }
         }
     }
-    didAltSvc(version) {
-        return this.#versionData[version].status !== -1;
-    }
-    nextAltSvc() {
-        return this.altSvc.next();
-    }
-    closeAltSvc(error) {
-        return this.altSvc.close(error);
-    }
-    clearAltSvc(version) {
-        this.altSvc.clear(version);
-    }
-    flagAltSvc(version, value) {
-        this.altSvc.flag(version, value);
-    }
     reset() {
         this.altSvc.clear();
         this.#versionData.forEach((item, index) => {
@@ -298,4 +284,5 @@ class HttpHost {
         return this.#streamSize;
     }
 }
+
 module.exports = HttpHost;