@upstash/redis 0.0.0-ci.ba685120 → 0.0.0-ci.baae64ab-20231010

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/lpos.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LPosCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/lpos
+ */
+class LPosCommand extends command_js_1.Command {
+    constructor(cmd, opts) {
+        const args = ["lpos", cmd[0], cmd[1]];
+        if (typeof cmd[2]?.rank === "number") {
+            args.push("rank", cmd[2].rank);
+        }
+        if (typeof cmd[2]?.count === "number") {
+            args.push("count", cmd[2].count);
+        }
+        if (typeof cmd[2]?.maxLen === "number") {
+            args.push("maxLen", cmd[2].maxLen);
+        }
+        super(args, opts);
+    }
+}
+exports.LPosCommand = LPosCommand;

package/script/pkg/commands/mod.js

@@ -33,6 +33,7 @@ __exportStar(require("./flushall.js"), exports);
 __exportStar(require("./flushdb.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 +46,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,11 +55,34 @@ __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);
 __exportStar(require("./lpushx.js"), exports);
 __exportStar(require("./lrange.js"), exports);
@@ -97,6 +122,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,3 +154,5 @@ __exportStar(require("./zrevrank.js"), exports);
 __exportStar(require("./zscan.js"), exports);
 __exportStar(require("./zscore.js"), exports);
 __exportStar(require("./zunionstore.js"), exports);
+__exportStar(require("./xadd.js"), exports);
+__exportStar(require("./xrange.js"), exports);

package/script/pkg/commands/scan.js

@@ -14,6 +14,9 @@ class ScanCommand extends command_js_1.Command {
         if (typeof opts?.count === "number") {
             command.push("count", opts.count);
         }
+        if (opts?.type && opts.type.length > 0) {
+            command.push("type", opts.type);
+        }
         super(command, cmdOpts);
     }
 }

package/script/pkg/commands/sdiffstore.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDiffStoreCommand = void 0;
 const command_js_1 = require("./command.js");
 /**
- * @see https://redis.io/commands/sdiffstpre
+ * @see https://redis.io/commands/sdiffstore
  */
 class SDiffStoreCommand extends command_js_1.Command {
     constructor(cmd, opts) {

package/script/pkg/commands/set.js

@@ -9,17 +9,29 @@ class SetCommand extends command_js_1.Command {
     constructor([key, value, opts], cmdOpts) {
         const command = ["set", key, value];
         if (opts) {
+            if ("nx" in opts && opts.nx) {
+                command.push("nx");
+            }
+            else if ("xx" in opts && opts.xx) {
+                command.push("xx");
+            }
+            if ("get" in opts && opts.get) {
+                command.push("get");
+            }
             if ("ex" in opts && typeof opts.ex === "number") {
                 command.push("ex", opts.ex);
             }
             else if ("px" in opts && typeof opts.px === "number") {
                 command.push("px", opts.px);
             }
-            if ("nx" in opts && opts.nx) {
-                command.push("nx");
+            else if ("exat" in opts && typeof opts.exat === "number") {
+                command.push("exat", opts.exat);
             }
-            else if ("xx" in opts && opts.xx) {
-                command.push("xx");
+            else if ("pxat" in opts && typeof opts.pxat === "number") {
+                command.push("pxat", opts.pxat);
+            }
+            else if ("keepTtl" in opts && 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,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.XRangeCommand = void 0;
+const command_js_1 = require("./command.js");
+function deserialize(result) {
+    if (result.length === 0) {
+        return {};
+    }
+    const obj = {};
+    while (result.length >= 2) {
+        const streamId = result.shift();
+        const entries = result.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[0]),
+            ...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/zmscore.js

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

package/script/pkg/commands/zrange.js

@@ -15,6 +15,12 @@ class ZRangeCommand extends command_js_1.Command {
         if (opts?.byLex) {
             command.push("bylex");
         }
+        if (opts?.rev) {
+            command.push("rev");
+        }
+        if (typeof opts?.count !== "undefined" && typeof opts?.offset !== "undefined") {
+            command.push("limit", opts.offset, opts.count);
+        }
         if (opts?.withScores) {
             command.push("withscores");
         }

package/script/pkg/http.js

@@ -28,9 +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", ...config.headers };
-        this.options = { backend: config.options?.backend };
+        this.headers = {
+            "Content-Type": "application/json",
+            ...config.headers,
+        };
+        if (this.options.responseEncoding === "base64") {
+            this.headers["Upstash-Encoding"] = "base64";
+        }
         if (typeof config?.retry === "boolean" && config?.retry === false) {
             this.retry = {
                 attempts: 1,
@@ -45,12 +56,31 @@ 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),
             keepalive: true,
+            agent: this.options?.agent,
             /**
              * Fastly specific
              */
@@ -73,9 +103,76 @@ 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)}`);
+        }
+        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 {
+        /**
+         * 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 {
+        dec = b64;
+    }
+    return dec;
+    // try {
+    //   return decodeURIComponent(dec);
+    // } catch {
+    //   return dec;
+    // }
+}
+function decode(raw) {
+    let result = undefined;
+    switch (typeof raw) {
+        case "undefined":
+            return raw;
+        case "number": {
+            result = raw;
+            break;
+        }
+        case "object": {
+            if (Array.isArray(raw)) {
+                result = raw.map((v) => typeof v === "string"
+                    ? base64decode(v)
+                    : Array.isArray(v)
+                        ? v.map(decode)
+                        : v);
+            }
+            else {
+                // If it's not an array it must be null
+                // Apparently null is an object in javascript
+                result = null;
+            }
+            break;
+        }
+        case "string": {
+            result = raw === "OK" ? "OK" : base64decode(raw);
+            break;
+        }
+        default:
+            break;
+    }
+    return result;
+}