pinokiod 3.2.251 → 3.2.254

package/kernel/api/fs/index.js

@@ -94,7 +94,6 @@ class FS {
   }
 
   async share(req, ondata, kernel) {
-
     /////////////////////////////////////////////////////////////////////////////
     //
     //    1. peer to peer shared drive
@@ -160,10 +159,6 @@ class FS {
     //
     /////////////////////////////////////////////////////////////////////////////
 
-
-
-
-
     ondata({ raw: "\r\ncreating a shared drive:\r\n" + JSON.stringify(req.params, null, 2).replace(/\n/g, "\r\n") })
 
 

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

@@ -89,7 +89,7 @@ class Kernel {
     }
     return Environment.get2(folderpath, this)
   }
-  async userAgent(browser) {
+  userAgent(browser) {
     if (browser) {
       return randomUseragent.getRandom((ua) => {
         return ua.browserName === browser;
@@ -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/kernel/shell.js

@@ -798,7 +798,6 @@ class Shell {
   async exec(params) {
     params = await this.activate(params)
     this.cmd = this.build(params)
-    console.log("this.cmd", this.cmd)
     let res = await new Promise((resolve, reject) => {
       this.resolve = resolve
       this.reject = reject

package/kernel/shells.js

@@ -27,7 +27,6 @@ class Shells {
   }
 */
   async init() {
-    console.log("SHELLS>INIT")
     // iterate through all the envs
     let sh = new Shell(this.kernel)
     let m
@@ -60,10 +59,8 @@ class Shells {
     // if array, duplicate the action
     if (Array.isArray(params.message)) {
       let res
-      console.log("params.message", params.message)
       for(let i=0; i<params.message.length; i++) {
         let message = params.message[i]
-        console.log("Processing message", { message, i })
         let params_dup = Object.assign({}, params) 
         params_dup.message = message
         res = await this._launch(params_dup, options, ondata)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.251",
+  "version": "3.2.254",
   "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,

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
         }
       }
     })