pinokiod 3.2.250 → 3.2.252

package/kernel/bin/index.js

@@ -552,7 +552,7 @@ class Bin {
             if (m.name === name) {
               //await m.mod.install(this, ondata)
               const message = `${m.mod.description ? '<br>' + m.mod.description : ''}`
-              ondata({ html: `<b>${progress} Installing ${name}</b>${message}` }, "notify")
+              ondata({ html: `<b><i class="fas fa-circle-notch fa-spin"></i> ${progress} Installing ${name}</b>${message}` }, "notify")
               console.log("## Before m.mod.install", requirement)
               await m.mod.install(requirement, ondata, this.kernel)
 

package/kernel/index.js

@@ -520,13 +520,10 @@ class Kernel {
                     }
                     console.log("clear Interval")
                     clearInterval(interval)
-                    await new Promise((resolve, reject) => {
-                      setTimeout(() => {
-                        this.launch_complete = true
-                        console.log("SETTING launch complete", this.launch_complete)
-                        resolve()
-                      }, 1000)
-                    })
+                    setTimeout(() => {
+                      this.launch_complete = true
+                      console.log("SETTING launch complete", this.launch_complete)
+                    }, 2000)
                   }
                 }, 1000)
               }

package/package.json

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

package/server/index.js

@@ -1361,6 +1361,7 @@ class Server {
       if (meta) {
         items = running.concat(notRunning)
         res.render("index", {
+          launch_complete: this.kernel.launch_complete,
           home_url: `http://localhost:${this.port}`,
           proxy: home_proxy,
           cloudflare_pub: this.cloudflare_pub,
@@ -2301,6 +2302,7 @@ class Server {
           folders = {
             bin: path.resolve(this.kernel.homedir, "bin"),
             cache: path.resolve(this.kernel.homedir, "cache"),
+            env: path.resolve(this.kernel.homedir, "ENVIRONMENT"),
             drive: path.resolve(this.kernel.homedir, "drive"),
           }
         }
@@ -2982,6 +2984,12 @@ class Server {
           await fse.remove(folderPath)
           await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
           res.json({ success: true })
+        } else if (req.body.type === 'env') {
+          let envpath = this.kernel.path("ENVIRONMENT")
+          let str = await Environment.ENV("system", this.kernel.homedir)
+          console.log({ str })
+          await fs.promises.writeFile(path.resolve(this.kernel.homedir, "ENVIRONMENT"), str)
+          res.json({ success: true })
         } else if (req.body.type === 'browser-cache') {
           if (this.browser) {
             await this.browser.clearCache()

package/server/views/index.ejs

@@ -735,29 +735,23 @@ if (document.querySelector("form input[type=search]")) {
   })
 }
 <% if (ishome) { %>
+// if launch_complete is true => already finished launching so no need to refresh
+// if launch_complete is false => not finished launching. wait until it's complete, and then refresh
 // autolaunch display update
-fetch("/pinokio/info").then((res) => {
-  return res.json()
-}).then((res) => {
-  console.log("res", res)
-  if (res.launch_complete) {
-//    location.href = location.href
-  } else {
-    let interval = setInterval(async () => {
-      let res = await fetch("/pinokio/info").then((res) => {
-        return res.json()
-      })
-      console.log("res", res)
-      if (res.launch_complete) {
-        console.log("launched")
-        clearInterval(interval)
-        location.href = location.href
-      } else {
-        console.log("not yet launched")
-      }
-    }, 1000)
-  }
-})
+<% if (!launch_complete) { %>
+  let interval = setInterval(async () => {
+    let res = await fetch("/pinokio/info").then((res) => {
+      return res.json()
+    })
+    if (res.launch_complete) {
+      console.log("launched")
+      clearInterval(interval)
+      location.href = location.href
+    } else {
+      console.log("not yet launched")
+    }
+  }, 1000)
+<% } %>
 document.addEventListener("keydown", (e) => {
   e = e || window.event;
   if (e.key === "ArrowUp") {

package/server/views/install.ejs

@@ -94,6 +94,21 @@ body {
 .timestamp {
   color: rgba(0,0,0,0.5);
 }
+#status-screen {
+  padding: 10px;
+  box-sizing: border-box;
+  width: 100%;
+  margin: 0;
+  background: royalblue;
+  overflow: auto;
+  color: white;
+  /*
+  color: rgb(27, 28, 29);
+  */
+}
+#status-screen b {
+  color: white;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -113,7 +128,10 @@ body {
 </head>
 <body class='<%=theme%>'>
 <header class='grabbable'></header>
-<div id='terminal'></div>
+<div id='status-screen'></div>
+<div class='terminal-container'>
+  <div id='terminal'></div>
+</div>
 <input id='requirements' type='hidden' value="<%=requirements%>">
 <input id='callback' type='hidden' value="<%=callback%>">
 <script>
@@ -221,7 +239,8 @@ document.addEventListener("DOMContentLoaded", async () => {
           if (packet.data.type) {
             payload.type = packet.data.type
           }
-          n.Noty(payload)
+//          n.Noty(payload)
+          document.querySelector("#status-screen").innerHTML = packet.data.html
         }
       }
     })

package/server/views/settings.ejs

@@ -330,6 +330,17 @@ hr {
           <button class='red btn' id='del-cache'><i class="fa-solid fa-trash-can"></i> Reset</button>
         </div>
       </div>
+      <div class='item'>
+        <label><i class="fa-solid fa-folder-open"></i> environment variables</label>
+        <div class='d'>Reset the pinokio environment variables and start fresh from scratch</div>
+        <div class='reset-env-loading hidden'>
+          <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+        </div>
+        <div>
+          <button class='btn' data-filepath="<%=env%>"><i class="fa-solid fa-up-right-from-square"></i> View ENVIRONMENT file</button>
+          <button class='red btn' id='del-env'><i class="fa-solid fa-trash-can"></i> Reset</button>
+        </div>
+      </div>
       <% if (agent === "electron") { %>
         <div class='item'>
           <label><i class="fa-solid fa-folder-open"></i> browser cache</label>
@@ -417,6 +428,30 @@ document.addEventListener("DOMContentLoaded", async () => {
         }
       }
     })
+    document.querySelector("#del-env").addEventListener("click", async (e) => {
+      console.log("del-env")
+      let proceed = confirm("Are you sure you wish to reset the environment variables?")
+      if (proceed) {
+        document.querySelector(".reset-env-loading").classList.remove("hidden")
+        document.querySelector("#del-env").classList.add("hidden")
+        let res = await fetch("/pinokio/delete", {
+          method: "post",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ type: "env" })
+        }).then((res) => {
+          return res.json()
+        })
+        console.log(res)
+        document.querySelector(".reset-env-loading").classList.add("hidden")
+        if (res.error) {
+          alert(res.error)
+        } else {
+          location.href = location.href
+        }
+      }
+    })
   <% } %>
   <% if (agent === "electron") { %>
     if (document.querySelector("#del-browser-cache")) {