@upstash/redis 1.0.0-alpha.1 → 1.0.0-alpha.2

package/dist/index.js

@@ -38,13 +38,10 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
 // pkg/index.ts
 var pkg_exports = {};
 __export(pkg_exports, {
-  Redis: () => Redis,
+  Redis: () => Redis2,
   UpstashError: () => UpstashError
 });
 
-// pkg/http.ts
-var import_isomorphic_fetch = require("isomorphic-fetch");
-
 // pkg/error.ts
 var UpstashError = class extends Error {
   constructor(message) {
@@ -53,39 +50,6 @@ var UpstashError = class extends Error {
   }
 };
 
-// pkg/http.ts
-var HttpClient = class {
-  constructor(config) {
-    var _a;
-    this.baseUrl = config.baseUrl.replace(/\/$/, "");
-    this.headers = (_a = config.headers) != null ? _a : {};
-    this.options = config.options;
-  }
-  async request(method, req) {
-    var _a;
-    if (!req.path) {
-      req.path = [];
-    }
-    const headers = __spreadValues(__spreadValues({
-      "Content-Type": "application/json"
-    }, this.headers), req.headers);
-    const res = await fetch([this.baseUrl, ...req.path].join("/"), {
-      method,
-      headers,
-      body: JSON.stringify(req.body),
-      backend: (_a = this.options) == null ? void 0 : _a.backend
-    });
-    const body = await res.json();
-    if (!res.ok) {
-      throw new UpstashError(body.error);
-    }
-    return body;
-  }
-  async post(req) {
-    return await this.request("POST", req);
-  }
-};
-
 // pkg/util.ts
 function parseRecursive(obj) {
   return Array.isArray(obj) ? obj.map((o) => {
@@ -112,7 +76,7 @@ var Command = class {
     this.deserialize = (_a = opts == null ? void 0 : opts.deserialize) != null ? _a : parseResponse;
   }
   async exec(client) {
-    const { result, error } = await client.post({
+    const { result, error } = await client.request({
       body: this.command
     });
     if (error) {
@@ -1044,7 +1008,7 @@ var Pipeline = class {
     if (this.commands.length === 0) {
       throw new Error("Pipeline is empty");
     }
-    const res = await this.client.post({
+    const res = await this.client.request({
       path: ["pipeline"],
       body: Object.values(this.commands).map((c) => c.command)
     });
@@ -1384,39 +1348,8 @@ var Pipeline = class {
 
 // pkg/redis.ts
 var Redis = class {
-  constructor(config) {
-    this.client = new HttpClient({
-      baseUrl: config.url,
-      headers: {
-        authorization: `Bearer ${config.token}`
-      },
-      options: config.requestOptions
-    });
-  }
-  static fromEnv() {
-    if (typeof (process == null ? void 0 : process.env) === "undefined") {
-      throw new Error("Unable to get environment variables, `process.env` is undefined. If you are deploying to cloudflare, please use `fromCloudflareEnv()` instead");
-    }
-    const url = process.env["UPSTASH_REDIS_REST_URL"];
-    if (!url) {
-      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_URL`");
-    }
-    const token = process.env["UPSTASH_REDIS_REST_TOKEN"];
-    if (!token) {
-      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
-    }
-    return new Redis({ url, token });
-  }
-  static fromCloudflareEnv() {
-    const url = UPSTASH_REDIS_REST_URL;
-    const token = UPSTASH_REDIS_REST_TOKEN;
-    if (!url) {
-      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_URL`");
-    }
-    if (!token) {
-      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
-    }
-    return new Redis({ url, token });
+  constructor(client) {
+    this.client = client;
   }
   pipeline() {
     return new Pipeline(this.client);
@@ -1746,6 +1679,63 @@ var Redis = class {
     return new ZUnionStoreCommand(...args).exec(this.client);
   }
 };
+
+// pkg/http.ts
+var import_isomorphic_fetch = require("isomorphic-fetch");
+var HttpClient = class {
+  constructor(config) {
+    this.baseUrl = config.baseUrl.replace(/\/$/, "");
+    this.headers = __spreadValues({
+      "Content-Type": "application/json"
+    }, config.headers);
+    this.options = config.options;
+  }
+  async request(req) {
+    var _a;
+    if (!req.path) {
+      req.path = [];
+    }
+    const res = await fetch([this.baseUrl, ...req.path].join("/"), {
+      method: "POST",
+      headers: this.headers,
+      body: JSON.stringify(req.body),
+      backend: (_a = this.options) == null ? void 0 : _a.backend
+    });
+    const body = await res.json();
+    if (!res.ok) {
+      throw new UpstashError(body.error);
+    }
+    return body;
+  }
+};
+
+// pkg/nodejs.ts
+var import_isomorphic_fetch2 = require("isomorphic-fetch");
+var Redis2 = class extends Redis {
+  constructor(config) {
+    const client = new HttpClient({
+      baseUrl: config.url,
+      headers: {
+        authorization: `Bearer ${config.token}`
+      }
+    });
+    super(client);
+  }
+  static fromEnv() {
+    if (typeof (process == null ? void 0 : process.env) === "undefined") {
+      throw new Error("Unable to get environment variables, `process.env` is undefined. If you are deploying to cloudflare, please use `Redis.onCloudflare()` instead");
+    }
+    const url = process.env["UPSTASH_REDIS_REST_URL"];
+    if (!url) {
+      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_URL`");
+    }
+    const token = process.env["UPSTASH_REDIS_REST_TOKEN"];
+    if (!token) {
+      throw new Error("Unable to find environment variable: `UPSTASH_REDIS_REST_TOKEN`");
+    }
+    return new Redis2({ url, token });
+  }
+};
 module.exports = __toCommonJS(pkg_exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {