pinokiod 3.11.0 → 3.11.6

package/kernel/bin/git.js

@@ -12,34 +12,47 @@ class Git {
     }
   }
   async install(req, ondata) {
+    console.log("GIT install")
+    await this.kernel.bin.exec({
+      message: [
+        "conda clean -y --all",
+        `conda install -y -c conda-forge ${this.cmd()}`
+      ]
+    }, ondata)
     if (this.kernel.platform === "darwin") {
+      console.log("brew install gh")
       await this.kernel.bin.exec({
-        conda: { skip: true },
-        message: "brew install gh",
-      }, ondata)
-    } else {
-      await this.kernel.bin.exec({
+//        conda: { skip: true },
         message: [
-          "conda clean -y --all",
-          `conda install -y -c conda-forge ${this.cmd()}`
-        ]
-      }, ondata)
+          "echo $PATH",
+          "which brew",
+          "brew install gh",
+        ],
+      }, (e) => {
+        process.stdout.write(e.raw)
+        ondata(e)
+      })
     }
     await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
-//    if (this.kernel.platform === 'win32') {
-//      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-//      // check if gitconfig exists
-//      let exists = await this.kernel.api.exists(gitconfig_path)
-//      // if not, create one
-//      if (!exists) {
-//        await fs.promises.copyFile(
-//          path.resolve(__dirname, "..", "gitconfig_template"),
-//          gitconfig_path
-//        )
-//      }
-//    }
+
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    // check if gitconfig exists
+    let exists = await this.kernel.api.exists(gitconfig_path)
+    // if not, create one
+    if (!exists) {
+      await fs.promises.copyFile(
+        path.resolve(__dirname, "..", "gitconfig_template"),
+        gitconfig_path
+      )
+    }
   }
   async installed() {
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    let exists = await this.kernel.api.exists(gitconfig_path)
+    if (!exists) {
+      return false; 
+    }
+
     if (this.kernel.platform === "darwin") {
       let gh_config_exists = await this.kernel.exists("config/gh")
       return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.brew.has("gh") && gh_config_exists

package/kernel/bin/index.js

@@ -285,13 +285,13 @@ class Bin {
         await fs.promises.writeFile(pipconfig_path, pipconfigStr) 
       }
 
-      // add gitconfig => support git lfs, long path, etc.
-      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-      // check if gitconfig exists
-      await fs.promises.copyFile(
-        path.resolve(__dirname, "..", "gitconfig_template"),
-        gitconfig_path
-      )
+//      // add gitconfig => support git lfs, long path, etc.
+//      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+//      // check if gitconfig exists
+//      await fs.promises.copyFile(
+//        path.resolve(__dirname, "..", "gitconfig_template"),
+//        gitconfig_path
+//      )
 
       for(let mod of this.mods) {
         if (mod.mod.start) {

package/kernel/bin/setup.js

@@ -1,8 +1,15 @@
 const os = require('os')
 let platform = os.platform()
+let zip_cmd
+if (platform === 'win32') {
+  zip_cmd = "7zip"
+} else {
+  zip_cmd = "p7zip"
+}
 module.exports = {
   ai: (kernel) => {
     let conda_requirements = [
+      zip_cmd,
       "uv",
       "node",
       "huggingface",
@@ -12,19 +19,21 @@ module.exports = {
     ]
     let requirements = [
       { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
       { name: "git", },
-  //      { name: "zip", },
       { name: "node", },
       { name: "ffmpeg", },
 //      { name: "caddy", }
-    ]
+    ])
     if (platform === "win32") {
       requirements.push({ name: "registry" })
       requirements.push({ name: "vs" })
     }
-    if (platform === "darwin") {
-      requirements.push({ name: "brew" })
-    }
     if (platform === "linux") {
       requirements.push({ name: "gxx" })
       conda_requirements.push("gxx")
@@ -49,34 +58,50 @@ module.exports = {
     }
   },
   javascript: (kernel) => {
+    let requirements = [
+      { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
+      { name: "git", },
+      { name: "node", },
+      { name: "py" },
+    ])
     return {
       icon: "fa-brands fa-js",
       title: "Node.js",
       description: "Set up self-contained node.js development environment",
-      requirements: [
-        { name: "conda", },
-        { name: "git", },
-        { name: "node", },
-        { name: "py" },
-      ],
+      requirements,
       conda_requirements: [
+        zip_cmd,
         "node",
         "git",
       ]
     }
   },
   python: (kernel) => {
+    let requirements = [
+      { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
+      { name: "git", },
+      { name: "uv", },
+      { name: "py" },
+    ])
     return {
       icon: "fa-brands fa-python",
       title: "Python",
       description: "Set up self-contained python development environment",
-      requirements: [
-        { name: "conda", },
-        { name: "git", },
-        { name: "uv", },
-        { name: "py" },
-      ],
+      requirements,
       conda_requirements: [
+        zip_cmd,
         "uv",
         "git",
       ]
@@ -85,11 +110,18 @@ module.exports = {
   dev: (kernel) => {
     let requirements = [
       { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
       { name: "git", },
       { name: "node", },
       { name: "uv", },
-    ]
+    ])
     let conda_requirements = [
+      zip_cmd,
       "uv",
       "node",
       "git",
@@ -114,34 +146,52 @@ module.exports = {
     }
   },
   network: (kernel) => {
+    let requirements = [
+      { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
+      { name: "git", },
+      { name: "caddy", },
+      { name: "py", },
+    ])
+    console.log("Setup.network", requirements)
     return {
       icon: "fa-solid fa-wifi",
       title: "Network",
       description: "Automatic HTTPS and local network sharing for ALL local apps",
-      requirements: [
-        { name: "conda", },
-        { name: "git", },
-        { name: "caddy", },
-        { name: "py", },
-      ],
+      requirements,
       conda_requirements: [
+        zip_cmd,
         "git",
         "caddy"
       ]
     }
   },
   connect: (kernel) => {
+    let requirements = [
+      { name: "conda", },
+      { name: "zip", },
+    ]
+    if (platform === "darwin") {
+      requirements.push({ name: "brew" })
+    }
+    requirements = requirements.concat([
+      { name: "git", },
+      { name: "caddy", },
+      { name: "py", },
+    ])
+    console.log("Setup.connect", requirements)
     return {
       icon: "fa-solid fa-wifi",
       title: "API Connect",
       description: "Connect with 3rd party APIs",
-      requirements: [
-        { name: "conda", },
-        { name: "git", },
-        { name: "caddy", },
-        { name: "py", },
-      ],
+      requirements,
       conda_requirements: [
+        zip_cmd,
         "git",
         "caddy"
       ]

package/kernel/index.js

@@ -264,14 +264,20 @@ class Kernel {
   }
   async refresh(notify_peers) {
     let env = await Environment.get(this.homedir)
-    let peer_active = false
+    let peer_active = true
     // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
-    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
-      peer_active = true
+    // By default it should be on.
+    // It's off if the value is set, and it's 0 or false
+
+    //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
+    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
+      peer_active = false
     }
-    let https_active = false
-    if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
-      https_active = true
+    let https_active = true
+    //if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
+    if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="0" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="false")) {
+      //https_active = true
+      https_active = false 
     }
 //    console.log("kernel.refresh", { active, notify_peers })
 
@@ -643,6 +649,13 @@ class Kernel {
         // 2. mkdir all the folders if not already created
         await Environment.init_folders(this.homedir)
 
+        // if key.json doesn't exist, create an empty json file
+        let ee = await this.exists(this.homedir, "key.json")
+        if (!ee) {
+          await fs.promises.writeFile(path.resolve(this.homedir, "key.json"), JSON.stringify({}))
+        }
+
+
 
 //        // 3. check if Caddyfile exists
 //        let e2 = await this.exists(this.homedir, "Caddyfile")

package/kernel/peer.js

@@ -29,10 +29,11 @@ class PeerDiscovery {
     let env = await Environment.get(kernel.homedir)
 
     // by default expose to the local network
-    this.active = false
+    this.active = true
     // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
-    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
-      this.active = true
+    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
+    //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
+      this.active = false
     }
 
     this.name = os.userInfo().username

package/kernel/prototype.js

@@ -30,7 +30,7 @@ class Proto {
       console.log("--config", config)
       this.config = config
 
-      if (this.config.menu) {
+      if (this.config && this.config.menu) {
         this.config.menu.push({
           icon: "fa-solid fa-rotate",
           text: "Update",

package/kernel/shell.js

@@ -318,6 +318,11 @@ class Shell {
 
 //    return this.id
   }
+  resize({ cols, rows }) {
+    console.log("RESIZE", { cols, rows })
+    this.ptyProcess.resize(cols, rows)
+    this.vt.resize(cols, rows)
+  }
   emit2(message) {
     let i = 0;
     const interval = setInterval(() => {

package/kernel/shells.js

@@ -257,6 +257,21 @@ class Shells {
     let response = await this.send(params, ondata)
     return response
   }
+  resize(params) {
+    /*
+      params := {
+        "id": <shell id>,
+        "resize": {
+          "cols": <cols>,
+          "rows": <rows>,
+        }
+      }
+    */
+    let session = this.get(params.id)
+    if (session) {
+      session.resize(params.resize)
+    }
+  }
   emit(params) {
     /*
       params := {

package/package.json

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

package/server/index.js

@@ -2449,6 +2449,13 @@ class Server {
         let p2 = path.resolve(home, "prototype")
         await fse.remove(p2)
 
+        let p3 = path.resolve(home, "plugin")
+        await fse.remove(p3)
+
+        let gitconfig = path.resolve(home, "gitconfig")
+        await fse.remove(gitconfig)
+
+
         console.log("[TRY] Updating to the new version")
         this.kernel.store.set("version", this.version.pinokiod)
         console.log("[DONE] Updating to the new version")
@@ -2770,6 +2777,51 @@ class Server {
 //      }
     }))
 
+    this.app.get("/check_router_up", ex(async (req, res) => {
+      // check if caddy is runnign properly
+      //    try https://pinokio.localhost
+      //    if it works, proceed
+      //    if not, redirect
+      let https_running = false
+      try {
+        let res = await axios.get(`http://127.0.0.1:2019/config/`, {
+          timeout: 2000
+        })
+        let test = /pinokio\.localhost/.test(JSON.stringify(res.data))
+        if (test) {
+          https_running = true
+        }
+      } catch (e) {
+        console.log(e)
+      }
+      console.log({ https_running })
+      if (!https_running) {
+        res.json({ error: "pinokio.host not yet available" })
+//        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
+        return
+      }
+
+
+      // check if pinokio.localhost router is running
+      let router_running = false
+      let router = this.kernel.router.published()
+      for(let ip in router) {
+        let domains = router[ip]
+        if (domains.includes("pinokio.localhost")) {
+          router_running = true
+          break
+        }
+      }
+      console.log({ router_running })
+      if (!router_running) {
+        res.json({ error: "pinokio.localhost not yet available" })
+//        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
+        return
+      }
+
+      res.json({ success: true })
+    }))
+
     /*
     GET /connect => display connection options
     - github
@@ -2804,32 +2856,13 @@ class Server {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("connect"),
       })
-      console.log({ requirements_pending, install_required })
+      console.log("1", { requirements_pending, install_required })
       if (!requirements_pending && install_required) {
+        console.log("REDIRECT", req.params.provider)
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
         return
       }
 
-      // check if router is running
-      let router_running = false
-      let router = this.kernel.router.published()
-      for(let ip in router) {
-        let domains = router[ip]
-        if (domains.includes("pinokio.localhost")) {
-          router_running = true
-          break
-        }
-      }
-      console.log({ router_running })
-      if (!router_running) {
-        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
-        return
-      }
-
-      // check if caddy is runnign properly
-      //    try https://pinokio.localhost
-      //    if it works, proceed
-      //    if not, redirect
       let https_running = false
       try {
         let res = await axios.get(`http://127.0.0.1:2019/config/`, {
@@ -2844,10 +2877,30 @@ class Server {
       }
       console.log({ https_running })
       if (!https_running) {
+//        res.json({ error: "pinokio.host not yet available" })
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
         return
       }
 
+
+      // check if pinokio.localhost router is running
+      let router_running = false
+      let router = this.kernel.router.published()
+      for(let ip in router) {
+        let domains = router[ip]
+        if (domains.includes("pinokio.localhost")) {
+          router_running = true
+          break
+        }
+      }
+      console.log({ router_running })
+      if (!router_running) {
+//        res.json({ error: "pinokio.localhost not yet available" })
+        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
+        return
+      }
+
+
       let readme = await this.kernel.connect[req.params.provider].readme()
       res.render(`connect/${req.params.provider}`, {
         portal: this.portal,
@@ -3022,28 +3075,63 @@ class Server {
       }
       let md = await fs.promises.readFile(path.resolve(__dirname, "..", "kernel/connect/providers/github/README.md"), "utf8")
       let readme = marked.parse(md)
+
+      let hosts = ""
+      let hosts_file = this.kernel.path("config/gh/hosts.yml")
+      let e = await this.exists(hosts_file)
+      console.log({ hosts_file, e })
+      if (e) {
+        hosts = await fs.promises.readFile(hosts_file, "utf8")
+        console.log( { hosts: `#${hosts}#` })
+        if (hosts.startsWith("{}")) {
+          hosts = ""
+        }
+      }
+      console.log("hosts", hosts)
+
+      let items
+      if (hosts.length > 0) {
+        // logged in => display logout
+        items = [{
+          icon: "fa-solid fa-circle-xmark",
+          title: "Logout",
+          description: "Log out of Github",
+          url: "/github/logout"
+        }]
+      } else {
+        // logged out => display login
+        items = [{
+          icon: "fa-solid fa-key",
+          title: "Login",
+          description: "Log into Github",
+          url: "/github/login"
+        }]
+      }
+
       res.render("github", {
+        hosts,
         readme,
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
         agent: this.agent,
-        items: [{
-          icon: "fa-solid fa-key",
-          title: "Login",
-          description: "Log into Github",
-          url: "/github/login"
-        }, {
-          icon: "fa-solid fa-check",
-          title: "Status",
-          description: "Check Github login status",
-          url: "/github/status"
-        }, {
-          icon: "fa-solid fa-circle-xmark",
-          title: "Logout",
-          description: "Log out of Github",
-          url: "/github/logout"
-        }]
+        items
+//        items: [{
+//          icon: "fa-solid fa-key",
+//          title: "Login",
+//          description: "Log into Github",
+//          url: "/github/login"
+////        }, {
+////          icon: "fa-solid fa-check",
+////          title: "Status",
+////          description: "Check Github login status",
+////          url: "/github/status"
+//        }, {
+//          icon: "fa-solid fa-circle-xmark",
+//          title: "Logout",
+//          description: "Log out of Github",
+//          url: "/github/logout"
+//        }]
       })
     }))
     this.app.get("/github/status", ex(async (req, res) => {
@@ -3067,7 +3155,7 @@ class Server {
       params.set("message", encodeURIComponent(message))
       params.set("path", this.kernel.homedir)
 //      params.set("kill", "/Logged in/i")
-      params.set("kill_message", "Click to return home")
+//      params.set("kill_message", "Click to return home")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
       params.set("target", "_top")
@@ -3091,7 +3179,7 @@ class Server {
       params.set("input", true)
       params.set("path", this.kernel.homedir)
       params.set("kill", "/Logged in/i")
-      params.set("kill_message", "Your Github account is now connected.")
+//      params.set("kill_message", "Your Github account is now connected.")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
       params.set("target", "_top")
@@ -3229,14 +3317,38 @@ class Server {
         bin
       })
       // set dependencies for conda
+      let cr = new Set()
       for(let i=0; i<requirements.length; i++) {
         let r = requirements[i]
         if (r.name === "conda") {
           requirements[i].dependencies = bin.conda_requirements
+          if (bin.conda_requirements) {
+            for(let r of bin.conda_requirements) {
+              cr.add(r)
+            }
+          }
         }
       }
+
+      // if the setup mode includes caddy, wait
+      let wait = null
+      if (cr.has("caddy")) {
+        wait = "caddy"
+      }
+      console.log({ wait, cr })
+
       let current = req.query.callback || req.originalUrl
+      console.log("render setup", { current })
+
+//      console.log("2", { requirements_pending, install_required })
+//      if (!requirements_pending && !install_required) {
+//        console.log("redirect", current)
+//        res.redirect(current)
+//        return
+//      }
+//
       res.render("setup", {
+        wait,
         error,
         current,
         install_required,
@@ -4392,6 +4504,7 @@ class Server {
       res.redirect("/pinokio/install")
     }))
     this.app.get("/pinokio/install", ex((req, res) => {
+      console.log("render /pinokio/install")
       let requirements = req.session.requirements
       let callback = req.session.callback
       req.session.requirements = null

package/server/public/common.js

@@ -48,6 +48,11 @@ document.addEventListener("DOMContentLoaded", () => {
       history.forward()
     })
   }
+  if (document.querySelector("#refresh-page")) {
+    document.querySelector("#refresh-page").addEventListener("click", (e) => {
+      location.reload()
+    })
+  }
   if (document.querySelector("#genlog")) {
     document.querySelector("#genlog").addEventListener("click", (e) => {
       e.preventDefault()