@nka212bg/backend-utils 0.1.25 → 0.1.27

package/package.json

@@ -1,17 +1,17 @@
 {
     "name": "@nka212bg/backend-utils",
     "author": "nka212bg",
-    "version": "0.1.25",
+    "version": "0.1.27",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",
         "systeminformation": "^5.21.24",
         "adm-zip": "^0.5.16",
-        "nodemailer": "^6.9.14",
+        "nodemailer": "^8.0.8",
         "os-utils": "^0.0.14",
         "stripe": "^14.23.0",
         "mysql2": "^3.11.0",
-        "sqlite3": "^5.1.7",
+        "sqlite3": "^6.0.1",
         "sharp": "^0.33.5",
         "ws": "^7.3.0"
     }

package/socket.js

@@ -1,77 +1,59 @@
 const WebSocket = require("ws");
-let socketsCount = 0;
-let sockets = [];
 
-exports.socket = (server) => {
-    const sl = sockets.length;
-    sockets[sl] = new WebSocket.Server({ server });
-    sockets[sl].on("connection", (ws, req) => {
+module.exports = (server) => {
+    const socket = new WebSocket.Server({ server, noServer: !server });
+    socket.on("connection", (ws, req) => {
         try {
-            ws.params = Object.fromEntries(new URLSearchParams(decodeURIComponent(req.url || "").replace(/^(\/\?|\?)/, "")));
+            ws.params = Object.fromEntries(new URLSearchParams(decodeURIComponent(req.url || "").replace(/^(\/\?|\?|\/)/g, "")));
         } catch (error) {}
     });
-};
-
-exports.getUsersStatuses = (users) => {
-    if (typeof users == "string") users = users.split(/[, ]/g);
-    if (!Array.isArray(users) || !sockets.length) return {};
-
-    const usersObj = {};
-    users.forEach((u) => {
-        usersObj[u] = { online: false };
-
-        for (const socket of sockets) {
-            for (const client of socket.clients) {
-                if (client.params.userId == u) {
-                    usersObj[u] = { online: true };
-                    return;
-                }
-            }
-        }
-    });
-
-    return usersObj;
-};
 
-exports.sendSocketMessage = ({ userId, skipId, skipToken, data, broadcast } = {}) => {
-    let sentCount = 0;
-    let tempCount = 0;
+    socket.send = ({ id = [], skipId = [], skipToken = [], data, broadcast } = {}) => {
+        id = Array.isArray(id) ? id.map((e) => String(e)) : [String(id)];
+        if (!data || (!id.length && !broadcast)) return 0;
 
-    if ((!userId && !broadcast) || !sockets.length) return;
-    userId = !Array.isArray(userId) ? [String(userId)] : userId.map((e) => String(e));
+        skipId = Array.isArray(skipId) ? skipId.map((e) => String(e)) : [String(skipId)];
+        skipToken = Array.isArray(skipToken) ? skipToken.map((e) => String(e)) : [String(skipToken)];
 
-    if (skipId) skipId = !Array.isArray(skipId) ? [String(skipId)] : skipId.map((e) => String(e));
-    if (skipToken && !Array.isArray(skipToken)) skipToken = [String(skipToken)];
+        try {
+            if (typeof data === "object") data = JSON.stringify(data);
+        } catch {}
 
-    try {
-        if (typeof data != "string") data = JSON.stringify(data);
-    } catch {}
+        let sentCount = 0;
+        (socket.clients || []).forEach((client) => {
+            if (broadcast || id.includes(client.params.id)) {
+                if (skipId.includes(client.params.id)) return;
+                if (skipToken.includes(client.params.token)) return;
 
-    sockets.forEach((socket) => {
-        (socket.clients || []).forEach(manageClient);
-    });
+                client.send(data);
+                sentCount += 1;
+            }
+        });
 
-    socketsCount = tempCount;
-    return sentCount;
+        return sentCount;
+    };
 
-    function manageClient(client) {
-        tempCount += 1;
+    socket.getStatuses = (users) => {
+        if (typeof users == "string") users = users.split(/[, ]/g);
+        if (!Array.isArray(users)) return {};
+        const usersObj = {};
+        users.forEach((u) => {
+            usersObj[u] = 0;
 
-        if (broadcast || userId.includes(client.params.userId)) {
-            if (skipId && skipId.includes(client.params.userId)) return;
-            if (skipToken && skipToken.includes(client.params.token)) return;
+            for (const client of socket.clients) {
+                if (client.params.id == u) {
+                    usersObj[u] = 1;
+                    return;
+                }
+            }
+        });
+        return usersObj;
+    };
 
-            client.send(data);
-            sentCount += 1;
-        }
-    }
+    return socket;
 };
 
-exports.socketStat = () => {
-    return {
-        socketsCount,
-    };
-};
+////////////////////////////////////////
 
 // "web-push": "^3.2.2", // package.json
 // const webPush = require("web-push");