rekwest 3.2.0 → 3.3.2

package/dist/index.js

@@ -7,15 +7,15 @@ var _exportNames = {
 exports.constants = void 0;
 exports.default = rekwest;
 
-var _http = _interopRequireDefault(require("http"));
+var _nodeHttp = _interopRequireDefault(require("node:http"));
 
-var _http2 = _interopRequireWildcard(require("http2"));
+var _nodeHttp2 = _interopRequireWildcard(require("node:http2"));
 
-exports.constants = _http2.constants;
+exports.constants = _nodeHttp2.constants;
 
-var _https = _interopRequireDefault(require("https"));
+var _nodeHttps = _interopRequireDefault(require("node:https"));
 
-var _promises = require("timers/promises");
+var _promises = require("node:timers/promises");
 
 var _ackn = require("./ackn.js");
 
@@ -44,17 +44,17 @@ Object.keys(_errors).forEach(function (key) {
   exports[key] = _errors[key];
 });
 
-var _helpers = require("./helpers.js");
+var _mediatypes = require("./mediatypes.js");
+
+var _utils = require("./utils.js");
 
-Object.keys(_helpers).forEach(function (key) {
+Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _helpers[key]) return;
-  exports[key] = _helpers[key];
+  if (key in exports && exports[key] === _utils[key]) return;
+  exports[key] = _utils[key];
 });
 
-var _mediatypes = require("./mediatypes.js");
-
 var _file = require("./file.js");
 
 Object.keys(_file).forEach(function (key) {
@@ -92,7 +92,7 @@ const {
   HTTP_STATUS_SEE_OTHER,
   HTTP_STATUS_SERVICE_UNAVAILABLE,
   HTTP_STATUS_TOO_MANY_REQUESTS
-} = _http2.default.constants;
+} = _nodeHttp2.default.constants;
 const maxRetryAfter = Symbol('maxRetryAfter');
 
 const maxRetryAfterError = (interval, options) => new _errors.RequestError(`Maximum '${HTTP2_HEADER_RETRY_AFTER}' limit exceeded: ${interval} ms.`, options);
@@ -120,10 +120,15 @@ let defaults = {
 };
 
 async function rekwest(url, options = {}) {
-  url = options.url = new URL(url);
+  ({
+    url
+  } = (0, _utils.revise)({
+    options,
+    url
+  }));
 
   if (!options.redirected) {
-    options = (0, _helpers.merge)(rekwest.defaults, options);
+    options = (0, _utils.merge)(rekwest.defaults, options);
   }
 
   if (options.body && [HTTP2_METHOD_GET, HTTP2_METHOD_HEAD].includes(options.method)) {
@@ -140,7 +145,7 @@ async function rekwest(url, options = {}) {
     ['alpnProtocol', 'createConnection', 'h2', 'protocol'].forEach(it => Reflect.deleteProperty(options, it));
   }
 
-  options = (0, _helpers.preflight)(options);
+  options = (0, _utils.preflight)(options);
   const {
     cookies,
     digest,
@@ -148,29 +153,26 @@ async function rekwest(url, options = {}) {
     h2,
     redirect,
     redirected,
-    thenable,
-    url: {
-      protocol
-    }
+    thenable
   } = options;
   const {
     request
-  } = protocol === 'http:' ? _http.default : _https.default;
+  } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
   let {
     body
   } = options;
   const promise = new Promise((resolve, reject) => {
     let client, req;
-    body &&= (0, _helpers.transform)(body, options);
+    body &&= (0, _utils.transform)(body, options);
 
     if (h2) {
-      client = _http2.default.connect(url.origin, options);
+      client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
       req = request(url, options);
     }
 
-    (0, _helpers.affix)(client, req, options);
+    (0, _utils.affix)(client, req, options);
     req.once('error', reject);
     req.once('frameError', reject);
     req.once('goaway', reject);
@@ -184,7 +186,7 @@ async function rekwest(url, options = {}) {
         res.once('error', reject);
       }
 
-      (0, _helpers.admix)(res, headers, options);
+      (0, _utils.admix)(res, headers, options);
 
       if (cookies !== false && res.headers[HTTP2_HEADER_SET_COOKIE]) {
         if (_cookies.Cookies.jar.has(url.origin)) {
@@ -202,11 +204,11 @@ async function rekwest(url, options = {}) {
       });
 
       if (follow && /^3\d{2}$/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
-        if (redirect === _helpers.redirects.error) {
+        if (redirect === _utils.redirects.error) {
           return res.emit('error', new _errors.RequestError(`Unexpected redirect, redirect mode is set to '${redirect}'.`));
         }
 
-        if (redirect === _helpers.redirects.follow) {
+        if (redirect === _utils.redirects.follow) {
           options.url = new URL(res.headers[HTTP2_HEADER_LOCATION], url).href;
 
           if (res.statusCode !== HTTP_STATUS_SEE_OTHER && body === Object(body) && body.pipe?.constructor === Function) {
@@ -229,7 +231,7 @@ async function rekwest(url, options = {}) {
 
             if (interval > options.maxRetryAfter) {
               return res.emit('error', maxRetryAfterError(interval, {
-                cause: (0, _helpers.mixin)(res, options)
+                cause: (0, _utils.mixin)(res, options)
               }));
             }
 
@@ -241,12 +243,12 @@ async function rekwest(url, options = {}) {
       }
 
       if (res.statusCode >= HTTP_STATUS_BAD_REQUEST) {
-        return reject((0, _helpers.mixin)(res, options));
+        return reject((0, _utils.mixin)(res, options));
       }
 
-      resolve((0, _helpers.mixin)(res, options));
+      resolve((0, _utils.mixin)(res, options));
     });
-    (0, _helpers.dispatch)(req, { ...options,
+    (0, _utils.dispatch)(req, { ...options,
       body
     });
   });
@@ -302,35 +304,37 @@ async function rekwest(url, options = {}) {
 
 Reflect.defineProperty(rekwest, 'stream', {
   enumerable: true,
-  value: function (url, options = {}) {
-    options = (0, _helpers.preflight)({
-      url,
-      ...(0, _helpers.merge)(rekwest.defaults, {
+
+  value(url, options = {}) {
+    ({
+      url
+    } = (0, _utils.revise)({
+      options,
+      url
+    }));
+    options = (0, _utils.preflight)({ ...(0, _utils.merge)(rekwest.defaults, {
         headers: {
           [HTTP2_HEADER_CONTENT_TYPE]: _mediatypes.APPLICATION_OCTET_STREAM
         }
       }, options),
-      redirect: _helpers.redirects.manual
+      redirect: _utils.redirects.manual
     });
     const {
-      h2,
-      url: {
-        protocol
-      }
+      h2
     } = options;
     const {
       request
-    } = protocol === 'http:' ? _http.default : _https.default;
+    } = url.protocol === 'http:' ? _nodeHttp.default : _nodeHttps.default;
     let client, req;
 
     if (h2) {
-      client = _http2.default.connect(url.origin, options);
+      client = _nodeHttp2.default.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
-      req = request(options.url, options);
+      req = request(url, options);
     }
 
-    (0, _helpers.affix)(client, req, options);
+    (0, _utils.affix)(client, req, options);
     req.once('response', res => {
       let headers;
 
@@ -339,10 +343,11 @@ Reflect.defineProperty(rekwest, 'stream', {
         res = req;
       }
 
-      (0, _helpers.admix)(res, headers, options);
+      (0, _utils.admix)(res, headers, options);
     });
     return req;
   }
+
 });
 Reflect.defineProperty(rekwest, 'defaults', {
   enumerable: true,
@@ -352,7 +357,7 @@ Reflect.defineProperty(rekwest, 'defaults', {
   },
 
   set(value) {
-    defaults = (0, _helpers.merge)(defaults, value);
+    defaults = (0, _utils.merge)(defaults, value);
   }
 
 });

package/dist/{helpers.js → utils.js}

@@ -1,19 +1,19 @@
 "use strict";
 
 exports.__esModule = true;
-exports.redirects = exports.preflight = exports.mixin = exports.merge = exports.dispatch = exports.decompress = exports.compress = exports.affix = exports.admix = void 0;
+exports.revise = exports.redirects = exports.preflight = exports.mixin = exports.merge = exports.dispatch = exports.decompress = exports.compress = exports.collate = exports.affix = exports.admix = void 0;
 exports.tap = tap;
 exports.transform = void 0;
 
-var _buffer = require("buffer");
+var _nodeBuffer = require("node:buffer");
 
-var _http = _interopRequireDefault(require("http2"));
+var _nodeHttp = _interopRequireDefault(require("node:http2"));
 
-var _stream = require("stream");
+var _nodeStream = require("node:stream");
 
-var _util = require("util");
+var _nodeUtil = require("node:util");
 
-var _zlib = _interopRequireDefault(require("zlib"));
+var _nodeZlib = _interopRequireDefault(require("node:zlib"));
 
 var _cookies = require("./cookies.js");
 
@@ -41,13 +41,13 @@ const {
   HTTP2_HEADER_STATUS,
   HTTP2_METHOD_GET,
   HTTP2_METHOD_HEAD
-} = _http.default.constants;
-const brotliCompress = (0, _util.promisify)(_zlib.default.brotliCompress);
-const brotliDecompress = (0, _util.promisify)(_zlib.default.brotliDecompress);
-const gzip = (0, _util.promisify)(_zlib.default.gzip);
-const gunzip = (0, _util.promisify)(_zlib.default.gunzip);
-const deflate = (0, _util.promisify)(_zlib.default.deflate);
-const inflate = (0, _util.promisify)(_zlib.default.inflate);
+} = _nodeHttp.default.constants;
+const brotliCompress = (0, _nodeUtil.promisify)(_nodeZlib.default.brotliCompress);
+const brotliDecompress = (0, _nodeUtil.promisify)(_nodeZlib.default.brotliDecompress);
+const gzip = (0, _nodeUtil.promisify)(_nodeZlib.default.gzip);
+const gunzip = (0, _nodeUtil.promisify)(_nodeZlib.default.gunzip);
+const deflate = (0, _nodeUtil.promisify)(_nodeZlib.default.deflate);
+const inflate = (0, _nodeUtil.promisify)(_nodeZlib.default.inflate);
 
 const admix = (res, headers, options) => {
   const {
@@ -94,14 +94,22 @@ const affix = (client, req, options) => {
 
 exports.affix = affix;
 
+const collate = (entity, primordial) => {
+  if (entity?.constructor !== primordial) {
+    throw new TypeError('Illegal invocation');
+  }
+};
+
+exports.collate = collate;
+
 const compress = (buf, encoding, {
   async = false
 } = {}) => {
   encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const compressor = {
-    br: async ? brotliCompress : _zlib.default.brotliCompressSync,
-    deflate: async ? deflate : _zlib.default.deflateSync,
-    gzip: async ? gzip : _zlib.default.gzipSync
+    br: async ? brotliCompress : _nodeZlib.default.brotliCompressSync,
+    deflate: async ? deflate : _nodeZlib.default.deflateSync,
+    gzip: async ? gzip : _nodeZlib.default.gzipSync
   }[encoding];
   return compressor?.(buf) ?? (async ? Promise.resolve(buf) : buf);
 };
@@ -113,9 +121,9 @@ const decompress = (buf, encoding, {
 } = {}) => {
   encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const decompressor = {
-    br: async ? brotliDecompress : _zlib.default.brotliDecompressSync,
-    deflate: async ? inflate : _zlib.default.inflateSync,
-    gzip: async ? gunzip : _zlib.default.gunzipSync
+    br: async ? brotliDecompress : _nodeZlib.default.brotliDecompressSync,
+    deflate: async ? inflate : _nodeZlib.default.inflateSync,
+    gzip: async ? gunzip : _nodeZlib.default.gunzipSync
   }[encoding];
   return decompressor?.(buf) ?? (async ? Promise.resolve(buf) : buf);
 };
@@ -128,14 +136,14 @@ const dispatch = (req, {
 }) => {
   if (body === Object(body) && !Buffer.isBuffer(body)) {
     if (body.pipe?.constructor !== Function && (Reflect.has(body, Symbol.asyncIterator) || Reflect.has(body, Symbol.iterator))) {
-      body = _stream.Readable.from(body);
+      body = _nodeStream.Readable.from(body);
     }
 
     const compressor = {
-      br: _zlib.default.createBrotliCompress,
-      deflate: _zlib.default.createDeflate,
-      gzip: _zlib.default.createGzip
-    }[headers[HTTP2_HEADER_CONTENT_ENCODING]] ?? _stream.PassThrough;
+      br: _nodeZlib.default.createBrotliCompress,
+      deflate: _nodeZlib.default.createDeflate,
+      gzip: _nodeZlib.default.createGzip
+    }[headers[HTTP2_HEADER_CONTENT_ENCODING]] ?? _nodeStream.PassThrough;
     body.pipe(compressor()).pipe(req);
   } else {
     req.end(body);
@@ -179,31 +187,39 @@ const mixin = (res, {
     Object.defineProperties(res, {
       arrayBuffer: {
         enumerable: true,
-        value: function () {
+        value: async function () {
+          collate(this, res?.constructor);
           parse &&= false;
-          return this.body().then(({
+          const {
             buffer,
             byteLength,
             byteOffset
-          }) => buffer.slice(byteOffset, byteOffset + byteLength));
+          } = await this.body();
+          return buffer.slice(byteOffset, byteOffset + byteLength);
         }
       },
       blob: {
         enumerable: true,
-        value: function () {
-          return this.arrayBuffer().then(res => new _buffer.Blob([res]));
+        value: async function () {
+          collate(this, res?.constructor);
+          const val = await this.arrayBuffer();
+          return new _nodeBuffer.Blob([val]);
         }
       },
       json: {
         enumerable: true,
-        value: function () {
-          return this.text().then(res => JSON.parse(res));
+        value: async function () {
+          collate(this, res?.constructor);
+          const val = await this.text();
+          return JSON.parse(val);
         }
       },
       text: {
         enumerable: true,
-        value: function () {
-          return this.blob().then(blob => blob.text());
+        value: async function () {
+          collate(this, res?.constructor);
+          const blob = await this.blob();
+          return blob.text();
         }
       }
     });
@@ -213,8 +229,10 @@ const mixin = (res, {
     body: {
       enumerable: true,
       value: async function () {
+        collate(this, res?.constructor);
+
         if (this.bodyUsed) {
-          throw new TypeError('Response stream already read.');
+          throw new TypeError('Response stream already read');
         }
 
         let spool = [];
@@ -252,9 +270,11 @@ const mixin = (res, {
     },
     bodyUsed: {
       enumerable: true,
-      get: function () {
+
+      get() {
         return this.readableEnded;
       }
+
     }
   });
 };
@@ -262,13 +282,13 @@ const mixin = (res, {
 exports.mixin = mixin;
 
 const preflight = options => {
-  const url = options.url = new URL(options.url);
   const {
     cookies,
     h2 = false,
-    method = HTTP2_METHOD_GET,
     headers,
-    redirected
+    method = HTTP2_METHOD_GET,
+    redirected,
+    url
   } = options;
 
   if (h2) {
@@ -333,6 +353,22 @@ const redirects = {
 };
 exports.redirects = redirects;
 
+const revise = ({
+  url,
+  options
+}) => {
+  if (options.trimTrailingSlashes) {
+    url = `${url}`.replace(/(?<!:)\/+/gi, '/');
+  }
+
+  url = new URL(url);
+  return Object.assign(options, {
+    url
+  });
+};
+
+exports.revise = revise;
+
 async function* tap(value) {
   if (Reflect.has(value, Symbol.asyncIterator)) {
     yield* value;
@@ -346,9 +382,9 @@ async function* tap(value) {
 const transform = (body, options) => {
   let headers = {};
 
-  if (_util.types.isAnyArrayBuffer(body) && !Buffer.isBuffer(body)) {
+  if (_nodeUtil.types.isAnyArrayBuffer(body) && !Buffer.isBuffer(body)) {
     body = Buffer.from(body);
-  } else if (_util.types.isArrayBufferView(body) && !Buffer.isBuffer(body)) {
+  } else if (_nodeUtil.types.isArrayBufferView(body) && !Buffer.isBuffer(body)) {
     body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
   }
 
@@ -357,7 +393,7 @@ const transform = (body, options) => {
       [HTTP2_HEADER_CONTENT_LENGTH]: body.size,
       [HTTP2_HEADER_CONTENT_TYPE]: body.type || _mediatypes.APPLICATION_OCTET_STREAM
     };
-    body = body.stream?.() ?? _stream.Readable.from(tap(body));
+    body = body.stream?.() ?? _nodeStream.Readable.from(tap(body));
   } else if (_formdata.FormData.alike(body)) {
     body = _formdata.FormData.actuate(body);
     headers = {

package/package.json

@@ -8,14 +8,14 @@
     "url": "https://github.com/bricss/rekwest/issues"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.9",
-    "@babel/eslint-parser": "^7.17.0",
-    "@babel/preset-env": "^7.16.11",
-    "c8": "^7.11.2",
-    "eslint": "^8.14.0",
+    "@babel/cli": "^7.18.10",
+    "@babel/core": "^7.18.10",
+    "@babel/eslint-parser": "^7.18.9",
+    "@babel/preset-env": "^7.18.10",
+    "c8": "^7.12.0",
+    "eslint": "^8.21.0",
     "eslint-config-ultra-refined": "^2.5.0",
-    "mocha": "^9.2.2"
+    "mocha": "^10.0.0"
   },
   "description": "The robust request library that humanity deserves 🌐",
   "engines": {
@@ -32,6 +32,8 @@
   "homepage": "https://github.com/bricss/rekwest#readme",
   "keywords": [
     "backoff",
+    "compression",
+    "cookie",
     "fetch",
     "fetch-alike",
     "formdata",
@@ -42,6 +44,7 @@
     "http2",
     "multipart",
     "request",
+    "redirect",
     "retry"
   ],
   "license": "MIT",
@@ -62,5 +65,5 @@
     "test:bail": "mocha --bail",
     "test:cover": "c8 --include=src --reporter=lcov --reporter=text npm test"
   },
-  "version": "3.2.0"
+  "version": "3.3.2"
 }

package/src/ackn.mjs

@@ -1,33 +1,33 @@
-import { connect } from 'tls';
-
-export const ackn = (options) => new Promise((resolve, reject) => {
-  const { url } = options;
-  const socket = connect({
-    ...options,
-    ALPNProtocols: [
-      'h2',
-      'http/1.1',
-    ],
-    host: url.hostname,
-    port: parseInt(url.port) || 443,
-    servername: url.hostname,
-  }, () => {
-    socket.off('error', reject);
-    socket.off('timeout', reject);
-
-    const { alpnProtocol } = socket;
-
-    resolve({
-      ...options,
-      alpnProtocol,
-      createConnection() {
-        return socket;
-      },
-      h2: /h2c?/.test(alpnProtocol),
-      protocol: url.protocol,
-    });
-  });
-
-  socket.on('error', reject);
-  socket.on('timeout', reject);
-});
+import { connect } from 'node:tls';
+
+export const ackn = (options) => new Promise((resolve, reject) => {
+  const { url } = options;
+  const socket = connect({
+    ...options,
+    ALPNProtocols: [
+      'h2',
+      'http/1.1',
+    ],
+    host: url.hostname,
+    port: parseInt(url.port) || 443,
+    servername: url.hostname,
+  }, () => {
+    socket.off('error', reject);
+    socket.off('timeout', reject);
+
+    const { alpnProtocol } = socket;
+
+    resolve({
+      ...options,
+      alpnProtocol,
+      createConnection() {
+        return socket;
+      },
+      h2: /h2c?/.test(alpnProtocol),
+      protocol: url.protocol,
+    });
+  });
+
+  socket.on('error', reject);
+  socket.on('timeout', reject);
+});

package/src/cookies.mjs

@@ -1,3 +1,5 @@
+import { collate } from './utils.mjs';
+
 export class Cookies extends URLSearchParams {
 
   static jar = new Map();
@@ -18,6 +20,8 @@ export class Cookies extends URLSearchParams {
   }
 
   toString() {
+    collate(this, Cookies);
+
     return super.toString().split('&').join('; ').trim();
   }
 

package/src/file.mjs

@@ -1,6 +1,6 @@
-import { Blob } from 'buffer';
+import { Blob } from 'node:buffer';
 
-export { Blob } from 'buffer';
+export { Blob } from 'node:buffer';
 
 export class File extends Blob {