@arrirpc/server 0.61.0 → 0.62.0

package/dist/index.cjs

@@ -863,7 +863,7 @@ class WsPeer {
     __publicField$1(this, "url");
     this._peer = peer;
     this._validator = opts.validator;
-    this.url = peer.url;
+    this.url = peer.websocket.url ?? "";
     this.context = opts.context;
   }
   send(data) {
@@ -908,72 +908,20 @@ data: ${JSON.stringify(err)}`);
     const payload = this._validator.serialize(message);
     this._peer.publish(channel, payload);
   }
-  readyState() {
-    return this._peer.readyState;
-  }
 }
 function defineWebsocketRpc(def) {
   def.transport = "ws";
   return def;
 }
-function registerWebsocketRpc(router, path, rpc) {
-  let responseValidator;
-  let paramValidator;
-  try {
-    responseValidator = rpc.response ? schema.a.compile(rpc.response) : void 0;
-  } catch (err) {
-    console.error("ERROR COMPILING VALIDATOR", err);
-  }
-  try {
-    paramValidator = rpc.params ? schema.a.compile(rpc.params) : void 0;
-  } catch (err) {
-    console.error("ERROR COMPILING PARAMS", err);
-  }
-  const rpcHandler = typeof rpc.handler === "function" ? rpc.handler() : rpc.handler;
+function registerWebsocketRpc(router, path, _rpc) {
   const handler = h3.defineWebSocketHandler({
     upgrade(_req) {
     },
-    open(peer) {
-      const urlParts = peer.url.split("?");
-      const context = {
-        rpcName: rpc.name,
-        clientAddress: peer.addr
-      };
-      if (urlParts.length > 1) {
-        urlParts.shift();
-        const queryStr = new URLSearchParams(urlParts.join("?"));
-        const query = {};
-        for (const [key, val] of queryStr.entries()) {
-          query[key] = val;
-        }
-        context.queryParams = query;
-      }
-      const wsPeer = new WsPeer(peer, {
-        validator: responseValidator,
-        context
-      });
-      peer.ctx.__wsPeer = wsPeer;
-      rpcHandler.onOpen(peer.ctx.__wsPeer);
+    open(_) {
     },
-    message(peer, message) {
-      if (!paramValidator) {
-        return;
-      }
-      const data = paramValidator.safeParse(message.text());
-      if (!data.success) {
-        const errorResponse = {
-          code: 400,
-          message: data.error.message,
-          data: data.error.errors,
-          stack: data.error.stack?.split("\n")
-        };
-        peer.ctx.__wsPeer.sendError(errorResponse);
-        return;
-      }
-      rpcHandler.onMessage(peer.ctx.__wsPeer, data.value);
+    message(_, __) {
     },
-    close(peer, details) {
-      rpcHandler.onClose(peer.ctx.__wsPeer, details);
+    close(_, __) {
     }
   });
   router.use(path, handler);
@@ -1143,7 +1091,7 @@ class ArriApp {
       return;
     }
     if (p.transport === "ws") {
-      registerWebsocketRpc(this.h3Router, path, p);
+      registerWebsocketRpc(this.h3Router, path);
     }
   }
   route(route) {

package/dist/index.d.cts

@@ -170,13 +170,12 @@ declare class WsPeer<TResponse> {
     context: WsPeerContext;
     url: string;
     constructor(peer: Peer, opts: WsPeerOpts<TResponse>);
-    send(data: TResponse): number | undefined;
-    sendError(err: ArriServerErrorResponse): number;
+    send(data: TResponse): number | void;
+    sendError(err: ArriServerErrorResponse): number | void | undefined;
     close(): void;
     subscribe(channel: string): void;
     unsubscribe(channel: string): void;
     publish(channel: string, message: TResponse): void;
-    readyState(): (0 | 1 | 2 | 3) | -1;
 }
 interface WebSocketRpcHandler<TParams, TResponse> {
     onOpen: (peer: WsPeer<TResponse>) => void;
@@ -194,7 +193,7 @@ declare function defineWebsocketRpc<TParams extends RpcParamSchema | undefined,
 /**
  * @experimental
  */
-declare function registerWebsocketRpc(router: Router, path: string, rpc: NamedWebsocketRpc<any, any>): void;
+declare function registerWebsocketRpc(router: Router, path: string, _rpc: NamedWebsocketRpc<any, any>): void;
 /**
  * @experimental
  */

package/dist/index.d.mts

@@ -170,13 +170,12 @@ declare class WsPeer<TResponse> {
     context: WsPeerContext;
     url: string;
     constructor(peer: Peer, opts: WsPeerOpts<TResponse>);
-    send(data: TResponse): number | undefined;
-    sendError(err: ArriServerErrorResponse): number;
+    send(data: TResponse): number | void;
+    sendError(err: ArriServerErrorResponse): number | void | undefined;
     close(): void;
     subscribe(channel: string): void;
     unsubscribe(channel: string): void;
     publish(channel: string, message: TResponse): void;
-    readyState(): (0 | 1 | 2 | 3) | -1;
 }
 interface WebSocketRpcHandler<TParams, TResponse> {
     onOpen: (peer: WsPeer<TResponse>) => void;
@@ -194,7 +193,7 @@ declare function defineWebsocketRpc<TParams extends RpcParamSchema | undefined,
 /**
  * @experimental
  */
-declare function registerWebsocketRpc(router: Router, path: string, rpc: NamedWebsocketRpc<any, any>): void;
+declare function registerWebsocketRpc(router: Router, path: string, _rpc: NamedWebsocketRpc<any, any>): void;
 /**
  * @experimental
  */

package/dist/index.d.ts

@@ -170,13 +170,12 @@ declare class WsPeer<TResponse> {
     context: WsPeerContext;
     url: string;
     constructor(peer: Peer, opts: WsPeerOpts<TResponse>);
-    send(data: TResponse): number | undefined;
-    sendError(err: ArriServerErrorResponse): number;
+    send(data: TResponse): number | void;
+    sendError(err: ArriServerErrorResponse): number | void | undefined;
     close(): void;
     subscribe(channel: string): void;
     unsubscribe(channel: string): void;
     publish(channel: string, message: TResponse): void;
-    readyState(): (0 | 1 | 2 | 3) | -1;
 }
 interface WebSocketRpcHandler<TParams, TResponse> {
     onOpen: (peer: WsPeer<TResponse>) => void;
@@ -194,7 +193,7 @@ declare function defineWebsocketRpc<TParams extends RpcParamSchema | undefined,
 /**
  * @experimental
  */
-declare function registerWebsocketRpc(router: Router, path: string, rpc: NamedWebsocketRpc<any, any>): void;
+declare function registerWebsocketRpc(router: Router, path: string, _rpc: NamedWebsocketRpc<any, any>): void;
 /**
  * @experimental
  */

package/dist/index.mjs

@@ -862,7 +862,7 @@ class WsPeer {
     __publicField$1(this, "url");
     this._peer = peer;
     this._validator = opts.validator;
-    this.url = peer.url;
+    this.url = peer.websocket.url ?? "";
     this.context = opts.context;
   }
   send(data) {
@@ -907,72 +907,20 @@ data: ${JSON.stringify(err)}`);
     const payload = this._validator.serialize(message);
     this._peer.publish(channel, payload);
   }
-  readyState() {
-    return this._peer.readyState;
-  }
 }
 function defineWebsocketRpc(def) {
   def.transport = "ws";
   return def;
 }
-function registerWebsocketRpc(router, path, rpc) {
-  let responseValidator;
-  let paramValidator;
-  try {
-    responseValidator = rpc.response ? a.compile(rpc.response) : void 0;
-  } catch (err) {
-    console.error("ERROR COMPILING VALIDATOR", err);
-  }
-  try {
-    paramValidator = rpc.params ? a.compile(rpc.params) : void 0;
-  } catch (err) {
-    console.error("ERROR COMPILING PARAMS", err);
-  }
-  const rpcHandler = typeof rpc.handler === "function" ? rpc.handler() : rpc.handler;
+function registerWebsocketRpc(router, path, _rpc) {
   const handler = defineWebSocketHandler({
     upgrade(_req) {
     },
-    open(peer) {
-      const urlParts = peer.url.split("?");
-      const context = {
-        rpcName: rpc.name,
-        clientAddress: peer.addr
-      };
-      if (urlParts.length > 1) {
-        urlParts.shift();
-        const queryStr = new URLSearchParams(urlParts.join("?"));
-        const query = {};
-        for (const [key, val] of queryStr.entries()) {
-          query[key] = val;
-        }
-        context.queryParams = query;
-      }
-      const wsPeer = new WsPeer(peer, {
-        validator: responseValidator,
-        context
-      });
-      peer.ctx.__wsPeer = wsPeer;
-      rpcHandler.onOpen(peer.ctx.__wsPeer);
+    open(_) {
     },
-    message(peer, message) {
-      if (!paramValidator) {
-        return;
-      }
-      const data = paramValidator.safeParse(message.text());
-      if (!data.success) {
-        const errorResponse = {
-          code: 400,
-          message: data.error.message,
-          data: data.error.errors,
-          stack: data.error.stack?.split("\n")
-        };
-        peer.ctx.__wsPeer.sendError(errorResponse);
-        return;
-      }
-      rpcHandler.onMessage(peer.ctx.__wsPeer, data.value);
+    message(_, __) {
     },
-    close(peer, details) {
-      rpcHandler.onClose(peer.ctx.__wsPeer, details);
+    close(_, __) {
     }
   });
   router.use(path, handler);
@@ -1142,7 +1090,7 @@ class ArriApp {
       return;
     }
     if (p.transport === "ws") {
-      registerWebsocketRpc(this.h3Router, path, p);
+      registerWebsocketRpc(this.h3Router, path);
     }
   }
   route(route) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arrirpc/server",
-  "version": "0.61.0",
+  "version": "0.62.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -23,19 +23,19 @@
   },
   "dependencies": {
     "@types/source-map-support": "^0.5.10",
-    "crossws": "^0.2.4",
-    "h3": "^1.12.0",
+    "crossws": "^0.3.1",
+    "h3": "^1.13.0",
     "scule": "^1.3.0",
     "source-map-support": "^0.5.21",
     "uncrypto": "^0.1.3",
-    "@arrirpc/codegen-dart": "0.61.0",
-    "@arrirpc/codegen-ts": "0.61.0",
-    "@arrirpc/codegen-kotlin": "0.61.0",
-    "@arrirpc/schema": "0.61.0",
-    "@arrirpc/codegen-utils": "0.61.0",
-    "arri": "0.61.0"
+    "@arrirpc/codegen-dart": "0.62.0",
+    "@arrirpc/codegen-ts": "0.62.0",
+    "@arrirpc/codegen-kotlin": "0.62.0",
+    "@arrirpc/codegen-utils": "0.62.0",
+    "@arrirpc/schema": "0.62.0",
+    "arri": "0.62.0"
   },
   "devDependencies": {
-    "bun-types": "^1.1.25"
+    "bun-types": "^1.1.29"
   }
 }