pinokiod 1.3.4 → 1.3.5

package/kernel/api/index.js

@@ -539,6 +539,7 @@ class Api {
     // 1. render once
     let rpc = rawrpc
     let pass = 0;
+    console.log("Render", { rpc, memory })
     while(true) {
       rpc = this.kernel.template.render(rpc, memory)
       if (this.kernel.template.istemplate(rpc)) {
@@ -607,7 +608,20 @@ class Api {
 
         if (rpc.hasOwnProperty("when")) {
           // if rpc.when is false, don't run this and go to the next step
-          if (!rpc.when) {
+          let should_run
+          if (rpc.when) {
+            // when { allow_undefined: true}, undefined is treated as falsy
+            let h = this.kernel.template.render(rpc.when, memory, { allow_undefined: true })
+            if (h) {
+              should_run = true
+            } else {
+              should_run = false
+            }
+          } else {
+            should_run = false
+          }
+          if (!should_run) {
+          //if (!rpc.when) {
             if (typeof rpc.next === "undefined" || rpc.next === null) {
               // last call
               if (script.daemon) {

package/kernel/index.js

@@ -7,6 +7,7 @@ const fastq = require('fastq')
 const fetch = require('cross-fetch');
 const waitOn = require('wait-on');
 const system = require('systeminformation');
+//const hostile = require('hostile');
 const Sysinfo = require('./sysinfo')
 const portfinder = require('portfinder');
 const Loader = require("./loader")
@@ -225,6 +226,9 @@ class Kernel {
     }
     this.procs = {}
     this.template = new Template()
+
+
+
     try {
       if (this.homedir) {
         await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
@@ -286,6 +290,31 @@ class Kernel {
 //        userDataDir: this.bin.path("puppet")
 //      });
 
+
+      // set hosts
+      //hostile.get(false, async (err, lines) => {
+      //  if (err) {
+      //    console.error(err.message)
+      //  }
+      //  let hostSet
+      //  for(let line of lines) {
+      //    if (line.includes("pinokio.network")) {
+      //      hostSet = true 
+      //    }
+      //  }
+      //  console.log({ hostSet })
+      //  if (!hostSet) {
+      //    console.log("setting hosts")
+      //    await this.exec({
+      //      sudo: true,
+      //      message: "npx hostile set 127.0.0.1 pinokio.network"
+      //    }, (e) => {
+      //      console.log(e)
+      //    })
+      //    console.log("success")
+      //  }
+      //})
+
     } catch (e) {
       console.log("### ERROR", e)
     }

package/kernel/shell.js

@@ -147,6 +147,33 @@ class Shell {
     }
     // custom env was passed in
 
+    console.log("params", params)
+
+    // override cache folders if cache is specified
+    if (params.cache) {
+      // cache data files
+      let cache_path = path.resolve(params.path, params.cache)
+      let types = [
+        "HF_HOME",                // huggingface models
+        "TORCH_HOME",             // torch hub models
+        "GRADIO_TEMP_DIR"         // gradio data
+//        "XDG_CACHE_HOME",
+//        "PIP_CACHE_DIR",
+//        "TMPDIR",
+//        "TEMP",
+//        "TMP",
+//        "XDG_DATA_HOME",
+//        "XDG_CONFIG_HOME",
+//        "XDG_STATE_HOME",
+      ]
+      for(let type of types) {
+        let p = path.resolve(cache_path, type)
+        console.log("setting", p)
+        this.env[type] = p
+        await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
+      }
+    }
+
 
     if (params.env) {
       for(let key in params.env) {
@@ -205,6 +232,7 @@ class Shell {
     // automatically add self to the shells registry
     this.kernel.shell.add(this)
 
+    console.log("params", params)
     if (params.sudo) {
       let options = {
         name: "Pinokio",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,6 +21,7 @@
     "decompress": "^4.2.1",
     "ejs": "^3.1.9",
     "express": "^4.18.2",
+    "express-http-proxy-cp": "^2.0.3",
     "express-session": "^1.17.3",
     "fake-useragent": "^1.0.1",
     "fastq": "^1.15.0",
@@ -32,7 +33,7 @@
     "http-proxy": "^1.18.1",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
-    "jimini": "^0.0.4",
+    "jimini": "^0.0.5",
     "jsdom": "^24.0.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",

package/script/index.js

@@ -35,9 +35,10 @@ class Store {
   }
 }
 const server = new Server({
-  port: 42000,
+  //port: 42000,
+  port: 80,
   agent: "web",
   store: new Store()
 })
-server.start(true)
+server.start({ debug: true })
 //server.start()

package/server/index.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const proxy = require('express-http-proxy-cp');
 const sudo = require("sudo-prompt-programfiles-x86");
 const compressing = require('compressing');
 const { rimraf } = require('rimraf')
@@ -1651,8 +1652,12 @@ class Server {
       }
     }
   }
-  async start(debug) {
-    this.debug = debug
+  async start(options) {
+    this.debug = false
+    if (options) {
+      this.debug = options.debug
+      this.browser = options.browser
+    }
 
     if (this.listening) {
       // stop proxies
@@ -1714,14 +1719,42 @@ class Server {
         res.redirect("/?mode=settings")
         return
       }
+      if (req.query.mode === "help") {
+        let folders = {}
+        if (this.kernel.homedir) {
+          folders = {
+            bin: path.resolve(this.kernel.homedir, "bin"),
+            cache: path.resolve(this.kernel.homedir, "cache"),
+            drive: path.resolve(this.kernel.homedir, "drive"),
+          }
+        }
+        res.render("help", {
+          version: this.version,
+          logo: this.logo,
+          theme: this.theme,
+          agent: this.agent,
+          ...folders
+        })
+        return
+      }
+
+
       if (req.query.mode === 'settings') {
+
+        let platform = os.platform()
+        let _home
+        if (platform === "win32") {
+          _home = path.resolve(path.parse(os.homedir()).root, "pinokio");
+        } else {
+          _home = path.resolve(os.homedir(), "pinokio")
+        }
         let configArray = [{
           key: "home",
           description: [
             "* NO white spaces (' ')",
             "* NO exFAT drives",
           ],
-          val: this.kernel.homedir ? this.kernel.homedir : path.resolve(os.homedir(), "pinokio"),
+          val: this.kernel.homedir ? this.kernel.homedir : _home,
           placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
         }, {
           key: "theme",
@@ -2026,6 +2059,11 @@ class Server {
           let folderPath = this.kernel.path("cache")
           await fse.remove(folderPath)
           res.json({ success: true })
+        } else if (req.body.type === 'browser-cache') {
+          if (this.browser) {
+            await this.browser.clearCache()
+          }
+          res.json({ success: true })
         } else if (req.body.name) {
           let folderPath = this.kernel.path("api", req.body.name)
           await fse.remove(folderPath)

package/server/public/css/all.css

@@ -1,7 +1,7 @@
 /*!
- * Font Awesome Free 6.2.1 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- * Copyright 2022 Fonticons, Inc.
+ * Copyright 2024 Fonticons, Inc.
  */
 .fa {
   font-family: var(--fa-style-family, "Font Awesome 6 Free");
@@ -258,8 +258,10 @@
             animation-duration: 1ms;
     -webkit-animation-iteration-count: 1;
             animation-iteration-count: 1;
-    transition-delay: 0s;
-    transition-duration: 0s; } }
+    -webkit-transition-delay: 0s;
+            transition-delay: 0s;
+    -webkit-transition-duration: 0s;
+            transition-duration: 0s; } }
 
 @-webkit-keyframes fa-beat {
   0%, 90% {
@@ -461,8 +463,8 @@
           transform: scale(-1, -1); }
 
 .fa-rotate-by {
-  -webkit-transform: rotate(var(--fa-rotate-angle, none));
-          transform: rotate(var(--fa-rotate-angle, none)); }
+  -webkit-transform: rotate(var(--fa-rotate-angle, 0));
+          transform: rotate(var(--fa-rotate-angle, 0)); }
 
 .fa-stack {
   display: inline-block;
@@ -491,6 +493,7 @@
 
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
 readers do not read off random characters that represent icons */
+
 .fa-0::before {
   content: "\30"; }
 
@@ -2765,6 +2768,9 @@ readers do not read off random characters that represent icons */
 .fa-italic::before {
   content: "\f033"; }
 
+.fa-table-cells-column-lock::before {
+  content: "\e678"; }
+
 .fa-church::before {
   content: "\f51d"; }
 
@@ -4937,6 +4943,9 @@ readers do not read off random characters that represent icons */
 .fa-font::before {
   content: "\f031"; }
 
+.fa-table-cells-row-lock::before {
+  content: "\e67a"; }
+
 .fa-rupiah-sign::before {
   content: "\e23d"; }
 
@@ -5966,9 +5975,6 @@ readers do not read off random characters that represent icons */
 .fa-share::before {
   content: "\f064"; }
 
-.fa-arrow-turn-right::before {
-  content: "\f064"; }
-
 .fa-mail-forward::before {
   content: "\f064"; }
 
@@ -6418,6 +6424,9 @@ readers do not read off random characters that represent icons */
 .fa-ups:before {
   content: "\f7e0"; }
 
+.fa-pixiv:before {
+  content: "\e640"; }
+
 .fa-wpexplorer:before {
   content: "\f2de"; }
 
@@ -6478,6 +6487,9 @@ readers do not read off random characters that represent icons */
 .fa-drupal:before {
   content: "\f1a9"; }
 
+.fa-jxl:before {
+  content: "\e67b"; }
+
 .fa-hire-a-helper:before {
   content: "\f3b0"; }
 
@@ -6523,6 +6535,9 @@ readers do not read off random characters that represent icons */
 .fa-deskpro:before {
   content: "\f38f"; }
 
+.fa-brave:before {
+  content: "\e63c"; }
+
 .fa-sistrix:before {
   content: "\f3ee"; }
 
@@ -6547,6 +6562,9 @@ readers do not read off random characters that represent icons */
 .fa-edge:before {
   content: "\f282"; }
 
+.fa-threads:before {
+  content: "\e618"; }
+
 .fa-napster:before {
   content: "\f3d2"; }
 
@@ -6688,6 +6706,9 @@ readers do not read off random characters that represent icons */
 .fa-cloudsmith:before {
   content: "\f384"; }
 
+.fa-opensuse:before {
+  content: "\e62b"; }
+
 .fa-pied-piper-alt:before {
   content: "\f1a8"; }
 
@@ -6715,6 +6736,9 @@ readers do not read off random characters that represent icons */
 .fa-scribd:before {
   content: "\f28a"; }
 
+.fa-debian:before {
+  content: "\e60b"; }
+
 .fa-openid:before {
   content: "\f19b"; }
 
@@ -6769,6 +6793,9 @@ readers do not read off random characters that represent icons */
 .fa-kickstarter:before {
   content: "\f3bb"; }
 
+.fa-square-kickstarter:before {
+  content: "\f3bb"; }
+
 .fa-grav:before {
   content: "\f2d6"; }
 
@@ -6829,6 +6856,9 @@ readers do not read off random characters that represent icons */
 .fa-bluetooth-b:before {
   content: "\f294"; }
 
+.fa-square-letterboxd:before {
+  content: "\e62e"; }
+
 .fa-sticker-mule:before {
   content: "\f3f7"; }
 
@@ -6862,6 +6892,9 @@ readers do not read off random characters that represent icons */
 .fa-confluence:before {
   content: "\f78d"; }
 
+.fa-shoelace:before {
+  content: "\e60c"; }
+
 .fa-mdb:before {
   content: "\f8ca"; }
 
@@ -6955,6 +6988,9 @@ readers do not read off random characters that represent icons */
 .fa-neos:before {
   content: "\f612"; }
 
+.fa-square-threads:before {
+  content: "\e619"; }
+
 .fa-hackerrank:before {
   content: "\f5f7"; }
 
@@ -6982,6 +7018,9 @@ readers do not read off random characters that represent icons */
 .fa-envira:before {
   content: "\f299"; }
 
+.fa-google-scholar:before {
+  content: "\e63b"; }
+
 .fa-square-gitlab:before {
   content: "\e5ae"; }
 
@@ -7114,6 +7153,9 @@ readers do not read off random characters that represent icons */
 .fa-vine:before {
   content: "\f1ca"; }
 
+.fa-signal-messenger:before {
+  content: "\e663"; }
+
 .fa-paypal:before {
   content: "\f1ed"; }
 
@@ -7147,6 +7189,9 @@ readers do not read off random characters that represent icons */
 .fa-nfc-symbol:before {
   content: "\e531"; }
 
+.fa-mintbit:before {
+  content: "\e62f"; }
+
 .fa-ethereum:before {
   content: "\f42e"; }
 
@@ -7171,6 +7216,9 @@ readers do not read off random characters that represent icons */
 .fa-bimobject:before {
   content: "\f378"; }
 
+.fa-brave-reverse:before {
+  content: "\e63d"; }
+
 .fa-facebook-f:before {
   content: "\f39e"; }
 
@@ -7180,6 +7228,9 @@ readers do not read off random characters that represent icons */
 .fa-google-plus-square:before {
   content: "\f0d4"; }
 
+.fa-web-awesome:before {
+  content: "\e682"; }
+
 .fa-mandalorian:before {
   content: "\f50f"; }
 
@@ -7273,6 +7324,9 @@ readers do not read off random characters that represent icons */
 .fa-tencent-weibo:before {
   content: "\f1d5"; }
 
+.fa-letterboxd:before {
+  content: "\e62d"; }
+
 .fa-symfony:before {
   content: "\f83d"; }
 
@@ -7297,6 +7351,9 @@ readers do not read off random characters that represent icons */
 .fa-erlang:before {
   content: "\f39d"; }
 
+.fa-x-twitter:before {
+  content: "\e61b"; }
+
 .fa-cotton-bureau:before {
   content: "\f89e"; }
 
@@ -7336,6 +7393,9 @@ readers do not read off random characters that represent icons */
 .fa-xbox:before {
   content: "\f412"; }
 
+.fa-square-web-awesome-stroke:before {
+  content: "\e684"; }
+
 .fa-searchengin:before {
   content: "\f3eb"; }
 
@@ -7408,6 +7468,9 @@ readers do not read off random characters that represent icons */
 .fa-cmplid:before {
   content: "\e360"; }
 
+.fa-upwork:before {
+  content: "\e641"; }
+
 .fa-facebook:before {
   content: "\f09a"; }
 
@@ -7441,6 +7504,9 @@ readers do not read off random characters that represent icons */
 .fa-whatsapp:before {
   content: "\f232"; }
 
+.fa-square-upwork:before {
+  content: "\e67c"; }
+
 .fa-slideshare:before {
   content: "\f1e7"; }
 
@@ -7519,6 +7585,9 @@ readers do not read off random characters that represent icons */
 .fa-sellsy:before {
   content: "\f213"; }
 
+.fa-square-web-awesome:before {
+  content: "\e683"; }
+
 .fa-sass:before {
   content: "\f41e"; }
 
@@ -7555,6 +7624,9 @@ readers do not read off random characters that represent icons */
 .fa-waze:before {
   content: "\f83f"; }
 
+.fa-bluesky:before {
+  content: "\e671"; }
+
 .fa-cc-jcb:before {
   content: "\f24b"; }
 
@@ -7582,6 +7654,9 @@ readers do not read off random characters that represent icons */
 .fa-supple:before {
   content: "\f3f9"; }
 
+.fa-webflow:before {
+  content: "\e65c"; }
+
 .fa-rebel:before {
   content: "\f1d0"; }
 
@@ -7744,6 +7819,9 @@ readers do not read off random characters that represent icons */
 .fa-internet-explorer:before {
   content: "\f26b"; }
 
+.fa-stubber:before {
+  content: "\e5c7"; }
+
 .fa-telegram:before {
   content: "\f2c6"; }
 
@@ -7753,6 +7831,9 @@ readers do not read off random characters that represent icons */
 .fa-old-republic:before {
   content: "\f510"; }
 
+.fa-odysee:before {
+  content: "\e5c6"; }
+
 .fa-square-whatsapp:before {
   content: "\f40c"; }
 
@@ -7786,6 +7867,9 @@ readers do not read off random characters that represent icons */
 .fa-quora:before {
   content: "\f2c4"; }
 
+.fa-square-x-twitter:before {
+  content: "\e61a"; }
+
 .fa-reacteurope:before {
   content: "\f75d"; }