fix dish.StreamerStats exporting

Author: krustowski

.env.example

@@ -4,7 +4,7 @@
 
 APP_NAME=swis-api
 APP_ROOT=/opt/${APP_NAME}
-APP_VERSION=5.17.8
+APP_VERSION=5.17.9
 
 
 #

api/swagger.json

@@ -13,7 +13,7 @@
             "name": "MIT",
             "url": "https://github.com/vxn-dev/swis-api/blob/master/LICENSE"
         },
-        "version": "5.17.8"
+        "version": "5.17.9"
     },
     "host": "swis-api-run-prod:8050",
     "basePath": "/",

cmd/swis-api/main.go

@@ -1,5 +1,5 @@
 // @title swis-api (swapi) v5
-// @version 5.17.8
+// @version 5.17.9
 // @description sakalWeb Information System v5 RESTful API documentation
 // @termsOfService http://swagger.io/terms/
 
@@ -79,6 +79,7 @@ func main() {
 	// @Description Simple ping-pong route
 	// @Success 200
 	// @Router /ping [get]
+	// @Router /ping [head]
 	// Very simple LE support --- https://github.com/gin-gonic/gin#support-lets-encrypt.
 	router.GET("/ping", func(c *gin.Context) {
 		c.String(http.StatusOK, "pong")

pkg/dish/controllers.go

@@ -748,50 +748,36 @@ func GetIncidentListBySocketID(ctx *gin.Context) {
 // @Router       /dish/streamer/stats [get]
 func GetStreamerStats(ctx *gin.Context) {
 	var counter int
-	var key string = "stats"
+	var exportedStats = map[string]StreamerStats{}
 
 	if CacheStreamer == nil {
 		ctx.IndentedJSON(http.StatusInternalServerError, gin.H{
 			"code":    http.StatusInternalServerError,
 			"count":   counter,
 			"package": pkgName,
 			"message": "cannot access streamer cache",
-			"key":     key,
 		})
 		return
 	}
 
-	rawStat, ok := CacheSockets.Get(key)
-	if !ok {
-		ctx.IndentedJSON(http.StatusNotFound, gin.H{
-			"code":    http.StatusNotFound,
-			"count":   counter,
-			"package": pkgName,
-			"message": "no streamer statistics",
-			"key":     key,
-		})
-		return
-	}
+	rawStats, counter := CacheStreamer.GetAll()
 
-	stat, ok := rawStat.(StreamerStats)
-	if !ok {
-		ctx.IndentedJSON(http.StatusInternalServerError, gin.H{
-			"code":    http.StatusInternalServerError,
-			"count":   counter,
-			"package": pkgName,
-			"message": "could not assert type dish.StreamerStats",
-			"key":     key,
-		})
-		return
+	// loop over string-map of interface{}
+	for key, rawStat := range rawStats {
+		stat, ok := rawStat.(StreamerStats)
+		if !ok {
+			continue
+		}
+
+		exportedStats[key] = stat
 	}
 
-	counter++
 	ctx.IndentedJSON(http.StatusOK, gin.H{
 		"code":    http.StatusOK,
 		"count":   counter,
-		"item":    stat,
+		"items":   exportedStats,
 		"message": "ok, dumping streamer statistics",
-		"key":     key,
+		"package": pkgName,
 	})
 	return
 }

pkg/dish/stream.go

@@ -18,6 +18,11 @@ func NewDispatcher() (stream *Stream) {
 	go stream.listen()
 	go stream.heartbeat()
 
+	// Init stats
+	if CacheStreamer != nil {
+		CacheStreamer.Set("stats", StreamerStats{ClientCount: 0})
+	}
+
 	return stream
 }