@trpc/server 11.0.0-next-beta.206 → 11.0.0-next-beta.208

package/dist/adapters/fetch/index.js

@@ -1,120 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
+var fetchRequestHandler = require('./fetchRequestHandler.js');
 
-var http = require('@trpc/core/http');
 
-/**
- * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
- *
- * Do **not** import from `@trpc/core`
- * @example
- * ```ts
- * import type { AnyTRPCRouter } from '@trpc/server'
- * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
- * ```
- */ // @trpc/server
-const trimSlashes = (path)=>{
-    path = path.startsWith('/') ? path.slice(1) : path;
-    path = path.endsWith('/') ? path.slice(0, -1) : path;
-    return path;
-};
-async function fetchRequestHandler(opts) {
-    const resHeaders = new Headers();
-    const createContext = async (innerOpts)=>{
-        return opts.createContext?.({
-            req: opts.req,
-            resHeaders,
-            ...innerOpts
-        });
-    };
-    const url = new URL(opts.req.url);
-    const pathname = trimSlashes(url.pathname);
-    const endpoint = trimSlashes(opts.endpoint);
-    const path = trimSlashes(pathname.slice(endpoint.length));
-    const req = {
-        query: url.searchParams,
-        method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers),
-        body: opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : ''
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let status = 200;
-    let isStream = false;
-    let controller;
-    let encoder;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            if (typeof value === 'string') {
-                resHeaders.set(key, value);
-                continue;
-            }
-            for (const v of value){
-                resHeaders.append(key, v);
-            }
-        }
-        status = head.status;
-        if (isStreaming) {
-            resHeaders.set('Transfer-Encoding', 'chunked');
-            resHeaders.append('Vary', 'trpc-batch-mode');
-            const stream = new ReadableStream({
-                start (c) {
-                    controller = c;
-                }
-            });
-            const response = new Response(stream, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-            encoder = new TextEncoder();
-            formatter = http.getBatchStreamFormatter();
-            isStream = true;
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            const response = new Response(string || null, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-        } else {
-            controller.enqueue(encoder.encode(formatter(index, string)));
-        }
-    };
-    http.resolveHTTPResponse({
-        req,
-        createContext,
-        path,
-        router: opts.router,
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            controller.enqueue(encoder.encode(formatter.end()));
-            controller.close();
-        }
-    }).catch(()=>{
-        if (isStream) {
-            controller.close();
-        }
-    });
-    return promise;
-}
 
-exports.fetchRequestHandler = fetchRequestHandler;
+exports.fetchRequestHandler = fetchRequestHandler.fetchRequestHandler;

package/dist/adapters/fetch/index.mjs

@@ -1,116 +1 @@
-import { resolveHTTPResponse, getBatchStreamFormatter } from '@trpc/core/http';
-
-/**
- * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`
- *
- * Do **not** import from `@trpc/core`
- * @example
- * ```ts
- * import type { AnyTRPCRouter } from '@trpc/server'
- * import type { HTTPBaseHandlerOptions } from '@trpc/server/http'
- * ```
- */ // @trpc/server
-const trimSlashes = (path)=>{
-    path = path.startsWith('/') ? path.slice(1) : path;
-    path = path.endsWith('/') ? path.slice(0, -1) : path;
-    return path;
-};
-async function fetchRequestHandler(opts) {
-    const resHeaders = new Headers();
-    const createContext = async (innerOpts)=>{
-        return opts.createContext?.({
-            req: opts.req,
-            resHeaders,
-            ...innerOpts
-        });
-    };
-    const url = new URL(opts.req.url);
-    const pathname = trimSlashes(url.pathname);
-    const endpoint = trimSlashes(opts.endpoint);
-    const path = trimSlashes(pathname.slice(endpoint.length));
-    const req = {
-        query: url.searchParams,
-        method: opts.req.method,
-        headers: Object.fromEntries(opts.req.headers),
-        body: opts.req.headers.get('content-type')?.startsWith('application/json') ? await opts.req.text() : ''
-    };
-    let resolve;
-    const promise = new Promise((r)=>resolve = r);
-    let status = 200;
-    let isStream = false;
-    let controller;
-    let encoder;
-    let formatter;
-    const unstable_onHead = (head, isStreaming)=>{
-        for (const [key, value] of Object.entries(head.headers ?? {})){
-            /* istanbul ignore if -- @preserve */ if (typeof value === 'undefined') {
-                continue;
-            }
-            if (typeof value === 'string') {
-                resHeaders.set(key, value);
-                continue;
-            }
-            for (const v of value){
-                resHeaders.append(key, v);
-            }
-        }
-        status = head.status;
-        if (isStreaming) {
-            resHeaders.set('Transfer-Encoding', 'chunked');
-            resHeaders.append('Vary', 'trpc-batch-mode');
-            const stream = new ReadableStream({
-                start (c) {
-                    controller = c;
-                }
-            });
-            const response = new Response(stream, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-            encoder = new TextEncoder();
-            formatter = getBatchStreamFormatter();
-            isStream = true;
-        }
-    };
-    const unstable_onChunk = ([index, string])=>{
-        if (index === -1) {
-            // full response, no streaming
-            const response = new Response(string || null, {
-                status,
-                headers: resHeaders
-            });
-            resolve(response);
-        } else {
-            controller.enqueue(encoder.encode(formatter(index, string)));
-        }
-    };
-    resolveHTTPResponse({
-        req,
-        createContext,
-        path,
-        router: opts.router,
-        batching: opts.batching,
-        responseMeta: opts.responseMeta,
-        onError (o) {
-            opts?.onError?.({
-                ...o,
-                req: opts.req
-            });
-        },
-        unstable_onHead,
-        unstable_onChunk
-    }).then(()=>{
-        if (isStream) {
-            controller.enqueue(encoder.encode(formatter.end()));
-            controller.close();
-        }
-    }).catch(()=>{
-        if (isStream) {
-            controller.close();
-        }
-    });
-    return promise;
-}
-
-export { fetchRequestHandler };
+export { fetchRequestHandler } from './fetchRequestHandler.mjs';

package/dist/adapters/next.js

@@ -1,12 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@trpc/core');
-var nodeHTTPRequestHandler = require('../nodeHTTPRequestHandler-83441c73.js');
-require('@trpc/core/http');
-require('./node-http/content-type/json/index.js');
-require('../contentType-d9d22104.js');
+var nodeHTTPRequestHandler = require('./node-http/nodeHTTPRequestHandler.js');
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`

package/dist/adapters/next.mjs

@@ -1,8 +1,5 @@
 import { getErrorShape, TRPCError } from '@trpc/core';
-import { n as nodeHTTPRequestHandler } from '../nodeHTTPRequestHandler-0223fac5.mjs';
-import '@trpc/core/http';
-import './node-http/content-type/json/index.mjs';
-import '../contentType-72ed9df5.mjs';
+import { nodeHTTPRequestHandler } from './node-http/nodeHTTPRequestHandler.mjs';
 
 /**
  * If you're making an adapter for tRPC and looking at this file for reference, you should import types and functions from `@trpc/server` and `@trpc/server/http`

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

@@ -0,0 +1,161 @@
+'use strict';
+
+var node_crypto = require('node:crypto');
+var node_fs = require('node:fs');
+var fs = require('node:fs/promises');
+var node_os = require('node:os');
+var node_path = require('node:path');
+var node_stream = require('node:stream');
+var node_util = require('node:util');
+var streamSlice = require('./streamSlice.js');
+var uploadHandler = require('./uploadHandler.js');
+
+async function readableStreamToString(stream, encoding) {
+    const reader = stream.getReader();
+    const chunks = [];
+    async function read() {
+        const { 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 defaultFilePathResolver = ({ filename ,  })=>{
+    const ext = filename ? node_path.extname(filename) : '';
+    return 'upload_' + node_crypto.randomBytes(4).readUInt32LE(0) + ext;
+};
+async function uniqueFile(filepath) {
+    const ext = node_path.extname(filepath);
+    let uniqueFilepath = filepath;
+    for(let i = 1; await fs.stat(uniqueFilepath).then(()=>true).catch(()=>false); i++){
+        uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
+    }
+    return uniqueFilepath;
+}
+function createFileUploadHandler({ directory =node_os.tmpdir() , avoidFileConflicts =true , file =defaultFilePathResolver , filter , maxPartSize =3000000  } = {}) {
+    return async ({ name , filename , contentType , data  })=>{
+        if (!filename || filter && !await filter({
+            name,
+            filename,
+            contentType
+        })) {
+            return undefined;
+        }
+        const dir = typeof directory === 'string' ? directory : directory({
+            name,
+            filename,
+            contentType
+        });
+        if (!dir) {
+            return undefined;
+        }
+        const filedir = node_path.resolve(dir);
+        const path = typeof file === 'string' ? file : file({
+            name,
+            filename,
+            contentType
+        });
+        if (!path) {
+            return undefined;
+        }
+        let filepath = node_path.resolve(filedir, path);
+        if (avoidFileConflicts) {
+            filepath = await uniqueFile(filepath);
+        }
+        await fs.mkdir(node_path.dirname(filepath), {
+            recursive: true
+        }).catch(()=>{});
+        const writeFileStream = node_fs.createWriteStream(filepath);
+        let size = 0;
+        let deleteFile = false;
+        try {
+            for await (const chunk of data){
+                size += chunk.byteLength;
+                if (size > maxPartSize) {
+                    deleteFile = true;
+                    throw new uploadHandler.MaxPartSizeExceededError(name, maxPartSize);
+                }
+                writeFileStream.write(chunk);
+            }
+        } finally{
+            writeFileStream.end();
+            await node_util.promisify(node_stream.finished)(writeFileStream);
+            if (deleteFile) {
+                await fs.rm(filepath).catch(()=>{});
+            }
+        }
+        return new NodeOnDiskFile(filepath, contentType);
+    };
+}
+let _toStringTag = Symbol.toStringTag;
+class NodeOnDiskFile {
+    get size() {
+        const stats = node_fs.statSync(this.filepath);
+        if (this.slicer) {
+            const slice = this.slicer.end - this.slicer.start;
+            return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
+        }
+        return stats.size;
+    }
+    slice(start, end, type) {
+        if (typeof start === 'number' && start < 0) start = this.size + start;
+        if (typeof end === 'number' && end < 0) end = this.size + end;
+        const startOffset = this.slicer?.start ?? 0;
+        start = startOffset + (start ?? 0);
+        end = startOffset + (end ?? this.size);
+        return new NodeOnDiskFile(this.filepath, typeof type === 'string' ? type : this.type, {
+            start,
+            end
+        });
+    }
+    async arrayBuffer() {
+        let stream = node_fs.createReadStream(this.filepath);
+        if (this.slicer) {
+            stream = stream.pipe(streamSlice.streamSlice(this.slicer.start, this.slicer.end));
+        }
+        return new Promise((resolve, reject)=>{
+            const buf = [];
+            stream.on('data', (chunk)=>buf.push(chunk));
+            stream.on('end', ()=>{
+                resolve(Buffer.concat(buf));
+            });
+            stream.on('error', (err)=>{
+                reject(err);
+            });
+        });
+    }
+    stream() {
+        let stream = node_fs.createReadStream(this.filepath);
+        if (this.slicer) {
+            stream = stream.pipe(streamSlice.streamSlice(this.slicer.start, this.slicer.end));
+        }
+        return node_stream.Readable.toWeb(stream);
+    }
+    async text() {
+        return readableStreamToString(this.stream());
+    }
+    remove() {
+        return fs.unlink(this.filepath);
+    }
+    getFilePath() {
+        return this.filepath;
+    }
+    constructor(filepath, type, slicer){
+        this.filepath = filepath;
+        this.type = type;
+        this.slicer = slicer;
+        this.lastModified = 0;
+        this.webkitRelativePath = '';
+        this[_toStringTag] = 'File';
+        this.name = node_path.basename(filepath);
+    }
+}
+
+exports.NodeOnDiskFile = NodeOnDiskFile;
+exports.createFileUploadHandler = createFileUploadHandler;
+exports.readableStreamToString = readableStreamToString;

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

@@ -0,0 +1,157 @@
+import { randomBytes } from 'node:crypto';
+import { createWriteStream, statSync, createReadStream } from 'node:fs';
+import { mkdir, rm, unlink, stat } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { resolve, dirname, basename, extname } from 'node:path';
+import { finished, Readable } from 'node:stream';
+import { promisify } from 'node:util';
+import { streamSlice } from './streamSlice.mjs';
+import { MaxPartSizeExceededError } from './uploadHandler.mjs';
+
+async function readableStreamToString(stream, encoding) {
+    const reader = stream.getReader();
+    const chunks = [];
+    async function read() {
+        const { 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 defaultFilePathResolver = ({ filename ,  })=>{
+    const ext = filename ? extname(filename) : '';
+    return 'upload_' + randomBytes(4).readUInt32LE(0) + ext;
+};
+async function uniqueFile(filepath) {
+    const ext = extname(filepath);
+    let uniqueFilepath = filepath;
+    for(let i = 1; await stat(uniqueFilepath).then(()=>true).catch(()=>false); i++){
+        uniqueFilepath = (ext ? filepath.slice(0, -ext.length) : filepath) + `-${new Date().getTime()}${ext}`;
+    }
+    return uniqueFilepath;
+}
+function createFileUploadHandler({ directory =tmpdir() , avoidFileConflicts =true , file =defaultFilePathResolver , filter , maxPartSize =3000000  } = {}) {
+    return async ({ name , filename , contentType , data  })=>{
+        if (!filename || filter && !await filter({
+            name,
+            filename,
+            contentType
+        })) {
+            return undefined;
+        }
+        const dir = typeof directory === 'string' ? directory : directory({
+            name,
+            filename,
+            contentType
+        });
+        if (!dir) {
+            return undefined;
+        }
+        const filedir = resolve(dir);
+        const path = typeof file === 'string' ? file : file({
+            name,
+            filename,
+            contentType
+        });
+        if (!path) {
+            return undefined;
+        }
+        let filepath = resolve(filedir, path);
+        if (avoidFileConflicts) {
+            filepath = await uniqueFile(filepath);
+        }
+        await mkdir(dirname(filepath), {
+            recursive: true
+        }).catch(()=>{});
+        const writeFileStream = createWriteStream(filepath);
+        let size = 0;
+        let deleteFile = false;
+        try {
+            for await (const chunk of data){
+                size += chunk.byteLength;
+                if (size > maxPartSize) {
+                    deleteFile = true;
+                    throw new MaxPartSizeExceededError(name, maxPartSize);
+                }
+                writeFileStream.write(chunk);
+            }
+        } finally{
+            writeFileStream.end();
+            await promisify(finished)(writeFileStream);
+            if (deleteFile) {
+                await rm(filepath).catch(()=>{});
+            }
+        }
+        return new NodeOnDiskFile(filepath, contentType);
+    };
+}
+let _toStringTag = Symbol.toStringTag;
+class NodeOnDiskFile {
+    get size() {
+        const stats = statSync(this.filepath);
+        if (this.slicer) {
+            const slice = this.slicer.end - this.slicer.start;
+            return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
+        }
+        return stats.size;
+    }
+    slice(start, end, type) {
+        if (typeof start === 'number' && start < 0) start = this.size + start;
+        if (typeof end === 'number' && end < 0) end = this.size + end;
+        const startOffset = this.slicer?.start ?? 0;
+        start = startOffset + (start ?? 0);
+        end = startOffset + (end ?? this.size);
+        return new NodeOnDiskFile(this.filepath, typeof type === 'string' ? type : this.type, {
+            start,
+            end
+        });
+    }
+    async arrayBuffer() {
+        let stream = createReadStream(this.filepath);
+        if (this.slicer) {
+            stream = stream.pipe(streamSlice(this.slicer.start, this.slicer.end));
+        }
+        return new Promise((resolve, reject)=>{
+            const buf = [];
+            stream.on('data', (chunk)=>buf.push(chunk));
+            stream.on('end', ()=>{
+                resolve(Buffer.concat(buf));
+            });
+            stream.on('error', (err)=>{
+                reject(err);
+            });
+        });
+    }
+    stream() {
+        let stream = createReadStream(this.filepath);
+        if (this.slicer) {
+            stream = stream.pipe(streamSlice(this.slicer.start, this.slicer.end));
+        }
+        return Readable.toWeb(stream);
+    }
+    async text() {
+        return readableStreamToString(this.stream());
+    }
+    remove() {
+        return unlink(this.filepath);
+    }
+    getFilePath() {
+        return this.filepath;
+    }
+    constructor(filepath, type, slicer){
+        this.filepath = filepath;
+        this.type = type;
+        this.slicer = slicer;
+        this.lastModified = 0;
+        this.webkitRelativePath = '';
+        this[_toStringTag] = 'File';
+        this.name = basename(filepath);
+    }
+}
+
+export { NodeOnDiskFile, createFileUploadHandler, readableStreamToString };