From d5b2837033860283f43bc353bcc6317bd08f8c5d Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Wed, 22 Jul 2020 06:35:53 +0000
Subject: [PATCH] updates to admin stats

---
 cmd/telebit/admin.go | 75 ++++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/cmd/telebit/admin.go b/cmd/telebit/admin.go
index 8a3f29f..28d3fef 100644
--- a/cmd/telebit/admin.go
+++ b/cmd/telebit/admin.go
@@ -80,7 +80,8 @@ func InitAdmin(authURL string) {
 			})
 		})
 
-		r.Get("/subscribers", getSubscribers)
+		r.Get("/subscribers", getAllSubscribers)
+		r.Get("/subscribers/{subject}", getSubscribers)
 		r.Delete("/subscribers/{subject}", delSubscribers)
 		r.NotFound(apiNotFoundHandler)
 	})
@@ -115,32 +116,11 @@ type SubscriberStatus struct {
 	// TODO bytes read
 }
 
-func getSubscribers(w http.ResponseWriter, r *http.Request) {
+func getAllSubscribers(w http.ResponseWriter, r *http.Request) {
 	statuses := []*SubscriberStatus{}
 	table.Servers.Range(func(key, value interface{}) bool {
-		status := &SubscriberStatus{
-			Since:   nil,
-			Subject: "",
-			Sockets: []string{},
-			Clients: 0,
-		}
-		//subject := key.(string)
 		srvMap := value.(*sync.Map)
-		srvMap.Range(func(k, v interface{}) bool {
-			status.Sockets = append(status.Sockets, k.(string))
-			srv := v.(*table.SubscriberConn)
-			if nil == status.Since || srv.Since.Sub(*status.Since) < 0 {
-				copied := srv.Since.Truncate(time.Second)
-				status.Since = &copied
-			}
-			status.Subject = srv.Grants.Subject
-			srv.Clients.Range(func(k, v interface{}) bool {
-				status.Clients++
-				return true
-			})
-
-			return true
-		})
+		status := getSubscribersHelper(srvMap)
 		statuses = append(statuses, status)
 		return true
 	})
@@ -153,6 +133,53 @@ func getSubscribers(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
+func getSubscribers(w http.ResponseWriter, r *http.Request) {
+	subject := chi.URLParam(r, "subject")
+	statuses := &struct {
+		Success     bool                `json:"success"`
+		Subscribers []*SubscriberStatus `json:"subscribers"`
+	}{
+		Success:     true,
+		Subscribers: []*SubscriberStatus{},
+	}
+
+	var srvMap *sync.Map
+	srvMapX, ok := table.Servers.Load(subject)
+	if ok {
+		srvMap = srvMapX.(*sync.Map)
+		statuses.Subscribers = append(statuses.Subscribers, getSubscribersHelper(srvMap))
+	}
+
+	_ = json.NewEncoder(w).Encode(statuses)
+}
+
+func getSubscribersHelper(srvMap *sync.Map) *SubscriberStatus {
+	status := &SubscriberStatus{
+		Since:   nil,
+		Subject: "",
+		Sockets: []string{},
+		Clients: 0,
+	}
+
+	srvMap.Range(func(k, v interface{}) bool {
+		status.Sockets = append(status.Sockets, k.(string))
+		srv := v.(*table.SubscriberConn)
+		if nil == status.Since || srv.Since.Sub(*status.Since) < 0 {
+			copied := srv.Since.Truncate(time.Second)
+			status.Since = &copied
+		}
+		status.Subject = srv.Grants.Subject
+		srv.Clients.Range(func(k, v interface{}) bool {
+			status.Clients++
+			return true
+		})
+
+		return true
+	})
+
+	return status
+}
+
 func delSubscribers(w http.ResponseWriter, r *http.Request) {
 	subject := chi.URLParam(r, "subject")