@nka212bg/backend-utils 0.1.42 → 0.1.44

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.42",
+    "version": "0.1.44",
     "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

@@ -9,6 +9,7 @@ const parseParams = (url) => {
 };
 
 module.exports = (server, { authenticate } = {}) => {
+    const hidden = new Set();
     const socket = new WebSocket.Server({ server, noServer: !server });
     socket.on("connection", (ws, req) => {
         const params = parseParams(req.url);
@@ -22,7 +23,7 @@ module.exports = (server, { authenticate } = {}) => {
         const userId = ws.params.userId;
 
         // first tab of this user -> online
-        if (userId && !isConnected(userId, ws)) notifyWatchers(userId, 1);
+        if (userId && !hidden.has(userId) && !isConnected(userId, ws)) notifyWatchers(userId, 1);
 
         // { watchStatuses: [userIds] } -> replies { statuses: { userId: 0 | 1 } }, then pushes { status: { userId, online } } on changes
         ws.on("message", (raw) => {
@@ -35,7 +36,7 @@ module.exports = (server, { authenticate } = {}) => {
         });
 
         // last tab closed -> offline
-        ws.on("close", () => userId && !isConnected(userId, ws) && notifyWatchers(userId, 0));
+        ws.on("close", () => userId && !hidden.has(userId) && !isConnected(userId, ws) && notifyWatchers(userId, 0));
     });
 
     const isConnected = (userId, except) => {
@@ -43,7 +44,7 @@ module.exports = (server, { authenticate } = {}) => {
         return false;
     };
 
-    const notifyWatchers = (userId, online) => {
+    const notifyWatchers = (userId, online) => {        
         const data = JSON.stringify({ statuses: { [userId]: online } });
         for (const c of socket.clients) if (c.watching?.has(userId)) c.send(data);
     };
@@ -97,12 +98,20 @@ module.exports = (server, { authenticate } = {}) => {
         for (const client of socket.clients || []) {
             if (!users.size) break;
             const id = client.params?.userId;
-            if (users.delete(id)) usersObj[id] = 1; // delete() is true only the first time -> extra tabs are ignored
+            if (!hidden.has(id) && users.delete(id)) usersObj[id] = 1; 
         }
 
         return usersObj;
     };
 
+    socket.setStatuses = (userId, offline = true) => {
+        userId = String(userId);
+        if (!!offline === hidden.has(userId)) return; // no change
+
+        offline ? hidden.add(userId) : hidden.delete(userId);
+        if (isConnected(userId)) notifyWatchers(userId, offline ? 0 : 1);
+    };
+
     return socket;
 };