优化代码

internal/events/utils.go

@@ -1,27 +1,71 @@
 package events
 
-import "sync"
+import (
+	"sync"
+)
 
-var eventsMap = map[string][]func(){} // event => []callbacks
+type Callbacks = []func()
+
+var eventsMap = map[Event]map[interface{}]Callbacks{} // event => map[event key][]callback
 var locker = sync.Mutex{}
 
+var eventKeyId = 0
+
+func NewKey() interface{} {
+	locker.Lock()
+	defer locker.Unlock()
+	eventKeyId++
+	return eventKeyId
+}
+
 // On 增加事件回调
-func On(event string, callback func()) {
+func On(event Event, callback func()) {
+	OnKey(event, nil, callback)
+}
+
+// OnKey 使用Key增加事件回调
+func OnKey(event Event, key interface{}, callback func()) {
+	if key == nil {
+		key = NewKey()
+	}
+
 	locker.Lock()
 	defer locker.Unlock()
 
-	callbacks, _ := eventsMap[event]
-	callbacks = append(callbacks, callback)
-	eventsMap[event] = callbacks
+	m, ok := eventsMap[event]
+	if !ok {
+		m = map[interface{}]Callbacks{}
+		eventsMap[event] = m
+	}
+	m[key] = append(m[key], callback)
+}
+
+// Remove 删除事件回调
+func Remove(key interface{}) {
+	if key == nil {
+		return
+	}
+
+	locker.Lock()
+	for k, m := range eventsMap {
+		_, ok := m[key]
+		if ok {
+			delete(m, key)
+			eventsMap[k] = m
+		}
+	}
+	locker.Unlock()
 }
 
 // Notify 通知事件
-func Notify(event string) {
+func Notify(event Event) {
 	locker.Lock()
-	callbacks, _ := eventsMap[event]
+	m := eventsMap[event]
 	locker.Unlock()
 
-	for _, callback := range callbacks {
-		callback()
+	for _, callbacks := range m {
+		for _, callback := range callbacks {
+			callback()
+		}
 	}
 }