@dxos/cli 0.1.53 → 0.1.54-next.b67d4c9

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 (121) hide show
  1. package/README.md +96 -133
  2. package/dist/src/base-command.d.ts +3 -1
  3. package/dist/src/base-command.d.ts.map +1 -1
  4. package/dist/src/base-command.js +24 -14
  5. package/dist/src/base-command.js.map +1 -1
  6. package/dist/src/commands/agent/agent.test.d.ts +2 -0
  7. package/dist/src/commands/agent/agent.test.d.ts.map +1 -0
  8. package/dist/src/commands/agent/agent.test.js +186 -0
  9. package/dist/src/commands/agent/agent.test.js.map +1 -0
  10. package/dist/src/commands/agent/list.d.ts.map +1 -1
  11. package/dist/src/commands/agent/list.js +22 -1
  12. package/dist/src/commands/agent/list.js.map +1 -1
  13. package/dist/src/commands/agent/restart.d.ts +10 -0
  14. package/dist/src/commands/agent/restart.d.ts.map +1 -1
  15. package/dist/src/commands/agent/restart.js +9 -2
  16. package/dist/src/commands/agent/restart.js.map +1 -1
  17. package/dist/src/commands/agent/start.d.ts +1 -0
  18. package/dist/src/commands/agent/start.d.ts.map +1 -1
  19. package/dist/src/commands/agent/start.js +29 -27
  20. package/dist/src/commands/agent/start.js.map +1 -1
  21. package/dist/src/commands/agent/stop.d.ts +2 -0
  22. package/dist/src/commands/agent/stop.d.ts.map +1 -1
  23. package/dist/src/commands/agent/stop.js +17 -7
  24. package/dist/src/commands/agent/stop.js.map +1 -1
  25. package/dist/src/commands/app/create.d.ts +1 -0
  26. package/dist/src/commands/app/create.d.ts.map +1 -1
  27. package/dist/src/commands/app/open.d.ts +1 -0
  28. package/dist/src/commands/app/open.d.ts.map +1 -1
  29. package/dist/src/commands/app/open.js +6 -6
  30. package/dist/src/commands/app/open.js.map +1 -1
  31. package/dist/src/commands/app/publish.d.ts +1 -0
  32. package/dist/src/commands/app/publish.d.ts.map +1 -1
  33. package/dist/src/commands/config/index.d.ts.map +1 -1
  34. package/dist/src/commands/config/index.js +3 -1
  35. package/dist/src/commands/config/index.js.map +1 -1
  36. package/dist/src/commands/debug/stats.d.ts +1 -0
  37. package/dist/src/commands/debug/stats.d.ts.map +1 -1
  38. package/dist/src/commands/debug/stats.js +21 -16
  39. package/dist/src/commands/debug/stats.js.map +1 -1
  40. package/dist/src/commands/function/dev-server.d.ts +2 -1
  41. package/dist/src/commands/function/dev-server.d.ts.map +1 -1
  42. package/dist/src/commands/function/dev-server.js +3 -3
  43. package/dist/src/commands/function/dev-server.js.map +1 -1
  44. package/dist/src/commands/halo/credential/list.d.ts +1 -0
  45. package/dist/src/commands/halo/credential/list.d.ts.map +1 -1
  46. package/dist/src/commands/halo/join.d.ts +1 -0
  47. package/dist/src/commands/halo/join.d.ts.map +1 -1
  48. package/dist/src/commands/halo/join.js +2 -2
  49. package/dist/src/commands/halo/join.js.map +1 -1
  50. package/dist/src/commands/halo/share.d.ts +1 -0
  51. package/dist/src/commands/halo/share.d.ts.map +1 -1
  52. package/dist/src/commands/halo/share.js +4 -4
  53. package/dist/src/commands/halo/share.js.map +1 -1
  54. package/dist/src/commands/kube/deploy.d.ts +1 -0
  55. package/dist/src/commands/kube/deploy.d.ts.map +1 -1
  56. package/dist/src/commands/reset/index.d.ts +1 -0
  57. package/dist/src/commands/reset/index.d.ts.map +1 -1
  58. package/dist/src/commands/reset/index.js +1 -1
  59. package/dist/src/commands/reset/index.js.map +1 -1
  60. package/dist/src/commands/space/create.d.ts.map +1 -1
  61. package/dist/src/commands/space/create.js +1 -29
  62. package/dist/src/commands/space/create.js.map +1 -1
  63. package/dist/src/commands/space/epoch.d.ts +1 -0
  64. package/dist/src/commands/space/epoch.d.ts.map +1 -1
  65. package/dist/src/commands/space/invite.d.ts.map +1 -1
  66. package/dist/src/commands/space/invite.js +2 -2
  67. package/dist/src/commands/space/invite.js.map +1 -1
  68. package/dist/src/commands/space/join.d.ts +1 -0
  69. package/dist/src/commands/space/join.d.ts.map +1 -1
  70. package/dist/src/commands/space/join.js +2 -2
  71. package/dist/src/commands/space/join.js.map +1 -1
  72. package/dist/src/commands/space/list.d.ts +1 -0
  73. package/dist/src/commands/space/list.d.ts.map +1 -1
  74. package/dist/src/commands/space/members.d.ts +1 -0
  75. package/dist/src/commands/space/members.d.ts.map +1 -1
  76. package/dist/src/commands/tunnel/set.d.ts +1 -0
  77. package/dist/src/commands/tunnel/set.d.ts.map +1 -1
  78. package/dist/src/help.d.ts +6 -0
  79. package/dist/src/help.d.ts.map +1 -0
  80. package/dist/src/help.js +31 -0
  81. package/dist/src/help.js.map +1 -0
  82. package/dist/src/hooks/command-not-found.d.ts +4 -0
  83. package/dist/src/hooks/command-not-found.d.ts.map +1 -0
  84. package/dist/src/hooks/command-not-found.js +14 -0
  85. package/dist/src/hooks/command-not-found.js.map +1 -0
  86. package/dist/src/util/invitation.d.ts +1 -1
  87. package/dist/src/util/invitation.d.ts.map +1 -1
  88. package/dist/src/util/invitation.js +7 -7
  89. package/dist/src/util/invitation.js.map +1 -1
  90. package/dist/src/util/print.d.ts +3 -4
  91. package/dist/src/util/print.d.ts.map +1 -1
  92. package/dist/src/util/print.js +2 -2
  93. package/dist/src/util/print.js.map +1 -1
  94. package/dist/src/util/publish/publisher-rpc-peer.d.ts.map +1 -1
  95. package/dist/src/util/publish/publisher-rpc-peer.js +4 -5
  96. package/dist/src/util/publish/publisher-rpc-peer.js.map +1 -1
  97. package/dist/src/util/supervisor/supervisor-rpc-peer.d.ts.map +1 -1
  98. package/dist/src/util/supervisor/supervisor-rpc-peer.js +4 -5
  99. package/dist/src/util/supervisor/supervisor-rpc-peer.js.map +1 -1
  100. package/dist/src/util/telemetry.d.ts.map +1 -1
  101. package/dist/src/util/telemetry.js.map +1 -1
  102. package/dist/src/util/telemetryrc.json +2 -2
  103. package/dist/src/util/test-util.d.ts +1 -0
  104. package/dist/src/util/test-util.d.ts.map +1 -1
  105. package/dist/src/util/test-util.js +14 -5
  106. package/dist/src/util/test-util.js.map +1 -1
  107. package/dist/src/util/tunnel/tunnel-rpc-peer.d.ts.map +1 -1
  108. package/dist/src/util/tunnel/tunnel-rpc-peer.js +4 -5
  109. package/dist/src/util/tunnel/tunnel-rpc-peer.js.map +1 -1
  110. package/dist/src/util/util.d.ts +1 -1
  111. package/dist/src/util/util.d.ts.map +1 -1
  112. package/oclif.manifest.json +36 -199
  113. package/package.json +31 -32
  114. package/dist/src/commands/debug/echo-test-data.d.ts +0 -19
  115. package/dist/src/commands/debug/echo-test-data.d.ts.map +0 -1
  116. package/dist/src/commands/debug/echo-test-data.js +0 -63
  117. package/dist/src/commands/debug/echo-test-data.js.map +0 -1
  118. package/dist/src/commands/device/invite.d.ts +0 -6
  119. package/dist/src/commands/device/invite.d.ts.map +0 -1
  120. package/dist/src/commands/device/invite.js +0 -36
  121. package/dist/src/commands/device/invite.js.map +0 -1
@@ -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
- * Ref: https://github.com/salesforcecli/sf-plugins-core/blob/main/src/sfCommand.ts
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: 143, 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) });
96
+ (0, log_1.log)('ok', {}, { file: "packages/devtools/cli/src/base-command.ts", line: 159, 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)(client_1.DX_DATA);
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: 173, 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
+ (0, log_1.log)((0, chalk_1.default) `✨ {bgMagenta Running as internal user} ✨\n`, {}, { file: "packages/devtools/cli/src/base-command.ts", line: 189, 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)(client_1.DX_DATA);
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)(client_1.DX_DATA));
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'))), 'config/config-default.yml');
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 : client_1.DX_DATA, this.flags.profile);
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
- Sentry.captureException(err);
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, client_1.fromAgent)({ profile: this.flags.profile }) });
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: 323, 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) });
246
+ (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 341, 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(`${client_1.DX_RUNTIME}`);
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();
@@ -337,6 +342,11 @@ class BaseCommand extends core_1.Command {
337
342
  }
338
343
  BaseCommand.enableJsonFlag = true;
339
344
  BaseCommand.flags = {
345
+ // Even though oclif should support this out of the box there seems to be a bug.
346
+ json: core_1.Flags.boolean({
347
+ description: 'Output as JSON.',
348
+ default: false,
349
+ }),
340
350
  'dry-run': core_1.Flags.boolean({
341
351
  description: 'Dry run.',
342
352
  default: false,
@@ -1 +1 @@
1
- {"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAgF;AAChF,kDAA0B;AAC1B,sDAA2B;AAC3B,4DAA+B;AAC/B,8DAAiC;AACjC,sDAAyB;AACzB,+CAAoE;AACpE,yCAA0C;AAC1C,oDAA2B;AAE3B,uCAAoD;AACpD,yCAA8E;AAC9E,2DAAyG;AAEzG,uCAAoC;AACpC,mCAAgC;AAChC,qDAAuC;AACvC,yCAAgD;AAChD,2DAA6C;AAE7C,iCAWgB;AAEhB,gCAAgC;AAChC,MAAM,MAAM,GAAG,KAAK,EAAE,GAAG,IAAc,EAAoB,EAAE;IAC3D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,eAAI,EAAC,IAAA,gBAAI,EAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,CAAC,MAAM,CAAC;KACjB;IAAC,OAAO,GAAQ,EAAE;QACjB,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC9B,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,GAAG,CAAC;SACX;KACF;AACH,CAAC,CAAC;AAKF;;;;GAIG;AACH,MAAsB,WAA4C,SAAQ,cAAO;IAyD/E,YAAY,IAAc,EAAE,MAAmB;QAC7C,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QARd,aAAQ,GAAG,KAAK,CAAC;QAUvB,IAAI;YACF,IAAI,CAAC,MAAM,GAAG,iBAAE,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;SAC1C;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;SACzB;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,YAAY;QACd,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC,aAAc,CAAC;IAC7B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC;IAED,IAAI;QACF,IAAA,SAAG,EAAC,IAAI,iTAAC,CAAC;IACZ,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,IAAI;QACjB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAE5B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YACvC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK;YACtB,SAAS,EAAG,KAAK,CAAC,IAA2B,CAAC,SAAS;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI;YACpB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,KAAiB,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAe,CAAC;QAE5B,yBAAyB;QACzB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAA,0BAAmB,EAAC,gBAAO,CAAC,CAAC;QAC5D,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAErF;YACE,IAAI,KAAK,KAAK,MAAM,EAAE;gBACpB,IAAA,SAAG,EAAC,IAAA,eAAK,EAAA,4CAA4C,iTAAC,CAAC;aACxD;YAED,MAAM,IAAA,0BAAmB,EAAC,gBAAO,CAAC,CAAC;SACpC;QAED,IAAI,yBAAkB,IAAI,IAAI,KAAK,UAAU,EAAE;YAC7C,MAAM,CAAC,IAAI,CAAC;gBACV,cAAc;gBACd,WAAW,EAAE,yBAAkB;gBAC/B,WAAW;gBACX,OAAO;gBACP,oCAAoC;gBACpC,UAAU,EAAE,GAAG;gBACf,cAAc,EAAE,IAAI,KAAK,MAAM;gBAC/B,UAAU,EAAE;oBACV,KAAK;iBACN;aACF,CAAC,CAAC;SACJ;QAED,IAAI,wBAAiB,EAAE;YACrB,IAAI,KAAK,UAAU,IAAI,CAAC,MAAM,IAAA,uBAAgB,EAAC,gBAAO,CAAC,CAAC,CAAC;YAEzD,SAAS,CAAC,IAAI,CAAC;gBACb,MAAM,EAAE,wBAAiB;gBACzB,SAAS,EAAE,EAAE;gBACb,MAAM,EAAE,OAAO,CAAC,wBAAiB,CAAC,IAAI,IAAI,KAAK,UAAU;aAC1D,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAEjD,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAK,EAAC,kCAAkC,qBAAc,EAAE,CAAC,CAAC;YAC5E,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;YAC9B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;YAC5D,IAAI,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;SAC5E;QAAC,OAAO,GAAG,EAAE;YACZ,IAAA,yBAAgB,EAAC,GAAG,CAAC,CAAC;SACvB;IACH,CAAC;IAEO,KAAK,CAAC,WAAW;;;QACvB,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1C,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,iBAAiB,GAAG,IAAA,gBAAI,EAC5B,IAAA,mBAAO,EAAC,MAAA,gBAAK,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,mCAAI,IAAA,aAAK,EAAC,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAC1F,2BAA2B,CAC5B,CAAC;YAEF,MAAM,UAAU,GAAG,iBAAI,CAAC,IAAI,CAAC,MAAM,IAAA,mBAAQ,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAgB,CAAC;YACxF;gBACE,+BAA+B;gBAC/B,MAAA,UAAU,CAAC,OAAO,oCAAlB,UAAU,CAAC,OAAO,GAAK,EAAE,EAAC;gBAC1B,YAAA,UAAU,CAAC,OAAO,EAAC,MAAM,uCAAN,MAAM,GAAK,EAAE,EAAC;gBACjC,YAAA,UAAU,CAAC,OAAO,CAAC,MAAM,EAAC,OAAO,uCAAP,OAAO,GAAK,EAAE,EAAC;gBACzC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,IAAA,gBAAI,EAC3C,MAAA,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,mCAAI,gBAAO,EACjD,IAAI,CAAC,KAAK,CAAC,OAAO,CACnB,CAAC;aACH;YAED,MAAM,IAAA,gBAAK,EAAC,IAAA,mBAAO,EAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,iBAAI,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;SAC7D;QAED,IAAI,CAAC,aAAa,GAAG,IAAI,eAAM,CAAC,iBAAI,CAAC,IAAI,CAAC,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE,OAAO,CAAC,CAAgB,CAAC,CAAC;IACjG,CAAC;IAED,qDAAqD;IAErD;;;OAGG;IACM,GAAG,CAAC,OAAe,EAAE,GAAG,IAAW;QAC1C,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACM,IAAI,CAAC,GAAmB;QAC/B,MAAM,OAAO,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;QAC5D,KAAK,CAAC,WAAW,CAAC,IAAA,eAAK,EAAA,kBAAkB,OAAO,EAAE,CAAC,CAAC;QACpD,6CAA6C;QAC7C,mBAAmB;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;IASQ,KAAK,CAAC,GAAmB,EAAE,OAAa;QAC/C,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAc,CAAC,CAAC;QACjC,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;IAED;;OAEG;IACM,KAAK,CAAC,OAAO;;QACpB,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAE3B,SAAS,CAAC,KAAK,CAAC;YACd,cAAc,EAAE,MAAA,IAAI,CAAC,iBAAiB,0CAAE,cAAc;YACtD,IAAI,EAAE,iBAAiB;YACvB,UAAU,EAAE;gBACV,GAAG,IAAI,CAAC,iBAAiB;gBACzB,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;gBAC7C,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;aACxD;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACzC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3D,IAAI,CAAC,OAAO,EAAE;oBACZ,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;oBACnD,MAAM,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBACxC;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3B,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;gBAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,eAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;aAC3D;iBAAM;gBACL,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC9B,IAAI,CAAC,OAAO,GAAG,IAAI,eAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,EAAE,IAAA,kBAAS,EAAC,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;aACjH;YAED,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YAChC,IAAA,SAAG,EAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,6SAAC,CAAC;SAC5D;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAClB,QAAoD,EACpD,SAAS,GAAG,KAAK;QAEjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACtC,IAAI,SAAS,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE;YAC5C,IAAI,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,cAAc,CAAI,QAAoD;QAC1E,MAAM,MAAM,GAAG,IAAI,qBAAa,CAAC,GAAG,mBAAU,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,iBAAiB,CAAI,QAA2D;QACpF,IAAI,GAAiC,CAAC;QACtC,IAAI;YACF,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YAC/E,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;YACnB,GAAG,GAAG,IAAI,uBAAgB,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClH,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC5B;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACjB;gBAAS;YACR,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;aACnB;SACF;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAI,QAAwD;QACjF,IAAI,GAA8B,CAAC;QACnC,IAAI;YACF,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YAC/E,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;YACnB,GAAG,GAAG,IAAI,oBAAa,CAAC,UAAU,CAAC,CAAC;YACpC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClH,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC5B;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACjB;gBAAS;YACR,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;aACnB;SACF;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAI,QAA4D;QACtF,IAAI,GAAkC,CAAC;QACvC,IAAI;YACF,IAAA,qBAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;YAChF,IAAA,qBAAM,EAAC,UAAU,CAAC,CAAC;YACnB,GAAG,GAAG,IAAI,wBAAiB,CAAC,UAAU,CAAC,CAAC;YACxC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAClH,OAAO,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;SAC5B;QAAC,OAAO,GAAQ,EAAE;YACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACjB;gBAAS;YACR,IAAI,GAAG,EAAE;gBACP,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;aACnB;SACF;IACH,CAAC;IAED,qBAAqB,CAAC,MAAc;QAClC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,OAAO;SACR;QAED,IAAI,CAAC,iBAAiB,GAAG;YACvB,GAAG,IAAI,CAAC,iBAAiB;YACzB,GAAG,MAAM;SACV,CAAC;IACJ,CAAC;;AA3WsB,0BAAc,GAAG,IAAI,AAAP,CAAQ;AAE7B,iBAAK,GAAG;IACtB,SAAS,EAAE,YAAK,CAAC,OAAO,CAAC;QACvB,WAAW,EAAE,UAAU;QACvB,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,gBAAgB;QAC7B,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,OAAO,EAAE,YAAK,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,eAAe;QAC5B,OAAO,EAAE,wCAAsB;QAC/B,GAAG,EAAE,gCAAc;KACpB,CAAC;IAEF,MAAM,EAAE,YAAK,CAAC,MAAM,CAAC;QACnB,GAAG,EAAE,+BAAa;QAClB,WAAW,EAAE,cAAc;QAC3B,SAAS,EAAE,MAAM;QACjB,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,EAAkB;;YACrC,MAAM,OAAO,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,mCAAI,wCAAsB,CAAC;YACzD,OAAO,IAAA,gBAAI,EAAC,2BAAS,EAAE,WAAW,OAAO,MAAM,CAAC,CAAC;QACnD,CAAC;QACD,SAAS,EAAE,CAAC,SAAS,CAAC;QACtB,OAAO,EAAE,CAAC,GAAG,CAAC;KACf,CAAC;IAEF,+CAA+C;IAC/C,UAAU,EAAE,YAAK,CAAC,OAAO,CAAC;QACxB,WAAW,EAAE,mBAAmB;QAChC,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,OAAO,EAAE,YAAK,CAAC,OAAO,CAAC;QACrB,WAAW,EAAE,qBAAqB;QAClC,OAAO,EAAE,EAAE;QACX,OAAO,EAAE,CAAC,GAAG,CAAC;KACf,CAAC;CACH,AAzCoB,CAyCnB;AA5CkB,kCAAW"}
1
+ {"version":3,"file":"base-command.js","sourceRoot":"","sources":["../../src/base-command.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=agent.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"agent.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/agent.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,186 @@
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
+ beforeEach(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
+ afterEach(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
+ })
99
+ .timeout(120000)
100
+ .tag('flaky');
101
+ (0, test_1.test)('stop command', async () => {
102
+ const profile1 = 'test-profile-1';
103
+ const profile2 = 'test-profile-2';
104
+ await (0, util_1.runCommand)(`agent start --profile=${profile1} --config=${HOST_CONFIG_PATH}`, __dirname);
105
+ await (0, util_1.runCommand)(`create halo FIRST --profile=${profile1} --config=${HOST_CONFIG_PATH}`, __dirname);
106
+ await (0, util_1.runCommand)(`agent start --profile=${profile2} --config=${HOST_CONFIG_PATH}`, __dirname);
107
+ await (0, util_1.runCommand)(`create halo SECOND --profile=${profile2} --config=${HOST_CONFIG_PATH}`, __dirname);
108
+ await (0, util_1.runCommand)('agent stop --all --force', __dirname);
109
+ const listAfterStop = await (0, util_1.runCommand)('agent list --json', __dirname);
110
+ (0, chai_1.expect)(JSON.parse(listAfterStop)).to.equal([]);
111
+ }).tag('flaky');
112
+ });
113
+ const performHaloCLIInvitation = async ({ host, guest }) => {
114
+ const invitation = new async_1.Trigger();
115
+ const secret = new async_1.Trigger();
116
+ const hostClosed = new async_1.Trigger();
117
+ const hostProcess = (0, node_child_process_1.spawn)(util_1.BIN_PATH, ['halo', 'share', `--profile=${host.profile}`, `--config=${host.config}`], {
118
+ shell: true,
119
+ cwd: __dirname,
120
+ });
121
+ {
122
+ const handleHost = (data) => {
123
+ data
124
+ .toString()
125
+ .split('\n')
126
+ .forEach((line) => {
127
+ if (line.includes('Invitation')) {
128
+ (0, log_1.log)('Invitation:', line.split(': ')[1], { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 150, 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) });
129
+ invitation.wake(line.split(': ')[1]);
130
+ }
131
+ if (line.includes('Secret')) {
132
+ (0, log_1.log)('Secret:', line.split(': ')[1], { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 154, 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) });
133
+ secret.wake(line.split(': ')[1]);
134
+ }
135
+ // });
136
+ });
137
+ };
138
+ hostProcess.stdout.on('data', handleHost);
139
+ hostProcess.stderr.on('data', handleHost);
140
+ hostProcess.on('error', (err) => {
141
+ throw err;
142
+ });
143
+ hostProcess.on('exit', (code) => {
144
+ if (code !== 0) {
145
+ throw new Error(`Host process exited with code ${code}`);
146
+ }
147
+ hostClosed.wake();
148
+ });
149
+ }
150
+ const guestReadyForInvitation = new async_1.Trigger();
151
+ const guestReadyForSecret = new async_1.Trigger();
152
+ const guestProcess = (0, node_child_process_1.spawn)(util_1.BIN_PATH, ['halo', 'join', `--profile=${guest.profile}`, `--config=${guest.config}`], {
153
+ shell: true,
154
+ cwd: __dirname,
155
+ });
156
+ {
157
+ const handleGuest = (data) => {
158
+ data
159
+ .toString()
160
+ .split('\n')
161
+ .forEach((line) => {
162
+ if (line.includes('Invitation')) {
163
+ (0, log_1.log)('Ready for invitation', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 188, 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) });
164
+ guestReadyForInvitation.wake();
165
+ }
166
+ if (line.includes('Invitation code')) {
167
+ (0, log_1.log)('Ready for secret', {}, { file: "packages/devtools/cli/src/commands/agent/agent.test.ts", line: 192, 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) });
168
+ guestReadyForSecret.wake();
169
+ }
170
+ });
171
+ };
172
+ guestProcess.stdout.on('data', handleGuest);
173
+ guestProcess.stderr.on('data', handleGuest);
174
+ guestProcess.on('error', (err) => {
175
+ throw err;
176
+ });
177
+ }
178
+ await (0, async_1.asyncTimeout)(guestReadyForInvitation.wait(), 10000);
179
+ guestProcess.stdin.write(`${await invitation.wait()}\n`);
180
+ await (0, async_1.asyncTimeout)(guestReadyForSecret.wait(), 10000);
181
+ guestProcess.stdin.write(`${await secret.wait()}\n`);
182
+ await (0, async_1.asyncTimeout)(hostClosed.wait(), 10000);
183
+ hostProcess.kill();
184
+ guestProcess.kill();
185
+ };
186
+ //# 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":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,eAAO,MAAM,WAAW,YAAa,GAAG,EAAE,qBAkBzC,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"}
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,qBAoCzC,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;CAS1B"}
@@ -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, {
@@ -17,6 +18,24 @@ const printAgents = (daemons, flags = {}) => {
17
18
  running: {
18
19
  header: 'running',
19
20
  },
21
+ lockAcquired: {
22
+ header: 'lockAcquired',
23
+ },
24
+ restarts: {
25
+ header: 'restarts',
26
+ },
27
+ uptime: {
28
+ header: 'uptime',
29
+ get: (row) => {
30
+ if (!row.running) {
31
+ return 'stopped';
32
+ }
33
+ return (0, date_fns_1.formatDistance)(new Date(), new Date(row.started));
34
+ },
35
+ },
36
+ logFile: {
37
+ header: 'logFile',
38
+ },
20
39
  }, {
21
40
  ...flags,
22
41
  });
@@ -26,7 +45,9 @@ class List extends base_command_1.BaseCommand {
26
45
  async run() {
27
46
  return await this.execWithDaemon(async (daemon) => {
28
47
  const result = await daemon.list();
29
- (0, exports.printAgents)(result);
48
+ if (!this.flags.json) {
49
+ (0, exports.printAgents)(result);
50
+ }
30
51
  return result;
31
52
  });
32
53
  }
@@ -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;AAEjC,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,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB;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"}
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,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,cAAc;SACvB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,UAAU;SACnB;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;oBAChB,OAAO,SAAS,CAAC;iBAClB;gBACD,OAAO,IAAA,yBAAc,EAAC,IAAI,IAAI,EAAE,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3D,CAAC;SACF;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;SAClB;KACF,EACD;QACE,GAAG,KAAK;KACT,CACF,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,WAAW,eAoCtB;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,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gBACpB,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;aACrB;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;;AAXe,mBAAc,GAAG,IAAI,CAAC;AACtB,gBAAW,GAAG,cAAc,CAAC;kBAF1B,IAAI"}
@@ -2,6 +2,16 @@ import { BaseCommand } from '../../base-command';
2
2
  export default class Restart extends BaseCommand<typeof Restart> {
3
3
  static enableJsonFlag: boolean;
4
4
  static description: string;
5
+ static flags: {
6
+ force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
7
+ json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
8
+ 'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
9
+ verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
10
+ profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
11
+ config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
12
+ 'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
13
+ timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
14
+ };
5
15
  run(): Promise<any>;
6
16
  }
7
17
  //# sourceMappingURL=restart.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/restart.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,WAAW,CAAC,OAAO,OAAO,CAAC;IAC9D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEhD,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAM1B"}
1
+ {"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/restart.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,OAAO,OAAO,OAAQ,SAAQ,WAAW,CAAC,OAAO,OAAO,CAAC;IAC9D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAA2B;IAEtD,OAAgB,KAAK;;;;;;;;;MAGnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAQ1B"}
@@ -3,16 +3,23 @@
3
3
  // Copyright 2023 DXOS.org
4
4
  //
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ const core_1 = require("@oclif/core");
6
7
  const base_command_1 = require("../../base-command");
7
8
  class Restart extends base_command_1.BaseCommand {
8
9
  async run() {
9
10
  return await this.execWithDaemon(async (daemon) => {
10
- const process = await daemon.restart(this.flags.profile);
11
- this.log('Restarted: ', process);
11
+ const process = await daemon.restart(this.flags.profile, { config: this.flags.config });
12
+ if (process) {
13
+ this.log('Restarted: ', process);
14
+ }
12
15
  });
13
16
  }
14
17
  }
15
18
  Restart.enableJsonFlag = true;
16
19
  Restart.description = 'Restart agent daemon.';
20
+ Restart.flags = {
21
+ ...base_command_1.BaseCommand.flags,
22
+ force: core_1.Flags.boolean({ description: 'Force restart.' }),
23
+ };
17
24
  exports.default = Restart;
18
25
  //# sourceMappingURL=restart.js.map
@@ -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;YACzD,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
+ {"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../../src/commands/agent/restart.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAoC;AAEpC,qDAAiD;AAEjD,MAAqB,OAAQ,SAAQ,0BAA2B;IAS9D,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,OAAO,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;aAClC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAfe,sBAAc,GAAG,IAAI,CAAC;AACtB,mBAAW,GAAG,uBAAuB,CAAC;AAEtC,aAAK,GAAG;IACtB,GAAG,0BAAW,CAAC,KAAK;IACpB,KAAK,EAAE,YAAK,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACxD,CAAC;kBAPiB,OAAO"}
@@ -8,6 +8,7 @@ export default class Start extends BaseCommand<typeof Start> {
8
8
  'web-socket': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
9
9
  echo: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
10
10
  monitor: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
11
+ json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
11
12
  'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
12
13
  verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
13
14
  profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
@@ -1 +1 @@
1
- {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAaA,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;YA6ChB,YAAY;IAiB1B,OAAO,CAAC,cAAc;CAevB"}
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;YA+ChB,YAAY;IAc1B,OAAO,CAAC,cAAc;CAevB"}
@@ -31,6 +31,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
32
  const core_1 = require("@oclif/core");
33
33
  const chalk_1 = __importDefault(require("chalk"));
34
+ const node_fs_1 = require("node:fs");
34
35
  const agent_1 = require("@dxos/agent");
35
36
  const async_1 = require("@dxos/async");
36
37
  const client_protocol_1 = require("@dxos/client-protocol");
@@ -53,28 +54,33 @@ class Start extends base_command_1.BaseCommand {
53
54
  }
54
55
  async _runInForeground() {
55
56
  var _a, _b, _c, _d, _e;
56
- const options = {
57
- profile: this.flags.profile,
58
- socket: `unix://${client_protocol_1.DX_RUNTIME}/profile/${this.flags.profile}/agent.sock`,
59
- webSocket: this.flags['web-socket'],
60
- };
61
- const agent = new agent_1.Agent(this.clientConfig, options);
62
- // ECHO API.
63
- // TODO(burdon): Config.
64
- if (this.flags['echo-proxy']) {
65
- agent.addPlugin(new agent_1.EchoProxyServer({ port: this.flags['echo-proxy'] }));
66
- }
67
- // Epoch monitoring.
68
- // TODO(burdon): Config.
69
- if (this.flags.monitor) {
70
- agent.addPlugin(new agent_1.EpochMonitor());
71
- }
72
- // Functions.
73
- if ((_b = (_a = this.clientConfig.values.runtime) === null || _a === void 0 ? void 0 : _a.agent) === null || _b === void 0 ? void 0 : _b.functions) {
74
- agent.addPlugin(new agent_1.FunctionsPlugin({
75
- port: (_e = (_d = (_c = this.clientConfig.values.runtime) === null || _c === void 0 ? void 0 : _c.agent) === null || _d === void 0 ? void 0 : _d.functions) === null || _e === void 0 ? void 0 : _e.port,
76
- }));
57
+ const socket = `unix://${client_protocol_1.DX_RUNTIME}/profile/${this.flags.profile}/agent.sock`;
58
+ {
59
+ // Clear out old socket file.
60
+ const { path } = (0, agent_1.parseAddress)(socket);
61
+ (0, node_fs_1.rmSync)(path, { force: true });
77
62
  }
63
+ const agent = new agent_1.Agent({
64
+ config: this.clientConfig,
65
+ profile: this.flags.profile,
66
+ protocol: {
67
+ socket,
68
+ webSocket: this.flags['web-socket'],
69
+ },
70
+ plugins: [
71
+ // Epoch monitoring.
72
+ // TODO(burdon): Config.
73
+ this.flags.monitor && new agent_1.EpochMonitor(),
74
+ // ECHO API.
75
+ // TODO(burdon): Config.
76
+ this.flags['echo-proxy'] && new agent_1.EchoProxyServer({ port: this.flags['echo-proxy'] }),
77
+ // Functions.
78
+ ((_b = (_a = this.clientConfig.values.runtime) === null || _a === void 0 ? void 0 : _a.agent) === null || _b === void 0 ? void 0 : _b.functions) &&
79
+ new agent_1.FunctionsPlugin({
80
+ port: (_e = (_d = (_c = this.clientConfig.values.runtime) === null || _c === void 0 ? void 0 : _c.agent) === null || _d === void 0 ? void 0 : _d.functions) === null || _e === void 0 ? void 0 : _e.port,
81
+ }),
82
+ ],
83
+ });
78
84
  await agent.start();
79
85
  this.log('Agent started... (ctrl-c to exit)');
80
86
  process.on('SIGINT', async () => {
@@ -93,14 +99,10 @@ class Start extends base_command_1.BaseCommand {
93
99
  this.log((0, chalk_1.default) `{red Warning}: '${this.flags.profile}' is already running.`);
94
100
  return;
95
101
  }
96
- try {
97
- await daemon.start(this.flags.profile);
102
+ const process = await daemon.start(this.flags.profile, { config: this.flags.config });
103
+ if (process) {
98
104
  this.log('Agent started.');
99
105
  }
100
- catch (err) {
101
- this.log((0, chalk_1.default) `{red Failed to start daemon}: ${err}`);
102
- await daemon.stop(this.flags.profile);
103
- }
104
106
  });
105
107
  }
106
108
  _sendTelemetry() {