@upstash/redis 0.0.0-ci.8122a6a6-20221030 → 0.0.0-ci.8132df91-20231017

package/script/pkg/commands/json_set.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonSetCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/json.set
+ */
+class JsonSetCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        const command = ["JSON.SET", cmd[0], cmd[1], cmd[2]];
+        if (cmd[3]) {
+            if (cmd[3].nx) {
+                command.push("NX");
+            }
+            else if (cmd[3].xx) {
+                command.push("XX");
+            }
+        }
+        super(command, opts);
+    }
+}
+exports.JsonSetCommand = JsonSetCommand;

package/script/pkg/commands/json_strappend.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonStrAppendCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/json.strappend
+ */
+class JsonStrAppendCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["JSON.STRAPPEND", ...cmd], opts);
+    }
+}
+exports.JsonStrAppendCommand = JsonStrAppendCommand;

package/script/pkg/commands/json_strlen.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonStrLenCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/json.strlen
+ */
+class JsonStrLenCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["JSON.STRLEN", ...cmd], opts);
+    }
+}
+exports.JsonStrLenCommand = JsonStrLenCommand;

package/script/pkg/commands/json_toggle.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonToggleCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/json.toggle
+ */
+class JsonToggleCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["JSON.TOGGLE", ...cmd], opts);
+    }
+}
+exports.JsonToggleCommand = JsonToggleCommand;

package/script/pkg/commands/json_type.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsonTypeCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/json.type
+ */
+class JsonTypeCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["JSON.TYPE", ...cmd], opts);
+    }
+}
+exports.JsonTypeCommand = JsonTypeCommand;

package/script/pkg/commands/lmove.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LMoveCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/lmove
+ */
+class LMoveCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["lmove", ...cmd], opts);
+    }
+}
+exports.LMoveCommand = LMoveCommand;

package/script/pkg/commands/mod.js

@@ -31,8 +31,10 @@ __exportStar(require("./expire.js"), exports);
 __exportStar(require("./expireat.js"), exports);
 __exportStar(require("./flushall.js"), exports);
 __exportStar(require("./flushdb.js"), exports);
+__exportStar(require("./geo_add.js"), exports);
 __exportStar(require("./get.js"), exports);
 __exportStar(require("./getbit.js"), exports);
+__exportStar(require("./getdel.js"), exports);
 __exportStar(require("./getrange.js"), exports);
 __exportStar(require("./getset.js"), exports);
 __exportStar(require("./hdel.js"), exports);
@@ -45,6 +47,7 @@ __exportStar(require("./hkeys.js"), exports);
 __exportStar(require("./hlen.js"), exports);
 __exportStar(require("./hmget.js"), exports);
 __exportStar(require("./hmset.js"), exports);
+__exportStar(require("./hrandfield.js"), exports);
 __exportStar(require("./hscan.js"), exports);
 __exportStar(require("./hset.js"), exports);
 __exportStar(require("./hsetnx.js"), exports);
@@ -53,10 +56,32 @@ __exportStar(require("./hvals.js"), exports);
 __exportStar(require("./incr.js"), exports);
 __exportStar(require("./incrby.js"), exports);
 __exportStar(require("./incrbyfloat.js"), exports);
+__exportStar(require("./json_arrappend.js"), exports);
+__exportStar(require("./json_arrindex.js"), exports);
+__exportStar(require("./json_arrinsert.js"), exports);
+__exportStar(require("./json_arrlen.js"), exports);
+__exportStar(require("./json_arrpop.js"), exports);
+__exportStar(require("./json_arrtrim.js"), exports);
+__exportStar(require("./json_clear.js"), exports);
+__exportStar(require("./json_del.js"), exports);
+__exportStar(require("./json_forget.js"), exports);
+__exportStar(require("./json_get.js"), exports);
+__exportStar(require("./json_mget.js"), exports);
+__exportStar(require("./json_numincrby.js"), exports);
+__exportStar(require("./json_nummultby.js"), exports);
+__exportStar(require("./json_objkeys.js"), exports);
+__exportStar(require("./json_objlen.js"), exports);
+__exportStar(require("./json_resp.js"), exports);
+__exportStar(require("./json_set.js"), exports);
+__exportStar(require("./json_strappend.js"), exports);
+__exportStar(require("./json_strlen.js"), exports);
+__exportStar(require("./json_toggle.js"), exports);
+__exportStar(require("./json_type.js"), exports);
 __exportStar(require("./keys.js"), exports);
 __exportStar(require("./lindex.js"), exports);
 __exportStar(require("./linsert.js"), exports);
 __exportStar(require("./llen.js"), exports);
+__exportStar(require("./lmove.js"), exports);
 __exportStar(require("./lpop.js"), exports);
 __exportStar(require("./lpos.js"), exports);
 __exportStar(require("./lpush.js"), exports);
@@ -98,6 +123,7 @@ __exportStar(require("./sinter.js"), exports);
 __exportStar(require("./sinterstore.js"), exports);
 __exportStar(require("./sismember.js"), exports);
 __exportStar(require("./smembers.js"), exports);
+__exportStar(require("./smismember.js"), exports);
 __exportStar(require("./smove.js"), exports);
 __exportStar(require("./spop.js"), exports);
 __exportStar(require("./srandmember.js"), exports);
@@ -128,4 +154,7 @@ __exportStar(require("./zremrangebyscore.js"), exports);
 __exportStar(require("./zrevrank.js"), exports);
 __exportStar(require("./zscan.js"), exports);
 __exportStar(require("./zscore.js"), exports);
+__exportStar(require("./zunion.js"), exports);
 __exportStar(require("./zunionstore.js"), exports);
+__exportStar(require("./xadd.js"), exports);
+__exportStar(require("./xrange.js"), exports);

package/script/pkg/commands/set.js

@@ -31,7 +31,7 @@ class SetCommand extends command_js_1.Command {
                 command.push("pxat", opts.pxat);
             }
             else if ("keepTtl" in opts && opts.keepTtl) {
-                command.push("keepTtl", opts.keepTtl);
+                command.push("keepTtl");
             }
         }
         super(command, cmdOpts);

package/script/pkg/commands/smismember.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SMIsMemberCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/smismember
+ */
+class SMIsMemberCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["smismember", cmd[0], ...cmd[1]], opts);
+    }
+}
+exports.SMIsMemberCommand = SMIsMemberCommand;

package/script/pkg/commands/xadd.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XAddCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/xadd
+ */
+class XAddCommand extends command_js_1.Command {
+    constructor([key, id, entries, opts], commandOptions) {
+        const command = ["XADD", key];
+        if (opts) {
+            if (opts.nomkStream) {
+                command.push("NOMKSTREAM");
+            }
+            if (opts.trim) {
+                command.push(opts.trim.type, opts.trim.comparison, opts.trim.threshold);
+                if (typeof opts.trim.limit !== "undefined") {
+                    command.push("LIMIT", opts.trim.limit);
+                }
+            }
+        }
+        command.push(id);
+        // entries
+        Object.entries(entries).forEach(([k, v]) => {
+            command.push(k, v);
+        });
+        super(command, commandOptions);
+    }
+}
+exports.XAddCommand = XAddCommand;

package/script/pkg/commands/xrange.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XRangeCommand = void 0;
+const command_js_1 = require("./command.js");
+function deserialize(result) {
+    const obj = {};
+    for (const e of result) {
+        while (e.length >= 2) {
+            const streamId = e.shift();
+            const entries = e.shift();
+            if (!(streamId in obj)) {
+                obj[streamId] = {};
+            }
+            while (entries.length >= 2) {
+                const field = entries.shift();
+                const value = entries.shift();
+                try {
+                    obj[streamId][field] = JSON.parse(value);
+                }
+                catch {
+                    obj[streamId][field] = value;
+                }
+            }
+        }
+    }
+    return obj;
+}
+class XRangeCommand extends command_js_1.Command {
+    constructor([key, start, end, count], opts) {
+        const command = ["XRANGE", key, start, end];
+        if (typeof count === "number") {
+            command.push("COUNT", count);
+        }
+        super(command, {
+            deserialize: (result) => deserialize(result),
+            ...opts,
+        });
+    }
+}
+exports.XRangeCommand = XRangeCommand;

package/script/pkg/commands/zdiffstore.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZDiffStoreCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/zdiffstore
+ */
+class ZDiffStoreCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        super(["zdiffstore", ...cmd], opts);
+    }
+}
+exports.ZDiffStoreCommand = ZDiffStoreCommand;

package/script/pkg/commands/zunion.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZUnionCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/zunion
+ */
+class ZUnionCommand extends command_js_1.Command {
+    constructor([numKeys, keyOrKeys, opts], cmdOpts) {
+        const command = ["zunion", numKeys];
+        if (Array.isArray(keyOrKeys)) {
+            command.push(...keyOrKeys);
+        }
+        else {
+            command.push(keyOrKeys);
+        }
+        if (opts) {
+            if ("weights" in opts && opts.weights) {
+                command.push("weights", ...opts.weights);
+            }
+            else if ("weight" in opts && typeof opts.weight === "number") {
+                command.push("weights", opts.weight);
+            }
+            if ("aggregate" in opts) {
+                command.push("aggregate", opts.aggregate);
+            }
+            if (opts?.withScores) {
+                command.push("withscores");
+            }
+        }
+        super(command, cmdOpts);
+    }
+}
+exports.ZUnionCommand = ZUnionCommand;

package/script/pkg/http.js

@@ -28,13 +28,20 @@ class HttpClient {
             writable: true,
             value: void 0
         });
+        this.options = {
+            backend: config.options?.backend,
+            agent: config.agent,
+            responseEncoding: config.responseEncoding ?? "base64",
+            cache: config.cache,
+        };
         this.baseUrl = config.baseUrl.replace(/\/$/, "");
         this.headers = {
             "Content-Type": "application/json",
-            "Upstash-Encoding": "base64",
             ...config.headers,
         };
-        this.options = { backend: config.options?.backend, agent: config.agent };
+        if (this.options.responseEncoding === "base64") {
+            this.headers["Upstash-Encoding"] = "base64";
+        }
         if (typeof config?.retry === "boolean" && config?.retry === false) {
             this.retry = {
                 attempts: 1,
@@ -49,8 +56,26 @@ class HttpClient {
             };
         }
     }
+    mergeTelemetry(telemetry) {
+        function merge(obj, key, value) {
+            if (!value) {
+                return obj;
+            }
+            if (obj[key]) {
+                obj[key] = [obj[key], value].join(",");
+            }
+            else {
+                obj[key] = value;
+            }
+            return obj;
+        }
+        this.headers = merge(this.headers, "Upstash-Telemetry-Runtime", telemetry.runtime);
+        this.headers = merge(this.headers, "Upstash-Telemetry-Platform", telemetry.platform);
+        this.headers = merge(this.headers, "Upstash-Telemetry-Sdk", telemetry.sdk);
+    }
     async request(req) {
         const requestOptions = {
+            cache: this.options.cache,
             method: "POST",
             headers: this.headers,
             body: JSON.stringify(req.body),
@@ -78,43 +103,61 @@ class HttpClient {
         }
         const body = (await res.json());
         if (!res.ok) {
-            throw new error_js_1.UpstashError(body.error);
+            throw new error_js_1.UpstashError(`${body.error}, command was: ${JSON.stringify(req.body)}`);
         }
-        return Array.isArray(body) ? body.map(decode) : decode(body);
+        if (this.options?.responseEncoding === "base64") {
+            if (Array.isArray(body)) {
+                return body.map(({ result, error }) => ({
+                    result: decode(result),
+                    error,
+                }));
+            }
+            const result = decode(body.result);
+            return { result, error: body.error };
+        }
+        return body;
     }
 }
 exports.HttpClient = HttpClient;
 function base64decode(b64) {
     let dec = "";
     try {
-        dec = atob(b64).split("").map((c) => "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2)).join("");
-    }
-    catch (e) {
-        console.warn(`Unable to decode base64 [${dec}]: ${e.message}`);
-        return dec;
-    }
-    try {
-        return decodeURIComponent(dec);
+        /**
+         * Using only atob() is not enough because it doesn't work with unicode characters
+         */
+        const binString = atob(b64);
+        const size = binString.length;
+        const bytes = new Uint8Array(size);
+        for (let i = 0; i < size; i++) {
+            bytes[i] = binString.charCodeAt(i);
+        }
+        dec = new TextDecoder().decode(bytes);
     }
-    catch (e) {
-        console.warn(`Unable to decode URI [${dec}]: ${e.message}`);
-        return dec;
+    catch {
+        dec = b64;
     }
+    return dec;
+    // try {
+    //   return decodeURIComponent(dec);
+    // } catch {
+    //   return dec;
+    // }
 }
 function decode(raw) {
     let result = undefined;
-    switch (typeof raw.result) {
+    switch (typeof raw) {
         case "undefined":
             return raw;
-        case "number":
-            result = raw.result;
+        case "number": {
+            result = raw;
             break;
-        case "object":
-            if (Array.isArray(raw.result)) {
-                result = raw.result.map((v) => typeof v === "string"
+        }
+        case "object": {
+            if (Array.isArray(raw)) {
+                result = raw.map((v) => typeof v === "string"
                     ? base64decode(v)
                     : Array.isArray(v)
-                        ? v.map(base64decode)
+                        ? v.map(decode)
                         : v);
             }
             else {
@@ -123,11 +166,13 @@ function decode(raw) {
                 result = null;
             }
             break;
-        case "string":
-            result = raw.result === "OK" ? "OK" : base64decode(raw.result);
+        }
+        case "string": {
+            result = raw === "OK" ? "OK" : base64decode(raw);
             break;
+        }
         default:
             break;
     }
-    return { result, error: raw.error };
+    return result;
 }