pinokiod 7.3.5 → 7.3.8

package/kernel/resource_usage/index.js

@@ -55,8 +55,7 @@ class ResourceUsageService {
     })
     this.gpuSampler = new GpuSampler({
       kernel: this.kernel,
-      ttlMs: 10000,
-      timeoutMs: 2500
+      ttlMs: 5000
     })
     this.cpuAverages = new Map()
     this.workspaceCache = new Map()
@@ -76,6 +75,12 @@ class ResourceUsageService {
     return preferences
   }
 
+  stop() {
+    if (this.gpuSampler && typeof this.gpuSampler.stop === "function") {
+      this.gpuSampler.stop()
+    }
+  }
+
   getShellRootGroups() {
     if (!this.kernel || !this.kernel.shell || typeof this.kernel.path !== "function") {
       return new Map()
@@ -243,8 +248,8 @@ class ResourceUsageService {
       ? await this.macFootprintSampler.getFootprintByPid(this.selectFootprintPids(allPids))
       : null
 
-    const gpuSnapshot = preferences.show_vram && allPids.size > 0
-      ? await this.gpuSampler.getSnapshot()
+    const gpuSnapshot = preferences.show_vram && this.platform !== "darwin" && allPids.size > 0
+      ? await this.gpuSampler.getSnapshot(allPids)
       : null
 
     const nextCache = new Map()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.3.5",
+  "version": "7.3.8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -56,6 +56,7 @@
     "key-store": "^1.2.0",
     "kill-sync": "^1.0.3",
     "kleur": "^4.1.5",
+    "koffi": "^3.0.2",
     "lodash": "^4.17.21",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",

package/server/index.js

@@ -396,6 +396,9 @@ class Server {
     }
   }
   stop() {
+    if (this.resourceUsage && typeof this.resourceUsage.stop === 'function') {
+      this.resourceUsage.stop()
+    }
     this.server.close()
   }
   killProcessTree(pid, label) {
@@ -2924,7 +2927,12 @@ class Server {
       }
     }
     if (pathComponents.length === 0 && req.query.mode === "explore") {
+      const peerAccess = await this.composePeerAccessPayload()
+      let list = this.getPeers()
       res.render("explore", {
+        current_host: this.kernel.peer.host,
+        ...peerAccess,
+        list,
         discover_dark: this.discover_dark,
         discover_light: this.discover_light,
         portal: this.portal,
@@ -5051,7 +5059,7 @@ class Server {
 
     if (this.theme === "dark") {
       this.colors = {
-        color: "#252527",
+        color: "#1b1c1d",
 //        symbolColor: "white"
         symbolColor: "#F4F4F4"
 //        color: "rgb(31, 29, 39)",
@@ -5060,7 +5068,7 @@ class Server {
     } else {
       this.colors = {
         //color: "white",
-        color: "#F4F4F4",
+        color: "#ffffff",
 //        color: "#F5F4FA",
         symbolColor: "#000000",
       }
@@ -13537,6 +13545,7 @@ class Server {
       }
 
       let current = req.query.callback || req.originalUrl
+      const peerAccess = await this.composePeerAccessPayload()
 
 //      console.log("2", { requirements_pending, install_required })
 //      if (!requirements_pending && !install_required) {
@@ -13546,6 +13555,9 @@ class Server {
 //      }
 //
       res.render("setup", {
+        current_host: this.kernel.peer.host,
+        ...peerAccess,
+        list: this.getPeers(),
         mode: req.params.mode,
         wait,
         error,

package/server/public/nav.js

@@ -25,7 +25,7 @@ document.addEventListener("DOMContentLoaded", () => {
     return;
   }
 
-  const headerMinimizeEnabled = !!minimizeButton;
+  const headerMinimizeEnabled = !!minimizeButton && minimizeButton.dataset.mainSidebarHeaderToggle !== "true";
   if (!headerMinimizeEnabled) {
     header.classList.remove("minimized", "transitioning");
   }