From 71a42af593a4d9693cf61a55ebdf8e4c17ad12a6 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Wed, 26 Feb 2025 19:45:29 +0900
Subject: [PATCH] added a debugging log message for conn_notice packets created
 SendNotice function for reuse by external parties

---
 client.go     |  1 +
 server-ctl.go | 26 +++++++++-----------------
 server.go     | 25 +++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/client.go b/client.go
index 033bc62..e0809ea 100644
--- a/client.go
+++ b/client.go
@@ -1193,6 +1193,7 @@ start_over:
 				var ok bool
 				x, ok = pkt.U.(*Packet_Notice)
 				if ok {
+					cts.C.log.Write(cts.Sid, LOG_DEBUG, "conn_notice message '%s' received from %s", x.Notice.Text, cts.remote_addr)
 					if cts.C.conn_notice != nil {
 						cts.C.conn_notice.Handle(cts, x.Notice.Text)
 					}
diff --git a/server-ctl.go b/server-ctl.go
index e5ac5ca..68757fb 100644
--- a/server-ctl.go
+++ b/server-ctl.go
@@ -560,10 +560,11 @@ oops:
 func (ctl *server_ctl_notices) ServeHTTP(w http.ResponseWriter, req *http.Request) (int, error) {
 	var s *Server
 	var status_code int
-	var cts *ServerConn
+	var je *json.Encoder
 	var err error
 
 	s = ctl.s
+	je = json.NewEncoder(w)
 
 	switch req.Method {
 		case http.MethodPost:
@@ -575,13 +576,13 @@ func (ctl *server_ctl_notices) ServeHTTP(w http.ResponseWriter, req *http.Reques
 				goto oops
 			}
 
-			// TODO: what if this loop takes too long? in that case, lock is held for long. think about how to handle this.
-			s.cts_mtx.Lock()
-			for _, cts = range s.cts_map {
-				cts.pss.Send(MakeConnNoticePacket(noti.Text))
-				// let's not care about an error when broacasting a notice to all connections
+			err = s.SendNotice("", noti.Text)
+			if err != nil {
+				status_code = WriteJsonRespHeader(w, http.StatusInternalServerError)
+				je.Encode(JsonErrmsg{Text: err.Error()})
+				goto oops
 			}
-			s.cts_mtx.Unlock()
+
 			status_code = WriteJsonRespHeader(w, http.StatusOK)
 
 		default:
@@ -601,7 +602,6 @@ func (ctl *server_ctl_notices_id) ServeHTTP(w http.ResponseWriter, req *http.Req
 	var s *Server
 	var status_code int
 	var conn_id string
-	var cts *ServerConn
 	var je *json.Encoder
 	var err error
 
@@ -609,12 +609,6 @@ func (ctl *server_ctl_notices_id) ServeHTTP(w http.ResponseWriter, req *http.Req
 	je = json.NewEncoder(w)
 
 	conn_id = req.PathValue("conn_id") // server connection
-	cts, err = s.FindServerConnByIdStr(conn_id)
-	if err != nil {
-		status_code = WriteJsonRespHeader(w, http.StatusNotFound)
-		je.Encode(JsonErrmsg{Text: err.Error()})
-		goto oops
-	}
 
 	switch req.Method {
 		case http.MethodPost:
@@ -626,10 +620,8 @@ func (ctl *server_ctl_notices_id) ServeHTTP(w http.ResponseWriter, req *http.Req
 				goto oops
 			}
 
-			// no check if noti.Text is empty as i want an empty message to be delivered too.
-			err = cts.pss.Send(MakeConnNoticePacket(noti.Text))
+			err = s.SendNotice(conn_id, noti.Text)
 			if err != nil {
-				err = fmt.Errorf("failed to send conn_notice text '%s' to %s - %s", noti.Text, cts.RemoteAddr, err.Error())
 				status_code = WriteJsonRespHeader(w, http.StatusInternalServerError)
 				je.Encode(JsonErrmsg{Text: err.Error()})
 				goto oops
diff --git a/server.go b/server.go
index f8139cc..c097dd8 100644
--- a/server.go
+++ b/server.go
@@ -1916,3 +1916,28 @@ func (s *Server) AddCtlMetricsCollector(col prometheus.Collector) error {
 func (s *Server) RemoveCtlMetricsCollector(col prometheus.Collector) bool {
 	return s.promreg.Unregister(col)
 }
+
+func (s *Server) SendNotice(id_str string, text string) error {
+	var cts *ServerConn
+	var err error
+
+	if id_str != "" {
+		cts, err = s.FindServerConnByIdStr(id_str) // this function accepts connection id as well as the token.
+		if err != nil { return err }
+		err = cts.pss.Send(MakeConnNoticePacket(text))
+		if err != nil {
+			return fmt.Errorf("failed to send conn_notice text '%s' to %s - %s", text, cts.RemoteAddr, err.Error())
+		}
+	} else {
+		s.cts_mtx.Lock()
+		// TODO: what if this loop takes too long? in that case,
+		//       lock is held for long. think about how to handle this.
+		for _, cts = range s.cts_map {
+			cts.pss.Send(MakeConnNoticePacket(text))
+			// let's not care about an error when broacasting a notice to all connections
+		}
+		s.cts_mtx.Unlock()
+	}
+
+	return nil
+}