@dxos/cli 0.1.53-main.75474bf → 0.1.53-main.8f662cd
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 +37 -36
- package/bin/dev +3 -0
- package/dist/src/base-command.d.ts +2 -1
- package/dist/src/base-command.d.ts.map +1 -1
- package/dist/src/base-command.js +19 -14
- package/dist/src/base-command.js.map +1 -1
- package/dist/src/commands/agent/agent.test.d.ts +2 -0
- package/dist/src/commands/agent/agent.test.d.ts.map +1 -0
- package/dist/src/commands/agent/agent.test.js +173 -0
- package/dist/src/commands/agent/agent.test.js.map +1 -0
- package/dist/src/commands/agent/list.d.ts.map +1 -1
- package/dist/src/commands/agent/list.js +4 -2
- package/dist/src/commands/agent/list.js.map +1 -1
- package/dist/src/commands/agent/restart.js +1 -1
- package/dist/src/commands/agent/restart.js.map +1 -1
- package/dist/src/commands/agent/start.d.ts.map +1 -1
- package/dist/src/commands/agent/start.js +10 -9
- package/dist/src/commands/agent/start.js.map +1 -1
- package/dist/src/commands/agent/stop.js +1 -1
- package/dist/src/commands/agent/stop.js.map +1 -1
- package/dist/src/commands/app/open.d.ts.map +1 -1
- package/dist/src/commands/app/open.js +4 -4
- package/dist/src/commands/app/open.js.map +1 -1
- package/dist/src/commands/debug/stats.d.ts +1 -1
- package/dist/src/commands/debug/stats.d.ts.map +1 -1
- package/dist/src/commands/debug/stats.js +28 -1
- package/dist/src/commands/debug/stats.js.map +1 -1
- package/dist/src/commands/function/dev-server.d.ts +1 -1
- package/dist/src/commands/function/dev-server.js +1 -1
- package/dist/src/commands/function/dev-server.js.map +1 -1
- package/dist/src/commands/halo/join.d.ts.map +1 -1
- package/dist/src/commands/halo/join.js +2 -2
- package/dist/src/commands/halo/join.js.map +1 -1
- package/dist/src/commands/halo/share.d.ts.map +1 -1
- package/dist/src/commands/halo/share.js +4 -4
- package/dist/src/commands/halo/share.js.map +1 -1
- package/dist/src/commands/reset/index.d.ts.map +1 -1
- package/dist/src/commands/reset/index.js +3 -2
- package/dist/src/commands/reset/index.js.map +1 -1
- package/dist/src/commands/space/create.d.ts.map +1 -1
- package/dist/src/commands/space/create.js +2 -29
- package/dist/src/commands/space/create.js.map +1 -1
- package/dist/src/commands/space/epoch.d.ts.map +1 -1
- package/dist/src/commands/space/epoch.js +1 -0
- package/dist/src/commands/space/epoch.js.map +1 -1
- package/dist/src/commands/space/invite.d.ts.map +1 -1
- package/dist/src/commands/space/invite.js +3 -2
- package/dist/src/commands/space/invite.js.map +1 -1
- package/dist/src/commands/space/join.d.ts.map +1 -1
- package/dist/src/commands/space/join.js +3 -2
- package/dist/src/commands/space/join.js.map +1 -1
- package/dist/src/commands/space/list.d.ts.map +1 -1
- package/dist/src/commands/space/list.js +1 -0
- package/dist/src/commands/space/list.js.map +1 -1
- package/dist/src/commands/space/members.d.ts.map +1 -1
- package/dist/src/commands/space/members.js +1 -0
- package/dist/src/commands/space/members.js.map +1 -1
- package/dist/src/help.d.ts +6 -0
- package/dist/src/help.d.ts.map +1 -0
- package/dist/src/help.js +23 -0
- package/dist/src/help.js.map +1 -0
- package/dist/src/hooks/command-not-found.d.ts +4 -0
- package/dist/src/hooks/command-not-found.d.ts.map +1 -0
- package/dist/src/hooks/command-not-found.js +14 -0
- package/dist/src/hooks/command-not-found.js.map +1 -0
- package/dist/src/util/invitation.d.ts +1 -1
- package/dist/src/util/invitation.d.ts.map +1 -1
- package/dist/src/util/invitation.js +7 -7
- package/dist/src/util/invitation.js.map +1 -1
- package/dist/src/util/print.d.ts +3 -4
- package/dist/src/util/print.d.ts.map +1 -1
- package/dist/src/util/print.js +2 -2
- package/dist/src/util/print.js.map +1 -1
- package/dist/src/util/publish/publisher-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/publish/publisher-rpc-peer.js +4 -5
- package/dist/src/util/publish/publisher-rpc-peer.js.map +1 -1
- package/dist/src/util/supervisor/supervisor-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/supervisor/supervisor-rpc-peer.js +4 -5
- package/dist/src/util/supervisor/supervisor-rpc-peer.js.map +1 -1
- package/dist/src/util/telemetry.d.ts.map +1 -1
- package/dist/src/util/telemetry.js.map +1 -1
- package/dist/src/util/telemetryrc.json +1 -1
- package/dist/src/util/test-util.d.ts +1 -0
- package/dist/src/util/test-util.d.ts.map +1 -1
- package/dist/src/util/test-util.js +14 -5
- package/dist/src/util/test-util.js.map +1 -1
- package/dist/src/util/tunnel/tunnel-rpc-peer.d.ts.map +1 -1
- package/dist/src/util/tunnel/tunnel-rpc-peer.js +4 -5
- package/dist/src/util/tunnel/tunnel-rpc-peer.js.map +1 -1
- package/dist/src/util/util.d.ts +1 -1
- package/dist/src/util/util.d.ts.map +1 -1
- package/dist/src/util/util.js +1 -0
- package/dist/src/util/util.js.map +1 -1
- package/oclif.manifest.json +5 -72
- package/package.json +27 -28
- package/dist/src/commands/device/invite.d.ts +0 -6
- package/dist/src/commands/device/invite.d.ts.map +0 -1
- package/dist/src/commands/device/invite.js +0 -36
- package/dist/src/commands/device/invite.js.map +0 -1
package/README.md
CHANGED
|
@@ -2,21 +2,46 @@
|
|
|
2
2
|
|
|
3
3
|
DXOS command line interface.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
<!-- toc -->
|
|
6
|
+
* [DX CLI](#dx-cli)
|
|
7
|
+
* [Development](#development)
|
|
8
|
+
* [Usage](#usage)
|
|
9
|
+
<!-- tocstop -->
|
|
10
|
+
|
|
6
11
|
|
|
7
12
|
# Development
|
|
8
13
|
|
|
9
|
-
|
|
14
|
+
To build the CLI:
|
|
15
|
+
|
|
16
|
+
```bash
|
|
17
|
+
nx run cli:build --watch=true
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
Run the CLI from the local directory:
|
|
21
|
+
|
|
22
|
+
```bash
|
|
23
|
+
./bin/run config --json
|
|
24
|
+
```
|
|
25
|
+
|
|
26
|
+
Or source the following script to set the `dx` alias from any directory in the repo.
|
|
10
27
|
|
|
11
28
|
```bash
|
|
12
|
-
$
|
|
29
|
+
. $(git rev-parse --show-toplevel)/packages/devtools/cli/scripts/dev.sh
|
|
30
|
+
|
|
31
|
+
dx config --json
|
|
13
32
|
```
|
|
14
33
|
|
|
15
|
-
|
|
34
|
+
## Resetting the CLI
|
|
16
35
|
|
|
17
36
|
```bash
|
|
18
|
-
|
|
19
|
-
|
|
37
|
+
```
|
|
38
|
+
|
|
39
|
+
## Reporting errors
|
|
40
|
+
|
|
41
|
+
Run the following command to create a gist of the debug stats.
|
|
42
|
+
|
|
43
|
+
```bash
|
|
44
|
+
dx debug stats --json --no-agent | gh gist create
|
|
20
45
|
```
|
|
21
46
|
|
|
22
47
|
# Usage
|
|
@@ -27,7 +52,7 @@ $ npm install -g @dxos/cli
|
|
|
27
52
|
$ dx COMMAND
|
|
28
53
|
running command...
|
|
29
54
|
$ dx (--version)
|
|
30
|
-
@dxos/cli/0.1.53-main.
|
|
55
|
+
@dxos/cli/0.1.53-main.8f662cd linux-x64 node-v18.16.1
|
|
31
56
|
$ dx --help [COMMAND]
|
|
32
57
|
USAGE
|
|
33
58
|
$ dx COMMAND
|
|
@@ -35,7 +60,7 @@ USAGE
|
|
|
35
60
|
```
|
|
36
61
|
<!-- usagestop -->
|
|
37
62
|
|
|
38
|
-
|
|
63
|
+
## Commands
|
|
39
64
|
|
|
40
65
|
<!-- commands -->
|
|
41
66
|
* [`dx agent list`](#dx-agent-list)
|
|
@@ -49,7 +74,6 @@ USAGE
|
|
|
49
74
|
* [`dx config`](#dx-config)
|
|
50
75
|
* [`dx debug stats`](#dx-debug-stats)
|
|
51
76
|
* [`dx device`](#dx-device)
|
|
52
|
-
* [`dx device invite`](#dx-device-invite)
|
|
53
77
|
* [`dx device list`](#dx-device-list)
|
|
54
78
|
* [`dx function dev`](#dx-function-dev)
|
|
55
79
|
* [`dx function dev-server`](#dx-function-dev-server)
|
|
@@ -325,11 +349,10 @@ Output debug stats.
|
|
|
325
349
|
|
|
326
350
|
```
|
|
327
351
|
USAGE
|
|
328
|
-
$ dx debug stats [--json] [--dry-run] [
|
|
352
|
+
$ dx debug stats [--json] [--dry-run] [--verbose] [--config <value> --profile <value>] [--no-agent] [--timeout
|
|
329
353
|
<value>] [--humanize] [--truncate]
|
|
330
354
|
|
|
331
355
|
FLAGS
|
|
332
|
-
-v, --verbose Verbose output
|
|
333
356
|
--config=path [default: /home/runner/.config/dx/profile/default.yml] Config file.
|
|
334
357
|
--dry-run Dry run.
|
|
335
358
|
--humanize Humanized keys.
|
|
@@ -337,6 +360,7 @@ FLAGS
|
|
|
337
360
|
--profile=<value> [default: default] User profile.
|
|
338
361
|
--timeout=<value> [default: 30] Timeout in seconds.
|
|
339
362
|
--truncate Truncate keys.
|
|
363
|
+
--verbose Verbose output.
|
|
340
364
|
|
|
341
365
|
GLOBAL FLAGS
|
|
342
366
|
--json Format output as json.
|
|
@@ -368,29 +392,6 @@ DESCRIPTION
|
|
|
368
392
|
Show device info.
|
|
369
393
|
```
|
|
370
394
|
|
|
371
|
-
## `dx device invite`
|
|
372
|
-
|
|
373
|
-
Create device invitation.
|
|
374
|
-
|
|
375
|
-
```
|
|
376
|
-
USAGE
|
|
377
|
-
$ dx device invite [--json] [--dry-run] [-v] [--config <value> --profile <value>] [--no-agent] [--timeout <value>]
|
|
378
|
-
|
|
379
|
-
FLAGS
|
|
380
|
-
-v, --verbose Verbose output
|
|
381
|
-
--config=path [default: /home/runner/.config/dx/profile/default.yml] Config file.
|
|
382
|
-
--dry-run Dry run.
|
|
383
|
-
--no-agent Auto-start agent.
|
|
384
|
-
--profile=<value> [default: default] User profile.
|
|
385
|
-
--timeout=<value> [default: 30] Timeout in seconds.
|
|
386
|
-
|
|
387
|
-
GLOBAL FLAGS
|
|
388
|
-
--json Format output as json.
|
|
389
|
-
|
|
390
|
-
DESCRIPTION
|
|
391
|
-
Create device invitation.
|
|
392
|
-
```
|
|
393
|
-
|
|
394
395
|
## `dx device list`
|
|
395
396
|
|
|
396
397
|
Show device info.
|
|
@@ -430,7 +431,7 @@ FLAGS
|
|
|
430
431
|
--manifest=<value> [default: functions.yml]
|
|
431
432
|
--no-agent Auto-start agent.
|
|
432
433
|
--profile=<value> [default: default] User profile.
|
|
433
|
-
--require=<value>...
|
|
434
|
+
--require=<value>... [default: ts-node/register]
|
|
434
435
|
--timeout=<value> [default: 30] Timeout in seconds.
|
|
435
436
|
|
|
436
437
|
GLOBAL FLAGS
|
|
@@ -464,7 +465,7 @@ FLAGS
|
|
|
464
465
|
--manifest=<value> [default: functions.yml]
|
|
465
466
|
--no-agent Auto-start agent.
|
|
466
467
|
--profile=<value> [default: default] User profile.
|
|
467
|
-
--require=<value>...
|
|
468
|
+
--require=<value>... [default: ts-node/register]
|
|
468
469
|
--timeout=<value> [default: 30] Timeout in seconds.
|
|
469
470
|
|
|
470
471
|
GLOBAL FLAGS
|
package/bin/dev
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
#!/usr/bin/env -S node --no-warnings
|
|
2
2
|
// NOTE: Specify --no-warnings in production script.
|
|
3
3
|
|
|
4
|
+
const chalk = require('chalk');
|
|
5
|
+
console.log(chalk`{yellow.bold Warning: Running CLI in dev mode (only for development purposes).}`)
|
|
6
|
+
|
|
4
7
|
const oclif = require('@oclif/core')
|
|
5
8
|
|
|
6
9
|
const path = require('path')
|
|
@@ -7,7 +7,7 @@ export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
|
|
|
7
7
|
/**
|
|
8
8
|
* Custom base command.
|
|
9
9
|
* https://oclif.io/docs/base_class#docsNav
|
|
10
|
-
*
|
|
10
|
+
* https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
|
|
11
11
|
*/
|
|
12
12
|
export declare abstract class BaseCommand<T extends typeof Command = any> extends Command {
|
|
13
13
|
static enableJsonFlag: boolean;
|
|
@@ -55,6 +55,7 @@ export declare abstract class BaseCommand<T extends typeof Command = any> extend
|
|
|
55
55
|
* https://oclif.io/docs/error_handling
|
|
56
56
|
*/
|
|
57
57
|
error(err: string | Error, options?: any): never;
|
|
58
|
+
catch(err: Error, options?: any): Promise<void>;
|
|
58
59
|
/**
|
|
59
60
|
* Called after each command run.
|
|
60
61
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,WAAW,EAAS,UAAU,EAAE,MAAM,aAAa,CAAC;AAUhF,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
|
package/dist/src/base-command.js
CHANGED
|
@@ -42,12 +42,14 @@ const pkg_up_1 = __importDefault(require("pkg-up"));
|
|
|
42
42
|
const agent_1 = require("@dxos/agent");
|
|
43
43
|
const client_1 = require("@dxos/client");
|
|
44
44
|
const client_protocol_1 = require("@dxos/client-protocol");
|
|
45
|
+
const services_1 = require("@dxos/client/services");
|
|
45
46
|
const debug_1 = require("@dxos/debug");
|
|
46
47
|
const log_1 = require("@dxos/log");
|
|
47
48
|
const Sentry = __importStar(require("@dxos/sentry"));
|
|
48
49
|
const sentry_1 = require("@dxos/sentry");
|
|
49
50
|
const Telemetry = __importStar(require("@dxos/telemetry"));
|
|
50
51
|
const util_1 = require("./util");
|
|
52
|
+
const DEFAULT_CONFIG = 'config/config-default.yml';
|
|
51
53
|
// TODO(wittjosiah): Factor out.
|
|
52
54
|
const exists = async (...args) => {
|
|
53
55
|
try {
|
|
@@ -66,7 +68,7 @@ const exists = async (...args) => {
|
|
|
66
68
|
/**
|
|
67
69
|
* Custom base command.
|
|
68
70
|
* https://oclif.io/docs/base_class#docsNav
|
|
69
|
-
*
|
|
71
|
+
* https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
|
|
70
72
|
*/
|
|
71
73
|
class BaseCommand extends core_1.Command {
|
|
72
74
|
constructor(argv, config) {
|
|
@@ -91,7 +93,7 @@ class BaseCommand extends core_1.Command {
|
|
|
91
93
|
return Date.now() - this._startTime.getTime();
|
|
92
94
|
}
|
|
93
95
|
done() {
|
|
94
|
-
(0, log_1.log)('ok', {}, { file: "packages/devtools/cli/src/base-command.ts", line:
|
|
96
|
+
(0, log_1.log)('ok', {}, { file: "packages/devtools/cli/src/base-command.ts", line: 153, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
95
97
|
}
|
|
96
98
|
/**
|
|
97
99
|
* Load the client config.
|
|
@@ -111,13 +113,13 @@ class BaseCommand extends core_1.Command {
|
|
|
111
113
|
await this._loadConfig();
|
|
112
114
|
}
|
|
113
115
|
async _initTelemetry() {
|
|
114
|
-
this._telemetryContext = await (0, util_1.getTelemetryContext)(
|
|
116
|
+
this._telemetryContext = await (0, util_1.getTelemetryContext)(client_protocol_1.DX_DATA);
|
|
115
117
|
const { mode, installationId, group, environment, release } = this._telemetryContext;
|
|
116
118
|
{
|
|
117
119
|
if (group === 'dxos') {
|
|
118
|
-
(0, log_1.log)((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`, {}, { file: "packages/devtools/cli/src/base-command.ts", line:
|
|
120
|
+
(0, log_1.log)((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 183, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
119
121
|
}
|
|
120
|
-
await (0, util_1.showTelemetryBanner)(
|
|
122
|
+
await (0, util_1.showTelemetryBanner)(client_protocol_1.DX_DATA);
|
|
121
123
|
}
|
|
122
124
|
if (util_1.SENTRY_DESTINATION && mode !== 'disabled') {
|
|
123
125
|
Sentry.init({
|
|
@@ -134,7 +136,7 @@ class BaseCommand extends core_1.Command {
|
|
|
134
136
|
});
|
|
135
137
|
}
|
|
136
138
|
if (util_1.TELEMETRY_API_KEY) {
|
|
137
|
-
mode === 'disabled' && (await (0, util_1.disableTelemetry)(
|
|
139
|
+
mode === 'disabled' && (await (0, util_1.disableTelemetry)(client_protocol_1.DX_DATA));
|
|
138
140
|
Telemetry.init({
|
|
139
141
|
apiKey: util_1.TELEMETRY_API_KEY,
|
|
140
142
|
batchSize: 20,
|
|
@@ -158,14 +160,14 @@ class BaseCommand extends core_1.Command {
|
|
|
158
160
|
const { config: configFile } = this.flags;
|
|
159
161
|
const configExists = await exists(configFile);
|
|
160
162
|
if (!configExists) {
|
|
161
|
-
const defaultConfigPath = (0, node_path_1.join)((0, node_path_1.dirname)((_a = pkg_up_1.default.sync({ cwd: __dirname })) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('Could not find package.json'))),
|
|
163
|
+
const defaultConfigPath = (0, node_path_1.join)((0, node_path_1.dirname)((_a = pkg_up_1.default.sync({ cwd: __dirname })) !== null && _a !== void 0 ? _a : (0, debug_1.raise)(new Error('Could not find package.json'))), DEFAULT_CONFIG);
|
|
162
164
|
const yamlConfig = js_yaml_1.default.load(await (0, promises_1.readFile)(defaultConfigPath, 'utf-8'));
|
|
163
165
|
{
|
|
164
166
|
// Isolate DX_PROFILE storages.
|
|
165
167
|
(_b = yamlConfig.runtime) !== null && _b !== void 0 ? _b : (yamlConfig.runtime = {});
|
|
166
168
|
(_c = (_f = yamlConfig.runtime).client) !== null && _c !== void 0 ? _c : (_f.client = {});
|
|
167
169
|
(_d = (_g = yamlConfig.runtime.client).storage) !== null && _d !== void 0 ? _d : (_g.storage = {});
|
|
168
|
-
yamlConfig.runtime.client.storage.path = (0, node_path_1.join)((_e = yamlConfig.runtime.client.storage.path) !== null && _e !== void 0 ? _e :
|
|
170
|
+
yamlConfig.runtime.client.storage.path = (0, node_path_1.join)((_e = yamlConfig.runtime.client.storage.path) !== null && _e !== void 0 ? _e : client_protocol_1.DX_DATA, this.flags.profile);
|
|
169
171
|
}
|
|
170
172
|
await (0, promises_1.mkdir)((0, node_path_1.dirname)(configFile), { recursive: true });
|
|
171
173
|
await (0, promises_1.writeFile)(configFile, js_yaml_1.default.dump(yamlConfig), 'utf-8');
|
|
@@ -193,8 +195,12 @@ class BaseCommand extends core_1.Command {
|
|
|
193
195
|
}
|
|
194
196
|
error(err, options) {
|
|
195
197
|
super.error(err, options);
|
|
196
|
-
|
|
198
|
+
}
|
|
199
|
+
async catch(err, options) {
|
|
200
|
+
// Will only submit if API key exists (i.e., prod).
|
|
201
|
+
super.error(err, options);
|
|
197
202
|
this._failing = true;
|
|
203
|
+
throw err;
|
|
198
204
|
}
|
|
199
205
|
/**
|
|
200
206
|
* Called after each command run.
|
|
@@ -218,7 +224,7 @@ class BaseCommand extends core_1.Command {
|
|
|
218
224
|
const running = await daemon.isRunning(this.flags.profile);
|
|
219
225
|
if (!running) {
|
|
220
226
|
this.log(`Starting agent (${this.flags.profile})`);
|
|
221
|
-
await daemon.start(this.flags.profile);
|
|
227
|
+
await daemon.start(this.flags.profile, { config: this.flags.config });
|
|
222
228
|
}
|
|
223
229
|
});
|
|
224
230
|
}
|
|
@@ -229,16 +235,15 @@ class BaseCommand extends core_1.Command {
|
|
|
229
235
|
async getClient() {
|
|
230
236
|
(0, node_assert_1.default)(this._clientConfig);
|
|
231
237
|
if (!this._client) {
|
|
232
|
-
(0, node_assert_1.default)(this._clientConfig);
|
|
233
238
|
if (this.flags['no-agent']) {
|
|
234
239
|
this._client = new client_1.Client({ config: this._clientConfig });
|
|
235
240
|
}
|
|
236
241
|
else {
|
|
237
242
|
await this.maybeStartDaemon();
|
|
238
|
-
this._client = new client_1.Client({ config: this._clientConfig, services: (0,
|
|
243
|
+
this._client = new client_1.Client({ config: this._clientConfig, services: (0, services_1.fromAgent)({ profile: this.flags.profile }) });
|
|
239
244
|
}
|
|
240
245
|
await this._client.initialize();
|
|
241
|
-
(0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line:
|
|
246
|
+
(0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 335, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
242
247
|
}
|
|
243
248
|
return this._client;
|
|
244
249
|
}
|
|
@@ -259,7 +264,7 @@ class BaseCommand extends core_1.Command {
|
|
|
259
264
|
* Convenience function to wrap starting the agent.
|
|
260
265
|
*/
|
|
261
266
|
async execWithDaemon(callback) {
|
|
262
|
-
const daemon = new agent_1.ForeverDaemon(`${
|
|
267
|
+
const daemon = new agent_1.ForeverDaemon(`${client_protocol_1.DX_RUNTIME}`);
|
|
263
268
|
await daemon.connect();
|
|
264
269
|
const value = await callback(daemon);
|
|
265
270
|
await daemon.disconnect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/agent.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
//
|
|
3
|
+
// Copyright 2023 DXOS.org
|
|
4
|
+
//
|
|
5
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
6
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
const chai_1 = require("chai");
|
|
10
|
+
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
11
|
+
const node_child_process_1 = require("node:child_process");
|
|
12
|
+
const node_fs_1 = require("node:fs");
|
|
13
|
+
const node_path_1 = require("node:path");
|
|
14
|
+
const async_1 = require("@dxos/async");
|
|
15
|
+
const log_1 = require("@dxos/log");
|
|
16
|
+
const test_1 = require("@dxos/test");
|
|
17
|
+
const util_1 = require("../../util");
|
|
18
|
+
(0, test_1.describe)('agent', () => {
|
|
19
|
+
const TEST_FOLDER = '/tmp/dxos/testing/cli';
|
|
20
|
+
const HOST_CONFIG_PATH = (0, node_path_1.join)(TEST_FOLDER, 'config-host.yml');
|
|
21
|
+
const GUEST_CONFIG_PATH = (0, node_path_1.join)(TEST_FOLDER, 'config-guest.yml');
|
|
22
|
+
(0, test_1.beforeAll)(async () => {
|
|
23
|
+
// Create config files.
|
|
24
|
+
[
|
|
25
|
+
[HOST_CONFIG_PATH, (0, node_path_1.join)(TEST_FOLDER, 'host')],
|
|
26
|
+
[GUEST_CONFIG_PATH, (0, node_path_1.join)(TEST_FOLDER, 'guest')],
|
|
27
|
+
].forEach(([configPath, storagePath]) => {
|
|
28
|
+
(0, node_fs_1.mkdirSync)((0, node_path_1.dirname)(configPath), { recursive: true });
|
|
29
|
+
(0, node_fs_1.writeFileSync)(configPath, js_yaml_1.default.dump({
|
|
30
|
+
version: 1,
|
|
31
|
+
runtime: {
|
|
32
|
+
client: {
|
|
33
|
+
storage: {
|
|
34
|
+
persistent: true,
|
|
35
|
+
path: storagePath,
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
services: {
|
|
39
|
+
signaling: [
|
|
40
|
+
{
|
|
41
|
+
server: 'wss://dev.kube.dxos.org/.well-known/dx/signal',
|
|
42
|
+
},
|
|
43
|
+
{
|
|
44
|
+
server: 'wss://kube.dxos.org/.well-known/dx/signal',
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
ice: [
|
|
48
|
+
{
|
|
49
|
+
urls: 'stun:kube.dxos.org:3478',
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
urls: 'turn:kube.dxos.org:3478',
|
|
53
|
+
username: 'dxos',
|
|
54
|
+
credential: 'dxos',
|
|
55
|
+
},
|
|
56
|
+
],
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
}));
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
(0, test_1.afterAll)(async () => {
|
|
63
|
+
// Cleanup.
|
|
64
|
+
(0, node_fs_1.rmSync)(TEST_FOLDER, { recursive: true, force: true });
|
|
65
|
+
});
|
|
66
|
+
(0, test_1.test)('join two agent profiles', async () => {
|
|
67
|
+
const haloName = 'TEST_NAME';
|
|
68
|
+
const host = 'test-profile-1';
|
|
69
|
+
const guest = 'test-profile-2';
|
|
70
|
+
{
|
|
71
|
+
log_1.log.info('Starting first test profile agent.', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 78, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
72
|
+
await (0, util_1.runCommand)(`agent start --profile=${host} --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
73
|
+
log_1.log.info('Creating halo identity.', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 80, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
74
|
+
await (0, util_1.runCommand)(`halo create ${haloName} --profile=${host} --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
75
|
+
}
|
|
76
|
+
{
|
|
77
|
+
log_1.log.info('Starting second test profile agent.', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 85, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
78
|
+
await (0, util_1.runCommand)(`agent start --profile=${guest} --config=${GUEST_CONFIG_PATH}`, __dirname);
|
|
79
|
+
}
|
|
80
|
+
{
|
|
81
|
+
log_1.log.info('Inviting second profile to join first profile halo.', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 90, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
82
|
+
await performHaloCLIInvitation({
|
|
83
|
+
host: { profile: host, config: HOST_CONFIG_PATH },
|
|
84
|
+
guest: { profile: guest, config: GUEST_CONFIG_PATH },
|
|
85
|
+
});
|
|
86
|
+
log_1.log.info('Invitation successful.', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 95, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
87
|
+
}
|
|
88
|
+
{
|
|
89
|
+
// TODO(mykola): Remove fancy colorful output from the CLI.
|
|
90
|
+
const firstIdentity = await (0, util_1.runCommand)(`halo --profile=${host} --json --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
91
|
+
const secondIdentity = await (0, util_1.runCommand)(`halo --profile=${guest} --json --config=${GUEST_CONFIG_PATH}`, __dirname);
|
|
92
|
+
(0, chai_1.expect)(secondIdentity).to.equal(firstIdentity);
|
|
93
|
+
}
|
|
94
|
+
{
|
|
95
|
+
await (0, util_1.runCommand)(`agent stop --profile=${host} --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
96
|
+
await (0, util_1.runCommand)(`agent stop --profile=${guest} --config=${GUEST_CONFIG_PATH}`, __dirname);
|
|
97
|
+
}
|
|
98
|
+
}).timeout(120000);
|
|
99
|
+
});
|
|
100
|
+
const performHaloCLIInvitation = async ({ host, guest }) => {
|
|
101
|
+
const invitation = new async_1.Trigger();
|
|
102
|
+
const secret = new async_1.Trigger();
|
|
103
|
+
const hostClosed = new async_1.Trigger();
|
|
104
|
+
const hostProcess = (0, node_child_process_1.spawn)(util_1.BIN_PATH, ['halo', 'share', `--profile=${host.profile}`, `--config=${host.config}`], {
|
|
105
|
+
shell: true,
|
|
106
|
+
cwd: __dirname,
|
|
107
|
+
});
|
|
108
|
+
{
|
|
109
|
+
const handleHost = (data) => {
|
|
110
|
+
data
|
|
111
|
+
.toString()
|
|
112
|
+
.split('\n')
|
|
113
|
+
.forEach((line) => {
|
|
114
|
+
if (line.includes('Invitation')) {
|
|
115
|
+
(0, log_1.log)('Invitation:', line.split(': ')[1], { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 136, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
116
|
+
invitation.wake(line.split(': ')[1]);
|
|
117
|
+
}
|
|
118
|
+
if (line.includes('Secret')) {
|
|
119
|
+
(0, log_1.log)('Secret:', line.split(': ')[1], { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 140, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
120
|
+
secret.wake(line.split(': ')[1]);
|
|
121
|
+
}
|
|
122
|
+
// });
|
|
123
|
+
});
|
|
124
|
+
};
|
|
125
|
+
hostProcess.stdout.on('data', handleHost);
|
|
126
|
+
hostProcess.stderr.on('data', handleHost);
|
|
127
|
+
hostProcess.on('error', (err) => {
|
|
128
|
+
throw err;
|
|
129
|
+
});
|
|
130
|
+
hostProcess.on('exit', (code) => {
|
|
131
|
+
if (code !== 0) {
|
|
132
|
+
throw new Error(`Host process exited with code ${code}`);
|
|
133
|
+
}
|
|
134
|
+
hostClosed.wake();
|
|
135
|
+
});
|
|
136
|
+
}
|
|
137
|
+
const guestReadyForInvitation = new async_1.Trigger();
|
|
138
|
+
const guestReadyForSecret = new async_1.Trigger();
|
|
139
|
+
const guestProcess = (0, node_child_process_1.spawn)(util_1.BIN_PATH, ['halo', 'join', `--profile=${guest.profile}`, `--config=${guest.config}`], {
|
|
140
|
+
shell: true,
|
|
141
|
+
cwd: __dirname,
|
|
142
|
+
});
|
|
143
|
+
{
|
|
144
|
+
const handleGuest = (data) => {
|
|
145
|
+
data
|
|
146
|
+
.toString()
|
|
147
|
+
.split('\n')
|
|
148
|
+
.forEach((line) => {
|
|
149
|
+
if (line.includes('Invitation')) {
|
|
150
|
+
(0, log_1.log)('Ready for invitation', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 174, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
151
|
+
guestReadyForInvitation.wake();
|
|
152
|
+
}
|
|
153
|
+
if (line.includes('Invitation code')) {
|
|
154
|
+
(0, log_1.log)('Ready for secret', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 178, scope: this, bugcheck: "If you see this message then it means that the source code preprocessor for @dxos/log is broken. It probably has misinterpreted an unrelated call for a logger invocation.", callSite: (fn, args) => fn(...args) });
|
|
155
|
+
guestReadyForSecret.wake();
|
|
156
|
+
}
|
|
157
|
+
});
|
|
158
|
+
};
|
|
159
|
+
guestProcess.stdout.on('data', handleGuest);
|
|
160
|
+
guestProcess.stderr.on('data', handleGuest);
|
|
161
|
+
guestProcess.on('error', (err) => {
|
|
162
|
+
throw err;
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
await (0, async_1.asyncTimeout)(guestReadyForInvitation.wait(), 10000);
|
|
166
|
+
guestProcess.stdin.write(`${await invitation.wait()}\n`);
|
|
167
|
+
await (0, async_1.asyncTimeout)(guestReadyForSecret.wait(), 10000);
|
|
168
|
+
guestProcess.stdin.write(`${await secret.wait()}\n`);
|
|
169
|
+
await (0, async_1.asyncTimeout)(hostClosed.wait(), 10000);
|
|
170
|
+
hostProcess.kill();
|
|
171
|
+
guestProcess.kill();
|
|
172
|
+
};
|
|
173
|
+
//# sourceMappingURL=agent.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent.test.js","sourceRoot":"","sources":["../../../../src/commands/agent/agent.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/list.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/list.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,eAAO,MAAM,WAAW,YAAa,GAAG,EAAE,qBAmBzC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAkB;IAEvC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAO1B"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.printAgents = void 0;
|
|
7
7
|
const core_1 = require("@oclif/core");
|
|
8
|
+
const date_fns_1 = require("date-fns");
|
|
8
9
|
const base_command_1 = require("../../base-command");
|
|
9
10
|
const printAgents = (daemons, flags = {}) => {
|
|
10
11
|
core_1.ux.table(daemons, {
|
|
@@ -14,8 +15,9 @@ const printAgents = (daemons, flags = {}) => {
|
|
|
14
15
|
pid: {
|
|
15
16
|
header: 'process',
|
|
16
17
|
},
|
|
17
|
-
|
|
18
|
-
header: '
|
|
18
|
+
uptime: {
|
|
19
|
+
header: 'uptime',
|
|
20
|
+
get: (row) => (0, date_fns_1.formatDistance)(new Date(), new Date(row.started)),
|
|
19
21
|
},
|
|
20
22
|
}, {
|
|
21
23
|
...flags,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/agent/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/agent/list.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AACjC,uCAA0C;AAE1C,qDAAiD;AAE1C,MAAM,WAAW,GAAG,CAAC,OAAc,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACxD,SAAE,CAAC,KAAK,CACN,OAAO,EACP;QACE,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;QACD,GAAG,EAAE;YACH,MAAM,EAAE,SAAS;SAClB;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,yBAAc,EAAC,IAAI,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAChE;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,WAAW,eAmBtB;AAEF,MAAqB,IAAK,SAAQ,0BAAwB;IAIxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YACnC,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;;AATe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,cAAc,CAAC;kBAF1B,IAAI"}
|
|
@@ -7,7 +7,7 @@ const base_command_1 = require("../../base-command");
|
|
|
7
7
|
class Restart extends base_command_1.BaseCommand {
|
|
8
8
|
async run() {
|
|
9
9
|
return await this.execWithDaemon(async (daemon) => {
|
|
10
|
-
const process = await daemon.restart(this.flags.profile);
|
|
10
|
+
const process = await daemon.restart(this.flags.profile, { config: this.flags.config });
|
|
11
11
|
this.log('Restarted: ', process);
|
|
12
12
|
});
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../../src/commands/agent/restart.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,qDAAiD;AAEjD,MAAqB,OAAQ,SAAQ,0BAA2B;IAI9D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../../src/commands/agent/restart.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,qDAAiD;AAEjD,MAAqB,OAAQ,SAAQ,0BAA2B;IAI9D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;YACxF,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC;;AARe,sBAAc,GAAG,IAAI,CAAC;AACtB,mBAAW,GAAG,uBAAuB,CAAC;kBAFnC,OAAO"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"
|
|
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,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAuB;IAElD,OAAgB,KAAK;;;;;;;;;;;MAmBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YASX,gBAAgB;YAoDhB,YAAY;IAY1B,OAAO,CAAC,cAAc;CAevB"}
|