pinokiod 7.1.77 → 7.1.79

package/kernel/shell.js

@@ -16,6 +16,7 @@ const sudo = require("sudo-prompt-programfiles-x86");
 const unparse = require('yargs-unparser-custom-flag');
 const Util = require('./util')
 const Environment = require('./environment')
+const { applyWindowsNodePackageManagerEnv } = require('./windows_node_package_manager_env')
 const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
@@ -179,10 +180,6 @@ class Shell {
     this.env.CONDA_SHORTCUTS = 0
     this.env.CONDA_CONSOLE = 'json'
 
-    if (this.platform === "win32") {
-      this.env.npm_config_symlink = "false"
-    }
-
 //    this.env.TCELL_MINIMIZE=1
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
@@ -305,6 +302,12 @@ class Shell {
         delete this.env[key]
       }
     }
+
+    if (this.platform === "win32") {
+      await applyWindowsNodePackageManagerEnv(this.env, {
+        targetPath: params && params.path ? params.path : this.kernel.homedir,
+      })
+    }
   }
   isCmdShell(shellName=this.shell) {
     const name = (shellName || '').toLowerCase()

package/kernel/windows_node_package_manager_env.js

@@ -0,0 +1,92 @@
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+
+const windowsDirectoryLinkCache = new Map()
+
+async function findExistingAncestor(targetPath) {
+  let current = path.resolve(targetPath)
+  while (true) {
+    const exists = await fs.promises.access(current, fs.constants.F_OK).then(() => true).catch(() => false)
+    if (exists) {
+      return current
+    }
+    const parent = path.dirname(current)
+    if (!parent || parent === current) {
+      return null
+    }
+    current = parent
+  }
+}
+
+async function windowsDirectoryLinksWork(targetPath) {
+  const ancestor = await findExistingAncestor(targetPath || os.homedir())
+  if (!ancestor) {
+    return true
+  }
+
+  const cacheKey = path.parse(path.resolve(ancestor)).root.toLowerCase()
+  if (windowsDirectoryLinkCache.has(cacheKey)) {
+    return windowsDirectoryLinkCache.get(cacheKey)
+  }
+
+  const probePromise = (async () => {
+    let probeDir = null
+    try {
+      probeDir = await fs.promises.mkdtemp(path.join(ancestor, ".pinokio-link-probe-"))
+      const sourceDir = path.resolve(probeDir, "source")
+      const linkDir = path.resolve(probeDir, "link")
+      await fs.promises.mkdir(sourceDir)
+      await fs.promises.symlink(path.resolve(sourceDir), linkDir, "junction")
+      return true
+    } catch (_) {
+      return false
+    } finally {
+      if (probeDir) {
+        await fs.promises.rm(probeDir, { recursive: true, force: true }).catch(() => {})
+      }
+    }
+  })()
+
+  windowsDirectoryLinkCache.set(cacheKey, probePromise)
+  return probePromise
+}
+
+function getFirstDefinedEnv(env, keys) {
+  for (const key of keys) {
+    const value = env[key]
+    if (typeof value === "string" && value.trim()) {
+      return value.trim()
+    }
+  }
+  return null
+}
+
+async function applyWindowsNodePackageManagerEnv(env, options = {}) {
+  delete env.npm_config_symlink
+  delete env.NPM_CONFIG_SYMLINK
+  delete env.pnpm_config_symlink
+  delete env.PNPM_CONFIG_SYMLINK
+
+  const explicitNodeLinker = getFirstDefinedEnv(env, [
+    "npm_config_node_linker",
+    "NPM_CONFIG_NODE_LINKER",
+    "pnpm_config_node_linker",
+    "PNPM_CONFIG_NODE_LINKER",
+  ])
+  if (explicitNodeLinker) {
+    return
+  }
+
+  const targetPath = options.targetPath || os.homedir()
+  if (await windowsDirectoryLinksWork(targetPath)) {
+    return
+  }
+
+  env.npm_config_node_linker = "hoisted"
+  env.NPM_CONFIG_NODE_LINKER = "hoisted"
+}
+
+module.exports = {
+  applyWindowsNodePackageManagerEnv,
+}

package/package.json

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

package/server/public/container-tab-link.js

@@ -69,6 +69,7 @@
       requireAlternate: false,
       restrictToBase: true,
       forceCanonicalQr: true,
+      closeOnMouseLeave: true,
       allowQrPortMismatch: true,
       skipPeerFallback: true
     })

package/server/public/tab-link-popover.js

@@ -3,6 +3,7 @@
   let tabLinkActiveLink = null
   let tabLinkPendingLink = null
   let tabLinkHideTimer = null
+  let tabLinkCloseOnMouseLeave = false
   let tabLinkLocalInfoPromise = null
   let tabLinkLocalInfoExpiry = 0
   let tabLinkRouterInfoPromise = null
@@ -137,7 +138,9 @@
         }
       })
       tabLinkPopoverEl.addEventListener("mouseleave", () => {
-        hideTabLinkPopover({ immediate: true })
+        if (tabLinkCloseOnMouseLeave) {
+          hideTabLinkPopover({ immediate: true })
+        }
       })
       tabLinkPopoverEl.addEventListener("click", (event) => {
         const item = event.target.closest(".tab-link-popover-item")
@@ -1421,6 +1424,7 @@
       tabLinkActiveLink = null
       tabLinkPendingLink = null
       tabLinkHideTimer = null
+      tabLinkCloseOnMouseLeave = false
     }
 
     if (tabLinkHideTimer) {
@@ -1449,6 +1453,7 @@
     const requireAlternate = options && options.requireAlternate === false ? false : true
     const restrictToBase = options && options.restrictToBase === true
     const forceCanonicalQr = options && options.forceCanonicalQr === true
+    tabLinkCloseOnMouseLeave = options && options.closeOnMouseLeave === true
     let sameOrigin = false
     let canonicalBase = canonicalizeUrl(effectiveHref)
     if (canonicalBase && isHttpUrl(canonicalBase)) {
@@ -1869,7 +1874,10 @@
         hideTabLinkPopover({ immediate: true })
         return
       }
-      renderTabLinkPopover(link, { requireAlternate: false })
+      renderTabLinkPopover(link, {
+        requireAlternate: false,
+        closeOnMouseLeave: false
+      })
     }
 
     const handleTriggerClick = (event) => {

package/server/views/app.ejs

@@ -8319,6 +8319,7 @@ const rerenderMenuSection = (container, html) => {
   const closeFloatingMenus = () => {
     closeStatusDropdowns()
     closeAllNestedMenus()
+    hideTabLinkPopover({ immediate: true })
   }
 
   const openNestedMenu = (menu, toggle) => {