@dxos/cli 0.6.9-staging.8e43e2a → 0.6.10-staging.00555f6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/commands/agent/agent.test.js +9 -9
- package/dist/src/commands/agent/agent.test.js.map +1 -1
- package/dist/src/commands/halo/credential/add.js +2 -2
- package/dist/src/commands/halo/credential/add.js.map +1 -1
- package/dist/src/commands/profile/import.js +1 -1
- package/dist/src/commands/profile/import.js.map +1 -1
- package/dist/src/util/publish/publisher-rpc-peer.js +5 -5
- package/dist/src/util/publish/publisher-rpc-peer.js.map +1 -1
- package/dist/src/util/supervisor/supervisor-rpc-peer.js +5 -5
- package/dist/src/util/supervisor/supervisor-rpc-peer.js.map +1 -1
- package/dist/src/util/tunnel/tunnel-rpc-peer.js +5 -5
- package/dist/src/util/tunnel/tunnel-rpc-peer.js.map +1 -1
- package/oclif.manifest.json +2 -2
- package/package.json +33 -37
|
@@ -68,22 +68,22 @@ const test_1 = require("@dxos/test");
|
|
|
68
68
|
const host = 'test-profile-1';
|
|
69
69
|
const guest = 'test-profile-2';
|
|
70
70
|
{
|
|
71
|
-
log_1.log.info('Starting first test profile agent.'
|
|
71
|
+
log_1.log.info('Starting first test profile agent.');
|
|
72
72
|
await (0, cli_base_1.runCommand)(`agent start --profile=${host} --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
73
|
-
log_1.log.info('Creating halo identity.'
|
|
73
|
+
log_1.log.info('Creating halo identity.');
|
|
74
74
|
await (0, cli_base_1.runCommand)(`halo create ${haloName} --profile=${host} --config=${HOST_CONFIG_PATH}`, __dirname);
|
|
75
75
|
}
|
|
76
76
|
{
|
|
77
|
-
log_1.log.info('Starting second test profile agent.'
|
|
77
|
+
log_1.log.info('Starting second test profile agent.');
|
|
78
78
|
await (0, cli_base_1.runCommand)(`agent start --profile=${guest} --config=${GUEST_CONFIG_PATH}`, __dirname);
|
|
79
79
|
}
|
|
80
80
|
{
|
|
81
|
-
log_1.log.info('Inviting second profile to join first profile halo.'
|
|
81
|
+
log_1.log.info('Inviting second profile to join first profile halo.');
|
|
82
82
|
await performHaloCLIInvitation({
|
|
83
83
|
host: { profile: host, config: HOST_CONFIG_PATH },
|
|
84
84
|
guest: { profile: guest, config: GUEST_CONFIG_PATH },
|
|
85
85
|
});
|
|
86
|
-
log_1.log.info('Invitation successful.'
|
|
86
|
+
log_1.log.info('Invitation successful.');
|
|
87
87
|
}
|
|
88
88
|
{
|
|
89
89
|
// TODO(mykola): Remove fancy colorful output from the CLI.
|
|
@@ -125,11 +125,11 @@ const performHaloCLIInvitation = async ({ host, guest }) => {
|
|
|
125
125
|
.split('\n')
|
|
126
126
|
.forEach((line) => {
|
|
127
127
|
if (line.includes('Invitation')) {
|
|
128
|
-
(0, log_1.log)('Invitation:', line.split(': ')[1]
|
|
128
|
+
(0, log_1.log)('Invitation:', line.split(': ')[1]);
|
|
129
129
|
invitation.wake(line.split(': ')[1]);
|
|
130
130
|
}
|
|
131
131
|
if (line.includes('Secret')) {
|
|
132
|
-
(0, log_1.log)('Secret:', line.split(': ')[1]
|
|
132
|
+
(0, log_1.log)('Secret:', line.split(': ')[1]);
|
|
133
133
|
secret.wake(line.split(': ')[1]);
|
|
134
134
|
}
|
|
135
135
|
// });
|
|
@@ -160,11 +160,11 @@ const performHaloCLIInvitation = async ({ host, guest }) => {
|
|
|
160
160
|
.split('\n')
|
|
161
161
|
.forEach((line) => {
|
|
162
162
|
if (line.includes('Invitation')) {
|
|
163
|
-
(0, log_1.log)('Ready for invitation'
|
|
163
|
+
(0, log_1.log)('Ready for invitation');
|
|
164
164
|
guestReadyForInvitation.wake();
|
|
165
165
|
}
|
|
166
166
|
if (line.includes('Invitation code')) {
|
|
167
|
-
(0, log_1.log)('Ready for secret'
|
|
167
|
+
(0, log_1.log)('Ready for secret');
|
|
168
168
|
guestReadyForSecret.wake();
|
|
169
169
|
}
|
|
170
170
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.test.js","sourceRoot":"","sources":["../../../../src/commands/agent/agent.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,+BAA8B;AAC9B,sDAA2B;AAC3B,2DAA2C;AAC3C,qCAA2D;AAC3D,yCAA0C;AAE1C,uCAAoD;AACpD,6CAAsD;AACtD,mCAAgC;AAChC,qCAA4C;AAE5C,IAAA,eAAQ,EAAC,OAAO,EAAE,GAAG,EAAE;IACrB,MAAM,WAAW,GAAG,uBAAuB,CAAC;IAC5C,MAAM,gBAAgB,GAAG,IAAA,gBAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAC9D,MAAM,iBAAiB,GAAG,IAAA,gBAAI,EAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAEhE,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,uBAAuB;QACvB;YACE,CAAC,gBAAgB,EAAE,IAAA,gBAAI,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC7C,CAAC,iBAAiB,EAAE,IAAA,gBAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SAChD,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE;YACtC,IAAA,mBAAS,EAAC,IAAA,mBAAO,EAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,IAAA,uBAAa,EACX,UAAU,EACV,iBAAI,CAAC,IAAI,CAAC;gBACR,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE;oBACP,MAAM,EAAE;wBACN,OAAO,EAAE;4BACP,UAAU,EAAE,IAAI;4BAChB,IAAI,EAAE,WAAW;yBAClB;qBACF;oBACD,QAAQ,EAAE;wBACR,SAAS,EAAE;4BACT;gCACE,MAAM,EAAE,+CAA+C;6BACxD;4BACD;gCACE,MAAM,EAAE,2CAA2C;6BACpD;yBACF;wBACD,GAAG,EAAE;4BACH;gCACE,IAAI,EAAE,yBAAyB;6BAChC;4BACD;gCACE,IAAI,EAAE,yBAAyB;gCAC/B,QAAQ,EAAE,MAAM;gCAChB,UAAU,EAAE,MAAM;6BACnB;yBACF;qBACF;iBACF;aACF,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,WAAW;QACX,IAAA,gBAAM,EAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,IAAA,WAAI,EAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,QAAQ,GAAG,WAAW,CAAC;QAE7B,MAAM,IAAI,GAAG,gBAAgB,CAAC;QAC9B,MAAM,KAAK,GAAG,gBAAgB,CAAC;QAE/B,CAAC;YACC,SAAG,CAAC,IAAI,CAAC,oCAAoC,
|
|
1
|
+
{"version":3,"file":"agent.test.js","sourceRoot":"","sources":["../../../../src/commands/agent/agent.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const core_1 = require("@oclif/core");
|
|
7
7
|
const invariant_1 = require("@dxos/invariant");
|
|
8
|
-
const
|
|
8
|
+
const proto_1 = require("@dxos/protocols/proto");
|
|
9
9
|
const base_1 = require("../../../base");
|
|
10
10
|
class Add extends base_1.BaseCommand {
|
|
11
11
|
async run() {
|
|
@@ -21,7 +21,7 @@ class Add extends base_1.BaseCommand {
|
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
23
|
try {
|
|
24
|
-
const codec =
|
|
24
|
+
const codec = proto_1.schema.getCodecForType('dxos.halo.credentials.Credential');
|
|
25
25
|
const credentialBytes = Buffer.from(credentialHex, 'hex');
|
|
26
26
|
const error = codec.protoType.verify(credentialBytes);
|
|
27
27
|
if (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/add.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAmC;AAEnC,+CAA4C;AAC5C
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../../../src/commands/halo/credential/add.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,sCAAmC;AAEnC,+CAA4C;AAC5C,iDAA+C;AAE/C,wCAA4C;AAE5C,MAAqB,GAAI,SAAQ,kBAAuB;IAMtD,KAAK,CAAC,GAAG;QACP,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,CAAC;QAED,IAAA,qBAAS,EAAC,aAAa,EAAE,qBAAqB,CAAC,CAAC;QAChD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;YACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,cAAM,CAAC,eAAe,CAAC,kCAAkC,CAAC,CAAC;oBACzE,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,aAAc,EAAE,KAAK,CAAC,CAAC;oBAE3D,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;oBACtD,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;oBACzB,CAAC;oBAED,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;oBACjD,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;gBACnD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAjCe,eAAW,GAAG,8BAA8B,CAAC;AAC7C,QAAI,GAAG;IACrB,UAAU,EAAE,WAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CACxE,CAAC;kBAJiB,GAAG"}
|
|
@@ -64,7 +64,7 @@ class Import extends base_1.BaseCommand {
|
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
if ((0, fs_1.existsSync)(storageConfig.dataRoot)) {
|
|
67
|
-
log_1.log.error('data directory already exists', { path: storageConfig.dataRoot }
|
|
67
|
+
log_1.log.error('data directory already exists', { path: storageConfig.dataRoot });
|
|
68
68
|
throw new Error('Data directory already exists');
|
|
69
69
|
}
|
|
70
70
|
const data = await (0, promises_1.readFile)(file);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../src/commands/profile/import.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAC1B,2BAAgC;AAChC,0CAAuC;AACvC,uCAAkC;AAClC,+BAA+B;AAE/B,mCAAgC;AAGhC,qCAAyC;AAEzC,MAAqB,MAAO,SAAQ,kBAA0B;IAa5D,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEhF,MAAM,EAAE,WAAW,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,wDACrF,uBAAuB,GACxB,CAAC;QAEF,IAAI,aAAqC,CAAC;QAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,iBAAM,EAAC;gBAC/B,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,IAAA,eAAK,EAAA,0CAA0C,OAAO,KAAK;aACrE,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YACD,aAAa,GAAG,IAAI,CAAC,YAAa,CAAC,GAAG,CAAC,wBAAwB,CAAE,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC/C,aAAa,GAAG;gBACd,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,QAAQ;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,IAAA,eAAU,EAAC,aAAa,CAAC,QAAS,CAAC,EAAE,CAAC;YACxC,SAAG,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,QAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../src/commands/profile/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ exports.PublisherRpcPeer = void 0;
|
|
|
10
10
|
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
11
11
|
const async_1 = require("@dxos/async");
|
|
12
12
|
const log_1 = require("@dxos/log");
|
|
13
|
-
const
|
|
13
|
+
const proto_1 = require("@dxos/protocols/proto");
|
|
14
14
|
const rpc_1 = require("@dxos/rpc");
|
|
15
15
|
class PublisherRpcPeer {
|
|
16
16
|
constructor(_url) {
|
|
@@ -23,7 +23,7 @@ class PublisherRpcPeer {
|
|
|
23
23
|
this._socket.onopen = async () => {
|
|
24
24
|
try {
|
|
25
25
|
await this._rpc.open();
|
|
26
|
-
(0, log_1.log)(`RPC open ${this._url}
|
|
26
|
+
(0, log_1.log)(`RPC open ${this._url}`);
|
|
27
27
|
this.connected.emit();
|
|
28
28
|
this._connectTrigger.wake();
|
|
29
29
|
}
|
|
@@ -32,7 +32,7 @@ class PublisherRpcPeer {
|
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
34
|
this._socket.onclose = async () => {
|
|
35
|
-
(0, log_1.log)(`Disconnected ${this._url}
|
|
35
|
+
(0, log_1.log)(`Disconnected ${this._url}`);
|
|
36
36
|
this.disconnected.emit();
|
|
37
37
|
try {
|
|
38
38
|
await this._rpc.close();
|
|
@@ -43,12 +43,12 @@ class PublisherRpcPeer {
|
|
|
43
43
|
};
|
|
44
44
|
this._socket.onerror = (event) => {
|
|
45
45
|
var _a;
|
|
46
|
-
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}
|
|
46
|
+
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`);
|
|
47
47
|
this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
|
|
48
48
|
};
|
|
49
49
|
this._rpc = (0, rpc_1.createProtoRpcPeer)({
|
|
50
50
|
requested: {
|
|
51
|
-
Publisher:
|
|
51
|
+
Publisher: proto_1.schema.getService('dxos.service.publisher.Publisher'),
|
|
52
52
|
},
|
|
53
53
|
exposed: {},
|
|
54
54
|
handlers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publisher-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kEAAsC;AAEtC,uCAA6C;AAC7C,mCAAgC;AAChC
|
|
1
|
+
{"version":3,"file":"publisher-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/publish/publisher-rpc-peer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kEAAsC;AAEtC,uCAA6C;AAC7C,mCAAgC;AAChC,iDAA+C;AAE/C,mCAAkE;AAElE,MAAa,gBAAgB;IAS3B,YAA6B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QANxB,oBAAe,GAAG,IAAI,eAAO,EAAE,CAAC;QAExC,cAAS,GAAG,IAAI,aAAK,EAAE,CAAC;QACxB,iBAAY,GAAG,IAAI,aAAK,EAAE,CAAC;QAC3B,UAAK,GAAG,IAAI,aAAK,EAAS,CAAC;QAGlC,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,IAAI,EAAE;YAC/B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,IAAA,SAAG,EAAC,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;YAChC,IAAA,SAAG,EAAC,gBAAgB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,KAA2B,EAAE,EAAE;;YACrD,IAAA,SAAG,EAAC,0BAA0B,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAA,KAAK,CAAC,KAAK,mCAAI,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,GAAG,IAAA,wBAAkB,EAAC;YAC7B,SAAS,EAAE;gBACT,SAAS,EAAE,cAAM,CAAC,UAAU,CAAC,kCAAkC,CAAC;aACjE;YACD,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,OAAS;YAClB,IAAI,EAAE;gBACJ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;gBACD,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE;oBAChB,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,EAAE,GAA2B,EAAE,EAAE;wBAC7D,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,YAAY,IAAI,EAAE,CAAC;4BAC5D,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;wBAChD,CAAC;6BAAM,CAAC;4BACN,EAAE,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;wBACtB,CAAC;oBACH,CAAC,CAAC;gBACJ,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;CACF;AAzED,4CAyEC"}
|
|
@@ -11,7 +11,7 @@ exports.SupervisorRpcPeer = void 0;
|
|
|
11
11
|
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const log_1 = require("@dxos/log");
|
|
14
|
-
const
|
|
14
|
+
const proto_1 = require("@dxos/protocols/proto");
|
|
15
15
|
const rpc_1 = require("@dxos/rpc");
|
|
16
16
|
class SupervisorRpcPeer {
|
|
17
17
|
constructor(_url) {
|
|
@@ -24,7 +24,7 @@ class SupervisorRpcPeer {
|
|
|
24
24
|
this._socket.onopen = async () => {
|
|
25
25
|
try {
|
|
26
26
|
await this._rpc.open();
|
|
27
|
-
(0, log_1.log)(`RPC open ${this._url}
|
|
27
|
+
(0, log_1.log)(`RPC open ${this._url}`);
|
|
28
28
|
this.connected.emit();
|
|
29
29
|
this._connectTrigger.wake();
|
|
30
30
|
}
|
|
@@ -33,7 +33,7 @@ class SupervisorRpcPeer {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
this._socket.onclose = async () => {
|
|
36
|
-
(0, log_1.log)(`Disconnected ${this._url}
|
|
36
|
+
(0, log_1.log)(`Disconnected ${this._url}`);
|
|
37
37
|
this.disconnected.emit();
|
|
38
38
|
try {
|
|
39
39
|
await this._rpc.close();
|
|
@@ -44,12 +44,12 @@ class SupervisorRpcPeer {
|
|
|
44
44
|
};
|
|
45
45
|
this._socket.onerror = (event) => {
|
|
46
46
|
var _a;
|
|
47
|
-
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}
|
|
47
|
+
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`);
|
|
48
48
|
this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
|
|
49
49
|
};
|
|
50
50
|
this._rpc = (0, rpc_1.createProtoRpcPeer)({
|
|
51
51
|
requested: {
|
|
52
|
-
Supervisor:
|
|
52
|
+
Supervisor: proto_1.schema.getService('dxos.service.supervisor.Supervisor'),
|
|
53
53
|
},
|
|
54
54
|
exposed: {},
|
|
55
55
|
handlers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kCAAkC;AAClC,kEAAsC;AAEtC,uCAA6C;AAC7C,mCAAgC;AAChC
|
|
1
|
+
{"version":3,"file":"supervisor-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/supervisor/supervisor-rpc-peer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kCAAkC;AAClC,kEAAsC;AAEtC,uCAA6C;AAC7C,mCAAgC;AAChC,iDAA+C;AAE/C,mCAAkE;AAElE,MAAa,iBAAiB;IAS5B,YAA6B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QANxB,oBAAe,GAAG,IAAI,eAAO,EAAE,CAAC;QAExC,cAAS,GAAG,IAAI,aAAK,EAAE,CAAC;QACxB,iBAAY,GAAG,IAAI,aAAK,EAAE,CAAC;QAC3B,UAAK,GAAG,IAAI,aAAK,EAAS,CAAC;QAGlC,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,IAAI,EAAE;YAC/B,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvB,IAAA,SAAG,EAAC,YAAY,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;gBACtB,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC;YAC9B,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,KAAK,IAAI,EAAE;YAChC,IAAA,SAAG,EAAC,gBAAgB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACjC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,KAA2B,EAAE,EAAE;;YACrD,IAAA,SAAG,EAAC,0BAA0B,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAA,KAAK,CAAC,KAAK,mCAAI,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC;QAEF,IAAI,CAAC,IAAI,GAAG,IAAA,wBAAkB,EAAC;YAC7B,SAAS,EAAE;gBACT,UAAU,EAAE,cAAM,CAAC,UAAU,CAAC,oCAAoC,CAAC;aACpE;YACD,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE,OAAS;YAClB,IAAI,EAAE;gBACJ,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;oBACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;gBACD,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE;oBAChB,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,KAAK,EAAE,GAA2B,EAAE,EAAE;wBAC7D,IAAI,OAAO,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,YAAY,IAAI,EAAE,CAAC;4BAC5D,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;wBAChD,CAAC;6BAAM,CAAC;4BACN,EAAE,CAAC,GAAG,CAAC,IAAW,CAAC,CAAC;wBACtB,CAAC;oBACH,CAAC,CAAC;gBACJ,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;CACF;AAzED,8CAyEC"}
|
|
@@ -11,7 +11,7 @@ exports.TunnelRpcPeer = void 0;
|
|
|
11
11
|
const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const log_1 = require("@dxos/log");
|
|
14
|
-
const
|
|
14
|
+
const proto_1 = require("@dxos/protocols/proto");
|
|
15
15
|
const rpc_1 = require("@dxos/rpc");
|
|
16
16
|
class TunnelRpcPeer {
|
|
17
17
|
constructor(_url) {
|
|
@@ -24,7 +24,7 @@ class TunnelRpcPeer {
|
|
|
24
24
|
this._socket.onopen = async () => {
|
|
25
25
|
try {
|
|
26
26
|
await this._rpc.open();
|
|
27
|
-
(0, log_1.log)(`RPC open ${this._url}
|
|
27
|
+
(0, log_1.log)(`RPC open ${this._url}`);
|
|
28
28
|
this.connected.emit();
|
|
29
29
|
this._connectTrigger.wake();
|
|
30
30
|
}
|
|
@@ -33,7 +33,7 @@ class TunnelRpcPeer {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
this._socket.onclose = async () => {
|
|
36
|
-
(0, log_1.log)(`Disconnected ${this._url}
|
|
36
|
+
(0, log_1.log)(`Disconnected ${this._url}`);
|
|
37
37
|
this.disconnected.emit();
|
|
38
38
|
try {
|
|
39
39
|
await this._rpc.close();
|
|
@@ -44,12 +44,12 @@ class TunnelRpcPeer {
|
|
|
44
44
|
};
|
|
45
45
|
this._socket.onerror = (event) => {
|
|
46
46
|
var _a;
|
|
47
|
-
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}
|
|
47
|
+
(0, log_1.log)(`Publisher socket error ${this._url} ${event.message}`);
|
|
48
48
|
this.error.emit((_a = event.error) !== null && _a !== void 0 ? _a : new Error(event.message));
|
|
49
49
|
};
|
|
50
50
|
this._rpc = (0, rpc_1.createProtoRpcPeer)({
|
|
51
51
|
requested: {
|
|
52
|
-
Tunnel:
|
|
52
|
+
Tunnel: proto_1.schema.getService('dxos.service.tunnel.Tunnel'),
|
|
53
53
|
},
|
|
54
54
|
exposed: {},
|
|
55
55
|
handlers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kCAAkC;AAClC,kEAAsC;AAEtC,uCAA6C;AAC7C,mCAAgC;AAChC
|
|
1
|
+
{"version":3,"file":"tunnel-rpc-peer.js","sourceRoot":"","sources":["../../../../src/util/tunnel/tunnel-rpc-peer.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
|
@@ -5233,7 +5233,7 @@
|
|
|
5233
5233
|
"name": {
|
|
5234
5234
|
"description": "Tunnel name",
|
|
5235
5235
|
"name": "name",
|
|
5236
|
-
"default": "
|
|
5236
|
+
"default": "ink-hawaii-nuts-paris",
|
|
5237
5237
|
"hasDynamicHelp": false,
|
|
5238
5238
|
"multiple": false,
|
|
5239
5239
|
"type": "option"
|
|
@@ -6005,5 +6005,5 @@
|
|
|
6005
6005
|
]
|
|
6006
6006
|
}
|
|
6007
6007
|
},
|
|
6008
|
-
"version": "0.6.
|
|
6008
|
+
"version": "0.6.10-staging.00555f6"
|
|
6009
6009
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/cli",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.10-staging.00555f6",
|
|
4
4
|
"description": "DXOS CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dxos",
|
|
@@ -48,43 +48,39 @@
|
|
|
48
48
|
"pkg-up": "^3.1.0",
|
|
49
49
|
"platform": "^1.3.6",
|
|
50
50
|
"react": "~18.2.0",
|
|
51
|
-
"undici": "*",
|
|
52
|
-
"uuid": "^9.0.0",
|
|
53
51
|
"ws": "^8.14.2",
|
|
54
52
|
"wtfnode": "^0.9.1",
|
|
55
|
-
"@dxos/agent": "0.6.
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/
|
|
59
|
-
"@dxos/cli-composer": "0.6.
|
|
60
|
-
"@dxos/client-protocol": "0.6.
|
|
61
|
-
"@dxos/client": "0.6.
|
|
62
|
-
"@dxos/client
|
|
63
|
-
"@dxos/config": "0.6.
|
|
64
|
-
"@dxos/context": "0.6.
|
|
65
|
-
"@dxos/debug": "0.6.
|
|
66
|
-
"@dxos/echo-schema": "0.6.
|
|
67
|
-
"@dxos/
|
|
68
|
-
"@dxos/
|
|
69
|
-
"@dxos/
|
|
70
|
-
"@dxos/
|
|
71
|
-
"@dxos/network-manager": "0.6.
|
|
72
|
-
"@dxos/node-std": "0.6.
|
|
73
|
-
"@dxos/
|
|
74
|
-
"@dxos/
|
|
75
|
-
"@dxos/
|
|
76
|
-
"@dxos/
|
|
77
|
-
"@dxos/protocols": "0.6.
|
|
78
|
-
"@dxos/
|
|
79
|
-
"@dxos/
|
|
80
|
-
"@dxos/
|
|
81
|
-
"@dxos/
|
|
82
|
-
"@dxos/util": "0.6.
|
|
53
|
+
"@dxos/agent": "0.6.10-staging.00555f6",
|
|
54
|
+
"@dxos/async": "0.6.10-staging.00555f6",
|
|
55
|
+
"@dxos/bare-template": "0.6.10-staging.00555f6",
|
|
56
|
+
"@dxos/cli-base": "0.6.10-staging.00555f6",
|
|
57
|
+
"@dxos/cli-composer": "0.6.10-staging.00555f6",
|
|
58
|
+
"@dxos/client-protocol": "0.6.10-staging.00555f6",
|
|
59
|
+
"@dxos/client-services": "0.6.10-staging.00555f6",
|
|
60
|
+
"@dxos/client": "0.6.10-staging.00555f6",
|
|
61
|
+
"@dxos/config": "0.6.10-staging.00555f6",
|
|
62
|
+
"@dxos/context": "0.6.10-staging.00555f6",
|
|
63
|
+
"@dxos/debug": "0.6.10-staging.00555f6",
|
|
64
|
+
"@dxos/echo-schema": "0.6.10-staging.00555f6",
|
|
65
|
+
"@dxos/hello-template": "0.6.10-staging.00555f6",
|
|
66
|
+
"@dxos/invariant": "0.6.10-staging.00555f6",
|
|
67
|
+
"@dxos/log": "0.6.10-staging.00555f6",
|
|
68
|
+
"@dxos/functions": "0.6.10-staging.00555f6",
|
|
69
|
+
"@dxos/network-manager": "0.6.10-staging.00555f6",
|
|
70
|
+
"@dxos/node-std": "0.6.10-staging.00555f6",
|
|
71
|
+
"@dxos/plate": "0.6.10-staging.00555f6",
|
|
72
|
+
"@dxos/plugin-markdown": "0.6.10-staging.00555f6",
|
|
73
|
+
"@dxos/observability": "0.6.10-staging.00555f6",
|
|
74
|
+
"@dxos/process": "0.6.10-staging.00555f6",
|
|
75
|
+
"@dxos/protocols": "0.6.10-staging.00555f6",
|
|
76
|
+
"@dxos/rpc": "0.6.10-staging.00555f6",
|
|
77
|
+
"@dxos/plugin-script": "0.6.10-staging.00555f6",
|
|
78
|
+
"@dxos/random": "0.6.10-staging.00555f6",
|
|
79
|
+
"@dxos/tasks-template": "0.6.10-staging.00555f6",
|
|
80
|
+
"@dxos/util": "0.6.10-staging.00555f6"
|
|
83
81
|
},
|
|
84
82
|
"devDependencies": {
|
|
85
|
-
"@effect/schema": "^0.67.16",
|
|
86
83
|
"@oclif/test": "^4.0.3",
|
|
87
|
-
"@phosphor-icons/react": "^2.1.5",
|
|
88
84
|
"@types/cli-progress": "^3.11.0",
|
|
89
85
|
"@types/fs-extra": "^9.0.4",
|
|
90
86
|
"@types/inquirer": "^8.2.10",
|
|
@@ -94,13 +90,13 @@
|
|
|
94
90
|
"@types/node-fetch": "^2.5.10",
|
|
95
91
|
"@types/platform": "^1.3.4",
|
|
96
92
|
"@types/react-dom": "~18.2.0",
|
|
97
|
-
"effect": "^3.2.7",
|
|
98
|
-
"fast-check": "^3.19.0",
|
|
99
93
|
"oclif": "^4.13.0",
|
|
100
|
-
"prettier": "^3.2.4",
|
|
101
94
|
"shx": "^0.3.3",
|
|
102
95
|
"typescript": "^5.5.4",
|
|
103
|
-
"
|
|
96
|
+
"undici": "*"
|
|
97
|
+
},
|
|
98
|
+
"peerDependencies": {
|
|
99
|
+
"undici": "*"
|
|
104
100
|
},
|
|
105
101
|
"engines": {
|
|
106
102
|
"node": ">=18.0.0"
|