@abitat_reece/host-daemon 0.1.6 → 0.1.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/index.js +107 -16
- package/dist/cli/index.js.map +1 -1
- package/dist/local-control/relay-client.d.ts +36 -0
- package/dist/local-control/relay-client.d.ts.map +1 -0
- package/dist/local-control/relay-client.js +164 -0
- package/dist/local-control/relay-client.js.map +1 -0
- package/dist/local-control/state.d.ts +15 -1
- package/dist/local-control/state.d.ts.map +1 -1
- package/dist/local-control/state.js +57 -1
- package/dist/local-control/state.js.map +1 -1
- package/dist/local-control/transport.d.ts +40 -1
- package/dist/local-control/transport.d.ts.map +1 -1
- package/dist/local-control/transport.js +260 -1
- package/dist/local-control/transport.js.map +1 -1
- package/package.json +2 -2
package/dist/cli/index.js
CHANGED
|
@@ -8,9 +8,10 @@ import { defaultConfigPath, loadHostConfig, saveHostConfig } from "../config/hos
|
|
|
8
8
|
import { collectChangeset } from "../git/changeset.js";
|
|
9
9
|
import { branchNameForConversation, resolveRepoPath } from "../git/paths.js";
|
|
10
10
|
import { createLocalCodexBridge } from "../local-control/codex-bridge.js";
|
|
11
|
+
import { startRelayClient } from "../local-control/relay-client.js";
|
|
11
12
|
import { startLocalControlServer } from "../local-control/server.js";
|
|
12
13
|
import { createLocalControlStore } from "../local-control/state.js";
|
|
13
|
-
import { resolveLocalControlTransport, startQuickTunnel } from "../local-control/transport.js";
|
|
14
|
+
import { resolveLocalControlTransport, startEndpointHealthMonitor, startQuickTunnel, startTemporarySshTunnel, waitForQuickTunnelReady } from "../local-control/transport.js";
|
|
14
15
|
import { commitAndPushWorktree, tryCreatePullRequest } from "../git/publish.js";
|
|
15
16
|
import { cleanupConversationWorktree, setupConversationWorktree } from "../git/worktree.js";
|
|
16
17
|
import { createRemoteControlManager } from "../remote-control/manager.js";
|
|
@@ -43,7 +44,7 @@ async function main() {
|
|
|
43
44
|
return;
|
|
44
45
|
}
|
|
45
46
|
console.error(`Unknown command: ${command}`);
|
|
46
|
-
console.error("Usage: abitat-host iphone [--transport quick-tunnel|local|tailscale|manual] | abitat-host pair --code ABITAT-123456 | abitat-host start --mock");
|
|
47
|
+
console.error("Usage: abitat-host iphone [--transport relay|temporary-tunnel|quick-tunnel|local|tailscale|manual] | abitat-host pair --code ABITAT-123456 | abitat-host start --mock");
|
|
47
48
|
process.exitCode = 1;
|
|
48
49
|
}
|
|
49
50
|
async function pairDaemon(args) {
|
|
@@ -63,17 +64,22 @@ async function pairDaemon(args) {
|
|
|
63
64
|
}
|
|
64
65
|
async function startIphoneControl(args) {
|
|
65
66
|
const port = numberOption(args, "--port", Number(process.env.ABITAT_LOCAL_CONTROL_PORT ?? 3901));
|
|
66
|
-
const requestedTransport = transportOption(readOption(args, "--transport") ?? "
|
|
67
|
+
const requestedTransport = transportOption(readOption(args, "--transport") ?? "relay");
|
|
67
68
|
const endpoint = readOption(args, "--endpoint") ?? process.env.ABITAT_LOCAL_CONTROL_ENDPOINT;
|
|
69
|
+
const relayEndpoint = readOption(args, "--relay-endpoint") ??
|
|
70
|
+
process.env.ABITAT_RELAY_ENDPOINT ??
|
|
71
|
+
"https://workspace.abitat.io";
|
|
68
72
|
const codexServerUrl = readOption(args, "--codex-server-url") ??
|
|
69
73
|
process.env.CODEX_APP_SERVER_URL ??
|
|
70
74
|
"ws://127.0.0.1:47777";
|
|
71
75
|
const transport = await resolveLocalControlTransport({
|
|
72
76
|
endpoint,
|
|
73
77
|
port,
|
|
78
|
+
relayEndpoint,
|
|
74
79
|
requestedTransport
|
|
75
80
|
});
|
|
76
81
|
const store = createLocalControlStore();
|
|
82
|
+
const relayId = transport.transport === "relay" ? await store.getRelayId() : undefined;
|
|
77
83
|
const server = await startLocalControlServer({
|
|
78
84
|
bindHost: transport.bindHost,
|
|
79
85
|
codex: createLocalCodexBridge({ serverUrl: codexServerUrl }),
|
|
@@ -83,27 +89,110 @@ async function startIphoneControl(args) {
|
|
|
83
89
|
transport: transport.transport
|
|
84
90
|
});
|
|
85
91
|
let quickTunnel = null;
|
|
92
|
+
let fallbackTunnel = null;
|
|
93
|
+
let endpointMonitor = null;
|
|
94
|
+
let relayClient = null;
|
|
86
95
|
let publicEndpoint = server.endpoint;
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
96
|
+
let pairingTransport = transport.transport;
|
|
97
|
+
const stop = async (exitCode = 0) => {
|
|
98
|
+
endpointMonitor?.stop();
|
|
99
|
+
relayClient?.close();
|
|
100
|
+
await quickTunnel?.close().catch(() => undefined);
|
|
101
|
+
await fallbackTunnel?.close().catch(() => undefined);
|
|
102
|
+
await server.close().catch(() => undefined);
|
|
103
|
+
console.log("status=stopped");
|
|
104
|
+
process.exit(exitCode);
|
|
105
|
+
};
|
|
106
|
+
if (!endpoint && transport.transport === "relay") {
|
|
107
|
+
if (!relayId || !transport.relayEndpoint) {
|
|
108
|
+
throw new Error("Relay transport is missing relay configuration");
|
|
109
|
+
}
|
|
110
|
+
console.log(`Connecting this Mac to Abitat relay at ${transport.relayEndpoint}...`);
|
|
111
|
+
relayClient = startRelayClient({
|
|
112
|
+
localEndpoint: localServerEndpoint(port),
|
|
113
|
+
relayEndpoint: transport.relayEndpoint,
|
|
114
|
+
relayId,
|
|
115
|
+
store
|
|
116
|
+
});
|
|
117
|
+
publicEndpoint = transport.relayEndpoint;
|
|
118
|
+
pairingTransport = "relay";
|
|
119
|
+
}
|
|
120
|
+
if (!endpoint && requestedTransport === "temporary-tunnel") {
|
|
121
|
+
console.log("Starting temporary HTTPS tunnel through localhost.run from this Mac...");
|
|
122
|
+
fallbackTunnel = await startTemporarySshTunnel({
|
|
123
|
+
localUrl: server.endpoint,
|
|
124
|
+
onFallback(error) {
|
|
125
|
+
console.log(`localhost.run is unavailable (${errorMessage(error)}). Trying Pinggy over SSH from this Mac...`);
|
|
126
|
+
}
|
|
127
|
+
}).catch(async (error) => {
|
|
128
|
+
await server.close().catch(() => undefined);
|
|
129
|
+
throw error;
|
|
130
|
+
});
|
|
131
|
+
publicEndpoint = fallbackTunnel.endpoint;
|
|
132
|
+
pairingTransport = "manual";
|
|
133
|
+
console.log("Waiting for temporary tunnel to become reachable...");
|
|
134
|
+
await waitForQuickTunnelReady(publicEndpoint).catch(async (error) => {
|
|
135
|
+
await fallbackTunnel?.close().catch(() => undefined);
|
|
90
136
|
await server.close().catch(() => undefined);
|
|
91
137
|
throw error;
|
|
92
138
|
});
|
|
93
|
-
publicEndpoint = quickTunnel.endpoint;
|
|
94
139
|
}
|
|
140
|
+
if (!endpoint && transport.transport === "quick-tunnel") {
|
|
141
|
+
console.log("Starting Cloudflare Quick Tunnel from this Mac...");
|
|
142
|
+
try {
|
|
143
|
+
quickTunnel = await startQuickTunnel({ localUrl: server.endpoint });
|
|
144
|
+
publicEndpoint = quickTunnel.endpoint;
|
|
145
|
+
console.log("Waiting for Cloudflare Quick Tunnel to become reachable...");
|
|
146
|
+
await waitForQuickTunnelReady(publicEndpoint);
|
|
147
|
+
}
|
|
148
|
+
catch (error) {
|
|
149
|
+
console.log(`Cloudflare Quick Tunnel is unavailable (${errorMessage(error)}). Falling back to localhost.run over SSH from this Mac...`);
|
|
150
|
+
await quickTunnel?.close().catch(() => undefined);
|
|
151
|
+
quickTunnel = null;
|
|
152
|
+
fallbackTunnel = await startTemporarySshTunnel({
|
|
153
|
+
localUrl: server.endpoint,
|
|
154
|
+
onFallback(localhostRunError) {
|
|
155
|
+
console.log(`localhost.run fallback is unavailable (${errorMessage(localhostRunError)}). Trying Pinggy over SSH from this Mac...`);
|
|
156
|
+
}
|
|
157
|
+
}).catch(async (fallbackError) => {
|
|
158
|
+
await server.close().catch(() => undefined);
|
|
159
|
+
throw fallbackError;
|
|
160
|
+
});
|
|
161
|
+
publicEndpoint = fallbackTunnel.endpoint;
|
|
162
|
+
pairingTransport = "manual";
|
|
163
|
+
console.log("Waiting for fallback tunnel to become reachable...");
|
|
164
|
+
await waitForQuickTunnelReady(publicEndpoint).catch(async (fallbackError) => {
|
|
165
|
+
await fallbackTunnel?.close().catch(() => undefined);
|
|
166
|
+
await server.close().catch(() => undefined);
|
|
167
|
+
throw fallbackError;
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
endpointMonitor = startEndpointHealthMonitor(publicEndpoint, {
|
|
172
|
+
healthPath: pairingTransport === "relay" ? "/relay/health" : "/health",
|
|
173
|
+
intervalMs: 5_000,
|
|
174
|
+
maxFailures: 2,
|
|
175
|
+
onUnhealthy(error) {
|
|
176
|
+
console.error(error.message);
|
|
177
|
+
void stop(1);
|
|
178
|
+
}
|
|
179
|
+
});
|
|
95
180
|
const pairing = await store.createPairing({
|
|
96
181
|
endpoint: publicEndpoint,
|
|
97
|
-
|
|
182
|
+
relayId,
|
|
183
|
+
transport: pairingTransport
|
|
98
184
|
});
|
|
99
185
|
const qrPayload = JSON.stringify(pairing);
|
|
100
186
|
console.log("Abitat local iPhone control");
|
|
101
187
|
console.log(`status=online`);
|
|
102
188
|
console.log(`endpoint=${publicEndpoint}`);
|
|
103
|
-
if (
|
|
189
|
+
if (publicEndpoint !== server.endpoint) {
|
|
104
190
|
console.log(`localEndpoint=${server.endpoint}`);
|
|
105
191
|
}
|
|
106
|
-
console.log(`transport=${
|
|
192
|
+
console.log(`transport=${pairingTransport}`);
|
|
193
|
+
if (relayId) {
|
|
194
|
+
console.log(`relayId=${relayId}`);
|
|
195
|
+
}
|
|
107
196
|
if (transport.warning) {
|
|
108
197
|
console.log(`warning=${transport.warning}`);
|
|
109
198
|
}
|
|
@@ -117,12 +206,6 @@ async function startIphoneControl(args) {
|
|
|
117
206
|
console.log(qrPayload);
|
|
118
207
|
console.log("");
|
|
119
208
|
console.log("Keep this command running while pairing and using the phone.");
|
|
120
|
-
const stop = async () => {
|
|
121
|
-
await quickTunnel?.close().catch(() => undefined);
|
|
122
|
-
await server.close().catch(() => undefined);
|
|
123
|
-
console.log("status=stopped");
|
|
124
|
-
process.exit(0);
|
|
125
|
-
};
|
|
126
209
|
process.once("SIGINT", () => void stop());
|
|
127
210
|
process.once("SIGTERM", () => void stop());
|
|
128
211
|
await new Promise(() => undefined);
|
|
@@ -487,12 +570,20 @@ function transportOption(value) {
|
|
|
487
570
|
if (normalized === "auto" ||
|
|
488
571
|
normalized === "local" ||
|
|
489
572
|
normalized === "tailscale" ||
|
|
573
|
+
normalized === "temporary-tunnel" ||
|
|
574
|
+
normalized === "relay" ||
|
|
490
575
|
normalized === "quick-tunnel" ||
|
|
491
576
|
normalized === "manual") {
|
|
492
577
|
return normalized;
|
|
493
578
|
}
|
|
494
579
|
return "auto";
|
|
495
580
|
}
|
|
581
|
+
function localServerEndpoint(port) {
|
|
582
|
+
return `http://127.0.0.1:${port}`;
|
|
583
|
+
}
|
|
584
|
+
function errorMessage(error) {
|
|
585
|
+
return error instanceof Error ? error.message : String(error);
|
|
586
|
+
}
|
|
496
587
|
async function stopDaemon(client, connection) {
|
|
497
588
|
if (connection.paired) {
|
|
498
589
|
await client
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAkB,MAAM,sBAAsB,CAAC;AACrE,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAA8B,MAAM,2BAA2B,CAAC;AAChG,OAAO,EACL,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,EAIxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAE,2BAA2B,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;AAEnC,KAAK,IAAI,EAAE,CAAC;AAEZ,KAAK,UAAU,IAAI;IACjB,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO;IACT,CAAC;IAED,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC/B,OAAO;IACT,CAAC;IAED,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,WAAW,CAAC,IAAI,CAAC,CAAC;QACxB,OAAO;IACT,CAAC;IAED,IAAI,OAAO,KAAK,kBAAkB,EAAE,CAAC;QACnC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IAED,OAAO,CAAC,KAAK,CAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;IAC7C,OAAO,CAAC,KAAK,CACX,uKAAuK,CACxK,CAAC;IACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAc;IACtC,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,uBAAuB,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,aAAa,CAAC;IACrE,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,iBAAiB,EAAE,CAAC;IACzE,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC;QACjC,WAAW;QACX,WAAW;QACX,aAAa,EAAE,OAAO;KACvB,CAAC,CAAC;IAEH,MAAM,cAAc,CAAC,EAAE,MAAM,EAAE,GAAG,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC;IAC1D,OAAO,CAAC,GAAG,CAAC,oBAAoB,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CAAC,UAAU,UAAU,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,IAAc;IAC9C,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,IAAI,CAAC,CAAC,CAAC;IACjG,MAAM,kBAAkB,GAAG,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,OAAO,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC;IAC7F,MAAM,aAAa,GACjB,UAAU,CAAC,IAAI,EAAE,kBAAkB,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,qBAAqB;QACjC,6BAA6B,CAAC;IAChC,MAAM,cAAc,GAClB,UAAU,CAAC,IAAI,EAAE,oBAAoB,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,oBAAoB;QAChC,sBAAsB,CAAC;IACzB,MAAM,SAAS,GAAG,MAAM,4BAA4B,CAAC;QACnD,QAAQ;QACR,IAAI;QACJ,aAAa;QACb,kBAAkB;KACnB,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,uBAAuB,EAAE,CAAC;IACxC,MAAM,OAAO,GAAG,SAAS,CAAC,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;QAC3C,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,KAAK,EAAE,sBAAsB,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC;QAC5D,QAAQ,EAAE,SAAS,CAAC,QAAQ;QAC5B,IAAI;QACJ,KAAK;QACL,SAAS,EAAE,SAAS,CAAC,SAAS;KAC/B,CAAC,CAAC;IACH,IAAI,WAAW,GAAuB,IAAI,CAAC;IAC3C,IAAI,cAAc,GAAqB,IAAI,CAAC;IAC5C,IAAI,eAAe,GAAiC,IAAI,CAAC;IACzD,IAAI,WAAW,GAA6B,IAAI,CAAC;IACjD,IAAI,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC;IACrC,IAAI,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,EAAE,QAAQ,GAAG,CAAC,EAAE,EAAE;QAClC,eAAe,EAAE,IAAI,EAAE,CAAC;QACxB,WAAW,EAAE,KAAK,EAAE,CAAC;QACrB,MAAM,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAClD,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,SAAS,KAAK,OAAO,EAAE,CAAC;QACjD,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,0CAA0C,SAAS,CAAC,aAAa,KAAK,CAAC,CAAC;QACpF,WAAW,GAAG,gBAAgB,CAAC;YAC7B,aAAa,EAAE,mBAAmB,CAAC,IAAI,CAAC;YACxC,aAAa,EAAE,SAAS,CAAC,aAAa;YACtC,OAAO;YACP,KAAK;SACN,CAAC,CAAC;QACH,cAAc,GAAG,SAAS,CAAC,aAAa,CAAC;QACzC,gBAAgB,GAAG,OAAO,CAAC;IAC7B,CAAC;IAED,IAAI,CAAC,QAAQ,IAAI,kBAAkB,KAAK,kBAAkB,EAAE,CAAC;QAC3D,OAAO,CAAC,GAAG,CAAC,wEAAwE,CAAC,CAAC;QACtF,cAAc,GAAG,MAAM,uBAAuB,CAAC;YAC7C,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,CAAC,KAAK;gBACd,OAAO,CAAC,GAAG,CACT,iCAAiC,YAAY,CAC3C,KAAK,CACN,4CAA4C,CAC9C,CAAC;YACJ,CAAC;SACF,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;QACH,cAAc,GAAG,cAAc,CAAC,QAAQ,CAAC;QACzC,gBAAgB,GAAG,QAAQ,CAAC;QAC5B,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;QACnE,MAAM,uBAAuB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YAClE,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACrD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5C,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,SAAS,KAAK,cAAc,EAAE,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;QACjE,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,gBAAgB,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,cAAc,GAAG,WAAW,CAAC,QAAQ,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YAC1E,MAAM,uBAAuB,CAAC,cAAc,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,2CAA2C,YAAY,CAAC,KAAK,CAAC,4DAA4D,CAC3H,CAAC;YACF,MAAM,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAClD,WAAW,GAAG,IAAI,CAAC;YACnB,cAAc,GAAG,MAAM,uBAAuB,CAAC;gBAC7C,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,UAAU,CAAC,iBAAiB;oBAC1B,OAAO,CAAC,GAAG,CACT,0CAA0C,YAAY,CACpD,iBAAiB,CAClB,4CAA4C,CAC9C,CAAC;gBACJ,CAAC;aACF,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;gBAC/B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC5C,MAAM,aAAa,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,cAAc,GAAG,cAAc,CAAC,QAAQ,CAAC;YACzC,gBAAgB,GAAG,QAAQ,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,MAAM,uBAAuB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;gBAC1E,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBACrD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC5C,MAAM,aAAa,CAAC;YACtB,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,eAAe,GAAG,0BAA0B,CAAC,cAAc,EAAE;QAC3D,UAAU,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;QACtE,UAAU,EAAE,KAAK;QACjB,WAAW,EAAE,CAAC;QACd,WAAW,CAAC,KAAK;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7B,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;QACf,CAAC;KACF,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,aAAa,CAAC;QACxC,QAAQ,EAAE,cAAc;QACxB,OAAO;QACP,SAAS,EAAE,gBAAgB;KAC5B,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE1C,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,YAAY,cAAc,EAAE,CAAC,CAAC;IAC1C,IAAI,cAAc,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,aAAa,gBAAgB,EAAE,CAAC,CAAC;IAC7C,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,WAAW,OAAO,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,WAAW,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,SAAS,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,cAAc,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;IAC3D,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;IAE5E,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAE3C,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACrC,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAc;IACvC,MAAM,OAAO,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC1F,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,OAAO,EAAE,kBAAkB,CAAC;IAC1F,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,IAAI,CAAC,CAAC;IAClF,MAAM,uBAAuB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,IAAI,CAAC,CAAC;IAC9F,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,iBAAiB,EAAE,CAAC;IACzE,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACvD,IAAI,UAAU,GAAG,uBAAuB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACvE,IAAI,MAAM,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,uBAAuB,EAAE,CAAC;IAE9C,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC;IAC/B,OAAO,CAAC,GAAG,CAAC,iBAAiB,aAAa,EAAE,CAAC,CAAC;IAC9C,OAAO,CAAC,GAAG,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,aAAa,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,UAAU,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE7B,oEAAoE;IACpE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;QACvB,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACpD,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBACxD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;oBACnC,WAAW;oBACX,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,aAAa;oBAC7D,aAAa,EAAE,OAAO;iBACvB,CAAC,CAAC;gBACH,MAAM,cAAc,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC;gBAC3E,UAAU,GAAG,uBAAuB,CAAC;oBACnC,MAAM,EAAE,MAAM,cAAc,CAAC,UAAU,CAAC;oBACxC,GAAG,EAAE,OAAO,CAAC,GAAG;iBACjB,CAAC,CAAC;gBACH,MAAM,GAAG,IAAI,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;gBACpE,OAAO,CAAC,GAAG,CAAC,UAAU,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,aAAa,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,mBAAmB,CAAC,KAAK,IAAI,EAAE;QACpD,MAAM,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACjF,MAAM,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IACH,MAAM,oBAAoB,GACxB,OAAO,CAAC,GAAG,CAAC,4BAA4B,KAAK,GAAG;QAC9C,CAAC,CAAC,0BAA0B,CAAC,MAAM,EAAE;YACjC,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,iCAAiC;YACzD,SAAS,EAAE,UAAU,CAAC,SAAS;SAChC,CAAC;QACJ,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACtB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,aAAa,SAAS,EAAE,CAAC,CAAC;QAEtC,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,cAAc,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,mBAAmB,CAAC,GAAG,EAAE,CAAC;QAClC,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;YACpE,MAAM,MAAM,CAAC,SAAS,CAAC;gBACrB,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,MAAM,EAAE,QAAQ;gBAChB,oBAAoB,EAAE,qBAAqB,CAAC,CAAC,CAAC;gBAC9C,qBAAqB;aACtB,CAAC,CAAC;QACL,CAAC;QAED,MAAM,aAAa,CACjB,MAAM,EACN,UAAU,CAAC,SAAS,EACpB,aAAa,EACb,WAAW,EACX,UAAU,CAAC,MAAM,EACjB,UAAU,CAAC,SAAS,CACrB,CAAC;QAEF,IAAI,UAAU,CAAC,MAAM,IAAI,oBAAoB,EAAE,CAAC;YAC9C,MAAM,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,yBAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC,CAAC;IAClF,SAAS,CAAC,KAAK,EAAE,CAAC;IAElB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,SAAS,CAAC,IAAI,EAAE,CAAC;QACjB,oBAAoB,EAAE,OAAO,EAAE,CAAC;QAChC,KAAK,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACL,CAAC;AAOD,SAAS,uBAAuB;IAC9B,OAAO;QACL,eAAe,EAAE,IAAI,GAAG,EAAU;QAClC,KAAK,EAAE,IAAI,GAAG,EAAiB;KAChC,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,WAA8B;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,mBAAmB,CAAC,WAA8B,EAAE,IAAmB;IAC9E,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5B,KAAK,IAAI;SACN,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC;IAClF,CAAC,CAAC;SACD,OAAO,CAAC,GAAG,EAAE;QACZ,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,MAAqB,EAAE,SAAiB;IACpE,MAAM,KAAK,GAAG,MAAM,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC;IAC/C,MAAM,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,MAAqB,EAAE,SAAiB;IACzE,MAAM,QAAQ,GAAG,MAAM,uBAAuB,EAAE,CAAC;IACjD,MAAM,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACtD,OAAO,CAAC,GAAG,CACT,iBAAiB,QAAQ,CAAC,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,aAAa,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CACtH,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,UAAkB,EAAE,IAAyB;IACvE,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,QAAQ,GAAyB,IAAI,CAAC;IAE1C,OAAO;QACL,KAAK,CAAC,GAAG;YACP,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO;YACT,CAAC;YAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,GAAG,GAAG,aAAa,GAAG,UAAU,EAAE,CAAC;gBACrC,OAAO;YACT,CAAC;YAED,aAAa,GAAG,GAAG,CAAC;YACpB,QAAQ,GAAG,IAAI,EAAE;iBACd,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;gBACxB,OAAO,CAAC,KAAK,CACX,iCAAiC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC1F,CAAC;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACZ,QAAQ,GAAG,IAAI,CAAC;YAClB,CAAC,CAAC,CAAC;YACL,MAAM,QAAQ,CAAC;QACjB,CAAC;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,MAAqB,EACrB,SAAiB,EACjB,aAAqB,EACrB,WAA8B,EAC9B,MAAc,EACd,SAAkB;IAElB,IAAI,QAAuD,CAAC;IAC5D,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,wBAAwB,CAAC,WAAW,CAAC,CAAC,CAAC;IACpF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;IAEzB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9C,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACpD,MAAM,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;gBAAS,CAAC;YACT,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACzD,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC1C,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,2BAA2B,CAAC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QACtF,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,IAAI,KAAK,oBAAoB,EAAE,CAAC;QACtC,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACnD,OAAO;IACT,CAAC;IAED,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACjG,mBAAmB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,uBAAuB,CACpC,MAAqB,EACrB,GAAuD,EACvD,aAAqB,EACrB,WAA8B,EAC9B,MAAc,EACd,SAAkB;IAElB,IAAI,CAAC;QACH,MAAM,KAAK,GACT,GAAG,CAAC,OAAO,CAAC,eAAe,IAAI,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU;YAC/E,CAAC,CAAC;gBACE,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU;gBAClC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;oBACjC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,eAAe,CAAC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC;gBACvD,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;aACvC;YACH,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa;gBACzB,CAAC,CAAC,MAAM,4BAA4B,CAAC,GAAG,CAAC;gBACzC,CAAC,CAAC,MAAM,yBAAyB,CAAC;oBAC9B,aAAa;oBACb,cAAc,EAAE,GAAG,CAAC,cAAc;oBAClC,gBAAgB,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB;oBAC9C,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM;oBACnD,OAAO,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO;oBAC5B,aAAa,EAAE,MAAM;iBACtB,CAAC,CAAC;QAEX,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QAC9C,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,MAAM,EACN,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;SAC3B,CAAC,EACF;YACE,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;YAC1B,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK;YACxB,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe;YAC5C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;SACrD,CACF,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC7D,MAAM,MAAM,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAC5D,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAuB;SAC/E,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,MAAqB,EACrB,GAA2D,EAC3D,WAA8B,EAC9B,MAAc,EACd,SAAkB;IAElB,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;QACjF,IAAI,CAAC,YAAY,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7E,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;QAC3B,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU;YAClC,YAAY;SACb,CAAC,CAAC;QAEH,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACnD,MAAM,EACN,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,QAAQ;YACtB,GAAG,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;SAC3B,CAAC,EACF;YACE,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,cAAc,EAAE,IAAI;YACpB,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,KAAK;YACxB,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;YAC1B,eAAe,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe;YAC5C,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;YACpD,YAAY;SACb,CACF,CAAC;QAEF,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU;YAClC,gBAAgB;YAChB,YAAY;SACb,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB;SAC5E,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,GAAuD;IAEvD,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;IACrD,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC;IAE3B,OAAO;QACL,UAAU,EAAE,yBAAyB,CAAC;YACpC,cAAc,EAAE,GAAG,CAAC,cAAc;YAClC,gBAAgB,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB;YAC9C,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM;SACpD,CAAC;QACF,QAAQ,EAAE,SAAS;QACnB,YAAY;KACb,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,MAAqB,EACrB,GAAoD;IAEpD,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAEnD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC;YACzC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU;YAClC,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;SACzC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC;YAC1C,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY;YACtC,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,UAAU;SACnC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACvD,YAAY,EAAE,cAAc,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;SAC7E,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE;YAC1B,MAAM,EAAE,QAAQ;YAChB,YAAY,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,wBAAwB;SAChF,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAc;IAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,GAAG,OAAO,EAAE,kBAAkB,CAAC;IAC1F,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC;IACrD,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEtD,IAAI,CAAC,OAAO,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC5F,CAAC;IAED,MAAM,2BAA2B,CAAC;QAChC,aAAa;QACb,QAAQ,EAAE,eAAe,CAAC,aAAa,EAAE,OAAO,CAAC;QACjD,YAAY;KACb,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,WAAW,YAAY,EAAE,CAAC,CAAC;AACzC,CAAC;AAED,KAAK,UAAU,qBAAqB,CAAC,IAAY;IAC/C,IAAI,CAAC;QACH,OAAO,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAc,EAAE,MAAc;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACnC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAClD,CAAC;AAED,SAAS,YAAY,CAAC,IAAc,EAAE,MAAc,EAAE,QAAgB;IACpE,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,OAAO,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;AACrE,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAChC,IACE,UAAU,KAAK,MAAM;QACrB,UAAU,KAAK,OAAO;QACtB,UAAU,KAAK,WAAW;QAC1B,UAAU,KAAK,kBAAkB;QACjC,UAAU,KAAK,OAAO;QACtB,UAAU,KAAK,cAAc;QAC7B,UAAU,KAAK,QAAQ,EACvB,CAAC;QACD,OAAO,UAAiE,CAAC;IAC3E,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAY;IACvC,OAAO,oBAAoB,IAAI,EAAE,CAAC;AACpC,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAChE,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,MAAqB,EACrB,UAAkD;IAElD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,MAAM;aACT,SAAS,CAAC;YACT,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,MAAM,EAAE,SAAS;SAClB,CAAC;aACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import WebSocket from "ws";
|
|
2
|
+
import { createRelayReplayCache, type RelayEncryptedEnvelope } from "@abitat_reece/shared";
|
|
3
|
+
import type { LocalControlStore } from "./state.js";
|
|
4
|
+
interface RelayKeyMaterial {
|
|
5
|
+
id: string;
|
|
6
|
+
keyMaterial: string;
|
|
7
|
+
kind: "device" | "pairing";
|
|
8
|
+
}
|
|
9
|
+
interface RelayStore {
|
|
10
|
+
getRelayKeyMaterials(relayId: string): Promise<RelayKeyMaterial[]>;
|
|
11
|
+
}
|
|
12
|
+
interface HandleRelayRequestInput {
|
|
13
|
+
envelope: RelayEncryptedEnvelope;
|
|
14
|
+
fetch?: typeof fetch;
|
|
15
|
+
localEndpoint: string;
|
|
16
|
+
relayId: string;
|
|
17
|
+
replayCache: ReturnType<typeof createRelayReplayCache>;
|
|
18
|
+
store: RelayStore;
|
|
19
|
+
}
|
|
20
|
+
interface StartRelayClientInput {
|
|
21
|
+
fetch?: typeof fetch;
|
|
22
|
+
localEndpoint: string;
|
|
23
|
+
reconnectIntervalMs?: number;
|
|
24
|
+
relayEndpoint: string;
|
|
25
|
+
relayId: string;
|
|
26
|
+
store: LocalControlStore;
|
|
27
|
+
}
|
|
28
|
+
export { createRelayReplayCache };
|
|
29
|
+
export declare function handleRelayRequest(input: HandleRelayRequestInput): Promise<RelayEncryptedEnvelope>;
|
|
30
|
+
export declare function startRelayClient(input: StartRelayClientInput): {
|
|
31
|
+
close(): void;
|
|
32
|
+
};
|
|
33
|
+
export declare function handleRelaySocketMessage(raw: string, input: Omit<HandleRelayRequestInput, "envelope"> & {
|
|
34
|
+
socket: WebSocket | null;
|
|
35
|
+
}): Promise<void>;
|
|
36
|
+
//# sourceMappingURL=relay-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-client.d.ts","sourceRoot":"","sources":["../../src/local-control/relay-client.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EACL,sBAAsB,EAKtB,KAAK,sBAAsB,EAE5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;CAC5B;AAED,UAAU,UAAU;IAClB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;CACpE;AAED,UAAU,uBAAuB;IAC/B,QAAQ,EAAE,sBAAsB,CAAC;IACjC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAAC;IACvD,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,UAAU,qBAAqB;IAC7B,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,iBAAiB,CAAC;CAC1B;AAeD,OAAO,EAAE,sBAAsB,EAAE,CAAC;AAElC,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,uBAAuB,mCA8BtE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB;;EAoD5D;AAED,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,IAAI,CAAC,uBAAuB,EAAE,UAAU,CAAC,GAAG;IAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAAA;CAAE,iBAmChF"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import WebSocket from "ws";
|
|
2
|
+
import { createRelayReplayCache, decryptRelayEnvelope, encryptRelayEnvelope, relaySessionKey, validateRelayEnvelopeFreshness } from "@abitat_reece/shared";
|
|
3
|
+
export { createRelayReplayCache };
|
|
4
|
+
export async function handleRelayRequest(input) {
|
|
5
|
+
const keyMaterials = await input.store.getRelayKeyMaterials(input.relayId);
|
|
6
|
+
const replayCache = input.replayCache;
|
|
7
|
+
for (const keyMaterial of keyMaterials) {
|
|
8
|
+
const key = await relaySessionKey(keyMaterial.keyMaterial, input.relayId);
|
|
9
|
+
const request = await decryptRelayEnvelope(key, input.envelope).catch(() => null);
|
|
10
|
+
if (!request) {
|
|
11
|
+
continue;
|
|
12
|
+
}
|
|
13
|
+
validateRelayEnvelopeFreshness({ createdAt: input.envelope.createdAt });
|
|
14
|
+
replayCache.assertFresh(request.requestId);
|
|
15
|
+
const localResponse = await forwardToLocalApi({
|
|
16
|
+
fetch: input.fetch ?? fetch,
|
|
17
|
+
localEndpoint: input.localEndpoint,
|
|
18
|
+
request
|
|
19
|
+
});
|
|
20
|
+
return encryptRelayEnvelope(key, {
|
|
21
|
+
body: localResponse.body,
|
|
22
|
+
headers: localResponse.headers,
|
|
23
|
+
requestId: request.requestId,
|
|
24
|
+
status: localResponse.status
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
throw new Error("Relay request could not be decrypted by this Mac");
|
|
28
|
+
}
|
|
29
|
+
export function startRelayClient(input) {
|
|
30
|
+
const replayCache = createRelayReplayCache();
|
|
31
|
+
let stopped = false;
|
|
32
|
+
let socket = null;
|
|
33
|
+
let reconnectTimer = null;
|
|
34
|
+
const connect = () => {
|
|
35
|
+
if (stopped) {
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
const url = relayWebSocketUrl(input.relayEndpoint, input.relayId);
|
|
39
|
+
socket = new WebSocket(url);
|
|
40
|
+
socket.on("message", (data) => {
|
|
41
|
+
void handleRelaySocketMessage(String(data), {
|
|
42
|
+
fetch: input.fetch,
|
|
43
|
+
localEndpoint: input.localEndpoint,
|
|
44
|
+
relayId: input.relayId,
|
|
45
|
+
replayCache,
|
|
46
|
+
socket,
|
|
47
|
+
store: input.store
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
socket.on("close", () => scheduleReconnect());
|
|
51
|
+
socket.on("error", () => {
|
|
52
|
+
socket?.close();
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
const scheduleReconnect = () => {
|
|
56
|
+
if (stopped || reconnectTimer) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
reconnectTimer = setTimeout(() => {
|
|
60
|
+
reconnectTimer = null;
|
|
61
|
+
connect();
|
|
62
|
+
}, input.reconnectIntervalMs ?? 2_000);
|
|
63
|
+
reconnectTimer.unref?.();
|
|
64
|
+
};
|
|
65
|
+
connect();
|
|
66
|
+
return {
|
|
67
|
+
close() {
|
|
68
|
+
stopped = true;
|
|
69
|
+
if (reconnectTimer) {
|
|
70
|
+
clearTimeout(reconnectTimer);
|
|
71
|
+
reconnectTimer = null;
|
|
72
|
+
}
|
|
73
|
+
socket?.close();
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
export async function handleRelaySocketMessage(raw, input) {
|
|
78
|
+
const message = parseRelayHostRequest(raw);
|
|
79
|
+
if (!message) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const send = (payload) => {
|
|
83
|
+
if (input.socket?.readyState === WebSocket.OPEN) {
|
|
84
|
+
input.socket.send(JSON.stringify(payload));
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
let envelope;
|
|
88
|
+
try {
|
|
89
|
+
envelope = await handleRelayRequest({ ...input, envelope: message.envelope });
|
|
90
|
+
}
|
|
91
|
+
catch (error) {
|
|
92
|
+
send({
|
|
93
|
+
error: errorMessage(error),
|
|
94
|
+
requestId: message.requestId,
|
|
95
|
+
status: statusCode(error),
|
|
96
|
+
type: "error"
|
|
97
|
+
});
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
send({
|
|
101
|
+
envelope,
|
|
102
|
+
requestId: message.requestId,
|
|
103
|
+
type: "response"
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
async function forwardToLocalApi(input) {
|
|
107
|
+
const response = await input.fetch(new URL(input.request.path, input.localEndpoint), {
|
|
108
|
+
body: input.request.body === undefined ? undefined : JSON.stringify(input.request.body),
|
|
109
|
+
headers: input.request.headers,
|
|
110
|
+
method: input.request.method
|
|
111
|
+
});
|
|
112
|
+
const text = await response.text();
|
|
113
|
+
const contentType = response.headers.get("content-type") ?? "";
|
|
114
|
+
const body = contentType.includes("application/json") && text ? JSON.parse(text) : text;
|
|
115
|
+
return {
|
|
116
|
+
body,
|
|
117
|
+
headers: {
|
|
118
|
+
"content-type": contentType
|
|
119
|
+
},
|
|
120
|
+
status: response.status
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
function parseRelayHostRequest(raw) {
|
|
124
|
+
try {
|
|
125
|
+
const parsed = JSON.parse(raw);
|
|
126
|
+
if (parsed.type !== "request" ||
|
|
127
|
+
typeof parsed.requestId !== "string" ||
|
|
128
|
+
!parsed.envelope ||
|
|
129
|
+
parsed.envelope.requestId !== parsed.requestId) {
|
|
130
|
+
return null;
|
|
131
|
+
}
|
|
132
|
+
return parsed;
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
return null;
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
function relayWebSocketUrl(relayEndpoint, relayId) {
|
|
139
|
+
const url = new URL(`/relay/${encodeURIComponent(relayId)}/host`, relayEndpoint);
|
|
140
|
+
url.protocol = url.protocol === "http:" ? "ws:" : "wss:";
|
|
141
|
+
return url.toString();
|
|
142
|
+
}
|
|
143
|
+
function statusCode(error) {
|
|
144
|
+
if (error &&
|
|
145
|
+
typeof error === "object" &&
|
|
146
|
+
typeof error.statusCode === "number") {
|
|
147
|
+
return error.statusCode;
|
|
148
|
+
}
|
|
149
|
+
const message = errorMessage(error);
|
|
150
|
+
if (message.includes("could not be decrypted")) {
|
|
151
|
+
return 401;
|
|
152
|
+
}
|
|
153
|
+
if (message.includes("already been processed")) {
|
|
154
|
+
return 409;
|
|
155
|
+
}
|
|
156
|
+
if (message.includes("timestamp") || message.includes("too old")) {
|
|
157
|
+
return 400;
|
|
158
|
+
}
|
|
159
|
+
return 500;
|
|
160
|
+
}
|
|
161
|
+
function errorMessage(error) {
|
|
162
|
+
return error instanceof Error ? error.message : String(error);
|
|
163
|
+
}
|
|
164
|
+
//# sourceMappingURL=relay-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relay-client.js","sourceRoot":"","sources":["../../src/local-control/relay-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type LocalControlTransport = "local" | "tailscale" | "quick-tunnel" | "manual";
|
|
1
|
+
export type LocalControlTransport = "local" | "tailscale" | "quick-tunnel" | "manual" | "relay";
|
|
2
2
|
export interface LocalPairingPayload {
|
|
3
3
|
version: 1;
|
|
4
4
|
product: "abitat";
|
|
@@ -8,6 +8,7 @@ export interface LocalPairingPayload {
|
|
|
8
8
|
manualCode: string;
|
|
9
9
|
expiresAt: string;
|
|
10
10
|
transport: LocalControlTransport;
|
|
11
|
+
relayId?: string;
|
|
11
12
|
capabilities: string[];
|
|
12
13
|
}
|
|
13
14
|
export interface LocalPairedDevice {
|
|
@@ -17,6 +18,7 @@ export interface LocalPairedDevice {
|
|
|
17
18
|
tokenHash: string;
|
|
18
19
|
pairedAt: string;
|
|
19
20
|
lastSeenAt: string;
|
|
21
|
+
relayId?: string | null;
|
|
20
22
|
revokedAt?: string | null;
|
|
21
23
|
}
|
|
22
24
|
interface CreateLocalControlStoreOptions {
|
|
@@ -27,6 +29,7 @@ interface CreateLocalControlStoreOptions {
|
|
|
27
29
|
}
|
|
28
30
|
interface CreatePairingInput {
|
|
29
31
|
endpoint: string;
|
|
32
|
+
relayId?: string;
|
|
30
33
|
transport: LocalControlTransport;
|
|
31
34
|
ttlMs?: number;
|
|
32
35
|
}
|
|
@@ -47,6 +50,7 @@ export declare function createLocalControlStore(options?: CreateLocalControlStor
|
|
|
47
50
|
macName: string;
|
|
48
51
|
}>;
|
|
49
52
|
getHostToken(): Promise<string>;
|
|
53
|
+
getRelayId(): Promise<string>;
|
|
50
54
|
createPairing(input: CreatePairingInput): Promise<LocalPairingPayload>;
|
|
51
55
|
consumePairing(input: ConsumePairingInput): Promise<{
|
|
52
56
|
machineId: string;
|
|
@@ -56,6 +60,15 @@ export declare function createLocalControlStore(options?: CreateLocalControlStor
|
|
|
56
60
|
endpoint: string;
|
|
57
61
|
macId: string;
|
|
58
62
|
}>;
|
|
63
|
+
getRelayKeyMaterials(relayId: string): Promise<({
|
|
64
|
+
id: string;
|
|
65
|
+
kind: "pairing";
|
|
66
|
+
keyMaterial: string;
|
|
67
|
+
} | {
|
|
68
|
+
id: string;
|
|
69
|
+
kind: "device";
|
|
70
|
+
keyMaterial: string;
|
|
71
|
+
})[]>;
|
|
59
72
|
requireDeviceByToken(token: string): Promise<{
|
|
60
73
|
lastSeenAt: string;
|
|
61
74
|
id: string;
|
|
@@ -63,6 +76,7 @@ export declare function createLocalControlStore(options?: CreateLocalControlStor
|
|
|
63
76
|
platform: "ios" | string;
|
|
64
77
|
tokenHash: string;
|
|
65
78
|
pairedAt: string;
|
|
79
|
+
relayId?: string | null;
|
|
66
80
|
revokedAt?: string | null;
|
|
67
81
|
}>;
|
|
68
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/local-control/state.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/local-control/state.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,qBAAqB,GAAG,OAAO,GAAG,WAAW,GAAG,cAAc,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEhG,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,CAAC,CAAC;IACX,OAAO,EAAE,QAAQ,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,qBAAqB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAyBD,UAAU,8BAA8B;IACtC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,kBAAkB;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,qBAAqB,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,mBAAmB;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,GAAG,MAAM,CAAC;CAC1B;AAWD,wBAAgB,4BAA4B,WAE3C;AAED,wBAAgB,+BAA+B,WAE9C;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,UAElD;AAED,wBAAgB,uBAAuB,CAAC,OAAO,GAAE,8BAAmC;;;;;;;;yBAiFrD,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;0BA0ChD,mBAAmB;;;;;;;;kCA2DX,MAAM;;;;;;;;;gCAwBR,MAAM;;YA1RtC,MAAM;cACJ,MAAM;kBACF,KAAK,GAAG,MAAM;mBACb,MAAM;kBACP,MAAM;kBAEN,MAAM,GAAG,IAAI;oBACX,MAAM,GAAG,IAAI;;EAwS1B;AAwED,MAAM,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
|
|
@@ -69,6 +69,25 @@ export function createLocalControlStore(options = {}) {
|
|
|
69
69
|
});
|
|
70
70
|
return hostToken;
|
|
71
71
|
},
|
|
72
|
+
async getRelayId() {
|
|
73
|
+
const state = await loadState();
|
|
74
|
+
const existingRelayId = state.relayId ?? latestStoredRelayId(state);
|
|
75
|
+
if (existingRelayId) {
|
|
76
|
+
if (!state.relayId) {
|
|
77
|
+
await saveState({
|
|
78
|
+
...state,
|
|
79
|
+
relayId: existingRelayId
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
return existingRelayId;
|
|
83
|
+
}
|
|
84
|
+
const relayId = idGenerator("relay");
|
|
85
|
+
await saveState({
|
|
86
|
+
...state,
|
|
87
|
+
relayId
|
|
88
|
+
});
|
|
89
|
+
return relayId;
|
|
90
|
+
},
|
|
72
91
|
async createPairing(input) {
|
|
73
92
|
const state = await loadState();
|
|
74
93
|
const createdAt = now();
|
|
@@ -83,6 +102,7 @@ export function createLocalControlStore(options = {}) {
|
|
|
83
102
|
expiresAt: new Date(createdAt.getTime() + (input.ttlMs ?? DEFAULT_PAIRING_TTL_MS)).toISOString(),
|
|
84
103
|
consumedAt: null,
|
|
85
104
|
createdAt: createdAt.toISOString(),
|
|
105
|
+
relayId: input.relayId ?? null,
|
|
86
106
|
transport: input.transport
|
|
87
107
|
};
|
|
88
108
|
await saveState({
|
|
@@ -101,6 +121,7 @@ export function createLocalControlStore(options = {}) {
|
|
|
101
121
|
manualCode,
|
|
102
122
|
expiresAt: pairing.expiresAt,
|
|
103
123
|
transport: input.transport,
|
|
124
|
+
relayId: input.relayId,
|
|
104
125
|
capabilities: [...PAIRING_CAPABILITIES]
|
|
105
126
|
};
|
|
106
127
|
},
|
|
@@ -131,6 +152,7 @@ export function createLocalControlStore(options = {}) {
|
|
|
131
152
|
tokenHash: hashLocalControlToken(clientToken),
|
|
132
153
|
pairedAt: pairedAt.toISOString(),
|
|
133
154
|
lastSeenAt: pairedAt.toISOString(),
|
|
155
|
+
relayId: pairing.relayId ?? null,
|
|
134
156
|
revokedAt: null
|
|
135
157
|
};
|
|
136
158
|
const nextPairings = state.activePairings.map((candidate) => candidate.id === pairing.id
|
|
@@ -150,6 +172,25 @@ export function createLocalControlStore(options = {}) {
|
|
|
150
172
|
macId: state.macId
|
|
151
173
|
};
|
|
152
174
|
},
|
|
175
|
+
async getRelayKeyMaterials(relayId) {
|
|
176
|
+
const state = await loadState();
|
|
177
|
+
const checkedAt = now();
|
|
178
|
+
const pairingMaterials = state.activePairings
|
|
179
|
+
.filter((pairing) => pairing.relayId === relayId && !pairing.consumedAt && !isExpired(pairing, checkedAt))
|
|
180
|
+
.map((pairing) => ({
|
|
181
|
+
id: pairing.id,
|
|
182
|
+
kind: "pairing",
|
|
183
|
+
keyMaterial: pairing.secretHash
|
|
184
|
+
}));
|
|
185
|
+
const deviceMaterials = state.pairedDevices
|
|
186
|
+
.filter((device) => device.relayId === relayId && !device.revokedAt)
|
|
187
|
+
.map((device) => ({
|
|
188
|
+
id: device.id,
|
|
189
|
+
kind: "device",
|
|
190
|
+
keyMaterial: device.tokenHash
|
|
191
|
+
}));
|
|
192
|
+
return [...pairingMaterials, ...deviceMaterials];
|
|
193
|
+
},
|
|
153
194
|
async requireDeviceByToken(token) {
|
|
154
195
|
const state = await loadState();
|
|
155
196
|
const device = state.pairedDevices.find((candidate) => !candidate.revokedAt && tokenMatchesHash(token, candidate.tokenHash));
|
|
@@ -176,6 +217,7 @@ async function readStateFile(path) {
|
|
|
176
217
|
macId: parsed.macId,
|
|
177
218
|
macName: typeof parsed.macName === "string" ? parsed.macName : hostname() || "Abitat Mac",
|
|
178
219
|
hostTokenHash: typeof parsed.hostTokenHash === "string" ? parsed.hostTokenHash : "",
|
|
220
|
+
relayId: typeof parsed.relayId === "string" ? parsed.relayId : undefined,
|
|
179
221
|
pairedDevices: Array.isArray(parsed.pairedDevices) ? parsed.pairedDevices : [],
|
|
180
222
|
activePairings: Array.isArray(parsed.activePairings) ? parsed.activePairings : []
|
|
181
223
|
};
|
|
@@ -192,11 +234,25 @@ function manualCodeFromSeed(seed) {
|
|
|
192
234
|
return `ABITAT-${digest.slice(0, 4)}-${digest.slice(4, 8)}`;
|
|
193
235
|
}
|
|
194
236
|
function normalizeManualCode(code) {
|
|
195
|
-
return code
|
|
237
|
+
return code
|
|
238
|
+
.trim()
|
|
239
|
+
.replace(/[\u2010-\u2015\u2212]/gu, "-")
|
|
240
|
+
.replace(/\s+/gu, "")
|
|
241
|
+
.toUpperCase();
|
|
196
242
|
}
|
|
197
243
|
function isExpired(pairing, now) {
|
|
198
244
|
return Date.parse(pairing.expiresAt) <= now.getTime();
|
|
199
245
|
}
|
|
246
|
+
function latestStoredRelayId(state) {
|
|
247
|
+
return [
|
|
248
|
+
...state.pairedDevices.flatMap((device) => device.relayId ? [{ relayId: device.relayId, timestamp: Date.parse(device.pairedAt) }] : []),
|
|
249
|
+
...state.activePairings.flatMap((pairing) => pairing.relayId
|
|
250
|
+
? [{ relayId: pairing.relayId, timestamp: Date.parse(pairing.createdAt) }]
|
|
251
|
+
: [])
|
|
252
|
+
]
|
|
253
|
+
.sort((left, right) => right.timestamp - left.timestamp)
|
|
254
|
+
.at(0)?.relayId;
|
|
255
|
+
}
|
|
200
256
|
function tokenMatchesHash(token, expectedHash) {
|
|
201
257
|
const actual = Buffer.from(hashLocalControlToken(token), "hex");
|
|
202
258
|
const expected = Buffer.from(expectedHash, "hex");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/local-control/state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/local-control/state.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ type SpawnProcess = (file: string, args: string[]) => QuickTunnelProcess;
|
|
|
16
16
|
export interface LocalControlTransportResolution {
|
|
17
17
|
bindHost: string;
|
|
18
18
|
endpoint: string;
|
|
19
|
+
relayEndpoint?: string;
|
|
19
20
|
transport: LocalControlTransport;
|
|
20
21
|
warning?: string;
|
|
21
22
|
}
|
|
@@ -23,11 +24,31 @@ export interface QuickTunnel {
|
|
|
23
24
|
close(): Promise<void>;
|
|
24
25
|
endpoint: string;
|
|
25
26
|
}
|
|
27
|
+
export interface SshTunnel {
|
|
28
|
+
close(): Promise<void>;
|
|
29
|
+
endpoint: string;
|
|
30
|
+
}
|
|
31
|
+
interface WaitForQuickTunnelReadyInput {
|
|
32
|
+
fetch?: typeof fetch;
|
|
33
|
+
intervalMs?: number;
|
|
34
|
+
timeoutMs?: number;
|
|
35
|
+
}
|
|
36
|
+
export interface EndpointHealthMonitor {
|
|
37
|
+
stop(): void;
|
|
38
|
+
}
|
|
39
|
+
interface StartEndpointHealthMonitorInput {
|
|
40
|
+
fetch?: typeof fetch;
|
|
41
|
+
healthPath?: string;
|
|
42
|
+
intervalMs?: number;
|
|
43
|
+
maxFailures?: number;
|
|
44
|
+
onUnhealthy(error: Error): void;
|
|
45
|
+
}
|
|
26
46
|
interface ResolveLocalControlTransportInput {
|
|
27
47
|
endpoint?: string;
|
|
28
48
|
execFile?: ExecFile;
|
|
29
49
|
port: number;
|
|
30
|
-
|
|
50
|
+
relayEndpoint?: string;
|
|
51
|
+
requestedTransport: "auto" | LocalControlTransport | "temporary-tunnel";
|
|
31
52
|
}
|
|
32
53
|
export declare function resolveLocalControlTransport(input: ResolveLocalControlTransportInput): Promise<LocalControlTransportResolution>;
|
|
33
54
|
export declare function startQuickTunnel(input: {
|
|
@@ -35,5 +56,23 @@ export declare function startQuickTunnel(input: {
|
|
|
35
56
|
spawnProcess?: SpawnProcess;
|
|
36
57
|
timeoutMs?: number;
|
|
37
58
|
}): Promise<QuickTunnel>;
|
|
59
|
+
export declare function startLocalhostRunTunnel(input: {
|
|
60
|
+
localUrl: string;
|
|
61
|
+
spawnProcess?: SpawnProcess;
|
|
62
|
+
timeoutMs?: number;
|
|
63
|
+
}): Promise<SshTunnel>;
|
|
64
|
+
export declare function startPinggyTunnel(input: {
|
|
65
|
+
localUrl: string;
|
|
66
|
+
spawnProcess?: SpawnProcess;
|
|
67
|
+
timeoutMs?: number;
|
|
68
|
+
}): Promise<SshTunnel>;
|
|
69
|
+
export declare function startTemporarySshTunnel(input: {
|
|
70
|
+
localUrl: string;
|
|
71
|
+
onFallback?(error: unknown): void;
|
|
72
|
+
spawnProcess?: SpawnProcess;
|
|
73
|
+
timeoutMs?: number;
|
|
74
|
+
}): Promise<SshTunnel>;
|
|
75
|
+
export declare function waitForQuickTunnelReady(endpoint: string, input?: WaitForQuickTunnelReadyInput): Promise<void>;
|
|
76
|
+
export declare function startEndpointHealthMonitor(endpoint: string, input: StartEndpointHealthMonitorInput): EndpointHealthMonitor;
|
|
38
77
|
export {};
|
|
39
78
|
//# sourceMappingURL=transport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/local-control/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAExD,KAAK,QAAQ,GAAG,CACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EAAE,KACX,OAAO,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;IAChD,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,kBAAkB,CAAC;IAC3E,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,IAAI,GAAG,kBAAkB,CAAC;IAC5E,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,QAAQ,CAAC;CAClB;AAED,KAAK,YAAY,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,kBAAkB,CAAC;AAEzE,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,qBAAqB,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,iCAAiC;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,GAAG,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/local-control/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,9 @@ export async function resolveLocalControlTransport(input) {
|
|
|
6
6
|
return {
|
|
7
7
|
bindHost: "0.0.0.0",
|
|
8
8
|
endpoint: trimTrailingSlash(input.endpoint),
|
|
9
|
-
transport: input.requestedTransport === "auto"
|
|
9
|
+
transport: input.requestedTransport === "auto" || input.requestedTransport === "temporary-tunnel"
|
|
10
|
+
? "manual"
|
|
11
|
+
: input.requestedTransport
|
|
10
12
|
};
|
|
11
13
|
}
|
|
12
14
|
if (input.requestedTransport === "tailscale" || input.requestedTransport === "auto") {
|
|
@@ -39,6 +41,24 @@ export async function resolveLocalControlTransport(input) {
|
|
|
39
41
|
warning: "Quick Tunnel endpoint will be resolved after the local server starts."
|
|
40
42
|
};
|
|
41
43
|
}
|
|
44
|
+
if (input.requestedTransport === "relay") {
|
|
45
|
+
const relayEndpoint = trimTrailingSlash(input.relayEndpoint ?? "https://workspace.abitat.io");
|
|
46
|
+
return {
|
|
47
|
+
bindHost: "127.0.0.1",
|
|
48
|
+
endpoint: relayEndpoint,
|
|
49
|
+
relayEndpoint,
|
|
50
|
+
transport: "relay",
|
|
51
|
+
warning: "Relay endpoint will route through this Mac after the local server starts."
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
if (input.requestedTransport === "temporary-tunnel") {
|
|
55
|
+
return {
|
|
56
|
+
bindHost: "127.0.0.1",
|
|
57
|
+
endpoint: `http://127.0.0.1:${input.port}`,
|
|
58
|
+
transport: "manual",
|
|
59
|
+
warning: "Temporary tunnel endpoint will be resolved after the local server starts."
|
|
60
|
+
};
|
|
61
|
+
}
|
|
42
62
|
return {
|
|
43
63
|
bindHost: "127.0.0.1",
|
|
44
64
|
endpoint: `http://127.0.0.1:${input.port}`,
|
|
@@ -97,6 +117,220 @@ export function startQuickTunnel(input) {
|
|
|
97
117
|
child.once("exit", onExit);
|
|
98
118
|
});
|
|
99
119
|
}
|
|
120
|
+
export function startLocalhostRunTunnel(input) {
|
|
121
|
+
const origin = new URL(input.localUrl);
|
|
122
|
+
const port = origin.port || (origin.protocol === "https:" ? "443" : "80");
|
|
123
|
+
const remote = `80:${origin.hostname}:${port}`;
|
|
124
|
+
const spawnProcess = input.spawnProcess ??
|
|
125
|
+
((file, args) => spawn(file, args, { stdio: ["ignore", "pipe", "pipe"] }));
|
|
126
|
+
const child = spawnProcess("ssh", [
|
|
127
|
+
"-o",
|
|
128
|
+
"BatchMode=yes",
|
|
129
|
+
"-o",
|
|
130
|
+
"ConnectTimeout=10",
|
|
131
|
+
"-o",
|
|
132
|
+
"ExitOnForwardFailure=yes",
|
|
133
|
+
"-o",
|
|
134
|
+
"ServerAliveInterval=15",
|
|
135
|
+
"-o",
|
|
136
|
+
"StrictHostKeyChecking=accept-new",
|
|
137
|
+
"-R",
|
|
138
|
+
remote,
|
|
139
|
+
"nokey@localhost.run"
|
|
140
|
+
]);
|
|
141
|
+
const timeoutMs = input.timeoutMs ?? 30_000;
|
|
142
|
+
return new Promise((resolve, reject) => {
|
|
143
|
+
let settled = false;
|
|
144
|
+
let output = "";
|
|
145
|
+
const timer = setTimeout(() => {
|
|
146
|
+
fail(new Error("Timed out waiting for localhost.run tunnel URL from ssh."));
|
|
147
|
+
}, timeoutMs);
|
|
148
|
+
timer.unref?.();
|
|
149
|
+
const onData = (chunk) => {
|
|
150
|
+
output += chunk.toString();
|
|
151
|
+
const endpoint = parseLocalhostRunEndpoint(output);
|
|
152
|
+
if (!endpoint) {
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
cleanup();
|
|
156
|
+
settled = true;
|
|
157
|
+
resolve({
|
|
158
|
+
endpoint,
|
|
159
|
+
close: () => closeQuickTunnelProcess(child)
|
|
160
|
+
});
|
|
161
|
+
};
|
|
162
|
+
const onError = (error) => {
|
|
163
|
+
fail(localhostRunStartError(error));
|
|
164
|
+
};
|
|
165
|
+
const onExit = (code, signal) => {
|
|
166
|
+
fail(new Error(`ssh exited before creating a localhost.run tunnel URL (code=${code ?? "null"}, signal=${signal ?? "null"}).`));
|
|
167
|
+
};
|
|
168
|
+
const cleanup = () => {
|
|
169
|
+
clearTimeout(timer);
|
|
170
|
+
child.stdout.off("data", onData);
|
|
171
|
+
child.stderr.off("data", onData);
|
|
172
|
+
child.off("error", onError);
|
|
173
|
+
child.off("exit", onExit);
|
|
174
|
+
};
|
|
175
|
+
const fail = (error) => {
|
|
176
|
+
if (settled) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
cleanup();
|
|
180
|
+
settled = true;
|
|
181
|
+
reject(error);
|
|
182
|
+
};
|
|
183
|
+
child.stdout.on("data", onData);
|
|
184
|
+
child.stderr.on("data", onData);
|
|
185
|
+
child.once("error", onError);
|
|
186
|
+
child.once("exit", onExit);
|
|
187
|
+
});
|
|
188
|
+
}
|
|
189
|
+
export function startPinggyTunnel(input) {
|
|
190
|
+
const origin = new URL(input.localUrl);
|
|
191
|
+
const port = origin.port || (origin.protocol === "https:" ? "443" : "80");
|
|
192
|
+
const remote = `0:${origin.hostname}:${port}`;
|
|
193
|
+
const spawnProcess = input.spawnProcess ??
|
|
194
|
+
((file, args) => spawn(file, args, { stdio: ["ignore", "pipe", "pipe"] }));
|
|
195
|
+
const child = spawnProcess("ssh", [
|
|
196
|
+
"-o",
|
|
197
|
+
"BatchMode=yes",
|
|
198
|
+
"-o",
|
|
199
|
+
"ConnectTimeout=10",
|
|
200
|
+
"-o",
|
|
201
|
+
"ExitOnForwardFailure=yes",
|
|
202
|
+
"-o",
|
|
203
|
+
"ServerAliveInterval=15",
|
|
204
|
+
"-o",
|
|
205
|
+
"StrictHostKeyChecking=accept-new",
|
|
206
|
+
"-p",
|
|
207
|
+
"443",
|
|
208
|
+
"-R",
|
|
209
|
+
remote,
|
|
210
|
+
"a.pinggy.io"
|
|
211
|
+
]);
|
|
212
|
+
const timeoutMs = input.timeoutMs ?? 30_000;
|
|
213
|
+
return new Promise((resolve, reject) => {
|
|
214
|
+
let settled = false;
|
|
215
|
+
let output = "";
|
|
216
|
+
const timer = setTimeout(() => {
|
|
217
|
+
fail(new Error("Timed out waiting for Pinggy tunnel URL from ssh."));
|
|
218
|
+
}, timeoutMs);
|
|
219
|
+
timer.unref?.();
|
|
220
|
+
const onData = (chunk) => {
|
|
221
|
+
output += chunk.toString();
|
|
222
|
+
const endpoint = parsePinggyEndpoint(output);
|
|
223
|
+
if (!endpoint) {
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
cleanup();
|
|
227
|
+
settled = true;
|
|
228
|
+
resolve({
|
|
229
|
+
endpoint,
|
|
230
|
+
close: () => closeQuickTunnelProcess(child)
|
|
231
|
+
});
|
|
232
|
+
};
|
|
233
|
+
const onError = (error) => {
|
|
234
|
+
fail(pinggyStartError(error));
|
|
235
|
+
};
|
|
236
|
+
const onExit = (code, signal) => {
|
|
237
|
+
fail(new Error(`ssh exited before creating a Pinggy tunnel URL (code=${code ?? "null"}, signal=${signal ?? "null"}).`));
|
|
238
|
+
};
|
|
239
|
+
const cleanup = () => {
|
|
240
|
+
clearTimeout(timer);
|
|
241
|
+
child.stdout.off("data", onData);
|
|
242
|
+
child.stderr.off("data", onData);
|
|
243
|
+
child.off("error", onError);
|
|
244
|
+
child.off("exit", onExit);
|
|
245
|
+
};
|
|
246
|
+
const fail = (error) => {
|
|
247
|
+
if (settled) {
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
cleanup();
|
|
251
|
+
settled = true;
|
|
252
|
+
reject(error);
|
|
253
|
+
};
|
|
254
|
+
child.stdout.on("data", onData);
|
|
255
|
+
child.stderr.on("data", onData);
|
|
256
|
+
child.once("error", onError);
|
|
257
|
+
child.once("exit", onExit);
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
export function startTemporarySshTunnel(input) {
|
|
261
|
+
return startLocalhostRunTunnel(input).catch((error) => {
|
|
262
|
+
input.onFallback?.(error);
|
|
263
|
+
return startPinggyTunnel(input);
|
|
264
|
+
});
|
|
265
|
+
}
|
|
266
|
+
export async function waitForQuickTunnelReady(endpoint, input = {}) {
|
|
267
|
+
const runFetch = input.fetch ?? fetch;
|
|
268
|
+
const timeoutMs = input.timeoutMs ?? 20_000;
|
|
269
|
+
const intervalMs = input.intervalMs ?? 750;
|
|
270
|
+
const healthUrl = new URL("/health", trimTrailingSlash(endpoint)).toString();
|
|
271
|
+
const deadline = Date.now() + timeoutMs;
|
|
272
|
+
let lastError = "not checked yet";
|
|
273
|
+
while (Date.now() <= deadline) {
|
|
274
|
+
try {
|
|
275
|
+
const response = await runFetch(healthUrl, { method: "GET" });
|
|
276
|
+
if (response.ok) {
|
|
277
|
+
const body = (await response.json().catch(() => null));
|
|
278
|
+
if (body?.ok === true) {
|
|
279
|
+
return;
|
|
280
|
+
}
|
|
281
|
+
lastError = "health endpoint did not return ok=true";
|
|
282
|
+
}
|
|
283
|
+
else {
|
|
284
|
+
lastError = `${response.status} ${response.statusText || "response"}`;
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
catch (error) {
|
|
288
|
+
lastError = errorMessage(error);
|
|
289
|
+
}
|
|
290
|
+
await sleep(intervalMs);
|
|
291
|
+
}
|
|
292
|
+
throw new Error(`Tunnel endpoint is not reachable at ${healthUrl} (${lastError}). Keep the tunnel running on the Mac and try again.`);
|
|
293
|
+
}
|
|
294
|
+
export function startEndpointHealthMonitor(endpoint, input) {
|
|
295
|
+
const runFetch = input.fetch ?? fetch;
|
|
296
|
+
const intervalMs = input.intervalMs ?? 15_000;
|
|
297
|
+
const maxFailures = input.maxFailures ?? 2;
|
|
298
|
+
const healthUrl = new URL(input.healthPath ?? "/health", trimTrailingSlash(endpoint)).toString();
|
|
299
|
+
let stopped = false;
|
|
300
|
+
let failures = 0;
|
|
301
|
+
const check = async () => {
|
|
302
|
+
if (stopped) {
|
|
303
|
+
return;
|
|
304
|
+
}
|
|
305
|
+
try {
|
|
306
|
+
const response = await runFetch(healthUrl, { method: "GET" });
|
|
307
|
+
if (!response.ok) {
|
|
308
|
+
throw new Error(`${response.status} ${response.statusText || "response"}`);
|
|
309
|
+
}
|
|
310
|
+
const body = (await response.json().catch(() => null));
|
|
311
|
+
if (body?.ok !== true) {
|
|
312
|
+
throw new Error("health endpoint did not return ok=true");
|
|
313
|
+
}
|
|
314
|
+
failures = 0;
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
failures += 1;
|
|
318
|
+
if (failures >= maxFailures && !stopped) {
|
|
319
|
+
stopped = true;
|
|
320
|
+
input.onUnhealthy(new Error(`Tunnel endpoint is no longer reachable at ${healthUrl}: ${errorMessage(error)}`));
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
};
|
|
324
|
+
const timer = setInterval(() => void check(), intervalMs);
|
|
325
|
+
timer.unref?.();
|
|
326
|
+
void check();
|
|
327
|
+
return {
|
|
328
|
+
stop() {
|
|
329
|
+
stopped = true;
|
|
330
|
+
clearInterval(timer);
|
|
331
|
+
}
|
|
332
|
+
};
|
|
333
|
+
}
|
|
100
334
|
async function resolveTailscaleEndpoint(port, run) {
|
|
101
335
|
const { stdout } = await run("tailscale", ["status", "--json"]);
|
|
102
336
|
const status = JSON.parse(stdout);
|
|
@@ -120,6 +354,12 @@ function errorMessage(error) {
|
|
|
120
354
|
function parseQuickTunnelEndpoint(output) {
|
|
121
355
|
return output.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/iu)?.[0] ?? null;
|
|
122
356
|
}
|
|
357
|
+
function parseLocalhostRunEndpoint(output) {
|
|
358
|
+
return output.match(/https:\/\/[a-z0-9-]+\.lhr\.life/iu)?.[0] ?? null;
|
|
359
|
+
}
|
|
360
|
+
function parsePinggyEndpoint(output) {
|
|
361
|
+
return output.match(/https:\/\/[a-z0-9-]+\.run\.pinggy-free\.link/iu)?.[0] ?? null;
|
|
362
|
+
}
|
|
123
363
|
function quickTunnelStartError(error) {
|
|
124
364
|
const message = errorMessage(error);
|
|
125
365
|
const code = error && typeof error === "object" && "code" in error ? String(error.code) : undefined;
|
|
@@ -128,6 +368,25 @@ function quickTunnelStartError(error) {
|
|
|
128
368
|
}
|
|
129
369
|
return new Error(`Unable to start Cloudflare Quick Tunnel: ${message}`);
|
|
130
370
|
}
|
|
371
|
+
function localhostRunStartError(error) {
|
|
372
|
+
const message = errorMessage(error);
|
|
373
|
+
const code = error && typeof error === "object" && "code" in error ? String(error.code) : undefined;
|
|
374
|
+
if (code === "ENOENT" || message.includes("ENOENT")) {
|
|
375
|
+
return new Error("Unable to start localhost.run fallback tunnel because ssh is unavailable.");
|
|
376
|
+
}
|
|
377
|
+
return new Error(`Unable to start localhost.run fallback tunnel: ${message}`);
|
|
378
|
+
}
|
|
379
|
+
function pinggyStartError(error) {
|
|
380
|
+
const message = errorMessage(error);
|
|
381
|
+
const code = error && typeof error === "object" && "code" in error ? String(error.code) : undefined;
|
|
382
|
+
if (code === "ENOENT" || message.includes("ENOENT")) {
|
|
383
|
+
return new Error("Unable to start Pinggy fallback tunnel because ssh is unavailable.");
|
|
384
|
+
}
|
|
385
|
+
return new Error(`Unable to start Pinggy fallback tunnel: ${message}`);
|
|
386
|
+
}
|
|
387
|
+
function sleep(ms) {
|
|
388
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
389
|
+
}
|
|
131
390
|
function closeQuickTunnelProcess(child) {
|
|
132
391
|
return new Promise((resolve) => {
|
|
133
392
|
if (child.killed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/local-control/transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/local-control/transport.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abitat_reece/host-daemon",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.7",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"description": "Mac host daemon for Abitat Workspace remote Codex control",
|
|
7
7
|
"bin": {
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"node-pty": "^1.1.0",
|
|
24
24
|
"qrcode-terminal": "0.12.0",
|
|
25
25
|
"ws": "^8.20.0",
|
|
26
|
-
"@abitat_reece/shared": "0.1.
|
|
26
|
+
"@abitat_reece/shared": "0.1.1"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@types/qrcode-terminal": "0.12.2",
|