skybridge 0.0.0-dev.e365d28 → 0.0.0-dev.e378aa9
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 +155 -130
- package/dist/cli/tunnel-control-server.d.ts +9 -0
- package/dist/cli/tunnel-control-server.js +31 -0
- package/dist/cli/tunnel-control-server.js.map +1 -0
- package/dist/cli/tunnel-control-server.test.d.ts +1 -0
- package/dist/cli/tunnel-control-server.test.js +39 -0
- package/dist/cli/tunnel-control-server.test.js.map +1 -0
- package/dist/cli/tunnel-handler.d.ts +3 -0
- package/dist/cli/tunnel-handler.js +48 -0
- package/dist/cli/tunnel-handler.js.map +1 -0
- package/dist/cli/tunnel-handler.test.d.ts +1 -0
- package/dist/cli/tunnel-handler.test.js +105 -0
- package/dist/cli/tunnel-handler.test.js.map +1 -0
- package/dist/cli/tunnel.d.ts +57 -0
- package/dist/cli/tunnel.js +154 -0
- package/dist/cli/tunnel.js.map +1 -0
- package/dist/cli/tunnel.test.d.ts +1 -0
- package/dist/cli/tunnel.test.js +190 -0
- package/dist/cli/tunnel.test.js.map +1 -0
- package/dist/cli/use-tunnel.d.ts +1 -1
- package/dist/cli/use-tunnel.js +102 -68
- package/dist/cli/use-tunnel.js.map +1 -1
- package/dist/commands/dev.js +26 -2
- package/dist/commands/dev.js.map +1 -1
- package/dist/server/express.js +18 -0
- package/dist/server/express.js.map +1 -1
- package/dist/server/express.test.js +59 -0
- package/dist/server/express.test.js.map +1 -1
- package/dist/server/tunnel-proxy-router.d.ts +7 -0
- package/dist/server/tunnel-proxy-router.js +110 -0
- package/dist/server/tunnel-proxy-router.js.map +1 -0
- package/dist/server/tunnel-proxy-router.test.d.ts +1 -0
- package/dist/server/tunnel-proxy-router.test.js +229 -0
- package/dist/server/tunnel-proxy-router.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { EventEmitter } from "node:events";
|
|
2
|
+
import type { Readable } from "node:stream";
|
|
3
|
+
export type TunnelState = {
|
|
4
|
+
status: "idle";
|
|
5
|
+
} | {
|
|
6
|
+
status: "starting";
|
|
7
|
+
message: string;
|
|
8
|
+
} | {
|
|
9
|
+
status: "connected";
|
|
10
|
+
url: string;
|
|
11
|
+
} | {
|
|
12
|
+
status: "error";
|
|
13
|
+
message: string;
|
|
14
|
+
};
|
|
15
|
+
export type ParsedStdoutEvent = {
|
|
16
|
+
kind: "connected";
|
|
17
|
+
url: string;
|
|
18
|
+
} | {
|
|
19
|
+
kind: "starting";
|
|
20
|
+
message: string;
|
|
21
|
+
};
|
|
22
|
+
export declare function parseStdoutLine(line: string): ParsedStdoutEvent | null;
|
|
23
|
+
export type TunnelActivity = {
|
|
24
|
+
time: string;
|
|
25
|
+
text: string;
|
|
26
|
+
level: "log" | "error";
|
|
27
|
+
};
|
|
28
|
+
export type TunnelChildProcess = {
|
|
29
|
+
stdout: Pick<Readable, "on"> | null;
|
|
30
|
+
stderr: Pick<Readable, "on"> | null;
|
|
31
|
+
kill: (signal?: NodeJS.Signals | number) => boolean;
|
|
32
|
+
on(event: "error", listener: (err: Error) => void): unknown;
|
|
33
|
+
on(event: "close", listener: (code: number | null) => void): unknown;
|
|
34
|
+
};
|
|
35
|
+
export type SpawnFn = (port: number) => TunnelChildProcess;
|
|
36
|
+
export declare class TunnelManager extends EventEmitter {
|
|
37
|
+
private state;
|
|
38
|
+
private child;
|
|
39
|
+
private timeout;
|
|
40
|
+
private stderrBuffer;
|
|
41
|
+
private connected;
|
|
42
|
+
private readonly getPort;
|
|
43
|
+
private readonly spawnFn;
|
|
44
|
+
constructor(opts: {
|
|
45
|
+
getPort: () => number;
|
|
46
|
+
spawn?: SpawnFn;
|
|
47
|
+
});
|
|
48
|
+
getState(): TunnelState;
|
|
49
|
+
subscribe(listener: (state: TunnelState) => void): () => void;
|
|
50
|
+
start(): void;
|
|
51
|
+
stop(): void;
|
|
52
|
+
private handleStdout;
|
|
53
|
+
private handleStderr;
|
|
54
|
+
private setState;
|
|
55
|
+
private emitActivity;
|
|
56
|
+
private clearConnectTimeout;
|
|
57
|
+
}
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
import { spawn as nodeSpawn } from "node:child_process";
|
|
2
|
+
import { EventEmitter } from "node:events";
|
|
3
|
+
const FORWARDING_RE = /Forwarding:\s+(https?:\/\/\S+)\s*->\s*(\S+)/;
|
|
4
|
+
export function parseStdoutLine(line) {
|
|
5
|
+
const trimmed = line.trim();
|
|
6
|
+
if (!trimmed) {
|
|
7
|
+
return null;
|
|
8
|
+
}
|
|
9
|
+
const match = trimmed.match(FORWARDING_RE);
|
|
10
|
+
if (match?.[1]) {
|
|
11
|
+
return { kind: "connected", url: match[1].replace(/\/$/, "") };
|
|
12
|
+
}
|
|
13
|
+
return { kind: "starting", message: trimmed };
|
|
14
|
+
}
|
|
15
|
+
const CONNECT_TIMEOUT_MS = 60_000;
|
|
16
|
+
const STDERR_BUFFER_BYTES = 1024;
|
|
17
|
+
const defaultSpawn = (port) => nodeSpawn("npx", ["--yes", "alpic", "tunnel", "--port", String(port), "--plain"], {
|
|
18
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
19
|
+
});
|
|
20
|
+
export class TunnelManager extends EventEmitter {
|
|
21
|
+
state = { status: "idle" };
|
|
22
|
+
child = null;
|
|
23
|
+
timeout = null;
|
|
24
|
+
stderrBuffer = "";
|
|
25
|
+
connected = false;
|
|
26
|
+
getPort;
|
|
27
|
+
spawnFn;
|
|
28
|
+
constructor(opts) {
|
|
29
|
+
super();
|
|
30
|
+
this.getPort = opts.getPort;
|
|
31
|
+
this.spawnFn = opts.spawn ?? defaultSpawn;
|
|
32
|
+
// Multiple SSE subscribers (CLI, devtools, ad-hoc curl) can each register
|
|
33
|
+
// state + activity listeners; the default cap of 10 is easy to hit.
|
|
34
|
+
this.setMaxListeners(0);
|
|
35
|
+
}
|
|
36
|
+
getState() {
|
|
37
|
+
return this.state;
|
|
38
|
+
}
|
|
39
|
+
subscribe(listener) {
|
|
40
|
+
listener(this.state);
|
|
41
|
+
this.on("state", listener);
|
|
42
|
+
return () => {
|
|
43
|
+
this.off("state", listener);
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
start() {
|
|
47
|
+
if (this.state.status === "starting" || this.state.status === "connected") {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
this.connected = false;
|
|
51
|
+
this.stderrBuffer = "";
|
|
52
|
+
this.setState({ status: "starting", message: "Starting tunnel…" });
|
|
53
|
+
const child = this.spawnFn(this.getPort());
|
|
54
|
+
this.child = child;
|
|
55
|
+
this.timeout = setTimeout(() => {
|
|
56
|
+
if (!this.connected) {
|
|
57
|
+
this.setState({
|
|
58
|
+
status: "error",
|
|
59
|
+
message: "Tunnel connection timed out after one minute",
|
|
60
|
+
});
|
|
61
|
+
// Detach before killing so the imminent `close` event is treated as
|
|
62
|
+
// stale and does not overwrite the timeout error message.
|
|
63
|
+
this.child = null;
|
|
64
|
+
child.kill();
|
|
65
|
+
}
|
|
66
|
+
}, CONNECT_TIMEOUT_MS);
|
|
67
|
+
child.stdout?.on("data", (data) => {
|
|
68
|
+
this.handleStdout(data);
|
|
69
|
+
});
|
|
70
|
+
child.stderr?.on("data", (data) => {
|
|
71
|
+
this.handleStderr(data);
|
|
72
|
+
});
|
|
73
|
+
child.on("error", (err) => {
|
|
74
|
+
// Stale event from a child we've already replaced via stop()+start().
|
|
75
|
+
if (child !== this.child) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this.clearConnectTimeout();
|
|
79
|
+
this.setState({ status: "error", message: err.message });
|
|
80
|
+
});
|
|
81
|
+
child.on("close", (code) => {
|
|
82
|
+
// Stale event from a child we've already replaced via stop()+start().
|
|
83
|
+
if (child !== this.child) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
this.clearConnectTimeout();
|
|
87
|
+
if (code !== 0 && code !== null) {
|
|
88
|
+
const detail = this.stderrBuffer.trim() || `exited with code ${code}`;
|
|
89
|
+
this.setState({ status: "error", message: detail });
|
|
90
|
+
}
|
|
91
|
+
else {
|
|
92
|
+
this.setState({ status: "idle" });
|
|
93
|
+
}
|
|
94
|
+
this.child = null;
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
stop() {
|
|
98
|
+
this.clearConnectTimeout();
|
|
99
|
+
if (this.child) {
|
|
100
|
+
this.child.kill();
|
|
101
|
+
this.child = null;
|
|
102
|
+
}
|
|
103
|
+
this.setState({ status: "idle" });
|
|
104
|
+
}
|
|
105
|
+
handleStdout(data) {
|
|
106
|
+
const lines = data.toString().split("\n");
|
|
107
|
+
for (const raw of lines) {
|
|
108
|
+
const parsed = parseStdoutLine(raw);
|
|
109
|
+
if (!parsed) {
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
112
|
+
if (parsed.kind === "connected") {
|
|
113
|
+
this.connected = true;
|
|
114
|
+
this.clearConnectTimeout();
|
|
115
|
+
this.setState({ status: "connected", url: parsed.url });
|
|
116
|
+
}
|
|
117
|
+
else if (this.connected) {
|
|
118
|
+
this.emitActivity(parsed.message, "log");
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
this.setState({ status: "starting", message: parsed.message });
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
handleStderr(data) {
|
|
126
|
+
const text = data.toString().trim();
|
|
127
|
+
if (!text) {
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
this.stderrBuffer = (this.stderrBuffer + text).slice(-STDERR_BUFFER_BYTES);
|
|
131
|
+
for (const line of text.split("\n").filter(Boolean)) {
|
|
132
|
+
this.emitActivity(line, "error");
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
setState(next) {
|
|
136
|
+
this.state = next;
|
|
137
|
+
this.emit("state", next);
|
|
138
|
+
}
|
|
139
|
+
emitActivity(text, level) {
|
|
140
|
+
const activity = {
|
|
141
|
+
time: new Date().toISOString(),
|
|
142
|
+
text,
|
|
143
|
+
level,
|
|
144
|
+
};
|
|
145
|
+
this.emit("activity", activity);
|
|
146
|
+
}
|
|
147
|
+
clearConnectTimeout() {
|
|
148
|
+
if (this.timeout) {
|
|
149
|
+
clearTimeout(this.timeout);
|
|
150
|
+
this.timeout = null;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
//# sourceMappingURL=tunnel.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/cli/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAa3C,MAAM,aAAa,GAAG,6CAA6C,CAAC;AAEpE,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAC3C,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACf,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;IACjE,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,kBAAkB,GAAG,MAAM,CAAC;AAClC,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAkBjC,MAAM,YAAY,GAAY,CAAC,IAAI,EAAE,EAAE,CACrC,SAAS,CACP,KAAK,EACL,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,EAC/D;IACE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;CAClC,CACF,CAAC;AAEJ,MAAM,OAAO,aAAc,SAAQ,YAAY;IACrC,KAAK,GAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IACxC,KAAK,GAA+B,IAAI,CAAC;IACzC,OAAO,GAA0B,IAAI,CAAC;IACtC,YAAY,GAAG,EAAE,CAAC;IAClB,SAAS,GAAG,KAAK,CAAC;IACT,OAAO,CAAe;IACtB,OAAO,CAAU;IAElC,YAAY,IAAgD;QAC1D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,IAAI,YAAY,CAAC;QAC1C,0EAA0E;QAC1E,oEAAoE;QACpE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,SAAS,CAAC,QAAsC;QAC9C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC3B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC;IAED,KAAK;QACH,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC1E,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;QAEnE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC;oBACZ,MAAM,EAAE,OAAO;oBACf,OAAO,EAAE,8CAA8C;iBACxD,CAAC,CAAC;gBACH,oEAAoE;gBACpE,0DAA0D;gBAC1D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,CAAC;QACH,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAEvB,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAC/B,sEAAsE;YACtE,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,EAAE;YACxC,sEAAsE;YACtE,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAChC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,oBAAoB,IAAI,EAAE,CAAC;gBACtE,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACpC,CAAC;IAEO,YAAY,CAAC,IAAY;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1C,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACpC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,SAAS;YACX,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBACtB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;YAC1D,CAAC;iBAAM,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;IACH,CAAC;IAEO,YAAY,CAAC,IAAY;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAC3E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,QAAQ,CAAC,IAAiB;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3B,CAAC;IAEO,YAAY,CAAC,IAAY,EAAE,KAAsB;QACvD,MAAM,QAAQ,GAAmB;YAC/B,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAC9B,IAAI;YACJ,KAAK;SACN,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClC,CAAC;IAEO,mBAAmB;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import { EventEmitter } from "node:events";
|
|
2
|
+
import { Readable } from "node:stream";
|
|
3
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
4
|
+
import { parseStdoutLine, TunnelManager } from "./tunnel.js";
|
|
5
|
+
describe("parseStdoutLine", () => {
|
|
6
|
+
it("returns a connected event when the forwarding line is seen", () => {
|
|
7
|
+
const result = parseStdoutLine("Forwarding: https://abc.tunnel.example -> http://localhost:3000");
|
|
8
|
+
expect(result).toEqual({
|
|
9
|
+
kind: "connected",
|
|
10
|
+
url: "https://abc.tunnel.example",
|
|
11
|
+
});
|
|
12
|
+
});
|
|
13
|
+
it("strips a trailing slash from the forwarded URL", () => {
|
|
14
|
+
const result = parseStdoutLine("Forwarding: https://abc.tunnel.example/ -> http://localhost:3000");
|
|
15
|
+
expect(result).toEqual({
|
|
16
|
+
kind: "connected",
|
|
17
|
+
url: "https://abc.tunnel.example",
|
|
18
|
+
});
|
|
19
|
+
});
|
|
20
|
+
it("returns a starting event for any other non-empty line", () => {
|
|
21
|
+
expect(parseStdoutLine("Opening tunnel...")).toEqual({
|
|
22
|
+
kind: "starting",
|
|
23
|
+
message: "Opening tunnel...",
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
it("returns null for empty lines", () => {
|
|
27
|
+
expect(parseStdoutLine("")).toBeNull();
|
|
28
|
+
expect(parseStdoutLine(" ")).toBeNull();
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
function makeFakeChild() {
|
|
32
|
+
const child = new EventEmitter();
|
|
33
|
+
child.stdout = new Readable({ read() { } });
|
|
34
|
+
child.stderr = new Readable({ read() { } });
|
|
35
|
+
child.kill = vi.fn(() => true);
|
|
36
|
+
return child;
|
|
37
|
+
}
|
|
38
|
+
describe("TunnelManager", () => {
|
|
39
|
+
beforeEach(() => {
|
|
40
|
+
vi.useFakeTimers();
|
|
41
|
+
});
|
|
42
|
+
afterEach(() => {
|
|
43
|
+
vi.useRealTimers();
|
|
44
|
+
});
|
|
45
|
+
it("starts idle", () => {
|
|
46
|
+
const manager = new TunnelManager({
|
|
47
|
+
getPort: () => 3000,
|
|
48
|
+
spawn: () => makeFakeChild(),
|
|
49
|
+
});
|
|
50
|
+
expect(manager.getState()).toEqual({ status: "idle" });
|
|
51
|
+
});
|
|
52
|
+
it("transitions idle -> starting -> connected as stdout reports progress", () => {
|
|
53
|
+
const child = makeFakeChild();
|
|
54
|
+
const manager = new TunnelManager({
|
|
55
|
+
getPort: () => 3000,
|
|
56
|
+
spawn: () => child,
|
|
57
|
+
});
|
|
58
|
+
const states = [];
|
|
59
|
+
manager.on("state", (s) => states.push(s.status));
|
|
60
|
+
manager.start();
|
|
61
|
+
child.stdout.emit("data", Buffer.from("Opening tunnel...\n"));
|
|
62
|
+
child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
|
|
63
|
+
expect(states).toEqual(["starting", "starting", "connected"]);
|
|
64
|
+
expect(manager.getState()).toEqual({
|
|
65
|
+
status: "connected",
|
|
66
|
+
url: "https://abc.tunnel.example",
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
it("emits activity events for stdout lines after connect", () => {
|
|
70
|
+
const child = makeFakeChild();
|
|
71
|
+
const manager = new TunnelManager({
|
|
72
|
+
getPort: () => 3000,
|
|
73
|
+
spawn: () => child,
|
|
74
|
+
});
|
|
75
|
+
const activity = [];
|
|
76
|
+
manager.on("activity", (a) => activity.push({ text: a.text, level: a.level }));
|
|
77
|
+
manager.start();
|
|
78
|
+
child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
|
|
79
|
+
child.stdout.emit("data", Buffer.from("GET /widgets/foo\n"));
|
|
80
|
+
child.stderr.emit("data", Buffer.from("connection wobble\n"));
|
|
81
|
+
expect(activity).toEqual([
|
|
82
|
+
{ text: "GET /widgets/foo", level: "log" },
|
|
83
|
+
{ text: "connection wobble", level: "error" },
|
|
84
|
+
]);
|
|
85
|
+
});
|
|
86
|
+
it("calling start twice does not spawn twice", () => {
|
|
87
|
+
const spawn = vi.fn(() => makeFakeChild());
|
|
88
|
+
const manager = new TunnelManager({ getPort: () => 3000, spawn });
|
|
89
|
+
manager.start();
|
|
90
|
+
manager.start();
|
|
91
|
+
expect(spawn).toHaveBeenCalledTimes(1);
|
|
92
|
+
});
|
|
93
|
+
it("transitions to error when the connection times out", () => {
|
|
94
|
+
const child = makeFakeChild();
|
|
95
|
+
const manager = new TunnelManager({
|
|
96
|
+
getPort: () => 3000,
|
|
97
|
+
spawn: () => child,
|
|
98
|
+
});
|
|
99
|
+
manager.start();
|
|
100
|
+
vi.advanceTimersByTime(60_000);
|
|
101
|
+
expect(manager.getState().status).toBe("error");
|
|
102
|
+
expect(child.kill).toHaveBeenCalled();
|
|
103
|
+
});
|
|
104
|
+
it("preserves the timeout error message when the killed child later emits close", () => {
|
|
105
|
+
const child = makeFakeChild();
|
|
106
|
+
const manager = new TunnelManager({
|
|
107
|
+
getPort: () => 3000,
|
|
108
|
+
spawn: () => child,
|
|
109
|
+
});
|
|
110
|
+
manager.start();
|
|
111
|
+
vi.advanceTimersByTime(60_000);
|
|
112
|
+
// The killed child emits a non-zero close after the timeout fired.
|
|
113
|
+
child.emit("close", 1);
|
|
114
|
+
expect(manager.getState()).toEqual({
|
|
115
|
+
status: "error",
|
|
116
|
+
message: "Tunnel connection timed out after one minute",
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
it("stop() kills the subprocess and goes idle", () => {
|
|
120
|
+
const child = makeFakeChild();
|
|
121
|
+
const manager = new TunnelManager({
|
|
122
|
+
getPort: () => 3000,
|
|
123
|
+
spawn: () => child,
|
|
124
|
+
});
|
|
125
|
+
manager.start();
|
|
126
|
+
manager.stop();
|
|
127
|
+
expect(child.kill).toHaveBeenCalled();
|
|
128
|
+
expect(manager.getState()).toEqual({ status: "idle" });
|
|
129
|
+
});
|
|
130
|
+
it("subscribers get the current state on subscribe", () => {
|
|
131
|
+
const child = makeFakeChild();
|
|
132
|
+
const manager = new TunnelManager({
|
|
133
|
+
getPort: () => 3000,
|
|
134
|
+
spawn: () => child,
|
|
135
|
+
});
|
|
136
|
+
manager.start();
|
|
137
|
+
child.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
|
|
138
|
+
let received;
|
|
139
|
+
const unsubscribe = manager.subscribe((s) => {
|
|
140
|
+
received = s;
|
|
141
|
+
});
|
|
142
|
+
expect(received).toEqual({
|
|
143
|
+
status: "connected",
|
|
144
|
+
url: "https://abc.tunnel.example",
|
|
145
|
+
});
|
|
146
|
+
unsubscribe();
|
|
147
|
+
});
|
|
148
|
+
it("ignores deferred close from a child that was replaced via stop()+start()", () => {
|
|
149
|
+
const childA = makeFakeChild();
|
|
150
|
+
const childB = makeFakeChild();
|
|
151
|
+
let spawnCount = 0;
|
|
152
|
+
const manager = new TunnelManager({
|
|
153
|
+
getPort: () => 3000,
|
|
154
|
+
spawn: () => (spawnCount++ === 0 ? childA : childB),
|
|
155
|
+
});
|
|
156
|
+
manager.start();
|
|
157
|
+
manager.stop();
|
|
158
|
+
manager.start();
|
|
159
|
+
childB.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
|
|
160
|
+
expect(manager.getState()).toEqual({
|
|
161
|
+
status: "connected",
|
|
162
|
+
url: "https://abc.tunnel.example",
|
|
163
|
+
});
|
|
164
|
+
// Stale close from childA arrives only now — must not clobber state.
|
|
165
|
+
childA.emit("close", null);
|
|
166
|
+
expect(manager.getState()).toEqual({
|
|
167
|
+
status: "connected",
|
|
168
|
+
url: "https://abc.tunnel.example",
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
it("ignores deferred error from a child that was replaced via stop()+start()", () => {
|
|
172
|
+
const childA = makeFakeChild();
|
|
173
|
+
const childB = makeFakeChild();
|
|
174
|
+
let spawnCount = 0;
|
|
175
|
+
const manager = new TunnelManager({
|
|
176
|
+
getPort: () => 3000,
|
|
177
|
+
spawn: () => (spawnCount++ === 0 ? childA : childB),
|
|
178
|
+
});
|
|
179
|
+
manager.start();
|
|
180
|
+
manager.stop();
|
|
181
|
+
manager.start();
|
|
182
|
+
childB.stdout.emit("data", Buffer.from("Forwarding: https://abc.tunnel.example -> http://localhost:3000\n"));
|
|
183
|
+
childA.emit("error", new Error("late spawn failure"));
|
|
184
|
+
expect(manager.getState()).toEqual({
|
|
185
|
+
status: "connected",
|
|
186
|
+
url: "https://abc.tunnel.example",
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
//# sourceMappingURL=tunnel.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tunnel.test.js","sourceRoot":"","sources":["../../src/cli/tunnel.test.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/use-tunnel.d.ts
CHANGED
|
@@ -11,4 +11,4 @@ export type TunnelState = {
|
|
|
11
11
|
status: "error";
|
|
12
12
|
message: string;
|
|
13
13
|
};
|
|
14
|
-
export declare function useTunnel(port: number | null, pushMessage: PushMessage, verbose: boolean): TunnelState;
|
|
14
|
+
export declare function useTunnel(port: number | null, pushMessage: PushMessage, verbose: boolean, autoStart: boolean): TunnelState;
|
package/dist/cli/use-tunnel.js
CHANGED
|
@@ -1,27 +1,16 @@
|
|
|
1
|
-
import { spawn } from "node:child_process";
|
|
2
1
|
import { useEffect, useState } from "react";
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
const POST_RETRY_DELAY_MS = 250;
|
|
3
|
+
export function useTunnel(port, pushMessage, verbose, autoStart) {
|
|
4
|
+
const [state, setState] = useState(port !== null && autoStart
|
|
5
|
+
? { status: "starting", message: "Starting tunnel…" }
|
|
6
|
+
: { status: "idle" });
|
|
7
7
|
useEffect(() => {
|
|
8
8
|
if (port === null) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
let stderrBuffer = "";
|
|
15
|
-
let connected = false;
|
|
16
|
-
const timeout = setTimeout(() => {
|
|
17
|
-
if (!connected) {
|
|
18
|
-
setState({
|
|
19
|
-
status: "error",
|
|
20
|
-
message: "Tunnel connection timed out after one minute",
|
|
21
|
-
});
|
|
22
|
-
tunnelProcess.kill();
|
|
23
|
-
}
|
|
24
|
-
}, 60_000);
|
|
11
|
+
const baseUrl = `http://localhost:${port}`;
|
|
12
|
+
const controller = new AbortController();
|
|
13
|
+
let cancelled = false;
|
|
25
14
|
const pushLog = (text, type) => {
|
|
26
15
|
const time = new Date().toLocaleTimeString("en-US", {
|
|
27
16
|
hour: "numeric",
|
|
@@ -31,67 +20,112 @@ export function useTunnel(port, pushMessage, verbose) {
|
|
|
31
20
|
});
|
|
32
21
|
pushMessage(`${time} [tunnel] ${text}`, type);
|
|
33
22
|
};
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
23
|
+
const handleEvent = (event, data) => {
|
|
24
|
+
if (event === "state") {
|
|
25
|
+
const next = JSON.parse(data);
|
|
26
|
+
setState(next);
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
if (event === "activity") {
|
|
30
|
+
if (!verbose) {
|
|
31
|
+
return;
|
|
42
32
|
}
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
33
|
+
const activity = JSON.parse(data);
|
|
34
|
+
pushLog(activity.text, activity.level);
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
const consumeSse = async () => {
|
|
38
|
+
const res = await fetch(`${baseUrl}/__skybridge/tunnel/events`, {
|
|
39
|
+
signal: controller.signal,
|
|
40
|
+
headers: { Accept: "text/event-stream" },
|
|
41
|
+
});
|
|
42
|
+
if (!res.ok || !res.body) {
|
|
43
|
+
throw new Error(`SSE connection failed (${res.status})`);
|
|
44
|
+
}
|
|
45
|
+
const reader = res.body.getReader();
|
|
46
|
+
const decoder = new TextDecoder();
|
|
47
|
+
let buffer = "";
|
|
48
|
+
while (!cancelled) {
|
|
49
|
+
const { value, done } = await reader.read();
|
|
50
|
+
if (done) {
|
|
51
|
+
return;
|
|
49
52
|
}
|
|
50
|
-
|
|
51
|
-
|
|
53
|
+
buffer += decoder.decode(value, { stream: true });
|
|
54
|
+
// SSE frames are separated by a blank line ("\n\n").
|
|
55
|
+
let sep = buffer.indexOf("\n\n");
|
|
56
|
+
while (sep !== -1) {
|
|
57
|
+
const frame = buffer.slice(0, sep);
|
|
58
|
+
buffer = buffer.slice(sep + 2);
|
|
59
|
+
let eventName = "message";
|
|
60
|
+
const dataLines = [];
|
|
61
|
+
for (const rawLine of frame.split("\n")) {
|
|
62
|
+
const line = rawLine.replace(/\r$/, "");
|
|
63
|
+
if (line.startsWith("event:")) {
|
|
64
|
+
eventName = line.slice(6).trim();
|
|
65
|
+
}
|
|
66
|
+
else if (line.startsWith("data:")) {
|
|
67
|
+
dataLines.push(line.slice(5).trimStart());
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
if (dataLines.length > 0) {
|
|
71
|
+
handleEvent(eventName, dataLines.join("\n"));
|
|
72
|
+
}
|
|
73
|
+
sep = buffer.indexOf("\n\n");
|
|
52
74
|
}
|
|
53
75
|
}
|
|
54
76
|
};
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
77
|
+
const postUntilStarted = async () => {
|
|
78
|
+
// Retry indefinitely until POST lands once. Bounded by the effect
|
|
79
|
+
// lifetime via controller.abort() on unmount. Once the manager has
|
|
80
|
+
// been started, this returns and never POSTs again — a user-driven
|
|
81
|
+
// DELETE /tunnel won't be auto-undone.
|
|
82
|
+
while (!cancelled) {
|
|
83
|
+
try {
|
|
84
|
+
const res = await fetch(`${baseUrl}/__skybridge/tunnel`, {
|
|
85
|
+
method: "POST",
|
|
86
|
+
signal: controller.signal,
|
|
87
|
+
});
|
|
88
|
+
if (res.ok) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
// dev server not up yet (or restarting under nodemon) — wait, retry
|
|
94
|
+
}
|
|
95
|
+
await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));
|
|
59
96
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
97
|
+
};
|
|
98
|
+
// Always observe the tunnel state so external triggers (curl, future
|
|
99
|
+
// devtools UI) update the cli UI. `autoStart` only decides whether we
|
|
100
|
+
// also POST /tunnel on mount. Reconnects indefinitely so we survive
|
|
101
|
+
// dev-server boot delay and nodemon restarts; the cli owns the actual
|
|
102
|
+
// subprocess so a temporarily-unreachable dev server is fine.
|
|
103
|
+
const observe = async () => {
|
|
104
|
+
while (!cancelled) {
|
|
105
|
+
try {
|
|
106
|
+
await consumeSse();
|
|
64
107
|
}
|
|
108
|
+
catch {
|
|
109
|
+
// network error or stream ended abnormally — fall through to retry
|
|
110
|
+
}
|
|
111
|
+
if (cancelled) {
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
await new Promise((r) => setTimeout(r, POST_RETRY_DELAY_MS));
|
|
65
115
|
}
|
|
66
116
|
};
|
|
67
|
-
|
|
68
|
-
|
|
117
|
+
// observe() always runs — it owns the cli's view of tunnel state. POST is
|
|
118
|
+
// a fire-and-forget side-effect that nudges the manager into starting and
|
|
119
|
+
// retries until it lands at least once.
|
|
120
|
+
if (autoStart) {
|
|
121
|
+
void postUntilStarted();
|
|
69
122
|
}
|
|
70
|
-
|
|
71
|
-
tunnelProcess.stderr.on("data", handleStderr);
|
|
72
|
-
}
|
|
73
|
-
tunnelProcess.on("error", (err) => {
|
|
74
|
-
clearTimeout(timeout);
|
|
75
|
-
setState({ status: "error", message: err.message });
|
|
76
|
-
});
|
|
77
|
-
tunnelProcess.on("close", (code) => {
|
|
78
|
-
clearTimeout(timeout);
|
|
79
|
-
if (code !== 0 && code !== null) {
|
|
80
|
-
const detail = stderrBuffer.trim() || `exited with code ${code}`;
|
|
81
|
-
const hint = verbose
|
|
82
|
-
? `Try manually: npx alpic tunnel --port ${port}`
|
|
83
|
-
: "Re-run with --verbose to see full tunnel logs";
|
|
84
|
-
setState({
|
|
85
|
-
status: "error",
|
|
86
|
-
message: `${detail}. ${hint}`,
|
|
87
|
-
});
|
|
88
|
-
}
|
|
89
|
-
});
|
|
123
|
+
void observe();
|
|
90
124
|
return () => {
|
|
91
|
-
|
|
92
|
-
|
|
125
|
+
cancelled = true;
|
|
126
|
+
controller.abort();
|
|
93
127
|
};
|
|
94
|
-
}, [port, pushMessage, verbose]);
|
|
128
|
+
}, [port, pushMessage, verbose, autoStart]);
|
|
95
129
|
return state;
|
|
96
130
|
}
|
|
97
131
|
//# sourceMappingURL=use-tunnel.js.map
|