@dxos/cli 0.4.4 → 0.4.5-main.414d832

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 (11) hide show
  1. package/bin/dev +1 -0
  2. package/bin/dx +3 -0
  3. package/dist/src/base-command.d.ts.map +1 -1
  4. package/dist/src/base-command.js +3 -2
  5. package/dist/src/base-command.js.map +1 -1
  6. package/dist/src/commands/halo/join.d.ts +1 -1
  7. package/dist/src/commands/halo/join.d.ts.map +1 -1
  8. package/dist/src/commands/halo/join.js +24 -11
  9. package/dist/src/commands/halo/join.js.map +1 -1
  10. package/oclif.manifest.json +4 -7
  11. package/package.json +23 -23
package/bin/dev CHANGED
@@ -5,6 +5,7 @@ const oclif = require('@oclif/core')
5
5
  const path = require('path')
6
6
  const project = path.join(__dirname, '..', 'tsconfig.json')
7
7
 
8
+ process.env.DX_ENVIRONMENT = process.env.DX_ENVIRONMENT ?? 'development'
8
9
  process.env.NODE_ENV = 'development'
9
10
 
10
11
  // In dev mode, use ts-node and dev plugins.
package/bin/dx CHANGED
@@ -1,5 +1,8 @@
1
1
  #!/usr/bin/env -S node --no-warnings
2
2
 
3
+ // Note: `npm publish` or `pnpm deploy` will change the default depending on the DX_ENVIRONMENT at time of invocation.
4
+ process.env.DX_ENVIRONMENT = process.env.DX_ENVIRONMENT ?? 'development'
5
+
3
6
  const oclif = require('@oclif/core')
4
7
 
5
8
  oclif.run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'))
package/dist/src/base-command.d.ts.map CHANGED
@@ -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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"}
package/dist/src/base-command.js CHANGED
@@ -101,7 +101,7 @@ class BaseCommand extends core_1.Command {
101
101
  const observabilityState = await (0, observability_1.getObservabilityState)(client_protocol_1.DX_DATA);
102
102
  const { mode, installationId, group } = observabilityState;
103
103
  if (mode === 'disabled') {
104
- this.log('telemetry disabled by config');
104
+ this.log('observability disabled by config');
105
105
  return;
106
106
  }
107
107
  {
@@ -119,6 +119,7 @@ class BaseCommand extends core_1.Command {
119
119
  }
120
120
  this._observability = await (0, observability_1.initializeNodeObservability)({
121
121
  namespace,
122
+ version: this.config.version,
122
123
  installationId,
123
124
  group,
124
125
  config: this._clientConfig,
@@ -252,7 +253,7 @@ class BaseCommand extends core_1.Command {
252
253
  this._client = new client_1.Client({ config: this._clientConfig, services: (0, services_1.fromAgent)({ profile: this.flags.profile }) });
253
254
  }
254
255
  await this._client.initialize();
255
- (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 379, 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) });
256
+ (0, log_1.log)('Client initialized', { profile: this.flags.profile }, { file: "packages/devtools/cli/src/base-command.ts", line: 380, 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) });
256
257
  }
257
258
  return this._client;
258
259
  }
package/dist/src/base-command.js.map CHANGED
@@ -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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"}
package/dist/src/commands/halo/join.d.ts CHANGED
@@ -5,13 +5,13 @@ export default class Join extends BaseCommand<typeof Join> {
5
5
  static flags: {
6
6
  invitation: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
7
7
  secret: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
8
+ timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
8
9
  json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
9
10
  'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
10
11
  verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
11
12
  profile: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
12
13
  config: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
13
14
  'no-agent': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
14
- timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
15
15
  'no-wait': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
16
16
  };
17
17
  run(): Promise<any>;
package/dist/src/commands/halo/join.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/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,SAAoC;IAC/D,OAAgB,KAAK;;;;;;;;;;;MAQnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAwC1B"}
1
+ {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../../../src/commands/halo/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,SAAoC;IAC/D,OAAgB,KAAK;;;;;;;;;;;MAYnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;CAkD1B"}
package/dist/src/commands/halo/join.js CHANGED
@@ -30,17 +30,26 @@ class Join extends base_command_1.BaseCommand {
30
30
  core_1.ux.log('');
31
31
  core_1.ux.action.start('Waiting for peer to connect');
32
32
  const done = new async_1.Trigger();
33
- const invitation = await (0, util_1.acceptInvitation)({
34
- observable: client.halo.join(invitations_1.InvitationEncoder.decode(encoded)),
35
- callbacks: {
36
- onConnecting: async () => core_1.ux.action.stop(),
37
- onReadyForAuth: async () => secret !== null && secret !== void 0 ? secret : core_1.ux.prompt((0, chalk_1.default) `\n{red Secret}`),
38
- onSuccess: async () => {
39
- done.wake();
40
- },
41
- },
42
- });
43
- await done.wait();
33
+ let invitation;
34
+ try {
35
+ invitation = await (0, async_1.asyncTimeout)(Promise.all([
36
+ (0, util_1.acceptInvitation)({
37
+ observable: client.halo.join(invitations_1.InvitationEncoder.decode(encoded)),
38
+ callbacks: {
39
+ onConnecting: async () => core_1.ux.action.stop(),
40
+ onReadyForAuth: async () => secret !== null && secret !== void 0 ? secret : core_1.ux.prompt((0, chalk_1.default) `\n{red Secret}`),
41
+ onSuccess: async () => {
42
+ done.wake();
43
+ },
44
+ },
45
+ }),
46
+ done.wait(),
47
+ ]).then((ret) => ret[0]), this.flags.timeout * 1000);
48
+ }
49
+ catch (err) {
50
+ core_1.ux.log();
51
+ this.error((0, chalk_1.default) `{red Timeout waiting for device join to complete: ${err.message}}`);
52
+ }
44
53
  core_1.ux.log();
45
54
  core_1.ux.log((0, chalk_1.default) `{green Joined successfully.}`);
46
55
  return {
@@ -59,6 +68,10 @@ Join.flags = {
59
68
  secret: core_1.Flags.string({
60
69
  description: 'Invitation secret',
61
70
  }),
71
+ timeout: core_1.Flags.integer({
72
+ description: 'Timeout in seconds',
73
+ default: 300,
74
+ }),
62
75
  };
63
76
  exports.default = Join;
64
77
  //# sourceMappingURL=join.js.map
package/dist/src/commands/halo/join.js.map CHANGED
@@ -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,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,8BAA8B,CAAC,CAAC;YAE5C,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":"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"}
package/oclif.manifest.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "0.4.4",
2
+ "version": "0.4.5-main.414d832",
3
3
  "commands": {
4
4
  "agent:list": {
5
5
  "id": "agent:list",
@@ -2051,12 +2051,9 @@
2051
2051
  "timeout": {
2052
2052
  "name": "timeout",
2053
2053
  "type": "option",
2054
- "description": "Timeout (ms).",
2054
+ "description": "Timeout in seconds",
2055
2055
  "multiple": false,
2056
- "default": 60000,
2057
- "aliases": [
2058
- "t"
2059
- ]
2056
+ "default": 300
2060
2057
  },
2061
2058
  "no-wait": {
2062
2059
  "name": "no-wait",
@@ -3524,7 +3521,7 @@
3524
3521
  "type": "option",
3525
3522
  "description": "Tunnel name",
3526
3523
  "multiple": false,
3527
- "default": "fourteen-double-johnny-cup"
3524
+ "default": "victor-butter-glucose-aspen"
3528
3525
  }
3529
3526
  },
3530
3527
  "args": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/cli",
3
- "version": "0.4.4",
3
+ "version": "0.4.5-main.414d832",
4
4
  "description": "DXOS CLI",
5
5
  "keywords": [
6
6
  "dxos",
@@ -45,28 +45,28 @@
45
45
  "react": "^18.2.0",
46
46
  "uuid": "^8.3.2",
47
47
  "ws": "^8.14.2",
48
- "@dxos/bare-template": "0.4.4",
49
- "@dxos/async": "0.4.4",
50
- "@dxos/client-protocol": "0.4.4",
51
- "@dxos/agent": "0.4.4",
52
- "@dxos/client": "0.4.4",
53
- "@dxos/client-services": "0.4.4",
54
- "@dxos/config": "0.4.4",
55
- "@dxos/context": "0.4.4",
56
- "@dxos/functions": "0.4.4",
57
- "@dxos/debug": "0.4.4",
58
- "@dxos/hello-template": "0.4.4",
59
- "@dxos/invariant": "0.4.4",
60
- "@dxos/log": "0.4.4",
61
- "@dxos/network-manager": "0.4.4",
62
- "@dxos/observability": "0.4.4",
63
- "@dxos/process": "0.4.4",
64
- "@dxos/plate": "0.4.4",
65
- "@dxos/protocols": "0.4.4",
66
- "@dxos/random": "0.4.4",
67
- "@dxos/util": "0.4.4",
68
- "@dxos/tasks-template": "0.4.4",
69
- "@dxos/rpc": "0.4.4"
48
+ "@dxos/agent": "0.4.5-main.414d832",
49
+ "@dxos/async": "0.4.5-main.414d832",
50
+ "@dxos/bare-template": "0.4.5-main.414d832",
51
+ "@dxos/client": "0.4.5-main.414d832",
52
+ "@dxos/context": "0.4.5-main.414d832",
53
+ "@dxos/client-services": "0.4.5-main.414d832",
54
+ "@dxos/config": "0.4.5-main.414d832",
55
+ "@dxos/debug": "0.4.5-main.414d832",
56
+ "@dxos/functions": "0.4.5-main.414d832",
57
+ "@dxos/hello-template": "0.4.5-main.414d832",
58
+ "@dxos/client-protocol": "0.4.5-main.414d832",
59
+ "@dxos/invariant": "0.4.5-main.414d832",
60
+ "@dxos/network-manager": "0.4.5-main.414d832",
61
+ "@dxos/log": "0.4.5-main.414d832",
62
+ "@dxos/observability": "0.4.5-main.414d832",
63
+ "@dxos/process": "0.4.5-main.414d832",
64
+ "@dxos/plate": "0.4.5-main.414d832",
65
+ "@dxos/protocols": "0.4.5-main.414d832",
66
+ "@dxos/random": "0.4.5-main.414d832",
67
+ "@dxos/tasks-template": "0.4.5-main.414d832",
68
+ "@dxos/rpc": "0.4.5-main.414d832",
69
+ "@dxos/util": "0.4.5-main.414d832"
70
70
  },
71
71
  "devDependencies": {
72
72
  "@oclif/test": "^2.3.31",