pinokiod 1.2.73 → 1.3.1

package/kernel/api/fs/index.js

@@ -507,7 +507,7 @@ class FS {
       ondata({ raw: "\r\nURIs:\r\n" + JSON.stringify(url, null, 2).replace(/\n/g, "\r\n") })
       for(let i=0; i<url.length; i++) {
         let u = url[i]
-        ondata({ raw: "\r\n[${i+1}/${url.length}] Downloading ${u}\r\n" })
+        ondata({ raw: `\r\n[${i+1}/${url.length}] Downloading ${u}\r\n` })
         req.params.url = u
         await this.downloadOne(req, ondata, kernel)
       }

package/kernel/api/index.js

@@ -511,6 +511,8 @@ class Api {
 
     await this.init()
 
+    await this.kernel.update_sysinfo()
+
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
 

package/kernel/bin/registry.js

@@ -5,9 +5,12 @@ class Registry {
       message: "reg query HKLM\\SYSTEM\\CurrentControlSet\\Control\\FileSystem /v LongPathsEnabled",
     }, (stream) => {
     })
+    console.log("registry check", { res })
     let matches = /(LongPathsEnabled.+)[\r\n]+/.exec(res.response)
+    console.log("matches", matches)
     if (matches && matches.length > 0) {
       let chunks = matches[1].split(/\s+/)
+      console.log("chunks", chunks)
       if (chunks.length === 3) {
         if (Number(chunks[2]) === 1) {
           return true

package/kernel/index.js

@@ -119,6 +119,7 @@ class Kernel {
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)
     for(let type of ["info", "buf", "cleaned"]) {
+    //for(let type of ["info", "cleaned"]) {
       let logPath = path.resolve(this.homedir, "logs", "shell", type, relativePath)
       let logFolder = path.dirname(logPath)
       let filename = path.basename(logPath)
@@ -142,16 +143,18 @@ class Kernel {
       let relativePath = path.relative(this.homedir, group)
 
       if (!path.isAbsolute(relativePath)) {
-        for(let type of ["info", "buf", "cleaned"]) {
-          let logPath = path.resolve(this.homedir, "logs", "shell", type, relativePath + "." + info.index + ".yaml")
+        //for(let type of ["info", "buf", "cleaned"]) {
+        for(let type of ["info", "cleaned"]) {
+          let logPath = path.resolve(this.homedir, "logs", "shell", type, relativePath + "." + info.index + ".txt")
           let logFolder = path.dirname(logPath)
           await fs.promises.mkdir(logFolder, { recursive: true }).catch((e) => { })
           await fs.promises.appendFile(logPath, data[type])
         }
       }
     } else {
-      for(let type of ["info", "buf", "cleaned"]) {
-        let logPath = path.resolve(this.homedir, "logs", "shell", type, "index.yaml")
+      //for(let type of ["info", "buf", "cleaned"]) {
+      for(let type of ["info", "cleaned"]) {
+        let logPath = path.resolve(this.homedir, "logs", "shell", type, "index.txt")
         let logFolder = path.dirname(logPath)
         await fs.promises.mkdir(logFolder, { recursive: true }).catch((e) => { })
         await fs.promises.appendFile(logPath, data[type])
@@ -251,9 +254,9 @@ class Kernel {
       await this.api.init()
 
 
-      let sysinfo = new Sysinfo()
-      await sysinfo.init(this)
-      let info = sysinfo.info
+      this.sys = new Sysinfo()
+      await this.sys.init(this)
+      let info = this.sys.info
       await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
       await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify({
         platform: this.platform,
@@ -270,24 +273,12 @@ class Kernel {
         arch: this.arch,
         ...info
       })
-      if (this.sysinfo_interval) {
-        clearInterval(this.sysinfo_interval)
-      }
-      this.sysinfo_interval = setInterval(async () => {
-        try {
-          await sysinfo.refresh()
-          let info = sysinfo.info
-          this.template.update(info)
-          this.sysinfo = info
-        } catch (e) {
-          console.log("sysinfo error", e)
-        }
-      }, 10000) // update every 10 seconds
+
+
+      await this.update_sysinfo()
 
 //      await this.template.init()
 
-      this.gpu = info.gpu
-      this.gpus = info.gpus
 
 //      let PuppeteerPath = this.bin.path("puppet", "node_modules", "puppeteer")
 //      this.puppet = (await this.loader.load(PuppeteerPath)).resolved
@@ -299,6 +290,18 @@ class Kernel {
       console.log("### ERROR", e)
     }
   }
+  async update_sysinfo() {
+    try {
+      await this.sys.refresh()
+      let info = this.sys.info
+      this.template.update(info)
+      this.sysinfo = info
+      this.gpu = info.gpu
+      this.gpus = info.gpus
+    } catch (e) {
+      console.log("sysinfo error", e)
+    }
+  }
   async exec(params, ondata) {
 //    params.path = this.path()
 //    if (this.client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.2.73",
+  "version": "1.3.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",
-    "lproxy": "^0.0.8",
+    "lproxy": "^0.0.9",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",

package/server/index.js

@@ -328,6 +328,8 @@ class Server {
         }
       }
 
+      console.log({ type: 1, requirements })
+
       let error = null
       try {
         this.compatible()
@@ -674,6 +676,9 @@ class Server {
           return r.relevant
         })
 
+        console.log({ type: 2, requirements })
+
+
         let mem = this.getMemory(filepath)
 //        let localMem = this.kernel.memory.local[filepath]
 //        let globalMem = this.kernel.memory.global[filepath]
@@ -1125,8 +1130,6 @@ class Server {
       for(let i=0; i<config.menu.length; i++) {
         let menuitem = config.menu[i]
 
-        console.log({ menuitem })
-
         if (menuitem.menu) {
           let m = await this.renderMenu(uri, name, { menu: menuitem.menu }, pathComponents)
           menuitem.menu = m.menu
@@ -1406,6 +1409,7 @@ class Server {
       if (mod.installed) {
         installed = await mod.installed()
       }
+      console.log("_installed", { name, type, installed })
       return installed
     }
   }

package/server/public/style.css

@@ -1111,7 +1111,8 @@ body.dark .swal2-popup {
   color: var(--dark-btn-color);
 }
 .swal2-popup {
-  border-radius: 0 !important;
+  border-radius: 20px !important;
+  box-sizing: border-box;
 }
 .swal2-html-container a {
   text-decoration: none;
@@ -1121,15 +1122,27 @@ body.dark .swal2-popup {
   text-align: center;
   padding: 10px;
   display: block;
+  box-sizing: border-box;
+}
+body.dark .swal2-html-container .btn {
+  background: white;
+  color: black;
+}
+.swal2-html-container .btn {
+  padding: 10px !important;
+  font-weight: bold;
 }
 .swal2-html-container a.btn {
   color: white;
   display: inline-block;
-  padding: 10px;
+  box-sizing: border-box;
 }
 .swal2-html-container {
   display: block !important;
-  margin: 0px 20px !important;
+  margin: 0px 15px !important;
+  /*
+  margin: 0 10px 10px !important;
+  */
 }
 .swal2-html-container .desc:empty {
   display: none;
@@ -1137,9 +1150,11 @@ body.dark .swal2-popup {
 .swal2-html-container .desc {
   font-size: 14px;
   text-align: left;
-  padding: 10px;
   box-sizing: border-box;
 }
+.swal2-html-container .desc ol {
+  padding-inline-start: 25px;
+}
 .swal2-html-container .field {
   font-size: 14px;
   box-sizing: border-box;
@@ -1175,12 +1190,16 @@ body.dark .swal2-popup {
 .swal2-title:empty {
   display: none !important;
 }
+body.dark .swal2-title {
+  color: white !important;
+}
 .swal2-title {
+  color: black !important;
   display: block !important;
   text-align: left !important;
   letter-spacing: -1px !important;
   font-size: 30px !important;
-  padding: 20px !important;
+  padding: 15px !important;
   /*
   background: rgba(0,0,200,0.04);
   */
@@ -1195,7 +1214,7 @@ body.dark .swal2-popup {
   */
 }
 .swal2-modal  {
-  padding: 0 !important;
+  padding: 10px !important;
   /*
   background: rgba(0,0,0,0.8) !important;
   */
@@ -1246,7 +1265,7 @@ body.dark .swal2-styled.swal2-confirm{
   */
 }
 .swal2-styled.swal2-confirm{
-  background: rgba(0,0,0,0.8) !important;
+  background: black !important;
   margin: 0;
   font-weight: bold;
   border: none;