@intentic/sandbox-contract 1.311.0 → 1.312.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +9 -4
- package/dist/chores/chores.js +6 -6
- package/dist/chores/chores.js.map +1 -1
- package/dist/chores/fix-deps.d.ts.map +1 -1
- package/dist/chores/fix-deps.js +3 -2
- package/dist/chores/fix-deps.js.map +1 -1
- package/dist/chores/prompt.d.ts.map +1 -1
- package/dist/chores/prompt.js +3 -2
- package/dist/chores/prompt.js.map +1 -1
- package/dist/contracts/accounts.contract.d.ts +12 -0
- package/dist/contracts/accounts.contract.d.ts.map +1 -1
- package/dist/contracts/agents.contract.d.ts +601 -0
- package/dist/contracts/agents.contract.d.ts.map +1 -1
- package/dist/contracts/agents.contract.js +30 -2
- package/dist/contracts/agents.contract.js.map +1 -1
- package/dist/contracts/device.contract.d.ts +1 -0
- package/dist/contracts/device.contract.d.ts.map +1 -1
- package/dist/contracts/extensions.contract.d.ts +2 -0
- package/dist/contracts/extensions.contract.d.ts.map +1 -1
- package/dist/contracts/offload.contract.d.ts +107 -0
- package/dist/contracts/offload.contract.d.ts.map +1 -0
- package/dist/contracts/offload.contract.js +53 -0
- package/dist/contracts/offload.contract.js.map +1 -0
- package/dist/contracts/ports.contract.d.ts +5 -0
- package/dist/contracts/ports.contract.d.ts.map +1 -1
- package/dist/contracts/runner.contract.d.ts +66 -0
- package/dist/contracts/runner.contract.d.ts.map +1 -1
- package/dist/contracts/runner.contract.js +3 -1
- package/dist/contracts/runner.contract.js.map +1 -1
- package/dist/contracts/settings.contract.d.ts +8 -0
- package/dist/contracts/settings.contract.d.ts.map +1 -1
- package/dist/contracts/system.contract.d.ts +95 -0
- package/dist/contracts/system.contract.d.ts.map +1 -1
- package/dist/contracts/translator.contract.d.ts +16 -0
- package/dist/contracts/translator.contract.d.ts.map +1 -1
- package/dist/contracts/workspace.contract.d.ts +146 -0
- package/dist/contracts/workspace.contract.d.ts.map +1 -1
- package/dist/contracts/workspace.contract.js +40 -3
- package/dist/contracts/workspace.contract.js.map +1 -1
- package/dist/documents/conversions.d.ts +81 -0
- package/dist/documents/conversions.d.ts.map +1 -0
- package/dist/documents/conversions.js +213 -0
- package/dist/documents/conversions.js.map +1 -0
- package/dist/documents/index.d.ts +3 -0
- package/dist/documents/index.d.ts.map +1 -0
- package/dist/documents/index.js +3 -0
- package/dist/documents/index.js.map +1 -0
- package/dist/documents/passthrough.d.ts +13 -0
- package/dist/documents/passthrough.d.ts.map +1 -0
- package/dist/documents/passthrough.js +101 -0
- package/dist/documents/passthrough.js.map +1 -0
- package/dist/events/land-breakage.d.ts +3 -0
- package/dist/events/land-breakage.d.ts.map +1 -1
- package/dist/events/land-breakage.js +3 -0
- package/dist/events/land-breakage.js.map +1 -1
- package/dist/events/land-conflict.d.ts +3 -0
- package/dist/events/land-conflict.d.ts.map +1 -0
- package/dist/events/land-conflict.js +4 -0
- package/dist/events/land-conflict.js.map +1 -0
- package/dist/events/system-events.d.ts +66 -0
- package/dist/events/system-events.d.ts.map +1 -1
- package/dist/events/system-events.js +3 -1
- package/dist/events/system-events.js.map +1 -1
- package/dist/events/verify-nudge.d.ts.map +1 -1
- package/dist/events/verify-nudge.js.map +1 -1
- package/dist/front/generated/wire.d.ts +63 -0
- package/dist/front/generated/wire.d.ts.map +1 -1
- package/dist/front/terminal-frames.d.ts +17 -0
- package/dist/front/terminal-frames.d.ts.map +1 -0
- package/dist/front/terminal-frames.js +79 -0
- package/dist/front/terminal-frames.js.map +1 -0
- package/dist/ids/conversation-ids.d.ts +2 -0
- package/dist/ids/conversation-ids.d.ts.map +1 -1
- package/dist/ids/conversation-ids.js +2 -0
- package/dist/ids/conversation-ids.js.map +1 -1
- package/dist/index.d.ts +1002 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -1
- package/dist/index.js.map +1 -1
- package/dist/protocol/container-requirements.d.ts +0 -1
- package/dist/protocol/container-requirements.d.ts.map +1 -1
- package/dist/protocol/container-requirements.js +1 -2
- package/dist/protocol/container-requirements.js.map +1 -1
- package/dist/protocol/ingress-contract.d.ts +0 -11
- package/dist/protocol/ingress-contract.d.ts.map +1 -1
- package/dist/protocol/raw-routes.d.ts +36 -4
- package/dist/protocol/raw-routes.d.ts.map +1 -1
- package/dist/protocol/raw-routes.js +18 -13
- package/dist/protocol/raw-routes.js.map +1 -1
- package/dist/protocol/route-meta.d.ts +2 -0
- package/dist/protocol/route-meta.d.ts.map +1 -1
- package/dist/protocol/route-meta.js.map +1 -1
- package/dist/protocol/runner-protocol.d.ts +34 -0
- package/dist/protocol/runner-protocol.d.ts.map +1 -1
- package/dist/protocol/runner-protocol.js +33 -0
- package/dist/protocol/runner-protocol.js.map +1 -1
- package/dist/protocol/tunnel-lanes.d.ts +10 -0
- package/dist/protocol/tunnel-lanes.d.ts.map +1 -0
- package/dist/protocol/tunnel-lanes.js +16 -0
- package/dist/protocol/tunnel-lanes.js.map +1 -0
- package/dist/schemas/activity.d.ts.map +1 -1
- package/dist/schemas/activity.js.map +1 -1
- package/dist/schemas/agents.d.ts +73 -0
- package/dist/schemas/agents.d.ts.map +1 -1
- package/dist/schemas/agents.js +33 -2
- package/dist/schemas/agents.js.map +1 -1
- package/dist/schemas/automations.d.ts +19 -0
- package/dist/schemas/automations.d.ts.map +1 -1
- package/dist/schemas/devices.d.ts +2 -0
- package/dist/schemas/devices.d.ts.map +1 -1
- package/dist/schemas/extension-updates.d.ts +4 -0
- package/dist/schemas/extension-updates.d.ts.map +1 -1
- package/dist/schemas/git/git.d.ts +16 -0
- package/dist/schemas/git/git.d.ts.map +1 -1
- package/dist/schemas/git/git.js +1 -0
- package/dist/schemas/git/git.js.map +1 -1
- package/dist/schemas/hosts.d.ts +8 -0
- package/dist/schemas/hosts.d.ts.map +1 -1
- package/dist/schemas/hosts.js +3 -0
- package/dist/schemas/hosts.js.map +1 -1
- package/dist/schemas/metrics.d.ts +7 -0
- package/dist/schemas/metrics.d.ts.map +1 -1
- package/dist/schemas/metrics.js +1 -0
- package/dist/schemas/metrics.js.map +1 -1
- package/dist/schemas/offload.d.ts +62 -0
- package/dist/schemas/offload.d.ts.map +1 -0
- package/dist/schemas/offload.js +23 -0
- package/dist/schemas/offload.js.map +1 -0
- package/dist/schemas/personas.js +3 -3
- package/dist/schemas/personas.js.map +1 -1
- package/dist/schemas/ports.d.ts +10 -0
- package/dist/schemas/ports.d.ts.map +1 -1
- package/dist/schemas/ports.js +8 -0
- package/dist/schemas/ports.js.map +1 -1
- package/dist/schemas/providers/plan-limits.d.ts +29 -0
- package/dist/schemas/providers/plan-limits.d.ts.map +1 -1
- package/dist/schemas/providers/plan-limits.js +7 -0
- package/dist/schemas/providers/plan-limits.js.map +1 -1
- package/dist/schemas/providers/provider-oauth.d.ts +12 -0
- package/dist/schemas/providers/provider-oauth.d.ts.map +1 -1
- package/dist/schemas/settings-history.d.ts +28 -0
- package/dist/schemas/settings-history.d.ts.map +1 -0
- package/dist/schemas/settings-history.js +39 -0
- package/dist/schemas/settings-history.js.map +1 -0
- package/dist/schemas/settings.d.ts +4 -0
- package/dist/schemas/settings.d.ts.map +1 -1
- package/dist/schemas/settings.js +10 -3
- package/dist/schemas/settings.js.map +1 -1
- package/dist/schemas/system.d.ts +24 -0
- package/dist/schemas/system.d.ts.map +1 -1
- package/dist/schemas/system.js +15 -0
- package/dist/schemas/system.js.map +1 -1
- package/dist/schemas/workspace/mainline.d.ts +371 -0
- package/dist/schemas/workspace/mainline.d.ts.map +1 -0
- package/dist/schemas/workspace/mainline.js +134 -0
- package/dist/schemas/workspace/mainline.js.map +1 -0
- package/dist/schemas/workspace/workspace-tree.d.ts +23 -0
- package/dist/schemas/workspace/workspace-tree.d.ts.map +1 -1
- package/dist/schemas/workspace/workspace-tree.js +34 -0
- package/dist/schemas/workspace/workspace-tree.js.map +1 -1
- package/dist/state/definition.d.ts +20 -4
- package/dist/state/definition.d.ts.map +1 -1
- package/dist/state/definition.js.map +1 -1
- package/dist/state/history-state.d.ts.map +1 -1
- package/dist/state/history-state.js +5 -0
- package/dist/state/history-state.js.map +1 -1
- package/dist/state/runtime-state.d.ts +3 -0
- package/dist/state/runtime-state.d.ts.map +1 -1
- package/dist/state/runtime-state.js +1 -0
- package/dist/state/runtime-state.js.map +1 -1
- package/dist/state/workspace-state.d.ts +22 -1
- package/dist/state/workspace-state.d.ts.map +1 -1
- package/dist/state/workspace-state.js +27 -1
- package/dist/state/workspace-state.js.map +1 -1
- package/dist/text/transcript-fold.d.ts +1 -0
- package/dist/text/transcript-fold.d.ts.map +1 -1
- package/dist/text/transcript-fold.js +10 -1
- package/dist/text/transcript-fold.js.map +1 -1
- package/package.json +28 -27
- package/src/chores/chores.ts +6 -6
- package/src/chores/fix-deps.ts +3 -2
- package/src/chores/prompt.ts +3 -2
- package/src/contracts/agents.contract.ts +36 -1
- package/src/contracts/offload.contract.ts +60 -0
- package/src/contracts/runner.contract.ts +7 -1
- package/src/contracts/workspace.contract.ts +54 -2
- package/src/documents/conversions.ts +402 -0
- package/src/documents/index.ts +5 -0
- package/src/documents/passthrough.ts +139 -0
- package/src/events/land-breakage.ts +12 -0
- package/src/events/land-conflict.ts +12 -0
- package/src/events/system-events.ts +9 -3
- package/src/events/verify-nudge.ts +4 -3
- package/src/front/generated/wire.ts +35 -4
- package/src/front/terminal-frames.fixture.json +55 -0
- package/src/front/terminal-frames.test.ts +63 -0
- package/src/front/terminal-frames.ts +102 -0
- package/src/ids/conversation-ids.ts +7 -0
- package/src/index.ts +7 -1
- package/src/protocol/container-requirements.test.ts +2 -3
- package/src/protocol/container-requirements.ts +1 -7
- package/src/protocol/ingress-contract.fixture.json +77 -0
- package/src/protocol/ingress-contract.test.ts +18 -26
- package/src/protocol/ingress-contract.ts +3 -22
- package/src/protocol/raw-routes.ts +21 -14
- package/src/protocol/route-meta.ts +4 -0
- package/src/protocol/runner-protocol.ts +53 -0
- package/src/protocol/tunnel-lanes.json +136 -0
- package/src/protocol/tunnel-lanes.test.ts +30 -0
- package/src/protocol/tunnel-lanes.ts +32 -0
- package/src/schemas/activity.ts +3 -1
- package/src/schemas/agents.ts +52 -3
- package/src/schemas/git/git.ts +5 -0
- package/src/schemas/hosts.ts +8 -0
- package/src/schemas/metrics.ts +2 -0
- package/src/schemas/offload.ts +44 -0
- package/src/schemas/personas.ts +3 -3
- package/src/schemas/ports.ts +10 -0
- package/src/schemas/providers/plan-limits.ts +13 -0
- package/src/schemas/settings-history.ts +61 -0
- package/src/schemas/settings.ts +40 -19
- package/src/schemas/system.ts +17 -0
- package/src/schemas/workspace/mainline.ts +201 -0
- package/src/schemas/workspace/workspace-tree.ts +47 -0
- package/src/state/definition.ts +3 -2
- package/src/state/history-state.ts +15 -0
- package/src/state/runtime-state.ts +4 -0
- package/src/state/workspace-state.ts +35 -1
- package/src/text/transcript-fold.test.ts +33 -0
- package/src/text/transcript-fold.ts +14 -1
- package/dist/protocol/ingress-protocol.d.ts +0 -30
- package/dist/protocol/ingress-protocol.d.ts.map +0 -1
- package/dist/protocol/ingress-protocol.js +0 -300
- package/dist/protocol/ingress-protocol.js.map +0 -1
- package/dist/protocol/terminal-protocol.d.ts +0 -18
- package/dist/protocol/terminal-protocol.d.ts.map +0 -1
- package/dist/protocol/terminal-protocol.js +0 -2
- package/dist/protocol/terminal-protocol.js.map +0 -1
- package/dist/protocol/tunnel-heartbeat.d.ts +0 -19
- package/dist/protocol/tunnel-heartbeat.d.ts.map +0 -1
- package/dist/protocol/tunnel-heartbeat.js +0 -41
- package/dist/protocol/tunnel-heartbeat.js.map +0 -1
- package/src/protocol/ingress-protocol.test.ts +0 -579
- package/src/protocol/ingress-protocol.ts +0 -469
- package/src/protocol/terminal-protocol.ts +0 -13
- package/src/protocol/tunnel-heartbeat.test.ts +0 -75
- package/src/protocol/tunnel-heartbeat.ts +0 -67
|
@@ -2,6 +2,8 @@ import { STATE_DIR } from "@intentic/constants";
|
|
|
2
2
|
import type { AgentEvent } from "../events/agent-events.js";
|
|
3
3
|
import type { TranscriptPatch, TranscriptRow } from "../events/transcript.js";
|
|
4
4
|
import { watchWakePrompt } from "../events/watch-wake.js";
|
|
5
|
+
import { LAND_CONFLICT_OPENING } from "../events/land-conflict.js";
|
|
6
|
+
import { RESUME_NOTES } from "../events/resume.js";
|
|
5
7
|
import { childReportPrompt, peerMessagePrompt } from "../events/agent-words.js";
|
|
6
8
|
import { applyTranscriptPatch, foldTurn, TranscriptFold, userRow } from "./transcript-fold.js";
|
|
7
9
|
|
|
@@ -249,6 +251,25 @@ describe("foldTurn", () => {
|
|
|
249
251
|
);
|
|
250
252
|
});
|
|
251
253
|
|
|
254
|
+
// A resolve turn exists because the branch couldn't rebase; its own opening rebase failing the same way is that
|
|
255
|
+
// errand said twice, one row under itself. Any other turn still hears it, and a resolve turn still hears what moved.
|
|
256
|
+
it("leaves the blocked rebase out of a land-conflict turn's notice, and only that", () => {
|
|
257
|
+
const blocked: AgentEvent = { kind: "worktree", branch: "agent/x", base: "abc1234", sync: { commits: 0, blocked: ["intentic"] } };
|
|
258
|
+
const resolve = `${LAND_CONFLICT_OPENING}\n\n1. \`git add -A && git commit\``;
|
|
259
|
+
expect(foldOf(resolve, [blocked])).toEqual(openingOf(resolve));
|
|
260
|
+
expect(foldOf(`${RESUME_NOTES.restart}\n\n${resolve}`, [blocked]).slice(1)).toEqual([]);
|
|
261
|
+
expect(foldOf("go", [blocked]).slice(1)).toEqual([
|
|
262
|
+
{
|
|
263
|
+
role: "notice",
|
|
264
|
+
text: "Couldn't rebase onto your workspace in intentic: the turn is running from the older base, so its land may need a resolve.",
|
|
265
|
+
},
|
|
266
|
+
]);
|
|
267
|
+
const mixed: AgentEvent = { kind: "worktree", branch: "agent/x", base: "abc1234", sync: { commits: 3, blocked: ["intentic"] } };
|
|
268
|
+
expect(foldOf(resolve, [mixed]).slice(1)).toEqual([
|
|
269
|
+
{ role: "notice", text: "Your workspace moved on while this agent waited, its branch was rebased onto your latest 3 commits." },
|
|
270
|
+
]);
|
|
271
|
+
});
|
|
272
|
+
|
|
252
273
|
it("stamps the checkpoint and the preamble's notes on the turn's user row", () => {
|
|
253
274
|
const events: AgentEvent[] = [
|
|
254
275
|
{ kind: "checkpoint", id: "snap-1", index: 4 },
|
|
@@ -451,6 +472,18 @@ describe("patches", () => {
|
|
|
451
472
|
]);
|
|
452
473
|
});
|
|
453
474
|
|
|
475
|
+
// A subagent thinks a token at a time; sending the spawning card whole each time would resend every child it holds.
|
|
476
|
+
it("sends a subagent's reasoning as its words alone, onto the card that spawned it", () => {
|
|
477
|
+
const fold = new TranscriptFold(openingOf("go"));
|
|
478
|
+
fold.apply({ kind: "tool_call", id: "task-1", name: "Agent", category: "other", status: "in_progress" });
|
|
479
|
+
fold.apply({ kind: "tool_call", id: "t2", name: "Read", category: "read", status: "completed", parentToolUseId: "task-1" });
|
|
480
|
+
expect(fold.apply({ kind: "thinking", text: "the handler", parentToolUseId: "task-1" })).toEqual([
|
|
481
|
+
{ op: "toolThinking", index: 1, id: "task-1", text: "the handler" },
|
|
482
|
+
]);
|
|
483
|
+
expect(fold.apply({ kind: "thinking", text: "", parentToolUseId: "task-1" })).toEqual([]);
|
|
484
|
+
expect(fold.rows[1]?.tools?.[0]?.thinking).toBe("the handler");
|
|
485
|
+
});
|
|
486
|
+
|
|
454
487
|
it("send a delegation's card without its subtree or thinking, and a client keeps the ones it has", () => {
|
|
455
488
|
const events: AgentEvent[] = [
|
|
456
489
|
{ kind: "tool_call", id: "task-1", name: "Agent", category: "other", status: "in_progress" },
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
} from "../events/transcript.js";
|
|
13
13
|
import { contextTrimLine } from "../schemas/context-trim.js";
|
|
14
14
|
import { keptWarmLine } from "../schemas/keep-warm.js";
|
|
15
|
+
import { isLandConflict } from "../events/land-conflict.js";
|
|
15
16
|
import { turnedAwayCode } from "../policy/turned-away.js";
|
|
16
17
|
import { mentionedPathTokens } from "./mentions.js";
|
|
17
18
|
import { unspokenPromptRow } from "../events/agent-words.js";
|
|
@@ -344,7 +345,7 @@ export class TranscriptFold {
|
|
|
344
345
|
// and the fold beside the message only ever lists notes that actually rode.
|
|
345
346
|
return this.pushRow({ role: "notice", text: contextTrimLine(event) });
|
|
346
347
|
case "worktree":
|
|
347
|
-
return event.sync === undefined ? [] : this.
|
|
348
|
+
return event.sync === undefined ? [] : this.synced(event.sync);
|
|
348
349
|
case "landed":
|
|
349
350
|
return this.pushRow(landedRow(event));
|
|
350
351
|
case "compact":
|
|
@@ -539,7 +540,11 @@ export class TranscriptFold {
|
|
|
539
540
|
if (place === undefined || parent === undefined) {
|
|
540
541
|
return [];
|
|
541
542
|
}
|
|
543
|
+
// Only the new words travel: the card whole, children and all, would go out again for every token.
|
|
542
544
|
if (event.kind === "thinking") {
|
|
545
|
+
if (event.text.length === 0) {
|
|
546
|
+
return [];
|
|
547
|
+
}
|
|
543
548
|
place.tool.thinking = `${place.tool.thinking ?? ""}${event.text}`;
|
|
544
549
|
return [{ op: "toolThinking", index: place.row, id: parent, text: event.text }];
|
|
545
550
|
}
|
|
@@ -613,6 +618,14 @@ export class TranscriptFold {
|
|
|
613
618
|
return [{ op: "tool", index: place.row, tool: structuredClone(ownFields(place.tool)), ...(place.parent === undefined ? {} : { parent: place.parent }) }];
|
|
614
619
|
}
|
|
615
620
|
|
|
621
|
+
// The rebase notice, less what a resolve turn was sent to fix: that turn opens because the branch couldn't rebase, so
|
|
622
|
+
// saying so again one row under its own errand only repeats it. What did move is still told.
|
|
623
|
+
private synced(sync: { commits: number; blocked: readonly string[] }): TranscriptPatch[] {
|
|
624
|
+
const opener = this.opener === undefined ? undefined : this.rows[this.opener];
|
|
625
|
+
const text = syncLine(opener !== undefined && isLandConflict(opener.text) ? { ...sync, blocked: [] } : sync);
|
|
626
|
+
return text === "" ? [] : this.pushRow({ role: "notice", text });
|
|
627
|
+
}
|
|
628
|
+
|
|
616
629
|
private stampOpener(mutate: (row: TranscriptRow) => void): TranscriptPatch[] {
|
|
617
630
|
if (this.opener === undefined) {
|
|
618
631
|
return [];
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { type IncomingMessage, type ServerResponse } from "node:http";
|
|
2
|
-
import { Duplex } from "node:stream";
|
|
3
|
-
export declare const INITIAL_WINDOW_SIZE: number;
|
|
4
|
-
export declare const CONNECTION_WINDOW_SIZE: number;
|
|
5
|
-
export interface IngressSession {
|
|
6
|
-
readonly forwardRequest: (request: IncomingMessage, response: ServerResponse) => Promise<void>;
|
|
7
|
-
readonly forwardUpgrade: (request: IncomingMessage, socket: Duplex, head: Buffer) => Promise<void>;
|
|
8
|
-
readonly close: () => void;
|
|
9
|
-
}
|
|
10
|
-
export declare const openIngressSession: (duplex: Duplex) => Promise<IngressSession>;
|
|
11
|
-
export interface ServeIngressSessionOptions {
|
|
12
|
-
readonly targetPort: number;
|
|
13
|
-
}
|
|
14
|
-
export interface IngressSessionServer {
|
|
15
|
-
readonly close: () => void;
|
|
16
|
-
}
|
|
17
|
-
export declare const serveIngressSession: (duplex: Duplex, options: ServeIngressSessionOptions) => Promise<IngressSessionServer>;
|
|
18
|
-
export interface TunnelWebSocket {
|
|
19
|
-
readonly send: (data: Buffer, options: {
|
|
20
|
-
binary: boolean;
|
|
21
|
-
}, callback: (error?: Error) => void) => void;
|
|
22
|
-
readonly close: () => void;
|
|
23
|
-
readonly on: {
|
|
24
|
-
(event: `message`, listener: (data: unknown) => void): unknown;
|
|
25
|
-
(event: `close`, listener: () => void): unknown;
|
|
26
|
-
(event: `error`, listener: (error: Error) => void): unknown;
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
export declare const webSocketDuplex: (socket: TunnelWebSocket) => Duplex;
|
|
30
|
-
//# sourceMappingURL=ingress-protocol.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ingress-protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/ingress-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,eAAe,EAA4B,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AAU7H,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAuGrC,eAAO,MAAM,mBAAmB,QAAc,CAAC;AAK/C,eAAO,MAAM,sBAAsB,QAA0B,CAAC;AAyE9D,MAAM,WAAW,cAAc;IAI3B,QAAQ,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAG/F,QAAQ,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnG,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;CAC9B;AAID,eAAO,MAAM,kBAAkB,WAAkB,MAAM,KAAG,OAAO,CAAC,cAAc,CAuG/E,CAAC;AAIF,MAAM,WAAW,0BAA0B;IAEvC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IAGjC,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;CAC9B;AAID,eAAO,MAAM,mBAAmB,WAAkB,MAAM,WAAW,0BAA0B,KAAG,OAAO,CAAC,oBAAoB,CA4G3H,CAAC;AAKF,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,EAAE,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,KAAK,IAAI,KAAK,IAAI,CAAC;IACvG,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,EAAE;QACT,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC;QAC/D,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;QAChD,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;KAC/D,CAAC;CACL;AAED,eAAO,MAAM,eAAe,WAAY,eAAe,KAAG,MAoBzD,CAAC"}
|
|
@@ -1,300 +0,0 @@
|
|
|
1
|
-
import { Agent, request as h1Request } from "node:http";
|
|
2
|
-
import { connect as h2Connect, constants, createServer as createH2Server, } from "node:http2";
|
|
3
|
-
import { createServer as createNetServer, connect as netConnect } from "node:net";
|
|
4
|
-
import { Duplex } from "node:stream";
|
|
5
|
-
const HOP_BY_HOP = new Set([
|
|
6
|
-
"connection",
|
|
7
|
-
"host",
|
|
8
|
-
"http2-settings",
|
|
9
|
-
"keep-alive",
|
|
10
|
-
"proxy-authenticate",
|
|
11
|
-
"proxy-authorization",
|
|
12
|
-
"proxy-connection",
|
|
13
|
-
"te",
|
|
14
|
-
"trailer",
|
|
15
|
-
"transfer-encoding",
|
|
16
|
-
"upgrade",
|
|
17
|
-
]);
|
|
18
|
-
const endToEnd = (headers) => {
|
|
19
|
-
const kept = {};
|
|
20
|
-
for (const [name, value] of Object.entries(headers)) {
|
|
21
|
-
if (value !== undefined && !name.startsWith(":") && !HOP_BY_HOP.has(name)) {
|
|
22
|
-
kept[name] = value;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
return kept;
|
|
26
|
-
};
|
|
27
|
-
const UPGRADE_METHOD_HEADER = "x-ingress-method";
|
|
28
|
-
const UPGRADE_PATH_HEADER = "x-ingress-path";
|
|
29
|
-
const UPGRADE_HEADER_PREFIX = "x-ingress-h-";
|
|
30
|
-
const upgradeEnvelope = (request, authority) => {
|
|
31
|
-
const envelope = {
|
|
32
|
-
[constants.HTTP2_HEADER_METHOD]: constants.HTTP2_METHOD_CONNECT,
|
|
33
|
-
[constants.HTTP2_HEADER_AUTHORITY]: authority,
|
|
34
|
-
[UPGRADE_METHOD_HEADER]: request.method ?? "GET",
|
|
35
|
-
[UPGRADE_PATH_HEADER]: request.url ?? "/",
|
|
36
|
-
};
|
|
37
|
-
for (const [name, value] of Object.entries(request.headers)) {
|
|
38
|
-
if (value !== undefined) {
|
|
39
|
-
envelope[`${UPGRADE_HEADER_PREFIX}${name}`] = value;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
return envelope;
|
|
43
|
-
};
|
|
44
|
-
const upgradeHead = (headers) => {
|
|
45
|
-
const rebuilt = {};
|
|
46
|
-
for (const [name, value] of Object.entries(headers)) {
|
|
47
|
-
if (value !== undefined && name.startsWith(UPGRADE_HEADER_PREFIX)) {
|
|
48
|
-
rebuilt[name.slice(UPGRADE_HEADER_PREFIX.length)] = value;
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
return {
|
|
52
|
-
method: single(headers[UPGRADE_METHOD_HEADER]) ?? "GET",
|
|
53
|
-
path: single(headers[UPGRADE_PATH_HEADER]) ?? "/",
|
|
54
|
-
headers: rebuilt,
|
|
55
|
-
};
|
|
56
|
-
};
|
|
57
|
-
const single = (value) => (Array.isArray(value) ? value[0] : value);
|
|
58
|
-
const serializeHead = (response, drop, add) => {
|
|
59
|
-
const lines = [`HTTP/${response.httpVersion} ${String(response.statusCode)} ${response.statusMessage ?? ""}`];
|
|
60
|
-
for (let index = 0; index + 1 < response.rawHeaders.length; index += 2) {
|
|
61
|
-
const name = response.rawHeaders[index];
|
|
62
|
-
if (!drop.has(name.toLowerCase())) {
|
|
63
|
-
lines.push(`${name}: ${response.rawHeaders[index + 1]}`);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
return Buffer.from(`${[...lines, ...add].join("\r\n")}\r\n\r\n`, "latin1");
|
|
67
|
-
};
|
|
68
|
-
const DECLINED_UPGRADE_DROP = new Set(["connection", "keep-alive", "transfer-encoding"]);
|
|
69
|
-
const DECLINED_UPGRADE_ADD = ["connection: close"];
|
|
70
|
-
const NOTHING_DROPPED = new Set();
|
|
71
|
-
const MAX_SESSION_MEMORY_MB = 128;
|
|
72
|
-
export const INITIAL_WINDOW_SIZE = 1024 * 1024;
|
|
73
|
-
export const CONNECTION_WINDOW_SIZE = 2 * INITIAL_WINDOW_SIZE;
|
|
74
|
-
const PEER_MAX_CONCURRENT_STREAMS = 256;
|
|
75
|
-
const LOOPBACK = "127.0.0.1";
|
|
76
|
-
const splice = (left, right) => {
|
|
77
|
-
left.pipe(right);
|
|
78
|
-
right.pipe(left);
|
|
79
|
-
const fail = () => {
|
|
80
|
-
left.destroy();
|
|
81
|
-
right.destroy();
|
|
82
|
-
};
|
|
83
|
-
left.on("error", fail);
|
|
84
|
-
right.on("error", fail);
|
|
85
|
-
left.on("close", () => {
|
|
86
|
-
if (!right.writableFinished) {
|
|
87
|
-
right.destroy();
|
|
88
|
-
}
|
|
89
|
-
});
|
|
90
|
-
right.on("close", () => {
|
|
91
|
-
if (!left.writableFinished) {
|
|
92
|
-
left.destroy();
|
|
93
|
-
}
|
|
94
|
-
});
|
|
95
|
-
};
|
|
96
|
-
const loopbackBridge = async () => {
|
|
97
|
-
const listener = createNetServer();
|
|
98
|
-
try {
|
|
99
|
-
await new Promise((resolve, reject) => {
|
|
100
|
-
listener.once("error", reject);
|
|
101
|
-
listener.listen(0, LOOPBACK, resolve);
|
|
102
|
-
});
|
|
103
|
-
const accepted = new Promise((resolve, reject) => {
|
|
104
|
-
listener.once("connection", resolve);
|
|
105
|
-
listener.once("error", reject);
|
|
106
|
-
});
|
|
107
|
-
const tunnel = netConnect(listener.address().port, LOOPBACK);
|
|
108
|
-
await new Promise((resolve, reject) => {
|
|
109
|
-
tunnel.once("connect", resolve);
|
|
110
|
-
tunnel.once("error", reject);
|
|
111
|
-
});
|
|
112
|
-
const session = await accepted;
|
|
113
|
-
if (session.remotePort !== tunnel.localPort) {
|
|
114
|
-
session.destroy();
|
|
115
|
-
tunnel.destroy();
|
|
116
|
-
throw new Error("the loopback bridge accepted a connection that was not its own");
|
|
117
|
-
}
|
|
118
|
-
session.setNoDelay(true);
|
|
119
|
-
tunnel.setNoDelay(true);
|
|
120
|
-
return { session, tunnel };
|
|
121
|
-
}
|
|
122
|
-
finally {
|
|
123
|
-
listener.close();
|
|
124
|
-
}
|
|
125
|
-
};
|
|
126
|
-
export const openIngressSession = async (duplex) => {
|
|
127
|
-
const bridge = await loopbackBridge();
|
|
128
|
-
splice(bridge.tunnel, duplex);
|
|
129
|
-
const session = h2Connect("http://tunnel.invalid", {
|
|
130
|
-
createConnection: () => bridge.session,
|
|
131
|
-
maxSessionMemory: MAX_SESSION_MEMORY_MB,
|
|
132
|
-
peerMaxConcurrentStreams: PEER_MAX_CONCURRENT_STREAMS,
|
|
133
|
-
settings: { initialWindowSize: INITIAL_WINDOW_SIZE },
|
|
134
|
-
});
|
|
135
|
-
session.on("error", () => duplex.destroy());
|
|
136
|
-
session.on("close", () => duplex.destroy());
|
|
137
|
-
session.once("connect", () => session.setLocalWindowSize(CONNECTION_WINDOW_SIZE));
|
|
138
|
-
const authorityOf = (request) => {
|
|
139
|
-
const host = request.headers.host;
|
|
140
|
-
if (host === undefined || host === "") {
|
|
141
|
-
throw new Error("an ingress request is routed by its Host header, and this one has none");
|
|
142
|
-
}
|
|
143
|
-
return host;
|
|
144
|
-
};
|
|
145
|
-
const forwardRequest = (request, response) => new Promise((resolve, reject) => {
|
|
146
|
-
const authority = authorityOf(request);
|
|
147
|
-
const stream = session.request({
|
|
148
|
-
[constants.HTTP2_HEADER_METHOD]: request.method ?? "GET",
|
|
149
|
-
[constants.HTTP2_HEADER_PATH]: request.url ?? "/",
|
|
150
|
-
[constants.HTTP2_HEADER_AUTHORITY]: authority,
|
|
151
|
-
[constants.HTTP2_HEADER_SCHEME]: "https",
|
|
152
|
-
...endToEnd(request.headers),
|
|
153
|
-
}, { endStream: false });
|
|
154
|
-
request.pipe(stream);
|
|
155
|
-
response.on("close", () => {
|
|
156
|
-
if (!response.writableFinished) {
|
|
157
|
-
stream.close(constants.NGHTTP2_CANCEL);
|
|
158
|
-
}
|
|
159
|
-
});
|
|
160
|
-
stream.on("response", (headers) => {
|
|
161
|
-
if (response.destroyed) {
|
|
162
|
-
stream.close(constants.NGHTTP2_CANCEL);
|
|
163
|
-
return;
|
|
164
|
-
}
|
|
165
|
-
response.writeHead(Number(headers[constants.HTTP2_HEADER_STATUS] ?? 502), endToEnd(headers));
|
|
166
|
-
stream.pipe(response);
|
|
167
|
-
});
|
|
168
|
-
stream.on("error", reject);
|
|
169
|
-
response.on("finish", resolve);
|
|
170
|
-
stream.on("close", () => {
|
|
171
|
-
if (!response.writableEnded) {
|
|
172
|
-
reject(new Error("the tunnel closed the stream before the response was complete"));
|
|
173
|
-
}
|
|
174
|
-
});
|
|
175
|
-
});
|
|
176
|
-
const forwardUpgrade = (request, socket, head) => new Promise((resolve, reject) => {
|
|
177
|
-
const stream = session.request(upgradeEnvelope(request, authorityOf(request)), { endStream: false });
|
|
178
|
-
stream.on("error", reject);
|
|
179
|
-
stream.once("response", (headers) => {
|
|
180
|
-
const status = Number(headers[constants.HTTP2_HEADER_STATUS]);
|
|
181
|
-
if (status !== constants.HTTP_STATUS_OK) {
|
|
182
|
-
stream.close(constants.NGHTTP2_CANCEL);
|
|
183
|
-
reject(new Error(`the tunnel refused an upgrade with :status ${String(status)}`));
|
|
184
|
-
return;
|
|
185
|
-
}
|
|
186
|
-
if (head.length > 0) {
|
|
187
|
-
stream.write(head);
|
|
188
|
-
}
|
|
189
|
-
splice(stream, socket);
|
|
190
|
-
resolve();
|
|
191
|
-
});
|
|
192
|
-
});
|
|
193
|
-
return {
|
|
194
|
-
forwardRequest,
|
|
195
|
-
forwardUpgrade,
|
|
196
|
-
close: () => {
|
|
197
|
-
session.close(() => bridge.tunnel.destroy());
|
|
198
|
-
bridge.tunnel.end();
|
|
199
|
-
},
|
|
200
|
-
};
|
|
201
|
-
};
|
|
202
|
-
export const serveIngressSession = async (duplex, options) => {
|
|
203
|
-
const bridge = await loopbackBridge();
|
|
204
|
-
splice(bridge.tunnel, duplex);
|
|
205
|
-
const agent = new Agent({ keepAlive: true, maxSockets: PEER_MAX_CONCURRENT_STREAMS });
|
|
206
|
-
const server = createH2Server({
|
|
207
|
-
maxSessionMemory: MAX_SESSION_MEMORY_MB,
|
|
208
|
-
settings: { initialWindowSize: INITIAL_WINDOW_SIZE },
|
|
209
|
-
});
|
|
210
|
-
server.on("sessionError", () => duplex.destroy());
|
|
211
|
-
server.on("clientError", () => duplex.destroy());
|
|
212
|
-
server.on("error", () => duplex.destroy());
|
|
213
|
-
server.on("session", (session) => session.setLocalWindowSize(CONNECTION_WINDOW_SIZE));
|
|
214
|
-
const gone = (stream) => stream.destroyed || stream.closed;
|
|
215
|
-
const forwardToLoopback = (stream, headers) => {
|
|
216
|
-
const local = h1Request({
|
|
217
|
-
host: LOOPBACK,
|
|
218
|
-
port: options.targetPort,
|
|
219
|
-
method: single(headers[constants.HTTP2_HEADER_METHOD]) ?? "GET",
|
|
220
|
-
path: single(headers[constants.HTTP2_HEADER_PATH]) ?? "/",
|
|
221
|
-
headers: { host: single(headers[constants.HTTP2_HEADER_AUTHORITY]) ?? "", ...endToEnd(headers) },
|
|
222
|
-
agent,
|
|
223
|
-
});
|
|
224
|
-
stream.pipe(local);
|
|
225
|
-
local.on("response", (response) => {
|
|
226
|
-
if (gone(stream)) {
|
|
227
|
-
response.destroy();
|
|
228
|
-
return;
|
|
229
|
-
}
|
|
230
|
-
stream.respond({ [constants.HTTP2_HEADER_STATUS]: response.statusCode ?? 502, ...endToEnd(response.headers) });
|
|
231
|
-
response.pipe(stream);
|
|
232
|
-
});
|
|
233
|
-
local.on("error", () => stream.close(constants.NGHTTP2_INTERNAL_ERROR));
|
|
234
|
-
stream.on("error", () => local.destroy());
|
|
235
|
-
stream.on("aborted", () => local.destroy());
|
|
236
|
-
stream.on("close", () => local.destroy());
|
|
237
|
-
};
|
|
238
|
-
const spliceUpgrade = (stream, headers) => {
|
|
239
|
-
const head = upgradeHead(headers);
|
|
240
|
-
const local = h1Request({ host: LOOPBACK, port: options.targetPort, method: head.method, path: head.path, headers: head.headers, agent: false });
|
|
241
|
-
local.on("upgrade", (response, socket, first) => {
|
|
242
|
-
if (gone(stream)) {
|
|
243
|
-
socket.destroy();
|
|
244
|
-
return;
|
|
245
|
-
}
|
|
246
|
-
stream.respond({ [constants.HTTP2_HEADER_STATUS]: constants.HTTP_STATUS_OK });
|
|
247
|
-
stream.write(serializeHead(response, NOTHING_DROPPED, []));
|
|
248
|
-
if (first.length > 0) {
|
|
249
|
-
stream.write(first);
|
|
250
|
-
}
|
|
251
|
-
splice(stream, socket);
|
|
252
|
-
});
|
|
253
|
-
local.on("response", (response) => {
|
|
254
|
-
if (gone(stream)) {
|
|
255
|
-
response.destroy();
|
|
256
|
-
return;
|
|
257
|
-
}
|
|
258
|
-
stream.respond({ [constants.HTTP2_HEADER_STATUS]: constants.HTTP_STATUS_OK });
|
|
259
|
-
stream.write(serializeHead(response, DECLINED_UPGRADE_DROP, DECLINED_UPGRADE_ADD));
|
|
260
|
-
response.pipe(stream);
|
|
261
|
-
});
|
|
262
|
-
local.on("error", () => stream.close(constants.NGHTTP2_CONNECT_ERROR));
|
|
263
|
-
stream.on("close", () => local.destroy());
|
|
264
|
-
local.end();
|
|
265
|
-
};
|
|
266
|
-
server.on("stream", (stream, headers) => {
|
|
267
|
-
if (headers[constants.HTTP2_HEADER_METHOD] === constants.HTTP2_METHOD_CONNECT) {
|
|
268
|
-
spliceUpgrade(stream, headers);
|
|
269
|
-
return;
|
|
270
|
-
}
|
|
271
|
-
forwardToLoopback(stream, headers);
|
|
272
|
-
});
|
|
273
|
-
server.emit("connection", bridge.session);
|
|
274
|
-
return {
|
|
275
|
-
close: () => {
|
|
276
|
-
agent.destroy();
|
|
277
|
-
server.close();
|
|
278
|
-
bridge.tunnel.end();
|
|
279
|
-
},
|
|
280
|
-
};
|
|
281
|
-
};
|
|
282
|
-
export const webSocketDuplex = (socket) => {
|
|
283
|
-
const duplex = new Duplex({
|
|
284
|
-
read: () => { },
|
|
285
|
-
write: (chunk, _encoding, callback) => {
|
|
286
|
-
socket.send(chunk, { binary: true }, (error) => callback(error ?? null));
|
|
287
|
-
},
|
|
288
|
-
final: (callback) => {
|
|
289
|
-
socket.close();
|
|
290
|
-
callback();
|
|
291
|
-
},
|
|
292
|
-
});
|
|
293
|
-
socket.on(`message`, (data) => {
|
|
294
|
-
duplex.push(Buffer.isBuffer(data) ? data : Buffer.from(data));
|
|
295
|
-
});
|
|
296
|
-
socket.on(`close`, () => duplex.push(null));
|
|
297
|
-
socket.on(`error`, (error) => duplex.destroy(error));
|
|
298
|
-
return duplex;
|
|
299
|
-
};
|
|
300
|
-
//# sourceMappingURL=ingress-protocol.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ingress-protocol.js","sourceRoot":"","sources":["../../src/protocol/ingress-protocol.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
export type TerminalClientMessage = {
|
|
2
|
-
readonly type: "input";
|
|
3
|
-
readonly data: string;
|
|
4
|
-
} | {
|
|
5
|
-
readonly type: "resize";
|
|
6
|
-
readonly cols: number;
|
|
7
|
-
readonly rows: number;
|
|
8
|
-
} | {
|
|
9
|
-
readonly type: "ping";
|
|
10
|
-
};
|
|
11
|
-
export type TerminalServerMessage = {
|
|
12
|
-
readonly type: "exit";
|
|
13
|
-
readonly code: number;
|
|
14
|
-
readonly reason?: string;
|
|
15
|
-
} | {
|
|
16
|
-
readonly type: "pong";
|
|
17
|
-
};
|
|
18
|
-
//# sourceMappingURL=terminal-protocol.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-protocol.d.ts","sourceRoot":"","sources":["../../src/protocol/terminal-protocol.ts"],"names":[],"mappings":"AAMA,MAAM,MAAM,qBAAqB,GAC3B;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAGhC,MAAM,MAAM,qBAAqB,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-protocol.js","sourceRoot":"","sources":["../../src/protocol/terminal-protocol.ts"],"names":[],"mappings":""}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
export declare const PING_INTERVAL_MS = 15000;
|
|
2
|
-
export declare const DEAD_AFTER_MS = 45000;
|
|
3
|
-
export interface HeartbeatOptions {
|
|
4
|
-
readonly ping: () => void;
|
|
5
|
-
readonly onDead: () => void;
|
|
6
|
-
readonly now?: () => number;
|
|
7
|
-
readonly deadAfterMs?: number;
|
|
8
|
-
}
|
|
9
|
-
export interface Heartbeat {
|
|
10
|
-
readonly saw: () => void;
|
|
11
|
-
readonly tick: () => void;
|
|
12
|
-
readonly stop: () => void;
|
|
13
|
-
readonly alive: () => boolean;
|
|
14
|
-
}
|
|
15
|
-
export declare const createHeartbeat: (options: HeartbeatOptions) => Heartbeat;
|
|
16
|
-
export declare const startHeartbeat: (options: HeartbeatOptions & {
|
|
17
|
-
readonly intervalMs?: number;
|
|
18
|
-
}) => Heartbeat;
|
|
19
|
-
//# sourceMappingURL=tunnel-heartbeat.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-heartbeat.d.ts","sourceRoot":"","sources":["../../src/protocol/tunnel-heartbeat.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gBAAgB,QAAS,CAAC;AACvC,eAAO,MAAM,aAAa,QAAS,CAAC;AAEpC,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,SAAS;IAEtB,QAAQ,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC;IAEzB,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,eAAe,YAAa,gBAAgB,KAAG,SA4B3D,CAAC;AAGF,eAAO,MAAM,cAAc,YAAa,gBAAgB,GAAG;IAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,SAW7F,CAAC"}
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
export const PING_INTERVAL_MS = 15_000;
|
|
2
|
-
export const DEAD_AFTER_MS = 45_000;
|
|
3
|
-
export const createHeartbeat = (options) => {
|
|
4
|
-
const now = options.now ?? Date.now;
|
|
5
|
-
const deadAfterMs = options.deadAfterMs ?? DEAD_AFTER_MS;
|
|
6
|
-
let lastSeen = now();
|
|
7
|
-
let stopped = false;
|
|
8
|
-
return {
|
|
9
|
-
saw: () => {
|
|
10
|
-
lastSeen = now();
|
|
11
|
-
},
|
|
12
|
-
tick: () => {
|
|
13
|
-
if (stopped) {
|
|
14
|
-
return;
|
|
15
|
-
}
|
|
16
|
-
if (now() - lastSeen > deadAfterMs) {
|
|
17
|
-
stopped = true;
|
|
18
|
-
options.onDead();
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
options.ping();
|
|
22
|
-
},
|
|
23
|
-
stop: () => {
|
|
24
|
-
stopped = true;
|
|
25
|
-
},
|
|
26
|
-
alive: () => !stopped,
|
|
27
|
-
};
|
|
28
|
-
};
|
|
29
|
-
export const startHeartbeat = (options) => {
|
|
30
|
-
const heartbeat = createHeartbeat(options);
|
|
31
|
-
const timer = setInterval(() => heartbeat.tick(), options.intervalMs ?? PING_INTERVAL_MS);
|
|
32
|
-
timer.unref();
|
|
33
|
-
return {
|
|
34
|
-
...heartbeat,
|
|
35
|
-
stop: () => {
|
|
36
|
-
clearInterval(timer);
|
|
37
|
-
heartbeat.stop();
|
|
38
|
-
},
|
|
39
|
-
};
|
|
40
|
-
};
|
|
41
|
-
//# sourceMappingURL=tunnel-heartbeat.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel-heartbeat.js","sourceRoot":"","sources":["../../src/protocol/tunnel-heartbeat.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;AACvC,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC;AAkBpC,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAyB,EAAa,EAAE;IACpE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC;IACpC,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,aAAa,CAAC;IACzD,IAAI,QAAQ,GAAG,GAAG,EAAE,CAAC;IACrB,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,OAAO;QACH,GAAG,EAAE,GAAG,EAAE;YACN,QAAQ,GAAG,GAAG,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACP,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO;YACX,CAAC;YAGD,IAAI,GAAG,EAAE,GAAG,QAAQ,GAAG,WAAW,EAAE,CAAC;gBACjC,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO;YACX,CAAC;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACP,OAAO,GAAG,IAAI,CAAC;QACnB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO;KACxB,CAAC;AACN,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,OAA4D,EAAa,EAAE;IACtG,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,UAAU,IAAI,gBAAgB,CAAC,CAAC;IAC1F,KAAK,CAAC,KAAK,EAAE,CAAC;IACd,OAAO;QACH,GAAG,SAAS;QACZ,IAAI,EAAE,GAAG,EAAE;YACP,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,SAAS,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC;KACJ,CAAC;AACN,CAAC,CAAC"}
|