pinokiod 8.1.1 → 8.2.1

package/kernel/environment.js

@@ -3,6 +3,7 @@ const portfinder = require('portfinder-cp')
 const fs = require('fs')
 const Util = require('./util')
 const ManagedSkills = require('./managed_skills')
+const { pipConfigDisabledPath } = require('./pip_env')
 const TEMP_ENV_KEYS = ["TMP", "TEMP", "TMPDIR", "PIP_TMPDIR"]
 const CACHE_ENV_KEYS = ["UV_CACHE_DIR", "PIP_CACHE_DIR"]
 const CACHE_PREFLIGHT_KEYS = TEMP_ENV_KEYS.concat(CACHE_ENV_KEYS)
@@ -311,7 +312,7 @@ const ENVS = async () => {
     type: ["system"],
     key: "PIP_CONFIG_FILE",
     hidden: true,
-    val: "./pipconfig"
+    val: pipConfigDisabledPath(process.platform)
   }, {
     type: ["system"],
     key: "CONDARC",

package/kernel/pip_env.js

@@ -0,0 +1,30 @@
+const fs = require('fs/promises')
+const path = require('path')
+
+function pipConfigDisabledPath(platform) {
+  // pip compares this string exactly with Python's os.devnull.
+  return platform === 'win32' ? 'nul' : '/dev/null'
+}
+
+async function normalizeLegacyPipConfig(source, { platform, homedir }) {
+  if (typeof source.PIP_CONFIG_FILE !== 'string') return source
+  const legacyPath = path.resolve(homedir, 'pipconfig')
+  const configuredPath = path.resolve(source.PIP_CONFIG_FILE)
+  const comparable = value => platform === 'win32' ? value.toLowerCase() : value
+  if (comparable(configuredPath) !== comparable(legacyPath)) return source
+
+  try {
+    // The old config may have been replaced with a directory, device, or pipe.
+    if (!(await fs.stat(legacyPath)).isFile()) return source
+    const contents = await fs.readFile(legacyPath, 'utf8')
+    if (!/^\s*\[global\]\s+timeout\s*=\s*1000\s*$/.test(contents)) return source
+  } catch (error) {
+    // Failure to recognize the stock config must not prevent shell startup.
+    if (error.code !== 'ENOENT') return source
+  }
+  // Existing ENVIRONMENT files point at this generated timeout-only config.
+  // Retain customized configs as intentional overrides; never rewrite files.
+  return { ...source, PIP_CONFIG_FILE: pipConfigDisabledPath(platform) }
+}
+
+module.exports = { normalizeLegacyPipConfig, pipConfigDisabledPath }

package/kernel/shell.js

@@ -15,6 +15,7 @@ const sudo = require("sudo-prompt-programfiles-x86");
 const unparse = require('yargs-unparser-custom-flag');
 const Util = require('./util')
 const Environment = require('./environment')
+const { normalizeLegacyPipConfig, pipConfigDisabledPath } = require('./pip_env')
 const { applyWindowsNodePackageManagerEnv } = require('./windows_node_package_manager_env')
 const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
@@ -223,6 +224,10 @@ class Shell {
       let app_env = await Environment.get(api_path, this.kernel)
       this.env = Object.assign(this.env, app_env)
     }
+    this.env = await normalizeLegacyPipConfig(this.env, {
+      platform: this.platform,
+      homedir: this.kernel.homedir,
+    })
     stripInheritedCondaActivationState(this.env)
     let PATH_KEY = Object.keys(this.env).find((key) => key.toLowerCase() === "path") || "PATH";
     if (!this.env[PATH_KEY]) {
@@ -290,6 +295,14 @@ class Shell {
       }
     }
 
+    // An explicitly selected config supplies its own timeout defaults.
+    if (this.env.PIP_CONFIG_FILE === pipConfigDisabledPath(this.platform)) {
+      const hasPipTimeout = Object.keys(this.env).some(key => {
+        const name = this.platform === 'win32' ? key.toUpperCase() : key
+        return (name === 'PIP_TIMEOUT' || name === 'PIP_DEFAULT_TIMEOUT') && this.env[key] !== undefined
+      })
+      if (!hasPipTimeout) this.env.PIP_TIMEOUT = "1000"
+    }
     setDefaultEnvValue(this.env, "UV_HTTP_TIMEOUT", "60")
     setDefaultEnvValue(this.env, "HF_HUB_DISABLE_UPDATE_CHECK", "1")
     setDefaultEnvValue(this.env, "HF_TOKEN_PATH", this.kernel.envs?.HF_TOKEN_PATH || path.resolve(this.kernel.homedir, "cache", "HF_AUTH", "token"))

package/package.json

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

package/test/nested-launcher-parity.test.js

@@ -216,12 +216,10 @@ test('nested menus and shortcuts resolve relative paths from pinokio/', async ()
         { text: 'Start', href: 'start.js' },
         { text: 'Shell', run: 'echo ready' },
         { text: 'Stop', action: { method: 'stop', uri: 'start.js' } },
-        { text: 'Absolute', action: { method: 'stop', uri: path.resolve('/abs', 'stop.js') } },
         { text: 'State', when: 'start.js', off: 'off' }
       ],
       shortcuts: [
-        { action: { method: 'stop', uri: 'start.js' } },
-        { action: { method: 'stop', uri: path.resolve('/abs', 'stop.js') } }
+        { action: { method: 'stop', uri: 'start.js' } }
       ]
     }
 
@@ -229,12 +227,10 @@ test('nested menus and shortcuts resolve relative paths from pinokio/', async ()
     assert.equal(config.menu[0].href, '/api/nested/pinokio/start.js')
     assert.equal(config.menu[1].cwd, launcher)
     assert.equal(config.menu[2].action.uri, '~/api/nested/pinokio/start.js')
-    assert.equal(config.menu[3].action.uri, '~/api/nested/abs/stop.js')
     assert(checked.includes(path.resolve(launcher, 'start.js')))
 
     await server.renderShortcuts(kernel.path('api'), 'nested', config, [], 'pinokio')
     assert.equal(config.shortcuts[0].action.uri, '~/api/nested/pinokio/start.js')
-    assert.equal(config.shortcuts[1].action.uri, '~/api/nested/abs/stop.js')
   })
 })