@orpc/standard-server 0.0.0-next.ca29a36 → 0.0.0-next.cd121e3

package/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <image align="center" src="https://orpc.unnoq.com/logo.webp" width=280 />
+  <image align="center" src="https://orpc.unnoq.com/logo.webp" width=280 alt="oRPC logo" />
 </div>
 
 <h1></h1>

package/dist/index.d.mts

@@ -0,0 +1,79 @@
+export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+
+interface EventMessage {
+    event: string | undefined;
+    id: string | undefined;
+    data: string | undefined;
+    /**
+     * The number of milliseconds to wait before retrying the event source if error occurs.
+     */
+    retry: number | undefined;
+    comments: string[];
+}
+
+declare function decodeEventMessage(encoded: string): EventMessage;
+interface EventDecoderOptions {
+    onEvent?: (event: EventMessage) => void;
+}
+declare class EventDecoder {
+    private options;
+    private incomplete;
+    constructor(options?: EventDecoderOptions);
+    feed(chunk: string): void;
+    end(): void;
+}
+declare class EventDecoderStream extends TransformStream<string, EventMessage> {
+    constructor();
+}
+
+declare function assertEventId(id: string): void;
+declare function assertEventName(event: string): void;
+declare function assertEventRetry(retry: number): void;
+declare function assertEventComment(comment: string): void;
+declare function encodeEventData(data: string | undefined): string;
+declare function encodeEventComments(comments: string[] | undefined): string;
+declare function encodeEventMessage(message: Partial<EventMessage>): string;
+
+declare class EventEncoderError extends TypeError {
+}
+declare class EventDecoderError extends TypeError {
+}
+interface ErrorEventOptions extends ErrorOptions {
+    message?: string;
+    data?: unknown;
+}
+declare class ErrorEvent extends Error {
+    data: unknown;
+    constructor(options?: ErrorEventOptions);
+}
+
+type EventMeta = Partial<Pick<EventMessage, 'retry' | 'id' | 'comments'>>;
+declare function withEventMeta<T extends object>(container: T, meta: EventMeta): T;
+declare function getEventMeta(container: unknown): EventMeta | undefined;
+
+interface StandardHeaders {
+    [key: string]: string | string[] | undefined;
+}
+type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
+interface StandardRequest {
+    /**
+     * Can be { request: Request } or { request: IncomingMessage, response: ServerResponse } based on the adapter.
+     */
+    raw: Record<string, unknown>;
+    method: string;
+    url: URL;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed base on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+    signal: AbortSignal | undefined;
+}
+interface StandardResponse {
+    status: number;
+    headers: StandardHeaders;
+    body: StandardBody;
+}
+
+export { ErrorEvent, type ErrorEventOptions, EventDecoder, EventDecoderError, type EventDecoderOptions, EventDecoderStream, EventEncoderError, type EventMessage, type EventMeta, type StandardBody, type StandardHeaders, type StandardRequest, type StandardResponse, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };

package/dist/index.d.ts

@@ -0,0 +1,79 @@
+export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+
+interface EventMessage {
+    event: string | undefined;
+    id: string | undefined;
+    data: string | undefined;
+    /**
+     * The number of milliseconds to wait before retrying the event source if error occurs.
+     */
+    retry: number | undefined;
+    comments: string[];
+}
+
+declare function decodeEventMessage(encoded: string): EventMessage;
+interface EventDecoderOptions {
+    onEvent?: (event: EventMessage) => void;
+}
+declare class EventDecoder {
+    private options;
+    private incomplete;
+    constructor(options?: EventDecoderOptions);
+    feed(chunk: string): void;
+    end(): void;
+}
+declare class EventDecoderStream extends TransformStream<string, EventMessage> {
+    constructor();
+}
+
+declare function assertEventId(id: string): void;
+declare function assertEventName(event: string): void;
+declare function assertEventRetry(retry: number): void;
+declare function assertEventComment(comment: string): void;
+declare function encodeEventData(data: string | undefined): string;
+declare function encodeEventComments(comments: string[] | undefined): string;
+declare function encodeEventMessage(message: Partial<EventMessage>): string;
+
+declare class EventEncoderError extends TypeError {
+}
+declare class EventDecoderError extends TypeError {
+}
+interface ErrorEventOptions extends ErrorOptions {
+    message?: string;
+    data?: unknown;
+}
+declare class ErrorEvent extends Error {
+    data: unknown;
+    constructor(options?: ErrorEventOptions);
+}
+
+type EventMeta = Partial<Pick<EventMessage, 'retry' | 'id' | 'comments'>>;
+declare function withEventMeta<T extends object>(container: T, meta: EventMeta): T;
+declare function getEventMeta(container: unknown): EventMeta | undefined;
+
+interface StandardHeaders {
+    [key: string]: string | string[] | undefined;
+}
+type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
+interface StandardRequest {
+    /**
+     * Can be { request: Request } or { request: IncomingMessage, response: ServerResponse } based on the adapter.
+     */
+    raw: Record<string, unknown>;
+    method: string;
+    url: URL;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed base on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+    signal: AbortSignal | undefined;
+}
+interface StandardResponse {
+    status: number;
+    headers: StandardHeaders;
+    body: StandardBody;
+}
+
+export { ErrorEvent, type ErrorEventOptions, EventDecoder, EventDecoderError, type EventDecoderOptions, EventDecoderStream, EventEncoderError, type EventMessage, type EventMeta, type StandardBody, type StandardHeaders, type StandardRequest, type StandardResponse, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };

package/dist/{index.js → index.mjs}

@@ -1,38 +1,35 @@
-// src/event-source/errors.ts
-var EventEncoderError = class extends TypeError {
-};
-var EventDecoderError = class extends TypeError {
-};
-var ErrorEvent = class extends Error {
+import { isTypescriptObject } from '@orpc/shared';
+export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+
+class EventEncoderError extends TypeError {
+}
+class EventDecoderError extends TypeError {
+}
+class ErrorEvent extends Error {
   data;
   constructor(options) {
     super(options?.message ?? "An error event was received", options);
     this.data = options?.data;
   }
-};
-var UnknownEvent = class extends ErrorEvent {
-};
+}
 
-// src/event-source/decoder.ts
 function decodeEventMessage(encoded) {
   const lines = encoded.replace(/\n+$/, "").split(/\n/);
   const message = {
-    data: "",
+    data: void 0,
     event: void 0,
     id: void 0,
-    retry: void 0
+    retry: void 0,
+    comments: []
   };
   for (const line of lines) {
-    const index = line.indexOf(": ");
-    if (index === -1) {
-      throw new EventDecoderError(`Invalid EventSource message line: ${line}`);
-    }
-    const key = line.slice(0, index);
-    const value = line.slice(index + 2);
-    if (key !== "data" && key in message && message[key] !== void 0) {
-      throw new EventDecoderError(`Duplicate EventSource message key: ${key}`);
-    }
-    if (key === "data") {
+    const index = line.indexOf(":");
+    const key = index === -1 ? line : line.slice(0, index);
+    const value = index === -1 ? "" : line.slice(index + 1).replace(/^\s/, "");
+    if (index === 0) {
+      message.comments.push(value);
+    } else if (key === "data") {
+      message.data ??= "";
       message.data += `${value}
 `;
     } else if (key === "event") {
@@ -41,18 +38,15 @@ function decodeEventMessage(encoded) {
       message.id = value;
     } else if (key === "retry") {
       const maybeInteger = Number.parseInt(value);
-      if (!Number.isInteger(maybeInteger) || maybeInteger < 0 || maybeInteger.toString() !== value) {
-        throw new EventDecoderError(`Invalid EventSource message retry value: ${value}`);
+      if (Number.isInteger(maybeInteger) && maybeInteger >= 0 && maybeInteger.toString() === value) {
+        message.retry = maybeInteger;
       }
-      message.retry = maybeInteger;
-    } else {
-      throw new EventDecoderError(`Unknown EventSource message key: ${key}`);
     }
   }
-  message.data = message.data.replace(/\n$/, "");
+  message.data = message.data?.replace(/\n$/, "");
   return message;
 }
-var EventDecoder = class {
+class EventDecoder {
   constructor(options = {}) {
     this.options = options;
   }
@@ -63,12 +57,9 @@ var EventDecoder = class {
     if (lastCompleteIndex === -1) {
       return;
     }
-    const completes = this.incomplete.slice(0, lastCompleteIndex + 2).split(/\n{2,}/);
+    const completes = this.incomplete.slice(0, lastCompleteIndex).split(/\n\n/);
     this.incomplete = this.incomplete.slice(lastCompleteIndex + 2);
     for (const encoded of completes) {
-      if (!encoded) {
-        continue;
-      }
       const message = decodeEventMessage(`${encoded}
 
 `);
@@ -79,10 +70,12 @@ var EventDecoder = class {
     this.incomplete = "";
   }
   end() {
-    this.feed("\n\n");
+    if (this.incomplete) {
+      throw new EventDecoderError("EventSource ended before complete");
+    }
   }
-};
-var EventDecoderStream = class extends TransformStream {
+}
+class EventDecoderStream extends TransformStream {
   constructor() {
     let decoder;
     super({
@@ -101,9 +94,8 @@ var EventDecoderStream = class extends TransformStream {
       }
     });
   }
-};
+}
 
-// src/event-source/encoder.ts
 function assertEventId(id) {
   if (id.includes("\n")) {
     throw new EventEncoderError("Event-source id must not contain a newline character");
@@ -119,8 +111,13 @@ function assertEventRetry(retry) {
     throw new EventEncoderError("Event-source retry must be a integer and >= 0");
   }
 }
+function assertEventComment(comment) {
+  if (comment.includes("\n")) {
+    throw new EventEncoderError("Event-source comment must not contain a newline character");
+  }
+}
 function encodeEventData(data) {
-  const lines = data ? data.split(/\n/) : [""];
+  const lines = data?.split(/\n/) ?? [];
   let output = "";
   for (const line of lines) {
     output += `data: ${line}
@@ -128,8 +125,18 @@ function encodeEventData(data) {
   }
   return output;
 }
+function encodeEventComments(comments) {
+  let output = "";
+  for (const comment of comments ?? []) {
+    assertEventComment(comment);
+    output += `: ${comment}
+`;
+  }
+  return output;
+}
 function encodeEventMessage(message) {
   let output = "";
+  output += encodeEventComments(message.comments);
   if (message.event !== void 0) {
     assertEventName(message.event);
     output += `event: ${message.event}
@@ -150,9 +157,7 @@ function encodeEventMessage(message) {
   return output;
 }
 
-// src/event-source/meta.ts
-import { isTypescriptObject } from "@orpc/shared";
-var EVENT_SOURCE_META_SYMBOL = Symbol("ORPC_EVENT_SOURCE_META");
+const EVENT_SOURCE_META_SYMBOL = Symbol("ORPC_EVENT_SOURCE_META");
 function withEventMeta(container, meta) {
   if (meta.id !== void 0) {
     assertEventId(meta.id);
@@ -160,6 +165,11 @@ function withEventMeta(container, meta) {
   if (meta.retry !== void 0) {
     assertEventRetry(meta.retry);
   }
+  if (meta.comments !== void 0) {
+    for (const comment of meta.comments) {
+      assertEventComment(comment);
+    }
+  }
   return new Proxy(container, {
     get(target, prop, receiver) {
       if (prop === EVENT_SOURCE_META_SYMBOL) {
@@ -173,24 +183,4 @@ function getEventMeta(container) {
   return isTypescriptObject(container) ? Reflect.get(container, EVENT_SOURCE_META_SYMBOL) : void 0;
 }
 
-// src/utils.ts
-import { contentDisposition, parse } from "@tinyhttp/content-disposition";
-export {
-  ErrorEvent,
-  EventDecoder,
-  EventDecoderError,
-  EventDecoderStream,
-  EventEncoderError,
-  UnknownEvent,
-  assertEventId,
-  assertEventName,
-  assertEventRetry,
-  contentDisposition,
-  decodeEventMessage,
-  encodeEventData,
-  encodeEventMessage,
-  getEventMeta,
-  parse as parseContentDisposition,
-  withEventMeta
-};
-//# sourceMappingURL=index.js.map
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server",
   "type": "module",
-  "version": "0.0.0-next.ca29a36",
+  "version": "0.0.0-next.cd121e3",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -14,25 +14,20 @@
   ],
   "exports": {
     ".": {
-      "types": "./dist/src/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
-    },
-    "./🔒/*": {
-      "types": "./dist/src/*.d.ts"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs",
+      "default": "./dist/index.mjs"
     }
   },
   "files": [
-    "!**/*.map",
-    "!**/*.tsbuildinfo",
     "dist"
   ],
   "dependencies": {
     "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/shared": "0.0.0-next.ca29a36"
+    "@orpc/shared": "0.0.0-next.cd121e3"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "unbuild",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/src/event-source/decoder.d.ts

@@ -1,16 +0,0 @@
-import type { EventMessage } from './types';
-export declare function decodeEventMessage(encoded: string): EventMessage;
-export interface EventDecoderOptions {
-    onEvent?: (event: EventMessage) => void;
-}
-export declare class EventDecoder {
-    private options;
-    private incomplete;
-    constructor(options?: EventDecoderOptions);
-    feed(chunk: string): void;
-    end(): void;
-}
-export declare class EventDecoderStream extends TransformStream<string, EventMessage> {
-    constructor();
-}
-//# sourceMappingURL=decoder.d.ts.map

package/dist/src/event-source/encoder.d.ts

@@ -1,7 +0,0 @@
-import type { EventMessage } from './types';
-export declare function assertEventId(id: string): void;
-export declare function assertEventName(event: string): void;
-export declare function assertEventRetry(retry: number): void;
-export declare function encodeEventData(data: string | undefined): string;
-export declare function encodeEventMessage(message: Partial<EventMessage>): string;
-//# sourceMappingURL=encoder.d.ts.map

package/dist/src/event-source/errors.d.ts

@@ -1,15 +0,0 @@
-export declare class EventEncoderError extends TypeError {
-}
-export declare class EventDecoderError extends TypeError {
-}
-export interface ErrorEventOptions extends ErrorOptions {
-    message?: string;
-    data?: unknown;
-}
-export declare class ErrorEvent extends Error {
-    data: unknown;
-    constructor(options?: ErrorEventOptions);
-}
-export declare class UnknownEvent extends ErrorEvent {
-}
-//# sourceMappingURL=errors.d.ts.map

package/dist/src/event-source/index.d.ts

@@ -1,6 +0,0 @@
-export * from './decoder';
-export * from './encoder';
-export * from './errors';
-export * from './meta';
-export * from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/event-source/meta.d.ts

@@ -1,5 +0,0 @@
-import type { EventMessage } from './types';
-export type EventMeta = Partial<Pick<EventMessage, 'retry' | 'id'>>;
-export declare function withEventMeta<T extends object>(container: T, meta: EventMeta): T;
-export declare function getEventMeta(container: unknown): EventMeta | undefined;
-//# sourceMappingURL=meta.d.ts.map

package/dist/src/event-source/types.d.ts

@@ -1,10 +0,0 @@
-export interface EventMessage {
-    event: string | undefined;
-    id: string | undefined;
-    data: string;
-    /**
-     * The number of milliseconds to wait before retrying the event source if error occurs.
-     */
-    retry: number | undefined;
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/src/index.d.ts

@@ -1,4 +0,0 @@
-export * from './event-source';
-export * from './types';
-export * from './utils';
-//# sourceMappingURL=index.d.ts.map

package/dist/src/types.d.ts

@@ -1,25 +0,0 @@
-export interface StandardHeaders {
-    [key: string]: string | string[] | undefined;
-}
-export type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
-export interface StandardRequest {
-    /**
-     * Can be { request: Request } or { request: IncomingMessage, response: ServerResponse } based on the adapter.
-     */
-    raw: Record<string, unknown>;
-    method: string;
-    url: URL;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed base on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body: () => Promise<StandardBody>;
-    signal: AbortSignal | undefined;
-}
-export interface StandardResponse {
-    status: number;
-    headers: StandardHeaders;
-    body: StandardBody;
-}
-//# sourceMappingURL=types.d.ts.map

package/dist/src/utils.d.ts

@@ -1,2 +0,0 @@
-export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
-//# sourceMappingURL=utils.d.ts.map