tunli 0.4.1 → 0.5.0
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/CHANGELOG.md +21 -0
- package/README.md +3 -1
- package/dist/client.js +16 -2
- package/dist/client.js.map +1 -1
- package/dist/commands/CommandAuth/CommandAuth.d.ts.map +1 -1
- package/dist/commands/CommandAuth/CommandAuth.js +4 -2
- package/dist/commands/CommandAuth/CommandAuth.js.map +1 -1
- package/dist/commands/CommandRegister/CommandRegister.d.ts.map +1 -1
- package/dist/commands/CommandRegister/CommandRegister.js +5 -4
- package/dist/commands/CommandRegister/CommandRegister.js.map +1 -1
- package/dist/commands/CommandUpdate/CommandUpdate.d.ts.map +1 -1
- package/dist/commands/CommandUpdate/CommandUpdate.js +31 -3
- package/dist/commands/CommandUpdate/CommandUpdate.js.map +1 -1
- package/dist/daemon/DaemonServer.d.ts.map +1 -1
- package/dist/daemon/DaemonServer.js +7 -1
- package/dist/daemon/DaemonServer.js.map +1 -1
- package/dist/daemon/protocol.d.ts +5 -0
- package/dist/daemon/protocol.d.ts.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,26 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.5.0] - 2026-03-26
|
|
4
|
+
|
|
5
|
+
### `tunli update`
|
|
6
|
+
- After a successful update, prompts to restart the daemon (`Restart daemon now to apply the update? [y/N]`) if the daemon was running at the time of the update
|
|
7
|
+
- `--restart` — skip prompt, always restart
|
|
8
|
+
- `--no-restart` — skip prompt, never restart
|
|
9
|
+
- Both flags set together is an error
|
|
10
|
+
|
|
11
|
+
### Daemon version check
|
|
12
|
+
- On every command (except `--help`, `--version`, and `tunli daemon …`), the CLI queries the running daemon's version and compares it to the binary version
|
|
13
|
+
- If they differ, an error is shown and the process exits: `Daemon version mismatch: binary is X, daemon is Y. Run \`tunli daemon restart\` to apply the update.`
|
|
14
|
+
- The daemon captures its version at startup so the check is reliable even after the binary has been swapped on disk
|
|
15
|
+
|
|
16
|
+
### Fixes
|
|
17
|
+
- `tunli register` and `tunli auth` without `--relay` / `--name` now correctly fall back to the default server URL and name — `Option.default()` values are not forwarded by the CLI parser, so the fallback is now applied explicitly in the command
|
|
18
|
+
|
|
19
|
+
## [0.4.2] - 2026-03-26
|
|
20
|
+
|
|
21
|
+
### Fixes
|
|
22
|
+
- Tunnel restore after `daemon restart` / update no longer reports "No active tunnels" — daemon now restores the dump before opening the socket, so `DaemonClient.start()` only returns once all tunnels are back
|
|
23
|
+
|
|
3
24
|
## [0.4.1] - 2026-03-26
|
|
4
25
|
|
|
5
26
|
### Fixes
|
package/README.md
CHANGED
|
@@ -232,10 +232,12 @@ tunli connect tunli1abc... --port 2222 # fixed local port
|
|
|
232
232
|
|
|
233
233
|
### `tunli update`
|
|
234
234
|
|
|
235
|
-
Download and apply the latest binary release.
|
|
235
|
+
Download and apply the latest binary release. If the daemon was running, you are prompted to restart it afterwards.
|
|
236
236
|
|
|
237
237
|
```bash
|
|
238
238
|
tunli update
|
|
239
|
+
tunli update --restart # restart daemon automatically without prompting
|
|
240
|
+
tunli update --no-restart # skip daemon restart
|
|
239
241
|
```
|
|
240
242
|
|
|
241
243
|
### `tunli relay`
|
package/dist/client.js
CHANGED
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
// not actionable from userland. removeAllListeners is required because Node's default warning
|
|
3
3
|
// output is itself a listener on 'warning'; adding our own handler alone does not suppress it.
|
|
4
4
|
process.removeAllListeners('warning');
|
|
5
|
-
process.on('warning', (w) => {
|
|
6
|
-
|
|
5
|
+
process.on('warning', (w) => {
|
|
6
|
+
if (w.code !== 'DEP0169')
|
|
7
|
+
process.stderr.write(`Warning: ${w.message}\n`);
|
|
8
|
+
});
|
|
7
9
|
import { readJsonFile } from "#core/FS/utils";
|
|
8
10
|
import { Option, program } from '#commander/index';
|
|
9
11
|
import { FOUND_LOCAL_CONFIG_FILEPATH, GLOBAL_CONFIG_FILEPATH, LOCAL_CONFIG_FILEPATH } from "#lib/defs";
|
|
@@ -32,6 +34,7 @@ import { createCommandUp } from "#commands/CommandUp/CommandUp";
|
|
|
32
34
|
import { createCommandDown } from "#commands/CommandDown/CommandDown";
|
|
33
35
|
import { ApiClient } from "#api-client/ApiClient";
|
|
34
36
|
import { readPackageJson } from "#package-json/packageJson";
|
|
37
|
+
import { DaemonClient } from "#daemon/DaemonClient";
|
|
35
38
|
const globalConf = new ParsedGlobalConfig(readJsonFile(GLOBAL_CONFIG_FILEPATH), GLOBAL_CONFIG_FILEPATH);
|
|
36
39
|
const localConf = FOUND_LOCAL_CONFIG_FILEPATH ? new ParsedLocalConfig(readJsonFile(FOUND_LOCAL_CONFIG_FILEPATH), FOUND_LOCAL_CONFIG_FILEPATH) : undefined;
|
|
37
40
|
const packageJson = readPackageJson();
|
|
@@ -87,5 +90,16 @@ program.action(({ options }) => {
|
|
|
87
90
|
ctx.exit(1);
|
|
88
91
|
}
|
|
89
92
|
});
|
|
93
|
+
const args = process.argv.slice(2);
|
|
94
|
+
const isHelpOrVersion = args.some(a => a === '--help' || a === '-h' || a === '-?' || a === '--version' || a === '-v');
|
|
95
|
+
const isDaemonCommand = args[0] === 'daemon';
|
|
96
|
+
if (!isHelpOrVersion && !isDaemonCommand && packageJson?.version) {
|
|
97
|
+
const res = await new DaemonClient().send({ type: 'version' }).catch(() => null);
|
|
98
|
+
if (res?.type === 'version' && res.version !== packageJson.version) {
|
|
99
|
+
ctx.logger.error(`Daemon version mismatch: binary is ${packageJson.version}, daemon is ${res.version}.\n` +
|
|
100
|
+
`Run \`tunli daemon restart\` to apply the update.`);
|
|
101
|
+
ctx.exit(1);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
90
104
|
await program.parseAsync(process.argv);
|
|
91
105
|
//# sourceMappingURL=client.js.map
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,2FAA2F;AAC3F,8FAA8F;AAC9F,+FAA+F;AAC/F,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;AACrC,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandAuth.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandAuth/CommandAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAG1C,eAAO,MAAM,iBAAiB,GAAI,KAAK,OAAO,EAAE,UAAU,OAAO,
|
|
1
|
+
{"version":3,"file":"CommandAuth.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandAuth/CommandAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AAC7E,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAG1C,eAAO,MAAM,iBAAiB,GAAI,KAAK,OAAO,EAAE,UAAU,OAAO,YA6BhE,CAAA"}
|
|
@@ -9,9 +9,11 @@ export const createCommandAuth = (ctx, _program) => {
|
|
|
9
9
|
cmd.action(async ({ args, options }) => {
|
|
10
10
|
const token = args.token;
|
|
11
11
|
const opt = options;
|
|
12
|
+
const relayUrl = opt.relay ?? DEFAULT_API_SERVER_URL;
|
|
13
|
+
const serverName = opt.name ?? DEFAULT_SERVER_NAME;
|
|
12
14
|
ctx.config.global
|
|
13
|
-
.server(
|
|
14
|
-
.setUrl(
|
|
15
|
+
.server(serverName)
|
|
16
|
+
.setUrl(relayUrl)
|
|
15
17
|
.setAuthToken(token)
|
|
16
18
|
.save();
|
|
17
19
|
ctx.logger.info('Auth token saved.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandAuth.js","sourceRoot":"","sources":["../../../src/commands/CommandAuth/CommandAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAC,sBAAsB,EAAE,mBAAmB,EAAC,MAAM,WAAW,CAAC;AAEtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,QAAiB,EAAE,EAAE;IAMnE,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;SAC5B,WAAW,CAAC,+CAA+C,CAAC;SAC5D,WAAW,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC;SACpE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,8CAA8C,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;SAC9H,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAEvH,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,IAAI,EAAE,OAAO,EAAc,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAe,CAAA;QAClC,MAAM,GAAG,GAAG,OAAkB,CAAA;QAC9B,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"CommandAuth.js","sourceRoot":"","sources":["../../../src/commands/CommandAuth/CommandAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAE7E,OAAO,EAAC,sBAAsB,EAAE,mBAAmB,EAAC,MAAM,WAAW,CAAC;AAEtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,QAAiB,EAAE,EAAE;IAMnE,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;SAC5B,WAAW,CAAC,+CAA+C,CAAC;SAC5D,WAAW,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC;SACpE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,8CAA8C,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;SAC9H,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAEvH,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,IAAI,EAAE,OAAO,EAAc,EAAE,EAAE;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAe,CAAA;QAClC,MAAM,GAAG,GAAG,OAAkB,CAAA;QAC9B,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,IAAI,sBAAsB,CAAA;QACpD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,IAAI,mBAAmB,CAAA;QAClD,GAAG,CAAC,MAAM,CAAC,MAAM;aACd,MAAM,CAAC,UAAU,CAAC;aAClB,MAAM,CAAC,QAAQ,CAAC;aAChB,YAAY,CAAC,KAAK,CAAC;aACnB,IAAI,EAAE,CAAA;QACT,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,WAAW,EAAE,CAAA;IACjB,GAAG,CAAC,UAAU,CAAC,cAAc,EAAE,0CAA0C,CAAC,CAAA;IAC1E,GAAG,CAAC,UAAU,CAAC,8DAA8D,EAAE,4CAA4C,CAAC,CAAA;IAC5H,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandRegister.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandRegister/CommandRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAI1C,eAAO,MAAM,qBAAqB,GAAI,KAAK,OAAO,EAAE,UAAU,OAAO,
|
|
1
|
+
{"version":3,"file":"CommandRegister.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandRegister/CommandRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAA2B,MAAM,kBAAkB,CAAC;AACnE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAC;AAI1C,eAAO,MAAM,qBAAqB,GAAI,KAAK,OAAO,EAAE,UAAU,OAAO,YA8DpE,CAAA"}
|
|
@@ -10,13 +10,14 @@ export const createCommandRegister = (ctx, _program) => {
|
|
|
10
10
|
cmd.action(async ({ options }) => {
|
|
11
11
|
const opt = options;
|
|
12
12
|
const force = opt.force === true;
|
|
13
|
-
const
|
|
13
|
+
const relayUrl = opt.relay ?? DEFAULT_API_SERVER_URL;
|
|
14
|
+
const serverName = opt.name ?? DEFAULT_SERVER_NAME;
|
|
14
15
|
const serverConf = ctx.config.global.server(serverName);
|
|
15
16
|
if (serverConf.exists() && !force) {
|
|
16
17
|
ctx.logger.info('Auth token already exists. Use --force to renew.');
|
|
17
18
|
return ctx.exit(0);
|
|
18
19
|
}
|
|
19
|
-
const { data, error } = await ctx.apiClient.register(
|
|
20
|
+
const { data, error } = await ctx.apiClient.register(relayUrl);
|
|
20
21
|
if (error || !data) {
|
|
21
22
|
if (error) {
|
|
22
23
|
ctx.logger.error(error.message);
|
|
@@ -30,10 +31,10 @@ export const createCommandRegister = (ctx, _program) => {
|
|
|
30
31
|
ctx.config.global.activeServer = serverName;
|
|
31
32
|
}
|
|
32
33
|
serverConf
|
|
33
|
-
.setUrl(
|
|
34
|
+
.setUrl(relayUrl)
|
|
34
35
|
.setAuthToken(data)
|
|
35
36
|
.save();
|
|
36
|
-
ctx.logger.info(`Registration successful. Relay: ${
|
|
37
|
+
ctx.logger.info(`Registration successful. Relay: ${relayUrl} (${serverName})`);
|
|
37
38
|
const isNew = loadIdentity() === null;
|
|
38
39
|
const identity = ensureIdentity();
|
|
39
40
|
if (isNew) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandRegister.js","sourceRoot":"","sources":["../../../src/commands/CommandRegister/CommandRegister.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,MAAM,EAAmB,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAC,sBAAsB,EAAE,mBAAmB,EAAC,MAAM,WAAW,CAAC;AACtE,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAE9F,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,GAAY,EAAE,QAAiB,EAAE,EAAE;IAQvE,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,UAAU,CAAC;SAChC,WAAW,CAAC,iDAAiD,CAAC;SAC9D,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpG,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,2EAA2E,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;SAC3J,SAAS,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,gFAAgF,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAEjK,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAC,OAAO,EAAc,EAAE,EAAE;QAC1C,MAAM,GAAG,GAAG,OAAkB,CAAA;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,KAAK,IAAI,CAAA;QAChC,MAAM,
|
|
1
|
+
{"version":3,"file":"CommandRegister.js","sourceRoot":"","sources":["../../../src/commands/CommandRegister/CommandRegister.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandUpdate.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandUpdate/CommandUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"CommandUpdate.d.ts","sourceRoot":"","sources":["../../../src/commands/CommandUpdate/CommandUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAS,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,cAAc,CAAA;AAQzC,eAAO,MAAM,mBAAmB,GAAI,KAAK,OAAO,EAAE,UAAU,OAAO,YAgElE,CAAA"}
|
|
@@ -1,22 +1,32 @@
|
|
|
1
|
-
import { Command } from '#commander/index';
|
|
1
|
+
import { Command, Option } from '#commander/index';
|
|
2
2
|
import { getAvailableUpdate } from '#cli-app/versionCheck';
|
|
3
3
|
import { downloadBinaryUpdate } from '#lib/Flow/downloadBinaryUpdate';
|
|
4
4
|
import { applyUpdate } from '#lib/Flow/applyUpdate';
|
|
5
5
|
import { readPackageJson } from '#package-json/packageJson';
|
|
6
|
+
import { DaemonClient } from '#daemon/DaemonClient';
|
|
7
|
+
import { confirm } from '#commands/utils';
|
|
6
8
|
export const createCommandUpdate = (ctx, _program) => {
|
|
7
9
|
return new Command('update')
|
|
8
10
|
.description('Update tunli to the latest version')
|
|
9
|
-
.
|
|
11
|
+
.addOption(new Option('restart', 'Restart the daemon after update without prompting'))
|
|
12
|
+
.addOption(new Option('no-restart', 'Skip daemon restart after update without prompting'))
|
|
13
|
+
.action(async ({ options }) => {
|
|
14
|
+
const opt = options;
|
|
10
15
|
const packageJson = readPackageJson();
|
|
11
16
|
if (!packageJson) {
|
|
12
17
|
ctx.logger.error('Could not read package.json');
|
|
13
18
|
return ctx.exit(1);
|
|
14
19
|
}
|
|
20
|
+
if (opt.restart && opt.noRestart) {
|
|
21
|
+
ctx.logger.error('--restart and --no-restart are mutually exclusive');
|
|
22
|
+
return ctx.exit(1);
|
|
23
|
+
}
|
|
15
24
|
const latest = await getAvailableUpdate(packageJson.version);
|
|
16
25
|
if (!latest) {
|
|
17
26
|
ctx.logger.info(`Already on the latest version (${packageJson.version})`);
|
|
18
27
|
return;
|
|
19
28
|
}
|
|
29
|
+
const daemonWasRunning = await DaemonClient.isRunning();
|
|
20
30
|
ctx.logger.info(`Updating to ${latest}...`);
|
|
21
31
|
await new Promise((resolve, reject) => {
|
|
22
32
|
downloadBinaryUpdate((result) => {
|
|
@@ -32,7 +42,25 @@ export const createCommandUpdate = (ctx, _program) => {
|
|
|
32
42
|
});
|
|
33
43
|
});
|
|
34
44
|
await applyUpdate();
|
|
35
|
-
ctx.logger.info(`Updated to ${latest}
|
|
45
|
+
ctx.logger.info(`Updated to ${latest}.`);
|
|
46
|
+
if (!daemonWasRunning)
|
|
47
|
+
return;
|
|
48
|
+
let doRestart;
|
|
49
|
+
if (opt.restart) {
|
|
50
|
+
doRestart = true;
|
|
51
|
+
}
|
|
52
|
+
else if (opt.noRestart) {
|
|
53
|
+
doRestart = false;
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
doRestart = await confirm('Restart daemon now to apply the update? [y/N] ');
|
|
57
|
+
}
|
|
58
|
+
if (!doRestart) {
|
|
59
|
+
ctx.logger.info('Daemon restart skipped. Run `tunli daemon restart` to apply.');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
await DaemonClient.start();
|
|
63
|
+
ctx.logger.info('Daemon restarted.');
|
|
36
64
|
});
|
|
37
65
|
};
|
|
38
66
|
//# sourceMappingURL=CommandUpdate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommandUpdate.js","sourceRoot":"","sources":["../../../src/commands/CommandUpdate/CommandUpdate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"CommandUpdate.js","sourceRoot":"","sources":["../../../src/commands/CommandUpdate/CommandUpdate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonServer.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAA8B,MAAM,cAAc,CAAA;AAGrE,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"DaemonServer.d.ts","sourceRoot":"","sources":["../../src/daemon/DaemonServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAA8B,MAAM,cAAc,CAAA;AAGrE,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAA;AAa7D,qBAAa,YAAY;;gBAQX,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM;IAMpD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CA2M9B"}
|
|
@@ -5,14 +5,17 @@ import { AppEventEmitter } from '#cli-app/AppEventEmitter';
|
|
|
5
5
|
import { ApiClient } from '#api-client/ApiClient';
|
|
6
6
|
import { ParsedGlobalConfig } from '#config/ParsedGlobalConfig';
|
|
7
7
|
import { createProxy } from '#proxy/Proxy';
|
|
8
|
+
import { readPackageJson } from '#package-json/packageJson';
|
|
8
9
|
export class DaemonServer {
|
|
9
10
|
#logger;
|
|
10
11
|
#apiClient;
|
|
12
|
+
#version;
|
|
11
13
|
#tunnels = new Map();
|
|
12
14
|
#server;
|
|
13
15
|
constructor(globalConf, logger) {
|
|
14
16
|
this.#logger = logger;
|
|
15
17
|
this.#apiClient = new ApiClient(globalConf);
|
|
18
|
+
this.#version = readPackageJson()?.version ?? 'unknown';
|
|
16
19
|
}
|
|
17
20
|
async listen() {
|
|
18
21
|
try {
|
|
@@ -37,9 +40,9 @@ export class DaemonServer {
|
|
|
37
40
|
}
|
|
38
41
|
});
|
|
39
42
|
});
|
|
43
|
+
await this.#restoreFromDump();
|
|
40
44
|
await new Promise((resolve) => this.#server.listen(DAEMON_SOCKET_PATH, resolve));
|
|
41
45
|
this.#logger.info('Daemon listening');
|
|
42
|
-
await this.#restoreFromDump();
|
|
43
46
|
process.on('SIGTERM', () => this.#shutdown());
|
|
44
47
|
process.on('SIGINT', () => this.#shutdown());
|
|
45
48
|
}
|
|
@@ -59,6 +62,9 @@ export class DaemonServer {
|
|
|
59
62
|
this.#respond(socket, { type: 'ok' });
|
|
60
63
|
this.#shutdown();
|
|
61
64
|
return;
|
|
65
|
+
case 'version':
|
|
66
|
+
this.#respond(socket, { type: 'version', version: this.#version });
|
|
67
|
+
return;
|
|
62
68
|
}
|
|
63
69
|
}
|
|
64
70
|
async #handleStart(req, socket) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DaemonServer.js","sourceRoot":"","sources":["../../src/daemon/DaemonServer.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAA;AACrB,OAAO,EAAC,YAAY,EAAE,UAAU,EAAC,MAAM,SAAS,CAAA;AAChD,OAAO,EAAC,kBAAkB,EAAE,qBAAqB,EAAC,MAAM,WAAW,CAAA;AAGnE,OAAO,EAAC,eAAe,EAAsD,MAAM,0BAA0B,CAAA;AAC7G,OAAO,EAAC,SAAS,EAAC,MAAM,uBAAuB,CAAA;AAC/C,OAAO,EAAC,kBAAkB,EAAC,MAAM,4BAA4B,CAAA;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"DaemonServer.js","sourceRoot":"","sources":["../../src/daemon/DaemonServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,8 @@ export type DaemonRequest = StartRequest | {
|
|
|
31
31
|
type: 'dump';
|
|
32
32
|
} | {
|
|
33
33
|
type: 'shutdown';
|
|
34
|
+
} | {
|
|
35
|
+
type: 'version';
|
|
34
36
|
};
|
|
35
37
|
export type EventMessage = {
|
|
36
38
|
type: 'event';
|
|
@@ -93,6 +95,9 @@ export type DaemonResponse = {
|
|
|
93
95
|
status: TunnelInfo['status'];
|
|
94
96
|
lastLatency?: number;
|
|
95
97
|
requestCount: number;
|
|
98
|
+
} | {
|
|
99
|
+
type: 'version';
|
|
100
|
+
version: string;
|
|
96
101
|
} | EventMessage | {
|
|
97
102
|
type: 'error';
|
|
98
103
|
message: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/daemon/protocol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,YAAY,EAAC,MAAM,0BAA0B,CAAA;AAE7E,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,YAAY,GAAG,WAAW,GAAG,cAAc,GAAG,OAAO,CAAA;CAC9D,CAAA;AAID,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,EAAE,OAAO,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAAA;AAErD,MAAM,MAAM,aAAa,GACrB,YAAY,GACZ;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/daemon/protocol.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED