crossws 0.3.0 → 0.3.2

package/dist/adapters/bun.d.mts

@@ -1,4 +1,4 @@
-import { AdapterInstance, AdapterOptions, Adapter, Peer } from '../index.mjs';
+import { AdapterInstance, AdapterOptions, Peer, Adapter } from '../index.mjs';
 import { WebSocketHandler, Server, ServerWebSocket } from 'bun';
 import '../shared/crossws.ChIJSJVK.mjs';
 
@@ -12,6 +12,7 @@ type ContextData = {
     peer?: BunPeer;
     request: Request;
     server?: Server;
+    context: Peer["context"];
 };
 declare const _default: Adapter<BunAdapter, BunOptions>;
 
@@ -21,6 +22,7 @@ declare class BunPeer extends Peer<{
     peers: Set<BunPeer>;
 }> {
     get remoteAddress(): string;
+    get context(): Record<string, unknown>;
     send(data: unknown, options?: {
         compress?: boolean;
     }): number;

package/dist/adapters/bun.d.ts

@@ -1,4 +1,4 @@
-import { AdapterInstance, AdapterOptions, Adapter, Peer } from '../index.js';
+import { AdapterInstance, AdapterOptions, Peer, Adapter } from '../index.js';
 import { WebSocketHandler, Server, ServerWebSocket } from 'bun';
 import '../shared/crossws.ChIJSJVK.js';
 
@@ -12,6 +12,7 @@ type ContextData = {
     peer?: BunPeer;
     request: Request;
     server?: Server;
+    context: Peer["context"];
 };
 declare const _default: Adapter<BunAdapter, BunOptions>;
 
@@ -21,6 +22,7 @@ declare class BunPeer extends Peer<{
     peers: Set<BunPeer>;
 }> {
     get remoteAddress(): string;
+    get context(): Record<string, unknown>;
     send(data: unknown, options?: {
         compress?: boolean;
     }): number;

package/dist/adapters/bun.mjs

@@ -1,5 +1,5 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DTY7a69w.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.B4sHId41.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
+import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
 import 'uncrypto';
 
 const bun = defineWebSocketAdapter(
@@ -9,16 +9,17 @@ const bun = defineWebSocketAdapter(
     return {
       ...adapterUtils(peers),
       async handleUpgrade(request, server) {
-        const res = await hooks.callHook("upgrade", request);
-        if (res instanceof Response) {
-          return res;
+        const { upgradeHeaders, endResponse, context } = await hooks.upgrade(request);
+        if (endResponse) {
+          return endResponse;
         }
         const upgradeOK = server.upgrade(request, {
           data: {
             server,
-            request
+            request,
+            context
           },
-          headers: res?.headers
+          headers: upgradeHeaders
         });
         if (!upgradeOK) {
           return new Response("Upgrade failed", { status: 500 });
@@ -58,6 +59,9 @@ class BunPeer extends Peer {
   get remoteAddress() {
     return this._internal.ws.remoteAddress;
   }
+  get context() {
+    return this._internal.ws.data.context;
+  }
   send(data, options) {
     return this._internal.ws.send(toBufferLike(data), options?.compress);
   }

package/dist/adapters/cloudflare-durable.mjs

@@ -1,5 +1,5 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DTY7a69w.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.B4sHId41.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
+import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
 import 'uncrypto';
 
 const cloudflareDurable = defineWebSocketAdapter((opts) => {
@@ -18,9 +18,11 @@ const cloudflareDurable = defineWebSocketAdapter((opts) => {
     handleDurableInit: async (obj, state, env) => {
     },
     handleDurableUpgrade: async (obj, request) => {
-      const res = await hooks.callHook("upgrade", request);
-      if (res instanceof Response) {
-        return res;
+      const { upgradeHeaders, endResponse } = await hooks.upgrade(
+        request
+      );
+      if (endResponse) {
+        return endResponse;
       }
       const pair = new WebSocketPair();
       const client = pair[0];
@@ -36,7 +38,7 @@ const cloudflareDurable = defineWebSocketAdapter((opts) => {
       return new Response(null, {
         status: 101,
         webSocket: client,
-        headers: res?.headers
+        headers: upgradeHeaders
       });
     },
     handleDurableMessage: async (obj, ws, message) => {

package/dist/adapters/cloudflare.mjs

@@ -1,5 +1,5 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DTY7a69w.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.B4sHId41.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
+import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
 import { W as WSError } from '../shared/crossws.By9qWDAI.mjs';
 import 'uncrypto';
 
@@ -9,13 +9,12 @@ const cloudflare = defineWebSocketAdapter(
     const peers = /* @__PURE__ */ new Set();
     return {
       ...adapterUtils(peers),
-      handleUpgrade: async (request, env, context) => {
-        const res = await hooks.callHook(
-          "upgrade",
+      handleUpgrade: async (request, env, cfCtx) => {
+        const { upgradeHeaders, endResponse, context } = await hooks.upgrade(
           request
         );
-        if (res instanceof Response) {
-          return res;
+        if (endResponse) {
+          return endResponse;
         }
         const pair = new WebSocketPair();
         const client = pair[0];
@@ -26,7 +25,8 @@ const cloudflare = defineWebSocketAdapter(
           wsServer: server,
           request,
           cfEnv: env,
-          cfCtx: context
+          cfCtx,
+          context
         });
         peers.add(peer);
         server.accept();
@@ -49,7 +49,7 @@ const cloudflare = defineWebSocketAdapter(
         return new Response(null, {
           status: 101,
           webSocket: client,
-          headers: res?.headers
+          headers: upgradeHeaders
         });
       }
     };

package/dist/adapters/deno.d.mts

@@ -1,5 +1,4 @@
 import { AdapterInstance, AdapterOptions, Adapter } from '../index.mjs';
-import * as _deno_types from '@deno/types';
 import '../shared/crossws.ChIJSJVK.mjs';
 
 interface DenoAdapter extends AdapterInstance {
@@ -7,9 +6,6 @@ interface DenoAdapter extends AdapterInstance {
 }
 interface DenoOptions extends AdapterOptions {
 }
-declare global {
-    const Deno: typeof _deno_types.Deno;
-}
 type ServeHandlerInfo = {
     remoteAddr?: {
         transport: string;

package/dist/adapters/deno.d.ts

@@ -1,5 +1,4 @@
 import { AdapterInstance, AdapterOptions, Adapter } from '../index.js';
-import * as _deno_types from '@deno/types';
 import '../shared/crossws.ChIJSJVK.js';
 
 interface DenoAdapter extends AdapterInstance {
@@ -7,9 +6,6 @@ interface DenoAdapter extends AdapterInstance {
 }
 interface DenoOptions extends AdapterOptions {
 }
-declare global {
-    const Deno: typeof _deno_types.Deno;
-}
 type ServeHandlerInfo = {
     remoteAddr?: {
         transport: string;

package/dist/adapters/deno.mjs

@@ -1,5 +1,5 @@
-import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DTY7a69w.mjs';
-import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.B4sHId41.mjs';
+import { M as Message, P as Peer, t as toBufferLike } from '../shared/crossws.DLRVRjZs.mjs';
+import { d as defineWebSocketAdapter, a as adapterUtils, A as AdapterHookable } from '../shared/crossws.BcEs6ZHK.mjs';
 import { W as WSError } from '../shared/crossws.By9qWDAI.mjs';
 import 'uncrypto';
 
@@ -10,19 +10,20 @@ const deno = defineWebSocketAdapter(
     return {
       ...adapterUtils(peers),
       handleUpgrade: async (request, info) => {
-        const res = await hooks.callHook("upgrade", request);
-        if (res instanceof Response) {
-          return res;
+        const { upgradeHeaders, endResponse, context } = await hooks.upgrade(request);
+        if (endResponse) {
+          return endResponse;
         }
         const upgrade = Deno.upgradeWebSocket(request, {
           // @ts-expect-error https://github.com/denoland/deno/pull/22242
-          headers: res?.headers
+          headers: upgradeHeaders
         });
         const peer = new DenoPeer({
           ws: upgrade.socket,
           request,
           peers,
-          denoInfo: info
+          denoInfo: info,
+          context
         });
         peers.add(peer);
         upgrade.socket.addEventListener("open", () => {