pinokiod 7.2.17 → 7.3.0

package/kernel/index.js

@@ -40,11 +40,9 @@ const Git = require('./git')
 const Connect = require('./connect')
 const Favicon = require('./favicon')
 const AppLauncher = require('./app_launcher')
-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');
@@ -56,37 +54,9 @@ 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.3.0"
+  schema = "<=7.0.0"
   constructor(store) {
     this.fetch = fetch
 
@@ -415,9 +385,6 @@ class Kernel {
   path(...args) {
     return path.resolve(this.homedir, ...args)
   }
-  systemPath(...args) {
-    return path.resolve(__dirname, "..", "system", ...args)
-  }
   exists(...args) {
     if (args) {
       let abspath = this.path(...args)
@@ -497,30 +464,6 @@ 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
@@ -1032,7 +975,6 @@ class Kernel {
     this.loader = new Loader()
     this.bin = new Bin(this)
     this.api = new Api(this)
-    this.watch = new WatchManager(this)
     this.python = new Python(this)
     this.shell = new Shells(this)
     this.appLauncher = new AppLauncher(this)
@@ -1063,7 +1005,6 @@ class Kernel {
       args: {},
     }
     this.procs = {}
-    this.activeProcessWaits = {}
     this.template = new Template()
     try {
       if (this.homedir) {
@@ -1110,10 +1051,6 @@ class Kernel {
 
         // 2. mkdir all the folders if not already created
         await Environment.init_folders(this.homedir, 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/kernel/plugin.js

@@ -1,14 +1,39 @@
-const fs = require('fs')
-const PluginSources = require("./plugin_sources")
-
+const path = require('path')
+const { glob } = require('glob')
+const Info = require("./info")
 class Plugin {
   constructor(kernel) {
     this.kernel = kernel
   }
   async setConfig() {
+    let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
     this.cache = {}
 
-    const plugins = await PluginSources.loadPluginMenu(this.kernel)
+    let plugin_paths = await glob('**/pinokio.js', { cwd: plugin_dir })
+
+    let plugins = []
+    for(let plugin_path of plugin_paths) {
+      let config = await this.kernel.require(path.resolve(plugin_dir, plugin_path))
+      if (config && config.run && Array.isArray(config.run)) {
+        let invalid
+        for(let key in config) {
+          if (typeof config[key] === "function") {
+            invalid = true
+          }
+        }
+        if (invalid) {
+          continue
+        }
+
+        let chunks = plugin_path.split(path.sep)
+        let cwd = chunks.slice(0, -1).join("/")
+        config.image = "/asset/plugin/" + cwd + "/" + config.icon 
+        plugins.push({
+          href: "/run/plugin/" + chunks.join("/"),
+          ...config
+        })
+      }
+    }
 
     this.config = {
       menu: plugins.map((plugin) => {
@@ -23,10 +48,37 @@ class Plugin {
     if (!exists) {
       await fs.promises.mkdir(this.kernel.path("plugin"), { recursive: true }).catch((e) => {})
     }
-    await this.setConfig()
+    let code_exists = await this.kernel.exists("plugin/code")
+    console.log({ code_exists })
+    if (!code_exists) {
+      if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
+        await this.kernel.exec({
+          //message: "git clone https://github.com/peanutcocktail/plugin",
+          //message: "git clone https://github.com/pinokiocomputer/plugin",
+          message: "git clone https://github.com/pinokiocomputer/code",
+          path: this.kernel.path("plugin")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+        await this.setConfig()
+        return
+      }
+    } else {
+      await this.setConfig()
+    }
   }
   async update() {
-    await this.setConfig()
+    if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
+      let exists = await this.kernel.exists("plugin")
+      if (!exists) {
+        await this.kernel.exec({
+          message: "git pull",
+          path: this.kernel.path("plugin")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      }
+    }
   }
 }
 module.exports = Plugin

package/kernel/shell.js

@@ -20,7 +20,6 @@ const { applyWindowsNodePackageManagerEnv } = require('./windows_node_package_ma
 const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
-const ShellRunTemplate = require('./api/shell_run_template')
 const home = os.homedir()
 
 function normalizeComparablePath(filePath, platform) {
@@ -309,7 +308,7 @@ class Shell {
         delete this.env[key]
       }
       let val = this.env[key]
-      if (!ShellRunTemplate.isPinokioEnvArgKey(key) && /[\r\n]/.test(val)) {
+      if (/[\r\n]/.test(val)) {
         const replaced = val.replaceAll(/[\r\n]+/g, ' ');
         this.env[key] = replaced
 //        delete this.env[key]
@@ -363,9 +362,6 @@ class Shell {
   }
   quoteArgForShell(value, shellName=this.shell) {
     const input = value == null ? "" : String(value)
-    if (ShellRunTemplate.hasEnvArgMarker(input)) {
-      return ShellRunTemplate.quoteEnvArgComposite(input, shellName)
-    }
     if (this.isCmdShell(shellName)) {
       return `"${input.replace(/([()%!^"<>&|])/g, '^$1')}"`
     }
@@ -413,7 +409,6 @@ class Shell {
     this.userActive = false
     this.decsyncBuffer = ''
     this.stateSync.reset()
-    this.envArgsPreviewed = false
 
     /*
       params := {
@@ -545,9 +540,6 @@ class Shell {
         //}
       }
     }
-    if (params._pinokio_cmd_delayed_expansion && this.isCmdShell(this.shell) && !this.args.includes("/V:ON")) {
-      this.args.push("/V:ON")
-    }
 
     // 3. path => path can be http, relative, absolute
     this.path = params.path
@@ -765,16 +757,6 @@ class Shell {
     }
     this.stateSync.invalidate({ clearTail: true })
   }
-  emitEnvArgsPreview(params) {
-    if (!params || !Array.isArray(params._pinokio_env_args) || params._pinokio_env_args.length === 0 || this.envArgsPreviewed) {
-      return
-    }
-    this.envArgsPreviewed = true
-    const raw = ShellRunTemplate.formatEnvArgsPreview(params._pinokio_env_args)
-    if (raw && this.ondata) {
-      this.ondata({ raw })
-    }
-  }
   async run(params, cb) {
     let r = await this.request(params, cb)
     return r
@@ -1380,7 +1362,6 @@ class Shell {
   }
   async exec(params) {
     this.parser = new ShellParser()
-    this.emitEnvArgsPreview(params)
     params = await this.activate(params)
     this.cmd = this.build(params)
     let res = await new Promise((resolve, reject) => {
@@ -1748,7 +1729,7 @@ class Shell {
       cmd: this.cmd,
       index: this.index,
       group: this.group,
-      env: ShellRunTemplate.redactEnvArgs(this.env),
+      env: this.env,
       done: this.done,
       ready: this.ready,
       id: this.id,

package/kernel/util.js

@@ -434,65 +434,6 @@ const openURL = (url) => {
     console.warn('[Util.openURL] exec failed:', err && err.message ? err.message : err)
   }
 }
-const openURI = async (uri) => {
-  const platform = os.platform()
-  const launch = (command, args) => {
-    return new Promise((resolve, reject) => {
-      let settled = false
-      const settle = (fn, value) => {
-        if (settled) return
-        settled = true
-        clearTimeout(timer)
-        fn(value)
-      }
-      const timer = setTimeout(() => {
-        settle(resolve, {
-          ok: true,
-          command,
-          status: 'started'
-        })
-      }, 3000)
-      const child = spawn(command, args, {
-        detached: true,
-        stdio: 'ignore'
-      })
-      child.on('error', (error) => {
-        settle(reject, error)
-      })
-      child.on('close', (code) => {
-        if (code) {
-          settle(reject, new Error(`${command} exited with code ${code}`))
-        } else {
-          settle(resolve, {
-            ok: true,
-            command,
-            status: 'exited'
-          })
-        }
-      })
-      child.unref()
-    })
-  }
-  try {
-    if (platform === 'darwin') {
-      return await launch('open', [uri])
-    } else if (platform === 'win32') {
-      try {
-        return await launch('rundll32.exe', ['url.dll,FileProtocolHandler', uri])
-      } catch (error) {
-        console.warn('[Util.openURI] rundll32 failed, falling back to explorer:', error && error.message ? error.message : error)
-        return await launch('explorer.exe', [uri])
-      }
-    }
-    return await launch('xdg-open', [uri])
-  } catch (err) {
-    console.warn('[Util.openURI] spawn failed:', err && err.message ? err.message : err)
-    return {
-      ok: false,
-      error: err && err.message ? err.message : String(err)
-    }
-  }
-}
 const openfs = (dirPath, options, kernel) => {
   let command = '';
   const platform = os.platform()
@@ -1256,7 +1197,6 @@ module.exports = {
   find_venv,
   fill_object,
   run,
-  openURI,
   openURL,
   u2p,
   p2u,

package/package.json

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