pinokiod 7.2.11 → 7.2.12

package/kernel/environment.js

@@ -72,7 +72,7 @@ const managedCacheEnvDefaults = () => {
   return defaults
 }
 
-const ensureCachePreflightDir = async (key, targetPath) => {
+const ensureCachePreflightDir = async (key, targetPath, options = {}) => {
   logCachePreflight(`${key}: target=${targetPath}`)
   try {
     await fs.promises.mkdir(targetPath, { recursive: true })
@@ -95,7 +95,26 @@ const ensureCachePreflightDir = async (key, targetPath) => {
     logCachePreflight(`${key}: repair delete ok`)
   } catch (error) {
     logCachePreflight(`${key}: repair delete failed ${formatCachePreflightError(error)}`)
-    return { key, path: targetPath, repaired: false, ok: false, step: "repair delete", error }
+    if (typeof options.elevatedRepair !== "function") {
+      return { key, path: targetPath, repaired: false, ok: false, step: "repair delete", error }
+    }
+    logCachePreflight(`${key}: elevated repair start path=${targetPath}`)
+    let elevatedRepair
+    try {
+      elevatedRepair = await options.elevatedRepair(targetPath, logCachePreflight)
+    } catch (repairError) {
+      elevatedRepair = { ok: false, error: repairError }
+    }
+    if (!elevatedRepair || !elevatedRepair.ok) {
+      return { key, path: targetPath, repaired: false, elevated: true, ok: false, step: "elevated repair", error: elevatedRepair && elevatedRepair.error ? elevatedRepair.error : error }
+    }
+    const elevatedProbe = await probeCacheDir(targetPath)
+    if (elevatedProbe.ok) {
+      logCachePreflight(`${key}: elevated repair probe ok`)
+      return { key, path: targetPath, repaired: true, elevated: true, ok: true }
+    }
+    logCachePreflight(`${key}: elevated repair probe failed step="${elevatedProbe.step}" ${formatCachePreflightError(elevatedProbe.error)}`)
+    return { key, path: targetPath, repaired: true, elevated: true, ok: false, step: elevatedProbe.step, error: elevatedProbe.error }
   }
 
   try {
@@ -140,7 +159,7 @@ const ensurePinokioCacheDirs = async (kernel, options = {}) => {
 
   for (const key of CACHE_PREFLIGHT_KEYS) {
     const targetPath = path.resolve(cacheRoot, key)
-    const result = await ensureCachePreflightDir(key, targetPath)
+    const result = await ensureCachePreflightDir(key, targetPath, options)
     results.push(result)
     if (!result.ok) {
       errors.push(result)

package/kernel/index.js

@@ -44,6 +44,7 @@ const WatchManager = require('./watch')
 const { DownloaderHelper } = require('node-downloader-helper');
 const { ProxyAgent } = require('proxy-agent');
 const fakeUa = require('fake-useragent');
+const sudo = process.platform === "win32" ? require("sudo-prompt-programfiles-x86") : null
 //const kill = require('./tree-kill');
 const kill = require('kill-sync')
 const ejs = require('ejs');
@@ -55,6 +56,34 @@ const VARS = {
   }
 }
 
+const powershellSingleQuote = (value) => {
+  return `'${String(value).replace(/'/g, "''")}'`
+}
+
+const windowsCacheRepairCommand = (targetPath) => {
+  const psPath = powershellSingleQuote(targetPath)
+  return [
+    "powershell.exe",
+    "-NoProfile",
+    "-ExecutionPolicy Bypass",
+    "-Command",
+    `"`,
+    "$ErrorActionPreference = 'Stop';",
+    `$p = ${psPath};`,
+    "$account = [System.Security.Principal.WindowsIdentity]::GetCurrent().Name;",
+    "$grant = $account + ':(OI)(CI)F';",
+    "if (Test-Path -LiteralPath $p) {",
+    "  & takeown.exe /F $p /R /D Y;",
+    "  & icacls.exe $p /reset /T /C;",
+    "  & icacls.exe $p /grant $grant /T /C;",
+    "  Remove-Item -LiteralPath $p -Recurse -Force;",
+    "}",
+    "New-Item -ItemType Directory -Force -Path $p | Out-Null;",
+    "& icacls.exe $p /grant $grant /T /C;",
+    `"`
+  ].join(" ")
+}
+
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   schema = "<=7.0.0"
@@ -465,6 +494,30 @@ class Kernel {
       return ''
     }
   }
+  async elevatedCacheRepair(targetPath, log = console.log) {
+    if (this.platform !== "win32" || !sudo) {
+      return { ok: false, error: new Error("Elevated cache repair is only available on Windows") }
+    }
+    const command = windowsCacheRepairCommand(targetPath)
+    log(`elevated repair command=${command}`)
+    return new Promise((resolve) => {
+      sudo.exec(command, { name: "Pinokio" }, (error, stdout, stderr) => {
+        if (stdout && stdout.trim()) {
+          log(`elevated repair stdout ${stdout.trim()}`)
+        }
+        if (stderr && stderr.trim()) {
+          log(`elevated repair stderr ${stderr.trim()}`)
+        }
+        if (error) {
+          log(`elevated repair failed ${error.message || error}`)
+          resolve({ ok: false, error, stdout, stderr })
+        } else {
+          log(`elevated repair ok path=${targetPath}`)
+          resolve({ ok: true, stdout, stderr })
+        }
+      })
+    })
+  }
   async ensureRouterMode() {
     const domain = await this.resolvePinokioDomain()
     const shouldUseCustom = domain.length > 0
@@ -1053,7 +1106,10 @@ class Kernel {
 
         // 2. mkdir all the folders if not already created
         await Environment.init_folders(this.homedir, this)
-        await Environment.ensurePinokioCacheDirs(this)
+        await Environment.ensurePinokioCacheDirs(this, {
+          throwOnFailure: true,
+          elevatedRepair: this.elevatedCacheRepair.bind(this)
+        })
 
         // if key.json doesn't exist, create an empty json file
         let ee = await this.exists(this.homedir, "key.json")

package/package.json

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

package/server/index.js

@@ -5707,6 +5707,16 @@ class Server {
 
         needsManagedRefresh = true
         console.log("[TRY] Updating to the new version")
+        let envPath = path.resolve(home, "ENVIRONMENT")
+        let envExists = await this.kernel.exists(envPath)
+        if (!envExists) {
+          let str = await Environment.ENV("system", home, this.kernel)
+          await fs.promises.writeFile(envPath, str)
+        }
+        await Environment.ensurePinokioCacheDirs(this.kernel, {
+          throwOnFailure: true,
+          elevatedRepair: this.kernel.elevatedCacheRepair.bind(this.kernel)
+        })
         this.kernel.store.set("version", this.version.pinokiod)
         console.log("[DONE] Updating to the new version")
         console.log("not up to date. update py.")