-
Notifications
You must be signed in to change notification settings - Fork 31
feat: add support for webassembly #49
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.
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
Open
remyleone
wants to merge
5
commits into
moby:main
Choose a base branch
from
remyleone:webassembly
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+82
−6
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| //go:build !windows | ||
| // +build !windows | ||
| //go:build !js && !windows | ||
| // +build !js,!windows | ||
|
|
||
| package term | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| //go:build js | ||
| // +build js | ||
|
|
||
| package term | ||
|
|
||
| import ( | ||
| "errors" | ||
| "io" | ||
| "os" | ||
| "syscall/js" | ||
| ) | ||
|
|
||
| // terminalState holds the platform-specific state / console mode for the terminal. | ||
| type terminalState struct{} | ||
|
|
||
| // GetWinsize returns the window size based on the specified file descriptor. | ||
| func getWinsize(fd uintptr) (*Winsize, error) { | ||
| window := js.Global().Get("window") | ||
| width := uint16(window.Get("innerWidth").Int()) | ||
| height := uint16(window.Get("innerHeight").Int()) | ||
| return &Winsize{Width: width, Height: height}, nil | ||
| } | ||
|
|
||
| func isTerminal(fd uintptr) bool { | ||
| return true | ||
| } | ||
|
|
||
| func saveState(fd uintptr) (*State, error) { | ||
| return &State{}, nil | ||
| } | ||
|
|
||
| func stdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) { | ||
| return os.Stdin, os.Stdout, os.Stderr | ||
| } | ||
|
|
||
| func disableEcho(fd uintptr, state *State) error { | ||
| return nil | ||
| } | ||
|
|
||
| func setRawTerminal(fd uintptr) (*State, error) { | ||
| return makeRaw(fd) | ||
| } | ||
|
|
||
| func getFdInfo(in interface{}) (uintptr, bool) { | ||
| var inFd uintptr | ||
| var isTerminalIn bool | ||
| if file, ok := in.(*os.File); ok { | ||
| inFd = file.Fd() | ||
| isTerminalIn = isTerminal(inFd) | ||
| } | ||
| return inFd, isTerminalIn | ||
| } | ||
|
|
||
| func setWinsize(fd uintptr, ws *Winsize) error { | ||
| window := js.Global().Get("window") | ||
| window.Set("innerWidth", ws.Width) | ||
| window.Set("innerHeight", ws.Height) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func makeRaw(fd uintptr) (*State, error) { | ||
| oldState := State{} | ||
| return &oldState, nil | ||
| } | ||
|
|
||
| func setRawTerminalOutput(fd uintptr) (*State, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func restoreTerminal(fd uintptr, state *State) error { | ||
| if state == nil { | ||
| return errors.New("invalid terminal state") | ||
| } | ||
| return nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| //go:build !windows | ||
| // +build !windows | ||
| //go:build !js && !windows | ||
| // +build !js,!windows | ||
|
|
||
| package term | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems rather dangerous, or at least it means that it will compile, but silently discard setting this option and (e.g.) print passwords?
Wondering if it should either error, or if we need to make it a compile option when trying to use these parts with webassembly (i.e., don't have these functions implemented).
cc @AkihiroSuda @vvoland any thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah not sure about that either.
Does k8s end up using them somehow?
If not, perhaps it would be better to omit these functions on wasm (so their usage wouldn't compile)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've try to delete https://github.com/kubernetes/kubernetes/blob/e457f5687ac58e60652b7c2d678d0aefc9bb83d4/vendor/github.com/moby/term/term.go#L58-L57 and it compiles without issue. So maybe it is not really used.