pinokiod 2.15.80 → 2.15.82

package/kernel/index.js

@@ -337,14 +337,18 @@ class Kernel {
 
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
+      console.log("> bin.init()")
       this.bin.init()
+      console.log("> api.init()")
       await this.api.init()
+      console.log("> shell.init()")
 
       //await this.shell.init()
       this.shell.init()
 
       if (this.homedir) {
         this.sys = new Sysinfo()
+        console.log("> sys.init()")
         await this.sys.init(this)
         let info = this.sys.info
         await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
@@ -355,6 +359,7 @@ class Kernel {
           ...info
         }, null, 2))
         this.sysinfo = info
+        console.log("> template.init()")
         await this.template.init({
           kernel: this,
           system,
@@ -367,6 +372,7 @@ class Kernel {
           },
           ...info
         })
+        console.log("> update_sysinfo")
         await this.update_sysinfo()
       }
 
@@ -379,6 +385,7 @@ class Kernel {
       }
       process.env.PLAYWRIGHT_BROWSERS_PATH = this.bin.path("playwright/browsers")
       this.playwright = (await this.loader.load(pwpath)).resolved
+      console.log("Kernel.init finished")
 
 //      await this.template.init()
 

package/kernel/loader.js

@@ -23,11 +23,16 @@ class Loader {
 //      resolved = await this.requireYAML(_path)
     } else {
       // load JS if directory
-      let stat = await fs.promises.stat(_path)
-      if (stat.isDirectory()) {
-        resolved = await this.requireJS(_path)
-        dirname = _path
-      } else {
+      try {
+        let stat = await fs.promises.stat(_path)
+        if (stat.isDirectory()) {
+          resolved = await this.requireJS(_path)
+          dirname = _path
+        } else {
+          resolved = null
+        }
+      } catch (e) {
+        console.log(e)
         resolved = null
       }
     }

package/package.json

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

package/server/index.js

@@ -305,8 +305,7 @@ class Server {
     }
     const env = await this.kernel.env("api/" + name)
 
-    //res.render("browser", {
-    res.render("browser-experimental", {
+    res.render("browser", {
       env,
       mode,
       port: this.port,
@@ -1966,15 +1965,19 @@ class Server {
     let new_home = this.kernel.store.get("new_home")
   }
   async startLogging() {
+    console.log("> startLogging", {debug: this.debug, homedir: this.kernel.homedir})
     if (!this.debug) {
       if (this.logInterval) {
         clearInterval(this.logInterval)
       }
       if (this.kernel.homedir) {
         let exists = await this.exists(this.kernel.homedir)
+        console.log({ exists })
         if (exists) {
           let logsdir = path.resolve(this.kernel.homedir, "logs")
+          console.log({ logsdir })
           await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { })
+          console.log("this.log", this.log)
           if (!this.log) {
             this.log = fs.createWriteStream(path.resolve(this.kernel.homedir, "logs/stdout.txt"))
             process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
@@ -2093,7 +2096,9 @@ class Server {
 //        });
 //      }
 //    }
+    console.log("Before startLogging")
     await this.startLogging()
+    console.log("After startLogging")
 
     // check version from this.store
     let version = this.kernel.store.get("version")
@@ -2140,22 +2145,28 @@ class Server {
       origin: '*'
     }));
 
+    console.log(">> 00")
     if (this.kernel.homedir) {
       this.app.use(express.static(this.kernel.path("web/public")))
     }
+    console.log(">> 01")
     this.app.use(express.static(path.resolve(__dirname, 'public')));
     this.app.use("/web", express.static(path.resolve(__dirname, "..", "..", "web")))
     this.app.set('view engine', 'ejs');
+    console.log(">> 1")
     if (this.kernel.homedir) {
+      console.log(">> 2")
       this.app.set("views", [
         this.kernel.path("web/views"),
         path.resolve(__dirname, "views")
       ])
     } else {
+      console.log(">> 3")
       this.app.set("views", [
         path.resolve(__dirname, "views")
       ])
     }
+    console.log(">> 4")
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     this.app.use(cookieParser());
@@ -3267,6 +3278,7 @@ class Server {
     // install
     this.server = httpserver.createServer(this.app);
     this.socket = new Socket(this)
+    console.log(">> 100")
     await new Promise((resolve, reject) => {
       this.listening = this.server.listen(this.port, () => {
         console.log(`Server listening on port ${this.port}`)