pb: Opaque API & update naming

Author: criyle

Procfile

@@ -1,3 +1,3 @@
 apigateway: air -c .air.apigateway.toml
-demoserver: MONGODB_URI=mongodb://mongo/test air -c .air.demoserver.toml
+demoserver: air -c .air.demoserver.toml
 judger: air -c .air.judger.toml

Procfile.dev

@@ -1,15 +1,15 @@
-# go-sandbox-demo
+# go-judge-demo
 
-A simple demo site for the [go-judge](https://github.com/criyle/go-judge), deployed on [heroku](https://go-judger.herokuapp.com).
+A simple demo site for the [go-judge](https://github.com/criyle/go-judge), deployed on M1 Mac Mini docker desktop [site](https://goj.ac).
 Under development...
 
 Components:
 
-- Frontend: Vue.js
+- Frontend: Vue 3, Naive UI, monaco editor
 - APIGateway: GO
 - Backend: GO
 - Judger Client: GO
-- Dev Server Compiler: Air
+- Dev Server Compiler: Air, Overmind
 
 Tools:
 
@@ -85,13 +85,13 @@ docker build -t judger_exec -f Dockerfile.exec .
 ```bash
 docker run --name mongo -d -p 27017:27017 mongo
 
-docker run --name demo --link mongo -d -e TOKEN=token -e GRPC_ADDR=:6081 -e MONGODB_URI=mongodb://mongo:27017/admin -e RELEASE=1 -p 6081:6081 -p 5082:5082 demoserver
+docker run --name demo --link mongo -d -e MONGODB_URI=mongodb://mongo:27017/test -p 5081:5081 -p 5082:5082 demoserver
 
-docker run --name apigateway --link demo -d -e TOKEN=token -e DEMO_SERVER=demo:6081 -e RELEASE=1 -p 5000:5000 apigateway
+docker run --name apigateway --link demo -d -e DEMO_SERVER=demo:5081 -p 5000:5000 apigateway
 
-docker run --name exec -d --privileged -e ES_AUTH_TOKEN=token -e ES_ENABLE_GRPC=1 -e ES_ENABLE_METRICS=1 -e ES_ENABLE_DEBUG=1 -e ES_GRPC_ADDR=:6051 -e ES_HTTP_ADDR=:6050 -p 6051:6051 -p 6050:6050 judger_exec
+docker run --name exec -d --privileged -e ES_ENABLE_GRPC=1 -e ES_ENABLE_METRICS=1 -e ES_ENABLE_DEBUG=1 -p 5052:5052 -p 5051:5051 -p 5050:5050 judger_exec
 
-docker run --name judger --link exec --link demo -d -e TOKEN=token -e DEMO_SERVER=demo:6081 -e EXEC_SERVER=exec:6051 -e RELEASE=1 -p 2112:2112 judger
+docker run --name judger --link exec --link demo -d -e DEMO_SERVER=demo:5081 -e EXEC_SERVER=exec:5051 -p 2112:2112 judger
 ```
 
 ## Data Model

README.md

@@ -5,7 +5,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/criyle/go-judger-demo/pb"
+	"github.com/criyle/go-judge-demo/pb"
 	"github.com/gin-gonic/gin"
 	"google.golang.org/protobuf/encoding/protojson"
 )
@@ -23,14 +23,19 @@ func (a *api) Register(r *gin.RouterGroup) {
 
 func (a *api) apiSubmission(c *gin.Context) {
 	id := c.Query("id")
-	resp, err := a.client.Submission(c, &pb.SubmissionRequest{
-		Id: id,
-	})
+	resp, err := a.client.Submission(c, pb.SubmissionRequest_builder{
+		Id: &id,
+	}.Build())
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return
 	}
-	c.JSON(http.StatusOK, resp.Submissions)
+	ct, err := protojson.Marshal(resp)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+	c.Data(http.StatusOK, "application/json; charset=utf-8", ct)
 }
 
 func (a *api) apiSubmit(c *gin.Context) {

apigateway/api.go

@@ -1,16 +1,15 @@
 package main
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"net/http"
 	"time"
 
-	"github.com/criyle/go-judger-demo/pb"
+	"github.com/criyle/go-judge-demo/pb"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/emptypb"
 )
 
@@ -79,13 +78,12 @@ func (j *judgeUpdater) broadcastLoop() {
 			delete(j.observers, c)
 
 		case msg := <-j.broadcast:
-			buf := new(bytes.Buffer)
-			err := json.NewEncoder(buf).Encode(msg)
+			buf, err := protojson.Marshal(msg)
 			if err != nil {
 				j.logger.Sugar().Debug("encode fail:", err)
 				continue
 			}
-			pMsg, err := websocket.NewPreparedMessage(websocket.TextMessage, buf.Bytes())
+			pMsg, err := websocket.NewPreparedMessage(websocket.TextMessage, buf)
 			if err != nil {
 				j.logger.Sugar().Debug("prepare fail:", err)
 				continue

apigateway/judge_updater.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/criyle/go-judger-demo/pb"
+	"github.com/criyle/go-judge-demo/pb"
 	ginzap "github.com/gin-contrib/zap"
 	"github.com/gin-gonic/contrib/static"
 	"github.com/gin-gonic/gin"

apigateway/main.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/criyle/go-judger-demo/pb"
+	"github.com/criyle/go-judge-demo/pb"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 	"go.uber.org/zap"
@@ -71,13 +71,11 @@ func (s *shell) readLoop() {
 		if err != nil {
 			break
 		}
-		err = s.sc.Send(&pb.ShellInput{
-			Request: &pb.ShellInput_Input{
-				Input: &pb.Input{
-					Content: msg,
-				},
-			},
-		})
+		err = s.sc.Send(pb.ShellInput_builder{
+			Input: pb.Input_builder{
+				Content: msg,
+			}.Build(),
+		}.Build())
 		if err != nil {
 			break
 		}

apigateway/shell.go

@@ -76,7 +76,7 @@ type db struct {
 const (
 	colName         = "submission3"
 	colName2        = "shell1"
-	defaultURI      = "mongodb://localhost:27017/admin"
+	defaultURI      = "mongodb://localhost:27017/test"
 	defaultDatabase = "test1"
 )
 

demoserver/db.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"time"
 
+	"github.com/criyle/go-judge-demo/pb"
 	execpb "github.com/criyle/go-judge/pb"
-	"github.com/criyle/go-judger-demo/pb"
 	"go.mongodb.org/mongo-driver/v2/bson"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/emptypb"
@@ -54,18 +54,19 @@ func (s *demoServer) Submission(ctx context.Context, req *pb.SubmissionRequest)
 	}
 	sub := make([]*pb.Submission, 0, len(m))
 	for _, v := range m {
-		sub = append(sub, &pb.Submission{
-			Id:        v.ID.Hex(),
+		id := v.ID.Hex()
+		sub = append(sub, pb.Submission_builder{
+			Id:        &id,
 			Language:  convertLanguage(v.Lang),
-			Source:    v.Source,
+			Source:    &v.Source,
 			Date:      timestamppb.New(*v.Date),
-			Status:    v.Status,
-			TotalTime: v.TotalTime,
-			MaxMemory: v.MaxMemory,
+			Status:    &v.Status,
+			TotalTime: &v.TotalTime,
+			MaxMemory: &v.MaxMemory,
 			Results:   convertResults(v.Results),
-		})
+		}.Build())
 	}
-	return &pb.SubmissionResponse{Submissions: sub}, nil
+	return pb.SubmissionResponse_builder{Submissions: sub}.Build(), nil
 }
 
 func (s *demoServer) Submit(ctx context.Context, req *pb.SubmitRequest) (*pb.SubmitResponse, error) {
@@ -76,22 +77,24 @@ func (s *demoServer) Submit(ctx context.Context, req *pb.SubmitRequest) (*pb.Sub
 	if err != nil {
 		return nil, err
 	}
-	s.submit <- &pb.JudgeClientRequest{
-		Id:          m.ID.Hex(),
+	id := m.ID.Hex()
+	source := req.GetSource()
+	s.submit <- pb.JudgeClientRequest_builder{
+		Id:          &id,
 		Language:    req.GetLanguage(),
-		Source:      req.GetSource(),
+		Source:      &source,
 		InputAnswer: req.GetInputAnswer(),
-	}
-	s.update <- &pb.JudgeClientResponse{
-		Id:       m.ID.Hex(),
-		Language: req.Language,
+	}.Build()
+	s.update <- pb.JudgeClientResponse_builder{
+		Id:       &id,
+		Language: req.GetLanguage(),
 		Date:     timestamppb.New(*m.Date),
-		Source:   m.Source,
-	}
+		Source:   &source,
+	}.Build()
 	s.logger.Sugar().Debug("submit: ", m)
-	return &pb.SubmitResponse{
-		Id: m.ID.Hex(),
-	}, nil
+	return pb.SubmitResponse_builder{
+		Id: &id,
+	}.Build(), nil
 }
 
 func (s *demoServer) Judge(js pb.DemoBackend_JudgeServer) error {
@@ -118,7 +121,7 @@ func (s *demoServer) Judge(js pb.DemoBackend_JudgeServer) error {
 				return err
 			}
 			s.update <- resp
-			if resp.Type == "finished" {
+			if resp.GetType() == "finished" {
 				break
 			}
 		}
@@ -193,13 +196,13 @@ func (s *demoServer) Shell(ss pb.DemoBackend_ShellServer) error {
 			switch msg := msg.Response.(type) {
 			case *execpb.StreamResponse_ExecOutput:
 				output.Write(msg.ExecOutput.Content)
-				err = ss.Send(&pb.ShellOutput{Content: msg.ExecOutput.Content})
+				err = ss.Send(pb.ShellOutput_builder{Content: msg.ExecOutput.Content}.Build())
 				if err != nil {
 					return
 				}
 
 			case *execpb.StreamResponse_ExecResponse:
-				err = ss.Send(&pb.ShellOutput{Content: []byte(msg.ExecResponse.String())})
+				err = ss.Send(pb.ShellOutput_builder{Content: []byte(msg.ExecResponse.String())}.Build())
 				if err != nil {
 					return
 				}
@@ -217,22 +220,22 @@ func (s *demoServer) Shell(ss pb.DemoBackend_ShellServer) error {
 			if err != nil {
 				return
 			}
-			switch msg := msg.Request.(type) {
-			case *pb.ShellInput_Input:
-				input.Write(msg.Input.Content)
+			switch msg.WhichRequest() {
+			case pb.ShellInput_Input_case:
+				input.Write(msg.GetInput().GetContent())
 				err = sc.Send(&execpb.StreamRequest{Request: &execpb.StreamRequest_ExecInput{ExecInput: &execpb.StreamRequest_Input{
-					Content: msg.Input.Content,
+					Content: msg.GetInput().GetContent(),
 				}}})
 				if err != nil {
 					return
 				}
 
-			case *pb.ShellInput_Resize:
+			case pb.ShellInput_Resize_case:
 				err = sc.Send(&execpb.StreamRequest{Request: &execpb.StreamRequest_ExecResize{ExecResize: &execpb.StreamRequest_Resize{
-					Rows: msg.Resize.Rows,
-					Cols: msg.Resize.Cols,
-					X:    msg.Resize.X,
-					Y:    msg.Resize.Y,
+					Rows: msg.GetResize().GetRows(),
+					Cols: msg.GetResize().GetCols(),
+					X:    msg.GetResize().GetX(),
+					Y:    msg.GetResize().GetY(),
 				}}})
 				if err != nil {
 					return
@@ -258,15 +261,15 @@ func (s *demoServer) updateLoop() {
 			delete(s.observers, o)
 
 		case u := <-s.update:
-			up := &pb.JudgeUpdate{
-				Id:       u.GetId(),
-				Type:     u.GetType(),
-				Status:   u.GetStatus(),
+			up := pb.JudgeUpdate_builder{
 				Date:     u.GetDate(),
 				Language: u.GetLanguage(),
 				Results:  u.GetResults(),
-				Source:   u.GetSource(),
-			}
+			}.Build()
+			up.SetId(u.GetId())
+			up.SetType(u.GetType())
+			up.SetStatus(u.GetStatus())
+			up.SetSource(u.GetSource())
 			// save to db
 			id, _ := bson.ObjectIDFromHex(u.GetId())
 			s.db.Update(context.TODO(), &JudgerUpdate{
@@ -299,13 +302,13 @@ func convertLanguagePB(l *pb.Language) Language {
 }
 
 func convertLanguage(l Language) *pb.Language {
-	return &pb.Language{
-		Name:           l.Name,
-		SourceFileName: l.SourceFileName,
-		CompileCmd:     l.CompileCmd,
-		Executables:    l.Executables,
-		RunCmd:         l.RunCmd,
-	}
+	return pb.Language_builder{
+		Name:           &l.Name,
+		SourceFileName: &l.SourceFileName,
+		CompileCmd:     &l.CompileCmd,
+		Executables:    &l.Executables,
+		RunCmd:         &l.RunCmd,
+	}.Build()
 }
 
 func convertResultsPB(r []*pb.Result) []Result {
@@ -318,12 +321,12 @@ func convertResultsPB(r []*pb.Result) []Result {
 
 func convertResultPB(r *pb.Result) Result {
 	return Result{
-		Time:   r.Time,
-		Memory: r.Memory,
-		Stdin:  r.Stdin,
-		Stdout: r.Stdout,
-		Stderr: r.Stderr,
-		Log:    r.Log,
+		Time:   r.GetTime(),
+		Memory: r.GetMemory(),
+		Stdin:  r.GetStdin(),
+		Stdout: r.GetStdout(),
+		Stderr: r.GetStderr(),
+		Log:    r.GetLog(),
 	}
 }
 
@@ -336,12 +339,12 @@ func convertResults(r []Result) []*pb.Result {
 }
 
 func convertResult(r Result) *pb.Result {
-	return &pb.Result{
-		Time:   r.Time,
-		Memory: r.Memory,
-		Stdin:  r.Stdin,
-		Stdout: r.Stdout,
-		Stderr: r.Stderr,
-		Log:    r.Log,
-	}
+	return pb.Result_builder{
+		Time:   &r.Time,
+		Memory: &r.Memory,
+		Stdin:  &r.Stdin,
+		Stdout: &r.Stdout,
+		Stderr: &r.Stderr,
+		Log:    &r.Log,
+	}.Build()
 }

demoserver/grpc_server.go

@@ -10,8 +10,8 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/criyle/go-judge-demo/pb"
 	execpb "github.com/criyle/go-judge/pb"
-	"github.com/criyle/go-judger-demo/pb"
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
 	grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth"
 	"github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging"