@temporary-name/server 1.9.3-alpha.03f5d40e5b399f85012c2fb4e98167e26d551d36 → 1.9.3-alpha.0f2e1f4d66464608b85c66977bff51174cbb238f

package/dist/plugins/index.mjs

@@ -1,119 +1,5 @@
-import { runWithSpan, value, setSpanError, isAsyncIteratorObject, AsyncIteratorClass, clone, ORPCError } from '@temporary-name/shared';
-import { flattenHeader } from '@temporary-name/standard-server';
-import { parseBatchRequest, toBatchResponse } from '@temporary-name/standard-server/batch';
-import { toFetchHeaders } from '@temporary-name/standard-server-fetch';
-
-class BatchHandlerPlugin {
-  maxSize;
-  mapRequestItem;
-  successStatus;
-  headers;
-  order = 5e6;
-  constructor(options = {}) {
-    this.maxSize = options.maxSize ?? 10;
-    this.mapRequestItem = options.mapRequestItem ?? ((request, { request: batchRequest }) => ({
-      ...request,
-      headers: {
-        ...batchRequest.headers,
-        ...request.headers
-      }
-    }));
-    this.successStatus = options.successStatus ?? 207;
-    this.headers = options.headers ?? {};
-  }
-  init(options) {
-    options.rootInterceptors ??= [];
-    options.rootInterceptors.unshift(async (options2) => {
-      const xHeader = flattenHeader(options2.request.headers["x-orpc-batch"]);
-      if (xHeader === void 0) {
-        return options2.next();
-      }
-      let isParsing = false;
-      try {
-        return await runWithSpan({ name: "handle_batch_request" }, async (span) => {
-          const mode = xHeader === "buffered" ? "buffered" : "streaming";
-          isParsing = true;
-          const parsed = parseBatchRequest({ ...options2.request, body: await options2.request.body() });
-          isParsing = false;
-          span?.setAttribute("batch.mode", mode);
-          span?.setAttribute("batch.size", parsed.length);
-          const maxSize = await value(this.maxSize, options2);
-          if (parsed.length > maxSize) {
-            const message = "Batch request size exceeds the maximum allowed size";
-            setSpanError(span, message);
-            return {
-              matched: true,
-              response: {
-                status: 413,
-                headers: {},
-                body: message
-              }
-            };
-          }
-          const responses = parsed.map((request, index) => {
-            const mapped = this.mapRequestItem(request, options2);
-            return options2.next({ ...options2, request: { ...mapped, body: () => Promise.resolve(mapped.body) } }).then(({ response: response2, matched }) => {
-              span?.addEvent(`response.${index}.${matched ? "success" : "not_matched"}`);
-              if (matched) {
-                if (response2.body instanceof Blob || response2.body instanceof FormData || isAsyncIteratorObject(response2.body)) {
-                  return {
-                    index,
-                    status: 500,
-                    headers: {},
-                    body: "Batch responses do not support file/blob, or event-iterator. Please call this procedure separately outside of the batch request."
-                  };
-                }
-                return { ...response2, index };
-              }
-              return { index, status: 404, headers: {}, body: "No procedure matched" };
-            }).catch((err) => {
-              Promise.reject(err);
-              return { index, status: 500, headers: {}, body: "Internal server error" };
-            });
-          });
-          await Promise.race(responses);
-          const status = await value(this.successStatus, responses, options2);
-          const headers = await value(this.headers, responses, options2);
-          const promises = [...responses];
-          const response = await toBatchResponse({
-            status,
-            headers,
-            mode,
-            body: new AsyncIteratorClass(
-              async () => {
-                const handling = promises.filter((p) => p !== void 0);
-                if (handling.length <= 0) {
-                  return { done: true, value: void 0 };
-                }
-                const value2 = await Promise.race(handling);
-                promises[value2.index] = void 0;
-                return { done: false, value: value2 };
-              },
-              async () => {
-              }
-            )
-          });
-          return {
-            matched: true,
-            response
-          };
-        });
-      } catch (cause) {
-        if (isParsing) {
-          return {
-            matched: true,
-            response: {
-              status: 400,
-              headers: {},
-              body: "Invalid batch request, this could be caused by a malformed request body or a missing header"
-            }
-          };
-        }
-        throw cause;
-      }
-    });
-  }
-}
+import { value, ORPCError } from '@temporary-name/shared';
+import { maybeSetHeader } from '@temporary-name/standard-server';
 
 class CORSPlugin {
   options;
@@ -132,17 +18,13 @@ class CORSPlugin {
     options.rootInterceptors ??= [];
     options.rootInterceptors.unshift(async (interceptorOptions) => {
       if (interceptorOptions.request.method === "OPTIONS") {
-        const resHeaders = {};
+        const resHeaders = new Headers();
         if (this.options.maxAge !== void 0) {
-          resHeaders["access-control-max-age"] = this.options.maxAge.toString();
-        }
-        if (this.options.allowMethods?.length) {
-          resHeaders["access-control-allow-methods"] = flattenHeader(this.options.allowMethods);
-        }
-        const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers["access-control-request-headers"];
-        if (typeof allowHeaders === "string" || allowHeaders?.length) {
-          resHeaders["access-control-allow-headers"] = flattenHeader(allowHeaders);
+          resHeaders.set("access-control-max-age", this.options.maxAge.toString());
         }
+        maybeSetHeader(resHeaders, "access-control-allow-methods", this.options.allowMethods);
+        const allowHeaders = this.options.allowHeaders ?? interceptorOptions.request.headers.get("access-control-request-headers");
+        maybeSetHeader(resHeaders, "access-control-allow-headers", allowHeaders);
         return {
           matched: true,
           response: {
@@ -159,87 +41,33 @@ class CORSPlugin {
       if (!result.matched) {
         return result;
       }
-      const origin = flattenHeader(interceptorOptions.request.headers.origin) ?? "";
+      const origin = interceptorOptions.request.headers.get("origin") ?? "";
       const allowedOrigin = await value(this.options.origin, origin, interceptorOptions);
       const allowedOriginArr = Array.isArray(allowedOrigin) ? allowedOrigin : [allowedOrigin];
       if (allowedOriginArr.includes("*")) {
-        result.response.headers["access-control-allow-origin"] = "*";
+        result.response.headers.set("access-control-allow-origin", "*");
       } else {
         if (allowedOriginArr.includes(origin)) {
-          result.response.headers["access-control-allow-origin"] = origin;
+          result.response.headers.set("access-control-allow-origin", origin);
         }
-        result.response.headers.vary = interceptorOptions.request.headers.vary ?? "origin";
+        result.response.headers.set("vary", interceptorOptions.request.headers.get("vary") ?? "origin");
       }
       const allowedTimingOrigin = await value(this.options.timingOrigin, origin, interceptorOptions);
       const allowedTimingOriginArr = Array.isArray(allowedTimingOrigin) ? allowedTimingOrigin : [allowedTimingOrigin];
       if (allowedTimingOriginArr.includes("*")) {
-        result.response.headers["timing-allow-origin"] = "*";
+        result.response.headers.set("timing-allow-origin", "*");
       } else if (allowedTimingOriginArr.includes(origin)) {
-        result.response.headers["timing-allow-origin"] = origin;
+        result.response.headers.set("timing-allow-origin", origin);
       }
       if (this.options.credentials) {
-        result.response.headers["access-control-allow-credentials"] = "true";
-      }
-      if (this.options.exposeHeaders?.length) {
-        result.response.headers["access-control-expose-headers"] = flattenHeader(this.options.exposeHeaders);
+        result.response.headers.set("access-control-allow-credentials", "true");
       }
+      maybeSetHeader(result.response.headers, "access-control-expose-headers", this.options.exposeHeaders);
       return result;
     });
   }
 }
 
-class RequestHeadersPlugin {
-  init(options) {
-    options.rootInterceptors ??= [];
-    options.rootInterceptors.push((interceptorOptions) => {
-      const reqHeaders = interceptorOptions.context.reqHeaders ?? toFetchHeaders(interceptorOptions.request.headers);
-      return interceptorOptions.next({
-        ...interceptorOptions,
-        context: {
-          ...interceptorOptions.context,
-          reqHeaders
-        }
-      });
-    });
-  }
-}
-
-class ResponseHeadersPlugin {
-  init(options) {
-    options.rootInterceptors ??= [];
-    options.rootInterceptors.push(async (interceptorOptions) => {
-      const resHeaders = interceptorOptions.context.resHeaders ?? new Headers();
-      const result = await interceptorOptions.next({
-        ...interceptorOptions,
-        context: {
-          ...interceptorOptions.context,
-          resHeaders
-        }
-      });
-      if (!result.matched) {
-        return result;
-      }
-      const responseHeaders = clone(result.response.headers);
-      for (const [key, value] of resHeaders) {
-        if (Array.isArray(responseHeaders[key])) {
-          responseHeaders[key].push(value);
-        } else if (responseHeaders[key] !== void 0) {
-          responseHeaders[key] = [responseHeaders[key], value];
-        } else {
-          responseHeaders[key] = value;
-        }
-      }
-      return {
-        ...result,
-        response: {
-          ...result.response,
-          headers: responseHeaders
-        }
-      };
-    });
-  }
-}
-
 const SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL = Symbol("SIMPLE_CSRF_PROTECTION_CONTEXT");
 class SimpleCsrfProtectionHandlerPlugin {
   headerName;
@@ -266,7 +94,7 @@ class SimpleCsrfProtectionHandlerPlugin {
         ...options2,
         context: {
           ...options2.context,
-          [SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL]: options2.request.headers[headerName] === headerValue
+          [SIMPLE_CSRF_PROTECTION_CONTEXT_SYMBOL]: options2.request.headers.get(headerName) === headerValue
         }
       });
     });
@@ -285,4 +113,4 @@ class SimpleCsrfProtectionHandlerPlugin {
   }
 }
 
-export { BatchHandlerPlugin, CORSPlugin, RequestHeadersPlugin, ResponseHeadersPlugin, SimpleCsrfProtectionHandlerPlugin };
+export { CORSPlugin, SimpleCsrfProtectionHandlerPlugin };

package/dist/shared/{server.Bk5r0-2R.d.ts → server.25yUS-xw.d.mts}

@@ -1,7 +1,6 @@
 import { Meta } from '@temporary-name/contract';
-import { HTTPPath, Interceptor } from '@temporary-name/shared';
-import { StandardLazyRequest, StandardResponse } from '@temporary-name/standard-server';
-import { C as Context, R as Router, E as ProcedureClientInterceptorOptions } from './server.CZNLCQBm.js';
+import { HTTPPath, StandardLazyRequest, Interceptor, StandardResponse } from '@temporary-name/shared';
+import { C as Context, R as Router, H as ProcedureClientInterceptorOptions } from './server.VtI8pLxV.mjs';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
@@ -41,7 +40,7 @@ interface StandardHandlerOptions<TContext extends Context> {
      *
      * Interceptors for procedure client.
      */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Meta>, Promise<unknown>>[];
 }
 declare class StandardHandler<T extends Context> {
     private readonly interceptors;

package/dist/shared/{server.Bs6ka_UE.d.mts → server.BKwU5-Ea.d.mts}

@@ -1,6 +1,6 @@
 import { HTTPPath } from '@temporary-name/shared';
-import { C as Context } from './server.CZNLCQBm.mjs';
-import { c as StandardHandleOptions } from './server.CbLTWfgn.mjs';
+import { C as Context } from './server.VtI8pLxV.mjs';
+import { c as StandardHandleOptions } from './server.25yUS-xw.mjs';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;

package/dist/shared/server.C1RJffw4.mjs

@@ -0,0 +1,30 @@
+import { parse, serialize } from 'cookie';
+
+function setCookie(headers, name, value, options = {}) {
+  if (headers === void 0) {
+    return;
+  }
+  const cookieString = serialize(name, value, {
+    path: "/",
+    ...options
+  });
+  headers.append("Set-Cookie", cookieString);
+}
+function getCookie(headers, name, options = {}) {
+  if (headers === void 0) {
+    return void 0;
+  }
+  const cookieHeader = headers.get("cookie");
+  if (cookieHeader === null) {
+    return void 0;
+  }
+  return parse(cookieHeader, options)[name];
+}
+function deleteCookie(headers, name, options = {}) {
+  return setCookie(headers, name, "", {
+    ...options,
+    maxAge: 0
+  });
+}
+
+export { deleteCookie as d, getCookie as g, setCookie as s };

package/dist/shared/{server.CbLTWfgn.d.mts → server.Co-zpS8Y.d.ts}

@@ -1,7 +1,6 @@
 import { Meta } from '@temporary-name/contract';
-import { HTTPPath, Interceptor } from '@temporary-name/shared';
-import { StandardLazyRequest, StandardResponse } from '@temporary-name/standard-server';
-import { C as Context, R as Router, E as ProcedureClientInterceptorOptions } from './server.CZNLCQBm.mjs';
+import { HTTPPath, StandardLazyRequest, Interceptor, StandardResponse } from '@temporary-name/shared';
+import { C as Context, R as Router, H as ProcedureClientInterceptorOptions } from './server.VtI8pLxV.js';
 
 interface StandardHandlerPlugin<T extends Context> {
     order?: number;
@@ -41,7 +40,7 @@ interface StandardHandlerOptions<TContext extends Context> {
      *
      * Interceptors for procedure client.
      */
-    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>, Promise<unknown>>[];
+    clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Meta>, Promise<unknown>>[];
 }
 declare class StandardHandler<T extends Context> {
     private readonly interceptors;

package/dist/shared/{server.BVxcyR6X.mjs → server.DRYRuXpK.mjs}

@@ -1,44 +1,16 @@
-import { isObject, stringifyJSON, isORPCErrorStatus, tryDecodeURIComponent, value, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
-import { flattenHeader } from '@temporary-name/standard-server';
-import { c as createProcedureClient } from './server.DcfsPloY.mjs';
-import { fallbackContractConfig } from '@temporary-name/contract';
-import { d as deserialize, s as serialize, a as standardizeHTTPPath } from './server.BEHw7Eyx.mjs';
+import { stringifyJSON, isObject, isORPCErrorStatus, tryDecodeURIComponent, toHttpPath, toArray, intercept, runWithSpan, ORPC_NAME, isAsyncIteratorObject, asyncIteratorWithSpan, setSpanError, ORPCError, toORPCError } from '@temporary-name/shared';
+import { c as createProcedureClient } from './server.DWEp52Gx.mjs';
+import { fallbackContractConfig, standardizeHTTPPath } from '@temporary-name/contract';
+import { d as deserialize, b as bracketNotationDeserialize, s as serialize } from './server.JtIZ8YG7.mjs';
 import { traverseContractProcedures, isProcedure, getLazyMeta, unlazy, getRouter, createContractedProcedure } from '@temporary-name/server';
 import { createRouter, addRoute, findRoute } from 'rou3';
 
-async function decode(request, params, procedure) {
-  const inputStructure = fallbackContractConfig(
-    "defaultInputStructure",
-    procedure["~orpc"].route.inputStructure
-  );
-  if (inputStructure === "compact") {
-    const data = request.method === "GET" ? deserialize(request.url.searchParams) : deserialize(await request.body());
-    if (data === void 0) {
-      return params;
-    }
-    if (isObject(data)) {
-      return {
-        ...params,
-        ...data
-      };
-    }
-    return data;
-  }
-  const deserializeSearchParams = () => {
-    return deserialize(request.url.searchParams);
-  };
+async function decode(request, pathParams) {
   return {
-    params,
-    get query() {
-      const value = deserializeSearchParams();
-      Object.defineProperty(this, "query", { value, writable: true });
-      return value;
-    },
-    set query(value) {
-      Object.defineProperty(this, "query", { value, writable: true });
-    },
+    path: pathParams ?? {},
+    query: bracketNotationDeserialize(Array.from(request.url.searchParams.entries())),
     headers: request.headers,
-    body: deserialize(await request.body())
+    body: deserialize(await request.body()) ?? {}
   };
 }
 function encode(output, procedure) {
@@ -53,7 +25,7 @@ function encode(output, procedure) {
   if (outputStructure === "compact") {
     return {
       status: successStatus,
-      headers: {},
+      headers: new Headers(),
       body: serialize(output)
     };
   }
@@ -72,14 +44,14 @@ function encode(output, procedure) {
   }
   return {
     status: output.status ?? successStatus,
-    headers: output.headers ?? {},
+    headers: output.headers ?? new Headers(),
     body: serialize(output.body)
   };
 }
 function encodeError(error) {
   return {
     status: error.status,
-    headers: {},
+    headers: new Headers(),
     body: serialize(error.toJSON(), { outputFormat: "plain" })
   };
 }
@@ -117,9 +89,6 @@ class StandardOpenAPIMatcher {
   pendingRouters = [];
   init(router, path = []) {
     const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
-      if (!value(true, traverseOptions)) {
-        return;
-      }
       const { path: path2, contract } = traverseOptions;
       const method = fallbackContractConfig("defaultMethod", contract["~orpc"].route.method);
       const httpPath = toRou3Pattern(contract["~orpc"].route.path ?? toHttpPath(path2));
@@ -236,15 +205,12 @@ class StandardHandler {
               span?.setAttribute("rpc.system", ORPC_NAME);
               span?.setAttribute("rpc.method", match.path.join("."));
               step = "decode_input";
-              let input = await runWithSpan(
-                { name: "decode_input" },
-                () => decode(request2, match.params, match.procedure)
-              );
+              const input = await runWithSpan({ name: "decode_input" }, () => decode(request2, match.params));
               step = void 0;
-              if (isAsyncIteratorObject(input)) {
-                input = asyncIteratorWithSpan(
+              if (isAsyncIteratorObject(input.body)) {
+                input.body = asyncIteratorWithSpan(
                   { name: "consume_event_iterator_input", signal: request2.signal },
-                  input
+                  input.body
                 );
               }
               const client = createProcedureClient(match.procedure, {
@@ -254,8 +220,9 @@ class StandardHandler {
               });
               step = "call_procedure";
               const output = await client(input, {
+                request: request2,
                 signal: request2.signal,
-                lastEventId: flattenHeader(request2.headers["last-event-id"])
+                lastEventId: request2.headers.get("last-event-id") ?? void 0
               });
               step = void 0;
               const response = encode(output, match.procedure);

package/dist/shared/{server.D2UFMrxf.d.ts → server.DV_PWBS2.d.ts}

@@ -1,6 +1,6 @@
 import { HTTPPath } from '@temporary-name/shared';
-import { C as Context } from './server.CZNLCQBm.js';
-import { c as StandardHandleOptions } from './server.Bk5r0-2R.js';
+import { C as Context } from './server.VtI8pLxV.js';
+import { c as StandardHandleOptions } from './server.Co-zpS8Y.js';
 
 type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
     context?: T;