alchemy 0.73.0 → 0.74.0

package/bin/alchemy.ts

@@ -9,6 +9,7 @@ import { login } from "./commands/login.ts";
 import { logout } from "./commands/logout.ts";
 import { run } from "./commands/run.ts";
 import { telemetry } from "./commands/telemetry.ts";
+import { util } from "./commands/util.ts";
 import { getPackageVersion } from "./services/get-package-version.ts";
 import { t } from "./trpc.ts";
 
@@ -23,6 +24,7 @@ const router = t.router({
   configure,
   run,
   telemetry,
+  util,
 });
 
 export type AppRouter = typeof router;

package/bin/commands/configure.ts

@@ -85,7 +85,10 @@ export const configure = authProcedure
     outro(pc.green(`✅ Configured profile ${pc.bold(name)}`));
   });
 
-const promptForProfileName = async (input: { profile?: string }) => {
+/**
+ * Prompts the user to enter a profile name.
+ */
+export const promptForProfileName = async (input: { profile?: string }) => {
   input.profile = input.profile?.trim();
   if (input.profile) {
     return input.profile;

package/bin/commands/util.ts

@@ -0,0 +1,510 @@
+import {
+  confirm,
+  intro,
+  isCancel,
+  log,
+  outro,
+  password,
+  text,
+} from "@clack/prompts";
+import pc from "picocolors";
+import z from "zod";
+import { Profile, Provider } from "../../src/auth.ts";
+import { CancelSignal, loggedProcedure, t } from "../trpc.ts";
+import { promptForProfileName } from "./configure.ts";
+
+const createCloudflareToken = loggedProcedure
+  .meta({
+    description: "Create a Cloudflare god token with API key and account IDs",
+  })
+  .input(
+    z.object({
+      profile: z
+        .string()
+        .optional()
+        .meta({ alias: "p" })
+        .describe("the profile to use to generate a token"),
+      godToken: z
+        .boolean()
+        .optional()
+        .describe("if a god token should be created"),
+    }),
+  )
+  .mutation(async ({ input }) => {
+    if (input.godToken) {
+      await createCloudflareGodToken();
+    } else {
+      await createCloudflareProfileToken(input);
+    }
+  });
+
+export const util = t.router({
+  "create-cloudflare-token": createCloudflareToken,
+});
+
+async function createToken(
+  keyName: string,
+  accountIds: Array<string>,
+  permissionGroupIds: Array<string> | undefined,
+  credentials: { apiKey: string; accountEmail: string },
+) {
+  type PermissionGroup = {
+    id: string;
+    name: string;
+    description: string;
+    scopes: Array<string>;
+  };
+
+  const permissionGroups = await fetch(
+    "https://api.cloudflare.com/client/v4/user/tokens/permission_groups",
+    {
+      headers: {
+        "Content-Type": "application/json",
+        "X-Auth-Key": credentials.apiKey,
+        "X-Auth-Email": credentials.accountEmail,
+      },
+    },
+  )
+    .then((res) => res.json())
+    .then((data) => data.result as Array<PermissionGroup>)
+    .then((data) => {
+      //* filter permissions and group by scope
+      const groupedByScope = data.reduce(
+        (acc, group) => {
+          if (
+            permissionGroupIds != null &&
+            !permissionGroupIds.includes(group.id)
+          ) {
+            return acc;
+          }
+          const scope = group.scopes[0];
+          if (!acc[scope]) {
+            acc[scope] = [];
+          }
+          acc[scope].push(group);
+          return acc;
+        },
+        {} as Record<string, Array<PermissionGroup>>,
+      );
+      return groupedByScope;
+    })
+    .catch((err) => {
+      log.error(pc.red(`Error fetching permission groups: ${err.message}`));
+      throw new CancelSignal();
+    });
+
+  const apiToken = await fetch(
+    "https://api.cloudflare.com/client/v4/user/tokens",
+    {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-Auth-Key": credentials.apiKey,
+        "X-Auth-Email": credentials.accountEmail,
+      },
+      body: JSON.stringify({
+        name: `Alchemy Token - ${keyName}`,
+        status: "active",
+        policies: [
+          {
+            effect: "allow",
+            resources: accountIds.reduce((acc, id) => {
+              acc[`com.cloudflare.api.account.${id}`] = "*";
+              return acc;
+            }, {}),
+            permission_groups: permissionGroups[
+              "com.cloudflare.api.account"
+            ].map((group) => ({ id: group.id })),
+          },
+          {
+            effect: "allow",
+            resources: { "com.cloudflare.api.account.zone.*": "*" },
+            permission_groups: permissionGroups[
+              "com.cloudflare.api.account.zone"
+            ].map((group) => ({ id: group.id })),
+          },
+        ],
+      }),
+    },
+  )
+    .then((res) => res.json())
+    .then((data) => data.result.value)
+    .catch((err) => {
+      log.error(pc.red(`Error creating cloudflare token: ${err.message}`));
+      throw new CancelSignal();
+    });
+
+  return apiToken;
+}
+
+async function createCloudflareGodToken() {
+  intro(pc.cyan("🧪 Create Cloudflare God Token"));
+
+  const apiKey = await password({
+    message: "Enter Cloudflare API Key",
+  });
+  if (isCancel(apiKey)) {
+    throw new CancelSignal();
+  }
+
+  const accountEmail = await text({
+    message: "Enter account email",
+    placeholder: "user@example.com",
+  });
+  if (isCancel(accountEmail)) {
+    throw new CancelSignal();
+  }
+
+  const accountIds: string[] = [];
+  log.info(
+    pc.dim("Enter account IDs (press enter with empty value to finish)"),
+  );
+
+  while (true) {
+    const accountId = await text({
+      message: `Enter account ID ${accountIds.length > 0 ? "(or press enter to finish)" : ""}`,
+      placeholder: accountIds.length === 0 ? "account-id" : "",
+      defaultValue: "",
+      validate: (value) => {
+        if (!value?.trim() && accountIds.length === 0) {
+          return "Please enter at least one account ID";
+        }
+      },
+    });
+
+    if (isCancel(accountId)) {
+      throw new CancelSignal();
+    }
+
+    const trimmedId = (accountId || "").trim();
+
+    if (!trimmedId && accountIds.length > 0) {
+      log.info(pc.dim("Finishing input..."));
+      break;
+    }
+
+    if (trimmedId) {
+      accountIds.push(trimmedId);
+      log.info(pc.dim(`Added account ID: ${trimmedId}`));
+    }
+  }
+
+  log.error(
+    pc.red(
+      "🚨 If this token is leaked or compromised, it could result in:\n   • Complete account takeover\n   • Data breaches\n   • Service disruption\n   • Financial losses\n",
+    ),
+  );
+
+  const confirmCreate = await confirm({
+    message: "Do you understand the risks and want to proceed?",
+    initialValue: false,
+  });
+
+  if (isCancel(confirmCreate) || !confirmCreate) {
+    log.info(pc.dim("Token creation cancelled"));
+    throw new CancelSignal();
+  }
+
+  const apiToken = await createToken("GOD-TOKEN", accountIds, undefined, {
+    apiKey,
+    accountEmail,
+  }).catch((err) => {
+    log.error(pc.red(`Error creating cloudflare god token: ${err.message}`));
+    throw new CancelSignal();
+  });
+
+  outro(`Cloudflare god token created: ${pc.magenta(apiToken)}`);
+}
+
+async function createCloudflareProfileToken(input: { profile?: string }) {
+  const name = await promptForProfileName(input);
+  intro(pc.cyan(`🧪 Create Cloudflare Token for ${pc.bold(name)}`));
+
+  const profile = await Profile.get(name);
+  if (profile == null) {
+    throw new Error(`Profile ${pc.bold(name)} not found`);
+  }
+  const { provider } = await Provider.getWithCredentials({
+    profile: name,
+    provider: "cloudflare",
+  });
+
+  if (provider.method !== "oauth") {
+    throw new Error(
+      `Profile ${pc.bold(name)} is not configured to use Cloudflare via OAuth`,
+    );
+  }
+
+  if (provider.scopes == null) {
+    throw new Error(
+      `Profile ${pc.bold(name)} is not configured with any Cloudflare scopes`,
+    );
+  }
+
+  const permissionGroupIds: Array<string> = [];
+  for (const scope of provider.scopes) {
+    const ids = CLOUDFLARE_OAUTH_SCOPES_TO_PERMISSION_GROUP_IDS[scope];
+    if (ids != null) {
+      permissionGroupIds.push(...ids);
+    }
+  }
+
+  const apiKey = await password({
+    message: "Enter Cloudflare API Key",
+  });
+  if (isCancel(apiKey)) {
+    throw new CancelSignal();
+  }
+
+  const accountEmail = await text({
+    message: "Enter account email",
+    placeholder: "user@example.com",
+  });
+  if (isCancel(accountEmail)) {
+    throw new CancelSignal();
+  }
+
+  const apiToken = await createToken(
+    name,
+    [provider.metadata.id],
+    permissionGroupIds,
+    { apiKey, accountEmail },
+  );
+
+  outro(
+    `Cloudflare token created for profile ${pc.bold(name)}: ${pc.magenta(apiToken)}`,
+  );
+}
+
+export const CLOUDFLARE_OAUTH_SCOPES_TO_PERMISSION_GROUP_IDS = {
+  "access:read": [
+    "eb258a38ea634c86a0c89da6b27cb6b6",
+    "7ea222f6d5064cfa89ea366d7c1fee89",
+    "08e61dabe81a422dab0dea6fdef1a98a",
+    "0f4841f80adb4bada5a09493300e7f8d",
+    "4f3196a5c95747b6ad82e34e1d0a694f",
+    "26bc23f853634eb4bff59983b9064fde",
+    "b8b7514ce5364cd8ac0455f3eb16eb5f",
+    "de99c87e48d642ce8c985d027905b475",
+    "91f7ce32fa614d73b7e1fc8f0e78582b",
+    "99ff99e4e30247a99d3777a8c4c18541",
+    "e985ca9351db460faebbe8681c48e560",
+  ],
+  "access:write": [
+    "a1c0fec57cf94af79479a6d827fa518c",
+    "d30c9ad8b5224e7cb8d41bcb4757effc",
+    "bc783549a3a741aaa10556faf8b485bb",
+    "6d23f290472f4e6fad5c4398c057c356",
+    "bfe0d8686a584fa680f4c53b5eb0de6d",
+    "7121a0c7e9ed46e3829f9cca2bb572aa",
+    "29d3afbfd4054af9accdd1118815ed05",
+    "2fc1072ee6b743828db668fcb3f9dee7",
+    "4e5fd8ac327b4a358e48c66fcbeb856d",
+    "1e13c5124ca64b72b1969a67e8829049",
+    "959972745952452f8be2452be8cbb9f2",
+    "6c9d1cfcfc6840a987d1b5bfb880a841",
+    "6db4e222e21248ac96a3f4c2a81e3b41",
+    "eb258a38ea634c86a0c89da6b27cb6b6",
+    "7ea222f6d5064cfa89ea366d7c1fee89",
+    "08e61dabe81a422dab0dea6fdef1a98a",
+    "0f4841f80adb4bada5a09493300e7f8d",
+    "4f3196a5c95747b6ad82e34e1d0a694f",
+    "26bc23f853634eb4bff59983b9064fde",
+    "b8b7514ce5364cd8ac0455f3eb16eb5f",
+    "de99c87e48d642ce8c985d027905b475",
+    "91f7ce32fa614d73b7e1fc8f0e78582b",
+    "99ff99e4e30247a99d3777a8c4c18541",
+    "e985ca9351db460faebbe8681c48e560",
+  ],
+  "account:read": ["c1fde68c7bcc44588cbb6ddbc16d6480"],
+  "agw:read": ["05a2a65760a546439ed29762b163cece"],
+  "agw:run": [
+    "05a2a65760a546439ed29762b163cece",
+    "5e5d3e8efeec49f3afb67bafecbcd511",
+  ],
+  "ai:read": ["a92d2450e05d4e7bb7d0a64968f83d11"],
+  "ai:write": [
+    "a92d2450e05d4e7bb7d0a64968f83d11",
+    "bacc64e0f6c34fc0883a1223f938a104",
+  ],
+  "aiaudit:read": ["19637fbb73d242c0a92845d8db0b95b1"],
+  "aiaudit:write": [
+    "19637fbb73d242c0a92845d8db0b95b1",
+    "1ba6ab4cacdb454b913bbb93e1b8cb8c",
+  ],
+  "aig:read": ["4dc8917b4b40457d88d3035d5dadb054"],
+  "aig:write": [
+    "4dc8917b4b40457d88d3035d5dadb054",
+    "644535f4ed854494a59cb289d634b257",
+    "6c8a3737f07f46369c1ea1f22138daaf",
+  ],
+  "auditlogs:read": ["b05b28e839c54467a7d6cba5d3abb5a3"],
+  "browser:read": ["374b03fa229f4eb6b011bb1cd7f235ee"],
+  "browser:write": [
+    "374b03fa229f4eb6b011bb1cd7f235ee",
+    "adddda876faa4a0590f1b23a038976e4",
+  ],
+  "cfone:read": [
+    "1cd960c063a0448481343372c963d8c7",
+    "c1968d31028d4239976ec3bc4750bbf6",
+    "07cf1c1952a84b13b2cd542f3d2f29ab",
+  ],
+  "cfone:write": [
+    "5b5c774a5d174ca88d046c8889648b3f",
+    "037b9e348b3b42d4b46ea2fcb1cfb3e7",
+    "a7030c9c98d544e092d8b099fabb1f06",
+    "1cd960c063a0448481343372c963d8c7",
+    "c1968d31028d4239976ec3bc4750bbf6",
+    "07cf1c1952a84b13b2cd542f3d2f29ab",
+  ],
+  "cloudchamber:write": [
+    "65ec50cbde3d4c838bbe7500024d5745",
+    "26ce6c7d18a346528e7b905d5e269866",
+  ],
+  "constellation:write": [
+    "eeffa4d16812430cb4a0ae9e7f46fc24",
+    "7c81856725af47ce89a790d5fb36f362",
+  ],
+  "containers:write": [
+    "cfd39eebc07c4e3ea849e4b3d2644637",
+    "bdbcd690c763475a985e8641dddc09f7",
+  ],
+  "d1:write": [
+    "192192df92ee43ac90f2aeeffce67e35",
+    "09b2857d1c31407795e75e3fed8617a1",
+  ],
+  "dex:read": ["3b376e0aa52c41cbb6afc9cab945afa8"],
+  "dex:write": [
+    "3a1e1ef09dd34271bb44fc4c6a419952",
+    "3b376e0aa52c41cbb6afc9cab945afa8",
+    "92c8dcd551cc42a6a57a54e8f8d3f3e3",
+  ],
+  "dns_analytics:read": [], //??
+  "dns_records:edit": [
+    "82e64a83756745bbbb1c9c2701bf816b",
+    "95d69e8d6d5144bfb0923667355d9f11",
+    "5b7aedd821a548b9bf5a2acabbce98c7",
+    "4755a26eedb94da69e1066d98aa820be",
+  ],
+  "dns_records:read": [
+    "82e64a83756745bbbb1c9c2701bf816b",
+    "95d69e8d6d5144bfb0923667355d9f11",
+  ],
+  "dns_settings:read": ["cfa964bcdafc4ab39704e7476154e41b"],
+  "firstpartytags:write": [], //??
+  "lb:edit": [
+    "59059f0c977b44f8b1c18e0aaf91c369",
+    "419ec42810af4659ade77716dbe47bc6",
+    "6d7f2f5f5b1d4a0e9081fdc98d432fd1",
+    "9d24387c6e8544e2bc4024a03991339f",
+    "d2a1802cc9a34e30852f8b33869b2f3c",
+  ],
+  "lb:read": [
+    "59059f0c977b44f8b1c18e0aaf91c369",
+    "9d24387c6e8544e2bc4024a03991339f",
+    "e9a975f628014f1d85b723993116f7d5",
+  ],
+  "logpush:read": [
+    "6a315a56f18441e59ed03352369ae956",
+    "c4a30cd58c5d42619c86a3c36c441e2d",
+  ],
+  "logpush:write": [
+    "6a315a56f18441e59ed03352369ae956",
+    "c4a30cd58c5d42619c86a3c36c441e2d",
+    "96163bd1b0784f62b3e44ed8c2ab1eb6",
+    "3e0b5820118e47f3922f7c989e673882",
+  ],
+  "notification:read": ["ce18edbdcebf465e9d6d1d2fc80ffd42"],
+  "notification:write": [
+    "ce18edbdcebf465e9d6d1d2fc80ffd42",
+    "c3c847c5802d4ce3ba00e3e97b3c8555",
+  ],
+  "pages:read": ["e247aedd66bd41cc9193af0213416666"],
+  "pages:write": [
+    "e247aedd66bd41cc9193af0213416666",
+    "8d28297797f24fb8a0c332fe0866ec89",
+  ],
+  "pipelines:read": ["14b9cf2f410f4c0c9a16bb10a81c0e0b"],
+  "pipelines:setup": ["5606e7405dc542949d949d59993d321f"],
+  "pipelines:write": [
+    "14b9cf2f410f4c0c9a16bb10a81c0e0b",
+    "5606e7405dc542949d949d59993d321f",
+    "e34111af393449539859485aa5ddd5bd",
+  ],
+  "query_cache:write": [],
+  "queues:write": [
+    "84a7755d54c646ca87cd50682a34bf7c",
+    "366f57075ffc42689627bcf8242a1b6d",
+  ],
+  "r2_catalog:write": [
+    "45db74139a62490b9b60eb7c4f34994b",
+    "d229766a2f7f4d299f20eaa8c9b1fde9",
+    "f45430d92e2b4a6cb9f94f2594c141b8",
+  ],
+  "radar:read": ["dfe525ec7b07472c827d8d009178b2ac"],
+  "rag:read": ["d7887c7a417e4cf2a69f1d01c1a1dc3b"],
+  "rag:write": [
+    "d7887c7a417e4cf2a69f1d01c1a1dc3b",
+    "7fb8d27511b34d02994d005b520b679f",
+    "234108c786084936a381bb19b7f4ea65",
+  ],
+  "secrets_store:read": ["5e33b7d77788455c9fdf18cbd38ee5a0"],
+  "secrets_store:write": [
+    "5e33b7d77788455c9fdf18cbd38ee5a0",
+    "adc8fa2bc6124928a8b3314dc63a1235",
+  ],
+  "sso-connector:read": ["1d80f6f165ea47f2b55d4a393fd697de"],
+  "sso-connector:write": [
+    "1d80f6f165ea47f2b55d4a393fd697de",
+    "901ca5e292584c6aa1b4cdb39248bb07",
+  ],
+  "ssl_certs:write": [
+    "a7a233f9604845c787d4c8c39ac09c21",
+    "db37e5f1cb1a4e1aabaef8deaea43575",
+    "7b7216b327b04b8fbc8f524e1f9b7531",
+    "c03055bc037c4ea9afb9a9f104b7b721",
+  ],
+  "teams:pii": [], //??
+  "teams:read": [], //??
+  "teams:secure_location": [], //??
+  "teams:write": [], //??
+  "url_scanner:read": ["5d613a610b294788a29572aaac2f254d"],
+  "url_scanner:write": [
+    "5d613a610b294788a29572aaac2f254d",
+    "2a400bcb29154daab509fe07e3facab0",
+  ],
+  "user:read": [], //??
+  "vectorize:write": [
+    "1799edaae5db489294430e20d9b519e0",
+    "64156ba5be47441096c83c7fc17c488b",
+  ],
+  "workers:write": [
+    "2072033d694d415a936eaeb94e6405b8",
+    "28f4b596e7d643029c524985477ae49a",
+    "1a71c399035b4950a1bd1466bbe4f420",
+    "e086da7e2179491d91ee5f35b3ca210a",
+  ],
+  "workers_builds:read": ["ad99c5ae555e45c4bef5bdf2678388ba"],
+  "workers_builds:write": ["2e095cf436e2455fa62c9a9c2e18c478"],
+  "workers_kv:write": [
+    "8b47d2786a534c08a1f94ee8f9f599ef",
+    "f7f0eda5697f475c90846e879bab8666",
+  ],
+  "workers_observability:read": ["66c1ed49f4ed46098b75696a6d4ee3c9"],
+  "workers_observability:write": [
+    "66c1ed49f4ed46098b75696a6d4ee3c9",
+    "82c075da3f4647a2a03becd0fe240f8a",
+  ],
+  "workers_observability_telemetry:write": ["29c629fb7b5e4c408ca0f7b545724fcc"],
+  "workers_routes:write": [], //??
+  "workers_scripts:write": [], //??
+  "workers_tail:read": ["05880cd1bdc24d8bae0be2136972816b"],
+  "zone:read": [
+    "c8fed203ed3043cba015a93ad1616f1f",
+    "517b21aee92c4d89936c976ba6e4be55",
+    "211a4c0feb3e43b3a2d41f1443a433e7",
+    "1b1ea24cf0904d33903f0cc7e54e280f",
+    "dbc512b354774852af2b5a5f4ba3d470",
+  ],
+  offline_access: [],
+} as const;

package/bin/services/execute-alchemy.ts

@@ -245,8 +245,9 @@ export async function execAlchemy(
     promiseWithResolvers<string>();
 
   process.on("SIGINT", async () => {
+    // hold the parent process open until the child process exits,
+    // then the trpc middleware will handle the SIGINT after sending the event
     await exitPromise;
-    throw new ExitSignal(sanitizeExitCode(child.exitCode));
   });
 
   const child = spawn(command, {

package/bin/trpc.ts

@@ -22,24 +22,30 @@ const loggingMiddleware = t.middleware(async ({ path, next }) => {
   let exitCode = 0;
 
   try {
-    await next();
-    await createAndSendEvent({
-      event: "cli.success",
-      command: path,
-    });
-  } catch (error) {
-    const isSafeExit = error instanceof ExitSignal && error.code === 0;
-    await createAndSendEvent(
-      {
-        event: isSafeExit ? "cli.success" : "cli.error",
+    const result = await next();
+    if (result.ok || result.error.cause instanceof CancelSignal) {
+      await createAndSendEvent({
+        event: "cli.success",
         command: path,
-      },
-      isSafeExit ? undefined : error,
-    );
-    if (error instanceof ExitSignal) {
-      exitCode = error.code;
+      });
+    } else if (result.error.cause instanceof ExitSignal) {
+      exitCode = result.error.cause.code;
+      await createAndSendEvent(
+        {
+          event: exitCode === 0 ? "cli.success" : "cli.error",
+          command: path,
+        },
+        result.error.cause,
+      );
     } else {
-      throw error;
+      await createAndSendEvent(
+        {
+          event: "cli.error",
+          command: path,
+        },
+        result.error.cause,
+      );
+      exitCode = 1;
     }
   } finally {
     //* this is a node issue https://github.com/nodejs/node/issues/56645

package/lib/cloudflare/bound.d.ts

@@ -32,6 +32,6 @@ export type Bound<T extends Binding> = T extends _DurableObjectNamespace<infer O
     type: "kv_namespace";
 } ? KVNamespace : T extends WorkerStub<infer RPC> ? BoundWorker<RPC> : T extends _Worker<any, infer RPC> | WorkerRef<infer RPC> ? BoundWorker<RPC> : T extends {
     type: "service";
-} ? Service : T extends _R2Bucket ? R2Bucket : T extends _Hyperdrive | HyperdriveRef ? Hyperdrive : T extends Secret ? string : T extends CloudflareSecret | CloudflareSecretRef ? SecretsStoreSecret : T extends SecretKey ? CryptoKey : T extends Assets ? Service : T extends _Workflow<infer P> ? Workflow<P> : T extends _D1Database ? D1Database : T extends DispatchNamespace ? DispatchNamespace : T extends _WorkerLoader ? WorkerLoader : T extends _VectorizeIndex ? VectorizeIndex : T extends _Queue<infer Body> ? Queue<Body> : T extends _AnalyticsEngineDataset ? AnalyticsEngineDataset : T extends _Pipeline<infer R> ? Pipeline<R> : T extends _RateLimit ? RateLimit : T extends string ? T : T extends BrowserRendering ? Fetcher : T extends _Ai<infer M> ? Ai<M> : T extends _Images ? ImagesBinding : T extends _VersionMetadata ? WorkerVersionMetadata : T extends Self ? Service : T extends Json<infer T> ? T : T extends _Container<infer Obj> ? DurableObjectNamespace<Obj & Rpc.DurableObjectBranded> : Service;
+} ? Service : T extends _R2Bucket ? R2Bucket : T extends _Hyperdrive | HyperdriveRef ? Hyperdrive : T extends Secret ? string : T extends CloudflareSecret | CloudflareSecretRef ? SecretsStoreSecret : T extends SecretKey ? CryptoKey : T extends Assets ? Service : T extends _Workflow<infer P> ? Workflow<P> : T extends _D1Database ? D1Database : T extends DispatchNamespace ? DispatchNamespace : T extends _WorkerLoader ? WorkerLoader : T extends _VectorizeIndex ? VectorizeIndex : T extends _Queue<infer Body> ? Queue<Body> : T extends _AnalyticsEngineDataset ? AnalyticsEngineDataset : T extends _Pipeline<infer R> ? Pipeline<R> : T extends _RateLimit ? RateLimit : T extends string ? T : T extends BrowserRendering ? Fetcher : T extends _Ai<infer M> ? Ai<M> : T extends _Images ? ImagesBinding : T extends _VersionMetadata ? WorkerVersionMetadata : T extends Self ? Service : T extends Json<infer T> ? T : T extends _Container<infer Obj> ? DurableObjectNamespace<Obj & Rpc.DurableObjectBranded> : T extends undefined ? undefined : Service;
 export {};
 //# sourceMappingURL=bound.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"bound.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bound.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bound.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bound.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAOvC,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAClD,aAAa,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IAChD,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1B;;;GAwFA;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC;IAC3B,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAoDD,qBAAa,yBAA0B,SAAQ,KAAK;IAGhD,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADvB,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,YAAY;IAKxB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,QAAQ;IAkBxD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB;CAQ9D"}
+{"version":3,"file":"miniflare-worker-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-worker-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAOvC,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5B;AAED,wBAAsB,0BAA0B,CAAC,OAAO,EAAE;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,IAAI,CAAC;IAClD,aAAa,EAAE,CAAC,OAAO,EAAE,WAAW,KAAK,MAAM,CAAC;IAChD,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC;IAC/B,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC1B;;;GAqFA;AAED,UAAU,WAAW;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,GAAG,CAAC;IACT,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC;IAC3B,IAAI,EAAE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;CAC5B;AAoDD,qBAAa,yBAA0B,SAAQ,KAAK;IAGhD,QAAQ,CAAC,MAAM,EAAE,MAAM;gBADvB,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,YAAY;IAKxB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,SAAS,CAAC,QAAQ;IAkBxD,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB;CAQ9D"}

package/lib/cloudflare/miniflare/miniflare-worker-proxy.js

@@ -3,20 +3,14 @@ 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.js";
+import { createUpgradeHandler } from "../../util/http.js";
 export async function createMiniflareWorkerProxy(options) {
     const server = http.createServer();
     const wss = new WebSocketServer({ noServer: true });
-    server.on("upgrade", async (req, socket, head) => {
-        try {
-            const server = await createServerWebSocket(req);
-            coupleWebSocket(wss, req, socket, head, server);
-        }
-        catch (error) {
-            console.error(error);
-            socket.destroy();
-        }
-    });
+    server.on("upgrade", createUpgradeHandler({
+        wss,
+        createServerWebSocket: (req) => createServerWebSocket(req),
+    }));
     server.on("request", async (req, res) => {
         try {
             const response = await handleFetch(req);
@@ -61,13 +55,11 @@ export async function createMiniflareWorkerProxy(options) {
         const info = parseIncomingMessage(req);
         options.transformRequest?.(info);
         const name = options.getWorkerName(info);
-        const server = new WebSocket(url, protocols, {
+        return new WebSocket(url, protocols, {
             headers: {
                 "MF-Route-Override": name,
             },
         });
-        await once(server, "open");
-        return server;
     };
     server.listen(options.port);
     await once(server, "listening");