anycloud 0.0.26 → 0.0.27
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.
- package/binaries/anycloud-darwin-arm64 +0 -0
- package/binaries/anycloud-darwin-x64 +0 -0
- package/binaries/anycloud-linux-arm64 +0 -0
- package/binaries/anycloud-linux-x64 +0 -0
- package/dist/cli/commands/config/edit.js +42 -178
- package/dist/cli/commands/config/edit.js.map +1 -1
- package/dist/cli/commands/config/list.js +2 -31
- package/dist/cli/commands/config/list.js.map +1 -1
- package/dist/cli/commands/config/new.js +42 -77
- package/dist/cli/commands/config/new.js.map +1 -1
- package/dist/cli/commands/config/remove.js +1 -12
- package/dist/cli/commands/config/remove.js.map +1 -1
- package/dist/cli/commands/run.js +16 -12
- package/dist/cli/commands/run.js.map +1 -1
- package/dist/cli/commands/ssh.js +23 -11
- package/dist/cli/commands/ssh.js.map +1 -1
- package/dist/cli/commands/status.js +49 -23
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/terminate.js +42 -58
- package/dist/cli/commands/terminate.js.map +1 -1
- package/dist/cli/config.js +5 -4
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/services/api-client.js +28 -11
- package/dist/cli/services/api-client.js.map +1 -1
- package/dist/cli/services/config.js +75 -50
- package/dist/cli/services/config.js.map +1 -1
- package/dist/cli/services/slurp/gcp.js.map +1 -1
- package/dist/cli/utils/output.js +4 -4
- package/dist/cli/utils/output.js.map +1 -1
- package/dist/shared/id-generator.js +20 -4
- package/dist/shared/id-generator.js.map +1 -1
- package/dist/shared/types.js.map +1 -1
- package/dist/shared/utils.js +11 -0
- package/dist/shared/utils.js.map +1 -0
- package/package.json +5 -3
- package/dist/cli/commands/upgrade.js +0 -106
- package/dist/cli/commands/upgrade.js.map +0 -1
package/dist/cli/commands/run.js
CHANGED
|
@@ -3,7 +3,7 @@ import prompts from 'prompts';
|
|
|
3
3
|
import { getGitHubToken } from '../services/auth.js';
|
|
4
4
|
import { resolveDeploymentProfile, loadDeploymentProfiles, profilesToTableEntries, } from '../services/config.js';
|
|
5
5
|
import { loadCredentials } from '../services/credentials.js';
|
|
6
|
-
import { createDeployment, saveSshKey } from '../services/api-client.js';
|
|
6
|
+
import { createDeployment, saveSshKey, saveDeploymentCredentials, } from '../services/api-client.js';
|
|
7
7
|
import { printInfo, printError, createSpinner, printCloudConfigsTable, } from '../utils/output.js';
|
|
8
8
|
import { isNonInteractive, getConfigFromEnv, } from '../services/non-interactive.js';
|
|
9
9
|
import { DeploymentType, } from '../../shared/types.js';
|
|
@@ -131,7 +131,7 @@ export function createRunCommand() {
|
|
|
131
131
|
.argument('[image]', 'Container image (e.g., ghcr.io/user/repo:latest)')
|
|
132
132
|
.option('-c, --config <name>', 'Config name from anycloud.json')
|
|
133
133
|
.option('-i, --id <id>', 'Job identifier')
|
|
134
|
-
.option('
|
|
134
|
+
.option('--env-file <file>', 'Environment file (.env format)')
|
|
135
135
|
.option('-p, --persist', 'Keep VM running after job completes')
|
|
136
136
|
// Docker runtime options
|
|
137
137
|
.option('--shm-size <size>', 'Shared memory size (e.g., 8g)')
|
|
@@ -146,7 +146,7 @@ Examples:
|
|
|
146
146
|
$ anycloud run # Select from GHCR images
|
|
147
147
|
$ anycloud run ghcr.io/user/repo:latest # Deploy specific image
|
|
148
148
|
$ anycloud run ghcr.io/user/repo:v1.0 --config prod # Deploy with config
|
|
149
|
-
$ anycloud run ghcr.io/user/repo:latest --env .env # Deploy with env vars
|
|
149
|
+
$ anycloud run ghcr.io/user/repo:latest --env-file .env # Deploy with env vars
|
|
150
150
|
|
|
151
151
|
Build first:
|
|
152
152
|
$ anycloud build # Build and push image
|
|
@@ -320,15 +320,15 @@ Output:
|
|
|
320
320
|
}
|
|
321
321
|
// Parse environment variables from file if provided
|
|
322
322
|
let envVars;
|
|
323
|
-
if (options.
|
|
323
|
+
if (options.envFile) {
|
|
324
324
|
try {
|
|
325
|
-
envVars = parseEnvFile(options.
|
|
325
|
+
envVars = parseEnvFile(options.envFile);
|
|
326
326
|
const count = Object.keys(envVars).length;
|
|
327
327
|
if (count > 0) {
|
|
328
|
-
printInfo(`Loaded ${count} environment variable(s) from ${options.
|
|
328
|
+
printInfo(`Loaded ${count} environment variable(s) from ${options.envFile}`);
|
|
329
329
|
}
|
|
330
330
|
else {
|
|
331
|
-
printInfo(`No environment variables found in ${options.
|
|
331
|
+
printInfo(`No environment variables found in ${options.envFile}`);
|
|
332
332
|
}
|
|
333
333
|
}
|
|
334
334
|
catch (error) {
|
|
@@ -347,9 +347,9 @@ Output:
|
|
|
347
347
|
}
|
|
348
348
|
pullSpinner.succeed('Image verified');
|
|
349
349
|
// Resolve deployment profile and credentials
|
|
350
|
-
const
|
|
350
|
+
const cloudConfig = await resolveDeploymentProfile(configName);
|
|
351
351
|
// Generate job ID if not provided
|
|
352
|
-
const jobId = options.id || generateJobId();
|
|
352
|
+
const jobId = options.id || generateJobId(image);
|
|
353
353
|
// Prompt for persist if not provided via flag (interactive mode only)
|
|
354
354
|
let persist = options.persist;
|
|
355
355
|
if (persist === undefined && !isNonInteractive()) {
|
|
@@ -386,8 +386,7 @@ Output:
|
|
|
386
386
|
const spinner = createSpinner('Creating job deployment...').start();
|
|
387
387
|
const request = {
|
|
388
388
|
image,
|
|
389
|
-
|
|
390
|
-
configName,
|
|
389
|
+
cloudConfig,
|
|
391
390
|
accessToken,
|
|
392
391
|
deploymentType: DeploymentType.Job,
|
|
393
392
|
version: packageJson.version,
|
|
@@ -397,8 +396,13 @@ Output:
|
|
|
397
396
|
dockerOptions,
|
|
398
397
|
};
|
|
399
398
|
const response = await createDeployment(request);
|
|
400
|
-
// Save SSH key for this deployment
|
|
399
|
+
// Save SSH key and credentials for this deployment
|
|
401
400
|
await saveSshKey(response.id, response.sshPrivateKey);
|
|
401
|
+
const fullCredentials = {
|
|
402
|
+
...cloudConfig.credentials,
|
|
403
|
+
cloudProvider: cloudConfig.cloudProvider,
|
|
404
|
+
};
|
|
405
|
+
await saveDeploymentCredentials(response.id, fullCredentials);
|
|
402
406
|
spinner.succeed('Job deployment created!');
|
|
403
407
|
console.log('');
|
|
404
408
|
printInfo(`ID: ${response.id}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/commands/ssh.js
CHANGED
|
@@ -5,8 +5,7 @@ import { tmpdir } from 'os';
|
|
|
5
5
|
import { join } from 'path';
|
|
6
6
|
import prompts from 'prompts';
|
|
7
7
|
import { getGitHubToken } from '../services/auth.js';
|
|
8
|
-
import { getDeploymentStatus, listDeployments, loadSshKey, } from '../services/api-client.js';
|
|
9
|
-
import { resolveAllDeploymentProfiles } from '../services/config.js';
|
|
8
|
+
import { getDeploymentStatus, listDeployments, loadSshKey, loadDeploymentCredentials, } from '../services/api-client.js';
|
|
10
9
|
import { printInfo, printError, createSpinner, selectDeployment, } from '../utils/output.js';
|
|
11
10
|
import { isNonInteractive, getEnvOptional, } from '../services/non-interactive.js';
|
|
12
11
|
import { DeploymentState, isExitedState, isVmAccessible, } from '../../shared/types.js';
|
|
@@ -75,22 +74,32 @@ Use --vm to SSH directly to the VM without entering the container.
|
|
|
75
74
|
isCompletedJob = isExitedState(selectedDeployment.state);
|
|
76
75
|
}
|
|
77
76
|
}
|
|
78
|
-
// Load SSH key for this deployment
|
|
77
|
+
// Load credentials and SSH key for this deployment
|
|
78
|
+
let credentials;
|
|
79
79
|
let sshPrivateKey;
|
|
80
|
+
try {
|
|
81
|
+
credentials = await loadDeploymentCredentials(deploymentId);
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
printError(`Credentials not found for deployment ${deploymentId}.\n` +
|
|
85
|
+
' This deployment may have been created from a different machine.\n' +
|
|
86
|
+
' Email support@anycloud.sh to reclaim it.');
|
|
87
|
+
process.exit(1);
|
|
88
|
+
}
|
|
80
89
|
try {
|
|
81
90
|
sshPrivateKey = await loadSshKey(deploymentId);
|
|
82
91
|
}
|
|
83
92
|
catch {
|
|
84
93
|
printError(`SSH key not found for deployment ${deploymentId}.\n` +
|
|
85
|
-
' This deployment may have been created from a different machine
|
|
94
|
+
' This deployment may have been created from a different machine.\n' +
|
|
95
|
+
' Email support@anycloud.sh to reclaim it.');
|
|
86
96
|
process.exit(1);
|
|
87
97
|
}
|
|
88
|
-
//
|
|
89
|
-
const anycloudConfigs = await resolveAllDeploymentProfiles();
|
|
98
|
+
// Get VM IPs
|
|
90
99
|
const spinner = createSpinner('Getting VM info...').start();
|
|
91
100
|
const statusRequest = {
|
|
92
101
|
id: deploymentId,
|
|
93
|
-
|
|
102
|
+
credentials,
|
|
94
103
|
accessToken,
|
|
95
104
|
version: packageJson.version,
|
|
96
105
|
sshPrivateKey,
|
|
@@ -161,15 +170,18 @@ Use --vm to SSH directly to the VM without entering the container.
|
|
|
161
170
|
// Add docker exec command unless --vm flag is set
|
|
162
171
|
if (!vmOnly) {
|
|
163
172
|
const snapshotName = `${deploymentId}-snapshot`;
|
|
173
|
+
// Get volume mounts from original container and pass to snapshot
|
|
174
|
+
// This ensures files in mounted volumes (e.g., /mnt/bucket) are accessible
|
|
175
|
+
const getMounts = `MOUNTS=$(docker inspect --format '{{range .Mounts}}-v {{.Source}}:{{.Destination}} {{end}}' ${deploymentId} 2>/dev/null)`;
|
|
176
|
+
const runSnapshot = `docker run -it --rm $MOUNTS ${snapshotName} bash`;
|
|
164
177
|
if (isCompletedJob) {
|
|
165
|
-
// Container exited - snapshot and run shell
|
|
166
|
-
sshArgs.push(
|
|
167
|
-
`docker run -it --rm ${snapshotName} bash`);
|
|
178
|
+
// Container exited - snapshot and run shell with volume mounts
|
|
179
|
+
sshArgs.push(`${getMounts} && docker commit ${deploymentId} ${snapshotName} && ${runSnapshot}`);
|
|
168
180
|
}
|
|
169
181
|
else {
|
|
170
182
|
// Try exec first, fallback to snapshot if container exited (handles direct ID case)
|
|
171
183
|
sshArgs.push(`docker exec -it ${deploymentId} bash 2>/dev/null || ` +
|
|
172
|
-
`(docker commit ${deploymentId} ${snapshotName} &&
|
|
184
|
+
`(${getMounts} && docker commit ${deploymentId} ${snapshotName} && ${runSnapshot})`);
|
|
173
185
|
}
|
|
174
186
|
}
|
|
175
187
|
const sshProcess = spawn('ssh', sshArgs, { stdio: 'inherit' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../../src/cli/commands/ssh.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,UAAU,
|
|
1
|
+
{"version":3,"file":"ssh.js","sourceRoot":"","sources":["../../../src/cli/commands/ssh.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,29 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { getGitHubToken } from '../services/auth.js';
|
|
3
|
-
import { getDeploymentStatus, listDeployments, loadSshKey, } from '../services/api-client.js';
|
|
4
|
-
import { resolveAllDeploymentProfiles } from '../services/config.js';
|
|
3
|
+
import { getDeploymentStatus, listDeployments, loadSshKey, loadDeploymentCredentials, } from '../services/api-client.js';
|
|
5
4
|
import { printInfo, printError, createSpinner, printDeploymentHeader, selectDeployment, } from '../utils/output.js';
|
|
6
5
|
import { isNonInteractive, getEnvOptional, } from '../services/non-interactive.js';
|
|
7
|
-
import { DeploymentState, } from '../../shared/types.js';
|
|
6
|
+
import { DeploymentState, isTerminalState, } from '../../shared/types.js';
|
|
8
7
|
import packageJson from '../../../package.json' with { type: 'json' };
|
|
9
|
-
//
|
|
10
|
-
const
|
|
8
|
+
// Wrap long lines to terminal width, preserving a prefix on continuation lines
|
|
9
|
+
const wrapLine = (line, prefix) => {
|
|
11
10
|
const maxWidth = process.stdout.columns || 80;
|
|
12
11
|
const available = maxWidth - prefix.length;
|
|
13
|
-
|
|
12
|
+
if (line.length <= available)
|
|
13
|
+
return [line];
|
|
14
|
+
const lines = [];
|
|
15
|
+
let remaining = line;
|
|
16
|
+
while (remaining.length > available) {
|
|
17
|
+
// Try to break at a space within the available width
|
|
18
|
+
let breakPoint = remaining.lastIndexOf(' ', available);
|
|
19
|
+
if (breakPoint <= 0)
|
|
20
|
+
breakPoint = available; // No space found, hard break
|
|
21
|
+
lines.push(remaining.slice(0, breakPoint));
|
|
22
|
+
remaining = remaining.slice(breakPoint).trimStart();
|
|
23
|
+
}
|
|
24
|
+
if (remaining)
|
|
25
|
+
lines.push(remaining);
|
|
26
|
+
return lines;
|
|
14
27
|
};
|
|
15
28
|
// Format deployment events as human-readable log
|
|
16
29
|
const formatEvents = (events) => {
|
|
@@ -23,15 +36,13 @@ const formatEvents = (events) => {
|
|
|
23
36
|
if (e.metadata?.message) {
|
|
24
37
|
message = `: ${e.metadata.message}`;
|
|
25
38
|
}
|
|
26
|
-
// For error events, show the error
|
|
39
|
+
// For error events, show the error string
|
|
27
40
|
if (e.state === 'error' && e.metadata?.error) {
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
message += ` (${err.code})`;
|
|
34
|
-
}
|
|
41
|
+
const errorStr = typeof e.metadata.error === 'string'
|
|
42
|
+
? e.metadata.error
|
|
43
|
+
: e.metadata.error?.message ||
|
|
44
|
+
JSON.stringify(e.metadata.error);
|
|
45
|
+
message = `: ${errorStr}`;
|
|
35
46
|
}
|
|
36
47
|
return `[${time}] ${e.state}${message}`;
|
|
37
48
|
})
|
|
@@ -47,7 +58,11 @@ const formatLogs = (events) => {
|
|
|
47
58
|
const errorMatch = line.match(/^(\[\d{2}:\d{2}:\d{2}\]) error: (.*)$/);
|
|
48
59
|
if (errorMatch) {
|
|
49
60
|
const [, timestamp, message] = errorMatch;
|
|
50
|
-
|
|
61
|
+
const prefix = ' │ ';
|
|
62
|
+
// Split message on newlines, then wrap each line to terminal width
|
|
63
|
+
const messageLines = message.split('\\n').filter((l) => l.trim());
|
|
64
|
+
const wrappedLines = messageLines.flatMap((l) => wrapLine(l.trim(), prefix).map((wrapped) => `${prefix}${wrapped}`));
|
|
65
|
+
return `${timestamp} error\n${wrappedLines.join('\n')}`;
|
|
51
66
|
}
|
|
52
67
|
return line;
|
|
53
68
|
})
|
|
@@ -144,10 +159,18 @@ Output:
|
|
|
144
159
|
});
|
|
145
160
|
selectedDeployment = deployments.find((d) => d.id === deploymentId);
|
|
146
161
|
}
|
|
147
|
-
// Load
|
|
148
|
-
|
|
149
|
-
// Load SSH key for this deployment (optional - may not exist yet during provisioning)
|
|
162
|
+
// Load credentials and SSH key for this deployment
|
|
163
|
+
let credentials;
|
|
150
164
|
let sshPrivateKey;
|
|
165
|
+
try {
|
|
166
|
+
credentials = await loadDeploymentCredentials(deploymentId);
|
|
167
|
+
}
|
|
168
|
+
catch {
|
|
169
|
+
printError(`Credentials not found for deployment ${deploymentId}.\n` +
|
|
170
|
+
' This deployment may have been created from a different machine.\n' +
|
|
171
|
+
' Email support@anycloud.sh to reclaim it.');
|
|
172
|
+
process.exit(1);
|
|
173
|
+
}
|
|
151
174
|
try {
|
|
152
175
|
sshPrivateKey = await loadSshKey(deploymentId);
|
|
153
176
|
}
|
|
@@ -158,7 +181,7 @@ Output:
|
|
|
158
181
|
const spinner = createSpinner(`Fetching status...`).start();
|
|
159
182
|
const statusRequest = {
|
|
160
183
|
id: deploymentId,
|
|
161
|
-
|
|
184
|
+
credentials,
|
|
162
185
|
accessToken,
|
|
163
186
|
version: packageJson.version,
|
|
164
187
|
sshPrivateKey: sshPrivateKey || '',
|
|
@@ -178,23 +201,26 @@ Output:
|
|
|
178
201
|
// Show per-VM status if available
|
|
179
202
|
if (response.vmStatuses && response.vmStatuses.length > 0) {
|
|
180
203
|
const isPending = selectedDeployment?.state === DeploymentState.Starting;
|
|
204
|
+
const isCompleted = selectedDeployment?.state &&
|
|
205
|
+
isTerminalState(selectedDeployment.state);
|
|
181
206
|
console.log('VMs:');
|
|
182
207
|
response.vmStatuses.forEach((vm) => {
|
|
183
208
|
console.log(` ${vm.ip}`);
|
|
184
209
|
// Container status
|
|
185
210
|
const containerOk = vm.container?.healthy ?? false;
|
|
186
211
|
const containerIcon = isPending ? '◌' : containerOk ? '✓' : '✗';
|
|
212
|
+
// For terminal states, infer "exited" if we don't have container state
|
|
187
213
|
const containerState = isPending
|
|
188
214
|
? 'pending'
|
|
189
|
-
: vm.container?.state || 'unknown';
|
|
215
|
+
: vm.container?.state || (isCompleted ? 'exited' : 'unknown');
|
|
190
216
|
const containerUptime = vm.container?.uptime;
|
|
191
217
|
const containerLine = containerOk && containerUptime
|
|
192
218
|
? `${containerState} ${containerUptime}`
|
|
193
219
|
: containerState;
|
|
194
220
|
console.log(` ${containerIcon} container ${containerLine}`);
|
|
195
|
-
// Bucket sync status (
|
|
196
|
-
if (
|
|
197
|
-
const bucketOk = vm.rclone
|
|
221
|
+
// Bucket sync status (show if bucket configured for deployment)
|
|
222
|
+
if (selectedDeployment?.bucketName) {
|
|
223
|
+
const bucketOk = vm.rclone?.active ?? false;
|
|
198
224
|
const bucketIcon = isPending ? '◌' : bucketOk ? '✓' : '✗';
|
|
199
225
|
const bucketState = isPending
|
|
200
226
|
? 'pending'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,UAAU,
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,SAAS,EACT,UAAU,EACV,aAAa,EACb,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,cAAc,GACf,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,eAAe,GAIhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,WAAW,MAAM,uBAAuB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEtE,+EAA+E;AAC/E,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,MAAc,EAAY,EAAE;IAC1D,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC;IAC3C,IAAI,IAAI,CAAC,MAAM,IAAI,SAAS;QAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,OAAO,SAAS,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;QACpC,qDAAqD;QACrD,IAAI,UAAU,GAAG,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACvD,IAAI,UAAU,IAAI,CAAC;YAAE,UAAU,GAAG,SAAS,CAAC,CAAC,6BAA6B;QAC1E,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QAC3C,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC;IACtD,CAAC;IACD,IAAI,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,iDAAiD;AACjD,MAAM,YAAY,GAAG,CAAC,MAAyB,EAAU,EAAE;IACzD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,oBAAoB,CAAC;IAErD,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/D,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;YACxB,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,CAAC;QACD,0CAA0C;QAC1C,IAAK,CAAC,CAAC,KAAgB,KAAK,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;YACzD,MAAM,QAAQ,GACZ,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,KAAK,QAAQ;gBAClC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK;gBAClB,CAAC,CAAE,CAAC,CAAC,QAAQ,CAAC,KAAa,EAAE,OAAO;oBAClC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,IAAI,KAAK,CAAC,CAAC,KAAK,GAAG,OAAO,EAAE,CAAC;IAC1C,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF,mDAAmD;AACnD,MAAM,UAAU,GAAG,CAAC,MAAyB,EAAU,EAAE;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO,SAAS;SACb,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,+CAA+C;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,UAAU,CAAC;YAC1C,MAAM,MAAM,GAAG,MAAM,CAAC;YACtB,mEAAmE;YACnE,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YAClE,MAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,MAAM,GAAG,OAAO,EAAE,CAAC,CACnE,CAAC;YACF,OAAO,GAAG,SAAS,WAAW,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,UAAU,mBAAmB;IACjC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;SACzB,WAAW,CAAC,0BAA0B,CAAC;SACvC,QAAQ,CACP,MAAM,EACN,kEAAkE,CACnE;SACA,MAAM,CAAC,OAAO,EAAE,sDAAsD,CAAC;SACvE,MAAM,CAAC,UAAU,EAAE,8BAA8B,CAAC;SAClD,WAAW,CACV,OAAO,EACP;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BL,CACI;SACA,MAAM,CACL,KAAK,EAAE,EAAW,EAAE,OAA6C,EAAE,EAAE;QACnE,IAAI,CAAC;YACH,IAAI,YAAY,GAAG,EAAE,CAAC;YACtB,IAAI,kBAAgD,CAAC;YAErD,8BAA8B;YAC9B,MAAM,MAAM,GAAiC,OAAO,EAAE,GAAG;gBACvD,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,OAAO,EAAE,MAAM;oBACf,CAAC,CAAC,QAAQ;oBACV,CAAC,CAAC,SAAS,CAAC;YAEhB,mBAAmB;YACnB,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;YAE3C,oDAAoD;YACpD,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,yDAAyD;gBACzD,IAAI,gBAAgB,EAAE,EAAE,CAAC;oBACvB,YAAY,GAAG,cAAc,CAAC,wBAAwB,CAAC,CAAC;oBACxD,IAAI,CAAC,YAAY,EAAE,CAAC;wBAClB,UAAU,CACR,iDAAiD;4BAC/C,+EAA+E,CAClF,CAAC;wBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,+BAA+B;oBAC/B,MAAM,cAAc,GAAG,aAAa,CAClC,wBAAwB,CACzB,CAAC,KAAK,EAAE,CAAC;oBACV,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC;wBACxC,WAAW;wBACX,OAAO,EAAE,WAAW,CAAC,OAAO;wBAC5B,MAAM;qBACP,CAAC,CAAC;oBACH,cAAc,CAAC,IAAI,EAAE,CAAC;oBAEtB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBAC7B,SAAS,CAAC,uBAAuB,CAAC,CAAC;wBACnC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;oBAED,oDAAoD;oBACpD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBAChB,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,CAAC;oBAErD,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB;oBACpC,CAAC;oBAED,YAAY,GAAG,QAAQ,CAAC,EAAE,CAAC;oBAC3B,kBAAkB,GAAG,WAAW,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAC7B,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,iFAAiF;YACjF,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC;oBACxC,WAAW;oBACX,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,MAAM;iBACP,CAAC,CAAC;gBACH,kBAAkB,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,CAAC;YACtE,CAAC;YAED,mDAAmD;YACnD,IAAI,WAAW,CAAC;YAChB,IAAI,aAAiC,CAAC;YACtC,IAAI,CAAC;gBACH,WAAW,GAAG,MAAM,yBAAyB,CAAC,YAAY,CAAC,CAAC;YAC9D,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,CACR,wCAAwC,YAAY,KAAK;oBACvD,sEAAsE;oBACtE,6CAA6C,CAChD,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,CAAC;gBACH,aAAa,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,CAAC;YACjD,CAAC;YAAC,MAAM,CAAC;gBACP,8CAA8C;YAChD,CAAC;YAED,aAAa;YACb,MAAM,OAAO,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC;YAC5D,MAAM,aAAa,GAAkB;gBACnC,EAAE,EAAE,YAAY;gBAChB,WAAW;gBACX,WAAW;gBACX,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,aAAa,EAAE,aAAa,IAAI,EAAE;aACnC,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAC1D,OAAO,CAAC,IAAI,EAAE,CAAC;YAEf,6CAA6C;YAC7C,IAAI,kBAAkB,EAAE,CAAC;gBACvB,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC1B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAClB,CAAC;YAED,kCAAkC;YAClC,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1D,MAAM,SAAS,GACb,kBAAkB,EAAE,KAAK,KAAK,eAAe,CAAC,QAAQ,CAAC;gBACzD,MAAM,WAAW,GACf,kBAAkB,EAAE,KAAK;oBACzB,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpB,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACjC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;oBAE1B,mBAAmB;oBACnB,MAAM,WAAW,GAAG,EAAE,CAAC,SAAS,EAAE,OAAO,IAAI,KAAK,CAAC;oBACnD,MAAM,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;oBAChE,uEAAuE;oBACvE,MAAM,cAAc,GAAG,SAAS;wBAC9B,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAChE,MAAM,eAAe,GAAG,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;oBAC7C,MAAM,aAAa,GACjB,WAAW,IAAI,eAAe;wBAC5B,CAAC,CAAC,GAAG,cAAc,OAAO,eAAe,EAAE;wBAC3C,CAAC,CAAC,cAAc,CAAC;oBACrB,OAAO,CAAC,GAAG,CAAC,OAAO,aAAa,iBAAiB,aAAa,EAAE,CAAC,CAAC;oBAElE,gEAAgE;oBAChE,IAAI,kBAAkB,EAAE,UAAU,EAAE,CAAC;wBACnC,MAAM,QAAQ,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,IAAI,KAAK,CAAC;wBAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;wBAC1D,MAAM,WAAW,GAAG,SAAS;4BAC3B,CAAC,CAAC,SAAS;4BACX,CAAC,CAAC,QAAQ;gCACR,CAAC,CAAC,SAAS;gCACX,CAAC,CAAC,SAAS,CAAC;wBAChB,OAAO,CAAC,GAAG,CAAC,OAAO,UAAU,iBAAiB,WAAW,EAAE,CAAC,CAAC;oBAC/D,CAAC;oBAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,aAAa;YACb,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,UAAU,CAAC,2BAA4B,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CACF,CAAC;AACN,CAAC"}
|
|
@@ -1,21 +1,18 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import prompts from 'prompts';
|
|
3
|
-
import { terminateDeployment, listDeployments, } from '../services/api-client.js';
|
|
3
|
+
import { terminateDeployment, listDeployments, loadDeploymentCredentials, } from '../services/api-client.js';
|
|
4
4
|
import { getGitHubToken } from '../services/auth.js';
|
|
5
|
-
import { resolveDeploymentProfile, resolveAllDeploymentProfiles, } from '../services/config.js';
|
|
6
5
|
import { printInfo, printError, createSpinner } from '../utils/output.js';
|
|
7
|
-
import { isNonInteractive,
|
|
6
|
+
import { isNonInteractive, getEnvOptional, } from '../services/non-interactive.js';
|
|
8
7
|
import { stateEmoji } from '../../shared/types.js';
|
|
9
8
|
import packageJson from '../../../package.json' with { type: 'json' };
|
|
10
9
|
export function createTerminateCommand() {
|
|
11
10
|
return new Command('terminate')
|
|
12
11
|
.description('🛑 Terminate one or more deployments')
|
|
13
12
|
.argument('[ids...]', 'Deployment IDs (optional - will prompt to select if not provided)')
|
|
14
|
-
.option('--config <name>', 'Config name from anycloud.json')
|
|
15
13
|
.addHelpText('after', `
|
|
16
14
|
Examples:
|
|
17
15
|
$ anycloud terminate abc123 def456 ghi789
|
|
18
|
-
$ anycloud terminate abc123 --config my-app
|
|
19
16
|
$ anycloud terminate
|
|
20
17
|
|
|
21
18
|
Non-interactive mode:
|
|
@@ -25,10 +22,11 @@ Output:
|
|
|
25
22
|
Terminating: abc123
|
|
26
23
|
✓ Deployment terminated successfully!
|
|
27
24
|
`)
|
|
28
|
-
.action(async (ids
|
|
25
|
+
.action(async (ids) => {
|
|
29
26
|
try {
|
|
30
27
|
let deploymentIds = ids?.length ? ids : [];
|
|
31
|
-
|
|
28
|
+
// Get GitHub token
|
|
29
|
+
const accessToken = await getGitHubToken();
|
|
32
30
|
// If no IDs provided, fetch and prompt for selection
|
|
33
31
|
if (deploymentIds.length === 0) {
|
|
34
32
|
// Check for environment variable in non-interactive mode
|
|
@@ -42,18 +40,17 @@ Output:
|
|
|
42
40
|
deploymentIds = envIds.split(',').map((id) => id.trim());
|
|
43
41
|
}
|
|
44
42
|
else {
|
|
45
|
-
// Get GitHub token
|
|
46
|
-
const accessToken = await getGitHubToken();
|
|
47
43
|
// List all deployments (fast KV-based)
|
|
48
44
|
const loadingSpinner = createSpinner('Loading deployments...').start();
|
|
49
45
|
const deployments = await listDeployments({
|
|
50
46
|
accessToken,
|
|
51
47
|
version: packageJson.version,
|
|
48
|
+
filter: 'active',
|
|
52
49
|
});
|
|
53
50
|
loadingSpinner.stop();
|
|
54
51
|
if (deployments.length === 0) {
|
|
55
|
-
printError('No deployments found.');
|
|
56
|
-
printInfo('
|
|
52
|
+
printError('No active deployments found.');
|
|
53
|
+
printInfo('Only active deployments can be terminated. Inactive deployments are already stopped.');
|
|
57
54
|
process.exit(1);
|
|
58
55
|
}
|
|
59
56
|
// Prompt for deployment selection (multi-select)
|
|
@@ -71,67 +68,54 @@ Output:
|
|
|
71
68
|
hint: '- Space to select, Enter to confirm',
|
|
72
69
|
});
|
|
73
70
|
if (!selection.deployments || selection.deployments.length === 0) {
|
|
74
|
-
|
|
71
|
+
console.log('👋 No deployments selected, nothing to do.');
|
|
72
|
+
process.exit(0);
|
|
75
73
|
}
|
|
76
|
-
|
|
77
|
-
const anycloudConfigs = await resolveAllDeploymentProfiles();
|
|
78
|
-
for (const depId of selection.deployments) {
|
|
79
|
-
printInfo(`Terminating: ${depId}`);
|
|
80
|
-
const spinner = createSpinner('Terminating deployment...').start();
|
|
81
|
-
try {
|
|
82
|
-
const response = await terminateDeployment({
|
|
83
|
-
id: depId,
|
|
84
|
-
anycloudConfigs,
|
|
85
|
-
accessToken,
|
|
86
|
-
version: packageJson.version,
|
|
87
|
-
configName,
|
|
88
|
-
});
|
|
89
|
-
spinner.succeed('Deployment terminated successfully!');
|
|
90
|
-
if (response.message) {
|
|
91
|
-
printInfo(response.message);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
catch (error) {
|
|
95
|
-
spinner.fail(`Failed to terminate ${depId}`);
|
|
96
|
-
printError(error.message);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
console.log('');
|
|
100
|
-
process.exit(0);
|
|
74
|
+
deploymentIds = selection.deployments;
|
|
101
75
|
}
|
|
102
76
|
}
|
|
103
|
-
//
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
printInfo('
|
|
121
|
-
process.exit(
|
|
77
|
+
// When IDs are provided directly, validate they are active
|
|
78
|
+
if (ids?.length || isNonInteractive()) {
|
|
79
|
+
const activeDeployments = await listDeployments({
|
|
80
|
+
accessToken,
|
|
81
|
+
version: packageJson.version,
|
|
82
|
+
filter: 'active',
|
|
83
|
+
});
|
|
84
|
+
const activeIds = new Set(activeDeployments.map((d) => d.id));
|
|
85
|
+
// Filter out inactive deployments and warn the user
|
|
86
|
+
const inactiveIds = deploymentIds.filter((id) => !activeIds.has(id));
|
|
87
|
+
if (inactiveIds.length > 0) {
|
|
88
|
+
for (const id of inactiveIds) {
|
|
89
|
+
printError(`Deployment ${id} is inactive and cannot be terminated.`);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
deploymentIds = deploymentIds.filter((id) => activeIds.has(id));
|
|
93
|
+
if (deploymentIds.length === 0) {
|
|
94
|
+
printInfo('No active deployments to terminate.');
|
|
95
|
+
process.exit(0);
|
|
122
96
|
}
|
|
123
97
|
}
|
|
124
98
|
// Terminate deployments
|
|
125
99
|
for (const deploymentId of deploymentIds) {
|
|
126
100
|
printInfo(`Terminating: ${deploymentId}`);
|
|
101
|
+
// Load credentials for this deployment
|
|
102
|
+
let credentials;
|
|
103
|
+
try {
|
|
104
|
+
credentials = await loadDeploymentCredentials(deploymentId);
|
|
105
|
+
}
|
|
106
|
+
catch {
|
|
107
|
+
printError(`Credentials not found for deployment ${deploymentId}.\n` +
|
|
108
|
+
' This deployment may have been created from a different machine.\n' +
|
|
109
|
+
' Email support@anycloud.sh to reclaim it.');
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
127
112
|
const spinner = createSpinner('Terminating deployment...').start();
|
|
128
113
|
try {
|
|
129
114
|
const response = await terminateDeployment({
|
|
130
115
|
id: deploymentId,
|
|
131
|
-
|
|
116
|
+
credentials,
|
|
132
117
|
accessToken,
|
|
133
118
|
version: packageJson.version,
|
|
134
|
-
configName,
|
|
135
119
|
});
|
|
136
120
|
spinner.succeed('Deployment terminated successfully!');
|
|
137
121
|
if (response.message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminate.js","sourceRoot":"","sources":["../../../src/cli/commands/terminate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EACL,mBAAmB,EACnB,eAAe,
|
|
1
|
+
{"version":3,"file":"terminate.js","sourceRoot":"","sources":["../../../src/cli/commands/terminate.ts"],"names":[],"mappings":"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"}
|