pinokiod 3.93.0 → 3.95.0

package/kernel/util.js

@@ -546,7 +546,9 @@ function push(params) {
   if (!params.title) {
     params.title = "Pinokio"
   }
-  console.log("Notifier.notify", params)
+  if (!params.contentImage) {
+    params.contentImage = path.resolve(__dirname, "../server/public/pinokio-black.png")
+  }
   notifier.notify(params)
 }
 function p2u(localPath) {

package/package.json

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

package/server/index.js

@@ -3998,7 +3998,66 @@ class Server {
     this.app.post("/push", ex(async (req, res) => {
       console.log("Push", req.body)
       try {
-        Util.push(req.body)
+        const payload = { ...(req.body || {}) }
+        if (typeof payload.image === 'string' && payload.image.trim()) {
+          const resolveAssetPath = (raw) => {
+            if (typeof raw !== 'string') {
+              return null
+            }
+            const trimmed = raw.trim()
+            if (!trimmed) {
+              return null
+            }
+            let candidate = trimmed
+            if (/^https?:\/\//i.test(trimmed)) {
+              try {
+                const parsed = new URL(trimmed)
+                candidate = parsed.pathname
+              } catch (_) {
+                return null
+              }
+            }
+            if (!candidate.startsWith('/asset/')) {
+              return null
+            }
+            const pathPart = candidate.split('?')[0].split('#')[0]
+            const rel = pathPart.replace(/^\/asset\/+/, '')
+            if (!rel) {
+              return null
+            }
+            const parts = rel.split('/').filter(Boolean)
+            if (!parts.length || parts.some((part) => part === '..')) {
+              return null
+            }
+            try {
+              return this.kernel.path(...parts)
+            } catch (_) {
+              return null
+            }
+          }
+          const resolvedImage = resolveAssetPath(payload.image)
+          if (resolvedImage) {
+            payload.image = resolvedImage
+          } else {
+            const normalised = payload.image.trim()
+            if (normalised.startsWith('/')) {
+              const relative = normalised.replace(/^\/+/, '')
+              if (relative) {
+                const publicRoot = path.resolve(__dirname, 'public')
+                const candidate = path.resolve(publicRoot, relative)
+                if (candidate.startsWith(publicRoot)) {
+                  try {
+                    await fs.promises.access(candidate, fs.constants.R_OK)
+                    payload.image = candidate
+                  } catch (_) {
+                    // ignore missing fallback asset
+                  }
+                }
+              }
+            }
+          }
+        }
+        Util.push(payload)
         res.json({ success: true })
       } catch (e) {
         res.json({ error: e.stack })

package/server/public/tab-idle-notifier.js

@@ -176,7 +176,7 @@
         return value;
       }
     }
-    return null;
+    return '/pinokio-black.png';
   };
 
   const findLinkByFrameName = (frameName) => {
@@ -198,6 +198,57 @@
     return null;
   };
 
+  const normaliseImageSrc = (value) => {
+    if (typeof value !== 'string') {
+      return null;
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+      return null;
+    }
+    try {
+      const url = new URL(trimmed, window.location.origin);
+      if (url.origin === window.location.origin) {
+        if (url.pathname.startsWith('/asset/')) {
+          return url.pathname;
+        }
+        return url.href;
+      }
+      return url.href;
+    } catch (_) {
+      if (trimmed.startsWith('/')) {
+        return trimmed;
+      }
+      return null;
+    }
+  };
+
+  const resolveTabImage = (link) => {
+    if (!link) {
+      return null;
+    }
+    const direct = link.querySelector('img.menu-item-image');
+    if (direct) {
+      const candidates = [direct.currentSrc, direct.src, direct.getAttribute('src')];
+      for (const candidate of candidates) {
+        const normalised = normaliseImageSrc(candidate);
+        if (normalised) {
+          return normalised;
+        }
+      }
+    }
+    const attrCandidates = ['data-iconpath', 'data-icon'];
+    for (const attr of attrCandidates) {
+      if (link.hasAttribute(attr)) {
+        const normalised = normaliseImageSrc(link.getAttribute(attr));
+        if (normalised) {
+          return normalised;
+        }
+      }
+    }
+    return null;
+  };
+
   const findIndicatorForFrame = (frameName) => {
     const link = findLinkByFrameName(frameName);
     if (!link) {
@@ -427,15 +478,21 @@ const ensureTabAccessories = aggregateDebounce(() => {
     }
     const tab = link.querySelector('.tab');
     const title = tab ? tab.textContent.trim() : 'Tab activity';
-    const subtitle = title || 'Pinokio';
-    const message = state.lastInput ? `Last input: ${state.lastInput}` : 'Tab is now idle.';
+    //const subtitle = title || 'Pinokio';
+    //const message = state.lastInput ? `Last input: ${state.lastInput}` : 'Tab is now idle.';
+    const message = state.lastInput ? `Response to: "${state.lastInput}` : "Tab is now idle."
+    const image = resolveTabImage(link);
 
     const payload = {
       title: 'Pinokio',
-      subtitle,
+      //subtitle,
       message,
+      timeout: 60,
       sound: true,
     };
+    if (image) {
+      payload.image = image;
+    }
 
     try {
       log('Sending notification payload', payload);

package/server/views/app.ejs

@@ -798,6 +798,9 @@ body.dark .grid-btns .btn2 {
   /*
   margin-top: 4px;
   */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .tab.has-preview .tab-updated {
   color: rgba(0, 0, 0, 0.45);
@@ -2397,7 +2400,7 @@ body.dark {
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/">
+<a class='home' href="/home">
   <img class='icon' src="/pinokio-black.png">
 </a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>

package/server/views/connect/x.ejs

@@ -193,7 +193,7 @@ pre {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/connect.ejs

@@ -812,7 +812,7 @@ document.addEventListener('DOMContentLoaded', function() {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/container.ejs

@@ -326,7 +326,7 @@ iframe {
   -->
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/download.ejs

@@ -121,7 +121,7 @@ body.frozen {
 <% } %>
 <header class='grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/explore.ejs

@@ -122,7 +122,7 @@ body main iframe {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/general_editor.ejs

@@ -188,7 +188,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 <body class='columns <%=theme%>' data-agent="<%=agent%>">
   <header class='navheader grabbable'>
   <h1>
-    <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+    <a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
     <%=filepath%>
   </h1>
   <div class='runner'>

package/server/views/github.ejs

@@ -234,7 +234,7 @@ ol {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/help.ejs

@@ -255,7 +255,7 @@ body.dark .item .tile .badge {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/index.ejs

@@ -417,7 +417,7 @@ body.dark aside .current.selected {
 <header class='navheader grabbable'>
 <h1>
 <% if (ishome) { %>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/index2.ejs

@@ -242,7 +242,7 @@ body.dark .open-menu, body.dark .browse {
 <header class='navheader grabbable'>
 <h1>
 <% if (ishome) { %>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/init/index.ejs

@@ -1520,7 +1520,7 @@ body.dark .ace-editor {
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/mini.ejs

@@ -755,7 +755,7 @@ body.dark .appcanvas {
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/net.ejs

@@ -535,7 +535,7 @@ document.addEventListener('DOMContentLoaded', function() {
 <% } %>
 <header class='navheader grabbable'>
   <h1>
-    <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+    <a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
     <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
     <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
     <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/network.ejs

@@ -1048,7 +1048,7 @@ document.addEventListener('DOMContentLoaded', function() {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/network2.ejs

@@ -418,7 +418,7 @@ table h3 {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/old_network.ejs

@@ -401,7 +401,7 @@ input:checked + .slider:before {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/pro.ejs

@@ -184,7 +184,7 @@ body.dark #status-window b {
   <% } %>
     <h1>
       <% if (target === "_top") { %>
-      <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+      <a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
       <% } %>
       <div class='hidden btn run play-btn'>
         <span class='play'><i class="fa-solid fa-play"></i> Start</span>

package/server/views/prototype/index.ejs

@@ -1002,7 +1002,7 @@ body.dark .appcanvas {
 <body class='<%=theme%>' data-platform="<%=platform%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/review.ejs

@@ -935,7 +935,7 @@ body.dark .top-menu .btn2.selected {
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/">
+<a class='home' href="/home">
   <img class='icon' src="/pinokio-black.png">
 </a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>

package/server/views/screenshots.ejs

@@ -708,7 +708,7 @@ document.addEventListener('DOMContentLoaded', function() {
   -->
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/settings.ejs

@@ -373,7 +373,7 @@ document.addEventListener('DOMContentLoaded', function() {
   -->
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/setup.ejs

@@ -135,7 +135,7 @@ body {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='grabbable'>
 <h1>
-<a class='home' href="/"><%-logo%></a>
+<a class='home' href="/home"><%-logo%></a>
 <button class='btn2' id='screenshot' data-tippy-content="take a screenshot"><i class="fa-solid fa-camera"></i></button>
 <div class='flexible'></div>
 <a class='btn2' href="/columns" data-tippy-content="split into 2 columns">

package/server/views/shell.ejs

@@ -1116,7 +1116,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   <% } %>
     <div class='runner'>
       <% if (target === "_top") { %>
-      <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+      <a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
       <% } %>
       <div class='hidden btn run play-btn'>
         <span class='play'><i class="fa-solid fa-play"></i> Start</span>

package/server/views/sidebar.ejs

@@ -35,7 +35,7 @@ html, body {
 </style>
 </head>
 <body class='<%=theme%>' data-agent="<%=agent%>">
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <a class='header-item' href="<%=home%>">
   <img src="<%=rawpath%>/<%=config.icon%>?raw=true"/>
   <div><%=config.title%></div>

package/server/views/tools.ejs

@@ -1098,7 +1098,7 @@ document.addEventListener('DOMContentLoaded', function() {
   -->
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/home"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>