pinokiod 3.18.4 → 3.18.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.18.4",
+  "version": "3.18.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -2480,6 +2480,8 @@ class Server {
     if (options) {
       this.debug = options.debug
       this.browser = options.browser
+      this.onrestart = options.onrestart
+      this.onquit = options.onquit
     }
 
     if (this.listening) {
@@ -4983,6 +4985,16 @@ class Server {
     this.app.get("/check", ex((req, res) => {
       res.json({ success: true })
     }))
+    this.app.post("/onrestart", ex(async (req, res) => {
+      console.log("post /onrestart")
+      if (this.onrestart) {
+        console.log("onrestart exists")
+        this.onrestart()
+      } else {
+        await this.start({ debug: this.debug, browser: this.browser })
+        res.json({ success: true })
+      }
+    }))
     this.app.post("/restart", ex(async (req, res) => {
       console.log("post /restart")
       this.start({ debug: this.debug, browser: this.browser })

package/server/views/settings.ejs

@@ -642,11 +642,38 @@ console.log("body", body)
           allowOutsideClick: false,
           allowEscapeKey: false,
           allowEnterKey: false,
-          showConfirmButton: false,
-          didOpen: () => {
-            Swal.showLoading();
+          confirmButtonText: "Restart",
+//          showConfirmButton: false,
+//          didOpen: () => {
+//            Swal.showLoading();
+//          }
+        }).then((result) => {
+          if (result.isConfirmed) {
+            fetch("/onrestart", {
+              method: "POST",
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify({})
+            }).then((res) => {
+              return res.json()
+            })
+            setInterval(async () => {
+              try {
+                let res = await fetch("/check").then((res) => {
+                  return res.json()
+                })
+                if (res.success) {
+                  document.querySelector(".loading").classList.add("hidden")
+                  setTimeout(() => {
+                    location.href = "/"
+                  }, 1000)
+                }
+              } catch (e) {
+                console.log(e)
+              }
+            }, 1000)
           }
-        });
+        })
+
       } else {
         //alert("Successfully updated the pinokio home to " + val)
         fetch("/restart", {