pinokiod 1.2.1 → 1.2.2

package/kernel/shell.js

@@ -545,18 +545,41 @@ class Shell {
       let env_exists = await this.exists(env_path)
       if (env_exists) {
         params.message = [
+
+          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda activate base`,
+
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           //'pip install --upgrade pip',
  //         'pip install --upgrade wheel pip setuptools',
         ].concat(params.message)
       } else {
         params.message = [
+
+          (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda deactivate`,
+          `conda activate base`,
+
+
           `python -m venv ${env_path}`,
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           //'pip install --upgrade pip',
 //          'pip install --upgrade wheel pip setuptools',
         ].concat(params.message)
       }
+    } else {
+      params.message = [
+        (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
+        `conda deactivate`,
+        `conda deactivate`,
+        `conda deactivate`,
+        `conda activate base`,
+      ].concat(params.message)
     }
 
     return params

package/package.json

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

package/server/index.js

@@ -86,11 +86,11 @@ class Server {
         throw new Error(`Pinokio supports Windows release 18309 and up (current system: ${buildNumber}`)
       }
 
-      if (buildNumber > 25000) {
-        console.log("Windows buildNumber", buildNumber)
-        throw new Error(`Pinokio does not currently support Windows Canary (versions 25000 and up). The current system is ${buildNumber}`)
-        
-      }
+//      if (buildNumber > 25000) {
+//        console.log("Windows buildNumber", buildNumber)
+//        throw new Error(`Pinokio does not currently support Windows Canary (versions 25000 and up). The current system is ${buildNumber}`)
+//        
+//      }
     }
   }
   getMemory(filepath) {
@@ -153,6 +153,7 @@ class Server {
       return {
         icon,
         menu: x.menu,
+        shortcuts: x.shortcuts,
         index: x.index,
         //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
         name,
@@ -972,14 +973,30 @@ class Server {
 
               items[i].menu = config.menu
             }
+
+            if (config.shortcuts) {
+              if (typeof config.shortcuts === "function") {
+                if (config.shortcuts.constructor.name === "AsyncFunction") {
+                  config.shortcuts = await config.shortcuts(this.kernel)
+                } else {
+                  config.shortcuts = config.shortcuts(this.kernel)
+                }
+              }
+              await this.renderShortcuts(uri, item.name, config, pathComponents)
+              items[i].shortcuts = config.shortcuts
+            }
           }
 
 
           // check if there is a running process with this folder name
           let runningApps = new Set()
           for(let key in this.kernel.api.running) {
-            let re = new RegExp(item.name)
-            if (re.test(key)) {
+            let p = this.kernel.path("api", items[i].name) + "/"
+            //let re = new RegExp(items[i].name)
+            //if (re.test(key)) {
+            console.log({ p , key })
+            //if (p === key) {
+            if (key.includes(p)) {
               items[i].running = true
               items[i].index = index
               index++;
@@ -1020,6 +1037,9 @@ class Server {
       }
 
 
+      console.log("#display", display)
+
+
       res.render("index", {
         proxy: pinokio_proxy[0],
         qr,
@@ -1066,9 +1086,11 @@ class Server {
             name = x.name
             description = ""
           }
+          console.log("X", x)
           return {
             icon,
             menu: x.menu,
+            shortcuts: x.shortcuts,
             //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
             name,
             uri,
@@ -1083,6 +1105,41 @@ class Server {
       })
     }
   }
+  async renderShortcuts(uri, name, config, pathComponents) {
+    console.log("config.shortcuts", config.shortcuts)
+    if (config.shortcuts) {
+      for(let i=0; i<config.shortcuts.length; i++) {
+        let shortcut = config.shortcuts[i]
+        if (shortcut.action) {
+          if (shortcut.action.method === "stop") {
+            if (shortcut.action.uri) {
+              let absolute = path.resolve(__dirname, ...pathComponents, shortcut.action.uri)
+              let seed = path.resolve(__dirname)
+              let p = absolute.replace(seed, "")
+              let link = p.split(/[\/\\]/).filter((x) => { return x }).join("/")
+              let uri = "~/api/" + name + "/" + link
+
+              console.log("*uri", uri)
+              config.shortcuts[i].action.uri = uri
+
+
+              if (shortcut.hasOwnProperty("text")) {
+                if (shortcut.hasOwnProperty("icon")) {
+                  config.shortcuts[i].html = `<i class="${shortcut.icon}"></i> ${shortcut.text}` 
+                } else {
+                  config.shortcuts[i].html = `${shortcut.text}` 
+                }
+                config.shortcuts[i].btn = shortcut.html
+              }
+
+            }
+          }
+        }
+      }
+    }
+  }
+
+
   async renderMenu(uri, name, config, pathComponents) {
     if (config.menu) {
       for(let i=0; i<config.menu.length; i++) {
@@ -1093,6 +1150,7 @@ class Server {
           menuitem.menu = m.menu
         }
 
+        console.log("MENUITEM", menuitem)
 
         if (menuitem.href && !menuitem.href.startsWith("http")) {
 
@@ -1125,12 +1183,31 @@ class Server {
 
           // check running
           let fullpath = this.kernel.path(menuitem.src.slice(1))
+          console.log("fullpath", fullpath, menuitem.src, this.kernel.api.running)
           if (this.kernel.api.running[fullpath]) {
             menuitem.running = true
           }
 
         }
 
+        if (menuitem.action) {
+          if (menuitem.action.method === "stop") {
+            if (menuitem.action.uri) {
+              let absolute = path.resolve(__dirname, ...pathComponents, menuitem.action.uri)
+              let seed = path.resolve(__dirname)
+              let p = absolute.replace(seed, "")
+              let link = p.split(/[\/\\]/).filter((x) => { return x }).join("/")
+              let uri = "~/api/" + name + "/" + link
+
+              console.log("*uri", uri)
+              config.menu[i].action.uri = uri
+            }
+          }
+        }
+
+
+
+
 
 
 //        if (menuitem.href && menuitem.params) {
@@ -1194,6 +1271,8 @@ class Server {
             if (menuitem.href) {
               // button
               config.menu[i].btn = menuitem.html
+            } else if (menuitem.action) {
+              config.menu[i].btn = menuitem.html
             } else if (menuitem.menu) {
               config.menu[i].btn = menuitem.html
             } else {
@@ -1841,7 +1920,7 @@ class Server {
         let uri = this.kernel.path("api")
         await this.renderMenu(uri, name, config, [])
 
-        console.log({ config })
+        console.log("#CONFIG", JSON.stringify(config, null, 2))
       }
 
 

package/server/public/install.js

@@ -104,7 +104,8 @@ const install = async (name, url, term, socket, options) => {
     })
   } else {
     // ask the backend to create install.json and start.json if gradio
-    location.href = `/?selected=${name}`
+    //location.href = `/?selected=${name}`
+    location.href = `/pinokio/browser/${name}`
 
   }
 }

package/server/views/browser.ejs

@@ -15,6 +15,7 @@
 <script src="/opener.js"></script>
 <script src="/report.js"></script>
 <script src="/normalize.js"></script>
+<script src="/Socket.js"></script>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
@@ -409,6 +410,9 @@ body.dark .loader-container {
   background: rgba(255,255,255,0.3);
 }
 #menu {
+  display: flex;
+}
+#menu-mobile {
   display: none;
 }
 @media only screen and (max-width: 480px) {
@@ -445,6 +449,9 @@ body.dark .loader-container {
     display: none;
   }
   #menu {
+    display: none;
+  }
+  #menu-mobile {
     display: flex;
   }
 }
@@ -500,6 +507,7 @@ body.dark .loader-container {
 <div class='container'>
   <nav>
     <div class='hidden bar'>
+      <button class='btn2' id='menu-mobile'><i class="fa-solid fa-bars"></i></button>
       <button class='btn2' id='menu'><i class="fa-solid fa-bars"></i></button>
       <% if (agent === "electron") { %>
         <button class='btn2' id='back'><i class="fa-solid fa-arrow-left"></i></button>
@@ -1047,11 +1055,15 @@ const addTab = async (url) => {
 
 
 
-if (document.querySelector("#menu")) {
-  document.querySelector("#menu").addEventListener("click", async (e) => {
+if (document.querySelector("#menu-mobile")) {
+  document.querySelector("#menu-mobile").addEventListener("click", async (e) => {
     location.hash = ""
     refresh()
-//    renderSelection()
+  })
+}
+if (document.querySelector("#menu")) {
+  document.querySelector("#menu").addEventListener("click", async (e) => {
+    document.querySelector("aside").classList.toggle("hidden")
   })
 }
 document.querySelector(".app-info").addEventListener("click", async (e) => {
@@ -1152,7 +1164,26 @@ document.querySelector("aside").addEventListener("click", async (e) => {
         }
       }
 
-      if (target.target === "_blank") {
+      if (target.getAttribute("data-action")) {
+        let actionStr = target.getAttribute("data-action")
+        let action = JSON.parse(actionStr)
+        console.log("action", action)
+        if (action.method === "stop" && action.uri) {
+          let socket = new Socket()
+          socket.run({
+            method: "kernel.api.stop",
+            params: {
+              uri: action.uri//"~" + location.pathname
+            }
+          }, (packet) => {
+            console.log("packet", packet)
+            if (packet.type === "result") {
+              socket.close()
+//              location.href = location.href
+            }
+          })
+        }
+      } else if (target.target === "_blank") {
         // nothing
       } else {
         if (target.classList.contains("reveal")) {

package/server/views/index.ejs

@@ -141,30 +141,6 @@ header .runner {
     <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View Folder</button>
   </div>
 <% } %>
-<!--
-<div class='runner'>
-  <% if (display.includes("menu")) { %>
-    <% config.menu.forEach((item) => { %>
-      <% if (item.btn) { %>
-        <% if (item.target) { %>
-          <% if (item.features) { %>
-            <a target="<%=item.target%>" href="<%=item.href%>" features="<%=item.features%>" class='btn'><%-item.btn%></a>
-          <% } else { %>
-            <a target="<%=item.target%>" href="<%=item.href%>" class='btn'><%-item.btn%></a>
-          <% } %>
-        <% } else { %>
-          <a href="<%=item.href%>" class='btn'><%-item.btn%></a>
-        <% } %>
-      <% } else if (item.label) { %>
-        <label class='btn label'><%-item.label%></label>
-      <% } %>
-    <% }) %>
-  <% } %>
-  <% if (display.includes("install")) { %>
-  <button id='install' class='btn' data-url="<%=config.install%>"><i class="fa-solid fa-plug"></i> Install</button>
-  <% } %>
-</div>
--->
 <% if (display.includes("dependencies")) { %>
 <div class='dependencies'>
   <h2>Prerequisites</h2>
@@ -201,31 +177,16 @@ header .runner {
             <div class='col'>
               <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
-              <!--<div class='title'><a href="<%=item.browser_url%>"><%=item.name%> <i class="fa-solid fa-angles-right"></i></a></div>-->
               <div class='description'><%=item.description%></div>
-              <!--
-              <% if (item.menu && item.menu.length > 0) { %>
+              <% if (item.shortcuts && item.shortcuts.length > 0) { %>
                 <div class='btns'>
-                  <% if (item.menu) { %>
-                    <% item.menu.forEach((btn) => { %>
-                      <% if (btn.btn) { %>
-                        <% if (btn.target) { %>
-                          <% if (btn.features) { %>
-                            <a target="<%=btn.target%>" href="<%=item.browser_url%>#<%=btn.href%>" features="<%=btn.features%>" class='btn'><%-btn.btn%></a>
-                          <% } else { %>
-                            <a target="<%=btn.target%>" href="<%=item.browser_url%>#<%=btn.href%>" class='btn'><%-btn.btn%></a>
-                          <% } %>
-                        <% } else { %>
-                          <a href="<%=item.browser_url%>#<%=btn.href%>" class='btn'><%-btn.btn%></a>
-                        <% } %>
-                      <% } else if (btn.label) { %>
-                        <label class='btn label'><%-btn.label%></label>
-                      <% } %>
-                    <% }) %>
-                  <% } %>
+                  <% item.shortcuts.forEach((btn) => { %>
+                    <% if (btn.btn) { %>
+                      <button data-action="<%=btn.action ? JSON.stringify(btn.action) : ''%>" class='btn menu-btn'><%-btn.btn%></button>
+                    <% } %>
+                  <% }) %>
                 </div>
               <% } %>
-              -->
             </div>
             <div class='spinner'>
               <i class="fa-solid fa-circle-notch fa-spin"></i>
@@ -252,6 +213,15 @@ header .runner {
               <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
+              <% if (item.shortcuts && item.shortcuts.length > 0) { %>
+                <div class='btns'>
+                  <% item.shortcuts.forEach((btn) => { %>
+                    <% if (btn.btn) { %>
+                      <button data-action="<%=btn.action ? JSON.stringify(btn.action) : ''%>" class='btn menu-btn'><%-btn.btn%></button>
+                    <% } %>
+                  <% }) %>
+                </div>
+              <% } %>
             </div>
           </h3>
         </a>
@@ -494,7 +464,62 @@ document.querySelector("form input[type=search]").addEventListener("input", (e)
 document.querySelector("form input[type=search]").focus()
 <% } %>
 
-<% if (display.includes("menu")) { %>
+if (document.querySelector(".container")) {
+  document.querySelector(".container").addEventListener("click", async (e) => {
+    let el = e.target.closest(".menu-btn")
+    if (!el) {
+      if (el.classList.contains("menu-btn")) {
+        el = e.target
+      }
+    }
+
+    console.log("EL", el)
+    debugger
+
+    if (el) {
+      e.preventDefault()
+      e.stopPropagation()
+      let actionStr = el.getAttribute("data-action")
+      if (actionStr) {
+        let action = JSON.parse(actionStr)
+        console.log("action", action)
+        if (action.method === "stop" && action.uri) {
+          socket.run({
+            method: "kernel.api.stop",
+            params: {
+              uri: action.uri//"~" + location.pathname
+            }
+          }, (packet) => {
+            console.log("packet", packet)
+            if (packet.type === "result") {
+              socket.close()
+              location.href = location.href
+            }
+          })
+        }
+      }
+
+    }
+  })
+}
+
+
+//  if (el) {
+//    let url = el.getAttribute("data-url")
+//    if (url) {
+//      let target = el.getAttribute("data-target")
+//      if (target && target.length > 0) {
+//        let agent = el.getAttribute("data-agent")
+//        if (agent && agent.length > 0) {
+//          window.open(url, target, agent)
+//        } else {
+//          window.open(url, target)
+//        }
+//      } else {
+//        location.href = url
+//      }
+//    }
+//  }
 //document.querySelector(".runner").addEventListener("click", async (e) => {
 //  let el = e.target.closest(".btn")
 //  if (!el) {
@@ -520,7 +545,6 @@ document.querySelector("form input[type=search]").focus()
 //    }
 //  }
 //})
-<% } %>
 <% if (display.includes("install")) { %>
 document.querySelector("#install").addEventListener("click", async (e) => {
   location.href = e.target.getAttribute("data-url")

package/server/views/partials/menu.ejs

@@ -10,7 +10,11 @@
     </div>
   <% } else { %>
     <% if (item.btn) { %>
-      <% if (item.target === "_blank") { %>
+      <% if (item.action) { %>
+        <div data-action="<%=JSON.stringify(item.action)%>" class='btn header-item frame-link'>
+          <div class='tab'><%-item.btn%></div>
+        </div>
+      <% } else if (item.target === "_blank") { %>
         <a data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link'>
           <div class='tab'><%-item.btn%></div>
           <div class='loader'>