-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
stream: add websocket transport layer support
- Loading branch information
Showing
9 changed files
with
303 additions
and
20 deletions.
There are no files selected for viewing
This file contains 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 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 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 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,104 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "log" | ||
| "net/http" | ||
| "os" | ||
|
|
||
| "github.com/criyle/go-judge/cmd/go-judge/model" | ||
| "github.com/criyle/go-judge/cmd/go-judge/stream" | ||
| "github.com/gorilla/websocket" | ||
| ) | ||
|
|
||
| var _ Stream = &websocketStream{} | ||
|
|
||
| type websocketStream struct { | ||
| conn *websocket.Conn | ||
| } | ||
|
|
||
| func newWebsocket(args []string, wsURL string) Stream { | ||
| header := make(http.Header) | ||
| token := os.Getenv("TOKEN") | ||
| if token != "" { | ||
| header.Add("Authorization", "Bearer "+token) | ||
| } | ||
| conn, _, err := websocket.DefaultDialer.Dial(wsURL, header) | ||
| if err != nil { | ||
| log.Fatalln("ws connect: ", err) | ||
| } | ||
| log.Println("start", args) | ||
| return &websocketStream{conn: conn} | ||
| } | ||
|
|
||
| // Recv implements Stream. | ||
| func (s *websocketStream) Recv() (*stream.Response, error) { | ||
| _, r, err := s.conn.ReadMessage() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(r) == 0 { | ||
| return nil, io.ErrUnexpectedEOF | ||
| } | ||
| resp := new(stream.Response) | ||
| switch r[0] { | ||
| case 1: | ||
| resp.Response = new(model.Response) | ||
| if err := json.Unmarshal(r[1:], resp.Response); err != nil { | ||
| return nil, err | ||
| } | ||
| case 2: | ||
| if len(r) < 2 { | ||
| return nil, io.ErrUnexpectedEOF | ||
| } | ||
| resp.Output = new(stream.OutputResponse) | ||
| resp.Output.Index = int(r[1]>>4) & 0xf | ||
| resp.Output.Fd = int(r[1]) & 0xf | ||
| resp.Output.Content = r[2:] | ||
| default: | ||
| return nil, fmt.Errorf("invalid type code: %d", r[0]) | ||
| } | ||
| return resp, nil | ||
| } | ||
|
|
||
| // Send implements Stream. | ||
| func (s *websocketStream) Send(req *stream.Request) error { | ||
| w, err := s.conn.NextWriter(websocket.BinaryMessage) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| defer w.Close() | ||
|
|
||
| switch { | ||
| case req.Request != nil: | ||
| if _, err := w.Write([]byte{1}); err != nil { | ||
| return err | ||
| } | ||
| if err := json.NewEncoder(w).Encode(req.Request); err != nil { | ||
| return err | ||
| } | ||
| case req.Resize != nil: | ||
| if _, err := w.Write([]byte{2}); err != nil { | ||
| return err | ||
| } | ||
| if err := json.NewEncoder(w).Encode(req.Resize); err != nil { | ||
| return err | ||
| } | ||
| case req.Input != nil: | ||
| if _, err := w.Write([]byte{3, byte(req.Input.Index<<4 | req.Input.Fd)}); err != nil { | ||
| return err | ||
| } | ||
| if _, err := w.Write(req.Input.Content); err != nil { | ||
| return err | ||
| } | ||
| case req.Cancel != nil: | ||
| if _, err := w.Write([]byte{4}); err != nil { | ||
| return err | ||
| } | ||
| default: | ||
| return fmt.Errorf("invalid request") | ||
| } | ||
| return nil | ||
| } |
This file contains 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 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 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 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,120 @@ | ||
| package wsexecutor | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "time" | ||
|
|
||
| "github.com/criyle/go-judge/cmd/go-judge/model" | ||
| "github.com/criyle/go-judge/cmd/go-judge/stream" | ||
| "github.com/gorilla/websocket" | ||
| ) | ||
|
|
||
| var _ stream.Stream = &streamWrapper{} | ||
|
|
||
| type streamWrapper struct { | ||
| ctx context.Context | ||
| conn *websocket.Conn | ||
| sendCh chan stream.Response | ||
| } | ||
|
|
||
| func (w *streamWrapper) sendLoop() { | ||
| conn := w.conn | ||
| defer conn.Close() | ||
|
|
||
| ticker := time.NewTicker(pingPeriod) | ||
| defer ticker.Stop() | ||
| for { | ||
| select { | ||
| case <-w.ctx.Done(): | ||
| return | ||
| case r := <-w.sendCh: | ||
| conn.SetWriteDeadline(time.Now().Add(writeWait)) | ||
| switch { | ||
| case r.Response != nil: | ||
| w, err := conn.NextWriter(websocket.BinaryMessage) | ||
| if err != nil { | ||
| return | ||
| } | ||
| if _, err := w.Write([]byte{1}); err != nil { | ||
| return | ||
| } | ||
| if err := json.NewEncoder(w).Encode(r.Response); err != nil { | ||
| return | ||
| } | ||
| if err := w.Close(); err != nil { | ||
| return | ||
| } | ||
| conn.Close() | ||
| return | ||
| case r.Output != nil: | ||
| w, err := conn.NextWriter(websocket.BinaryMessage) | ||
| if err != nil { | ||
| return | ||
| } | ||
| if _, err := w.Write([]byte{2, byte(r.Output.Index<<4 | r.Output.Fd)}); err != nil { | ||
| return | ||
| } | ||
| if _, err := w.Write(r.Output.Content); err != nil { | ||
| return | ||
| } | ||
| if err := w.Close(); err != nil { | ||
| return | ||
| } | ||
| } | ||
| case <-ticker.C: | ||
| conn.SetWriteDeadline(time.Now().Add(writeWait)) | ||
| if err := conn.WriteMessage(websocket.PingMessage, nil); err != nil { | ||
| return | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func (w *streamWrapper) Send(resp stream.Response) error { | ||
| select { | ||
| case <-w.ctx.Done(): | ||
| return w.ctx.Err() | ||
| case w.sendCh <- resp: | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| func (w *streamWrapper) Recv() (*stream.Request, error) { | ||
| conn := w.conn | ||
| _, buf, err := conn.ReadMessage() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(buf) == 0 { | ||
| return nil, io.ErrUnexpectedEOF | ||
| } | ||
| var req stream.Request | ||
| switch buf[0] { | ||
| case 1: | ||
| req.Request = new(model.Request) | ||
| if err := json.Unmarshal(buf[1:], req.Request); err != nil { | ||
| return nil, err | ||
| } | ||
| case 2: | ||
| req.Resize = new(stream.ResizeRequest) | ||
| if err := json.Unmarshal(buf[1:], req.Resize); err != nil { | ||
| return nil, err | ||
| } | ||
| case 3: | ||
| if len(buf) < 2 { | ||
| return nil, io.ErrUnexpectedEOF | ||
| } | ||
| req.Input = new(stream.InputRequest) | ||
| req.Input.Index = int(buf[1]>>4) & 0xf | ||
| req.Input.Fd = int(buf[1]) & 0xf | ||
| req.Input.Content = buf[2:] | ||
| case 4: | ||
| req.Cancel = new(struct{}) | ||
| default: | ||
| return nil, fmt.Errorf("invalid type code: %d", buf[0]) | ||
| } | ||
| return &req, nil | ||
| } |
Oops, something went wrong.