pinokiod 7.4.2 → 7.4.3

package/kernel/bin/ffmpeg.js

@@ -9,28 +9,11 @@ class Ffmpeg {
     return CONDA_SPEC
   }
 
-  condaInstallFlags() {
-    if (this.kernel.platform === "win32") {
-      return `-y --solver=classic ${CONDA_CHANNEL_FLAGS}`
-    }
-    return `-y ${CONDA_CHANNEL_FLAGS}`
-  }
-
-  solverRepairCommands() {
-    if (this.kernel.platform !== "win32") {
-      return []
-    }
-    return [
-      `conda install -y --solver=classic ${CONDA_CHANNEL_FLAGS} "conda-libmamba-solver>=25.4.0" libmamba libmambapy libsolv libarchive`
-    ]
-  }
-
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        ...this.solverRepairCommands(),
-        `conda install ${this.condaInstallFlags()} ${this.cmd()}`
+        `conda install -y ${CONDA_CHANNEL_FLAGS} ${this.cmd()}`
       ]
     }, ondata)
   }

package/kernel/legacy_cleanup/ffmpeg.js

@@ -7,20 +7,9 @@ const LEGACY_FFMPEG_HOOK_NAMES = [
   'zz_pinokio_ffmpeg.ps1',
 ]
 
-const TRANSIENT_REMOVE_ERRORS = new Set([
-  'EBUSY',
-  'ENOTEMPTY',
-  'EPERM',
-  'EACCES',
-])
-
 const REMOVE_RETRY_COUNT = 5
 const REMOVE_RETRY_DELAY_MS = 100
 
-function delay(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
 async function pathExists(target) {
   return fs.promises.access(target).then(() => true).catch(() => false)
 }
@@ -84,29 +73,6 @@ async function hasCleanupTargets(kernel) {
     await hasAnyPath(legacyFfmpegRuntimePaths(kernel))
 }
 
-function isTransientRemoveError(error) {
-  return error && TRANSIENT_REMOVE_ERRORS.has(error.code)
-}
-
-async function retryTransient(operation) {
-  let lastError
-  for (let attempt = 0; attempt <= REMOVE_RETRY_COUNT; attempt += 1) {
-    try {
-      return await operation()
-    } catch (error) {
-      if (error && error.code === 'ENOENT') {
-        return null
-      }
-      lastError = error
-      if (!isTransientRemoveError(error) || attempt === REMOVE_RETRY_COUNT) {
-        break
-      }
-      await delay(REMOVE_RETRY_DELAY_MS * (attempt + 1))
-    }
-  }
-  throw lastError
-}
-
 async function removeLegacyPath(target, ondata) {
   const existed = await pathExists(target)
   if (!existed) {
@@ -114,12 +80,12 @@ async function removeLegacyPath(target, ondata) {
   }
 
   try {
-    await retryTransient(() => fs.promises.rm(target, {
+    await fs.promises.rm(target, {
       recursive: true,
       force: true,
       maxRetries: REMOVE_RETRY_COUNT,
       retryDelay: REMOVE_RETRY_DELAY_MS,
-    }))
+    })
   } catch (error) {
     if (ondata) {
       const reason = error && (error.code || error.message) ? error.code || error.message : String(error)

package/package.json

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

package/test/ffmpeg-bin.test.js

@@ -34,14 +34,13 @@ test('FFmpeg bin installs pinned ffmpeg into base Conda on Windows', async () =>
   assert.equal(calls.length, 1)
   assert.deepEqual(calls[0].message, [
     'conda clean -y --all',
-    'conda install -y --solver=classic --override-channels -c conda-forge "conda-libmamba-solver>=25.4.0" libmamba libmambapy libsolv libarchive',
-    'conda install -y --solver=classic --override-channels -c conda-forge ffmpeg=8.1.2',
+    'conda install -y --override-channels -c conda-forge ffmpeg=8.1.2',
   ])
   assert.equal(calls[0].env, undefined)
   assert.equal(calls[0].message.some((command) => /ffmpeg-env|conda create|-p /.test(command)), false)
 })
 
-test('FFmpeg bin installs pinned ffmpeg into base Conda without Windows solver repair elsewhere', async () => {
+test('FFmpeg bin installs pinned ffmpeg into base Conda consistently across platforms', async () => {
   const calls = []
   const kernel = createKernel('darwin')
   kernel.bin.exec = async (payload) => {