new subsrcribe topic with wildcard *

models/data.go

@@ -1,7 +1,14 @@
 package models
 
+import "encoding/json"
+
 type Data struct {
-	Action string `json:"action"`
+	Action string `json:"action,omitempty"`
 	Topic  string `json:"topic"`
 	Data   any    `json:"data"`
 }
+
+func (*Data) ReadData(data []byte) (request Data, err error) {
+	err = json.Unmarshal(data, &request)
+	return
+}

pubSub.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 
 	"gitea.tecamino.com/paadi/pubSub/models"
+	"gitea.tecamino.com/paadi/pubSub/utils"
 )
 
 // Pubsub implements a simple topic-based publish/subscribe system
@@ -43,9 +44,13 @@ func (ps *Pubsub) worker() {
 	defer ps.wg.Done()
 	for job := range ps.jobQueue {
 		ps.mu.RLock()
-		subs := make([]func(any), 0, len(ps.subs[job.Topic]))
+		var subs []func(any)
-		for _, cb := range ps.subs[job.Topic] {
+		for pattern, callbacks := range ps.subs {
-			subs = append(subs, cb)
+			if utils.Matches(pattern, job.Topic) {
+				for _, cb := range callbacks {
+					subs = append(subs, cb)
+				}
+			}
 		}
 		ps.mu.RUnlock()
 
@@ -53,7 +58,7 @@ func (ps *Pubsub) worker() {
 			func(c func(any), d any) {
 				defer func() { recover() }()
 				c(d)
-			}(cb, job.Data)
+			}(cb, job)
 		}
 	}
 }

utils/utils.go

@@ -0,0 +1,14 @@
+package utils
+
+import "strings"
+
+func Matches(pattern, topic string) bool {
+	if pattern == "*" {
+		return true
+	}
+	if strings.HasSuffix(pattern, "/*") {
+		prefix := strings.TrimSuffix(pattern, "/*")
+		return strings.HasPrefix(topic, prefix+"/")
+	}
+	return pattern == topic
+}