@nka212bg/backend-utils 0.1.19 → 0.1.21

package/os.js

@@ -29,25 +29,42 @@ exports.rebootServer = ({ password } = {}) => {
     }
 };
 
-exports.backupSystem = async ({ basePath, archiveName, overrideExisting, items } = {}) => {
+exports.backupSystem = async ({ basePath, archiveName, override, items, count = 5 } = {}) => {
     try {
         const startTime = Date.now();
 
         basePath = basePath || `${__basedir}/backups`;
-        archiveName = archiveName || new Date().toISOString().split("T")[0];
-        const fullPath = `${basePath}/${archiveName}`;
         !existsSync(basePath) && mkdirSync(basePath, { recursive: true });
-
+        
+           
         const availableBackups = readdirSync(basePath);
-        if (availableBackups.length > 2) rmSync(`${basePath}/${availableBackups[0]}`, { recursive: true, force: true });
+        if (availableBackups.length > parseInt(count)) {
+            let oldestFile = null;
+            let oldestTime = Infinity;
+
+            availableBackups.forEach(file => {
+                file = `${basePath}/${file}`;
+                const stats = lstatSync(file);
+
+                if (stats.isFile() && stats.birthtimeMs < oldestTime) {
+                    oldestTime = stats.birthtimeMs;
+                    oldestFile = file;
+                }
+            });
+            rmSync(oldestFile, { recursive: true, force: true });
+        }
 
-        if (!overrideExisting && existsSync(`${fullPath}.zip`)) return console.log("backupSystem info, file awready exists --> ", `${fullPath}.zip`);
+        archiveName = archiveName || new Date().toISOString().split("T")[0];
+        const fullPath = `${basePath}/${archiveName}`;
+
+        if (!override && existsSync(`${fullPath}.zip`)) return console.log("backupSystem info, file awready exists --> ", `${fullPath}.zip`);
 
         if (!items) throw "No items";
         if (typeof items == "string") items = [items];
 
         const zip = new AdmZip();
-        items.forEach((e) => (lstatSync(e).isFile() ? zip.addLocalFile(e) : zip.addLocalFolder(e)));
+        items.forEach((e) => lstatSync(e).isFile() ? zip.addLocalFile(e) : zip.addLocalFolder(e, e.split('/').pop()));
+
         zip.writeZip(`${fullPath}.zip`);
 
         console.info(`System backup --> time: ${parseInt((Date.now() - startTime) / 1000)}`);
@@ -61,6 +78,7 @@ exports.osStatus = () => {
 
     try {
         return {
+            serverStart,
             serverUptime: secToTime((now - serverStart) / 1000),
             machineUptime: secToTime(os.uptime()),
             memoryUsage: shortCount(os.totalmem() - os.freemem(), "disk"),

package/package.json

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

package/socket.js

@@ -1,40 +1,29 @@
 const WebSocket = require("ws");
-let http = null;
-let https = null;
 let socketsCount = 0;
+let sockets = [];
 
-exports.socket = ({ httpServer, httpsServer }) => {
-    if (httpServer) {
-        http = new WebSocket.Server({ server: httpServer });
-        http.on("connection", (ws, req) => {
-            ws.params = JSON.parse(`{"${decodeURI(req.url.replace(/\/\?/g, "")).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g, '":"')}"}`);
-        });
-    } else if (httpsServer) {
-        https = new WebSocket.Server({ server: httpsServer });
-        https.on("connection", (ws, req) => {
-            ws.params = JSON.parse(`{"${decodeURI(req.url.replace(/\/\?/g, "")).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g, '":"')}"}`);
-        });
-    }
+exports.socket = (server) => {
+    const sl = sockets.length;
+    sockets[sl] = new WebSocket.Server({ server });
+    sockets[sl].on("connection", (ws, req) => {
+        ws.params = JSON.parse(`{"${decodeURI(req.url.replace(/\/\?/g, "")).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g, '":"')}"}`);
+    });
 };
 
 exports.getUsersStatuses = (users) => {
     if (typeof users == "string") users = users.split(/[, ]/g);
-    if (!Array.isArray(users) || !https?.clients.length) return {};
+    if (!Array.isArray(users) || !sockets.length) return {};
 
     const usersObj = {};
     users.forEach((u) => {
         usersObj[u] = { online: false };
-        for (const c of https.clients) {
-            if (c.params.userId == u) {
-                usersObj[u] = { online: true };
-                return;
-            }
-        }
 
-        for (const c of http.clients) {
-            if (c.params.userId == u) {
-                usersObj[u] = { online: true };
-                return;
+        for (const socket of sockets) {
+            for (const client of socket.clients) {
+                if (client.params.userId == u) {
+                    usersObj[u] = { online: true };
+                    return;
+                }
             }
         }
     });
@@ -42,34 +31,11 @@ exports.getUsersStatuses = (users) => {
     return usersObj;
 };
 
-// exports.getUsersStatuses = (users = []) => {
-//     users = users.map((u) => {
-//         u = { id: u, online: false };
-//         for (const c of https.clients) {
-//             if (c.params.userId == u.id) {
-//                 u.online = true;
-//                 return u;
-//             }
-//         }
-
-//         for (const c of http.clients) {
-//             if (c.params.userId == u.id) {
-//                 u.online = true;
-//                 return u;
-//             }
-//         }
-
-//         return u;
-//     });
-
-//     return users;
-// };
-
 exports.sendSocketMessage = ({ userId, skipId, skipToken, data, broadcast } = {}) => {
     let sentCount = 0;
     let tempCount = 0;
 
-    if (!userId) return;
+    if ((!userId && !broadcast) || !sockets.length) return;
     userId = !Array.isArray(userId) ? [String(userId)] : userId.map((e) => String(e));
 
     if (skipId) skipId = !Array.isArray(skipId) ? [String(skipId)] : skipId.map((e) => String(e));
@@ -79,8 +45,9 @@ exports.sendSocketMessage = ({ userId, skipId, skipToken, data, broadcast } = {}
         if (typeof data != "string") data = JSON.stringify(data);
     } catch {}
 
-    (https.clients || []).forEach(manageClient);
-    (http.clients || []).forEach(manageClient);
+    sockets.forEach((socket) => {
+        (socket.clients || []).forEach(manageClient);
+    });
 
     socketsCount = tempCount;
     return sentCount;