Skip to content

Don't redirect stdin when running headless #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2025
Merged

Don't redirect stdin when running headless #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d87b7ed
Don't redirect stdin when running headless.
blaix Aug 1, 2025
e1b4334
Clean up RedirectTerminalIO message
blaix Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 22 additions & 29 deletions src/Main.gren
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,14 @@ type Msg
, downloadResult : Result (HttpClient.Error Bytes) (HttpClient.Response Bytes)
}
| CompilerInstalled (Result FileSystem.Error Path)
| CompilerInitialized { quiet : Bool, backendStreams : ChildProcess.StreamIO, encodedCommand : Bytes }
| CompilerInitialized { headless : Bool, backendStreams : ChildProcess.StreamIO, encodedCommand : Bytes }
| CompilerRan Int
| CompiledForRun { path : Path, exitCode : Int }
| RunStarted Process.Id
| RunStarted { processId : Process.Id, streams : Maybe ChildProcess.StreamIO }
| RunExited Int
| RedirectTerminalIO
(Result
{ error : Stream.Error
, source : Stream.Readable Bytes
, target : Stream.Writable Bytes
}
Stream.Error
{ source : Stream.Readable Bytes
, target : Stream.Writable Bytes
}
Expand Down Expand Up @@ -257,19 +254,22 @@ update msg model =
CompilerInstalled (Ok compilerPath) ->
parseUserArgs model compilerPath

CompilerInitialized { backendStreams, encodedCommand, quiet } ->
CompilerInitialized { backendStreams, encodedCommand, headless } ->
Cmd.batch
[ Stream.write encodedCommand backendStreams.input
|> Task.map (\_ -> { source = model.stdin, target = backendStreams.input })
|> Task.mapError
(\err ->
{ error = err
, source = model.stdin
, target = backendStreams.input
}
)
|> Task.attempt RedirectTerminalIO
, if quiet then
[ if headless then
Stream.write encodedCommand backendStreams.input
|> Task.map (\_ -> {})
|> Task.onError
(\e ->
Stream.Log.line model.stderr (Stream.errorToString e)
|> Task.andThen (\_ -> Node.exitWithCode 1)
)
|> Task.execute
else
Stream.write encodedCommand backendStreams.input
|> Task.map (\_ -> { source = model.stdin, target = backendStreams.input })
|> Task.attempt RedirectTerminalIO
, if headless then
Cmd.none
else
Task.succeed { source = backendStreams.output, target = model.stdout }
Expand All @@ -288,7 +288,7 @@ update msg model =
, fsPermission = model.fsPermission
, pathToString = model.pathToString
, path = path
, onInit = \{ processId } -> RunStarted processId
, onInit = RunStarted
, onExit = RunExited
}
|> Task.onError
Expand All @@ -313,16 +313,9 @@ update msg model =
Stream.read streams.source
|> Task.andThen (\str -> Stream.write str streams.target)
|> Task.map (\_ -> streams)
|> Task.mapError
(\err ->
{ error = err
, source = streams.source
, target = streams.target
}
)
|> Task.attempt RedirectTerminalIO

RedirectTerminalIO (Err { error, source, target }) ->
RedirectTerminalIO (Err error) ->
when error is
Stream.Closed ->
Cmd.none
Expand Down Expand Up @@ -391,7 +384,7 @@ parseUserArgs model compilerPath =
Just streams ->
CompilerInitialized
{ backendStreams = streams
, quiet = False
, headless = False
, encodedCommand =
Compiler.Backend.encodeCommand
{ interactiveSession = model.interactive
Expand Down Expand Up @@ -544,7 +537,7 @@ parseUserArgs model compilerPath =
CompilerInitialized
{ backendStreams = streams
, encodedCommand = encodedCommand
, quiet = True
, headless = True
}
)
, onCompiled =
Expand Down
1 change: 1 addition & 0 deletions src/Terminal/Run.gren
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ run config =

runWith command =
ChildProcess.defaultSpawnOptions config.onInit config.onExit
|> (\opts -> { opts | connection = ChildProcess.Integrated })
|> ChildProcess.spawn config.cpPermission command [ path ]
|> Task.succeed
in
Expand Down
Loading