convex 1.47.0 → 1.48.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (177) hide show
  1. package/dist/browser.bundle.js +1 -1
  2. package/dist/browser.bundle.js.map +1 -1
  3. package/dist/cjs/bundler/context.js +7 -5
  4. package/dist/cjs/bundler/context.js.map +2 -2
  5. package/dist/cjs/bundler/fs.js +47 -6
  6. package/dist/cjs/bundler/fs.js.map +2 -2
  7. package/dist/cjs/cli/account.js +237 -0
  8. package/dist/cjs/cli/account.js.map +7 -0
  9. package/dist/cjs/cli/configure.js +15 -2
  10. package/dist/cjs/cli/configure.js.map +2 -2
  11. package/dist/cjs/cli/lib/deployKeyWarning.js +43 -0
  12. package/dist/cjs/cli/lib/deployKeyWarning.js.map +7 -0
  13. package/dist/cjs/cli/lib/deployment.js +2 -0
  14. package/dist/cjs/cli/lib/deployment.js.map +2 -2
  15. package/dist/cjs/cli/lib/deploymentSelection.js +27 -18
  16. package/dist/cjs/cli/lib/deploymentSelection.js.map +2 -2
  17. package/dist/cjs/cli/lib/envvars.js +32 -0
  18. package/dist/cjs/cli/lib/envvars.js.map +2 -2
  19. package/dist/cjs/cli/lib/fsUtils.js +1 -1
  20. package/dist/cjs/cli/lib/fsUtils.js.map +2 -2
  21. package/dist/cjs/cli/lib/generateDocs.js +1 -1
  22. package/dist/cjs/cli/lib/generateDocs.js.map +1 -1
  23. package/dist/cjs/cli/lib/login.js +28 -4
  24. package/dist/cjs/cli/lib/login.js.map +2 -2
  25. package/dist/cjs/cli/lib/mcp/requestContext.js +5 -1
  26. package/dist/cjs/cli/lib/mcp/requestContext.js.map +2 -2
  27. package/dist/cjs/cli/lib/profileManagement.js +196 -0
  28. package/dist/cjs/cli/lib/profileManagement.js.map +7 -0
  29. package/dist/cjs/cli/lib/profiles.js +333 -0
  30. package/dist/cjs/cli/lib/profiles.js.map +7 -0
  31. package/dist/cjs/cli/lib/utils/utils.js +18 -9
  32. package/dist/cjs/cli/lib/utils/utils.js.map +2 -2
  33. package/dist/cjs/cli/login.js +213 -114
  34. package/dist/cjs/cli/login.js.map +3 -3
  35. package/dist/cjs/cli/logout.js +113 -12
  36. package/dist/cjs/cli/logout.js.map +3 -3
  37. package/dist/cjs/cli/mcp.js +43 -10
  38. package/dist/cjs/cli/mcp.js.map +3 -3
  39. package/dist/cjs/cli/program.js +2 -1
  40. package/dist/cjs/cli/program.js.map +2 -2
  41. package/dist/cjs/index.js +1 -1
  42. package/dist/cjs/index.js.map +1 -1
  43. package/dist/cjs-types/bundler/context.d.ts +5 -0
  44. package/dist/cjs-types/bundler/context.d.ts.map +1 -1
  45. package/dist/cjs-types/bundler/fs.d.ts +7 -2
  46. package/dist/cjs-types/bundler/fs.d.ts.map +1 -1
  47. package/dist/cjs-types/cli/account.d.ts +6 -0
  48. package/dist/cjs-types/cli/account.d.ts.map +1 -0
  49. package/dist/cjs-types/cli/configure.d.ts.map +1 -1
  50. package/dist/cjs-types/cli/lib/deployKeyWarning.d.ts +3 -0
  51. package/dist/cjs-types/cli/lib/deployKeyWarning.d.ts.map +1 -0
  52. package/dist/cjs-types/cli/lib/deployment.d.ts +2 -0
  53. package/dist/cjs-types/cli/lib/deployment.d.ts.map +1 -1
  54. package/dist/cjs-types/cli/lib/deploymentSelection.d.ts +2 -1
  55. package/dist/cjs-types/cli/lib/deploymentSelection.d.ts.map +1 -1
  56. package/dist/cjs-types/cli/lib/envvars.d.ts +6 -0
  57. package/dist/cjs-types/cli/lib/envvars.d.ts.map +1 -1
  58. package/dist/cjs-types/cli/lib/fsUtils.d.ts +1 -0
  59. package/dist/cjs-types/cli/lib/fsUtils.d.ts.map +1 -1
  60. package/dist/cjs-types/cli/lib/login.d.ts +3 -1
  61. package/dist/cjs-types/cli/lib/login.d.ts.map +1 -1
  62. package/dist/cjs-types/cli/lib/mcp/requestContext.d.ts.map +1 -1
  63. package/dist/cjs-types/cli/lib/mcp/tools/insights.d.ts +2 -2
  64. package/dist/cjs-types/cli/lib/profileManagement.d.ts +10 -0
  65. package/dist/cjs-types/cli/lib/profileManagement.d.ts.map +1 -0
  66. package/dist/cjs-types/cli/lib/profiles.d.ts +59 -0
  67. package/dist/cjs-types/cli/lib/profiles.d.ts.map +1 -0
  68. package/dist/cjs-types/cli/lib/utils/utils.d.ts +5 -0
  69. package/dist/cjs-types/cli/lib/utils/utils.d.ts.map +1 -1
  70. package/dist/cjs-types/cli/login.d.ts +21 -0
  71. package/dist/cjs-types/cli/login.d.ts.map +1 -1
  72. package/dist/cjs-types/cli/logout.d.ts +8 -1
  73. package/dist/cjs-types/cli/logout.d.ts.map +1 -1
  74. package/dist/cjs-types/cli/mcp.d.ts.map +1 -1
  75. package/dist/cjs-types/cli/program.d.ts.map +1 -1
  76. package/dist/cjs-types/index.d.ts +1 -1
  77. package/dist/cjs-types/index.d.ts.map +1 -1
  78. package/dist/cli.bundle.cjs +2118 -1096
  79. package/dist/cli.bundle.cjs.map +4 -4
  80. package/dist/esm/bundler/context.js +7 -5
  81. package/dist/esm/bundler/context.js.map +2 -2
  82. package/dist/esm/bundler/fs.js +47 -6
  83. package/dist/esm/bundler/fs.js.map +2 -2
  84. package/dist/esm/cli/account.js +221 -0
  85. package/dist/esm/cli/account.js.map +7 -0
  86. package/dist/esm/cli/configure.js +15 -2
  87. package/dist/esm/cli/configure.js.map +2 -2
  88. package/dist/esm/cli/lib/deployKeyWarning.js +27 -0
  89. package/dist/esm/cli/lib/deployKeyWarning.js.map +7 -0
  90. package/dist/esm/cli/lib/deployment.js +2 -2
  91. package/dist/esm/cli/lib/deployment.js.map +2 -2
  92. package/dist/esm/cli/lib/deploymentSelection.js +35 -20
  93. package/dist/esm/cli/lib/deploymentSelection.js.map +2 -2
  94. package/dist/esm/cli/lib/envvars.js +35 -1
  95. package/dist/esm/cli/lib/envvars.js.map +2 -2
  96. package/dist/esm/cli/lib/fsUtils.js +1 -1
  97. package/dist/esm/cli/lib/fsUtils.js.map +2 -2
  98. package/dist/esm/cli/lib/generateDocs.js +1 -1
  99. package/dist/esm/cli/lib/generateDocs.js.map +1 -1
  100. package/dist/esm/cli/lib/login.js +36 -4
  101. package/dist/esm/cli/lib/login.js.map +2 -2
  102. package/dist/esm/cli/lib/mcp/requestContext.js +5 -1
  103. package/dist/esm/cli/lib/mcp/requestContext.js.map +2 -2
  104. package/dist/esm/cli/lib/profileManagement.js +179 -0
  105. package/dist/esm/cli/lib/profileManagement.js.map +7 -0
  106. package/dist/esm/cli/lib/profiles.js +288 -0
  107. package/dist/esm/cli/lib/profiles.js.map +7 -0
  108. package/dist/esm/cli/lib/utils/utils.js +16 -9
  109. package/dist/esm/cli/lib/utils/utils.js.map +2 -2
  110. package/dist/esm/cli/login.js +225 -112
  111. package/dist/esm/cli/login.js.map +3 -3
  112. package/dist/esm/cli/logout.js +110 -13
  113. package/dist/esm/cli/logout.js.map +2 -2
  114. package/dist/esm/cli/mcp.js +34 -10
  115. package/dist/esm/cli/mcp.js.map +2 -2
  116. package/dist/esm/cli/program.js +2 -1
  117. package/dist/esm/cli/program.js.map +2 -2
  118. package/dist/esm/index.js +1 -1
  119. package/dist/esm/index.js.map +1 -1
  120. package/dist/esm-types/bundler/context.d.ts +5 -0
  121. package/dist/esm-types/bundler/context.d.ts.map +1 -1
  122. package/dist/esm-types/bundler/fs.d.ts +7 -2
  123. package/dist/esm-types/bundler/fs.d.ts.map +1 -1
  124. package/dist/esm-types/cli/account.d.ts +6 -0
  125. package/dist/esm-types/cli/account.d.ts.map +1 -0
  126. package/dist/esm-types/cli/configure.d.ts.map +1 -1
  127. package/dist/esm-types/cli/lib/deployKeyWarning.d.ts +3 -0
  128. package/dist/esm-types/cli/lib/deployKeyWarning.d.ts.map +1 -0
  129. package/dist/esm-types/cli/lib/deployment.d.ts +2 -0
  130. package/dist/esm-types/cli/lib/deployment.d.ts.map +1 -1
  131. package/dist/esm-types/cli/lib/deploymentSelection.d.ts +2 -1
  132. package/dist/esm-types/cli/lib/deploymentSelection.d.ts.map +1 -1
  133. package/dist/esm-types/cli/lib/envvars.d.ts +6 -0
  134. package/dist/esm-types/cli/lib/envvars.d.ts.map +1 -1
  135. package/dist/esm-types/cli/lib/fsUtils.d.ts +1 -0
  136. package/dist/esm-types/cli/lib/fsUtils.d.ts.map +1 -1
  137. package/dist/esm-types/cli/lib/login.d.ts +3 -1
  138. package/dist/esm-types/cli/lib/login.d.ts.map +1 -1
  139. package/dist/esm-types/cli/lib/mcp/requestContext.d.ts.map +1 -1
  140. package/dist/esm-types/cli/lib/mcp/tools/insights.d.ts +2 -2
  141. package/dist/esm-types/cli/lib/profileManagement.d.ts +10 -0
  142. package/dist/esm-types/cli/lib/profileManagement.d.ts.map +1 -0
  143. package/dist/esm-types/cli/lib/profiles.d.ts +59 -0
  144. package/dist/esm-types/cli/lib/profiles.d.ts.map +1 -0
  145. package/dist/esm-types/cli/lib/utils/utils.d.ts +5 -0
  146. package/dist/esm-types/cli/lib/utils/utils.d.ts.map +1 -1
  147. package/dist/esm-types/cli/login.d.ts +21 -0
  148. package/dist/esm-types/cli/login.d.ts.map +1 -1
  149. package/dist/esm-types/cli/logout.d.ts +8 -1
  150. package/dist/esm-types/cli/logout.d.ts.map +1 -1
  151. package/dist/esm-types/cli/mcp.d.ts.map +1 -1
  152. package/dist/esm-types/cli/program.d.ts.map +1 -1
  153. package/dist/esm-types/index.d.ts +1 -1
  154. package/dist/esm-types/index.d.ts.map +1 -1
  155. package/dist/react.bundle.js +1 -1
  156. package/dist/react.bundle.js.map +1 -1
  157. package/package.json +1 -1
  158. package/src/bundler/context.ts +9 -5
  159. package/src/bundler/fs.ts +54 -5
  160. package/src/cli/account.ts +320 -0
  161. package/src/cli/configure.ts +18 -2
  162. package/src/cli/lib/deployKeyWarning.ts +43 -0
  163. package/src/cli/lib/deployment.ts +2 -2
  164. package/src/cli/lib/deploymentSelection.ts +37 -18
  165. package/src/cli/lib/envvars.ts +43 -1
  166. package/src/cli/lib/fsUtils.ts +5 -2
  167. package/src/cli/lib/generateDocs.ts +1 -1
  168. package/src/cli/lib/login.ts +47 -3
  169. package/src/cli/lib/mcp/requestContext.ts +7 -1
  170. package/src/cli/lib/profileManagement.ts +262 -0
  171. package/src/cli/lib/profiles.ts +398 -0
  172. package/src/cli/lib/utils/utils.ts +19 -15
  173. package/src/cli/login.ts +293 -168
  174. package/src/cli/logout.ts +142 -17
  175. package/src/cli/mcp.ts +48 -11
  176. package/src/cli/program.ts +2 -0
  177. package/src/index.ts +1 -1
@@ -0,0 +1,288 @@
1
+ "use strict";
2
+ import path from "path";
3
+ import { isDeepStrictEqual } from "util";
4
+ import { randomUUID } from "crypto";
5
+ import * as dotenv from "dotenv";
6
+ import { z } from "zod";
7
+ import { logFinishedStep, logWarning } from "../../bundler/log.js";
8
+ import { globalConfigPath, readGlobalConfig } from "./utils/globalConfig.js";
9
+ import { ENV_VAR_FILE_PATH, rootDirectory } from "./utils/utils.js";
10
+ import { CONVEX_ACCOUNT_ENV_VAR } from "./envvars.js";
11
+ const settingsSchema = z.object({
12
+ defaultProfile: z.string().optional(),
13
+ directories: z.record(z.string()).optional(),
14
+ revokeReplacedTokens: z.boolean().optional()
15
+ }).passthrough();
16
+ const credentialsSchema = z.object({
17
+ accessToken: z.string().min(1),
18
+ memberId: z.string().optional(),
19
+ email: z.string().optional()
20
+ }).passthrough();
21
+ export async function readProfileSettings(ctx) {
22
+ if (!ctx.fs.exists(globalConfigPath())) return {};
23
+ try {
24
+ return settingsSchema.parse(
25
+ JSON.parse(ctx.fs.readUtf8File(globalConfigPath()))
26
+ );
27
+ } catch {
28
+ return await ctx.crash({
29
+ exitCode: 1,
30
+ errorType: "invalid filesystem data",
31
+ printedMessage: `Unable to read account settings from ${globalConfigPath()}. Check defaultProfile, directories, and revokeReplacedTokens.`
32
+ });
33
+ }
34
+ }
35
+ function writeProfileSettings(ctx, settings) {
36
+ if (Object.keys(settings).length === 0) {
37
+ if (ctx.fs.exists(globalConfigPath())) ctx.fs.unlink(globalConfigPath());
38
+ return;
39
+ }
40
+ const temporary = `${globalConfigPath()}.${randomUUID()}.tmp`;
41
+ try {
42
+ ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 384);
43
+ ctx.fs.swapTmpFile(temporary, globalConfigPath());
44
+ } finally {
45
+ if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
46
+ }
47
+ }
48
+ export async function updateProfileSettings(ctx, update, afterWrite) {
49
+ const lockPath = `${globalConfigPath()}.lock`;
50
+ ctx.fs.mkdir(rootDirectory(), { allowExisting: true });
51
+ const deadline = Date.now() + 5e3;
52
+ for (; ; ) {
53
+ try {
54
+ ctx.fs.mkdir(lockPath);
55
+ break;
56
+ } catch (err) {
57
+ if (err.code !== "EEXIST") throw err;
58
+ if (Date.now() >= deadline) {
59
+ return await ctx.crash({
60
+ exitCode: 1,
61
+ errorType: "fatal",
62
+ printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`
63
+ });
64
+ }
65
+ await new Promise((resolve) => setTimeout(resolve, 25));
66
+ }
67
+ }
68
+ let released = false;
69
+ const release = () => {
70
+ if (released) return;
71
+ ctx.fs.rmdir(lockPath);
72
+ released = true;
73
+ };
74
+ const cleanup = ctx.registerCleanup(async () => release());
75
+ try {
76
+ const settings = await readProfileSettings(ctx);
77
+ const result = await update(settings);
78
+ writeProfileSettings(ctx, settings);
79
+ afterWrite?.();
80
+ return result;
81
+ } finally {
82
+ ctx.removeCleanup(cleanup);
83
+ release();
84
+ }
85
+ }
86
+ export function profileConfigPath(name) {
87
+ return path.join(
88
+ rootDirectory(),
89
+ "profiles",
90
+ `${encodeURIComponent(name)}.json`
91
+ );
92
+ }
93
+ export async function validateProfileName(ctx, name) {
94
+ if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {
95
+ await ctx.crash({
96
+ exitCode: 1,
97
+ errorType: "invalid filesystem or env vars",
98
+ printedMessage: "Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores."
99
+ });
100
+ }
101
+ }
102
+ export async function getProfileSelection(ctx, options = {}) {
103
+ let name = options.name;
104
+ let source = "--account";
105
+ if (name === void 0 && process.env[CONVEX_ACCOUNT_ENV_VAR] !== void 0) {
106
+ name = process.env[CONVEX_ACCOUNT_ENV_VAR];
107
+ source = `${CONVEX_ACCOUNT_ENV_VAR} environment variable`;
108
+ }
109
+ if (name === void 0) {
110
+ const files = options.envFile ? [options.envFile] : [ENV_VAR_FILE_PATH, ".env"];
111
+ for (const file of files) {
112
+ if (!ctx.fs.exists(file)) continue;
113
+ name = dotenv.parse(ctx.fs.readUtf8File(file))[CONVEX_ACCOUNT_ENV_VAR];
114
+ if (name !== void 0) {
115
+ source = `${CONVEX_ACCOUNT_ENV_VAR} in ${file}`;
116
+ break;
117
+ }
118
+ }
119
+ }
120
+ if (name === void 0) {
121
+ const config = await readProfileSettings(ctx);
122
+ const binding = findProfileDirectory(
123
+ config.directories ?? {},
124
+ process.cwd()
125
+ );
126
+ name = binding?.name ?? config.defaultProfile;
127
+ source = binding ? `directory selection for ${binding.directory}` : `default account in ${globalConfigPath()}`;
128
+ }
129
+ if (name === void 0) return null;
130
+ await validateProfileName(ctx, name);
131
+ return { name, source };
132
+ }
133
+ export async function readProfileAuth(ctx, profile, allowMissing = false) {
134
+ const credentials = await readProfileCredentials(ctx, profile, allowMissing);
135
+ return credentials === null ? null : {
136
+ kind: "accessToken",
137
+ accessToken: credentials.accessToken,
138
+ header: `Bearer ${credentials.accessToken}`,
139
+ profile
140
+ };
141
+ }
142
+ export async function readProfileCredentials(ctx, profile, allowMissing = false) {
143
+ await validateProfileName(ctx, profile.name);
144
+ const configPath = profileConfigPath(profile.name);
145
+ if (!ctx.fs.exists(configPath)) {
146
+ if (allowMissing) return null;
147
+ return await ctx.crash({
148
+ exitCode: 1,
149
+ errorType: "invalid filesystem data",
150
+ printedMessage: `Account "${profile.name}" selected by ${profile.source} is not logged in. Run \`npx convex login --account ${profile.name}\`.`
151
+ });
152
+ }
153
+ try {
154
+ return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));
155
+ } catch {
156
+ return await ctx.crash({
157
+ exitCode: 1,
158
+ errorType: "invalid filesystem data",
159
+ printedMessage: `Unable to read credentials for account "${profile.name}" from ${configPath}.`
160
+ });
161
+ }
162
+ }
163
+ export function readProfileToken(ctx, name) {
164
+ try {
165
+ const token = JSON.parse(
166
+ ctx.fs.readUtf8File(profileConfigPath(name))
167
+ ).accessToken;
168
+ return typeof token === "string" && token.length > 0 ? token : null;
169
+ } catch {
170
+ return null;
171
+ }
172
+ }
173
+ async function writeCredentialsFile(ctx, name, credentials) {
174
+ const configPath = profileConfigPath(name);
175
+ const directory = path.dirname(configPath);
176
+ ctx.fs.mkdir(directory, { allowExisting: true });
177
+ for (const dir of [rootDirectory(), directory]) {
178
+ if (!ctx.fs.lstat(dir).isDirectory()) {
179
+ return await ctx.crash({
180
+ exitCode: 1,
181
+ errorType: "invalid filesystem data",
182
+ printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`
183
+ });
184
+ }
185
+ }
186
+ const temporary = `${configPath}.${randomUUID()}.tmp`;
187
+ try {
188
+ ctx.fs.writeUtf8File(
189
+ temporary,
190
+ JSON.stringify(credentials, null, 2),
191
+ 384
192
+ );
193
+ ctx.fs.swapTmpFile(temporary, configPath);
194
+ } finally {
195
+ if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);
196
+ }
197
+ }
198
+ export async function writeProfileCredentials(ctx, name, accessToken, metadata = {}, expected) {
199
+ await validateProfileName(ctx, name);
200
+ await updateProfileSettings(ctx, async (settings) => {
201
+ if (expected !== void 0) {
202
+ const current = await readProfileCredentials(
203
+ ctx,
204
+ { name, source: "login" },
205
+ true
206
+ );
207
+ if (!isDeepStrictEqual(current, expected)) {
208
+ return await ctx.crash({
209
+ exitCode: 1,
210
+ errorType: "fatal",
211
+ printedMessage: `Account "${name}" changed during login. Retry the login.`
212
+ });
213
+ }
214
+ }
215
+ await writeCredentialsFile(ctx, name, { ...metadata, accessToken });
216
+ if (settings.defaultProfile === name) settings.accessToken = accessToken;
217
+ });
218
+ }
219
+ export async function legacyAuthForFirstProfile(ctx, profile) {
220
+ const settings = await readProfileSettings(ctx);
221
+ const profilesDir = path.dirname(profileConfigPath(profile.name));
222
+ if (settings.defaultProfile !== void 0 || ctx.fs.exists(profilesDir) && ctx.fs.listDir(profilesDir).some((entry) => entry.name.endsWith(".json"))) {
223
+ return null;
224
+ }
225
+ const config = readGlobalConfig(ctx);
226
+ return config === null ? null : {
227
+ kind: "accessToken",
228
+ accessToken: config.accessToken,
229
+ header: `Bearer ${config.accessToken}`,
230
+ profile
231
+ };
232
+ }
233
+ export async function initializeDefaultProfile(ctx, profile, namingLegacyAccount, select = true) {
234
+ const defaultProfile = await updateProfileSettings(ctx, async (settings) => {
235
+ if (settings.defaultProfile !== void 0) return void 0;
236
+ const credentials = await readProfileCredentials(ctx, profile);
237
+ const accessToken = credentials.accessToken;
238
+ const legacyToken = settings.accessToken;
239
+ if (!select && (savedProfileNames(ctx).some((name) => name !== profile.name) || !namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken))
240
+ return void 0;
241
+ if (!namingLegacyAccount && typeof legacyToken === "string" && legacyToken.length > 0 && legacyToken !== accessToken) {
242
+ let legacyName = "default";
243
+ for (let suffix = 2; ctx.fs.exists(profileConfigPath(legacyName)); suffix++) {
244
+ legacyName = `default-${suffix}`;
245
+ }
246
+ await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });
247
+ settings.defaultProfile = legacyName;
248
+ } else {
249
+ settings.defaultProfile = profile.name;
250
+ settings.accessToken = accessToken;
251
+ }
252
+ return settings.defaultProfile;
253
+ });
254
+ if (defaultProfile !== void 0)
255
+ logFinishedStep(`Default account: ${defaultProfile}`);
256
+ }
257
+ export function findProfileDirectory(directories, cwd) {
258
+ let directory = path.resolve(cwd);
259
+ for (; ; ) {
260
+ if (Object.hasOwn(directories, directory)) {
261
+ return { directory, name: directories[directory] };
262
+ }
263
+ const parent = path.dirname(directory);
264
+ if (parent === directory) return null;
265
+ directory = parent;
266
+ }
267
+ }
268
+ export function savedProfileNames(ctx) {
269
+ const directory = path.join(rootDirectory(), "profiles");
270
+ if (!ctx.fs.exists(directory)) return [];
271
+ return ctx.fs.listDir(directory).filter((entry) => entry.name.endsWith(".json")).map((entry) => entry.name.slice(0, -5)).sort();
272
+ }
273
+ export async function writeProfileDirectory(ctx, name) {
274
+ await validateProfileName(ctx, name);
275
+ await updateProfileSettings(ctx, (settings) => {
276
+ settings.directories = { ...settings.directories, [process.cwd()]: name };
277
+ });
278
+ logFinishedStep(
279
+ `Saved directory selection: ${name} (applies to this directory and its subdirectories).`
280
+ );
281
+ const selected = await getProfileSelection(ctx);
282
+ if (selected !== null && selected.name !== name) {
283
+ logWarning(
284
+ `Account "${selected.name}" selected by ${selected.source} overrides this directory selection. Remove that override to use account "${name}".`
285
+ );
286
+ }
287
+ }
288
+ //# sourceMappingURL=profiles.js.map
@@ -0,0 +1,7 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../../../src/cli/lib/profiles.ts"],
4
+ "sourcesContent": ["import path from \"path\";\nimport { isDeepStrictEqual } from \"util\";\nimport { randomUUID } from \"crypto\";\nimport { TempPath } from \"../../bundler/fs.js\";\nimport * as dotenv from \"dotenv\";\nimport { z } from \"zod\";\nimport { BigBrainAuth, Context } from \"../../bundler/context.js\";\nimport { logFinishedStep, logWarning } from \"../../bundler/log.js\";\nimport { globalConfigPath, readGlobalConfig } from \"./utils/globalConfig.js\";\nimport { ENV_VAR_FILE_PATH, rootDirectory } from \"./utils/utils.js\";\n\nimport { CONVEX_ACCOUNT_ENV_VAR } from \"./envvars.js\";\n\nexport type ProfileSelection = {\n name: string;\n source: string;\n};\n\nconst settingsSchema = z\n .object({\n defaultProfile: z.string().optional(),\n directories: z.record(z.string()).optional(),\n revokeReplacedTokens: z.boolean().optional(),\n })\n .passthrough();\n\nconst credentialsSchema = z\n .object({\n accessToken: z.string().min(1),\n memberId: z.string().optional(),\n email: z.string().optional(),\n })\n .passthrough();\n\nexport type ProfileCredentials = z.infer<typeof credentialsSchema>;\n\nexport async function readProfileSettings(\n ctx: Context,\n): Promise<z.infer<typeof settingsSchema>> {\n if (!ctx.fs.exists(globalConfigPath())) return {};\n try {\n return settingsSchema.parse(\n JSON.parse(ctx.fs.readUtf8File(globalConfigPath())),\n );\n } catch {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Unable to read account settings from ${globalConfigPath()}. Check defaultProfile, directories, and revokeReplacedTokens.`,\n });\n }\n}\n\nfunction writeProfileSettings(ctx: Context, settings: Record<string, unknown>) {\n if (Object.keys(settings).length === 0) {\n if (ctx.fs.exists(globalConfigPath())) ctx.fs.unlink(globalConfigPath());\n return;\n }\n const temporary = `${globalConfigPath()}.${randomUUID()}.tmp` as TempPath;\n try {\n ctx.fs.writeUtf8File(temporary, JSON.stringify(settings, null, 2), 0o600);\n ctx.fs.swapTmpFile(temporary, globalConfigPath());\n } finally {\n if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n }\n}\n\nexport async function updateProfileSettings<T>(\n ctx: Context,\n update: (settings: z.infer<typeof settingsSchema>) => T | Promise<T>,\n afterWrite?: () => void,\n): Promise<T> {\n const lockPath = `${globalConfigPath()}.lock`;\n ctx.fs.mkdir(rootDirectory(), { allowExisting: true });\n const deadline = Date.now() + 5000;\n for (;;) {\n try {\n ctx.fs.mkdir(lockPath);\n break;\n } catch (err: any) {\n // Only the process that creates the directory owns the update lock.\n // eslint-disable-next-line no-restricted-syntax\n if (err.code !== \"EEXIST\") throw err;\n if (Date.now() >= deadline) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"fatal\",\n printedMessage: `Another command is updating Convex accounts. Retry after it finishes. If it was interrupted, remove ${lockPath}.`,\n });\n }\n await new Promise((resolve) => setTimeout(resolve, 25));\n }\n }\n let released = false;\n const release = () => {\n if (released) return;\n ctx.fs.rmdir(lockPath);\n released = true;\n };\n const cleanup = ctx.registerCleanup(async () => release());\n try {\n const settings = await readProfileSettings(ctx);\n const result = await update(settings);\n writeProfileSettings(ctx, settings);\n // Credential deletion follows persistence while sharing the lock with renewals.\n afterWrite?.();\n return result;\n } finally {\n ctx.removeCleanup(cleanup);\n release();\n }\n}\n\nexport function profileConfigPath(name: string): string {\n return path.join(\n rootDirectory(),\n \"profiles\",\n `${encodeURIComponent(name)}.json`,\n );\n}\n\nexport async function validateProfileName(\n ctx: Context,\n name: string,\n): Promise<void> {\n if (!/^[a-z0-9][a-z0-9_-]*$/.test(name)) {\n await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem or env vars\",\n printedMessage:\n \"Account names must start with a lowercase letter or number and contain only lowercase letters, numbers, hyphens, and underscores.\",\n });\n }\n}\n\nexport async function getProfileSelection(\n ctx: Context,\n options: { name?: string | undefined; envFile?: string | undefined } = {},\n): Promise<ProfileSelection | null> {\n let name = options.name;\n let source = \"--account\";\n if (name === undefined && process.env[CONVEX_ACCOUNT_ENV_VAR] !== undefined) {\n name = process.env[CONVEX_ACCOUNT_ENV_VAR];\n source = `${CONVEX_ACCOUNT_ENV_VAR} environment variable`;\n }\n if (name === undefined) {\n const files = options.envFile\n ? [options.envFile]\n : [ENV_VAR_FILE_PATH, \".env\"];\n for (const file of files) {\n if (!ctx.fs.exists(file)) continue;\n name = dotenv.parse(ctx.fs.readUtf8File(file))[CONVEX_ACCOUNT_ENV_VAR];\n if (name !== undefined) {\n source = `${CONVEX_ACCOUNT_ENV_VAR} in ${file}`;\n break;\n }\n }\n }\n if (name === undefined) {\n const config = await readProfileSettings(ctx);\n const binding = findProfileDirectory(\n config.directories ?? {},\n process.cwd(),\n );\n name = binding?.name ?? config.defaultProfile;\n source = binding\n ? `directory selection for ${binding.directory}`\n : `default account in ${globalConfigPath()}`;\n }\n if (name === undefined) return null;\n await validateProfileName(ctx, name);\n return { name, source };\n}\n\nexport async function readProfileAuth(\n ctx: Context,\n profile: ProfileSelection,\n allowMissing = false,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n const credentials = await readProfileCredentials(ctx, profile, allowMissing);\n return credentials === null\n ? null\n : {\n kind: \"accessToken\",\n accessToken: credentials.accessToken,\n header: `Bearer ${credentials.accessToken}`,\n profile,\n };\n}\n\nexport async function readProfileCredentials(\n ctx: Context,\n profile: ProfileSelection,\n allowMissing = false,\n): Promise<ProfileCredentials | null> {\n await validateProfileName(ctx, profile.name);\n const configPath = profileConfigPath(profile.name);\n if (!ctx.fs.exists(configPath)) {\n if (allowMissing) return null;\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Account \"${profile.name}\" selected by ${profile.source} is not logged in. Run \\`npx convex login --account ${profile.name}\\`.`,\n });\n }\n try {\n return credentialsSchema.parse(JSON.parse(ctx.fs.readUtf8File(configPath)));\n } catch {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Unable to read credentials for account \"${profile.name}\" from ${configPath}.`,\n });\n }\n}\n\nexport function readProfileToken(ctx: Context, name: string): string | null {\n try {\n const token = JSON.parse(\n ctx.fs.readUtf8File(profileConfigPath(name)),\n ).accessToken;\n return typeof token === \"string\" && token.length > 0 ? token : null;\n } catch {\n return null;\n }\n}\n\nasync function writeCredentialsFile(\n ctx: Context,\n name: string,\n credentials: ProfileCredentials,\n) {\n const configPath = profileConfigPath(name);\n const directory = path.dirname(configPath);\n ctx.fs.mkdir(directory, { allowExisting: true });\n for (const dir of [rootDirectory(), directory]) {\n if (!ctx.fs.lstat(dir).isDirectory()) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"invalid filesystem data\",\n printedMessage: `Cannot save account credentials through a symlink or non-directory: ${dir}.`,\n });\n }\n }\n const temporary = `${configPath}.${randomUUID()}.tmp` as TempPath;\n try {\n ctx.fs.writeUtf8File(\n temporary,\n JSON.stringify(credentials, null, 2),\n 0o600,\n );\n ctx.fs.swapTmpFile(temporary, configPath);\n } finally {\n if (ctx.fs.exists(temporary)) ctx.fs.unlink(temporary);\n }\n}\n\nexport async function writeProfileCredentials(\n ctx: Context,\n name: string,\n accessToken: string,\n metadata: Omit<ProfileCredentials, \"accessToken\"> = {},\n expected?: ProfileCredentials | null,\n): Promise<void> {\n await validateProfileName(ctx, name);\n await updateProfileSettings(ctx, async (settings) => {\n if (expected !== undefined) {\n const current = await readProfileCredentials(\n ctx,\n { name, source: \"login\" },\n true,\n );\n if (!isDeepStrictEqual(current, expected)) {\n return await ctx.crash({\n exitCode: 1,\n errorType: \"fatal\",\n printedMessage: `Account \"${name}\" changed during login. Retry the login.`,\n });\n }\n }\n await writeCredentialsFile(ctx, name, { ...metadata, accessToken });\n if (settings.defaultProfile === name) settings.accessToken = accessToken;\n });\n}\n\nexport async function legacyAuthForFirstProfile(\n ctx: Context,\n profile: ProfileSelection,\n): Promise<Extract<BigBrainAuth, { kind: \"accessToken\" }> | null> {\n const settings = await readProfileSettings(ctx);\n const profilesDir = path.dirname(profileConfigPath(profile.name));\n if (\n settings.defaultProfile !== undefined ||\n (ctx.fs.exists(profilesDir) &&\n ctx.fs.listDir(profilesDir).some((entry) => entry.name.endsWith(\".json\")))\n ) {\n return null;\n }\n const config = readGlobalConfig(ctx);\n return config === null\n ? null\n : {\n kind: \"accessToken\",\n accessToken: config.accessToken,\n header: `Bearer ${config.accessToken}`,\n profile,\n };\n}\n\nexport async function initializeDefaultProfile(\n ctx: Context,\n profile: ProfileSelection,\n namingLegacyAccount: boolean,\n select = true,\n) {\n const defaultProfile = await updateProfileSettings(ctx, async (settings) => {\n if (settings.defaultProfile !== undefined) return undefined;\n const credentials = await readProfileCredentials(ctx, profile);\n const accessToken = credentials!.accessToken;\n const legacyToken = settings.accessToken;\n if (\n !select &&\n (savedProfileNames(ctx).some((name) => name !== profile.name) ||\n (!namingLegacyAccount &&\n typeof legacyToken === \"string\" &&\n legacyToken.length > 0 &&\n legacyToken !== accessToken))\n )\n return undefined;\n if (\n !namingLegacyAccount &&\n typeof legacyToken === \"string\" &&\n legacyToken.length > 0 &&\n legacyToken !== accessToken\n ) {\n // An explicitly new login keeps the previous account as the default for\n // directories that haven't selected an account.\n let legacyName = \"default\";\n for (\n let suffix = 2;\n ctx.fs.exists(profileConfigPath(legacyName));\n suffix++\n ) {\n legacyName = `default-${suffix}`;\n }\n await writeCredentialsFile(ctx, legacyName, { accessToken: legacyToken });\n settings.defaultProfile = legacyName;\n } else {\n settings.defaultProfile = profile.name;\n settings.accessToken = accessToken;\n }\n\n return settings.defaultProfile;\n });\n if (defaultProfile !== undefined)\n logFinishedStep(`Default account: ${defaultProfile}`);\n}\n\nexport function findProfileDirectory(\n directories: Record<string, string>,\n cwd: string,\n): { directory: string; name: string } | null {\n let directory = path.resolve(cwd);\n for (;;) {\n if (Object.hasOwn(directories, directory)) {\n return { directory, name: directories[directory] };\n }\n const parent = path.dirname(directory);\n if (parent === directory) return null;\n directory = parent;\n }\n}\n\nexport function savedProfileNames(ctx: Context): string[] {\n const directory = path.join(rootDirectory(), \"profiles\");\n if (!ctx.fs.exists(directory)) return [];\n return ctx.fs\n .listDir(directory)\n .filter((entry) => entry.name.endsWith(\".json\"))\n .map((entry) => entry.name.slice(0, -5))\n .sort();\n}\n\nexport async function writeProfileDirectory(ctx: Context, name: string) {\n await validateProfileName(ctx, name);\n await updateProfileSettings(ctx, (settings) => {\n settings.directories = { ...settings.directories, [process.cwd()]: name };\n });\n logFinishedStep(\n `Saved directory selection: ${name} (applies to this directory and its subdirectories).`,\n );\n const selected = await getProfileSelection(ctx);\n if (selected !== null && selected.name !== name) {\n logWarning(\n `Account \"${selected.name}\" selected by ${selected.source} overrides this directory selection. Remove that override to use account \"${name}\".`,\n );\n }\n}\n"],
5
+ "mappings": "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",
6
+ "names": []
7
+ }
@@ -32,13 +32,14 @@ export const CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME = "CONVEX_DEPLOYMENT_TOKEN";
32
32
  export const CONVEX_DEPLOYMENT_ENV_VAR_NAME = "CONVEX_DEPLOYMENT";
33
33
  export const CONVEX_SELF_HOSTED_URL_VAR_NAME = "CONVEX_SELF_HOSTED_URL";
34
34
  export const CONVEX_SELF_HOSTED_ADMIN_KEY_VAR_NAME = "CONVEX_SELF_HOSTED_ADMIN_KEY";
35
+ export const IGNORED_DEPLOY_KEY = "<ignore_deploy_key>";
35
36
  const MAX_RETRIES = 6;
36
37
  const RETRY_LOG_THRESHOLD = 3;
37
38
  export async function processDeployKeyValue(ctx, deployKey) {
38
39
  if (deployKey === void 0) {
39
40
  return void 0;
40
41
  }
41
- if (deployKey === "<ignore_deploy_key>") {
42
+ if (deployKey === IGNORED_DEPLOY_KEY) {
42
43
  return void 0;
43
44
  }
44
45
  const missingKeyPattern = /^<missing_deploy_key:(.+)>$/;
@@ -54,17 +55,23 @@ export async function processDeployKeyValue(ctx, deployKey) {
54
55
  return deployKey;
55
56
  }
56
57
  export function readDeployKeyFromEnv(getEnv) {
57
- const fromDeployKey = getEnv(CONVEX_DEPLOY_KEY_ENV_VAR_NAME);
58
- const fromToken = getEnv(CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME);
59
- return fromDeployKey || fromToken || void 0;
58
+ return readDeployKeyEnvVar(getEnv)?.value;
59
+ }
60
+ export function readDeployKeyEnvVar(getEnv) {
61
+ for (const name of [
62
+ CONVEX_DEPLOY_KEY_ENV_VAR_NAME,
63
+ CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME
64
+ ]) {
65
+ const value = getEnv(name);
66
+ if (value) return { name, value };
67
+ }
68
+ return void 0;
60
69
  }
61
70
  const PERMISSION_DENIED_MESSAGE_PREFIX = "You do not have permission to perform this operation";
62
71
  function deployKeyPermissionAdvice() {
63
- const envVarName = process.env[CONVEX_DEPLOY_KEY_ENV_VAR_NAME] ? CONVEX_DEPLOY_KEY_ENV_VAR_NAME : process.env[CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME] ? CONVEX_DEPLOYMENT_TOKEN_ENV_VAR_NAME : null;
64
- if (envVarName === null) {
65
- return null;
66
- }
67
- return `This is determined by the permissions granted to ${envVarName}.`;
72
+ const envVar = readDeployKeyEnvVar((name) => process.env[name]);
73
+ if (envVar === void 0 || envVar.value === IGNORED_DEPLOY_KEY) return null;
74
+ return `This is determined by the permissions granted to ${envVar.name}.`;
68
75
  }
69
76
  export function permissionDeniedErrorMessage(errorMessage) {
70
77
  const index = errorMessage.indexOf(PERMISSION_DENIED_MESSAGE_PREFIX);