@dxos/cli 0.1.58-main.fc3ea9b → 0.1.58-main.ffb4cc4
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/README.md +20 -9
- package/config/config-dev.yml +1 -1
- package/config/config-local.yml +1 -1
- package/config/config-staging.yml +1 -1
- package/config/config.yml +1 -1
- package/dist/src/commands/agent/start.d.ts +0 -1
- package/dist/src/commands/agent/start.d.ts.map +1 -1
- package/dist/src/commands/agent/start.js +1 -11
- package/dist/src/commands/agent/start.js.map +1 -1
- package/dist/src/commands/app/create.d.ts.map +1 -1
- package/dist/src/commands/app/create.js +9 -14
- package/dist/src/commands/app/create.js.map +1 -1
- package/dist/src/commands/reset/index.d.ts.map +1 -1
- package/dist/src/commands/reset/index.js +7 -2
- package/dist/src/commands/reset/index.js.map +1 -1
- package/dist/src/util/telemetryrc.json +1 -1
- package/oclif.manifest.json +2 -8
- package/package.json +20 -19
- package/dist/src/util/exec.d.ts +0 -7
- package/dist/src/util/exec.d.ts.map +0 -1
- package/dist/src/util/exec.js +0 -42
- package/dist/src/util/exec.js.map +0 -1
package/README.md
CHANGED
|
@@ -4,20 +4,32 @@ DXOS command line interface.
|
|
|
4
4
|
|
|
5
5
|
<!-- toc -->
|
|
6
6
|
* [DX CLI](#dx-cli)
|
|
7
|
-
* [
|
|
7
|
+
* [Installation](#installation)
|
|
8
8
|
* [Running an Agent](#running-an-agent)
|
|
9
9
|
* [Development](#development)
|
|
10
10
|
* [Usage](#usage)
|
|
11
11
|
<!-- tocstop -->
|
|
12
12
|
|
|
13
|
-
#
|
|
13
|
+
# Installation
|
|
14
14
|
```terminal
|
|
15
15
|
npm install -g @dxos/cli@main
|
|
16
16
|
```
|
|
17
17
|
---
|
|
18
18
|
# Running an Agent
|
|
19
19
|
Agent is a name for DXOS Client which is run by CLI in the background in the daemonized process.
|
|
20
|
-
|
|
20
|
+
|
|
21
|
+
## Start agent with LaunchD (macOS users)
|
|
22
|
+
1. Install DXOS CLI with steps in [Installation](#Instalation) section.
|
|
23
|
+
2. Replace `??NODE_PATH??` in "./init-templates/org.dxos.agent.plist" with output of command `dirname $(which node)`
|
|
24
|
+
3. Replace `??DX_PATH??` in "./init-templates/org.dxos.agent.plist" with output of command `which dx`
|
|
25
|
+
4. Copy `./init-templates/org.dxos.agent.plist` -> `~/Library/LaunchAgents/org.dxos.agent.plist`
|
|
26
|
+
5. Run `launchctl load -w ~/Library/LaunchAgents/org.dxos.agent.plist`
|
|
27
|
+
|
|
28
|
+
### Stop agent started by LaunchD
|
|
29
|
+
1. Run `launchctl unload -w ~/Library/LaunchAgents/org.dxos.agent.plist`
|
|
30
|
+
2. Remove `~/Library/LaunchAgents/org.dxos.agent.plist`
|
|
31
|
+
|
|
32
|
+
## Start agent with CLI (not very reliable)
|
|
21
33
|
Agent is automatically started by each command that requires Client (to avoid this behavior use `--no-agent` flag). You can use `--profile` flag (default value is `default`) to run agent in an isolated profile, and `--foreground` to run agent in attached process.
|
|
22
34
|
```terminal
|
|
23
35
|
dx agent start
|
|
@@ -29,10 +41,10 @@ see: [dx agent start](#dx-agent-start)
|
|
|
29
41
|
|
|
30
42
|
|
|
31
43
|
|
|
32
|
-
|
|
44
|
+
2. Run halo join command in your terminal.
|
|
33
45
|
|
|
34
46
|
|
|
35
|
-
|
|
47
|
+
3. Proceed with invitation
|
|
36
48
|
|
|
37
49
|
## Troubleshooting
|
|
38
50
|
1. Make sure you are running the latest version of the shared worker in the browser. Go to the shared workers tab chrome://inspect/#workers, kill `dxos-vault` worker, then reload the Composer tab.
|
|
@@ -80,7 +92,7 @@ $ npm install -g @dxos/cli
|
|
|
80
92
|
$ dx COMMAND
|
|
81
93
|
running command...
|
|
82
94
|
$ dx (--version)
|
|
83
|
-
@dxos/cli/0.1.58-main.
|
|
95
|
+
@dxos/cli/0.1.58-main.ffb4cc4 linux-x64 node-v18.17.1
|
|
84
96
|
$ dx --help [COMMAND]
|
|
85
97
|
USAGE
|
|
86
98
|
$ dx COMMAND
|
|
@@ -209,7 +221,7 @@ Starts the agent.
|
|
|
209
221
|
```
|
|
210
222
|
USAGE
|
|
211
223
|
$ dx agent start [--json] [--dry-run] [-v] [--config <value> --profile <value>] [--no-agent] [--timeout
|
|
212
|
-
<value>] [--no-wait] [-f] [--ws <value>] [--echo <value>] [--
|
|
224
|
+
<value>] [--no-wait] [-f] [--ws <value>] [--echo <value>] [--metrics]
|
|
213
225
|
|
|
214
226
|
FLAGS
|
|
215
227
|
-f, --foreground Run in foreground.
|
|
@@ -219,7 +231,6 @@ FLAGS
|
|
|
219
231
|
--echo=port Expose ECHO REST API.
|
|
220
232
|
--json Output as JSON.
|
|
221
233
|
--metrics Start metrics recording.
|
|
222
|
-
--monitor Run epoch monitoring.
|
|
223
234
|
--no-agent Run command without agent.
|
|
224
235
|
--no-wait Do not wait for space to be ready.
|
|
225
236
|
--profile=<value> [default: default] User profile.
|
|
@@ -1531,7 +1542,7 @@ FLAGS
|
|
|
1531
1542
|
--config=path [default: /home/runner/.config/dx/profile/default.yml] Config file.
|
|
1532
1543
|
--dry-run Dry run.
|
|
1533
1544
|
--json Output as JSON.
|
|
1534
|
-
--name=<value> [default:
|
|
1545
|
+
--name=<value> [default: high-nineteen-hotel-violet] Tunnel name
|
|
1535
1546
|
--no-agent Run command without agent.
|
|
1536
1547
|
--no-wait Do not wait for space to be ready.
|
|
1537
1548
|
--profile=<value> [default: default] User profile.
|
package/config/config-dev.yml
CHANGED
package/config/config-local.yml
CHANGED
package/config/config.yml
CHANGED
|
@@ -6,7 +6,6 @@ export default class Start extends BaseCommand<typeof Start> {
|
|
|
6
6
|
foreground: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
7
7
|
ws: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
8
8
|
echo: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
9
|
-
monitor: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
10
9
|
metrics: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
11
10
|
json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
11
|
'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,KAAK
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAClD,OAAgB,KAAK;;;;;;;;;;;;;MAmBnB;IAEF,OAAgB,QAAQ;;;QAKtB;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YASX,gBAAgB;YA4ChB,YAAY;IAsB1B,OAAO,CAAC,cAAc;CAgBvB"}
|
|
@@ -71,8 +71,7 @@ class Start extends base_command_1.BaseCommand {
|
|
|
71
71
|
},
|
|
72
72
|
plugins: [
|
|
73
73
|
// Epoch monitoring.
|
|
74
|
-
|
|
75
|
-
this.flags.monitor && new agent_1.EpochMonitor(),
|
|
74
|
+
new agent_1.EpochMonitor(),
|
|
76
75
|
// ECHO API.
|
|
77
76
|
// TODO(burdon): Config.
|
|
78
77
|
this.flags['echo-proxy'] && new agent_1.EchoProxyServer({ port: this.flags['echo-proxy'] }),
|
|
@@ -85,11 +84,6 @@ class Start extends base_command_1.BaseCommand {
|
|
|
85
84
|
});
|
|
86
85
|
await agent.start();
|
|
87
86
|
this.log('Agent started... (ctrl-c to exit)');
|
|
88
|
-
process.on('SIGINT', async () => {
|
|
89
|
-
void this._ctx.dispose();
|
|
90
|
-
await agent.stop();
|
|
91
|
-
process.exit(0);
|
|
92
|
-
});
|
|
93
87
|
this._sendTelemetry();
|
|
94
88
|
if (this.flags.ws) {
|
|
95
89
|
this.log(`Open devtools: https://devtools.dxos.org?target=ws://localhost:${this.flags.ws}`);
|
|
@@ -105,7 +99,6 @@ class Start extends base_command_1.BaseCommand {
|
|
|
105
99
|
const process = await daemon.start(this.flags.profile, {
|
|
106
100
|
config: this.flags.config,
|
|
107
101
|
metrics: this.flags.metrics,
|
|
108
|
-
monitor: this.flags.monitor,
|
|
109
102
|
ws: this.flags.ws,
|
|
110
103
|
});
|
|
111
104
|
if (process) {
|
|
@@ -152,9 +145,6 @@ Start.flags = {
|
|
|
152
145
|
description: 'Expose ECHO REST API.',
|
|
153
146
|
helpValue: 'port',
|
|
154
147
|
}),
|
|
155
|
-
monitor: core_1.Flags.boolean({
|
|
156
|
-
description: 'Run epoch monitoring.',
|
|
157
|
-
}),
|
|
158
148
|
metrics: core_1.Flags.boolean({
|
|
159
149
|
description: 'Start metrics recording.',
|
|
160
150
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAC1B,qCAAiC;AAEjC,uCAAkG;AAClG,uCAAiE;AACjE,2DAAmE;AACnE,2CAAwC;AACxC,2DAA6C;AAE7C,qDAAiD;AAEjD,MAAqB,KAAM,SAAQ,0BAAyB;IAA5D;;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/app/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/commands/app/create.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,eAAO,MAAM,aAAa,UAAoB,CAAC;AAY/C,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,OAAgB,WAAW,SAA0B;IAErD,OAAgB,IAAI;;MAElB;IAEF,OAAgB,KAAK;;;;;;;;;;;;MAgBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CA2C1B"}
|
|
@@ -34,8 +34,8 @@ const core_1 = require("@oclif/core");
|
|
|
34
34
|
const fs_1 = require("fs");
|
|
35
35
|
const os_1 = __importDefault(require("os"));
|
|
36
36
|
const process_1 = require("process");
|
|
37
|
+
const process_2 = require("@dxos/process");
|
|
37
38
|
const base_command_1 = require("../../base-command");
|
|
38
|
-
const exec_1 = require("../../util/exec");
|
|
39
39
|
exports.APP_TEMPLATES = ['hello', 'bare'];
|
|
40
40
|
// TODO(zhenyasav): factor this out into @dxos/fs or something (along with 'exists' from plate?)
|
|
41
41
|
const isDirEmpty = async (dirpath) => {
|
|
@@ -50,27 +50,21 @@ class Create extends base_command_1.BaseCommand {
|
|
|
50
50
|
async run() {
|
|
51
51
|
const { default: bare, isDxosMonorepoSync } = await Promise.resolve().then(() => __importStar(require('@dxos/bare-template')));
|
|
52
52
|
const { default: hello } = await Promise.resolve().then(() => __importStar(require('@dxos/hello-template')));
|
|
53
|
-
const {
|
|
53
|
+
const { fileExists } = await Promise.resolve().then(() => __importStar(require('@dxos/plate')));
|
|
54
54
|
const { name } = this.args;
|
|
55
55
|
const { template, interactive, verbose } = this.flags;
|
|
56
56
|
const outputDirectory = `${(0, process_1.cwd)()}/${name}`;
|
|
57
|
-
const outputDirExists = await
|
|
57
|
+
const outputDirExists = await fileExists(outputDirectory);
|
|
58
58
|
const isOutputEmpty = outputDirExists && (await isDirEmpty(outputDirectory));
|
|
59
59
|
if (outputDirExists && !isOutputEmpty) {
|
|
60
60
|
this.error(`Output directory ${outputDirectory} is not empty`);
|
|
61
61
|
}
|
|
62
|
-
|
|
63
|
-
await (0, exec_1.exec)('which pnpm');
|
|
64
|
-
}
|
|
65
|
-
catch (_a) {
|
|
66
|
-
this.error('pnpm not found. Please run "npm i -g pnpm" first.');
|
|
67
|
-
}
|
|
68
|
-
// TODO(???): make sure this exists in the @dxos/create packages too.
|
|
62
|
+
// TODO:: make sure this exists in the @dxos/create packages too
|
|
69
63
|
if (os_1.default.platform() === 'darwin') {
|
|
70
64
|
try {
|
|
71
|
-
await (0,
|
|
65
|
+
await (0, process_2.exec)('which xcrun');
|
|
72
66
|
}
|
|
73
|
-
catch (
|
|
67
|
+
catch (_a) {
|
|
74
68
|
this.error('XCode Command Line Tools not found. Please run "xcode-select --install" first.');
|
|
75
69
|
}
|
|
76
70
|
}
|
|
@@ -80,16 +74,17 @@ class Create extends base_command_1.BaseCommand {
|
|
|
80
74
|
hello,
|
|
81
75
|
};
|
|
82
76
|
const monorepo = isDxosMonorepoSync();
|
|
83
|
-
const result = await templates[template].
|
|
77
|
+
const result = await templates[template].apply({
|
|
84
78
|
outputDirectory,
|
|
85
79
|
interactive,
|
|
86
80
|
verbose,
|
|
87
81
|
input: {
|
|
88
82
|
monorepo,
|
|
89
83
|
name,
|
|
84
|
+
createFolder: false,
|
|
90
85
|
},
|
|
91
86
|
});
|
|
92
|
-
void result.
|
|
87
|
+
void result.apply();
|
|
93
88
|
}
|
|
94
89
|
}
|
|
95
90
|
Create.description = 'Manage applications.';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/app/create.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAA0C;AAC1C,2BAAoC;AACpC,4CAAoB;AACpB,qCAA8B;AAE9B,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/app/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAsB;IACjD,OAAgB,KAAK;;;;;;;;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,WAAW,SAAsB;IACjD,OAAgB,KAAK;;;;;;;;;;MAMnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAoD1B"}
|
|
@@ -22,19 +22,24 @@ class Reset extends base_command_1.BaseCommand {
|
|
|
22
22
|
(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_DATA, profile),
|
|
23
23
|
(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_STATE, profile),
|
|
24
24
|
(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_RUNTIME, profile),
|
|
25
|
+
(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_CONFIG, profile) + '.yml',
|
|
25
26
|
storage,
|
|
26
27
|
]
|
|
27
28
|
.sort()
|
|
28
29
|
.filter(Boolean)),
|
|
29
30
|
];
|
|
30
31
|
if (storage && storage !== (0, client_protocol_1.getProfilePath)(client_protocol_1.DX_DATA, profile)) {
|
|
31
|
-
this.warn((0, chalk_1.default) `The
|
|
32
|
+
this.warn((0, chalk_1.default) `The storage path does not match the default:\n- config: {yellow ${storage}}\n- expected: {green ${(0, client_protocol_1.getProfilePath)(client_protocol_1.DX_DATA, profile)}}`);
|
|
32
33
|
}
|
|
33
34
|
const dryRun = this.flags['dry-run'] ||
|
|
34
35
|
!(this.flags.force || (await core_1.ux.confirm((0, chalk_1.default) `\n{red Delete all data? {white (Profile: ${profile})}}`)));
|
|
35
36
|
if (!dryRun) {
|
|
36
37
|
// TODO(burdon): Problem if running manually.
|
|
37
|
-
await this.execWithDaemon(async (daemon) =>
|
|
38
|
+
await this.execWithDaemon(async (daemon) => {
|
|
39
|
+
if (await daemon.isRunning(this.flags.profile)) {
|
|
40
|
+
await daemon.stop(this.flags.profile, { force: this.flags.force });
|
|
41
|
+
}
|
|
42
|
+
});
|
|
38
43
|
if (this.flags.verbose) {
|
|
39
44
|
this.log((0, chalk_1.default) `{red Deleting files...}`);
|
|
40
45
|
paths.forEach((path) => this.log(`- ${path}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAC1B,4CAAoB;AAEpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/reset/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAC1B,4CAAoB;AAEpB,2DAA2G;AAE3G,qDAAiD;AAEjD,MAAqB,KAAM,SAAQ,0BAAyB;IAU1D,KAAK,CAAC,GAAG;;QACP,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,YAAY,0CAAE,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;QACnC,MAAM,KAAK,GAAG;YACZ,GAAG,IAAI,GAAG,CACR;gBACE,IAAA,gCAAc,EAAC,0BAAQ,EAAE,OAAO,CAAC;gBACjC,IAAA,gCAAc,EAAC,yBAAO,EAAE,OAAO,CAAC;gBAChC,IAAA,gCAAc,EAAC,0BAAQ,EAAE,OAAO,CAAC;gBACjC,IAAA,gCAAc,EAAC,4BAAU,EAAE,OAAO,CAAC;gBACnC,IAAA,gCAAc,EAAC,2BAAS,EAAE,OAAO,CAAC,GAAG,MAAM;gBAC3C,OAAO;aACR;iBACE,IAAI,EAAE;iBACN,MAAM,CAAC,OAAO,CAAa,CAC/B;SACF,CAAC;QAEF,IAAI,OAAO,IAAI,OAAO,KAAK,IAAA,gCAAc,EAAC,yBAAO,EAAE,OAAO,CAAC,EAAE;YAC3D,IAAI,CAAC,IAAI,CACP,IAAA,eAAK,EAAA,mEAAmE,OAAO,yBAAyB,IAAA,gCAAc,EACpH,yBAAO,EACP,OAAO,CACR,GAAG,CACL,CAAC;SACH;QAED,MAAM,MAAM,GACV,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;YACrB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,MAAM,SAAE,CAAC,OAAO,CAAC,IAAA,eAAK,EAAA,4CAA4C,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAE3G,IAAI,CAAC,MAAM,EAAE;YACX,6CAA6C;YAC7C,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACzC,IAAI,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;oBAC9C,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;iBACpE;YACH,CAAC,CAAC,CAAC;YACH,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBACtB,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,yBAAyB,CAAC,CAAC;gBACzC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;aAChD;YAED,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACrB,YAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC1B;QAED,OAAO,KAAK,CAAC;IACf,CAAC;;AA5De,iBAAW,GAAG,kBAAkB,CAAC;AACjC,WAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,KAAK,EAAE,YAAK,CAAC,OAAO,CAAC;QACnB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAC;kBARiB,KAAK"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"DX_ENVIRONMENT": "staging",
|
|
3
|
-
"DX_RELEASE": "@dxos/cli@0.1.58-main.
|
|
3
|
+
"DX_RELEASE": "@dxos/cli@0.1.58-main.ffb4cc4",
|
|
4
4
|
"SENTRY_DESTINATION": "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
|
|
5
5
|
"TELEMETRY_API_KEY": "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
|
|
6
6
|
"IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "0.1.58-main.
|
|
2
|
+
"version": "0.1.58-main.ffb4cc4",
|
|
3
3
|
"commands": {
|
|
4
4
|
"agent:list": {
|
|
5
5
|
"id": "agent:list",
|
|
@@ -335,12 +335,6 @@
|
|
|
335
335
|
"helpValue": "port",
|
|
336
336
|
"multiple": false
|
|
337
337
|
},
|
|
338
|
-
"monitor": {
|
|
339
|
-
"name": "monitor",
|
|
340
|
-
"type": "boolean",
|
|
341
|
-
"description": "Run epoch monitoring.",
|
|
342
|
-
"allowNo": false
|
|
343
|
-
},
|
|
344
338
|
"metrics": {
|
|
345
339
|
"name": "metrics",
|
|
346
340
|
"type": "boolean",
|
|
@@ -3495,7 +3489,7 @@
|
|
|
3495
3489
|
"type": "option",
|
|
3496
3490
|
"description": "Tunnel name",
|
|
3497
3491
|
"multiple": false,
|
|
3498
|
-
"default": "
|
|
3492
|
+
"default": "high-nineteen-hotel-violet"
|
|
3499
3493
|
}
|
|
3500
3494
|
},
|
|
3501
3495
|
"args": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/cli",
|
|
3
|
-
"version": "0.1.58-main.
|
|
3
|
+
"version": "0.1.58-main.ffb4cc4",
|
|
4
4
|
"description": "DXOS CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dxos",
|
|
@@ -47,24 +47,25 @@
|
|
|
47
47
|
"react": "^18.2.0",
|
|
48
48
|
"uuid": "^8.3.2",
|
|
49
49
|
"ws": "^7.4.4",
|
|
50
|
-
"@dxos/agent": "0.1.58-main.
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/client": "0.1.58-main.
|
|
54
|
-
"@dxos/client-protocol": "0.1.58-main.
|
|
55
|
-
"@dxos/config": "0.1.58-main.
|
|
56
|
-
"@dxos/context": "0.1.58-main.
|
|
57
|
-
"@dxos/debug": "0.1.58-main.
|
|
58
|
-
"@dxos/functions": "0.1.58-main.
|
|
59
|
-
"@dxos/hello-template": "0.1.58-main.
|
|
60
|
-
"@dxos/invariant": "0.1.58-main.
|
|
61
|
-
"@dxos/log": "0.1.58-main.
|
|
62
|
-
"@dxos/plate": "0.1.58-main.
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/
|
|
65
|
-
"@dxos/
|
|
66
|
-
"@dxos/
|
|
67
|
-
"@dxos/
|
|
50
|
+
"@dxos/agent": "0.1.58-main.ffb4cc4",
|
|
51
|
+
"@dxos/bare-template": "0.1.58-main.ffb4cc4",
|
|
52
|
+
"@dxos/async": "0.1.58-main.ffb4cc4",
|
|
53
|
+
"@dxos/client": "0.1.58-main.ffb4cc4",
|
|
54
|
+
"@dxos/client-protocol": "0.1.58-main.ffb4cc4",
|
|
55
|
+
"@dxos/config": "0.1.58-main.ffb4cc4",
|
|
56
|
+
"@dxos/context": "0.1.58-main.ffb4cc4",
|
|
57
|
+
"@dxos/debug": "0.1.58-main.ffb4cc4",
|
|
58
|
+
"@dxos/functions": "0.1.58-main.ffb4cc4",
|
|
59
|
+
"@dxos/hello-template": "0.1.58-main.ffb4cc4",
|
|
60
|
+
"@dxos/invariant": "0.1.58-main.ffb4cc4",
|
|
61
|
+
"@dxos/log": "0.1.58-main.ffb4cc4",
|
|
62
|
+
"@dxos/plate": "0.1.58-main.ffb4cc4",
|
|
63
|
+
"@dxos/process": "0.1.58-main.ffb4cc4",
|
|
64
|
+
"@dxos/protocols": "0.1.58-main.ffb4cc4",
|
|
65
|
+
"@dxos/rpc": "0.1.58-main.ffb4cc4",
|
|
66
|
+
"@dxos/sentry": "0.1.58-main.ffb4cc4",
|
|
67
|
+
"@dxos/telemetry": "0.1.58-main.ffb4cc4",
|
|
68
|
+
"@dxos/util": "0.1.58-main.ffb4cc4"
|
|
68
69
|
},
|
|
69
70
|
"devDependencies": {
|
|
70
71
|
"@oclif/test": "^2.3.31",
|
package/dist/src/util/exec.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"exec.d.ts","sourceRoot":"","sources":["../../../src/util/exec.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,WAAW,GAAG;IACxB,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAGF,eAAO,MAAM,IAAI,YAAa,MAAM,YAAY,QAAQ,WAAW,CAAC,KAAG,QAAQ,MAAM,CA+BpF,CAAC"}
|
package/dist/src/util/exec.js
DELETED
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
//
|
|
3
|
-
// Copyright 2023 DXOS.org
|
|
4
|
-
//
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.exec = void 0;
|
|
7
|
-
const node_child_process_1 = require("node:child_process");
|
|
8
|
-
// TODO(zhenyasav): resolve with executors/.../exec.ts
|
|
9
|
-
const exec = (command, options) => {
|
|
10
|
-
const { verbose, cwd, shell } = { verbose: false, cwd: process.cwd(), shell: true, ...options };
|
|
11
|
-
if (verbose) {
|
|
12
|
-
console.log(command);
|
|
13
|
-
}
|
|
14
|
-
const [first, ...rest] = command.split(' ');
|
|
15
|
-
return new Promise((resolve, reject) => {
|
|
16
|
-
const subprocess = (0, node_child_process_1.spawn)(first, rest, {
|
|
17
|
-
shell,
|
|
18
|
-
cwd,
|
|
19
|
-
});
|
|
20
|
-
const stdout = [];
|
|
21
|
-
const stderr = [];
|
|
22
|
-
subprocess.stdout.on('data', (chunk) => {
|
|
23
|
-
stdout.push(chunk.toString('utf8'));
|
|
24
|
-
});
|
|
25
|
-
subprocess.stderr.on('data', (chunk) => {
|
|
26
|
-
stderr.push(chunk.toString('utf8'));
|
|
27
|
-
});
|
|
28
|
-
subprocess.on('exit', (code) => {
|
|
29
|
-
if (code === 0) {
|
|
30
|
-
resolve(stdout.join());
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
reject(new Error(`exit code: ${code} ${stderr.join()} ${stdout.join()}`));
|
|
34
|
-
}
|
|
35
|
-
});
|
|
36
|
-
subprocess.on('error', (error) => {
|
|
37
|
-
reject(error);
|
|
38
|
-
});
|
|
39
|
-
});
|
|
40
|
-
};
|
|
41
|
-
exports.exec = exec;
|
|
42
|
-
//# sourceMappingURL=exec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../../src/util/exec.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,2DAA2C;AAQ3C,sDAAsD;AAC/C,MAAM,IAAI,GAAG,CAAC,OAAe,EAAE,OAA8B,EAAmB,EAAE;IACvF,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC;IAChG,IAAI,OAAO,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;KACtB;IAED,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,UAAU,GAAG,IAAA,0BAAK,EAAC,KAAK,EAAE,IAAI,EAAE;YACpC,KAAK;YACL,GAAG;SACJ,CAAC,CAAC;QACH,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;aACxB;iBAAM;gBACL,MAAM,CAAC,IAAI,KAAK,CAAC,cAAc,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;aAC3E;QACH,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA/BW,QAAA,IAAI,QA+Bf"}
|