chore: split message and event

server/go/websocket/messages.go

@@ -7,24 +7,29 @@ type Message struct {
 	Message interface{} `json:"message"`
 }
 
+type Event struct {
+	Type  string      `json:"type"`
+	Event interface{} `json:"event"`
+}
+
 func SuccessMessage(messageType string) Message {
 	return Message{
 		Type:    messageType,
 		Message: "success",
 	}
 }
 
-func Error(err error) Message {
+func ErrorMessage(err error) Message {
 	return Message{
 		Type:    "error",
 		Message: err.Error(),
 	}
 }
 
-func UpdateMessage(object interface{}) Message {
-	jsonContent, _ := json.Marshal(object)
-	return Message{
-		Type:    "update",
-		Message: jsonContent,
+func ResourceUpdatedEvent(resource interface{}) Event {
+	jsonContent, _ := json.Marshal(resource)
+	return Event{
+		Type:  "update",
+		Event: jsonContent,
 	}
 }

server/go/websocket/router.go

@@ -34,15 +34,15 @@ func (r *Router) ListenAndServe(addr string) {
 		messageObject := routingMessage{}
 		err := json.Unmarshal(message, &messageObject)
 		if err != nil {
-			errMessage := Error(fmt.Errorf("could not unmarshal message: %w", err))
+			errMessage := ErrorMessage(fmt.Errorf("could not unmarshal message: %w", err))
 			conn.WriteJSON(errMessage)
 			return
 		}
 
 		if handler, exists := r.routes[messageObject.Type]; exists {
 			handler(conn, message)
 		} else {
-			conn.WriteJSON(Error(fmt.Errorf("No routes for message type %s", messageObject.Type)))
+			conn.WriteJSON(ErrorMessage(fmt.Errorf("No routes for message type %s", messageObject.Type)))
 		}
 	}
 

server/go/websocket/subscribe.go

@@ -17,17 +17,17 @@ func HandleSubscribeCommand(conn *websocket.Conn, message []byte) {
 	msg := subscriptionMessage{}
 	err := json.Unmarshal(message, &msg)
 	if err != nil {
-		conn.WriteJSON(Error(fmt.Errorf("invalid subscription message: %w", err)))
+		conn.WriteJSON(ErrorMessage(fmt.Errorf("invalid subscription message: %w", err)))
 		return
 	}
 
 	if msg.ResourceID == "" || msg.ResourceType == "" {
-		conn.WriteJSON(Error(fmt.Errorf("either ResourceType or ResourceID is empty")))
+		conn.WriteJSON(ErrorMessage(fmt.Errorf("either ResourceType or ResourceID is empty")))
 		return
 	}
 
 	messageConverter := subscription.NewSubscriberFunction(func(m *subscription.Message) error {
-		err := conn.WriteJSON(UpdateMessage(m.Content))
+		err := conn.WriteJSON(ResourceUpdatedEvent(m.Content))
 		if err != nil {
 			return fmt.Errorf("could not send update message: %w", err)
 		}