@upstash/redis 0.0.0-ci.b1b216d3-20230414 → 0.0.0-ci.b3f07153-20231018

package/esm/pkg/commands/geo_add.js

@@ -0,0 +1,27 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+export class GeoAddCommand extends Command {
+    constructor([key, arg1, ...arg2], opts) {
+        const command = ["geoadd", key];
+        if ("nx" in arg1 && arg1.nx) {
+            command.push("nx");
+        }
+        else if ("xx" in arg1 && arg1.xx) {
+            command.push("xx");
+        }
+        if ("ch" in arg1 && arg1.ch) {
+            command.push("ch");
+        }
+        if ("latitude" in arg1 && arg1.latitude) {
+            command.push(arg1.longitude, arg1.latitude, arg1.member);
+        }
+        command.push(...arg2.flatMap(({ latitude, longitude, member }) => [
+            longitude,
+            latitude,
+            member,
+        ]));
+        super(command, opts);
+    }
+}

package/esm/pkg/commands/geo_dist.js

@@ -0,0 +1,11 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/geodist
+ */
+export class GeoDistCommand extends Command {
+    constructor([key, member1, member2, unit = "M"], opts) {
+        const command = ["GEODIST", key];
+        command.push(member1, member2, unit);
+        super(command, opts);
+    }
+}

package/esm/pkg/commands/hgetall.js

@@ -8,7 +8,15 @@ function deserialize(result) {
         const key = result.shift();
         const value = result.shift();
         try {
-            obj[key] = JSON.parse(value);
+            // handle unsafe integer
+            const valueIsNumberAndNotSafeInteger = !isNaN(Number(value)) &&
+                !Number.isSafeInteger(value);
+            if (valueIsNumberAndNotSafeInteger) {
+                obj[key] = value;
+            }
+            else {
+                obj[key] = JSON.parse(value);
+            }
         }
         catch {
             obj[key] = value;

package/esm/pkg/commands/mod.js

@@ -15,6 +15,8 @@ export * from "./expire.js";
 export * from "./expireat.js";
 export * from "./flushall.js";
 export * from "./flushdb.js";
+export * from "./geo_add.js";
+export * from "./geo_dist.js";
 export * from "./get.js";
 export * from "./getbit.js";
 export * from "./getdel.js";
@@ -137,4 +139,7 @@ export * from "./zremrangebyscore.js";
 export * from "./zrevrank.js";
 export * from "./zscan.js";
 export * from "./zscore.js";
+export * from "./zunion.js";
 export * from "./zunionstore.js";
+export * from "./xadd.js";
+export * from "./xrange.js";

package/esm/pkg/commands/set.js

@@ -28,7 +28,7 @@ export class SetCommand extends 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/esm/pkg/commands/xadd.js

@@ -0,0 +1,26 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/xadd
+ */
+export class XAddCommand extends 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);
+    }
+}

package/esm/pkg/commands/xrange.js

@@ -0,0 +1,36 @@
+import { Command } from "./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;
+}
+export class XRangeCommand extends 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,
+        });
+    }
+}

package/esm/pkg/commands/zunion.js

@@ -0,0 +1,30 @@
+import { Command } from "./command.js";
+/**
+ * @see https://redis.io/commands/zunion
+ */
+export class ZUnionCommand extends 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);
+    }
+}

package/esm/pkg/http.js

@@ -100,10 +100,17 @@ export class HttpClient {
         }
         const body = (await res.json());
         if (!res.ok) {
-            throw new UpstashError(body.error);
+            throw new UpstashError(`${body.error}, command was: ${JSON.stringify(req.body)}`);
         }
         if (this.options?.responseEncoding === "base64") {
-            return Array.isArray(body) ? body.map(decode) : decode(body);
+            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;
     }
@@ -134,19 +141,19 @@ function base64decode(b64) {
 }
 function decode(raw) {
     let result = undefined;
-    switch (typeof raw.result) {
+    switch (typeof raw) {
         case "undefined":
             return raw;
         case "number": {
-            result = raw.result;
+            result = raw;
             break;
         }
         case "object": {
-            if (Array.isArray(raw.result)) {
-                result = raw.result.map((v) => typeof v === "string"
+            if (Array.isArray(raw)) {
+                result = raw.map((v) => typeof v === "string"
                     ? base64decode(v)
                     : Array.isArray(v)
-                        ? v.map(base64decode)
+                        ? v.map(decode)
                         : v);
             }
             else {
@@ -157,11 +164,11 @@ function decode(raw) {
             break;
         }
         case "string": {
-            result = raw.result === "OK" ? "OK" : base64decode(raw.result);
+            result = raw === "OK" ? "OK" : base64decode(raw);
             break;
         }
         default:
             break;
     }
-    return { result, error: raw.error };
+    return result;
 }

package/esm/pkg/pipeline.js

@@ -1,4 +1,4 @@
-import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
+import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GeoAddCommand, GeoDistCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { UpstashError } from "./error.js";
 import { ZMScoreCommand } from "./commands/zmscore.js";
 import { HRandFieldCommand } from "./commands/hrandfield.js";
@@ -31,7 +31,7 @@ import { ZDiffStoreCommand } from "./commands/zdiffstore.js";
  * const res = await p.set("key","value").get("key").exec()
  * ```
  *
- * It's not possible to infer correct types with a dynamic pipeline, so you can
+ * Return types are inferred if all commands are chained, but you can still
  * override the response type manually:
  * ```ts
  *  redis.pipeline()
@@ -72,9 +72,11 @@ export class Pipeline {
          *
          * Returns an array with the results of all pipelined commands.
          *
-         * You can define a return type manually to make working in typescript easier
+         * If all commands are statically chained from start to finish, types are inferred. You can still define a return type manually if necessary though:
          * ```ts
-         * redis.pipeline().get("key").exec<[{ greeting: string }]>()
+         * const p = redis.pipeline()
+         * p.get("key")
+         * const result = p.exec<[{ greeting: string }]>()
          * ```
          */
         Object.defineProperty(this, "exec", {
@@ -1183,24 +1185,38 @@ export class Pipeline {
             writable: true,
             value: (...args) => this.chain(new ZUnionStoreCommand(args, this.commandOptions))
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => this.chain(new ZUnionCommand(args, this.commandOptions))
+        });
         this.client = opts.client;
-        this.commands = [];
+        this.commands = []; // the TCommands generic in the class definition is only used for carrying through chained command types and should never be explicitly set when instantiating the class
         this.commandOptions = opts.commandOptions;
         this.multiExec = opts.multiExec ?? false;
     }
     /**
-     * Pushes a command into the pipelien and returns a chainable instance of the
+     * Returns the length of pipeline before the execution
+     */
+    length() {
+        return this.commands.length;
+    }
+    /**
+     * Pushes a command into the pipeline and returns a chainable instance of the
      * pipeline
      */
     chain(command) {
         this.commands.push(command);
-        return this;
+        return this; // TS thinks we're returning Pipeline<[]> here, because we're not creating a new instance of the class, hence the cast
     }
     /**
      * @see https://redis.io/commands/?group=json
      */
     get json() {
-        // For some reason we needed to define the types manually, otherwise Deno wouldn't build it
         return {
             /**
              * @see https://redis.io/commands/json.arrappend
@@ -1238,6 +1254,14 @@ export class Pipeline {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => this.chain(new JsonForgetCommand(args, this.commandOptions)),
+            /**
+             * @see https://redis.io/commands/geoadd
+             */
+            geoadd: (...args) => new GeoAddCommand(args, this.commandOptions).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geodist
+             */
+            geodist: (...args) => new GeoDistCommand(args, this.commandOptions).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

package/esm/pkg/redis.js

@@ -1,4 +1,4 @@
-import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HRandFieldCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionStoreCommand, } from "./commands/mod.js";
+import { AppendCommand, BitCountCommand, BitOpCommand, BitPosCommand, DBSizeCommand, DecrByCommand, DecrCommand, DelCommand, EchoCommand, EvalCommand, EvalshaCommand, ExistsCommand, ExpireAtCommand, ExpireCommand, FlushAllCommand, FlushDBCommand, GeoAddCommand, GeoDistCommand, GetBitCommand, GetCommand, GetDelCommand, GetRangeCommand, GetSetCommand, HDelCommand, HExistsCommand, HGetAllCommand, HGetCommand, HIncrByCommand, HIncrByFloatCommand, HKeysCommand, HLenCommand, HMGetCommand, HMSetCommand, HRandFieldCommand, HScanCommand, HSetCommand, HSetNXCommand, HStrLenCommand, HValsCommand, IncrByCommand, IncrByFloatCommand, IncrCommand, JsonArrAppendCommand, JsonArrIndexCommand, JsonArrInsertCommand, JsonArrLenCommand, JsonArrPopCommand, JsonArrTrimCommand, JsonClearCommand, JsonDelCommand, JsonForgetCommand, JsonGetCommand, JsonMGetCommand, JsonNumIncrByCommand, JsonNumMultByCommand, JsonObjKeysCommand, JsonObjLenCommand, JsonRespCommand, JsonSetCommand, JsonStrAppendCommand, JsonStrLenCommand, JsonToggleCommand, JsonTypeCommand, KeysCommand, LIndexCommand, LInsertCommand, LLenCommand, LMoveCommand, LPopCommand, LPosCommand, LPushCommand, LPushXCommand, LRangeCommand, LRemCommand, LSetCommand, LTrimCommand, MGetCommand, MSetCommand, MSetNXCommand, PersistCommand, PExpireAtCommand, PExpireCommand, PingCommand, PSetEXCommand, PTtlCommand, PublishCommand, RandomKeyCommand, RenameCommand, RenameNXCommand, RPopCommand, RPushCommand, RPushXCommand, SAddCommand, ScanCommand, SCardCommand, ScriptExistsCommand, ScriptFlushCommand, ScriptLoadCommand, SDiffCommand, SDiffStoreCommand, SetBitCommand, SetCommand, SetExCommand, SetNxCommand, SetRangeCommand, SInterCommand, SInterStoreCommand, SIsMemberCommand, SMembersCommand, SMIsMemberCommand, SMoveCommand, SPopCommand, SRandMemberCommand, SRemCommand, SScanCommand, StrLenCommand, SUnionCommand, SUnionStoreCommand, TimeCommand, TouchCommand, TtlCommand, TypeCommand, UnlinkCommand, XAddCommand, XRangeCommand, ZAddCommand, ZCardCommand, ZCountCommand, ZIncrByCommand, ZInterStoreCommand, ZLexCountCommand, ZPopMaxCommand, ZPopMinCommand, ZRangeCommand, ZRankCommand, ZRemCommand, ZRemRangeByLexCommand, ZRemRangeByRankCommand, ZRemRangeByScoreCommand, ZRevRankCommand, ZScanCommand, ZScoreCommand, ZUnionCommand, ZUnionStoreCommand, } from "./commands/mod.js";
 import { Pipeline } from "./pipeline.js";
 import { Script } from "./script.js";
 import { ZMScoreCommand } from "./commands/zmscore.js";
@@ -1005,6 +1005,24 @@ export class Redis {
             writable: true,
             value: (...args) => new UnlinkCommand(args, this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/xadd
+         */
+        Object.defineProperty(this, "xadd", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new XAddCommand(args, this.opts).exec(this.client)
+        });
+        /**
+         * @see https://redis.io/commands/xrange
+         */
+        Object.defineProperty(this, "xrange", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new XRangeCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zadd
          */
@@ -1181,6 +1199,15 @@ export class Redis {
             writable: true,
             value: (key, member) => new ZScoreCommand([key, member], this.opts).exec(this.client)
         });
+        /**
+         * @see https://redis.io/commands/zunion
+         */
+        Object.defineProperty(this, "zunion", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (...args) => new ZUnionCommand(args, this.opts).exec(this.client)
+        });
         /**
          * @see https://redis.io/commands/zunionstore
          */
@@ -1232,6 +1259,14 @@ export class Redis {
              * @see https://redis.io/commands/json.forget
              */
             forget: (...args) => new JsonForgetCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geoadd
+             */
+            geoadd: (...args) => new GeoAddCommand(args, this.opts).exec(this.client),
+            /**
+             * @see https://redis.io/commands/geodist
+             */
+            geodist: (...args) => new GeoDistCommand(args, this.opts).exec(this.client),
             /**
              * @see https://redis.io/commands/json.get
              */

package/esm/platforms/nodejs.js

@@ -35,14 +35,16 @@ export class Redis extends core.Redis {
             headers: { authorization: `Bearer ${configOrRequester.token}` },
             agent: configOrRequester.agent,
             responseEncoding: configOrRequester.responseEncoding,
-            cache: "no-store",
+            cache: configOrRequester.cache || "no-store",
         });
         super(client, {
             automaticDeserialization: configOrRequester.automaticDeserialization,
             enableTelemetry: !process.env.UPSTASH_DISABLE_TELEMETRY,
         });
         this.addTelemetry({
-            runtime: `node@${process.version}`,
+            runtime: typeof EdgeRuntime === "string"
+                ? "edge-light"
+                : `node@${process.version}`,
             platform: process.env.VERCEL
                 ? "vercel"
                 : process.env.AWS_REGION

package/esm/version.js

@@ -1 +1 @@
-export const VERSION = "v0.0.0-ci.b1b216d3-20230414";
+export const VERSION = "v0.0.0-ci.b3f07153-20231018";

package/package.json

@@ -3,7 +3,7 @@
   "main": "./script/platforms/nodejs.js",
   "types": "./types/platforms/nodejs.d.ts",
   "name": "@upstash/redis",
-  "version": "v0.0.0-ci.b1b216d3-20230414",
+  "version": "v0.0.0-ci.b3f07153-20231018",
   "description": "An HTTP/REST based Redis client built on top of Upstash REST API.",
   "repository": {
     "type": "git",
@@ -27,10 +27,18 @@
   },
   "typesVersions": {
     "*": {
-      "nodejs": "./types/platforms/nodejs.d.ts",
-      "cloudflare": "./types/platforms/cloudflare.d.ts",
-      "fastly": "./types/platforms/fastly.d.ts",
-      "with-fetch": "./types/platforms/node_with_fetch.d.ts"
+      "nodejs": [
+        "./types/platforms/nodejs.d.ts"
+      ],
+      "cloudflare": [
+        "./types/platforms/cloudflare.d.ts"
+      ],
+      "fastly": [
+        "./types/platforms/fastly.d.ts"
+      ],
+      "with-fetch": [
+        "./types/platforms/node_with_fetch.d.ts"
+      ]
     }
   },
   "exports": {

package/script/pkg/commands/geo_add.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeoAddCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/geoadd
+ */
+class GeoAddCommand extends command_js_1.Command {
+    constructor([key, arg1, ...arg2], opts) {
+        const command = ["geoadd", key];
+        if ("nx" in arg1 && arg1.nx) {
+            command.push("nx");
+        }
+        else if ("xx" in arg1 && arg1.xx) {
+            command.push("xx");
+        }
+        if ("ch" in arg1 && arg1.ch) {
+            command.push("ch");
+        }
+        if ("latitude" in arg1 && arg1.latitude) {
+            command.push(arg1.longitude, arg1.latitude, arg1.member);
+        }
+        command.push(...arg2.flatMap(({ latitude, longitude, member }) => [
+            longitude,
+            latitude,
+            member,
+        ]));
+        super(command, opts);
+    }
+}
+exports.GeoAddCommand = GeoAddCommand;

package/script/pkg/commands/geo_dist.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeoDistCommand = void 0;
+const command_js_1 = require("./command.js");
+/**
+ * @see https://redis.io/commands/geodist
+ */
+class GeoDistCommand extends command_js_1.Command {
+    constructor([key, member1, member2, unit = "M"], opts) {
+        const command = ["GEODIST", key];
+        command.push(member1, member2, unit);
+        super(command, opts);
+    }
+}
+exports.GeoDistCommand = GeoDistCommand;

package/script/pkg/commands/hgetall.js

@@ -11,7 +11,15 @@ function deserialize(result) {
         const key = result.shift();
         const value = result.shift();
         try {
-            obj[key] = JSON.parse(value);
+            // handle unsafe integer
+            const valueIsNumberAndNotSafeInteger = !isNaN(Number(value)) &&
+                !Number.isSafeInteger(value);
+            if (valueIsNumberAndNotSafeInteger) {
+                obj[key] = value;
+            }
+            else {
+                obj[key] = JSON.parse(value);
+            }
         }
         catch {
             obj[key] = value;

package/script/pkg/commands/mod.js

@@ -31,6 +31,8 @@ __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("./geo_dist.js"), exports);
 __exportStar(require("./get.js"), exports);
 __exportStar(require("./getbit.js"), exports);
 __exportStar(require("./getdel.js"), exports);
@@ -153,4 +155,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/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/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;