@remix-run/node 1.4.2 → 1.5.0-pre.1

package/base64.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/crypto.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/fetch.d.ts

@@ -1,24 +1,23 @@
-import type AbortController from "abort-controller";
-import type { RequestInfo, RequestInit, Response } from "node-fetch";
-import { Request as BaseNodeRequest } from "node-fetch";
-import type { UploadHandler } from "./formData";
-export type { HeadersInit, RequestInfo, ResponseInit } from "node-fetch";
-export { Headers, Response } from "node-fetch";
-interface NodeRequestInit extends RequestInit {
-    abortController?: AbortController;
-}
-declare class NodeRequest extends BaseNodeRequest {
-    private abortController?;
-    constructor(input: RequestInfo, init?: NodeRequestInit | undefined);
-    formData(uploadHandler?: UploadHandler): Promise<FormData>;
+/// <reference types="node" />
+import type { Readable } from "stream";
+import { fetch as webFetch, Headers as WebHeaders, Request as WebRequest, Response as WebResponse } from "@remix-run/web-fetch";
+export { FormData } from "@remix-run/web-fetch";
+export { File, Blob } from "@remix-run/web-file";
+declare type NodeHeadersInit = ConstructorParameters<typeof WebHeaders>[0];
+declare type NodeResponseInit = NonNullable<ConstructorParameters<typeof WebResponse>[1]>;
+declare type NodeRequestInfo = ConstructorParameters<typeof WebRequest>[0] | NodeRequest;
+declare type NodeRequestInit = Omit<NonNullable<ConstructorParameters<typeof WebRequest>[1]>, "body"> & {
+    body?: NonNullable<ConstructorParameters<typeof WebRequest>[1]>["body"] | Readable;
+};
+export type { NodeHeadersInit as HeadersInit, NodeRequestInfo as RequestInfo, NodeRequestInit as RequestInit, NodeResponseInit as ResponseInit, };
+declare class NodeRequest extends WebRequest {
+    constructor(info: NodeRequestInfo, init?: NodeRequestInit);
+    get headers(): WebHeaders;
     clone(): NodeRequest;
 }
-export { NodeRequest as Request, NodeRequestInit as RequestInit };
-/**
- * A `fetch` function for node that matches the web Fetch API. Based on
- * `node-fetch`.
- *
- * @see https://github.com/node-fetch/node-fetch
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
- */
-export declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response>;
+declare class NodeResponse extends WebResponse {
+    get headers(): WebHeaders;
+    clone(): NodeResponse;
+}
+export { WebHeaders as Headers, NodeRequest as Request, NodeResponse as Response, };
+export declare const fetch: typeof webFetch;

package/fetch.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,137 +12,60 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var stream = require('stream');
-var FormStream = require('form-data');
-var nodeFetch = require('node-fetch');
-var formData = require('./formData.js');
-var parseMultipartFormData = require('./parseMultipartFormData.js');
+var webFetch = require('@remix-run/web-fetch');
+var webFile = require('@remix-run/web-file');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var FormStream__default = /*#__PURE__*/_interopDefaultLegacy(FormStream);
-var nodeFetch__default = /*#__PURE__*/_interopDefaultLegacy(nodeFetch);
-
-function formDataToStream(formData$1) {
-  let formStream = new FormStream__default["default"]();
-
-  function toNodeStream(input) {
-    // The input is either a Node stream or a web stream, if it has
-    //  a `on` method it's a node stream so we can just return it
-    if (typeof (input === null || input === void 0 ? void 0 : input.on) === "function") {
-      return input;
-    }
-
-    let passthrough = new stream.PassThrough();
-    let stream$1 = input;
-    let reader = stream$1.getReader();
-    reader.read().then(async ({
-      done,
-      value
-    }) => {
-      while (!done) {
-        passthrough.push(value);
-        ({
-          done,
-          value
-        } = await reader.read());
-      }
-
-      passthrough.push(null);
-    }).catch(error => {
-      passthrough.emit("error", error);
-    });
-    return passthrough;
+class NodeRequest extends webFetch.Request {
+  constructor(info, init) {
+    super(info, init);
   }
 
-  for (let [key, value] of formData$1.entries()) {
-    if (typeof value === "string") {
-      formStream.append(key, value);
-    } else if (formData.isFile(value)) {
-      let stream = toNodeStream(value.stream());
-      formStream.append(key, stream, {
-        filename: value.name,
-        contentType: value.type,
-        knownLength: value.size
-      });
-    } else {
-      let file = value;
-      let stream = toNodeStream(file.stream());
-      formStream.append(key, stream, {
-        filename: "unknown"
-      });
-    }
+  get headers() {
+    return super.headers;
   }
 
-  return formStream;
-}
-
-class NodeRequest extends nodeFetch.Request {
-  constructor(input, init) {
-    var _init;
-
-    if (((_init = init) === null || _init === void 0 ? void 0 : _init.body) instanceof formData.FormData) {
-      init = { ...init,
-        body: formDataToStream(init.body)
-      };
-    }
-
-    super(input, init);
-    let anyInput = input;
-    let anyInit = init;
-    this.abortController = (anyInput === null || anyInput === void 0 ? void 0 : anyInput.abortController) || (anyInit === null || anyInit === void 0 ? void 0 : anyInit.abortController);
+  clone() {
+    return super.clone();
   }
 
-  async formData(uploadHandler) {
-    let contentType = this.headers.get("Content-Type");
-
-    if (contentType && (/application\/x-www-form-urlencoded/.test(contentType) || /multipart\/form-data/.test(contentType))) {
-      return await parseMultipartFormData.internalParseFormData(contentType, this.body, this.abortController, uploadHandler);
-    }
+}
 
-    throw new Error("Invalid MIME type");
+class NodeResponse extends webFetch.Response {
+  get headers() {
+    return super.headers;
   }
 
   clone() {
-    return new NodeRequest(this);
+    return super.clone();
   }
 
 }
-/**
- * A `fetch` function for node that matches the web Fetch API. Based on
- * `node-fetch`.
- *
- * @see https://github.com/node-fetch/node-fetch
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
- */
-
-function fetch(input, init) {
-  var _init2;
-
+const fetch = (info, init) => {
   init = {
+    // Disable compression handling so people can return the result of a fetch
+    // directly in the loader without messing with the Content-Encoding header.
     compress: false,
     ...init
   };
+  return webFetch.fetch(info, init);
+};
 
-  if (((_init2 = init) === null || _init2 === void 0 ? void 0 : _init2.body) instanceof formData.FormData) {
-    init = { ...init,
-      body: formDataToStream(init.body)
-    };
-  } // Default to { compress: false } so responses can be proxied through more
-  // easily in loaders. Otherwise the response stream encoding will not match
-  // the Content-Encoding response header.
-
-
-  return nodeFetch__default["default"](input, init);
-}
-
+Object.defineProperty(exports, 'FormData', {
+  enumerable: true,
+  get: function () { return webFetch.FormData; }
+});
 Object.defineProperty(exports, 'Headers', {
   enumerable: true,
-  get: function () { return nodeFetch.Headers; }
+  get: function () { return webFetch.Headers; }
+});
+Object.defineProperty(exports, 'Blob', {
+  enumerable: true,
+  get: function () { return webFile.Blob; }
 });
-Object.defineProperty(exports, 'Response', {
+Object.defineProperty(exports, 'File', {
   enumerable: true,
-  get: function () { return nodeFetch.Response; }
+  get: function () { return webFile.File; }
 });
 exports.Request = NodeRequest;
+exports.Response = NodeResponse;
 exports.fetch = fetch;

package/globals.d.ts

@@ -14,6 +14,8 @@ declare global {
             Response: typeof Response;
             fetch: typeof fetch;
             FormData: typeof FormData;
+            ReadableStream: typeof ReadableStream;
+            WritableStream: typeof WritableStream;
         }
     }
 }

package/globals.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,22 +12,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var file = require('@web-std/file');
+var webStream = require('@remix-run/web-stream');
 var base64 = require('./base64.js');
 var fetch = require('./fetch.js');
-var formData = require('./formData.js');
-var nodeFetch = require('node-fetch');
+var webFile = require('@remix-run/web-file');
+var webFetch = require('@remix-run/web-fetch');
 
 function installGlobals() {
   global.atob = base64.atob;
   global.btoa = base64.btoa;
-  global.Blob = file.Blob;
-  global.File = file.File;
-  global.Headers = nodeFetch.Headers;
+  global.Blob = webFile.Blob;
+  global.File = webFile.File;
+  global.Headers = webFetch.Headers;
   global.Request = fetch.Request;
-  global.Response = nodeFetch.Response;
+  global.Response = fetch.Response;
   global.fetch = fetch.fetch;
-  global.FormData = formData.FormData;
+  global.FormData = webFetch.FormData;
+  global.ReadableStream = webStream.ReadableStream;
+  global.WritableStream = webStream.WritableStream;
 }
 
 exports.installGlobals = installGlobals;

package/implementations.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/index.d.ts

@@ -1,13 +1,10 @@
 export { AbortController } from "abort-controller";
 export type { HeadersInit, RequestInfo, RequestInit, ResponseInit, } from "./fetch";
-export { Headers, Request, Response, fetch } from "./fetch";
-export { FormData } from "./formData";
-export type { UploadHandler, UploadHandlerArgs } from "./formData";
+export { fetch, FormData, Headers, Request, Response } from "./fetch";
 export { installGlobals } from "./globals";
-export { parseMultipartFormData as unstable_parseMultipartFormData } from "./parseMultipartFormData";
 export { createFileSessionStorage } from "./sessions/fileStorage";
 export { createFileUploadHandler as unstable_createFileUploadHandler, NodeOnDiskFile, } from "./upload/fileUploadHandler";
-export { createMemoryUploadHandler as unstable_createMemoryUploadHandler } from "./upload/memoryUploadHandler";
 export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSessionStorage, } from "./implementations";
-export { createRequestHandler, createSession, isCookie, isSession, json, redirect, } from "@remix-run/server-runtime";
-export type { ActionFunction, AppData, AppLoadContext, CreateRequestHandlerFunction, Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, DataFunctionArgs, EntryContext, ErrorBoundaryComponent, HandleDataRequestFunction, HandleDocumentRequestFunction, HeadersFunction, HtmlLinkDescriptor, HtmlMetaDescriptor, LinkDescriptor, LinksFunction, LoaderFunction, MetaDescriptor, MetaFunction, PageLinkDescriptor, RequestHandler, RouteComponent, RouteHandle, ServerBuild, ServerEntryModule, Session, SessionData, SessionIdStorageStrategy, SessionStorage, } from "@remix-run/server-runtime";
+export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable, } from "./stream";
+export { createRequestHandler, createSession, isCookie, isSession, json, MaxPartSizeExceededError, redirect, unstable_composeUploadHandlers, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/server-runtime";
+export type { ActionFunction, AppData, AppLoadContext, Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, CreateRequestHandlerFunction, DataFunctionArgs, EntryContext, ErrorBoundaryComponent, HandleDataRequestFunction, HandleDocumentRequestFunction, HeadersFunction, HtmlLinkDescriptor, HtmlMetaDescriptor, LinkDescriptor, LinksFunction, LoaderFunction, MemoryUploadHandlerFilterArgs, MemoryUploadHandlerOptions, MetaDescriptor, MetaFunction, PageLinkDescriptor, RequestHandler, RouteComponent, RouteHandle, ServerBuild, ServerEntryModule, Session, SessionData, SessionIdStorageStrategy, SessionStorage, UploadHandler, UploadHandlerPart, } from "@remix-run/server-runtime";

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,15 +15,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var sourceMapSupport = require('source-map-support');
 var abortController = require('abort-controller');
 var fetch = require('./fetch.js');
-var formData = require('./formData.js');
 var globals = require('./globals.js');
-var parseMultipartFormData = require('./parseMultipartFormData.js');
 var fileStorage = require('./sessions/fileStorage.js');
 var fileUploadHandler = require('./upload/fileUploadHandler.js');
-var memoryUploadHandler = require('./upload/memoryUploadHandler.js');
 var implementations = require('./implementations.js');
+var stream = require('./stream.js');
 var serverRuntime = require('@remix-run/server-runtime');
-var nodeFetch = require('node-fetch');
+var webFetch = require('@remix-run/web-fetch');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -36,18 +34,24 @@ Object.defineProperty(exports, 'AbortController', {
   get: function () { return abortController.AbortController; }
 });
 exports.Request = fetch.Request;
+exports.Response = fetch.Response;
 exports.fetch = fetch.fetch;
-exports.FormData = formData.FormData;
 exports.installGlobals = globals.installGlobals;
-exports.unstable_parseMultipartFormData = parseMultipartFormData.parseMultipartFormData;
 exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
 exports.NodeOnDiskFile = fileUploadHandler.NodeOnDiskFile;
 exports.unstable_createFileUploadHandler = fileUploadHandler.createFileUploadHandler;
-exports.unstable_createMemoryUploadHandler = memoryUploadHandler.createMemoryUploadHandler;
 exports.createCookie = implementations.createCookie;
 exports.createCookieSessionStorage = implementations.createCookieSessionStorage;
 exports.createMemorySessionStorage = implementations.createMemorySessionStorage;
 exports.createSessionStorage = implementations.createSessionStorage;
+exports.createReadableStreamFromReadable = stream.createReadableStreamFromReadable;
+exports.readableStreamToString = stream.readableStreamToString;
+exports.writeAsyncIterableToWritable = stream.writeAsyncIterableToWritable;
+exports.writeReadableStreamToWritable = stream.writeReadableStreamToWritable;
+Object.defineProperty(exports, 'MaxPartSizeExceededError', {
+  enumerable: true,
+  get: function () { return serverRuntime.MaxPartSizeExceededError; }
+});
 Object.defineProperty(exports, 'createRequestHandler', {
   enumerable: true,
   get: function () { return serverRuntime.createRequestHandler; }
@@ -72,11 +76,23 @@ Object.defineProperty(exports, 'redirect', {
   enumerable: true,
   get: function () { return serverRuntime.redirect; }
 });
-Object.defineProperty(exports, 'Headers', {
+Object.defineProperty(exports, 'unstable_composeUploadHandlers', {
+  enumerable: true,
+  get: function () { return serverRuntime.unstable_composeUploadHandlers; }
+});
+Object.defineProperty(exports, 'unstable_createMemoryUploadHandler', {
   enumerable: true,
-  get: function () { return nodeFetch.Headers; }
+  get: function () { return serverRuntime.unstable_createMemoryUploadHandler; }
 });
-Object.defineProperty(exports, 'Response', {
+Object.defineProperty(exports, 'unstable_parseMultipartFormData', {
+  enumerable: true,
+  get: function () { return serverRuntime.unstable_parseMultipartFormData; }
+});
+Object.defineProperty(exports, 'FormData', {
+  enumerable: true,
+  get: function () { return webFetch.FormData; }
+});
+Object.defineProperty(exports, 'Headers', {
   enumerable: true,
-  get: function () { return nodeFetch.Response; }
+  get: function () { return webFetch.Headers; }
 });

package/magicExports/esm/remix.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/magicExports/remix.d.ts

@@ -1,2 +1,2 @@
 export { createCookie, createSessionStorage, createCookieSessionStorage, createMemorySessionStorage, createFileSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/node";
-export type { UploadHandler, UploadHandlerArgs } from "@remix-run/node";
+export type { UploadHandler, UploadHandlerPart } from "@remix-run/node";

package/magicExports/remix.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remix-run/node",
   "description": "Node.js platform abstractions for Remix",
-  "version": "1.4.2",
+  "version": "1.5.0-pre.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -12,20 +12,17 @@
     "url": "https://github.com/remix-run/remix/issues"
   },
   "dependencies": {
-    "@remix-run/server-runtime": "1.4.2",
-    "@types/busboy": "^0.3.1",
-    "@types/node-fetch": "^2.5.12",
-    "@web-std/file": "^3.0.0",
+    "@remix-run/server-runtime": "1.5.0-pre.1",
+    "@remix-run/web-fetch": "^4.1.3",
+    "@remix-run/web-file": "^3.0.2",
+    "@remix-run/web-stream": "^1.0.3",
+    "@web3-storage/multipart-parser": "^1.0.0",
     "abort-controller": "^3.0.0",
-    "blob-stream": "^0.1.3",
-    "busboy": "^0.3.1",
     "cookie-signature": "^1.1.0",
-    "form-data": "^4.0.0",
-    "node-fetch": "^2.6.1",
-    "source-map-support": "^0.5.21"
+    "source-map-support": "^0.5.21",
+    "stream-slice": "^0.1.2"
   },
   "devDependencies": {
-    "@types/blob-stream": "^0.1.30",
     "@types/cookie-signature": "^1.0.3",
     "@types/source-map-support": "^0.5.4"
   },

package/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.4.2
+ * @remix-run/node v1.5.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/stream.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="node" />
+import type { Readable, Writable } from "stream";
+export declare function writeReadableStreamToWritable(stream: ReadableStream, writable: Writable): Promise<void>;
+export declare function writeAsyncIterableToWritable(iterable: AsyncIterable<Uint8Array>, writable: Writable): Promise<void>;
+export declare function readableStreamToString(stream: ReadableStream<Uint8Array>, encoding?: BufferEncoding): Promise<string>;
+export declare const createReadableStreamFromReadable: (source: Readable & {
+    readableHighWaterMark?: number;
+}) => ReadableStream<Uint8Array>;

package/stream.js

@@ -0,0 +1,167 @@
+/**
+ * @remix-run/node v1.5.0-pre.1
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var stream = require('stream');
+
+async function writeReadableStreamToWritable(stream, writable) {
+  let reader = stream.getReader();
+
+  async function read() {
+    let {
+      done,
+      value
+    } = await reader.read();
+
+    if (done) {
+      writable.end();
+      return;
+    }
+
+    writable.write(value);
+    await read();
+  }
+
+  try {
+    await read();
+  } catch (error) {
+    writable.destroy(error);
+    throw error;
+  }
+}
+async function writeAsyncIterableToWritable(iterable, writable) {
+  try {
+    for await (let chunk of iterable) {
+      writable.write(chunk);
+    }
+
+    writable.end();
+  } catch (error) {
+    writable.destroy(error);
+    throw error;
+  }
+}
+async function readableStreamToString(stream, encoding) {
+  let reader = stream.getReader();
+  let chunks = [];
+
+  async function read() {
+    let {
+      done,
+      value
+    } = await reader.read();
+
+    if (done) {
+      return;
+    } else if (value) {
+      chunks.push(value);
+    }
+
+    await read();
+  }
+
+  await read();
+  return Buffer.concat(chunks).toString(encoding);
+}
+const createReadableStreamFromReadable = source => {
+  let pump = new StreamPump(source);
+  let stream = new ReadableStream(pump, pump);
+  return stream;
+};
+
+class StreamPump {
+  constructor(stream$1) {
+    this.highWaterMark = stream$1.readableHighWaterMark || new stream.Stream.Readable().readableHighWaterMark;
+    this.accumalatedSize = 0;
+    this.stream = stream$1;
+    this.enqueue = this.enqueue.bind(this);
+    this.error = this.error.bind(this);
+    this.close = this.close.bind(this);
+  }
+
+  size(chunk) {
+    return (chunk === null || chunk === void 0 ? void 0 : chunk.byteLength) || 0;
+  }
+
+  start(controller) {
+    this.controller = controller;
+    this.stream.on("data", this.enqueue);
+    this.stream.once("error", this.error);
+    this.stream.once("end", this.close);
+    this.stream.once("close", this.close);
+  }
+
+  pull() {
+    this.resume();
+  }
+
+  cancel(reason) {
+    if (this.stream.destroy) {
+      this.stream.destroy(reason);
+    }
+
+    this.stream.off("data", this.enqueue);
+    this.stream.off("error", this.error);
+    this.stream.off("end", this.close);
+    this.stream.off("close", this.close);
+  }
+
+  enqueue(chunk) {
+    if (this.controller) {
+      try {
+        let bytes = chunk instanceof Uint8Array ? chunk : Buffer.from(chunk);
+        let available = (this.controller.desiredSize || 0) - bytes.byteLength;
+        this.controller.enqueue(bytes);
+
+        if (available <= 0) {
+          this.pause();
+        }
+      } catch (error) {
+        this.controller.error(new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
+        this.cancel();
+      }
+    }
+  }
+
+  pause() {
+    if (this.stream.pause) {
+      this.stream.pause();
+    }
+  }
+
+  resume() {
+    if (this.stream.readable && this.stream.resume) {
+      this.stream.resume();
+    }
+  }
+
+  close() {
+    if (this.controller) {
+      this.controller.close();
+      delete this.controller;
+    }
+  }
+
+  error(error) {
+    if (this.controller) {
+      this.controller.error(error);
+      delete this.controller;
+    }
+  }
+
+}
+
+exports.createReadableStreamFromReadable = createReadableStreamFromReadable;
+exports.readableStreamToString = readableStreamToString;
+exports.writeAsyncIterableToWritable = writeAsyncIterableToWritable;
+exports.writeReadableStreamToWritable = writeReadableStreamToWritable;