@dxos/cli 0.1.58-next.3349da8 → 0.1.58-next.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.
Files changed (43) hide show
  1. package/README.md +21 -10
  2. package/config/config-dev.yml +1 -1
  3. package/config/config-local.yml +1 -1
  4. package/config/config-staging.yml +1 -1
  5. package/config/config.yml +1 -1
  6. package/dist/src/base-command.d.ts.map +1 -1
  7. package/dist/src/base-command.js +6 -3
  8. package/dist/src/base-command.js.map +1 -1
  9. package/dist/src/commands/agent/start.d.ts +0 -1
  10. package/dist/src/commands/agent/start.d.ts.map +1 -1
  11. package/dist/src/commands/agent/start.js +2 -10
  12. package/dist/src/commands/agent/start.js.map +1 -1
  13. package/dist/src/commands/app/create.d.ts.map +1 -1
  14. package/dist/src/commands/app/create.js +9 -14
  15. package/dist/src/commands/app/create.js.map +1 -1
  16. package/dist/src/commands/app/open.js +1 -1
  17. package/dist/src/commands/app/open.js.map +1 -1
  18. package/dist/src/commands/config/index.js +1 -1
  19. package/dist/src/commands/config/index.js.map +1 -1
  20. package/dist/src/commands/debug/generate.js +1 -1
  21. package/dist/src/commands/halo/join.js +1 -1
  22. package/dist/src/commands/halo/join.js.map +1 -1
  23. package/dist/src/commands/halo/share.js +1 -1
  24. package/dist/src/commands/halo/share.js.map +1 -1
  25. package/dist/src/commands/reset/index.d.ts.map +1 -1
  26. package/dist/src/commands/reset/index.js +8 -4
  27. package/dist/src/commands/reset/index.js.map +1 -1
  28. package/dist/src/commands/space/create.js +1 -1
  29. package/dist/src/commands/space/create.js.map +1 -1
  30. package/dist/src/commands/space/join.d.ts.map +1 -1
  31. package/dist/src/commands/space/join.js +2 -3
  32. package/dist/src/commands/space/join.js.map +1 -1
  33. package/dist/src/commands/space/share.js +1 -1
  34. package/dist/src/commands/space/share.js.map +1 -1
  35. package/dist/src/util/spaces.js +1 -1
  36. package/dist/src/util/spaces.js.map +1 -1
  37. package/dist/src/util/telemetryrc.json +1 -1
  38. package/oclif.manifest.json +3 -9
  39. package/package.json +20 -19
  40. package/dist/src/util/exec.d.ts +0 -7
  41. package/dist/src/util/exec.d.ts.map +0 -1
  42. package/dist/src/util/exec.js +0 -42
  43. 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
- * [Instalation](#instalation)
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
- # Instalation
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
- ## Starting agent
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
  ![Composer add device](./public/composer-sidebar.png)
30
42
  ![Composer invitation](./public/composer-add-device.png)
31
43
 
32
- 1. Run halo join command in your terminal.
44
+ 2. Run halo join command in your terminal.
33
45
  ![CLI halo join flow](./public/cli-halo-join.png)
34
46
 
35
- 1. Proceed with invitation
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-next.3349da8 linux-x64 node-v18.17.1
95
+ @dxos/cli/0.1.58-next.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>] [--monitor] [--metrics]
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.
@@ -450,7 +461,7 @@ FLAGS
450
461
  --dry-run Dry run.
451
462
  --epoch=<value> Number of mutations per epoch.
452
463
  --interval=<value> Interval between mutations (ms).
453
- --jitter=<value> Inverval variance (ms).
464
+ --jitter=<value> Interval variance (ms).
454
465
  --json Output as JSON.
455
466
  --mutations=<value> Number of mutations.
456
467
  --no-agent Run command without agent.
@@ -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: whiskey-sad-dakota-fillet] Tunnel name
1545
+ --name=<value> [default: autumn-michigan-seventeen-tango] 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.
@@ -4,7 +4,7 @@ runtime:
4
4
  client:
5
5
  storage:
6
6
  persistent: true
7
- path: /tmp/dx/run
7
+ dataRoot: /tmp/dx/run
8
8
 
9
9
  services:
10
10
  ipfs:
@@ -4,7 +4,7 @@ runtime:
4
4
  client:
5
5
  storage:
6
6
  persistent: true
7
- path: /tmp/dx/run
7
+ dataRoot: /tmp/dx/run
8
8
 
9
9
 
10
10
  services:
@@ -4,7 +4,7 @@ runtime:
4
4
  client:
5
5
  storage:
6
6
  persistent: true
7
- path: /tmp/dx/run
7
+ dataRoot: /tmp/dx/run
8
8
 
9
9
  services:
10
10
  ipfs:
package/config/config.yml CHANGED
@@ -4,7 +4,7 @@ runtime:
4
4
  client:
5
5
  storage:
6
6
  persistent: true
7
- path: /tmp/dx/run
7
+ dataRoot: /tmp/dx/run
8
8
 
9
9
  services:
10
10
  ipfs:
@@ -1 +1 @@
1
- {"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
@@ -40,8 +40,8 @@ const node_path_1 = require("node:path");
40
40
  const pkg_up_1 = __importDefault(require("pkg-up"));
41
41
  const agent_1 = require("@dxos/agent");
42
42
  const client_1 = require("@dxos/client");
43
- const client_protocol_1 = require("@dxos/client-protocol");
44
43
  const services_1 = require("@dxos/client/services");
44
+ const client_protocol_1 = require("@dxos/client-protocol");
45
45
  const debug_1 = require("@dxos/debug");
46
46
  const invariant_1 = require("@dxos/invariant");
47
47
  const log_1 = require("@dxos/log");
@@ -175,7 +175,7 @@ class BaseCommand extends core_1.Command {
175
175
  (_b = yamlConfig.runtime) !== null && _b !== void 0 ? _b : (yamlConfig.runtime = {});
176
176
  (_c = (_f = yamlConfig.runtime).client) !== null && _c !== void 0 ? _c : (_f.client = {});
177
177
  (_d = (_g = yamlConfig.runtime.client).storage) !== null && _d !== void 0 ? _d : (_g.storage = {});
178
- yamlConfig.runtime.client.storage.path = (0, client_protocol_1.getProfilePath)((_e = yamlConfig.runtime.client.storage.path) !== null && _e !== void 0 ? _e : client_protocol_1.DX_DATA, this.flags.profile);
178
+ yamlConfig.runtime.client.storage.dataRoot = (0, client_protocol_1.getProfilePath)((_e = yamlConfig.runtime.client.storage.dataRoot) !== null && _e !== void 0 ? _e : client_protocol_1.DX_DATA, this.flags.profile);
179
179
  }
180
180
  await (0, promises_1.mkdir)((0, node_path_1.dirname)(configFile), { recursive: true });
181
181
  await (0, promises_1.writeFile)(configFile, js_yaml_1.default.dump(yamlConfig), 'utf-8');
@@ -218,6 +218,9 @@ class BaseCommand extends core_1.Command {
218
218
  // TODO(burdon): Need better diagnostics -- might fail for other reasons.
219
219
  this.logToStderr((0, chalk_1.default) `{red Error}: Agent may be stale (to restart: 'dx agent restart --force')`);
220
220
  }
221
+ else if (err instanceof agent_1.AgentIsNotStartedByCLIError) {
222
+ this.logToStderr((0, chalk_1.default) `{red Error}: Agent is running, and it is detached from CLI. Maybe you started it manually.`);
223
+ }
221
224
  else {
222
225
  // Handle unknown errors with default method.
223
226
  super.error(err, options);
@@ -266,7 +269,7 @@ class BaseCommand extends core_1.Command {
266
269
  this._client = new client_1.Client({ config: this._clientConfig, services: (0, services_1.fromAgent)({ profile: this.flags.profile }) });
267
270
  }
268
271
  await this._client.initialize();
269
- (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 374, 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) });
272
+ (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 378, 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) });
270
273
  }
271
274
  return this._client;
272
275
  }
@@ -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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"}
@@ -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;;;;;;;;;;;;;;MAsBnB;IAEF,OAAgB,QAAQ;;;QAKtB;IAEF,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IAEhC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YASX,gBAAgB;YAkDhB,YAAY;IAqB1B,OAAO,CAAC,cAAc;CAgBvB"}
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
- // TODO(burdon): Config.
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,6 +99,7 @@ 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,
102
+ ws: this.flags.ws,
108
103
  });
109
104
  if (process) {
110
105
  this.log('Agent started.');
@@ -150,9 +145,6 @@ Start.flags = {
150
145
  description: 'Expose ECHO REST API.',
151
146
  helpValue: 'port',
152
147
  }),
153
- monitor: core_1.Flags.boolean({
154
- description: 'Run epoch monitoring.',
155
- }),
156
148
  metrics: core_1.Flags.boolean({
157
149
  description: 'Start metrics recording.',
158
150
  }),
@@ -1 +1 @@
1
- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"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"}
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":"AASA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,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;CAiD1B"}
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 { exists } = await Promise.resolve().then(() => __importStar(require('@dxos/plate')));
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 exists(outputDirectory);
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
- try {
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, exec_1.exec)('which xcrun');
65
+ await (0, process_2.exec)('which xcrun');
72
66
  }
73
- catch (_b) {
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].execute({
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.save({ printFiles: verbose });
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":"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"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/app/create.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@ class Open extends (_b = base_command_1.BaseCommand) {
29
29
  return await context.newPage();
30
30
  }));
31
31
  if (this.flags.invite) {
32
- const observable = client.halo.createInvitation({
32
+ const observable = client.halo.share({
33
33
  type: invitations_1.Invitation.Type.MULTIUSE,
34
34
  authMethod: invitations_1.Invitation.AuthMethod.NONE,
35
35
  });
@@ -1 +1 @@
1
- {"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/app/open.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"open.js","sourceRoot":"","sources":["../../../../src/commands/app/open.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,sCAA8C;AAC9C,2CAA4C;AAC5C,kDAA0B;AAG1B,0DAAyE;AACzE,qCAAmC;AAEnC,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,IAAK,SAAQ,MAAA,0BAAW,CAAa;IAwBxD,KAAK,CAAC,GAAG;QACP,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,gCAAgC,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;aACX;YAED,8DAA8D;YAC9D,8CAA8C;YAE9C,MAAM,OAAO,GAAG,MAAM,eAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,IAAA,YAAK,EAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;gBAC3C,OAAO,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACjC,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;gBACrB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;oBACnC,IAAI,EAAE,wBAAU,CAAC,IAAI,CAAC,QAAQ;oBAC9B,UAAU,EAAE,wBAAU,CAAC,UAAU,CAAC,IAAI;iBACvC,CAAC,CAAC;gBAEH,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;oBACvC,UAAU;oBACV,SAAS,EAAE;wBACT,YAAY,EAAE,KAAK,IAAI,EAAE;4BACvB,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;4BAClE,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gCAC3B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gCACnC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;gCAChE,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;4BAC5B,CAAC,CAAC,CAAC;4BAEH,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBAC1D,CAAC;qBACF;oBACD,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS;iBAClC,CAAC,CAAC;gBAEH,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;gBAChD,MAAM,iBAAiB,CAAC;gBACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;aAClB;iBAAM;gBACL,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;;AAvEe,mBAAc,GAAG,IAAI,AAAP,CAAQ;AACtB,gBAAW,GAAG,4DAA4D,AAA/D,CAAgE;AAE3E,SAAI,GAAG;IACrB,GAAG,2BAAU;IACb,GAAG,EAAE,WAAI,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,UAAU;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,AANmB,CAMlB;AAEc,UAAK,GAAG;IACtB,GAAG,4BAAW;IACd,SAAS,EAAE,YAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,2BAA2B;QACxC,OAAO,EAAE,CAAC;KACX,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EAAE,wDAAwD;QACrE,OAAO,EAAE,IAAI;KACd,CAAC;CACH,AAVoB,CAUnB;kBAtBiB,IAAI"}
@@ -8,7 +8,7 @@ class Config extends base_command_1.BaseCommand {
8
8
  async run() {
9
9
  var _a, _b;
10
10
  const { config: configFile } = this.flags;
11
- if (this.flags.verbose) {
11
+ if (!this.flags.json) {
12
12
  this.log(`Config file: ${configFile}\n${JSON.stringify((_a = this.clientConfig) === null || _a === void 0 ? void 0 : _a.values, undefined, 2)}`);
13
13
  }
14
14
  return (_b = this.clientConfig) === null || _b === void 0 ? void 0 : _b.values;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/config/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,qDAAiD;AAEjD,MAAqB,MAAO,SAAQ,0BAA0B;IAI5D,KAAK,CAAC,GAAG;;QACP,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1C,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,gBAAgB,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACpG;QAED,OAAO,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,CAAC;IACnC,CAAC;;AAVe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,mBAAmB,CAAC;kBAF/B,MAAM"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/config/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,qDAAiD;AAEjD,MAAqB,MAAO,SAAQ,0BAA0B;IAI5D,KAAK,CAAC,GAAG;;QACP,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACpB,IAAI,CAAC,GAAG,CAAC,gBAAgB,UAAU,KAAK,IAAI,CAAC,SAAS,CAAC,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;SACpG;QAED,OAAO,MAAA,IAAI,CAAC,YAAY,0CAAE,MAAM,CAAC;IACnC,CAAC;;AAVe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,mBAAmB,CAAC;kBAF/B,MAAM"}
@@ -55,7 +55,7 @@ Generate.flags = {
55
55
  default: 0,
56
56
  }),
57
57
  jitter: core_1.Flags.integer({
58
- description: 'Inverval variance (ms).',
58
+ description: 'Interval variance (ms).',
59
59
  default: 0,
60
60
  }),
61
61
  objects: core_1.Flags.integer({
@@ -31,7 +31,7 @@ class Join extends base_command_1.BaseCommand {
31
31
  core_1.ux.action.start('Waiting for peer to connect');
32
32
  const done = new async_1.Trigger();
33
33
  const invitation = await (0, util_1.acceptInvitation)({
34
- observable: client.halo.acceptInvitation(invitations_1.InvitationEncoder.decode(encoded)),
34
+ observable: client.halo.join(invitations_1.InvitationEncoder.decode(encoded)),
35
35
  callbacks: {
36
36
  onConnecting: async () => core_1.ux.action.stop(),
37
37
  onReadyForAuth: async () => secret !== null && secret !== void 0 ? secret : core_1.ux.prompt((0, chalk_1.default) `\n{red Secret}`),
@@ -1 +1 @@
1
- {"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/halo/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAE1B,uCAAsC;AAEtC,0DAA6D;AAE7D,qDAAiD;AACjD,qCAA8C;AAE9C,MAAqB,IAAK,SAAQ,0BAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC9B,IAAI,CAAC,KAAK,CAAC,IAAA,eAAK,EAAA,oCAAoC,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACzC;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC9B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,sBAAsB,CAAC,mCAAI,OAAO,CAAC;aAC/D;YAED,SAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,+BAAiB,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC;gBAC5E,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,gBAAgB,CAAC;oBACtE,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAElB,SAAE,CAAC,GAAG,EAAE,CAAC;YACT,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,WAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAErE,OAAO;gBACL,WAAW,EAAE,UAAU,CAAC,WAAW;aACpC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAnDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,gCAAgC,CAAC;AAC/C,UAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}
1
+ {"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/halo/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAE1B,uCAAsC;AAEtC,0DAA6D;AAE7D,qDAAiD;AACjD,qCAA8C;AAE9C,MAAqB,IAAK,SAAQ,0BAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEjD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC9B,IAAI,CAAC,KAAK,CAAC,IAAA,eAAK,EAAA,oCAAoC,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;aACzC;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC9B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,sBAAsB,CAAC,mCAAI,OAAO,CAAC;aAC/D;YAED,SAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,+BAAiB,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC;gBAChE,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,gBAAgB,CAAC;oBACtE,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAElB,SAAE,CAAC,GAAG,EAAE,CAAC;YACT,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,WAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAErE,OAAO;gBACL,WAAW,EAAE,UAAU,CAAC,WAAW;aACpC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAnDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,gCAAgC,CAAC;AAC/C,UAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}
@@ -19,7 +19,7 @@ class Share extends (_b = base_command_1.BaseCommand) {
19
19
  this.log((0, chalk_1.default) `{red Profile not initialized.}`);
20
20
  return {};
21
21
  }
22
- const observable = client.halo.createInvitation({
22
+ const observable = client.halo.share({
23
23
  authMethod: this.flags.noCode ? invitations_1.Invitation.AuthMethod.NONE : invitations_1.Invitation.AuthMethod.SHARED_SECRET,
24
24
  });
25
25
  const invitationSuccess = (0, util_1.hostInvitation)({
@@ -1 +1 @@
1
- {"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/halo/share.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAG1B,0DAAyE;AAEzE,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,KAAM,SAAQ,MAAA,0BAAW,CAAc;IAY1D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,gCAAgC,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;aACX;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;gBAC9C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAU,CAAC,UAAU,CAAC,aAAa;aACjG,CAAC,CAAC;YACH,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;gBACvC,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;wBAClE,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBACxD,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC;oBACxF,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,iBAAiB,CAAC;YACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;;;AApCe,oBAAc,GAAG,IAAI,AAAP,CAAQ;AACtB,iBAAW,GAAG,kCAAkC,AAArC,CAAsC;AAEjD,WAAK,GAAG;IACtB,GAAG,4BAAW;IACd,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EAAE,yDAAyD;QACtE,OAAO,EAAE,KAAK;KACf,CAAC;CACH,AANoB,CAMnB;kBAViB,KAAK"}
1
+ {"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/halo/share.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAG1B,0DAAyE;AAEzE,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,KAAM,SAAQ,MAAA,0BAAW,CAAc;IAY1D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,gCAAgC,CAAC,CAAC;gBAChD,OAAO,EAAE,CAAC;aACX;YAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;gBACnC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,wBAAU,CAAC,UAAU,CAAC,aAAa;aACjG,CAAC,CAAC;YACH,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;gBACvC,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;wBAClE,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBACxD,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC;oBACxF,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,iBAAiB,CAAC;YACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;;;AApCe,oBAAc,GAAG,IAAI,AAAP,CAAQ;AACtB,iBAAW,GAAG,kCAAkC,AAArC,CAAsC;AAEjD,WAAK,GAAG;IACtB,GAAG,4BAAW;IACd,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EAAE,yDAAyD;QACtE,OAAO,EAAE,KAAK;KACf,CAAC;CACH,AANoB,CAMnB;kBAViB,KAAK"}
@@ -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;CAiD1B"}
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"}
@@ -14,7 +14,7 @@ const base_command_1 = require("../../base-command");
14
14
  class Reset extends base_command_1.BaseCommand {
15
15
  async run() {
16
16
  var _a;
17
- const storage = (_a = this.clientConfig) === null || _a === void 0 ? void 0 : _a.get('runtime.client.storage.path');
17
+ const storage = (_a = this.clientConfig) === null || _a === void 0 ? void 0 : _a.get('runtime.client.storage.dataRoot');
18
18
  const profile = this.flags.profile;
19
19
  const paths = [
20
20
  ...new Set([
@@ -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 config 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
+ 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) => daemon.stop(this.flags.profile, { force: this.flags.force }));
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}`));
@@ -42,7 +47,6 @@ class Reset extends base_command_1.BaseCommand {
42
47
  paths.forEach((path) => {
43
48
  fs_1.default.rmSync(path, { recursive: true, force: true });
44
49
  });
45
- await this.maybeStartDaemon();
46
50
  }
47
51
  else {
48
52
  this.log('Files', paths);
@@ -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,2DAAgG;AAEhG,qDAAiD;AAEjD,MAAqB,KAAM,SAAQ,0BAAyB;IAU1D,KAAK,CAAC,GAAG;;QACP,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,YAAY,0CAAE,GAAG,CAAC,6BAA6B,CAAC,CAAC;QACtE,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,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,0EAA0E,OAAO,yBAAyB,IAAA,gCAAc,EAC3H,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,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC1G,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;YAEH,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;SAC/B;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC1B;QAED,OAAO,KAAK,CAAC;IACf,CAAC;;AAzDe,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
+ {"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"}
@@ -13,7 +13,7 @@ const util_1 = require("../../util");
13
13
  class Create extends base_command_1.BaseCommand {
14
14
  async run() {
15
15
  return await this.execWithClient(async (client) => {
16
- const space = await client.createSpace();
16
+ const space = await client.spaces.create();
17
17
  await (0, util_1.waitForSpace)(space, this.flags.timeout, (err) => this.error(err));
18
18
  space.properties.name = this.args.name;
19
19
  const data = {
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAuC;AACvC,kDAA0B;AAI1B,qDAAiD;AACjD,qCAA0C;AAE1C,MAAqB,MAAO,SAAQ,0BAA0B;IAK5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;YACzC,MAAM,IAAA,mBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACvC,MAAM,IAAI,GAAG;gBACX,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;aAC5B,CAAC;YAEF,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,oBAAoB,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;;AAjBe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,eAAe,CAAC;AAC9B,WAAI,GAAG,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;kBAH5B,MAAM"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/space/create.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAuC;AACvC,kDAA0B;AAI1B,qDAAiD;AACjD,qCAA0C;AAE1C,MAAqB,MAAO,SAAQ,0BAA0B;IAK5D,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC3C,MAAM,IAAA,mBAAY,EAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACxE,KAAK,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YACvC,MAAM,IAAI,GAAG;gBACX,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;aAC5B,CAAC;YAEF,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,oBAAoB,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;;AAjBe,qBAAc,GAAG,IAAI,CAAC;AACtB,kBAAW,GAAG,eAAe,CAAC;AAC9B,WAAI,GAAG,EAAE,IAAI,EAAE,WAAI,CAAC,MAAM,EAAE,EAAE,CAAC;kBAH5B,MAAM"}
@@ -1 +1 @@
1
- {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IACtD,OAAgB,KAAK;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAuC1B"}
1
+ {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,WAAW,CAAC,OAAO,IAAI,CAAC;IACxD,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IACtD,OAAgB,KAAK;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAuC1B"}
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
9
9
  const core_1 = require("@oclif/core");
10
10
  const chalk_1 = __importDefault(require("chalk"));
11
11
  const async_1 = require("@dxos/async");
12
- const invitations_1 = require("@dxos/client/invitations");
13
12
  const base_command_1 = require("../../base-command");
14
13
  const util_1 = require("../../util");
15
14
  class Join extends base_command_1.BaseCommand {
@@ -29,7 +28,7 @@ class Join extends base_command_1.BaseCommand {
29
28
  const done = new async_1.Trigger();
30
29
  // TODO(burdon): Error code if joining same space (don't throw!)
31
30
  const invitation = await (0, util_1.acceptInvitation)({
32
- observable: client.acceptInvitation(invitations_1.InvitationEncoder.decode(encoded)),
31
+ observable: client.spaces.join(encoded),
33
32
  callbacks: {
34
33
  onConnecting: async () => core_1.ux.action.stop(),
35
34
  onReadyForAuth: async () => secret !== null && secret !== void 0 ? secret : core_1.ux.prompt((0, chalk_1.default) `\n{red Secret}`),
@@ -41,7 +40,7 @@ class Join extends base_command_1.BaseCommand {
41
40
  await done.wait();
42
41
  // TODO(burdon): Race condition.
43
42
  await (0, async_1.sleep)(1000);
44
- const space = client.getSpace(invitation.spaceKey);
43
+ const space = client.spaces.get(invitation.spaceKey);
45
44
  core_1.ux.log();
46
45
  core_1.ux.log((0, chalk_1.default) `{green Joined}: ${space.key.truncate()}`);
47
46
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAE1B,uCAA6C;AAE7C,0DAA6D;AAE7D,qDAAiD;AACjD,qCAA8C;AAE9C,MAAqB,IAAK,SAAQ,0BAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,qBAAqB,CAAC,CAAC;aACvD;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC9B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,qBAAqB,CAAC,mCAAI,OAAO,CAAC,CAAC,uBAAuB;aACtF;YAED,SAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,gEAAgE;YAChE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC,+BAAiB,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC;gBACvE,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,gBAAgB,CAAC;oBACtE,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,gCAAgC;YAChC,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAS,CAAE,CAAC;YAErD,SAAE,CAAC,GAAG,EAAE,CAAC;YACT,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEvD,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAlDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,uBAAuB,CAAC;AACtC,UAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}
1
+ {"version":3,"file":"join.js","sourceRoot":"","sources":["../../../../src/commands/space/join.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAwC;AACxC,kDAA0B;AAE1B,uCAA6C;AAG7C,qDAAiD;AACjD,qCAA8C;AAE9C,MAAqB,IAAK,SAAQ,0BAAwB;IAaxD,KAAK,CAAC,GAAG;QACP,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;;YACxD,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO,GAAG,MAAM,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,qBAAqB,CAAC,CAAC;aACvD;YACD,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC9B,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,OAAO,GAAG,MAAA,YAAY,CAAC,GAAG,CAAC,qBAAqB,CAAC,mCAAI,OAAO,CAAC,CAAC,uBAAuB;aACtF;YAED,SAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,IAAI,GAAG,IAAI,eAAO,EAAE,CAAC;YAC3B,gEAAgE;YAChE,MAAM,UAAU,GAAG,MAAM,IAAA,uBAAgB,EAAC;gBACxC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAQ,CAAC;gBACxC,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE;oBAC1C,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAE,CAAC,MAAM,CAAC,IAAA,eAAK,EAAA,gBAAgB,CAAC;oBACtE,SAAS,EAAE,KAAK,IAAI,EAAE;wBACpB,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,gCAAgC;YAChC,MAAM,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC;YAClB,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,QAAS,CAAE,CAAC;YAEvD,SAAE,CAAC,GAAG,EAAE,CAAC;YACT,SAAE,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAEvD,OAAO;gBACL,GAAG,EAAE,KAAK,CAAC,GAAG;aACf,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;;AAlDe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,uBAAuB,CAAC;AACtC,UAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,UAAU,EAAE,YAAK,CAAC,MAAM,CAAC;QACvB,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,WAAW,EAAE,mBAAmB;KACjC,CAAC;CACH,CAAC;kBAXiB,IAAI"}
@@ -20,7 +20,7 @@ class Share extends base_command_1.BaseCommand {
20
20
  // TODO(burdon): Timeout error not propagated.
21
21
  const type = this.flags.multiple ? services_1.Invitation.Type.MULTIUSE : undefined;
22
22
  const authMethod = this.flags['no-auth'] ? services_1.Invitation.AuthMethod.NONE : undefined;
23
- const observable = space.createInvitation({ type, authMethod, timeout: this.flags.timeout });
23
+ const observable = space.share({ type, authMethod, timeout: this.flags.timeout });
24
24
  const invitationSuccess = (0, util_1.hostInvitation)({
25
25
  observable,
26
26
  callbacks: {
@@ -1 +1 @@
1
- {"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAA8C;AAC9C,kDAA0B;AAG1B,0DAA6D;AAC7D,yEAAwE;AAExE,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,KAAM,SAAQ,0BAAyB;IAiB1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAE/C,8CAA8C;YAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAClF,MAAM,UAAU,GAAG,KAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9F,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;gBACvC,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;wBAClE,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBACxD,IAAI,UAAU,KAAK,qBAAU,CAAC,UAAU,CAAC,IAAI,EAAE;4BAC7C,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC;yBACjE;6BAAM;4BACL,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;yBACd;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,qCAAqC;YACrC,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,iBAAiB,CAAC;YACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;;AA7Ce,iBAAW,GAAG,0BAA0B,CAAC;AACzC,UAAI,GAAG,EAAE,GAAG,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC;AACvE,WAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,eAAe;KAC7B,CAAC;IACF,SAAS,EAAE,YAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,gCAAgC;KAC9C,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,0BAA0B;QACvC,OAAO,EAAE,IAAK;KACf,CAAC;CACH,CAAC;kBAfiB,KAAK"}
1
+ {"version":3,"file":"share.js","sourceRoot":"","sources":["../../../../src/commands/space/share.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAA8C;AAC9C,kDAA0B;AAG1B,0DAA6D;AAC7D,yEAAwE;AAExE,qDAAiD;AACjD,qCAA4C;AAE5C,MAAqB,KAAM,SAAQ,0BAAyB;IAiB1D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAc,EAAE,EAAE;YACxD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAE/C,8CAA8C;YAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,qBAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAClF,MAAM,UAAU,GAAG,KAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACnF,MAAM,iBAAiB,GAAG,IAAA,qBAAc,EAAC;gBACvC,UAAU;gBACV,SAAS,EAAE;oBACT,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,MAAM,cAAc,GAAG,+BAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;wBAClE,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,wBAAwB,cAAc,EAAE,CAAC,CAAC;wBACxD,IAAI,UAAU,KAAK,qBAAU,CAAC,UAAU,CAAC,IAAI,EAAE;4BAC7C,IAAI,CAAC,GAAG,CAAC,IAAA,eAAK,EAAA,mBAAmB,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,IAAI,CAAC,CAAC;yBACjE;6BAAM;4BACL,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;yBACd;oBACH,CAAC;iBACF;aACF,CAAC,CAAC;YAEH,qCAAqC;YACrC,SAAE,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YAC/C,MAAM,iBAAiB,CAAC;YACxB,SAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;;AA7Ce,iBAAW,GAAG,0BAA0B,CAAC;AACzC,UAAI,GAAG,EAAE,GAAG,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC,EAAE,CAAC;AACvE,WAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,QAAQ,EAAE,YAAK,CAAC,OAAO,CAAC;QACtB,WAAW,EAAE,eAAe;KAC7B,CAAC;IACF,SAAS,EAAE,YAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,gCAAgC;KAC9C,CAAC;IACF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,0BAA0B;QACvC,OAAO,EAAE,IAAK;KACf,CAAC;CACH,CAAC;kBAfiB,KAAK"}
@@ -8,9 +8,9 @@ const core_1 = require("@oclif/core");
8
8
  const async_1 = require("@dxos/async");
9
9
  const echo_1 = require("@dxos/client/echo");
10
10
  const debug_1 = require("@dxos/debug");
11
+ const types_1 = require("./types");
11
12
  const errors_1 = require("../errors");
12
13
  const timeouts_1 = require("../timeouts");
13
- const types_1 = require("./types");
14
14
  const selectSpace = async (spaces) => {
15
15
  // eslint-disable-next-line no-eval
16
16
  const inquirer = (await eval('import("inquirer")')).default;
@@ -1 +1 @@
1
- {"version":3,"file":"spaces.js","sourceRoot":"","sources":["../../../src/util/spaces.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AAEF,sCAAiC;AAGjC,uCAA2C;AAC3C,4CAAuD;AACvD,uCAA0C;AAE1C,sCAAkD;AAClD,0CAAiD;AACjD,mCAA2C;AAEpC,MAAM,WAAW,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;IACnD,mCAAmC;IACnC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,OAAO,CAAC;IAC5D,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;QACpC;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;gBAAC,OAAA,CAAC;oBAC9B,IAAI,EAAE,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,GAAG,CAAC,KAAK,MAAA,KAAK,CAAC,UAAU,CAAC,IAAI,mCAAI,EAAE,EAAE;oBAClE,KAAK,EAAE,KAAK,CAAC,GAAG;iBACjB,CAAC,CAAA;aAAA,CAAC;SACJ;KACF,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB;AAEK,MAAM,YAAY,GAAG,KAAK,EAC/B,KAAY,EACZ,OAAO,GAAG,6BAAkB,EAC5B,gBAAuC,EACvC,EAAE;IACF,IAAI;QACF,MAAM,IAAA,oBAAY,EAAC,KAAK,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,8BAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;KACzF;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,gBAAgB,EAAE;YACpB,gBAAgB,CAAC,GAAG,CAAC,CAAC;SACvB;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;AACH,CAAC,CAAC;AAdW,QAAA,YAAY,gBAcvB;AAOK,MAAM,SAAS,GAAG,CAAC,MAAe,EAAE,UAA4B,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE;IAChH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;;QAC1B,4BAA4B;QAC5B,oEAAoE;QACpE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,mCAAI,EAAE,CAAC;QAC1D,MAAM,OAAO,GAAG,IAAI,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAElE,kGAAkG;QAClG,uDAAuD;QACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC9C,MAAM,kBAAkB,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,0CAAE,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,aAAa,EAAE,mCAAI,CAAC,CAAC;QACpG,MAAM,KAAK,GAAG,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,0CAAE,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC;QAC/D,yEAAyE;QACzE,MAAM,oBAAoB,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,oBAAoB,0CAAE,aAAa,EAAE,mCAAI,CAAC,CAAC;QAClF,MAAM,kBAAkB,GAAG,MAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,mBAAmB,0CAAE,aAAa,EAAE,mCAAI,CAAC,CAAC;QAE/E,OAAO;YACL,GAAG,EAAE,IAAA,wBAAgB,EAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,YAAY,CAAC;YACtD,IAAI,EAAE,KAAK,CAAC,MAAM;YAClB,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;YAC3B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM;YACnC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM;YACxC,OAAO;YACP,KAAK;YACL,gBAAgB;YAEhB,kBAAkB;YAClB,oBAAoB;YACpB,kBAAkB;YAElB,0BAA0B;YAC1B,QAAQ,EAAE,CACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,GAAG,CAAC,kBAAkB,GAAG,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9G,GAAG,CACJ,CAAC,OAAO,CAAC,CAAC,CAAC;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AArCW,QAAA,SAAS,aAqCpB;AAEK,MAAM,WAAW,GAAG,CAAC,MAAe,EAAE,QAAgD,EAAE,EAAE,EAAE;IACjG,SAAE,CAAC,KAAK,CACN,IAAA,iBAAS,EAAC,MAAM,EAAE,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EACnD;QACE,GAAG,EAAE;YACH,MAAM,EAAE,KAAK;SACd;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM;YACd,QAAQ,EAAE,CAAC;SACZ;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM;SACf;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;QACD,KAAK,EAAE;YACL,MAAM,EAAE,OAAO;SAChB;QACD,kBAAkB;QAClB,6BAA6B;QAC7B,KAAK;QAEL,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAI;SACf;QACD,kBAAkB,EAAE;YAClB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAI;SACf;QACD,oBAAoB,EAAE;YACpB,MAAM,EAAE,WAAW;YACnB,QAAQ,EAAE,IAAI;SACf;QACD,kBAAkB,EAAE;YAClB,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,IAAI;SACf;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,IAAI;YACd,gFAAgF;YAChF,wBAAwB;YACxB,6CAA6C;YAC7C,wDAAwD;YACxD,yBAAyB;YACzB,sCAAsC;YACtC,4BAA4B;YAC5B,SAAS;YACT,QAAQ;YACR,0BAA0B;YAC1B,KAAK;SACN;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AA/DW,QAAA,WAAW,eA+DtB;AAEF,EAAE;AACF,UAAU;AACV,EAAE;AAEF,mCAAmC;AAC5B,MAAM,UAAU,GAAG,CAAC,OAAsB,EAAE,YAAY,GAAG,KAAK,EAAE,EAAE;IACzE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;;QAAC,OAAA,CAAC;YAC9B,GAAG,EAAE,IAAA,wBAAgB,EAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,YAAY,CAAC;YAChE,IAAI,EAAE,MAAA,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAAE,WAAW;YAC1C,QAAQ,EAAE,MAAM,CAAC,QAAQ,KAAK,kBAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;SACtF,CAAC,CAAA;KAAA,CAAC,CAAC;AACN,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,CAAC,OAAsB,EAAE,KAAK,GAAG,EAAE,EAAE,EAAE;IACjE,SAAE,CAAC,KAAK,CACN,IAAA,kBAAU,EAAC,OAAO,EAAE,IAAI,CAAC,EACzB;QACE,GAAG,EAAE;YACH,MAAM,EAAE,cAAc;SACvB;QACD,IAAI,EAAE;YACJ,MAAM,EAAE,cAAc;SACvB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,UAAU;SACnB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,YAAY,gBAkBvB"}
1
+ {"version":3,"file":"spaces.js","sourceRoot":"","sources":["../../../src/util/spaces.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "DX_ENVIRONMENT": "staging",
3
- "DX_RELEASE": "@dxos/cli@0.1.58-next.3349da8",
3
+ "DX_RELEASE": "@dxos/cli@0.1.58-next.ffb4cc4",
4
4
  "SENTRY_DESTINATION": "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
5
5
  "TELEMETRY_API_KEY": "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
6
6
  "IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "0.1.58-next.3349da8",
2
+ "version": "0.1.58-next.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",
@@ -1060,7 +1054,7 @@
1060
1054
  "jitter": {
1061
1055
  "name": "jitter",
1062
1056
  "type": "option",
1063
- "description": "Inverval variance (ms).",
1057
+ "description": "Interval variance (ms).",
1064
1058
  "multiple": false,
1065
1059
  "default": 0
1066
1060
  },
@@ -3495,7 +3489,7 @@
3495
3489
  "type": "option",
3496
3490
  "description": "Tunnel name",
3497
3491
  "multiple": false,
3498
- "default": "whiskey-sad-dakota-fillet"
3492
+ "default": "autumn-michigan-seventeen-tango"
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-next.3349da8",
3
+ "version": "0.1.58-next.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-next.3349da8",
51
- "@dxos/async": "0.1.58-next.3349da8",
52
- "@dxos/bare-template": "0.1.58-next.3349da8",
53
- "@dxos/client": "0.1.58-next.3349da8",
54
- "@dxos/client-protocol": "0.1.58-next.3349da8",
55
- "@dxos/config": "0.1.58-next.3349da8",
56
- "@dxos/context": "0.1.58-next.3349da8",
57
- "@dxos/debug": "0.1.58-next.3349da8",
58
- "@dxos/functions": "0.1.58-next.3349da8",
59
- "@dxos/hello-template": "0.1.58-next.3349da8",
60
- "@dxos/invariant": "0.1.58-next.3349da8",
61
- "@dxos/log": "0.1.58-next.3349da8",
62
- "@dxos/plate": "0.1.58-next.3349da8",
63
- "@dxos/protocols": "0.1.58-next.3349da8",
64
- "@dxos/rpc": "0.1.58-next.3349da8",
65
- "@dxos/sentry": "0.1.58-next.3349da8",
66
- "@dxos/telemetry": "0.1.58-next.3349da8",
67
- "@dxos/util": "0.1.58-next.3349da8"
50
+ "@dxos/agent": "0.1.58-next.ffb4cc4",
51
+ "@dxos/async": "0.1.58-next.ffb4cc4",
52
+ "@dxos/bare-template": "0.1.58-next.ffb4cc4",
53
+ "@dxos/client": "0.1.58-next.ffb4cc4",
54
+ "@dxos/client-protocol": "0.1.58-next.ffb4cc4",
55
+ "@dxos/config": "0.1.58-next.ffb4cc4",
56
+ "@dxos/context": "0.1.58-next.ffb4cc4",
57
+ "@dxos/debug": "0.1.58-next.ffb4cc4",
58
+ "@dxos/functions": "0.1.58-next.ffb4cc4",
59
+ "@dxos/hello-template": "0.1.58-next.ffb4cc4",
60
+ "@dxos/invariant": "0.1.58-next.ffb4cc4",
61
+ "@dxos/log": "0.1.58-next.ffb4cc4",
62
+ "@dxos/plate": "0.1.58-next.ffb4cc4",
63
+ "@dxos/process": "0.1.58-next.ffb4cc4",
64
+ "@dxos/protocols": "0.1.58-next.ffb4cc4",
65
+ "@dxos/rpc": "0.1.58-next.ffb4cc4",
66
+ "@dxos/sentry": "0.1.58-next.ffb4cc4",
67
+ "@dxos/telemetry": "0.1.58-next.ffb4cc4",
68
+ "@dxos/util": "0.1.58-next.ffb4cc4"
68
69
  },
69
70
  "devDependencies": {
70
71
  "@oclif/test": "^2.3.31",
@@ -1,7 +0,0 @@
1
- export type ExecOptions = {
2
- verbose: boolean;
3
- cwd: string;
4
- shell: boolean;
5
- };
6
- export declare const exec: (command: string, options?: Partial<ExecOptions>) => Promise<string>;
7
- //# sourceMappingURL=exec.d.ts.map
@@ -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"}
@@ -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"}