pinokiod 1.0.56 → 1.0.58

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/kernel/index.js

@@ -24,7 +24,7 @@ const VARS = {
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   //schema = ">=1.0.0"
-  schema = ">=1.0.0"
+  schema = ">=1.1.0"
   constructor(store) {
     this.fetch = fetch
     this.store = store
@@ -39,42 +39,6 @@ class Kernel {
       this.procs[uri] = undefined
     }
   }
-//  on(name, event) {
-//    if (name === "refresh_memory") {
-//      let urlSet = new Set()
-//      // start relevant proxies
-//      for(let scriptPath in this.memory.local) {
-//        let local = this.memory.local[scriptPath]
-//        // if 'url' is set
-//        // 1. check if a proxy is already running
-//        // 2. if running => ignore
-//        // 3. if not running => start proxy
-//        if (local.url) {
-//          urlSet.add(local.url)
-//        }
-//        let local = this.api.proxies[parentPath]
-//      }
-//
-//      // get all running urls
-//
-//
-//      // stop relevant proxies
-//
-//      for(let scriptPath in this.api.proxies) {
-//        // 1. get all the proxies for a scriptPath
-//        let proxies = this.api.proxies[scriptPath]
-//        // 2. iterate through the proxies
-//        for(let proxy of proxies) {
-//          if (urlSet.has(proxy.target)) {
-//            // the proxy target is part of the urlSet => don't do anything since all the relevant proxies have started above
-//          } else {
-//            // the proxy target is not part of the urlSet => stop the proxy
-//          }
-//        }
-//        //  - if the proxy.target is included in one of the uris in one of the local variables
-//      }
-//    }
-//  }
   local(...args) {
     // get local variables at path
     let v = this.memory.local[path.resolve(...args)]

package/package.json

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

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/editor.ejs

@@ -722,31 +722,12 @@ const reloadMemory = async () => {
       <a class='path' href="<%=path.path%>"><%-path.name%></a>
     <% } %>
   <% }) %>
-  <!--
-  <div class='flexible'></div>
-  <button class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></button>
-  <button class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></button>
-  <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <button id='new-window' title='open a new window'><i class="fa-solid fa-plus"></i></button>
-  -->
   </h1>
   <% if (false) { %>
   <a class='gitremote' data-filepath="<%=filepath%>"><%=filepath%></a>
   <div class='pinokiourl'><i class="fa-solid fa-link"></i><%=pinokioPath%></div>
   <% } %>
   <% if (!install_required) { %>
-  <!--
-    <div class='runner'>
-      <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
-        <span class='play'><i class="fa-solid fa-play"></i> Run</span>
-        <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>
-        <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
-      </div>
-      <div id='save' class='btn disabled'>
-        <span class='save'><i class="fa-solid fa-check"></i> Save</span>
-      </div>
-    </div>
-    -->
     <div class='runner'>
       <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
         <span class='play'><i class="fa-solid fa-play"></i> Run</span>
@@ -760,11 +741,6 @@ const reloadMemory = async () => {
       <div id='save' class='btn disabled'>
         <span class='save'><i class="fa-solid fa-check"></i> Save</span>
       </div>
-      <% if (proxies) { %>
-        <% proxies.forEach((proxy) => { %>
-          <a class='btn' target="_blank" href="<%=proxy.proxy%>"><i class='fa-solid fa-up-right-from-square'></i> Proxy <%=proxy.name ? "(" + proxy.name + ")" : proxy.proxy%></a>
-        <% }) %>
-      <% } %>
     </div>
   <% } %>
   </header>
@@ -849,12 +825,6 @@ const reloadMemory = async () => {
           <% } %>
           <div id='terminal'></div>
         </div>
-        <!--
-        <div class='terminal-container'>
-          <div id='terminal'></div>
-          <div id='terminal-resize'><i class="fa-solid fa-up-right-and-down-left-from-center"></i></div>
-        </div>
-        -->
       </div>
       <footer><b>Ready</b></footer>
     <% } %>

package/server/views/fullscreen_editor.ejs

@@ -714,26 +714,6 @@ const reloadMemory = async () => {
 <body class='<%=theme%>'>
 <% } %>
   <header>
-  <!--
-  <h1>
-  <% paths.forEach((path) => { %>
-    <% if (path.action) { %>
-      <a class='path nav-button' id="<%=path.id%>" onclick="<%=path.action%>"><%-path.name%></a>
-    <% } else if (path.path) { %>
-      <a class='path' href="<%=path.path%>"><%-path.name%></a>
-    <% } %>
-  <% }) %>
-  <div class='flexible'></div>
-  <button class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></button>
-  <button class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></button>
-  <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <button id='new-window' title='open a new window'><i class="fa-solid fa-plus"></i></button>
-  </h1>
-  <a class='gitremote' data-filepath="<%=filepath%>"><%=filepath%></a>
-  <% if (pinokioPath) { %>
-  <div class='pinokiourl'><i class="fa-solid fa-link"></i><%=pinokioPath%></div>
-  <% } %>
-  -->
   <% if (!install_required) { %>
     <div class='runner'>
       <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
@@ -742,19 +722,6 @@ const reloadMemory = async () => {
         <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>
       <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
-      <% if (proxies) { %>
-        <% proxies.forEach((proxy) => { %>
-          <a class='btn' target="_blank" href="<%=proxy.proxy%>"><i class='fa-solid fa-up-right-from-square'></i> Proxy <%=proxy.name ? "(" + proxy.name + ")" : proxy.proxy%></a>
-        <% }) %>
-      <% } %>
-      <!--
-      <button class='btn' id='source' data-editor-url="<%=editorUrl%>">Navigate</button>
-      -->
-      <!--
-      <div id='save' class='btn disabled'>
-        <span class='save'><i class="fa-solid fa-check"></i> Save</span>
-      </div>
-      -->
     </div>
   <% } %>
   </header>

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>
+      <% } %>
     <% } %>
   <% } %>
 <% }) %>