arri 0.24.0 → 0.25.0

package/dist/cli.cjs

@@ -12,7 +12,7 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.b27cbd19.cjs');
+const config = require('./shared/arri.65113bc6.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -22,7 +22,7 @@ const chokidar = require('chokidar');
 const Degit = require('degit');
 require('h3');
 require('arri-validate');
-require('node:process');
+require('h3-sse');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -49,9 +49,9 @@ const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
 
 const GEN_APP_FILE = "__arri_app.js";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
-const OUT_APP_FILE = "app.js";
-const OUT_SERVER_ENTRY = "server.js";
-const OUT_CODEGEN = "codegen.js";
+const OUT_APP_FILE = "app.mjs";
+const OUT_SERVER_ENTRY = "server.mjs";
+const OUT_CODEGEN = "codegen.mjs";
 async function setupWorkingDir(config) {
   const arriDir = path__default.resolve(config.rootDir, config.buildDir);
   const outDir = path__default.resolve(config.rootDir, ".output");
@@ -294,7 +294,7 @@ async function createServerEntryFile(config) {
         js: `import { createRequire as topLevelCreateRequire } from 'module';
 const require = topLevelCreateRequire(import.meta.url);`
       },
-      plugins: [esbuildPluginReplace.replace({ "virtual:arri/app": "./app.js" })],
+      plugins: [esbuildPluginReplace.replace({ "virtual:arri/app": "./app.mjs" })],
       allowOverwrite: true,
       outfile: path__default.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
     });

package/dist/cli.mjs

@@ -11,7 +11,7 @@ import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.62a101bf.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.ba3f283e.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -21,13 +21,13 @@ import chokidar from 'chokidar';
 import Degit from 'degit';
 import 'h3';
 import 'arri-validate';
-import 'node:process';
+import 'h3-sse';
 
 const GEN_APP_FILE = "__arri_app.js";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.js";
-const OUT_APP_FILE = "app.js";
-const OUT_SERVER_ENTRY = "server.js";
-const OUT_CODEGEN = "codegen.js";
+const OUT_APP_FILE = "app.mjs";
+const OUT_SERVER_ENTRY = "server.mjs";
+const OUT_CODEGEN = "codegen.mjs";
 async function setupWorkingDir(config) {
   const arriDir = path.resolve(config.rootDir, config.buildDir);
   const outDir = path.resolve(config.rootDir, ".output");
@@ -270,7 +270,7 @@ async function createServerEntryFile(config) {
         js: `import { createRequire as topLevelCreateRequire } from 'module';
 const require = topLevelCreateRequire(import.meta.url);`
       },
-      plugins: [replace({ "virtual:arri/app": "./app.js" })],
+      plugins: [replace({ "virtual:arri/app": "./app.mjs" })],
       allowOverwrite: true,
       outfile: path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY)
     });

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const config = require('./shared/arri.b27cbd19.cjs');
+const config = require('./shared/arri.65113bc6.cjs');
 const h3 = require('h3');
 require('arri-validate');
-require('node:process');
+require('h3-sse');
 require('arri-codegen-utils');
 require('scule');
 
@@ -23,8 +23,6 @@ exports.defineEventStreamRpc = config.defineEventStreamRpc;
 exports.defineRoute = config.defineRoute;
 exports.defineRpc = config.defineRpc;
 exports.errorResponseFromValidationErrors = config.errorResponseFromValidationErrors;
-exports.formatSse = config.formatSse;
-exports.formatSseList = config.formatSseList;
 exports.getRpcParamName = config.getRpcParamName;
 exports.getRpcPath = config.getRpcPath;
 exports.getRpcResponseName = config.getRpcResponseName;
@@ -38,7 +36,6 @@ exports.isRpcParamSchema = config.isRpcParamSchema;
 exports.registerEventStreamRpc = config.registerEventStreamRpc;
 exports.registerRoute = config.registerRoute;
 exports.registerRpc = config.registerRpc;
-exports.setSseHeaders = config.setSseHeaders;
 exports.validateRpcRequestInput = config.validateRpcRequestInput;
 exports.defineMiddleware = defineMiddleware;
 Object.keys(h3).forEach(function (k) {

package/dist/index.d.cts

@@ -2,6 +2,7 @@ import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaF
 import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
+import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -58,19 +59,15 @@ declare function errorResponseFromValidationErrors(errors: ValidationError["erro
 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"]): Promise<void>;
 
-declare function setSseHeaders(event: H3Event): void;
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
     isEventStream: true;
     handler: EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: EventStreamRpcEvent<TParams, TResponse>) => void | Promise<void>;
-interface EventStreamRpcEvent<TParams, TResponse> extends RpcEvent<TParams> {
-    connection: EventStreamConnection<TResponse>;
-}
+type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: RpcEvent<TResponse>) => void | Promise<void>;
 interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends RpcHandlerContext<TParams> {
-    connection: EventStreamConnection<TResponse>;
+    stream: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
     validator: (input: unknown) => input is TData;
@@ -78,29 +75,14 @@ interface EventStreamConnectionOptions<TData> {
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
-/**
- * A server sent event
- */
-interface Sse {
-    id?: string;
-    event?: string;
-    data: string;
-}
-declare function formatSse({ id, data, event }: Sse): string;
-declare function formatSseList(events: Sse[]): string;
 declare class EventStreamConnection<TData> {
-    lastEventId: string | undefined;
-    private readonly writable;
-    private readonly readable;
-    private readonly writer;
-    private writerIsClosed;
-    private readonly encoder;
+    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
-    private readonly h3Event;
     private pingInterval;
     private readonly pingIntervalMs;
+    readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
      * Start sending the event stream to the client
@@ -115,15 +97,13 @@ declare class EventStreamConnection<TData> {
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
     pushError(error: ErrorResponse, eventId?: string): Promise<void>;
-    private publishEvents;
-    private publishEvent;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
-    end(): Promise<void>;
-    on(event: "disconnect", callback: () => any): void;
-    on(event: "end", callback: () => any): void;
+    close(): Promise<void>;
+    on(event: "close", callback: () => any): void;
+    on(event: "request:close", callback: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
@@ -257,4 +237,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcEvent, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type Sse, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, formatSse, formatSseList, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, setSseHeaders, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.d.mts

@@ -2,6 +2,7 @@ import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaF
 import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
+import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -58,19 +59,15 @@ declare function errorResponseFromValidationErrors(errors: ValidationError["erro
 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"]): Promise<void>;
 
-declare function setSseHeaders(event: H3Event): void;
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
     isEventStream: true;
     handler: EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: EventStreamRpcEvent<TParams, TResponse>) => void | Promise<void>;
-interface EventStreamRpcEvent<TParams, TResponse> extends RpcEvent<TParams> {
-    connection: EventStreamConnection<TResponse>;
-}
+type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: RpcEvent<TResponse>) => void | Promise<void>;
 interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends RpcHandlerContext<TParams> {
-    connection: EventStreamConnection<TResponse>;
+    stream: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
     validator: (input: unknown) => input is TData;
@@ -78,29 +75,14 @@ interface EventStreamConnectionOptions<TData> {
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
-/**
- * A server sent event
- */
-interface Sse {
-    id?: string;
-    event?: string;
-    data: string;
-}
-declare function formatSse({ id, data, event }: Sse): string;
-declare function formatSseList(events: Sse[]): string;
 declare class EventStreamConnection<TData> {
-    lastEventId: string | undefined;
-    private readonly writable;
-    private readonly readable;
-    private readonly writer;
-    private writerIsClosed;
-    private readonly encoder;
+    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
-    private readonly h3Event;
     private pingInterval;
     private readonly pingIntervalMs;
+    readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
      * Start sending the event stream to the client
@@ -115,15 +97,13 @@ declare class EventStreamConnection<TData> {
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
     pushError(error: ErrorResponse, eventId?: string): Promise<void>;
-    private publishEvents;
-    private publishEvent;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
-    end(): Promise<void>;
-    on(event: "disconnect", callback: () => any): void;
-    on(event: "end", callback: () => any): void;
+    close(): Promise<void>;
+    on(event: "close", callback: () => any): void;
+    on(event: "request:close", callback: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
@@ -257,4 +237,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcEvent, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type Sse, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, formatSse, formatSseList, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, setSseHeaders, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaF
 import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
+import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -58,19 +59,15 @@ declare function errorResponseFromValidationErrors(errors: ValidationError["erro
 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"]): Promise<void>;
 
-declare function setSseHeaders(event: H3Event): void;
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
     isEventStream: true;
     handler: EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: EventStreamRpcEvent<TParams, TResponse>) => void | Promise<void>;
-interface EventStreamRpcEvent<TParams, TResponse> extends RpcEvent<TParams> {
-    connection: EventStreamConnection<TResponse>;
-}
+type EventStreamRpcHandler<TParams, TResponse> = (context: EventStreamRpcHandlerContext<TParams, TResponse>, event: RpcEvent<TResponse>) => void | Promise<void>;
 interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends RpcHandlerContext<TParams> {
-    connection: EventStreamConnection<TResponse>;
+    stream: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
     validator: (input: unknown) => input is TData;
@@ -78,29 +75,14 @@ interface EventStreamConnectionOptions<TData> {
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
-/**
- * A server sent event
- */
-interface Sse {
-    id?: string;
-    event?: string;
-    data: string;
-}
-declare function formatSse({ id, data, event }: Sse): string;
-declare function formatSseList(events: Sse[]): string;
 declare class EventStreamConnection<TData> {
-    lastEventId: string | undefined;
-    private readonly writable;
-    private readonly readable;
-    private readonly writer;
-    private writerIsClosed;
-    private readonly encoder;
+    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
-    private readonly h3Event;
     private pingInterval;
     private readonly pingIntervalMs;
+    readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
      * Start sending the event stream to the client
@@ -115,15 +97,13 @@ declare class EventStreamConnection<TData> {
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
     pushError(error: ErrorResponse, eventId?: string): Promise<void>;
-    private publishEvents;
-    private publishEvent;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
      */
-    end(): Promise<void>;
-    on(event: "disconnect", callback: () => any): void;
-    on(event: "end", callback: () => any): void;
+    close(): Promise<void>;
+    on(event: "close", callback: () => any): void;
+    on(event: "request:close", callback: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;
@@ -257,4 +237,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcEvent, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type Sse, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, formatSse, formatSseList, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, setSseHeaders, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.mjs

@@ -1,7 +1,7 @@
-export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, B as EventStreamConnection, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, w as defineEventStreamRpc, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, y as formatSse, z as formatSseList, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, x as isEventStreamRpc, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, C as registerEventStreamRpc, s as registerRoute, r as registerRpc, u as setSseHeaders, v as validateRpcRequestInput } from './shared/arri.62a101bf.mjs';
+export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, x as EventStreamConnection, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, u as defineEventStreamRpc, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, w as isEventStreamRpc, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, y as registerEventStreamRpc, s as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.ba3f283e.mjs';
 export * from 'h3';
 import 'arri-validate';
-import 'node:process';
+import 'h3-sse';
 import 'arri-codegen-utils';
 import 'scule';
 

package/dist/shared/{arri.b27cbd19.cjs → arri.65113bc6.cjs}

@@ -2,7 +2,7 @@
 
 const h3 = require('h3');
 const arriValidate = require('arri-validate');
-const node_process = require('node:process');
+const h3Sse = require('h3-sse');
 const arriCodegenUtils = require('arri-codegen-utils');
 const scule = require('scule');
 
@@ -433,19 +433,6 @@ var __publicField$2 = (obj, key, value) => {
   __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-function setSseHeaders(event) {
-  const isHttp2 = event._http2 === true;
-  const input = {
-    "Content-Type": "text/event-stream",
-    "Cache-Control": "private, no-cache, no-store, no-transform, must-revalidate, max-age=0",
-    Pragma: "no-cache",
-    "X-Accel-Buffering": "no"
-  };
-  if (!isHttp2) {
-    input.Connection = "keep-alive";
-  }
-  h3.setResponseHeaders(event, input);
-}
 function defineEventStreamRpc(config) {
   return {
     ...config,
@@ -456,69 +443,33 @@ function defineEventStreamRpc(config) {
 function isEventStreamRpc(input) {
   return isRpc(input) && "isEventStream" in input && input.isEventStream === true;
 }
-function formatSse({ id, data, event }) {
-  const parts = [];
-  if (id) {
-    parts.push(`id: ${id}`);
-  }
-  if (event) {
-    parts.push(`event: ${event}`);
-  }
-  parts.push(`data: ${data}`);
-  const payload = `${parts.join("\n")}
-
-`;
-  return payload;
-}
-function formatSseList(events) {
-  let output = "";
-  for (const event of events) {
-    output += formatSse(event);
-  }
-  return output;
-}
 class EventStreamConnection {
   constructor(event, opts) {
-    __publicField$2(this, "lastEventId");
-    __publicField$2(this, "writable");
-    __publicField$2(this, "readable");
-    __publicField$2(this, "writer");
-    __publicField$2(this, "writerIsClosed", false);
-    __publicField$2(this, "encoder");
+    __publicField$2(this, "h3Event");
     __publicField$2(this, "validationErrors");
     __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
-    __publicField$2(this, "h3Event");
     // for some reason Rollup cannot output DTS when this is set to NodeJS.Timeout
     __publicField$2(this, "pingInterval");
     __publicField$2(this, "pingIntervalMs");
+    __publicField$2(this, "eventStream");
     this.h3Event = event;
-    const id = h3.getHeader(event, "Last-Event-ID");
-    this.lastEventId = id;
-    const { readable, writable } = new TransformStream();
-    this.writable = writable;
-    this.readable = readable;
-    this.writer = writable.getWriter();
-    this.encoder = new TextEncoder();
+    this.eventStream = h3Sse.createEventStream(event, true);
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    void this.writer.closed.then(() => {
-      this.writerIsClosed = true;
+    this.eventStream.on("close", () => {
+      this.cleanup();
     });
   }
   /**
    * Start sending the event stream to the client
    */
   start() {
-    setSseHeaders(this.h3Event);
-    h3.setResponseStatus(this.h3Event, 200);
-    this.h3Event._handled = true;
-    void h3.sendStream(this.h3Event, this.readable);
+    void h3Sse.sendEventStream(this.h3Event, this.eventStream);
     this.pingInterval = setInterval(async () => {
-      await this.publishEvent({
-        id: this.lastEventId,
+      await this.eventStream.push({
         event: "ping",
         data: ""
       });
@@ -548,11 +499,11 @@ class EventStreamConnection {
           data: JSON.stringify(errorResponse2)
         });
       }
-      await this.publishEvents(events);
+      await this.eventStream.push(events);
       return;
     }
     if (this.validator(data)) {
-      await this.publishEvent({
+      await this.eventStream.push({
         id: eventId,
         event: "message",
         data: this.serializer(data)
@@ -565,7 +516,7 @@ class EventStreamConnection {
       statusMessage: "Failed to serialize response. Response does not match specified schema.",
       data: errors
     };
-    await this.publishEvent({
+    await this.eventStream.push({
       id: eventId,
       event: "error",
       data: JSON.stringify(errorResponse)
@@ -591,79 +542,34 @@ class EventStreamConnection {
    * Publish an error event. This will trigger the `onError` hooks of any connected clients.
    */
   async pushError(error, eventId) {
-    await this.publishEvent({
+    await this.eventStream.push({
       id: eventId,
       event: "error",
       data: JSON.stringify(error)
     });
   }
-  async publishEvents(events) {
-    const payload = formatSseList(events);
-    if (this.writerIsClosed) {
-      try {
-        this.h3Event.node.res.end();
-      } catch (_) {
-        await this.cleanup();
-      }
-      return;
-    }
-    await this.writer.write(this.encoder.encode(payload));
-  }
-  async publishEvent(event) {
-    const payload = formatSse(event);
-    if (this.writerIsClosed) {
-      try {
-        this.h3Event.node.res.end();
-      } catch (_) {
-        await this.cleanup();
-      }
-      return;
-    }
-    await this.writer.write(this.encoder.encode(payload));
-  }
-  async cleanup() {
+  cleanup() {
     if (this.pingInterval) {
       clearInterval(this.pingInterval);
     }
-    if (!this.writerIsClosed) {
-      try {
-        await this.writer.close();
-      } catch (_) {
-      }
-    }
   }
   /**
    * Tell clients that the stream has ended and close the connection.
    */
-  async end() {
-    await this.publishEvent({
+  async close() {
+    await this.eventStream.push({
       event: "done",
       data: "this stream has ended"
     }).catch();
-    await new Promise((resolve, reject) => {
-      node_process.nextTick(() => {
-        try {
-          this.h3Event.node.res.end();
-          resolve(true);
-        } catch (err) {
-          reject(err);
-        }
-      });
-    });
+    await this.eventStream.close();
   }
   on(event, callback) {
     switch (event) {
-      case "disconnect":
-        this.h3Event.node.req.on("close", async () => {
-          await callback();
-          await this.cleanup();
-        });
+      case "close":
+        this.eventStream.on("close", callback);
         break;
-      case "end":
-        this.h3Event.node.req.on("end", async () => {
-          await callback();
-          await this.cleanup();
-        });
+      case "request:close":
+        this.eventStream.on("request:close", callback);
         break;
     }
   }
@@ -697,7 +603,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
           procedure.params
         );
       }
-      const connection = new EventStreamConnection(event, {
+      const stream = new EventStreamConnection(event, {
         pingInterval: procedure.pingInterval,
         validator: responseValidator?.validate ?? function() {
           return true;
@@ -712,11 +618,14 @@ function registerEventStreamRpc(router, path, procedure, opts) {
           return [];
         }
       });
-      event.context.connection = connection;
+      event.context.stream = stream;
       await procedure.handler(
         event.context,
         event
       );
+      if (!event.handled && !stream.eventStream._handled) {
+        await h3Sse.sendEventStream(event, stream.eventStream);
+      }
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
@@ -1102,8 +1011,6 @@ exports.defineEventStreamRpc = defineEventStreamRpc;
 exports.defineRoute = defineRoute;
 exports.defineRpc = defineRpc;
 exports.errorResponseFromValidationErrors = errorResponseFromValidationErrors;
-exports.formatSse = formatSse;
-exports.formatSseList = formatSseList;
 exports.getRpcParamName = getRpcParamName;
 exports.getRpcPath = getRpcPath;
 exports.getRpcResponseName = getRpcResponseName;
@@ -1117,5 +1024,4 @@ exports.isRpcParamSchema = isRpcParamSchema;
 exports.registerEventStreamRpc = registerEventStreamRpc;
 exports.registerRoute = registerRoute;
 exports.registerRpc = registerRpc;
-exports.setSseHeaders = setSseHeaders;
 exports.validateRpcRequestInput = validateRpcRequestInput;

package/dist/shared/{arri.62a101bf.mjs → arri.ba3f283e.mjs}

@@ -1,6 +1,6 @@
-import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, setResponseHeaders, getHeader, sendStream, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
+import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
 import { a, isAObjectSchema, isARecordSchema, isADiscriminatorSchema } from 'arri-validate';
-import { nextTick } from 'node:process';
+import { createEventStream, sendEventStream } from 'h3-sse';
 import { isRpcHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
@@ -431,19 +431,6 @@ var __publicField$2 = (obj, key, value) => {
   __defNormalProp$2(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-function setSseHeaders(event) {
-  const isHttp2 = event._http2 === true;
-  const input = {
-    "Content-Type": "text/event-stream",
-    "Cache-Control": "private, no-cache, no-store, no-transform, must-revalidate, max-age=0",
-    Pragma: "no-cache",
-    "X-Accel-Buffering": "no"
-  };
-  if (!isHttp2) {
-    input.Connection = "keep-alive";
-  }
-  setResponseHeaders(event, input);
-}
 function defineEventStreamRpc(config) {
   return {
     ...config,
@@ -454,69 +441,33 @@ function defineEventStreamRpc(config) {
 function isEventStreamRpc(input) {
   return isRpc(input) && "isEventStream" in input && input.isEventStream === true;
 }
-function formatSse({ id, data, event }) {
-  const parts = [];
-  if (id) {
-    parts.push(`id: ${id}`);
-  }
-  if (event) {
-    parts.push(`event: ${event}`);
-  }
-  parts.push(`data: ${data}`);
-  const payload = `${parts.join("\n")}
-
-`;
-  return payload;
-}
-function formatSseList(events) {
-  let output = "";
-  for (const event of events) {
-    output += formatSse(event);
-  }
-  return output;
-}
 class EventStreamConnection {
   constructor(event, opts) {
-    __publicField$2(this, "lastEventId");
-    __publicField$2(this, "writable");
-    __publicField$2(this, "readable");
-    __publicField$2(this, "writer");
-    __publicField$2(this, "writerIsClosed", false);
-    __publicField$2(this, "encoder");
+    __publicField$2(this, "h3Event");
     __publicField$2(this, "validationErrors");
     __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
-    __publicField$2(this, "h3Event");
     // for some reason Rollup cannot output DTS when this is set to NodeJS.Timeout
     __publicField$2(this, "pingInterval");
     __publicField$2(this, "pingIntervalMs");
+    __publicField$2(this, "eventStream");
     this.h3Event = event;
-    const id = getHeader(event, "Last-Event-ID");
-    this.lastEventId = id;
-    const { readable, writable } = new TransformStream();
-    this.writable = writable;
-    this.readable = readable;
-    this.writer = writable.getWriter();
-    this.encoder = new TextEncoder();
+    this.eventStream = createEventStream(event, true);
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    void this.writer.closed.then(() => {
-      this.writerIsClosed = true;
+    this.eventStream.on("close", () => {
+      this.cleanup();
     });
   }
   /**
    * Start sending the event stream to the client
    */
   start() {
-    setSseHeaders(this.h3Event);
-    setResponseStatus(this.h3Event, 200);
-    this.h3Event._handled = true;
-    void sendStream(this.h3Event, this.readable);
+    void sendEventStream(this.h3Event, this.eventStream);
     this.pingInterval = setInterval(async () => {
-      await this.publishEvent({
-        id: this.lastEventId,
+      await this.eventStream.push({
         event: "ping",
         data: ""
       });
@@ -546,11 +497,11 @@ class EventStreamConnection {
           data: JSON.stringify(errorResponse2)
         });
       }
-      await this.publishEvents(events);
+      await this.eventStream.push(events);
       return;
     }
     if (this.validator(data)) {
-      await this.publishEvent({
+      await this.eventStream.push({
         id: eventId,
         event: "message",
         data: this.serializer(data)
@@ -563,7 +514,7 @@ class EventStreamConnection {
       statusMessage: "Failed to serialize response. Response does not match specified schema.",
       data: errors
     };
-    await this.publishEvent({
+    await this.eventStream.push({
       id: eventId,
       event: "error",
       data: JSON.stringify(errorResponse)
@@ -589,79 +540,34 @@ class EventStreamConnection {
    * Publish an error event. This will trigger the `onError` hooks of any connected clients.
    */
   async pushError(error, eventId) {
-    await this.publishEvent({
+    await this.eventStream.push({
       id: eventId,
       event: "error",
       data: JSON.stringify(error)
     });
   }
-  async publishEvents(events) {
-    const payload = formatSseList(events);
-    if (this.writerIsClosed) {
-      try {
-        this.h3Event.node.res.end();
-      } catch (_) {
-        await this.cleanup();
-      }
-      return;
-    }
-    await this.writer.write(this.encoder.encode(payload));
-  }
-  async publishEvent(event) {
-    const payload = formatSse(event);
-    if (this.writerIsClosed) {
-      try {
-        this.h3Event.node.res.end();
-      } catch (_) {
-        await this.cleanup();
-      }
-      return;
-    }
-    await this.writer.write(this.encoder.encode(payload));
-  }
-  async cleanup() {
+  cleanup() {
     if (this.pingInterval) {
       clearInterval(this.pingInterval);
     }
-    if (!this.writerIsClosed) {
-      try {
-        await this.writer.close();
-      } catch (_) {
-      }
-    }
   }
   /**
    * Tell clients that the stream has ended and close the connection.
    */
-  async end() {
-    await this.publishEvent({
+  async close() {
+    await this.eventStream.push({
       event: "done",
       data: "this stream has ended"
     }).catch();
-    await new Promise((resolve, reject) => {
-      nextTick(() => {
-        try {
-          this.h3Event.node.res.end();
-          resolve(true);
-        } catch (err) {
-          reject(err);
-        }
-      });
-    });
+    await this.eventStream.close();
   }
   on(event, callback) {
     switch (event) {
-      case "disconnect":
-        this.h3Event.node.req.on("close", async () => {
-          await callback();
-          await this.cleanup();
-        });
+      case "close":
+        this.eventStream.on("close", callback);
         break;
-      case "end":
-        this.h3Event.node.req.on("end", async () => {
-          await callback();
-          await this.cleanup();
-        });
+      case "request:close":
+        this.eventStream.on("request:close", callback);
         break;
     }
   }
@@ -695,7 +601,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
           procedure.params
         );
       }
-      const connection = new EventStreamConnection(event, {
+      const stream = new EventStreamConnection(event, {
         pingInterval: procedure.pingInterval,
         validator: responseValidator?.validate ?? function() {
           return true;
@@ -710,11 +616,14 @@ function registerEventStreamRpc(router, path, procedure, opts) {
           return [];
         }
       });
-      event.context.connection = connection;
+      event.context.stream = stream;
       await procedure.handler(
         event.context,
         event
       );
+      if (!event.handled && !stream.eventStream._handled) {
+        await sendEventStream(event, stream.eventStream);
+      }
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
@@ -1086,4 +995,4 @@ function defineConfig(config) {
   };
 }
 
-export { ArriApp as A, EventStreamConnection as B, registerEventStreamRpc as C, DEV_ENDPOINT_ROOT as D, ErrorResponse as E, DEV_DEFINITION_ENDPOINT as a, isRpc as b, createRpcDefinition as c, defineRpc as d, getRpcParamName as e, getRpcResponseName as f, getRpcPath as g, defineError as h, isRpcParamSchema as i, errorResponseFromValidationErrors as j, handleH3Error as k, isArriConfig as l, isResolvedArriConfig as m, defaultConfig as n, defineConfig as o, ArriRouter as p, defineRoute as q, registerRpc as r, registerRoute as s, handleRoute as t, setSseHeaders as u, validateRpcRequestInput as v, defineEventStreamRpc as w, isEventStreamRpc as x, formatSse as y, formatSseList as z };
+export { ArriApp as A, DEV_ENDPOINT_ROOT as D, ErrorResponse as E, DEV_DEFINITION_ENDPOINT as a, isRpc as b, createRpcDefinition as c, defineRpc as d, getRpcParamName as e, getRpcResponseName as f, getRpcPath as g, defineError as h, isRpcParamSchema as i, errorResponseFromValidationErrors as j, handleH3Error as k, isArriConfig as l, isResolvedArriConfig as m, defaultConfig as n, defineConfig as o, ArriRouter as p, defineRoute as q, registerRpc as r, registerRoute as s, handleRoute as t, defineEventStreamRpc as u, validateRpcRequestInput as v, isEventStreamRpc as w, EventStreamConnection as x, registerEventStreamRpc as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.24.0",
+  "version": "0.25.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -26,28 +26,29 @@
   },
   "dependencies": {
     "@joshmossas/listhen": "1.6.0",
-    "c12": "^1.8.0",
+    "c12": "^1.9.0",
     "chokidar": "^3.6.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "degit": "^2.8.4",
-    "esbuild": "^0.20.0",
+    "esbuild": "^0.20.1",
     "esbuild-plugin-replace": "^1.4.0",
     "globby": "^14.0.1",
-    "h3": "^1.10.1",
+    "h3": "^1.10.2",
+    "h3-sse": "^0.0.7",
     "jiti": "^1.21.0",
     "ofetch": "^1.3.3",
     "pathe": "^1.1.2",
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-dart": "0.24.0",
-    "arri-validate": "0.24.0",
-    "arri-codegen-utils": "0.24.0",
-    "arri-codegen-ts": "0.24.0"
+    "arri-codegen-ts": "0.25.0",
+    "arri-codegen-utils": "0.25.0",
+    "arri-validate": "0.25.0",
+    "arri-codegen-dart": "0.25.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.0.27"
+    "bun-types": "^1.0.28"
   }
 }