@rivascva/dt-idl 1.1.166 → 1.1.167

package/go/redis/baserdb.go

@@ -13,12 +13,10 @@ import (
 type RDB interface {
 	// NewRDB creates a new redis database from the parent database.
 	NewRDB(database string) RDB
-	// Set sets the value for the given key.
-	Set(ctx context.Context, key string, value any) error
-	// MSet sets the values for the given entries of key-value pairs.
-	MSet(ctx context.Context, entries map[string]any) error
-	// SetWithExpiration sets the value for the given key with an expiration time.
-	SetWithExpiration(ctx context.Context, key string, value any, expiration time.Duration) error
+	// Set sets the value for the given key with the given expiration.
+	Set(ctx context.Context, key string, value any, expiration time.Duration) error
+	// MSet sets the values for the given entries of key-value pairs with the given expiration.
+	MSet(ctx context.Context, entries map[string]any, expiration time.Duration) error
 	// Get gets the value for the given key. It unmarshals the value into the given destination.
 	Get(ctx context.Context, key string, dest any) error
 	// MGet gets the values for the given keys. It unmarshals the values into the given destinations in the same order as the keys.
@@ -54,7 +52,7 @@ func (r *BaseRDB) NewRDB(database string) RDB {
 	}
 }
 
-func (r *BaseRDB) Set(ctx context.Context, key string, value any) error {
+func (r *BaseRDB) Set(ctx context.Context, key string, value any, expiration time.Duration) error {
 	// marshal the value into a JSON byte array
 	bytes, err := json.Marshal(value)
 	if err != nil {
@@ -62,7 +60,7 @@ func (r *BaseRDB) Set(ctx context.Context, key string, value any) error {
 	}
 
 	// set the value in the redis client
-	err = r.client.Set(ctx, FormatKey(r.database, key), bytes, 0).Err()
+	err = r.client.Set(ctx, FormatKey(r.database, key), bytes, expiration).Err()
 	if err != nil {
 		return fmt.Errorf("failed to set the value in the redis client: %w", err)
 	}
@@ -70,39 +68,29 @@ func (r *BaseRDB) Set(ctx context.Context, key string, value any) error {
 	return nil
 }
 
-func (r *BaseRDB) MSet(ctx context.Context, entries map[string]any) error {
-	// format the entries
-	args := make([]any, 0, len(entries)*2)
+func (r *BaseRDB) MSet(ctx context.Context, entries map[string]any, expiration time.Duration) error {
+	// check that there are entries to set
+	if len(entries) == 0 {
+		return fmt.Errorf("there are no entries to set")
+	}
+
+	// build a flat list of arguments for the lua script: [k1, v1, k2, v2, ..., expire_sec]
+	// the last element is the TTL in seconds. Zero or negative expire means no TTL.
+	scriptArgs := make([]any, 0, (len(entries)*2)+1)
 	for key, value := range entries {
 		bytes, err := json.Marshal(value)
 		if err != nil {
 			return fmt.Errorf("failed to marshal the value for key %s: %w", key, err)
 		}
-		args = append(args, FormatKey(r.database, key), bytes)
+		scriptArgs = append(scriptArgs, FormatKey(r.database, key), bytes)
 	}
+	scriptArgs = append(scriptArgs, int(expiration.Seconds()))
 
-	// set the entries in the redis client
-	err := r.client.MSet(ctx, args...).Err()
+	// run the lua script
+	err := MSetWithExpireScript.Run(ctx, r.client, []string{}, scriptArgs...).Err()
 	if err != nil {
 		return fmt.Errorf("failed to set the entries in the redis client: %w", err)
 	}
-
-	return nil
-}
-
-func (r *BaseRDB) SetWithExpiration(ctx context.Context, key string, value any, expiration time.Duration) error {
-	// marshal the value into a JSON byte array
-	bytes, err := json.Marshal(value)
-	if err != nil {
-		return fmt.Errorf("failed to marshal the value: %w", err)
-	}
-
-	// set the value in the redis client
-	err = r.client.Set(ctx, FormatKey(r.database, key), bytes, expiration).Err()
-	if err != nil {
-		return fmt.Errorf("failed to set the value in the redis client: %w", err)
-	}
-
 	return nil
 }
 

package/go/redis/models.go

@@ -1,6 +1,25 @@
 package redis
 
-import "errors"
+import (
+	"errors"
+
+	goredis "github.com/redis/go-redis/v9"
+)
 
 // ErrNotFound is returned when a value is not found in the redis database.
 var ErrNotFound = errors.New("value not found in the redis database")
+
+// MSetWithExpireScript is a local lua script that sets the value for the given key with the given expiration.
+var MSetWithExpireScript = goredis.NewScript(`
+local n = #ARGV - 1
+if n < 1 then return 'OK' end
+local expire = tonumber(ARGV[#ARGV])
+for i = 1, n, 2 do
+  if expire > 0 then
+    redis.call('SET', ARGV[i], ARGV[i+1], 'EX', expire)
+  else
+    redis.call('SET', ARGV[i], ARGV[i+1])
+  end
+end
+return 'OK'
+`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.166",
+  "version": "1.1.167",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",