diff --git a/examples/node/index.js b/examples/node/index.js index 39bec47..8602bc8 100644 --- a/examples/node/index.js +++ b/examples/node/index.js @@ -6,11 +6,12 @@ import { readFileSync } from "node:fs"; const ws = crossws({ hooks: defineHooks({ upgrade(req, socket) { - if (!authorizedCheck(req)) { + // if (!authorizedCheck(req)) { socket.reject("Unauthorized") - } else { - socket.accept() - } + // } else { + // socket.accept() + + // } }, open(peer) { @@ -43,6 +44,7 @@ const port = 3000; const index = readFileSync("./public/index.html"); const server = createServer((req, res) => { + console.log('hit'); res.writeHead(200); res.end(index); }) diff --git a/examples/node/package.json b/examples/node/package.json index 4266ad4..fc8bb76 100644 --- a/examples/node/package.json +++ b/examples/node/package.json @@ -2,6 +2,7 @@ "name": "crossws-examples-node", "version": "0.0.0", "private": true, + "type": "module", "scripts": { "dev": "node ./index.js" }, diff --git a/src/hooks.ts b/src/hooks.ts index 0803a85..e41bb6e 100644 --- a/src/hooks.ts +++ b/src/hooks.ts @@ -34,7 +34,7 @@ export class AdapterHookable { ([globalRes, hook]) => { const hookResPromise = hook?.(arg1 as any, arg2 as any); return hookResPromise instanceof Promise - ? hookResPromise.then((hookRes) => hookRes ?? globalRes) + ? hookResPromise.then((hookRes) => hookRes || globalRes) : hookResPromise || globalRes; }, ) as Promise; @@ -146,7 +146,7 @@ export interface Hooks { accept: (params?: { headers?: HeadersInit }) => void, reject: (reason: Reasons) => void, }, - ) => MaybePromise; + ) => MaybePromise; /** A message is received */ message: (peer: Peer, message: Message) => MaybePromise;