@arrirpc/server 0.53.1 → 0.54.0

package/README.md

@@ -14,6 +14,7 @@ Typescript implementation of [Arri RPC](/README.md). It's built on top of [H3](h
         -   [Manual Routing](#manual-routing)
         -   [Creating Event Stream Procedures](#creating-event-stream-procedures)
         -   [Creating Websocket Procedures](#creating-websocket-procedures-experimental)
+            -   [Adding to the RPC Context](#adding-to-the-rpc-context)
     -   [Adding Non-RPC Routes](#adding-non-rpc-routes)
     -   [Adding Middleware](#adding-middleware)
 -   [Key Concepts](#key-concepts)
@@ -136,7 +137,7 @@ Setup your npm scripts:
 
 ### Creating Procedures
 
-#### File Based Router
+#### File Based Routing
 
 Arri RPC comes with an optional file based router that will automatically register functions in the `./procedures` directory that end with the `.rpc.ts` file extension.
 
@@ -192,7 +193,7 @@ app.rpc('sayHello', {...})
 
 // using a sub-router
 const app = new ArriApp();
-const router = new ArriRoute();
+const router = new ArriRouter();
 router.rpc('sayHello', {...})
 app.use(router)
 ```
@@ -404,12 +405,12 @@ app.rpc("sayHello", {
 });
 ```
 
-To get type safety for these new properties create a `.d.ts` file and augment the `ArriEventContext` provided by `@arri/server`
+To get type safety for these new properties create a `.d.ts` file and augment the `ArriEventContext` provided by `@arrirpc/server`
 
 ```ts
-import "@arri/server";
+import "@arrirpc/server";
 
-declare module "@arri/server" {
+declare module "@arrirpc/server" {
     interface ArriEventContext {
         user?: {
             id: number;
@@ -422,26 +423,25 @@ declare module "@arri/server" {
 
 ### Adding Client Generators
 
-Right now Arri RPC has client generators for the following languages:
-
--   typescript
--   dart
--   kotlin
-
 ```ts
 // arri.config.ts
 import { defineConfig, generators } from "arri";
 
 export default defineConfig({
     // rest of config
-    clientGenerators: [
+    generators: [
         generators.typescriptClient({...}),
         generators.dartClient({...}),
         generators.kotlinClient({...})
+        generators.someGenerator({...})
     ]
 });
 ```
 
+For info on what generators are available see [here](/README.md#client-generators)
+
+For info on how to create your own generator see []
+
 ## Key Concepts
 
 ### Arri Definition File
@@ -545,20 +545,33 @@ You can access H3 events from inside procedures handlers.
 
 ```ts
 defineRpc({
-  params: undefined,
-  response: undefined,
-  handler(_, event) {
-    getRequestIP(event);
-  }
-)
+    params: undefined,
+    response: undefined,
+    handler(_, event) {
+        getRequestIP(event);
+    },
+});
 
 defineEventStreamRpc({
-  params: undefined,
-  response: undefined,
-  handler(_, event) {
-    getRequestIP(event);
-  }
-)
+    params: undefined,
+    response: undefined,
+    handler(_, event) {
+        getRequestIP(event);
+    },
+});
+```
+
+#### Manually Starting an Arri Server
+
+Arri server is just an H3 app under the hood so you can start it the same way you would start an H3 app. Although you should note that currently the filed based router only works when using the Arri CLI.
+
+```ts
+import { createServer } from "node:http";
+import { ArriApp, toNodeListener } from "@arrirpc/server";
+
+const app = new ArriApp();
+
+createServer(toNodeListener(app.h3App)).listen(process.env.PORT || 3000);
 ```
 
 ## Arri CLI

package/dist/index.cjs

@@ -4,7 +4,6 @@ const codegenUtils = require('@arrirpc/codegen-utils');
 const arri = require('arri');
 const h3 = require('h3');
 const schema = require('@arrirpc/schema');
-const h3Sse = require('h3-sse');
 const scule = require('scule');
 
 var __defProp$4 = Object.defineProperty;
@@ -502,13 +501,13 @@ class EventStreamConnection {
     __publicField$3(this, "pingInterval");
     __publicField$3(this, "pingIntervalMs");
     __publicField$3(this, "eventStream");
-    this.eventStream = h3Sse.createEventStream(event);
-    this.lastEventId = this.eventStream.lastEventId;
+    this.eventStream = h3.createEventStream(event);
+    this.lastEventId = h3.getHeader(event, "Last-Event-Id");
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    this.eventStream.onClose(() => {
+    this.eventStream.onClosed(() => {
       this.cleanup();
     });
   }
@@ -526,6 +525,7 @@ class EventStreamConnection {
   }
   async push(data, eventId) {
     if (Array.isArray(data)) {
+      const results = [];
       const events = [];
       for (const item of data) {
         if (this.validator(item)) {
@@ -534,21 +534,17 @@ class EventStreamConnection {
             event: "message",
             data: this.serializer(item)
           });
+          results.push({ success: true });
           continue;
         }
         const errors2 = this.validationErrors(item);
-        const errorResponse2 = defineError(500, {
-          message: "Failed to serialize response. Response does not match specified schema.",
-          data: errors2
-        });
-        events.push({
-          id: eventId,
-          event: "error",
-          data: JSON.stringify(errorResponse2)
+        results.push({
+          success: false,
+          errors: errors2
         });
       }
       await this.eventStream.push(events);
-      return;
+      return results;
     }
     if (this.validator(data)) {
       await this.eventStream.push({
@@ -556,18 +552,13 @@ class EventStreamConnection {
         event: "message",
         data: this.serializer(data)
       });
-      return;
+      return { success: true };
     }
     const errors = this.validationErrors(data);
-    const errorResponse = defineError(500, {
-      message: "Failed to serialize response. Response does not match specified schema.",
-      data: errors
-    });
-    await this.eventStream.push({
-      id: eventId,
-      event: "error",
-      data: JSON.stringify(errorResponse)
-    });
+    return {
+      success: false,
+      errors
+    };
   }
   cleanup() {
     if (this.pingInterval) {
@@ -584,8 +575,8 @@ class EventStreamConnection {
     }).catch();
     await this.eventStream.close();
   }
-  onClose(cb) {
-    this.eventStream.onClose(cb);
+  onClosed(cb) {
+    this.eventStream.onClosed(cb);
   }
 }
 function registerEventStreamRpc(router, path, procedure, opts) {
@@ -640,7 +631,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
         event.context,
         event
       );
-      if (!event.handled && !stream.eventStream._handled) {
+      if (!event.handled) {
         stream.send();
       }
     } catch (err) {

package/dist/index.d.cts

@@ -1,8 +1,7 @@
 import { HttpMethod, WsRpcDefinition, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition } from '@arrirpc/codegen-utils';
 import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, CompiledValidator, ADiscriminatorSchema } from '@arrirpc/schema';
-import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
+import { StatusCode, H3Error, H3Event, H3EventContext, Router, EventStream, App } from 'h3';
 export * from 'h3';
-import { EventStream } from 'h3-sse';
 import { Peer, WSError } from 'crossws';
 
 declare class ArriServerError extends Error {
@@ -24,7 +23,6 @@ declare const ArriServerErrorResponse: AObjectSchema<{
 type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
 declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
 declare function errorResponseFromValidationErrors(errors: ValidationError["errors"], prefixText?: string): H3Error;
-type StatusCode = number | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
 declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
 
 type ArriEventContext = Record<string, any>;
@@ -108,15 +106,21 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
-    push(data: TData[], eventId?: string): Promise<void>;
-    push(data: TData, eventId?: string): Promise<void>;
+    push(data: TData[], eventId?: string): Promise<SsePushResult[]>;
+    push(data: TData, eventId?: string): Promise<SsePushResult>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    onClose(cb: () => any): void;
+    onClosed(cb: () => any): void;
 }
+type SsePushResult = {
+    success: true;
+} | {
+    success: false;
+    errors: ValueError[];
+};
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
 }, opts: RouteOptions): void;
@@ -280,4 +284,4 @@ interface ArriOptions {
     onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
-export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type StatusCode, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };
+export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type SsePushResult, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };

package/dist/index.d.mts

@@ -1,8 +1,7 @@
 import { HttpMethod, WsRpcDefinition, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition } from '@arrirpc/codegen-utils';
 import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, CompiledValidator, ADiscriminatorSchema } from '@arrirpc/schema';
-import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
+import { StatusCode, H3Error, H3Event, H3EventContext, Router, EventStream, App } from 'h3';
 export * from 'h3';
-import { EventStream } from 'h3-sse';
 import { Peer, WSError } from 'crossws';
 
 declare class ArriServerError extends Error {
@@ -24,7 +23,6 @@ declare const ArriServerErrorResponse: AObjectSchema<{
 type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
 declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
 declare function errorResponseFromValidationErrors(errors: ValidationError["errors"], prefixText?: string): H3Error;
-type StatusCode = number | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
 declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
 
 type ArriEventContext = Record<string, any>;
@@ -108,15 +106,21 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
-    push(data: TData[], eventId?: string): Promise<void>;
-    push(data: TData, eventId?: string): Promise<void>;
+    push(data: TData[], eventId?: string): Promise<SsePushResult[]>;
+    push(data: TData, eventId?: string): Promise<SsePushResult>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    onClose(cb: () => any): void;
+    onClosed(cb: () => any): void;
 }
+type SsePushResult = {
+    success: true;
+} | {
+    success: false;
+    errors: ValueError[];
+};
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
 }, opts: RouteOptions): void;
@@ -280,4 +284,4 @@ interface ArriOptions {
     onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
-export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type StatusCode, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };
+export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type SsePushResult, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };

package/dist/index.d.ts

@@ -1,8 +1,7 @@
 import { HttpMethod, WsRpcDefinition, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition } from '@arrirpc/codegen-utils';
 import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, CompiledValidator, ADiscriminatorSchema } from '@arrirpc/schema';
-import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
+import { StatusCode, H3Error, H3Event, H3EventContext, Router, EventStream, App } from 'h3';
 export * from 'h3';
-import { EventStream } from 'h3-sse';
 import { Peer, WSError } from 'crossws';
 
 declare class ArriServerError extends Error {
@@ -24,7 +23,6 @@ declare const ArriServerErrorResponse: AObjectSchema<{
 type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
 declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
 declare function errorResponseFromValidationErrors(errors: ValidationError["errors"], prefixText?: string): H3Error;
-type StatusCode = number | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
 declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
 
 type ArriEventContext = Record<string, any>;
@@ -108,15 +106,21 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
-    push(data: TData[], eventId?: string): Promise<void>;
-    push(data: TData, eventId?: string): Promise<void>;
+    push(data: TData[], eventId?: string): Promise<SsePushResult[]>;
+    push(data: TData, eventId?: string): Promise<SsePushResult>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    onClose(cb: () => any): void;
+    onClosed(cb: () => any): void;
 }
+type SsePushResult = {
+    success: true;
+} | {
+    success: false;
+    errors: ValueError[];
+};
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
 }, opts: RouteOptions): void;
@@ -280,4 +284,4 @@ interface ArriOptions {
     onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
-export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type StatusCode, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };
+export { ArriApp, type ArriEventContext, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, type DefinitionMap, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type NamedRpc, type NamedWebsocketRpc, type PostRouteEvent, type RouteEvent, type RouteEventContext, type RouteOptions, type RoutePostEventContext, type Rpc, type RpcEvent, type RpcEventContext, type RpcHandler, type RpcParamSchema, type RpcPostEvent, type RpcPostEventContext, type RpcPostHandler, type SsePushResult, type WebSocketRpcHandler, type WebsocketRpc, WsPeer, type WsPeerContext, createAppDefinition, createHttpRpcDefinition, createWsRpcDefinition, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, defineWebsocketRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isEventStreamRpc, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, registerWebsocketRpc, validateRpcRequestInput };

package/dist/index.mjs

@@ -1,9 +1,8 @@
 import { isRpcHttpMethod, removeDisallowedChars, SCHEMA_VERSION } from '@arrirpc/codegen-utils';
 import { DEV_DEFINITION_ENDPOINT } from 'arri';
-import { isError, setResponseStatus, setResponseHeader, send, eventHandler, isPreflightRequest, readRawBody, getValidatedQuery, defineEventHandler, getQuery, setHeader, defineWebSocketHandler, createRouter, createApp } from 'h3';
+import { isError, setResponseStatus, setResponseHeader, send, eventHandler, isPreflightRequest, readRawBody, getValidatedQuery, createEventStream, getHeader, defineEventHandler, getQuery, setHeader, defineWebSocketHandler, createRouter, createApp } from 'h3';
 export * from 'h3';
 import { a, isAObjectSchema, isADiscriminatorSchema } from '@arrirpc/schema';
-import { createEventStream } from 'h3-sse';
 import { kebabCase, pascalCase } from 'scule';
 
 var __defProp$4 = Object.defineProperty;
@@ -502,12 +501,12 @@ class EventStreamConnection {
     __publicField$3(this, "pingIntervalMs");
     __publicField$3(this, "eventStream");
     this.eventStream = createEventStream(event);
-    this.lastEventId = this.eventStream.lastEventId;
+    this.lastEventId = getHeader(event, "Last-Event-Id");
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    this.eventStream.onClose(() => {
+    this.eventStream.onClosed(() => {
       this.cleanup();
     });
   }
@@ -525,6 +524,7 @@ class EventStreamConnection {
   }
   async push(data, eventId) {
     if (Array.isArray(data)) {
+      const results = [];
       const events = [];
       for (const item of data) {
         if (this.validator(item)) {
@@ -533,21 +533,17 @@ class EventStreamConnection {
             event: "message",
             data: this.serializer(item)
           });
+          results.push({ success: true });
           continue;
         }
         const errors2 = this.validationErrors(item);
-        const errorResponse2 = defineError(500, {
-          message: "Failed to serialize response. Response does not match specified schema.",
-          data: errors2
-        });
-        events.push({
-          id: eventId,
-          event: "error",
-          data: JSON.stringify(errorResponse2)
+        results.push({
+          success: false,
+          errors: errors2
         });
       }
       await this.eventStream.push(events);
-      return;
+      return results;
     }
     if (this.validator(data)) {
       await this.eventStream.push({
@@ -555,18 +551,13 @@ class EventStreamConnection {
         event: "message",
         data: this.serializer(data)
       });
-      return;
+      return { success: true };
     }
     const errors = this.validationErrors(data);
-    const errorResponse = defineError(500, {
-      message: "Failed to serialize response. Response does not match specified schema.",
-      data: errors
-    });
-    await this.eventStream.push({
-      id: eventId,
-      event: "error",
-      data: JSON.stringify(errorResponse)
-    });
+    return {
+      success: false,
+      errors
+    };
   }
   cleanup() {
     if (this.pingInterval) {
@@ -583,8 +574,8 @@ class EventStreamConnection {
     }).catch();
     await this.eventStream.close();
   }
-  onClose(cb) {
-    this.eventStream.onClose(cb);
+  onClosed(cb) {
+    this.eventStream.onClosed(cb);
   }
 }
 function registerEventStreamRpc(router, path, procedure, opts) {
@@ -639,7 +630,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
         event.context,
         event
       );
-      if (!event.handled && !stream.eventStream._handled) {
+      if (!event.handled) {
         stream.send();
       }
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/server",
-  "version": "0.53.1",
+  "version": "0.54.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -24,19 +24,18 @@
   "dependencies": {
     "@types/source-map-support": "^0.5.10",
     "crossws": "^0.2.4",
-    "h3": "^1.11.1",
-    "h3-sse": "^0.0.12",
+    "h3": "^1.12.0",
     "scule": "^1.3.0",
     "source-map-support": "^0.5.21",
     "uncrypto": "^0.1.3",
-    "@arrirpc/codegen-dart": "0.53.1",
-    "@arrirpc/codegen-utils": "0.53.1",
-    "arri": "0.53.1",
-    "@arrirpc/schema": "0.53.1",
-    "@arrirpc/codegen-kotlin": "0.53.1",
-    "@arrirpc/codegen-ts": "0.53.1"
+    "@arrirpc/codegen-dart": "0.54.0",
+    "@arrirpc/codegen-utils": "0.54.0",
+    "@arrirpc/codegen-ts": "0.54.0",
+    "arri": "0.54.0",
+    "@arrirpc/schema": "0.54.0",
+    "@arrirpc/codegen-kotlin": "0.54.0"
   },
   "devDependencies": {
-    "bun-types": "^1.1.13"
+    "bun-types": "^1.1.15"
   }
 }