pinokiod 1.0.55 → 1.0.57

package/kernel/api/index.js

@@ -45,6 +45,7 @@ class Api {
       // stop all proxies for the script
       if (this.proxies[config.script]) {
         for(let p of this.proxies[config.script]) {
+          console.log("P", p)
           this.stopProxy({ uri: p.target })
         }
       }
@@ -54,18 +55,14 @@ class Api {
       this.lproxy.stop(config.uri)
 
       // remove the uri from the proxies array
-      for(let key in this.proxies) {
-        let p = this.proxies[key]
-        if (p.includes(config.uri)) {
-          let index;
-          for(let i = 0; i<p.length; i++) {
-            if (p[i].target === config.uri) {
-              index = i
-              break;
-            }
-          }
-          this.proxies[key].splice(index, 1)
-        }
+      for(let scriptPath in this.proxies) {
+        let p = this.proxies[scriptPath]
+        console.log("pp", p)
+        // iterate through p and find the one whose target matches config.uri
+        // and remove it
+        this.proxies[scriptPath] = this.proxies[scriptPath].filter((item) => {
+          return item.target !== config.uri
+        })
       }
     }
     console.log("stopped", { proxies: this.proxies })
@@ -94,6 +91,7 @@ class Api {
     return result
   }
   async stop(req, ondata) {
+    console.log("STOP")
     // 1. set the "stop" flag for the uri, so the next execution in the queue for the uri will NOT queue another task
     // 2. stream a message closing the socket
 

package/package.json

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

package/server/index.js

@@ -1211,7 +1211,7 @@ class Server {
         proxyMenu.push({
           btn: `<i class="fa-solid fa-bolt-lightning"></i> [Proxy] ${proxy.name}`,
           target: "_blank",
-          href: proxy.target
+          href: proxy.proxy
         })
       }
       console.log({ proxyMenu })
@@ -1900,7 +1900,6 @@ class Server {
         agent: this.agent,
         src: "/_api/" + name,
         rawpath,
-        proxies: this.kernel.api
       })
     })
     this.app.post("/pinokio/delete", async (req, res) => {

package/server/views/browser.ejs

@@ -226,7 +226,9 @@ body.dark .frame-link.selected {
   background: rgba(0,0,0,0.7) !important;
 }
 .frame-link .loader {
+/*
   padding: 5px;
+  */
 }
 .frame-link .tab {
   flex-grow: 1;
@@ -1070,42 +1072,44 @@ document.querySelector("aside").addEventListener("click", async (e) => {
 
 
     if (target) {
-
-      if (target.classList.contains("reveal")) {
-        // nested menu
-        target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
-        e.preventDefault()
-        e.stopPropagation()
+      if (target.target === "_blank") {
+        // nothing
       } else {
-        //location.hash = target.target
+        if (target.classList.contains("reveal")) {
+          // nested menu
+          target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
+          e.preventDefault()
+          e.stopPropagation()
+        } else {
+          //location.hash = target.target
 
 
-//        let id = getTarget(target.getAttribute("href"))
-//        console.log("ID", id, target.href)
-//        location.hash = id
+  //        let id = getTarget(target.getAttribute("href"))
+  //        console.log("ID", id, target.href)
+  //        location.hash = id
 
-        //location.hash = target.getAttribute("href")
+          //location.hash = target.getAttribute("href")
+
+          if (target.closest(".h")) {
+            location.hash = target.target
+          } else {
+            let index = target.getAttribute("data-index")
+            let type = target.closest(".m").getAttribute("data-type")
 
-        if (target.closest(".h")) {
-          location.hash = target.target
-        } else {
-          let index = target.getAttribute("data-index")
-          let type = target.closest(".m").getAttribute("data-type")
 
-          console.log({ type, index })
+            location.hash = type + index
+          }
 
-          debugger
+          document.querySelectorAll(".frame-link").forEach((el) => {
+            el.classList.remove("selected")
+          })
+          target.classList.add("selected")
 
-          location.hash = type + index
+          renderSelection(e)
         }
+      }
 
-        document.querySelectorAll(".frame-link").forEach((el) => {
-          el.classList.remove("selected")
-        })
-        target.classList.add("selected")
 
-        renderSelection(e)
-      }
 
 
     }

package/server/views/partials/menu.ejs

@@ -10,17 +10,23 @@
     </div>
   <% } else { %>
     <% if (item.btn) { %>
-      <!--
-      <a data-index="<%=index%>" target="h<%=index%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link'>
-      -->
-      <a 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>
-        <% if (item.running) { %>
+      <% if (item.target === "_blank") { %>
+        <a 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'>
-          <i class='fa-solid fa-spin fa-circle-notch'></i>
+            <i class="fa-solid fa-up-right-from-square"></i>
           </div>
-        <% } %>
-      </a>
+        </a>
+      <% } else { %>
+        <a 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>
+          <% if (item.running) { %>
+            <div class='loader'>
+            <i class='fa-solid fa-spin fa-circle-notch'></i>
+            </div>
+          <% } %>
+        </a>
+      <% } %>
     <% } %>
   <% } %>
 <% }) %>