@orpc/server 2.0.0-beta.5 → 2.0.0-beta.7

package/README.md

@@ -134,7 +134,6 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   </tr>
   <tr>
    <td align="center"><a href="https://github.com/piscis?ref=orpc" target="_blank" rel="noopener" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
-   <td align="center"><a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="119" alt="nattstack"/><br />nattstack</a></td>
    <td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=29e91400dbd4a9c217048a8f59562c4f740498e6&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
@@ -173,6 +172,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/illarionvk?ref=orpc" target="_blank" rel="noopener" title="Illarion Koperski"><img src="https://avatars.githubusercontent.com/u/5012724?u=7cfa13652f7ac5fb3c56d880e3eb3fbe40c3ea34&amp;v=4" width="32" height="32" alt="Illarion Koperski" /></a>
   <a href="https://github.com/steelbrain?ref=orpc" target="_blank" rel="noopener" title="Anees Iqbal"><img src="https://avatars.githubusercontent.com/u/4278113?u=22b80b5399eed68ac76cd58b02961b0481f1db11&amp;v=4" width="32" height="32" alt="Anees Iqbal" /></a>
   <a href="https://github.com/Scrumplex?ref=orpc" target="_blank" rel="noopener" title="Sefa Eyeoglu"><img src="https://avatars.githubusercontent.com/u/11587657?u=ab503582165c0bbff0cca47ce31c9450bb1553c9&amp;v=4" width="32" height="32" alt="Sefa Eyeoglu" /></a>
+  <a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="32" height="32" alt="nattstack" /></a>
   <a href="https://github.com/ChromeGG?ref=orpc" target="_blank" rel="noopener" title="Adam Tkaczyk"><img src="https://avatars.githubusercontent.com/u/39050595?u=a58ca6042a6950e94e6e92442db76ef584279bc0&amp;v=4" width="32" height="32" alt="Adam Tkaczyk" /></a>
   <a href="https://github.com/plancraft?ref=orpc" target="_blank" rel="noopener" title="plancraft"><img src="https://avatars.githubusercontent.com/u/46482287?v=4" width="32" height="32" alt="plancraft" /></a>
 </p>

package/dist/adapters/websocket/index.d.mts

@@ -9,7 +9,11 @@ import '@orpc/client';
 import '@orpc/contract';
 import '@standardserver/core';
 
-type WebsocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send'>;
+/**
+ * Supports standard WebSocket instances, Bun ServerWebSocket, "ws" ServerWebSocket,
+ * Cloudflare WebSocket Hibernation, and similar implementations.
+ */
+type WebsocketLike = Pick<WebSocket, 'send'>;
 interface WebsocketHandlerOptions<_T extends Context> {
     /**
      * Options for encoding peer messages. such as `prefix` for distinguishing messages on the same channel..
@@ -26,10 +30,6 @@ declare class WebsocketHandler<T extends Context> {
     private readonly encodePeerMessageOptions;
     private readonly decodePeerMessageOptions;
     constructor(handler: StandardHandler<T>, options?: NoInfer<WebsocketHandlerOptions<T>>);
-    /**
-     * Attaches necessary event listeners to a WebSocket to handle incoming messages and peer management.
-     */
-    upgrade(ws: WebsocketLike, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
     /**
      * Handles a single message received from a WebSocket.
      *
@@ -49,6 +49,13 @@ declare class WebsocketHandler<T extends Context> {
      * @param ws The WebSocket instance to clean up, must be the same instance used in `.message()` calls to properly clean up
      */
     close(ws: WebsocketLike): Promise<void>;
+    /**
+     * Attaches websocket event listeners for message and close handling.
+     *
+     * Use this instead of calling `.message()` and `.close()` manually.
+     * Requires a websocket-like object that supports `addEventListener` and `removeEventListener`.
+     */
+    upgrade(ws: Pick<WebSocket, 'send' | 'addEventListener' | 'removeEventListener'>, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
 }
 
 interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, RPCHandlerCodecOptions<T>, WebsocketHandlerOptions<T> {

package/dist/adapters/websocket/index.d.ts

@@ -9,7 +9,11 @@ import '@orpc/client';
 import '@orpc/contract';
 import '@standardserver/core';
 
-type WebsocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send'>;
+/**
+ * Supports standard WebSocket instances, Bun ServerWebSocket, "ws" ServerWebSocket,
+ * Cloudflare WebSocket Hibernation, and similar implementations.
+ */
+type WebsocketLike = Pick<WebSocket, 'send'>;
 interface WebsocketHandlerOptions<_T extends Context> {
     /**
      * Options for encoding peer messages. such as `prefix` for distinguishing messages on the same channel..
@@ -26,10 +30,6 @@ declare class WebsocketHandler<T extends Context> {
     private readonly encodePeerMessageOptions;
     private readonly decodePeerMessageOptions;
     constructor(handler: StandardHandler<T>, options?: NoInfer<WebsocketHandlerOptions<T>>);
-    /**
-     * Attaches necessary event listeners to a WebSocket to handle incoming messages and peer management.
-     */
-    upgrade(ws: WebsocketLike, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
     /**
      * Handles a single message received from a WebSocket.
      *
@@ -49,6 +49,13 @@ declare class WebsocketHandler<T extends Context> {
      * @param ws The WebSocket instance to clean up, must be the same instance used in `.message()` calls to properly clean up
      */
     close(ws: WebsocketLike): Promise<void>;
+    /**
+     * Attaches websocket event listeners for message and close handling.
+     *
+     * Use this instead of calling `.message()` and `.close()` manually.
+     * Requires a websocket-like object that supports `addEventListener` and `removeEventListener`.
+     */
+    upgrade(ws: Pick<WebSocket, 'send' | 'addEventListener' | 'removeEventListener'>, ...rest: MaybeOptionalOptions<StandardPeerRequestHandlerOptions<T>>): void;
 }
 
 interface RPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, RPCHandlerCodecOptions<T>, WebsocketHandlerOptions<T> {

package/dist/adapters/websocket/index.mjs

@@ -17,13 +17,6 @@ class WebsocketHandler {
   peers = /* @__PURE__ */ new WeakMap();
   encodePeerMessageOptions;
   decodePeerMessageOptions;
-  /**
-   * Attaches necessary event listeners to a WebSocket to handle incoming messages and peer management.
-   */
-  upgrade(ws, ...rest) {
-    ws.addEventListener("message", (event) => this.message(ws, event.data, ...rest));
-    ws.addEventListener("close", () => this.close(ws));
-  }
   /**
    * Handles a single message received from a WebSocket.
    *
@@ -63,6 +56,16 @@ class WebsocketHandler {
       this.peers.delete(ws);
     }
   }
+  /**
+   * Attaches websocket event listeners for message and close handling.
+   *
+   * Use this instead of calling `.message()` and `.close()` manually.
+   * Requires a websocket-like object that supports `addEventListener` and `removeEventListener`.
+   */
+  upgrade(ws, ...rest) {
+    ws.addEventListener("message", (event) => this.message(ws, event.data, ...rest));
+    ws.addEventListener("close", () => this.close(ws));
+  }
 }
 
 class RPCHandler extends WebsocketHandler {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -90,10 +90,10 @@
     "@standardserver/node": "^0.0.25",
     "@standardserver/peer": "^0.0.25",
     "cookie": "^1.1.1",
-    "@orpc/interop": "2.0.0-beta.5",
-    "@orpc/contract": "2.0.0-beta.5",
-    "@orpc/client": "2.0.0-beta.5",
-    "@orpc/shared": "2.0.0-beta.5"
+    "@orpc/client": "2.0.0-beta.7",
+    "@orpc/contract": "2.0.0-beta.7",
+    "@orpc/interop": "2.0.0-beta.7",
+    "@orpc/shared": "2.0.0-beta.7"
   },
   "devDependencies": {
     "crossws": "^0.4.6",