@nka212bg/backend-utils 0.1.41 → 0.1.43

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.41",
+    "version": "0.1.43",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",

package/session.js

@@ -44,7 +44,7 @@ exports.serverState = new Proxy(
         // const s = serverState["abc123"]; // => {name: 'alice', ..., expireIn: 604859999}
         // const s = serverState[req.headers.authorization];
         // const all = serverState.getAll; // => whole STATE map
-        // const alices = serverState["name=alice"]; // => all entries where name == "alice", each with its token
+        // const alices = serverState["name=alice"]; // => all entries where name == "alice", keyed by token, same shape as STATE
         get(_, token) {
             if (/^\s*(undefined|null|0)?\s*$/.test(token)) return false;
             token = String(token).trim();
@@ -53,9 +53,11 @@ exports.serverState = new Proxy(
 
             if (token.includes("=")) {
                 const [field, value] = token.trim().split(/\s*=\s*/);
-                return Object.entries(STATE)
-                    .filter(([, s]) => s[field] == value)
-                    .map(([token, s]) => ({ ...s, token }));
+                return Object.fromEntries(
+                    Object.entries(STATE)
+                        .filter(([, s]) => s[field] == value)
+                        .map(([token, s]) => [token, { ...s }]),
+                );
             }
 
             if (!STATE[token]) return false;

package/socket.js

@@ -8,15 +8,17 @@ const parseParams = (url) => {
     }
 };
 
-// options.authenticate (params, req) => boolean, rejects the connection with 401 during the handshake when falsy
 module.exports = (server, { authenticate } = {}) => {
-    const socket = new WebSocket.Server({
-        server,
-        noServer: !server,
-        verifyClient: authenticate && (({ req }) => !!authenticate(parseParams(req.url), req)),
-    });
+    const socket = new WebSocket.Server({ server, noServer: !server });
     socket.on("connection", (ws, req) => {
-        ws.params = parseParams(req.url);
+        const params = parseParams(req.url);
+
+        if (authenticate && !authenticate(params, req)) {
+            ws.params = {};
+            return ws.close(4001, "Unauthorized");
+        }
+
+        ws.params = params;
         const userId = ws.params.userId;
 
         // first tab of this user -> online