project: refactoring, change id on UUID

Author: Lapp

README.md

@@ -1,5 +1,5 @@
 # Чат
-[![Release](https://img.shields.io/badge/release-v1.1.0-blue)](https://github.com/Lapp-coder/websocket-chat/releases)
+[![Release](https://img.shields.io/badge/release-v1.1.1-blue)](https://github.com/Lapp-coder/websocket-chat/releases)
 
 ### При создании этого приложения были использованны следующие технологии:
 * Go 1.16.6

cmd/app/client/main.go

@@ -3,13 +3,14 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"github.com/Lapp-coder/websocket-chat/pkg/jrpc"
-	"github.com/gorilla/websocket"
-	"github.com/sirupsen/logrus"
 	"net/rpc"
 	"net/rpc/jsonrpc"
 	"os"
 	"strings"
+
+	"github.com/Lapp-coder/websocket-chat/internal/jrpc"
+	"github.com/gorilla/websocket"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -60,7 +61,7 @@ func main() {
 				continue
 			}
 
-			args := jrpc.SendMessageArgs{ID: id, Ids: sending[0], Message: sending[1]}
+			args := jrpc.SendMessageArgs{ID: id, IDs: sending[0], Message: sending[1]}
 			if err = client.Call("Handler.SendMessage", args, nil); err != nil {
 				logrus.Fatal(err)
 			}

go.mod

@@ -3,6 +3,7 @@ module github.com/Lapp-coder/websocket-chat
 go 1.16
 
 require (
+	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.4.2
 	github.com/sirupsen/logrus v1.8.1
 )

go.sum

@@ -1,9 +1,14 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

internal/app/server/errors.go

@@ -0,0 +1,7 @@
+package server
+
+import "errors"
+
+var (
+	errIDsIsEmpty = errors.New("ids is empty")
+)

internal/app/server/handler.go

@@ -1,14 +1,14 @@
 package server
 
 import (
-	"errors"
 	"fmt"
-	"github.com/Lapp-coder/websocket-chat/pkg/jrpc"
-	"github.com/gorilla/websocket"
 	"net/http"
 	"net/rpc/jsonrpc"
-	"strconv"
 	"strings"
+
+	"github.com/Lapp-coder/websocket-chat/internal/jrpc"
+	"github.com/google/uuid"
+	"github.com/gorilla/websocket"
 )
 
 type Handler struct {
@@ -23,13 +23,10 @@ func (h *Handler) InitRoutes() {
 	http.HandleFunc("/chat", h.chat)
 }
 
-var (
-	upgrader = websocket.Upgrader{
-		ReadBufferSize:  1024,
-		WriteBufferSize: 1024,
-	}
-	uniqueId int
-)
+var upgrader = websocket.Upgrader{
+	ReadBufferSize:  1024,
+	WriteBufferSize: 1024,
+}
 
 func (h *Handler) chat(w http.ResponseWriter, r *http.Request) {
 	ws, err := upgrader.Upgrade(w, r, nil)
@@ -38,8 +35,7 @@ func (h *Handler) chat(w http.ResponseWriter, r *http.Request) {
 	}
 	defer ws.Close()
 
-	uniqueId++
-	id := strconv.Itoa(uniqueId)
+	id := uuid.NewString()
 	if err = ws.WriteMessage(websocket.TextMessage, []byte(id)); err != nil {
 		return
 	}
@@ -56,23 +52,23 @@ func (h *Handler) chat(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *Handler) SendMessage(args *jrpc.SendMessageArgs, result *string) error {
-	switch args.Ids {
+	switch args.IDs {
 	case "*":
 		h.hub.broadcast <- []byte(fmt.Sprintf("%s: %s", args.ID, args.Message))
 	case "echo":
-		conn, ok := h.hub.connections[args.ID]
-		if ok {
+		conn, exists := h.hub.Connection(args.ID)
+		if exists {
 			conn.send <- []byte(args.Message)
 		}
 	default:
-		ids := strings.Split(args.Ids, ", ")
+		ids := strings.Split(args.IDs, ", ")
 		if len(ids) == 0 {
-			return errors.New("ids is empty")
+			return errIDsIsEmpty
 		}
 
 		for _, id := range ids {
-			conn, ok := h.hub.connections[id]
-			if ok {
+			conn, exists := h.hub.Connection(id)
+			if exists {
 				conn.send <- []byte(fmt.Sprintf("%s: %s", args.ID, args.Message))
 			}
 		}

internal/app/server/hub.go

@@ -1,6 +1,6 @@
 package server
 
-// Hub является центральным узлом (чатом), который обрабатывает все соединения
+// Hub является центральным узлом (чатом), который обрабатывает все соединения.
 type Hub struct {
 	connections map[string]*connection
 	broadcast   chan []byte
@@ -17,26 +17,46 @@ func NewHub() *Hub {
 	}
 }
 
-// Listen прослушивает новые соединения, закрытые соединения и сообщения из канала broadcast
+// Connection возращает ссылку на соединения и булево значение о том,
+// существует ли такое соединение в Hub.
+func (h Hub) Connection(id string) (conn *connection, exists bool) {
+	conn, exists = h.connections[id]
+	return
+}
+
+// Listen прослушивает сигнал на создание нового соеднинения, закрытия соединения,
+// а также сообщения из канала broadcast, куда попадают все публичные сообщения.
 func (h *Hub) Listen() {
 	for {
 		select {
 		case conn := <-h.register:
-			h.connections[conn.id] = conn
+			h.registerConn(conn)
 		case conn := <-h.unregister:
-			if _, ok := h.connections[conn.id]; ok {
-				delete(h.connections, conn.id)
-				close(conn.send)
-			}
+			h.unregisterConn(conn)
 		case message := <-h.broadcast:
-			for _, conn := range h.connections {
-				select {
-				case conn.send <- message:
-				default:
-					delete(h.connections, conn.id)
-					close(conn.send)
-				}
-			}
+			h.sendMessageAllConnections(message)
+		}
+	}
+}
+
+func (h *Hub) registerConn(conn *connection) {
+	h.connections[conn.id] = conn
+}
+
+func (h *Hub) unregisterConn(conn *connection) {
+	if _, ok := h.connections[conn.id]; ok {
+		delete(h.connections, conn.id)
+		close(conn.send)
+	}
+}
+
+func (h *Hub) sendMessageAllConnections(message []byte) {
+	for _, conn := range h.connections {
+		select {
+		case conn.send <- message:
+		default:
+			delete(h.connections, conn.id)
+			close(conn.send)
 		}
 	}
 }

pkg/jrpc/args.go renamed to internal/jrpc/args.go

@@ -2,7 +2,7 @@ package jrpc
 
 type SendMessageArgs struct {
 	ID      string
-	Ids     string
+	IDs     string
 	Message string
 }