pinokiod 3.2.238 → 3.2.240

package/kernel/index.js

@@ -491,36 +491,41 @@ class Kernel {
               })
 
               // get env
-              let interval = setInterval(() => {
-                if (this.i) {
-                  for(let api of this.i.api) {
-                    let env_path = path.resolve(this.api.userdir, api.path)
-                    let e = await Environment.get(env_path)
-                    console.log(e)
-                    if (e.PINOKIO_SCRIPT_AUTOLAUNCH && e.PINOKIO_SCRIPT_AUTOLAUNCH.trim().length > 0) {
-                      let autolaunch_path = path.resolve(env_path, e.PINOKIO_SCRIPT_AUTOLAUNCH)
-                      let exists = await this.exists(autolaunch_path)
-                      console.log("ATTEMPTING AUTOLAUNCH", autolaunch_path)
-                      if (exists) {
-                        console.log("SCRIPT EXISTS. Starting...", autolaunch_path)
-                        let res = await new Promise((resolve, reject) => {
-                          this.api.process({
-                            uri: autolaunch_path,
-                            input: {}
-            //                client: req.client,
-            //                caller: req.parent.path,
-                          }, (r) => {
-                            resolve(r.input)
+              if (!this.launch_complete) {
+                let interval = setInterval(async () => {
+                  if (this.i) {
+                    for(let api of this.i.api) {
+                      let env_path = path.resolve(this.api.userdir, api.path)
+                      let e = await Environment.get(env_path)
+                      console.log(e)
+                      if (e.PINOKIO_SCRIPT_AUTOLAUNCH && e.PINOKIO_SCRIPT_AUTOLAUNCH.trim().length > 0) {
+                        let autolaunch_path = path.resolve(env_path, e.PINOKIO_SCRIPT_AUTOLAUNCH)
+                        let exists = await this.exists(autolaunch_path)
+                        console.log("ATTEMPTING AUTOLAUNCH", autolaunch_path)
+                        if (exists) {
+                          console.log("SCRIPT EXISTS. Starting...", autolaunch_path)
+                          let res = await new Promise((resolve, reject) => {
+                            this.api.process({
+                              uri: autolaunch_path,
+                              input: {}
+              //                client: req.client,
+              //                caller: req.parent.path,
+                            }, (r) => {
+                              resolve(r.input)
+                            })
                           })
-                        })
-                      } else {
-                        console.log("SCRIPT DOES NOT EXIST. Ignoring.", autolaunch_path)
+                        } else {
+                          console.log("SCRIPT DOES NOT EXIST. Ignoring.", autolaunch_path)
+                        }
                       }
                     }
+                    console.log("clear Interval")
+                    clearInterval(interval)
+                    this.launch_complete = true
+                    console.log("SETTING launch complete", this.launch_complete)
                   }
-                  clearInterval(interval)
-                }
-              }, 1000)
+                }, 1000)
+              }
             }
 //            console.log({ grant_permission })
 //            if (grant_permission) {

package/package.json

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

package/server/index.js

@@ -3079,10 +3079,10 @@ class Server {
       res.json({ success: true })
     }))
     this.app.get("/pinokio/info", ex(async (req, res) => {
-      console.time("getInfo")
       await this.kernel.getInfo()
-      console.timeEnd("getInfo")
       let info = Object.assign({}, this.kernel.i)
+      info.launch_complete = this.kernel.launch_complete
+      console.log("kernel.launch_complete", this.kernel.launch_complete)
       delete info.vars
       delete info.shell_env
       delete info.memory

package/server/views/index.ejs

@@ -1077,6 +1077,24 @@ if (document.querySelector("#genlog")) {
     })
   })
 }
+fetch("/pinokio/info").then((res) => {
+  return res.json()
+}).then((res) => {
+  if (!res.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)
+  }
+})
 
 </script>
 </body>