@samebase/alchemy-convex 0.1.0 → 0.3.0

package/src/Deploy.ts

@@ -1,5 +1,7 @@
-// Convex.Deploy: pushes the functions in a `convex/` directory with
-// `npx convex deploy` and exposes the deployment URL for a frontend build.
+// Convex.Deploy (deprecated since 0.3.0, use Convex.Code): pushes the
+// functions in a `convex/` directory with `npx convex deploy` and exposes
+// the deployment URL for a frontend build. It stays so that stacks and state
+// from 0.1 and 0.2 keep working: Convex.Code has other props.
 //
 // The deployment itself belongs to the project, so delete leaves the last
 // pushed functions running. The URL comes from the CLI's own output because
@@ -12,6 +14,8 @@ import { havePropsChanged, isResolved } from "alchemy/Diff";
 import * as Provider from "alchemy/Provider";
 import * as Effect from "effect/Effect";
 import type * as Redacted from "effect/Redacted";
+import * as Schema from "effect/Schema";
+import { parseDeployOutput } from "./Code.ts";
 import type { Providers } from "./Providers.ts";
 
 export interface DeployProps extends Pick<CommandRunProps, "cwd" | "env" | "timeout"> {
@@ -46,7 +50,9 @@ export interface DeployProps extends Pick<CommandRunProps, "cwd" | "env" | "time
    * Files hashed to skip an unchanged push. By default every non-gitignored
    * file under `cwd` and the nearest lockfile. Use
    * `{ include: ["convex/**"], lockfile: true }` to ignore frontend changes,
-   * or `false` to push on every deploy.
+   * or `false` to push on every deploy. A preview deploy (`previewName` or
+   * `previewCreate`) pushes on every deploy: Convex can delete an expired
+   * preview deployment, and the hash cannot show that.
    * @default true
    */
   readonly memo?: MemoOptions | boolean;
@@ -62,26 +68,13 @@ export interface DeployAttributes {
 }
 
 export type Deploy = Resource<"Convex.Deploy", DeployProps, DeployAttributes, never, Providers>;
-export const Deploy = Resource<Deploy>("Convex.Deploy");
-
 /**
- * The CLI prints this line with `logFinishedStep` after the push succeeds, to
- * stderr (convex 1.45 `cli/lib/deploy2.js` for existing deployments,
- * `cli/deploy.js` for preview deployments). The host is
- * `<deployment>.convex.cloud` or `<deployment>.<region>.convex.cloud`.
+ * @deprecated Since 0.3.0. Use Convex.Code with a Convex.Deployment: it
+ * runs the installed Convex CLI, keeps the deploy key out of the process
+ * environment, checks that the key fits the deployment, and outputs the site
+ * URL. Removing a Deploy resource changes nothing in Convex.
  */
-const DEPLOYED_LINE =
-  /Deployed Convex functions to (https:\/\/([a-z0-9]+(?:-[a-z0-9]+)*)(?:\.[a-z0-9]+(?:-[a-z0-9]+)*)?\.convex\.cloud)\/?(?=\s|$)/m;
-
-/** Reads the deployment URL from `convex deploy` output. ANSI escape codes are removed first. */
-export const parseDeployOutput = (
-  text: string,
-): { url: string; deploymentName: string } | undefined => {
-  const match = DEPLOYED_LINE.exec(stripVTControlCharacters(text));
-  const url = match?.[1];
-  const deploymentName = match?.[2];
-  return url === undefined || deploymentName === undefined ? undefined : { url, deploymentName };
-};
+export const Deploy = Resource<Deploy>("Convex.Deploy");
 
 /** The `convex deploy` argv, starting with `npx`. */
 export const deployArgs = (
@@ -99,6 +92,26 @@ export const deployArgs = (
 /** Number of output lines quoted when the CLI exits 0 without the deployed line. */
 const OUTPUT_TAIL_LINES = 20;
 
+/** A `convex deploy` argument contains whitespace, which Alchemy's command runner splits on. */
+export class DeployArgumentError extends Schema.TaggedError<DeployArgumentError>()(
+  "DeployArgumentError",
+  { argument: Schema.String },
+) {
+  override get message() {
+    return `Convex.Deploy argument "${this.argument}" contains whitespace, and Alchemy splits the command on whitespace. Use the --flag=value form, such as --typecheck=disable, and names without spaces.`;
+  }
+}
+
+/** `npx convex deploy` exited 0 but did not print the deployment URL. */
+export class DeployOutputError extends Schema.TaggedError<DeployOutputError>()(
+  "DeployOutputError",
+  { outputTail: Schema.String },
+) {
+  override get message() {
+    return `npx convex deploy exited 0 but printed no "Deployed Convex functions to <url>" line, so Convex.Deploy has no deployment URL. Remove --dry-run from extraArgs if it is there, and read the CLI output. Last output:\n${this.outputTail}`;
+  }
+}
+
 export const DeployProvider = () =>
   Provider.effect(
     Deploy,
@@ -120,7 +133,16 @@ export const DeployProvider = () =>
         // under the same name.
         diff: Effect.fn(function* ({ olds, news, output }) {
           if (!isResolved(news)) return undefined;
-          if (output === undefined || output.hash === undefined || havePropsChanged(olds, news)) {
+          // A preview deployment can expire. The same hash then hides a
+          // missing deployment, so a preview always pushes. The CLI reuses
+          // a live preview with the same name.
+          const preview = news.previewName !== undefined || news.previewCreate !== undefined;
+          if (
+            preview ||
+            output === undefined ||
+            output.hash === undefined ||
+            havePropsChanged(olds, news)
+          ) {
             return { action: "update" } as const;
           }
           return { action: (yield* hashOf(news)) === output.hash ? "noop" : "update" } as const;
@@ -129,13 +151,7 @@ export const DeployProvider = () =>
         reconcile: Effect.fn(function* ({ news, session }) {
           const args = deployArgs(news);
           const spaced = args.find((arg) => /\s/.test(arg));
-          if (spaced !== undefined) {
-            return yield* Effect.die(
-              new Error(
-                `Convex.Deploy argument "${spaced}" contains whitespace; Alchemy splits commands on whitespace`,
-              ),
-            );
-          }
+          if (spaced !== undefined) return yield* new DeployArgumentError({ argument: spaced });
           // A push is idempotent: the CLI uploads the full function set every time.
           const { stdout, stderr } = yield* run(
             {
@@ -150,16 +166,12 @@ export const DeployProvider = () =>
           const output = `${stdout}\n${stderr}`;
           const deployed = parseDeployOutput(output);
           if (deployed === undefined) {
-            const tail = stripVTControlCharacters(output)
+            const outputTail = stripVTControlCharacters(output)
               .split(/\r?\n|\r/)
               .filter((line) => line.trim() !== "")
               .slice(-OUTPUT_TAIL_LINES)
               .join("\n");
-            return yield* Effect.die(
-              new Error(
-                `npx convex deploy exited 0 but printed no "Deployed Convex functions to <url>" line. Last output:\n${tail}`,
-              ),
-            );
+            return yield* new DeployOutputError({ outputTail });
           }
           return { ...deployed, hash: yield* hashOf(news) };
         }),

package/src/DeployKey.ts

@@ -1,11 +1,27 @@
 // Convex.DeployKey: a deploy key for one deployment, such as the key
 // `npx convex deploy` reads from CONVEX_DEPLOY_KEY.
 //
-// Convex returns the secret only once, from create_deploy_key. The listing
-// shows each key under a unique name, the requested name plus a short id
-// suffix such as "my-key (0e71106d)", and delete_deploy_key accepts that
-// unique name. A key cannot be changed after creation, so every property
-// change is a replacement.
+// Convex returns the secret only once, from create_deploy_key, and the
+// response has no id. The listing shows each key with a numeric id and a
+// name: the requested name, or, when a listed key already has that name, the
+// requested name plus a suffix such as " (870993b4-ffe6-4911-adbd-e29f7fd712f2)".
+//
+// One resource must never revoke the key of another resource:
+// - The requested name is the `name` prop plus a hash of the resource's fqn
+//   and instance id, so two resources with the same `name` request
+//   different names.
+// - After the create, exactly one listed key must have the requested name.
+//   Otherwise the create fails with a typed error that lists the keys. State
+//   keeps that key's numeric id.
+// - Delete sends the secret as `id`, so it can revoke only the key that this
+//   resource created. It never deletes by a listed name.
+// - With an OAuth token as the Management API credential, Convex returns
+//   that token as the "new" key. The provider never stores, revokes, or
+//   deletes such a key: the create fails with DeployKeyIsCredential.
+// - Delete runs only for a key with a `keyId` in state. A 0.1.x key, which
+//   has none, stays in Convex with a warning.
+// A key cannot change after creation, so every property change is a replacement.
+import { createHash } from "node:crypto";
 import { Resource } from "alchemy";
 import { havePropsChanged, isResolved } from "alchemy/Diff";
 import * as Provider from "alchemy/Provider";
@@ -13,7 +29,12 @@ import * as Effect from "effect/Effect";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
 import type { components } from "@convex-dev/platform/managementApi";
-import { absentAsUndefined, ManagementApi } from "./ManagementApi.ts";
+import {
+  absentAsUndefined,
+  type ConvexApiError,
+  ManagementApi,
+  retryIdempotentWrite,
+} from "./ManagementApi.ts";
 import type { Providers } from "./Providers.ts";
 
 /** Actions a deploy key can be limited to, from the generated schema. */
@@ -23,35 +44,50 @@ export type DeployKeyAction = NonNullable<
 
 /**
  * True when `listedName` is how Convex lists a key created as `name`: the
- * requested name, a space, and one parenthesized id without spaces. The id
- * check keeps `my-key` from matching a key created as `my-key (old)`.
+ * requested name itself, or the requested name, a space, and one
+ * parenthesized suffix without spaces. The suffix check keeps `my-key` from
+ * matching a key created as `my-key (old)`.
  */
 const isListedAs = (listedName: string, name: string) => {
   const prefix = `${name} (`;
-  return listedName.startsWith(prefix) && /^[^\s()]+\)$/.test(listedName.slice(prefix.length));
+  return (
+    listedName === name ||
+    (listedName.startsWith(prefix) && /^[^\s()]+\)$/.test(listedName.slice(prefix.length)))
+  );
 };
 
 /**
- * The listed key that a create call for `name` just made. The newest match
- * wins: an earlier attempt that failed before Alchemy saved state can leave
- * another key with the same requested name, and its secret is lost.
+ * True when the listing still has the key in state: by numeric id, or by
+ * listed name for state written by 0.1.x, which has no id.
  */
-export const selectCreatedKey = (
+export const isKeyListed = (
+  entries: ReadonlyArray<typeof ListedKey.Type>,
+  key: { readonly keyId: number | undefined; readonly uniqueName: string },
+): boolean =>
+  entries.some((entry) =>
+    key.keyId === undefined ? entry.name === key.uniqueName : entry.id === key.keyId,
+  );
+
+/** The listed keys that Convex shows for a key created as `name`. */
+export const keysListedAs = (
   entries: ReadonlyArray<typeof ListedKey.Type>,
   name: string,
-): typeof ListedKey.Type | undefined =>
-  entries
-    .filter((entry) => isListedAs(entry.name, name))
-    .reduce<typeof ListedKey.Type | undefined>(
-      (newest, entry) =>
-        newest === undefined || entry.creationTime > newest.creationTime ? entry : newest,
-      undefined,
-    );
+): ReadonlyArray<typeof ListedKey.Type> => entries.filter((entry) => isListedAs(entry.name, name));
+
+/**
+ * The name that a resource instance requests: `name`, a dash, and the first
+ * 12 hex characters of sha256("<fqn>:<instanceId>"). Two resources, or the
+ * old and the new generation of one replaced resource, never request the
+ * same name. Pattern from Confect `packages/alchemy/src/internal/ResourceIdentity.ts`
+ * (https://github.com/rjdellecese/confect, ISC license).
+ */
+export const requestedKeyName = (name: string, fqn: string, instanceId: string): string =>
+  `${name}-${createHash("sha256").update(`${fqn}:${instanceId}`).digest("hex").slice(0, 12)}`;
 
 /** One row of list_deploy_keys and list_preview_deploy_keys. Only the fields the providers use. */
 export const ListedKey = Schema.Struct({
+  id: Schema.Number,
   name: Schema.String,
-  creationTime: Schema.Number,
 });
 
 /** GET /deployments/{deployment_name}/list_deploy_keys */
@@ -60,18 +96,132 @@ export const DeployKeyList = Schema.Array(ListedKey);
 /** POST /deployments/{deployment_name}/create_deploy_key */
 export const CreatedDeployKey = Schema.Struct({ deployKey: Schema.String });
 
+/**
+ * A key cannot be tied to one resource: before the create, listed keys
+ * already have the requested name, or after the create, not exactly one has it.
+ */
+export class DeployKeyRecoveryRequired extends Schema.TaggedError<DeployKeyRecoveryRequired>()(
+  "DeployKeyRecoveryRequired",
+  {
+    /** Where the keys live, such as `deployment happy-otter-123` or `project 3145389`. */
+    target: Schema.String,
+    /** The requested name. */
+    name: Schema.String,
+    /** The listed keys with the requested name. */
+    keys: Schema.Array(ListedKey),
+    /** True when this run created a key before the listing check failed. */
+    afterCreate: Schema.Boolean,
+  },
+) {
+  override get message() {
+    const listed =
+      this.keys.length === 0
+        ? "no key"
+        : this.keys.map((key) => `"${key.name}" (id ${key.id})`).join(", ");
+    return this.afterCreate
+      ? `Convex created deploy key "${this.name}" on ${this.target}, but the listing shows ${listed} with that name, not exactly one, so this resource cannot track the new key. Alchemy does not revoke it. Delete the keys with that name in the Convex dashboard, then run the deploy again.`
+      : `${this.target} already lists ${listed} with the name "${this.name}", but Alchemy state has no such key. An interrupted run probably created it, and its secret is lost. Delete these keys in the Convex dashboard, then run the deploy again.`;
+  }
+}
+
+/**
+ * Convex returned the Management API credential itself as the new key. This
+ * happens with an OAuth token: Convex creates no key. A delete of the
+ * returned secret would revoke the credential, so the resource does not keep it.
+ */
+export class DeployKeyIsCredential extends Schema.TaggedError<DeployKeyIsCredential>()(
+  "DeployKeyIsCredential",
+  { target: Schema.String, name: Schema.String },
+) {
+  override get message() {
+    return `Convex returned the Management API credential itself as deploy key "${this.name}" on ${this.target}. With an OAuth token, Convex creates no new key, and deleting the returned key would revoke the OAuth token. Alchemy does not keep it. Use a team access token in CONVEX_ACCESS_TOKEN, or the Convex CLI login.`;
+  }
+}
+
+/**
+ * Creates a key named `name` and ties it to the caller. Fails before the
+ * create when keys with that name already exist. After the create, fails
+ * when the secret is the Management API credential itself, or when the
+ * listing does not show exactly one key with that name. It never revokes a
+ * key: the returned secret can be a shared credential.
+ */
+export const createTrackedKey = (options: {
+  readonly target: string;
+  readonly name: string;
+  readonly list: Effect.Effect<ReadonlyArray<typeof ListedKey.Type>, ConvexApiError>;
+  readonly create: Effect.Effect<string, ConvexApiError>;
+  readonly isCredentialToken: (secret: string) => Effect.Effect<boolean>;
+}) =>
+  Effect.gen(function* () {
+    const { target, name } = options;
+    const existing = keysListedAs(yield* options.list, name);
+    if (existing.length > 0) {
+      return yield* new DeployKeyRecoveryRequired({
+        target,
+        name,
+        keys: existing,
+        afterCreate: false,
+      });
+    }
+    const secret = yield* options.create;
+    if (yield* options.isCredentialToken(secret)) {
+      return yield* new DeployKeyIsCredential({ target, name });
+    }
+    const listed = keysListedAs(yield* options.list, name);
+    const [only] = listed;
+    if (only === undefined || listed.length !== 1) {
+      return yield* new DeployKeyRecoveryRequired({
+        target,
+        name,
+        keys: listed,
+        afterCreate: true,
+      });
+    }
+    return { keyId: only.id, uniqueName: only.name, secret: Redacted.make(secret) };
+  });
+
+/**
+ * The secret to send to a delete call, or undefined when a delete is not
+ * safe. Only a key with a `keyId` in state is known to be a new key that
+ * this resource owns: createTrackedKey found exactly one new listed key, and
+ * the secret was not the credential. State from 0.1.x has no `keyId`, and its
+ * secret can be an OAuth token that Convex returned as a key, so a delete
+ * could revoke that OAuth token. Such a key stays, and a warning names it.
+ */
+export const secretToDelete = (
+  key: {
+    readonly keyId: number | undefined;
+    readonly secret: Redacted.Redacted<string> | undefined;
+  },
+  label: string,
+) =>
+  Effect.gen(function* () {
+    if (key.keyId === undefined || !Redacted.isRedacted(key.secret)) {
+      yield* Effect.logWarning(
+        `${label} has no verified key id and secret in state (state from 0.1.x, for example), so Alchemy does not delete it. Delete it in the Convex dashboard.`,
+      );
+      return undefined;
+    }
+    return Redacted.value(key.secret);
+  });
+
 export interface DeployKeyProps {
   /** Deployment name, such as `project.prodDeploymentName`. */
   readonly deployment: string;
-  /** Requested key name. Convex appends a short id to make it unique. */
+  /**
+   * Key name. The provider requests this name, a dash, and a hash of the
+   * resource identity, so two resources with one `name` get different keys.
+   */
   readonly name: string;
   /** Limits the key to these actions. Convex grants every deployment action when omitted. */
   readonly allowedActions?: readonly DeployKeyAction[];
 }
 
 export interface DeployKeyAttributes {
-  /** The name Convex lists the key under, such as "my-key (0e71106d)". */
+  /** The name Convex lists the key under, such as "ci-3f2a1b0c9d8e". */
   readonly uniqueName: string;
+  /** Numeric id of the key in the listing. Undefined in state written by 0.1.x. */
+  readonly keyId: number | undefined;
   readonly deployment: string;
   /** The secret, such as `prod:<deployment>|<token>`. Convex returns it only at creation. */
   readonly deployKey: Redacted.Redacted<string>;
@@ -101,6 +251,20 @@ export const DeployKeyProvider = () =>
           )
           .pipe(Effect.map((body) => Schema.decodeUnknownSync(DeployKeyList)(body)));
 
+      /**
+       * `id` is the secret: Convex accepts it, and it matches only the key
+       * that this resource created. A second delete answers 404.
+       */
+      const deleteKey = (deployment: string, secret: string) =>
+        retryIdempotentWrite(
+          api.requestVoid("delete deploy key", (client) =>
+            client.POST("/deployments/{deployment_name}/delete_deploy_key", {
+              params: { path: { deployment_name: deployment } },
+              body: { id: secret },
+            }),
+          ),
+        );
+
       return {
         stables: ["uniqueName", "deployment"],
 
@@ -119,52 +283,49 @@ export const DeployKeyProvider = () =>
           // A key that is not in state has no known secret, so it is never adopted.
           if (output === undefined) return undefined;
           const entries = yield* absentAsUndefined(listKeys(output.deployment));
-          return entries?.some((entry) => entry.name === output.uniqueName) ? output : undefined;
+          return entries !== undefined && isKeyListed(entries, output) ? output : undefined;
         }),
 
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           if (output !== undefined) {
             // The secret cannot be read back. A key that still exists keeps the one in state.
-            const entries = yield* listKeys(news.deployment);
-            if (entries.some((entry) => entry.name === output.uniqueName)) return output;
+            if (isKeyListed(yield* listKeys(news.deployment), output)) return output;
           }
-          const created = yield* api.request("create deploy key", (client) =>
-            client.POST("/deployments/{deployment_name}/create_deploy_key", {
-              params: { path: { deployment_name: news.deployment } },
-              body: {
-                name: news.name,
-                ...(news.allowedActions === undefined
-                  ? {}
-                  : { allowedActions: [...news.allowedActions] }),
-              },
-            }),
-          );
-          const { deployKey } = Schema.decodeUnknownSync(CreatedDeployKey)(created);
-          const listed = selectCreatedKey(yield* listKeys(news.deployment), news.name);
-          if (listed === undefined) {
-            return yield* Effect.die(
-              new Error(
-                `Convex created deploy key "${news.name}" on ${news.deployment} but does not list it`,
+          const name = requestedKeyName(news.name, fqn, instanceId);
+          const { keyId, uniqueName, secret } = yield* createTrackedKey({
+            target: `deployment ${news.deployment}`,
+            name,
+            list: listKeys(news.deployment),
+            create: api
+              .request("create deploy key", (client) =>
+                client.POST("/deployments/{deployment_name}/create_deploy_key", {
+                  params: { path: { deployment_name: news.deployment } },
+                  body: {
+                    name,
+                    ...(news.allowedActions === undefined
+                      ? {}
+                      : { allowedActions: [...news.allowedActions] }),
+                  },
+                }),
+              )
+              .pipe(
+                Effect.map((body) => Schema.decodeUnknownSync(CreatedDeployKey)(body).deployKey),
               ),
-            );
-          }
-          return {
-            uniqueName: listed.name,
-            deployment: news.deployment,
-            deployKey: Redacted.make(deployKey),
-          };
+            isCredentialToken: api.isCredentialToken,
+          });
+          return { uniqueName, keyId, deployment: news.deployment, deployKey: secret };
         }),
 
         delete: Effect.fn(function* ({ output }) {
-          // 404 DeployKeyNotFound: an earlier attempt or someone else deleted it.
-          yield* absentAsUndefined(
-            api.requestVoid("delete deploy key", (client) =>
-              client.POST("/deployments/{deployment_name}/delete_deploy_key", {
-                params: { path: { deployment_name: output.deployment } },
-                body: { id: output.uniqueName },
-              }),
-            ),
+          // Only the secret names this key alone: 0.1.x state can hold the
+          // listed name of another resource's key.
+          const secret = yield* secretToDelete(
+            { keyId: output.keyId, secret: output.deployKey },
+            `Convex.DeployKey "${output.uniqueName}" on ${output.deployment}`,
           );
+          if (secret === undefined) return;
+          // 404 DeployKeyNotFound: an earlier attempt or someone else deleted it.
+          yield* absentAsUndefined(deleteKey(output.deployment, secret));
         }),
       };
     }),