feat: python, java autocomplete and gzip (#6)

* feat: python autocomplete

* fix: dockerfile for pyslp

* feat: gzip compression

* fix: pylsp command

* feat: java autocomplete

* fix: prod build image

* refactor: repeated code

Author: vigneshd332

Diff for: Dockerfile

@@ -1,10 +1,5 @@
-## Base
-FROM golang:1.18-alpine AS base
-
-RUN apk add --no-cache build-base ccls py3-lsp-server
-
 ## Build
-FROM base AS build
+FROM golang:1.18-alpine AS build
 
 WORKDIR /app
 
@@ -18,6 +13,12 @@ RUN go build -o server
 ## Dev
 FROM build AS dev
 
+RUN apk add --no-cache build-base ccls py3-lsp-server curl openjdk17
+
+WORKDIR /jdt
+RUN curl https://download.eclipse.org/jdtls/milestones/1.9.0/jdt-language-server-1.9.0-202203031534.tar.gz --output jdt.tar.gz
+RUN tar -xvf ./jdt.tar.gz
+
 WORKDIR /app
 
 RUN apk add --no-cache make
@@ -29,11 +30,18 @@ CMD ["make watch"]
 
 
 ## Prod
-FROM base AS prod
+FROM alpine:latest AS prod
+
+RUN apk add --no-cache build-base ccls py3-lsp-server curl openjdk17
+
+WORKDIR /jdt
+RUN curl https://download.eclipse.org/jdtls/milestones/1.9.0/jdt-language-server-1.9.0-202203031534.tar.gz --output jdt.tar.gz
+RUN tar -xvf ./jdt.tar.gz
 
 WORKDIR /
 
-COPY --from=build /app/server /app/entry.sh /app/.env  /
+COPY --from=build /app/server /app/entry.sh /app/.env ./
+COPY --from=build /app/player_code ./player_code/
 
 ENTRYPOINT ["/entry.sh"]
 CMD ["./server"]

Diff for: controllers/jsonrpc.go

@@ -21,6 +21,7 @@ func StreamReader(ws *models.WebsocketConnection) {
 		var contentLengthHeader string
 		contentLengthHeader = string(contentLengthLine)
 		if err != nil {
+			// If the process has exited, we should stop reading and exit the go routine
 			if err.Error() == "EOF" {
 				return
 			}
@@ -31,9 +32,17 @@ func StreamReader(ws *models.WebsocketConnection) {
 		contentLengthHeader = strings.TrimPrefix(contentLengthHeader, prefix)
 		contentLengthHeader = strings.TrimSuffix(contentLengthHeader, suffix)
 		contentLength, err := strconv.Atoi(contentLengthHeader)
+		if ws.Language == models.Python {
+			// pyls sends an extra Content-Type header after the Content-Length header
+			_, err = reader.ReadBytes('\n')
+			if err != nil {
+				continue
+			}
+		}
 		if err != nil {
 			continue
 		}
+		// Reading redundant newline after headers
 		_, err = reader.ReadBytes('\n')
 		if err != nil {
 			continue

Diff for: docker-compose.yml

@@ -12,3 +12,4 @@ services:
     volumes:
       - .:/app
       - ./workspaces:/app/workspaces
+      - ./workspaces:/workspaces

Diff for: main.go

@@ -18,6 +18,7 @@ func main() {
 		AllowOrigins: []string{config.FrontendURL},
 		AllowHeaders: []string{echo.HeaderOrigin, echo.HeaderContentType, echo.HeaderAccept},
 	}))
+	server.Use(middleware.Gzip())
 	router.InitRoutes(server)
 
 	server.Logger.Fatal(server.Start(":" + config.ServerPort))

Diff for: servers/ccls.go

@@ -3,7 +3,6 @@ package servers
 import (
 	"fmt"
 	"io/ioutil"
-	"os"
 	"os/exec"
 
 	"github.com/delta/codecharacter-lsp-2023/models"
@@ -29,18 +28,7 @@ func createCppServer(ws *models.WebsocketConnection) error {
 		  "onSave":1500
 		}
 	  }`)
-	ws.LSPServer.Stdin, err = ws.LSPServer.Process.StdinPipe()
-	if err != nil {
-		return err
-	}
-	ws.LSPServer.Stdout, err = ws.LSPServer.Process.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	devnull, _ := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
-	ws.LSPServer.Process.Stderr = devnull
-	ws.LSPServer.DevNullFd = devnull
-	return ws.LSPServer.Process.Start()
+	return createPipes(ws)
 }
 
 func createCompileCommands(ws *models.WebsocketConnection) string {

Diff for: servers/jdt.go

@@ -0,0 +1,28 @@
+package servers
+
+import (
+	"os/exec"
+	"path/filepath"
+
+	"github.com/delta/codecharacter-lsp-2023/models"
+)
+
+func createJavaServer(ws *models.WebsocketConnection) error {
+	workspaceDir, _ := filepath.Abs(ws.WorkspacePath)
+	ws.LSPServer.Process = exec.Command("java",
+		"-Declipse.application=org.eclipse.jdt.ls.core.id1",
+		"-Dosgi.bundles.defaultStartLevel=4",
+		"-Dosgi.bundles.defaultStartLevel=4",
+		"-Declipse.product=org.eclipse.jdt.ls.core.product",
+		"-Dlog.level=ERROR",
+		"-noverify",
+		"-Xmx100M",
+		"-jar",
+		"/jdt/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar",
+		"-configuration",
+		"/jdt/config_linux",
+		"-data",
+		workspaceDir,
+	)
+	return createPipes(ws)
+}

Diff for: servers/pylsp.go

@@ -0,0 +1,12 @@
+package servers
+
+import (
+	"os/exec"
+
+	"github.com/delta/codecharacter-lsp-2023/models"
+)
+
+func createPythonServer(ws *models.WebsocketConnection) error {
+	ws.LSPServer.Process = exec.Command("pylsp")
+	return createPipes(ws)
+}

Diff for: servers/servers.go

@@ -1,17 +1,35 @@
 package servers
 
 import (
+	"os"
+
 	"github.com/delta/codecharacter-lsp-2023/models"
 )
 
 func CreateLSPServer(ws *models.WebsocketConnection) error {
 	switch ws.Language {
 	case models.Cpp:
 		return createCppServer(ws)
-		// case models.Python:
-		// 	return createPythonServer(ws)
-		// case models.Java:
-		// 	return createPythonServer(ws)
+	case models.Python:
+		return createPythonServer(ws)
+	case models.Java:
+		return createJavaServer(ws)
 	}
 	return nil
 }
+
+func createPipes(ws *models.WebsocketConnection) error {
+	var err error
+	ws.LSPServer.Stdin, err = ws.LSPServer.Process.StdinPipe()
+	if err != nil {
+		return err
+	}
+	ws.LSPServer.Stdout, err = ws.LSPServer.Process.StdoutPipe()
+	if err != nil {
+		return err
+	}
+	devnull, _ := os.OpenFile(os.DevNull, os.O_WRONLY, 0755)
+	ws.LSPServer.Process.Stderr = devnull
+	ws.LSPServer.DevNullFd = devnull
+	return ws.LSPServer.Process.Start()
+}

Diff for: utils/websocket.go

@@ -14,7 +14,9 @@ import (
 	"github.com/labstack/echo/v4"
 )
 
-var upgrader = websocket.Upgrader{}
+var upgrader = websocket.Upgrader{
+	EnableCompression: true,
+}
 
 func CheckOrigin(r *http.Request) bool {
 	origin := r.Header.Get("Origin")
@@ -39,6 +41,7 @@ func InitWebsocket(c echo.Context) error {
 	c.Echo().Logger.Info("WS Connection Created with ID : ", ws.ID, " and Language : ", language)
 	upgrader.CheckOrigin = CheckOrigin
 	wsConn, err := upgrader.Upgrade(c.Response(), c.Request(), nil)
+	wsConn.EnableWriteCompression(true)
 	if err != nil {
 		return c.String(http.StatusBadRequest, "Error Upgrading to Websocket Connection")
 	}