V1.1.0 (#18)

Fullavatar · web-flow · commit 3f2a9646ea3f · 2025-02-12T10:12:00.000+01:00
* 1 restructuring (#14) * Restructured project tree * remove builds * Update .gitignore * Renamed folders * cleaned up * Added Makefile and Dockerfile (#16) * Refactored Project (#17) * Fixed wrong default scene in godot
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,8 @@
 
-Client/.godot/
-Client/icon.svg.import
+client/.godot/
+client/icon.svg.import
 
-Server/.idea
+server/.idea
+
+builds/
+client/asset/icon.svg.import
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}
diff --git a/Builds/Client.exe b/Builds/Client.exe
diff --git a/Builds/Server.exe b/Builds/Server.exe
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,14 @@
+
+FROM golang:1.23-alpine
+
+WORKDIR /app
+
+COPY . .
+
+RUN cd ./server && go mod tidy
+
+RUN cd ./server && go build -o ../builds/Server.exe ./main.go
+
+EXPOSE 5000
+
+CMD ["/app/builds/Server.exe"]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,46 @@
+CLIENT_SRC = ./client
+SERVER_SRC = ./main.go
+
+CLIENT_BIN = ./builds/Client.exe
+SERVER_BIN = ./builds/Server.exe
+
+MAKE_PATH = %CD%
+
+.PHONY: build-docker
+build-docker: ## Build Docker image
+	docker build --no-cache -t websocketchat .
+
+.PHONY: build-client
+build-client: ## Create the Client.exe
+	godot --headless --path $(CLIENT_SRC) --export-release "Windowsx86_64" ../$(CLIENT_BIN)
+
+.PHONY: build-server
+build-server: ## Create the Server.exe
+	cd server && go build -o ../$(SERVER_BIN) $(SERVER_SRC)
+
+.PHONY: clean-build
+clean-build: ## Remove Client and Server binaries
+	if exist $(CLIENT_BIN) del /F /Q $(CLIENT_BIN)
+	if exist $(SERVER_BIN) del /F /Q $(SERVER_BIN)
+
+.PHONY: run-docker
+run-docker: ## Run Docker image
+	docker stop websocketchat || true
+	docker rm websocketchat || true
+	docker run -d -p 5000:5000 --name websocketchat websocketchat
+
+.PHONY: run-client
+run-client: ## Run Client
+	$(CLIENT_BIN)
+
+.PHONY: run-server
+run-server: ## Run Server in a new terminal
+	cmd.exe /c start "C:\Users\loica\Desktop\ChatWS\builds\Server.exe"
+
+.PHONY: test
+test: ## Run tests
+	cd .\server && go test ./...
+
+.PHONY: deps
+deps: ## Install new dependencies
+	cd .\server && go mod tidy -v
diff --git a/Server/server_test.go b/Server/server_test.go
diff --git a/client/asset/icon.svg b/client/asset/icon.svg
diff --git a/client/export_presets.cfg b/client/export_presets.cfg
@@ -1,6 +1,6 @@
 [preset.0]
 
-name="Windows Desktop"
+name="Windowsx86_64"
 platform="Windows Desktop"
 runnable=true
 advanced_options=true
diff --git a/client/project.godot b/client/project.godot
@@ -11,6 +11,6 @@ config_version=5
 [application]
 
 config/name="ClientWebSocket"
-run/main_scene="res://scene/main.tscn"
+run/main_scene="res://scene/login.tscn"
 config/features=PackedStringArray("4.4", "Forward Plus")
-config/icon="res://icon.svg"
+config/icon="res://asset/icon.svg"
diff --git a/client/scene/login.tscn b/client/scene/login.tscn
@@ -4,6 +4,7 @@
 
 [node name="Control" type="Control"]
 layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 576.0
diff --git a/client/scene/main.tscn b/client/scene/main.tscn
@@ -4,6 +4,7 @@
 
 [sub_resource type="SystemFont" id="SystemFont_itxqv"]
 font_names = PackedStringArray("Comic Sans MS")
+subpixel_positioning = 0
 
 [sub_resource type="Theme" id="Theme_v0l8b"]
 default_font = SubResource("SystemFont_itxqv")
diff --git a/client/script/login.gd b/client/script/login.gd
diff --git a/client/script/main.gd b/client/script/main.gd
diff --git a/server/go.mod b/server/go.mod
@@ -1,4 +1,4 @@
-module github.com/fullavatar/realTimeChat
+module github.com/fullavatar/websocketchat
 
 go 1.23
 
diff --git a/server/go.sum b/server/go.sum
diff --git a/server/main.go b/server/main.go
@@ -0,0 +1,7 @@
+package main
+
+import websocketserver "github.com/fullavatar/websocketchat/websocketserver/pkg"
+
+func main() {
+	websocketserver.OpenWebSocketServer("5000")
+}
diff --git a/server/test/server_test.go b/server/test/server_test.go
@@ -0,0 +1,9 @@
+package websocketserver_test
+
+import (
+	"testing"
+)
+
+func TestWebSocketBroadcast(t *testing.T) {
+	// TODO
+}
diff --git a/server/websocketserver/internal/serverrouting.go b/server/websocketserver/internal/serverrouting.go
@@ -1,4 +1,4 @@
-package realTimeChat
+package websocketserver
 
 import (
 	"log"
@@ -8,14 +8,6 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-const (
-	Reset  = "\033[0m"
-	Red    = "\033[31m"
-	Green  = "\033[32m"
-	Yellow = "\033[33m"
-	Blue   = "\033[34m"
-)
-
 type WebSocketHandler struct {
 	upgrader websocket.Upgrader
 	clients  map[*websocket.Conn]string
diff --git a/server/websocketserver/internal/utils.go b/server/websocketserver/internal/utils.go
@@ -0,0 +1,9 @@
+package websocketserver
+
+const (
+	Reset  = "\033[0m"
+	Red    = "\033[31m"
+	Green  = "\033[32m"
+	Yellow = "\033[33m"
+	Blue   = "\033[34m"
+)
diff --git a/server/websocketserver/pkg/websocketserver.go b/server/websocketserver/pkg/websocketserver.go
@@ -1,17 +1,16 @@
-package main
+package websocketserver
 
 import (
-	"github.com/fullavatar/realTimeChat"
+	"github.com/fullavatar/websocketchat/websocketserver/internal"
 	"log"
 	"net/http"
 )
 
-func main() {
-	server := realTimeChat.NewWebSocketServer()
+func OpenWebSocketServer(port string) {
+	server := websocketserver.NewWebSocketServer()
 
 	http.Handle("/ws", server)
 
-	port := "5000"
 	log.Println("WebSocket server running on ws://localhost:" + port + "/ws")
 
 	if err := http.ListenAndServe(":"+port, nil); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "makefile.configureOnOpen": false`
	`3`	`+}`