quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-12 20:18:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

add fallback to default shell

Browse source
This commit is contained in:
Labhansh Agrawal 2021-02-08 21:05:23 +05:30 committed by Benjamin Staneck
parent 8c4791d074
commit faaad901fe
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/session.ts
View file

@ -91,16 +91,18 @@ export default class Session extends EventEmitter {
batcher: DataBatcher | null; batcher: DataBatcher | null;
shell: string | null; shell: string | null;
ended: boolean; ended: boolean;
initTimestamp: number;
constructor(options: SessionOptions) { constructor(options: SessionOptions) {
super(); super();
this.pty = null; this.pty = null;
this.batcher = null; this.batcher = null;
this.shell = null; this.shell = null;
this.ended = false; this.ended = false;
this.initTimestamp = new Date().getTime();
this.init(options); this.init(options);
} }
init({uid, rows, cols: columns, cwd, shell, shellArgs}: SessionOptions) { init({uid, rows, cols: columns, cwd, shell: _shell, shellArgs: _shellArgs}: SessionOptions) {
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const osLocale = require('os-locale') as typeof import('os-locale'); const osLocale = require('os-locale') as typeof import('os-locale');
const baseEnv = Object.assign( const baseEnv = Object.assign(
@ -137,8 +139,11 @@ export default class Session extends EventEmitter {
options.useConpty = useConpty; options.useConpty = useConpty;
} }
const shell = _shell || defaultShell;
const shellArgs = _shellArgs || defaultShellArgs;
try { try {
this.pty = spawn(shell || defaultShell, shellArgs || defaultShellArgs, options); this.pty = spawn(shell, shellArgs, options);
} catch (err) { } catch (err) {
if (/is not a function/.test(err.message)) { if (/is not a function/.test(err.message)) {
throw createNodePtyError(); throw createNodePtyError();
@ -159,14 +164,29 @@ export default class Session extends EventEmitter {
this.emit('data', data); this.emit('data', data);
}); });
this.pty.onExit(() => { this.pty.onExit((e) => {
if (!this.ended) { if (!this.ended) {
this.ended = true; // fall back to default shell config if the shell exits within 1 sec with non zero exit code
this.emit('exit'); // this will inform users in case there are errors in the config instead of instant exit
const runDuration = new Date().getTime() - this.initTimestamp;
if (e.exitCode > 0 && runDuration < 1000) {
const defaultShellConfig = {shell: defaultShell, shellArgs: defaultShellArgs};
const msg = `
shell exited in ${runDuration} ms with exit code ${e.exitCode}
please check the shell config: ${JSON.stringify({shell, shellArgs}, undefined, 2)}
fallback to default shell config: ${JSON.stringify(defaultShellConfig, undefined, 2)}
`;
console.warn(msg);
this.batcher?.write(msg.replaceAll('\n', '\r\n') as any);
this.init({uid, rows, cols: columns, cwd, ...defaultShellConfig});
} else {
this.ended = true;
this.emit('exit');
}
} }
}); });
this.shell = shell || defaultShell; this.shell = shell;
} }
exit() { exit() {