@monotykamary/localterm 1.11.1 → 1.11.3
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 +4 -4
- package/dist/commands/restart.d.ts.map +1 -1
- package/dist/commands/restart.js +2 -1
- package/dist/commands/restart.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +54 -13
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +19 -6
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/stop.d.ts.map +1 -1
- package/dist/commands/stop.js +21 -5
- package/dist/commands/stop.js.map +1 -1
- package/dist/index.js +14 -3
- package/dist/index.js.map +1 -1
- package/dist/paths.d.ts +1 -0
- package/dist/paths.d.ts.map +1 -1
- package/dist/paths.js +1 -0
- package/dist/paths.js.map +1 -1
- package/dist/state.d.ts +2 -1
- package/dist/state.d.ts.map +1 -1
- package/dist/state.js +27 -7
- package/dist/state.js.map +1 -1
- package/dist/utils/poll-for-daemon-ready.d.ts +2 -1
- package/dist/utils/poll-for-daemon-ready.d.ts.map +1 -1
- package/dist/utils/poll-for-daemon-ready.js +4 -3
- package/dist/utils/poll-for-daemon-ready.js.map +1 -1
- package/dist/utils/run-start-preflight.d.ts +1 -1
- package/dist/utils/run-start-preflight.d.ts.map +1 -1
- package/dist/utils/run-start-preflight.js +7 -1
- package/dist/utils/run-start-preflight.js.map +1 -1
- package/dist/utils/verify-pid-is-localterm.d.ts +2 -1
- package/dist/utils/verify-pid-is-localterm.d.ts.map +1 -1
- package/dist/utils/verify-pid-is-localterm.js +3 -3
- package/dist/utils/verify-pid-is-localterm.js.map +1 -1
- package/package.json +15 -14
- package/terminal/assets/{index-DsfFB-Jd.js → index-TQyjKb-9.js} +6 -6
- package/terminal/assets/index-TQyjKb-9.js.map +1 -0
- package/terminal/index.html +1 -1
- package/terminal/assets/index-DsfFB-Jd.js.map +0 -1
package/README.md
CHANGED
|
@@ -34,7 +34,7 @@ The mental model is **shell = browser tab**:
|
|
|
34
34
|
- **Close tab** → shell dies immediately
|
|
35
35
|
- **Reload tab** → fresh shell (the prior one is gone)
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
Reloads and connection drops spawn a fresh shell (auto-reconnect is built in for transport failures). If you want a long-lived shell that survives reloads, run `tmux` _inside_ localterm.
|
|
38
38
|
|
|
39
39
|
## CLI
|
|
40
40
|
|
|
@@ -55,11 +55,11 @@ State lives in `~/.localterm/` (PID, port, server log at `~/.localterm/server.lo
|
|
|
55
55
|
|
|
56
56
|
## Resources & Contributing Back
|
|
57
57
|
|
|
58
|
-
Looking to contribute back? Check out the [Contributing Guide](https://github.com/
|
|
58
|
+
Looking to contribute back? Check out the [Contributing Guide](https://github.com/monotykamary/localterm/blob/main/CONTRIBUTING.md) and [`AGENTS.md`](https://github.com/monotykamary/localterm/blob/main/AGENTS.md) for code style.
|
|
59
59
|
|
|
60
|
-
Find a bug? Head over to our [issue tracker](https://github.com/
|
|
60
|
+
Find a bug? Head over to our [issue tracker](https://github.com/monotykamary/localterm/issues) and we'll do our best to help. We love pull requests, too!
|
|
61
61
|
|
|
62
|
-
[**→ Start contributing on GitHub**](https://github.com/
|
|
62
|
+
[**→ Start contributing on GitHub**](https://github.com/monotykamary/localterm/blob/main/CONTRIBUTING.md)
|
|
63
63
|
|
|
64
64
|
### License
|
|
65
65
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,UAAU,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"restart.d.ts","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;CACf;AAED,eAAO,MAAM,UAAU,GAAU,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAqCtE,CAAC"}
|
package/dist/commands/restart.js
CHANGED
|
@@ -2,7 +2,7 @@ import { openSync } from "node:fs";
|
|
|
2
2
|
import kleur from "kleur";
|
|
3
3
|
import { DAEMON_PROBE_INTERVAL_MS, DAEMON_PROBE_MAX_WAIT_MS } from "../constants.js";
|
|
4
4
|
import { cliError, exitCodeForCliError } from "../errors.js";
|
|
5
|
-
import { ensureLogFile, isAlive, readPort } from "../state.js";
|
|
5
|
+
import { ensureLogFile, isAlive, readHost, readPort } from "../state.js";
|
|
6
6
|
import { buildDaemonStartArgs } from "../utils/build-daemon-args.js";
|
|
7
7
|
import { pollForDaemonReady } from "../utils/poll-for-daemon-ready.js";
|
|
8
8
|
import { reportCliError } from "../utils/report-cli-error.js";
|
|
@@ -31,6 +31,7 @@ export const runRestart = async (options) => {
|
|
|
31
31
|
logPath,
|
|
32
32
|
isAlive,
|
|
33
33
|
readPort,
|
|
34
|
+
readHost,
|
|
34
35
|
sleep,
|
|
35
36
|
});
|
|
36
37
|
if (result.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../src/commands/restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAQpC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,OAAuB,EAAiB,EAAE;IACzE,MAAM,OAAO,EAAE,CAAC;IAChB,MAAM,eAAe,GAAG,QAAQ,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACrC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC;QACpC,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC;QACnC,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpE,cAAc,CAAC,KAAK,CAAC,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC;QACtC,QAAQ;QACR,WAAW,EAAE,eAAe;QAC5B,UAAU,EAAE,wBAAwB;QACpC,SAAS,EAAE,wBAAwB;QACnC,OAAO;QACP,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,KAAK;KACN,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,KAAK,CAAC,oBAAoB,QAAQ,UAAU,MAAM,CAAC,IAAI,WAAW,OAAO,GAAG,CAAC,CACpF,CAAC;QACF,OAAO;IACT,CAAC;IAED,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AAClD,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AA+CA,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;CACrB;AAID,eAAO,MAAM,QAAQ,GAAU,SAAS,YAAY,KAAG,OAAO,CAAC,IAAI,CAMlE,CAAC;AAgMF,eAAO,MAAM,aAAa,EAAE,YAK3B,CAAC"}
|
package/dist/commands/start.js
CHANGED
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
import { existsSync, openSync } from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { fileURLToPath } from "node:url";
|
|
4
|
-
import { createServer, DEFAULT_HOST, DEFAULT_PORT } from "@monotykamary/localterm-server";
|
|
4
|
+
import { createServer, DEFAULT_HOST, DEFAULT_PORT, isLoopbackHost, isServerErrorException, } from "@monotykamary/localterm-server";
|
|
5
5
|
import kleur from "kleur";
|
|
6
6
|
import open from "open";
|
|
7
7
|
import { DAEMON_CHILD_ENV_FLAG, DAEMON_PROBE_INTERVAL_MS, DAEMON_PROBE_MAX_WAIT_MS, DAEMON_PROCESS_TITLE, EXIT_FAILURE, EXIT_OK, FORCE_EXIT_TIMEOUT_MS, getFriendlyUrl, STOP_COMMAND, } from "../constants.js";
|
|
8
8
|
import { cliError, exitCodeForCliError } from "../errors.js";
|
|
9
|
-
import { clearPid, ensureLogFile, isAlive, readPort, writePid } from "../state.js";
|
|
9
|
+
import { clearPid, ensureLogFile, isAlive, readHost, readPort, writePid } from "../state.js";
|
|
10
10
|
import { buildDaemonStartArgs } from "../utils/build-daemon-args.js";
|
|
11
11
|
import { pollForDaemonReady } from "../utils/poll-for-daemon-ready.js";
|
|
12
12
|
import { reportCliError } from "../utils/report-cli-error.js";
|
|
13
13
|
import { runStartPreflight } from "../utils/run-start-preflight.js";
|
|
14
14
|
import { sleep } from "../utils/sleep.js";
|
|
15
15
|
import { spawnDaemon } from "../utils/spawn-daemon.js";
|
|
16
|
+
import { runStop } from "./stop.js";
|
|
16
17
|
const moduleDir = path.dirname(fileURLToPath(import.meta.url));
|
|
17
18
|
const resolveStaticRoot = () => {
|
|
18
19
|
const candidates = [
|
|
@@ -34,11 +35,19 @@ export const runStart = async (options) => {
|
|
|
34
35
|
}
|
|
35
36
|
await runStartAsDaemon(options);
|
|
36
37
|
};
|
|
38
|
+
const handlePreflightError = (preflightError) => {
|
|
39
|
+
reportCliError(preflightError);
|
|
40
|
+
process.exit(exitCodeForCliError(preflightError));
|
|
41
|
+
};
|
|
37
42
|
const runStartAsDaemon = async (options) => {
|
|
38
|
-
const preflightError = runStartPreflight();
|
|
43
|
+
const preflightError = await runStartPreflight();
|
|
39
44
|
if (preflightError !== null) {
|
|
40
|
-
|
|
41
|
-
|
|
45
|
+
if (preflightError.kind === "stale-port-file")
|
|
46
|
+
await runStop();
|
|
47
|
+
else {
|
|
48
|
+
handlePreflightError(preflightError);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
42
51
|
}
|
|
43
52
|
const portBeforeSpawn = readPort();
|
|
44
53
|
const logPath = ensureLogFile();
|
|
@@ -60,6 +69,7 @@ const runStartAsDaemon = async (options) => {
|
|
|
60
69
|
logPath,
|
|
61
70
|
isAlive,
|
|
62
71
|
readPort,
|
|
72
|
+
readHost,
|
|
63
73
|
sleep,
|
|
64
74
|
});
|
|
65
75
|
if (result.ok) {
|
|
@@ -93,12 +103,16 @@ const openInBrowser = async (url) => {
|
|
|
93
103
|
}
|
|
94
104
|
};
|
|
95
105
|
const runStartInForeground = async (options) => {
|
|
96
|
-
|
|
106
|
+
process.title = DAEMON_PROCESS_TITLE;
|
|
107
|
+
const preflightError = await runStartPreflight();
|
|
97
108
|
if (preflightError !== null) {
|
|
98
|
-
|
|
99
|
-
|
|
109
|
+
if (preflightError.kind === "stale-port-file")
|
|
110
|
+
await runStop();
|
|
111
|
+
else {
|
|
112
|
+
handlePreflightError(preflightError);
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
100
115
|
}
|
|
101
|
-
process.title = DAEMON_PROCESS_TITLE;
|
|
102
116
|
const staticRoot = resolveStaticRoot();
|
|
103
117
|
if (!staticRoot) {
|
|
104
118
|
console.log(kleur.yellow("warning: terminal bundle not found. run 'pnpm build' first or only the API will be served."));
|
|
@@ -112,11 +126,38 @@ const runStartInForeground = async (options) => {
|
|
|
112
126
|
});
|
|
113
127
|
}
|
|
114
128
|
catch (caughtError) {
|
|
115
|
-
const
|
|
116
|
-
|
|
117
|
-
|
|
129
|
+
const isEaddrInuse = isServerErrorException(caughtError) &&
|
|
130
|
+
caughtError.error.kind === "listen-failed" &&
|
|
131
|
+
caughtError.error.cause instanceof Error &&
|
|
132
|
+
caughtError.error.cause.code === "EADDRINUSE";
|
|
133
|
+
if (isEaddrInuse) {
|
|
134
|
+
await runStop();
|
|
135
|
+
try {
|
|
136
|
+
server = await createServer({
|
|
137
|
+
port: options.port,
|
|
138
|
+
host: options.host,
|
|
139
|
+
staticRoot,
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
catch (retryError) {
|
|
143
|
+
console.error(kleur.red(`port ${options.port} is still in use after stop. ` +
|
|
144
|
+
`find the process with: lsof -i :${options.port} ` +
|
|
145
|
+
`or: fuser ${options.port}/tcp`));
|
|
146
|
+
const startError = cliError.serverStartFailed(retryError instanceof Error ? retryError : new Error(String(retryError)));
|
|
147
|
+
reportCliError(startError);
|
|
148
|
+
process.exit(exitCodeForCliError(startError));
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
const startError = cliError.serverStartFailed(caughtError instanceof Error ? caughtError : new Error(String(caughtError)));
|
|
153
|
+
reportCliError(startError);
|
|
154
|
+
process.exit(exitCodeForCliError(startError));
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
if (!isLoopbackHost(options.host)) {
|
|
158
|
+
console.warn(kleur.yellow(`⚠ binding to ${options.host} — anyone on this network can open a shell. an authentication mechanism is not yet available; see https://github.com/monotykamary/localterm/issues`));
|
|
118
159
|
}
|
|
119
|
-
writePid(process.pid, server.port);
|
|
160
|
+
writePid(process.pid, server.port, options.host);
|
|
120
161
|
const namedUrl = getFriendlyUrl(server.port);
|
|
121
162
|
if (isRunningAsDaemonChild()) {
|
|
122
163
|
console.log(`${kleur.green("✔")} daemon listening on ${namedUrl} (pid ${process.pid})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,SAAS,QAAa,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,SAAS,QAAa,OAAO,CAAC,IAAI,CA+C9C,CAAC"}
|
package/dist/commands/status.js
CHANGED
|
@@ -1,22 +1,33 @@
|
|
|
1
1
|
import kleur from "kleur";
|
|
2
2
|
import { healthSchema } from "@monotykamary/localterm-server";
|
|
3
3
|
import { getFriendlyUrl } from "../constants.js";
|
|
4
|
-
import { cliError } from "../errors.js";
|
|
5
|
-
import { isAlive, readPid, readPort } from "../state.js";
|
|
4
|
+
import { cliError, exitCodeForCliError } from "../errors.js";
|
|
5
|
+
import { clearPid, isAlive, readHost, readPid, readPort } from "../state.js";
|
|
6
6
|
import { reportCliError } from "../utils/report-cli-error.js";
|
|
7
7
|
export const runStatus = async () => {
|
|
8
8
|
const pid = readPid();
|
|
9
9
|
const port = readPort();
|
|
10
|
-
if (!pid
|
|
10
|
+
if (!pid && !port) {
|
|
11
11
|
console.log(kleur.dim("localterm is not running."));
|
|
12
12
|
return;
|
|
13
13
|
}
|
|
14
|
+
if (!pid) {
|
|
15
|
+
clearPid();
|
|
16
|
+
console.log(kleur.dim("stale port file removed."));
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
14
19
|
if (!isAlive(pid)) {
|
|
20
|
+
clearPid();
|
|
15
21
|
console.log(kleur.yellow(`pid ${pid} is gone (stale state). run 'localterm start'.`));
|
|
16
22
|
return;
|
|
17
23
|
}
|
|
24
|
+
if (!port) {
|
|
25
|
+
console.log(kleur.yellow(`pid ${pid} is alive but port is unknown. run 'localterm stop' then 'localterm start'.`));
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const resolvedHost = readHost() ?? "127.0.0.1";
|
|
18
29
|
try {
|
|
19
|
-
const response = await fetch(`http
|
|
30
|
+
const response = await fetch(`http://${resolvedHost}:${port}/api/health`);
|
|
20
31
|
if (!response.ok)
|
|
21
32
|
throw new Error(`health check failed: ${response.status}`);
|
|
22
33
|
const health = healthSchema.parse(await response.json());
|
|
@@ -24,11 +35,13 @@ export const runStatus = async () => {
|
|
|
24
35
|
console.log(` pid: ${pid}`);
|
|
25
36
|
console.log(` port: ${port}`);
|
|
26
37
|
console.log(` url: ${kleur.cyan(getFriendlyUrl(port))}`);
|
|
27
|
-
console.log(` raw: ${kleur.dim(`http
|
|
38
|
+
console.log(` raw: ${kleur.dim(`http://${resolvedHost}:${port}`)}`);
|
|
28
39
|
console.log(` sessions: ${health.sessions}`);
|
|
29
40
|
}
|
|
30
41
|
catch (error) {
|
|
31
|
-
|
|
42
|
+
const healthError = cliError.healthCheckFailed(pid, port, error instanceof Error ? error : new Error(String(error)));
|
|
43
|
+
reportCliError(healthError);
|
|
44
|
+
process.exitCode = exitCodeForCliError(healthError);
|
|
32
45
|
}
|
|
33
46
|
};
|
|
34
47
|
//# sourceMappingURL=status.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../src/commands/stop.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,OAAO,QAAa,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"stop.d.ts","sourceRoot":"","sources":["../../src/commands/stop.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,OAAO,QAAa,OAAO,CAAC,IAAI,CA+D5C,CAAC"}
|
package/dist/commands/stop.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import kleur from "kleur";
|
|
2
2
|
import { STOP_MAX_WAIT_MS, STOP_POLL_INTERVAL_MS } from "../constants.js";
|
|
3
|
-
import { cliError } from "../errors.js";
|
|
3
|
+
import { cliError, exitCodeForCliError } from "../errors.js";
|
|
4
4
|
import { clearPid, isAlive, readPid } from "../state.js";
|
|
5
5
|
import { reportCliError } from "../utils/report-cli-error.js";
|
|
6
6
|
import { sleep } from "../utils/sleep.js";
|
|
@@ -16,17 +16,25 @@ export const runStop = async () => {
|
|
|
16
16
|
console.log(kleur.dim("stale pid file removed."));
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
19
|
-
const
|
|
20
|
-
if (
|
|
21
|
-
|
|
19
|
+
const verification = await verifyPidIsLocalterm(pid);
|
|
20
|
+
if (verification === "not-ours") {
|
|
21
|
+
const notOursError = cliError.pidNotOurs(pid);
|
|
22
|
+
reportCliError(notOursError);
|
|
23
|
+
process.exitCode = exitCodeForCliError(notOursError);
|
|
22
24
|
clearPid();
|
|
23
25
|
return;
|
|
24
26
|
}
|
|
27
|
+
if (verification === "unknown") {
|
|
28
|
+
console.warn(kleur.yellow(`⚠ could not verify pid ${pid} — refusing to signal it. run 'kill ${pid}' manually if needed.`));
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
25
31
|
try {
|
|
26
32
|
process.kill(pid, "SIGTERM");
|
|
27
33
|
}
|
|
28
34
|
catch (error) {
|
|
29
|
-
|
|
35
|
+
const signalError = cliError.signalFailed(pid, error instanceof Error ? error : new Error(String(error)));
|
|
36
|
+
reportCliError(signalError);
|
|
37
|
+
process.exitCode = exitCodeForCliError(signalError);
|
|
30
38
|
return;
|
|
31
39
|
}
|
|
32
40
|
let waited = 0;
|
|
@@ -41,6 +49,14 @@ export const runStop = async () => {
|
|
|
41
49
|
catch {
|
|
42
50
|
/* process exited between SIGTERM and SIGKILL */
|
|
43
51
|
}
|
|
52
|
+
let killWaited = 0;
|
|
53
|
+
while (isAlive(pid) && killWaited < STOP_MAX_WAIT_MS) {
|
|
54
|
+
await sleep(STOP_POLL_INTERVAL_MS);
|
|
55
|
+
killWaited += STOP_POLL_INTERVAL_MS;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (isAlive(pid)) {
|
|
59
|
+
console.warn(kleur.yellow(`pid ${pid} did not exit after SIGKILL`));
|
|
44
60
|
}
|
|
45
61
|
clearPid();
|
|
46
62
|
console.log(kleur.green(`✔ stopped pid ${pid}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../src/commands/stop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"stop.js","sourceRoot":"","sources":["../../src/commands/stop.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,18 @@ import { runStatus } from "./commands/status.js";
|
|
|
6
6
|
import { runStop } from "./commands/stop.js";
|
|
7
7
|
import { parsePortOption } from "./utils/parse-port-option.js";
|
|
8
8
|
import { readPackageVersion } from "./utils/read-package-version.js";
|
|
9
|
-
const
|
|
9
|
+
const resolveInitialPort = () => {
|
|
10
|
+
const raw = process.env.PORT;
|
|
11
|
+
if (raw === undefined || raw === "")
|
|
12
|
+
return DEFAULT_PORT;
|
|
13
|
+
try {
|
|
14
|
+
return parsePortOption(raw);
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
console.warn(`ignoring invalid PORT environment variable: ${raw}`);
|
|
18
|
+
return DEFAULT_PORT;
|
|
19
|
+
}
|
|
20
|
+
};
|
|
10
21
|
const program = new Command();
|
|
11
22
|
program
|
|
12
23
|
.name("localterm")
|
|
@@ -15,7 +26,7 @@ program
|
|
|
15
26
|
program
|
|
16
27
|
.command("start")
|
|
17
28
|
.description("start the localterm server (daemonizes by default)")
|
|
18
|
-
.option("-p, --port <port>", "port to bind", parsePortOption,
|
|
29
|
+
.option("-p, --port <port>", "port to bind", parsePortOption, resolveInitialPort())
|
|
19
30
|
.option("-H, --host <host>", "host to bind", DEFAULT_HOST)
|
|
20
31
|
.option("--open", "open browser on start")
|
|
21
32
|
.option("-F, --foreground", "stay attached to this terminal (do not daemonize)", false)
|
|
@@ -42,7 +53,7 @@ program
|
|
|
42
53
|
program
|
|
43
54
|
.command("restart")
|
|
44
55
|
.description("restart the localterm server")
|
|
45
|
-
.option("-p, --port <port>", "port to bind", parsePortOption,
|
|
56
|
+
.option("-p, --port <port>", "port to bind", parsePortOption, resolveInitialPort())
|
|
46
57
|
.option("-H, --host <host>", "host to bind", DEFAULT_HOST)
|
|
47
58
|
.option("--open", "open browser on restart")
|
|
48
59
|
.action(async (options) => {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/paths.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export declare const getStateDirectory: () => string;
|
|
2
2
|
export declare const getPidFile: () => string;
|
|
3
3
|
export declare const getPortFile: () => string;
|
|
4
|
+
export declare const getHostFile: () => string;
|
|
4
5
|
export declare const getLogFile: () => string;
|
|
5
6
|
//# sourceMappingURL=paths.d.ts.map
|
package/dist/paths.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB,QAAO,MAA+C,CAAC;AACrF,eAAO,MAAM,UAAU,QAAO,MAAsD,CAAC;AACrF,eAAO,MAAM,WAAW,QAAO,MAAuD,CAAC;AACvF,eAAO,MAAM,UAAU,QAAO,MAAsD,CAAC"}
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,iBAAiB,QAAO,MAA+C,CAAC;AACrF,eAAO,MAAM,UAAU,QAAO,MAAsD,CAAC;AACrF,eAAO,MAAM,WAAW,QAAO,MAAuD,CAAC;AACvF,eAAO,MAAM,WAAW,QAAO,MAAuD,CAAC;AACvF,eAAO,MAAM,UAAU,QAAO,MAAsD,CAAC"}
|
package/dist/paths.js
CHANGED
|
@@ -3,5 +3,6 @@ import path from "node:path";
|
|
|
3
3
|
export const getStateDirectory = () => path.join(os.homedir(), ".localterm");
|
|
4
4
|
export const getPidFile = () => path.join(getStateDirectory(), "server.pid");
|
|
5
5
|
export const getPortFile = () => path.join(getStateDirectory(), "server.port");
|
|
6
|
+
export const getHostFile = () => path.join(getStateDirectory(), "server.host");
|
|
6
7
|
export const getLogFile = () => path.join(getStateDirectory(), "server.log");
|
|
7
8
|
//# sourceMappingURL=paths.js.map
|
package/dist/paths.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;AACrF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,YAAY,CAAC,CAAC;AACrF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,aAAa,CAAC,CAAC;AACvF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,YAAY,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../src/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;AACrF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,YAAY,CAAC,CAAC;AACrF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,aAAa,CAAC,CAAC;AACvF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,aAAa,CAAC,CAAC;AACvF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,YAAY,CAAC,CAAC"}
|
package/dist/state.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
export declare const ensureStateDirectory: () => void;
|
|
2
2
|
export declare const ensureLogFile: () => string;
|
|
3
|
-
export declare const writePid: (pid: number, port: number) => void;
|
|
3
|
+
export declare const writePid: (pid: number, port: number, host: string) => void;
|
|
4
4
|
export declare const clearPid: () => void;
|
|
5
5
|
export declare const readPid: () => number | null;
|
|
6
6
|
export declare const readPort: () => number | null;
|
|
7
|
+
export declare const readHost: () => string | null;
|
|
7
8
|
export declare const isAlive: (pid: number) => boolean;
|
|
8
9
|
//# sourceMappingURL=state.d.ts.map
|
package/dist/state.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,oBAAoB,QAAO,IAKvC,CAAC;AAEF,eAAO,MAAM,aAAa,QAAO,MAOhC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,EAAE,MAAM,MAAM,EAAE,MAAM,MAAM,KAAG,IAclE,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,IAQ3B,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,MAAM,GAAG,IAMnC,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,MAAM,GAAG,IAMpC,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAO,MAAM,GAAG,IAKpC,CAAC;AAEF,eAAO,MAAM,OAAO,GAAI,KAAK,MAAM,KAAG,OAUrC,CAAC"}
|
package/dist/state.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
|
|
2
|
-
import { getLogFile, getPidFile, getPortFile, getStateDirectory } from "./paths.js";
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync, } from "node:fs";
|
|
2
|
+
import { getHostFile, getLogFile, getPidFile, getPortFile, getStateDirectory } from "./paths.js";
|
|
3
3
|
export const ensureStateDirectory = () => {
|
|
4
4
|
const stateDirectory = getStateDirectory();
|
|
5
5
|
if (!existsSync(stateDirectory)) {
|
|
@@ -14,13 +14,23 @@ export const ensureLogFile = () => {
|
|
|
14
14
|
}
|
|
15
15
|
return logFile;
|
|
16
16
|
};
|
|
17
|
-
export const writePid = (pid, port) => {
|
|
17
|
+
export const writePid = (pid, port, host) => {
|
|
18
18
|
ensureStateDirectory();
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
const pidFile = getPidFile();
|
|
20
|
+
const portFile = getPortFile();
|
|
21
|
+
const hostFile = getHostFile();
|
|
22
|
+
const pidTmp = `${pidFile}.tmp`;
|
|
23
|
+
const portTmp = `${portFile}.tmp`;
|
|
24
|
+
const hostTmp = `${hostFile}.tmp`;
|
|
25
|
+
writeFileSync(pidTmp, String(pid), "utf8");
|
|
26
|
+
writeFileSync(portTmp, String(port), "utf8");
|
|
27
|
+
writeFileSync(hostTmp, host, "utf8");
|
|
28
|
+
renameSync(pidTmp, pidFile);
|
|
29
|
+
renameSync(portTmp, portFile);
|
|
30
|
+
renameSync(hostTmp, hostFile);
|
|
21
31
|
};
|
|
22
32
|
export const clearPid = () => {
|
|
23
|
-
for (const file of [getPidFile(), getPortFile()]) {
|
|
33
|
+
for (const file of [getPidFile(), getPortFile(), getHostFile()]) {
|
|
24
34
|
try {
|
|
25
35
|
if (existsSync(file))
|
|
26
36
|
unlinkSync(file);
|
|
@@ -46,12 +56,22 @@ export const readPort = () => {
|
|
|
46
56
|
const parsed = Number(raw);
|
|
47
57
|
return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
|
|
48
58
|
};
|
|
59
|
+
export const readHost = () => {
|
|
60
|
+
const hostFile = getHostFile();
|
|
61
|
+
if (!existsSync(hostFile))
|
|
62
|
+
return null;
|
|
63
|
+
const raw = readFileSync(hostFile, "utf8").trim();
|
|
64
|
+
return raw || null;
|
|
65
|
+
};
|
|
49
66
|
export const isAlive = (pid) => {
|
|
50
67
|
try {
|
|
51
68
|
process.kill(pid, 0);
|
|
52
69
|
return true;
|
|
53
70
|
}
|
|
54
|
-
catch {
|
|
71
|
+
catch (error) {
|
|
72
|
+
if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
|
|
73
|
+
return true;
|
|
74
|
+
}
|
|
55
75
|
return false;
|
|
56
76
|
}
|
|
57
77
|
};
|
package/dist/state.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../src/state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,SAAS,EACT,YAAY,EACZ,UAAU,EACV,UAAU,EACV,aAAa,GACd,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEjG,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAS,EAAE;IAC7C,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;IAC3C,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,SAAS,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,GAAW,EAAE;IACxC,oBAAoB,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAW,EAAE,IAAY,EAAE,IAAY,EAAQ,EAAE;IACxE,oBAAoB,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,GAAG,OAAO,MAAM,CAAC;IAChC,MAAM,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAClC,MAAM,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAClC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3C,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IAC7C,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACrC,UAAU,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5B,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC9B,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAS,EAAE;IACjC,KAAK,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;QAChE,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,IAAI,CAAC;gBAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACP,iFAAiF;QACnF,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,GAAkB,EAAE;IACzC,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAkB,EAAE;IAC1C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAkB,EAAE;IAC1C,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAClD,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,GAAW,EAAW,EAAE;IAC9C,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACpF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -14,8 +14,9 @@ export interface DaemonProbeOptions {
|
|
|
14
14
|
logPath: string;
|
|
15
15
|
isAlive: (pid: number) => boolean;
|
|
16
16
|
readPort: () => number | null;
|
|
17
|
+
readHost: () => string | null;
|
|
17
18
|
sleep: (durationMs: number) => Promise<void>;
|
|
18
|
-
probeHealth?: (port: number) => Promise<boolean>;
|
|
19
|
+
probeHealth?: (host: string, port: number) => Promise<boolean>;
|
|
19
20
|
}
|
|
20
21
|
export declare const pollForDaemonReady: (options: DaemonProbeOptions) => Promise<DaemonReadyResult>;
|
|
21
22
|
//# sourceMappingURL=poll-for-daemon-ready.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-for-daemon-ready.d.ts","sourceRoot":"","sources":["../../src/utils/poll-for-daemon-ready.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,QAAQ,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"poll-for-daemon-ready.d.ts","sourceRoot":"","sources":["../../src/utils/poll-for-daemon-ready.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAC;AAEvD,MAAM,MAAM,iBAAiB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5F,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,QAAQ,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CAChE;AAaD,eAAO,MAAM,kBAAkB,GAC7B,SAAS,kBAAkB,KAC1B,OAAO,CAAC,iBAAiB,CAuB3B,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { cliError } from "../errors.js";
|
|
2
|
-
const defaultProbeHealth = async (port) => {
|
|
2
|
+
const defaultProbeHealth = async (host, port) => {
|
|
3
3
|
try {
|
|
4
|
-
const response = await fetch(`http
|
|
4
|
+
const response = await fetch(`http://${host}:${port}/api/health`, {
|
|
5
5
|
signal: AbortSignal.timeout(2000),
|
|
6
6
|
});
|
|
7
7
|
return response.ok;
|
|
@@ -24,7 +24,8 @@ export const pollForDaemonReady = async (options) => {
|
|
|
24
24
|
return { ok: true, port: observedPort };
|
|
25
25
|
}
|
|
26
26
|
if (observedPort !== null) {
|
|
27
|
-
const
|
|
27
|
+
const resolvedHost = options.readHost() ?? "127.0.0.1";
|
|
28
|
+
const healthy = await probeHealth(resolvedHost, observedPort);
|
|
28
29
|
if (healthy)
|
|
29
30
|
return { ok: true, port: observedPort };
|
|
30
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll-for-daemon-ready.js","sourceRoot":"","sources":["../../src/utils/poll-for-daemon-ready.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"poll-for-daemon-ready.js","sourceRoot":"","sources":["../../src/utils/poll-for-daemon-ready.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAiBvD,MAAM,kBAAkB,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAoB,EAAE;IAChF,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,IAAI,IAAI,IAAI,aAAa,EAAE;YAChE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,OAA2B,EACC,EAAE;IAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC9D,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,OAAO,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;QAClC,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACxC,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACtF,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;QACxC,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC;YAClE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QAC1C,CAAC;QACD,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,WAAW,CAAC;YACvD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAC9D,IAAI,OAAO;gBAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;QACvD,CAAC;IACH,CAAC;IACD,OAAO;QACL,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC;KACzF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-start-preflight.d.ts","sourceRoot":"","sources":["../../src/utils/run-start-preflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"run-start-preflight.d.ts","sourceRoot":"","sources":["../../src/utils/run-start-preflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAY,MAAM,cAAc,CAAC;AAIvD,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,QAAQ,GAAG,IAAI,CAgBjE,CAAC"}
|
|
@@ -1,8 +1,14 @@
|
|
|
1
1
|
import { cliError } from "../errors.js";
|
|
2
2
|
import { clearPid, isAlive, readPid, readPort } from "../state.js";
|
|
3
|
-
|
|
3
|
+
import { verifyPidIsLocalterm } from "./verify-pid-is-localterm.js";
|
|
4
|
+
export const runStartPreflight = async () => {
|
|
4
5
|
const existingPid = readPid();
|
|
5
6
|
if (existingPid && isAlive(existingPid)) {
|
|
7
|
+
const verification = await verifyPidIsLocalterm(existingPid);
|
|
8
|
+
if (verification === "not-ours") {
|
|
9
|
+
clearPid();
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
6
12
|
const existingPort = readPort();
|
|
7
13
|
if (existingPort === null) {
|
|
8
14
|
return cliError.stalePortFile(existingPid);
|