From 9edd7f6337ce35dd8f28790296ae7b8ffe0dd3c3 Mon Sep 17 00:00:00 2001
From: Chris kerr <chriskerr@gmx.com>
Date: Sat, 27 Jul 2024 15:14:51 -0400
Subject: [PATCH] SendClosed func moved to response package

---
 relay/handlers/req.go             | 21 ++++++++-------------
 relay/handlers/response/closed.go | 13 +++++++++++++
 2 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 relay/handlers/response/closed.go

diff --git a/relay/handlers/req.go b/relay/handlers/req.go
index fd4fd39..23f3546 100644
--- a/relay/handlers/req.go
+++ b/relay/handlers/req.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"grain/relay/db"
+	"grain/relay/handlers/response"
 	relay "grain/relay/types"
 	"grain/relay/utils"
 
@@ -19,14 +20,14 @@ var subscriptions = make(map[string]relay.Subscription)
 func HandleReq(ws *websocket.Conn, message []interface{}) {
 	if len(message) < 3 {
 		fmt.Println("Invalid REQ message format")
-		SendClosed(ws, "", "invalid: invalid REQ message format")
+		response.SendClosed(ws, "", "invalid: invalid REQ message format")
 		return
 	}
 
 	subID, ok := message[1].(string)
 	if !ok {
 		fmt.Println("Invalid subscription ID format")
-		SendClosed(ws, "", "invalid: invalid subscription ID format")
+		response.SendClosed(ws, "", "invalid: invalid subscription ID format")
 		return
 	}
 
@@ -35,7 +36,7 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
 		filterData, ok := filter.(map[string]interface{})
 		if !ok {
 			fmt.Println("Invalid filter format")
-			SendClosed(ws, subID, "invalid: invalid filter format")
+			response.SendClosed(ws, subID, "invalid: invalid filter format")
 			return
 		}
 
@@ -53,7 +54,7 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
 
 	// Check if subscription already exists
 	if _, exists := subscriptions[subID]; exists {
-		SendClosed(ws, subID, "duplicate: subID already opened")
+		response.SendClosed(ws, subID, "duplicate: subID already opened")
 		return
 	}
 
@@ -64,7 +65,7 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
 	queriedEvents, err := QueryEvents(filters, db.GetClient(), "grain")
 	if err != nil {
 		fmt.Println("Error querying events:", err)
-		SendClosed(ws, subID, "error: could not query events")
+		response.SendClosed(ws, subID, "error: could not query events")
 		return
 	}
 
@@ -74,7 +75,7 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
 		err = websocket.Message.Send(ws, string(msgBytes))
 		if err != nil {
 			fmt.Println("Error sending event:", err)
-			SendClosed(ws, subID, "error: could not send event")
+			response.SendClosed(ws, subID, "error: could not send event")
 			return
 		}
 	}
@@ -85,7 +86,7 @@ func HandleReq(ws *websocket.Conn, message []interface{}) {
 	err = websocket.Message.Send(ws, string(eoseBytes))
 	if err != nil {
 		fmt.Println("Error sending EOSE:", err)
-		SendClosed(ws, subID, "error: could not send EOSE")
+		response.SendClosed(ws, subID, "error: could not send EOSE")
 		return
 	}
 }
@@ -153,9 +154,3 @@ func QueryEvents(filters []relay.Filter, client *mongo.Client, databaseName stri
 
 	return results, nil
 }
-
-func SendClosed(ws *websocket.Conn, subID string, message string) {
-	closeMsg := []interface{}{"CLOSED", subID, message}
-	closeBytes, _ := json.Marshal(closeMsg)
-	websocket.Message.Send(ws, string(closeBytes))
-}
diff --git a/relay/handlers/response/closed.go b/relay/handlers/response/closed.go
new file mode 100644
index 0000000..327ab55
--- /dev/null
+++ b/relay/handlers/response/closed.go
@@ -0,0 +1,13 @@
+package response
+
+import (
+	"encoding/json"
+
+	"golang.org/x/net/websocket"
+)
+
+func SendClosed(ws *websocket.Conn, subID string, message string) {
+	closeMsg := []interface{}{"CLOSED", subID, message}
+	closeBytes, _ := json.Marshal(closeMsg)
+	websocket.Message.Send(ws, string(closeBytes))
+}