@nka212bg/backend-utils 0.1.20 → 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.20",
+    "version": "0.1.21",
     "main": "index.js",
     "dependencies": {
         "@maxmind/geoip2-node": "^5.0.0",