add hash func

client/client.go

@@ -118,3 +118,8 @@ func (c *Client) Shutdown() {
 		pool.Shutdown()
 	}
 }
+
+// GetID returns the client ID hash.
+func (c *Client) GetID() string {
+	return mulch.HashKeyID(c.SecretKey, c.ID)
+}

mulch/logger.go

@@ -7,11 +7,11 @@ import "log"
 // Leaving the interface nil disables all log output.
 type Logger interface {
 	// Debugf is used sparingly.
-	Debugf(string, ...interface{})
+	Debugf(format string, v ...interface{})
 	// Errorf is the most used of the loggers.
-	Errorf(string, ...interface{})
+	Errorf(format string, v ...interface{})
 	// Printf is only used when a custom Handler is not provided.
-	Printf(string, ...interface{})
+	Printf(format string, v ...interface{})
 }
 
 // DefaultLogger is a simple wrapper around the provided Logger interface.

mulch/mulch.go

@@ -2,7 +2,11 @@
 // used by mulery client library, server library and server application.
 package mulch
 
-import "time"
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"time"
+)
 
 const SecretKeyHeader = "x-secret-key"
 
@@ -17,3 +21,15 @@ type Handshake struct {
 }
 
 const HandshakeTimeout = 15 * time.Second
+
+// HashKeyID creates a unique client ID hash.
+func HashKeyID(secret string, clientID string) string {
+	if secret == "" {
+		return clientID
+	}
+
+	hash := sha256.New()
+	hash.Write([]byte(secret + clientID))
+
+	return hex.EncodeToString(hash.Sum(nil))
+}

server/server.go

@@ -1,9 +1,10 @@
 package server
 
 import (
-	"crypto/sha256"
 	"fmt"
 	"time"
+
+	"golift.io/mulery/mulch"
 )
 
 var (
@@ -210,18 +211,8 @@ func (s *Server) dispatchRequest(request *dispatchRequest, threadID uint) {
 // Register the connection into server pools.
 // This is called through a channel from the register handler.
 func (s *Server) registerPool(client *PoolConfig) {
-	cID := client.ID
-
-	if client.secret != "" {
-		hash := sha256.New()
-		hash.Write([]byte(client.secret + client.ID))
-		// As promised, if a custom key validator returns a secret(string),
-		// hash that with the client id to create a new client id.
-		// This is custom logic you probably don't want, so don't return a string from your key validator.
-		cID = fmt.Sprintf("%x", hash.Sum(nil))
-	}
-
-	if pool, ok := s.pools[clientID(cID)]; !ok || pool == nil {
+	cID := mulch.HashKeyID(client.secret, client.ID)
+	if pool := s.pools[clientID(cID)]; pool == nil {
 		s.pools[clientID(cID)] = NewPool(s, client, cID+" ["+client.Name+"]")
 	}