pinokiod 3.8.153 → 3.8.1530

package/kernel/bin/git.js

@@ -14,6 +14,7 @@ class Git {
         `conda install -y -c conda-forge ${this.cmd()}`
       ]
     }, ondata)
+    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
@@ -28,18 +29,18 @@ class Git {
 //    }
   }
   async installed() {
-    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
+    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.conda.has("gh") && gh_config_exists
   }
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
   env() {
-//    if (this.kernel.platform === 'win32') {
-      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-      return {
-        GIT_CONFIG_GLOBAL: gitconfig_path
-      }
-//    }
+    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+    return {
+      GIT_CONFIG_GLOBAL: gitconfig_path,
+      GH_CONFIG_DIR: this.kernel.path("config/gh")
+    }
   }
   async requires() {
     return ["conda"]

package/kernel/bin/index.js

@@ -56,6 +56,7 @@ class Bin {
       params.cols = this.client.cols
       params.rows = this.client.rows
     }
+    console.log({ params })
     let response = await this.kernel.shell.run(params, null, ondata)
     return response
   }

package/kernel/peer.js

@@ -106,7 +106,6 @@ class PeerDiscovery {
   }
   // refresh peer info
   async refresh(peers) {
-      console.log("*Refresh")
 //    if (this.active) {
       this.refreshing = true
       let refresh_peers
@@ -119,7 +118,6 @@ class PeerDiscovery {
       let peer_info = await Promise.all(refresh_peers.map((host) => {
         return this._refresh(host)
       }))
-      console.log("*Peer.refresh", { peer_info })
       for(let i=0; i<peer_info.length; i++) {
         let peer = peer_info[i]
         if (peer) {

package/kernel/router/index.js

@@ -214,7 +214,7 @@ class Router {
         let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
           headers: { 'Content-Type': 'application/json' }
         })
-        console.log("Caddy Response", { response })
+//        console.log("Caddy Response", { response })
         this.old_config = this.config
       } catch (e) {
         console.log("EEEEEEEEEEEEE", e)

package/kernel/shell.js

@@ -923,6 +923,7 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
+            console.log({ data, done: this.done })
             if (!this.done) {
               this.queue.push(data)
             }
@@ -985,6 +986,7 @@ class Shell {
         // automatically remove the shell from this.kernel.shells
         this.kernel.shell.rm(this.id)
         this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+        this.ondata({ raw: "", type: "shell.kill" })
         console.log("before cb 1")
         cb()
       } else {
@@ -994,10 +996,12 @@ class Shell {
         // automatically remove the shell from this.kernel.shells
         this.kernel.shell.rm(this.id)
         this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+        this.ondata({ raw: "", type: "shell.kill" })
       }
     } else {
       this.kernel.shell.rm(this.id)
       this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
+      this.ondata({ raw: "", type: "shell.kill" })
     }
 
 

package/package.json

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

package/server/index.js

@@ -1468,12 +1468,20 @@ class Server {
           if (rendered.venv) params.set("venv", encodeURIComponent(rendered.venv))
           if (rendered.input) params.set("input", true)
           if (rendered.callback) params.set("callback", encodeURIComponent(rendered.callback))
+          if (rendered.kill) params.set("kill", encodeURIComponent(rendered.kill))
+          if (rendered.done) params.set("done", encodeURIComponent(rendered.done))
           if (rendered.env) {
             for(let key in rendered.env) {
               let env_key = "env." + key
               params.set(env_key, rendered.env[key])
             }
           }
+          if (rendered.conda) {
+            for(let key in rendered.conda) {
+              let conda_key = "conda." + key
+              params.set(conda_key, rendered.conda[key])
+            }
+          }
 
           // deterministic shell id generation
           // `${api_path}_${i}_${hash}`
@@ -2464,6 +2472,43 @@ class Server {
       Util.openfs(req.body.path, req.body, this.kernel)
       res.json({ success: true })
     }))
+    this.app.post("/keys", ex(async (req, res) => {
+      let p = this.kernel.path("key.json")
+      let keys  = (await this.kernel.loader.load(p)).resolved
+      console.log("update", req.body)
+      for(let host in req.body) {
+        let updated = req.body[host]
+        for(let indexStr in updated) {
+          let index = parseInt(indexStr)
+          keys[host][index] = updated[indexStr]
+        }
+      }
+      await fs.promises.writeFile(p, JSON.stringify(keys, null, 2))
+      res.json({ success: true })
+    }))
+    this.app.get("/keys", ex(async (req, res) => {
+      let p = this.kernel.path("key.json")
+      let keys  = (await this.kernel.loader.load(p)).resolved
+      console.log({ keys })
+      let items = []
+      if (keys) {
+        let sorted_keys = Object.keys(keys)
+        sorted_keys.sort((a, b) => { return a > b })
+        for(let key of sorted_keys) {
+          console.log({ key })
+          items.push({
+            host: key,
+            vals: keys[key]
+          })
+        }
+      }
+      res.render("keys", {
+        filepath: p,
+        theme: this.theme,
+        agent: this.agent,
+        items
+      })
+    }))
     this.app.get("/docs", ex(async (req, res) => {
       let url = req.query.url
       const possiblePaths = [
@@ -2524,6 +2569,28 @@ class Server {
         })
       }
     }))
+    this.app.get("/github/login", ex(async (req, res) => {
+      let params = new URLSearchParams()
+      let delimiter
+      if (this.kernel.platform === "win32") {
+        delimiter = " && "; // must use &&. & doesn't necessariliy wait until the curruent command finishes
+      } else {
+        delimiter = " ; ";
+      }
+      let message = [
+        "gh auth setup-git --hostname github.com --force",
+        "gh auth login --web --git-protocol https"
+      ].join(delimiter)
+      params.set("message", encodeURIComponent(message))
+      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("callback", encodeURIComponent("/"))
+      params.set("id", "github")
+      let url = "/shell/github?" + params.toString()
+      res.redirect(url)
+    }))
     this.app.get("/shell/:id", ex(async (req, res) => {
       /*
         req.query := {
@@ -2532,6 +2599,8 @@ class Server {
           venv,
           callback,
           kill,               // regex for killing
+          on.<regex1>: <key>,
+          on.<regex2>: <key>,
           env.<key1>,
           env.<key2>,
           ...
@@ -2543,9 +2612,15 @@ class Server {
       let id = decodeURIComponent(req.params.id)
       let cwd = this.kernel.path(this.kernel.api.filePath(decodeURIComponent(req.query.path)))
       let message = req.query.message ? decodeURIComponent(req.query.message) : null
+      //let message = req.query.message ? req.query.message : null
+      console.log({ message })
       let venv = req.query.venv ? decodeURIComponent(req.query.venv) : null
       let input = req.query.input ? true : false
       let callback = req.query.callback ? decodeURIComponent(req.query.callback) : null
+      let kill_message = req.query.kill_message ? decodeURIComponent(req.query.kill_message) : null
+      let done_message = req.query.done_message ? decodeURIComponent(req.query.done_message) : null
+      let kill = req.query.kill ? decodeURIComponent(req.query.kill) : null
+      let done = req.query.done ? decodeURIComponent(req.query.done) : null
       let env = {}
       for(let env_key in req.query) {
         if (env_key.startsWith("env.")) {
@@ -2554,6 +2629,24 @@ class Server {
           env[key] = req.query[env_key]
         }
       }
+      let conda = {}
+      let conda_exists = false
+      for(let conda_key in req.query) {
+        if (conda_key.startsWith("conda.")) {
+          let chunks = conda_key.split(".")
+          let key = chunks.slice(1).join(".")
+          conda[key] = req.query[conda_key]
+          conda_exists = true
+        }
+      }
+//      let pattern = {}
+//      for(let pattern_key in req.query) {
+//        if (pattern_key.startsWith("pattern.")) {
+//          let chunks = pattern_key.split(".")
+//          let key = chunks.slice(1).join(".")
+//          pattern[key] = req.query[pattern_key]
+//        }
+//      }
 
       let shell = this.kernel.shell.get(id)
       console.log({ shell })
@@ -2564,8 +2657,14 @@ class Server {
         cwd,
         message,
         venv,
+        conda: (conda_exists ? conda: null),
         env,
+//        pattern,
         input,
+        kill,
+        kill_message,
+        done,
+        done_message,
         callback,
         running: (shell ? true : false)
       })
@@ -2640,6 +2739,11 @@ class Server {
         agent: this.agent,
       })
     }))
+    this.app.post("/network/reset", ex(async (req, res) => {
+      let caddy_path = this.kernel.path("cache/XDG_DATA_HOME/caddy")
+      await rimraf(caddy_path)
+      res.json({ success: true })
+    }))
     this.app.get("/network", ex(async (req, res) => {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("network"),

package/server/views/keys.ejs

@@ -0,0 +1,276 @@
+<html class='columns'>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+<script src="/hotkeys.min.js"></script>
+<script src="/ace/ace.js"></script>
+<script src="/noty.js"></script>
+<script src="/notyq.js"></script>
+<script src="/xterm.js"></script>
+<script src="/xterm-addon-fit.js"></script>
+<script src="/xterm-addon-web-links.js"></script>
+<script src="/xterm-theme.js"></script>
+<script src="/xterm-addon-search.js"></script>
+<script src="/xterm-addon-search-bar.js"></script>
+<script src="/sweetalert2.js"></script>
+<script src="/Socket.js"></script>
+<script src="/common.js"></script>
+<script src="/he.js"></script>
+<script src="/opener.js"></script>
+<script src="/nav.js"></script>
+<script src="/autoexpand.js"></script>
+<script src="/modalinput.js"></script>
+<script src="/simplemodal.js"></script>
+<script src="/waitmodal.js"></script>
+<script src="/notifyinput.js"></script>
+<script src="/report.js"></script>
+<link href="/xterm.min.css" rel="stylesheet" />
+<link href="/css/fontawesome.min.css" rel="stylesheet">
+<link href="/css/solid.min.css" rel="stylesheet">
+<link href="/css/regular.min.css" rel="stylesheet">
+<link href="/css/brands.min.css" rel="stylesheet">
+<link href="/style.css" rel="stylesheet"/>
+<link href="/noty.css" rel="stylesheet"/>
+<% if (agent === "electron") { %>
+  <link href="/electron.css" rel="stylesheet"/>
+<% } %>
+<style>
+body.frozen {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+#table > table {
+  border-left: 2px solid black;
+  padding-left: 5px;
+  margin: 10px 0;
+}
+.highlight {
+  background: yellow;
+  width: 100px;
+}
+th {
+  background: rgba(0,0,0,0.1);
+  padding: 10px;
+  font-size: 12px;
+}
+td {
+  font-size: 12px;
+  padding: 10px;
+}
+td.val {
+  background: rgba(0,0,0,0.06);
+}
+td.key {
+  background: rgba(0,0,0,0.1);
+}
+.button {
+  cursor: pointer; 
+  background: rgba(0,0,0,0.8);
+  color: white;
+  padding: 5px 10px;
+  border-radius: 4px;
+}
+.button:hover {
+  
+}
+  #editor {
+    width: 100%;
+    box-sizing: border-box;
+    max-width: 600px;
+    padding: 20px;
+    margin: 0 auto;
+  }
+
+header .btn {
+  font-family: Sans-serif;
+  display: block;
+  margin-left: 10px;
+  font-style: normal;
+  font-size: 12px;
+  font-weight: normal;
+  padding: 5px 10px;
+}
+.disabled {
+  opacity: 0.7;
+}
+body.dark .env-item input[type=text] {
+  background: white;
+}
+.env-item input[type=text] {
+  width: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  border: none;
+  background: rgba(0,0,100, 0.1);
+}
+body.dark .env-item label {
+  color: cornflowerblue;
+}
+.env-item label {
+  color: royalblue;
+  display: block;
+  margin-bottom: 5px;
+  font-weight: bold;
+  font-size: 18px;
+}
+.env-item.highlighted {
+  border: 5px solid red;
+}
+.env-item {
+/*
+  padding-top: 10px;
+  padding-bottom: 30px;
+  */
+  padding: 10px;
+  margin-bottom: 20px;
+}
+body.dark .comment {
+  border-left: 2px solid white;
+}
+.comment {
+  opacity: 0.8;
+  border-left: 2px solid black;
+  padding-left: 10px;
+}
+#save {
+  background: royalblue;
+}
+a#customize {
+  text-decoration: underline;
+  cursor: pointer;
+}
+.e {
+  padding: 10px 0;
+}
+#editor {
+  padding: 20px 0;
+}
+.center {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+body {
+  display: block;
+}
+.card {
+  display: flex;
+  padding: 10px 0;
+  box-sizing: border-box;
+}
+.card img {
+  width: 100px;
+  border-radius: 10px;
+}
+.card .description {
+  opacity: 0.8;
+}
+.card .title {
+  font-weight: bold;
+  font-size: 30px;
+  letter-spacing: -1px;
+}
+.card .col {
+  padding-left: 10px;
+}
+h1 {
+  font-size: 50px;
+  padding-bottom: 20px;
+}
+footer {
+  background: none;
+  padding: 0;
+  text-align: right;
+  display: flex;
+  margin: 10px 0 20px 0;
+}
+footer .btn {
+  margin-left: 10px;
+  display: inline-block;
+  -webkit-appearance: button;
+  -moz-appearance: button;
+  appearance: button;
+
+}
+footer .btn.go-home {
+  margin-left: 0px;
+}
+.btn.home-button {
+  background: none !important;
+  margin: 0 !important;
+  font-size: 16px !important;
+}
+#editor {
+  height: auto;
+}
+.env-title {
+  font-weight: bold;
+}
+.env-description {
+  margin-bottom: 10px;
+}
+input[type=text] {
+  margin-bottom: 5px;
+}
+</style>
+<script>
+document.addEventListener("DOMContentLoaded", async () => {
+  const n = new N()
+  let updated = {}
+  document.addEventListener("input", (e) => {
+    let host = e.target.getAttribute("data-host")
+    let index = e.target.getAttribute("data-index")
+    if (!updated[host]) {
+      updated[host] = {}
+    }
+    updated[host][index] = e.target.value
+  })
+  document.querySelector("#save").addEventListener("click", async (e) => {
+    console.log({ updated })
+    let res = await fetch("/keys", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(updated)
+    }).then((res) => {
+      return res.json()
+    })
+    console.log("res" ,res)
+    n.Noty({
+      text: `Updated!`
+    })
+    setTimeout(() => {
+      location.href = location.href
+    }, 1000)
+  })
+})
+</script>
+</head>
+<body class='<%=theme%>'>
+  <main>
+    <header class='navheader grabbable'>
+      <h1>
+        <a class='home-button home' href="/"><i class='fa-solid fa-home'></i></a>
+        <div class='flexible'></div>
+        <div class='nav-btns'>
+          <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
+          <div id='save' class='btn'>
+            <span class='save'><i class="fa-solid fa-check"></i> Save</span>
+          </div>
+        </div>
+      </h1>
+    </header>
+    <div id='editor'>
+      <% items.forEach((item) => { %>
+        <div class='env-item'>
+          <label for="<%=item.host%>"><%=item.host%></label>
+          <% item.vals.forEach((val, index) => { %>
+            <input data-host="<%=item.host%>" data-index="<%=index%>" type="text" value="<%=val%>">
+          <% }) %>
+        </div>
+      <% }) %>
+    </div>
+  </main>
+</body>
+</html>

package/server/views/network.ejs

@@ -214,13 +214,18 @@ a.ln:hover {
   */
   padding: 10px 0;
 }
-#advanced-label {
+#reset-label {
+  color: firebrick;
+}
+.link-label {
+  margin-right: 10px;
   text-decoration: underline;
   color: royalblue;
   cursor: pointer;
 }
 .container-row table {
   width: 100%;
+  table-layout: fixed;
 }
 table a {
   text-decoration: none;
@@ -235,6 +240,7 @@ td:first-child, th:first-child {
   text-transform: uppercase;
 }
 .container-row th {
+  vertical-align: top;
   border-bottom: 1px solid rgba(0,0,0,0.05);
   text-align: left;
   padding: 20px 0;
@@ -249,6 +255,7 @@ td:first-child, th:first-child {
   vertical-align: top;
   font-size: 14px;
   padding: 5px 2px;
+  word-wrap: break-word;
 }
 
 .config {
@@ -440,7 +447,8 @@ input:checked + .slider:before {
     </div>
     <div class='advanced'>
       <div class='row'>
-        <div id='advanced-label' class='label'>Advanced</div>
+        <div id='advanced-label' class='link-label label'>Advanced</div>
+        <div id='reset-label' class='link-label label'>Reset HTTPS Certificates</div>
       </div>
       <!--
       <div id='advanced-input' class='row hidden'>
@@ -595,7 +603,50 @@ input:checked + .slider:before {
   </div>
 </main>
 <script>
+document.querySelector("#reset-label").addEventListener("click", async (e) => {
+  e.preventDefault()
+  e.stopPropagation()
+  let ok = confirm("are you sure you want to re-generate http certificates?")
+  if (ok) {
+    let r = await fetch("/network/reset", {
+      method: "post",
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }).then((res) => {
+      return res.json()
+    })
+    if (r.success) {
+      //alert("Successfully updated the pinokio home to " + val)
+      document.querySelector(".loading").classList.remove("hidden")
+      document.querySelector(".save").classList.add("hidden")
+      fetch("/restart", {
+        method: "post"
+      }, () => {
+      })
+      setInterval(async () => {
+        try {
+          let res = await fetch("/check_peer").then((res) => {
+            return res.json()
+          })
+          if (res.success) {
+            document.querySelector(".loading").classList.add("hidden")
+            location.href = location.href
+          }
+        } catch (e) {
+          console.log(e)
+        }
+      }, 1000)
+    } else if (r.error) {
+      alert(r.error)
+      location.href = location.href
+    }
+  }
+
+})
 document.querySelector("#advanced-label").addEventListener("click", (e) => {
+  e.preventDefault()
+  e.stopPropagation()
   //document.querySelector("#advanced-input").classList.toggle("hidden") 
   Commander({
     callback: "/network",

package/server/views/prototypes.ejs

@@ -137,9 +137,10 @@ body.dark .badge {
   font-weight: bold;
 }
 .folder-templates .folder img {
-  width: 20px;
-  height: 20px;
+  width: 30px;
+  height: 30px;
   margin-right: 10px;
+  border-radius: 10px;
 }
 .prototype-header {
   padding: 10px;

package/server/views/settings.ejs

@@ -200,6 +200,11 @@ hr {
   display: inline-block;
   cursor: pointer;
 }
+.keys pre {
+  padding: 20px;
+  margin-top: 20px;
+  background: rgba(0,0,200,0.1) !important;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -371,6 +376,24 @@ hr {
       </div>
     </div>
     <hr/>
+    <div class='keys'>
+      <h1>Keys</h1>
+      <br>
+      <br>
+      <div>Keys are array values stored for unique host names, stored at <code>~/pinokio/key.json</code>, and can be set through <code>pre</code> attributes in pinokio scripts. Here's an example:</div>
+      <pre>{
+  "openai.com": [
+    "sk-proj-2najBvCGFx18belpjf13T3BlbkFJIAR5KXK031n41WzAsPEn"
+  ],
+  "x.com": [
+    "12345678-FAKEaccesstoken1234567890abcdef",
+    "FAKEaccesstokensecret0987654321abcdef"
+  ]
+}</pre>
+      <br>
+      <a class='btn' href="/keys"><i class="fa-solid fa-key"></i> Edit Keys</a>
+    </div>
+    <hr/>
     <div class='advanced'>
       <h1>Advanced Settings</h1>
       <br>

package/server/views/shell.ejs

@@ -205,17 +205,32 @@ document.addEventListener("DOMContentLoaded", async () => {
           //method: "kernel.bin.shell_start",
           method: "kernel.bin.exec",
           <% if (message) { %>
-            message: "<%=message%>",
+            message: "<%-message%>",
           <% } %>
           <% if (venv) { %>
             venv: "<%=venv%>",
           <% } %>
+          <% if (kill) { %>
+            on: [{
+              event: "<%=kill%>",
+              kill: true
+            }],
+          <% } %>
+          <% if (done) { %>
+            on: [{
+              event: "<%=done%>",
+              done: true
+            }],
+          <% } %>
           <% if (input) { %>
             input: true,
           <% } %>
           <% if (env) { %>
           env: <%-JSON.stringify(env)%>,
           <% } %>
+          <% if (conda) { %>
+          conda: <%-JSON.stringify(conda)%>,
+          <% } %>
           id: "<%=id%>",
           path: "<%=cwd%>",
           client: {
@@ -279,6 +294,9 @@ document.addEventListener("DOMContentLoaded", async () => {
               this.write(JSON.stringify(packet.data.json2, null, 2).replace(/\n/g, "\r\n"))
               this.write("\r\n")
             }
+            if (packet.data.type === "shell.kill") {
+              this.socket.close()
+            }
             document.querySelector(".play-btn").classList.add("hidden")
             document.querySelector(".starting-btn").classList.add("hidden")
             document.querySelector(".stop-btn").classList.remove("hidden")
@@ -437,7 +455,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               n.Noty(payload)
             }
           } else if (packet.type === "result") {
-            this.socket.close()
+//            this.socket.close()
           } else if (packet.type === "info") {
             n.Noty({
               text: `${packet.data}`,
@@ -551,8 +569,22 @@ document.addEventListener("DOMContentLoaded", async () => {
           })
           document.querySelector(".stop-btn").classList.add("hidden")
           document.querySelector(".stopped-btn").classList.remove("hidden")
-          <% if (callback) { %>
-          location.href = "<%=callback%>"
+          <% if (kill_message) { %>
+            n.Noty({
+              text: "<%-kill_message%>",
+//              timeout: 3000,
+              <% if (callback) { %>
+              callbacks: {
+                onClose: () => {
+                  window.open("<%=callback%>", "_blank")
+                }
+              }
+              <% } %>
+            })
+          <% } else { %>
+            <% if (callback) { %>
+            location.href = "<%=callback%>"
+            <% } %>
           <% } %>
         })
       })