Merge pull request #1 from hyponet/fix/wildcard

fix: wildcard event deliver

bus/exchange.go

@@ -177,7 +177,7 @@ func lookupRadixTree(root *radixNode, topic string) (values []string) {
 		for crt != nil {
 			prefix := strings.Split(crt.prefix, sectionDelimiter)
 			subSections := sections[idx:]
-			m, isWildcard := getSameSectionsWithWildcard(prefix, sections[idx:])
+			m, _ := getSameSectionsWithWildcard(prefix, sections[idx:])
 			if m == 0 {
 				crt = crt.next
 				continue
@@ -189,19 +189,12 @@ func lookupRadixTree(root *radixNode, topic string) (values []string) {
 
 			if m < len(subSections) {
 				queue = append(queue, pos{idx: idx + m, next: crt.children})
-				if isWildcard {
-					crt = crt.next
-					continue
-				}
-				break
-			}
-
-			values = append(values, crt.values...)
-			if isWildcard {
 				crt = crt.next
 				continue
 			}
-			break
+
+			values = append(values, crt.values...)
+			crt = crt.next
 		}
 	}
 

bus/exchange_test.go

@@ -94,6 +94,29 @@ var _ = Describe("TestExchangeRoute", func() {
 				Expect(isContained(ex.route("a.b.*.*.f"), "id-6")).Should(BeTrue())
 			})
 		})
+
+		It("test route wildcard", func() {
+			Context("add topics", func() {
+				ex.add("a.b.c.d", "id-1")
+				ex.add("a.b.c.e", "id-2")
+				ex.add("a.b.c.*", "id-3")
+				ex.add("a.b.d.e.f", "id-4")
+				ex.add("a.b.d.*.f", "id-5")
+				ex.add("a.b.d.*.*", "id-6")
+			})
+			Context("add topics", func() {
+				Expect(isContained(ex.route("a.b.c.*"), "id-1")).Should(BeTrue())
+				Expect(isContained(ex.route("a.b.c.*"), "id-2")).Should(BeTrue())
+				Expect(isContained(ex.route("a.b.c.*"), "id-3")).Should(BeTrue())
+
+				Expect(isContained(ex.route("a.b.c.d"), "id-1")).Should(BeTrue())
+				Expect(isContained(ex.route("a.b.c.d"), "id-3")).Should(BeTrue())
+
+				Expect(isContained(ex.route("a.b.d.e.f"), "id-4")).Should(BeTrue())
+				Expect(isContained(ex.route("a.b.d.e.f"), "id-5")).Should(BeTrue())
+				Expect(isContained(ex.route("a.b.d.e.f"), "id-6")).Should(BeTrue())
+			})
+		})
 	})
 })
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/hyponet/eventbus
 
-go 1.18
+go 1.20
 
 require (
 	github.com/google/uuid v1.3.0