@dxos/cli 0.1.52-main.9577e70 → 0.1.52-main.b9b5b8f
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/README.md +1 -1
- package/dist/src/commands/agent/start.d.ts +2 -0
- package/dist/src/commands/agent/start.d.ts.map +1 -1
- package/dist/src/commands/agent/start.js +51 -39
- package/dist/src/commands/agent/start.js.map +1 -1
- package/dist/src/util/telemetryrc.json +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +23 -23
package/README.md
CHANGED
|
@@ -16,5 +16,7 @@ export default class Start extends BaseCommand<typeof Start> {
|
|
|
16
16
|
timeout: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
17
17
|
};
|
|
18
18
|
run(): Promise<any>;
|
|
19
|
+
private _runInForeground;
|
|
20
|
+
private _runAsDaemon;
|
|
19
21
|
}
|
|
20
22
|
//# sourceMappingURL=start.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAyB;IAEpD,OAAgB,KAAK;;;;;;;;;;;;MAqBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IAC1D,OAAgB,cAAc,UAAQ;IACtC,OAAgB,WAAW,SAAyB;IAEpD,OAAgB,KAAK;;;;;;;;;;;;MAqBnB;IAEI,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;YAQX,gBAAgB;YAuChB,YAAY;CAe3B"}
|
|
@@ -14,49 +14,61 @@ const base_command_1 = require("../../base-command");
|
|
|
14
14
|
const util_1 = require("../../util");
|
|
15
15
|
class Start extends base_command_1.BaseCommand {
|
|
16
16
|
async run() {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const listen = [];
|
|
20
|
-
if (this.flags.socket) {
|
|
21
|
-
listen.push(`unix://${client_protocol_1.DX_RUNTIME}/profile/${this.flags.profile}/agent.sock`);
|
|
22
|
-
}
|
|
23
|
-
if (this.flags['web-socket']) {
|
|
24
|
-
listen.push(`ws://localhost:${this.flags['web-socket']}`);
|
|
25
|
-
}
|
|
26
|
-
if (this.flags.http) {
|
|
27
|
-
listen.push(`http://localhost:${this.flags.http}`);
|
|
28
|
-
}
|
|
29
|
-
const options = {
|
|
30
|
-
profile: this.flags.profile,
|
|
31
|
-
listen,
|
|
32
|
-
};
|
|
33
|
-
// TODO(burdon): Build monitoring into agent start (not just epoch).
|
|
34
|
-
if (this.flags.epoch && this.flags.epoch !== '0') {
|
|
35
|
-
options.monitor = {
|
|
36
|
-
limit: (0, util_1.safeParseInt)(this.flags.epoch, undefined),
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
const agent = new agent_1.Agent(this.clientConfig, options);
|
|
40
|
-
await agent.start();
|
|
41
|
-
// NOTE: This is currently called by the agent's forever daemon.
|
|
42
|
-
this.log('Agent started... (ctrl-c to exit)');
|
|
43
|
-
process.on('SIGINT', async () => {
|
|
44
|
-
await agent.stop();
|
|
45
|
-
process.exit(0);
|
|
46
|
-
});
|
|
47
|
-
if (this.flags['web-socket']) {
|
|
48
|
-
this.log(`Open devtools: https://devtools.dxos.org?target=ws://localhost:${this.flags['web-socket']}`);
|
|
49
|
-
}
|
|
17
|
+
if (this.flags.foreground) {
|
|
18
|
+
await this._runInForeground();
|
|
50
19
|
}
|
|
51
20
|
else {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
21
|
+
await this._runAsDaemon();
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
async _runInForeground() {
|
|
25
|
+
const listen = [];
|
|
26
|
+
if (this.flags.socket) {
|
|
27
|
+
listen.push(`unix://${client_protocol_1.DX_RUNTIME}/profile/${this.flags.profile}/agent.sock`);
|
|
28
|
+
}
|
|
29
|
+
if (this.flags['web-socket']) {
|
|
30
|
+
listen.push(`ws://localhost:${this.flags['web-socket']}`);
|
|
31
|
+
}
|
|
32
|
+
if (this.flags.http) {
|
|
33
|
+
listen.push(`http://localhost:${this.flags.http}`);
|
|
34
|
+
}
|
|
35
|
+
const options = {
|
|
36
|
+
profile: this.flags.profile,
|
|
37
|
+
listen,
|
|
38
|
+
};
|
|
39
|
+
// TODO(burdon): Build monitoring into agent start (not just epoch).
|
|
40
|
+
if (this.flags.epoch && this.flags.epoch !== '0') {
|
|
41
|
+
options.monitor = {
|
|
42
|
+
limit: (0, util_1.safeParseInt)(this.flags.epoch, undefined),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
const agent = new agent_1.Agent(this.clientConfig, options);
|
|
46
|
+
await agent.start();
|
|
47
|
+
// NOTE: This is currently called by the agent's forever daemon.
|
|
48
|
+
this.log('Agent started... (ctrl-c to exit)');
|
|
49
|
+
process.on('SIGINT', async () => {
|
|
50
|
+
await agent.stop();
|
|
51
|
+
process.exit(0);
|
|
52
|
+
});
|
|
53
|
+
if (this.flags['web-socket']) {
|
|
54
|
+
this.log(`Open devtools: https://devtools.dxos.org?target=ws://localhost:${this.flags['web-socket']}`);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
async _runAsDaemon() {
|
|
58
|
+
return await this.execWithDaemon(async (daemon) => {
|
|
59
|
+
if (await daemon.isRunning(this.flags.profile)) {
|
|
60
|
+
this.log((0, chalk_1.default) `{red Warning}: '${this.flags.profile}' is already running (Maybe run 'dx reset')`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
try {
|
|
56
64
|
await daemon.start(this.flags.profile);
|
|
57
65
|
this.log('Agent started');
|
|
58
|
-
}
|
|
59
|
-
|
|
66
|
+
}
|
|
67
|
+
catch (err) {
|
|
68
|
+
this.log((0, chalk_1.default) `{red Failed to start daemon}: ${err}`);
|
|
69
|
+
await daemon.stop(this.flags.profile);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
60
72
|
}
|
|
61
73
|
}
|
|
62
74
|
Start.enableJsonFlag = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,sCAAoC;AACpC,kDAA0B;AAE1B,uCAAkD;AAClD,2DAAmD;AAEnD,qDAAiD;AACjD,qCAA0C;AAE1C,MAAqB,KAAM,SAAQ,0BAAyB;IA2B1D,KAAK,CAAC,GAAG;QACP,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/agent/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"DX_ENVIRONMENT": "staging",
|
|
3
|
-
"DX_RELEASE": "@dxos/cli@0.1.52-main.
|
|
3
|
+
"DX_RELEASE": "@dxos/cli@0.1.52-main.b9b5b8f",
|
|
4
4
|
"SENTRY_DESTINATION": "https://2647916221e643869965e78469479aa4@o4504012000067584.ingest.sentry.io/4504012027265029",
|
|
5
5
|
"TELEMETRY_API_KEY": "B00QG6PtJJrJ0VVFe0H5a6bcUUShKyZM",
|
|
6
6
|
"IPDATA_API_KEY": "ccc5f0cd66dd34a7c31c2ddc61c2bbca2db73892a993982bb3a5f0e2"
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/cli",
|
|
3
|
-
"version": "0.1.52-main.
|
|
3
|
+
"version": "0.1.52-main.b9b5b8f",
|
|
4
4
|
"description": "DXOS CLI",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dxos",
|
|
@@ -47,28 +47,28 @@
|
|
|
47
47
|
"tempy": "^1.0.1",
|
|
48
48
|
"uuid": "^8.3.2",
|
|
49
49
|
"ws": "^7.4.4",
|
|
50
|
-
"@dxos/agent": "0.1.52-main.
|
|
51
|
-
"@dxos/async": "0.1.52-main.
|
|
52
|
-
"@dxos/bare-template": "0.1.52-main.
|
|
53
|
-
"@dxos/client": "0.1.52-main.
|
|
54
|
-
"@dxos/client-protocol": "0.1.52-main.
|
|
55
|
-
"@dxos/client-services": "0.1.52-main.
|
|
56
|
-
"@dxos/
|
|
57
|
-
"@dxos/
|
|
58
|
-
"@dxos/context": "0.1.52-main.
|
|
59
|
-
"@dxos/debug": "0.1.52-main.
|
|
60
|
-
"@dxos/hello-template": "0.1.52-main.
|
|
61
|
-
"@dxos/keys": "0.1.52-main.
|
|
62
|
-
"@dxos/log": "0.1.52-main.
|
|
63
|
-
"@dxos/observable-object": "0.1.52-main.
|
|
64
|
-
"@dxos/plate": "0.1.52-main.
|
|
65
|
-
"@dxos/protocols": "0.1.52-main.
|
|
66
|
-
"@dxos/rpc": "0.1.52-main.
|
|
67
|
-
"@dxos/sentry": "0.1.52-main.
|
|
68
|
-
"@dxos/tasks-template": "0.1.52-main.
|
|
69
|
-
"@dxos/telemetry": "0.1.52-main.
|
|
70
|
-
"@dxos/util": "0.1.52-main.
|
|
71
|
-
"@dxos/websocket-rpc": "0.1.52-main.
|
|
50
|
+
"@dxos/agent": "0.1.52-main.b9b5b8f",
|
|
51
|
+
"@dxos/async": "0.1.52-main.b9b5b8f",
|
|
52
|
+
"@dxos/bare-template": "0.1.52-main.b9b5b8f",
|
|
53
|
+
"@dxos/client": "0.1.52-main.b9b5b8f",
|
|
54
|
+
"@dxos/client-protocol": "0.1.52-main.b9b5b8f",
|
|
55
|
+
"@dxos/client-services": "0.1.52-main.b9b5b8f",
|
|
56
|
+
"@dxos/codec-protobuf": "0.1.52-main.b9b5b8f",
|
|
57
|
+
"@dxos/config": "0.1.52-main.b9b5b8f",
|
|
58
|
+
"@dxos/context": "0.1.52-main.b9b5b8f",
|
|
59
|
+
"@dxos/debug": "0.1.52-main.b9b5b8f",
|
|
60
|
+
"@dxos/hello-template": "0.1.52-main.b9b5b8f",
|
|
61
|
+
"@dxos/keys": "0.1.52-main.b9b5b8f",
|
|
62
|
+
"@dxos/log": "0.1.52-main.b9b5b8f",
|
|
63
|
+
"@dxos/observable-object": "0.1.52-main.b9b5b8f",
|
|
64
|
+
"@dxos/plate": "0.1.52-main.b9b5b8f",
|
|
65
|
+
"@dxos/protocols": "0.1.52-main.b9b5b8f",
|
|
66
|
+
"@dxos/rpc": "0.1.52-main.b9b5b8f",
|
|
67
|
+
"@dxos/sentry": "0.1.52-main.b9b5b8f",
|
|
68
|
+
"@dxos/tasks-template": "0.1.52-main.b9b5b8f",
|
|
69
|
+
"@dxos/telemetry": "0.1.52-main.b9b5b8f",
|
|
70
|
+
"@dxos/util": "0.1.52-main.b9b5b8f",
|
|
71
|
+
"@dxos/websocket-rpc": "0.1.52-main.b9b5b8f"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"@oclif/test": "^2.3.11",
|