arri 0.38.1 → 0.39.0

package/dist/cli.cjs

@@ -11,7 +11,7 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.bba0eea2.cjs');
+const config = require('./shared/arri.ebe44c73.cjs');
 const consola = require('consola');
 const globby = require('globby');
 const scule = require('scule');

package/dist/cli.mjs

@@ -10,7 +10,7 @@ import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { q as defaultConfig, o as isArriConfig, p as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.37a5d932.mjs';
+import { q as defaultConfig, o as isArriConfig, p as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.1fc3f099.mjs';
 import { createConsola } from 'consola';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/arri.bba0eea2.cjs');
+const config = require('./shared/arri.ebe44c73.cjs');
 const h3 = require('h3');
 require('arri-codegen-utils');
 require('arri-validate');

package/dist/index.d.cts

@@ -128,7 +128,7 @@ interface WebsocketRpc<TParams extends RpcParamSchema | undefined = undefined, T
     params: TParams;
     response: TResponse;
     pingInterval?: boolean;
-    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
+    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> | (() => WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>);
 }
 interface WsPeerOpts<TResponse> {
     validator?: CompiledValidator<ASchema<TResponse>>;

package/dist/index.d.mts

@@ -128,7 +128,7 @@ interface WebsocketRpc<TParams extends RpcParamSchema | undefined = undefined, T
     params: TParams;
     response: TResponse;
     pingInterval?: boolean;
-    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
+    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> | (() => WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>);
 }
 interface WsPeerOpts<TResponse> {
     validator?: CompiledValidator<ASchema<TResponse>>;

package/dist/index.d.ts

@@ -128,7 +128,7 @@ interface WebsocketRpc<TParams extends RpcParamSchema | undefined = undefined, T
     params: TParams;
     response: TResponse;
     pingInterval?: boolean;
-    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
+    handler: WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> | (() => WebSocketRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>);
 }
 interface WsPeerOpts<TResponse> {
     validator?: CompiledValidator<ASchema<TResponse>>;

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as ArriApp, t as ArriRouter, j as ArriServerError, k as ArriServerErrorResponse, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as EventStreamConnection, W as WsPeer, c as createAppDefinition, e as createHttpRpcDefinition, G as createWsRpcDefinition, q as defaultConfig, s as defineConfig, l as defineError, y as defineEventStreamRpc, u as defineRoute, d as defineRpc, C as defineWebsocketRpc, m as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, n as handleH3Error, x as handleRoute, o as isArriConfig, z as isEventStreamRpc, p as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, B as registerEventStreamRpc, w as registerRoute, r as registerRpc, F as registerWebsocketRpc, v as validateRpcRequestInput } from './shared/arri.37a5d932.mjs';
+export { A as ArriApp, t as ArriRouter, j as ArriServerError, k as ArriServerErrorResponse, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as EventStreamConnection, W as WsPeer, c as createAppDefinition, e as createHttpRpcDefinition, G as createWsRpcDefinition, q as defaultConfig, s as defineConfig, l as defineError, y as defineEventStreamRpc, u as defineRoute, d as defineRpc, C as defineWebsocketRpc, m as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, n as handleH3Error, x as handleRoute, o as isArriConfig, z as isEventStreamRpc, p as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, B as registerEventStreamRpc, w as registerRoute, r as registerRpc, F as registerWebsocketRpc, v as validateRpcRequestInput } from './shared/arri.1fc3f099.mjs';
 export * from 'h3';
 import 'arri-codegen-utils';
 import 'arri-validate';

package/dist/shared/{arri.37a5d932.mjs → arri.1fc3f099.mjs}

@@ -876,11 +876,11 @@ class WsPeer {
       return;
     }
     const payload = this._validator.serialize(data);
-    return this._peer.send(`type: message
+    return this._peer.send(`event: message
 data: ${payload}`);
   }
   sendError(err) {
-    return this._peer.send(`type: error
+    return this._peer.send(`event: error
 data: ${JSON.stringify(err)}`);
   }
   close() {
@@ -931,6 +931,7 @@ function registerWebsocketRpc(router, path, rpc) {
   } catch (err) {
     console.error("ERROR COMPILING PARAMS", err);
   }
+  const rpcHandler = typeof rpc.handler === "function" ? rpc.handler() : rpc.handler;
   const handler = defineWebSocketHandler({
     upgrade(req) {
     },
@@ -954,7 +955,7 @@ function registerWebsocketRpc(router, path, rpc) {
         context
       });
       peer.ctx.__wsPeer = wsPeer;
-      rpc.handler.onOpen(peer.ctx.__wsPeer);
+      rpcHandler.onOpen(peer.ctx.__wsPeer);
     },
     message(peer, message) {
       if (!paramValidator) {
@@ -971,10 +972,10 @@ function registerWebsocketRpc(router, path, rpc) {
         peer.ctx.__wsPeer.sendError(errorResponse);
         return;
       }
-      rpc.handler.onMessage(peer.ctx.__wsPeer, data.value);
+      rpcHandler.onMessage(peer.ctx.__wsPeer, data.value);
     },
     close(peer, details) {
-      rpc.handler.onClose(peer.ctx.__wsPeer, details);
+      rpcHandler.onClose(peer.ctx.__wsPeer, details);
     }
   });
   router.use(path, handler);

package/dist/shared/{arri.bba0eea2.cjs → arri.ebe44c73.cjs}

@@ -878,11 +878,11 @@ class WsPeer {
       return;
     }
     const payload = this._validator.serialize(data);
-    return this._peer.send(`type: message
+    return this._peer.send(`event: message
 data: ${payload}`);
   }
   sendError(err) {
-    return this._peer.send(`type: error
+    return this._peer.send(`event: error
 data: ${JSON.stringify(err)}`);
   }
   close() {
@@ -933,6 +933,7 @@ function registerWebsocketRpc(router, path, rpc) {
   } catch (err) {
     console.error("ERROR COMPILING PARAMS", err);
   }
+  const rpcHandler = typeof rpc.handler === "function" ? rpc.handler() : rpc.handler;
   const handler = h3.defineWebSocketHandler({
     upgrade(req) {
     },
@@ -956,7 +957,7 @@ function registerWebsocketRpc(router, path, rpc) {
         context
       });
       peer.ctx.__wsPeer = wsPeer;
-      rpc.handler.onOpen(peer.ctx.__wsPeer);
+      rpcHandler.onOpen(peer.ctx.__wsPeer);
     },
     message(peer, message) {
       if (!paramValidator) {
@@ -973,10 +974,10 @@ function registerWebsocketRpc(router, path, rpc) {
         peer.ctx.__wsPeer.sendError(errorResponse);
         return;
       }
-      rpc.handler.onMessage(peer.ctx.__wsPeer, data.value);
+      rpcHandler.onMessage(peer.ctx.__wsPeer, data.value);
     },
     close(peer, details) {
-      rpc.handler.onClose(peer.ctx.__wsPeer, details);
+      rpcHandler.onClose(peer.ctx.__wsPeer, details);
     }
   });
   router.use(path, handler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.38.1",
+  "version": "0.39.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -44,10 +44,10 @@
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-dart": "0.38.1",
-    "arri-codegen-utils": "0.38.1",
-    "arri-validate": "0.38.1",
-    "arri-codegen-ts": "0.38.1"
+    "arri-codegen-dart": "0.39.0",
+    "arri-codegen-utils": "0.39.0",
+    "arri-validate": "0.39.0",
+    "arri-codegen-ts": "0.39.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",