@orpc/standard-server-fetch 0.0.0-next.ea0903c → 0.0.0-next.ea1d4fd

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -17,32 +17,31 @@
17
17
  <a href="https://discord.gg/TXEbwRBvQn">
18
18
  <img alt="Discord" src="https://img.shields.io/discord/1308966753044398161?color=7389D8&label&logo=discord&logoColor=ffffff" />
19
19
  </a>
20
+ <a href="https://deepwiki.com/unnoq/orpc">
21
+ <img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki">
22
+ </a>
20
23
  </div>
21
24
 
22
25
  <h3 align="center">Typesafe APIs Made Simple 🪄</h3>
23
26
 
24
- **oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards, ensuring a smooth and enjoyable developer experience.
27
+ **oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards
25
28
 
26
29
  ---
27
30
 
28
31
  ## Highlights
29
32
 
30
- - **End-to-End Type Safety 🔒**: Ensure complete type safety from inputs to outputs and errors, bridging server and client seamlessly.
31
- - **First-Class OpenAPI 📄**: Adheres to the OpenAPI standard out of the box, ensuring seamless integration and comprehensive API documentation.
32
- - **Contract-First Development 📜**: (Optional) Define your API contract upfront and implement it with confidence.
33
- - **Exceptional Developer Experience ✨**: Enjoy a streamlined workflow with robust typing and clear, in-code documentation.
34
- - **Multi-Runtime Support 🌍**: Run your code seamlessly on Cloudflare, Deno, Bun, Node.js, and more.
35
- - **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
36
- - **Server Actions ⚡️**: Fully compatible with React Server Actions on Next.js, TanStack Start, and more.
37
- - **Standard Schema Support 🗂️**: Effortlessly work with Zod, Valibot, ArkType, and others right out of the box.
38
- - **Fast & Lightweight 💨**: Built on native APIs across all runtimes – optimized for speed and efficiency.
39
- - **Native Types 📦**: Enjoy built-in support for Date, File, Blob, BigInt, URL and more with no extra setup.
40
- - **Lazy Router ⏱️**: Improve cold start times with our lazy routing feature.
41
- - **SSE & Streaming 📡**: Provides SSE and streaming features – perfect for real-time notifications and AI-powered streaming responses.
42
- - **Reusability 🔄**: Write once and reuse your code across multiple purposes effortlessly.
43
- - **Extendability 🔌**: Easily enhance oRPC with plugins, middleware, and interceptors.
44
- - **Reliability 🛡️**: Well-tested, fully TypeScript, production-ready, and MIT licensed for peace of mind.
45
- - **Simplicity 💡**: Enjoy straightforward, clean code with no hidden magic.
33
+ - **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
34
+ - **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
35
+ - **📝 Contract-First Development**: Optionally define your API contract before implementation.
36
+ - **🔍 First-Class OpenTelemetry**: Seamlessly integrate with OpenTelemetry for observability.
37
+ - **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte, Angular), SWR, Pinia Colada, and more.
38
+ - **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
39
+ - **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
40
+ - **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.
41
+ - **⏱️ Lazy Router**: Enhance cold start times with our lazy routing feature.
42
+ - **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
43
+ - **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
44
+ - **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
46
45
 
47
46
  ## Documentation
48
47
 
@@ -53,12 +52,14 @@ You can find the full documentation [here](https://orpc.unnoq.com).
53
52
  - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
54
53
  - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
55
54
  - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
56
- - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
57
- - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
58
- - [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
59
- - [@orpc/svelte-query](https://www.npmjs.com/package/@orpc/svelte-query): Integration with [Svelte Query](https://tanstack.com/query/latest/docs/framework/svelte/overview).
60
- - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
61
55
  - [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
56
+ - [@orpc/otel](https://www.npmjs.com/package/@orpc/otel): [OpenTelemetry](https://opentelemetry.io/) integration for observability.
57
+ - [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with [NestJS](https://nestjs.com/).
58
+ - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
59
+ - [@orpc/tanstack-query](https://www.npmjs.com/package/@orpc/tanstack-query): [TanStack Query](https://tanstack.com/query/latest) integration.
60
+ - [@orpc/experimental-react-swr](https://www.npmjs.com/package/@orpc/experimental-react-swr): [SWR](https://swr.vercel.app/) integration.
61
+ - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
62
+ - [@orpc/hey-api](https://www.npmjs.com/package/@orpc/hey-api): [Hey API](https://heyapi.dev/) integration.
62
63
  - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
63
64
  - [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): OpenAPI spec generation from [Valibot](https://valibot.dev/).
64
65
  - [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): OpenAPI spec generation from [ArkType](https://arktype.io/).
package/dist/index.d.mts CHANGED
@@ -1,6 +1,9 @@
1
1
  import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
2
+ import { SetSpanErrorOptions, AsyncIteratorClass } from '@orpc/shared';
2
3
 
3
- declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
4
+ interface ToEventIteratorOptions extends SetSpanErrorOptions {
5
+ }
6
+ declare function toEventIterator(stream: ReadableStream<Uint8Array> | null, options?: ToEventIteratorOptions): AsyncIteratorClass<unknown>;
4
7
  interface ToEventStreamOptions {
5
8
  /**
6
9
  * If true, a ping comment is sent periodically to keep the connection alive.
@@ -20,10 +23,25 @@ interface ToEventStreamOptions {
20
23
  * @default ''
21
24
  */
22
25
  eventIteratorKeepAliveComment?: string;
26
+ /**
27
+ * If true, an initial comment is sent immediately upon stream start to flush headers.
28
+ * This allows the receiving side to establish the connection without waiting for the first event.
29
+ *
30
+ * @default true
31
+ */
32
+ eventIteratorInitialCommentEnabled?: boolean;
33
+ /**
34
+ * The content of the initial comment sent upon stream start. Must not include newline characters.
35
+ *
36
+ * @default ''
37
+ */
38
+ eventIteratorInitialComment?: string;
23
39
  }
24
40
  declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array>;
25
41
 
26
- declare function toStandardBody(re: Request | Response): Promise<StandardBody>;
42
+ interface ToStandardBodyOptions extends ToEventIteratorOptions {
43
+ }
44
+ declare function toStandardBody(re: Request | Response, options?: ToStandardBodyOptions): Promise<StandardBody>;
27
45
  interface ToFetchBodyOptions extends ToEventStreamOptions {
28
46
  }
29
47
  /**
@@ -51,6 +69,9 @@ declare function toFetchRequest(request: StandardRequest, options?: ToFetchReque
51
69
  interface ToFetchResponseOptions extends ToFetchBodyOptions {
52
70
  }
53
71
  declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
54
- declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
72
+ interface ToStandardLazyResponseOptions extends ToStandardBodyOptions {
73
+ }
74
+ declare function toStandardLazyResponse(response: Response, options?: ToStandardLazyResponseOptions): StandardLazyResponse;
55
75
 
56
- export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
76
+ export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
77
+ export type { ToEventIteratorOptions, ToEventStreamOptions, ToFetchBodyOptions, ToFetchRequestOptions, ToFetchResponseOptions, ToStandardBodyOptions, ToStandardLazyResponseOptions };
package/dist/index.d.ts CHANGED
@@ -1,6 +1,9 @@
1
1
  import { StandardBody, StandardHeaders, StandardLazyRequest, StandardRequest, StandardResponse, StandardLazyResponse } from '@orpc/standard-server';
2
+ import { SetSpanErrorOptions, AsyncIteratorClass } from '@orpc/shared';
2
3
 
3
- declare function toEventIterator(stream: ReadableStream<Uint8Array>): AsyncGenerator<unknown | void, unknown | void, void>;
4
+ interface ToEventIteratorOptions extends SetSpanErrorOptions {
5
+ }
6
+ declare function toEventIterator(stream: ReadableStream<Uint8Array> | null, options?: ToEventIteratorOptions): AsyncIteratorClass<unknown>;
4
7
  interface ToEventStreamOptions {
5
8
  /**
6
9
  * If true, a ping comment is sent periodically to keep the connection alive.
@@ -20,10 +23,25 @@ interface ToEventStreamOptions {
20
23
  * @default ''
21
24
  */
22
25
  eventIteratorKeepAliveComment?: string;
26
+ /**
27
+ * If true, an initial comment is sent immediately upon stream start to flush headers.
28
+ * This allows the receiving side to establish the connection without waiting for the first event.
29
+ *
30
+ * @default true
31
+ */
32
+ eventIteratorInitialCommentEnabled?: boolean;
33
+ /**
34
+ * The content of the initial comment sent upon stream start. Must not include newline characters.
35
+ *
36
+ * @default ''
37
+ */
38
+ eventIteratorInitialComment?: string;
23
39
  }
24
40
  declare function toEventStream(iterator: AsyncIterator<unknown | void, unknown | void, void>, options?: ToEventStreamOptions): ReadableStream<Uint8Array>;
25
41
 
26
- declare function toStandardBody(re: Request | Response): Promise<StandardBody>;
42
+ interface ToStandardBodyOptions extends ToEventIteratorOptions {
43
+ }
44
+ declare function toStandardBody(re: Request | Response, options?: ToStandardBodyOptions): Promise<StandardBody>;
27
45
  interface ToFetchBodyOptions extends ToEventStreamOptions {
28
46
  }
29
47
  /**
@@ -51,6 +69,9 @@ declare function toFetchRequest(request: StandardRequest, options?: ToFetchReque
51
69
  interface ToFetchResponseOptions extends ToFetchBodyOptions {
52
70
  }
53
71
  declare function toFetchResponse(response: StandardResponse, options?: ToFetchResponseOptions): Response;
54
- declare function toStandardLazyResponse(response: Response): StandardLazyResponse;
72
+ interface ToStandardLazyResponseOptions extends ToStandardBodyOptions {
73
+ }
74
+ declare function toStandardLazyResponse(response: Response, options?: ToStandardLazyResponseOptions): StandardLazyResponse;
55
75
 
56
- export { type ToEventStreamOptions, type ToFetchBodyOptions, type ToFetchRequestOptions, type ToFetchResponseOptions, toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
76
+ export { toEventIterator, toEventStream, toFetchBody, toFetchHeaders, toFetchRequest, toFetchResponse, toStandardBody, toStandardHeaders, toStandardLazyRequest, toStandardLazyResponse };
77
+ export type { ToEventIteratorOptions, ToEventStreamOptions, ToFetchBodyOptions, ToFetchRequestOptions, ToFetchResponseOptions, ToStandardBodyOptions, ToStandardLazyResponseOptions };
package/dist/index.mjs CHANGED
@@ -1,15 +1,24 @@
1
- import { stringifyJSON, parseEmptyableJSON, isTypescriptObject, isAsyncIteratorObject, once } from '@orpc/shared';
2
- import { EventDecoderStream, encodeEventMessage, getEventMeta, ErrorEvent, withEventMeta, parseContentDisposition, contentDisposition } from '@orpc/standard-server';
1
+ import { AsyncIteratorClass, startSpan, runInSpanContext, AbortError, parseEmptyableJSON, isTypescriptObject, setSpanError, stringifyJSON, runWithSpan, isAsyncIteratorObject, once } from '@orpc/shared';
2
+ import { EventDecoderStream, withEventMeta, ErrorEvent, encodeEventMessage, getEventMeta, getFilenameFromContentDisposition, generateContentDisposition } from '@orpc/standard-server';
3
3
 
4
- function toEventIterator(stream) {
5
- const eventStream = stream.pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
6
- const reader = eventStream.getReader();
7
- async function* gen() {
4
+ function toEventIterator(stream, options = {}) {
5
+ const eventStream = stream?.pipeThrough(new TextDecoderStream()).pipeThrough(new EventDecoderStream());
6
+ const reader = eventStream?.getReader();
7
+ let span;
8
+ let isCancelled = false;
9
+ return new AsyncIteratorClass(async () => {
10
+ span ??= startSpan("consume_event_iterator_stream");
8
11
  try {
9
12
  while (true) {
10
- const { done, value } = await reader.read();
13
+ if (reader === void 0) {
14
+ return { done: true, value: void 0 };
15
+ }
16
+ const { done, value } = await runInSpanContext(span, () => reader.read());
11
17
  if (done) {
12
- return;
18
+ if (isCancelled) {
19
+ throw new AbortError("Stream was cancelled");
20
+ }
21
+ return { done: true, value: void 0 };
13
22
  }
14
23
  switch (value.event) {
15
24
  case "message": {
@@ -17,14 +26,15 @@ function toEventIterator(stream) {
17
26
  if (isTypescriptObject(message)) {
18
27
  message = withEventMeta(message, value);
19
28
  }
20
- yield message;
21
- break;
29
+ span?.addEvent("message");
30
+ return { done: false, value: message };
22
31
  }
23
32
  case "error": {
24
33
  let error = new ErrorEvent({
25
34
  data: parseEmptyableJSON(value.data)
26
35
  });
27
36
  error = withEventMeta(error, value);
37
+ span?.addEvent("error");
28
38
  throw error;
29
39
  }
30
40
  case "done": {
@@ -32,22 +42,53 @@ function toEventIterator(stream) {
32
42
  if (isTypescriptObject(done2)) {
33
43
  done2 = withEventMeta(done2, value);
34
44
  }
35
- return done2;
45
+ span?.addEvent("done");
46
+ return { done: true, value: done2 };
47
+ }
48
+ default: {
49
+ span?.addEvent("maybe_keepalive");
36
50
  }
37
51
  }
38
52
  }
53
+ } catch (e) {
54
+ if (!(e instanceof ErrorEvent)) {
55
+ setSpanError(span, e, options);
56
+ }
57
+ throw e;
58
+ }
59
+ }, async (reason) => {
60
+ try {
61
+ if (reason !== "next") {
62
+ isCancelled = true;
63
+ span?.addEvent("cancelled");
64
+ }
65
+ await runInSpanContext(span, () => reader?.cancel());
66
+ } catch (e) {
67
+ setSpanError(span, e, options);
68
+ throw e;
39
69
  } finally {
40
- await reader.cancel();
70
+ span?.end();
41
71
  }
42
- }
43
- return gen();
72
+ });
44
73
  }
45
74
  function toEventStream(iterator, options = {}) {
46
75
  const keepAliveEnabled = options.eventIteratorKeepAliveEnabled ?? true;
47
76
  const keepAliveInterval = options.eventIteratorKeepAliveInterval ?? 5e3;
48
77
  const keepAliveComment = options.eventIteratorKeepAliveComment ?? "";
78
+ const initialCommentEnabled = options.eventIteratorInitialCommentEnabled ?? true;
79
+ const initialComment = options.eventIteratorInitialComment ?? "";
80
+ let cancelled = false;
49
81
  let timeout;
82
+ let span;
50
83
  const stream = new ReadableStream({
84
+ start(controller) {
85
+ span = startSpan("stream_event_iterator");
86
+ if (initialCommentEnabled) {
87
+ controller.enqueue(encodeEventMessage({
88
+ comments: [initialComment]
89
+ }));
90
+ }
91
+ },
51
92
  async pull(controller) {
52
93
  try {
53
94
  if (keepAliveEnabled) {
@@ -55,77 +96,104 @@ function toEventStream(iterator, options = {}) {
55
96
  controller.enqueue(encodeEventMessage({
56
97
  comments: [keepAliveComment]
57
98
  }));
99
+ span?.addEvent("keepalive");
58
100
  }, keepAliveInterval);
59
101
  }
60
- const value = await iterator.next();
102
+ const value = await runInSpanContext(span, () => iterator.next());
61
103
  clearInterval(timeout);
62
- controller.enqueue(encodeEventMessage({
63
- ...getEventMeta(value.value),
64
- event: value.done ? "done" : "message",
65
- data: stringifyJSON(value.value)
66
- }));
104
+ if (cancelled) {
105
+ return;
106
+ }
107
+ const meta = getEventMeta(value.value);
108
+ if (!value.done || value.value !== void 0 || meta !== void 0) {
109
+ const event = value.done ? "done" : "message";
110
+ controller.enqueue(encodeEventMessage({
111
+ ...meta,
112
+ event,
113
+ data: stringifyJSON(value.value)
114
+ }));
115
+ span?.addEvent(event);
116
+ }
67
117
  if (value.done) {
68
118
  controller.close();
119
+ span?.end();
69
120
  }
70
121
  } catch (err) {
71
122
  clearInterval(timeout);
72
- controller.enqueue(encodeEventMessage({
73
- ...getEventMeta(err),
74
- event: "error",
75
- data: err instanceof ErrorEvent ? stringifyJSON(err.data) : void 0
76
- }));
77
- controller.close();
123
+ if (cancelled) {
124
+ return;
125
+ }
126
+ if (err instanceof ErrorEvent) {
127
+ controller.enqueue(encodeEventMessage({
128
+ ...getEventMeta(err),
129
+ event: "error",
130
+ data: stringifyJSON(err.data)
131
+ }));
132
+ span?.addEvent("error");
133
+ controller.close();
134
+ } else {
135
+ setSpanError(span, err);
136
+ controller.error(err);
137
+ }
138
+ span?.end();
78
139
  }
79
140
  },
80
- async cancel(reason) {
81
- if (reason) {
82
- await iterator.throw?.(reason);
83
- } else {
84
- await iterator.return?.();
141
+ async cancel() {
142
+ try {
143
+ cancelled = true;
144
+ clearInterval(timeout);
145
+ span?.addEvent("cancelled");
146
+ await runInSpanContext(span, () => iterator.return?.());
147
+ } catch (e) {
148
+ setSpanError(span, e);
149
+ throw e;
150
+ } finally {
151
+ span?.end();
85
152
  }
86
153
  }
87
154
  }).pipeThrough(new TextEncoderStream());
88
155
  return stream;
89
156
  }
90
157
 
91
- async function toStandardBody(re) {
92
- if (!re.body) {
93
- return void 0;
94
- }
95
- const contentDisposition2 = re.headers.get("content-disposition");
96
- if (contentDisposition2) {
97
- const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
98
- if (typeof fileName === "string") {
99
- const blob2 = await re.blob();
100
- return new File([blob2], fileName, {
101
- type: blob2.type
158
+ function toStandardBody(re, options = {}) {
159
+ return runWithSpan(
160
+ { name: "parse_standard_body", signal: options.signal },
161
+ async () => {
162
+ const contentDisposition = re.headers.get("content-disposition");
163
+ if (typeof contentDisposition === "string") {
164
+ const fileName = getFilenameFromContentDisposition(contentDisposition) ?? "blob";
165
+ const blob2 = await re.blob();
166
+ return new File([blob2], fileName, {
167
+ type: blob2.type
168
+ });
169
+ }
170
+ const contentType = re.headers.get("content-type");
171
+ if (!contentType || contentType.startsWith("application/json")) {
172
+ const text = await re.text();
173
+ return parseEmptyableJSON(text);
174
+ }
175
+ if (contentType.startsWith("multipart/form-data")) {
176
+ return await re.formData();
177
+ }
178
+ if (contentType.startsWith("application/x-www-form-urlencoded")) {
179
+ const text = await re.text();
180
+ return new URLSearchParams(text);
181
+ }
182
+ if (contentType.startsWith("text/event-stream")) {
183
+ return toEventIterator(re.body, options);
184
+ }
185
+ if (contentType.startsWith("text/plain")) {
186
+ return await re.text();
187
+ }
188
+ const blob = await re.blob();
189
+ return new File([blob], "blob", {
190
+ type: blob.type
102
191
  });
103
192
  }
104
- }
105
- const contentType = re.headers.get("content-type");
106
- if (!contentType || contentType.startsWith("application/json")) {
107
- const text = await re.text();
108
- return parseEmptyableJSON(text);
109
- }
110
- if (contentType.startsWith("multipart/form-data")) {
111
- return await re.formData();
112
- }
113
- if (contentType.startsWith("application/x-www-form-urlencoded")) {
114
- const text = await re.text();
115
- return new URLSearchParams(text);
116
- }
117
- if (contentType.startsWith("text/event-stream")) {
118
- return toEventIterator(re.body);
119
- }
120
- if (contentType.startsWith("text/plain")) {
121
- return await re.text();
122
- }
123
- const blob = await re.blob();
124
- return new File([blob], "blob", {
125
- type: blob.type
126
- });
193
+ );
127
194
  }
128
195
  function toFetchBody(body, headers, options = {}) {
196
+ const currentContentDisposition = headers.get("content-disposition");
129
197
  headers.delete("content-type");
130
198
  headers.delete("content-disposition");
131
199
  if (body === void 0) {
@@ -136,7 +204,7 @@ function toFetchBody(body, headers, options = {}) {
136
204
  headers.set("content-length", body.size.toString());
137
205
  headers.set(
138
206
  "content-disposition",
139
- contentDisposition(body instanceof File ? body.name : "blob", { type: "inline" })
207
+ currentContentDisposition ?? generateContentDisposition(body instanceof File ? body.name : "blob")
140
208
  );
141
209
  return body;
142
210
  }
@@ -148,8 +216,6 @@ function toFetchBody(body, headers, options = {}) {
148
216
  }
149
217
  if (isAsyncIteratorObject(body)) {
150
218
  headers.set("content-type", "text/event-stream");
151
- headers.set("cache-control", "no-cache");
152
- headers.set("connection", "keep-alive");
153
219
  return toEventStream(body, options);
154
220
  }
155
221
  headers.set("content-type", "application/json");
@@ -157,7 +223,7 @@ function toFetchBody(body, headers, options = {}) {
157
223
  }
158
224
 
159
225
  function toStandardHeaders(headers, standardHeaders = {}) {
160
- for (const [key, value] of headers) {
226
+ headers.forEach((value, key) => {
161
227
  if (Array.isArray(standardHeaders[key])) {
162
228
  standardHeaders[key].push(value);
163
229
  } else if (standardHeaders[key] !== void 0) {
@@ -165,7 +231,7 @@ function toStandardHeaders(headers, standardHeaders = {}) {
165
231
  } else {
166
232
  standardHeaders[key] = value;
167
233
  }
168
- }
234
+ });
169
235
  return standardHeaders;
170
236
  }
171
237
  function toFetchHeaders(headers, fetchHeaders = new Headers()) {
@@ -186,7 +252,7 @@ function toStandardLazyRequest(request) {
186
252
  url: new URL(request.url),
187
253
  signal: request.signal,
188
254
  method: request.method,
189
- body: once(() => toStandardBody(request)),
255
+ body: once(() => toStandardBody(request, { signal: request.signal })),
190
256
  get headers() {
191
257
  const headers = toStandardHeaders(request.headers);
192
258
  Object.defineProperty(this, "headers", { value: headers, writable: true });
@@ -213,9 +279,9 @@ function toFetchResponse(response, options = {}) {
213
279
  const body = toFetchBody(response.body, headers, options);
214
280
  return new Response(body, { headers, status: response.status });
215
281
  }
216
- function toStandardLazyResponse(response) {
282
+ function toStandardLazyResponse(response, options = {}) {
217
283
  return {
218
- body: once(() => toStandardBody(response)),
284
+ body: once(() => toStandardBody(response, options)),
219
285
  status: response.status,
220
286
  get headers() {
221
287
  const headers = toStandardHeaders(response.headers);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/standard-server-fetch",
3
3
  "type": "module",
4
- "version": "0.0.0-next.ea0903c",
4
+ "version": "0.0.0-next.ea1d4fd",
5
5
  "license": "MIT",
6
6
  "homepage": "https://unnoq.com",
7
7
  "repository": {
@@ -23,11 +23,11 @@
23
23
  "dist"
24
24
  ],
25
25
  "dependencies": {
26
- "@orpc/shared": "0.0.0-next.ea0903c",
27
- "@orpc/standard-server": "0.0.0-next.ea0903c"
26
+ "@orpc/shared": "0.0.0-next.ea1d4fd",
27
+ "@orpc/standard-server": "0.0.0-next.ea1d4fd"
28
28
  },
29
29
  "devDependencies": {
30
- "@hono/node-server": "^1.13.8"
30
+ "@hono/node-server": "^1.19.6"
31
31
  },
32
32
  "scripts": {
33
33
  "build": "unbuild",