@trpc/server 11.0.0-rc.345 → 11.0.0-rc.346

package/dist/adapters/node-http/content-type/form-data/index.d.ts

@@ -1,12 +1,5 @@
-/**
- * Copyright 2021 Remix Software Inc.
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
 import type { AnyRouter } from '../../../../@trpc/server';
 import type { NodeHTTPRequest, NodeHTTPResponse } from '../../types';
 import type { NodeHTTPContentTypeHandler } from '../types';
 export declare const getFormDataContentTypeHandler: <TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse>() => NodeHTTPContentTypeHandler<TRouter, TRequest, TResponse>;
-export { MaxBodySizeExceededError, MaxPartSizeExceededError, type UploadHandler, } from './uploadHandler';
 //# sourceMappingURL=index.d.ts.map

package/dist/adapters/node-http/content-type/form-data/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AA2F3D,eAAO,MAAM,6BAA6B,EAAE,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAoB5D,CAAC;AAEH,OAAO,EACL,wBAAwB,EACxB,wBAAwB,EACxB,KAAK,aAAa,GACnB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,6BAA6B,EAAE,CAC1C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CA6B5D,CAAC"}

package/dist/adapters/node-http/content-type/form-data/index.js

@@ -1,96 +1,7 @@
 'use strict';
 
-var fs = require('node:fs/promises');
 var node_stream = require('node:stream');
-var multipartParser = require('@web3-storage/multipart-parser');
-var fileUploadHandler = require('./fileUploadHandler.js');
-var memoryUploadHandler = require('./memoryUploadHandler.js');
-var uploadHandler = require('./uploadHandler.js');
 
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
-
-const utfTextDecoder = new TextDecoder('utf-8');
-/**
- * Allows you to handle multipart forms (file uploads) for your app.
- * Request body parts with a 'filename' property will be treated as files.
- * The rest will be treated as text.
- * @param request The incoming Node HTTP request
- * @param uploadHandler A function that handles file uploads and returns a value to be used in the request body. If uploaded to disk, the returned value is a NodeOnDiskFile. If uploaded to memory, the returned value is a File.
- * @param maxBodySize The maximum size of the request body in bytes. Defaults to Infinity.
- *
- * @link https://remix.run/utils/parse-multipart-form-data
- */ async function parseMultipartFormData(request, uploadHandler$1, maxBodySize = Infinity) {
-    const contentType = request.headers['content-type'] ?? '';
-    const [type, boundary] = contentType.split(/\s*;\s*boundary=/);
-    if (!boundary || type !== 'multipart/form-data') {
-        throw new TypeError('Could not parse content as FormData.');
-    }
-    const formData = new FormData();
-    const parts = multipartParser.streamMultipart(node_stream.Readable.toWeb(request), boundary);
-    let currentBodySize = 0;
-    const nodeOnDiskFiles = [];
-    try {
-        for await (const part of parts){
-            if (part.done) break;
-            if (typeof part.filename === 'string') {
-                // This is a file, so the uploadHandler function will be called
-                // only pass basename as the multipart/form-data spec recommends
-                // https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-                part.filename = part.filename.split(/[/\\]/).pop();
-                const value = await uploadHandler$1(part);
-                if (typeof value === 'undefined' || value === null) {
-                    continue;
-                }
-                // add to cleanup array in case of error
-                if (value instanceof fileUploadHandler.NodeOnDiskFile) {
-                    nodeOnDiskFiles.push(value);
-                }
-                // if the combined size of the body exceeds the max size, throw an error
-                currentBodySize += value.size;
-                if (currentBodySize > maxBodySize) {
-                    throw new uploadHandler.MaxBodySizeExceededError(maxBodySize);
-                }
-                // add the file to the form data
-                formData.append(part.name, value);
-            } else {
-                // This is text, so we'll decode it and add it to the form data
-                let textualPart = '';
-                for await (const chunk of part.data){
-                    // if the combined size of the body exceeds the max size, throw an error
-                    currentBodySize += chunk.length;
-                    if (currentBodySize > maxBodySize) {
-                        throw new uploadHandler.MaxBodySizeExceededError(maxBodySize);
-                    }
-                    textualPart += utfTextDecoder.decode(chunk);
-                }
-                // add the text to the form data
-                formData.append(part.name, textualPart);
-            }
-        }
-        return formData;
-    } catch (e) {
-        // clean up any files that were uploaded to disk if an error occurs
-        await Promise.all(nodeOnDiskFiles.map((file)=>fs__namespace.unlink(file.getFilePath())));
-        throw e;
-    }
-}
 const getFormDataContentTypeHandler = ()=>({
         name: 'node-http-formdata',
         isMatch (opts) {
@@ -100,11 +11,22 @@ const getFormDataContentTypeHandler = ()=>({
             if (inputOpts.isBatchCall) {
                 throw new Error('Batch calls not supported for form-data');
             }
-            const form = await parseMultipartFormData(opts.req, memoryUploadHandler.createMemoryUploadHandler());
+            const contentType = opts.req.headers['content-type'];
+            if (!contentType) {
+                // Should be unreachable given the isMatch check
+                throw new Error('No content-type header found');
+            }
+            const form = await new Request('https://unused.com', {
+                method: 'POST',
+                headers: {
+                    'content-type': contentType
+                },
+                body: node_stream.Readable.toWeb(opts.req),
+                // @ts-expect-error - outdated types? this exists
+                duplex: 'half'
+            }).formData();
             return form;
         }
     });
 
-exports.MaxBodySizeExceededError = uploadHandler.MaxBodySizeExceededError;
-exports.MaxPartSizeExceededError = uploadHandler.MaxPartSizeExceededError;
 exports.getFormDataContentTypeHandler = getFormDataContentTypeHandler;

package/dist/adapters/node-http/content-type/form-data/index.mjs

@@ -1,76 +1,5 @@
-import * as fs from 'node:fs/promises';
 import { Readable } from 'node:stream';
-import { streamMultipart } from '@web3-storage/multipart-parser';
-import { NodeOnDiskFile } from './fileUploadHandler.mjs';
-import { createMemoryUploadHandler } from './memoryUploadHandler.mjs';
-import { MaxBodySizeExceededError } from './uploadHandler.mjs';
-export { MaxPartSizeExceededError } from './uploadHandler.mjs';
 
-const utfTextDecoder = new TextDecoder('utf-8');
-/**
- * Allows you to handle multipart forms (file uploads) for your app.
- * Request body parts with a 'filename' property will be treated as files.
- * The rest will be treated as text.
- * @param request The incoming Node HTTP request
- * @param uploadHandler A function that handles file uploads and returns a value to be used in the request body. If uploaded to disk, the returned value is a NodeOnDiskFile. If uploaded to memory, the returned value is a File.
- * @param maxBodySize The maximum size of the request body in bytes. Defaults to Infinity.
- *
- * @link https://remix.run/utils/parse-multipart-form-data
- */ async function parseMultipartFormData(request, uploadHandler, maxBodySize = Infinity) {
-    const contentType = request.headers['content-type'] ?? '';
-    const [type, boundary] = contentType.split(/\s*;\s*boundary=/);
-    if (!boundary || type !== 'multipart/form-data') {
-        throw new TypeError('Could not parse content as FormData.');
-    }
-    const formData = new FormData();
-    const parts = streamMultipart(Readable.toWeb(request), boundary);
-    let currentBodySize = 0;
-    const nodeOnDiskFiles = [];
-    try {
-        for await (const part of parts){
-            if (part.done) break;
-            if (typeof part.filename === 'string') {
-                // This is a file, so the uploadHandler function will be called
-                // only pass basename as the multipart/form-data spec recommends
-                // https://datatracker.ietf.org/doc/html/rfc7578#section-4.2
-                part.filename = part.filename.split(/[/\\]/).pop();
-                const value = await uploadHandler(part);
-                if (typeof value === 'undefined' || value === null) {
-                    continue;
-                }
-                // add to cleanup array in case of error
-                if (value instanceof NodeOnDiskFile) {
-                    nodeOnDiskFiles.push(value);
-                }
-                // if the combined size of the body exceeds the max size, throw an error
-                currentBodySize += value.size;
-                if (currentBodySize > maxBodySize) {
-                    throw new MaxBodySizeExceededError(maxBodySize);
-                }
-                // add the file to the form data
-                formData.append(part.name, value);
-            } else {
-                // This is text, so we'll decode it and add it to the form data
-                let textualPart = '';
-                for await (const chunk of part.data){
-                    // if the combined size of the body exceeds the max size, throw an error
-                    currentBodySize += chunk.length;
-                    if (currentBodySize > maxBodySize) {
-                        throw new MaxBodySizeExceededError(maxBodySize);
-                    }
-                    textualPart += utfTextDecoder.decode(chunk);
-                }
-                // add the text to the form data
-                formData.append(part.name, textualPart);
-            }
-        }
-        return formData;
-    } catch (e) {
-        // clean up any files that were uploaded to disk if an error occurs
-        await Promise.all(nodeOnDiskFiles.map((file)=>fs.unlink(file.getFilePath())));
-        throw e;
-    }
-}
 const getFormDataContentTypeHandler = ()=>({
         name: 'node-http-formdata',
         isMatch (opts) {
@@ -80,9 +9,22 @@ const getFormDataContentTypeHandler = ()=>({
             if (inputOpts.isBatchCall) {
                 throw new Error('Batch calls not supported for form-data');
             }
-            const form = await parseMultipartFormData(opts.req, createMemoryUploadHandler());
+            const contentType = opts.req.headers['content-type'];
+            if (!contentType) {
+                // Should be unreachable given the isMatch check
+                throw new Error('No content-type header found');
+            }
+            const form = await new Request('https://unused.com', {
+                method: 'POST',
+                headers: {
+                    'content-type': contentType
+                },
+                body: Readable.toWeb(opts.req),
+                // @ts-expect-error - outdated types? this exists
+                duplex: 'half'
+            }).formData();
             return form;
         }
     });
 
-export { MaxBodySizeExceededError, getFormDataContentTypeHandler };
+export { getFormDataContentTypeHandler };