pinokiod 3.183.0 → 3.184.0

package/package.json

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

package/server/views/shell.ejs

@@ -893,6 +893,93 @@ document.addEventListener("DOMContentLoaded", async () => {
         }
       }
     }
+    async collectFilesFromDataTransfer(dataTransfer) {
+      if (!dataTransfer) {
+        return []
+      }
+      const items = dataTransfer.items ? Array.from(dataTransfer.items) : []
+      const stringItems = items.filter((item) => item && item.kind === "string" && typeof item.getAsString === "function")
+      const collectedStrings = []
+      if (stringItems.length > 0) {
+        const stringValues = await Promise.all(stringItems.map((item) => new Promise((resolve) => {
+          try {
+            item.getAsString((value) => resolve({ type: item.type || "text/plain", value }))
+          } catch (_) {
+            resolve({ type: item.type || "text/plain", value: "" })
+          }
+        })))
+        for (const entry of stringValues) {
+          if (entry && typeof entry.value === "string" && entry.value.trim()) {
+            collectedStrings.push(entry)
+          }
+        }
+      } else if (typeof dataTransfer.getData === "function") {
+        const uriList = dataTransfer.getData("text/uri-list")
+        if (uriList && uriList.trim()) {
+          collectedStrings.push({ type: "text/uri-list", value: uriList })
+        }
+        const plain = dataTransfer.getData("text/plain")
+        if (plain && plain.trim()) {
+          collectedStrings.push({ type: "text/plain", value: plain })
+        }
+      }
+      if (!collectedStrings.length) {
+        return []
+      }
+      const origin = window.location.origin
+      const urls = new Set()
+      for (const { type, value } of collectedStrings) {
+        if (!value) {
+          continue
+        }
+        const trimmed = value.trim()
+        if (!trimmed) {
+          continue
+        }
+        const candidates = (type === "text/uri-list" ? trimmed.split(/\r?\n/) : [trimmed]).filter((line) => line && !line.startsWith("#"))
+        for (const candidate of candidates) {
+          let resolved
+          try {
+            resolved = new URL(candidate, origin)
+          } catch (_) {
+            continue
+          }
+          if (resolved.origin !== origin) {
+            continue
+          }
+          urls.add(resolved.href)
+        }
+      }
+      if (!urls.size) {
+        return []
+      }
+      const FileCtor = typeof window !== "undefined" ? window.File : null
+      if (typeof FileCtor !== "function") {
+        return []
+      }
+      const files = []
+      for (const href of urls) {
+        try {
+          const response = await fetch(href, { credentials: "include" })
+          if (!response || !response.ok) {
+            continue
+          }
+          const blob = await response.blob()
+          const nameSegment = href.split("/").pop() || "download"
+          let filename = nameSegment || "download"
+          try {
+            filename = decodeURIComponent(filename)
+          } catch (_) {}
+          if (!filename) {
+            filename = "download"
+          }
+          files.push(new FileCtor([blob], filename, { type: blob.type || "application/octet-stream", lastModified: Date.now() }))
+        } catch (error) {
+          console.warn("Failed to resolve dropped resource", href, error)
+        }
+      }
+      return files
+    }
     async createTerm (_theme) {
       console.log(xtermTheme)
       if (!this.term) {
@@ -964,11 +1051,26 @@ document.addEventListener("DOMContentLoaded", async () => {
           prevent(event)
           dragDepth = 0
           dropOverlay.classList.remove("active")
-          const dropped = Array.from(event.dataTransfer ? event.dataTransfer.files || [] : [])
-          if (!dropped.length) {
+          const files = Array.from(event.dataTransfer ? event.dataTransfer.files || [] : [])
+          try {
+            const extra = await this.collectFilesFromDataTransfer(event.dataTransfer)
+            if (Array.isArray(extra) && extra.length) {
+              const seen = new Set(files.map((file) => `${file.name}-${file.size}`))
+              for (const file of extra) {
+                const key = `${file.name}-${file.size}`
+                if (!seen.has(key)) {
+                  seen.add(key)
+                  files.push(file)
+                }
+              }
+            }
+          } catch (error) {
+            console.warn("Failed to collect files from drop payload", error)
+          }
+          if (!files.length) {
             return
           }
-          await this.uploadFiles(dropped, dropOverlay)
+          await this.uploadFiles(files, dropOverlay)
           this.term.focus()
         })
         term.attachCustomKeyEventHandler(event => {

package/server/views/terminal.ejs

@@ -980,6 +980,93 @@ document.addEventListener("DOMContentLoaded", async () => {
         }
       }
     }
+    async collectFilesFromDataTransfer(dataTransfer) {
+      if (!dataTransfer) {
+        return []
+      }
+      const items = dataTransfer.items ? Array.from(dataTransfer.items) : []
+      const stringItems = items.filter((item) => item && item.kind === "string" && typeof item.getAsString === "function")
+      const collectedStrings = []
+      if (stringItems.length > 0) {
+        const stringValues = await Promise.all(stringItems.map((item) => new Promise((resolve) => {
+          try {
+            item.getAsString((value) => resolve({ type: item.type || "text/plain", value }))
+          } catch (_) {
+            resolve({ type: item.type || "text/plain", value: "" })
+          }
+        })))
+        for (const entry of stringValues) {
+          if (entry && typeof entry.value === "string" && entry.value.trim()) {
+            collectedStrings.push(entry)
+          }
+        }
+      } else if (typeof dataTransfer.getData === "function") {
+        const uriList = dataTransfer.getData("text/uri-list")
+        if (uriList && uriList.trim()) {
+          collectedStrings.push({ type: "text/uri-list", value: uriList })
+        }
+        const plain = dataTransfer.getData("text/plain")
+        if (plain && plain.trim()) {
+          collectedStrings.push({ type: "text/plain", value: plain })
+        }
+      }
+      if (!collectedStrings.length) {
+        return []
+      }
+      const origin = window.location.origin
+      const urls = new Set()
+      for (const { type, value } of collectedStrings) {
+        if (!value) {
+          continue
+        }
+        const trimmed = value.trim()
+        if (!trimmed) {
+          continue
+        }
+        const candidates = (type === "text/uri-list" ? trimmed.split(/\r?\n/) : [trimmed]).filter((line) => line && !line.startsWith("#"))
+        for (const candidate of candidates) {
+          let resolved
+          try {
+            resolved = new URL(candidate, origin)
+          } catch (_) {
+            continue
+          }
+          if (resolved.origin !== origin) {
+            continue
+          }
+          urls.add(resolved.href)
+        }
+      }
+      if (!urls.size) {
+        return []
+      }
+      const FileCtor = typeof window !== "undefined" ? window.File : null
+      if (typeof FileCtor !== "function") {
+        return []
+      }
+      const files = []
+      for (const href of urls) {
+        try {
+          const response = await fetch(href, { credentials: "include" })
+          if (!response || !response.ok) {
+            continue
+          }
+          const blob = await response.blob()
+          const nameSegment = href.split("/").pop() || "download"
+          let filename = nameSegment || "download"
+          try {
+            filename = decodeURIComponent(filename)
+          } catch (_) {}
+          if (!filename) {
+            filename = "download"
+          }
+          files.push(new FileCtor([blob], filename, { type: blob.type || "application/octet-stream", lastModified: Date.now() }))
+        } catch (error) {
+          console.warn("Failed to resolve dropped resource", href, error)
+        }
+      }
+      return files
+    }
     async createTerm (_theme) {
       if (!this.term) {
         const theme = Object.assign({ }, _theme, {
@@ -1048,11 +1135,26 @@ document.addEventListener("DOMContentLoaded", async () => {
           prevent(event)
           dragDepth = 0
           dropOverlay.classList.remove("active")
-          const dropped = Array.from(event.dataTransfer ? event.dataTransfer.files || [] : [])
-          if (!dropped.length) {
+          const files = Array.from(event.dataTransfer ? event.dataTransfer.files || [] : [])
+          try {
+            const extra = await this.collectFilesFromDataTransfer(event.dataTransfer)
+            if (Array.isArray(extra) && extra.length) {
+              const seen = new Set(files.map((file) => `${file.name}-${file.size}`))
+              for (const file of extra) {
+                const key = `${file.name}-${file.size}`
+                if (!seen.has(key)) {
+                  seen.add(key)
+                  files.push(file)
+                }
+              }
+            }
+          } catch (error) {
+            console.warn("Failed to collect files from drop payload", error)
+          }
+          if (!files.length) {
             return
           }
-          await this.uploadFiles(dropped, dropOverlay)
+          await this.uploadFiles(files, dropOverlay)
           this.term.focus()
         })
         term.attachCustomKeyEventHandler(event => {