Merge pull request #54 from AvadoDServer/v1.13.1

RocketPool v1.13.1

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.15.0 as builder
+FROM node:21.7.3 as builder
 
 # build wizard
 WORKDIR /usr/src/app/wizard
@@ -14,7 +14,7 @@ RUN yarn --production
 
 ####### Main image
 
-FROM --platform=linux/amd64 node:16.15.0
+FROM --platform=linux/amd64 node:21.7.3
 ARG RP_VERSION
 
 RUN mkdir -p /srv/rocketpool

build/monitor/package.json

@@ -10,9 +10,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "axios": "^0.24.0",
-    "restify": "^8.6.0",
-    "restify-cors-middleware2": "^2.1.2",
-    "adm-zip": "^0.5.9",
+    "restify": "^11.1.0",
+    "restify-cors-middleware2": "^2.2.1",
+    "adm-zip": "^0.5.12",
     "jsonfile": "^6"
   }
 }

build/monitor/server.js

@@ -137,49 +137,52 @@ const rpd = (command) => {
 }
 
 //restart Rocket Pool smartnode
-server.get("/network", (req, res) => {
+server.get("/network", (req, res, next) => {
     res.send(200, network);
+    return next();
 });
 
-server.get("/settings", (req, res) => {
+server.get("/settings", (req, res, next) => {
     try {
         const settings = jsonfile.readFileSync("/srv/rocketpool/settings.json");
         res.send(200, settings);
     } catch (e) {
         console.error(e)
     }
+    return next();
 });
 
-//restart Rocket Pool smartnode
-server.get("/restart-rocketpool-node", (req, res) => {
+// Restart Rocket Pool smartnode
+server.get("/restart-rocketpool-node", async (req, res) => {
     console.log(`Restart Rocket Pool smartnode`);
-    const cmd = "supervisorctl  restart rocketpool-node";
-    execute(cmd).then((stdout) => {
+    const cmd = "supervisorctl restart rocketpool-node";
+
+    try {
+        const stdout = await execute(cmd);
         res.send(200, stdout);
-    }).catch((e) => {
+    } catch (e) {
         res.send(500, e);
-    })
+    }
 });
 
-//backup
+// Backup
 const backupFileName = "rocket-pool-backup.zip";
-server.get("/" + backupFileName, (req, res) => {
-    res.setHeader("Content-Disposition", "attachment; " + backupFileName);
+server.get("/" + backupFileName, (req, res, next) => {
+    res.setHeader("Content-Disposition", "attachment; filename=" + backupFileName);
     res.setHeader("Content-Type", "application/zip");
 
     const zip = new AdmZip();
     zip.addLocalFolder("/rocketpool/data", "data");
-    zip.toBuffer(
-        (buffer, err) => {
-            if (err) {
-                reject(err);
-            } else {
-                res.setHeader("Content-Length", buffer.length);
-                res.end(buffer, "binary");
-            }
-        }
-    )
 
+    try {
+        const buffer = zip.toBuffer();
+        res.setHeader("Content-Length", buffer.length);
+        res.end(buffer, "binary");
+    } catch (err) {
+        next(err);
+    }
+
+    return next();
 });
 
 //restore
@@ -237,8 +240,6 @@ server.post('/restore-backup', (req, res, next) => {
     }
 });
 
-
-
 server.listen(9999, function () {
     console.log("%s listening at %s", server.name, server.url);
     console.assert(network == "prater" || network == "holesky" || network == "mainnet", 'Wrongly configured NETWORK environment variable! Use either "prater" or "mainnet"');