sync: wip changes
This commit is contained in:
binekrasik
@@ -27,6 +27,8 @@ import { Printf } from '../../program/Printf'
|
||||
import { Pwd } from '../../program/Pwd'
|
||||
import { Environment } from './Environment'
|
||||
import { InputManager } from './InputManager'
|
||||
import { Edit } from '../../program/Edit'
|
||||
import { Mv } from '../../program/Mv'
|
||||
|
||||
export class Wush extends Shell {
|
||||
public readonly Version = "0.3.2"
|
||||
@@ -38,7 +40,6 @@ export class Wush extends Shell {
|
||||
_promptStart: CursorPosition = { col: 0, row: 0 }
|
||||
|
||||
private inputManager: InputManager
|
||||
// @ts-ignore unused for now
|
||||
private environment: Environment
|
||||
|
||||
// exec stuff
|
||||
@@ -93,11 +94,21 @@ export class Wush extends Shell {
|
||||
this.programs['pwd'] = new Pwd()
|
||||
this.programs['cd'] = new Cd(this)
|
||||
this.programs['printf'] = new Printf()
|
||||
this.programs['edit'] = new Edit()
|
||||
this.programs['mv'] = new Mv()
|
||||
|
||||
// reset exit code
|
||||
this.SetExitCode(0)
|
||||
|
||||
// initial prompt
|
||||
this.Prompt()
|
||||
}
|
||||
|
||||
SetExitCode(code: number): void {
|
||||
this.execExitCode = code
|
||||
this.environment.SetVariable("status", code)
|
||||
}
|
||||
|
||||
HasRunningProgram(): boolean {
|
||||
return this.execExitCode === -1
|
||||
}
|
||||
@@ -122,7 +133,7 @@ export class Wush extends Shell {
|
||||
return new Promise<void>(resolve => {
|
||||
this.programs[name].Exec(this.stdin, this.stdout, this.workingDirectory, args)
|
||||
.then(code => {
|
||||
this.execExitCode = code != -1 ? code : -2
|
||||
this.SetExitCode(code != -1 ? code : -2)
|
||||
resolve()
|
||||
})
|
||||
.catch((e) => {
|
||||
@@ -134,7 +145,7 @@ export class Wush extends Shell {
|
||||
// check if the exec actually exited with an exit code
|
||||
// and if not, set it to -2 to indicate that it didn't exit with a valid code
|
||||
if (this.execExitCode === -1)
|
||||
this.execExitCode = -2
|
||||
this.SetExitCode(-2)
|
||||
|
||||
// this.terminal.Write(`The program exited with exit code ${this.execExitCode}.`)
|
||||
resolve()
|
||||
@@ -234,19 +245,33 @@ export class Wush extends Shell {
|
||||
this._bufferPos = 0
|
||||
}
|
||||
|
||||
// takes the prompt buffer, parses it and executes the contents
|
||||
/**
|
||||
* Takes the prompt buffer, parses it and executes the contents
|
||||
*/
|
||||
async ExecuteLineBuffer(data?: string) {
|
||||
type OperatorToken = '&&' | '||' | '|' | ';'
|
||||
type OperatorToken = '&&' | '||' | '|' | ';' | '>' | '>>' | '<'
|
||||
type Token = { type: 'word'; value: string } | { type: 'operator'; value: OperatorToken }
|
||||
type ParsedCommand = {
|
||||
args: string[]
|
||||
stdin: null | SimpleStream<string>
|
||||
stdout: null | SimpleStream<string>
|
||||
stdinPath: string | null
|
||||
stdoutPath: string | null
|
||||
stdoutAppend: boolean
|
||||
}
|
||||
type ParsedPipeline = { commands: ParsedCommand[] }
|
||||
type ParsedListItem = { pipeline: ParsedPipeline; operator: '&&' | '||' | ';' | null }
|
||||
|
||||
// splits the buffer into processable pieces (tokens)
|
||||
// environment variable helpers
|
||||
/**
|
||||
* @returns value of the variable, empty string otherwise
|
||||
*/
|
||||
const resolveVariable = (name: string): string => this.environment.GetVariable(name) ?? ''
|
||||
const isValidVarNameChar = (char: string) => /[A-Za-z0-9_]/.test(char)
|
||||
|
||||
/**
|
||||
* splits the buffer into smaller processable pieces (tokens)
|
||||
*/
|
||||
const tokenize = (text: string): { tokens: Token[]; error: string | null } => {
|
||||
const tokens: Token[] = []
|
||||
|
||||
@@ -258,7 +283,7 @@ export class Wush extends Shell {
|
||||
let escapeNext = false
|
||||
|
||||
/**
|
||||
* adds a new word to the token buffer
|
||||
* adds a new plain string to the token buffer
|
||||
*/
|
||||
const pushWord = () => {
|
||||
if (!wordStarted)
|
||||
@@ -271,6 +296,69 @@ export class Wush extends Shell {
|
||||
wordStarted = false
|
||||
}
|
||||
|
||||
// reads environment variable tokens
|
||||
const readVariable = (index: number): {
|
||||
value: string
|
||||
nextIndex: number
|
||||
error: string | null
|
||||
expanded: boolean
|
||||
} => {
|
||||
if (index + 1 >= text.length)
|
||||
return { value: '$', nextIndex: index, error: null, expanded: false }
|
||||
|
||||
const next = text[index + 1]
|
||||
if (next === '{') {
|
||||
let end = index + 2
|
||||
while (end < text.length && text[end] !== '}')
|
||||
end++
|
||||
|
||||
if (end >= text.length)
|
||||
return { value: '', nextIndex: text.length - 1, error: 'unterminated variable expansion', expanded: true }
|
||||
|
||||
const name = text.slice(index + 2, end)
|
||||
if (name.length === 0)
|
||||
return { value: '', nextIndex: end, error: 'empty variable name', expanded: true }
|
||||
|
||||
return { value: resolveVariable(name), nextIndex: end, error: null, expanded: true }
|
||||
}
|
||||
|
||||
if (isValidVarNameChar(next)) {
|
||||
let end = index + 1
|
||||
while (end + 1 < text.length && isValidVarNameChar(text[end + 1]))
|
||||
end++
|
||||
|
||||
const name = text.slice(index + 1, end + 1)
|
||||
return { value: resolveVariable(name), nextIndex: end, error: null, expanded: true }
|
||||
}
|
||||
|
||||
return { value: '$', nextIndex: index, error: null, expanded: false }
|
||||
}
|
||||
|
||||
const appendExpandedValue = (value: string, split: boolean, preserveEmpty: boolean) => {
|
||||
if (value.length === 0) {
|
||||
if (preserveEmpty)
|
||||
wordStarted = true
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
if (!split) {
|
||||
current += value
|
||||
wordStarted = true
|
||||
return
|
||||
}
|
||||
|
||||
for (const char of value) {
|
||||
if (char === ' ' || char === '\t') {
|
||||
pushWord()
|
||||
continue
|
||||
}
|
||||
|
||||
current += char
|
||||
wordStarted = true
|
||||
}
|
||||
}
|
||||
|
||||
// iterates over the provided text buffer
|
||||
for (let i = 0; i < text.length; i++) {
|
||||
const char = text[i]
|
||||
@@ -307,6 +395,18 @@ export class Wush extends Shell {
|
||||
current += text[i + 1]
|
||||
i++
|
||||
wordStarted = true
|
||||
} else if (char === '$') {
|
||||
const { value, nextIndex, error, expanded } = readVariable(i)
|
||||
if (error)
|
||||
return { tokens: [], error }
|
||||
|
||||
if (expanded) {
|
||||
appendExpandedValue(value, false, true)
|
||||
i = nextIndex
|
||||
} else {
|
||||
current += char
|
||||
wordStarted = true
|
||||
}
|
||||
} else {
|
||||
current += char
|
||||
wordStarted = true
|
||||
@@ -338,6 +438,22 @@ export class Wush extends Shell {
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === '$') {
|
||||
const { value, nextIndex, error, expanded } = readVariable(i)
|
||||
if (error)
|
||||
return { tokens: [], error }
|
||||
|
||||
if (expanded) {
|
||||
appendExpandedValue(value, true, false)
|
||||
i = nextIndex
|
||||
} else {
|
||||
current += char
|
||||
wordStarted = true
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === ' ' || char === '\t') {
|
||||
pushWord()
|
||||
continue
|
||||
@@ -358,6 +474,23 @@ export class Wush extends Shell {
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === '>') {
|
||||
pushWord()
|
||||
if (text[i + 1] === '>') {
|
||||
tokens.push({ type: 'operator', value: '>>' })
|
||||
i++
|
||||
} else {
|
||||
tokens.push({ type: 'operator', value: '>' })
|
||||
}
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === '<') {
|
||||
pushWord()
|
||||
tokens.push({ type: 'operator', value: '<' })
|
||||
continue
|
||||
}
|
||||
|
||||
if (char === '|') {
|
||||
pushWord()
|
||||
if (text[i + 1] === '|') {
|
||||
@@ -402,6 +535,10 @@ export class Wush extends Shell {
|
||||
let currentArgs: string[] = []
|
||||
let currentPipeline: ParsedCommand[] = []
|
||||
let expectCommand = false
|
||||
let expectRedirect: 'stdin' | 'stdout' | 'append' | null = null
|
||||
let currentStdinPath: string | null = null
|
||||
let currentStdoutPath: string | null = null
|
||||
let currentStdoutAppend = false
|
||||
|
||||
const pushCommand = () => {
|
||||
if (currentArgs.length === 0)
|
||||
@@ -411,8 +548,14 @@ export class Wush extends Shell {
|
||||
args: currentArgs,
|
||||
stdin: null,
|
||||
stdout: null,
|
||||
stdinPath: currentStdinPath,
|
||||
stdoutPath: currentStdoutPath,
|
||||
stdoutAppend: currentStdoutAppend,
|
||||
})
|
||||
currentArgs = []
|
||||
currentStdinPath = null
|
||||
currentStdoutPath = null
|
||||
currentStdoutAppend = false
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -427,12 +570,43 @@ export class Wush extends Shell {
|
||||
|
||||
for (const token of tokens) {
|
||||
if (token.type === 'word') {
|
||||
if (expectRedirect) {
|
||||
if (expectRedirect === 'stdin') {
|
||||
currentStdinPath = token.value
|
||||
} else {
|
||||
currentStdoutPath = token.value
|
||||
currentStdoutAppend = expectRedirect === 'append'
|
||||
}
|
||||
|
||||
expectRedirect = null
|
||||
expectCommand = false
|
||||
continue
|
||||
}
|
||||
|
||||
currentArgs.push(token.value)
|
||||
expectCommand = false
|
||||
continue
|
||||
}
|
||||
|
||||
if (expectRedirect)
|
||||
return { list: [], error: 'expected redirection target' }
|
||||
|
||||
if (token.value === '>' || token.value === '>>' || token.value === '<') {
|
||||
if (currentArgs.length === 0)
|
||||
return { list: [], error: `unexpected "${token.value}" operator` }
|
||||
|
||||
expectRedirect = token.value === '<'
|
||||
? 'stdin'
|
||||
: token.value === '>>'
|
||||
? 'append'
|
||||
: 'stdout'
|
||||
continue
|
||||
}
|
||||
|
||||
if (token.value === '|') {
|
||||
if (currentStdoutPath)
|
||||
return { list: [], error: 'unexpected "|" operator after redirection' }
|
||||
|
||||
if (!pushCommand())
|
||||
return { list: [], error: 'unexpected "|" operator' }
|
||||
|
||||
@@ -449,6 +623,9 @@ export class Wush extends Shell {
|
||||
if (expectCommand)
|
||||
return { list: [], error: 'unexpected end of input' }
|
||||
|
||||
if (expectRedirect)
|
||||
return { list: [], error: 'expected redirection target' }
|
||||
|
||||
if (currentArgs.length > 0)
|
||||
pushCommand()
|
||||
|
||||
@@ -494,32 +671,170 @@ export class Wush extends Shell {
|
||||
return
|
||||
}
|
||||
|
||||
if (list.some(item => item.pipeline.commands.length > 1)) {
|
||||
this.terminal.Write(`wush: error: pipes are not supported yet`)
|
||||
this.terminal.MoveCursor(0, 1, { x: true, y: false })
|
||||
const resolvePath = (path: string) => Item.NormalizePath(
|
||||
path.startsWith('/') ? path : `${this.workingDirectory.GetPath()}/${path}`
|
||||
)
|
||||
|
||||
this.Prompt()
|
||||
return
|
||||
const openInputRedirect = async (path: string) => {
|
||||
const resolved = resolvePath(path)
|
||||
const item = await Item.open(resolved)
|
||||
|
||||
if (!(await item.Exists()))
|
||||
throw new Error(`input file ${resolved} doesn't exist`)
|
||||
|
||||
if (item.IsDirectory())
|
||||
throw new Error(`input file ${resolved} is a directory`)
|
||||
|
||||
return { stream: new SimpleStream<string>(), data: item.ReadData() ?? '' }
|
||||
}
|
||||
|
||||
const openOutputRedirect = async (path: string, append: boolean) => {
|
||||
const resolved = resolvePath(path)
|
||||
const item = await Item.open(resolved)
|
||||
|
||||
if (!(await item.Exists()))
|
||||
await item.Create()
|
||||
|
||||
if (item.IsDirectory())
|
||||
throw new Error(`output path ${resolved} is a directory`)
|
||||
|
||||
if (!append)
|
||||
await item.Write('')
|
||||
|
||||
const stream = new SimpleStream<string>()
|
||||
let writeQueue = Promise.resolve()
|
||||
const listener = (data: string) => {
|
||||
writeQueue = writeQueue.then(() => item.Append(data))
|
||||
}
|
||||
stream.on(listener)
|
||||
|
||||
return {
|
||||
stream,
|
||||
finish: () => writeQueue,
|
||||
teardown: () => stream.off(listener),
|
||||
}
|
||||
}
|
||||
|
||||
const setupPipelineStreams = async (pipeline: ParsedPipeline) => {
|
||||
const teardown: Array<() => void> = []
|
||||
const stdins: SimpleStream<string>[] = []
|
||||
const stdouts: SimpleStream<string>[] = []
|
||||
const finishers: Array<() => Promise<void>> = []
|
||||
const inputFeeds: Array<{ stream: SimpleStream<string>; data: string }> = []
|
||||
|
||||
try {
|
||||
for (const [index, command] of pipeline.commands.entries()) {
|
||||
let stdin: SimpleStream<string>
|
||||
let stdout: SimpleStream<string>
|
||||
|
||||
if (command.stdinPath) {
|
||||
if (index !== 0)
|
||||
throw new Error('input redirection is only supported on the first command in a pipeline')
|
||||
|
||||
const { stream, data } = await openInputRedirect(command.stdinPath)
|
||||
stdin = stream
|
||||
inputFeeds.push({ stream, data })
|
||||
} else {
|
||||
stdin = index === 0 ? this.stdin : new SimpleStream<string>()
|
||||
}
|
||||
|
||||
if (command.stdoutPath) {
|
||||
if (index !== pipeline.commands.length - 1)
|
||||
throw new Error('output redirection is only supported on the last command in a pipeline')
|
||||
|
||||
const { stream, finish, teardown: remove } = await openOutputRedirect(
|
||||
command.stdoutPath,
|
||||
command.stdoutAppend
|
||||
)
|
||||
stdout = stream
|
||||
finishers.push(finish)
|
||||
teardown.push(remove)
|
||||
} else {
|
||||
stdout = index === pipeline.commands.length - 1 ? this.stdout : new SimpleStream<string>()
|
||||
}
|
||||
|
||||
command.stdin = stdin
|
||||
command.stdout = stdout
|
||||
|
||||
stdins.push(stdin)
|
||||
stdouts.push(stdout)
|
||||
}
|
||||
|
||||
for (let i = 0; i < pipeline.commands.length - 1; i++) {
|
||||
if (pipeline.commands[i].stdoutPath)
|
||||
throw new Error('cannot pipe a command with output redirection')
|
||||
|
||||
if (pipeline.commands[i + 1].stdinPath)
|
||||
throw new Error('cannot pipe into a command with input redirection')
|
||||
|
||||
const listener = (data: string) => stdins[i + 1].emit(data)
|
||||
stdouts[i].on(listener)
|
||||
teardown.push(() => stdouts[i].off(listener))
|
||||
}
|
||||
|
||||
return { stdins, stdouts, teardown, finishers, inputFeeds }
|
||||
} catch (e) {
|
||||
teardown.forEach(remove => remove())
|
||||
throw e
|
||||
}
|
||||
}
|
||||
|
||||
const executePipeline = async (pipeline: ParsedPipeline): Promise<number> => {
|
||||
const missing = pipeline.commands.find(command => !(this.programs[command.args[0]] instanceof Program))
|
||||
if (missing) {
|
||||
const name = missing.args[0]
|
||||
|
||||
if (name.length !== 0) {
|
||||
this.terminal.Write(`wush: error: unknown command: ${name}.`)
|
||||
this.terminal.MoveCursor(0, 1, { x: true, y: false })
|
||||
return 127
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
let setup: Awaited<ReturnType<typeof setupPipelineStreams>>
|
||||
try {
|
||||
setup = await setupPipelineStreams(pipeline)
|
||||
} catch (e) {
|
||||
const message = e instanceof Error ? e.message : String(e)
|
||||
this.terminal.Write(`wush: error: ${message}`)
|
||||
this.terminal.MoveCursor(0, 1, { x: true, y: false })
|
||||
return 1
|
||||
}
|
||||
|
||||
try {
|
||||
const exitCodes = await Promise.all(pipeline.commands.map(async (command, index) => {
|
||||
try {
|
||||
return await this.programs[command.args[0]].Exec(
|
||||
setup.stdins[index],
|
||||
setup.stdouts[index],
|
||||
this.workingDirectory,
|
||||
command.args
|
||||
)
|
||||
} catch (e) {
|
||||
this.WriteEscapedString(`wush: command ${command.args[0]} exited with the following exception\n`)
|
||||
this.WriteEscapedString(` | ${String(e)}\n`)
|
||||
return -2
|
||||
}
|
||||
}))
|
||||
|
||||
setup.inputFeeds.forEach(feed => {
|
||||
queueMicrotask(() => feed.stream.emit(feed.data))
|
||||
})
|
||||
|
||||
await Promise.all(setup.finishers.map(finish => finish()))
|
||||
|
||||
const lastExitCode = exitCodes[exitCodes.length - 1]
|
||||
return lastExitCode !== -1 ? lastExitCode : -2
|
||||
} finally {
|
||||
setup.teardown.forEach(remove => remove())
|
||||
}
|
||||
}
|
||||
|
||||
for (const item of list) {
|
||||
const command = item.pipeline.commands[0]
|
||||
|
||||
this.execExitCode = -1
|
||||
|
||||
if (this.programs[command.args[0]] instanceof Program) {
|
||||
await this.ExecuteProgram(command.args[0], command.args)
|
||||
} else {
|
||||
this.execExitCode = 0
|
||||
|
||||
// don't print anything if there are no arguments
|
||||
if (command.args[0].length !== 0) {
|
||||
this.terminal.Write(`wush: error: unknown command: ${command.args[0]}.`)
|
||||
this.terminal.MoveCursor(0, 1, { x: true, y: false })
|
||||
|
||||
this.execExitCode = 127
|
||||
}
|
||||
}
|
||||
this.SetExitCode(-1)
|
||||
this.SetExitCode(await executePipeline(item.pipeline))
|
||||
}
|
||||
|
||||
this.Prompt()
|
||||
|
||||
Reference in New Issue
Block a user