@intentic/machine 1.345.0 → 1.347.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 +100 -135
- package/dist/device/commands.d.ts +6 -1
- package/dist/device/commands.d.ts.map +1 -1
- package/dist/device/commands.js +19 -7
- package/dist/device/commands.js.map +1 -1
- package/dist/device/grant.d.ts +2 -1
- package/dist/device/grant.d.ts.map +1 -1
- package/dist/device/router.d.ts +2 -1
- package/dist/device/router.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/keeper.js +1 -1
- package/dist/device/sandbox-rounds/keeper.js.map +1 -1
- package/dist/device/tools/agent.d.ts.map +1 -1
- package/dist/device/tools/agent.js +7 -7
- package/dist/device/tools/agent.js.map +1 -1
- package/dist/device/tools/ic-binary.d.ts +1 -0
- package/dist/device/tools/ic-binary.d.ts.map +1 -1
- package/dist/device/tools/ic-binary.js +29 -1
- package/dist/device/tools/ic-binary.js.map +1 -1
- package/dist/device/tools/os/settings.js +3 -3
- package/dist/device/tools/os/settings.js.map +1 -1
- package/dist/device/tools/sandboxes.d.ts +1 -0
- package/dist/device/tools/sandboxes.d.ts.map +1 -1
- package/dist/device/tools/sandboxes.js +7 -2
- package/dist/device/tools/sandboxes.js.map +1 -1
- package/dist/install.d.ts +9 -1
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +28 -4
- package/dist/install.js.map +1 -1
- package/dist/resident/resident.d.ts.map +1 -1
- package/dist/resident/resident.js +1 -2
- package/dist/resident/resident.js.map +1 -1
- package/dist/status.d.ts.map +1 -1
- package/dist/status.js +1 -8
- package/dist/status.js.map +1 -1
- package/dist/sync/commands.d.ts +1 -9
- package/dist/sync/commands.d.ts.map +1 -1
- package/dist/sync/commands.js +48 -89
- package/dist/sync/commands.js.map +1 -1
- package/dist/sync/config.d.ts +21 -25
- package/dist/sync/config.d.ts.map +1 -1
- package/dist/sync/config.js +76 -35
- package/dist/sync/config.js.map +1 -1
- package/dist/sync/endpoint.d.ts +1 -1
- package/dist/sync/endpoint.d.ts.map +1 -1
- package/dist/sync/endpoint.js +2 -3
- package/dist/sync/endpoint.js.map +1 -1
- package/dist/sync/folders.d.ts.map +1 -1
- package/dist/sync/folders.js.map +1 -1
- package/dist/sync/gone-watch.d.ts +0 -1
- package/dist/sync/gone-watch.d.ts.map +1 -1
- package/dist/sync/gone-watch.js +16 -53
- package/dist/sync/gone-watch.js.map +1 -1
- package/dist/sync/holds.d.ts +30 -0
- package/dist/sync/holds.d.ts.map +1 -0
- package/dist/sync/holds.js +117 -0
- package/dist/sync/holds.js.map +1 -0
- package/dist/sync/low-disk.d.ts +2 -9
- package/dist/sync/low-disk.d.ts.map +1 -1
- package/dist/sync/low-disk.js +10 -38
- package/dist/sync/low-disk.js.map +1 -1
- package/dist/sync/mirror.d.ts +1 -4
- package/dist/sync/mirror.d.ts.map +1 -1
- package/dist/sync/mirror.js +57 -161
- package/dist/sync/mirror.js.map +1 -1
- package/dist/sync/mutagen-env.d.ts +1 -3
- package/dist/sync/mutagen-env.d.ts.map +1 -1
- package/dist/sync/mutagen-env.js +2 -12
- package/dist/sync/mutagen-env.js.map +1 -1
- package/dist/sync/mutagen-move.d.ts +3 -1
- package/dist/sync/mutagen-move.d.ts.map +1 -1
- package/dist/sync/mutagen-move.js +30 -22
- package/dist/sync/mutagen-move.js.map +1 -1
- package/dist/sync/mutagen.d.ts +4 -9
- package/dist/sync/mutagen.d.ts.map +1 -1
- package/dist/sync/mutagen.js +11 -71
- package/dist/sync/mutagen.js.map +1 -1
- package/dist/sync/project/project-commands.d.ts +0 -3
- package/dist/sync/project/project-commands.d.ts.map +1 -1
- package/dist/sync/project/project-commands.js +3 -2
- package/dist/sync/project/project-commands.js.map +1 -1
- package/dist/sync/project/project-delivery.d.ts.map +1 -1
- package/dist/sync/project/project-delivery.js +3 -3
- package/dist/sync/project/project-delivery.js.map +1 -1
- package/dist/sync/project/project-transfer.d.ts +4 -0
- package/dist/sync/project/project-transfer.d.ts.map +1 -1
- package/dist/sync/project/project-transfer.js +9 -2
- package/dist/sync/project/project-transfer.js.map +1 -1
- package/dist/sync/report.d.ts.map +1 -1
- package/dist/sync/report.js +16 -10
- package/dist/sync/report.js.map +1 -1
- package/dist/sync/retire.d.ts.map +1 -1
- package/dist/sync/retire.js +1 -2
- package/dist/sync/retire.js.map +1 -1
- package/dist/sync/tunnel.d.ts +4 -3
- package/dist/sync/tunnel.d.ts.map +1 -1
- package/dist/sync/tunnel.js +107 -42
- package/dist/sync/tunnel.js.map +1 -1
- package/dist/sync/uninstall.d.ts.map +1 -1
- package/dist/sync/uninstall.js +1 -1
- package/dist/sync/uninstall.js.map +1 -1
- package/dist/sync/wake.d.ts +3 -0
- package/dist/sync/wake.d.ts.map +1 -0
- package/dist/sync/wake.js +43 -0
- package/dist/sync/wake.js.map +1 -0
- package/package.json +9 -9
- package/dist/sync/attach-commands.d.ts +0 -39
- package/dist/sync/attach-commands.d.ts.map +0 -1
- package/dist/sync/attach-commands.js +0 -164
- package/dist/sync/attach-commands.js.map +0 -1
- package/dist/sync/swap-pause.d.ts +0 -10
- package/dist/sync/swap-pause.d.ts.map +0 -1
- package/dist/sync/swap-pause.js +0 -29
- package/dist/sync/swap-pause.js.map +0 -1
package/dist/sync/report.js
CHANGED
|
@@ -5,7 +5,8 @@ import { runPidPath } from "../config.js";
|
|
|
5
5
|
import { installedBuild } from "../installed.js";
|
|
6
6
|
import { machineId } from "../machine-id.js";
|
|
7
7
|
import { wslEnvironment } from "../environments/wsl.js";
|
|
8
|
-
import { deliversByItself, isProjectPairing, mirrorHeartbeatPath, pairingKey, readState } from "./config.js";
|
|
8
|
+
import { deliversByItself, isProjectPairing, mirrorHeartbeatPath, pairingKey, pairingSlugs, readState } from "./config.js";
|
|
9
|
+
import { syncHolds } from "./holds.js";
|
|
9
10
|
import { backupSessionName, readAllSessions, sessionName, sessionsByName, sessionStateOf } from "./mutagen.js";
|
|
10
11
|
import { ensureMutagen } from "./binary/mutagen-binary.js";
|
|
11
12
|
const lastTick = async () => {
|
|
@@ -17,9 +18,10 @@ const agentState = async (installed) => {
|
|
|
17
18
|
const [resident, lastTickAt] = await Promise.all([livePidRecord(runPidPath), lastTick()]);
|
|
18
19
|
return { running: resident !== undefined, pid: resident?.pid, build: resident?.build, installed, lastTickAt };
|
|
19
20
|
};
|
|
20
|
-
const withHolds = (row, pairing) => {
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const withHolds = (row, pairing, now) => {
|
|
22
|
+
row.heldBy = syncHolds(pairing, now);
|
|
23
|
+
if (pairing.lowDisk !== undefined) {
|
|
24
|
+
const { since, freeBytes, totalBytes } = pairing.lowDisk;
|
|
23
25
|
row.lowDisk = { since, freeBytes, totalBytes };
|
|
24
26
|
}
|
|
25
27
|
if (pairing.bridgeHolds !== undefined && pairing.bridgeHolds.length > 0) {
|
|
@@ -27,15 +29,19 @@ const withHolds = (row, pairing) => {
|
|
|
27
29
|
}
|
|
28
30
|
return row;
|
|
29
31
|
};
|
|
30
|
-
const
|
|
32
|
+
const slugOf = (pairing) => {
|
|
33
|
+
const slug = pairing.icSlug ?? pairingSlugs(pairing.sandboxUrl)[0];
|
|
34
|
+
return slug === undefined ? {} : { slug };
|
|
35
|
+
};
|
|
36
|
+
const pairingReport = (sessions, pairing, now) => {
|
|
31
37
|
const mirroring = pairing.mirrorOff === true ? "off" : "on";
|
|
32
38
|
const remote = pairing.remoteDir === undefined ? {} : { remoteDir: pairing.remoteDir };
|
|
33
39
|
const kind = {
|
|
34
|
-
...(pairing
|
|
40
|
+
...slugOf(pairing),
|
|
35
41
|
...(pairing.deliver === undefined ? {} : { deliver: deliversByItself(pairing) ? "auto" : "off" }),
|
|
36
42
|
};
|
|
37
|
-
if (pairing.mode !== "sync" || sessions === undefined
|
|
38
|
-
return withHolds({ sandboxId: pairing.sandboxId, mode: pairing.mode, localDir: pairing.localDir, ...remote, ...kind, mirroring }, pairing);
|
|
43
|
+
if (pairing.mode !== "sync" || sessions === undefined) {
|
|
44
|
+
return withHolds({ sandboxId: pairing.sandboxId, mode: pairing.mode, localDir: pairing.localDir, ...remote, ...kind, mirroring }, pairing, now);
|
|
39
45
|
}
|
|
40
46
|
const session = sessionStateOf(sessions.get(sessionName(pairingKey(pairing))));
|
|
41
47
|
const backup = isProjectPairing(pairing) ? undefined : sessionStateOf(sessions.get(backupSessionName(pairingKey(pairing))));
|
|
@@ -51,7 +57,7 @@ const pairingReport = (sessions, pairing) => {
|
|
|
51
57
|
conflictedPaths: session.conflictedPaths,
|
|
52
58
|
paused: session.paused,
|
|
53
59
|
backupStatus: backup?.status,
|
|
54
|
-
}, pairing);
|
|
60
|
+
}, pairing, now);
|
|
55
61
|
};
|
|
56
62
|
const portRows = (pairing) => [
|
|
57
63
|
...(pairing.mirroredPorts ?? []).map((port) => ({
|
|
@@ -75,7 +81,7 @@ export const buildReport = (state, sessions, agent, capturedAt, wsl, machine) =>
|
|
|
75
81
|
hostname: hostname(),
|
|
76
82
|
os: platform(),
|
|
77
83
|
...(wsl === undefined ? {} : { wsl }),
|
|
78
|
-
pairings: state.pairings.map((pairing) => pairingReport(sessions, pairing)),
|
|
84
|
+
pairings: state.pairings.map((pairing) => pairingReport(sessions, pairing, capturedAt)),
|
|
79
85
|
ports: state.pairings.flatMap(portRows),
|
|
80
86
|
agent,
|
|
81
87
|
capturedAt,
|
package/dist/sync/report.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAgB,UAAU,EAAE,SAAS,EAAkB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retire.d.ts","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAoB,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"retire.d.ts","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAoB,KAAK,OAAO,EAA+E,MAAM,aAAa,CAAC;AAsB1I,eAAO,MAAM,cAAc,aAAc,SAAS,OAAO,EAAE,QAAQ,MAAM,KAAG,MAAM,EAYjF,CAAC;AAGF,MAAM,WAAW,OAAO;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;IAErC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CACvC;AAGD,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5E;AAqBD,eAAO,MAAM,aAAa,cAAqB,MAAM,OAAO,GAAG,OAAO,MAAM,SAAS,WAAW,KAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAmC7H,CAAC"}
|
package/dist/sync/retire.js
CHANGED
|
@@ -2,13 +2,12 @@ import { rm } from "node:fs/promises";
|
|
|
2
2
|
import { errorMessage } from "@intentic/base/errors";
|
|
3
3
|
import { sandboxNames } from "@intentic/sandbox-run";
|
|
4
4
|
import { baseDir } from "../config.js";
|
|
5
|
-
import { isProjectPairing, pairingKey, pairingTransport, readState, removeSandboxPairings } from "./config.js";
|
|
5
|
+
import { isProjectPairing, pairingKey, pairingTransport, readState, removeSandboxPairings, pairingSlugs } from "./config.js";
|
|
6
6
|
import { realBridgeExec, realUnbridgeFs, unbridgeRepos } from "./git-bridge.js";
|
|
7
7
|
import { runProcessSync } from "./exec.js";
|
|
8
8
|
import { existingSyncSessions, MUTAGEN_CALL_TIMEOUT_MS, ourForwardSessions, forwardSessionName, syncSessionNames } from "./mutagen.js";
|
|
9
9
|
import { listingRecordPath } from "./project/project-local.js";
|
|
10
10
|
import { forgetKnownHost, pairingSshConfig, sanitizeId, sshAlias, writeManagedSshConfig } from "./ssh.js";
|
|
11
|
-
import { pairingSlugs } from "./swap-pause.js";
|
|
12
11
|
export const sandboxesNamed = (pairings, name) => {
|
|
13
12
|
const wanted = name.trim();
|
|
14
13
|
if (wanted === "") {
|
package/dist/sync/retire.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retire.js","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAgB,UAAU,EAAE,gBAAgB,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"retire.js","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"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"}
|
package/dist/sync/tunnel.d.ts
CHANGED
|
@@ -12,11 +12,12 @@ export interface TunnelTarget {
|
|
|
12
12
|
readonly sandboxId: string;
|
|
13
13
|
readonly base: string;
|
|
14
14
|
readonly syncToken: string;
|
|
15
|
+
readonly fallback?: string;
|
|
15
16
|
}
|
|
16
17
|
export declare const tunnelTargets: (dialed: readonly Dialed<Pairing>[]) => readonly TunnelTarget[];
|
|
17
|
-
export declare const bridgeConnection: (socket: Socket, target: TunnelTarget, onError: (message: string) => void) => void;
|
|
18
|
-
export declare const startSshTunnel: (target: TunnelTarget, log: Log) => Promise<(() => Promise<void>) | undefined>;
|
|
19
|
-
export declare const createTunnelPool: (log: Log, signal?: AbortSignal) => {
|
|
18
|
+
export declare const bridgeConnection: (socket: Socket, target: TunnelTarget, onError: (message: string) => void, onLoopbackFailed?: () => void) => void;
|
|
19
|
+
export declare const startSshTunnel: (target: TunnelTarget, log: Log, onLoopbackFailed?: (sandboxId: string) => void) => Promise<(() => Promise<void>) | undefined>;
|
|
20
|
+
export declare const createTunnelPool: (log: Log, signal?: AbortSignal, onLoopbackFailed?: (sandboxId: string) => void) => {
|
|
20
21
|
reconcile: (targets: readonly TunnelTarget[]) => Promise<void>;
|
|
21
22
|
stopAll: () => Promise<void>;
|
|
22
23
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAG3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,kBAAkB,CAAC;AAWzE,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,aAAa,OAAO,CAAC;AAmBlC,eAAO,MAAM,WAAW,cAAe,MAAM,gBAAe,eAAe,KAAuB,MAMjG,CAAC;AAIF,eAAO,MAAM,YAAY,cAAe,MAAM,gBAAe,eAAe,KAAuB,SAAS,MAAM,EAEjH,CAAC;AAKF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAA6E,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel.d.ts","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"AACA,OAAO,EAAsC,KAAK,MAAM,EAAE,MAAM,UAAU,CAAC;AAG3E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,OAAO,EAAoB,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,kBAAkB,CAAC;AAWzE,eAAO,MAAM,aAAa,QAAQ,CAAC;AACnC,eAAO,MAAM,aAAa,OAAO,CAAC;AAmBlC,eAAO,MAAM,WAAW,cAAe,MAAM,gBAAe,eAAe,KAAuB,MAMjG,CAAC;AAIF,eAAO,MAAM,YAAY,cAAe,MAAM,gBAAe,eAAe,KAAuB,SAAS,MAAM,EAEjH,CAAC;AAKF,eAAO,MAAM,YAAY,SAAU,MAAM,KAAG,MAA6E,CAAC;AAiB1H,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC9B;AAOD,eAAO,MAAM,aAAa,WAAY,SAAS,MAAM,CAAC,OAAO,CAAC,EAAE,KAAG,SAAS,YAAY,EAQlF,CAAC;AAiHP,eAAO,MAAM,gBAAgB,WACjB,MAAM,UACN,YAAY,WACX,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,qBAChB,MAAM,IAAI,KAC7B,IAqBF,CAAC;AAOF,eAAO,MAAM,cAAc,WACf,YAAY,OACf,GAAG,qBACU,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,KAC9C,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAoC3C,CAAC;AAQF,eAAO,MAAM,gBAAgB,QAAS,GAAG,WAAW,WAAW,qBAAqB,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI;IAOvG,SAAS,YAAkB,SAAS,YAAY,EAAE,KAAG,OAAO,CAAC,IAAI,CAAC;IAwClE,OAAO,QAAY,OAAO,CAAC,IAAI,CAAC;CAMvC,CAAC;AAMF,eAAO,MAAM,WAAW,SAAU,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,OAAO,CAaxE,CAAC"}
|
package/dist/sync/tunnel.js
CHANGED
|
@@ -23,60 +23,125 @@ export const syncSshPorts = (sandboxId, environment = syncEnvironment()) => [
|
|
|
23
23
|
];
|
|
24
24
|
export const sshSocketUrl = (base) => `${base.replace(/\/$/, "").replace(/^http/, "ws")}/system/sync/ssh`;
|
|
25
25
|
const OPEN_TIMEOUT_MS = 10_000;
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
26
|
+
const LOOPBACK_OPEN_TIMEOUT_MS = 3_000;
|
|
27
|
+
export const tunnelTargets = (dialed) => dialed.flatMap(({ pairing, base }) => {
|
|
28
|
+
if (pairing.syncToken === undefined || pairingTransport(pairing) === "docker" || pairing.goneSince !== undefined) {
|
|
29
|
+
return [];
|
|
30
|
+
}
|
|
31
|
+
const target = { sandboxId: pairing.sandboxId, base, syncToken: pairing.syncToken };
|
|
32
|
+
const floor = pairing.sandboxUrl.replace(/\/$/, "");
|
|
33
|
+
return [floor === base ? target : { ...target, fallback: floor }];
|
|
34
|
+
});
|
|
35
|
+
const closeBridge = (bridge) => {
|
|
36
|
+
if (bridge.closed) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
bridge.closed = true;
|
|
40
|
+
bridge.pump?.stop();
|
|
41
|
+
clearTimeout(bridge.handshake);
|
|
42
|
+
bridge.socket.destroy();
|
|
43
|
+
const { ws } = bridge;
|
|
44
|
+
if (ws !== undefined && (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING)) {
|
|
45
|
+
ws.close();
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
const dialStream = (bridge, base, timeoutMs, next) => {
|
|
49
|
+
const { socket, target } = bridge;
|
|
50
|
+
const current = new WebSocket(sshSocketUrl(base), { headers: { "x-intentic-sync": target.syncToken } });
|
|
51
|
+
current.binaryType = "arraybuffer";
|
|
52
|
+
bridge.ws = current;
|
|
53
|
+
let opened = false;
|
|
54
|
+
let settled = false;
|
|
55
|
+
const unopened = (message) => {
|
|
56
|
+
if (settled || bridge.closed) {
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
settled = true;
|
|
60
|
+
clearTimeout(bridge.handshake);
|
|
61
|
+
if (next === undefined) {
|
|
62
|
+
bridge.onError(message);
|
|
63
|
+
closeBridge(bridge);
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
bridge.onLoopbackFailed();
|
|
67
|
+
if (current.readyState === WebSocket.OPEN || current.readyState === WebSocket.CONNECTING) {
|
|
68
|
+
current.close();
|
|
44
69
|
}
|
|
70
|
+
dialStream(bridge, next, OPEN_TIMEOUT_MS, undefined);
|
|
45
71
|
};
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
socket.
|
|
56
|
-
|
|
57
|
-
queued: queued.splice(0),
|
|
72
|
+
bridge.handshake = setTimeout(() => unopened(`the sync transport to ${target.sandboxId} did not open within ${timeoutMs / 1000}s: the sandbox is not answering`), timeoutMs);
|
|
73
|
+
current.addEventListener("open", () => {
|
|
74
|
+
if (settled || bridge.closed) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
opened = true;
|
|
78
|
+
settled = true;
|
|
79
|
+
clearTimeout(bridge.handshake);
|
|
80
|
+
socket.off("data", bridge.early);
|
|
81
|
+
bridge.pump = pumpTcpWebSocket(socket, { send: (frame) => current.send(frame), bufferedAmount: () => current.bufferedAmount }, {
|
|
82
|
+
queued: bridge.queued.splice(0),
|
|
58
83
|
onOverflow: () => {
|
|
59
|
-
onError(`the sync transport to ${target.sandboxId} was dropped: ssh stopped reading what the sandbox sent`);
|
|
60
|
-
|
|
84
|
+
bridge.onError(`the sync transport to ${target.sandboxId} was dropped: ssh stopped reading what the sandbox sent`);
|
|
85
|
+
closeBridge(bridge);
|
|
61
86
|
},
|
|
62
87
|
});
|
|
63
88
|
});
|
|
64
|
-
|
|
65
|
-
|
|
89
|
+
current.addEventListener("message", (event) => {
|
|
90
|
+
if (opened) {
|
|
91
|
+
bridge.pump?.inbound(event.data);
|
|
92
|
+
}
|
|
66
93
|
});
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
94
|
+
const ended = () => {
|
|
95
|
+
if (opened) {
|
|
96
|
+
closeBridge(bridge);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
unopened(`the sync transport to ${target.sandboxId} could not be opened`);
|
|
100
|
+
};
|
|
101
|
+
current.addEventListener("error", () => {
|
|
102
|
+
if (opened) {
|
|
103
|
+
bridge.onError(`the sync transport to ${target.sandboxId} could not be opened`);
|
|
104
|
+
}
|
|
105
|
+
ended();
|
|
70
106
|
});
|
|
71
|
-
|
|
107
|
+
current.addEventListener("close", ended);
|
|
108
|
+
};
|
|
109
|
+
export const bridgeConnection = (socket, target, onError, onLoopbackFailed = () => undefined) => {
|
|
110
|
+
const queued = [];
|
|
111
|
+
const bridge = {
|
|
112
|
+
socket,
|
|
113
|
+
target,
|
|
114
|
+
onError,
|
|
115
|
+
onLoopbackFailed,
|
|
116
|
+
queued,
|
|
117
|
+
early: (chunk) => {
|
|
118
|
+
queued.push(chunk);
|
|
119
|
+
},
|
|
120
|
+
pump: undefined,
|
|
121
|
+
ws: undefined,
|
|
122
|
+
handshake: undefined,
|
|
123
|
+
closed: false,
|
|
124
|
+
};
|
|
125
|
+
socket.pause();
|
|
126
|
+
socket.on("data", bridge.early);
|
|
127
|
+
socket.on("close", () => closeBridge(bridge));
|
|
128
|
+
socket.on("error", () => closeBridge(bridge));
|
|
129
|
+
dialStream(bridge, target.base, target.fallback === undefined ? OPEN_TIMEOUT_MS : LOOPBACK_OPEN_TIMEOUT_MS, target.fallback);
|
|
72
130
|
};
|
|
73
|
-
export const startSshTunnel = async (target, log) => {
|
|
131
|
+
export const startSshTunnel = async (target, log, onLoopbackFailed = () => undefined) => {
|
|
74
132
|
const port = syncSshPort(target.sandboxId);
|
|
75
133
|
const sockets = new Set();
|
|
134
|
+
let toldFallback = false;
|
|
76
135
|
const server = createServer((socket) => {
|
|
77
136
|
sockets.add(socket);
|
|
78
137
|
socket.on("close", () => sockets.delete(socket));
|
|
79
|
-
bridgeConnection(socket, target, (message) => log(message))
|
|
138
|
+
bridgeConnection(socket, target, (message) => log(message), () => {
|
|
139
|
+
onLoopbackFailed(target.sandboxId);
|
|
140
|
+
if (!toldFallback) {
|
|
141
|
+
toldFallback = true;
|
|
142
|
+
log(` sync transport for ${target.sandboxId}: the loopback daemon did not open the stream, so it went through ${target.fallback ?? "the public address"}`);
|
|
143
|
+
}
|
|
144
|
+
});
|
|
80
145
|
});
|
|
81
146
|
const bound = await new Promise((resolve) => {
|
|
82
147
|
server.once("error", (error) => {
|
|
@@ -97,7 +162,7 @@ export const startSshTunnel = async (target, log) => {
|
|
|
97
162
|
await new Promise((resolve) => server.close(() => resolve()));
|
|
98
163
|
};
|
|
99
164
|
};
|
|
100
|
-
export const createTunnelPool = (log, signal) => {
|
|
165
|
+
export const createTunnelPool = (log, signal, onLoopbackFailed) => {
|
|
101
166
|
const running = new Map();
|
|
102
167
|
const retired = () => signal?.aborted === true;
|
|
103
168
|
return {
|
|
@@ -123,7 +188,7 @@ export const createTunnelPool = (log, signal) => {
|
|
|
123
188
|
await held.stop();
|
|
124
189
|
log(` sync transport for ${target.sandboxId} moving to ${target.base}`);
|
|
125
190
|
}
|
|
126
|
-
const stop = await startSshTunnel(target, log);
|
|
191
|
+
const stop = await startSshTunnel(target, log, onLoopbackFailed);
|
|
127
192
|
if (stop !== undefined && retired()) {
|
|
128
193
|
await stop();
|
|
129
194
|
return;
|
package/dist/sync/tunnel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,YAAY,EAA4B,MAAM,UAAU,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAa,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAGzE,OAAO,EAAgB,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAwB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAWzE,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AASlC,MAAM,aAAa,GAAG,KAAK,CAAC;AAG5B,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAU,EAAE;IAG/C,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5E,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,aAAa,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,SAAiB,EAAE,WAAW,GAAoB,eAAe,EAAE,EAAU,EAAE;IACvG,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;QACnB,OAAO,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACzF,OAAO,aAAa,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC;AACpE,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAiB,EAAE,WAAW,GAAoB,eAAe,EAAE,EAAqB,EAAE,CAAC;IACpH,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;CAC7F,CAAC;AAKF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC;AAK1H,MAAM,eAAe,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../../src/sync/tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../src/sync/uninstall.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,KAAK,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAoBtF,eAAO,MAAM,gBAAgB,eAAsB,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAQ1F,CAAC;AAIF,eAAO,MAAM,YAAY,YAAa,OAAO,KAAG,
|
|
1
|
+
{"version":3,"file":"uninstall.d.ts","sourceRoot":"","sources":["../../src/sync/uninstall.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,KAAK,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAoBtF,eAAO,MAAM,gBAAgB,eAAsB,MAAM,aAAa,MAAM,KAAG,OAAO,CAAC,IAAI,CAQ1F,CAAC;AAIF,eAAO,MAAM,YAAY,YAAa,OAAO,KAAG,OAAkC,CAAC;AAInF,eAAO,MAAM,aAAa,YAAa,SAAS,OAAO,EAAE,aAAa,SAAS,OAAO,EAAE,KAAG,WAAW,CAAC,MAAM,CACY,CAAC;AAkC1H,eAAO,MAAM,iBAAiB,QACrB,SAAS,SACP,SAAS,WACP,SAAS,OAAO,EAAE,gBACN;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,KACpD,OAAO,CAAC,MAAM,CAsDhB,CAAC"}
|
package/dist/sync/uninstall.js
CHANGED
|
@@ -19,7 +19,7 @@ export const revokeEnrollment = async (sandboxUrl, syncToken) => {
|
|
|
19
19
|
throw new Error(`HTTP ${response.status}`);
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
|
-
export const syncsAFolder = (pairing) => pairing.mode === "sync"
|
|
22
|
+
export const syncsAFolder = (pairing) => pairing.mode === "sync";
|
|
23
23
|
export const sandboxesLeft = (dropped, remaining) => new Set(dropped.map((pairing) => pairing.sandboxId).filter((id) => !remaining.some((held) => held.sandboxId === id)));
|
|
24
24
|
const endPairingSessions = async (mutagen, pairing, sandboxGoes) => {
|
|
25
25
|
if (pairing.mode === "sync" && syncSessionNames(pairing).length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/sync/uninstall.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAgB,UAAU,EAAE,aAAa,EAAkB,MAAM,aAAa,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EACH,uBAAuB,EACvB,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAQ3F,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,UAAkB,EAAE,SAAiB,EAAiB,EAAE;IAC3F,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,wBAAwB,EAAE;QACnF,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;KAC5C,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAgB,EAAW,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"uninstall.js","sourceRoot":"","sources":["../../src/sync/uninstall.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wake.d.ts","sourceRoot":"","sources":["../../src/sync/wake.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,WAAW,SAAgB,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,KAAG,OAAO,CAAC,IAAI,CAM5E,CAAC;AAIF,eAAO,MAAM,gBAAgB,OAAc,MAAM,UAAU,WAAW,KAAG,OAAO,CAAC,IAAI,CAwBpF,CAAC"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import { watch } from "node:fs";
|
|
2
|
+
import { writeFile } from "node:fs/promises";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { setTimeout as sleep } from "node:timers/promises";
|
|
5
|
+
import { errorMessage } from "@intentic/base/errors";
|
|
6
|
+
import { baseDir } from "../config.js";
|
|
7
|
+
const wakePath = join(baseDir, "mirror.wake");
|
|
8
|
+
const WAKE_FILE = "mirror.wake";
|
|
9
|
+
export const wakeWatcher = async (log) => {
|
|
10
|
+
try {
|
|
11
|
+
await writeFile(wakePath, `${Date.now()}\n`);
|
|
12
|
+
}
|
|
13
|
+
catch (error) {
|
|
14
|
+
log?.(`the watcher was not woken (${errorMessage(error)}); it picks the change up at its next pass`);
|
|
15
|
+
}
|
|
16
|
+
};
|
|
17
|
+
export const sleepUnlessWoken = async (ms, signal) => {
|
|
18
|
+
const woken = new AbortController();
|
|
19
|
+
let watcher;
|
|
20
|
+
try {
|
|
21
|
+
watcher = watch(baseDir, { persistent: false }, (_event, file) => {
|
|
22
|
+
if (file === WAKE_FILE) {
|
|
23
|
+
woken.abort();
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
watcher.on("error", () => watcher?.close());
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
watcher = undefined;
|
|
30
|
+
}
|
|
31
|
+
try {
|
|
32
|
+
await sleep(ms, undefined, { signal: AbortSignal.any([signal, woken.signal]) });
|
|
33
|
+
}
|
|
34
|
+
catch (error) {
|
|
35
|
+
if (signal.aborted || !woken.signal.aborted) {
|
|
36
|
+
throw error;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
finally {
|
|
40
|
+
watcher?.close();
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=wake.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wake.js","sourceRoot":"","sources":["../../src/sync/wake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAQvC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC9C,MAAM,SAAS,GAAG,aAAa,CAAC;AAGhC,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,GAA4B,EAAiB,EAAE;IAC7E,IAAI,CAAC;QACD,MAAM,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,GAAG,EAAE,CAAC,8BAA8B,YAAY,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IACzG,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAAU,EAAE,MAAmB,EAAiB,EAAE;IACrF,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;IACpC,IAAI,OAA8B,CAAC;IACnC,IAAI,CAAC;QACD,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAC7D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACrB,KAAK,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QAEL,OAAO,GAAG,SAAS,CAAC;IACxB,CAAC;IACD,IAAI,CAAC;QACD,MAAM,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,MAAM,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC1C,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;YAAS,CAAC;QACP,OAAO,EAAE,KAAK,EAAE,CAAC;IACrB,CAAC;AACL,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intentic/machine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.347.0",
|
|
4
4
|
"description": "The one agent that lives on a user's own device: lets an intentic sandbox work on it (outbound WebSocket, MCP tools, scopes enforced here) and keeps folders and ports mirrored with it (Mutagen over tunnel SSH, or through Docker for a project on this machine)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"intentic-machine": "./dist/cli.js"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@intentic/base": "1.
|
|
24
|
-
"@intentic/browser": "1.
|
|
25
|
-
"@intentic/constants": "1.
|
|
26
|
-
"@intentic/desktop-automation": "1.
|
|
27
|
-
"@intentic/keyring": "1.
|
|
28
|
-
"@intentic/local-agent": "1.
|
|
29
|
-
"@intentic/sandbox-contract": "1.
|
|
30
|
-
"@intentic/sandbox-run": "1.
|
|
23
|
+
"@intentic/base": "1.347.0",
|
|
24
|
+
"@intentic/browser": "1.347.0",
|
|
25
|
+
"@intentic/constants": "1.347.0",
|
|
26
|
+
"@intentic/desktop-automation": "1.347.0",
|
|
27
|
+
"@intentic/keyring": "1.347.0",
|
|
28
|
+
"@intentic/local-agent": "1.347.0",
|
|
29
|
+
"@intentic/sandbox-contract": "1.347.0",
|
|
30
|
+
"@intentic/sandbox-run": "1.347.0",
|
|
31
31
|
"@orpc/server": "1.15.4",
|
|
32
32
|
"@stricli/core": "1.3.0",
|
|
33
33
|
"tslib": "2.8.1",
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import { type Log } from "@intentic/local-agent";
|
|
2
|
-
import type { CommandContext } from "@stricli/core";
|
|
3
|
-
import { type Pairing } from "./config.js";
|
|
4
|
-
import { type Siblings } from "./siblings.js";
|
|
5
|
-
export interface AttachAsk {
|
|
6
|
-
readonly sandboxUrl?: string | undefined;
|
|
7
|
-
readonly dir?: string | undefined;
|
|
8
|
-
readonly name?: string | undefined;
|
|
9
|
-
}
|
|
10
|
-
export interface AttachResult {
|
|
11
|
-
readonly ok: true;
|
|
12
|
-
readonly pairing: string;
|
|
13
|
-
readonly remoteDir: string;
|
|
14
|
-
readonly folder: string;
|
|
15
|
-
}
|
|
16
|
-
export interface DetachResult {
|
|
17
|
-
readonly ok: true;
|
|
18
|
-
readonly pairing: string;
|
|
19
|
-
readonly folder: string;
|
|
20
|
-
}
|
|
21
|
-
export interface AttachSeams {
|
|
22
|
-
readonly locate?: (sandboxUrl: string) => Promise<string | undefined>;
|
|
23
|
-
readonly home?: string;
|
|
24
|
-
readonly siblings?: () => Promise<Siblings>;
|
|
25
|
-
}
|
|
26
|
-
export declare const projectsHostFor: (pairings: readonly Pairing[], sandboxUrl: string) => Pairing | undefined;
|
|
27
|
-
export declare const planAttach: (pairings: readonly Pairing[], ask: AttachAsk, seams?: AttachSeams) => Promise<Pairing>;
|
|
28
|
-
export declare const attachFolder: (ask: AttachAsk, log: Log, seams?: AttachSeams & {
|
|
29
|
-
readonly ensureAgent?: (log: Log) => Promise<void>;
|
|
30
|
-
}) => Promise<AttachResult>;
|
|
31
|
-
export interface DetachSeams {
|
|
32
|
-
readonly terminate?: (names: readonly string[]) => Promise<void>;
|
|
33
|
-
}
|
|
34
|
-
export declare const detachFolder: (dir: string | undefined, stateDir: string, seams?: DetachSeams) => Promise<DetachResult>;
|
|
35
|
-
export declare const attachCommands: {
|
|
36
|
-
attach: import("@stricli/core").Command<CommandContext>;
|
|
37
|
-
detach: import("@stricli/core").Command<CommandContext>;
|
|
38
|
-
};
|
|
39
|
-
//# sourceMappingURL=attach-commands.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"attach-commands.d.ts","sourceRoot":"","sources":["../../src/sync/attach-commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,KAAK,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAkC,KAAK,OAAO,EAAoF,MAAM,aAAa,CAAC;AAQ7J,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAW9D,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAElB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CAC3B;AAGD,MAAM,WAAW,WAAW;IAExB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEtE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAEvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC/C;AAMD,eAAO,MAAM,eAAe,aAAc,SAAS,OAAO,EAAE,cAAc,MAAM,KAAG,OAAO,GAAG,SAG5F,CAAC;AAkCF,eAAO,MAAM,UAAU,aAAoB,SAAS,OAAO,EAAE,OAAO,SAAS,UAAS,WAAW,KAAQ,OAAO,CAAC,OAAO,CAyDvH,CAAC;AAKF,eAAO,MAAM,YAAY,QAChB,SAAS,OACT,GAAG,UACD,WAAW,GAAG;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,KAC5E,OAAO,CAAC,YAAY,CAatB,CAAC;AAGF,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAeD,eAAO,MAAM,YAAY,QAAe,MAAM,GAAG,SAAS,YAAY,MAAM,UAAS,WAAW,KAAQ,OAAO,CAAC,YAAY,CAe3H,CAAC;AAwEF,eAAO,MAAM,cAAc;;;CAAqB,CAAC"}
|