crossws 0.3.1 → 0.3.3

package/dist/adapters/uws.d.mts

@@ -8,6 +8,7 @@ type UserData = {
     res: uws.HttpResponse;
     protocol: string;
     extensions: string;
+    context: Peer["context"];
 };
 type WebSocketHandler = uws.WebSocketBehavior<UserData>;
 interface UWSAdapter extends AdapterInstance {
@@ -26,6 +27,7 @@ declare class UWSPeer extends Peer<{
     uwsData: UserData;
 }> {
     get remoteAddress(): string | undefined;
+    get context(): Record<string, unknown>;
     send(data: unknown, options?: {
         compress?: boolean;
     }): number;

package/dist/adapters/uws.d.ts

@@ -8,6 +8,7 @@ type UserData = {
     res: uws.HttpResponse;
     protocol: string;
     extensions: string;
+    context: Peer["context"];
 };
 type WebSocketHandler = uws.WebSocketBehavior<UserData>;
 interface UWSAdapter extends AdapterInstance {
@@ -26,6 +27,7 @@ declare class UWSPeer extends Peer<{
     uwsData: UserData;
 }> {
     get remoteAddress(): string | undefined;
+    get context(): Record<string, unknown>;
     send(data: unknown, options?: {
         compress?: boolean;
     }): number;

package/dist/adapters/uws.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.CB4awDDj.mjs';
 import 'uncrypto';
 
 const uws = defineWebSocketAdapter(
@@ -29,25 +29,22 @@ const uws = defineWebSocketAdapter(
           peers.add(peer);
           hooks.callHook("open", peer);
         },
-        async upgrade(res, req, context) {
+        async upgrade(res, req, uwsContext) {
           let aborted = false;
           res.onAborted(() => {
             aborted = true;
           });
-          const _res = await hooks.callHook("upgrade", new UWSReqProxy(req));
-          if (aborted) {
-            return;
-          }
-          if (_res instanceof Response) {
-            res.writeStatus(`${_res.status} ${_res.statusText}`);
-            for (const [key, value] of _res.headers) {
+          const { upgradeHeaders, endResponse, context } = await hooks.upgrade(
+            new UWSReqProxy(req)
+          );
+          if (endResponse) {
+            res.writeStatus(`${endResponse.status} ${endResponse.statusText}`);
+            for (const [key, value] of endResponse.headers) {
               res.writeHeader(key, value);
             }
-            if (_res.body) {
-              for await (const chunk of _res.body) {
-                if (aborted) {
-                  break;
-                }
+            if (endResponse.body) {
+              for await (const chunk of endResponse.body) {
+                if (aborted) break;
                 res.write(chunk);
               }
             }
@@ -56,9 +53,13 @@ const uws = defineWebSocketAdapter(
             }
             return;
           }
+          if (aborted) {
+            return;
+          }
           res.writeStatus("101 Switching Protocols");
-          if (_res?.headers) {
-            for (const [key, value] of new Headers(_res.headers)) {
+          if (upgradeHeaders) {
+            const headers = upgradeHeaders instanceof Headers ? upgradeHeaders : new Headers(upgradeHeaders);
+            for (const [key, value] of headers) {
               res.writeHeader(key, value);
             }
           }
@@ -71,12 +72,13 @@ const uws = defineWebSocketAdapter(
                 req,
                 res,
                 protocol,
-                extensions
+                extensions,
+                context
               },
               key,
               protocol,
               extensions,
-              context
+              uwsContext
             );
           });
         }
@@ -109,6 +111,9 @@ class UWSPeer extends Peer {
     } catch {
     }
   }
+  get context() {
+    return this._internal.uwsData.context;
+  }
   send(data, options) {
     const dataBuff = toBufferLike(data);
     const isBinary = typeof data !== "string";

package/dist/index.d.mts

@@ -2,8 +2,9 @@ import { W as WebSocket } from './shared/crossws.ChIJSJVK.mjs';
 
 interface AdapterInternal {
     ws: unknown;
-    request?: Request | Partial<Request>;
+    request: UpgradeRequest;
     peers?: Set<Peer>;
+    context?: Peer["context"];
 }
 declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal> {
     #private;
@@ -11,6 +12,7 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     protected _topics: Set<string>;
     protected _id?: string;
     constructor(internal: Internal);
+    get context(): Record<string, unknown>;
     /**
      * Unique random [uuid v4](https://developer.mozilla.org/en-US/docs/Glossary/UUID) identifier for the peer.
      */
@@ -18,7 +20,7 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     /** IP address of the peer */
     get remoteAddress(): string | undefined;
     /** upgrade request */
-    get request(): Request | Partial<Request> | undefined;
+    get request(): UpgradeRequest;
     /**
      * Get the [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) instance.
      *
@@ -83,7 +85,7 @@ declare class Message implements Partial<MessageEvent> {
      *
      * If raw data is in any other format or string, it will be automatically converted and encoded.
      */
-    uint8Array(): Uint8Array;
+    uint8Array(): Uint8Array<ArrayBufferLike>;
     /**
      * Get data as [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer) or [SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) value.
      *
@@ -116,11 +118,19 @@ declare class Message implements Partial<MessageEvent> {
 declare function defineHooks<T extends Partial<Hooks> = Partial<Hooks>>(hooks: T): T;
 type ResolveHooks = (info: RequestInit | Peer) => Partial<Hooks> | Promise<Partial<Hooks>>;
 type MaybePromise<T> = T | Promise<T>;
+type UpgradeRequest = Request | {
+    url: string;
+    headers: Headers;
+};
 interface Hooks {
     /** Upgrading */
-    upgrade: (request: Request | {
-        url: string;
-        headers: Headers;
+    /**
+     *
+     * @param request
+     * @throws {Response}
+     */
+    upgrade: (request: UpgradeRequest & {
+        context: Peer["context"];
     }) => MaybePromise<Response | ResponseInit | void>;
     /** A message is received */
     message: (peer: Peer, message: Message) => MaybePromise<void>;

package/dist/index.d.ts

@@ -2,8 +2,9 @@ import { W as WebSocket } from './shared/crossws.ChIJSJVK.js';
 
 interface AdapterInternal {
     ws: unknown;
-    request?: Request | Partial<Request>;
+    request: UpgradeRequest;
     peers?: Set<Peer>;
+    context?: Peer["context"];
 }
 declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal> {
     #private;
@@ -11,6 +12,7 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     protected _topics: Set<string>;
     protected _id?: string;
     constructor(internal: Internal);
+    get context(): Record<string, unknown>;
     /**
      * Unique random [uuid v4](https://developer.mozilla.org/en-US/docs/Glossary/UUID) identifier for the peer.
      */
@@ -18,7 +20,7 @@ declare abstract class Peer<Internal extends AdapterInternal = AdapterInternal>
     /** IP address of the peer */
     get remoteAddress(): string | undefined;
     /** upgrade request */
-    get request(): Request | Partial<Request> | undefined;
+    get request(): UpgradeRequest;
     /**
      * Get the [WebSocket](https://developer.mozilla.org/en-US/docs/Web/API/WebSocket) instance.
      *
@@ -83,7 +85,7 @@ declare class Message implements Partial<MessageEvent> {
      *
      * If raw data is in any other format or string, it will be automatically converted and encoded.
      */
-    uint8Array(): Uint8Array;
+    uint8Array(): Uint8Array<ArrayBufferLike>;
     /**
      * Get data as [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer) or [SharedArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer) value.
      *
@@ -116,11 +118,19 @@ declare class Message implements Partial<MessageEvent> {
 declare function defineHooks<T extends Partial<Hooks> = Partial<Hooks>>(hooks: T): T;
 type ResolveHooks = (info: RequestInit | Peer) => Partial<Hooks> | Promise<Partial<Hooks>>;
 type MaybePromise<T> = T | Promise<T>;
+type UpgradeRequest = Request | {
+    url: string;
+    headers: Headers;
+};
 interface Hooks {
     /** Upgrading */
-    upgrade: (request: Request | {
-        url: string;
-        headers: Headers;
+    /**
+     *
+     * @param request
+     * @throws {Response}
+     */
+    upgrade: (request: UpgradeRequest & {
+        context: Peer["context"];
     }) => MaybePromise<Response | ResponseInit | void>;
     /** A message is received */
     message: (peer: Peer, message: Message) => MaybePromise<void>;

package/dist/index.mjs

@@ -1 +1 @@
-export { b as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.B4sHId41.mjs';
+export { b as defineHooks, d as defineWebSocketAdapter } from './shared/crossws.CB4awDDj.mjs';

package/dist/shared/{crossws.B4sHId41.mjs → crossws.CB4awDDj.mjs}

@@ -18,6 +18,37 @@ class AdapterHookable {
       }
     );
   }
+  async upgrade(request) {
+    const context = request.context ??= {};
+    try {
+      const res = await this.callHook(
+        "upgrade",
+        request
+      );
+      if (!res) {
+        return { context };
+      }
+      if (res.ok === false) {
+        return { context, endResponse: res };
+      }
+      if (res.headers) {
+        return {
+          context,
+          upgradeHeaders: res.headers
+        };
+      }
+    } catch (error) {
+      const errResponse = error.response || error;
+      if (errResponse instanceof Response) {
+        return {
+          context,
+          endResponse: errResponse
+        };
+      }
+      throw error;
+    }
+    return { context };
+  }
 }
 function defineHooks(hooks) {
   return hooks;

package/dist/shared/{crossws.DTY7a69w.mjs → crossws.DLRVRjZs.mjs}

@@ -1,7 +1,7 @@
 import { randomUUID } from 'uncrypto';
 
 function toBufferLike(val) {
-  if (val === void 0 || val === null) {
+  if (val === undefined || val === null) {
     return "";
   }
   const type = typeof val;
@@ -220,6 +220,9 @@ class Peer {
     this._topics = /* @__PURE__ */ new Set();
     this._internal = internal;
   }
+  get context() {
+    return this._internal.context ??= {};
+  }
   /**
    * Unique random [uuid v4](https://developer.mozilla.org/en-US/docs/Glossary/UUID) identifier for the peer.
    */
@@ -231,7 +234,7 @@ class Peer {
   }
   /** IP address of the peer */
   get remoteAddress() {
-    return void 0;
+    return undefined;
   }
   /** upgrade request */
   get request() {
@@ -303,7 +306,7 @@ function createWsProxy(ws, request) {
             return request?.headers?.get("sec-websocket-extensions") || "";
           }
           case "url": {
-            return request?.url?.replace(/^http/, "ws") || void 0;
+            return request?.url?.replace(/^http/, "ws") || undefined;
           }
         }
       }