Implementing Broadcast(final)

Author: Euler-B

go.mod

@@ -3,12 +3,11 @@ module github.com/Euler-B/API-REST_Go
 go 1.19
 
 require (
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/joho/godotenv v1.4.0 // indirect
-	github.com/lib/pq v1.10.7 // indirect
-	github.com/segmentio/ksuid v1.0.4 // indirect
-	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	github.com/golang-jwt/jwt/v4 v4.4.2
+	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/websocket v1.5.0
+	github.com/joho/godotenv v1.4.0
+	github.com/lib/pq v1.10.7
+	github.com/segmentio/ksuid v1.0.4
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
 github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=

handlers/posts.go

@@ -60,7 +60,12 @@ func InsertPostHandler(s server.Server) http.HandlerFunc {
 				if err != nil {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
+				}	
+				var postMessage = models.WebsocketMessage {
+					Type:    "Post_Created",
+					Payload:  post,
 				}
+				s.Hub().Broadcast(postMessage, nil)
 				w.Header().Set("Content-Type", "application/json")
 				json.NewEncoder(w).Encode(PostResponse{
 					Id: post.Id,

main.go

@@ -9,7 +9,6 @@ import (
 	"github.com/Euler-B/API-REST_Go/handlers"
 	"github.com/Euler-B/API-REST_Go/middleware"
 	"github.com/Euler-B/API-REST_Go/server"
-	"github.com/Euler-B/API-REST_Go/websocket"
 	"github.com/gorilla/mux"
 	"github.com/joho/godotenv"
 )
@@ -39,8 +38,7 @@ func main() {
 }
 
 func BindRoutes(s server.Server, r *mux.Router) {
-	hub := websocket.NewHub()
-
+	
 	r.Use(middleware.CheckAuthMiddleware(s))
 
 	r.HandleFunc("/", handlers.HomeHandler(s)).Methods(http.MethodGet)
@@ -55,6 +53,5 @@ func BindRoutes(s server.Server, r *mux.Router) {
 	r.HandleFunc("/posts/{id}", handlers.DeletePostHandler(s)).Methods(http.MethodDelete)
 	r.HandleFunc("/posts", handlers.ListPostHandler(s)).Methods(http.MethodGet)
 
-	go hub.Run()
-	r.HandleFunc("/ws", hub.HandleWebSocket) 
+	r.HandleFunc("/ws", s.Hub().HandleWebSocket) 
 }

models/message.go

@@ -0,0 +1,7 @@
+package models
+
+type WebsocketMessage struct {
+	Type    string      `json:"type"`
+	Payload interface{} `json:"payload"`
+}
+

server/server.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/Euler-B/API-REST_Go/repository"
 	"github.com/Euler-B/API-REST_Go/database"
+	"github.com/Euler-B/API-REST_Go/websocket"
 
 )
 
@@ -21,18 +22,24 @@ type Config struct {
 
 type Server interface {
 	Config() *Config
+	Hub()    *websocket.Hub
 }
 
 type Broker struct {
 	config *Config
 	router *mux.Router
+	hub    *websocket.Hub
 
 }
 
 func (b *Broker) Config() *Config {
 	return b.config
 }
 
+func (b *Broker) Hub() *websocket.Hub {
+	return b.hub
+}
+
 func NewServer(ctx context.Context, config *Config) (*Broker, error) {
 	if config.Port == "" {
 		return nil, errors.New("el puerto es requerido")
@@ -47,6 +54,7 @@ func NewServer(ctx context.Context, config *Config) (*Broker, error) {
 	broker := &Broker{
 		config: config,
 		router: mux.NewRouter(),
+		hub:    websocket.NewHub(),
 	}
 
 	return broker, nil
@@ -60,6 +68,7 @@ func (b *Broker) Start (binder func(s Server, r *mux.Router)) {
 	if err != nil {
 		log.Fatal(err)
 	}
+	go b.hub.Run()
 	repository.SetRepository(repo)
 
 	log.Println("Inicializando servidor en el Puerto", b.Config().Port)

websocket/client.go

@@ -5,9 +5,9 @@ import (
 )
 
 type Client struct {
-	hub *Hub
-	id string
-	socket *websocket.Conn
+	hub      *Hub
+	id       string
+	socket   *websocket.Conn
 	outbound chan []byte
 }
 
@@ -22,12 +22,17 @@ func NewClient (hub *Hub, socket *websocket.Conn) *Client {
 func (c *Client) Write() {
 	for {
 		select {
-		case message, ok := <- c.outbound:
+		case message, ok := <-c.outbound:
 			if !ok {
 				c.socket.WriteMessage(websocket.CloseMessage, []byte{})
 				return
 			}
 			c.socket.WriteMessage(websocket.TextMessage, message)
-			
 		}
+    }
 }
+
+func (c *Client) Close() {
+	c.socket.Close()
+	close(c.outbound)
+}

websocket/hub.go

@@ -1,9 +1,9 @@
 package websocket
 
 import (
-	"http"
-	"log"
+	"encoding/json"
 	"net/http"
+	"log"
 	"sync"
 
 	"github.com/gorilla/websocket"
@@ -28,18 +28,6 @@ func NewHub() *Hub {
 	}
 }
 
-func (hub *Hub) HandleWebSocket(w http.ResponseWriter, r *http.Request) {
-	socket, err := upgrader.Upgrade(w, r, nil)
-	if err != nil {
-		log.Println(err)
-		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
-	}
-	client := NewClient(hub, socket)
-	hub.register <- client
-
-	go client.Write()
-}
-
 func (hub *Hub) Run() {
 	for {
 		select {
@@ -62,6 +50,7 @@ func (hub *Hub) onConnect(client *Client) {
 
 func (hub *Hub) onDisconnect(client *Client) {
 	log.Println("Client Disconnected", client.socket.RemoteAddr())
+
 	client.socket.Close()
 	hub.mutex.Lock()
 	defer hub.mutex.Unlock()
@@ -75,4 +64,25 @@ func (hub *Hub) onDisconnect(client *Client) {
 	copy(hub.clients[i:], hub.clients[i+1:])
 	hub.clients[len(hub.clients) - 1] = nil 
 	hub.clients = hub.clients[:len(hub.clients) - 1]
+}
+
+func (hub *Hub) Broadcast(message interface{}, ignore *Client) {
+	data, _ := json.Marshal(message)
+	for _, client := range hub.clients {
+		if client != ignore {
+			client.outbound <-data 
+		}
+	} 
+}
+
+func (hub *Hub) HandleWebSocket(w http.ResponseWriter, r *http.Request) {
+	socket, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		log.Println(err)
+		http.Error(w, "Could not open websocket connection", http.StatusBadRequest)
+	}
+	client := NewClient(hub, socket)
+	hub.register <- client
+
+	go client.Write()
 }