@dxos/cli 0.4.5-main.b6f7e18 → 0.4.5-main.c8d4ae3
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.
|
@@ -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>;
|
|
@@ -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;;;;;;;;;;;
|
|
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"}
|
|
@@ -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
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
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
|
|
@@ -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,
|
|
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.5-main.
|
|
2
|
+
"version": "0.4.5-main.c8d4ae3",
|
|
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
|
|
2054
|
+
"description": "Timeout in seconds",
|
|
2055
2055
|
"multiple": false,
|
|
2056
|
-
"default":
|
|
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": "
|
|
3524
|
+
"default": "orange-solar-bluebird-island"
|
|
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.5-main.
|
|
3
|
+
"version": "0.4.5-main.c8d4ae3",
|
|
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/agent": "0.4.5-main.
|
|
49
|
-
"@dxos/
|
|
50
|
-
"@dxos/
|
|
51
|
-
"@dxos/
|
|
52
|
-
"@dxos/
|
|
53
|
-
"@dxos/client-services": "0.4.5-main.
|
|
54
|
-
"@dxos/
|
|
55
|
-
"@dxos/
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/
|
|
60
|
-
"@dxos/
|
|
61
|
-
"@dxos/
|
|
62
|
-
"@dxos/
|
|
63
|
-
"@dxos/
|
|
64
|
-
"@dxos/process": "0.4.5-main.
|
|
65
|
-
"@dxos/protocols": "0.4.5-main.
|
|
66
|
-
"@dxos/random": "0.4.5-main.
|
|
67
|
-
"@dxos/
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
48
|
+
"@dxos/agent": "0.4.5-main.c8d4ae3",
|
|
49
|
+
"@dxos/bare-template": "0.4.5-main.c8d4ae3",
|
|
50
|
+
"@dxos/client": "0.4.5-main.c8d4ae3",
|
|
51
|
+
"@dxos/client-protocol": "0.4.5-main.c8d4ae3",
|
|
52
|
+
"@dxos/config": "0.4.5-main.c8d4ae3",
|
|
53
|
+
"@dxos/client-services": "0.4.5-main.c8d4ae3",
|
|
54
|
+
"@dxos/context": "0.4.5-main.c8d4ae3",
|
|
55
|
+
"@dxos/debug": "0.4.5-main.c8d4ae3",
|
|
56
|
+
"@dxos/functions": "0.4.5-main.c8d4ae3",
|
|
57
|
+
"@dxos/hello-template": "0.4.5-main.c8d4ae3",
|
|
58
|
+
"@dxos/invariant": "0.4.5-main.c8d4ae3",
|
|
59
|
+
"@dxos/async": "0.4.5-main.c8d4ae3",
|
|
60
|
+
"@dxos/network-manager": "0.4.5-main.c8d4ae3",
|
|
61
|
+
"@dxos/log": "0.4.5-main.c8d4ae3",
|
|
62
|
+
"@dxos/plate": "0.4.5-main.c8d4ae3",
|
|
63
|
+
"@dxos/observability": "0.4.5-main.c8d4ae3",
|
|
64
|
+
"@dxos/process": "0.4.5-main.c8d4ae3",
|
|
65
|
+
"@dxos/protocols": "0.4.5-main.c8d4ae3",
|
|
66
|
+
"@dxos/random": "0.4.5-main.c8d4ae3",
|
|
67
|
+
"@dxos/tasks-template": "0.4.5-main.c8d4ae3",
|
|
68
|
+
"@dxos/rpc": "0.4.5-main.c8d4ae3",
|
|
69
|
+
"@dxos/util": "0.4.5-main.c8d4ae3"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
72
|
"@oclif/test": "^2.3.31",
|