pinokiod 3.94.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.94.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);