pinokiod 8.0.10 → 8.0.12

package/kernel/bin/conda.js

@@ -271,8 +271,6 @@ report_errors: false`)
       await removePath(target, {
         recursive: true,
         force: true,
-        maxRetries: 5,
-        retryDelay: 250,
         operation: "Updating Miniforge",
       })
     } catch (error) {

package/kernel/windows_restart_manager.js

@@ -17,15 +17,15 @@ const initialize = () => {
   const koffi = require("koffi")
   const library = koffi.load("rstrtmgr.dll")
   const kernel32 = koffi.load("kernel32.dll")
-  const fileTime = koffi.struct("PINOKIO_RM_FILETIME", {
+  const fileTime = koffi.struct({
     dwLowDateTime: "uint32_t",
     dwHighDateTime: "uint32_t",
   })
-  const uniqueProcess = koffi.struct("PINOKIO_RM_UNIQUE_PROCESS", {
+  const uniqueProcess = koffi.struct({
     dwProcessId: "uint32_t",
     ProcessStartTime: fileTime,
   })
-  const processInfo = koffi.struct("PINOKIO_RM_PROCESS_INFO", {
+  const processInfo = koffi.struct({
     Process: uniqueProcess,
     strAppName: koffi.array("char16_t", 256, "String"),
     strServiceShortName: koffi.array("char16_t", 64, "String"),

package/package.json

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

package/server/index.js

@@ -16270,8 +16270,6 @@ class Server {
             await removePath(runtimePath, {
               recursive: true,
               force: true,
-              maxRetries: 5,
-              retryDelay: 250,
               operation: "Updating Miniforge",
             })
           }
@@ -16281,8 +16279,6 @@ class Server {
           await removePath(folderPath, {
             recursive: true,
             force: true,
-            maxRetries: 5,
-            retryDelay: 250,
             operation: "Resetting managed tools",
           })
           await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
@@ -16292,8 +16288,6 @@ class Server {
           await removePath(folderPath, {
             recursive: true,
             force: true,
-            maxRetries: 5,
-            retryDelay: 250,
             operation: "Clearing the Pinokio cache",
           })
           await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
@@ -16316,8 +16310,6 @@ class Server {
           await removePath(folderPath, {
             recursive: true,
             force: true,
-            maxRetries: 5,
-            retryDelay: 250,
             operation: `Deleting ${req.body.name}`,
           })
 //          await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })

package/server/public/common.js

@@ -110,7 +110,12 @@ const PinokioPathRemoval = (() => {
 
       const update = () => {
         const container = Swal.getHtmlContainer()
-        if (container) container.innerHTML = render(current)
+        if (container) {
+          const filesOpen = !!container.querySelector(".pinokio-path-blocker-files")?.open
+          container.innerHTML = render(current)
+          const files = container.querySelector(".pinokio-path-blocker-files")
+          if (files) files.open = filesOpen
+        }
       }
 
       const attempt = async (manual = false) => {

package/test/path-removal-ui.test.js

@@ -221,6 +221,7 @@ test("path-removal request retries automatically without overlapping and resolve
   await waitFor(() => state.fireOptions, "path-removal modal")
   const intervalId = state.getRetryIntervalId()
   assert.equal(state.intervals.get(intervalId).delay, 2000)
+  state.htmlContainer.querySelector(".pinokio-path-blocker-files").open = true
 
   const firstAttempt = state.runInterval()
   assert.equal(state.buttonsDisabled, true)
@@ -241,6 +242,7 @@ test("path-removal request retries automatically without overlapping and resolve
   }))
   await firstAttempt
   assert.equal(state.buttonsDisabled, false)
+  assert.equal(state.htmlContainer.querySelector(".pinokio-path-blocker-files").open, true)
   assert.match(state.htmlContainer.textContent, /Second blocker/)
   assert.doesNotMatch(state.htmlContainer.textContent, /First blocker/)
 

package/test/windows-path-removal.integration.test.js

@@ -57,8 +57,6 @@ test("Windows integration: loaded DLL is diagnosed and removable after release",
     removePath(root, {
       recursive: true,
       force: true,
-      maxRetries: 1,
-      retryDelay: 50,
       operation: "Windows integration test",
     }),
     (error) => {
@@ -70,6 +68,12 @@ test("Windows integration: loaded DLL is diagnosed and removable after release",
   )
   assert.equal(await fs.promises.access(ordinaryFile).then(() => true).catch(() => false), false)
 
+  const restartManagerPath = require.resolve("../kernel/windows_restart_manager")
+  delete require.cache[restartManagerPath]
+  const reloadedRestartManager = require(restartManagerPath)
+  const reloadedInspection = await reloadedRestartManager.inspectWindowsFileLocks([dllPath])
+  assert.equal(reloadedInspection.blockers.some((blocker) => blocker.pid === child.pid), true)
+
   const exited = new Promise((resolve) => child.once("exit", resolve))
   child.stdin.write("release\n")
   await exited