convex 1.40.0 → 1.42.0

package/dist/cjs/cli/lib/localDeployment/secrets.js

@@ -0,0 +1,91 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var secrets_exports = {};
+__export(secrets_exports, {
+  LEGACY_LOCAL_BACKEND_INSTANCE_SECRET: () => LEGACY_LOCAL_BACKEND_INSTANCE_SECRET,
+  generateLocalDevSecrets: () => generateLocalDevSecrets,
+  generateLocalDevSecretsWithLatestBinary: () => generateLocalDevSecretsWithLatestBinary
+});
+module.exports = __toCommonJS(secrets_exports);
+var import_log = require("../../../bundler/log.js");
+var import_download = require("./download.js");
+var import_errors = require("./errors.js");
+var import_child_process = require("child_process");
+var import_util = require("util");
+var import_crypto = __toESM(require("crypto"), 1);
+const LEGACY_LOCAL_BACKEND_INSTANCE_SECRET = "4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974";
+async function generateLocalDevSecrets(ctx, {
+  deploymentName,
+  latestBinaryPath
+}) {
+  (0, import_log.logVerbose)("Generating local dev secrets");
+  const instanceSecret = generateInstanceSecret();
+  let stdout;
+  try {
+    ({ stdout } = await (0, import_util.promisify)(import_child_process.execFile)(latestBinaryPath, [
+      "keygen",
+      "admin-key",
+      "--instance-name",
+      deploymentName,
+      "--instance-secret",
+      instanceSecret
+    ]));
+  } catch (e) {
+    const err = e;
+    const detail = err.stderr ? err.stderr : err.message;
+    const message = `Failed to generate admin key:
+${detail}`;
+    return ctx.crash({
+      exitCode: 1,
+      errorType: "fatal",
+      printedMessage: message,
+      errForSentry: new import_errors.LocalDeploymentError(message)
+    });
+  }
+  const adminKey = stdout.trim();
+  return {
+    instanceSecret,
+    adminKey
+  };
+}
+function generateInstanceSecret() {
+  return import_crypto.default.randomBytes(32).toString("hex");
+}
+async function generateLocalDevSecretsWithLatestBinary(ctx, {
+  deploymentName
+}) {
+  const { binaryPath: latestBinaryPath } = await (0, import_download.ensureBackendBinaryDownloaded)(
+    ctx,
+    {
+      kind: "latest"
+    }
+  );
+  return generateLocalDevSecrets(ctx, { deploymentName, latestBinaryPath });
+}
+//# sourceMappingURL=secrets.js.map

package/dist/cjs/cli/lib/localDeployment/secrets.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/cli/lib/localDeployment/secrets.ts"],
+  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logVerbose } from \"../../../bundler/log.js\";\nimport { ensureBackendBinaryDownloaded } from \"./download.js\";\nimport { LocalDeploymentError } from \"./errors.js\";\nimport { execFile } from \"child_process\";\nimport { promisify } from \"util\";\nimport crypto from \"crypto\";\n\nexport const LEGACY_LOCAL_BACKEND_INSTANCE_SECRET =\n  \"4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974\";\n\n/**\n * Generates an instance secret and an admin key for a new (or just upgraded) local deployment.\n */\nexport async function generateLocalDevSecrets(\n  ctx: Context,\n  {\n    deploymentName,\n    latestBinaryPath,\n  }: {\n    deploymentName: string;\n    /**\n     * A path to the local backend binary.\n     *\n     * This must always be the latest version of the local binary that has been published,\n     * in order to make sure the `keygen admin-key` command is available. If you need to call\n     * this without having access to the latest binary, use `generateLocalDevSecretsWithLatestBinary`\n     * which will download the latest version when necessary.\n     */\n    latestBinaryPath: string;\n  },\n): Promise<{\n  instanceSecret: string;\n  adminKey: string;\n}> {\n  logVerbose(\"Generating local dev secrets\");\n\n  const instanceSecret = generateInstanceSecret();\n\n  let stdout: string;\n  try {\n    ({ stdout } = await promisify(execFile)(latestBinaryPath, [\n      \"keygen\",\n      \"admin-key\",\n      \"--instance-name\",\n      deploymentName,\n      \"--instance-secret\",\n      instanceSecret,\n    ]));\n  } catch (e) {\n    const err = e as { stderr?: string; message: string };\n    const detail = err.stderr ? err.stderr : err.message;\n    const message = `Failed to generate admin key:\\n${detail}`;\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: message,\n      errForSentry: new LocalDeploymentError(message),\n    });\n  }\n\n  const adminKey = stdout.trim();\n\n  return {\n    instanceSecret,\n    adminKey,\n  };\n}\n\nfunction generateInstanceSecret(): string {\n  return crypto.randomBytes(32).toString(\"hex\");\n}\n\n/**\n * Similar to generateLocalDevSecrets, but can be called when we\u2019re not confident\n * we have a binary that supports `keygen admin-key`\n */\nexport async function generateLocalDevSecretsWithLatestBinary(\n  ctx: Context,\n  {\n    deploymentName,\n  }: {\n    deploymentName: string;\n  },\n) {\n  const { binaryPath: latestBinaryPath } = await ensureBackendBinaryDownloaded(\n    ctx,\n    {\n      kind: \"latest\",\n    },\n  );\n  return generateLocalDevSecrets(ctx, { deploymentName, latestBinaryPath });\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,sBAA8C;AAC9C,oBAAqC;AACrC,2BAAyB;AACzB,kBAA0B;AAC1B,oBAAmB;AAEZ,MAAM,uCACX;AAKF,eAAsB,wBACpB,KACA;AAAA,EACE;AAAA,EACA;AACF,GAeC;AACD,6BAAW,8BAA8B;AAEzC,QAAM,iBAAiB,uBAAuB;AAE9C,MAAI;AACJ,MAAI;AACF,KAAC,EAAE,OAAO,IAAI,UAAM,uBAAU,6BAAQ,EAAE,kBAAkB;AAAA,MACxD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,UAAM,MAAM;AACZ,UAAM,SAAS,IAAI,SAAS,IAAI,SAAS,IAAI;AAC7C,UAAM,UAAU;AAAA,EAAkC,MAAM;AACxD,WAAO,IAAI,MAAM;AAAA,MACf,UAAU;AAAA,MACV,WAAW;AAAA,MACX,gBAAgB;AAAA,MAChB,cAAc,IAAI,mCAAqB,OAAO;AAAA,IAChD,CAAC;AAAA,EACH;AAEA,QAAM,WAAW,OAAO,KAAK;AAE7B,SAAO;AAAA,IACL;AAAA,IACA;AAAA,EACF;AACF;AAEA,SAAS,yBAAiC;AACxC,SAAO,cAAAA,QAAO,YAAY,EAAE,EAAE,SAAS,KAAK;AAC9C;AAMA,eAAsB,wCACpB,KACA;AAAA,EACE;AACF,GAGA;AACA,QAAM,EAAE,YAAY,iBAAiB,IAAI,UAAM;AAAA,IAC7C;AAAA,IACA;AAAA,MACE,MAAM;AAAA,IACR;AAAA,EACF;AACA,SAAO,wBAAwB,KAAK,EAAE,gBAAgB,iBAAiB,CAAC;AAC1E;",
+  "names": ["crypto"]
+}

package/dist/cjs/cli/lib/localDeployment/upgrade.js

@@ -28,7 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var upgrade_exports = {};
 __export(upgrade_exports, {
-  handlePotentialUpgrade: () => handlePotentialUpgrade
+  handlePotentialUpgradeAndStart: () => handlePotentialUpgradeAndStart
 });
 module.exports = __toCommonJS(upgrade_exports);
 var import_path = __toESM(require("path"), 1);
@@ -43,12 +43,25 @@ var import_prompts = require("../utils/prompts.js");
 var import_fsUtils = require("../fsUtils.js");
 var import_errors = require("./errors.js");
 var import_download = require("./download.js");
-async function handlePotentialUpgrade(ctx, args) {
+var import_secrets = require("./secrets.js");
+async function handlePotentialUpgradeAndStart(ctx, args) {
+  const { adminKey, instanceSecret } = args.existingCredentials === null || args.existingCredentials.instanceSecret === import_secrets.LEGACY_LOCAL_BACKEND_INSTANCE_SECRET ? (
+    // Using `generateLocalDevSecretsFromLatestBinary` instead of `generateLocalDevSecrets`
+    // here, because `newBinaryPath` can be a binary that doesn’t support
+    // the `keygen admin-key` subcommand (when the --local-backend-version flag is provided to the CLI)
+    //
+    // In most cases (the user is not using the flag), we have already downloaded the latest binary
+    // shortly before in handleLocalDeployment/handleAnonymousDeployment, so this doesn’t cause an
+    // extra download (even if the user chooses later not to upgrade their deployment)
+    await (0, import_secrets.generateLocalDevSecretsWithLatestBinary)(ctx, {
+      deploymentName: args.deploymentName
+    })
+  ) : args.existingCredentials;
   const newConfig = {
     ports: args.ports,
     backendVersion: args.newVersion,
-    adminKey: args.adminKey,
-    instanceSecret: args.instanceSecret,
+    adminKey,
+    instanceSecret,
     cloudProjectId: args.cloudProjectId
   };
   if (args.oldVersion === null || args.oldVersion === args.newVersion) {
@@ -58,14 +71,15 @@ async function handlePotentialUpgrade(ctx, args) {
       args.deploymentName,
       newConfig
     );
-    return (0, import_run2.runLocalBackend)(ctx, {
+    const { cleanupHandle: cleanupHandle2 } = await (0, import_run2.runLocalBackend)(ctx, {
       binaryPath: args.newBinaryPath,
       deploymentKind: args.deploymentKind,
       deploymentName: args.deploymentName,
       ports: args.ports,
-      instanceSecret: args.instanceSecret,
+      instanceSecret,
       isLatestVersion: true
     });
+    return { cleanupHandle: cleanupHandle2, adminKey };
   }
   (0, import_log.logVerbose)(
     `Considering upgrade from ${args.oldVersion} to ${args.newVersion}`
@@ -86,14 +100,15 @@ async function handlePotentialUpgrade(ctx, args) {
       ...newConfig,
       backendVersion: args.oldVersion
     });
-    return (0, import_run2.runLocalBackend)(ctx, {
+    const { cleanupHandle: cleanupHandle2 } = await (0, import_run2.runLocalBackend)(ctx, {
       binaryPath: oldBinaryPath,
       ports: args.ports,
       deploymentKind: args.deploymentKind,
       deploymentName: args.deploymentName,
-      instanceSecret: args.instanceSecret,
+      instanceSecret,
       isLatestVersion: false
     });
+    return { cleanupHandle: cleanupHandle2, adminKey };
   }
   const choice = args.forceUpgrade || !process.stdin.isTTY ? "transfer" : await (0, import_prompts.promptOptions)(ctx, {
     message: "Transfer data from existing deployment?",
@@ -116,31 +131,31 @@ async function handlePotentialUpgrade(ctx, args) {
       args.deploymentName,
       newConfig
     );
-    return (0, import_run2.runLocalBackend)(ctx, {
+    const { cleanupHandle: cleanupHandle2 } = await (0, import_run2.runLocalBackend)(ctx, {
       binaryPath: args.newBinaryPath,
       deploymentKind: args.deploymentKind,
       deploymentName: args.deploymentName,
       ports: args.ports,
-      instanceSecret: args.instanceSecret,
+      instanceSecret,
       isLatestVersion: true
     });
+    return { cleanupHandle: cleanupHandle2, adminKey };
   }
-  const newAdminKey = args.adminKey;
-  const oldAdminKey = (0, import_filePaths.loadDeploymentConfig)(ctx, args.deploymentKind, args.deploymentName)?.adminKey ?? args.adminKey;
-  return handleUpgrade(ctx, {
+  const { cleanupHandle } = await handleUpgrade(ctx, {
     deploymentKind: args.deploymentKind,
     deploymentName: args.deploymentName,
     oldVersion: args.oldVersion,
     newBinaryPath: args.newBinaryPath,
     newVersion: args.newVersion,
     ports: args.ports,
-    oldAdminKey,
-    newAdminKey,
-    instanceSecret: args.instanceSecret,
+    adminKey,
+    instanceSecret,
     cloudProjectId: args.cloudProjectId
   });
+  return { cleanupHandle, adminKey };
 }
 async function handleUpgrade(ctx, args) {
+  const { adminKey } = args;
   const { binaryPath: oldBinaryPath } = await (0, import_download.ensureBackendBinaryDownloaded)(
     ctx,
     {
@@ -161,7 +176,7 @@ async function handleUpgrade(ctx, args) {
   const deploymentUrl = (0, import_run2.localDeploymentUrl)(args.ports.cloud);
   const envs = await (0, import_run.runSystemQuery)(ctx, {
     deploymentUrl,
-    adminKey: args.oldAdminKey,
+    adminKey,
     functionName: "_system/cli/queryEnvironmentVariables",
     componentPath: void 0,
     args: {}
@@ -174,13 +189,13 @@ async function handleUpgrade(ctx, args) {
   if (ctx.fs.exists(exportPath)) {
     ctx.fs.unlink(exportPath);
   }
-  const snaphsotExportState = await (0, import_convexExport.startSnapshotExport)(ctx, {
+  const snapshotExportState = await (0, import_convexExport.startSnapshotExport)(ctx, {
     deploymentUrl,
-    adminKey: args.oldAdminKey,
+    adminKey,
     includeStorage: true,
     inputPath: exportPath
   });
-  if (snaphsotExportState.state !== "completed") {
+  if (snapshotExportState.state !== "completed") {
     return ctx.crash({
       exitCode: 1,
       errorType: "fatal",
@@ -188,9 +203,9 @@ async function handleUpgrade(ctx, args) {
     });
   }
   await (0, import_convexExport.downloadSnapshotExport)(ctx, {
-    snapshotExportTs: snaphsotExportState.start_ts,
+    snapshotExportTs: snapshotExportState.start_ts,
     inputPath: exportPath,
-    adminKey: args.oldAdminKey,
+    adminKey,
     deploymentUrl
   });
   (0, import_log.logVerbose)("Stopping the backend on the old version");
@@ -217,7 +232,7 @@ async function handleUpgrade(ctx, args) {
   if (envs.length > 0) {
     const fetch = (0, import_utils.deploymentFetch)(ctx, {
       deploymentUrl,
-      adminKey: args.newAdminKey
+      adminKey
     });
     try {
       await fetch("/api/update_environment_variables", {
@@ -231,7 +246,7 @@ async function handleUpgrade(ctx, args) {
   (0, import_log.logVerbose)("Doing a snapshot import");
   const importId = await (0, import_convexImport.uploadForImport)(ctx, {
     deploymentUrl,
-    adminKey: args.newAdminKey,
+    adminKey,
     filePath: exportPath,
     importArgs: { format: "zip", mode: "replace", tableName: void 0 },
     onImportFailed: async (e) => {
@@ -242,7 +257,7 @@ async function handleUpgrade(ctx, args) {
   let status = await (0, import_convexImport.waitForStableImportState)(ctx, {
     importId,
     deploymentUrl,
-    adminKey: args.newAdminKey,
+    adminKey,
     onProgress: () => {
       return 0;
     }
@@ -258,7 +273,7 @@ async function handleUpgrade(ctx, args) {
   }
   await (0, import_convexImport.confirmImport)(ctx, {
     importId,
-    adminKey: args.newAdminKey,
+    adminKey,
     deploymentUrl,
     onError: async (e) => {
       (0, import_log.logFailure)(`Failed to confirm import: ${e}`);
@@ -268,7 +283,7 @@ async function handleUpgrade(ctx, args) {
   status = await (0, import_convexImport.waitForStableImportState)(ctx, {
     importId,
     deploymentUrl,
-    adminKey: args.newAdminKey,
+    adminKey,
     onProgress: () => {
       return 0;
     }
@@ -287,7 +302,7 @@ async function handleUpgrade(ctx, args) {
   (0, import_filePaths.saveDeploymentConfig)(ctx, args.deploymentKind, args.deploymentName, {
     ports: args.ports,
     backendVersion: args.newVersion,
-    adminKey: args.newAdminKey,
+    adminKey,
     instanceSecret: args.instanceSecret,
     cloudProjectId: args.cloudProjectId
   });

package/dist/cjs/cli/lib/localDeployment/upgrade.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lib/localDeployment/upgrade.ts"],
-  "sourcesContent": ["import path from \"path\";\nimport { Context } from \"../../../bundler/context.js\";\nimport {\n  logFailure,\n  logFinishedStep,\n  logVerbose,\n} from \"../../../bundler/log.js\";\nimport { runSystemQuery } from \"../run.js\";\nimport {\n  LocalDeploymentConfig,\n  LocalDeploymentKind,\n  deploymentStateDir,\n  loadDeploymentConfig,\n  saveDeploymentConfig,\n} from \"./filePaths.js\";\nimport {\n  ensureBackendStopped,\n  localDeploymentUrl,\n  runLocalBackend,\n} from \"./run.js\";\nimport {\n  downloadSnapshotExport,\n  startSnapshotExport,\n} from \"../convexExport.js\";\nimport { deploymentFetch, logAndHandleFetchError } from \"../utils/utils.js\";\nimport {\n  confirmImport,\n  uploadForImport,\n  waitForStableImportState,\n} from \"../convexImport.js\";\nimport { promptOptions, promptYesNo } from \"../utils/prompts.js\";\nimport { recursivelyDelete } from \"../fsUtils.js\";\nimport { LocalDeploymentError } from \"./errors.js\";\nimport { ensureBackendBinaryDownloaded } from \"./download.js\";\nexport async function handlePotentialUpgrade(\n  ctx: Context,\n  args: {\n    deploymentKind: LocalDeploymentKind;\n    deploymentName: string;\n    oldVersion: string | null;\n    newBinaryPath: string;\n    newVersion: string;\n    ports: {\n      cloud: number;\n      site: number;\n    };\n    adminKey: string;\n    instanceSecret: string;\n    forceUpgrade: boolean;\n    cloudProjectId: number | undefined;\n  },\n): Promise<{ cleanupHandle: string }> {\n  const newConfig: LocalDeploymentConfig = {\n    ports: args.ports,\n    backendVersion: args.newVersion,\n    adminKey: args.adminKey,\n    instanceSecret: args.instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  };\n  if (args.oldVersion === null || args.oldVersion === args.newVersion) {\n    // No upgrade needed. Save the current config and start running the backend.\n    saveDeploymentConfig(\n      ctx,\n      args.deploymentKind,\n      args.deploymentName,\n      newConfig,\n    );\n    return runLocalBackend(ctx, {\n      binaryPath: args.newBinaryPath,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      ports: args.ports,\n      instanceSecret: args.instanceSecret,\n      isLatestVersion: true,\n    });\n  }\n  logVerbose(\n    `Considering upgrade from ${args.oldVersion} to ${args.newVersion}`,\n  );\n  const confirmed =\n    args.forceUpgrade ||\n    !process.stdin.isTTY ||\n    (await promptYesNo(ctx, {\n      message: `This deployment is using an older version of the Convex backend. Upgrade now?`,\n      default: true,\n    }));\n  if (!confirmed) {\n    const { binaryPath: oldBinaryPath } = await ensureBackendBinaryDownloaded(\n      ctx,\n      {\n        kind: \"version\",\n        version: args.oldVersion,\n      },\n    );\n    // Skipping upgrade, save the config with the old version and run.\n    saveDeploymentConfig(ctx, args.deploymentKind, args.deploymentName, {\n      ...newConfig,\n      backendVersion: args.oldVersion,\n    });\n    return runLocalBackend(ctx, {\n      binaryPath: oldBinaryPath,\n      ports: args.ports,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      instanceSecret: args.instanceSecret,\n      isLatestVersion: false,\n    });\n  }\n  const choice =\n    args.forceUpgrade || !process.stdin.isTTY\n      ? \"transfer\"\n      : await promptOptions(ctx, {\n          message: \"Transfer data from existing deployment?\",\n          default: \"transfer\",\n          choices: [\n            { name: \"transfer data\", value: \"transfer\" },\n            { name: \"start fresh\", value: \"reset\" },\n          ],\n        });\n  const deploymentStatePath = deploymentStateDir(\n    ctx,\n    args.deploymentKind,\n    args.deploymentName,\n  );\n  if (choice === \"reset\") {\n    recursivelyDelete(ctx, deploymentStatePath, { force: true });\n    saveDeploymentConfig(\n      ctx,\n      args.deploymentKind,\n      args.deploymentName,\n      newConfig,\n    );\n    return runLocalBackend(ctx, {\n      binaryPath: args.newBinaryPath,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      ports: args.ports,\n      instanceSecret: args.instanceSecret,\n      isLatestVersion: true,\n    });\n  }\n  const newAdminKey = args.adminKey;\n  const oldAdminKey =\n    loadDeploymentConfig(ctx, args.deploymentKind, args.deploymentName)\n      ?.adminKey ?? args.adminKey;\n  return handleUpgrade(ctx, {\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    oldVersion: args.oldVersion!,\n    newBinaryPath: args.newBinaryPath,\n    newVersion: args.newVersion,\n    ports: args.ports,\n    oldAdminKey,\n    newAdminKey,\n    instanceSecret: args.instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  });\n}\n\nasync function handleUpgrade(\n  ctx: Context,\n  args: {\n    deploymentName: string;\n    deploymentKind: LocalDeploymentKind;\n    oldVersion: string;\n    newBinaryPath: string;\n    newVersion: string;\n    ports: {\n      cloud: number;\n      site: number;\n    };\n    // In most of the cases the admin key is the same for the old and new version.\n    // This is helpful when we start generating new admin key formats that might\n    // be incompatible with older backend versions.\n    oldAdminKey: string;\n    newAdminKey: string;\n    instanceSecret: string;\n    cloudProjectId: number | undefined;\n  },\n): Promise<{ cleanupHandle: string }> {\n  const { binaryPath: oldBinaryPath } = await ensureBackendBinaryDownloaded(\n    ctx,\n    {\n      kind: \"version\",\n      version: args.oldVersion,\n    },\n  );\n\n  logVerbose(\"Running backend on old version\");\n  const { cleanupHandle: oldCleanupHandle } = await runLocalBackend(ctx, {\n    binaryPath: oldBinaryPath,\n    ports: args.ports,\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    instanceSecret: args.instanceSecret,\n    isLatestVersion: false,\n  });\n\n  logVerbose(\"Downloading env vars\");\n  const deploymentUrl = localDeploymentUrl(args.ports.cloud);\n  const envs = (await runSystemQuery(ctx, {\n    deploymentUrl,\n    adminKey: args.oldAdminKey,\n    functionName: \"_system/cli/queryEnvironmentVariables\",\n    componentPath: undefined,\n    args: {},\n  })) as Array<{\n    name: string;\n    value: string;\n  }>;\n\n  logVerbose(\"Doing a snapshot export\");\n  const exportPath = path.join(\n    deploymentStateDir(ctx, args.deploymentKind, args.deploymentName),\n    \"export.zip\",\n  );\n  if (ctx.fs.exists(exportPath)) {\n    ctx.fs.unlink(exportPath);\n  }\n  const snaphsotExportState = await startSnapshotExport(ctx, {\n    deploymentUrl,\n    adminKey: args.oldAdminKey,\n    includeStorage: true,\n    inputPath: exportPath,\n  });\n  if (snaphsotExportState.state !== \"completed\") {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: \"Failed to export snapshot\",\n    });\n  }\n  await downloadSnapshotExport(ctx, {\n    snapshotExportTs: snaphsotExportState.start_ts,\n    inputPath: exportPath,\n    adminKey: args.oldAdminKey,\n    deploymentUrl,\n  });\n\n  logVerbose(\"Stopping the backend on the old version\");\n  const oldCleanupFunc = ctx.removeCleanup(oldCleanupHandle);\n  if (oldCleanupFunc) {\n    await oldCleanupFunc(0);\n  }\n  await ensureBackendStopped(ctx, {\n    ports: args.ports,\n    maxTimeSecs: 5,\n    deploymentName: args.deploymentName,\n    allowOtherDeployments: false,\n  });\n\n  // TODO(ENG-7078) save old artifacts to backup files\n  logVerbose(\"Running backend on new version\");\n  const { cleanupHandle } = await runLocalBackend(ctx, {\n    binaryPath: args.newBinaryPath,\n    ports: args.ports,\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    instanceSecret: args.instanceSecret,\n    isLatestVersion: true,\n  });\n\n  logVerbose(\"Importing the env vars\");\n  if (envs.length > 0) {\n    const fetch = deploymentFetch(ctx, {\n      deploymentUrl,\n      adminKey: args.newAdminKey,\n    });\n    try {\n      await fetch(\"/api/update_environment_variables\", {\n        body: JSON.stringify({ changes: envs }),\n        method: \"POST\",\n      });\n    } catch (e) {\n      // TODO: this should ideally have a `LocalDeploymentError`\n      return await logAndHandleFetchError(ctx, e);\n    }\n  }\n\n  logVerbose(\"Doing a snapshot import\");\n  const importId = await uploadForImport(ctx, {\n    deploymentUrl,\n    adminKey: args.newAdminKey,\n    filePath: exportPath,\n    importArgs: { format: \"zip\", mode: \"replace\", tableName: undefined },\n    onImportFailed: async (e) => {\n      logFailure(`Failed to import snapshot: ${e}`);\n    },\n  });\n  logVerbose(`Snapshot import started`);\n  let status = await waitForStableImportState(ctx, {\n    importId,\n    deploymentUrl,\n    adminKey: args.newAdminKey,\n    onProgress: () => {\n      // do nothing for now\n      return 0;\n    },\n  });\n  if (status.state !== \"waiting_for_confirmation\") {\n    const message = \"Error while transferring data: Failed to upload snapshot\";\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: message,\n      errForSentry: new LocalDeploymentError(message),\n    });\n  }\n\n  await confirmImport(ctx, {\n    importId,\n    adminKey: args.newAdminKey,\n    deploymentUrl,\n    onError: async (e) => {\n      logFailure(`Failed to confirm import: ${e}`);\n    },\n  });\n  logVerbose(`Snapshot import confirmed`);\n  status = await waitForStableImportState(ctx, {\n    importId,\n    deploymentUrl,\n    adminKey: args.newAdminKey,\n    onProgress: () => {\n      // do nothing for now\n      return 0;\n    },\n  });\n  logVerbose(`Snapshot import status: ${status.state}`);\n  if (status.state !== \"completed\") {\n    const message = \"Error while transferring data: Failed to import snapshot\";\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: message,\n      errForSentry: new LocalDeploymentError(message),\n    });\n  }\n\n  logFinishedStep(\"Successfully upgraded to a new backend version\");\n  saveDeploymentConfig(ctx, args.deploymentKind, args.deploymentName, {\n    ports: args.ports,\n    backendVersion: args.newVersion,\n    adminKey: args.newAdminKey,\n    instanceSecret: args.instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  });\n\n  return { cleanupHandle };\n}\n"],
-  "mappings": "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",
-  "names": ["import_run", "path"]
+  "sourcesContent": ["import path from \"path\";\nimport { Context } from \"../../../bundler/context.js\";\nimport {\n  logFailure,\n  logFinishedStep,\n  logVerbose,\n} from \"../../../bundler/log.js\";\nimport { runSystemQuery } from \"../run.js\";\nimport {\n  LocalDeploymentConfig,\n  LocalDeploymentKind,\n  deploymentStateDir,\n  saveDeploymentConfig,\n} from \"./filePaths.js\";\nimport {\n  ensureBackendStopped,\n  localDeploymentUrl,\n  runLocalBackend,\n} from \"./run.js\";\nimport {\n  downloadSnapshotExport,\n  startSnapshotExport,\n} from \"../convexExport.js\";\nimport { deploymentFetch, logAndHandleFetchError } from \"../utils/utils.js\";\nimport {\n  confirmImport,\n  uploadForImport,\n  waitForStableImportState,\n} from \"../convexImport.js\";\nimport { promptOptions, promptYesNo } from \"../utils/prompts.js\";\nimport { recursivelyDelete } from \"../fsUtils.js\";\nimport { LocalDeploymentError } from \"./errors.js\";\nimport { ensureBackendBinaryDownloaded } from \"./download.js\";\nimport {\n  generateLocalDevSecretsWithLatestBinary,\n  LEGACY_LOCAL_BACKEND_INSTANCE_SECRET,\n} from \"./secrets.js\";\n\nexport async function handlePotentialUpgradeAndStart(\n  ctx: Context,\n  args: {\n    deploymentKind: LocalDeploymentKind;\n    deploymentName: string;\n    oldVersion: string | null;\n    newBinaryPath: string;\n    newVersion: string;\n    ports: {\n      cloud: number;\n      site: number;\n    };\n    existingCredentials: { adminKey: string; instanceSecret: string } | null;\n    forceUpgrade: boolean;\n    cloudProjectId: number | undefined;\n  },\n): Promise<{ cleanupHandle: string; adminKey: string }> {\n  const { adminKey, instanceSecret } =\n    args.existingCredentials === null ||\n    args.existingCredentials.instanceSecret ===\n      LEGACY_LOCAL_BACKEND_INSTANCE_SECRET\n      ? // Using `generateLocalDevSecretsFromLatestBinary` instead of `generateLocalDevSecrets`\n        // here, because `newBinaryPath` can be a binary that doesn\u2019t support\n        // the `keygen admin-key` subcommand (when the --local-backend-version flag is provided to the CLI)\n        //\n        // In most cases (the user is not using the flag), we have already downloaded the latest binary\n        // shortly before in handleLocalDeployment/handleAnonymousDeployment, so this doesn\u2019t cause an\n        // extra download (even if the user chooses later not to upgrade their deployment)\n        await generateLocalDevSecretsWithLatestBinary(ctx, {\n          deploymentName: args.deploymentName,\n        })\n      : args.existingCredentials;\n  const newConfig: LocalDeploymentConfig = {\n    ports: args.ports,\n    backendVersion: args.newVersion,\n    adminKey,\n    instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  };\n  if (args.oldVersion === null || args.oldVersion === args.newVersion) {\n    // No upgrade needed. Save the current config and start running the backend.\n    saveDeploymentConfig(\n      ctx,\n      args.deploymentKind,\n      args.deploymentName,\n      newConfig,\n    );\n    const { cleanupHandle } = await runLocalBackend(ctx, {\n      binaryPath: args.newBinaryPath,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      ports: args.ports,\n      instanceSecret,\n      isLatestVersion: true,\n    });\n    return { cleanupHandle, adminKey };\n  }\n  logVerbose(\n    `Considering upgrade from ${args.oldVersion} to ${args.newVersion}`,\n  );\n  const confirmed =\n    args.forceUpgrade ||\n    !process.stdin.isTTY ||\n    (await promptYesNo(ctx, {\n      message: `This deployment is using an older version of the Convex backend. Upgrade now?`,\n      default: true,\n    }));\n  if (!confirmed) {\n    const { binaryPath: oldBinaryPath } = await ensureBackendBinaryDownloaded(\n      ctx,\n      {\n        kind: \"version\",\n        version: args.oldVersion,\n      },\n    );\n    // Skipping upgrade, save the config with the old version and run.\n    saveDeploymentConfig(ctx, args.deploymentKind, args.deploymentName, {\n      ...newConfig,\n      backendVersion: args.oldVersion,\n    });\n    const { cleanupHandle } = await runLocalBackend(ctx, {\n      binaryPath: oldBinaryPath,\n      ports: args.ports,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      instanceSecret,\n      isLatestVersion: false,\n    });\n    return { cleanupHandle, adminKey };\n  }\n  const choice =\n    args.forceUpgrade || !process.stdin.isTTY\n      ? \"transfer\"\n      : await promptOptions(ctx, {\n          message: \"Transfer data from existing deployment?\",\n          default: \"transfer\",\n          choices: [\n            { name: \"transfer data\", value: \"transfer\" },\n            { name: \"start fresh\", value: \"reset\" },\n          ],\n        });\n  const deploymentStatePath = deploymentStateDir(\n    ctx,\n    args.deploymentKind,\n    args.deploymentName,\n  );\n  if (choice === \"reset\") {\n    recursivelyDelete(ctx, deploymentStatePath, { force: true });\n    saveDeploymentConfig(\n      ctx,\n      args.deploymentKind,\n      args.deploymentName,\n      newConfig,\n    );\n    const { cleanupHandle } = await runLocalBackend(ctx, {\n      binaryPath: args.newBinaryPath,\n      deploymentKind: args.deploymentKind,\n      deploymentName: args.deploymentName,\n      ports: args.ports,\n      instanceSecret,\n      isLatestVersion: true,\n    });\n    return { cleanupHandle, adminKey };\n  }\n  const { cleanupHandle } = await handleUpgrade(ctx, {\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    oldVersion: args.oldVersion!,\n    newBinaryPath: args.newBinaryPath,\n    newVersion: args.newVersion,\n    ports: args.ports,\n    adminKey,\n    instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  });\n  return { cleanupHandle, adminKey };\n}\n\nasync function handleUpgrade(\n  ctx: Context,\n  args: {\n    deploymentName: string;\n    deploymentKind: LocalDeploymentKind;\n    oldVersion: string;\n    newBinaryPath: string;\n    newVersion: string;\n    ports: {\n      cloud: number;\n      site: number;\n    };\n    instanceSecret: string;\n    adminKey: string;\n    cloudProjectId: number | undefined;\n  },\n): Promise<{ cleanupHandle: string }> {\n  const { adminKey } = args;\n  const { binaryPath: oldBinaryPath } = await ensureBackendBinaryDownloaded(\n    ctx,\n    {\n      kind: \"version\",\n      version: args.oldVersion,\n    },\n  );\n\n  logVerbose(\"Running backend on old version\");\n  const { cleanupHandle: oldCleanupHandle } = await runLocalBackend(ctx, {\n    binaryPath: oldBinaryPath,\n    ports: args.ports,\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    instanceSecret: args.instanceSecret,\n    isLatestVersion: false,\n  });\n\n  logVerbose(\"Downloading env vars\");\n  const deploymentUrl = localDeploymentUrl(args.ports.cloud);\n  const envs = (await runSystemQuery(ctx, {\n    deploymentUrl,\n    adminKey,\n    functionName: \"_system/cli/queryEnvironmentVariables\",\n    componentPath: undefined,\n    args: {},\n  })) as Array<{\n    name: string;\n    value: string;\n  }>;\n\n  logVerbose(\"Doing a snapshot export\");\n  const exportPath = path.join(\n    deploymentStateDir(ctx, args.deploymentKind, args.deploymentName),\n    \"export.zip\",\n  );\n  if (ctx.fs.exists(exportPath)) {\n    ctx.fs.unlink(exportPath);\n  }\n  const snapshotExportState = await startSnapshotExport(ctx, {\n    deploymentUrl,\n    adminKey,\n    includeStorage: true,\n    inputPath: exportPath,\n  });\n  if (snapshotExportState.state !== \"completed\") {\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: \"Failed to export snapshot\",\n    });\n  }\n  await downloadSnapshotExport(ctx, {\n    snapshotExportTs: snapshotExportState.start_ts,\n    inputPath: exportPath,\n    adminKey,\n    deploymentUrl,\n  });\n\n  logVerbose(\"Stopping the backend on the old version\");\n  const oldCleanupFunc = ctx.removeCleanup(oldCleanupHandle);\n  if (oldCleanupFunc) {\n    await oldCleanupFunc(0);\n  }\n  await ensureBackendStopped(ctx, {\n    ports: args.ports,\n    maxTimeSecs: 5,\n    deploymentName: args.deploymentName,\n    allowOtherDeployments: false,\n  });\n\n  // TODO(ENG-7078) save old artifacts to backup files\n  logVerbose(\"Running backend on new version\");\n  const { cleanupHandle } = await runLocalBackend(ctx, {\n    binaryPath: args.newBinaryPath,\n    ports: args.ports,\n    deploymentKind: args.deploymentKind,\n    deploymentName: args.deploymentName,\n    instanceSecret: args.instanceSecret,\n    isLatestVersion: true,\n  });\n\n  logVerbose(\"Importing the env vars\");\n  if (envs.length > 0) {\n    const fetch = deploymentFetch(ctx, {\n      deploymentUrl,\n      adminKey,\n    });\n    try {\n      await fetch(\"/api/update_environment_variables\", {\n        body: JSON.stringify({ changes: envs }),\n        method: \"POST\",\n      });\n    } catch (e) {\n      // TODO: this should ideally have a `LocalDeploymentError`\n      return await logAndHandleFetchError(ctx, e);\n    }\n  }\n\n  logVerbose(\"Doing a snapshot import\");\n  const importId = await uploadForImport(ctx, {\n    deploymentUrl,\n    adminKey,\n    filePath: exportPath,\n    importArgs: { format: \"zip\", mode: \"replace\", tableName: undefined },\n    onImportFailed: async (e) => {\n      logFailure(`Failed to import snapshot: ${e}`);\n    },\n  });\n  logVerbose(`Snapshot import started`);\n  let status = await waitForStableImportState(ctx, {\n    importId,\n    deploymentUrl,\n    adminKey,\n    onProgress: () => {\n      // do nothing for now\n      return 0;\n    },\n  });\n  if (status.state !== \"waiting_for_confirmation\") {\n    const message = \"Error while transferring data: Failed to upload snapshot\";\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: message,\n      errForSentry: new LocalDeploymentError(message),\n    });\n  }\n\n  await confirmImport(ctx, {\n    importId,\n    adminKey,\n    deploymentUrl,\n    onError: async (e) => {\n      logFailure(`Failed to confirm import: ${e}`);\n    },\n  });\n  logVerbose(`Snapshot import confirmed`);\n  status = await waitForStableImportState(ctx, {\n    importId,\n    deploymentUrl,\n    adminKey,\n    onProgress: () => {\n      // do nothing for now\n      return 0;\n    },\n  });\n  logVerbose(`Snapshot import status: ${status.state}`);\n  if (status.state !== \"completed\") {\n    const message = \"Error while transferring data: Failed to import snapshot\";\n    return ctx.crash({\n      exitCode: 1,\n      errorType: \"fatal\",\n      printedMessage: message,\n      errForSentry: new LocalDeploymentError(message),\n    });\n  }\n\n  logFinishedStep(\"Successfully upgraded to a new backend version\");\n  saveDeploymentConfig(ctx, args.deploymentKind, args.deploymentName, {\n    ports: args.ports,\n    backendVersion: args.newVersion,\n    adminKey,\n    instanceSecret: args.instanceSecret,\n    cloudProjectId: args.cloudProjectId,\n  });\n\n  return { cleanupHandle };\n}\n"],
+  "mappings": "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",
+  "names": ["import_run", "cleanupHandle", "path"]
 }

package/dist/cjs/cli/lib/localDeployment/utils.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,28 +15,17 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
   LOCAL_BACKEND_INSTANCE_SECRET: () => LOCAL_BACKEND_INSTANCE_SECRET,
   chooseLocalBackendPorts: () => chooseLocalBackendPorts,
   choosePorts: () => choosePorts,
-  generateInstanceSecret: () => generateInstanceSecret,
-  isOffline: () => isOffline,
   printLocalDeploymentWelcomeMessage: () => printLocalDeploymentWelcomeMessage
 });
 module.exports = __toCommonJS(utils_exports);
 var import_log = require("../../../bundler/log.js");
 var import_detect_port = require("detect-port");
-var import_crypto = __toESM(require("crypto"), 1);
 var import_chalk = require("chalk");
 async function choosePorts(ctx, {
   count,
@@ -91,9 +78,6 @@ async function chooseLocalBackendPorts(ctx, options) {
   });
   return { cloudPort, sitePort };
 }
-async function isOffline() {
-  return false;
-}
 function printLocalDeploymentWelcomeMessage() {
   (0, import_log.logMessage)(
     import_chalk.chalkStderr.cyan("You're trying out the beta local deployment feature!")
@@ -104,8 +88,5 @@ function printLocalDeploymentWelcomeMessage() {
     )
   );
 }
-function generateInstanceSecret() {
-  return import_crypto.default.randomBytes(32).toString("hex");
-}
 const LOCAL_BACKEND_INSTANCE_SECRET = "4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974";
 //# sourceMappingURL=utils.js.map

package/dist/cjs/cli/lib/localDeployment/utils.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/cli/lib/localDeployment/utils.ts"],
-  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logMessage } from \"../../../bundler/log.js\";\nimport { detect } from \"detect-port\";\nimport crypto from \"crypto\";\nimport { chalkStderr } from \"chalk\";\n\nexport async function choosePorts(\n  ctx: Context,\n  {\n    count,\n    requestedPorts,\n    suggestedPorts,\n    startPort,\n  }: {\n    count: number;\n    /** Ports that must mandatorily be used when provided. */\n    requestedPorts?: Array<number | null>;\n    /** Ports that will be tried preferentially when provided, but are not required. */\n    suggestedPorts?: Array<number | null>;\n    startPort: number;\n  },\n): Promise<Array<number>> {\n  const ports: Array<number> = [];\n  for (let i = 0; i < count; i++) {\n    const requestedPort = requestedPorts?.[i];\n    if (requestedPort !== null) {\n      const port = await detect(requestedPort);\n      if (port !== requestedPort) {\n        return ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Requested port ${requestedPort} is not available`,\n        });\n      }\n      ports.push(port);\n    } else {\n      const suggestedPort = suggestedPorts?.[ports.length] ?? null;\n      if (suggestedPort !== null) {\n        const port = await detect(suggestedPort);\n        if (port === suggestedPort) {\n          ports.push(suggestedPort);\n          continue;\n        }\n      }\n\n      const portToTry =\n        ports.length > 0 ? ports[ports.length - 1] + 1 : startPort;\n      const port = await detect(portToTry);\n      ports.push(port);\n    }\n  }\n  return ports;\n}\n\nexport async function chooseLocalBackendPorts(\n  ctx: Context,\n  options?: {\n    suggestedPorts?:\n      | { cloud?: number | undefined; site?: number | undefined }\n      | undefined;\n    requestedPorts?:\n      | { cloud?: number | undefined; site?: number | undefined }\n      | undefined;\n  },\n): Promise<{ cloudPort: number; sitePort: number }> {\n  const { suggestedPorts, requestedPorts } = options ?? {};\n\n  const [cloudPort, sitePort] = await choosePorts(ctx, {\n    count: 2,\n    startPort: 3210,\n    requestedPorts: [\n      requestedPorts?.cloud ?? null,\n      requestedPorts?.site ?? null,\n    ],\n    suggestedPorts: [\n      suggestedPorts?.cloud ?? null,\n      suggestedPorts?.site ?? null,\n    ],\n  });\n  return { cloudPort, sitePort };\n}\n\nexport async function isOffline(): Promise<boolean> {\n  // TODO(ENG-7080) -- implement this for real\n  return false;\n}\n\nexport function printLocalDeploymentWelcomeMessage() {\n  logMessage(\n    chalkStderr.cyan(\"You're trying out the beta local deployment feature!\"),\n  );\n  logMessage(\n    chalkStderr.cyan(\n      \"To learn more, read the docs: https://docs.convex.dev/cli/local-deployments\",\n    ),\n  );\n}\n\nexport function generateInstanceSecret(): string {\n  return crypto.randomBytes(32).toString(\"hex\");\n}\n\nexport const LOCAL_BACKEND_INSTANCE_SECRET =\n  \"4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974\";\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,yBAAuB;AACvB,oBAAmB;AACnB,mBAA4B;AAE5B,eAAsB,YACpB,KACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAQwB;AACxB,QAAM,QAAuB,CAAC;AAC9B,WAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,UAAM,gBAAgB,iBAAiB,CAAC;AACxC,QAAI,kBAAkB,MAAM;AAC1B,YAAM,OAAO,UAAM,2BAAO,aAAa;AACvC,UAAI,SAAS,eAAe;AAC1B,eAAO,IAAI,MAAM;AAAA,UACf,UAAU;AAAA,UACV,WAAW;AAAA,UACX,gBAAgB,kBAAkB,aAAa;AAAA,QACjD,CAAC;AAAA,MACH;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,OAAO;AACL,YAAM,gBAAgB,iBAAiB,MAAM,MAAM,KAAK;AACxD,UAAI,kBAAkB,MAAM;AAC1B,cAAMA,QAAO,UAAM,2BAAO,aAAa;AACvC,YAAIA,UAAS,eAAe;AAC1B,gBAAM,KAAK,aAAa;AACxB;AAAA,QACF;AAAA,MACF;AAEA,YAAM,YACJ,MAAM,SAAS,IAAI,MAAM,MAAM,SAAS,CAAC,IAAI,IAAI;AACnD,YAAM,OAAO,UAAM,2BAAO,SAAS;AACnC,YAAM,KAAK,IAAI;AAAA,IACjB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAsB,wBACpB,KACA,SAQkD;AAClD,QAAM,EAAE,gBAAgB,eAAe,IAAI,WAAW,CAAC;AAEvD,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,YAAY,KAAK;AAAA,IACnD,OAAO;AAAA,IACP,WAAW;AAAA,IACX,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,IACA,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,EACF,CAAC;AACD,SAAO,EAAE,WAAW,SAAS;AAC/B;AAEA,eAAsB,YAA8B;AAElD,SAAO;AACT;AAEO,SAAS,qCAAqC;AACnD;AAAA,IACE,yBAAY,KAAK,sDAAsD;AAAA,EACzE;AACA;AAAA,IACE,yBAAY;AAAA,MACV;AAAA,IACF;AAAA,EACF;AACF;AAEO,SAAS,yBAAiC;AAC/C,SAAO,cAAAC,QAAO,YAAY,EAAE,EAAE,SAAS,KAAK;AAC9C;AAEO,MAAM,gCACX;",
-  "names": ["port", "crypto"]
+  "sourcesContent": ["import { Context } from \"../../../bundler/context.js\";\nimport { logMessage } from \"../../../bundler/log.js\";\nimport { detect } from \"detect-port\";\nimport { chalkStderr } from \"chalk\";\n\nexport async function choosePorts(\n  ctx: Context,\n  {\n    count,\n    requestedPorts,\n    suggestedPorts,\n    startPort,\n  }: {\n    count: number;\n    /** Ports that must mandatorily be used when provided. */\n    requestedPorts?: Array<number | null>;\n    /** Ports that will be tried preferentially when provided, but are not required. */\n    suggestedPorts?: Array<number | null>;\n    startPort: number;\n  },\n): Promise<Array<number>> {\n  const ports: Array<number> = [];\n  for (let i = 0; i < count; i++) {\n    const requestedPort = requestedPorts?.[i];\n    if (requestedPort !== null) {\n      const port = await detect(requestedPort);\n      if (port !== requestedPort) {\n        return ctx.crash({\n          exitCode: 1,\n          errorType: \"fatal\",\n          printedMessage: `Requested port ${requestedPort} is not available`,\n        });\n      }\n      ports.push(port);\n    } else {\n      const suggestedPort = suggestedPorts?.[ports.length] ?? null;\n      if (suggestedPort !== null) {\n        const port = await detect(suggestedPort);\n        if (port === suggestedPort) {\n          ports.push(suggestedPort);\n          continue;\n        }\n      }\n\n      const portToTry =\n        ports.length > 0 ? ports[ports.length - 1] + 1 : startPort;\n      const port = await detect(portToTry);\n      ports.push(port);\n    }\n  }\n  return ports;\n}\n\nexport async function chooseLocalBackendPorts(\n  ctx: Context,\n  options?: {\n    suggestedPorts?:\n      | { cloud?: number | undefined; site?: number | undefined }\n      | undefined;\n    requestedPorts?:\n      | { cloud?: number | undefined; site?: number | undefined }\n      | undefined;\n  },\n): Promise<{ cloudPort: number; sitePort: number }> {\n  const { suggestedPorts, requestedPorts } = options ?? {};\n\n  const [cloudPort, sitePort] = await choosePorts(ctx, {\n    count: 2,\n    startPort: 3210,\n    requestedPorts: [\n      requestedPorts?.cloud ?? null,\n      requestedPorts?.site ?? null,\n    ],\n    suggestedPorts: [\n      suggestedPorts?.cloud ?? null,\n      suggestedPorts?.site ?? null,\n    ],\n  });\n  return { cloudPort, sitePort };\n}\n\nexport function printLocalDeploymentWelcomeMessage() {\n  logMessage(\n    chalkStderr.cyan(\"You're trying out the beta local deployment feature!\"),\n  );\n  logMessage(\n    chalkStderr.cyan(\n      \"To learn more, read the docs: https://docs.convex.dev/cli/local-deployments\",\n    ),\n  );\n}\n\nexport const LOCAL_BACKEND_INSTANCE_SECRET =\n  \"4361726e697461732c206c69746572616c6c79206d65616e696e6720226c6974\";\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,iBAA2B;AAC3B,yBAAuB;AACvB,mBAA4B;AAE5B,eAAsB,YACpB,KACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAQwB;AACxB,QAAM,QAAuB,CAAC;AAC9B,WAAS,IAAI,GAAG,IAAI,OAAO,KAAK;AAC9B,UAAM,gBAAgB,iBAAiB,CAAC;AACxC,QAAI,kBAAkB,MAAM;AAC1B,YAAM,OAAO,UAAM,2BAAO,aAAa;AACvC,UAAI,SAAS,eAAe;AAC1B,eAAO,IAAI,MAAM;AAAA,UACf,UAAU;AAAA,UACV,WAAW;AAAA,UACX,gBAAgB,kBAAkB,aAAa;AAAA,QACjD,CAAC;AAAA,MACH;AACA,YAAM,KAAK,IAAI;AAAA,IACjB,OAAO;AACL,YAAM,gBAAgB,iBAAiB,MAAM,MAAM,KAAK;AACxD,UAAI,kBAAkB,MAAM;AAC1B,cAAMA,QAAO,UAAM,2BAAO,aAAa;AACvC,YAAIA,UAAS,eAAe;AAC1B,gBAAM,KAAK,aAAa;AACxB;AAAA,QACF;AAAA,MACF;AAEA,YAAM,YACJ,MAAM,SAAS,IAAI,MAAM,MAAM,SAAS,CAAC,IAAI,IAAI;AACnD,YAAM,OAAO,UAAM,2BAAO,SAAS;AACnC,YAAM,KAAK,IAAI;AAAA,IACjB;AAAA,EACF;AACA,SAAO;AACT;AAEA,eAAsB,wBACpB,KACA,SAQkD;AAClD,QAAM,EAAE,gBAAgB,eAAe,IAAI,WAAW,CAAC;AAEvD,QAAM,CAAC,WAAW,QAAQ,IAAI,MAAM,YAAY,KAAK;AAAA,IACnD,OAAO;AAAA,IACP,WAAW;AAAA,IACX,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,IACA,gBAAgB;AAAA,MACd,gBAAgB,SAAS;AAAA,MACzB,gBAAgB,QAAQ;AAAA,IAC1B;AAAA,EACF,CAAC;AACD,SAAO,EAAE,WAAW,SAAS;AAC/B;AAEO,SAAS,qCAAqC;AACnD;AAAA,IACE,yBAAY,KAAK,sDAAsD;AAAA,EACzE;AACA;AAAA,IACE,yBAAY;AAAA,MACV;AAAA,IACF;AAAA,EACF;AACF;AAEO,MAAM,gCACX;",
+  "names": ["port"]
 }

package/dist/cjs/cli/lib/login.js

@@ -283,18 +283,22 @@ async function performLogin(ctx, {
       printedMessage: null
     });
   }
-  const authorizeArgs = {
-    authnToken: accessToken,
-    deviceName,
-    anonymousId
-  };
-  const data = await (0, import_utils.bigBrainAPI)({
-    ctx,
-    method: "POST",
-    path: "authorize",
-    data: authorizeArgs
+  ctx._updateBigBrainAuth({
+    accessToken,
+    kind: "accessToken",
+    header: `Bearer ${accessToken}`
   });
-  const globalConfig = { accessToken: data.accessToken };
+  const response = await (0, import_utils.typedPlatformClient)(ctx).POST(
+    "/create_personal_access_token",
+    {
+      // `anonymousId` links a prior anonymous session to this account. It's
+      // intentionally absent from the generated platform API types,
+      // so cast to pass it through.
+      body: { name: deviceName, anonymousId }
+    }
+  );
+  const newAccessToken = response.data.accessToken;
+  const globalConfig = { accessToken: newAccessToken };
   try {
     await (0, import_globalConfig.modifyGlobalConfig)(ctx, globalConfig);
     const path = (0, import_globalConfig.globalConfigPath)();
@@ -308,7 +312,7 @@ async function performLogin(ctx, {
     });
   }
   (0, import_log.logVerbose)(`performLogin: updating big brain auth after login`);
-  await (0, import_deploymentSelection.updateBigBrainAuthAfterLogin)(ctx, data.accessToken);
+  await (0, import_deploymentSelection.updateBigBrainAuthAfterLogin)(ctx, newAccessToken);
   (0, import_log.logVerbose)(`performLogin: checking opt ins, acceptOptIns: ${acceptOptIns}`);
   const shouldContinue = await optins(ctx, acceptOptIns ?? false);
   if (!shouldContinue) {