arri 0.26.0 → 0.27.0

package/README.md

@@ -261,7 +261,7 @@ export default defineEventStreamRpc({
     }),
     handler({ params, stream }) {
         // initialize the stream and send it to the client
-        stream.init();
+        stream.send();
 
         // send a message every second
         const interval = setInterval(async () => {
@@ -286,7 +286,7 @@ export default defineEventStreamRpc({
 ```ts
 stream.push(data: Data, eventId?: string)
 stream.pushError(error: ArriRequestError, eventId?: string)
-stream.init()
+stream.send()
 stream.end()
 stream.on(e: 'request:close' | 'close', callback: () => any)
 ```

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.593bcad9.cjs');
+const config = require('./shared/arri.22a9d5c0.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');

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.21567b92.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.8cfc63cb.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';

package/dist/index.cjs

@@ -1,9 +1,9 @@
 'use strict';
 
-const config = require('./shared/arri.593bcad9.cjs');
+const config = require('./shared/arri.22a9d5c0.cjs');
 const h3 = require('h3');
-const h3Sse = require('h3-sse');
 require('arri-validate');
+require('h3-sse');
 require('arri-codegen-utils');
 require('scule');
 
@@ -41,6 +41,3 @@ exports.defineMiddleware = defineMiddleware;
 Object.keys(h3).forEach(function (k) {
     if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = h3[k];
 });
-Object.keys(h3Sse).forEach(function (k) {
-    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = h3Sse[k];
-});

package/dist/index.d.cts

@@ -3,7 +3,6 @@ import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARec
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
-export * from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -78,7 +77,6 @@ interface EventStreamConnectionOptions<TData> {
 }
 declare class EventStreamConnection<TData> {
     readonly lastEventId?: string;
-    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
@@ -87,9 +85,9 @@ declare class EventStreamConnection<TData> {
     readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
-     * Initialize the stream. This must be called before sending any events.
+     * Send the stream to the client. This must be called before sending any events.
      */
-    init(): void;
+    send(): void;
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
@@ -104,8 +102,7 @@ declare class EventStreamConnection<TData> {
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    on(event: "close", callback: () => any): void;
-    on(event: "request:close", callback: () => any): void;
+    onClose(cb: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;

package/dist/index.d.mts

@@ -3,7 +3,6 @@ import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARec
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
-export * from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -78,7 +77,6 @@ interface EventStreamConnectionOptions<TData> {
 }
 declare class EventStreamConnection<TData> {
     readonly lastEventId?: string;
-    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
@@ -87,9 +85,9 @@ declare class EventStreamConnection<TData> {
     readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
-     * Initialize the stream. This must be called before sending any events.
+     * Send the stream to the client. This must be called before sending any events.
      */
-    init(): void;
+    send(): void;
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
@@ -104,8 +102,7 @@ declare class EventStreamConnection<TData> {
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    on(event: "close", callback: () => any): void;
-    on(event: "request:close", callback: () => any): void;
+    onClose(cb: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;

package/dist/index.d.ts

@@ -3,7 +3,6 @@ import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARec
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
-export * from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
 interface MiddlewareEventContext extends H3EventContext {
@@ -78,7 +77,6 @@ interface EventStreamConnectionOptions<TData> {
 }
 declare class EventStreamConnection<TData> {
     readonly lastEventId?: string;
-    private readonly h3Event;
     private readonly validationErrors;
     private readonly validator;
     private readonly serializer;
@@ -87,9 +85,9 @@ declare class EventStreamConnection<TData> {
     readonly eventStream: EventStream;
     constructor(event: H3Event, opts: EventStreamConnectionOptions<TData>);
     /**
-     * Initialize the stream. This must be called before sending any events.
+     * Send the stream to the client. This must be called before sending any events.
      */
-    init(): void;
+    send(): void;
     /**
      * Publish a new event. Events published with this hook will trigger the `onData()` hooks of any connected clients.
      */
@@ -104,8 +102,7 @@ declare class EventStreamConnection<TData> {
      * Tell clients that the stream has ended and close the connection.
      */
     close(): Promise<void>;
-    on(event: "close", callback: () => any): void;
-    on(event: "request:close", callback: () => any): void;
+    onClose(cb: () => any): void;
 }
 declare function registerEventStreamRpc(router: Router, path: string, procedure: EventStreamRpc<any, any> & {
     name: string;

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, 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.21567b92.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.8cfc63cb.mjs';
 export * from 'h3';
-export * from 'h3-sse';
 import 'arri-validate';
+import 'h3-sse';
 import 'arri-codegen-utils';
 import 'scule';
 

package/dist/shared/{arri.593bcad9.cjs → arri.22a9d5c0.cjs}

@@ -446,7 +446,6 @@ function isEventStreamRpc(input) {
 class EventStreamConnection {
   constructor(event, opts) {
     __publicField$2(this, "lastEventId");
-    __publicField$2(this, "h3Event");
     __publicField$2(this, "validationErrors");
     __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
@@ -454,22 +453,21 @@ class EventStreamConnection {
     __publicField$2(this, "pingInterval");
     __publicField$2(this, "pingIntervalMs");
     __publicField$2(this, "eventStream");
-    this.h3Event = event;
-    this.eventStream = h3Sse.createEventStream(event, true);
+    this.eventStream = h3Sse.createEventStream(event);
     this.lastEventId = this.eventStream.lastEventId;
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    this.eventStream.on("close", () => {
+    this.eventStream.onClose(() => {
       this.cleanup();
     });
   }
   /**
-   * Initialize the stream. This must be called before sending any events.
+   * Send the stream to the client. This must be called before sending any events.
    */
-  init() {
-    void h3Sse.sendEventStream(this.h3Event, this.eventStream);
+  send() {
+    void this.eventStream.send();
     this.pingInterval = setInterval(async () => {
       await this.eventStream.push({
         event: "ping",
@@ -565,15 +563,8 @@ class EventStreamConnection {
     }).catch();
     await this.eventStream.close();
   }
-  on(event, callback) {
-    switch (event) {
-      case "close":
-        this.eventStream.on("close", callback);
-        break;
-      case "request:close":
-        this.eventStream.on("request:close", callback);
-        break;
-    }
+  onClose(cb) {
+    this.eventStream.onClose(cb);
   }
 }
 function registerEventStreamRpc(router, path, procedure, opts) {
@@ -626,7 +617,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
         event
       );
       if (!event.handled && !stream.eventStream._handled) {
-        await h3Sse.sendEventStream(event, stream.eventStream);
+        stream.send();
       }
     } catch (err) {
       await handleH3Error(err, event, opts.onError);

package/dist/shared/{arri.21567b92.mjs → arri.8cfc63cb.mjs}

@@ -1,6 +1,6 @@
 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 { createEventStream, sendEventStream } from 'h3-sse';
+import { createEventStream } from 'h3-sse';
 import { isRpcHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
@@ -444,7 +444,6 @@ function isEventStreamRpc(input) {
 class EventStreamConnection {
   constructor(event, opts) {
     __publicField$2(this, "lastEventId");
-    __publicField$2(this, "h3Event");
     __publicField$2(this, "validationErrors");
     __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
@@ -452,22 +451,21 @@ class EventStreamConnection {
     __publicField$2(this, "pingInterval");
     __publicField$2(this, "pingIntervalMs");
     __publicField$2(this, "eventStream");
-    this.h3Event = event;
-    this.eventStream = createEventStream(event, true);
+    this.eventStream = createEventStream(event);
     this.lastEventId = this.eventStream.lastEventId;
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
     this.validator = opts.validator;
     this.validationErrors = opts.validationErrors;
-    this.eventStream.on("close", () => {
+    this.eventStream.onClose(() => {
       this.cleanup();
     });
   }
   /**
-   * Initialize the stream. This must be called before sending any events.
+   * Send the stream to the client. This must be called before sending any events.
    */
-  init() {
-    void sendEventStream(this.h3Event, this.eventStream);
+  send() {
+    void this.eventStream.send();
     this.pingInterval = setInterval(async () => {
       await this.eventStream.push({
         event: "ping",
@@ -563,15 +561,8 @@ class EventStreamConnection {
     }).catch();
     await this.eventStream.close();
   }
-  on(event, callback) {
-    switch (event) {
-      case "close":
-        this.eventStream.on("close", callback);
-        break;
-      case "request:close":
-        this.eventStream.on("request:close", callback);
-        break;
-    }
+  onClose(cb) {
+    this.eventStream.onClose(cb);
   }
 }
 function registerEventStreamRpc(router, path, procedure, opts) {
@@ -624,7 +615,7 @@ function registerEventStreamRpc(router, path, procedure, opts) {
         event
       );
       if (!event.handled && !stream.eventStream._handled) {
-        await sendEventStream(event, stream.eventStream);
+        stream.send();
       }
     } catch (err) {
       await handleH3Error(err, event, opts.onError);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -34,21 +34,21 @@
     "esbuild": "^0.20.1",
     "esbuild-plugin-replace": "^1.4.0",
     "globby": "^14.0.1",
-    "h3": "^1.10.2",
-    "h3-sse": "^0.0.9",
+    "h3": "^1.11.1",
+    "h3-sse": "^0.0.12",
     "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.26.0",
-    "arri-validate": "0.26.0",
-    "arri-codegen-ts": "0.26.0",
-    "arri-codegen-utils": "0.26.0"
+    "arri-codegen-dart": "0.27.0",
+    "arri-codegen-utils": "0.27.0",
+    "arri-validate": "0.27.0",
+    "arri-codegen-ts": "0.27.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.0.28"
+    "bun-types": "^1.0.29"
   }
 }