hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

cache terminall shell env

Browse Source 
Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2020-04-19 10:04:59 +03:00
parent 799482b3c4
commit 17d3edcd57
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/shell-session.ts
View File

@ -10,6 +10,8 @@ import { Cluster, ClusterPreferences } from "./cluster"
import { helmCli } from "./helm-cli" import { helmCli } from "./helm-cli"
export class ShellSession extends EventEmitter { export class ShellSession extends EventEmitter {
static shellEnv: any
protected websocket: WebSocket protected websocket: WebSocket
protected shellProcess: pty.IPty protected shellProcess: pty.IPty
protected kubeconfigPath: string protected kubeconfigPath: string
@ -30,8 +32,7 @@ export class ShellSession extends EventEmitter {
public async open() { public async open() {
this.kubectlBinDir = await this.kubectl.binDir() this.kubectlBinDir = await this.kubectl.binDir()
this.helmBinDir = helmCli.getBinaryDir() this.helmBinDir = helmCli.getBinaryDir()
await helmCli.binaryPath() const env = await this.getCachedShellEnv()
const env = this.getShellEnv()
const shell = env.PTYSHELL const shell = env.PTYSHELL
const args = await this.getShellArgs(shell) const args = await this.getShellArgs(shell)
this.shellProcess = pty.spawn(shell, args, { this.shellProcess = pty.spawn(shell, args, {
@ -75,8 +76,25 @@ export class ShellSession extends EventEmitter {
} }
} }
protected getShellEnv() { protected async getCachedShellEnv() {
const env = JSON.parse(JSON.stringify(shellEnv.sync())) let env: any
if (!ShellSession.shellEnv) {
env = await this.getShellEnv()
ShellSession.shellEnv = env
} else {
env = ShellSession.shellEnv
// refresh env in the background
this.getShellEnv().then((shellEnv: any) => {
ShellSession.shellEnv = shellEnv
})
}
return env
}
protected async getShellEnv() {
const env = JSON.parse(JSON.stringify(await shellEnv()))
const pathStr = [this.kubectlBinDir, this.helmBinDir, process.env.PATH].join(path.delimiter) const pathStr = [this.kubectlBinDir, this.helmBinDir, process.env.PATH].join(path.delimiter)
if(process.platform === "win32") { if(process.platform === "win32") {