arri 0.18.1 → 0.18.2

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.34c274c5.cjs');
+const config = require('./shared/arri.2034f594.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -22,6 +22,7 @@ const chokidar = require('chokidar');
 const Degit = require('degit');
 require('h3');
 require('arri-validate');
+require('node:process');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 

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.0ddf73b7.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.97188bcb.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -21,6 +21,7 @@ import chokidar from 'chokidar';
 import Degit from 'degit';
 import 'h3';
 import 'arri-validate';
+import 'node:process';
 
 const GEN_APP_FILE = "__arri_app.js";
 const GEN_SERVER_ENTRY_FILE = "__arri_server.js";

package/dist/index.cjs

@@ -1,8 +1,9 @@
 'use strict';
 
-const config = require('./shared/arri.34c274c5.cjs');
+const config = require('./shared/arri.2034f594.cjs');
 const h3 = require('h3');
 require('arri-validate');
+require('node:process');
 require('arri-codegen-utils');
 require('scule');
 

package/dist/index.d.cts

@@ -91,6 +91,7 @@ declare class EventStreamConnection<TData> {
     private readonly writable;
     private readonly readable;
     private readonly writer;
+    private writerIsClosed;
     private readonly encoder;
     private readonly serializer;
     private readonly h3Event;

package/dist/index.d.mts

@@ -91,6 +91,7 @@ declare class EventStreamConnection<TData> {
     private readonly writable;
     private readonly readable;
     private readonly writer;
+    private writerIsClosed;
     private readonly encoder;
     private readonly serializer;
     private readonly h3Event;

package/dist/index.d.ts

@@ -91,6 +91,7 @@ declare class EventStreamConnection<TData> {
     private readonly writable;
     private readonly readable;
     private readonly writer;
+    private writerIsClosed;
     private readonly encoder;
     private readonly serializer;
     private readonly h3Event;

package/dist/index.mjs

@@ -1,6 +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.0ddf73b7.mjs';
+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.97188bcb.mjs';
 export * from 'h3';
 import 'arri-validate';
+import 'node:process';
 import 'arri-codegen-utils';
 import 'scule';
 

package/dist/shared/{arri.34c274c5.cjs → arri.2034f594.cjs}

@@ -2,6 +2,7 @@
 
 const h3 = require('h3');
 const arriValidate = require('arri-validate');
+const node_process = require('node:process');
 const arriCodegenUtils = require('arri-codegen-utils');
 const scule = require('scule');
 
@@ -460,6 +461,7 @@ class EventStreamConnection {
     __publicField$2(this, "writable");
     __publicField$2(this, "readable");
     __publicField$2(this, "writer");
+    __publicField$2(this, "writerIsClosed", false);
     __publicField$2(this, "encoder");
     __publicField$2(this, "serializer");
     __publicField$2(this, "h3Event");
@@ -477,6 +479,9 @@ class EventStreamConnection {
     this.encoder = new TextEncoder();
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
+    void this.writer.closed.then(() => {
+      this.writerIsClosed = true;
+    });
   }
   /**
    * Start sending the event stream to the client
@@ -539,19 +544,37 @@ class EventStreamConnection {
   }
   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() {
     if (this.pingInterval) {
       clearInterval(this.pingInterval);
     }
-    try {
-      await this.writer.close();
-    } catch (_) {
+    if (!this.writerIsClosed) {
+      try {
+        await this.writer.close();
+      } catch (_) {
+      }
     }
   }
   /**
@@ -562,8 +585,16 @@ class EventStreamConnection {
       event: "done",
       data: "this stream has ended"
     }).catch();
-    this.h3Event.node.res.end();
-    await this.cleanup();
+    await new Promise((resolve, reject) => {
+      node_process.nextTick(() => {
+        try {
+          this.h3Event.node.res.end();
+          resolve(true);
+        } catch (err) {
+          reject(err);
+        }
+      });
+    });
   }
   on(event, callback) {
     switch (event) {
@@ -574,7 +605,10 @@ class EventStreamConnection {
         });
         break;
       case "end":
-        this.h3Event.node.req.on("end", callback);
+        this.h3Event.node.req.on("end", async () => {
+          await callback();
+          await this.cleanup();
+        });
         break;
     }
   }

package/dist/shared/{arri.0ddf73b7.mjs → arri.97188bcb.mjs}

@@ -1,5 +1,6 @@
 import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, setHeaders, getHeader, sendStream, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
 import { a, isAObjectSchema, isARecordSchema, isADiscriminatorSchema } from 'arri-validate';
+import { nextTick } from 'node:process';
 import { isRpcHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
@@ -458,6 +459,7 @@ class EventStreamConnection {
     __publicField$2(this, "writable");
     __publicField$2(this, "readable");
     __publicField$2(this, "writer");
+    __publicField$2(this, "writerIsClosed", false);
     __publicField$2(this, "encoder");
     __publicField$2(this, "serializer");
     __publicField$2(this, "h3Event");
@@ -475,6 +477,9 @@ class EventStreamConnection {
     this.encoder = new TextEncoder();
     this.pingIntervalMs = opts.pingInterval ?? 6e4;
     this.serializer = opts.serializer;
+    void this.writer.closed.then(() => {
+      this.writerIsClosed = true;
+    });
   }
   /**
    * Start sending the event stream to the client
@@ -537,19 +542,37 @@ class EventStreamConnection {
   }
   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() {
     if (this.pingInterval) {
       clearInterval(this.pingInterval);
     }
-    try {
-      await this.writer.close();
-    } catch (_) {
+    if (!this.writerIsClosed) {
+      try {
+        await this.writer.close();
+      } catch (_) {
+      }
     }
   }
   /**
@@ -560,8 +583,16 @@ class EventStreamConnection {
       event: "done",
       data: "this stream has ended"
     }).catch();
-    this.h3Event.node.res.end();
-    await this.cleanup();
+    await new Promise((resolve, reject) => {
+      nextTick(() => {
+        try {
+          this.h3Event.node.res.end();
+          resolve(true);
+        } catch (err) {
+          reject(err);
+        }
+      });
+    });
   }
   on(event, callback) {
     switch (event) {
@@ -572,7 +603,10 @@ class EventStreamConnection {
         });
         break;
       case "end":
-        this.h3Event.node.req.on("end", callback);
+        this.h3Event.node.req.on("end", async () => {
+          await callback();
+          await this.cleanup();
+        });
         break;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -41,10 +41,10 @@
     "scule": "^1.1.1",
     "uncrypto": "^0.1.3",
     "@joshmossas/listhen": "1.5.13",
-    "arri-codegen-dart": "0.18.1",
-    "arri-codegen-ts": "0.18.1",
-    "arri-codegen-utils": "0.18.1",
-    "arri-validate": "0.18.1"
+    "arri-codegen-dart": "0.18.2",
+    "arri-codegen-utils": "0.18.2",
+    "arri-validate": "0.18.2",
+    "arri-codegen-ts": "0.18.2"
   },
   "peerDependencies": {},
   "devDependencies": {