feat: allow commands to register themselves to the request handler

PapePathe · Apr 13, 2024 · 4cd11fd · 4cd11fd
1 parent 0a74190
commit 4cd11fd
Show file tree

Hide file tree

Showing 16 changed files with 78 additions and 25 deletions.
diff --git a/internal/commands/command.go b/internal/commands/command.go
@@ -3,8 +3,25 @@ package commands
 import (
 	"fmt"
 	"strings"
+	"sync"
 )
 
+var (
+	defaultCommands     map[string]CommandHandler
+	defaultCommandsLock sync.Mutex
+)
+
+func RegisterCommand(cmd string, h CommandHandler) {
+	defaultCommandsLock.Lock()
+	defer defaultCommandsLock.Unlock()
+
+	if defaultCommands == nil {
+		defaultCommands = make(map[string]CommandHandler)
+	}
+
+	defaultCommands[cmd] = h
+}
+
 type RequestHandler struct {
 	subcommands map[string]CommandHandler
 }
@@ -14,31 +31,7 @@ func NewRequestHandler() *RequestHandler {
 }
 
 func DefaultRequestHandler() *RequestHandler {
-	subcommands := map[string]CommandHandler{
-		// cluster commands
-		"cluster": ClusterHandler{},
-
-		// acl commands
-		"acl": AclHandler{},
-
-		"del": DelHandler{},
-		"get": GetHandler{},
-		"set": SetHandler{},
-
-		// hash related commands
-		"hexists": HExistsHandler{},
-		"hget":    HGetHandler{},
-		"hkeys":   HKeysHandler{},
-		"hlen":    HLenHandler{},
-		"hset":    HSetHandler{},
-		"hvals":   HValsHandler{},
-
-		"config": ConfigHandler{},
-		"hello":  HelloHandler{},
-		"auth":   AuthHandler{},
-		"ping":   PingHandler{},
-	}
-	return &RequestHandler{subcommands}
+	return &RequestHandler{defaultCommands}
 }
 
 func (s RequestHandler) Run(request ClientRequest) {

diff --git a/internal/commands/handler_acl.go b/internal/commands/handler_acl.go
@@ -103,3 +103,7 @@ func (aclService) users(r ClientRequest) error {
 
 	return nil
 }
+
+func init() {
+	RegisterCommand("acl", AclHandler{})
+}
diff --git a/internal/commands/handler_auth.go b/internal/commands/handler_auth.go
@@ -41,3 +41,7 @@ func (ch AuthHandler) Handle(r ClientRequest) {
 
 	r.WriteOK()
 }
+
+func init() {
+	RegisterCommand("auth", AuthHandler{})
+}
diff --git a/internal/commands/handler_cluster.go b/internal/commands/handler_cluster.go
@@ -58,3 +58,7 @@ func (ch ClusterHandler) Handle(r ClientRequest) {
 	}
 
 }
+
+func init() {
+	RegisterCommand("cluster", ClusterHandler{})
+}
diff --git a/internal/commands/handler_config.go b/internal/commands/handler_config.go
@@ -17,3 +17,7 @@ func (ch ConfigHandler) Persistent() bool {
 func (ch ConfigHandler) Handle(r ClientRequest) {
 	r.WriteError("not yet implemented")
 }
+
+func init() {
+	RegisterCommand("config", ConfigHandler{})
+}
diff --git a/internal/commands/handler_del.go b/internal/commands/handler_del.go
@@ -36,3 +36,7 @@ func (ch DelHandler) Handle(r ClientRequest) {
 
 	r.WriteNumber(fmt.Sprintf("%d", delCount))
 }
+
+func init() {
+	RegisterCommand("del", DelHandler{})
+}
diff --git a/internal/commands/handler_get.go b/internal/commands/handler_get.go
@@ -27,3 +27,7 @@ func (ch GetHandler) Handle(r ClientRequest) {
 	rr := renderer.BulkStringRenderer{}
 	r.Write(rr.Render(val))
 }
+
+func init() {
+	RegisterCommand("get", GetHandler{})
+}
diff --git a/internal/commands/handler_hello.go b/internal/commands/handler_hello.go
@@ -34,3 +34,7 @@ func (ch HelloHandler) Handle(r ClientRequest) {
 		log.Println(err)
 	}
 }
+
+func init() {
+	RegisterCommand("hello", HelloHandler{})
+}
diff --git a/internal/commands/handler_hexists.go b/internal/commands/handler_hexists.go
@@ -34,3 +34,7 @@ func (ch HExistsHandler) Handle(r ClientRequest) {
 
 	_ = r.WriteNumber("1")
 }
+
+func init() {
+	RegisterCommand("hexists", HExistsHandler{})
+}
diff --git a/internal/commands/handler_hget.go b/internal/commands/handler_hget.go
@@ -37,3 +37,7 @@ func (ch HGetHandler) Handle(r ClientRequest) {
 
 	_ = r.WriteString(value)
 }
+
+func init() {
+	RegisterCommand("hget", HGetHandler{})
+}
diff --git a/internal/commands/handler_hkeys.go b/internal/commands/handler_hkeys.go
@@ -29,3 +29,7 @@ func (ch HKeysHandler) Handle(r ClientRequest) {
 
 	_ = r.WriteArray(hs.Keys())
 }
+
+func init() {
+	RegisterCommand("hkeys", HKeysHandler{})
+}
diff --git a/internal/commands/handler_hlen.go b/internal/commands/handler_hlen.go
@@ -33,3 +33,7 @@ func (ch HLenHandler) Handle(r ClientRequest) {
 
 	_ = r.WriteNumber(fmt.Sprintf("%d", hs.Len()))
 }
+
+func init() {
+	RegisterCommand("hlen", HLenHandler{})
+}
diff --git a/internal/commands/handler_hset.go b/internal/commands/handler_hset.go
@@ -140,3 +140,7 @@ func chunkSlice(slice [][]byte, chunkSize int) hset {
 
 	return chunks
 }
+
+func init() {
+	RegisterCommand("hset", HSetHandler{})
+}
diff --git a/internal/commands/handler_hvals.go b/internal/commands/handler_hvals.go
@@ -29,3 +29,7 @@ func (ch HValsHandler) Handle(r ClientRequest) {
 
 	_ = r.WriteArray(hs.Values())
 }
+
+func init() {
+	RegisterCommand("hvals", HValsHandler{})
+}
diff --git a/internal/commands/handler_ping.go b/internal/commands/handler_ping.go
@@ -25,3 +25,7 @@ func (ch PingHandler) Handle(r ClientRequest) {
 
 	r.WriteString(data[0])
 }
+
+func init() {
+	RegisterCommand("ping", PingHandler{})
+}
diff --git a/internal/commands/handler_set.go b/internal/commands/handler_set.go
@@ -50,3 +50,7 @@ func (ch SetHandler) Handle(r ClientRequest) {
 
 	_, _ = r.Write([]byte("+OK\r\n"))
 }
+
+func init() {
+	RegisterCommand("set", SetHandler{})
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,3 +58,7 @@ func (ch ClusterHandler) Handle(r ClientRequest) { @@
     	}
     }
+    func init() {
+    	RegisterCommand("cluster", ClusterHandler{})
+    }