pinokiod 8.0.8 → 8.0.10

package/server/public/style.css

@@ -6973,3 +6973,68 @@ body.dark .swal2-popup.swal2-modal:not(.loader-popup):not(.pinokio-download-moda
     width: 100%;
   }
 }
+
+.pinokio-path-blocker > p {
+  margin: 0 0 14px;
+}
+
+.pinokio-path-blocker-list {
+  margin: 0 0 14px;
+  padding: 0;
+  list-style: none;
+}
+
+.pinokio-path-blocker-item {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 8px 0;
+  border-bottom: 1px solid rgba(127, 127, 127, 0.18);
+}
+
+.pinokio-path-blocker-name {
+  font-weight: 600;
+}
+
+.pinokio-path-blocker-detail {
+  font-size: 12px;
+  overflow-wrap: anywhere;
+  text-align: right;
+}
+
+.pinokio-path-blocker-files {
+  margin: 0 0 14px;
+}
+
+.pinokio-path-blocker-files summary {
+  cursor: pointer;
+}
+
+.pinokio-path-blocker-files div {
+  display: grid;
+  gap: 6px;
+  margin-top: 8px;
+}
+
+.pinokio-path-blocker-files code {
+  overflow-wrap: anywhere;
+  white-space: normal;
+}
+
+.pinokio-path-blocker-wait {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+@media (max-width: 560px) {
+  .pinokio-path-blocker-item {
+    display: grid;
+    gap: 2px;
+  }
+
+  .pinokio-path-blocker-detail {
+    text-align: left;
+  }
+}

package/server/views/app.ejs

@@ -11866,15 +11866,13 @@ const rerenderMenuSection = (container, html) => {
             actions: "hidden"
           }
         });
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ name })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log("res", res)
         Swal.close()
         if (res) {

package/server/views/download.ejs

@@ -231,18 +231,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ type: "bin" })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")
-        if (res.error) {
+        if (res.cancelled) {
+          document.querySelector("#del-bin").classList.remove("hidden")
+        } else if (res.error) {
           alert(res.error)
         } else {
           //location.href = location.href

package/server/views/editor.ejs

@@ -940,18 +940,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ type: "bin" })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")
-        if (res.error) {
+        if (res.cancelled) {
+          document.querySelector("#del-bin").classList.remove("hidden")
+        } else if (res.error) {
           alert(res.error)
         } else {
           document.querySelector("#install-form").submit()

package/server/views/env_editor.ejs

@@ -447,16 +447,18 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
         })
         try {
-          const res = await fetch("/pinokio/delete", {
+          const res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
             method: "post",
             headers: {
               "Content-Type": "application/json"
             },
             body: JSON.stringify({ name: projectName })
-          }).then((response) => response.json())
+          }))
           Swal.close()
           if (res && res.success) {
             navigateHome()
+          } else if (res && res.cancelled) {
+            return
           } else if (res && res.error) {
             alert(res.error)
           } else {

package/server/views/file_explorer.ejs

@@ -636,15 +636,13 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
         body: JSON.stringify({ name })
-      }).then((res) => {
-        return res.json()
-      })
+      }))
       console.log("res", res)
       Swal.close()
       if (res) {

package/server/views/index.ejs

@@ -4031,15 +4031,13 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
         body: JSON.stringify({ name })
-      }).then((res) => {
-        return res.json()
-      })
+      }))
       console.log("res", res)
       Swal.close()
       if (res) {

package/server/views/install.ejs

@@ -851,6 +851,31 @@ document.addEventListener("DOMContentLoaded", async () => {
         socket.close()
       } else if (packet.type === "result") {
         resolve() 
+      } else if (packet.type === "path.remove.blocked") {
+        const result = await PinokioPathRemoval.show({
+          details: packet.data,
+          retry: async () => {
+            const response = await fetch("/pinokio/delete", {
+              method: "post",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify({ type: "conda-runtime" })
+            })
+            const payload = await response.json()
+            const blocked = PinokioPathRemoval.blockedDetails(payload)
+            if (!blocked && (!response.ok || (payload && payload.error))) {
+              const message = payload && payload.error
+              throw new Error(typeof message === "string" ? message : `Cleanup failed (${response.status})`)
+            }
+            return payload
+          }
+        })
+        if (result && result.success) {
+          setTimeout(() => window.location.reload(), 0)
+        } else if (result && result.cancelled) {
+          navigateToCallback()
+        }
       } else if (packet.type === "error") {
         if (typeof packet.data === "string" && packet.data.includes("__PINOKIO_BLOCKER__")) {
           return

package/server/views/net.ejs

@@ -2361,15 +2361,13 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
         body: JSON.stringify({ name })
-      }).then((res) => {
-        return res.json()
-      })
+      }))
       console.log("res", res)
       Swal.close()
       if (res) {

package/server/views/settings.ejs

@@ -1537,18 +1537,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ type: "bin" })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")
-        if (res.error) {
+        if (res.cancelled) {
+          document.querySelector("#del-bin").classList.remove("hidden")
+        } else if (res.error) {
           alert(res.error)
         } else {
           location.href = location.href
@@ -1561,18 +1561,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-cache-loading").classList.remove("hidden")
         document.querySelector("#del-cache").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ type: "cache" })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log(res)
         document.querySelector(".reset-cache-loading").classList.add("hidden")
-        if (res.error) {
+        if (res.cancelled) {
+          document.querySelector("#del-cache").classList.remove("hidden")
+        } else if (res.error) {
           alert(res.error)
         } else {
           location.href = location.href

package/server/views/setup.ejs

@@ -389,17 +389,17 @@
         if (proceed) {
           document.querySelector(".reset-bin-loading").classList.remove("hidden")
           document.querySelector("#del-bin").classList.add("hidden")
-          let res = await fetch("/pinokio/delete", {
+          let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
             method: "post",
             headers: {
               "Content-Type": "application/json"
             },
             body: JSON.stringify({ type: "bin" })
-          }).then((res) => {
-            return res.json()
-          })
+          }))
           document.querySelector(".reset-bin-loading").classList.add("hidden")
-          if (res.error) {
+          if (res.cancelled) {
+            document.querySelector("#del-bin").classList.remove("hidden")
+          } else if (res.error) {
             alert(res.error)
           } else {
             document.querySelector("#install-form").submit()

package/server/views/terminal.ejs

@@ -3339,18 +3339,18 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify({ type: "bin" })
-        }).then((res) => {
-          return res.json()
-        })
+        }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")
-        if (res.error) {
+        if (res.cancelled) {
+          document.querySelector("#del-bin").classList.remove("hidden")
+        } else if (res.error) {
           alert(res.error)
         } else {
           //location.href = location.href

package/test/conda-bin.test.js

@@ -262,7 +262,7 @@ test('Conda install replaces the stale runtime and rebuilds declared Conda modul
   )
 })
 
-test('Conda replacement stops, preserves, and restarts a running managed Caddy', async () => {
+test('Conda replacement stops a running managed Caddy without restoring it', async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-caddy-lifecycle-'))
   await createMiniforge(root)
   const kernel = createKernel(root, 'win32')
@@ -277,10 +277,6 @@ test('Conda replacement stops, preserves, and restarts a running managed Caddy',
       events.push('caddy-stop')
       caddyRunning = false
     },
-    start: async () => {
-      events.push('caddy-start')
-      caddyRunning = true
-    },
   }
   kernel.bin.installed.conda = new Set(['caddy'])
   kernel.bin.mod = { caddy }
@@ -311,9 +307,8 @@ test('Conda replacement stops, preserves, and restarts a running managed Caddy',
 
   assert.ok(events.indexOf('caddy-stop') < events.indexOf('remove-miniforge'))
   assert.ok(events.indexOf('remove-miniforge') < events.indexOf('bootstrap'))
-  assert.ok(events.indexOf('conda-install') < events.indexOf('caddy-start'))
-  assert.match(condaInstall.message[1], / caddy=2\.9\.1$/)
-  assert.equal(caddyRunning, true)
+  assert.doesNotMatch(condaInstall.message[1], /caddy=/)
+  assert.equal(caddyRunning, false)
 })
 
 test('Conda install replaces legacy miniconda with a compatibility alias to miniforge', async () => {
@@ -452,7 +447,7 @@ test('Conda install propagates bootstrap failure after replacing the runtime', a
   )
 })
 
-test('Conda install reports manual recovery when the old runtime cannot be removed', async () => {
+test('Conda install reports recovery details when the old runtime cannot be removed', async () => {
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-runtime-locked-'))
   await createLegacyMiniconda(root)
   const kernel = createKernel(root)
@@ -467,10 +462,15 @@ test('Conda install reports manual recovery when the old runtime cannot be remov
   }
 
   try {
+    const packets = []
     await assert.rejects(
-      conda._install({ dependencies: [] }, () => {}),
-      /delete that folder manually/
+      conda._install({ dependencies: [] }, (data, type) => packets.push({ data, type })),
+      process.platform === 'win32' ? /__PINOKIO_BLOCKER__/ : /delete that folder manually/
     )
+    if (process.platform === 'win32') {
+      const blocked = packets.find((packet) => packet.type === 'path.remove.blocked')
+      assert.equal(blocked && blocked.data && blocked.data.code, 'PINOKIO_PATH_REMOVE_BLOCKED')
+    }
   } finally {
     fsModule.promises.rm = originalRm
   }

package/test/fixtures/hold-windows-dll.js

@@ -0,0 +1,21 @@
+if (process.platform !== "win32") {
+  process.exit(2)
+}
+
+const koffi = require("koffi")
+const kernel32 = koffi.load("kernel32.dll")
+const loadLibrary = kernel32.func("void * __stdcall LoadLibraryW(str16 path)")
+const freeLibrary = kernel32.func("int32_t __stdcall FreeLibrary(void *module)")
+
+const moduleHandle = loadLibrary(process.argv[2])
+if (!moduleHandle) {
+  process.stderr.write("LoadLibraryW failed\n")
+  process.exit(1)
+}
+
+process.stdout.write("READY\n")
+process.stdin.resume()
+process.stdin.once("data", () => {
+  freeLibrary(moduleHandle)
+  process.exit(0)
+})