pinokiod 1.1.35 → 1.1.37

package/kernel/index.js

@@ -262,10 +262,15 @@ class Kernel {
         clearInterval(this.sysinfo_interval)
       }
       this.sysinfo_interval = setInterval(async () => {
-        await sysinfo.refresh()
-        let info = sysinfo.info
-        this.template.update(info)
-        this.sysinfo = info
+        try {
+          await sysinfo.refresh()
+          let info = sysinfo.info
+          console.log("sysinfo", info)
+          this.template.update(info)
+          this.sysinfo = info
+        } catch (e) {
+          console.log("sysinfo error", e)
+        }
       }, 10000) // update every 10 seconds
 
 //      await this.template.init()

package/package.json

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

package/server/index.js

@@ -83,6 +83,12 @@ class Server {
         console.log("Windows buildNumber", buildNumber)
         throw new Error(`Pinokio supports Windows release 18309 and up (current system: ${buildNumber}`)
       }
+
+      if (buildNumber > 25000) {
+        console.log("Windows buildNumber", buildNumber)
+        throw new Error(`Pinokio does not currently support Windows Canary (versions 25000 and up). The current system is ${buildNumber}`)
+        
+      }
     }
   }
   getMemory(filepath) {
@@ -359,6 +365,9 @@ class Server {
       console.log("agent", this.agent)
       console.log({ configArray })
       res.render("settings", {
+        bin: path.resolve(this.kernel.homedir, "bin"),
+        cache: path.resolve(this.kernel.homedir, "cache"),
+        drive: path.resolve(this.kernel.homedir, "drive"),
         version: this.version,
         logo: this.logo,
         theme: this.theme,
@@ -1581,12 +1590,16 @@ class Server {
               console.error((err && err.stack) ? err.stack : err);
             });
             this.logInterval = setInterval(async () => {
-              let file = path.resolve(this.kernel.homedir, "logs/stdout.txt")
-              let data = await fs.promises.readFile(file, 'utf8')
-              let lines = data.split('\n')
-              if (lines.length > 100000) {
-                let str = lines.slice(-100000).join("\n")
-                await fs.promises.writeFile(file, str)
+              try {
+                let file = path.resolve(this.kernel.homedir, "logs/stdout.txt")
+                let data = await fs.promises.readFile(file, 'utf8')
+                let lines = data.split('\n')
+                if (lines.length > 100000) {
+                  let str = lines.slice(-100000).join("\n")
+                  await fs.promises.writeFile(file, str)
+                }
+              } catch (e) {
+                console.log("Log Error", e)
               }
             }, 1000 * 60 * 10)  // 10 minutes
           }
@@ -1602,6 +1615,13 @@ class Server {
     console.log("start called", this.listening, debug)
 
     if (this.listening) {
+      // stop proxies
+      for(let scriptPath in this.kernel.api.proxies) {
+        console.log("# Stop proxy", scriptPath)
+        await this.kernel.api.stopProxy({
+          script: scriptPath
+        })
+      }
       console.log("close server")
       console.log("terminate start")
       await this.httpTerminator.terminate();
@@ -1682,6 +1702,9 @@ class Server {
         }]
         console.log("agent", this.agent)
         res.render("settings", {
+          bin: path.resolve(this.kernel.homedir, "bin"),
+          cache: path.resolve(this.kernel.homedir, "cache"),
+          drive: path.resolve(this.kernel.homedir, "drive"),
           version: this.version,
           logo: this.logo,
           theme: this.theme,

package/server/public/simplemodal.js

@@ -1,16 +1,18 @@
 const SimpleModal = async (params) => {
-  let btns = params.menu.map((item) => {
+  let menu = (params.menu ? params.menu : [])
+  let btns = menu.map((item) => {
     if (item.href) {
-      return `<a class='btn' href='${item.href}' target='_blank'>${item.text}</a>`
+      let icon = (item.icon ? `<i class="${item.icon}"></i> ` : "")
+      return `<a class='btn' href='${item.href}' target='_blank'>${icon}${item.text}</a>`
     } else if (item.action) {
       return `<a class='btn' target='_blank'>${item.text}</a>`
     }
   }).join("")
   await Swal.fire({
-    title: params.title,
+    title: params.title || " ",
     confirmButtonText: 'Next',
     html: `<div class='simple-modal-desc'>
-${params.description}
+${params.description || ""}
 </div>
 <div class='simple-modal-content'>${btns}</div>`,
 //    showConfirmButton: false,

package/server/public/style.css

@@ -1506,3 +1506,6 @@ footer.status {
     background: black;
 }
 */
+.btn.red {
+  background: brown !important;
+}

package/server/views/settings.ejs

@@ -66,6 +66,7 @@
   padding: 20px 0;
 }
 .titleview h1 {
+  font-family: verdana;
   font-size: 40px;
   text-transform: uppercase;
   letter-spacing: 0;
@@ -77,6 +78,7 @@
   padding: 10px 20px;
 }
 .item label {
+  font-family: verdana;
   display: block;
   text-transform: capitalize;
   font-size: 20px;
@@ -276,20 +278,33 @@ hr {
     <br>
     <br>
     <div class='item'>
-      <label>Reset bin</label>
+      <label><i class="fa-solid fa-folder-open"></i> bin</label>
       <div class='d'>Reset the bin folder and start fresh from scratch</div>
       <div class='reset-bin-loading hidden'>
         <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
       </div>
-      <div><button class='btn' id='del-bin'>Reset</button></div>
+      <div>
+        <button class='btn' data-filepath="<%=bin%>"><i class="fa-solid fa-up-right-from-square"></i> View Folder</button>
+        <button class='red btn' id='del-bin'><i class="fa-solid fa-trash-can"></i> Reset</button>
+      </div>
     </div>
     <div class='item'>
-      <label>Reset cache</label>
+      <label><i class="fa-solid fa-folder-open"></i> cache</label>
       <div class='d'>Reset the cache folder and start fresh from scratch</div>
       <div class='reset-cache-loading hidden'>
         <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
       </div>
-      <div><button class='btn' id='del-cache'>Reset</button></div>
+      <div>
+        <button class='btn' data-filepath="<%=cache%>"><i class="fa-solid fa-up-right-from-square"></i> View Folder</button>
+        <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> drive</label>
+      <div class='d'>Shared virtual drives</div>
+      <div>
+        <button class='btn' data-filepath="<%=drive%>"><i class="fa-solid fa-up-right-from-square"></i> View Folder</button>
+      </div>
     </div>
   </div>
   <hr/>
@@ -302,44 +317,50 @@ document.addEventListener("DOMContentLoaded", async () => {
   const n = new N()
   document.querySelector("#del-bin").addEventListener("click", async (e) => {
     console.log("del-bin")
-    document.querySelector(".reset-bin-loading").classList.remove("hidden")
-    document.querySelector("#del-bin").classList.add("hidden")
-    let res = await fetch("/pinokio/delete", {
-      method: "post",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ type: "bin" })
-    }).then((res) => {
-      return res.json()
-    })
-    console.log(res)
-    document.querySelector(".reset-bin-loading").classList.add("hidden")
-    if (res.error) {
-      alert(res.error)
-    } else {
-      location.href = location.href
+    let proceeed = confirm("Are you sure you wish to delete the bin folder?")
+    if (proceed) {
+      document.querySelector(".reset-bin-loading").classList.remove("hidden")
+      document.querySelector("#del-bin").classList.add("hidden")
+      let res = await fetch("/pinokio/delete", {
+        method: "post",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ type: "bin" })
+      }).then((res) => {
+        return res.json()
+      })
+      console.log(res)
+      document.querySelector(".reset-bin-loading").classList.add("hidden")
+      if (res.error) {
+        alert(res.error)
+      } else {
+        location.href = location.href
+      }
     }
   })
   document.querySelector("#del-cache").addEventListener("click", async (e) => {
     console.log("del-cache")
-    document.querySelector(".reset-cache-loading").classList.remove("hidden")
-    document.querySelector("#del-cache").classList.add("hidden")
-    let res = await fetch("/pinokio/delete", {
-      method: "post",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify({ type: "cache" })
-    }).then((res) => {
-      return res.json()
-    })
-    console.log(res)
-    document.querySelector(".reset-cache-loading").classList.add("hidden")
-    if (res.error) {
-      alert(res.error)
-    } else {
-      location.href = location.href
+    let proceeed = confirm("Are you sure you wish to delete the cache folder?")
+    if (proceed) {
+      document.querySelector(".reset-cache-loading").classList.remove("hidden")
+      document.querySelector("#del-cache").classList.add("hidden")
+      let res = await fetch("/pinokio/delete", {
+        method: "post",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ type: "cache" })
+      }).then((res) => {
+        return res.json()
+      })
+      console.log(res)
+      document.querySelector(".reset-cache-loading").classList.add("hidden")
+      if (res.error) {
+        alert(res.error)
+      } else {
+        location.href = location.href
+      }
     }
   })
   document.querySelector("form").addEventListener("submit", async (e) => {