@trpc/server 11.0.0-rc.348 → 11.0.0-rc.351

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

@@ -1,30 +1,108 @@
+import * as fs from 'node:fs/promises';
 import { Readable } from 'node:stream';
+import { streamMultipart } from '@web3-storage/multipart-parser';
+import { createNodeHTTPContentTypeHandler } from '../../internals/contentType.mjs';
+import { NodeOnDiskFile } from './fileUploadHandler.mjs';
+export { createFileUploadHandler as experimental_createFileUploadHandler } from './fileUploadHandler.mjs';
+import { MaxBodySizeExceededError } from './uploadHandler.mjs';
+export { MaxPartSizeExceededError, composeUploadHandlers as experimental_composeUploadHandlers } from './uploadHandler.mjs';
+export { createMemoryUploadHandler as experimental_createMemoryUploadHandler } from './memoryUploadHandler.mjs';
 
-const getFormDataContentTypeHandler = ()=>({
-        name: 'node-http-formdata',
-        isMatch: (headers)=>{
-            return !!headers.get('content-type')?.startsWith('multipart/form-data');
-        },
-        async getInputs (opts, inputOpts) {
-            if (inputOpts.isBatchCall) {
-                throw new Error('Batch calls not supported for form-data');
+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);
             }
-            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;
         }
-    });
+        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;
+    }
+}
+function isMultipartFormDataRequest(req) {
+    const contentTypeHeader = req.headers['content-type'];
+    return contentTypeHeader?.startsWith('multipart/form-data') ?? contentTypeHeader === 'application/x-www-form-urlencoded';
+}
+const nodeHTTPFormDataContentTypeHandler = createNodeHTTPContentTypeHandler({
+    isMatch (opts) {
+        return isMultipartFormDataRequest(opts.req);
+    },
+    async getBody (opts) {
+        const fields = Object.fromEntries(opts.query);
+        return {
+            ok: true,
+            data: fields,
+            preprocessed: false
+        };
+    },
+    getInputs (opts) {
+        const req = opts.req;
+        const unparsedInput = req.query.get('input');
+        if (!unparsedInput) {
+            return {
+                0: undefined
+            };
+        }
+        const transformer = opts.router._def._config.transformer;
+        const deserializedInput = transformer.input.deserialize(JSON.parse(unparsedInput));
+        return {
+            0: deserializedInput
+        };
+    }
+});
 
-export { getFormDataContentTypeHandler };
+export { MaxBodySizeExceededError, NodeOnDiskFile as experimental_NodeOnDiskFile, isMultipartFormDataRequest as experimental_isMultipartFormDataRequest, parseMultipartFormData as experimental_parseMultipartFormData, nodeHTTPFormDataContentTypeHandler };

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

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ */
+/**
+ * @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/upload/memoryUploadHandler.ts
+ */
+import type { UploadHandler } from './uploadHandler';
+export type MemoryUploadHandlerFilterArgs = {
+    filename?: string;
+    contentType: string;
+    name: string;
+};
+export type MemoryUploadHandlerOptions = {
+    /**
+     * The maximum upload size allowed. If the size is exceeded an error will be thrown.
+     * Defaults to 3000000B (3MB).
+     */
+    maxPartSize?: number;
+    /**
+     *
+     * @param filename
+     * @param mimetype
+     * @param encoding
+     */
+    filter?(args: MemoryUploadHandlerFilterArgs): Promise<boolean> | boolean;
+};
+export declare function createMemoryUploadHandler({ filter, maxPartSize, }?: MemoryUploadHandlerOptions): UploadHandler;
+//# sourceMappingURL=memoryUploadHandler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"memoryUploadHandler.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/memoryUploadHandler.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGrD,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,MAAM,CAAC,CAAC,IAAI,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC1E,CAAC;AAEF,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,WAAqB,GACtB,GAAE,0BAA+B,GAAG,aAAa,CAkBjD"}

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

@@ -0,0 +1,29 @@
+'use strict';
+
+var uploadHandler = require('./uploadHandler.js');
+
+function createMemoryUploadHandler({ filter , maxPartSize =3000000  } = {}) {
+    return async ({ filename , contentType , name , data  })=>{
+        if (filter && !await filter({
+            filename,
+            contentType,
+            name
+        })) {
+            return undefined;
+        }
+        let size = 0;
+        const chunks = [];
+        for await (const chunk of data){
+            size += chunk.byteLength;
+            if (size > maxPartSize) {
+                throw new uploadHandler.MaxPartSizeExceededError(name, maxPartSize);
+            }
+            chunks.push(chunk);
+        }
+        return new File(chunks, filename, {
+            type: contentType
+        });
+    };
+}
+
+exports.createMemoryUploadHandler = createMemoryUploadHandler;

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

@@ -0,0 +1,27 @@
+import { MaxPartSizeExceededError } from './uploadHandler.mjs';
+
+function createMemoryUploadHandler({ filter , maxPartSize =3000000  } = {}) {
+    return async ({ filename , contentType , name , data  })=>{
+        if (filter && !await filter({
+            filename,
+            contentType,
+            name
+        })) {
+            return undefined;
+        }
+        let size = 0;
+        const chunks = [];
+        for await (const chunk of data){
+            size += chunk.byteLength;
+            if (size > maxPartSize) {
+                throw new MaxPartSizeExceededError(name, maxPartSize);
+            }
+            chunks.push(chunk);
+        }
+        return new File(chunks, filename, {
+            type: contentType
+        });
+    };
+}
+
+export { createMemoryUploadHandler };

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

@@ -0,0 +1,16 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { TransformCallback } from 'node:stream';
+import { Transform } from 'node:stream';
+declare class SliceStream extends Transform {
+    private startIndex;
+    private endIndex;
+    private indexOffset;
+    private emitUp;
+    private emitDown;
+    constructor(startIndex?: number, endIndex?: number);
+    _transform(chunk: any, _: BufferEncoding, done: TransformCallback): void;
+}
+export declare function streamSlice(startIndex?: number, endIndex?: number): SliceStream;
+export {};
+//# sourceMappingURL=streamSlice.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamSlice.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/streamSlice.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAM,WAAY,SAAQ,SAAS;IAKrB,OAAO,CAAC,UAAU;IAAM,OAAO,CAAC,QAAQ;IAJpD,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAS;gBAEL,UAAU,SAAI,EAAU,QAAQ,SAAW;IAItD,UAAU,CACjB,KAAK,EAAE,GAAG,EACV,CAAC,EAAE,cAAc,EACjB,IAAI,EAAE,iBAAiB,GACtB,IAAI;CAmCR;AAED,wBAAgB,WAAW,CAAC,UAAU,SAAI,EAAE,QAAQ,SAAW,GAAG,WAAW,CAE5E"}

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

@@ -0,0 +1,46 @@
+'use strict';
+
+var node_stream = require('node:stream');
+
+class SliceStream extends node_stream.Transform {
+    _transform(chunk, _, done) {
+        this.indexOffset += chunk.length;
+        if (!this.emitUp && this.indexOffset >= this.startIndex) {
+            this.emitUp = true;
+            const start = chunk.length - (this.indexOffset - this.startIndex);
+            if (this.indexOffset > this.endIndex) {
+                const end = chunk.length - (this.indexOffset - this.endIndex);
+                this.emitDown = true;
+                this.push(chunk.slice(start, end));
+            } else {
+                this.push(chunk.slice(start, chunk.length));
+            }
+            done();
+            return;
+        }
+        if (this.emitUp && !this.emitDown) {
+            if (this.indexOffset >= this.endIndex) {
+                this.emitDown = true;
+                this.push(chunk.slice(0, chunk.length - (this.indexOffset - this.endIndex)));
+            } else {
+                this.push(chunk);
+            }
+            done();
+            return;
+        }
+        done();
+    }
+    constructor(startIndex = 0, endIndex = Infinity){
+        super();
+        this.startIndex = startIndex;
+        this.endIndex = endIndex;
+        this.indexOffset = 0;
+        this.emitUp = false;
+        this.emitDown = false;
+    }
+}
+function streamSlice(startIndex = 0, endIndex = Infinity) {
+    return new SliceStream(startIndex, endIndex);
+}
+
+exports.streamSlice = streamSlice;

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

@@ -0,0 +1,44 @@
+import { Transform } from 'node:stream';
+
+class SliceStream extends Transform {
+    _transform(chunk, _, done) {
+        this.indexOffset += chunk.length;
+        if (!this.emitUp && this.indexOffset >= this.startIndex) {
+            this.emitUp = true;
+            const start = chunk.length - (this.indexOffset - this.startIndex);
+            if (this.indexOffset > this.endIndex) {
+                const end = chunk.length - (this.indexOffset - this.endIndex);
+                this.emitDown = true;
+                this.push(chunk.slice(start, end));
+            } else {
+                this.push(chunk.slice(start, chunk.length));
+            }
+            done();
+            return;
+        }
+        if (this.emitUp && !this.emitDown) {
+            if (this.indexOffset >= this.endIndex) {
+                this.emitDown = true;
+                this.push(chunk.slice(0, chunk.length - (this.indexOffset - this.endIndex)));
+            } else {
+                this.push(chunk);
+            }
+            done();
+            return;
+        }
+        done();
+    }
+    constructor(startIndex = 0, endIndex = Infinity){
+        super();
+        this.startIndex = startIndex;
+        this.endIndex = endIndex;
+        this.indexOffset = 0;
+        this.emitUp = false;
+        this.emitDown = false;
+    }
+}
+function streamSlice(startIndex = 0, endIndex = Infinity) {
+    return new SliceStream(startIndex, endIndex);
+}
+
+export { streamSlice };

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

@@ -0,0 +1,45 @@
+import type { NodeOnDiskFile } from './fileUploadHandler';
+/**
+ * @link https://github.com/remix-run/remix/blob/0bcb4a304dd2f08f6032c3bf0c3aa7eb5b976901/packages/remix-server-runtime/formData.ts
+ */
+export type UploadHandlerPart = {
+    name: string;
+    filename?: string;
+    contentType: string;
+    data: AsyncIterable<Uint8Array>;
+};
+export type UploadHandler = (part: Required<UploadHandlerPart>) => Promise<File | NodeOnDiskFile | null | undefined>;
+export declare function composeUploadHandlers(...handlers: UploadHandler[]): UploadHandler;
+export declare class MaxPartSizeExceededError extends Error {
+    field: string;
+    maxBytes: number;
+    constructor(field: string, maxBytes: number);
+}
+export declare class MaxBodySizeExceededError extends Error {
+    maxBytes: number;
+    constructor(maxBytes: number);
+}
+export type MemoryUploadHandlerFilterArgs = {
+    filename?: string;
+    contentType: string;
+    name: string;
+};
+export type MemoryUploadHandlerOptions = {
+    /**
+     * The maximum upload size allowed. If the size is exceeded an error will be thrown.
+     * Defaults to 3000000B (3MB).
+     */
+    maxPartSize?: number;
+    /**
+     *
+     * @param filename
+     * @param mimetype
+     * @param encoding
+     */
+    filter?(args: MemoryUploadHandlerFilterArgs): Promise<boolean> | boolean;
+};
+/**
+ * @see
+ */
+export declare function createMemoryUploadHandler({ filter, maxPartSize, }?: MemoryUploadHandlerOptions): UploadHandler;
+//# sourceMappingURL=uploadHandler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"uploadHandler.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/form-data/uploadHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAC1B,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,KAC9B,OAAO,CAAC,IAAI,GAAG,cAAc,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC;AAEvD,wBAAgB,qBAAqB,CACnC,GAAG,QAAQ,EAAE,aAAa,EAAE,GAC3B,aAAa,CAWf;AAED,qBAAa,wBAAyB,SAAQ,KAAK;IAC9B,KAAK,EAAE,MAAM;IAAS,QAAQ,EAAE,MAAM;gBAAtC,KAAK,EAAE,MAAM,EAAS,QAAQ,EAAE,MAAM;CAG1D;AAED,qBAAa,wBAAyB,SAAQ,KAAK;IAC9B,QAAQ,EAAE,MAAM;gBAAhB,QAAQ,EAAE,MAAM;CAGpC;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,MAAM,CAAC,CAAC,IAAI,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CAC1E,CAAC;AAEF;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,MAAM,EACN,WAAqB,GACtB,GAAE,0BAA+B,GAAG,aAAa,CAkBjD"}

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

@@ -0,0 +1,30 @@
+'use strict';
+
+function composeUploadHandlers(...handlers) {
+    return async (part)=>{
+        for (const handler of handlers){
+            const value = await handler(part);
+            if (typeof value !== 'undefined' && value !== null) {
+                return value;
+            }
+        }
+        return undefined;
+    };
+}
+class MaxPartSizeExceededError extends Error {
+    constructor(field, maxBytes){
+        super(`Field "${field}" exceeded upload size of ${maxBytes} bytes.`);
+        this.field = field;
+        this.maxBytes = maxBytes;
+    }
+}
+class MaxBodySizeExceededError extends Error {
+    constructor(maxBytes){
+        super(`Body exceeded upload size of ${maxBytes} bytes.`);
+        this.maxBytes = maxBytes;
+    }
+}
+
+exports.MaxBodySizeExceededError = MaxBodySizeExceededError;
+exports.MaxPartSizeExceededError = MaxPartSizeExceededError;
+exports.composeUploadHandlers = composeUploadHandlers;

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

@@ -0,0 +1,26 @@
+function composeUploadHandlers(...handlers) {
+    return async (part)=>{
+        for (const handler of handlers){
+            const value = await handler(part);
+            if (typeof value !== 'undefined' && value !== null) {
+                return value;
+            }
+        }
+        return undefined;
+    };
+}
+class MaxPartSizeExceededError extends Error {
+    constructor(field, maxBytes){
+        super(`Field "${field}" exceeded upload size of ${maxBytes} bytes.`);
+        this.field = field;
+        this.maxBytes = maxBytes;
+    }
+}
+class MaxBodySizeExceededError extends Error {
+    constructor(maxBytes){
+        super(`Body exceeded upload size of ${maxBytes} bytes.`);
+        this.maxBytes = maxBytes;
+    }
+}
+
+export { MaxBodySizeExceededError, MaxPartSizeExceededError, composeUploadHandlers };

package/dist/adapters/node-http/content-type/json/getPostBody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPostBody.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/json/getPostBody.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,eAAe,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,UAAU,CAAC,CAwCtB"}
+{"version":3,"file":"getPostBody.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/json/getPostBody.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,eAAe,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,UAAU,CAAC,CAiDtB"}

package/dist/adapters/node-http/content-type/json/getPostBody.js

@@ -7,6 +7,16 @@ require('../../../../unstable-core-do-not-import/rootConfig.js');
 async function getPostBody(opts) {
     const { req , maxBodySize =Infinity  } = opts;
     return new Promise((resolve)=>{
+        if (!req.headers['content-type']?.startsWith('application/json') && (!req.method || req.method !== 'GET' && req.method !== 'OPTIONS' && req.method !== 'HEAD')) {
+            resolve({
+                ok: false,
+                error: new TRPCError.TRPCError({
+                    code: 'UNSUPPORTED_MEDIA_TYPE',
+                    message: 'Invalid Content-Type header (expected application/json)'
+                })
+            });
+            return;
+        }
         if ('body' in req) {
             resolve({
                 ok: true,
@@ -18,11 +28,10 @@ async function getPostBody(opts) {
         }
         let body = '';
         let hasBody = false;
-        function onData(data) {
+        req.on('data', function(data) {
             body += data;
             hasBody = true;
             if (body.length > maxBodySize) {
-                req.off('data', onData);
                 resolve({
                     ok: false,
                     error: new TRPCError.TRPCError({
@@ -30,8 +39,7 @@ async function getPostBody(opts) {
                     })
                 });
             }
-        }
-        req.on('data', onData);
+        });
         req.on('end', ()=>{
             resolve({
                 ok: true,

package/dist/adapters/node-http/content-type/json/getPostBody.mjs

@@ -5,6 +5,16 @@ import '../../../../unstable-core-do-not-import/rootConfig.mjs';
 async function getPostBody(opts) {
     const { req , maxBodySize =Infinity  } = opts;
     return new Promise((resolve)=>{
+        if (!req.headers['content-type']?.startsWith('application/json') && (!req.method || req.method !== 'GET' && req.method !== 'OPTIONS' && req.method !== 'HEAD')) {
+            resolve({
+                ok: false,
+                error: new TRPCError({
+                    code: 'UNSUPPORTED_MEDIA_TYPE',
+                    message: 'Invalid Content-Type header (expected application/json)'
+                })
+            });
+            return;
+        }
         if ('body' in req) {
             resolve({
                 ok: true,
@@ -16,11 +26,10 @@ async function getPostBody(opts) {
         }
         let body = '';
         let hasBody = false;
-        function onData(data) {
+        req.on('data', function(data) {
             body += data;
             hasBody = true;
             if (body.length > maxBodySize) {
-                req.off('data', onData);
                 resolve({
                     ok: false,
                     error: new TRPCError({
@@ -28,8 +37,7 @@ async function getPostBody(opts) {
                     })
                 });
             }
-        }
-        req.on('data', onData);
+        });
         req.on('end', ()=>{
             resolve({
                 ok: true,

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

@@ -1,5 +1,2 @@
-import type { AnyRouter } from '../../../../@trpc/server';
-import type { NodeHTTPRequest, NodeHTTPResponse } from '../../types';
-import type { NodeHTTPContentTypeHandler } from '../types';
-export declare const getNodeHTTPJSONContentTypeHandler: <TRouter extends AnyRouter, TRequest extends NodeHTTPRequest, TResponse extends NodeHTTPResponse>() => NodeHTTPContentTypeHandler<TRouter, TRequest, TResponse>;
+export declare const nodeHTTPJSONContentTypeHandler: <TRequest extends import("../..").NodeHTTPRequest, TResponse extends import("../..").NodeHTTPResponse>() => import("../../internals/contentType").NodeHTTPContentTypeHandler<TRequest, TResponse>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/json/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,SAAS,EAEV,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAG3D,eAAO,MAAM,iCAAiC,EAAE,CAC9C,OAAO,SAAS,SAAS,EACzB,QAAQ,SAAS,eAAe,EAChC,SAAS,SAAS,gBAAgB,OAC7B,0BAA0B,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CA4E5D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/adapters/node-http/content-type/json/index.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,8BAA8B,mMAMzC,CAAC"}

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

@@ -1,65 +1,16 @@
 'use strict';
 
-var TRPCError = require('../../../../unstable-core-do-not-import/error/TRPCError.js');
+var contentType$1 = require('../../../../unstable-core-do-not-import/http/contentType.js');
 require('../../../../unstable-core-do-not-import/rootConfig.js');
+var contentType = require('../../internals/contentType.js');
 var getPostBody = require('./getPostBody.js');
 
-// @trpc/server
-const getNodeHTTPJSONContentTypeHandler = ()=>({
-        name: 'node-http-json',
-        isMatch: (headers)=>{
-            return !!headers.get('content-type')?.startsWith('application/json');
-        },
-        getInputs: async (opts, info)=>{
-            const bodyResult = await getPostBody.getPostBody(opts);
-            if (!bodyResult.ok) {
-                throw bodyResult.error;
-            }
-            const preprocessedBody = bodyResult.preprocessed;
-            const body = bodyResult.data;
-            function getRawProcedureInputOrThrow() {
-                try {
-                    if (opts.req.method === 'GET') {
-                        const input = opts.query.get('input');
-                        if (!input) {
-                            return undefined;
-                        }
-                        return JSON.parse(input);
-                    }
-                    if (preprocessedBody || typeof body !== 'string') {
-                        // Some tools like nextjs may parse json
-                        // requests before they reach us. So we just use them as is
-                        return body;
-                    } else {
-                        return JSON.parse(body);
-                    }
-                } catch (cause) {
-                    throw new TRPCError.TRPCError({
-                        code: 'PARSE_ERROR',
-                        cause
-                    });
-                }
-            }
-            const deserializeInputValue = (rawValue, transformer)=>{
-                return typeof rawValue !== 'undefined' ? transformer.input.deserialize(rawValue) : rawValue;
-            };
-            const rawInput = getRawProcedureInputOrThrow();
-            if (rawInput === undefined) {
-                return undefined;
-            }
-            const transformer = opts.router._def._config.transformer;
-            if (!info.isBatchCall) {
-                return deserializeInputValue(rawInput, transformer);
-            }
-            /* istanbul ignore if  */ if (rawInput == null || typeof rawInput !== 'object' || Array.isArray(rawInput)) {
-                throw new TRPCError.TRPCError({
-                    code: 'BAD_REQUEST',
-                    message: '"input" needs to be an object when doing a batch call'
-                });
-            }
-            const rawValue = rawInput[info.batch];
-            return deserializeInputValue(rawValue, transformer);
-        }
-    });
+const nodeHTTPJSONContentTypeHandler = contentType.createNodeHTTPContentTypeHandler({
+    isMatch (opts) {
+        return !!opts.req.headers['content-type']?.startsWith('application/json');
+    },
+    getBody: getPostBody.getPostBody,
+    getInputs: contentType$1.getJsonContentTypeInputs
+});
 
-exports.getNodeHTTPJSONContentTypeHandler = getNodeHTTPJSONContentTypeHandler;
+exports.nodeHTTPJSONContentTypeHandler = nodeHTTPJSONContentTypeHandler;