neon 3.0.0 → 3.1.1

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 (207) hide show
  1. package/README.md +70 -5
  2. package/dist/_chunks/auth_selection-DGgq6ifc.js +83 -0
  3. package/dist/_chunks/cmd_pipeline-CUbBO9U_.js +2818 -0
  4. package/dist/_chunks/credentials-MYdHdKah.js +188 -0
  5. package/dist/_chunks/env-NbA61JR3.js +585 -0
  6. package/dist/_chunks/env_services-Tz9G4JeT.js +531 -0
  7. package/dist/_chunks/paths-DMq0Lt7a.js +151 -0
  8. package/dist/_chunks/profiles-Ir29rqns.js +217 -0
  9. package/dist/_chunks/psql-DWH-kc69.js +2169 -0
  10. package/dist/_chunks/rolldown-runtime-D7D4PA-g.js +13 -0
  11. package/dist/_chunks/secure_file-BucZj4yQ.js +39 -0
  12. package/dist/analytics.js +163 -207
  13. package/dist/api.js +815 -758
  14. package/dist/auth.js +121 -141
  15. package/dist/auth_context.js +39 -53
  16. package/dist/cli.js +4 -7
  17. package/dist/commands/api.js +220 -250
  18. package/dist/commands/api_keys.js +251 -314
  19. package/dist/commands/auth.js +283 -328
  20. package/dist/commands/bootstrap.js +372 -437
  21. package/dist/commands/branches.js +304 -455
  22. package/dist/commands/bucket.js +374 -514
  23. package/dist/commands/checkout.js +213 -298
  24. package/dist/commands/config.js +573 -690
  25. package/dist/commands/connection_string.js +137 -165
  26. package/dist/commands/data_api.js +238 -260
  27. package/dist/commands/databases.js +67 -76
  28. package/dist/commands/deploy.js +31 -25
  29. package/dist/commands/dev.js +639 -719
  30. package/dist/commands/diff.js +156 -200
  31. package/dist/commands/env.js +255 -305
  32. package/dist/commands/functions.js +275 -355
  33. package/dist/commands/index.js +70 -65
  34. package/dist/commands/init.js +84 -119
  35. package/dist/commands/inspect.js +55 -55
  36. package/dist/commands/ip_allow.js +88 -120
  37. package/dist/commands/link.js +874 -1019
  38. package/dist/commands/logs.js +291 -0
  39. package/dist/commands/neon_auth.js +725 -933
  40. package/dist/commands/operations.js +34 -25
  41. package/dist/commands/orgs.js +28 -18
  42. package/dist/commands/profile.js +615 -846
  43. package/dist/commands/projects.js +313 -373
  44. package/dist/commands/psql.js +60 -58
  45. package/dist/commands/roles.js +55 -58
  46. package/dist/commands/schema_diff.js +87 -131
  47. package/dist/commands/set_context.js +34 -26
  48. package/dist/commands/snapshots.js +288 -413
  49. package/dist/commands/status.js +41 -37
  50. package/dist/commands/user.js +21 -10
  51. package/dist/commands/vpc_endpoints.js +85 -113
  52. package/dist/config.js +7 -6
  53. package/dist/config_format.js +50 -66
  54. package/dist/config_template.js +128 -157
  55. package/dist/context.js +183 -235
  56. package/dist/current_branch_fast_path.js +40 -49
  57. package/dist/dev/env.js +2 -446
  58. package/dist/dev/functions.js +54 -68
  59. package/dist/dev/inputs.js +46 -58
  60. package/dist/dev/runtime.js +135 -164
  61. package/dist/dev/websocket.js +766 -959
  62. package/dist/env.js +27 -33
  63. package/dist/env_file.js +118 -132
  64. package/dist/env_services.js +2 -51
  65. package/dist/errors.js +57 -68
  66. package/dist/functions_api.js +45 -43
  67. package/dist/help.js +189 -140
  68. package/dist/index.js +182 -257
  69. package/dist/init/agents.js +137 -118
  70. package/dist/init/auth.js +58 -68
  71. package/dist/init/bootstrap.js +325 -396
  72. package/dist/init/build_config.js +4 -2
  73. package/dist/init/detect_agent.js +56 -101
  74. package/dist/init/editors.js +35 -52
  75. package/dist/init/enrich_output.js +51 -66
  76. package/dist/init/extension.js +134 -171
  77. package/dist/init/inspect.js +179 -266
  78. package/dist/init/interactive.js +510 -622
  79. package/dist/init/neonctl.js +117 -168
  80. package/dist/init/orchestrate.js +157 -173
  81. package/dist/init/phases/auth.js +188 -202
  82. package/dist/init/phases/cleanup.js +23 -23
  83. package/dist/init/phases/db.js +251 -277
  84. package/dist/init/phases/getting_started.js +213 -223
  85. package/dist/init/phases/mcp.js +174 -224
  86. package/dist/init/phases/migrations.js +247 -248
  87. package/dist/init/phases/neon_auth.js +114 -133
  88. package/dist/init/phases/setup.js +546 -703
  89. package/dist/init/phases/skills.js +75 -86
  90. package/dist/init/phases/status.js +72 -67
  91. package/dist/init/resolve_context.js +102 -99
  92. package/dist/init/route_command.js +91 -98
  93. package/dist/init/skills.js +174 -218
  94. package/dist/init/vsix.js +77 -99
  95. package/dist/log.js +17 -16
  96. package/dist/neon_services.js +104 -129
  97. package/dist/parameters.gen.js +481 -471
  98. package/dist/pkg.js +17 -19
  99. package/dist/profile_keys.js +44 -47
  100. package/dist/psql/cli.js +44 -47
  101. package/dist/psql/command/cmd_cond.js +231 -406
  102. package/dist/psql/command/cmd_connect.js +557 -764
  103. package/dist/psql/command/cmd_copy.js +728 -984
  104. package/dist/psql/command/cmd_describe.js +1499 -1688
  105. package/dist/psql/command/cmd_format.js +733 -905
  106. package/dist/psql/command/cmd_io.js +2 -2193
  107. package/dist/psql/command/cmd_lo.js +297 -359
  108. package/dist/psql/command/cmd_meta.js +727 -878
  109. package/dist/psql/command/cmd_misc.js +138 -172
  110. package/dist/psql/command/cmd_pipeline.js +2 -1148
  111. package/dist/psql/command/cmd_restrict.js +119 -155
  112. package/dist/psql/command/cmd_show.js +529 -688
  113. package/dist/psql/command/dispatch.js +260 -325
  114. package/dist/psql/command/inputQueue.js +35 -33
  115. package/dist/psql/command/shared.js +49 -63
  116. package/dist/psql/complete/filenames.js +90 -133
  117. package/dist/psql/complete/index.js +59 -97
  118. package/dist/psql/complete/matcher.js +236 -300
  119. package/dist/psql/complete/psqlVars.js +218 -223
  120. package/dist/psql/complete/queries.js +159 -177
  121. package/dist/psql/complete/rules.js +1493 -2299
  122. package/dist/psql/core/common.js +2 -1253
  123. package/dist/psql/core/help.js +456 -546
  124. package/dist/psql/core/mainloop.js +692 -1303
  125. package/dist/psql/core/prompt.js +391 -408
  126. package/dist/psql/core/settings.js +429 -644
  127. package/dist/psql/core/sqlHelp.js +480 -554
  128. package/dist/psql/core/startup.js +2 -846
  129. package/dist/psql/core/syncVars.js +67 -110
  130. package/dist/psql/core/variables.js +156 -278
  131. package/dist/psql/describe/formatters.js +884 -1285
  132. package/dist/psql/describe/processNamePattern.js +173 -260
  133. package/dist/psql/describe/queries.js +1368 -2403
  134. package/dist/psql/describe/versionGate.js +32 -41
  135. package/dist/psql/index.js +2 -2030
  136. package/dist/psql/io/history.js +232 -271
  137. package/dist/psql/io/input.js +103 -108
  138. package/dist/psql/io/lineEditor/buffer.js +238 -319
  139. package/dist/psql/io/lineEditor/complete.js +135 -213
  140. package/dist/psql/io/lineEditor/filename.js +139 -148
  141. package/dist/psql/io/lineEditor/index.js +653 -870
  142. package/dist/psql/io/lineEditor/keymap.js +544 -702
  143. package/dist/psql/io/lineEditor/vt100.js +294 -341
  144. package/dist/psql/io/pgpass.js +158 -187
  145. package/dist/psql/io/pgservice.js +146 -183
  146. package/dist/psql/io/psqlrc.js +328 -403
  147. package/dist/psql/print/aligned.js +1020 -1683
  148. package/dist/psql/print/asciidoc.js +180 -214
  149. package/dist/psql/print/crosstab.js +281 -442
  150. package/dist/psql/print/csv.js +48 -70
  151. package/dist/psql/print/html.js +195 -226
  152. package/dist/psql/print/json.js +75 -88
  153. package/dist/psql/print/latex.js +291 -364
  154. package/dist/psql/print/pager.js +171 -242
  155. package/dist/psql/print/troff.js +194 -226
  156. package/dist/psql/print/unaligned.js +69 -95
  157. package/dist/psql/print/units.js +167 -169
  158. package/dist/psql/scanner/slash.js +428 -483
  159. package/dist/psql/scanner/sql.js +445 -889
  160. package/dist/psql/scanner/stringutils.js +309 -379
  161. package/dist/psql/types/index.js +8 -7
  162. package/dist/psql/types/scanner.js +25 -22
  163. package/dist/psql/wire/connection.js +2042 -2803
  164. package/dist/psql/wire/copy.js +84 -100
  165. package/dist/psql/wire/notify.js +39 -59
  166. package/dist/psql/wire/pipeline.js +305 -518
  167. package/dist/psql/wire/protocol.js +349 -417
  168. package/dist/psql/wire/sasl.js +180 -265
  169. package/dist/psql/wire/tls.js +400 -561
  170. package/dist/storage_api.js +115 -129
  171. package/dist/test_utils/fixtures.js +94 -113
  172. package/dist/test_utils/oauth_server.js +10 -7
  173. package/dist/test_utils/project_dir.js +33 -0
  174. package/dist/utils/ai_gateway_notice.js +131 -162
  175. package/dist/utils/api_enums.js +21 -28
  176. package/dist/utils/auth.js +10 -4
  177. package/dist/utils/branch_notice.js +20 -19
  178. package/dist/utils/branch_picker.js +83 -89
  179. package/dist/utils/cli_name.js +15 -12
  180. package/dist/utils/compute_units.js +20 -27
  181. package/dist/utils/config_diff.js +127 -158
  182. package/dist/utils/enrichers.js +95 -148
  183. package/dist/utils/esbuild.js +130 -189
  184. package/dist/utils/flags.js +35 -47
  185. package/dist/utils/formats.js +8 -15
  186. package/dist/utils/git_diff.js +69 -80
  187. package/dist/utils/inspect_db.js +101 -143
  188. package/dist/utils/inspect_queries.js +179 -142
  189. package/dist/utils/middlewares.js +39 -45
  190. package/dist/utils/openapi.js +87 -99
  191. package/dist/utils/package_manager.js +312 -110
  192. package/dist/utils/point_in_time.js +49 -53
  193. package/dist/utils/psql.js +89 -106
  194. package/dist/utils/service_picker.js +55 -58
  195. package/dist/utils/string.js +5 -5
  196. package/dist/utils/ui.js +38 -55
  197. package/dist/utils/write_sync.js +26 -35
  198. package/dist/utils/zip.js +4 -3
  199. package/dist/writer.js +67 -87
  200. package/package.json +11 -6
  201. package/dist/_shared/auth_selection.js +0 -86
  202. package/dist/_shared/credentials.js +0 -209
  203. package/dist/_shared/env-core/env.js +0 -558
  204. package/dist/_shared/env-core/reuse-secrets.js +0 -223
  205. package/dist/_shared/paths.js +0 -148
  206. package/dist/_shared/profiles.js +0 -276
  207. package/dist/_shared/secure_file.js +0 -43
@@ -0,0 +1,13 @@
1
+ //#region \0rolldown/runtime.js
2
+ var __defProp = Object.defineProperty;
3
+ var __exportAll = (all, no_symbols) => {
4
+ let target = {};
5
+ for (var name in all) __defProp(target, name, {
6
+ get: all[name],
7
+ enumerable: true
8
+ });
9
+ if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
10
+ return target;
11
+ };
12
+ //#endregion
13
+ export { __exportAll as t };
@@ -0,0 +1,39 @@
1
+ import { renameSync, unlinkSync, writeFileSync } from "node:fs";
2
+ import { basename, dirname, join } from "node:path";
3
+ //#region ../../internals/cli-core/dist/secure_file.js
4
+ /**
5
+ * Write a secret to disk owner-only, by creating a temporary file in the same directory and
6
+ * renaming it over the target.
7
+ *
8
+ * The rename is what makes this correct rather than merely tidy. `writeFileSync`'s `mode`
9
+ * applies only when it *creates* the file, so writing over an existing credentials file
10
+ * leaves whatever permissions it already had — a file created `0700` by an older release
11
+ * stays `0700` forever, and one created before a umask change stays world-readable. Renaming
12
+ * a fresh inode into place means every write lands at {@link SECRET_FILE_MODE}, so the
13
+ * permissions repair themselves instead of being inherited.
14
+ *
15
+ * It also closes the window where a reader could see the file at default permissions: the
16
+ * temporary file is created `0600` *before* it holds the secret's final name, and `rename`
17
+ * is atomic within a directory, so there is no moment at which the target is readable by
18
+ * anyone else and no moment at which it is half-written.
19
+ *
20
+ * The temporary name carries the pid so two processes writing at once cannot collide on it.
21
+ */
22
+ const writeSecretFile = (path, contents) => {
23
+ const directory = dirname(path);
24
+ const temporary = join(directory, `.${basename(path)}.${process.pid}.${Date.now()}.tmp`);
25
+ try {
26
+ writeFileSync(temporary, contents, {
27
+ encoding: "utf8",
28
+ mode: 384
29
+ });
30
+ renameSync(temporary, path);
31
+ } catch (err) {
32
+ try {
33
+ unlinkSync(temporary);
34
+ } catch {}
35
+ throw err;
36
+ }
37
+ };
38
+ //#endregion
39
+ export { writeSecretFile as t };
package/dist/analytics.js CHANGED
@@ -1,233 +1,189 @@
1
- import { Analytics } from "@segment/analytics-node";
2
- import { inspectCredentials, OAUTH } from "./_shared/credentials.js";
1
+ import { n as OAUTH, o as inspectCredentials } from "./_chunks/credentials-MYdHdKah.js";
2
+ import { getGithubEnvVars, isCi } from "./env.js";
3
+ import { log } from "./log.js";
4
+ import pkg_default from "./pkg.js";
3
5
  import { getApiClient, isNeonApiError } from "./api.js";
6
+ import { n as credentialsPath } from "./_chunks/paths-DMq0Lt7a.js";
7
+ import "./config.js";
4
8
  import { getAuthContext } from "./auth_context.js";
5
- import { credentialsPath } from "./config.js";
6
9
  import { isCurrentBranchProbe } from "./context.js";
7
- import { getGithubEnvVars, isCi } from "./env.js";
8
- import { log } from "./log.js";
9
- import pkg from "./pkg.js";
10
+ import { Analytics } from "@segment/analytics-node";
11
+ //#region src/analytics.ts
10
12
  const WRITE_KEY = "3SQXn5ejjXWLEJ8xU2PRYhAotLtTaeeV";
11
13
  /**
12
- * Raw-argv fallback for the offline `--current-branch` probe. The init
13
- * middleware runs before validation, where the parsed `currentBranch` flag may
14
- * not be populated yet, so we also scan `process.argv` directly to be safe.
15
- */
14
+ * Raw-argv fallback for the offline `--current-branch` probe. The init
15
+ * middleware runs before validation, where the parsed `currentBranch` flag may
16
+ * not be populated yet, so we also scan `process.argv` directly to be safe.
17
+ */
16
18
  const hasCurrentBranchArgv = () => process.argv.includes("--current-branch");
17
19
  const ANONYMOUS = "anonymous";
18
20
  /**
19
- * Who to attribute an event to, given whatever identified this invocation.
20
- *
21
- * Nothing is guaranteed to have identified it: a command can run with no credentials at all,
22
- * leaving the id empty. Segment accepts an empty `userId` and forwards it as-is rather than
23
- * rejecting it, so the substitution has to happen here. `""` is falsy but not nullish, which
24
- * is why the fallback has to be `||`.
25
- *
26
- * Exported for tests.
27
- */
28
- export const analyticsUserId = (userId) => userId || ANONYMOUS;
21
+ * Who to attribute an event to, given whatever identified this invocation.
22
+ *
23
+ * Nothing is guaranteed to have identified it: a command can run with no credentials at all,
24
+ * leaving the id empty. Segment accepts an empty `userId` and forwards it as-is rather than
25
+ * rejecting it, so the substitution has to happen here. `""` is falsy but not nullish, which
26
+ * is why the fallback has to be `||`.
27
+ *
28
+ * Exported for tests.
29
+ */
30
+ const analyticsUserId = (userId) => userId || ANONYMOUS;
29
31
  /**
30
- * The account an invocation that presented no API key may claim, which is nothing at all
31
- * unless stored credentials named a user.
32
- *
33
- * Both fields are omitted together. An empty account reported under a named method describes
34
- * an authentication that did not happen, which is worse than reporting neither.
35
- *
36
- * Exported for tests.
37
- */
38
- export const storedCredentialAttribution = (storedUserId) => storedUserId ? { accountId: storedUserId, authMethod: OAUTH } : {};
32
+ * The account an invocation that presented no API key may claim, which is nothing at all
33
+ * unless stored credentials named a user.
34
+ *
35
+ * Both fields are omitted together. An empty account reported under a named method describes
36
+ * an authentication that did not happen, which is worse than reporting neither.
37
+ *
38
+ * Exported for tests.
39
+ */
40
+ const storedCredentialAttribution = (storedUserId) => storedUserId ? {
41
+ accountId: storedUserId,
42
+ authMethod: OAUTH
43
+ } : {};
39
44
  /**
40
- * Which credential telemetry may describe this invocation with.
41
- *
42
- * `ensureAuth` records a context only when it selected a credential for this invocation, so a
43
- * missing context means the global auth middleware selected nothing before this ran. A key
44
- * sitting in `args.apiKey` is then not the credential the middleware chose — `neon profile list`
45
- * never used it — and must not be queried on its behalf, which would attribute the run to an
46
- * account it never authenticated as and add a telemetry-only API call. The local default is the
47
- * guess.
48
- *
49
- * The boundary is deliberately the credential the middleware selected, not every key a handler
50
- * may go on to use. Several `profile` subcommands authenticate inside their own handlers —
51
- * `create --api-key` verifies the key it is about to store, `rotate-key` mints and revokes — and
52
- * those runs are attributed to the local default rather than to the account the handler talked
53
- * to. Attributing them to that key puts an `identify` for the signed-in user beside an
54
- * `accountId` for a different account.
55
- *
56
- * A selected key records no file, because it authenticates as its own account rather than out
57
- * of one. Reading `DEFAULT` for it would identify the run as whoever is signed in locally, and
58
- * that borrowed id would suppress the API lookup that names the key's real owner.
59
- *
60
- * Exported for tests.
61
- */
62
- export const telemetryCredential = (authContext, apiKey, defaultCredentialsPath) => {
63
- if (authContext === null) {
64
- return { credentialsPath: defaultCredentialsPath };
65
- }
66
- if (authContext.source === "api-key") {
67
- return { apiKey };
68
- }
69
- return {
70
- apiKey,
71
- credentialsPath: authContext.credentialsPath ?? defaultCredentialsPath,
72
- };
45
+ * Which credential telemetry may describe this invocation with.
46
+ *
47
+ * `ensureAuth` records a context only when it selected a credential for this invocation, so a
48
+ * missing context means the global auth middleware selected nothing before this ran. A key
49
+ * sitting in `args.apiKey` is then not the credential the middleware chose — `neon profile list`
50
+ * never used it — and must not be queried on its behalf, which would attribute the run to an
51
+ * account it never authenticated as and add a telemetry-only API call. The local default is the
52
+ * guess.
53
+ *
54
+ * The boundary is deliberately the credential the middleware selected, not every key a handler
55
+ * may go on to use. Several `profile` subcommands authenticate inside their own handlers —
56
+ * `create --api-key` verifies the key it is about to store, `rotate-key` mints and revokes — and
57
+ * those runs are attributed to the local default rather than to the account the handler talked
58
+ * to. Attributing them to that key puts an `identify` for the signed-in user beside an
59
+ * `accountId` for a different account.
60
+ *
61
+ * A selected key records no file, because it authenticates as its own account rather than out
62
+ * of one. Reading `DEFAULT` for it would identify the run as whoever is signed in locally, and
63
+ * that borrowed id would suppress the API lookup that names the key's real owner.
64
+ *
65
+ * Exported for tests.
66
+ */
67
+ const telemetryCredential = (authContext, apiKey, defaultCredentialsPath) => {
68
+ if (authContext === null) return { credentialsPath: defaultCredentialsPath };
69
+ if (authContext.source === "api-key") return { apiKey };
70
+ return {
71
+ apiKey,
72
+ credentialsPath: authContext.credentialsPath ?? defaultCredentialsPath
73
+ };
73
74
  };
74
75
  let client;
75
76
  let clientInitialized = false;
76
77
  let userId = "";
77
78
  let errorEventContext;
78
79
  /**
79
- * Phase 1: Run before validation so the Segment client exists if any
80
- * middleware (e.g. auth) fails. Enables sendError() in the fail handler.
81
- * Does not resolve user id or send CLI Started.
82
- */
83
- export const initAnalyticsClientMiddleware = (args) => {
84
- if (!args.analytics || clientInitialized) {
85
- return;
86
- }
87
- // The offline `--current-branch` probe must make zero network calls. This
88
- // middleware runs before validation, so guard on the raw argv too (in case
89
- // the parsed `currentBranch` flag isn't populated this early): never create
90
- // the Segment client, which keeps trackEvent/closeAnalytics no-ops downstream.
91
- if (isCurrentBranchProbe(args) || hasCurrentBranchArgv()) {
92
- return;
93
- }
94
- clientInitialized = true;
95
- errorEventContext = getErrorAnalyticsEventContext(args);
96
- client = new Analytics({
97
- writeKey: WRITE_KEY,
98
- host: "https://track.neon.tech",
99
- });
100
- log.debug("Initialized CLI analytics client");
101
- client.identify({
102
- userId: ANONYMOUS,
103
- });
80
+ * Phase 1: Run before validation so the Segment client exists if any
81
+ * middleware (e.g. auth) fails. Enables sendError() in the fail handler.
82
+ * Does not resolve user id or send CLI Started.
83
+ */
84
+ const initAnalyticsClientMiddleware = (args) => {
85
+ if (!args.analytics || clientInitialized) return;
86
+ if (isCurrentBranchProbe(args) || hasCurrentBranchArgv()) return;
87
+ clientInitialized = true;
88
+ errorEventContext = getErrorAnalyticsEventContext(args);
89
+ client = new Analytics({
90
+ writeKey: WRITE_KEY,
91
+ host: "https://track.neon.tech"
92
+ });
93
+ log.debug("Initialized CLI analytics client");
94
+ client.identify({ userId: ANONYMOUS });
104
95
  };
105
96
  /**
106
- * Phase 2: Run after auth. Resolves user id from credentials,
107
- * identifies the user, and sends CLI Started.
108
- */
109
- export const analyticsMiddleware = async (args) => {
110
- if (!client || !args.analytics) {
111
- return;
112
- }
113
- if (isCurrentBranchProbe(args)) {
114
- return;
115
- }
116
- const { apiKey: keyToQuery, credentialsPath: fileToRead } = telemetryCredential(getAuthContext(), args.apiKey, credentialsPath(args.configDir));
117
- if (fileToRead !== undefined) {
118
- // Telemetry must never turn a damaged or unreadable credentials file into a failed command.
119
- try {
120
- const read = inspectCredentials(fileToRead);
121
- if (read.kind === "ok" &&
122
- typeof read.credentials.user_id === "string") {
123
- userId = read.credentials.user_id;
124
- }
125
- else if (read.kind !== "ok") {
126
- log.debug("No usable credentials at %s", fileToRead);
127
- }
128
- }
129
- catch (err) {
130
- log.debug("Could not read %s: %s", fileToRead, err);
131
- }
132
- }
133
- try {
134
- if (keyToQuery) {
135
- const apiClient = getApiClient({
136
- apiKey: keyToQuery,
137
- apiHost: args.apiHost,
138
- });
139
- // Populating api key details for analytics
140
- const authDetailsResponse = await apiClient.getAuthDetails();
141
- const authDetails = authDetailsResponse.data;
142
- args.accountId = authDetails.account_id;
143
- args.authMethod = authDetails.auth_method;
144
- args.authData = authDetails.auth_data;
145
- // Get user id if not org api key
146
- if (!userId && authDetails.auth_method !== "api_key_org") {
147
- const resp = await apiClient?.getCurrentUserInfo?.();
148
- userId = resp?.data?.id;
149
- }
150
- }
151
- else {
152
- const { accountId, authMethod } = storedCredentialAttribution(userId);
153
- args.accountId = accountId;
154
- args.authMethod = authMethod;
155
- }
156
- }
157
- catch (err) {
158
- log.debug("Failed to get user id from api", err);
159
- }
160
- client.identify({
161
- userId: analyticsUserId(userId),
162
- });
163
- client.track({
164
- userId: analyticsUserId(userId),
165
- event: "CLI Started",
166
- properties: getAnalyticsEventProperties(args),
167
- context: {
168
- direct: true,
169
- },
170
- });
97
+ * Phase 2: Run after auth. Resolves user id from credentials,
98
+ * identifies the user, and sends CLI Started.
99
+ */
100
+ const analyticsMiddleware = async (args) => {
101
+ if (!client || !args.analytics) return;
102
+ if (isCurrentBranchProbe(args)) return;
103
+ const { apiKey: keyToQuery, credentialsPath: fileToRead } = telemetryCredential(getAuthContext(), args.apiKey, credentialsPath(args.configDir));
104
+ if (fileToRead !== void 0) try {
105
+ const read = inspectCredentials(fileToRead);
106
+ if (read.kind === "ok" && typeof read.credentials.user_id === "string") userId = read.credentials.user_id;
107
+ else if (read.kind !== "ok") log.debug("No usable credentials at %s", fileToRead);
108
+ } catch (err) {
109
+ log.debug("Could not read %s: %s", fileToRead, err);
110
+ }
111
+ try {
112
+ if (keyToQuery) {
113
+ const apiClient = getApiClient({
114
+ apiKey: keyToQuery,
115
+ apiHost: args.apiHost
116
+ });
117
+ const authDetails = (await apiClient.getAuthDetails()).data;
118
+ args.accountId = authDetails.account_id;
119
+ args.authMethod = authDetails.auth_method;
120
+ args.authData = authDetails.auth_data;
121
+ if (!userId && authDetails.auth_method !== "api_key_org") userId = (await apiClient?.getCurrentUserInfo?.())?.data?.id;
122
+ } else {
123
+ const { accountId, authMethod } = storedCredentialAttribution(userId);
124
+ args.accountId = accountId;
125
+ args.authMethod = authMethod;
126
+ }
127
+ } catch (err) {
128
+ log.debug("Failed to get user id from api", err);
129
+ }
130
+ client.identify({ userId: analyticsUserId(userId) });
131
+ client.track({
132
+ userId: analyticsUserId(userId),
133
+ event: "CLI Started",
134
+ properties: getAnalyticsEventProperties(args),
135
+ context: { direct: true }
136
+ });
171
137
  };
172
- export const closeAnalytics = async (opts) => {
173
- if (client) {
174
- log.debug("Flushing CLI analytics");
175
- // `timeout` bounds how long we wait for in-flight events to flush so a
176
- // slow / unreachable track.neon.tech can't hang a short-lived command
177
- // (e.g. the psql launch path, which flushes here before process.exit).
178
- await client.closeAndFlush(opts);
179
- log.debug("Flushed CLI analytics");
180
- }
138
+ const closeAnalytics = async (opts) => {
139
+ if (client) {
140
+ log.debug("Flushing CLI analytics");
141
+ await client.closeAndFlush(opts);
142
+ log.debug("Flushed CLI analytics");
143
+ }
181
144
  };
182
- export const getErrorAnalyticsEventProperties = (err, errCode, context) => {
183
- const apiError = isNeonApiError(err) ? err : undefined;
184
- const requestId = apiError?.headers?.["x-neon-ret-request-id"];
185
- return {
186
- ...context,
187
- message: err.message,
188
- stack: err.stack,
189
- errCode,
190
- statusCode: apiError?.status,
191
- requestId,
192
- };
145
+ const getErrorAnalyticsEventProperties = (err, errCode, context) => {
146
+ const apiError = isNeonApiError(err) ? err : void 0;
147
+ const requestId = apiError?.headers?.["x-neon-ret-request-id"];
148
+ return {
149
+ ...context,
150
+ message: err.message,
151
+ stack: err.stack,
152
+ errCode,
153
+ statusCode: apiError?.status,
154
+ requestId
155
+ };
193
156
  };
194
- export const sendError = (err, errCode) => {
195
- if (!client) {
196
- return;
197
- }
198
- const apiError = isNeonApiError(err) ? err : undefined;
199
- const requestId = apiError?.headers?.["x-neon-ret-request-id"];
200
- if (requestId) {
201
- log.debug("Failed request ID: %s", requestId);
202
- }
203
- client.track({
204
- event: "CLI Error",
205
- userId: analyticsUserId(userId),
206
- properties: getErrorAnalyticsEventProperties(err, errCode, errorEventContext),
207
- });
208
- log.debug("Sent CLI error event: %s", errCode);
157
+ const sendError = (err, errCode) => {
158
+ if (!client) return;
159
+ const requestId = (isNeonApiError(err) ? err : void 0)?.headers?.["x-neon-ret-request-id"];
160
+ if (requestId) log.debug("Failed request ID: %s", requestId);
161
+ client.track({
162
+ event: "CLI Error",
163
+ userId: analyticsUserId(userId),
164
+ properties: getErrorAnalyticsEventProperties(err, errCode, errorEventContext)
165
+ });
166
+ log.debug("Sent CLI error event: %s", errCode);
209
167
  };
210
- export const trackEvent = (event, properties) => {
211
- if (!client) {
212
- return;
213
- }
214
- client.track({
215
- event,
216
- userId: analyticsUserId(userId),
217
- properties,
218
- });
219
- log.debug("Sent CLI event: %s", event);
168
+ const trackEvent = (event, properties) => {
169
+ if (!client) return;
170
+ client.track({
171
+ event,
172
+ userId: analyticsUserId(userId),
173
+ properties
174
+ });
175
+ log.debug("Sent CLI event: %s", event);
220
176
  };
221
177
  const getErrorAnalyticsEventContext = (_args) => ({
222
- version: pkg.version,
223
- ci: isCi(),
178
+ version: pkg_default.version,
179
+ ci: isCi()
224
180
  });
225
- export const getAnalyticsEventProperties = (args) => ({
226
- version: pkg.version,
227
- command: args._.join(" "),
228
- flags: {
229
- output: args.output,
230
- },
231
- ci: isCi(),
232
- githubEnvVars: getGithubEnvVars(process.env),
181
+ const getAnalyticsEventProperties = (args) => ({
182
+ version: pkg_default.version,
183
+ command: args._.join(" "),
184
+ flags: { output: args.output },
185
+ ci: isCi(),
186
+ githubEnvVars: getGithubEnvVars(process.env)
233
187
  });
188
+ //#endregion
189
+ export { analyticsMiddleware, analyticsUserId, closeAnalytics, getAnalyticsEventProperties, getErrorAnalyticsEventProperties, initAnalyticsClientMiddleware, sendError, storedCredentialAttribution, telemetryCredential, trackEvent };