alchemy 0.46.0 → 0.46.1

package/bin/alchemy.mjs

@@ -112,7 +112,7 @@ var require_utils_BhNVZA_c = __commonJS({
     function identity3(it) {
       return it;
     }
-    function assert(condition, msg = "no additional info") {
+    function assert2(condition, msg = "no additional info") {
       if (!condition) throw new Error(`AssertionError: ${msg}`);
     }
     function sleep(ms = 0) {
@@ -155,7 +155,7 @@ var require_utils_BhNVZA_c = __commonJS({
     Object.defineProperty(exports2, "assert", {
       enumerable: true,
       get: function() {
-        return assert;
+        return assert2;
       }
     });
     Object.defineProperty(exports2, "identity", {
@@ -5208,11 +5208,11 @@ var require_util = __commonJS({
     exports2.assertNotEqual = assertNotEqual;
     exports2.assertIs = assertIs;
     exports2.assertNever = assertNever;
-    exports2.assert = assert;
+    exports2.assert = assert2;
     exports2.getEnumValues = getEnumValues;
     exports2.joinValues = joinValues;
     exports2.jsonStringifyReplacer = jsonStringifyReplacer;
-    exports2.cached = cached;
+    exports2.cached = cached2;
     exports2.nullish = nullish;
     exports2.cleanRegex = cleanRegex;
     exports2.floatSafeRemainder = floatSafeRemainder2;
@@ -5256,7 +5256,7 @@ var require_util = __commonJS({
     function assertNever(_x) {
       throw new Error();
     }
-    function assert(_3) {
+    function assert2(_3) {
     }
     function getEnumValues(entries) {
       const numericValues = Object.values(entries).filter((v2) => typeof v2 === "number");
@@ -5271,7 +5271,7 @@ var require_util = __commonJS({
         return value.toString();
       return value;
     }
-    function cached(getter) {
+    function cached2(getter) {
       const set = false;
       return {
         get value() {
@@ -5360,7 +5360,7 @@ var require_util = __commonJS({
     function isObject2(data) {
       return typeof data === "object" && data !== null && !Array.isArray(data);
     }
-    exports2.allowsEval = cached(() => {
+    exports2.allowsEval = cached2(() => {
       if (typeof navigator !== "undefined" && navigator?.userAgent?.includes("Cloudflare")) {
         return false;
       }
@@ -20960,10 +20960,10 @@ var require_zod = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.z = void 0;
-    var z2 = __importStar(require_external());
-    exports2.z = z2;
+    var z3 = __importStar(require_external());
+    exports2.z = z3;
     __exportStar(require_external(), exports2);
-    exports2.default = z2;
+    exports2.default = z3;
   }
 });
 
@@ -25361,10 +25361,10 @@ var require_classic = __commonJS({
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.z = void 0;
-    var z2 = __importStar(require_external2());
-    exports2.z = z2;
+    var z3 = __importStar(require_external2());
+    exports2.z = z3;
     __exportStar(require_external2(), exports2);
-    exports2.default = z2;
+    exports2.default = z3;
   }
 });
 
@@ -36648,7 +36648,7 @@ var require_toml = __commonJS({
 });
 
 // bin/alchemy.ts
-var import_trpc_cli2 = __toESM(require_dist2(), 1);
+var import_trpc_cli3 = __toESM(require_dist2(), 1);
 
 // ../node_modules/@clack/prompts/dist/index.mjs
 import { stripVTControlCharacters as S2 } from "node:util";
@@ -37255,8 +37255,8 @@ var Y2 = ({ indicator: t2 = "dots" } = {}) => {
       if (i2) process.stdout.write(`${I2}  ${l2}...`);
       else if (t2 === "timer") process.stdout.write(`${I2}  ${l2} ${O2(g2)}`);
       else {
-        const z2 = ".".repeat(Math.floor(w2)).slice(0, 3);
-        process.stdout.write(`${I2}  ${l2}${z2}`);
+        const z3 = ".".repeat(Math.floor(w2)).slice(0, 3);
+        process.stdout.write(`${I2}  ${l2}${z3}`);
       }
       h3 = h3 + 1 < n2.length ? h3 + 1 : 0, w2 = w2 < n2.length ? w2 + 0.125 : 0;
     }, r2);
@@ -49673,6 +49673,7 @@ var dev = t.procedure.meta({
 
 // bin/commands/login.ts
 var import_picocolors6 = __toESM(require_picocolors(), 1);
+var import_trpc_cli2 = __toESM(require_dist2(), 1);
 
 // ../node_modules/kleur/index.mjs
 var FORCE_COLOR;
@@ -50039,6 +50040,9 @@ var ResultAsync = class _ResultAsync {
     });
   }
 };
+function okAsync(value) {
+  return new ResultAsync(Promise.resolve(new Ok(value)));
+}
 function errAsync(err2) {
   return new ResultAsync(Promise.resolve(new Err(err2)));
 }
@@ -50250,7 +50254,8 @@ var Err = class {
 };
 var fromThrowable = Result.fromThrowable;
 
-// src/cloudflare/auth-wrangler.ts
+// src/cloudflare/oauth.ts
+import assert from "node:assert";
 import crypto from "node:crypto";
 import fs15 from "node:fs/promises";
 import os2 from "node:os";
@@ -50840,9 +50845,9 @@ function memoize(fn, keyFn = defaultKeyFn) {
   const cache = /* @__PURE__ */ new Map();
   return async (...args) => {
     const key = keyFn(...args);
-    const cached = cache.get(key);
-    if (cached) {
-      return await cached;
+    const cached2 = cache.get(key);
+    if (cached2) {
+      return await cached2;
     }
     const promise = fn(...args).catch((error) => {
       cache.delete(key);
@@ -50852,19 +50857,6 @@ function memoize(fn, keyFn = defaultKeyFn) {
     return await promise;
   };
 }
-function memoizeSync(fn, keyFn = defaultKeyFn) {
-  const cache = /* @__PURE__ */ new Map();
-  return (...args) => {
-    const key = keyFn(...args);
-    const cached = cache.get(key);
-    if (cached) {
-      return cached;
-    }
-    const result = fn(...args);
-    cache.set(key, result);
-    return result;
-  };
-}
 var defaultKeyFn = (...args) => {
   return createHash("sha256").update(JSON.stringify(args)).digest("hex");
 };
@@ -50885,9 +50877,9 @@ var singleFlight = (fn) => {
   const results = /* @__PURE__ */ new Map();
   return (...args) => {
     const key = JSON.stringify(args ?? []);
-    const cached = results.get(key);
-    if (cached) {
-      return cached;
+    const cached2 = results.get(key);
+    if (cached2) {
+      return cached2;
     }
     const result = fn(...args);
     results.set(key, result);
@@ -50896,6 +50888,27 @@ var singleFlight = (fn) => {
     });
   };
 };
+var HTTPError = class extends Error {
+  constructor(message, status) {
+    super(message);
+    this.status = status;
+  }
+};
+var fetchResult = (url, init2 = {}) => {
+  return ResultAsync.fromPromise(
+    fetch(url, init2),
+    () => new HTTPError(`Failed to ${init2.method ?? "GET"} ${url}`, 0)
+  );
+};
+var fetchJSON = (url, init2 = {}) => {
+  return fetchResult(url, init2).andThen(decodeJSON);
+};
+var decodeJSON = (response) => {
+  return ResultAsync.fromPromise(
+    response.json(),
+    () => new HTTPError("Failed to decode JSON", response.status)
+  ).andThen((json) => response.ok ? ok(json) : err(json));
+};
 
 // src/util/xdg-paths.ts
 import { join as join4 } from "node:path";
@@ -50935,10 +50948,9 @@ function createXdgAppPaths(appName) {
   };
 }
 
-// src/cloudflare/auth-wrangler.ts
+// src/cloudflare/oauth.ts
 var CLIENT_ID = "54d11594-84e4-41aa-b438-e81b8fa78ee7";
 var REDIRECT_URI = "http://localhost:8976/oauth/callback";
-var ALCHEMY_BASE_URL = "https://alchemy.run";
 var DEFAULT_SCOPES = [
   "account:read",
   "user:read",
@@ -50958,6 +50970,25 @@ var DEFAULT_SCOPES = [
   "containers:write",
   "cloudchamber:write"
 ];
+var ALCHEMY_BASE_URL = "https://alchemy.run";
+var cached;
+var getRefreshedWranglerConfig = singleFlight(
+  () => readWranglerConfig().andThen((config) => {
+    if (config.expiration_time.getTime() > Date.now() + 10 * 1e3) {
+      return ok(config);
+    }
+    return fetchToken({
+      grant_type: "refresh_token",
+      refresh_token: config.refresh_token,
+      client_id: CLIENT_ID
+    });
+  }).orElse((error) => {
+    if (isInteractive()) {
+      return wranglerLogin();
+    }
+    return err(error);
+  })
+);
 var getWranglerConfigPath = memoize(async () => {
   const xdgConfigDir = createXdgAppPaths(".wrangler").config();
   const legacyConfigDir = path13.join(os2.homedir(), ".wrangler");
@@ -50965,27 +50996,30 @@ var getWranglerConfigPath = memoize(async () => {
   return path13.join(configDir, "config", "default.toml");
 });
 var readWranglerConfig = () => {
-  return ResultAsync.fromSafePromise(getWranglerConfigPath()).andThen(
-    (path14) => ResultAsync.fromPromise(
-      fs15.readFile(path14, "utf-8").then(async (text) => {
-        const toml = await Promise.resolve().then(() => __toESM(require_toml(), 1));
-        return toml.parse(text.replace(/\r\n/g, "\n"));
-      }),
-      () => new Error("Failed to read Wrangler config.")
-    )
-  ).andThen((config) => {
-    if (typeof config.oauth_token !== "string" || typeof config.refresh_token !== "string" || !config.expiration_time || !Array.isArray(config.scopes)) {
-      return err(new Error("Invalid Wrangler config."));
-    }
-    return ok({
-      oauth_token: config.oauth_token,
-      refresh_token: config.refresh_token,
-      expiration_time: new Date(config.expiration_time),
-      scopes: Array.from(config.scopes)
-    });
-  });
+  if (cached) {
+    return okAsync(cached);
+  }
+  return ResultAsync.fromPromise(
+    getWranglerConfigPath().then(async (path14) => {
+      const text = await fs15.readFile(path14, "utf-8");
+      const toml = await Promise.resolve().then(() => __toESM(require_toml(), 1));
+      const config = toml.parse(text.replace(/\r\n/g, "\n"));
+      assert(typeof config.oauth_token === "string");
+      assert(typeof config.refresh_token === "string");
+      assert(config.expiration_time instanceof Date);
+      assert(Array.isArray(config.scopes));
+      return {
+        oauth_token: config.oauth_token,
+        refresh_token: config.refresh_token,
+        expiration_time: new Date(config.expiration_time),
+        scopes: config.scopes
+      };
+    }),
+    () => new Error("Cloudflare credentials are missing or invalid.")
+  );
 };
 var writeWranglerConfig = (config) => {
+  cached = config;
   return ResultAsync.fromSafePromise(getWranglerConfigPath()).map(
     async (configPath) => {
       const toml = await Promise.resolve().then(() => __toESM(require_toml(), 1));
@@ -51001,98 +51035,6 @@ var writeWranglerConfig = (config) => {
     }
   );
 };
-var fetchToken = (body) => {
-  return ResultAsync.fromPromise(
-    fetch("https://dash.cloudflare.com/oauth2/token", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      body: new URLSearchParams(body)
-    }),
-    () => new OAuthError({
-      error: "fetch_error",
-      error_description: "Failed to fetch OAuth token.",
-      status_code: 0
-    })
-  ).andThen(
-    (res) => ResultAsync.fromPromise(
-      res.json(),
-      () => new OAuthError({
-        error: "invalid_response",
-        error_description: "The server returned an invalid response.",
-        status_code: res.status
-      })
-    ).andThen(
-      (json) => res.ok ? ok(json) : err(new OAuthError(json))
-    )
-  ).map(
-    (tokens) => ({
-      oauth_token: tokens.access_token,
-      refresh_token: tokens.refresh_token,
-      expiration_time: new Date(Date.now() + tokens.expires_in * 1e3),
-      scopes: tokens.scope.split(" ")
-    })
-  ).andTee((config) => writeWranglerConfig(config));
-};
-var getRefreshedWranglerConfig = singleFlight(
-  memoizeSync(
-    () => {
-      return readWranglerConfig().andThen((config) => {
-        if (config.expiration_time.getTime() > Date.now() + 10 * 1e3) {
-          return ok(config);
-        }
-        return fetchToken({
-          grant_type: "refresh_token",
-          refresh_token: config.refresh_token,
-          client_id: CLIENT_ID
-        });
-      }).orElse((error) => {
-        if (isInteractive()) {
-          return wranglerLogin();
-        }
-        if (error instanceof OAuthError) {
-          return err(error);
-        }
-        return ok(null);
-      });
-    },
-    () => Math.floor(Date.now() / 5e3).toString()
-  )
-);
-var isInteractive = () => {
-  return process.stdin.isTTY && process.stdout.isTTY && !process.env.CI;
-};
-var generateAuthorizationURL = (scopes) => {
-  const state = crypto.randomBytes(32).toString("base64url");
-  const verifier = crypto.randomBytes(96).toString("base64url");
-  const challenge = crypto.createHash("sha256").update(verifier).digest("base64url");
-  const url = new URL("https://dash.cloudflare.com/oauth2/auth");
-  url.search = new URLSearchParams({
-    response_type: "code",
-    client_id: CLIENT_ID,
-    redirect_uri: REDIRECT_URI,
-    scope: [...scopes, "offline_access"].join(" "),
-    state,
-    code_challenge: challenge,
-    code_challenge_method: "S256"
-  }).toString();
-  return { url: url.toString(), state, verifier };
-};
-var OAuthError = class extends Error {
-  error;
-  error_verbose;
-  error_hint;
-  status_code;
-  constructor(params) {
-    console.dir(params, { depth: null });
-    super(params.error_description);
-    this.error = params.error;
-    this.error_verbose = params.error_verbose;
-    this.error_hint = params.error_hint;
-    this.status_code = params.status_code;
-  }
-};
 var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
   const challenge = generateAuthorizationURL(scopes);
   log(
@@ -51107,6 +51049,9 @@ var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
   );
   open_default(challenge.url);
   const { result, ok: ok2, err: err2 } = detached();
+  const renderResponse = async (type) => {
+    return Response.redirect(`${ALCHEMY_BASE_URL}/auth/${type}`);
+  };
   const server = new HTTPServer({
     port: 8976,
     fetch: async (request) => {
@@ -51126,7 +51071,7 @@ var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
             status_code: 400
           })
         );
-        return Response.redirect(`${ALCHEMY_BASE_URL}/auth/error`);
+        return renderResponse("error");
       }
       if (!code || !state || state !== challenge.state) {
         err2(
@@ -51136,7 +51081,7 @@ var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
             status_code: 400
           })
         );
-        return Response.redirect(`${ALCHEMY_BASE_URL}/auth/error`);
+        return renderResponse("error");
       }
       const tokens = await fetchToken({
         grant_type: "authorization_code",
@@ -51147,10 +51092,10 @@ var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
       });
       if (tokens.isErr()) {
         err2(tokens.error);
-        return Response.redirect(`${ALCHEMY_BASE_URL}/auth/error`);
+        return renderResponse("error");
       }
       ok2(tokens.value);
-      return Response.redirect(`${ALCHEMY_BASE_URL}/auth/success`);
+      return renderResponse("success");
     }
   });
   const timeout = setTimeout(
@@ -51165,20 +51110,71 @@ var wranglerLogin = (scopes = DEFAULT_SCOPES, log = console.log) => {
     },
     1e3 * 60 * 5
   );
-  return ensure(result, async () => {
+  return ensure(result, () => {
     clearTimeout(timeout);
-    await server.stop();
+    void server.stop();
   });
 };
+var generateAuthorizationURL = (scopes) => {
+  const state = crypto.randomBytes(32).toString("base64url");
+  const verifier = crypto.randomBytes(96).toString("base64url");
+  const challenge = crypto.createHash("sha256").update(verifier).digest("base64url");
+  const url = new URL("https://dash.cloudflare.com/oauth2/auth");
+  url.search = new URLSearchParams({
+    response_type: "code",
+    client_id: CLIENT_ID,
+    redirect_uri: "http://localhost:8976/oauth/callback",
+    scope: [...scopes, "offline_access"].join(" "),
+    state,
+    code_challenge: challenge,
+    code_challenge_method: "S256"
+  }).toString();
+  return { url: url.toString(), state, verifier };
+};
+var OAuthError = class extends Error {
+  constructor(params) {
+    super(
+      `Cloudflare authentication failed with error ${params.error} (${params.status_code}): ${params.error_description}`
+    );
+  }
+};
+var fetchToken = (body) => {
+  return fetchJSON(
+    "https://dash.cloudflare.com/oauth2/token",
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      body: new URLSearchParams(body)
+    }
+  ).map(
+    (tokens) => ({
+      oauth_token: tokens.access_token,
+      refresh_token: tokens.refresh_token,
+      expiration_time: new Date(Date.now() + tokens.expires_in * 1e3),
+      scopes: tokens.scope.split(" ")
+    })
+  ).mapErr(
+    (error) => error instanceof HTTPError ? new OAuthError({
+      error: "http_error",
+      error_description: error.message,
+      status_code: error.status
+    }) : new OAuthError(error)
+  ).andTee((config) => writeWranglerConfig(config));
+};
+var isInteractive = () => {
+  return process.stdin.isTTY && process.stdout.isTTY && !process.env.CI;
+};
 
 // bin/commands/login.ts
 var login = t.procedure.meta({
   description: "Login to Cloudflare"
 }).input(
-  zod_default.tuple([
-    zod_default.object({
-      scopes: zod_default.array(zod_default.string()).optional().default([]).describe("Cloudflare OAuth scopes to authorize"),
-      defaultScopes: zod_default.boolean().optional().default(true).describe(
+  import_trpc_cli2.zod.tuple([
+    import_trpc_cli2.zod.object({
+      scopes: import_trpc_cli2.zod.array(import_trpc_cli2.zod.string()).optional().default([]).describe("Cloudflare OAuth scopes to authorize"),
+      defaultScopes: import_trpc_cli2.zod.boolean().optional().default(true).describe(
         "Whether to include the default Wrangler scopes when authenticating"
       )
     })
@@ -51241,7 +51237,7 @@ var router = t.router({
   dev,
   run: run2
 });
-var cli = (0, import_trpc_cli2.createCli)({
+var cli = (0, import_trpc_cli3.createCli)({
   router,
   name: "alchemy",
   version: getPackageVersion(),

package/bin/commands/login.ts

@@ -1,10 +1,7 @@
 import { cancel, intro, log, outro } from "@clack/prompts";
 import pc from "picocolors";
-import z from "zod";
-import {
-  DEFAULT_SCOPES,
-  wranglerLogin,
-} from "../../src/cloudflare/auth-wrangler.ts";
+import { zod as z } from "trpc-cli";
+import { DEFAULT_SCOPES, wranglerLogin } from "../../src/cloudflare/oauth.ts";
 import { throwWithContext } from "../errors.ts";
 import { t } from "../trpc.ts";
 

package/lib/cloudflare/api.d.ts

@@ -29,22 +29,24 @@ export interface CloudflareApiOptions {
      */
     email?: string;
 }
+/** Used to propagate normalized auth options from a parent resource to `createCloudflareApi` in a child resource */
+export type InternalCloudflareApiOptions = CloudflareAuthOptions & {
+    baseUrl?: string;
+    accountId: string;
+};
 /**
  * Creates a CloudflareApi instance with automatic account ID discovery if not provided
  *
  * @param options API options
  * @returns Promise resolving to a CloudflareApi instance
  */
-export declare function createCloudflareApi(options?: Partial<CloudflareApiOptions>): Promise<CloudflareApi>;
+export declare function createCloudflareApi(options?: Partial<CloudflareApiOptions> | InternalCloudflareApiOptions): Promise<CloudflareApi>;
 /**
  * Cloudflare API client using raw fetch
  */
 export declare class CloudflareApi {
     readonly accountId: string;
     readonly baseUrl: string;
-    readonly apiKey: Secret | undefined;
-    readonly apiToken: Secret | undefined;
-    readonly email: string | undefined;
     readonly authOptions: CloudflareAuthOptions;
     /**
      * Create a new Cloudflare API client
@@ -53,8 +55,10 @@ export declare class CloudflareApi {
      *
      * @param options API options
      */
-    constructor(options: CloudflareApiOptions & {
+    constructor(options: {
+        baseUrl?: string;
         accountId: string;
+        authOptions: CloudflareAuthOptions;
     });
     /**
      * Make a fetch request to the Cloudflare API

package/lib/cloudflare/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/cloudflare/api.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,WAAW,CAAC;AAGnB;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,OAAO,CAAC,oBAAoB,CAAM,GAC1C,OAAO,CAAC,aAAa,CAAC,CAsCxB;AAED;;GAEG;AACH,qBAAa,aAAa;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,SAAgB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,SAAgB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,SAAgB,WAAW,EAAE,qBAAqB,CAAC;IAEnD;;;;;;OAMG;gBAED,OAAO,EAAE,oBAAoB,GAAG;QAC9B,SAAS,EAAE,MAAM,CAAC;KACnB;IAuBH;;;;;;OAMG;IACU,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IA8D3E;;OAEG;IACG,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIlE;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAGnE;;OAEG;IACG,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAUpB;;OAEG;IACG,GAAG,CACP,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAKpB;;OAEG;IACG,KAAK,CACT,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAQpB;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;CAGtE"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/cloudflare/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,WAAW,CAAC;AAGnB;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,oHAAoH;AACpH,MAAM,MAAM,4BAA4B,GAAG,qBAAqB,GAAG;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,OAAO,CAAC,oBAAoB,CAAC,GAAG,4BAAiC,GACzE,OAAO,CAAC,aAAa,CAAC,CAYxB;AAED;;GAEG;AACH,qBAAa,aAAa;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;IAChC,SAAgB,WAAW,EAAE,qBAAqB,CAAC;IAEnD;;;;;;OAMG;gBACS,OAAO,EAAE;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,qBAAqB,CAAC;KACpC;IAMD;;;;;;OAMG;IACU,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IA8D3E;;OAEG;IACG,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIlE;;OAEG;IACG,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAGnE;;OAEG;IACG,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAUpB;;OAEG;IACG,GAAG,CACP,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAKpB;;OAEG;IACG,KAAK,CACT,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,GAAG,EACT,IAAI,GAAE,WAAgB,GACrB,OAAO,CAAC,QAAQ,CAAC;IAQpB;;OAEG;IACG,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;CAGtE"}

package/lib/cloudflare/api.js

@@ -1,8 +1,7 @@
-import { alchemy } from "../alchemy.js";
 import { withExponentialBackoff } from "../util/retry.js";
 import { safeFetch } from "../util/safe-fetch.js";
-import { getCloudflareAuthHeaders, } from "./auth.js";
-import { getCloudflareAccounts, getUserEmailFromApiKey } from "./user.js";
+import { getCloudflareAuthHeaders, normalizeAuthOptions, } from "./auth.js";
+import { getCloudflareAccountId } from "./user.js";
 /**
  * Creates a CloudflareApi instance with automatic account ID discovery if not provided
  *
@@ -10,35 +9,15 @@ import { getCloudflareAccounts, getUserEmailFromApiKey } from "./user.js";
  * @returns Promise resolving to a CloudflareApi instance
  */
 export async function createCloudflareApi(options = {}) {
-    const apiKey = options.apiKey ??
-        (process.env.CLOUDFLARE_API_KEY
-            ? alchemy.secret(process.env.CLOUDFLARE_API_KEY)
-            : undefined);
-    const apiToken = options.apiToken ??
-        (process.env.CLOUDFLARE_API_TOKEN
-            ? alchemy.secret(process.env.CLOUDFLARE_API_TOKEN)
-            : undefined);
-    let email = options.email ?? process.env.CLOUDFLARE_EMAIL;
-    if (apiKey && !email) {
-        email = await getUserEmailFromApiKey(apiKey.unencrypted);
-    }
+    const authOptions = await normalizeAuthOptions(options);
     const accountId = options.accountId ??
         process.env.CLOUDFLARE_ACCOUNT_ID ??
         process.env.CF_ACCOUNT_ID ??
-        (await getCloudflareAccounts({
-            apiKey,
-            apiToken,
-            email,
-        }))[0]?.id;
-    if (accountId === undefined) {
-        throw new Error("Either accountId or CLOUDFLARE_ACCOUNT_ID must be provided");
-    }
+        (await getCloudflareAccountId(authOptions));
     return new CloudflareApi({
         baseUrl: options.baseUrl,
         accountId,
-        email,
-        apiKey,
-        apiToken,
+        authOptions,
     });
 }
 /**
@@ -47,9 +26,6 @@ export async function createCloudflareApi(options = {}) {
 export class CloudflareApi {
     accountId;
     baseUrl;
-    apiKey;
-    apiToken;
-    email;
     authOptions;
     /**
      * Create a new Cloudflare API client
@@ -61,23 +37,7 @@ export class CloudflareApi {
     constructor(options) {
         this.accountId = options.accountId;
         this.baseUrl = options.baseUrl ?? "https://api.cloudflare.com/client/v4";
-        this.apiKey = options.apiKey;
-        this.apiToken = options.apiToken;
-        this.email = options.email;
-        if (this.apiKey && this.apiToken) {
-            throw new Error("'apiKey' and 'apiToken' cannot both be provided");
-        }
-        else if (this.apiKey && !this.email) {
-            throw new Error("'email' must be provided if 'apiKey' is provided");
-        }
-        this.authOptions = this.apiKey
-            ? {
-                apiKey: this.apiKey,
-                email: this.email,
-            }
-            : {
-                apiToken: this.apiToken,
-            };
+        this.authOptions = options.authOptions;
     }
     /**
      * Make a fetch request to the Cloudflare API