pinokiod 3.193.0 → 3.195.0

package/package.json

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

package/server/views/shell.ejs

@@ -1163,20 +1163,216 @@ document.addEventListener("DOMContentLoaded", async () => {
         dropOverlay.className = "terminal-drop-overlay"
         dropOverlay.textContent = "Drop files to upload"
         terminalContainer.appendChild(dropOverlay)
-        const filterUniqueResources = (urls) => {
+        const dedupeClipboardFiles = (inputs) => {
           const seen = new Set()
-          return (Array.isArray(urls) ? urls : []).filter((item) => {
-            if (!item || typeof item.href !== "string") {
-              return false
+          const results = []
+          inputs.forEach((file) => {
+            if (!file || !(file instanceof File) || !(file.size > 0)) {
+              return
             }
-            const key = item.href.trim()
-            if (!key || seen.has(key)) {
-              return false
+            const signature = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+            if (seen.has(signature)) {
+              return
+            }
+            seen.add(signature)
+            results.push(file)
+          })
+          return results
+        }
+        const collectClipboardFiles = (clipboardData) => {
+          const files = []
+          const seen = new Set()
+          if (!clipboardData) {
+            return { files, hasFileFlavor: false }
+          }
+          let hasFileFlavor = false
+          try {
+            const types = Array.from(clipboardData.types || [])
+            hasFileFlavor = types.some((type) => type === "Files" || type === "application/x-moz-file")
+          } catch (_) {}
+          const pushIfUnique = (file) => {
+            if (!file || !(file instanceof File) || !(file.size > 0)) {
+              return
+            }
+            const key = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+            if (seen.has(key)) {
+              return
+            }
+            seen.add(key)
+            files.push(file)
+          }
+          try {
+            Array.from(clipboardData.files || []).forEach(pushIfUnique)
+          } catch (_) {}
+          try {
+            const items = clipboardData.items ? Array.from(clipboardData.items) : []
+            items.forEach((item) => {
+              if (!item || item.kind !== "file" || typeof item.getAsFile !== "function") {
+                return
+              }
+              try {
+                pushIfUnique(item.getAsFile())
+              } catch (_) {}
+            })
+          } catch (_) {}
+          return { files, hasFileFlavor }
+        }
+        const readClipboardFilesFallback = async () => {
+          if (!navigator.clipboard || typeof navigator.clipboard.read !== "function") {
+            return []
+          }
+          try {
+            const clipboardItems = await navigator.clipboard.read()
+            const collected = []
+            const seen = new Set()
+            let index = 0
+            for (const item of clipboardItems) {
+              if (!item || !Array.isArray(item.types)) {
+                index += 1
+                continue
+              }
+              const types = item.types
+              const preferredType = types.find((type) => type && !type.startsWith("text/"))
+                || types.find((type) => /^image\//i.test(type))
+                || types[0]
+              if (!preferredType) {
+                index += 1
+                continue
+              }
+              try {
+                const blob = await item.getType(preferredType)
+                if (!blob) {
+                  index += 1
+                  continue
+                }
+                let name = typeof item.name === "string" && item.name ? item.name : ""
+                if (!name) {
+                  const ext = preferredType && preferredType.includes("/") ? preferredType.split("/").pop() : ""
+                  const safeExt = ext ? ext.replace(/[^a-z0-9]/gi, "").toLowerCase() : ""
+                  name = `clipboard-${Date.now()}-${index}${safeExt ? `.${safeExt}` : ""}`
+                }
+                const file = blob instanceof File ? blob : new File([blob], name, {
+                  type: blob.type || preferredType,
+                  lastModified: Date.now()
+                })
+                const key = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+                if (seen.has(key)) {
+                  index += 1
+                  continue
+                }
+                seen.add(key)
+                collected.push(file)
+              } catch (error) {
+                if (error && error.name !== "NotAllowedError") {
+                  console.warn("Failed to extract clipboard blob", error)
+                }
+              }
+              index += 1
+            }
+            return collected
+          } catch (error) {
+            if (error && error.name !== "NotAllowedError") {
+              console.warn("navigator.clipboard.read() failed", error)
+            }
+            return []
+          }
+        }
+        const extractUrlsFromClipboard = (clipboardData) => {
+          const urls = []
+          if (!clipboardData) {
+            return urls
+          }
+          const seen = new Set()
+          const pushUrl = (href, nameHint) => {
+            if (!href) {
+              return
+            }
+            let resolved
+            try {
+              resolved = new URL(href, window.location.href)
+            } catch (_) {
+              try {
+                resolved = new URL(href)
+              } catch (_) {
+                return
+              }
+            }
+            if (!/^https?:$/i.test(resolved.protocol)) {
+              return
+            }
+            const key = resolved.href
+            if (seen.has(key)) {
+              return
             }
             seen.add(key)
+            urls.push({ href: resolved.href, name: nameHint || null })
+          }
+          let html = ""
+          let uriList = ""
+          if (typeof clipboardData.getData === "function") {
+            try { html = clipboardData.getData("text/html") || "" } catch (_) {}
+            try { uriList = clipboardData.getData("text/uri-list") || "" } catch (_) {}
+          }
+          if (uriList) {
+            uriList.split(/\r?\n/).forEach((line) => {
+              const trimmed = line.trim()
+              if (!trimmed || trimmed.startsWith("#")) {
+                return
+              }
+              pushUrl(trimmed, null)
+            })
+          }
+          if (html) {
+            try {
+              const parser = new DOMParser()
+              const doc = parser.parseFromString(html, "text/html")
+              doc.querySelectorAll("img[src]").forEach((img) => {
+                const src = img.getAttribute("src")
+                const nameHint = img.getAttribute("alt") || img.getAttribute("title") || null
+                pushUrl(src, nameHint)
+              })
+              doc.querySelectorAll("a[href]").forEach((anchor) => {
+                const href = anchor.getAttribute("href")
+                const nameHint = anchor.getAttribute("download") || (anchor.textContent ? anchor.textContent.trim() : null)
+                pushUrl(href, nameHint)
+              })
+            } catch (error) {
+              console.warn("Failed to parse clipboard HTML", error)
+            }
+          }
+          return urls
+        }
+        const isLikelyImagePaste = (clipboardData) => {
+          if (!clipboardData) {
+            return false
+          }
+          const types = Array.from(clipboardData.types || [])
+          if (types.some((type) => type && type.toLowerCase().startsWith("image/"))) {
             return true
-          })
+          }
+          if (typeof clipboardData.getData === "function") {
+            try {
+              const html = clipboardData.getData("text/html") || ""
+              if (html && /<img\b/i.test(html)) {
+                return true
+              }
+            } catch (_) {}
+            try {
+              const uriList = clipboardData.getData("text/uri-list") || ""
+              if (uriList && uriList.split(/\r?\n/).some((line) => {
+                const trimmed = line.trim()
+                if (!trimmed || trimmed.startsWith("#")) {
+                  return false
+                }
+                return /^https?:\/\//i.test(trimmed)
+              })) {
+                return true
+              }
+            } catch (_) {}
+          }
+          return false
         }
+        let suppressClipboardText = false
         let dragDepth = 0
         const prevent = (event) => {
           event.preventDefault()
@@ -1203,7 +1399,20 @@ document.addEventListener("DOMContentLoaded", async () => {
           let remoteResources = []
           try {
             const extra = await this.collectFilesFromDataTransfer(event.dataTransfer)
-            remoteResources = filterUniqueResources(extra && extra.urls)
+            if (extra && Array.isArray(extra.urls) && extra.urls.length) {
+              const seenUrls = new Set()
+              remoteResources = extra.urls.filter((item) => {
+                if (!item || typeof item.href !== "string") {
+                  return false
+                }
+                const key = item.href.trim()
+                if (!key || seenUrls.has(key)) {
+                  return false
+                }
+                seenUrls.add(key)
+                return true
+              })
+            }
           } catch (error) {
             console.warn("Failed to collect files from drop payload", error)
           }
@@ -1223,35 +1432,41 @@ document.addEventListener("DOMContentLoaded", async () => {
           this.term.focus()
         })
         terminalContainer.addEventListener("paste", async (event) => {
-          const clipboard = event.clipboardData || window.clipboardData || null
-          if (!clipboard) {
-            return
-          }
-          const files = Array.from(clipboard.files || [])
-          let remoteResources = []
-          try {
-            const extra = await this.collectFilesFromDataTransfer(clipboard)
-            remoteResources = filterUniqueResources(extra && extra.urls)
-          } catch (error) {
-            console.warn("Failed to collect clipboard resources", error)
+          const clipboard = event && event.clipboardData ? event.clipboardData : null
+          const { files: directFiles, hasFileFlavor } = collectClipboardFiles(clipboard)
+          let files = directFiles
+          let remoteUrls = []
+          if (files.length === 0) {
+            remoteUrls = extractUrlsFromClipboard(clipboard)
+            if (remoteUrls.length === 0 && !hasFileFlavor && isLikelyImagePaste(clipboard)) {
+              files = await readClipboardFilesFallback()
+            }
           }
-          if (!files.length && (!remoteResources || remoteResources.length === 0)) {
+          console.log('[clipboard paste][shell]', {
+            files: files.map((file) => ({ name: file.name, size: file.size, type: file.type })),
+            remoteUrls,
+            hasFileFlavor,
+            types: clipboard ? Array.from(clipboard.types || []) : []
+          })
+          if (files.length === 0 && remoteUrls.length === 0) {
+            suppressClipboardText = false
             return
           }
           event.preventDefault()
           event.stopPropagation()
+          suppressClipboardText = true
           try {
-            if (remoteResources && remoteResources.length > 0) {
-              await this.uploadRemoteResources(remoteResources, dropOverlay)
+            if (remoteUrls.length > 0) {
+              await this.uploadRemoteResources(remoteUrls, dropOverlay)
+            }
+            if (files.length > 0) {
+              await this.uploadFiles(files, dropOverlay)
             }
           } catch (error) {
-            console.warn("Clipboard remote upload failed", error)
-          }
-          if (files.length > 0) {
-            await this.uploadFiles(files, dropOverlay)
+            console.warn("Clipboard upload failed", error)
           }
           this.term.focus()
-        })
+        }, true)
         term.attachCustomKeyEventHandler(event => {
           if ((event.ctrlKey || event.metaKey) && event.key === 'c') {
             const selection = term.getSelection();
@@ -1261,16 +1476,20 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
           }
           if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
-            navigator.clipboard.readText().then((text) => {
-              this.socket.run({
-                //key: "\x1b[200~" + text + "\x1b[201~",
-                key: text,
-                id: shell_id,
-                paste: true
-              })
-              this.captureTextInput(text)
+            if (!suppressClipboardText) {
+              navigator.clipboard.readText().then((text) => {
+                console.log('[clipboard paste][shell][text]', text)
+                this.socket.run({
+                  //key: "\x1b[200~" + text + "\x1b[201~",
+                  key: text,
+                  id: shell_id,
+                  paste: true
+                })
+                this.captureTextInput(text)
 
-            })
+              })
+            }
+            suppressClipboardText = false
             return false
           }
           return true;

package/server/views/terminal.ejs

@@ -767,6 +767,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           } else if (packet.type === "result") {
             if (packet.id === "terminal.upload") {
               const uploaded = Array.isArray(packet.data && packet.data.files) ? packet.data.files : []
+              console.log('[terminal.upload][terminal][result]', uploaded)
               if (uploaded.length > 0) {
                 const mappedFiles = uploaded.map((file) => {
                   const displayPath = file.displayPath || file.homeRelativePath ? `~/${(file.homeRelativePath || '').replace(/^\/+/, '')}` : (file.path || '')
@@ -1256,99 +1257,252 @@ document.addEventListener("DOMContentLoaded", async () => {
         dropOverlay.className = "terminal-drop-overlay"
         dropOverlay.textContent = "Drop files to upload"
         terminalContainer.appendChild(dropOverlay)
-        const filterUniqueResources = (urls) => {
+        const dedupeClipboardFiles = (inputs) => {
           const seen = new Set()
-          return (Array.isArray(urls) ? urls : []).filter((item) => {
-            if (!item || typeof item.href !== "string") {
-              return false
+          const results = []
+          inputs.forEach((file) => {
+            if (!file || !(file instanceof File) || !(file.size > 0)) {
+              return
             }
-            const key = item.href.trim()
-            if (!key || seen.has(key)) {
-              return false
+            const signature = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+            if (seen.has(signature)) {
+              return
             }
-            seen.add(key)
-            return true
+            seen.add(signature)
+            results.push(file)
           })
+          return results
         }
-        let dragDepth = 0
-        const prevent = (event) => {
-          event.preventDefault()
-          event.stopPropagation()
-        }
-        terminalContainer.addEventListener("dragenter", (event) => {
-          prevent(event)
-          dragDepth += 1
-          dropOverlay.classList.add("active")
-        })
-        terminalContainer.addEventListener("dragover", prevent)
-        terminalContainer.addEventListener("dragleave", (event) => {
-          prevent(event)
-          dragDepth = Math.max(0, dragDepth - 1)
-          if (dragDepth === 0) {
-            dropOverlay.classList.remove("active")
+        const collectClipboardFiles = (clipboardData) => {
+          const files = []
+          const seen = new Set()
+          if (!clipboardData) {
+            return { files, hasFileFlavor: false }
           }
-        })
-        terminalContainer.addEventListener("drop", async (event) => {
-          prevent(event)
-          dragDepth = 0
-          dropOverlay.classList.remove("active")
-          const files = Array.from(event.dataTransfer ? event.dataTransfer.files || [] : [])
-          let remoteResources = []
+          let hasFileFlavor = false
           try {
-            const extra = await this.collectFilesFromDataTransfer(event.dataTransfer)
-            remoteResources = filterUniqueResources(extra && extra.urls)
-          } catch (error) {
-            console.warn("Failed to collect files from drop payload", error)
+            const types = Array.from(clipboardData.types || [])
+            hasFileFlavor = types.some((type) => type === "Files" || type === "application/x-moz-file")
+          } catch (_) {}
+          const pushIfUnique = (file) => {
+            if (!file || !(file instanceof File) || !(file.size > 0)) {
+              return
+            }
+            const key = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+            if (seen.has(key)) {
+              return
+            }
+            seen.add(key)
+            files.push(file)
           }
-          if (!files.length && (!remoteResources || remoteResources.length === 0)) {
-            n.Noty({
-              text: "Dropped item did not include an accessible file",
-              type: "error"
+          try {
+            Array.from(clipboardData.files || []).forEach(pushIfUnique)
+          } catch (_) {}
+          try {
+            const items = clipboardData.items ? Array.from(clipboardData.items) : []
+            items.forEach((item) => {
+              if (!item || item.kind !== "file" || typeof item.getAsFile !== "function") {
+                return
+              }
+              try {
+                pushIfUnique(item.getAsFile())
+              } catch (_) {}
             })
-            return
+          } catch (_) {}
+          return { files, hasFileFlavor }
+        }
+        const readClipboardFilesFallback = async () => {
+          if (!navigator.clipboard || typeof navigator.clipboard.read !== "function") {
+            return []
           }
           try {
-            if (remoteResources && remoteResources.length > 0) {
-              await this.uploadRemoteResources(remoteResources, dropOverlay)
+            const clipboardItems = await navigator.clipboard.read()
+            const collected = []
+            const seen = new Set()
+            let index = 0
+            for (const item of clipboardItems) {
+              if (!item || !Array.isArray(item.types)) {
+                index += 1
+                continue
+              }
+              const types = item.types
+              const preferredType = types.find((type) => type && !type.startsWith("text/"))
+                || types.find((type) => /^image\//i.test(type))
+                || types[0]
+              if (!preferredType) {
+                index += 1
+                continue
+              }
+              try {
+                const blob = await item.getType(preferredType)
+                if (!blob) {
+                  index += 1
+                  continue
+                }
+                let name = typeof item.name === "string" && item.name ? item.name : ""
+                if (!name) {
+                  const ext = preferredType && preferredType.includes("/") ? preferredType.split("/").pop() : ""
+                  const safeExt = ext ? ext.replace(/[^a-z0-9]/gi, "").toLowerCase() : ""
+                  name = `clipboard-${Date.now()}-${index}${safeExt ? `.${safeExt}` : ""}`
+                }
+                const file = blob instanceof File ? blob : new File([blob], name, {
+                  type: blob.type || preferredType,
+                  lastModified: Date.now()
+                })
+                const key = `${file.name || ''}::${file.size || 0}::${file.type || ''}`
+                if (seen.has(key)) {
+                  index += 1
+                  continue
+                }
+                seen.add(key)
+                collected.push(file)
+              } catch (error) {
+                if (error && error.name !== "NotAllowedError") {
+                  console.warn("Failed to extract clipboard blob", error)
+                }
+              }
+              index += 1
             }
+            return collected
           } catch (error) {
-            console.warn("Remote upload failed", error)
+            if (error && error.name !== "NotAllowedError") {
+              console.warn("navigator.clipboard.read() failed", error)
+            }
+            return []
           }
-          if (files.length > 0) {
-            await this.uploadFiles(files, dropOverlay)
+        }
+        const extractUrlsFromClipboard = (clipboardData) => {
+          const urls = []
+          if (!clipboardData) {
+            return urls
           }
-          this.term.focus()
-        })
-        terminalContainer.addEventListener("paste", async (event) => {
-          const clipboard = event.clipboardData || window.clipboardData || null
-          if (!clipboard) {
-            return
+          const seen = new Set()
+          const pushUrl = (href, nameHint) => {
+            if (!href) {
+              return
+            }
+            let resolved
+            try {
+              resolved = new URL(href, window.location.href)
+            } catch (_) {
+              try {
+                resolved = new URL(href)
+              } catch (_) {
+                return
+              }
+            }
+            if (!/^https?:$/i.test(resolved.protocol)) {
+              return
+            }
+            const key = resolved.href
+            if (seen.has(key)) {
+              return
+            }
+            seen.add(key)
+            urls.push({ href: resolved.href, name: nameHint || null })
           }
-          const files = Array.from(clipboard.files || [])
-          let remoteResources = []
-          try {
-            const extra = await this.collectFilesFromDataTransfer(clipboard)
-            remoteResources = filterUniqueResources(extra && extra.urls)
-          } catch (error) {
-            console.warn("Failed to collect clipboard resources", error)
+          let html = ""
+          let uriList = ""
+          if (typeof clipboardData.getData === "function") {
+            try { html = clipboardData.getData("text/html") || "" } catch (_) {}
+            try { uriList = clipboardData.getData("text/uri-list") || "" } catch (_) {}
+          }
+          if (uriList) {
+            uriList.split(/\r?\n/).forEach((line) => {
+              const trimmed = line.trim()
+              if (!trimmed || trimmed.startsWith("#")) {
+                return
+              }
+              pushUrl(trimmed, null)
+            })
+          }
+          if (html) {
+            try {
+              const parser = new DOMParser()
+              const doc = parser.parseFromString(html, "text/html")
+              doc.querySelectorAll("img[src]").forEach((img) => {
+                const src = img.getAttribute("src")
+                const nameHint = img.getAttribute("alt") || img.getAttribute("title") || null
+                pushUrl(src, nameHint)
+              })
+              doc.querySelectorAll("a[href]").forEach((anchor) => {
+                const href = anchor.getAttribute("href")
+                const nameHint = anchor.getAttribute("download") || (anchor.textContent ? anchor.textContent.trim() : null)
+                pushUrl(href, nameHint)
+              })
+            } catch (error) {
+              console.warn("Failed to parse clipboard HTML", error)
+            }
+          }
+          return urls
+        }
+        const isLikelyImagePaste = (clipboardData) => {
+          if (!clipboardData) {
+            return false
+          }
+          const types = Array.from(clipboardData.types || [])
+          if (types.some((type) => type && type.toLowerCase().startsWith("image/"))) {
+            return true
+          }
+          if (typeof clipboardData.getData === "function") {
+            try {
+              const html = clipboardData.getData("text/html") || ""
+              if (html && /<img\b/i.test(html)) {
+                return true
+              }
+            } catch (_) {}
+            try {
+              const uriList = clipboardData.getData("text/uri-list") || ""
+              if (uriList && uriList.split(/\r?\n/).some((line) => {
+                const trimmed = line.trim()
+                if (!trimmed || trimmed.startsWith("#")) {
+                  return false
+                }
+                return /^https?:\/\//i.test(trimmed)
+              })) {
+                return true
+              }
+            } catch (_) {}
+          }
+          return false
+        }
+        let suppressClipboardText = false
+        terminalContainer.addEventListener("paste", async (event) => {
+          const clipboard = event && event.clipboardData ? event.clipboardData : null
+          const { files: directFiles, hasFileFlavor } = collectClipboardFiles(clipboard)
+          let files = directFiles
+          let remoteUrls = []
+          if (files.length === 0) {
+            remoteUrls = extractUrlsFromClipboard(clipboard)
+            if (remoteUrls.length === 0 && !hasFileFlavor && isLikelyImagePaste(clipboard)) {
+              files = await readClipboardFilesFallback()
+            }
           }
-          if (!files.length && (!remoteResources || remoteResources.length === 0)) {
+          console.log('[clipboard paste][terminal]', {
+            files: files.map((file) => ({ name: file.name, size: file.size, type: file.type })),
+            remoteUrls,
+            hasFileFlavor,
+            types: clipboard ? Array.from(clipboard.types || []) : []
+          })
+          if (files.length === 0 && remoteUrls.length === 0) {
+            suppressClipboardText = false
             return
           }
           event.preventDefault()
           event.stopPropagation()
+          suppressClipboardText = true
           try {
-            if (remoteResources && remoteResources.length > 0) {
-              await this.uploadRemoteResources(remoteResources, dropOverlay)
+            if (remoteUrls.length > 0) {
+              await this.uploadRemoteResources(remoteUrls, dropOverlay)
+            }
+            if (files.length > 0) {
+              await this.uploadFiles(files, dropOverlay)
             }
           } catch (error) {
-            console.warn("Clipboard remote upload failed", error)
-          }
-          if (files.length > 0) {
-            await this.uploadFiles(files, dropOverlay)
+            console.warn("Clipboard upload failed", error)
           }
           this.term.focus()
-        })
+        }, true)
         term.attachCustomKeyEventHandler(event => {
           if ((event.ctrlKey || event.metaKey) && event.key === 'c') {
             const selection = term.getSelection();
@@ -1358,14 +1512,16 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
           }
           if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
-            navigator.clipboard.readText().then((text) => {
-              this.socket.run({
-                //key: "\x1b[200~" + text + "\x1b[201~",
-                key: text,
-                id: shell_id,
-                paste: true
-              })
-              this.captureTextInput(text)
+            if (!suppressClipboardText) {
+              navigator.clipboard.readText().then((text) => {
+                console.log('[clipboard paste][terminal][text]', text)
+                this.socket.run({
+                  //key: "\x1b[200~" + text + "\x1b[201~",
+                  key: text,
+                  id: shell_id,
+                  paste: true
+                })
+                this.captureTextInput(text)
 
 
 //              this.socket.run({
@@ -1373,7 +1529,9 @@ document.addEventListener("DOMContentLoaded", async () => {
 //                key: text,
 //                id: shell_id
 //              })
-            })
+              })
+            }
+            suppressClipboardText = false
             return false
           }
           return true;