alchemy 0.66.0 → 0.68.0

package/src/cloudflare/secret.ts

@@ -51,42 +51,41 @@ export interface SecretProps extends CloudflareApiOptions {
   delete?: boolean;
 }
 
-export function isSecret(resource: Resource): resource is Secret {
-  return resource[ResourceKind] === "cloudflare::Secret";
+export function isSecret(resource: any): resource is Secret {
+  return resource?.[ResourceKind] === "cloudflare::Secret";
 }
 
-export type Secret = Resource<"cloudflare::Secret"> &
-  Omit<SecretProps, "delete" | "value"> & {
-    /**
-     * The binding type for Cloudflare Workers
-     */
-    type: "secrets_store_secret";
-
-    /**
-     * The name of the secret
-     */
-    name: string;
-
-    /**
-     * The unique identifier of the secrets store this secret belongs to
-     */
-    storeId: string;
-
-    /**
-     * The secret value (as an alchemy Secret instance)
-     */
-    value: AlchemySecret;
-
-    /**
-     * Timestamp when the secret was created
-     */
-    createdAt: number;
-
-    /**
-     * Timestamp when the secret was last modified
-     */
-    modifiedAt: number;
-  };
+export type Secret = Omit<SecretProps, "delete" | "value"> & {
+  /**
+   * The binding type for Cloudflare Workers
+   */
+  type: "secrets_store_secret";
+
+  /**
+   * The name of the secret
+   */
+  name: string;
+
+  /**
+   * The unique identifier of the secrets store this secret belongs to
+   */
+  storeId: string;
+
+  /**
+   * The secret value (as an alchemy Secret instance)
+   */
+  value: AlchemySecret;
+
+  /**
+   * Timestamp when the secret was created
+   */
+  createdAt: number;
+
+  /**
+   * Timestamp when the secret was last modified
+   */
+  modifiedAt: number;
+};
 
 /**
  * A Cloudflare Secret represents an individual secret stored in a Secrets Store.
@@ -197,7 +196,7 @@ const _Secret = Resource(
     // Insert or update the secret
     await insertSecret(api, storeId, secretName, props.value);
 
-    return this({
+    return {
       type: "secrets_store_secret",
       name: secretName,
       storeId,
@@ -205,7 +204,7 @@ const _Secret = Resource(
       value: props.value,
       createdAt,
       modifiedAt: Date.now(),
-    });
+    };
   },
 );
 

package/src/cloudflare/secrets-store.ts

@@ -54,16 +54,13 @@ export interface SecretsStoreProps<
   delete?: boolean;
 }
 
-export function isSecretsStore(
-  resource: Resource,
-): resource is SecretsStore<any> {
-  return resource[ResourceKind] === "cloudflare::SecretsStore";
+export function isSecretsStore(resource: any): resource is SecretsStore<any> {
+  return resource?.[ResourceKind] === "cloudflare::SecretsStore";
 }
 
 export interface SecretsStore<
   S extends Record<string, Secret> | undefined = undefined,
-> extends Resource<"cloudflare::SecretsStore">,
-    Omit<SecretsStoreProps<S>, "delete"> {
+> extends Omit<SecretsStoreProps<S>, "delete"> {
   /**
    * The unique identifier of the secrets store
    */
@@ -240,13 +237,13 @@ const _SecretsStore = Resource("cloudflare::SecretsStore", async function <
     await insertSecrets(api, storeId, props);
   }
 
-  return this({
+  return {
     id: storeId,
     name: name,
     secrets: props.secrets as S,
     createdAt: createdAt,
     modifiedAt: Date.now(),
-  });
+  };
 });
 
 export async function createSecretsStore<

package/src/cloudflare/tunnel.ts

@@ -264,16 +264,14 @@ export interface OriginRequestConfig {
   tcpKeepAliveInterval?: number;
 }
 
-export function isTunnel(resource: Resource): resource is Tunnel {
-  return resource[ResourceKind] === "cloudflare::Tunnel";
+export function isTunnel(resource: any): resource is Tunnel {
+  return resource?.[ResourceKind] === "cloudflare::Tunnel";
 }
 
 /**
  * Output returned after Tunnel creation/update
  */
-export interface Tunnel
-  extends Resource<"cloudflare::Tunnel">,
-    Omit<TunnelProps, "delete" | "tunnelSecret"> {
+export interface Tunnel extends Omit<TunnelProps, "delete" | "tunnelSecret"> {
   /**
    * The name of the tunnel
    */
@@ -667,7 +665,7 @@ export const Tunnel = Resource(
     }
 
     // Transform API response to our interface
-    return this({
+    return {
       tunnelId: tunnelData.id,
       accountTag: tunnelData.account_tag,
       name: tunnelData.name,
@@ -697,7 +695,7 @@ export const Tunnel = Resource(
       originRequest: props.originRequest,
       configSrc: props.configSrc,
       dnsRecords: Object.keys(dnsRecords).length > 0 ? dnsRecords : undefined,
-    });
+    };
   },
 );
 

package/src/cloudflare/user.ts

@@ -1,11 +1,9 @@
+import type { Credentials } from "../auth.ts";
 import type { Secret } from "../secret.ts";
 import { logger } from "../util/logger.ts";
 import { memoize } from "../util/memoize.ts";
 import { extractCloudflareResult } from "./api-response.ts";
-import {
-  getCloudflareAuthHeaders,
-  type CloudflareAuthOptions,
-} from "./auth.ts";
+import { CloudflareAuth } from "./auth.ts";
 
 export interface CloudflareAccount {
   name: string;
@@ -56,15 +54,20 @@ export interface CloudflareOrganization {
   roles: string[];
 }
 
-export const getCloudflareAccountId = memoize(
-  async (options: CloudflareAuthOptions): Promise<string> => {
-    const headers = await getCloudflareAuthHeaders(options);
-    const accounts = await extractCloudflareResult<CloudflareAccount[]>(
+export const listCloudflareAccounts = memoize(
+  async (credentials: Credentials): Promise<CloudflareAccount[]> => {
+    return await extractCloudflareResult<CloudflareAccount[]>(
       "get accounts for authorized user",
       fetch("https://api.cloudflare.com/client/v4/accounts", {
-        headers,
+        headers: CloudflareAuth.formatHeaders(credentials),
       }),
     );
+  },
+);
+
+export const getCloudflareAccountId = memoize(
+  async (credentials: Credentials): Promise<string> => {
+    const accounts = await listCloudflareAccounts(credentials);
     if (!accounts[0]) {
       throw new Error(
         "No accounts found for authorized user. Please make sure you're authenticated (see: https://alchemy.run/guides/cloudflare/) or explicitly set the Cloudflare Account ID (see: https://alchemy.run/guides/cloudflare/#account-id)",

package/src/cloudflare/vectorize-index.ts

@@ -51,18 +51,14 @@ export interface VectorizeIndexProps extends CloudflareApiOptions {
   adopt?: boolean;
 }
 
-export function isVectorizeIndex(
-  resource: Resource,
-): resource is VectorizeIndex {
-  return resource[ResourceKind] === "cloudflare::VectorizeIndex";
+export function isVectorizeIndex(resource: any): resource is VectorizeIndex {
+  return resource?.[ResourceKind] === "cloudflare::VectorizeIndex";
 }
 
 /**
  * Output returned after Vectorize Index creation/update
  */
-export interface VectorizeIndex
-  extends Resource<"cloudflare::VectorizeIndex">,
-    VectorizeIndexProps {
+export interface VectorizeIndex extends VectorizeIndexProps {
   type: "vectorize";
 
   /**
@@ -176,10 +172,10 @@ export const VectorizeIndex = Resource(
             `Attempted to update Vectorize index ${indexName} but only the delete property can be changed.`,
           );
         }
-        return this({
+        return {
           ...this.output,
           delete: props.delete,
-        });
+        };
       }
 
       // Check if this is a no-op update
@@ -194,7 +190,7 @@ export const VectorizeIndex = Resource(
             `Attempted to update Vectorize index ${indexName} but it was a no-op.`,
           );
         }
-        return this(this.output);
+        return this.output;
       }
 
       // Update operation is not supported by Vectorize API
@@ -204,7 +200,7 @@ export const VectorizeIndex = Resource(
       );
     }
 
-    return this({
+    return {
       type: "vectorize",
       id: indexName,
       name: indexName,
@@ -218,7 +214,7 @@ export const VectorizeIndex = Resource(
       createdAt: indexData.result.created_on
         ? new Date(indexData.result.created_on).getTime()
         : undefined,
-    });
+    };
   },
 );
 

package/src/cloudflare/vectorize-metadata-index.ts

@@ -30,17 +30,15 @@ export interface VectorizeMetadataIndexProps extends CloudflareApiOptions {
 }
 
 export function isVectorizeMetadataIndex(
-  resource: Resource,
+  resource: any,
 ): resource is VectorizeMetadataIndex {
-  return resource[ResourceKind] === "cloudflare::VectorizeMetadataIndex";
+  return resource?.[ResourceKind] === "cloudflare::VectorizeMetadataIndex";
 }
 
 /**
  * Output returned after Vectorize Metadata Index creation/deletion
  */
-export interface VectorizeMetadataIndex
-  extends Resource<"cloudflare::VectorizeMetadataIndex">,
-    VectorizeMetadataIndexProps {
+export interface VectorizeMetadataIndex extends VectorizeMetadataIndexProps {
   /**
    * ID of this metadata index (derived from propertyName)
    */
@@ -126,7 +124,7 @@ export const VectorizeMetadataIndex = Resource(
             `Attempted to update Vectorize metadata index ${this.props.propertyName} but it was a no-op.`,
           );
         }
-        return this(this.output);
+        return this.output;
       }
       // Update operation is not supported
       throw new Error(
@@ -136,14 +134,14 @@ export const VectorizeMetadataIndex = Resource(
     }
     const indexData = await createMetadataIndex(api, indexName, props);
 
-    return this({
+    return {
       id: propertyName, // Use propertyName as ID
       index: props.index,
       propertyName: props.propertyName,
       indexType: props.indexType,
       accountId: api.accountId,
       mutationId: indexData.result.mutationId,
-    });
+    };
   },
 );
 

package/src/cloudflare/website.ts

@@ -344,7 +344,7 @@ export async function Website<B extends Bindings>(
       ...worker.bindings,
       ...(!scope.local
         ? {
-            ASSETS: await Assets("assets", {
+            ASSETS: await Assets({
               path: path.relative(process.cwd(), paths.assets),
             }),
           }

package/src/cloudflare/worker-assets.ts

@@ -1,11 +1,9 @@
-import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
 import { AsyncQueue } from "../util/async-queue.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
 import { extractCloudflareResult } from "./api-response.ts";
 import type { CloudflareApi } from "./api.ts";
-import type { AssetFile, Assets } from "./assets.ts";
+import { Assets } from "./assets.ts";
 import type { AssetsConfig, WorkerProps } from "./worker.ts";
 
 export interface AssetUploadResult {
@@ -47,7 +45,12 @@ export async function uploadAssets(
   // Process the assets configuration once at the beginning
   const processedConfig = createAssetConfig(assetConfig);
 
-  const { manifest, filesByHash } = await prepareAssetManifest(assets);
+  const manifest: Record<string, FileMetadata> = {};
+  const filesByHash = new Map<string, Assets.FileMetadata>();
+  for (const file of await Assets.read(assets.path)) {
+    manifest[file.name] = { hash: file.hash, size: file.size };
+    filesByHash.set(file.hash, file);
+  }
 
   // Start the upload session
   const uploadSession = await extractCloudflareResult<{
@@ -130,31 +133,11 @@ export function createAssetConfig(config?: AssetsConfig): AssetsConfig {
   return assetConfig;
 }
 
-/**
- * Prepares the asset manifest for the assets upload session
- *
- * @param assets Assets resource containing files to upload
- * @returns Asset manifest and files by hash
- */
-export async function prepareAssetManifest(assets: Assets) {
-  const manifest: Record<string, FileMetadata> = {};
-  const filesByHash = new Map<string, AssetFile>();
-  await Promise.all(
-    assets.files.map(async (file) => {
-      const { hash, size } = await calculateFileMetadata(file.filePath);
-      const key = file.path.startsWith("/") ? file.path : `/${file.path}`;
-      manifest[key] = { hash, size };
-      filesByHash.set(hash, file);
-    }),
-  );
-  return { manifest, filesByHash };
-}
-
 async function uploadBucket(
   api: CloudflareApi,
   jwt: string,
   bucket: string[],
-  filesByHash: Map<string, AssetFile>,
+  filesByHash: Map<string, Assets.FileMetadata>,
 ) {
   const formData = new FormData();
   await Promise.all(
@@ -163,9 +146,9 @@ async function uploadBucket(
       if (!file) {
         throw new Error(`Could not find file with hash ${fileHash}`);
       }
-      const fileContent = await fs.readFile(file.filePath);
+      const fileContent = await fs.readFile(file.path);
       const blob = new Blob([fileContent.toString("base64")], {
-        type: file.contentType,
+        type: file.type,
       });
       formData.append(fileHash, blob, fileHash);
     }),
@@ -184,32 +167,3 @@ async function uploadBucket(
   );
   return uploadResult.jwt;
 }
-
-/**
- * Calculate the SHA-256 hash and size of a file
- *
- * @param filePath Path to the file
- * @returns Hash (first 32 chars of SHA-256) and size of the file
- */
-export async function calculateFileMetadata(
-  filePath: string,
-): Promise<{ hash: string; size: number }> {
-  const contents = await fs.readFile(filePath);
-
-  const hash = crypto.createHash("sha256");
-  hash.update(contents);
-
-  const extension = path.extname(filePath).substring(1);
-  hash.update(extension);
-
-  if (contents.length > 26214400) {
-    throw new Error(
-      `File "${filePath}" is too large to upload as an asset to Cloudflare (the file is ${(contents.length / 1024 / 1024).toFixed(2)} MB; the maximum size is 25MB).`,
-    );
-  }
-
-  return {
-    hash: hash.digest("hex").slice(0, 32),
-    size: contents.length,
-  };
-}

package/src/cloudflare/worker-metadata.ts

@@ -3,11 +3,10 @@ import { logger } from "../util/logger.ts";
 import { memoize } from "../util/memoize.ts";
 import { extractCloudflareResult } from "./api-response.ts";
 import type { CloudflareApi } from "./api.ts";
-import {
-  Self,
-  type Bindings,
-  type WorkerBindingDurableObjectNamespace,
-  type WorkerBindingSpec,
+import type {
+  Bindings,
+  WorkerBindingDurableObjectNamespace,
+  WorkerBindingSpec,
 } from "./bindings.ts";
 import { isContainer, type Container } from "./container.ts";
 import {
@@ -392,11 +391,12 @@ export async function prepareWorkerMetadata(
         name: bindingName,
         text: binding,
       });
-    } else if (binding === Self) {
+    } else if (binding.type === "cloudflare::Worker::Self") {
       meta.bindings.push({
         type: "service",
         name: bindingName,
         service: props.workerName,
+        entrypoint: binding.__entrypoint__,
       });
     } else if (binding.type === "d1") {
       meta.bindings.push({
@@ -416,6 +416,8 @@ export async function prepareWorkerMetadata(
         type: "service",
         name: bindingName,
         service: "service" in binding ? binding.service : binding.name,
+        entrypoint:
+          "__entrypoint__" in binding ? binding.__entrypoint__ : undefined,
       });
     } else if (binding.type === "durable_object_namespace") {
       meta.bindings.push({
@@ -491,12 +493,6 @@ export async function prepareWorkerMetadata(
         name: bindingName,
         index_name: binding.name,
       });
-    } else if (binding.type === "ai_gateway") {
-      // AI Gateway binding - just needs the name property
-      meta.bindings.push({
-        type: "ai",
-        name: bindingName,
-      });
     } else if (binding.type === "hyperdrive") {
       // Hyperdrive binding
       meta.bindings.push({
@@ -510,6 +506,12 @@ export async function prepareWorkerMetadata(
         name: bindingName,
       });
     } else if (binding.type === "ai") {
+      const existing = meta.bindings.find((b) => b.type === "ai");
+      if (existing) {
+        throw new Error(
+          `Workers cannot have multiple AI bindings. Binding "${bindingName}" conflicts with "${existing.name}".`,
+        );
+      }
       meta.bindings.push({
         type: "ai",
         name: bindingName,

package/src/cloudflare/worker-stub.ts

@@ -43,7 +43,7 @@ export interface WorkerStubProps<
  */
 export interface WorkerStub<
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
-> extends Resource<"cloudflare::WorkerStub"> {
+> {
   type: "service";
   /**
    * The name of the worker
@@ -64,8 +64,8 @@ export interface WorkerStub<
   __rpc__?: RPC;
 }
 
-export function isWorkerStub(resource: Resource): resource is WorkerStub {
-  return resource[ResourceKind] === "cloudflare::WorkerStub";
+export function isWorkerStub(resource: any): resource is WorkerStub {
+  return resource?.[ResourceKind] === "cloudflare::WorkerStub";
 }
 
 /**
@@ -120,12 +120,12 @@ export const WorkerStub = Resource("cloudflare::WorkerStub", async function <
       : undefined;
 
   // Return the worker stub info
-  return this({
+  return {
     type: "service",
     __rpc__: props.rpc as unknown as RPC,
     ...props,
     url: subdomain?.url,
-  }) as WorkerStub<RPC>;
+  } as WorkerStub<RPC>;
 });
 
 async function exists(

package/src/cloudflare/worker-subdomain.ts

@@ -37,8 +37,7 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
   dev?: boolean;
 }
 
-export interface WorkerSubdomain
-  extends Resource<"cloudflare::WorkerSubdomain"> {
+export interface WorkerSubdomain {
   /**
    * The `workers.dev` URL for the worker or preview version.
    */
@@ -49,13 +48,13 @@ export const WorkerSubdomain = Resource(
   "cloudflare::WorkerSubdomain",
   async function (
     this: Context<WorkerSubdomain>,
-    id: string,
+    _id: string,
     props: WorkerSubdomainProps,
   ) {
     if (this.scope.local && props.dev) {
-      return this({
+      return {
         url: this.output?.url ?? "https://unavailable.alchemy.run",
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -74,9 +73,9 @@ export const WorkerSubdomain = Resource(
     } else {
       url = `https://${props.scriptName}.${base}`;
     }
-    return this(id, {
+    return {
       url,
-    });
+    };
   },
 );