pinokiod 1.1.17 → 1.1.18

package/kernel/index.js

@@ -5,12 +5,14 @@ const path = require('path')
 const fastq = require('fastq')
 const fetch = require('cross-fetch');
 const system = require('systeminformation');
+const Sysinfo = require('./sysinfo')
 const portfinder = require('portfinder');
 const Loader = require("./loader")
 const Bin = require('./bin')
 const Api = require("./api")
 const Python = require("./python")
-const Template = require('./template')
+//const Template = require('./template')
+const Template = require('jimini')
 const Shells = require("./shells")
 const Key = require("./key")
 const Config = require("./pinokio.json")
@@ -198,7 +200,7 @@ class Kernel {
       }
     }
     this.procs = {}
-    this.template = new Template(this)
+    this.template = new Template()
     try {
       if (this.homedir) {
         await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
@@ -225,10 +227,32 @@ class Kernel {
 //      let contents = await fs.promises.readdir(this.homedir)
       await this.bin.init()
       await this.api.init()
-      await this.template.init()
 
-      this.gpu = this.template.gpu
-      this.gpus = this.template.gpus
+
+      let sysinfo = new Sysinfo()
+      await sysinfo.init()
+      let info = sysinfo.info
+
+      await this.template.init({
+        kernel: this,
+        system,
+        platform: this.platform,
+        arch: this.arch,
+        ...info
+      })
+      if (this.sysinfo_interval) {
+        clearInterval(this.sysinfo_interval)
+      }
+      this.sysinfo_interval = setInterval(async () => {
+        await sysinfo.refresh()
+        let info = sysinfo.info
+        this.template.update(info)
+      }, 10000) // update every 10 seconds
+
+//      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
@@ -240,6 +264,35 @@ class Kernel {
       console.log("### ERROR", e)
     }
   }
+  async sysinfo() {
+    let g = await system.graphics()
+    let gpus
+    if (g && g.controllers && g.controllers.length > 0) {
+      gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
+    } else {
+      gpus = []
+    }
+
+    let is_nvidia = gpus.find(gpu => /nvidia/i.test(gpu))
+    let is_amd = gpus.find(gpu => /(amd|advanced micro devices)/i.test(gpu))
+    let is_apple = gpus.find(gpu => /apple/i.test(gpu))
+
+    let gpu
+    if (is_nvidia) {
+      gpu = "nvidia"
+    } else if (is_amd) {
+      gpu = "amd"
+    } else if (is_apple) {
+      gpu = "apple"
+    } else if (gpus.length > 0) {
+      gpu = gpus[0]
+    } else {
+      gpu = "none"
+    }
+
+    return { gpus, gpu }
+
+  }
   async exec(params, ondata) {
 //    params.path = this.path()
 //    if (this.client) {

package/kernel/sysinfo.js

@@ -0,0 +1,95 @@
+const system = require('systeminformation')
+class Sysinfo {
+  async init() {
+    this.info = {}
+    await this.static()
+    await this.refresh()
+  }
+  async static() {
+    await this.gpus()
+    await this.system()
+    await this.cpu()
+    await this.os()
+    await this.audio()
+//    await this.disk()
+  }
+  async refresh() {
+    await this.time()
+    await this.memory()
+    await this.battery()
+    await this.proc()
+    await this.bluetooth()
+//    await this.net()
+  }
+  async gpus() {
+    let g = await system.graphics()
+    let gpus
+    if (g && g.controllers && g.controllers.length > 0) {
+      gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
+    } else {
+      gpus = []
+    }
+
+    let is_nvidia = gpus.find(gpu => /nvidia/i.test(gpu))
+    let is_amd = gpus.find(gpu => /(amd|advanced micro devices)/i.test(gpu))
+    let is_apple = gpus.find(gpu => /apple/i.test(gpu))
+
+    let gpu
+    if (is_nvidia) {
+      gpu = "nvidia"
+    } else if (is_amd) {
+      gpu = "amd"
+    } else if (is_apple) {
+      gpu = "apple"
+    } else if (gpus.length > 0) {
+      gpu = gpus[0]
+    } else {
+      gpu = "none"
+    }
+
+    this.info.graphics = g
+    this.info.gpus = gpus
+    this.info.gpu = gpu
+
+  }
+  async time() {
+    this.info.time = await system.time()
+  }
+  async system() {
+    this.info.system = await system.system()
+  }
+  async cpu() {
+    this.info.cpu = await system.cpu()
+  }
+  async memory() {
+    this.info.mem = await system.mem()
+  }
+  async battery() {
+    this.info.battery = await system.battery()
+  }
+  async os() {
+    this.info.osInfo = await system.osInfo()
+    this.info.shell = await system.shell()
+  }
+  async proc() {
+    this.info.load = await system.currentLoad()
+  }
+  async disk() {
+    this.info.diskLayout = await system.diskLayout()
+    this.info.blockDevices = await system.blockDevices()
+    this.info.fsSize = await system.fsSize()
+    this.info.usb = await system.usb()
+  }
+  async audio() {
+    this.info.audio = await system.audio()
+  }
+  async net() {
+    this.info.networkConnections = await system.networkConnections()
+    this.info.gateway = await system.networkGatewayDefault()
+    this.info.interface = await system.networkInterfaces("default")
+  }
+  async bluetooth() {
+    this.info.bluetooth = await system.bluetoothDevices()
+  }
+}
+module.exports = Sysinfo

package/kernel/template.js

@@ -19,10 +19,6 @@ class Template {
     }
     this.gpus = gpus
 
-    console.log("this.gpus", this.gpus)
-
-    
-
     let is_nvidia = gpus.find(gpu => /nvidia/i.test(gpu))
     let is_amd = gpus.find(gpu => /(amd|advanced micro devices)/i.test(gpu))
     let is_apple = gpus.find(gpu => /apple/i.test(gpu))
@@ -39,8 +35,6 @@ class Template {
       this.gpu = "none"
     }
 
-    console.log({ gpu: this.gpu, gpus: this.gpus })
-
 //    if (gpus.find((gpu) => { return gpu.includes("nvidia") }) {
 //      this.gpu = "nvidia"
 //    } else if (gpus.includes("amd") || gpus.includes("advanced micro devices")){
@@ -119,7 +113,6 @@ class Template {
     // CASE 1. String type => can be a regular string or a template string
     if (typeof template === "string") {
 
-
       if (/^\{\{\{(.+)\}\}\}$/g.test(template)) {
         // CASE 1.0. {{{ }}} raw expression => don't parse
         return template
@@ -214,9 +207,7 @@ class Template {
   raw_get(o, vars) {
     let fun = new Function("uri", "cwd", "key", "local", "global", "self", "input", "current", "next", "event", "_", "os", "path", "system", "pip", "platform", "arch", "gpu", "gpus", "kernel", `return ${o}`)
     try {
-      console.log("fun", fun.toString())
       let response = fun(vars.uri, vars.cwd, vars.key, vars.local, vars.global, vars.self, vars.input, vars.current, vars.next, vars.event, _, this.os, path, system, vars.pip, this.platform, this.arch, this.gpu, this.gpus, this.kernel)
-      console.log("response", response)
       if (typeof response === "undefined") {
         return `{{${o}}}`
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.17",
+  "version": "1.1.18",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -33,6 +33,7 @@
     "http-proxy": "^1.18.1",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
+    "jimini": "^0.0.2",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",