pinokiod 3.56.0 → 3.58.0

package/package.json

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

package/server/index.js

@@ -654,7 +654,7 @@ class Server {
       review_tab,
 //        paths,
       theme: this.theme,
-      agent: this.agent,
+      agent: req.agent,
       src: "/_api/" + name,
       //asset: "/asset/api/" + name,
       asset: "/files/api/" + name,
@@ -784,7 +784,7 @@ class Server {
         schema: this.kernel.schema,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         stars_selected: (req.query.sort === "stars" || !req.query.sort ? "selected" : ""),
         forks_selected: (req.query.sort === "forks" ? "selected" : ""),
         updated_selected: (req.query.sort === "updated" ? "selected" : ""),
@@ -806,7 +806,7 @@ class Server {
         requirements_pending,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         userdir: this.kernel.api.userdir,
         display: ["form"],
         query: req.query
@@ -868,7 +868,7 @@ class Server {
         version: this.version,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         paths,
         config: configArray,
         query: req.query,
@@ -1079,7 +1079,7 @@ class Server {
           console.log({ cwd, api_path, root, root_path })
           res.render("required_env_editor", {
             portal: this.portal,
-            agent: this.agent,
+            agent: req.agent,
             theme: this.theme,
             filename,
             filepath: root_path,
@@ -1116,7 +1116,7 @@ class Server {
             stop: (req.query && req.query.stop ? true : false),
             pinokioPath,
             runnable,
-            agent: this.agent,
+            agent: req.agent,
             rawpath,
             gitRemote,
             filename,
@@ -1156,7 +1156,7 @@ class Server {
           portal: this.portal,
           logo: this.logo,
           theme: this.theme,
-          agent: this.agent,
+          agent: req.agent,
           rawpath: rawpath + "?frame=true",
           paths,
           filepath
@@ -1574,6 +1574,7 @@ class Server {
 //      let list = this.getPeerInfo()
       let list = this.getPeers()
 
+        console.log("agent", req.agent)
       if (meta) {
         items = running.concat(notRunning)
         res.render("index", {
@@ -1596,7 +1597,7 @@ class Server {
           pinokioPath,
           config,
           display,
-          agent: this.agent,
+          agent: req.agent,
   //        folder,
           paths,
           uri,
@@ -1629,7 +1630,7 @@ class Server {
           pinokioPath,
           config,
           display,
-          agent: this.agent,
+          agent: req.agent,
   //        folder,
           paths,
           uri,
@@ -2068,7 +2069,7 @@ class Server {
 
 
         if (config.menu[i].href && config.menu[i].href.startsWith("http")) {
-          if (this.agent !== "electron") {
+          if (req.agent !== "electron") {
             config.menu[i].target = "_blank"
           }
         }
@@ -2300,11 +2301,11 @@ class Server {
 
     // when loaded in electron but in minimal mode,
     // the app is loaded in the web so the agent should be "web"
-    if (this.agent === "electron") {
-      if (this.mode === "minimal" || this.mode === "background") {
-        this.agent = "web"
-      }
-    }
+//    if (this.agent === "electron") {
+//      if (this.mode === "minimal" || this.mode === "background") {
+//        this.agent = "web"
+//      }
+//    }
 
     if (this.theme === "dark") {
       this.colors = {
@@ -2945,17 +2946,12 @@ class Server {
 
     this.app.use((req, res, next) => {
       const userAgent = req.get('User-Agent') || '';
-      const clientType = req.get('X-Client-Type');
-      const customUA = userAgent.includes('MyApp-Electron');
-      req.clientInfo = {
-        userAgent,
-        clientType,
-        isElectron: clientType === 'electron' || customUA,
-        isBrowser: !clientType === 'electron' && !customUA,
-        userAgent: userAgent,
-        clientType: clientType || 'unknown'
-      };
-      console.log("clientInfo", req.clientInfo)
+      if (userAgent.includes("Pinokio")) {
+        req.agent = "electron"
+      } else {
+        req.agent = "web"
+      }
+      console.log("req.agent", req.agent)
       next();
     })
 
@@ -3085,7 +3081,7 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         list,
       })
     }))
@@ -3097,21 +3093,21 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         list,
       })
     }))
     this.app.get("/columns", ex(async (req, res) => {
       res.render("columns", {
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         src: req.get('Referrer')
       })
     }))
     this.app.get("/rows", ex(async (req, res) => {
       res.render("rows", {
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         src: req.get('Referrer')
       })
     }))
@@ -3120,7 +3116,7 @@ class Server {
     this.app.get("/container", ex(async (req, res) => {
       res.render("container", {
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         src: req.query.url
       })
     }))
@@ -3223,7 +3219,7 @@ class Server {
             autolaunch,
             logo: this.logo,
             theme: this.theme,
-            agent: this.agent,
+            agent: req.agent,
             name: meta.title,
             image: meta.icon,
             link: `/p/${name}?autolaunch=${autolaunch ? "1" : "0"}`,
@@ -3237,7 +3233,7 @@ class Server {
         autolaunch,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         name: "Does not exist",
         image: "/pinokio-black.png",
         link: null
@@ -3276,7 +3272,7 @@ class Server {
           version: this.version,
           logo: this.logo,
           theme: this.theme,
-          agent: this.agent,
+          agent: req.agent,
           ...folders
         })
         return
@@ -3351,7 +3347,7 @@ class Server {
           portal: this.portal,
           logo: this.logo,
           theme: this.theme,
-          agent: this.agent,
+          agent: req.agent,
           paths: [],
           config: configArray,
           query: req.query,
@@ -3425,7 +3421,7 @@ class Server {
         logo: this.logo,
         platform: this.kernel.platform,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         kernel: this.kernel,
       })
       /*
@@ -3524,7 +3520,7 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         items,
       })
     }))
@@ -3598,7 +3594,7 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         id,
         readme
       })
@@ -3729,7 +3725,7 @@ class Server {
       res.render("keys", {
         filepath: p,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         items
       })
     }))
@@ -3837,7 +3833,7 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         items
 //        items: [{
 //          icon: "fa-solid fa-key",
@@ -4000,7 +3996,7 @@ class Server {
         target,
         filepath: cwd,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         id,
         cwd,
         message,
@@ -4054,7 +4050,7 @@ class Server {
         portal: this.portal,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/setup/:mode", ex(async (req, res) => {
@@ -4109,7 +4105,7 @@ class Server {
         requirements_pending,
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.post("/plugin/update_spec", ex(async (req, res) => {
@@ -4220,7 +4216,7 @@ class Server {
         docs: this.docs,
         portal: this.portal,
         install: this.install,
-        agent: this.agent,
+        agent: req.agent,
         theme: this.theme,
         processes,
         installed,
@@ -4400,7 +4396,7 @@ class Server {
 //        port_mapping: this.kernel.caddy.port_mapping,
 //        ip_mapping: this.kernel.caddy.ip_mapping,
         lan: this.kernel.router.local_network_mapping,
-        agent: this.agent,
+        agent: req.agent,
         theme: this.theme,
         items: proxies,
         qr,
@@ -4760,7 +4756,7 @@ class Server {
         items,
         theme: this.theme,
         filepath,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/env/*", ex(async (req, res) => {
@@ -4817,7 +4813,7 @@ class Server {
           items,
           theme: this.theme,
           filepath,
-          agent: this.agent,
+          agent: req.agent,
           path: "/api/" + name + "/pinokio.js",
           _path: "/_api/" + name,
           str: configStr
@@ -4849,7 +4845,7 @@ class Server {
           items,
           theme: this.theme,
           filepath,
-          agent: this.agent,
+          agent: req.agent,
         })
       }
       //res.render("env_editor", {
@@ -4883,7 +4879,7 @@ class Server {
         res.render("pre", {
           name: req.params.name,
           theme: this.theme,
-          agent: this.agent,
+          agent: req.agent,
           name: req.params.name,
           items: config.pre,
           env
@@ -4963,7 +4959,7 @@ class Server {
         config,
         theme: this.theme,
         filepath,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/xterm_config", ex(async (req, res) => {
@@ -5000,7 +4996,7 @@ class Server {
         theme: this.theme,
         filepath,
         content,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/script/:name", ex((req, res) => {
@@ -5214,7 +5210,7 @@ class Server {
         dir,
         theme: this.theme,
         platform: this.kernel.platform,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/d/*", ex(async (req, res) => {
@@ -5303,7 +5299,7 @@ class Server {
         docs: this.docs,
         portal: this.portal,
         install: this.install,
-        agent: this.agent,
+        agent: req.agent,
         theme: this.theme,
         //dynamic: plugin_menu
         dynamic,
@@ -5342,7 +5338,7 @@ class Server {
         dynamic_content: null,
         home: req.originalUrl,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
       }
       res.render("mini", result)
     }))
@@ -5779,7 +5775,7 @@ class Server {
         redirect_uri: "https://app-7pt7.onrender.com/apps/redirect?git=" + gitRemote,
         platform: this.kernel.platform,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
       })
     }))
     this.app.get("/p/:name/dev", ex(async (req, res) => {
@@ -5914,7 +5910,7 @@ class Server {
       res.render("install", {
         logo: this.logo,
         theme: this.theme,
-        agent: this.agent,
+        agent: req.agent,
         userdir: this.kernel.api.userdir,
         display: ["form"],
 //        query: req.query,

package/server/public/nav.js

@@ -15,6 +15,8 @@ document.addEventListener("DOMContentLoaded", () => {
   if (document.querySelector("#new-window")) {
     document.querySelector("#new-window").addEventListener("click", (e) => {
       let agent = document.body.getAttribute("data-agent")
+      window.open("/", "_blank", "self")
+      /*
       if (agent === "electron") {
         window.open("/", "_blank", "self")
       } else {
@@ -30,6 +32,7 @@ document.addEventListener("DOMContentLoaded", () => {
           console.log(res)
         })
       }
+      */
     })
   }
 })

package/server/public/style.css

@@ -2393,9 +2393,6 @@ body.minimized header .home {
   top: 0;
 }
 body.minimized header {
-/*
-  padding: 26px 0 0 !important;
-  */
   overflow: auto;
   flex-shrink: 0;
   position: fixed;
@@ -2453,68 +2450,7 @@ body.minimized #dragger {
 body.minimized aside .tab.submenu {
   padding: 10px;
 }
-/*
-body.minimized aside {
-  display: none;
-}
-*/
 
-/*
-@media only screen and (max-width: 800px) {
-  header .dropdown-content {
-    position: relative;
-    min-width: unset;
-    top: unset;
-    left: unset;
-  }
-  header h1 #close-window {
-    order: 0;
-  }
-  header {
-    padding: 10px 0 0;
-    overflow: auto;
-    flex-shrink: 0;
-  }
-  header .home {
-    display: block;
-  }
-  header h1 .btn2 {
-    padding: 10px;
-    width: 100%;
-    box-sizing: border-box;
-  }
-  header h1 {
-    height: 100%;
-    overflow: auto;
-    display: block;
-  }
-  .mode-selector {
-    flex-direction: column;
-    padding: 0;
-    margin: 0;
-    border-radius: 0;
-    align-items: stretch;
-    gap: 0;
-  }
-  .mode-selector .btn2 {
-    width: unset;
-    padding: 10px;
-    border-radius: 0 !important;
-  }
-  .mode-selector .caption {
-    display: none;
-  }
-  main {
-    padding-top: 10px;
-  }
-  .appcanvas {
-    padding-top: 20px;
-  }
-  main .container {
-    margin-left: 0;
-  }
-  .app-icon {
-    display: block;
-  }
+body[data-agent='electron'] {
+  padding-top: 16px;
 }
-*/