@orpc/client 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,7 +1,7 @@
 import { toArray, value, splitInHalf, promiseWithResolvers, safeEncodeURIComponent, stringifyJSON, once, isAsyncIteratorObject, defer, captureAsyncContext, loadBytes, allAbortSignal, runWithSignal, replicateAsyncIterator, replicateReadableStream, wrapAsyncIterator, throwIfAborted, isCompressibleContentType, override, AsyncIteratorClass, sleep, AbortError, anyAbortSignal } from '@orpc/shared';
 import { parseStandardUrl, flattenStandardHeader, generateContentDisposition, getEventMeta } from '@standard-server/core';
 import { ClientPeer, isPeerMessage, isServerPeerSendMessage, decodePeerMessage } from '@standard-server/peer';
-import { toFetchHeaders, toStandardBody } from '@standard-server/fetch';
+import { toFetchBody, toFetchHeaders, toStandardBody } from '@standard-server/fetch';
 import { O as ORPCError, R as ResponseError, C as COMMON_ERROR_STATUS_MAP } from '../shared/client.LF04eOvL.mjs';
 
 const BATCH_HEADER = "orpc-batch";
@@ -548,7 +548,6 @@ class RequestCompressionLinkPlugin {
               body: compressedStream,
               headers: {
                 ...request.headers,
-                "standard-server": "octet-stream",
                 "content-length": [],
                 "content-encoding": this.encoding
               }
@@ -556,7 +555,8 @@ class RequestCompressionLinkPlugin {
           });
         }
       } else if (request.body instanceof Blob) {
-        if ((!Number.isFinite(request.body.size) || request.body.size >= this.threshold) && this.isCompressibleContentType(request.body.type, interceptorOptions)) {
+        const contentType = request.headers["content-type"] ?? request.body.type;
+        if ((!Number.isFinite(request.body.size) || request.body.size >= this.threshold) && this.isCompressibleContentType(flattenStandardHeader(contentType), interceptorOptions)) {
           const compressedStream = request.body.stream().pipeThrough(new CompressionStream(this.encoding));
           const contentDisposition = request.headers["content-disposition"] ?? generateContentDisposition(
             request.body instanceof File ? request.body.name : "blob"
@@ -568,8 +568,8 @@ class RequestCompressionLinkPlugin {
               body: compressedStream,
               headers: {
                 ...request.headers,
-                "standard-server": "file",
-                "content-type": request.body.type,
+                "standard-server": request.headers["standard-server"] ?? "file",
+                "content-type": contentType,
                 "content-length": [],
                 "content-disposition": contentDisposition,
                 "content-encoding": this.encoding
@@ -618,15 +618,16 @@ class RequestCompressionLinkPlugin {
         const string = request.body.toString();
         if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
           const compressedStream = new Blob([string]).stream().pipeThrough(new CompressionStream(this.encoding));
+          const [, bodyHeaders] = toFetchBody(request.body, request.headers);
           return next({
             ...interceptorOptions,
             request: {
               ...interceptorOptions.request,
               body: compressedStream,
               headers: {
-                ...request.headers,
-                "standard-server": [],
-                "content-type": "application/x-www-form-urlencoded",
+                ...bodyHeaders,
+                // An empty hint rather than none, so the adapter does not hint the compressed stream as `octet-stream`
+                "standard-server": bodyHeaders["standard-server"] ?? [],
                 "content-length": [],
                 "content-encoding": this.encoding
               }
@@ -634,7 +635,7 @@ class RequestCompressionLinkPlugin {
           });
         }
       } else if (request.body !== void 0 && !isAsyncIteratorObject(request.body)) {
-        const string = stringifyJSON(request.body);
+        const [string, bodyHeaders] = toFetchBody(request.body, request.headers);
         if (string.length * AVG_BYTES_PER_CHAR >= this.threshold) {
           const compressedStream = new Blob([string]).stream().pipeThrough(new CompressionStream(this.encoding));
           return next({
@@ -643,9 +644,8 @@ class RequestCompressionLinkPlugin {
               ...interceptorOptions.request,
               body: compressedStream,
               headers: {
-                ...request.headers,
-                "standard-server": [],
-                "content-type": "application/json",
+                ...bodyHeaders,
+                "standard-server": bodyHeaders["standard-server"] ?? [],
                 "content-length": [],
                 "content-encoding": this.encoding
               }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "2.0.0-beta.46",
+  "version": "2.0.0-beta.47",
   "description": "Consume oRPC and OpenAPI APIs with end-to-end type safety over HTTP, WebSocket, or message ports",
   "license": "MIT",
   "funding": [
@@ -63,10 +63,10 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "2.0.0-beta.46",
-    "@standard-server/core": "~0.11.0",
-    "@standard-server/fetch": "~0.11.0",
-    "@standard-server/peer": "~0.11.0"
+    "@orpc/shared": "2.0.0-beta.47",
+    "@standard-server/core": "~0.13.0",
+    "@standard-server/fetch": "~0.13.0",
+    "@standard-server/peer": "~0.13.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.2",