@trpc/server 10.0.0-proxy-beta.4 → 10.0.0-proxy-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trpc/server",
-  "version": "10.0.0-proxy-beta.4",
+  "version": "10.0.0-proxy-beta.6",
   "description": "tRPC Server",
   "author": "KATT",
   "license": "MIT",
@@ -11,16 +11,23 @@
     "directory": "packages/server"
   },
   "eslintConfig": {
-    "rules": {
-      "explicit-module-boundary-types": "off",
-      "no-restricted-imports": [
-        "error",
-        "@trpc/server"
-      ]
-    }
+    "overrides": [
+      {
+        "files": [
+          "src"
+        ],
+        "rules": {
+          "explicit-module-boundary-types": "off",
+          "no-restricted-imports": [
+            "error",
+            "@trpc/server"
+          ]
+        }
+      }
+    ]
   },
   "scripts": {
-    "benchmark": "yarn tsc --project tsconfig.benchmark.json",
+    "benchmark": "tsc --project tsconfig.benchmark.json",
     "ts-watch": "tsc --project tsconfig.watch.json"
   },
   "main": "dist/index.js",
@@ -109,11 +116,16 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^3.14.1",
     "@fastify/websocket": "^5.0.0",
-    "@miniflare/core": "^2.4.0",
-    "@tanstack/react-query": "^4.3.0",
+    "@miniflare/core": "^2.9.0",
+    "@trpc/client": "10.0.0-proxy-beta.6",
+    "@trpc/next": "10.0.0-proxy-beta.6",
+    "@trpc/react": "10.0.0-proxy-beta.6",
+    "@trpc/server": "10.0.0-proxy-beta.6",
     "@types/aws-lambda": "^8.10.97",
     "@types/express": "^4.17.12",
     "@types/hash-sum": "^1.0.0",
+    "@types/node": "^18.7.20",
+    "@types/node-fetch": "^2.5.11",
     "@types/ws": "^8.2.0",
     "abort-controller": "^3.0.0",
     "aws-lambda": "^1.0.7",
@@ -130,11 +142,12 @@
     "myzod": "^1.3.1",
     "next": "^12.3.1",
     "node-fetch": "^2.6.1",
+    "superjson": "^1.7.4",
     "superstruct": "^0.15.2",
     "typescript": "^4.8.3",
     "ws": "^8.0.0",
     "yup": "^0.32.8",
     "zod": "^3.0.0"
   },
-  "gitHead": "fb72199e0d4454377cc6bc82f60b946e55732595"
+  "gitHead": "840af567d6634243e0b6a09d9fdb5bf19554cc93"
 }

package/src/http/internals/getHTTPStatusCode.ts

@@ -22,6 +22,7 @@ const JSONRPC2_TO_HTTP_CODE: Record<
   PRECONDITION_FAILED: 412,
   PAYLOAD_TOO_LARGE: 413,
   METHOD_NOT_SUPPORTED: 405,
+  TOO_MANY_REQUESTS: 429,
 };
 
 function getStatusCodeFromKey(code: keyof typeof TRPC_ERROR_CODES_BY_KEY) {

package/src/rpc/codes.ts

@@ -31,6 +31,7 @@ export const TRPC_ERROR_CODES_BY_KEY = {
   CONFLICT: -32009, // 409
   PRECONDITION_FAILED: -32012, // 412
   PAYLOAD_TOO_LARGE: -32013, // 413
+  TOO_MANY_REQUESTS: -32029, // 429
   CLIENT_CLOSED_REQUEST: -32099, // 499
 } as const;
 

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/aws-lambda/index";

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.dev.js

@@ -1,190 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var transformTRPCResponse = require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/router-ee876044.cjs.dev.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-var resolveHTTPResponse = require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
-}
-function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
-}
-
-function determinePayloadFormat(event) {
-  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-  // According to AWS support, version is is extracted from the version property in the event.
-  // If there is no version property, then the version is implied as 1.0
-  const unknownEvent = event;
-
-  if (typeof unknownEvent.version === 'undefined') {
-    return '1.0';
-  } else {
-    if (['1.0', '2.0'].includes(unknownEvent.version)) {
-      return unknownEvent.version;
-    } else {
-      return 'custom';
-    }
-  }
-}
-
-const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-function lambdaEventToHTTPRequest(event) {
-  const query = new URLSearchParams();
-
-  for (const [key, value] of Object.entries((_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {})) {
-    var _event$queryStringPar;
-
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
-}
-
-function getHTTPMethod(event) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function getPath(event) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function transformHeaders(headers) {
-  const obj = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
-}
-
-function tRPCOutputToAPIGatewayOutput(event, response) {
-  if (isPayloadV1(event)) {
-    var _response$body, _response$headers;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body = response.body) !== null && _response$body !== void 0 ? _response$body : '',
-      headers: transformHeaders((_response$headers = response.headers) !== null && _response$headers !== void 0 ? _response$headers : {})
-    };
-    return resp;
-  } else if (isPayloadV2(event)) {
-    var _response$body2, _response$headers2;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body2 = response.body) !== null && _response$body2 !== void 0 ? _response$body2 : undefined,
-      headers: transformHeaders((_response$headers2 = response.headers) !== null && _response$headers2 !== void 0 ? _response$headers2 : {})
-    };
-    return resp;
-  } else {
-    throw new transformTRPCResponse.TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
-}
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-
-
-function awsLambdaRequestHandler(opts) {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-
-    const createContext = async function _createContext() {
-      var _opts$createContext;
-
-      return await ((_opts$createContext = opts.createContext) === null || _opts$createContext === void 0 ? void 0 : _opts$createContext.call(opts, {
-        event,
-        context
-      }));
-    };
-
-    const response = await resolveHTTPResponse.resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts === null || opts === void 0 ? void 0 : opts.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-
-      onError(o) {
-        var _opts$onError;
-
-        opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
-          req: event
-        });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
-}
-
-exports.awsLambdaRequestHandler = awsLambdaRequestHandler;

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.prod.js");
-} else {
-  module.exports = require("./trpc-server-adapters-aws-lambda.cjs.dev.js");
-}

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.prod.js

@@ -1,190 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var transformTRPCResponse = require('../../../dist/transformTRPCResponse-077b7539.cjs.prod.js');
-require('../../../dist/router-aaecbe82.cjs.prod.js');
-require('events');
-require('http');
-require('url');
-require('../../../dist/nodeHTTPRequestHandler-21707788.cjs.prod.js');
-var resolveHTTPResponse = require('../../../dist/resolveHTTPResponse-9812e803.cjs.prod.js');
-require('../../../dist/codes-aff770a3.cjs.prod.js');
-
-function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
-}
-function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
-}
-
-function determinePayloadFormat(event) {
-  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-  // According to AWS support, version is is extracted from the version property in the event.
-  // If there is no version property, then the version is implied as 1.0
-  const unknownEvent = event;
-
-  if (typeof unknownEvent.version === 'undefined') {
-    return '1.0';
-  } else {
-    if (['1.0', '2.0'].includes(unknownEvent.version)) {
-      return unknownEvent.version;
-    } else {
-      return 'custom';
-    }
-  }
-}
-
-const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-function lambdaEventToHTTPRequest(event) {
-  const query = new URLSearchParams();
-
-  for (const [key, value] of Object.entries((_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {})) {
-    var _event$queryStringPar;
-
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
-}
-
-function getHTTPMethod(event) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function getPath(event) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new transformTRPCResponse.TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function transformHeaders(headers) {
-  const obj = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
-}
-
-function tRPCOutputToAPIGatewayOutput(event, response) {
-  if (isPayloadV1(event)) {
-    var _response$body, _response$headers;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body = response.body) !== null && _response$body !== void 0 ? _response$body : '',
-      headers: transformHeaders((_response$headers = response.headers) !== null && _response$headers !== void 0 ? _response$headers : {})
-    };
-    return resp;
-  } else if (isPayloadV2(event)) {
-    var _response$body2, _response$headers2;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body2 = response.body) !== null && _response$body2 !== void 0 ? _response$body2 : undefined,
-      headers: transformHeaders((_response$headers2 = response.headers) !== null && _response$headers2 !== void 0 ? _response$headers2 : {})
-    };
-    return resp;
-  } else {
-    throw new transformTRPCResponse.TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
-}
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-
-
-function awsLambdaRequestHandler(opts) {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-
-    const createContext = async function _createContext() {
-      var _opts$createContext;
-
-      return await ((_opts$createContext = opts.createContext) === null || _opts$createContext === void 0 ? void 0 : _opts$createContext.call(opts, {
-        event,
-        context
-      }));
-    };
-
-    const response = await resolveHTTPResponse.resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts === null || opts === void 0 ? void 0 : opts.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-
-      onError(o) {
-        var _opts$onError;
-
-        opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
-          req: event
-        });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
-}
-
-exports.awsLambdaRequestHandler = awsLambdaRequestHandler;

package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.esm.js

@@ -1,186 +0,0 @@
-import { T as TRPCError } from '../../../dist/transformTRPCResponse-56464e52.esm.js';
-import '../../../dist/router-a3fe3182.esm.js';
-import 'events';
-import 'http';
-import 'url';
-import '../../../dist/nodeHTTPRequestHandler-4e09fc4c.esm.js';
-import { r as resolveHTTPResponse } from '../../../dist/resolveHTTPResponse-fcf14f5a.esm.js';
-import '../../../dist/codes-5678cc97.esm.js';
-
-function isPayloadV1(event) {
-  return determinePayloadFormat(event) == '1.0';
-}
-function isPayloadV2(event) {
-  return determinePayloadFormat(event) == '2.0';
-}
-
-function determinePayloadFormat(event) {
-  // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
-  // According to AWS support, version is is extracted from the version property in the event.
-  // If there is no version property, then the version is implied as 1.0
-  const unknownEvent = event;
-
-  if (typeof unknownEvent.version === 'undefined') {
-    return '1.0';
-  } else {
-    if (['1.0', '2.0'].includes(unknownEvent.version)) {
-      return unknownEvent.version;
-    } else {
-      return 'custom';
-    }
-  }
-}
-
-const UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE = 'Custom payload format version not handled by this adapter. Please use either 1.0 or 2.0. More information here' + 'https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html';
-
-function lambdaEventToHTTPRequest(event) {
-  const query = new URLSearchParams();
-
-  for (const [key, value] of Object.entries((_event$queryStringPar = event.queryStringParameters) !== null && _event$queryStringPar !== void 0 ? _event$queryStringPar : {})) {
-    var _event$queryStringPar;
-
-    if (typeof value !== 'undefined') {
-      query.append(key, value);
-    }
-  }
-
-  return {
-    method: getHTTPMethod(event),
-    query: query,
-    headers: event.headers,
-    body: event.body
-  };
-}
-
-function getHTTPMethod(event) {
-  if (isPayloadV1(event)) {
-    return event.httpMethod;
-  }
-
-  if (isPayloadV2(event)) {
-    return event.requestContext.http.method;
-  }
-
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function getPath(event) {
-  if (isPayloadV1(event)) {
-    const matches = event.resource.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.path.slice(1);
-  }
-
-  if (isPayloadV2(event)) {
-    const matches = event.routeKey.matchAll(/\{(.*?)\}/g);
-
-    for (const match of matches) {
-      const group = match[1];
-
-      if (group.includes('+') && event.pathParameters) {
-        return event.pathParameters[group.replace('+', '')] || '';
-      }
-    }
-
-    return event.rawPath.slice(1);
-  }
-
-  throw new TRPCError({
-    code: 'INTERNAL_SERVER_ERROR',
-    message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-  });
-}
-
-function transformHeaders(headers) {
-  const obj = {};
-
-  for (const [key, value] of Object.entries(headers)) {
-    if (typeof value === 'undefined') {
-      continue;
-    }
-
-    obj[key] = Array.isArray(value) ? value.join(',') : value;
-  }
-
-  return obj;
-}
-
-function tRPCOutputToAPIGatewayOutput(event, response) {
-  if (isPayloadV1(event)) {
-    var _response$body, _response$headers;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body = response.body) !== null && _response$body !== void 0 ? _response$body : '',
-      headers: transformHeaders((_response$headers = response.headers) !== null && _response$headers !== void 0 ? _response$headers : {})
-    };
-    return resp;
-  } else if (isPayloadV2(event)) {
-    var _response$body2, _response$headers2;
-
-    const resp = {
-      statusCode: response.status,
-      body: (_response$body2 = response.body) !== null && _response$body2 !== void 0 ? _response$body2 : undefined,
-      headers: transformHeaders((_response$headers2 = response.headers) !== null && _response$headers2 !== void 0 ? _response$headers2 : {})
-    };
-    return resp;
-  } else {
-    throw new TRPCError({
-      code: 'INTERNAL_SERVER_ERROR',
-      message: UNKNOWN_PAYLOAD_FORMAT_VERSION_ERROR_MESSAGE
-    });
-  }
-}
-/** Will check the createContext of the TRouter and get the parameter of event.
- * @internal
- **/
-
-
-function awsLambdaRequestHandler(opts) {
-  return async (event, context) => {
-    const req = lambdaEventToHTTPRequest(event);
-    const path = getPath(event);
-
-    const createContext = async function _createContext() {
-      var _opts$createContext;
-
-      return await ((_opts$createContext = opts.createContext) === null || _opts$createContext === void 0 ? void 0 : _opts$createContext.call(opts, {
-        event,
-        context
-      }));
-    };
-
-    const response = await resolveHTTPResponse({
-      router: opts.router,
-      batching: opts.batching,
-      responseMeta: opts === null || opts === void 0 ? void 0 : opts.responseMeta,
-      createContext,
-      req,
-      path,
-      error: null,
-
-      onError(o) {
-        var _opts$onError;
-
-        opts === null || opts === void 0 ? void 0 : (_opts$onError = opts.onError) === null || _opts$onError === void 0 ? void 0 : _opts$onError.call(opts, { ...o,
-          req: event
-        });
-      }
-
-    });
-    return tRPCOutputToAPIGatewayOutput(event, response);
-  };
-}
-
-export { awsLambdaRequestHandler };

package/adapters/express/dist/trpc-server-adapters-express.cjs.d.ts

@@ -1 +0,0 @@
-export * from "../../../dist/declarations/src/adapters/express";

package/adapters/express/dist/trpc-server-adapters-express.cjs.dev.js

@@ -1,23 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var nodeHTTPRequestHandler = require('../../../dist/nodeHTTPRequestHandler-9a93c255.cjs.dev.js');
-require('url');
-require('../../../dist/resolveHTTPResponse-ab01e4b9.cjs.dev.js');
-require('../../../dist/transformTRPCResponse-36a41418.cjs.dev.js');
-require('../../../dist/codes-130e62df.cjs.dev.js');
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-function createExpressMiddleware(opts) {
-  return async (req, res) => {
-    const endpoint = req.path.slice(1);
-    await nodeHTTPRequestHandler.nodeHTTPRequestHandler({ ...opts,
-      req,
-      res,
-      path: endpoint
-    });
-  };
-}
-
-exports.createExpressMiddleware = createExpressMiddleware;