eas-cli 23.0.0 → 23.2.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 (53) hide show
  1. package/README.md +174 -149
  2. package/build/api.d.ts +1 -0
  3. package/build/api.js +12 -0
  4. package/build/commandUtils/new/commands.d.ts +16 -1
  5. package/build/commandUtils/new/commands.js +59 -20
  6. package/build/commandUtils/new/projectFiles.d.ts +2 -1
  7. package/build/commandUtils/new/projectFiles.js +24 -1
  8. package/build/commandUtils/new/sdkVersion.d.ts +17 -0
  9. package/build/commandUtils/new/sdkVersion.js +138 -0
  10. package/build/commandUtils/workflow/logs/fetchLogs.d.ts +5 -0
  11. package/build/commandUtils/workflow/logs/fetchLogs.js +24 -0
  12. package/build/commandUtils/workflow/logs/parseLogs.d.ts +14 -0
  13. package/build/commandUtils/workflow/logs/parseLogs.js +69 -0
  14. package/build/commandUtils/workflow/logs/watcher.d.ts +32 -0
  15. package/build/commandUtils/workflow/logs/watcher.js +162 -0
  16. package/build/commandUtils/workflow/stateMachine.js +2 -1
  17. package/build/commandUtils/workflow/types.d.ts +12 -5
  18. package/build/commandUtils/workflow/utils.d.ts +9 -5
  19. package/build/commandUtils/workflow/utils.js +144 -146
  20. package/build/commands/project/new.d.ts +1 -0
  21. package/build/commands/project/new.js +13 -2
  22. package/build/commands/simulator/get.js +2 -0
  23. package/build/commands/simulator/index.d.ts +1 -0
  24. package/build/commands/simulator/index.js +10 -0
  25. package/build/commands/simulator/list.d.ts +1 -0
  26. package/build/commands/simulator/list.js +9 -0
  27. package/build/commands/workflow/run.d.ts +8 -0
  28. package/build/commands/workflow/run.js +27 -0
  29. package/build/commands/workflow/ssh.d.ts +31 -0
  30. package/build/commands/workflow/ssh.js +190 -0
  31. package/build/graphql/generated.d.ts +243 -3
  32. package/build/graphql/generated.js +28 -4
  33. package/build/graphql/mutations/RealtimeLogsMutation.d.ts +6 -0
  34. package/build/graphql/mutations/RealtimeLogsMutation.js +40 -0
  35. package/build/graphql/mutations/WorkflowRunMutation.d.ts +3 -2
  36. package/build/graphql/mutations/WorkflowRunMutation.js +4 -1
  37. package/build/graphql/queries/DeviceRunSessionQuery.js +5 -0
  38. package/build/graphql/queries/WorkflowJobSshQuery.d.ts +20 -0
  39. package/build/graphql/queries/WorkflowJobSshQuery.js +133 -0
  40. package/build/ora.d.ts +7 -0
  41. package/build/ora.js +12 -0
  42. package/build/simulator/utils.js +9 -1
  43. package/build/utils/centrifuge.d.ts +10 -0
  44. package/build/utils/centrifuge.js +89 -0
  45. package/build/utils/expodash/uniqBy.js +3 -2
  46. package/build/worker/upload.d.ts +14 -1
  47. package/build/worker/upload.js +81 -17
  48. package/oclif.manifest.json +397 -287
  49. package/package.json +12 -10
  50. package/build/commandUtils/workflow/fetchLogs.d.ts +0 -6
  51. package/build/commandUtils/workflow/fetchLogs.js +0 -44
  52. package/build/onboarding/git.d.ts +0 -16
  53. package/build/onboarding/git.js +0 -88
@@ -0,0 +1,162 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.WorkflowRunLogsWatcher = exports.WorkflowJobLogsState = void 0;
4
+ exports.realtimeLogsTargetForJob = realtimeLogsTargetForJob;
5
+ const tslib_1 = require("tslib");
6
+ const parseLogs_1 = require("./parseLogs");
7
+ const generated_1 = require("../../../graphql/generated");
8
+ const log_1 = tslib_1.__importDefault(require("../../../log"));
9
+ const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
10
+ function isRealtimeLogLine(entry) {
11
+ return (typeof entry === 'object' &&
12
+ entry !== null &&
13
+ typeof entry.logId === 'string');
14
+ }
15
+ class WorkflowJobLogsState {
16
+ fileLogIds = new Set();
17
+ realtimeLogLines = [];
18
+ realtimeLogIds = new Set();
19
+ haveFileLogsCaughtUp = false;
20
+ realtimeLogsRevealed = false;
21
+ groupedLogs = new Map();
22
+ ingestFileLogLines(logLines) {
23
+ this.fileLogIds = new Set(logLines.flatMap(logLine => (logLine.logId ? [logLine.logId] : [])));
24
+ if (!this.haveFileLogsCaughtUp &&
25
+ this.realtimeLogLines.some(logLine => this.fileLogIds.has(logLine.logId))) {
26
+ this.haveFileLogsCaughtUp = true;
27
+ }
28
+ this.realtimeLogLines = this.realtimeLogLines.filter(logLine => !this.fileLogIds.has(logLine.logId));
29
+ this.realtimeLogIds = new Set(this.realtimeLogLines.map(logLine => logLine.logId));
30
+ if (this.haveFileLogsCaughtUp) {
31
+ this.realtimeLogsRevealed = true;
32
+ }
33
+ this.groupedLogs = (0, parseLogs_1.groupLogLinesIntoSteps)((0, parseLogs_1.mergeLogLines)(logLines, this.realtimeLogsRevealed ? this.realtimeLogLines : []));
34
+ }
35
+ ingestRealtimeLogLines(data) {
36
+ if (!Array.isArray(data)) {
37
+ return false;
38
+ }
39
+ const publishedLogLines = data.filter(isRealtimeLogLine);
40
+ if (publishedLogLines.length === 0) {
41
+ return false;
42
+ }
43
+ if (!this.haveFileLogsCaughtUp &&
44
+ publishedLogLines.some(logLine => this.fileLogIds.has(logLine.logId))) {
45
+ this.haveFileLogsCaughtUp = true;
46
+ }
47
+ const newLogLines = publishedLogLines.filter(logLine => !this.fileLogIds.has(logLine.logId) && !this.realtimeLogIds.has(logLine.logId));
48
+ for (const logLine of newLogLines) {
49
+ this.realtimeLogLines.push(logLine);
50
+ this.realtimeLogIds.add(logLine.logId);
51
+ }
52
+ if (!this.realtimeLogsRevealed) {
53
+ if (this.haveFileLogsCaughtUp) {
54
+ this.revealRealtimeLogs();
55
+ }
56
+ }
57
+ else if (newLogLines.length > 0) {
58
+ (0, parseLogs_1.groupLogLinesIntoSteps)(newLogLines, this.groupedLogs);
59
+ }
60
+ return true;
61
+ }
62
+ markCompleted() {
63
+ this.revealRealtimeLogs();
64
+ }
65
+ getLogs() {
66
+ return this.groupedLogs;
67
+ }
68
+ revealRealtimeLogs() {
69
+ if (this.realtimeLogsRevealed) {
70
+ return;
71
+ }
72
+ this.realtimeLogsRevealed = true;
73
+ (0, parseLogs_1.groupLogLinesIntoSteps)(this.realtimeLogLines, this.groupedLogs);
74
+ }
75
+ }
76
+ exports.WorkflowJobLogsState = WorkflowJobLogsState;
77
+ function realtimeLogsTargetForJob(job) {
78
+ if (job.turtleJobRun?.id) {
79
+ return { type: generated_1.RealtimeLogsTargetType.JobRun, id: job.turtleJobRun.id };
80
+ }
81
+ const buildId = job.turtleBuild?.id ?? job.outputs?.build_id;
82
+ if (buildId) {
83
+ return { type: generated_1.RealtimeLogsTargetType.Build, id: buildId };
84
+ }
85
+ return null;
86
+ }
87
+ class WorkflowRunLogsWatcher {
88
+ graphqlClient;
89
+ createRealtimeLogsClient;
90
+ onRealtimeLogs;
91
+ trackedJobs = new Map();
92
+ realtimeLogsClient;
93
+ constructor(graphqlClient, createRealtimeLogsClient, onRealtimeLogs) {
94
+ this.graphqlClient = graphqlClient;
95
+ this.createRealtimeLogsClient = createRealtimeLogsClient;
96
+ this.onRealtimeLogs = onRealtimeLogs;
97
+ }
98
+ async syncJobsAsync(jobs) {
99
+ await Promise.all(jobs.map(job => this.syncJobAsync(job)));
100
+ return new Map(jobs.map(job => [
101
+ job.id,
102
+ (0, nullthrows_1.default)(this.trackedJobs.get(job.id), 'job has to be in tracked jobs after it was synced').logsState,
103
+ ]));
104
+ }
105
+ close() {
106
+ for (const trackedJob of this.trackedJobs.values()) {
107
+ trackedJob.subscription?.close();
108
+ trackedJob.subscription = null;
109
+ }
110
+ this.realtimeLogsClient?.close();
111
+ }
112
+ async syncJobAsync(job) {
113
+ let trackedJob = this.trackedJobs.get(job.id);
114
+ if (!trackedJob) {
115
+ trackedJob = { logsState: new WorkflowJobLogsState(), subscription: null };
116
+ this.trackedJobs.set(job.id, trackedJob);
117
+ }
118
+ const workflowInProgress = job.status === generated_1.WorkflowJobStatus.InProgress;
119
+ if (!workflowInProgress) {
120
+ trackedJob.subscription?.close();
121
+ trackedJob.subscription = null;
122
+ return;
123
+ }
124
+ await Promise.all([
125
+ trackedJob.subscription ? Promise.resolve() : this.subscribeAsync(job, trackedJob),
126
+ this.fetchLogsAsync(job, trackedJob),
127
+ ]);
128
+ }
129
+ async fetchLogsAsync(job, trackedJob) {
130
+ try {
131
+ const logLines = await (0, parseLogs_1.fetchAndParseLogsFromJobAsync)({ graphqlClient: this.graphqlClient }, job);
132
+ if (logLines) {
133
+ trackedJob.logsState.ingestFileLogLines(logLines);
134
+ }
135
+ }
136
+ catch (err) {
137
+ log_1.default.debug(`Failed to fetch logs for job ${job.id}: ${err.message}`);
138
+ }
139
+ }
140
+ getRealtimeLogsClient() {
141
+ if (this.realtimeLogsClient === undefined) {
142
+ this.realtimeLogsClient = this.createRealtimeLogsClient();
143
+ }
144
+ return this.realtimeLogsClient;
145
+ }
146
+ async subscribeAsync(job, trackedJob) {
147
+ const target = realtimeLogsTargetForJob(job);
148
+ if (!target) {
149
+ return;
150
+ }
151
+ const realtimeLogsClient = this.getRealtimeLogsClient();
152
+ if (!realtimeLogsClient) {
153
+ return;
154
+ }
155
+ trackedJob.subscription = await realtimeLogsClient.subscribeAsync({ target }, data => {
156
+ if (trackedJob.logsState.ingestRealtimeLogLines(data)) {
157
+ this.onRealtimeLogs();
158
+ }
159
+ });
160
+ }
161
+ }
162
+ exports.WorkflowRunLogsWatcher = WorkflowRunLogsWatcher;
@@ -8,6 +8,7 @@ exports.moveToWorkflowStepSelectionState = moveToWorkflowStepSelectionState;
8
8
  exports.moveToWorkflowSelectionFinishedState = moveToWorkflowSelectionFinishedState;
9
9
  exports.moveToWorkflowSelectionErrorState = moveToWorkflowSelectionErrorState;
10
10
  const tslib_1 = require("tslib");
11
+ const parseLogs_1 = require("./logs/parseLogs");
11
12
  const utils_1 = require("./utils");
12
13
  const AppQuery_1 = require("../../graphql/queries/AppQuery");
13
14
  const WorkflowJobQuery_1 = require("../../graphql/queries/WorkflowJobQuery");
@@ -161,7 +162,7 @@ const workflowStepSelectionAction = async (prevState) => {
161
162
  if (!job) {
162
163
  return moveToWorkflowSelectionErrorState(prevState, 'No job found');
163
164
  }
164
- const logs = await (0, utils_1.fetchAndProcessLogsFromJobAsync)(prevState, job);
165
+ const logs = await (0, parseLogs_1.fetchAndProcessLogsFromJobAsync)(prevState, job);
165
166
  if (!logs) {
166
167
  return moveToWorkflowSelectionErrorState(prevState, 'No logs found');
167
168
  }
@@ -30,15 +30,22 @@ export type WorkflowRunWithJobsResult = WorkflowRunResult & {
30
30
  jobs: WorkflowJobResult[];
31
31
  logs?: string;
32
32
  };
33
- export type WorkflowLogLine = {
34
- time: string;
35
- msg: string;
33
+ export type WorkflowRawLogLine = {
34
+ logId?: string;
35
+ buildStepId?: string;
36
+ buildStepDisplayName?: string;
37
+ phase?: string;
38
+ time?: string;
39
+ msg?: string;
36
40
  result?: string;
37
41
  marker?: string;
38
42
  err?: any;
39
43
  };
40
- export type WorkflowLogs = Map<string, {
44
+ export type WorkflowLogLine = Pick<WorkflowRawLogLine, 'time' | 'result' | 'marker' | 'err'> & Required<Pick<WorkflowRawLogLine, 'msg'>>;
45
+ export type StepLogs = {
41
46
  key: string;
42
47
  label: string;
48
+ result?: string;
43
49
  logLines: WorkflowLogLine[];
44
- }>;
50
+ };
51
+ export type WorkflowLogs = Map<string, StepLogs>;
@@ -14,11 +14,14 @@ export declare function choicesFromWorkflowLogs(logs: WorkflowLogs): (Choice & {
14
14
  logLines: WorkflowLogLine[] | undefined;
15
15
  })[];
16
16
  export declare function processWorkflowRuns(runs: WorkflowRunFragment[]): WorkflowRunResult[];
17
- export declare function fetchAndProcessLogsFromJobAsync(state: {
18
- graphqlClient: ExpoGraphqlClient;
19
- }, job: WorkflowJobResult): Promise<WorkflowLogs | null>;
20
- export declare function infoForActiveWorkflowRunAsync(graphqlClient: ExpoGraphqlClient, workflowRun: WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'], maxLogLines?: number): Promise<string>;
21
- export declare function infoForFailedWorkflowRunAsync(graphqlClient: ExpoGraphqlClient, workflowRun: WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'], maxLogLines?: number): Promise<string>;
17
+ type WorkflowRunWithJobs = WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'];
18
+ type JobWithLogs = {
19
+ job: WorkflowRunWithJobs['jobs'][number];
20
+ logs: WorkflowLogs;
21
+ };
22
+ export declare function logsForFailedWorkflowRunAsync(graphqlClient: ExpoGraphqlClient, workflowRun: WorkflowRunWithJobs): Promise<JobWithLogs[]>;
23
+ export declare function formatActiveWorkflowRun(jobLogs: JobWithLogs[], maxLogLines?: number): string;
24
+ export declare function formatFailedWorkflowRun(jobLogs: JobWithLogs[], maxLogLines?: number): string;
22
25
  export declare function fileExistsAsync(filePath: string): Promise<boolean>;
23
26
  export declare function maybeReadStdinAsync(): Promise<string | null>;
24
27
  export declare function showWorkflowStatusAsync(graphqlClient: ExpoGraphqlClient, { workflowRunId, spinnerUsesStdErr, waitForCompletion, }: {
@@ -31,3 +34,4 @@ export declare const workflowRunExitCodes: {
31
34
  WORKFLOW_CANCELED: number;
32
35
  WAIT_ABORTED: number;
33
36
  };
37
+ export {};
@@ -6,23 +6,26 @@ exports.choiceFromWorkflowRun = choiceFromWorkflowRun;
6
6
  exports.choiceFromWorkflowJob = choiceFromWorkflowJob;
7
7
  exports.choicesFromWorkflowLogs = choicesFromWorkflowLogs;
8
8
  exports.processWorkflowRuns = processWorkflowRuns;
9
- exports.fetchAndProcessLogsFromJobAsync = fetchAndProcessLogsFromJobAsync;
10
- exports.infoForActiveWorkflowRunAsync = infoForActiveWorkflowRunAsync;
11
- exports.infoForFailedWorkflowRunAsync = infoForFailedWorkflowRunAsync;
9
+ exports.logsForFailedWorkflowRunAsync = logsForFailedWorkflowRunAsync;
10
+ exports.formatActiveWorkflowRun = formatActiveWorkflowRun;
11
+ exports.formatFailedWorkflowRun = formatFailedWorkflowRun;
12
12
  exports.fileExistsAsync = fileExistsAsync;
13
13
  exports.maybeReadStdinAsync = maybeReadStdinAsync;
14
14
  exports.showWorkflowStatusAsync = showWorkflowStatusAsync;
15
15
  const tslib_1 = require("tslib");
16
16
  const chalk_1 = tslib_1.__importDefault(require("chalk"));
17
17
  const fs = tslib_1.__importStar(require("node:fs"));
18
- const fetchLogs_1 = require("./fetchLogs");
18
+ const parseLogs_1 = require("./logs/parseLogs");
19
19
  const types_1 = require("./types");
20
20
  const generated_1 = require("../../graphql/generated");
21
+ const watcher_1 = require("./logs/watcher");
21
22
  const WorkflowRunQuery_1 = require("../../graphql/queries/WorkflowRunQuery");
22
23
  const log_1 = tslib_1.__importDefault(require("../../log"));
23
24
  const ora_1 = require("../../ora");
24
25
  const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
26
+ const centrifuge_1 = require("../../utils/centrifuge");
25
27
  const promise_1 = require("../../utils/promise");
28
+ const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
26
29
  function computeTriggerInfoForWorkflowRun(run) {
27
30
  let triggerType = types_1.WorkflowTriggerType.OTHER;
28
31
  let trigger = '';
@@ -75,16 +78,13 @@ function choiceFromWorkflowJob(job, index) {
75
78
  }
76
79
  function choicesFromWorkflowLogs(logs) {
77
80
  return Array.from(logs.values())
78
- .map(({ key, label, logLines }) => {
79
- const stepStatus = logLines?.filter((line) => line.marker === 'end-step' || line.marker === 'END_PHASE')[0]?.result ?? '';
80
- return {
81
- title: `${label} - ${stepStatus}`,
82
- name: label,
83
- status: stepStatus,
84
- value: key,
85
- logLines,
86
- };
87
- })
81
+ .map(({ key, label, result, logLines }) => ({
82
+ title: `${label} - ${result ?? ''}`,
83
+ name: label,
84
+ status: result ?? '',
85
+ value: key,
86
+ logLines,
87
+ }))
88
88
  .filter(step => step.status !== 'skipped');
89
89
  }
90
90
  function processWorkflowRuns(runs) {
@@ -106,48 +106,6 @@ function processWorkflowRuns(runs) {
106
106
  };
107
107
  });
108
108
  }
109
- async function fetchAndProcessLogsFromJobAsync(state, job) {
110
- let rawLogs;
111
- switch (job.type) {
112
- case generated_1.WorkflowJobType.Build:
113
- case generated_1.WorkflowJobType.Repack:
114
- rawLogs = await (0, fetchLogs_1.fetchRawLogsForBuildJobAsync)(state, job);
115
- break;
116
- default:
117
- rawLogs = await (0, fetchLogs_1.fetchRawLogsForCustomJobAsync)(job);
118
- break;
119
- }
120
- if (!rawLogs) {
121
- return null;
122
- }
123
- log_1.default.debug(`rawLogs = ${JSON.stringify(rawLogs, null, 2)}`);
124
- const logs = new Map();
125
- rawLogs.split('\n').forEach((line, index) => {
126
- log_1.default.debug(`line ${index} = ${JSON.stringify(line, null, 2)}`);
127
- try {
128
- const parsedLine = JSON.parse(line);
129
- const { buildStepDisplayName, buildStepId, phase, time, msg, result, marker, err } = parsedLine;
130
- const stepKey = buildStepId ?? buildStepDisplayName ?? phase;
131
- const stepLabel = buildStepDisplayName ?? buildStepId ?? phase;
132
- if (stepKey && stepLabel) {
133
- if (!logs.has(stepKey)) {
134
- logs.set(stepKey, {
135
- key: stepKey,
136
- label: stepLabel,
137
- logLines: [],
138
- });
139
- }
140
- const logGroup = logs.get(stepKey);
141
- if (buildStepDisplayName) {
142
- logGroup.label = buildStepDisplayName;
143
- }
144
- logGroup.logLines.push({ time, msg, result, marker, err });
145
- }
146
- }
147
- catch { }
148
- });
149
- return logs;
150
- }
151
109
  function descriptionForJobStatus(status) {
152
110
  switch (status) {
153
111
  case generated_1.WorkflowJobStatus.New:
@@ -168,73 +126,78 @@ function descriptionForJobStatus(status) {
168
126
  return 'Pending cancel';
169
127
  }
170
128
  }
171
- async function infoForActiveWorkflowRunAsync(graphqlClient, workflowRun, maxLogLines = 5 // -1 means no limit
129
+ function isJobCompleted(status) {
130
+ switch (status) {
131
+ case generated_1.WorkflowJobStatus.Success:
132
+ case generated_1.WorkflowJobStatus.Failure:
133
+ case generated_1.WorkflowJobStatus.Canceled:
134
+ case generated_1.WorkflowJobStatus.Skipped:
135
+ return true;
136
+ case generated_1.WorkflowJobStatus.New:
137
+ case generated_1.WorkflowJobStatus.InProgress:
138
+ case generated_1.WorkflowJobStatus.ActionRequired:
139
+ case generated_1.WorkflowJobStatus.PendingCancel:
140
+ return false;
141
+ }
142
+ }
143
+ function stepLogTail(step, maxLogLines // -1 means no limit
144
+ ) {
145
+ const logLines = step.logLines ?? [];
146
+ const tail = maxLogLines === -1 ? logLines : logLines.slice(-maxLogLines);
147
+ return tail.map(line => line.msg);
148
+ }
149
+ async function logsForFailedWorkflowRunAsync(graphqlClient, workflowRun) {
150
+ const jobs = workflowRun.jobs.filter(job => job.status === generated_1.WorkflowJobStatus.Failure);
151
+ return await Promise.all(jobs.map(async (job) => {
152
+ const maybeLogs = await (0, parseLogs_1.fetchAndProcessLogsFromJobAsync)({ graphqlClient }, job);
153
+ return { job, logs: maybeLogs ?? new Map() };
154
+ }));
155
+ }
156
+ function formatActiveWorkflowRun(jobLogs, maxLogLines = 5 // -1 means no limit
172
157
  ) {
173
- const statusLines = [];
174
158
  const statusValues = [];
175
- for (const job of workflowRun.jobs) {
159
+ for (const { job, logs } of jobLogs) {
176
160
  statusValues.push({ label: '', value: '' });
177
161
  statusValues.push({ label: ' Job', value: job.name });
178
162
  statusValues.push({ label: ' Status', value: descriptionForJobStatus(job.status) });
179
163
  if (job.status !== generated_1.WorkflowJobStatus.InProgress) {
180
164
  continue;
181
165
  }
182
- const logs = await fetchAndProcessLogsFromJobAsync({ graphqlClient }, job);
183
- const steps = logs ? choicesFromWorkflowLogs(logs) : [];
184
- if (steps.length > 0) {
185
- const currentStep = steps[steps.length - 1];
186
- statusValues.push({ label: ' Current step', value: currentStep.name });
187
- if (currentStep?.logLines?.length) {
188
- statusValues.push({ label: ' Current logs', value: '' });
189
- const currentLogs = currentStep.logLines
190
- ?.map(line => line.msg)
191
- .filter((_, index) => {
192
- if (maxLogLines === -1) {
193
- return true;
194
- }
195
- return index > (currentStep.logLines?.length ?? 0) - maxLogLines;
196
- }) ?? [];
197
- for (const log of currentLogs) {
198
- statusValues.push({ label: '', value: log });
199
- }
166
+ const steps = choicesFromWorkflowLogs(logs);
167
+ if (steps.length === 0) {
168
+ continue;
169
+ }
170
+ const currentStep = steps[steps.length - 1];
171
+ statusValues.push({ label: ' Current step', value: currentStep.name });
172
+ if (currentStep.logLines?.length) {
173
+ statusValues.push({ label: ' Current logs', value: '' });
174
+ for (const log of stepLogTail(currentStep, maxLogLines)) {
175
+ statusValues.push({ label: '', value: log });
200
176
  }
201
177
  }
202
178
  }
203
179
  statusValues.push({ label: '', value: '' });
204
- statusLines.push((0, formatFields_1.default)(statusValues));
205
- return statusLines.join('\n');
180
+ return (0, formatFields_1.default)(statusValues);
206
181
  }
207
- async function infoForFailedWorkflowRunAsync(graphqlClient, workflowRun, maxLogLines = -1 // -1 means no limit
182
+ function formatFailedWorkflowRun(jobLogs, maxLogLines = -1 // -1 means no limit
208
183
  ) {
209
- const statusLines = [];
210
184
  const statusValues = [];
211
- const logLinesToKeep = maxLogLines === -1 ? Infinity : maxLogLines;
212
- for (const job of workflowRun.jobs) {
213
- if (job.status !== generated_1.WorkflowJobStatus.Failure) {
214
- continue;
215
- }
216
- const logs = await fetchAndProcessLogsFromJobAsync({ graphqlClient }, job);
217
- const steps = logs ? choicesFromWorkflowLogs(logs) : [];
185
+ for (const { job, logs } of jobLogs) {
218
186
  statusValues.push({ label: '', value: '' });
219
187
  statusValues.push({ label: ' Failed job', value: job.name });
220
- if (steps.length > 0) {
221
- const failedStep = steps.find(step => step.status === 'fail' || step.status === 'failed');
222
- if (failedStep) {
223
- const logs = failedStep.logLines?.map(line => line.msg).slice(-logLinesToKeep) ?? [];
224
- statusValues.push({ label: ' Failed step', value: failedStep.name });
225
- statusValues.push({
226
- label: ' Logs for failed step',
227
- value: '',
228
- });
229
- for (const log of logs) {
230
- statusValues.push({ label: '', value: log });
231
- }
232
- }
188
+ const steps = choicesFromWorkflowLogs(logs);
189
+ const failedStep = steps.find(step => step.status === 'fail' || step.status === 'failed');
190
+ if (!failedStep) {
191
+ continue;
192
+ }
193
+ statusValues.push({ label: ' Failed step', value: failedStep.name });
194
+ statusValues.push({ label: ' Logs for failed step', value: '' });
195
+ for (const log of stepLogTail(failedStep, maxLogLines)) {
196
+ statusValues.push({ label: '', value: log });
233
197
  }
234
198
  }
235
199
  statusValues.push({ label: '', value: '' });
236
- statusLines.push((0, formatFields_1.default)(statusValues));
237
- return statusLines.join('\n');
200
+ return (0, formatFields_1.default)(statusValues);
238
201
  }
239
202
  async function fileExistsAsync(filePath) {
240
203
  return await fs.promises
@@ -271,57 +234,92 @@ async function showWorkflowStatusAsync(graphqlClient, { workflowRunId, spinnerUs
271
234
  stream: spinnerUsesStdErr ? process.stderr : process.stdout,
272
235
  text: '',
273
236
  }).start();
274
- spinner.prefixText = (0, chalk_1.default) `{bold.yellow Workflow run is waiting to start:}`;
237
+ (0, ora_1.updateSpinnerText)(spinner, {
238
+ prefixText: (0, chalk_1.default) `{bold.yellow Workflow run is waiting to start:}`,
239
+ });
240
+ const watcher = new watcher_1.WorkflowRunLogsWatcher(graphqlClient, () => (0, centrifuge_1.createRealtimeLogsClient)(graphqlClient), () => {
241
+ renderActiveWorkflowRun();
242
+ });
275
243
  let failedFetchesCount = 0;
276
- while (true) {
277
- try {
278
- const workflowRun = await WorkflowRunQuery_1.WorkflowRunQuery.withJobsByIdAsync(graphqlClient, workflowRunId, {
279
- useCache: false,
280
- });
281
- failedFetchesCount = 0;
282
- switch (workflowRun.status) {
283
- case generated_1.WorkflowRunStatus.New:
284
- break;
285
- case generated_1.WorkflowRunStatus.InProgress: {
286
- spinner.prefixText = (0, chalk_1.default) `{bold.green Workflow run is in progress:}`;
287
- spinner.text = await infoForActiveWorkflowRunAsync(graphqlClient, workflowRun, 5);
288
- break;
244
+ let renderActiveWorkflowRun = () => { };
245
+ try {
246
+ while (true) {
247
+ try {
248
+ const workflowRun = await WorkflowRunQuery_1.WorkflowRunQuery.withJobsByIdAsync(graphqlClient, workflowRunId, {
249
+ useCache: false,
250
+ });
251
+ failedFetchesCount = 0;
252
+ switch (workflowRun.status) {
253
+ case generated_1.WorkflowRunStatus.New:
254
+ break;
255
+ case generated_1.WorkflowRunStatus.InProgress: {
256
+ (0, ora_1.updateSpinnerText)(spinner, {
257
+ prefixText: (0, chalk_1.default) `{bold.green Workflow run is in progress:}`,
258
+ });
259
+ const logsStates = await watcher.syncJobsAsync(workflowRun.jobs);
260
+ for (const job of workflowRun.jobs) {
261
+ if (isJobCompleted(job.status)) {
262
+ (0, nullthrows_1.default)(logsStates.get(job.id), 'syncJobsAsync must have been called before markCompleted').markCompleted();
263
+ }
264
+ }
265
+ renderActiveWorkflowRun = () => {
266
+ const text = formatActiveWorkflowRun(workflowRun.jobs.map(job => ({
267
+ job,
268
+ logs: (0, nullthrows_1.default)(logsStates.get(job.id), 'syncJobsAsync must have been called before getLogs').getLogs(),
269
+ })));
270
+ (0, ora_1.updateSpinnerText)(spinner, { text });
271
+ };
272
+ renderActiveWorkflowRun();
273
+ break;
274
+ }
275
+ case generated_1.WorkflowRunStatus.ActionRequired:
276
+ (0, ora_1.updateSpinnerText)(spinner, {
277
+ prefixText: (0, chalk_1.default) `{bold.yellow Workflow run is waiting for action:}`,
278
+ });
279
+ break;
280
+ case generated_1.WorkflowRunStatus.Canceled:
281
+ (0, ora_1.updateSpinnerText)(spinner, {
282
+ prefixText: (0, chalk_1.default) `{bold.yellow Workflow has been canceled.}`,
283
+ });
284
+ spinner.stopAndPersist();
285
+ return workflowRun;
286
+ case generated_1.WorkflowRunStatus.Failure: {
287
+ (0, ora_1.updateSpinnerText)(spinner, {
288
+ prefixText: (0, chalk_1.default) `{bold.red Workflow has failed.}`,
289
+ });
290
+ const jobLogs = await logsForFailedWorkflowRunAsync(graphqlClient, workflowRun);
291
+ spinner.fail(formatFailedWorkflowRun(jobLogs, 30));
292
+ return workflowRun;
293
+ }
294
+ case generated_1.WorkflowRunStatus.Success:
295
+ (0, ora_1.updateSpinnerText)(spinner, {
296
+ prefixText: (0, chalk_1.default) `{bold.green Workflow has completed successfully.}`,
297
+ });
298
+ spinner.succeed('');
299
+ return workflowRun;
289
300
  }
290
- case generated_1.WorkflowRunStatus.ActionRequired:
291
- spinner.prefixText = (0, chalk_1.default) `{bold.yellow Workflow run is waiting for action:}`;
292
- break;
293
- case generated_1.WorkflowRunStatus.Canceled:
294
- spinner.prefixText = (0, chalk_1.default) `{bold.yellow Workflow has been canceled.}`;
295
- spinner.stopAndPersist();
296
- return workflowRun;
297
- case generated_1.WorkflowRunStatus.Failure: {
298
- spinner.prefixText = (0, chalk_1.default) `{bold.red Workflow has failed.}`;
299
- const failedInfo = await infoForFailedWorkflowRunAsync(graphqlClient, workflowRun, 30);
300
- spinner.fail(failedInfo);
301
+ if (!waitForCompletion) {
302
+ if (spinner.isSpinning) {
303
+ spinner.stopAndPersist();
304
+ }
301
305
  return workflowRun;
302
306
  }
303
- case generated_1.WorkflowRunStatus.Success:
304
- spinner.prefixText = (0, chalk_1.default) `{bold.green Workflow has completed successfully.}`;
305
- spinner.text = '';
306
- spinner.succeed('');
307
- return workflowRun;
308
307
  }
309
- if (!waitForCompletion) {
310
- if (spinner.isSpinning) {
311
- spinner.stopAndPersist();
308
+ catch {
309
+ (0, ora_1.updateSpinnerText)(spinner, {
310
+ text: '⚠ Failed to fetch the workflow run status. Check your network connection.',
311
+ });
312
+ failedFetchesCount += 1;
313
+ if (failedFetchesCount > 6) {
314
+ spinner.fail('Failed to fetch the workflow run status 6 times in a row. Aborting wait.');
315
+ process.exit(exports.workflowRunExitCodes.WAIT_ABORTED);
312
316
  }
313
- return workflowRun;
314
317
  }
318
+ await (0, promise_1.sleepAsync)(10 /* seconds */ * 1000 /* milliseconds */);
315
319
  }
316
- catch {
317
- spinner.text = '⚠ Failed to fetch the workflow run status. Check your network connection.';
318
- failedFetchesCount += 1;
319
- if (failedFetchesCount > 6) {
320
- spinner.fail('Failed to fetch the workflow run status 6 times in a row. Aborting wait.');
321
- process.exit(exports.workflowRunExitCodes.WAIT_ABORTED);
322
- }
323
- }
324
- await (0, promise_1.sleepAsync)(10 /* seconds */ * 1000 /* milliseconds */);
320
+ }
321
+ finally {
322
+ watcher.close();
325
323
  }
326
324
  }
327
325
  exports.workflowRunExitCodes = {
@@ -26,6 +26,7 @@ export default class New extends EasCommand {
26
26
  };
27
27
  static flags: {
28
28
  'package-manager': import("@oclif/core/lib/interfaces").OptionFlag<"npm" | "pnpm" | "yarn" | "bun", import("@oclif/core/lib/interfaces").CustomOptions>;
29
+ 'sdk-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
29
30
  };
30
31
  static contextDefinition: {
31
32
  loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
@@ -11,6 +11,7 @@ const url_1 = require("../../build/utils/url");
11
11
  const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
12
12
  const commands_1 = require("../../commandUtils/new/commands");
13
13
  const configs_1 = require("../../commandUtils/new/configs");
14
+ const sdkVersion_1 = require("../../commandUtils/new/sdkVersion");
14
15
  const projectFiles_1 = require("../../commandUtils/new/projectFiles");
15
16
  const utils_1 = require("../../commandUtils/new/utils");
16
17
  const AppMutation_1 = require("../../graphql/mutations/AppMutation");
@@ -60,7 +61,8 @@ async function generateProjectFilesAsync(projectDir, app, packageManager) {
60
61
  const spinner = (0, ora_1.ora)(`Generating project files`).start();
61
62
  await (0, projectFiles_1.generateAppConfigAsync)(projectDir, app);
62
63
  await (0, projectFiles_1.generateEasConfigAsync)(projectDir);
63
- await (0, projectFiles_1.updatePackageJsonAsync)(projectDir);
64
+ await (0, projectFiles_1.updatePackageJsonAsync)(projectDir, app.slug);
65
+ await (0, projectFiles_1.removeTemplateFilesAsync)(projectDir);
64
66
  await (0, projectFiles_1.copyProjectTemplatesAsync)(projectDir);
65
67
  await (0, projectFiles_1.updateReadmeAsync)(projectDir, packageManager);
66
68
  spinner.succeed(`Generated project files`);
@@ -83,6 +85,9 @@ class New extends EasCommand_1.default {
83
85
  options: [...installDependencies_1.PACKAGE_MANAGERS],
84
86
  default: 'npm',
85
87
  })(),
88
+ 'sdk-version': core_1.Flags.string({
89
+ description: 'Expo SDK version to use for the new project (e.g. 57, or "latest")',
90
+ }),
86
91
  };
87
92
  static contextDefinition = {
88
93
  ...this.ContextOptions.LoggedIn,
@@ -94,8 +99,14 @@ class New extends EasCommand_1.default {
94
99
  throw new Error('This command is not available for robot users. Make sure you are not using a robot token and try again.');
95
100
  }
96
101
  log_1.default.log(`👋 Welcome to Expo, ${actor.username}!`);
102
+ // Resolve the template before any prompts when --sdk-version is provided,
103
+ // so an invalid version fails fast.
104
+ let template = flags['sdk-version']
105
+ ? await (0, sdkVersion_1.resolveTemplateAsync)({ sdkVersion: flags['sdk-version'] })
106
+ : null;
97
107
  const { projectName, projectDirectory: targetProjectDirectory, projectAccount, } = await generateConfigsAsync(args, actor, graphqlClient);
98
- const projectDirectory = await (0, commands_1.cloneTemplateAsync)(targetProjectDirectory);
108
+ template ??= await (0, sdkVersion_1.resolveTemplateAsync)({});
109
+ const projectDirectory = await (0, commands_1.downloadTemplateAsync)(targetProjectDirectory, template);
99
110
  const packageManager = flags['package-manager'];
100
111
  await (0, commands_1.installProjectDependenciesAsync)(projectDirectory, packageManager);
101
112
  const projectId = await createProjectAsync({