@orpc/server 2.0.0-beta.46 → 2.0.0-beta.47

package/README.md

@@ -156,10 +156,11 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
    <td align="center"><a href="https://github.com/christ12938?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="christ12938"><img src="https://avatars.githubusercontent.com/u/25758598?v=4" width="167" alt="christ12938"/><br />christ12938</a></td>
    <td align="center"><a href="https://github.com/Ryanjso?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ryan Soderberg"><img src="https://avatars.githubusercontent.com/u/39172778?u=5ed913c31d57e7221b75784abcad48c7ebddde27&amp;v=4" width="167" alt="Ryan Soderberg"/><br />Ryan Soderberg</a></td>
    <td align="center"><a href="https://github.com/itigoore01?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="shota"><img src="https://avatars.githubusercontent.com/u/11831107?u=c976a6dc7e055eb026304c46c99100ed22b0c8e0&amp;v=4" width="167" alt="shota"/><br />shota</a></td>
+   <td align="center"><a href="https://github.com/Nic13Gamer?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Nicholas"><img src="https://avatars.githubusercontent.com/u/54724556?u=56a7ab430ce7a80d648ab6eba051d454a818ed0b&amp;v=4" width="167" alt="Nicholas"/><br />Nicholas</a></td>
    <td align="center"><a href="https://github.com/ellis-driscoll?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Ellis Driscoll"><img src="https://avatars.githubusercontent.com/u/70685966?u=c5f95bc33b5991d9744abe00052542e4a2ed3cb9&amp;v=4" width="167" alt="Ellis Driscoll"/><br />Ellis Driscoll</a></td>
-   <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="167" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
   </tr>
   <tr>
+   <td align="center"><a href="https://github.com/hoangbn?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Hoang Nguyen"><img src="https://avatars.githubusercontent.com/u/38968280?u=c90084c6de65c56facabab7ba13a72a49ddbc3e4&amp;v=4" width="167" alt="Hoang Nguyen"/><br />Hoang Nguyen</a></td>
    <td align="center"><a href="https://opencollective.com/guest-ac41de3b?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Orestis Ioannou"><img src="https://images.opencollective.com/guest-ac41de3b/avatar/460.png" width="167" alt="Orestis Ioannou"/><br />Orestis Ioannou</a></td>
    <td align="center"><a href="https://automatio.ai/?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Stefan Smiljkovic"><img src="https://avatars.githubusercontent.com/u/1984909?u=b7bf5bc40ed49df3c22f69d2da7b8d78709c49ed&amp;v=4" width="167" alt="Stefan Smiljkovic"/><br />Stefan Smiljkovic</a></td>
   </tr>
@@ -198,7 +199,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   </tr>
 </table>
 
-With thanks to [40 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
+With thanks to [39 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
 
 ## Open Source Programs
 
@@ -206,7 +207,9 @@ With thanks to [40 past sponsors](https://orpc.dev/sponsors#past-sponsors) who h
 
 <table>
   <tr>
-   <td align="center"><a href="https://claude.com/contact-sales/claude-for-oss" target="_blank" rel="noopener" title="Claude for Open Source"><img src="https://cdn.simpleicons.org/claude" width="64" alt="Claude"/><br />Claude for Open Source</a></td>
+   <td align="center"><a href="https://claude.com/contact-sales/claude-for-oss" target="_blank" rel="noopener" title="Claude for Open Source"><img src="https://cdn.simpleicons.org/claude" width="64" alt="Claude"/><br />Claude</a></td>
+   <td align="center"><a href="https://pullfrog.com/for-oss" target="_blank" rel="noopener" title="Pullfrog for OSS"><img src="https://avatars.githubusercontent.com/in/1768019?s=128&amp;v=4" width="64" alt="Pullfrog"/><br />Pullfrog</a></td>
+   <td align="center"><a href="https://macroscope.com/open-source" target="_blank" rel="noopener" title="Macroscope for Open Source"><img src="https://avatars.githubusercontent.com/in/900172?s=128&amp;v=4" width="64" alt="Macroscope"/><br />Macroscope</a></td>
   </tr>
 </table>
 

package/dist/plugins/index.mjs

@@ -1,10 +1,10 @@
 import { ORPCError } from '@orpc/client';
 import { DEFAULT_BATCH_MAX_SIZE, BATCH_HEADER } from '@orpc/client/plugins';
 export { BATCH_HEADER, DEFAULT_BATCH_MAX_SIZE } from '@orpc/client/plugins';
-import { toArray, value, promiseWithResolvers, isAsyncIteratorObject, isCompressibleContentType, isNoTransformCacheControl, parseAcceptEncodingQualities, isAcceptableEncoding, varyByAcceptEncoding, stringifyJSON, anyAbortSignal, override, AsyncIteratorClass, runWithSignal, AbortError, wrapAsyncIterator, wrapReadableStream } from '@orpc/shared';
+import { toArray, value, promiseWithResolvers, isAsyncIteratorObject, isCompressibleContentType, isNoTransformCacheControl, parseAcceptEncodingQualities, isAcceptableEncoding, varyByAcceptEncoding, anyAbortSignal, override, AsyncIteratorClass, runWithSignal, AbortError, wrapAsyncIterator, wrapReadableStream } from '@orpc/shared';
 import { flattenStandardHeader, parseStandardUrl, generateContentDisposition, mergeStandardHeaders } from '@standard-server/core';
 import { ServerPeer, isPeerMessage, isClientPeerSendMessage, encodePeerMessage } from '@standard-server/peer';
-import { toFetchHeaders, toStandardBody, toStandardHeaders } from '@standard-server/fetch';
+import { toFetchHeaders, toStandardBody, toFetchBody, toStandardHeaders } from '@standard-server/fetch';
 export { R as RequestLimitHandlerPlugin } from '../shared/server.1ExWFMze.mjs';
 
 const BATCH_CONTENT_TYPE = "application/vnd.orpc.batch";
@@ -248,6 +248,7 @@ class BatchHandlerPlugin {
       };
       const subrequests = runSubrequests();
       const { batchHeaders, streams } = await lifting;
+      const framedHeaders = { ...batchHeaders, "content-type": batchHeaders["content-type"] ?? BATCH_CONTENT_TYPE };
       if (!streams) {
         await subrequests;
         await peer.close();
@@ -257,8 +258,8 @@ class BatchHandlerPlugin {
             matched: true,
             response: {
               status,
-              headers: batchHeaders,
-              body: new Blob(chunks, { type: BATCH_CONTENT_TYPE })
+              headers: framedHeaders,
+              body: new Blob(chunks)
             }
           };
         }
@@ -291,7 +292,7 @@ class BatchHandlerPlugin {
         matched: true,
         response: {
           status,
-          headers: { ...batchHeaders, "content-type": BATCH_CONTENT_TYPE },
+          headers: framedHeaders,
           body
         }
       };
@@ -606,10 +607,7 @@ class ResponseCompressionHandlerPlugin {
             response: {
               ...response,
               body: body.pipeThrough(new CompressionStream(encoding)),
-              headers: {
-                ...toCompressedHeaders(headers, encoding),
-                "standard-server": "octet-stream"
-              }
+              headers: toCompressedHeaders(headers, encoding)
             }
           };
         }
@@ -626,7 +624,7 @@ class ResponseCompressionHandlerPlugin {
               body: body.stream().pipeThrough(new CompressionStream(encoding)),
               headers: {
                 ...toCompressedHeaders(headers, encoding),
-                "standard-server": "file",
+                "standard-server": headers["standard-server"] ?? "file",
                 "content-type": contentType,
                 "content-disposition": contentDisposition
               }
@@ -671,21 +669,22 @@ class ResponseCompressionHandlerPlugin {
       } else if (body instanceof URLSearchParams) {
         const string = body.toString();
         if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
+          const [, bodyHeaders] = toFetchBody(body, headers);
           return {
             ...result,
             response: {
               ...response,
               body: new Blob([string]).stream().pipeThrough(new CompressionStream(encoding)),
               headers: {
-                ...toCompressedHeaders(headers, encoding),
-                "standard-server": [],
-                "content-type": "application/x-www-form-urlencoded"
+                ...toCompressedHeaders(bodyHeaders, encoding),
+                // An empty hint rather than none, so the adapter does not hint the compressed stream as `octet-stream`
+                "standard-server": bodyHeaders["standard-server"] ?? []
               }
             }
           };
         }
       } else if (body !== void 0 && !isAsyncIteratorObject(body)) {
-        const string = stringifyJSON(body);
+        const [string, bodyHeaders] = toFetchBody(body, headers);
         if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
           return {
             ...result,
@@ -693,9 +692,8 @@ class ResponseCompressionHandlerPlugin {
               ...response,
               body: new Blob([string]).stream().pipeThrough(new CompressionStream(encoding)),
               headers: {
-                ...toCompressedHeaders(headers, encoding),
-                "standard-server": [],
-                "content-type": "application/json"
+                ...toCompressedHeaders(bodyHeaders, encoding),
+                "standard-server": bodyHeaders["standard-server"] ?? []
               }
             }
           };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "2.0.0-beta.46",
+  "version": "2.0.0-beta.47",
   "description": "Build typesafe APIs with oRPC: RPC and OpenAPI support, middleware, and adapters for Node.js, Bun, Deno, Fetch, Fastify, WebSocket, AWS Lambda, and more",
   "license": "MIT",
   "funding": [
@@ -117,15 +117,15 @@
     }
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.46",
-    "@orpc/contract": "2.0.0-beta.46",
-    "@orpc/shared": "2.0.0-beta.46",
-    "@standard-server/aws-lambda": "~0.11.0",
-    "@standard-server/core": "~0.11.0",
-    "@standard-server/fastify": "~0.11.0",
-    "@standard-server/fetch": "~0.11.0",
-    "@standard-server/node": "~0.11.0",
-    "@standard-server/peer": "~0.11.0",
+    "@orpc/client": "2.0.0-beta.47",
+    "@orpc/contract": "2.0.0-beta.47",
+    "@orpc/shared": "2.0.0-beta.47",
+    "@standard-server/aws-lambda": "~0.13.0",
+    "@standard-server/core": "~0.13.0",
+    "@standard-server/fastify": "~0.13.0",
+    "@standard-server/fetch": "~0.13.0",
+    "@standard-server/node": "~0.13.0",
+    "@standard-server/peer": "~0.13.0",
     "cookie": "^2.0.1"
   },
   "devDependencies": {