alchemy 0.67.0 → 0.68.0

package/src/cloudflare/d1-database.ts

@@ -117,48 +117,47 @@ export interface D1DatabaseProps extends CloudflareApiOptions {
   };
 }
 
-export function isD1Database(resource: Resource): resource is D1Database {
-  return resource[ResourceKind] === "cloudflare::D1Database";
+export function isD1Database(resource: any): resource is D1Database {
+  return resource?.[ResourceKind] === "cloudflare::D1Database";
 }
 
 /**
  * Output returned after D1 Database creation/update
  */
-export type D1Database = Resource<"cloudflare::D1Database"> &
-  Pick<
-    D1DatabaseProps,
-    | "migrationsDir"
-    | "migrationsTable"
-    | "primaryLocationHint"
-    | "readReplication"
-  > & {
-    type: "d1";
-    /**
-     * The unique ID of the database (UUID)
-     */
-    id: string;
+export type D1Database = Pick<
+  D1DatabaseProps,
+  | "migrationsDir"
+  | "migrationsTable"
+  | "primaryLocationHint"
+  | "readReplication"
+> & {
+  type: "d1";
+  /**
+   * The unique ID of the database (UUID)
+   */
+  id: string;
+
+  /**
+   * The name of the database
+   */
+  name: string;
 
+  /**
+   * Development mode properties
+   * @internal
+   */
+  dev: {
     /**
-     * The name of the database
+     * The ID of the database in development mode
      */
-    name: string;
+    id: string;
 
     /**
-     * Development mode properties
-     * @internal
+     * Whether the database is running remotely
      */
-    dev: {
-      /**
-       * The ID of the database in development mode
-       */
-      id: string;
-
-      /**
-       * Whether the database is running remotely
-       */
-      remote: boolean;
-    };
+    remote: boolean;
   };
+};
 
 /**
  * Creates and manages Cloudflare D1 Databases.
@@ -286,7 +285,7 @@ const _D1Database = Resource(
           rootDir: this.scope.rootDir,
         });
       }
-      return this({
+      return {
         type: "d1",
         id: this.output?.id ?? "",
         name: databaseName,
@@ -295,7 +294,7 @@ const _D1Database = Resource(
         migrationsDir: props.migrationsDir,
         migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
         dev,
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -414,7 +413,7 @@ const _D1Database = Resource(
       // TODO(sam): why would this ever happen?
       throw new Error("Database ID not found");
     }
-    return this({
+    return {
       type: "d1",
       id: dbData.result.uuid!,
       name: databaseName,
@@ -423,7 +422,7 @@ const _D1Database = Resource(
       dev,
       migrationsDir: props.migrationsDir,
       migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
-    });
+    };
   },
 );
 

package/src/cloudflare/dispatch-namespace.ts

@@ -37,17 +37,16 @@ export interface DispatchNamespaceProps extends CloudflareApiOptions {
 }
 
 export function isDispatchNamespace(
-  resource: Resource,
+  resource: any,
 ): resource is DispatchNamespace {
-  return resource[ResourceKind] === "cloudflare::DispatchNamespace";
+  return resource?.[ResourceKind] === "cloudflare::DispatchNamespace";
 }
 
 /**
  * Output returned after Dispatch Namespace creation/update
  */
 export interface DispatchNamespace
-  extends Resource<"cloudflare::DispatchNamespace">,
-    Omit<DispatchNamespaceProps, "delete"> {
+  extends Omit<DispatchNamespaceProps, "delete"> {
   type: "dispatch_namespace";
   /**
    * The name of the namespace
@@ -182,14 +181,14 @@ export const DispatchNamespace = Resource(
       throw new Error(`Failed to get namespace information for '${namespace}'`);
     }
 
-    return this({
+    return {
       type: "dispatch_namespace",
       namespace,
       namespaceName: namespaceInfo.namespaceName,
       namespaceId: namespaceInfo.namespaceId,
       createdAt: createdAt,
       modifiedAt: Date.now(),
-    });
+    };
   },
 );
 

package/src/cloudflare/dns-records.ts

@@ -68,7 +68,7 @@ export interface DnsRecordsProps extends CloudflareApiOptions {
 /**
  * Output returned after DNS records creation/update
  */
-export interface DnsRecords extends Resource<"cloudflare::DnsRecords"> {
+export interface DnsRecords {
   /**
    * Zone ID where records are created
    */
@@ -219,10 +219,10 @@ export const DnsRecords = Resource(
         }),
       );
 
-      return this({
+      return {
         zoneId,
         records: updatedRecords,
-      });
+      };
     }
 
     // Create new records
@@ -270,10 +270,10 @@ export const DnsRecords = Resource(
       }),
     );
 
-    return this({
+    return {
       zoneId,
       records: createdRecords,
-    });
+    };
   },
 );
 

package/src/cloudflare/email-address.ts

@@ -36,7 +36,7 @@ export interface EmailAddressProps extends CloudflareApiOptions {
 /**
  * A destination email address for Cloudflare email routing
  */
-export interface EmailAddress extends Resource<"cloudflare::EmailAddress"> {
+export interface EmailAddress {
   /**
    * The email address
    */
@@ -145,13 +145,13 @@ export const EmailAddress = Resource(
           const result =
             (await getResponse.json()) as CloudflareResponse<CloudflareEmailAddress>;
 
-          return this({
+          return {
             email: result.result.email,
             verified: result.result.verified,
             created: result.result.created,
             modified: result.result.modified,
             tag: result.result.tag,
-          });
+          };
         }
       }
     }
@@ -166,13 +166,13 @@ export const EmailAddress = Resource(
       const result =
         (await getResponse.json()) as CloudflareResponse<CloudflareEmailAddress>;
 
-      return this({
+      return {
         email: result.result.email,
         verified: result.result.verified,
         created: result.result.created,
         modified: result.result.modified,
         tag: result.result.tag,
-      });
+      };
     }
 
     // Create new email address
@@ -192,12 +192,12 @@ export const EmailAddress = Resource(
     const result =
       (await createResponse.json()) as CloudflareResponse<CloudflareEmailAddress>;
 
-    return this({
+    return {
       email: result.result.email,
       verified: result.result.verified,
       created: result.result.created,
       modified: result.result.modified,
       tag: result.result.tag,
-    });
+    };
   },
 );

package/src/cloudflare/email-catch-all.ts

@@ -1,8 +1,8 @@
 import type { Context } from "../context.ts";
 import { Resource } from "../resource.ts";
 import { type CloudflareApiOptions, createCloudflareApi } from "./api.ts";
-import type { CloudflareResponse } from "./response.ts";
 import type { EmailAction, EmailMatcher } from "./email-rule.ts";
+import type { CloudflareResponse } from "./response.ts";
 import type { Zone } from "./zone.ts";
 
 /**
@@ -54,7 +54,7 @@ export interface EmailCatchAllProps extends CloudflareApiOptions {
 /**
  * A catch-all email routing rule for a Cloudflare zone
  */
-export interface EmailCatchAll extends Resource<"cloudflare::EmailCatchAll"> {
+export interface EmailCatchAll {
   /**
    * Zone ID where the catch-all rule is configured
    */
@@ -203,14 +203,14 @@ export const EmailCatchAll = Resource(
       const result =
         (await response.json()) as CloudflareResponse<CloudflareEmailCatchAll>;
 
-      return this({
+      return {
         zoneId,
         enabled: result.result.enabled,
         name: result.result.name,
         matchers: result.result.matchers,
         actions: result.result.actions,
         tag: result.result.tag,
-      });
+      };
     }
 
     // Create or update catch-all rule
@@ -236,13 +236,13 @@ export const EmailCatchAll = Resource(
     const result =
       (await response.json()) as CloudflareResponse<CloudflareEmailCatchAll>;
 
-    return this({
+    return {
       zoneId,
       enabled: result.result.enabled,
       name: result.result.name,
       matchers: result.result.matchers,
       actions: result.result.actions,
       tag: result.result.tag,
-    });
+    };
   },
 );

package/src/cloudflare/email-routing.ts

@@ -43,7 +43,7 @@ export interface EmailRoutingProps extends CloudflareApiOptions {
 /**
  * Email routing configuration for a Cloudflare zone
  */
-export interface EmailRouting extends Resource<"cloudflare::EmailRouting"> {
+export interface EmailRouting {
   /**
    * Zone ID where email routing is configured
    */
@@ -173,14 +173,14 @@ export const EmailRouting = Resource(
       const result =
         (await getResponse.json()) as CloudflareResponse<CloudflareEmailRouting>;
 
-      return this({
+      return {
         zoneId,
         enabled: result.result.enabled,
         name: result.result.name,
         created: result.result.created,
         modified: result.result.modified,
         tag: result.result.tag,
-      });
+      };
     }
 
     // Create/Enable email routing
@@ -218,13 +218,13 @@ export const EmailRouting = Resource(
     const result =
       (await getResponse.json()) as CloudflareResponse<CloudflareEmailRouting>;
 
-    return this({
+    return {
       zoneId,
       enabled: result.result.enabled,
       name: result.result.name,
       created: result.result.created,
       modified: result.result.modified,
       tag: result.result.tag,
-    });
+    };
   },
 );

package/src/cloudflare/email-rule.ts

@@ -104,7 +104,7 @@ export interface EmailRuleProps extends CloudflareApiOptions {
 /**
  * An email routing rule for a Cloudflare zone
  */
-export interface EmailRule extends Resource<"cloudflare::EmailRule"> {
+export interface EmailRule {
   /**
    * Zone ID where the rule is created
    */
@@ -274,7 +274,7 @@ export const EmailRule = Resource(
         const result =
           (await response.json()) as CloudflareResponse<CloudflareEmailRule>;
 
-        return this({
+        return {
           zoneId,
           ruleId: result.result.id,
           name: result.result.name,
@@ -283,7 +283,7 @@ export const EmailRule = Resource(
           matchers: result.result.matchers,
           actions: result.result.actions,
           tag: result.result.tag,
-        });
+        };
       }
     }
 
@@ -308,7 +308,7 @@ export const EmailRule = Resource(
     const result =
       (await createResponse.json()) as CloudflareResponse<CloudflareEmailRule>;
 
-    return this({
+    return {
       zoneId,
       ruleId: result.result.id,
       name: result.result.name,
@@ -317,6 +317,6 @@ export const EmailRule = Resource(
       matchers: result.result.matchers,
       actions: result.result.actions,
       tag: result.result.tag,
-    });
+    };
   },
 );

package/src/cloudflare/hyperdrive.ts

@@ -190,46 +190,45 @@ export interface HyperdriveProps extends CloudflareApiOptions {
  * Output returned after Cloudflare Hyperdrive creation/update.
  * IMPORTANT: The interface name MUST match the exported resource name.
  */
-export type Hyperdrive = Resource<"cloudflare::Hyperdrive"> &
-  Omit<HyperdriveProps, "origin" | "dev"> & {
-    /**
-     * The ID of the resource
-     */
-    id: string;
-
-    /**
-     * Name of the Hyperdrive configuration
-     */
-    name: string;
+export type Hyperdrive = Omit<HyperdriveProps, "origin" | "dev"> & {
+  /**
+   * The ID of the resource
+   */
+  id: string;
 
-    /**
-     * The Cloudflare-generated UUID of the hyperdrive
-     */
-    hyperdriveId: string;
+  /**
+   * Name of the Hyperdrive configuration
+   */
+  name: string;
 
-    /**
-     * Database connection origin configuration
-     */
-    origin: HyperdrivePublicOrigin | HyperdriveOriginWithAccess;
+  /**
+   * The Cloudflare-generated UUID of the hyperdrive
+   */
+  hyperdriveId: string;
 
-    /**
-     * Local development configuration
-     * @internal
-     */
-    dev: {
-      /**
-       * The connection string to use for local development
-       */
-      origin: Secret;
-    };
+  /**
+   * Database connection origin configuration
+   */
+  origin: HyperdrivePublicOrigin | HyperdriveOriginWithAccess;
 
+  /**
+   * Local development configuration
+   * @internal
+   */
+  dev: {
     /**
-     * Resource type identifier for binding.
-     * @internal
+     * The connection string to use for local development
      */
-    type: "hyperdrive";
+    origin: Secret;
   };
 
+  /**
+   * Resource type identifier for binding.
+   * @internal
+   */
+  type: "hyperdrive";
+};
+
 /**
  * Represents a Cloudflare Hyperdrive configuration.
  *
@@ -356,7 +355,7 @@ const _Hyperdrive = Resource(
       props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
     if (this.scope.local) {
-      return this({
+      return {
         id,
         hyperdriveId: hyperdriveId || "",
         name,
@@ -365,7 +364,7 @@ const _Hyperdrive = Resource(
         mtls: props.mtls,
         dev: props.dev,
         type: "hyperdrive",
-      });
+      };
     }
     const api = await createCloudflareApi(props);
 
@@ -445,7 +444,7 @@ const _Hyperdrive = Resource(
     }
 
     // Construct the output object from API response and props
-    return this({
+    return {
       id,
       hyperdriveId: result.id, // Store the Cloudflare-assigned UUID
       name: result.name,
@@ -454,7 +453,7 @@ const _Hyperdrive = Resource(
       mtls: result.mtls,
       dev: props.dev,
       type: "hyperdrive",
-    });
+    };
   },
 );
 

package/src/cloudflare/kv-namespace.ts

@@ -95,47 +95,46 @@ export interface KVPair {
   metadata?: any;
 }
 
-export function isKVNamespace(resource: Resource): resource is KVNamespace {
-  return resource[ResourceKind] === "cloudflare::KVNamespace";
+export function isKVNamespace(resource: any): resource is KVNamespace {
+  return resource?.[ResourceKind] === "cloudflare::KVNamespace";
 }
 
 /**
  * Output returned after KV Namespace creation/update
  */
-export type KVNamespace = Resource<"cloudflare::KVNamespace"> &
-  Omit<KVNamespaceProps, "delete" | "dev"> & {
-    type: "kv_namespace";
-    /**
-     * The ID of the namespace
-     */
-    namespaceId: string;
+export type KVNamespace = Omit<KVNamespaceProps, "delete" | "dev"> & {
+  type: "kv_namespace";
+  /**
+   * The ID of the namespace
+   */
+  namespaceId: string;
 
-    /**
-     * Time at which the namespace was created
-     */
-    createdAt: number;
+  /**
+   * Time at which the namespace was created
+   */
+  createdAt: number;
+
+  /**
+   * Time at which the namespace was last modified
+   */
+  modifiedAt: number;
 
+  /**
+   * Development mode properties
+   * @internal
+   */
+  dev: {
     /**
-     * Time at which the namespace was last modified
+     * The ID of the KV namespace in development mode
      */
-    modifiedAt: number;
+    id: string;
 
     /**
-     * Development mode properties
-     * @internal
+     * Whether the KV namespace is running remotely
      */
-    dev: {
-      /**
-       * The ID of the KV namespace in development mode
-       */
-      id: string;
-
-      /**
-       * Whether the KV namespace is running remotely
-       */
-      remote: boolean;
-    };
+    remote: boolean;
   };
+};
 
 /**
  * A Cloudflare KV Namespace is a key-value store that can be used to store data for your application.
@@ -221,7 +220,7 @@ const _KVNamespace = Resource(
     };
 
     if (local) {
-      return this({
+      return {
         type: "kv_namespace",
         namespaceId: this.output?.namespaceId ?? "",
         title,
@@ -229,7 +228,7 @@ const _KVNamespace = Resource(
         dev,
         createdAt: this.output?.createdAt ?? Date.now(),
         modifiedAt: Date.now(),
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -260,7 +259,7 @@ const _KVNamespace = Resource(
 
     await insertKVRecords(api, result.namespaceId, props);
 
-    return this({
+    return {
       type: "kv_namespace",
       namespaceId: result.namespaceId,
       title,
@@ -268,7 +267,7 @@ const _KVNamespace = Resource(
       dev,
       createdAt: result.createdAt,
       modifiedAt: Date.now(),
-    });
+    };
   },
 );
 

package/src/cloudflare/miniflare/delete.ts

@@ -113,7 +113,7 @@ async function cleanMiniflareDirectory(dotAlchemy: string) {
 
 const removeDirectory = async (path: string, options?: RmDirOptions) => {
   try {
-    await fs.rmdir(path, options);
+    await fs.rm(path, options);
   } catch (error) {
     if (!isENOENT(error)) {
       throw error;

package/src/cloudflare/miniflare/miniflare-worker-proxy.ts

@@ -3,6 +3,7 @@ import { once } from "node:events";
 import http from "node:http";
 import { Readable } from "node:stream";
 import { WebSocket, WebSocketServer } from "ws";
+import { coupleWebSocket } from "../../util/http.ts";
 
 export interface MiniflareWorkerProxy {
   url: URL;
@@ -22,13 +23,7 @@ export async function createMiniflareWorkerProxy(options: {
   server.on("upgrade", async (req, socket, head) => {
     try {
       const server = await createServerWebSocket(req);
-      wss.handleUpgrade(req, socket, head, (client) => {
-        client.on("message", (event, binary) => server.send(event, { binary }));
-        client.on("close", (code, reason) => server.close(code, reason));
-        server.on("message", (event, binary) => client.send(event, { binary }));
-        server.on("close", (code, reason) => client.close(code, reason));
-        wss.emit("connection", client, req);
-      });
+      coupleWebSocket(wss, req, socket, head, server);
     } catch (error) {
       console.error(error);
       socket.destroy();

package/src/cloudflare/miniflare/remote-binding-proxy.ts

@@ -1,4 +1,5 @@
 import type { RemoteProxyConnectionString } from "miniflare";
+import { WebSocket } from "ws";
 import { HTTPServer } from "../../util/http.ts";
 import { extractCloudflareResult } from "../api-response.ts";
 import type { CloudflareApi } from "../api.ts";
@@ -54,18 +55,29 @@ export async function createRemoteProxyWorker(input: {
     getAccountSubdomain(input.api),
   ]);
 
-  const proxyURL = `https://${input.name}.${subdomain}.workers.dev`;
+  const host = `${input.name}.${subdomain}.workers.dev`;
+
   const server = new HTTPServer({
+    websocket: async (req) => {
+      const input = new URL(req.url);
+      const proxied = new URL(input.pathname + input.search, `https://${host}`);
+      return new WebSocket(proxied, {
+        headers: {
+          "cf-workers-preview-token": token,
+          host,
+        },
+      });
+    },
     fetch: async (req) => {
       const url = new URL(req.url);
-      const targetUrl = new URL(url.pathname + url.search, proxyURL);
+      const proxied = new URL(url.pathname + url.search, `https://${host}`);
 
       const headers = new Headers(req.headers);
       headers.set("cf-workers-preview-token", token);
-      headers.set("host", new URL(proxyURL).hostname);
+      headers.set("host", host);
       headers.delete("cf-connecting-ip");
 
-      const res = await fetch(targetUrl, {
+      const res = await fetch(proxied, {
         method: req.method,
         headers,
         body: req.body,