@whatwg-node/node-fetch 0.0.1-alpha-20221228082016-9ef2266 → 0.0.1-alpha-20221228110205-1d6dcac

package/Body.d.ts

@@ -4,14 +4,28 @@ import { Readable } from 'stream';
 import { PonyfillFormData } from './FormData';
 import { PonyfillReadableStream } from './ReadableStream';
 export type BodyPonyfillInit = XMLHttpRequestBodyInit | Readable | PonyfillReadableStream<Uint8Array>;
+export interface FormDataLimits {
+    fieldNameSize?: number;
+    fieldSize?: number;
+    fields?: number;
+    fileSize?: number;
+    files?: number;
+    parts?: number;
+    headerSize?: number;
+}
+export interface PonyfillBodyOptions {
+    formDataLimits?: FormDataLimits;
+}
 export declare class PonyfillBody implements Body {
     private bodyInit;
+    private options;
     bodyUsed: boolean;
-    readonly body: PonyfillReadableStream<Uint8Array> | null;
+    private _body;
     contentType: string | null;
     contentLength: number | null;
-    constructor(bodyInit: BodyPonyfillInit | null);
+    constructor(bodyInit: BodyPonyfillInit | null, options?: PonyfillBodyOptions);
     private bodyType?;
+    get body(): PonyfillReadableStream<Uint8Array> | null;
     arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<PonyfillBlob>;
     formData(): Promise<PonyfillFormData>;

package/ReadableStream.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Readable, Writable } from 'stream';
+import { Readable } from 'stream';
 export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
     readable: Readable;
     constructor(underlyingSource?: UnderlyingSource<T> | Readable | ReadableStream<T> | PonyfillReadableStream<T>);
@@ -16,6 +16,5 @@ export declare class PonyfillReadableStream<T> implements ReadableStream<T> {
         writable: WritableStream<T>;
         readable: ReadableStream<T2>;
     }): ReadableStream<T2>;
-    pipe(writable: Writable): Writable;
-    on(event: string, listener: (...args: any[]) => void): this;
+    static [Symbol.hasInstance](instance: unknown): instance is PonyfillReadableStream<unknown>;
 }

package/Request.d.ts

@@ -1,6 +1,6 @@
-import { PonyfillBody, BodyPonyfillInit } from './Body';
+import { PonyfillBody, BodyPonyfillInit, PonyfillBodyOptions } from './Body';
 import { PonyfillHeadersInit } from './Headers';
-export type RequestPonyfillInit = Omit<RequestInit, 'body' | 'headers'> & {
+export type RequestPonyfillInit = PonyfillBodyOptions & Omit<RequestInit, 'body' | 'headers'> & {
     body?: BodyPonyfillInit | null;
     headers?: PonyfillHeadersInit;
 };

package/Response.d.ts

@@ -1,6 +1,6 @@
-import { PonyfillBody, BodyPonyfillInit } from './Body';
+import { PonyfillBody, BodyPonyfillInit, PonyfillBodyOptions } from './Body';
 import { PonyfillHeadersInit } from './Headers';
-export type ResponsePonyfilInit = Omit<ResponseInit, 'headers'> & {
+export type ResponsePonyfilInit = PonyfillBodyOptions & Omit<ResponseInit, 'headers'> & {
     url?: string;
     redirected?: boolean;
     headers?: PonyfillHeadersInit;

package/index.js

@@ -2,11 +2,14 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
 const http = require('http');
 const https = require('https');
 const events = require('@whatwg-node/events');
 const buffer = require('buffer');
 const stream = require('stream');
+const busboy = _interopDefault(require('busboy'));
 const url = require('url');
 const fs = require('fs');
 
@@ -201,13 +204,8 @@ class PonyfillReadableStream {
         this.pipeTo(writable);
         return readable;
     }
-    // Trick Fastify
-    pipe(writable) {
-        return this.readable.pipe(writable);
-    }
-    on(event, listener) {
-        this.readable.on(event, listener);
-        return this;
+    static [Symbol.hasInstance](instance) {
+        return instance != null && typeof instance === 'object' && 'getReader' in instance;
     }
 }
 
@@ -296,39 +294,40 @@ var BodyInitType;
     BodyInitType["Readable"] = "Readable";
 })(BodyInitType || (BodyInitType = {}));
 class PonyfillBody {
-    constructor(bodyInit) {
+    constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
+        this.options = options;
         this.bodyUsed = false;
-        this.body = null;
+        this._body = null;
         this.contentType = null;
         this.contentLength = null;
         if (this.bodyInit == null) {
-            this.body = null;
+            this._body = null;
         }
         else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            this.body = new PonyfillReadableStream(stream.Readable.from(buffer));
+            this._body = new PonyfillReadableStream(stream.Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            this.body = this.bodyInit;
+            this._body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            this.body = new PonyfillReadableStream(blobStream);
+            this._body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            this.body = new PonyfillReadableStream({
+            this._body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -363,21 +362,46 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
+            this._body = new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
+            this._body = new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof stream.Readable) {
             this.bodyType = BodyInitType.Readable;
-            this.body = new PonyfillReadableStream(this.bodyInit);
+            this._body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
         }
     }
+    get body() {
+        if (this._body != null) {
+            const ponyfillReadableStream = this._body;
+            const readable = this._body.readable;
+            return new Proxy(this._body.readable, {
+                get(_, prop) {
+                    if (prop in ponyfillReadableStream) {
+                        const ponyfillReadableStreamProp = ponyfillReadableStream[prop];
+                        if (typeof ponyfillReadableStreamProp === 'function') {
+                            return ponyfillReadableStreamProp.bind(ponyfillReadableStream);
+                        }
+                        return ponyfillReadableStreamProp;
+                    }
+                    if (prop in readable) {
+                        const readableProp = readable[prop];
+                        if (typeof readableProp === 'function') {
+                            return readableProp.bind(readable);
+                        }
+                        return readableProp;
+                    }
+                }
+            });
+        }
+        return null;
+    }
     async arrayBuffer() {
         if (this.bodyType === BodyInitType.ArrayBuffer) {
             return this.bodyInit;
@@ -390,18 +414,73 @@ class PonyfillBody {
             return this.bodyInit;
         }
         const chunks = [];
-        if (this.body) {
-            for await (const chunk of this.body.readable) {
+        if (this._body) {
+            for await (const chunk of this._body.readable) {
                 chunks.push(chunk);
             }
         }
         return new PonyfillBlob(chunks);
     }
-    async formData() {
+    formData() {
         if (this.bodyType === BodyInitType.FormData) {
-            return this.bodyInit;
-        }
-        throw new Error('Not implemented');
+            return Promise.resolve(this.bodyInit);
+        }
+        const formData = new PonyfillFormData();
+        if (this._body == null) {
+            return Promise.resolve(formData);
+        }
+        const formDataLimits = this.options.formDataLimits;
+        return new Promise((resolve, reject) => {
+            var _a;
+            const bb = busboy({
+                headers: {
+                    'content-type': this.contentType || ''
+                },
+                limits: formDataLimits,
+                defParamCharset: 'utf-8'
+            });
+            bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
+                if (nameTruncated) {
+                    reject(new Error(`Field name size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldNameSize} bytes`));
+                }
+                if (valueTruncated) {
+                    reject(new Error(`Field value size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldSize} bytes`));
+                }
+                formData.set(name, value);
+            });
+            bb.on('fieldsLimit', () => {
+                reject(new Error(`Fields limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fields}`));
+            });
+            bb.on('file', (name, fileStream, { filename, mimeType }) => {
+                const chunks = [];
+                fileStream.on('limit', () => {
+                    reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                });
+                fileStream.on('data', (chunk) => {
+                    chunks.push(Buffer.from(chunk));
+                });
+                fileStream.on('close', () => {
+                    if (fileStream.truncated) {
+                        reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                    }
+                    const file = new PonyfillFile(chunks, filename, { type: mimeType });
+                    formData.set(name, file);
+                });
+            });
+            bb.on('filesLimit', () => {
+                reject(new Error(`Files limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.files}`));
+            });
+            bb.on('partsLimit', () => {
+                reject(new Error(`Parts limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.parts}`));
+            });
+            bb.on('close', () => {
+                resolve(formData);
+            });
+            bb.on('error', err => {
+                reject(err);
+            });
+            (_a = this._body) === null || _a === void 0 ? void 0 : _a.readable.pipe(bb);
+        });
     }
     async json() {
         const text = await this.text();
@@ -418,8 +497,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Readable) {
             return this.bodyInit;
         }
-        if (this.body != null) {
-            return this.body.readable;
+        if (this._body != null) {
+            return this._body.readable;
         }
         return null;
     }
@@ -520,7 +599,7 @@ class PonyfillRequest extends PonyfillBody {
             bodyInit = options.body || null;
             requestInit = options;
         }
-        super(bodyInit);
+        super(bodyInit, options);
         this.destination = '';
         this.priority = 'auto';
         this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
@@ -540,16 +619,24 @@ class PonyfillRequest extends PonyfillBody {
                 this.headers.set('connection', 'keep-alive');
             }
         }
-        if (!this.headers.has('content-type')) {
+        const contentTypeInHeaders = this.headers.get('content-type');
+        if (!contentTypeInHeaders) {
             if (this.contentType) {
                 this.headers.set('content-type', this.contentType);
             }
         }
-        if (!this.headers.has('content-length')) {
+        else {
+            this.contentType = contentTypeInHeaders;
+        }
+        const contentLengthInHeaders = this.headers.get('content-length');
+        if (!contentLengthInHeaders) {
             if (this.contentLength) {
                 this.headers.set('content-length', this.contentLength.toString());
             }
         }
+        else {
+            this.contentLength = parseInt(contentLengthInHeaders, 10);
+        }
     }
     clone() {
         return new Request(this);
@@ -558,7 +645,7 @@ class PonyfillRequest extends PonyfillBody {
 
 class PonyfillResponse extends PonyfillBody {
     constructor(body, init) {
-        super(body || null);
+        super(body || null, init);
         this.headers = new PonyfillHeaders();
         this.status = 200;
         this.statusText = 'OK';
@@ -648,7 +735,7 @@ const fetchPonyfill = (info, init) => {
                 return;
             }
             const requestFn = getRequestFnForProtocol(protocol);
-            const nodeReadable = fetchRequest.readable();
+            const nodeReadable = fetchRequest.body;
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();

package/index.mjs

@@ -3,6 +3,7 @@ import { request } from 'https';
 import { EventTarget, CustomEvent } from '@whatwg-node/events';
 import { Blob } from 'buffer';
 import { Readable } from 'stream';
+import busboy from 'busboy';
 import { fileURLToPath } from 'url';
 import { createReadStream } from 'fs';
 
@@ -197,13 +198,8 @@ class PonyfillReadableStream {
         this.pipeTo(writable);
         return readable;
     }
-    // Trick Fastify
-    pipe(writable) {
-        return this.readable.pipe(writable);
-    }
-    on(event, listener) {
-        this.readable.on(event, listener);
-        return this;
+    static [Symbol.hasInstance](instance) {
+        return instance != null && typeof instance === 'object' && 'getReader' in instance;
     }
 }
 
@@ -292,39 +288,40 @@ var BodyInitType;
     BodyInitType["Readable"] = "Readable";
 })(BodyInitType || (BodyInitType = {}));
 class PonyfillBody {
-    constructor(bodyInit) {
+    constructor(bodyInit, options = {}) {
         this.bodyInit = bodyInit;
+        this.options = options;
         this.bodyUsed = false;
-        this.body = null;
+        this._body = null;
         this.contentType = null;
         this.contentLength = null;
         if (this.bodyInit == null) {
-            this.body = null;
+            this._body = null;
         }
         else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            this.body = new PonyfillReadableStream(Readable.from(buffer));
+            this._body = new PonyfillReadableStream(Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            this.body = this.bodyInit;
+            this._body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            this.body = new PonyfillReadableStream(blobStream);
+            this._body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            this.body = new PonyfillReadableStream({
+            this._body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -359,21 +356,46 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(Readable.from(this.bodyInit));
+            this._body = new PonyfillReadableStream(Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            this.body = new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
+            this._body = new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof Readable) {
             this.bodyType = BodyInitType.Readable;
-            this.body = new PonyfillReadableStream(this.bodyInit);
+            this._body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
         }
     }
+    get body() {
+        if (this._body != null) {
+            const ponyfillReadableStream = this._body;
+            const readable = this._body.readable;
+            return new Proxy(this._body.readable, {
+                get(_, prop) {
+                    if (prop in ponyfillReadableStream) {
+                        const ponyfillReadableStreamProp = ponyfillReadableStream[prop];
+                        if (typeof ponyfillReadableStreamProp === 'function') {
+                            return ponyfillReadableStreamProp.bind(ponyfillReadableStream);
+                        }
+                        return ponyfillReadableStreamProp;
+                    }
+                    if (prop in readable) {
+                        const readableProp = readable[prop];
+                        if (typeof readableProp === 'function') {
+                            return readableProp.bind(readable);
+                        }
+                        return readableProp;
+                    }
+                }
+            });
+        }
+        return null;
+    }
     async arrayBuffer() {
         if (this.bodyType === BodyInitType.ArrayBuffer) {
             return this.bodyInit;
@@ -386,18 +408,73 @@ class PonyfillBody {
             return this.bodyInit;
         }
         const chunks = [];
-        if (this.body) {
-            for await (const chunk of this.body.readable) {
+        if (this._body) {
+            for await (const chunk of this._body.readable) {
                 chunks.push(chunk);
             }
         }
         return new PonyfillBlob(chunks);
     }
-    async formData() {
+    formData() {
         if (this.bodyType === BodyInitType.FormData) {
-            return this.bodyInit;
-        }
-        throw new Error('Not implemented');
+            return Promise.resolve(this.bodyInit);
+        }
+        const formData = new PonyfillFormData();
+        if (this._body == null) {
+            return Promise.resolve(formData);
+        }
+        const formDataLimits = this.options.formDataLimits;
+        return new Promise((resolve, reject) => {
+            var _a;
+            const bb = busboy({
+                headers: {
+                    'content-type': this.contentType || ''
+                },
+                limits: formDataLimits,
+                defParamCharset: 'utf-8'
+            });
+            bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
+                if (nameTruncated) {
+                    reject(new Error(`Field name size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldNameSize} bytes`));
+                }
+                if (valueTruncated) {
+                    reject(new Error(`Field value size exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fieldSize} bytes`));
+                }
+                formData.set(name, value);
+            });
+            bb.on('fieldsLimit', () => {
+                reject(new Error(`Fields limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fields}`));
+            });
+            bb.on('file', (name, fileStream, { filename, mimeType }) => {
+                const chunks = [];
+                fileStream.on('limit', () => {
+                    reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                });
+                fileStream.on('data', (chunk) => {
+                    chunks.push(Buffer.from(chunk));
+                });
+                fileStream.on('close', () => {
+                    if (fileStream.truncated) {
+                        reject(new Error(`File size limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.fileSize} bytes`));
+                    }
+                    const file = new PonyfillFile(chunks, filename, { type: mimeType });
+                    formData.set(name, file);
+                });
+            });
+            bb.on('filesLimit', () => {
+                reject(new Error(`Files limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.files}`));
+            });
+            bb.on('partsLimit', () => {
+                reject(new Error(`Parts limit exceeded: ${formDataLimits === null || formDataLimits === void 0 ? void 0 : formDataLimits.parts}`));
+            });
+            bb.on('close', () => {
+                resolve(formData);
+            });
+            bb.on('error', err => {
+                reject(err);
+            });
+            (_a = this._body) === null || _a === void 0 ? void 0 : _a.readable.pipe(bb);
+        });
     }
     async json() {
         const text = await this.text();
@@ -414,8 +491,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Readable) {
             return this.bodyInit;
         }
-        if (this.body != null) {
-            return this.body.readable;
+        if (this._body != null) {
+            return this._body.readable;
         }
         return null;
     }
@@ -516,7 +593,7 @@ class PonyfillRequest extends PonyfillBody {
             bodyInit = options.body || null;
             requestInit = options;
         }
-        super(bodyInit);
+        super(bodyInit, options);
         this.destination = '';
         this.priority = 'auto';
         this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
@@ -536,16 +613,24 @@ class PonyfillRequest extends PonyfillBody {
                 this.headers.set('connection', 'keep-alive');
             }
         }
-        if (!this.headers.has('content-type')) {
+        const contentTypeInHeaders = this.headers.get('content-type');
+        if (!contentTypeInHeaders) {
             if (this.contentType) {
                 this.headers.set('content-type', this.contentType);
             }
         }
-        if (!this.headers.has('content-length')) {
+        else {
+            this.contentType = contentTypeInHeaders;
+        }
+        const contentLengthInHeaders = this.headers.get('content-length');
+        if (!contentLengthInHeaders) {
             if (this.contentLength) {
                 this.headers.set('content-length', this.contentLength.toString());
             }
         }
+        else {
+            this.contentLength = parseInt(contentLengthInHeaders, 10);
+        }
     }
     clone() {
         return new Request(this);
@@ -554,7 +639,7 @@ class PonyfillRequest extends PonyfillBody {
 
 class PonyfillResponse extends PonyfillBody {
     constructor(body, init) {
-        super(body || null);
+        super(body || null, init);
         this.headers = new PonyfillHeaders();
         this.status = 200;
         this.statusText = 'OK';
@@ -644,7 +729,7 @@ const fetchPonyfill = (info, init) => {
                 return;
             }
             const requestFn = getRequestFnForProtocol(protocol);
-            const nodeReadable = fetchRequest.readable();
+            const nodeReadable = fetchRequest.body;
             const nodeHeaders = getHeadersObj(fetchRequest.headers);
             const abortListener = function abortListener(event) {
                 nodeRequest.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20221228082016-9ef2266",
+  "version": "0.0.1-alpha-20221228110205-1d6dcac",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@whatwg-node/events": "0.0.2",
+    "busboy": "1.6.0",
     "tslib": "^2.3.1"
   },
   "repository": {