pinokiod 1.0.53 → 1.0.55

package/kernel/api/proxy/index.js

@@ -9,7 +9,13 @@ class P {
         }
       }
     */
+    ondata({
+      raw: `\r\n[Start proxy] ${req.params.name} ${req.params.uri}\r\n`
+    })
     let response = await kernel.api.startProxy(req.parent.path, req.params.uri, req.params.name)
+    ondata({
+      raw: "Proxy Started"
+    })
     return response
   }
   async stop (req, ondata, kernel) {
@@ -21,7 +27,13 @@ class P {
         }
       }
     */
+    ondata({
+      raw: `\r\n[Stop proxy] ${req.params.uri}\r\n`
+    })
     kernel.api.stopProxy({ uri: req.params.uri })
+    ondata({
+      raw: "Proxy Stopped"
+    })
   }
 }
 module.exports = P

package/kernel/api/set/index.js

@@ -158,4 +158,5 @@ module.exports = async (req, ondata, kernel) => {
 
     kernel.keys = old
   }
+
 }

package/kernel/index.js

@@ -39,6 +39,42 @@ 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.53",
+  "version": "1.0.55",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",
-    "lproxy": "^0.0.1",
+    "lproxy": "^0.0.2",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",

package/server/index.js

@@ -1174,7 +1174,12 @@ class Server {
             }
           }
         }
-        config.menu[i].target = "@" + (config.menu[i].id || config.menu[i].src)
+        console.log("menu item", config.menu[i])
+        if (config.menu[i].popout) {
+          config.menu[i].target = "_blank"
+        } else {
+          config.menu[i].target = "@" + (config.menu[i].id || config.menu[i].src)
+        }
       }
 
 
@@ -1185,6 +1190,34 @@ class Server {
         
       
       console.log("config", JSON.stringify(config,null,2))
+
+
+      // get all proxies that belong to this repository
+      let childProxies = []
+      console.log("this.kernel.api.proxies=", this.kernel.api.proxies)
+      for(let scriptPath in this.kernel.api.proxies) {
+        let proxies = this.kernel.api.proxies[scriptPath]
+        console.log("PROXIES", proxies)
+        for(let proxy of proxies) {
+          if (scriptPath.startsWith(this.kernel.path("api", name))) {
+            childProxies.push(proxy) 
+          }
+        }
+      }
+      console.log({ childProxies })
+
+      let proxyMenu = []
+      for(let proxy of childProxies) {
+        proxyMenu.push({
+          btn: `<i class="fa-solid fa-bolt-lightning"></i> [Proxy] ${proxy.name}`,
+          target: "_blank",
+          href: proxy.target
+        })
+      }
+      console.log({ proxyMenu })
+      config.menu = proxyMenu.concat(config.menu)
+
+
       return config
     } else {
       return config
@@ -1844,12 +1877,14 @@ class Server {
         let uri = this.kernel.path("api")
         await this.renderMenu(uri, name, config, [])
 
+
         console.log({ config })
 
       }
 
 
 
+
       console.log("MEMORY", this.kernel.memory)
       res.render("browser", {
         running:this.kernel.api.running,
@@ -1865,6 +1900,7 @@ class Server {
         agent: this.agent,
         src: "/_api/" + name,
         rawpath,
+        proxies: this.kernel.api
       })
     })
     this.app.post("/pinokio/delete", async (req, res) => {

package/server/public/style.css

@@ -1037,8 +1037,8 @@ body.dark .btn {
   background: rgba(0,0,0,0.8);
 }
 body.dark .swal2-popup {
-  color: var(--dark-btn-bg);
-  background: var(--dark-btn-color);
+  background: var(--dark-btn-bg);
+  color: var(--dark-btn-color);
 }
 .swal2-popup {
   border-radius: 0 !important;
@@ -1059,7 +1059,7 @@ body.dark .swal2-popup {
 }
 .swal2-html-container {
   display: block !important;
-  margin: 10px !important;
+  margin: 0px 20px !important;
 }
 .swal2-html-container .desc:empty {
   display: none;
@@ -1119,7 +1119,7 @@ body.dark .swal2-popup {
   width: 100% !important;
   justify-content: flex-end !important;
   margin: 0 !important;
-  padding: 10px 20px !important;
+  padding: 20px !important;
   /*
   background: rgba(0,0,200,0.04);
   */
@@ -1147,9 +1147,11 @@ body.dark .swal2-popup {
   box-sizing: border-box;
 }
 body.dark .swal2-modal input {
+/*
   background: var(--dark-btn-bg);
+  */
   color: var(--dark-btn-color);
-  border: none;
+  border: 2px solid rgba(255,255,255,0.1);
 }
 .swal2-modal input {
 /*
@@ -1166,11 +1168,18 @@ body.dark .swal2-modal input {
   border-radius: 2px !important;
 }
 body.dark .swal2-styled.swal2-confirm{
+  background: rgba(255,255,255,0.9) !important;
+  color: black;
+  /*
   background: var(--dark-btn-bg);
   color: var(--dark-btn-color);
+  */
 }
 .swal2-styled.swal2-confirm{
-  background: black !important;
+  background: rgba(0,0,0,0.8) !important;
+  margin: 0;
+  font-weight: bold;
+  border: none;
 }
 .swal2-input {
   margin: 0 !important;