pinokiod 3.9.19 → 3.9.21

package/package.json

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

package/server/index.js

@@ -276,6 +276,7 @@ class Server {
       }
       let browser_browse_url = browser_url + "/browse"
       return {
+        filepath: this.kernel.path("api", name),
         icon,
         iconpath,
         path: apipath,
@@ -669,6 +670,7 @@ class Server {
         bin: this.kernel.bin.preset("ai"),
       })
       res.render("download", {
+        portal: this.portal,
         error,
         current: req.originalUrl,
         install_required,

package/server/public/common.js

@@ -39,7 +39,18 @@ document.addEventListener("DOMContentLoaded", () => {
     document.querySelector("#create-new-folder").addEventListener("click", async (e) => {
       e.preventDefault()
       e.stopPropagation()
-      let folder = prompt("Enter a folder name to create")
+      let result = await Swal.fire({
+        title: "Create",
+        inputPlaceholder: "Enter a folder name to create",
+        allowOutsideClick: true,
+        confirmButtonText: 'Create',
+        input: "text",
+      })
+      if (result.isDismissed) {
+        return false
+      }
+      let folder = result.value
+      //let folder = prompt("Enter a folder name to create")
       if (folder && folder.length > 0) {
       } else {
         alert("Please enter a folder name")

package/server/public/fseditor.js

@@ -109,7 +109,11 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
               if (dirty) {
                 formData.append("icon_dirty", true)
               }
-              formData.append("icon_path", iconpath)
+              if (iconpath) {
+                formData.append("icon_path", iconpath)
+              } else {
+                formData.append("icon_path", "icon.png")
+              }
               let title = Swal.getPopup().querySelector('#new-folder-title').value
               let description = Swal.getPopup().querySelector('#new-folder-description').value
               let folder_path_el = Swal.getPopup().querySelector('#new-folder-path')
@@ -171,7 +175,8 @@ const FSEditor = async ({title, description, old_path, icon, iconpath, redirect,
                   dirty = true
                   // make sure the image mime type is transformed into the same type as the existing image
                   pond.setOptions({
-                    imageTransformOutputMimeType: initial_file.fileType
+                    //imageTransformOutputMimeType: initial_file.fileType
+                    imageTransformOutputMimeType: "image/png"
                   })
                 }
                 initial_file = file

package/server/public/style.css

@@ -1463,8 +1463,12 @@ 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;
+  */
+  color: rgba(255,255,255,0.8) !important;
+  border: 1px solid rgba(255,255,255,0.8) !important;
   /*
   background: var(--dark-btn-bg);
   color: var(--dark-btn-color);

package/server/views/app.ejs

@@ -1020,51 +1020,20 @@ body.dark .appcanvas {
   //  }
   }
   const renderSelection = (e, force) => {
-    console.log("renderSelection", { e, force, started_script })
-    // if the renderSelection was NOT caused by the user (e is null) ==> automatic execution
-    // and the user has already interacted with the page, don't renderselection
-    console.log("> 1")
-//    let selection
-//    if (interacted) {
-//      if (e) {
-//        selection = document.querySelector("[data-default]")
-//      } else {
-//        if (started_script) {
-//          selection = document.querySelector(`[data-key="${started_script}"]`)
-//          started_script = null
-//        } else {
-//          return
-//        }
-//      }
-//    } else {
-//      selection = document.querySelector("[data-default]")
-//    }
-      let init = document.querySelector("[data-init]")
-      if (init) {
-        location.href = init.href
-        return
-      }
-      let selection = document.querySelector("[data-default]")
-
-//    console.log("> 3")
-//    let selection
-//    if (started_script) {
-//      selection = document.querySelector(`[data-filepath="${started_script}"]`)
-//      started_script = null
-//    } else {
-//      // if the menu has a default item, or if the url specifies a selection
-//      selection = document.querySelector("[data-default]")
-//    }
+    let init = document.querySelector("[data-init]")
+    if (init) {
+      location.href = init.href
+      return
+    }
+    let selection = null
+    <% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
+      selection = document.querySelector("[data-default]")
+    <% } %>
     console.log({ selection })
-//    let selection = document.querySelector("[data-default]")
     if (selection || location.hash && location.hash.length > 0) {
       let target
       if (location.hash && location.hash.length > 0) {
-    //    document.querySelector(".bar").classList.remove("hidden")
-        //let id = getTarget(location.hash.slice(1))
         let id = location.hash.slice(1)
-
-
         let selector
         if (id.startsWith("@")) {
           //selector = `aside [target='${id.slice(1)}']`
@@ -1372,9 +1341,7 @@ body.dark .appcanvas {
 
     }
   }
-  <% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
   renderSelection()
-  <% } %>
   //renderCursor()
   //Reporter()
   <% if (agent === "electron") { %>
@@ -1471,7 +1438,9 @@ body.dark .appcanvas {
       description: `<%=config.description%>`,
       old_path: `<%=name%>`,
       icon: `<%=config.icon%>`,
-      iconpath: `<%=config.iconpath%>`,
+      <% if (config.iconpath) { %>
+      iconpath: `<%-JSON.stringify(config.iconpath).slice(1, -1)%>`,
+      <% } %>
       move: true,
       edit: true,
       redirect: (new_path) => {
@@ -1487,7 +1456,9 @@ body.dark .appcanvas {
       description: `<%=config.description%>`,
       old_path: `<%=name%>`,
       icon: `<%=config.icon%>`,
-      iconpath: `<%=config.iconpath%>`,
+      <% if (config.iconpath) { %>
+      iconpath: `<%-JSON.stringify(config.iconpath).slice(1, -1)%>`,
+      <% } %>
       edit: true,
       redirect: (new_path) => {
         return "./" + new_path
@@ -1502,7 +1473,9 @@ body.dark .appcanvas {
       description: `<%=config.description%>`,
       old_path: `<%=name%>`,
       icon: `<%=config.icon%>`,
-      iconpath: `<%=config.iconpath%>`,
+      <% if (config.iconpath) { %>
+      iconpath: `<%-JSON.stringify(config.iconpath).slice(1, -1)%>`,
+      <% } %>
       copy: true,
       edit: true,
       redirect: (new_path) => {
@@ -1821,18 +1794,7 @@ body.dark .appcanvas {
     // render the selected frame only if not silent
     if (silent) {
     } else {
-      if (options && options.nodelay) {
-      } else {
-  //      await new Promise((resolve, reject) => {
-  //        setTimeout(() => {
-  //          resolve()
-  //        }, 500)
-  //      })
-      }
-      <% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
-        
-        renderSelection()
-      <% } %>
+      renderSelection()
     }
   }
   if (document.querySelector("#genlog")) {
@@ -1870,6 +1832,7 @@ body.dark .appcanvas {
             } else if (event.data.action.type === "title") {
               console.log("title", event.data)
             } else if (event.data.action.type === "location") {
+              console.log("EVENT", event)
               let url = event.data.action.url
               console.log({ action: event.data.action })
 

package/server/views/connect/x.ejs

@@ -179,6 +179,7 @@ pre {
 </style>
 <link href="/highlight.css" rel="stylesheet" />
 <script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
 <script src="/common.js"></script>
 <script src="/opener.js"></script>
 <script src="/highlight.js"></script>

package/server/views/connect.ejs

@@ -150,6 +150,7 @@ body.dark .card {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
 <script src="/common.js"></script>
 <script src="/opener.js"></script>
 </head>

package/server/views/download.ejs

@@ -23,20 +23,6 @@ body.frozen {
   overflow: auto !important;
 }
 
-body {
-  height: 100%;
-  overflow: auto;
-  background: rgb(44, 29, 22);
-  display: flex;
-  flex-direction: column;
-}
-body {
-/*
-  background: white;
-  background: rgb(44, 29, 22);
-  */
-  background: var(--dark-bg);
-}
 .line2 {
   display: flex;
   align-items: center;
@@ -128,17 +114,27 @@ body {
 <% } %>
 <header class='grabbable'>
 <h1>
-<a class='path' href="/"><%-logo%></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+<button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
+<button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
+<a class='btn2 create-new' id='create-new-folder'><div><i class='fa-solid fa-plus'></i></div><div>New</div></a>
+<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
+<a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
+<a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
-  <button class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></button>
-  <a class='btn2' href='https://discord.gg/TQdNwadtE4' target="_blank"><div><i class="fa-brands fa-discord"></i></div><div>Discord</div></a>
-  <a class='btn2' href='https://twitter.com/cocktailpeanut' target="_blank"><div><i class="fa-brands fa-twitter"></i></div><div>Twitter</div></a>
+  <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
+  <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
+  <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <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' class='btn2'><i class="fa-solid fa-plus"></i></button>
+  <% if (agent === "electron") { %>
+    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
+  <% } else { %>
+    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
+  <% } %>
+  <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>
-</h1>
 </header>
 <% if (requirements_pending) { %>
   <div class='requirements'>
@@ -189,7 +185,6 @@ body {
 <% } %>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
-  Reporter()
   <% if (error) { %>
     document.querySelector(".requirements .content").innerHTML = '<div class="loading"><i class="fa-solid fa-circle-exclamation"></i> <%=error%></div>'
   <% } %>

package/server/views/explore.ejs

@@ -114,6 +114,7 @@ body main iframe {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
 <script src="/nav.js"></script>
 </head>
 <body class='<%=theme%>'>

package/server/views/github.ejs

@@ -168,6 +168,7 @@ hr {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
 <script src="/common.js"></script>
 <script src="/opener.js"></script>
 </head>

package/server/views/help.ejs

@@ -236,7 +236,6 @@ body.dark .item .tile .badge {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
-<script src="/sweetalert2.js"></script>
 <script src="/noty.js"></script>
 <script src="/notyq.js"></script>
 <script src="/xterm.js"></script>

package/server/views/index.ejs

@@ -169,10 +169,13 @@ body.dark .open-menu, body.dark .browse {
   background: black !important;
   color: white !important;
 }
+.open-menu:hover, .browse:hover, body.dark .open-menu:hover, body.dark .browse:hover {
+  color: royalblue !important;
+}
 .open-menu, .browse {
   width: 80px;
   border-radius: 0 !important;
-  background: rgba(0,0,0,0.06) !important;
+  background: rgba(0,0,0,0.04) !important;
   color: black !important;
   /*
   border: 1px solid rgba(0, 0, 0, 0.3);
@@ -371,7 +374,7 @@ body.dark .open-menu, body.dark .browse {
               <% } %>
             </div>
             <div class='col'>
-              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
+              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.filepath%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
               <div class='menu-btns'>
@@ -446,7 +449,7 @@ body.dark .open-menu, body.dark .browse {
               <% } %>
             </div>
             <div class='col'>
-              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
+              <div class='uri'><i class="fa-regular fa-folder"></i><%=item.filepath%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
               <div class='menu-btns'>
@@ -458,11 +461,14 @@ body.dark .open-menu, body.dark .browse {
                 </button>
                 <div class='context-menu collapsed'>
                   <div class='context-menu-wrapper'>
+                    <button class='btn' data-filepath="<%=item.filepath%>">
+                      <i class="fa-solid fa-folder-open"></i> Open</button>
+                    </button>
                     <button class='btn copy-menu' data-src="<%=item.browser_url%>/browse">
                       <i class='fa-solid fa-copy'></i> Copy
                     </button>
                     <button class='btn move-menu' data-src="<%=item.browser_url%>/browse">
-                      <i class="fa-solid fa-pencil"></i> Move
+                      <i class="fa-solid fa-right-to-bracket"></i> Move
                     </button>
                     <button class='btn edit-menu' data-src="<%=item.browser_url%>/browse">
                       <i class='fa-solid fa-pen-to-square'></i> Edit

package/server/views/network.ejs

@@ -392,6 +392,7 @@ input:checked + .slider:before {
 }
 </style>
 <script src="/hotkeys.min.js"></script>
+<script src="/sweetalert2.js"></script>
 <script src="/common.js"></script>
 <script src="/opener.js"></script>
 </head>

package/server/views/prototype/show.ejs

@@ -26,9 +26,11 @@ main {
 }
 .doc {
   padding: 20px;
-  margin-top: 20px;
+  margin: 20px;
+  /*
   border-radius: 10px;
   border: 1px solid rgba(0,0,0,0.1);
+  */
 }
 #readme {
   border-top: 1px solid rgba(0,0,0,0.1);

package/server/views/settings.ejs

@@ -233,7 +233,6 @@ hr {
 <script src="/xterm-addon-fit.js"></script>
 <script src="/xterm-addon-web-links.js"></script>
 <script src="/xterm-theme.js"></script>
-<script src="/sweetalert2.js"></script>
 <script src="/install.js"></script>
 <script src="/timeago.min.js"></script>
 <script src="/common.js"></script>