alchemy 0.13.0 → 0.14.0

package/src/cloudflare/user.ts

@@ -0,0 +1,142 @@
+import { handleApiError } from "../neon/api-error.js";
+import type { Secret } from "../secret.js";
+import {
+  getCloudflareAuthHeaders,
+  type CloudflareAuthOptions,
+} from "./auth.js";
+
+export interface CloudflareAccount {
+  name: string;
+  id: string;
+  type: "standard" | "zero_rating" | "full_control";
+  settings: {
+    enforce_twofactor: boolean;
+    api_access_enabled: null;
+    access_approval_expiry: null;
+    abuse_contact_email: null;
+  };
+  legacy_flags: {
+    enterprise_zone_quota: {
+      maximum: number;
+      current: number;
+      available: number;
+    };
+  };
+}
+
+export interface CloudflareUserInfo {
+  apiToken?: Secret;
+  apiKey?: Secret;
+  email: string;
+  username: string;
+  accounts: CloudflareAccount[];
+  organizations: CloudflareOrganization[];
+  tokenPermissions: string[] | undefined;
+  first_name: string | null;
+  last_name: string | null;
+  telephone: string | null;
+  country: string | null;
+  zipcode: string | null;
+  two_factor_authentication_enabled: boolean;
+  two_factor_authentication_locked: boolean;
+  has_pro_zones: boolean;
+  has_business_zones: boolean;
+  has_enterprise_zones: boolean;
+  suspended: boolean;
+  betas: string[];
+}
+
+export interface CloudflareOrganization {
+  id: string;
+  name: string;
+  status: string;
+  permissions: string[];
+  roles: string[];
+}
+
+const userInfoCache: Record<string, CloudflareUserInfo> = {};
+
+export async function getCloudflareUserInfo(
+  options: CloudflareAuthOptions,
+): Promise<CloudflareUserInfo> {
+  const cacheKey = JSON.stringify({
+    apiKey: options.apiKey?.unencrypted,
+    apiToken: options.apiToken?.unencrypted,
+    email: options.email,
+  });
+  if (userInfoCache[cacheKey]) {
+    return userInfoCache[cacheKey];
+  }
+  const headers = await getCloudflareAuthHeaders(options);
+  const user = await fetch("https://api.cloudflare.com/client/v4/user", {
+    headers,
+  });
+  if (!user.ok) {
+    if (user.status === 403) {
+      throw new Error(
+        "Cloudflare authentication required. Did you forget to login with `wrangler login` or set CLOUDFLARE_API_TOKEN, CLOUDFLARE_API_KEY, or CLOUDFLARE_EMAIL, or CLOUDFLARE_API_KEY?",
+      );
+    }
+    await handleApiError(user, "get", "user", "user");
+  }
+  const accounts = await fetch(
+    "https://api.cloudflare.com/client/v4/accounts",
+    {
+      headers,
+    },
+  );
+  const userInfo: CloudflareUserInfo = {
+    ...((await user.json()) as any).result,
+    accounts: ((await accounts.json()) as any).result,
+  };
+  userInfoCache[cacheKey] = userInfo;
+  return userInfo;
+}
+
+const emailCache: Record<string, string> = {};
+
+export async function getUserEmailFromApiKey(apiKey: string): Promise<string> {
+  if (emailCache[apiKey]) {
+    return emailCache[apiKey];
+  }
+
+  try {
+    const baseUrl = "https://api.cloudflare.com/client/v4";
+
+    // Call the /user endpoint to get user information
+    const response = await fetch(`${baseUrl}/user`, {
+      headers: {
+        "Content-Type": "application/json",
+        "X-Auth-Key": apiKey,
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to get user information: ${response.status} ${response.statusText}`,
+      );
+    }
+
+    const data = (await response.json()) as {
+      success: boolean;
+      result: {
+        id: string;
+        email: string;
+        name: string;
+        [key: string]: any;
+      };
+    };
+
+    if (!data.success || !data.result || !data.result.email) {
+      throw new Error("Cloudflare API did not return valid user information");
+    }
+
+    emailCache[apiKey] = data.result.email;
+    return data.result.email;
+  } catch (error) {
+    console.error("Error retrieving email from Cloudflare API:", error);
+    throw new Error(
+      "Failed to automatically discover email for API Key authentication",
+    );
+  }
+}

package/src/cloudflare/worker.ts

@@ -1,7 +1,7 @@
 import * as crypto from "node:crypto";
 import * as fs from "node:fs/promises";
 import type { Context } from "../context.js";
-import { Bundle, type BundleProps } from "../esbuild/bundle.js";
+import type { BundleProps } from "../esbuild/bundle.js";
 import { Resource } from "../resource.js";
 import { getContentType } from "../util/content-type.js";
 import { withExponentialBackoff } from "../util/retry.js";
@@ -15,8 +15,7 @@ import {
 import type { Assets } from "./assets.js";
 import type { Bindings, WorkerBindingSpec } from "./bindings.js";
 import type { Bound } from "./bound.js";
-import { external } from "./bundle/external.js";
-import { nodejsHybridPlugin } from "./bundle/hybrid-nodejs-compat.js";
+import { bundleWorkerScript } from "./bundle/bundle-worker.js";
 import type { DurableObjectNamespace } from "./durable-object-namespace.js";
 import { type EventSource, isQueueEventSource } from "./event-source.js";
 import {
@@ -86,21 +85,31 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Path to the entry point file
+   *
    * Will be bundled using esbuild
+   *
    * One of script, entryPoint, or bundle must be provided
    */
   entrypoint?: string;
 
+  /**
+   * The project root directory used to resolve aliases.
+   *
+   * @default process.cwd()
+   */
+  projectRoot?: string;
+
   /**
    * Bundle options when using entryPoint
+   *
    * Ignored if bundle is provided
    */
   bundle?: Omit<BundleProps, "entryPoint">;
 
   /**
    * Module format for the worker script
-   * 'esm' - ECMAScript modules (default)
-   * 'cjs' - CommonJS modules
+   * - 'esm' - ECMAScript modules (default)
+   * - 'cjs' - CommonJS modules
    * @default 'esm'
    */
   format?: "esm" | "cjs";
@@ -119,6 +128,7 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Environment variables to attach to the worker
+   *
    * These will be converted to plain_text bindings
    */
   env?: {
@@ -127,6 +137,7 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Whether to enable a workers.dev URL for this worker
+   *
    * If true, the worker will be available at {name}.{subdomain}.workers.dev
    * @default false
    */
@@ -134,6 +145,7 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Observability configuration for the worker
+   *
    * Controls whether worker logs are enabled
    * @default { enabled: true }
    */
@@ -173,7 +185,9 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Cron expressions for the trigger.
+   *
    * Uses standard cron syntax (e.g. "0 0 * * *" for daily at midnight)
+   *
    * To clear all cron triggers, pass an empty array.
    *
    * @see https://developers.cloudflare.com/workers/configuration/cron-triggers/#examples
@@ -182,6 +196,7 @@ export interface WorkerProps<B extends Bindings = Bindings>
 
   /**
    * Event sources that this worker will consume.
+   *
    * Can include queues, streams, or other event sources.
    */
   eventSources?: EventSource[];
@@ -371,7 +386,12 @@ export const Worker = Resource(
 
     // Get the script content - either from props.script, or by bundling
     const scriptContent =
-      props.script ?? (await bundleWorkerScript(compatibilityDate, props));
+      props.script ??
+      (await bundleWorkerScript({
+        ...props,
+        compatibilityDate,
+        compatibilityFlags,
+      }));
 
     // Find any assets bindings
     const assetsBindings: { name: string; assets: Assets }[] = [];
@@ -929,51 +949,6 @@ async function assertWorkerDoesNotExist<B extends Bindings>(
   );
 }
 
-async function bundleWorkerScript<B extends Bindings>(
-  compatibilityDate: string,
-  props: WorkerProps<B>,
-) {
-  const bundle = await Bundle("bundle", {
-    entryPoint: props.entrypoint!,
-    format: props.format === "cjs" ? "cjs" : "esm", // Use the specified format or default to ESM
-    target: "esnext",
-    platform: "neutral",
-    minify: false,
-    ...(props.bundle || {}),
-    options: {
-      ...(props.bundle?.options || {}),
-      keepNames: true, // Important for Durable Object classes
-      loader: {
-        ".sql": "text",
-        ".json": "json",
-      },
-      plugins:
-        compatibilityDate >= "2024-09-23" &&
-        props.compatibilityFlags?.find((flag) => flag === "nodejs_compat")
-          ? [await nodejsHybridPlugin()]
-          : [],
-    },
-    external: [
-      ...external,
-      ...(props.bundle?.external ?? []),
-      ...(props.bundle?.options?.external ?? []),
-    ],
-  });
-
-  try {
-    if (bundle.content) {
-      return bundle.content;
-    }
-    if (bundle.path) {
-      return await fs.readFile(bundle.path, "utf-8");
-    }
-    throw new Error("Failed to create bundle");
-  } catch (error) {
-    console.error("Error reading bundle:", error);
-    throw new Error("Error reading bundle");
-  }
-}
-
 async function configureURL<B extends Bindings>(
   ctx: Context<Worker<B>>,
   api: CloudflareApi,

package/src/esbuild/bundle.ts

@@ -126,7 +126,6 @@ export const Bundle = Resource(
     props: Props,
   ): Promise<Bundle<Props>> {
     if (this.phase === "delete") {
-      console.log("delete", this.output.path);
       if (this.output.path) {
         try {
           await fs.rm(this.output.path, { force: true });

package/src/test/bun.ts

@@ -199,13 +199,8 @@ export function test(meta: ImportMeta, defaultOptions?: TestOptions): test {
             parent: scope,
           },
           async (scope) => {
-            try {
-              // Enter test scope since bun calls from different scope
-              await scope.run(() => fn(scope));
-            } catch (err) {
-              console.error(err);
-              throw err;
-            }
+            // Enter test scope since bun calls from different scope
+            await scope.run(() => fn(scope));
           },
         ),
       timeout,

package/lib/cloudflare/account-id.d.ts

@@ -1,6 +0,0 @@
-import { type CloudflareAuthOptions } from "./auth.js";
-export type CloudflareAccountId = string & {
-    readonly __brand: "CloudflareAccountId";
-};
-export declare function CloudflareAccountId(options: CloudflareAuthOptions): Promise<CloudflareAccountId>;
-//# sourceMappingURL=account-id.d.ts.map

package/lib/cloudflare/account-id.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"account-id.d.ts","sourceRoot":"","sources":["../../src/cloudflare/account-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAE9E,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG;IACzC,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC;CACzC,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,qBAAqB,GAC7B,OAAO,CAAC,mBAAmB,CAAC,CAG9B"}

package/lib/cloudflare/account-id.js

@@ -1,6 +0,0 @@
-import { getCloudflareUserInfo } from "./auth.js";
-export async function CloudflareAccountId(options) {
-    const userInfo = await getCloudflareUserInfo(options);
-    return userInfo.accounts[0].id;
-}
-//# sourceMappingURL=account-id.js.map

package/lib/cloudflare/account-id.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"account-id.js","sourceRoot":"","sources":["../../src/cloudflare/account-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAA8B,MAAM,WAAW,CAAC;AAM9E,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAA8B;IAE9B,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACtD,OAAO,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAyB,CAAC;AACxD,CAAC"}

package/lib/cloudflare/bundle/hybrid-nodejs-compat.d.ts

@@ -1,8 +0,0 @@
-import type { Plugin } from "esbuild";
-/**
- * ESBuild plugin to apply the unenv preset.
- *
- * @returns ESBuild plugin
- */
-export declare function nodejsHybridPlugin(): Promise<Plugin>;
-//# sourceMappingURL=hybrid-nodejs-compat.d.ts.map

package/lib/cloudflare/bundle/hybrid-nodejs-compat.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"hybrid-nodejs-compat.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/hybrid-nodejs-compat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,SAAS,CAAC;AAanD;;;;GAIG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CAkB1D"}

package/lib/cloudflare/bundle/hybrid-nodejs-compat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"hybrid-nodejs-compat.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/hybrid-nodejs-compat.ts"],"names":[],"mappings":"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"}

package/src/cloudflare/account-id.ts

@@ -1,12 +0,0 @@
-import { getCloudflareUserInfo, type CloudflareAuthOptions } from "./auth.js";
-
-export type CloudflareAccountId = string & {
-  readonly __brand: "CloudflareAccountId";
-};
-
-export async function CloudflareAccountId(
-  options: CloudflareAuthOptions,
-): Promise<CloudflareAccountId> {
-  const userInfo = await getCloudflareUserInfo(options);
-  return userInfo.accounts[0].id as CloudflareAccountId;
-}