@intentic/machine 1.325.0 → 1.327.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 +387 -33
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +2 -0
- package/dist/commands.js.map +1 -1
- package/dist/daemon-base.d.ts.map +1 -1
- package/dist/daemon-base.js +2 -3
- package/dist/daemon-base.js.map +1 -1
- package/dist/device/audit.d.ts +2 -0
- package/dist/device/audit.d.ts.map +1 -1
- package/dist/device/audit.js +23 -3
- package/dist/device/audit.js.map +1 -1
- package/dist/device/commands.d.ts +4 -0
- package/dist/device/commands.d.ts.map +1 -1
- package/dist/device/commands.js +7 -2
- package/dist/device/commands.js.map +1 -1
- package/dist/device/connection.d.ts +12 -1
- package/dist/device/connection.d.ts.map +1 -1
- package/dist/device/connection.js +77 -3
- package/dist/device/connection.js.map +1 -1
- package/dist/device/grant.d.ts +52 -0
- package/dist/device/grant.d.ts.map +1 -1
- package/dist/device/loopback-catch.d.ts +1 -1
- package/dist/device/loopback-catch.d.ts.map +1 -1
- package/dist/device/loopback-catch.js +5 -30
- package/dist/device/loopback-catch.js.map +1 -1
- package/dist/device/mcp.d.ts.map +1 -1
- package/dist/device/mcp.js +190 -30
- package/dist/device/mcp.js.map +1 -1
- package/dist/device/router.d.ts +52 -0
- package/dist/device/router.d.ts.map +1 -1
- package/dist/device/router.js +21 -0
- package/dist/device/router.js.map +1 -1
- package/dist/device/sandbox-rounds/auto-backup.d.ts +3 -1
- package/dist/device/sandbox-rounds/auto-backup.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/auto-backup.js +14 -5
- package/dist/device/sandbox-rounds/auto-backup.js.map +1 -1
- package/dist/device/sandbox-rounds/auto-prepare.d.ts +3 -1
- package/dist/device/sandbox-rounds/auto-prepare.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/auto-prepare.js +3 -3
- package/dist/device/sandbox-rounds/auto-prepare.js.map +1 -1
- package/dist/device/sandbox-rounds/in-flight.d.ts.map +1 -0
- package/dist/device/sandbox-rounds/in-flight.js.map +1 -0
- package/dist/device/sandbox-rounds/keeper.d.ts +26 -4
- package/dist/device/sandbox-rounds/keeper.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/keeper.js +129 -31
- package/dist/device/sandbox-rounds/keeper.js.map +1 -1
- package/dist/device/sandbox-rounds/probation-watch.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/probation-watch.js.map +1 -1
- package/dist/device/tools/android-parse.d.ts +69 -0
- package/dist/device/tools/android-parse.d.ts.map +1 -0
- package/dist/device/tools/android-parse.js +391 -0
- package/dist/device/tools/android-parse.js.map +1 -0
- package/dist/device/tools/android.d.ts +71 -0
- package/dist/device/tools/android.d.ts.map +1 -0
- package/dist/device/tools/android.js +534 -0
- package/dist/device/tools/android.js.map +1 -0
- package/dist/device/tools/apps.d.ts +3 -3
- package/dist/device/tools/apps.d.ts.map +1 -1
- package/dist/device/tools/apps.js +16 -6
- package/dist/device/tools/apps.js.map +1 -1
- package/dist/device/tools/describe.d.ts.map +1 -1
- package/dist/device/tools/describe.js +10 -5
- package/dist/device/tools/describe.js.map +1 -1
- package/dist/device/tools/device.d.ts +9 -15
- package/dist/device/tools/device.d.ts.map +1 -1
- package/dist/device/tools/device.js +34 -58
- package/dist/device/tools/device.js.map +1 -1
- package/dist/device/tools/elements.d.ts +13 -0
- package/dist/device/tools/elements.d.ts.map +1 -0
- package/dist/device/tools/elements.js +84 -0
- package/dist/device/tools/elements.js.map +1 -0
- 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 +40 -17
- package/dist/device/tools/ic-binary.js.map +1 -1
- package/dist/device/tools/sandboxes.d.ts +1 -1
- package/dist/device/tools/sandboxes.d.ts.map +1 -1
- package/dist/device/tools/sandboxes.js +9 -8
- package/dist/device/tools/sandboxes.js.map +1 -1
- package/dist/device/tools/shell.js +1 -1
- package/dist/device/tools/shell.js.map +1 -1
- package/dist/device/tools/view.d.ts +4 -0
- package/dist/device/tools/view.d.ts.map +1 -0
- package/dist/device/tools/view.js +4 -0
- package/dist/device/tools/view.js.map +1 -0
- package/dist/environments/children.js +1 -1
- package/dist/environments/children.js.map +1 -1
- package/dist/environments/commands.js +1 -1
- package/dist/environments/commands.js.map +1 -1
- package/dist/environments/crossing.d.ts +1 -1
- package/dist/environments/crossing.d.ts.map +1 -1
- package/dist/environments/machine.js +1 -1
- package/dist/environments/machine.js.map +1 -1
- package/dist/environments/wsl.d.ts.map +1 -0
- package/dist/environments/wsl.js.map +1 -0
- package/dist/resident.d.ts.map +1 -1
- package/dist/resident.js +14 -8
- package/dist/resident.js.map +1 -1
- package/dist/status.d.ts.map +1 -1
- package/dist/status.js +16 -13
- package/dist/status.js.map +1 -1
- package/dist/sync/attach-commands.d.ts +39 -0
- package/dist/sync/attach-commands.d.ts.map +1 -0
- package/dist/sync/attach-commands.js +152 -0
- package/dist/sync/attach-commands.js.map +1 -0
- package/dist/sync/commands.d.ts +8 -4
- package/dist/sync/commands.d.ts.map +1 -1
- package/dist/sync/commands.js +137 -79
- package/dist/sync/commands.js.map +1 -1
- package/dist/sync/config.d.ts +43 -9
- package/dist/sync/config.d.ts.map +1 -1
- package/dist/sync/config.js +86 -41
- package/dist/sync/config.js.map +1 -1
- package/dist/sync/endpoint.d.ts +8 -1
- package/dist/sync/endpoint.d.ts.map +1 -1
- package/dist/sync/endpoint.js +41 -1
- package/dist/sync/endpoint.js.map +1 -1
- package/dist/sync/environment.d.ts +11 -0
- package/dist/sync/environment.d.ts.map +1 -0
- package/dist/sync/environment.js +48 -0
- package/dist/sync/environment.js.map +1 -0
- package/dist/sync/exec.d.ts +1 -0
- package/dist/sync/exec.d.ts.map +1 -1
- package/dist/sync/exec.js +4 -5
- package/dist/sync/exec.js.map +1 -1
- package/dist/sync/folders.d.ts +3 -2
- package/dist/sync/folders.d.ts.map +1 -1
- package/dist/sync/folders.js +55 -2
- package/dist/sync/folders.js.map +1 -1
- package/dist/sync/forget-command.d.ts +22 -0
- package/dist/sync/forget-command.d.ts.map +1 -0
- package/dist/sync/forget-command.js +95 -0
- package/dist/sync/forget-command.js.map +1 -0
- package/dist/sync/git-bridge.d.ts +6 -0
- package/dist/sync/git-bridge.d.ts.map +1 -1
- package/dist/sync/git-bridge.js +64 -1
- package/dist/sync/git-bridge.js.map +1 -1
- package/dist/sync/gone-watch.d.ts +18 -0
- package/dist/sync/gone-watch.d.ts.map +1 -0
- package/dist/sync/gone-watch.js +142 -0
- package/dist/sync/gone-watch.js.map +1 -0
- package/dist/sync/gone.d.ts +22 -0
- package/dist/sync/gone.d.ts.map +1 -0
- package/dist/sync/gone.js +60 -0
- package/dist/sync/gone.js.map +1 -0
- package/dist/sync/local-sandboxes.d.ts +6 -0
- package/dist/sync/local-sandboxes.d.ts.map +1 -0
- package/dist/sync/local-sandboxes.js +26 -0
- package/dist/sync/local-sandboxes.js.map +1 -0
- package/dist/sync/mirror.d.ts +7 -0
- package/dist/sync/mirror.d.ts.map +1 -1
- package/dist/sync/mirror.js +434 -111
- package/dist/sync/mirror.js.map +1 -1
- package/dist/sync/mutagen.d.ts +50 -18
- package/dist/sync/mutagen.d.ts.map +1 -1
- package/dist/sync/mutagen.js +294 -80
- package/dist/sync/mutagen.js.map +1 -1
- package/dist/sync/project/adopt.d.ts +18 -0
- package/dist/sync/project/adopt.d.ts.map +1 -0
- package/dist/sync/project/adopt.js +86 -0
- package/dist/sync/project/adopt.js.map +1 -0
- package/dist/sync/{project-commands.d.ts → project/project-commands.d.ts} +4 -1
- package/dist/sync/project/project-commands.d.ts.map +1 -0
- package/dist/sync/{project-commands.js → project/project-commands.js} +10 -10
- package/dist/sync/project/project-commands.js.map +1 -0
- package/dist/sync/project/project-delivery.d.ts +23 -0
- package/dist/sync/project/project-delivery.d.ts.map +1 -0
- package/dist/sync/project/project-delivery.js +315 -0
- package/dist/sync/project/project-delivery.js.map +1 -0
- package/dist/sync/{project-files.d.ts → project/project-files.d.ts} +1 -1
- package/dist/sync/project/project-files.d.ts.map +1 -0
- package/dist/sync/{project-files.js → project/project-files.js} +5 -2
- package/dist/sync/project/project-files.js.map +1 -0
- package/dist/sync/{project-local.d.ts → project/project-local.d.ts} +1 -1
- package/dist/sync/project/project-local.d.ts.map +1 -0
- package/dist/sync/{project-local.js → project/project-local.js} +1 -1
- package/dist/sync/project/project-local.js.map +1 -0
- package/dist/sync/{project-remote.d.ts → project/project-remote.d.ts} +1 -1
- package/dist/sync/project/project-remote.d.ts.map +1 -0
- package/dist/sync/{project-remote.js → project/project-remote.js} +1 -1
- package/dist/sync/project/project-remote.js.map +1 -0
- package/dist/sync/{project-transfer.d.ts → project/project-transfer.d.ts} +20 -6
- package/dist/sync/project/project-transfer.d.ts.map +1 -0
- package/dist/sync/{project-transfer.js → project/project-transfer.js} +26 -23
- package/dist/sync/project/project-transfer.js.map +1 -0
- package/dist/sync/report.d.ts.map +1 -1
- package/dist/sync/report.js +13 -7
- package/dist/sync/report.js.map +1 -1
- package/dist/sync/restore-points.d.ts +15 -11
- package/dist/sync/restore-points.d.ts.map +1 -1
- package/dist/sync/restore-points.js +25 -24
- package/dist/sync/restore-points.js.map +1 -1
- package/dist/sync/retire.d.ts +14 -0
- package/dist/sync/retire.d.ts.map +1 -0
- package/dist/sync/retire.js +66 -0
- package/dist/sync/retire.js.map +1 -0
- package/dist/sync/siblings.d.ts +27 -0
- package/dist/sync/siblings.d.ts.map +1 -0
- package/dist/sync/siblings.js +112 -0
- package/dist/sync/siblings.js.map +1 -0
- package/dist/sync/ssh.d.ts +1 -0
- package/dist/sync/ssh.d.ts.map +1 -1
- package/dist/sync/ssh.js +37 -23
- package/dist/sync/ssh.js.map +1 -1
- package/dist/sync/tunnel.d.ts +6 -2
- package/dist/sync/tunnel.d.ts.map +1 -1
- package/dist/sync/tunnel.js +45 -48
- package/dist/sync/tunnel.js.map +1 -1
- package/dist/upkeep/doctor.d.ts +5 -0
- package/dist/upkeep/doctor.d.ts.map +1 -0
- package/dist/upkeep/doctor.js +73 -0
- package/dist/upkeep/doctor.js.map +1 -0
- package/dist/upkeep/entry.d.ts +26 -0
- package/dist/upkeep/entry.d.ts.map +1 -0
- package/dist/upkeep/entry.js +2 -0
- package/dist/upkeep/entry.js.map +1 -0
- package/dist/upkeep/login.d.ts +15 -0
- package/dist/upkeep/login.d.ts.map +1 -0
- package/dist/upkeep/login.js +128 -0
- package/dist/upkeep/login.js.map +1 -0
- package/dist/upkeep/manifest.d.ts +3 -0
- package/dist/upkeep/manifest.d.ts.map +1 -0
- package/dist/upkeep/manifest.js +6 -0
- package/dist/upkeep/manifest.js.map +1 -0
- package/dist/upkeep/reconcile.d.ts +45 -0
- package/dist/upkeep/reconcile.d.ts.map +1 -0
- package/dist/upkeep/reconcile.js +159 -0
- package/dist/upkeep/reconcile.js.map +1 -0
- package/dist/upkeep/retention.d.ts +10 -0
- package/dist/upkeep/retention.d.ts.map +1 -0
- package/dist/upkeep/retention.js +71 -0
- package/dist/upkeep/retention.js.map +1 -0
- package/dist/upkeep/retired.d.ts +12 -0
- package/dist/upkeep/retired.d.ts.map +1 -0
- package/dist/upkeep/retired.js +125 -0
- package/dist/upkeep/retired.js.map +1 -0
- package/dist/upkeep/second-ic.d.ts +4 -0
- package/dist/upkeep/second-ic.d.ts.map +1 -0
- package/dist/upkeep/second-ic.js +36 -0
- package/dist/upkeep/second-ic.js.map +1 -0
- package/dist/upkeep/trash.d.ts +9 -0
- package/dist/upkeep/trash.d.ts.map +1 -0
- package/dist/upkeep/trash.js +77 -0
- package/dist/upkeep/trash.js.map +1 -0
- package/dist/watchdog.d.ts +13 -0
- package/dist/watchdog.d.ts.map +1 -0
- package/dist/watchdog.js +38 -0
- package/dist/watchdog.js.map +1 -0
- package/package.json +9 -9
- package/dist/autostart/legacy-autostart.d.ts +0 -4
- package/dist/autostart/legacy-autostart.d.ts.map +0 -1
- package/dist/autostart/legacy-autostart.js +0 -33
- package/dist/autostart/legacy-autostart.js.map +0 -1
- package/dist/device/tools/in-flight.d.ts.map +0 -1
- package/dist/device/tools/in-flight.js.map +0 -1
- package/dist/sync/project-commands.d.ts.map +0 -1
- package/dist/sync/project-commands.js.map +0 -1
- package/dist/sync/project-files.d.ts.map +0 -1
- package/dist/sync/project-files.js.map +0 -1
- package/dist/sync/project-local.d.ts.map +0 -1
- package/dist/sync/project-local.js.map +0 -1
- package/dist/sync/project-remote.d.ts.map +0 -1
- package/dist/sync/project-remote.js.map +0 -1
- package/dist/sync/project-transfer.d.ts.map +0 -1
- package/dist/sync/project-transfer.js.map +0 -1
- package/dist/wsl.d.ts.map +0 -1
- package/dist/wsl.js.map +0 -1
- /package/dist/device/{tools → sandbox-rounds}/in-flight.d.ts +0 -0
- /package/dist/device/{tools → sandbox-rounds}/in-flight.js +0 -0
- /package/dist/{wsl.d.ts → environments/wsl.d.ts} +0 -0
- /package/dist/{wsl.js → environments/wsl.js} +0 -0
|
@@ -3,11 +3,11 @@ import { mkdir, mkdtemp, readdir, rm, writeFile } from "node:fs/promises";
|
|
|
3
3
|
import { join } from "node:path";
|
|
4
4
|
import { errorMessage } from "@intentic/base/errors";
|
|
5
5
|
import { claimPidFile, livePidRecord, releasePidFile } from "@intentic/local-agent";
|
|
6
|
-
import { pairingRemoteDir, projectDirection } from "
|
|
6
|
+
import { pairingKey, pairingRemoteDir, projectDirection } from "../config.js";
|
|
7
7
|
import { capped, classify, ignoreExpressions, ignoreMatcher, selectChanges, } from "./project-files.js";
|
|
8
8
|
import { assertFolder, hashFile, installFile, listingRecordPath, localFile, localTarget, readListingRecord, realDurability, removeFile, walkLocal, writeListingRecord, } from "./project-local.js";
|
|
9
|
-
import { backUp, createPointDir, listPoints, pruneRestorePoints, readManifest, restoreDir, restoreEntry, sealPoint, writeManifest, } from "
|
|
10
|
-
import { ignoresFor } from "
|
|
9
|
+
import { backUp, createPointDir, listPoints, pruneRestorePoints, readManifest, restoreDir, restoreEntry, sealPoint, writeManifest, } from "../restore-points.js";
|
|
10
|
+
import { ignoresFor } from "../ssh.js";
|
|
11
11
|
const STALE = { current: false, conflicts: new Map() };
|
|
12
12
|
const flushedStanding = async (context) => {
|
|
13
13
|
const flushed = await context.session.flush();
|
|
@@ -39,7 +39,7 @@ const listSides = async (context, standing, record) => {
|
|
|
39
39
|
const patterns = ignoresFor(pairing);
|
|
40
40
|
const remoteDir = pairingRemoteDir(pairing);
|
|
41
41
|
const remote = await context.sandbox.list(ignoreExpressions(patterns));
|
|
42
|
-
const recordPath = listingRecordPath(stateDir, pairing
|
|
42
|
+
const recordPath = listingRecordPath(stateDir, pairingKey(pairing));
|
|
43
43
|
const held = await readListingRecord(recordPath, pairing.localDir, remoteDir);
|
|
44
44
|
const wantsHash = (path, size) => {
|
|
45
45
|
const there = remote.get(path);
|
|
@@ -55,7 +55,7 @@ const listSides = async (context, standing, record) => {
|
|
|
55
55
|
};
|
|
56
56
|
const recordAgreement = async (context, applied) => {
|
|
57
57
|
const { pairing, stateDir } = context;
|
|
58
|
-
const recordPath = listingRecordPath(stateDir, pairing
|
|
58
|
+
const recordPath = listingRecordPath(stateDir, pairingKey(pairing));
|
|
59
59
|
const record = await readListingRecord(recordPath, pairing.localDir, pairingRemoteDir(pairing));
|
|
60
60
|
const agreed = new Map(record.agreed);
|
|
61
61
|
for (const { path, hash } of applied) {
|
|
@@ -68,8 +68,9 @@ const recordAgreement = async (context, applied) => {
|
|
|
68
68
|
}
|
|
69
69
|
await writeListingRecord(recordPath, pairing.localDir, pairingRemoteDir(pairing), { files: record.files, agreed });
|
|
70
70
|
};
|
|
71
|
-
const
|
|
72
|
-
const
|
|
71
|
+
export const folderStateDir = (context) => restoreDir(context.stateDir, pairingKey(context.pairing));
|
|
72
|
+
const lockPath = (context) => join(folderStateDir(context), ".operation.pid");
|
|
73
|
+
const pausedPath = (context) => join(folderStateDir(context), ".paused");
|
|
73
74
|
const liftAbandonedPause = async (context, locked) => {
|
|
74
75
|
if (!existsSync(pausedPath(context)) || (!locked && (await livePidRecord(lockPath(context))) !== undefined)) {
|
|
75
76
|
return;
|
|
@@ -97,15 +98,15 @@ const holdStill = async (context, flush) => {
|
|
|
97
98
|
return { standing, release };
|
|
98
99
|
};
|
|
99
100
|
const claim = async (context) => {
|
|
100
|
-
const dir =
|
|
101
|
+
const dir = folderStateDir(context);
|
|
101
102
|
await mkdir(dir, { recursive: true, mode: 0o700 });
|
|
102
103
|
const claimed = await claimPidFile(lockPath(context), dir, { pid: process.pid });
|
|
103
104
|
return claimed.claimed ? { claimed: true } : { claimed: false, holder: claimed.holder.pid };
|
|
104
105
|
};
|
|
105
|
-
const exclusively = async (context, operation) => {
|
|
106
|
+
export const exclusively = async (context, operation) => {
|
|
106
107
|
const claimed = await claim(context);
|
|
107
108
|
if (!claimed.claimed) {
|
|
108
|
-
throw new Error(`another bring-back or
|
|
109
|
+
throw new Error(`another bring-back, restore or delivery for ${context.pairing.localDir} is running (pid ${claimed.holder}); try again once it has finished`);
|
|
109
110
|
}
|
|
110
111
|
try {
|
|
111
112
|
await liftAbandonedPause(context, true);
|
|
@@ -115,7 +116,7 @@ const exclusively = async (context, operation) => {
|
|
|
115
116
|
await releasePidFile(lockPath(context), process.pid);
|
|
116
117
|
}
|
|
117
118
|
};
|
|
118
|
-
const whileHeld = async (context, flush, operation, done) => {
|
|
119
|
+
export const whileHeld = async (context, flush, operation, done) => {
|
|
119
120
|
const held = await holdStill(context, flush);
|
|
120
121
|
let result;
|
|
121
122
|
try {
|
|
@@ -144,7 +145,7 @@ export const projectChanges = async (context) => {
|
|
|
144
145
|
const running = (await context.session.inspect()).state === "running";
|
|
145
146
|
const standing = running ? await flushedStanding(context) : STALE;
|
|
146
147
|
const shown = capped((await listSides(context, standing, claimed)).changes);
|
|
147
|
-
const result = { ok: true, pairing: context.pairing
|
|
148
|
+
const result = { ok: true, pairing: pairingKey(context.pairing), direction: projectDirection(context.pairing), changes: shown.changes.map(listed) };
|
|
148
149
|
return shown.truncated ? { ...result, truncated: true } : result;
|
|
149
150
|
}
|
|
150
151
|
finally {
|
|
@@ -177,7 +178,7 @@ const apply = async (root, ready, entry) => {
|
|
|
177
178
|
const mode = current === undefined ? { executable: ready.fetched.executable } : { exact: current.mode };
|
|
178
179
|
await installFile(root, ready.change.path, ready.fetched.staged, mode);
|
|
179
180
|
};
|
|
180
|
-
const clearStaging = async (dir) => {
|
|
181
|
+
export const clearStaging = async (dir) => {
|
|
181
182
|
for (const name of (await readdir(dir)).filter((entry) => entry.startsWith(".staging-"))) {
|
|
182
183
|
await rm(join(dir, name), { recursive: true, force: true });
|
|
183
184
|
}
|
|
@@ -209,20 +210,21 @@ const bringBackHeld = async (context, paths, standing, staging) => {
|
|
|
209
210
|
const { selected, unmatched } = selectChanges(sides.changes, paths);
|
|
210
211
|
const skipped = unmatched.map((path) => ({ path, reason: "the sandbox's copy has no change to bring back there" }));
|
|
211
212
|
const ready = await readyChanges(context, sides, selected, staging, skipped);
|
|
212
|
-
const
|
|
213
|
+
const key = pairingKey(pairing);
|
|
214
|
+
const point = await createPointDir(stateDir, key, Date.now());
|
|
213
215
|
const kept = [];
|
|
214
216
|
for (const item of ready) {
|
|
215
217
|
try {
|
|
216
218
|
const request = { path: item.change.path, kind: item.change.kind, applied: item.applied };
|
|
217
|
-
kept.push({ ready: item, entry: await backUp(stateDir,
|
|
219
|
+
kept.push({ ready: item, entry: await backUp(stateDir, key, point.id, pairing.localDir, request, durability) });
|
|
218
220
|
}
|
|
219
221
|
catch (error) {
|
|
220
222
|
skipped.push({ path: item.change.path, reason: errorMessage(error) });
|
|
221
223
|
}
|
|
222
224
|
}
|
|
223
225
|
const manifest = { id: point.id, createdAt: point.createdAt, dir: pairing.localDir, entries: kept.map(({ entry }) => entry) };
|
|
224
|
-
await writeManifest(stateDir,
|
|
225
|
-
await sealPoint(stateDir,
|
|
226
|
+
await writeManifest(stateDir, key, manifest);
|
|
227
|
+
await sealPoint(stateDir, key, point.id, durability);
|
|
226
228
|
const done = [];
|
|
227
229
|
for (const { ready: item, entry } of kept) {
|
|
228
230
|
try {
|
|
@@ -233,12 +235,12 @@ const bringBackHeld = async (context, paths, standing, staging) => {
|
|
|
233
235
|
skipped.push({ path: item.change.path, reason: errorMessage(error) });
|
|
234
236
|
}
|
|
235
237
|
}
|
|
236
|
-
await writeManifest(stateDir,
|
|
238
|
+
await writeManifest(stateDir, key, { ...manifest, entries: done.map(({ entry }) => entry) });
|
|
237
239
|
await recordAgreement(context, done.map(({ entry }) => ({ path: entry.path, hash: entry.applied })));
|
|
238
240
|
return { ok: true, point: point.id, applied: done.map(({ entry, kind }) => ({ path: entry.path, kind })), skipped };
|
|
239
241
|
};
|
|
240
242
|
export const bringBack = async (context, paths) => await exclusively(context, async () => {
|
|
241
|
-
const dir =
|
|
243
|
+
const dir = folderStateDir(context);
|
|
242
244
|
await clearStaging(dir);
|
|
243
245
|
const result = await whileHeld(context, true, async (standing) => {
|
|
244
246
|
const staging = await mkdtemp(join(dir, ".staging-"));
|
|
@@ -249,23 +251,24 @@ export const bringBack = async (context, paths) => await exclusively(context, as
|
|
|
249
251
|
await rm(staging, { recursive: true, force: true });
|
|
250
252
|
}
|
|
251
253
|
}, (done) => `Brought back ${done.applied.length} file(s), restore point ${done.point}`);
|
|
252
|
-
await pruneRestorePoints(context.stateDir, context.pairing
|
|
254
|
+
await pruneRestorePoints(context.stateDir, pairingKey(context.pairing), Date.now(), result.point);
|
|
253
255
|
return result;
|
|
254
256
|
});
|
|
255
257
|
export const restorePoints = async (context) => ({
|
|
256
258
|
ok: true,
|
|
257
|
-
points: await listPoints(context.stateDir, context.pairing
|
|
259
|
+
points: await listPoints(context.stateDir, pairingKey(context.pairing), context.pairing.localDir),
|
|
258
260
|
});
|
|
259
261
|
export const restorePoint = async (context, id) => await exclusively(context, async () => {
|
|
260
262
|
const { pairing, stateDir } = context;
|
|
261
|
-
const
|
|
263
|
+
const key = pairingKey(pairing);
|
|
264
|
+
const manifest = await readManifest(stateDir, key, id, pairing.localDir);
|
|
262
265
|
await assertFolder(pairing.localDir);
|
|
263
266
|
return await whileHeld(context, false, async () => {
|
|
264
267
|
const skipped = [];
|
|
265
268
|
let restored = 0;
|
|
266
269
|
for (const entry of manifest.entries) {
|
|
267
270
|
try {
|
|
268
|
-
await restoreEntry(stateDir,
|
|
271
|
+
await restoreEntry(stateDir, key, id, pairing.localDir, entry);
|
|
269
272
|
restored += 1;
|
|
270
273
|
}
|
|
271
274
|
catch (error) {
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-transfer.js","sourceRoot":"","sources":["../../../src/sync/project/project-transfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAA6B,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAKvG,OAAO,
|
|
1
|
+
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAA6B,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAKvG,OAAO,EAAgG,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC3I,OAAO,EAAoC,KAAK,WAAW,EAAgE,MAAM,cAAc,CAAC;AAyBhJ,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAmE5D,eAAO,MAAM,WAAW,UACb,SAAS,YACN,YAAY,GAAG,SAAS,SAC3B,WAAW,cACN,MAAM,QACZ;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,YACnC,MAAM,GAAG,SAAS,KAC7B,YAWD,CAAC;AAGH,eAAO,MAAM,YAAY,YAAmB,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC,YAAY,CAQpF,CAAC;AAKF,eAAO,MAAM,YAAY,WAAY,YAAY,aAAa,MAAM,KAAG,YAIrE,CAAC;AAGH,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAkF,CAAC;AAGpJ,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,YAAY,CAA8C,CAAC"}
|
package/dist/sync/report.js
CHANGED
|
@@ -4,8 +4,8 @@ import { livePidRecord } from "@intentic/local-agent";
|
|
|
4
4
|
import { runPidPath } from "../config.js";
|
|
5
5
|
import { installedBuild } from "../installed.js";
|
|
6
6
|
import { machineId } from "../machine-id.js";
|
|
7
|
-
import { wslEnvironment } from "../wsl.js";
|
|
8
|
-
import { isProjectPairing, mirrorHeartbeatPath, readState } from "./config.js";
|
|
7
|
+
import { wslEnvironment } from "../environments/wsl.js";
|
|
8
|
+
import { deliversByItself, isProjectPairing, mirrorHeartbeatPath, pairingKey, readState } from "./config.js";
|
|
9
9
|
import { backupSessionName, ensureMutagen, readAllSessions, sessionName, sessionsByName, sessionStateOf } from "./mutagen.js";
|
|
10
10
|
const lastTick = async () => {
|
|
11
11
|
const raw = await readFile(mirrorHeartbeatPath, "utf8").catch(() => undefined);
|
|
@@ -19,16 +19,21 @@ const agentState = async (installed) => {
|
|
|
19
19
|
const pairingReport = (sessions, pairing) => {
|
|
20
20
|
const mirroring = pairing.mirrorOff === true ? "off" : "on";
|
|
21
21
|
const remote = pairing.remoteDir === undefined ? {} : { remoteDir: pairing.remoteDir };
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
const kind = {
|
|
23
|
+
...(pairing.projectsHost === true ? { projectsHost: true } : {}),
|
|
24
|
+
...(pairing.deliver === undefined ? {} : { deliver: deliversByItself(pairing) ? "auto" : "off" }),
|
|
25
|
+
};
|
|
26
|
+
if (pairing.mode !== "sync" || sessions === undefined || pairing.projectsHost === true) {
|
|
27
|
+
return { sandboxId: pairing.sandboxId, mode: pairing.mode, localDir: pairing.localDir, ...remote, ...kind, mirroring };
|
|
24
28
|
}
|
|
25
|
-
const session = sessionStateOf(sessions.get(sessionName(pairing
|
|
26
|
-
const backup = isProjectPairing(pairing) ? undefined : sessionStateOf(sessions.get(backupSessionName(pairing
|
|
29
|
+
const session = sessionStateOf(sessions.get(sessionName(pairingKey(pairing))));
|
|
30
|
+
const backup = isProjectPairing(pairing) ? undefined : sessionStateOf(sessions.get(backupSessionName(pairingKey(pairing))));
|
|
27
31
|
return {
|
|
28
32
|
sandboxId: pairing.sandboxId,
|
|
29
33
|
mode: pairing.mode,
|
|
30
34
|
localDir: pairing.localDir,
|
|
31
35
|
...remote,
|
|
36
|
+
...kind,
|
|
32
37
|
mirroring,
|
|
33
38
|
mutagenStatus: session.status,
|
|
34
39
|
conflicts: session.conflicts,
|
|
@@ -67,7 +72,8 @@ export const buildReport = (state, sessions, agent, capturedAt, wsl, machine) =>
|
|
|
67
72
|
export const deviceReport = async (mutagen) => {
|
|
68
73
|
const [state, agent, wsl] = await Promise.all([readState(), agentState(installedBuild()), wslEnvironment()]);
|
|
69
74
|
const syncing = mutagen !== undefined && state.pairings.some((pairing) => pairing.mode === "sync");
|
|
70
|
-
const
|
|
75
|
+
const listed = syncing ? readAllSessions(mutagen) : undefined;
|
|
76
|
+
const sessions = listed === undefined ? undefined : sessionsByName(listed);
|
|
71
77
|
return buildReport(state, sessions, agent, Date.now(), wsl, machineId());
|
|
72
78
|
};
|
|
73
79
|
export const scopedReport = (report, sandboxId) => ({
|
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,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7C,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,
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/sync/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import type { ChangeKind } from "./project-files.js";
|
|
3
|
-
import { type Durability } from "./project-local.js";
|
|
4
|
-
export declare const restoreDir: (stateDir: string,
|
|
2
|
+
import type { ChangeKind } from "./project/project-files.js";
|
|
3
|
+
import { type Durability } from "./project/project-local.js";
|
|
4
|
+
export declare const restoreDir: (stateDir: string, key: string) => string;
|
|
5
5
|
export declare const pointId: (at: Date) => string;
|
|
6
6
|
export declare const pointTime: (id: string) => number | undefined;
|
|
7
7
|
declare const EntrySchema: z.ZodObject<{
|
|
@@ -32,6 +32,10 @@ declare const ManifestSchema: z.ZodObject<{
|
|
|
32
32
|
backup: z.ZodOptional<z.ZodString>;
|
|
33
33
|
mode: z.ZodOptional<z.ZodNumber>;
|
|
34
34
|
}, z.core.$strip>>;
|
|
35
|
+
landing: z.ZodOptional<z.ZodObject<{
|
|
36
|
+
agentId: z.ZodString;
|
|
37
|
+
title: z.ZodOptional<z.ZodString>;
|
|
38
|
+
}, z.core.$strip>>;
|
|
35
39
|
}, z.core.$strip>;
|
|
36
40
|
export type RestoreEntry = z.infer<typeof EntrySchema>;
|
|
37
41
|
export type Manifest = z.infer<typeof ManifestSchema>;
|
|
@@ -39,14 +43,14 @@ export interface Skipped {
|
|
|
39
43
|
readonly path: string;
|
|
40
44
|
readonly reason: string;
|
|
41
45
|
}
|
|
42
|
-
export declare const writeManifest: (stateDir: string,
|
|
43
|
-
export declare const readManifest: (stateDir: string,
|
|
46
|
+
export declare const writeManifest: (stateDir: string, key: string, manifest: Manifest) => Promise<void>;
|
|
47
|
+
export declare const readManifest: (stateDir: string, key: string, id: string, dir: string) => Promise<Manifest>;
|
|
44
48
|
export interface PointSummary {
|
|
45
49
|
readonly id: string;
|
|
46
50
|
readonly createdAt: string;
|
|
47
51
|
readonly entries: number;
|
|
48
52
|
}
|
|
49
|
-
export declare const listPoints: (stateDir: string,
|
|
53
|
+
export declare const listPoints: (stateDir: string, key: string, dir: string) => Promise<PointSummary[]>;
|
|
50
54
|
export declare const RETAINED_NEWEST = 20;
|
|
51
55
|
export declare const RETAINED_MS: number;
|
|
52
56
|
export type PointHolding = "files" | "nothing" | "unfinished";
|
|
@@ -55,8 +59,8 @@ export interface PointOnDisk {
|
|
|
55
59
|
readonly holding: PointHolding;
|
|
56
60
|
}
|
|
57
61
|
export declare const expiredPoints: (points: readonly PointOnDisk[], now: number, keep?: string) => string[];
|
|
58
|
-
export declare const pruneRestorePoints: (stateDir: string,
|
|
59
|
-
export declare const createPointDir: (stateDir: string,
|
|
62
|
+
export declare const pruneRestorePoints: (stateDir: string, key: string, now: number, keep?: string) => Promise<void>;
|
|
63
|
+
export declare const createPointDir: (stateDir: string, key: string, now: number) => Promise<{
|
|
60
64
|
readonly id: string;
|
|
61
65
|
readonly createdAt: string;
|
|
62
66
|
}>;
|
|
@@ -65,8 +69,8 @@ export interface BackupRequest {
|
|
|
65
69
|
readonly kind: ChangeKind;
|
|
66
70
|
readonly applied: string | null;
|
|
67
71
|
}
|
|
68
|
-
export declare const backUp: (stateDir: string,
|
|
69
|
-
export declare const sealPoint: (stateDir: string,
|
|
70
|
-
export declare const restoreEntry: (stateDir: string,
|
|
72
|
+
export declare const backUp: (stateDir: string, key: string, id: string, root: string, request: BackupRequest, durability: Durability) => Promise<RestoreEntry>;
|
|
73
|
+
export declare const sealPoint: (stateDir: string, key: string, id: string, durability: Durability) => Promise<void>;
|
|
74
|
+
export declare const restoreEntry: (stateDir: string, key: string, id: string, root: string, entry: RestoreEntry) => Promise<void>;
|
|
71
75
|
export {};
|
|
72
76
|
//# sourceMappingURL=restore-points.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restore-points.d.ts","sourceRoot":"","sources":["../../src/sync/restore-points.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"restore-points.d.ts","sourceRoot":"","sources":["../../src/sync/restore-points.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,8 @@ import { dirname, join } from "node:path";
|
|
|
3
3
|
import { errnoCode, undefinedIfMissing } from "@intentic/base/errors";
|
|
4
4
|
import { writeFileAtomic } from "@intentic/base/fs";
|
|
5
5
|
import { z } from "zod";
|
|
6
|
-
import { hashFile, installFile, localFile, localTarget, removeFile } from "./project-local.js";
|
|
7
|
-
export const restoreDir = (stateDir,
|
|
6
|
+
import { hashFile, installFile, localFile, localTarget, removeFile } from "./project/project-local.js";
|
|
7
|
+
export const restoreDir = (stateDir, key) => join(stateDir, "restore", encodeURIComponent(key));
|
|
8
8
|
const POINT_ID = /^\d{8}T\d{6}\.\d{3}Z$/;
|
|
9
9
|
export const pointId = (at) => at.toISOString().replace(/[-:]/g, "");
|
|
10
10
|
export const pointTime = (id) => POINT_ID.test(id) ? Date.parse(`${id.slice(0, 4)}-${id.slice(4, 6)}-${id.slice(6, 11)}:${id.slice(11, 13)}:${id.slice(13)}`) : undefined;
|
|
@@ -21,9 +21,10 @@ const ManifestSchema = z.object({
|
|
|
21
21
|
createdAt: z.string(),
|
|
22
22
|
dir: z.string(),
|
|
23
23
|
entries: z.array(EntrySchema),
|
|
24
|
+
landing: z.object({ agentId: z.string(), title: z.string().optional() }).optional(),
|
|
24
25
|
});
|
|
25
|
-
const manifestPath = (stateDir,
|
|
26
|
-
export const writeManifest = async (stateDir,
|
|
26
|
+
const manifestPath = (stateDir, key, id) => join(restoreDir(stateDir, key), id, "manifest.json");
|
|
27
|
+
export const writeManifest = async (stateDir, key, manifest) => await writeFileAtomic(manifestPath(stateDir, key, manifest.id), `${JSON.stringify(manifest, undefined, 2)}\n`, 0o600, { durable: true });
|
|
27
28
|
const parsedManifest = (raw) => {
|
|
28
29
|
try {
|
|
29
30
|
return ManifestSchema.safeParse(JSON.parse(raw)).data;
|
|
@@ -32,8 +33,8 @@ const parsedManifest = (raw) => {
|
|
|
32
33
|
return undefined;
|
|
33
34
|
}
|
|
34
35
|
};
|
|
35
|
-
export const readManifest = async (stateDir,
|
|
36
|
-
const raw = POINT_ID.test(id) ? await readFile(manifestPath(stateDir,
|
|
36
|
+
export const readManifest = async (stateDir, key, id, dir) => {
|
|
37
|
+
const raw = POINT_ID.test(id) ? await readFile(manifestPath(stateDir, key, id), "utf8").catch(undefinedIfMissing) : undefined;
|
|
37
38
|
if (raw === undefined) {
|
|
38
39
|
throw new Error(`there is no restore point ${JSON.stringify(id)} for ${dir}`);
|
|
39
40
|
}
|
|
@@ -46,11 +47,11 @@ export const readManifest = async (stateDir, sandboxId, id, dir) => {
|
|
|
46
47
|
}
|
|
47
48
|
return manifest;
|
|
48
49
|
};
|
|
49
|
-
export const listPoints = async (stateDir,
|
|
50
|
-
const names = (await readdir(restoreDir(stateDir,
|
|
50
|
+
export const listPoints = async (stateDir, key, dir) => {
|
|
51
|
+
const names = (await readdir(restoreDir(stateDir, key)).catch(undefinedIfMissing)) ?? [];
|
|
51
52
|
const points = [];
|
|
52
53
|
for (const id of names.filter((name) => POINT_ID.test(name)).toSorted().toReversed()) {
|
|
53
|
-
const manifest = await readManifest(stateDir,
|
|
54
|
+
const manifest = await readManifest(stateDir, key, id, dir).catch(() => undefined);
|
|
54
55
|
if (manifest !== undefined && manifest.entries.length > 0) {
|
|
55
56
|
points.push({ id: manifest.id, createdAt: manifest.createdAt, entries: manifest.entries.length });
|
|
56
57
|
}
|
|
@@ -65,30 +66,30 @@ export const expiredPoints = (points, now, keep) => {
|
|
|
65
66
|
const empty = points.filter((point) => point.holding !== "files" && POINT_ID.test(point.id) && point.id !== keep);
|
|
66
67
|
return [...aged, ...empty].map((point) => point.id).toSorted();
|
|
67
68
|
};
|
|
68
|
-
const holdingOf = async (stateDir,
|
|
69
|
-
const raw = await readFile(manifestPath(stateDir,
|
|
69
|
+
const holdingOf = async (stateDir, key, id) => {
|
|
70
|
+
const raw = await readFile(manifestPath(stateDir, key, id), "utf8").catch(undefinedIfMissing);
|
|
70
71
|
if (raw === undefined) {
|
|
71
72
|
return "unfinished";
|
|
72
73
|
}
|
|
73
74
|
return parsedManifest(raw)?.entries.length === 0 ? "nothing" : "files";
|
|
74
75
|
};
|
|
75
|
-
export const pruneRestorePoints = async (stateDir,
|
|
76
|
-
const dir = restoreDir(stateDir,
|
|
76
|
+
export const pruneRestorePoints = async (stateDir, key, now, keep) => {
|
|
77
|
+
const dir = restoreDir(stateDir, key);
|
|
77
78
|
const names = ((await readdir(dir).catch(undefinedIfMissing)) ?? []).filter((name) => POINT_ID.test(name));
|
|
78
79
|
const points = [];
|
|
79
80
|
for (const id of names) {
|
|
80
|
-
points.push({ id, holding: await holdingOf(stateDir,
|
|
81
|
+
points.push({ id, holding: await holdingOf(stateDir, key, id) });
|
|
81
82
|
}
|
|
82
83
|
for (const id of expiredPoints(points, now, keep)) {
|
|
83
84
|
await rm(join(dir, id), { recursive: true, force: true });
|
|
84
85
|
}
|
|
85
86
|
};
|
|
86
|
-
export const createPointDir = async (stateDir,
|
|
87
|
-
await mkdir(restoreDir(stateDir,
|
|
87
|
+
export const createPointDir = async (stateDir, key, now) => {
|
|
88
|
+
await mkdir(restoreDir(stateDir, key), { recursive: true, mode: 0o700 });
|
|
88
89
|
for (let at = now;; at += 1) {
|
|
89
90
|
const created = new Date(at);
|
|
90
91
|
try {
|
|
91
|
-
await mkdir(join(restoreDir(stateDir,
|
|
92
|
+
await mkdir(join(restoreDir(stateDir, key), pointId(created)), { mode: 0o700 });
|
|
92
93
|
return { id: pointId(created), createdAt: created.toISOString() };
|
|
93
94
|
}
|
|
94
95
|
catch (error) {
|
|
@@ -98,7 +99,7 @@ export const createPointDir = async (stateDir, sandboxId, now) => {
|
|
|
98
99
|
}
|
|
99
100
|
}
|
|
100
101
|
};
|
|
101
|
-
export const backUp = async (stateDir,
|
|
102
|
+
export const backUp = async (stateDir, key, id, root, request, durability) => {
|
|
102
103
|
const current = await localFile(root, request.path);
|
|
103
104
|
if (request.kind === "added") {
|
|
104
105
|
if (current !== undefined) {
|
|
@@ -109,7 +110,7 @@ export const backUp = async (stateDir, sandboxId, id, root, request, durability)
|
|
|
109
110
|
if (current === undefined) {
|
|
110
111
|
throw new Error("it is no longer in this folder");
|
|
111
112
|
}
|
|
112
|
-
const copy = join(restoreDir(stateDir,
|
|
113
|
+
const copy = join(restoreDir(stateDir, key), id, "files", ...request.path.split("/"));
|
|
113
114
|
await mkdir(dirname(copy), { recursive: true, mode: 0o700 });
|
|
114
115
|
await copyFile(await localTarget(root, request.path), copy);
|
|
115
116
|
await durability.file(copy);
|
|
@@ -127,13 +128,13 @@ const foldersIn = async (dir) => {
|
|
|
127
128
|
const nested = await Promise.all(entries.filter((entry) => entry.isDirectory()).map(async (entry) => await foldersIn(join(dir, entry.name))));
|
|
128
129
|
return [...nested.flat(), dir];
|
|
129
130
|
};
|
|
130
|
-
export const sealPoint = async (stateDir,
|
|
131
|
-
const dir = join(restoreDir(stateDir,
|
|
132
|
-
for (const folder of [...(await foldersIn(join(dir, "files"))), dir, restoreDir(stateDir,
|
|
131
|
+
export const sealPoint = async (stateDir, key, id, durability) => {
|
|
132
|
+
const dir = join(restoreDir(stateDir, key), id);
|
|
133
|
+
for (const folder of [...(await foldersIn(join(dir, "files"))), dir, restoreDir(stateDir, key)]) {
|
|
133
134
|
await durability.folder(folder);
|
|
134
135
|
}
|
|
135
136
|
};
|
|
136
|
-
export const restoreEntry = async (stateDir,
|
|
137
|
+
export const restoreEntry = async (stateDir, key, id, root, entry) => {
|
|
137
138
|
const current = await localFile(root, entry.path);
|
|
138
139
|
const now = current?.hash ?? null;
|
|
139
140
|
if (now !== entry.applied) {
|
|
@@ -144,7 +145,7 @@ export const restoreEntry = async (stateDir, sandboxId, id, root, entry) => {
|
|
|
144
145
|
await removeFile(root, entry.path);
|
|
145
146
|
return;
|
|
146
147
|
}
|
|
147
|
-
const copy = join(restoreDir(stateDir,
|
|
148
|
+
const copy = join(restoreDir(stateDir, key), id, "files", ...entry.path.split("/"));
|
|
148
149
|
const held = await hashFile(copy).catch(undefinedIfMissing);
|
|
149
150
|
if (held === undefined || held !== entry.backup) {
|
|
150
151
|
throw new Error("its copy in the restore point is missing or damaged");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restore-points.js","sourceRoot":"","sources":["../../src/sync/restore-points.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAmB,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"restore-points.js","sourceRoot":"","sources":["../../src/sync/restore-points.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { Log } from "@intentic/local-agent";
|
|
2
|
+
import { type Pairing } from "./config.js";
|
|
3
|
+
export declare const sandboxesNamed: (pairings: readonly Pairing[], name: string) => string[];
|
|
4
|
+
export interface Retired {
|
|
5
|
+
readonly sandboxId: string;
|
|
6
|
+
readonly pairings: readonly string[];
|
|
7
|
+
readonly folders: readonly string[];
|
|
8
|
+
}
|
|
9
|
+
export interface RetireSeams {
|
|
10
|
+
readonly mutagen: string | undefined;
|
|
11
|
+
readonly unbridge?: (alias: string, localDir: string) => Promise<number>;
|
|
12
|
+
}
|
|
13
|
+
export declare const retireSandbox: (sandboxId: string, log: Log, why: string, seams: RetireSeams) => Promise<Retired | undefined>;
|
|
14
|
+
//# sourceMappingURL=retire.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retire.d.ts","sourceRoot":"","sources":["../../src/sync/retire.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAoB,KAAK,OAAO,EAAkE,MAAM,aAAa,CAAC;AAsB7H,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"}
|