rekwest 3.1.1 → 3.3.1

package/src/formdata.mjs

@@ -1,12 +1,15 @@
-import { randomBytes } from 'crypto';
-import http2 from 'http2';
-import { toUSVString } from 'util';
+import { randomBytes } from 'node:crypto';
+import http2 from 'node:http2';
+import { toUSVString } from 'node:util';
 import { File } from './file.mjs';
-import { tap } from './helpers.mjs';
 import {
   APPLICATION_OCTET_STREAM,
   MULTIPART_FORM_DATA,
 } from './mediatypes.mjs';
+import {
+  collate,
+  tap,
+} from './utils.mjs';
 
 const CRLF = '\r\n';
 const {
@@ -140,11 +143,13 @@ export class FormData {
   }
 
   append(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 2, 'append');
     this.#entries.push(this.constructor.#enfoldEntry(...args));
   }
 
   delete(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 1, 'delete');
     const name = toUSVString(args[0]);
 
@@ -152,18 +157,20 @@ export class FormData {
   }
 
   forEach(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 1, 'forEach');
     const [callback, thisArg] = args;
 
     for (const entry of this) {
       Reflect.apply(callback, thisArg, [
-        ...(entry.reverse()),
+        ...entry.reverse(),
         this,
       ]);
     }
   }
 
   get(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 1, 'get');
     const name = toUSVString(args[0]);
 
@@ -171,6 +178,7 @@ export class FormData {
   }
 
   getAll(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 1, 'getAll');
     const name = toUSVString(args[0]);
 
@@ -178,6 +186,7 @@ export class FormData {
   }
 
   has(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 1, 'has');
     const name = toUSVString(args[0]);
 
@@ -185,6 +194,7 @@ export class FormData {
   }
 
   set(...args) {
+    collate(this, FormData);
     this.#ensureArgs(args, 2, 'set');
     const entry = this.constructor.#enfoldEntry(...args);
     const idx = this.#entries.findIndex((it) => it.name === entry.name);
@@ -197,6 +207,7 @@ export class FormData {
   }
 
   * entries() {
+    collate(this, FormData);
     for (const { name, value } of this.#entries) {
       yield [
         name,
@@ -206,18 +217,22 @@ export class FormData {
   }
 
   * keys() {
+    collate(this, FormData);
     for (const [name] of this) {
       yield name;
     }
   }
 
   * values() {
+    collate(this, FormData);
     for (const [, value] of this) {
       yield value;
     }
   }
 
   [Symbol.iterator]() {
+    collate(this, FormData);
+
     return this.entries();
   }
 

package/src/index.mjs

@@ -1,10 +1,11 @@
-import http from 'http';
-import http2 from 'http2';
-import https from 'https';
-import { setTimeout as setTimeoutPromise } from 'timers/promises';
+import http from 'node:http';
+import http2 from 'node:http2';
+import https from 'node:https';
+import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
 import { ackn } from './ackn.mjs';
 import { Cookies } from './cookies.mjs';
 import { RequestError } from './errors.mjs';
+import { APPLICATION_OCTET_STREAM } from './mediatypes.mjs';
 import {
   admix,
   affix,
@@ -13,18 +14,18 @@ import {
   mixin,
   preflight,
   redirects,
+  revise,
   transform,
-} from './helpers.mjs';
-import { APPLICATION_OCTET_STREAM } from './mediatypes.mjs';
+} from './utils.mjs';
 
-export { constants } from 'http2';
+export { constants } from 'node:http2';
 
 export * from './ackn.mjs';
 export * from './cookies.mjs';
 export * from './errors.mjs';
 export * from './file.mjs';
 export * from './formdata.mjs';
-export * from './helpers.mjs';
+export * from './utils.mjs';
 
 const {
   HTTP2_HEADER_CONTENT_LENGTH,
@@ -69,7 +70,7 @@ let defaults = {
 };
 
 export default async function rekwest(url, options = {}) {
-  url = options.url = new URL(url);
+  ({ url } = revise({ options, url }));
   if (!options.redirected) {
     options = merge(rekwest.defaults, options);
   }
@@ -98,8 +99,8 @@ export default async function rekwest(url, options = {}) {
 
   options = preflight(options);
 
-  const { cookies, digest, follow, h2, redirect, redirected, thenable, url: { protocol } } = options;
-  const { request } = (protocol === 'http:' ? http : https);
+  const { cookies, digest, follow, h2, redirect, redirected, thenable } = options;
+  const { request } = (url.protocol === 'http:' ? http : https);
   let { body } = options;
 
   const promise = new Promise((resolve, reject) => {
@@ -149,7 +150,7 @@ export default async function rekwest(url, options = {}) {
 
       if (follow && /^3\d{2}$/.test(res.statusCode) && res.headers[HTTP2_HEADER_LOCATION]) {
         if (redirect === redirects.error) {
-          res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
+          return res.emit('error', new RequestError(`Unexpected redirect, redirect mode is set to '${ redirect }'.`));
         }
 
         if (redirect === redirects.follow) {
@@ -157,7 +158,7 @@ export default async function rekwest(url, options = {}) {
 
           if (res.statusCode !== HTTP_STATUS_SEE_OTHER
             && body === Object(body) && body.pipe?.constructor === Function) {
-            res.emit('error', new RequestError(`Unable to ${ redirect } redirect with body as readable stream.`));
+            return res.emit('error', new RequestError(`Unable to ${ redirect } redirect with streamable body.`));
           }
 
           options.follow--;
@@ -176,7 +177,7 @@ export default async function rekwest(url, options = {}) {
             interval = Number(interval) * 1000 || new Date(interval) - Date.now();
 
             if (interval > options.maxRetryAfter) {
-              res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
+              return res.emit('error', maxRetryAfterError(interval, { cause: mixin(res, options) }));
             }
 
             return setTimeoutPromise(interval).then(() => rekwest(options.url, options).then(resolve, reject));
@@ -240,24 +241,24 @@ export default async function rekwest(url, options = {}) {
 
 Reflect.defineProperty(rekwest, 'stream', {
   enumerable: true,
-  value: function (url, options = {}) {
+  value(url, options = {}) {
+    ({ url } = revise({ options, url }));
     options = preflight({
-      url,
       ...merge(rekwest.defaults, {
         headers: { [HTTP2_HEADER_CONTENT_TYPE]: APPLICATION_OCTET_STREAM },
       }, options),
       redirect: redirects.manual,
     });
 
-    const { h2, url: { protocol } } = options;
-    const { request } = (protocol === 'http:' ? http : https);
+    const { h2 } = options;
+    const { request } = (url.protocol === 'http:' ? http : https);
     let client, req;
 
     if (h2) {
       client = http2.connect(url.origin, options);
       req = client.request(options.headers, options);
     } else {
-      req = request(options.url, options);
+      req = request(url, options);
     }
 
     affix(client, req, options);

package/src/{helpers.mjs → utils.mjs}

@@ -1,14 +1,14 @@
-import { Blob } from 'buffer';
-import http2 from 'http2';
+import { Blob } from 'node:buffer';
+import http2 from 'node:http2';
 import {
   PassThrough,
   Readable,
-} from 'stream';
+} from 'node:stream';
 import {
   promisify,
   types,
-} from 'util';
-import zlib from 'zlib';
+} from 'node:util';
+import zlib from 'node:zlib';
 import { Cookies } from './cookies.mjs';
 import { TimeoutError } from './errors.mjs';
 import { File } from './file.mjs';
@@ -86,6 +86,12 @@ export const affix = (client, req, options) => {
   });
 };
 
+export const collate = (entity, primordial) => {
+  if (entity?.constructor !== primordial) {
+    throw new TypeError('Illegal invocation');
+  }
+};
+
 export const compress = (buf, encoding, { async = false } = {}) => {
   encoding &&= encoding.match(/(?<encoding>\bbr\b|\bdeflate\b|\bgzip\b)/i)?.groups.encoding.toLowerCase();
   const compressor = {
@@ -163,7 +169,8 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
     Object.defineProperties(res, {
       arrayBuffer: {
         enumerable: true,
-        value: function () {
+        value() {
+          collate(this, res?.constructor);
           parse &&= false;
 
           return this.body().then(({ buffer, byteLength, byteOffset }) => buffer.slice(
@@ -174,19 +181,25 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
       },
       blob: {
         enumerable: true,
-        value: function () {
+        value() {
+          collate(this, res?.constructor);
+
           return this.arrayBuffer().then((res) => new Blob([res]));
         },
       },
       json: {
         enumerable: true,
-        value: function () {
+        value() {
+          collate(this, res?.constructor);
+
           return this.text().then((res) => JSON.parse(res));
         },
       },
       text: {
         enumerable: true,
-        value: function () {
+        value() {
+          collate(this, res?.constructor);
+
           return this.blob().then((blob) => blob.text());
         },
       },
@@ -197,8 +210,10 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
     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 = [];
@@ -239,7 +254,7 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
     },
     bodyUsed: {
       enumerable: true,
-      get: function () {
+      get() {
         return this.readableEnded;
       },
     },
@@ -247,8 +262,7 @@ export const mixin = (res, { digest = false, parse = false } = {}) => {
 };
 
 export const preflight = (options) => {
-  const url = options.url = new URL(options.url);
-  const { cookies, h2 = false, method = HTTP2_METHOD_GET, headers, redirected } = options;
+  const { cookies, h2 = false, headers, method = HTTP2_METHOD_GET, redirected, url } = options;
 
   if (h2) {
     options.endStream = [
@@ -316,6 +330,16 @@ export const redirects = {
   manual: 'manual',
 };
 
+export const revise = ({ url, options }) => {
+  if (options.trimTrailingSlashes) {
+    url = `${ url }`.replace(/(?<!:)\/+/gi, '/');
+  }
+
+  url = new URL(url);
+
+  return Object.assign(options, { url });
+};
+
 export async function* tap(value) {
   if (Reflect.has(value, Symbol.asyncIterator)) {
     yield* value;