pinokiod 7.1.78 → 7.1.80

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.78",
+  "version": "7.1.80",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/public/terminal-settings.js

@@ -773,6 +773,7 @@
         if ('fontFamily' in parsed && typeof parsed.fontFamily !== 'string') {
           delete parsed.fontFamily;
         }
+        delete parsed.lineHeight;
         if ('theme' in parsed) {
           parsed.theme = this.sanitizeTheme(parsed.theme);
           if (!parsed.theme || !Object.keys(parsed.theme).length) {
@@ -819,14 +820,39 @@
     }
 
     safeGetOption(term, option) {
-      if (!term || typeof term.getOption !== 'function') {
+      if (!term) {
         return undefined;
       }
-      try {
-        return term.getOption(option);
-      } catch (_) {
-        return undefined;
+      if (term.options && Object.prototype.hasOwnProperty.call(term.options, option)) {
+        try {
+          return term.options[option];
+        } catch (_) {}
       }
+      if (typeof term.getOption === 'function') {
+        try {
+          return term.getOption(option);
+        } catch (_) {}
+      }
+      return undefined;
+    }
+
+    applyOption(term, key, value) {
+      if (!term) {
+        return false;
+      }
+      if (term.options) {
+        try {
+          term.options[key] = value;
+          return true;
+        } catch (_) {}
+      }
+      if (typeof term.setOption === 'function') {
+        try {
+          term.setOption(key, value);
+          return true;
+        } catch (_) {}
+      }
+      return false;
     }
 
     register(term, meta) {
@@ -936,33 +962,23 @@
     }
 
     applyNumericOption(term, key, value) {
-      if (typeof term.setOption === 'function') {
-        try {
-          term.setOption(key, value);
-        } catch (_) {}
-      }
+      this.applyOption(term, key, value);
       if (term.element && term.element.style) {
-        const cssValue = `${value}px`;
+        term.element.style.removeProperty(`--${key}`);
         if (key === 'fontSize') {
-          term.element.style.setProperty('--font-size', cssValue);
-          term.element.style.fontSize = cssValue;
+          term.element.style.fontSize = '';
         } else {
-          term.element.style.setProperty(`--${key}`, cssValue);
-          term.element.style[key] = cssValue;
+          term.element.style[key] = '';
         }
       }
     }
 
     applyStringOption(term, key, value) {
-      if (typeof term.setOption === 'function') {
-        try {
-          term.setOption(key, value);
-        } catch (_) {}
-      }
+      this.applyOption(term, key, value);
       if (term.element && term.element.style) {
-        term.element.style.setProperty(`--${key}`, value);
+        term.element.style.removeProperty(`--${key}`);
         if (key === 'fontFamily') {
-          term.element.style.fontFamily = value;
+          term.element.style.fontFamily = '';
         }
       }
     }
@@ -983,6 +999,7 @@
       }
       this.savePreferences();
       this.applyAll();
+      this.requestForceResize({ source: 'terminal-font-family' });
       this.syncMenus();
     }
 
@@ -999,16 +1016,23 @@
       }
       this.savePreferences();
       this.applyAll();
+      this.requestForceResize({ source: 'terminal-font-size' });
       this.syncMenus();
     }
 
     resetPreferences() {
+      const hadGeometryPreferences = Boolean(
+        typeof this.preferences.fontFamily === 'string' && this.preferences.fontFamily.trim()
+      ) || isFiniteNumber(this.preferences.fontSize);
       delete this.preferences.fontFamily;
       delete this.preferences.fontSize;
       delete this.preferences.theme;
       this.currentFontFamily = '';
       this.savePreferences();
       this.applyAll();
+      if (hadGeometryPreferences) {
+        this.requestForceResize({ source: 'terminal-reset' });
+      }
       this.syncMenus();
     }
 
@@ -1062,39 +1086,7 @@
     }
 
     updateGlobalStylesFromPreferences() {
-      if (typeof document === 'undefined') {
-        return;
-      }
-      const family = typeof this.preferences.fontFamily === 'string' ? this.preferences.fontFamily.trim() : '';
-      const size = isFiniteNumber(this.preferences.fontSize) ? this.preferences.fontSize : null;
-      if (!family && !size) {
-        this.removeStyleElement();
-        return;
-      }
-      const style = this.ensureStyleElement();
-      if (!style) {
-        return;
-      }
-      const selectors = [
-        '.xterm',
-        '.xterm .xterm-rows',
-        '.xterm .xterm-rows span',
-        '.xterm .xterm-text-layer',
-        '.xterm .xterm-text-layer canvas',
-        '.xterm .xterm-cursor-layer',
-        '.xterm .xterm-char-measure-element'
-      ];
-      const declarations = [];
-      if (family) {
-        declarations.push(`font-family: ${family} !important`);
-      }
-      if (size) {
-        declarations.push(`font-size: ${size}px !important`);
-      }
-      const nextCss = `${selectors.join(', ')} { ${declarations.join('; ')}; }`;
-      if (style.textContent !== nextCss) {
-        style.textContent = nextCss;
-      }
+      this.removeStyleElement();
     }
 
     sanitizeTheme(raw, allowUnknown) {
@@ -1193,16 +1185,7 @@
         return;
       }
       const nextTheme = Object.assign({}, theme);
-      let applied = false;
-      if (typeof term.setOption === 'function') {
-        try {
-          term.setOption('theme', nextTheme);
-          applied = true;
-        } catch (_) {}
-      } else if (term.options) {
-        term.options.theme = nextTheme;
-        applied = true;
-      }
+      const applied = this.applyOption(term, 'theme', nextTheme);
 
       const element = term.element;
       if (element && element.style) {
@@ -1759,6 +1742,7 @@
         positionMenu();
       };
 
+      sizeInput.addEventListener('input', handleSizeChange);
       sizeInput.addEventListener('change', handleSizeChange);
       sizeInput.addEventListener('blur', handleSizeChange);
 

package/server/views/app.ejs

@@ -5288,7 +5288,6 @@ header.navheader .mode-selector .community-mode-toggle {
             </a>
           <%})%>
         </div>
-        <div class='active-nested-path hidden' id='active-nested-path'></div>
       </div>
       <div class='menu-actions'>
         <% if (type === 'run') { %>
@@ -7185,7 +7184,6 @@ const rerenderMenuSection = (container, html) => {
     }
 
     if (!target) {
-      activeNestedFocusMenu = null
       syncActiveNestedPath()
       browserPopoutSurface.hide()
       document.querySelector(".container").classList.remove("active")
@@ -7219,7 +7217,6 @@ const rerenderMenuSection = (container, html) => {
       el.classList.remove("selected")
     })
     target.classList.add("selected")
-    activeNestedFocusMenu = null
     syncActiveNestedPath({ selectedLink: target })
     if (skipPersistedSelection && target.hasAttribute('data-default')) {
       ignorePersistedSelection = false
@@ -8055,162 +8052,7 @@ const rerenderMenuSection = (container, html) => {
 
   const getSubmenu = (menu) => getDirectChild(menu, ".submenu")
   const getToggle = (menu) => getDirectChild(menu, ".reveal")
-  const activeNestedPathRoot = document.getElementById("active-nested-path")
-  const activeNestedProxyMap = new WeakMap()
-  let activeNestedFocusMenu = null
-
-  const getNestedMenuChain = (node) => {
-    if (!node) {
-      return []
-    }
-    let current = node
-    if (!current.classList || !current.classList.contains("nested-menu")) {
-      current = current.closest(".nested-menu")
-    }
-    const chain = []
-    while (current) {
-      chain.unshift(current)
-      current = current.parentElement ? current.parentElement.closest(".nested-menu") : null
-    }
-    return chain
-  }
-
-  const sanitizeActiveNestedProxy = (proxy) => {
-    if (!proxy) {
-      return null
-    }
-    proxy.removeAttribute("id")
-    proxy.classList.remove("frame-link", "selected", "tab-link-popover-host")
-    proxy.classList.add("active-nested-proxy")
-    proxy.setAttribute("data-active-nested-proxy", "true")
-    proxy.querySelectorAll(".tab-link-popover-trigger").forEach((node) => {
-      node.remove()
-    })
-    return proxy
-  }
-
-  const buildActiveNestedProxy = (child, isCurrent) => {
-    if (!child) {
-      return null
-    }
-    let proxy
-    if (child.classList && child.classList.contains("nested-menu")) {
-      const toggle = getToggle(child)
-      if (!toggle) {
-        return null
-      }
-      proxy = toggle.cloneNode(true)
-    } else {
-      proxy = child.cloneNode(true)
-    }
-    sanitizeActiveNestedProxy(proxy)
-    if (child.classList && child.classList.contains("nested-menu")) {
-      const loader = proxy.querySelector(".loader")
-      if (loader) {
-        loader.innerHTML = `<i class="fa-solid ${isCurrent ? "fa-angle-down" : "fa-angle-right"}"></i>`
-      }
-    }
-    proxy.classList.toggle("is-current", Boolean(isCurrent))
-    activeNestedProxyMap.set(proxy, child)
-    return proxy
-  }
-
-  const syncActiveNestedPath = ({ selectedLink = null } = {}) => {
-    if (!activeNestedPathRoot) {
-      return
-    }
-    if (activeNestedFocusMenu && !activeNestedFocusMenu.isConnected) {
-      activeNestedFocusMenu = null
-    }
-    const currentSelectedLink = (selectedLink && selectedLink.isConnected)
-      ? selectedLink
-      : document.querySelector("aside .frame-link.selected")
-    const chain = activeNestedFocusMenu
-      ? getNestedMenuChain(activeNestedFocusMenu)
-      : getNestedMenuChain(currentSelectedLink)
-
-    activeNestedPathRoot.replaceChildren()
-
-    if (!chain.length) {
-      activeNestedPathRoot.classList.add("hidden")
-      if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
-        window.PinokioMenuScrollHints.update()
-      }
-      return
-    }
-
-    chain.forEach((menu, index) => {
-      const submenu = getSubmenu(menu)
-      if (!submenu) {
-        return
-      }
-      const row = document.createElement("div")
-      row.className = "m active-nested-row"
-      row.dataset.activeNestedLevel = String(index)
-      const nextMenu = chain[index + 1] || null
-
-      Array.from(submenu.children).forEach((child) => {
-        let isCurrent = false
-        if (child.classList && child.classList.contains("nested-menu")) {
-          isCurrent = child === nextMenu || (!nextMenu && currentSelectedLink ? child.contains(currentSelectedLink) : false)
-        } else {
-          isCurrent = child === currentSelectedLink
-        }
-        const proxy = buildActiveNestedProxy(child, isCurrent)
-        if (proxy) {
-          row.appendChild(proxy)
-        }
-      })
-
-      if (row.childElementCount > 0) {
-        activeNestedPathRoot.appendChild(row)
-      }
-    })
-
-    if (!activeNestedPathRoot.childElementCount) {
-      activeNestedPathRoot.classList.add("hidden")
-      if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
-        window.PinokioMenuScrollHints.update()
-      }
-      return
-    }
-
-    activeNestedPathRoot.classList.remove("hidden")
-    const currentProxy = activeNestedPathRoot.querySelector(".active-nested-proxy.is-current")
-    if (currentProxy && typeof currentProxy.scrollIntoView === "function") {
-      currentProxy.scrollIntoView({
-        block: "nearest",
-        inline: "nearest"
-      })
-    }
-    if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
-      window.PinokioMenuScrollHints.update()
-    }
-  }
-
-  if (activeNestedPathRoot) {
-    activeNestedPathRoot.addEventListener("click", (event) => {
-      const proxy = event.target.closest("[data-active-nested-proxy='true']")
-      if (!proxy || !activeNestedPathRoot.contains(proxy)) {
-        return
-      }
-      const source = activeNestedProxyMap.get(proxy)
-      if (!source || !source.isConnected) {
-        return
-      }
-      event.preventDefault()
-      event.stopPropagation()
-      if (source.classList && source.classList.contains("nested-menu")) {
-        activeNestedFocusMenu = source
-        syncActiveNestedPath()
-        return
-      }
-      activeNestedFocusMenu = null
-      if (typeof source.click === "function") {
-        source.click()
-      }
-    })
-  }
+  const syncActiveNestedPath = () => {}
 
   renderSelection()