arri 0.19.4 → 0.20.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.6b7e8945.cjs');
+const config = require('./shared/arri.b90bc113.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.ea72d98f.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.f69ab093.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/arri.6b7e8945.cjs');
+const config = require('./shared/arri.b90bc113.cjs');
 const h3 = require('h3');
 require('arri-validate');
 require('node:process');

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -73,6 +73,8 @@ interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends R
     connection: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
+    validator: (input: unknown) => input is TData;
+    validationErrors: (input: unknown) => ValueError[];
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
@@ -93,6 +95,8 @@ declare class EventStreamConnection<TData> {
     private readonly writer;
     private writerIsClosed;
     private readonly encoder;
+    private readonly validationErrors;
+    private readonly validator;
     private readonly serializer;
     private readonly h3Event;
     private pingInterval;

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -73,6 +73,8 @@ interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends R
     connection: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
+    validator: (input: unknown) => input is TData;
+    validationErrors: (input: unknown) => ValueError[];
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
@@ -93,6 +95,8 @@ declare class EventStreamConnection<TData> {
     private readonly writer;
     private writerIsClosed;
     private readonly encoder;
+    private readonly validationErrors;
+    private readonly validator;
     private readonly serializer;
     private readonly h3Event;
     private pingInterval;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcHttpMethod, RpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ARecordSchema, ADiscriminatorSchema } from 'arri-validate';
 import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -73,6 +73,8 @@ interface EventStreamRpcHandlerContext<TParams = any, TResponse = any> extends R
     connection: EventStreamConnection<TResponse>;
 }
 interface EventStreamConnectionOptions<TData> {
+    validator: (input: unknown) => input is TData;
+    validationErrors: (input: unknown) => ValueError[];
     serializer: (input: TData) => string;
     pingInterval?: number;
 }
@@ -93,6 +95,8 @@ declare class EventStreamConnection<TData> {
     private readonly writer;
     private writerIsClosed;
     private readonly encoder;
+    private readonly validationErrors;
+    private readonly validator;
     private readonly serializer;
     private readonly h3Event;
     private pingInterval;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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.ea72d98f.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.f69ab093.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'node:process';

package/dist/shared/{arri.6b7e8945.cjs → arri.b90bc113.cjs}

@@ -312,6 +312,13 @@ function registerRpc(router, path, procedure, opts) {
         await opts.onBeforeResponse(event);
       }
       if (typeof response === "object") {
+        if (!responseValidator?.validate(response)) {
+          const errors = arriValidate.a.errors(procedure.response, response);
+          throw defineError(500, {
+            statusMessage: "Failed to serialize response. Response does not match specified schema",
+            data: errors
+          });
+        }
         h3.setResponseHeader(event, "Content-Type", "application/json");
         await h3.send(
           event,
@@ -423,13 +430,17 @@ var __publicField$2 = (obj, key, value) => {
   return value;
 };
 function setSseHeaders(event) {
-  h3.setHeaders(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",
-    Connection: "keep-alive",
     Pragma: "no-cache",
     "X-Accel-Buffering": "no"
-  });
+  };
+  if (!isHttp2) {
+    input.Connection = "keep-alive";
+  }
+  h3.setResponseHeaders(event, input);
 }
 function defineEventStreamRpc(config) {
   return {
@@ -470,6 +481,8 @@ class EventStreamConnection {
     __publicField$2(this, "writer");
     __publicField$2(this, "writerIsClosed", false);
     __publicField$2(this, "encoder");
+    __publicField$2(this, "validationErrors");
+    __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
     __publicField$2(this, "h3Event");
     __publicField$2(this, "pingInterval");
@@ -484,6 +497,8 @@ class EventStreamConnection {
     this.encoder = new TextEncoder();
     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;
     });
@@ -508,19 +523,47 @@ class EventStreamConnection {
     if (Array.isArray(data)) {
       const events = [];
       for (const item of data) {
+        if (this.validator(item)) {
+          events.push({
+            id: eventId,
+            event: "message",
+            data: this.serializer(item)
+          });
+          continue;
+        }
+        const errors2 = this.validationErrors(item);
+        const errorResponse2 = {
+          statusCode: 500,
+          statusMessage: "Failed to serialize response. Response does not match specified schema.",
+          data: errors2
+        };
         events.push({
           id: eventId,
-          event: "message",
-          data: this.serializer(item)
+          event: "error",
+          data: JSON.stringify(errorResponse2)
         });
       }
       await this.publishEvents(events);
       return;
     }
+    if (this.validator(data)) {
+      await this.publishEvent({
+        id: eventId,
+        event: "message",
+        data: this.serializer(data)
+      });
+      return;
+    }
+    const errors = this.validationErrors(data);
+    const errorResponse = {
+      statusCode: 500,
+      statusMessage: "Failed to serialize response. Response does not match specified schema.",
+      data: errors
+    };
     await this.publishEvent({
       id: eventId,
-      event: "message",
-      data: this.serializer(data)
+      event: "error",
+      data: JSON.stringify(errorResponse)
     });
   }
   // /**
@@ -651,8 +694,17 @@ function registerEventStreamRpc(router, path, procedure, opts) {
       }
       const connection = new EventStreamConnection(event, {
         pingInterval: procedure.pingInterval,
+        validator: responseValidator?.validate ?? function() {
+          return true;
+        },
         serializer: responseValidator?.serialize ?? function(_) {
           return "";
+        },
+        validationErrors(input) {
+          if (procedure.response) {
+            return arriValidate.a.errors(procedure.response, input);
+          }
+          return [];
         }
       });
       event.context.connection = connection;

package/dist/shared/{arri.ea72d98f.mjs → arri.f69ab093.mjs}

@@ -1,4 +1,4 @@
-import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, setHeaders, getHeader, sendStream, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
+import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, setResponseHeaders, 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';
@@ -310,6 +310,13 @@ function registerRpc(router, path, procedure, opts) {
         await opts.onBeforeResponse(event);
       }
       if (typeof response === "object") {
+        if (!responseValidator?.validate(response)) {
+          const errors = a.errors(procedure.response, response);
+          throw defineError(500, {
+            statusMessage: "Failed to serialize response. Response does not match specified schema",
+            data: errors
+          });
+        }
         setResponseHeader(event, "Content-Type", "application/json");
         await send(
           event,
@@ -421,13 +428,17 @@ var __publicField$2 = (obj, key, value) => {
   return value;
 };
 function setSseHeaders(event) {
-  setHeaders(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",
-    Connection: "keep-alive",
     Pragma: "no-cache",
     "X-Accel-Buffering": "no"
-  });
+  };
+  if (!isHttp2) {
+    input.Connection = "keep-alive";
+  }
+  setResponseHeaders(event, input);
 }
 function defineEventStreamRpc(config) {
   return {
@@ -468,6 +479,8 @@ class EventStreamConnection {
     __publicField$2(this, "writer");
     __publicField$2(this, "writerIsClosed", false);
     __publicField$2(this, "encoder");
+    __publicField$2(this, "validationErrors");
+    __publicField$2(this, "validator");
     __publicField$2(this, "serializer");
     __publicField$2(this, "h3Event");
     __publicField$2(this, "pingInterval");
@@ -482,6 +495,8 @@ class EventStreamConnection {
     this.encoder = new TextEncoder();
     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;
     });
@@ -506,19 +521,47 @@ class EventStreamConnection {
     if (Array.isArray(data)) {
       const events = [];
       for (const item of data) {
+        if (this.validator(item)) {
+          events.push({
+            id: eventId,
+            event: "message",
+            data: this.serializer(item)
+          });
+          continue;
+        }
+        const errors2 = this.validationErrors(item);
+        const errorResponse2 = {
+          statusCode: 500,
+          statusMessage: "Failed to serialize response. Response does not match specified schema.",
+          data: errors2
+        };
         events.push({
           id: eventId,
-          event: "message",
-          data: this.serializer(item)
+          event: "error",
+          data: JSON.stringify(errorResponse2)
         });
       }
       await this.publishEvents(events);
       return;
     }
+    if (this.validator(data)) {
+      await this.publishEvent({
+        id: eventId,
+        event: "message",
+        data: this.serializer(data)
+      });
+      return;
+    }
+    const errors = this.validationErrors(data);
+    const errorResponse = {
+      statusCode: 500,
+      statusMessage: "Failed to serialize response. Response does not match specified schema.",
+      data: errors
+    };
     await this.publishEvent({
       id: eventId,
-      event: "message",
-      data: this.serializer(data)
+      event: "error",
+      data: JSON.stringify(errorResponse)
     });
   }
   // /**
@@ -649,8 +692,17 @@ function registerEventStreamRpc(router, path, procedure, opts) {
       }
       const connection = new EventStreamConnection(event, {
         pingInterval: procedure.pingInterval,
+        validator: responseValidator?.validate ?? function() {
+          return true;
+        },
         serializer: responseValidator?.serialize ?? function(_) {
           return "";
+        },
+        validationErrors(input) {
+          if (procedure.response) {
+            return a.errors(procedure.response, input);
+          }
+          return [];
         }
       });
       event.context.connection = connection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.19.4",
+  "version": "0.20.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -37,17 +37,17 @@
     "h3": "^1.10.0",
     "jiti": "^1.21.0",
     "ofetch": "^1.3.3",
-    "pathe": "^1.1.1",
-    "prettier": "^3.1.1",
-    "scule": "^1.1.1",
+    "pathe": "^1.1.2",
+    "prettier": "^3.2.2",
+    "scule": "^1.2.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-dart": "0.19.4",
-    "arri-codegen-ts": "0.19.4",
-    "arri-codegen-utils": "0.19.4",
-    "arri-validate": "0.19.4"
+    "arri-codegen-dart": "0.20.0",
+    "arri-validate": "0.20.0",
+    "arri-codegen-utils": "0.20.0",
+    "arri-codegen-ts": "0.20.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.0.21"
+    "bun-types": "^1.0.22"
   }
 }