@intentic/machine 1.331.0 → 1.333.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 +67 -8
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +1 -1
- package/dist/app.js.map +1 -1
- package/dist/autostart/autostart.js +1 -1
- package/dist/autostart/autostart.js.map +1 -1
- package/dist/cli-ui.d.ts +10 -0
- package/dist/cli-ui.d.ts.map +1 -0
- package/dist/cli-ui.js +62 -0
- package/dist/cli-ui.js.map +1 -0
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +61 -26
- package/dist/commands.js.map +1 -1
- package/dist/daemon-base.d.ts +1 -0
- package/dist/daemon-base.d.ts.map +1 -1
- package/dist/daemon-base.js +21 -18
- package/dist/daemon-base.js.map +1 -1
- package/dist/device/audit.d.ts.map +1 -1
- package/dist/device/audit.js.map +1 -1
- package/dist/device/commands.d.ts +8 -6
- package/dist/device/commands.d.ts.map +1 -1
- package/dist/device/commands.js +64 -42
- package/dist/device/commands.js.map +1 -1
- package/dist/device/connection.d.ts.map +1 -1
- package/dist/device/connection.js +2 -3
- package/dist/device/connection.js.map +1 -1
- package/dist/device/grant.d.ts +7 -0
- package/dist/device/grant.d.ts.map +1 -1
- package/dist/device/loopback-catch.d.ts.map +1 -1
- package/dist/device/loopback-catch.js +1 -1
- package/dist/device/loopback-catch.js.map +1 -1
- package/dist/device/mcp.d.ts.map +1 -1
- package/dist/device/mcp.js +19 -0
- package/dist/device/mcp.js.map +1 -1
- package/dist/device/policy.d.ts.map +1 -1
- package/dist/device/policy.js +3 -5
- package/dist/device/policy.js.map +1 -1
- package/dist/device/router.d.ts +7 -0
- package/dist/device/router.d.ts.map +1 -1
- package/dist/device/router.js +17 -5
- package/dist/device/router.js.map +1 -1
- package/dist/device/sandbox-cli.d.ts +12 -1
- package/dist/device/sandbox-cli.d.ts.map +1 -1
- package/dist/device/sandbox-cli.js +90 -18
- package/dist/device/sandbox-cli.js.map +1 -1
- package/dist/device/sandbox-rounds/ic-swaps.d.ts +11 -0
- package/dist/device/sandbox-rounds/ic-swaps.d.ts.map +1 -0
- package/dist/device/sandbox-rounds/ic-swaps.js +40 -0
- package/dist/device/sandbox-rounds/ic-swaps.js.map +1 -0
- package/dist/device/sandbox-rounds/keeper.d.ts +26 -1
- package/dist/device/sandbox-rounds/keeper.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/keeper.js +118 -20
- package/dist/device/sandbox-rounds/keeper.js.map +1 -1
- package/dist/device/sandbox-rounds/probation-watch.d.ts +1 -1
- package/dist/device/sandbox-rounds/probation-watch.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/probation-watch.js +2 -2
- package/dist/device/sandbox-rounds/probation-watch.js.map +1 -1
- package/dist/device/sandbox-rounds/sleep.d.ts +52 -0
- package/dist/device/sandbox-rounds/sleep.d.ts.map +1 -0
- package/dist/device/sandbox-rounds/sleep.js +115 -0
- package/dist/device/sandbox-rounds/sleep.js.map +1 -0
- package/dist/device/sandbox-rounds/swap-records.d.ts +1 -5
- package/dist/device/sandbox-rounds/swap-records.d.ts.map +1 -1
- package/dist/device/sandbox-rounds/swap-records.js +2 -33
- package/dist/device/sandbox-rounds/swap-records.js.map +1 -1
- package/dist/device/sandbox-rounds/swaps-fallback.d.ts +7 -0
- package/dist/device/sandbox-rounds/swaps-fallback.d.ts.map +1 -0
- package/dist/device/sandbox-rounds/swaps-fallback.js +44 -0
- package/dist/device/sandbox-rounds/swaps-fallback.js.map +1 -0
- package/dist/device/tools/agent.js +3 -3
- package/dist/device/tools/agent.js.map +1 -1
- package/dist/device/tools/android.d.ts.map +1 -1
- package/dist/device/tools/android.js +7 -62
- package/dist/device/tools/android.js.map +1 -1
- package/dist/device/tools/apps.d.ts.map +1 -1
- package/dist/device/tools/apps.js +7 -1
- package/dist/device/tools/apps.js.map +1 -1
- package/dist/device/tools/describe.d.ts +6 -0
- package/dist/device/tools/describe.d.ts.map +1 -1
- package/dist/device/tools/describe.js +30 -9
- package/dist/device/tools/describe.js.map +1 -1
- package/dist/device/tools/device.d.ts.map +1 -1
- package/dist/device/tools/device.js +2 -1
- package/dist/device/tools/device.js.map +1 -1
- package/dist/device/tools/ic-binary.d.ts +7 -0
- package/dist/device/tools/ic-binary.d.ts.map +1 -1
- package/dist/device/tools/ic-binary.js +16 -8
- package/dist/device/tools/ic-binary.js.map +1 -1
- package/dist/device/tools/logs/logs.d.ts +30 -0
- package/dist/device/tools/logs/logs.d.ts.map +1 -0
- package/dist/device/tools/logs/logs.js +147 -0
- package/dist/device/tools/logs/logs.js.map +1 -0
- package/dist/device/tools/programs/artifacts.d.ts.map +1 -1
- package/dist/device/tools/programs/artifacts.js +5 -10
- package/dist/device/tools/programs/artifacts.js.map +1 -1
- package/dist/device/tools/programs/{tunnel.d.ts → device-tunnel.d.ts} +1 -1
- package/dist/device/tools/programs/device-tunnel.d.ts.map +1 -0
- package/dist/device/tools/programs/{tunnel.js → device-tunnel.js} +1 -1
- package/dist/device/tools/programs/device-tunnel.js.map +1 -0
- package/dist/device/tools/programs/isolated.d.ts +0 -1
- package/dist/device/tools/programs/isolated.d.ts.map +1 -1
- package/dist/device/tools/programs/isolated.js +8 -10
- package/dist/device/tools/programs/isolated.js.map +1 -1
- package/dist/device/tools/programs/programs.d.ts +1 -1
- package/dist/device/tools/programs/programs.d.ts.map +1 -1
- package/dist/device/tools/programs/programs.js +89 -35
- package/dist/device/tools/programs/programs.js.map +1 -1
- package/dist/device/tools/sandboxes.d.ts.map +1 -1
- package/dist/device/tools/sandboxes.js +11 -10
- package/dist/device/tools/sandboxes.js.map +1 -1
- package/dist/device/tools/shell.d.ts +6 -5
- package/dist/device/tools/shell.d.ts.map +1 -1
- package/dist/device/tools/shell.js +37 -86
- package/dist/device/tools/shell.js.map +1 -1
- package/dist/engine-env.d.ts +15 -0
- package/dist/engine-env.d.ts.map +1 -0
- package/dist/engine-env.js +80 -0
- package/dist/engine-env.js.map +1 -0
- package/dist/environments/auto-upgrade.d.ts +2 -2
- package/dist/environments/auto-upgrade.d.ts.map +1 -1
- package/dist/environments/auto-upgrade.js +3 -5
- package/dist/environments/auto-upgrade.js.map +1 -1
- package/dist/environments/commands.d.ts +7 -1
- package/dist/environments/commands.d.ts.map +1 -1
- package/dist/environments/commands.js +37 -31
- package/dist/environments/commands.js.map +1 -1
- package/dist/environments/machine-upgrade.d.ts +8 -1
- package/dist/environments/machine-upgrade.d.ts.map +1 -1
- package/dist/environments/machine-upgrade.js +35 -26
- package/dist/environments/machine-upgrade.js.map +1 -1
- package/dist/environments/machine.d.ts +5 -4
- package/dist/environments/machine.d.ts.map +1 -1
- package/dist/environments/machine.js +13 -16
- package/dist/environments/machine.js.map +1 -1
- package/dist/environments/wsl.d.ts.map +1 -1
- package/dist/environments/wsl.js +4 -7
- package/dist/environments/wsl.js.map +1 -1
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +28 -30
- package/dist/install.js.map +1 -1
- package/dist/resident/last-exit.d.ts +40 -0
- package/dist/resident/last-exit.d.ts.map +1 -0
- package/dist/resident/last-exit.js +147 -0
- package/dist/resident/last-exit.js.map +1 -0
- package/dist/resident/log-roll.d.ts +8 -0
- package/dist/resident/log-roll.d.ts.map +1 -0
- package/dist/resident/log-roll.js +30 -0
- package/dist/resident/log-roll.js.map +1 -0
- package/dist/{resident.d.ts → resident/resident.d.ts} +1 -1
- package/dist/resident/resident.d.ts.map +1 -0
- package/dist/{resident.js → resident/resident.js} +52 -27
- package/dist/resident/resident.js.map +1 -0
- package/dist/{supervision.d.ts → resident/supervision.d.ts} +7 -3
- package/dist/resident/supervision.d.ts.map +1 -0
- package/dist/{supervision.js → resident/supervision.js} +20 -16
- package/dist/resident/supervision.js.map +1 -0
- package/dist/resident/watchdog.d.ts +24 -0
- package/dist/resident/watchdog.d.ts.map +1 -0
- package/dist/resident/watchdog.js +69 -0
- package/dist/resident/watchdog.js.map +1 -0
- package/dist/status.d.ts +14 -8
- package/dist/status.d.ts.map +1 -1
- package/dist/status.js +141 -107
- package/dist/status.js.map +1 -1
- package/dist/sync/attach-commands.d.ts +1 -1
- package/dist/sync/attach-commands.d.ts.map +1 -1
- package/dist/sync/attach-commands.js +19 -12
- package/dist/sync/attach-commands.js.map +1 -1
- package/dist/sync/commands.d.ts +6 -3
- package/dist/sync/commands.d.ts.map +1 -1
- package/dist/sync/commands.js +149 -113
- package/dist/sync/commands.js.map +1 -1
- package/dist/sync/exec.d.ts +9 -0
- package/dist/sync/exec.d.ts.map +1 -1
- package/dist/sync/exec.js +21 -22
- package/dist/sync/exec.js.map +1 -1
- package/dist/sync/folders.d.ts.map +1 -1
- package/dist/sync/folders.js +3 -14
- package/dist/sync/folders.js.map +1 -1
- package/dist/sync/forget-command.d.ts +1 -1
- package/dist/sync/forget-command.d.ts.map +1 -1
- package/dist/sync/forget-command.js +10 -7
- package/dist/sync/forget-command.js.map +1 -1
- package/dist/sync/git-bridge.d.ts.map +1 -1
- package/dist/sync/git-bridge.js +4 -2
- package/dist/sync/git-bridge.js.map +1 -1
- package/dist/sync/local-sandboxes.d.ts.map +1 -1
- package/dist/sync/local-sandboxes.js +2 -4
- package/dist/sync/local-sandboxes.js.map +1 -1
- package/dist/sync/mirror.d.ts.map +1 -1
- package/dist/sync/mirror.js +9 -18
- package/dist/sync/mirror.js.map +1 -1
- package/dist/sync/mutagen.d.ts.map +1 -1
- package/dist/sync/mutagen.js +33 -37
- package/dist/sync/mutagen.js.map +1 -1
- package/dist/sync/project/project-commands.d.ts +7 -2
- package/dist/sync/project/project-commands.d.ts.map +1 -1
- package/dist/sync/project/project-commands.js +110 -46
- package/dist/sync/project/project-commands.js.map +1 -1
- package/dist/sync/project/project-files.d.ts +4 -6
- package/dist/sync/project/project-files.d.ts.map +1 -1
- package/dist/sync/project/project-files.js +4 -6
- package/dist/sync/project/project-files.js.map +1 -1
- package/dist/sync/project/project-local.d.ts.map +1 -1
- package/dist/sync/project/project-local.js +3 -19
- package/dist/sync/project/project-local.js.map +1 -1
- package/dist/sync/project/project-remote.js +4 -4
- package/dist/sync/project/project-transfer.d.ts +13 -30
- package/dist/sync/project/project-transfer.d.ts.map +1 -1
- package/dist/sync/project/project-transfer.js +1 -1
- package/dist/sync/project/project-transfer.js.map +1 -1
- package/dist/sync/retire.d.ts.map +1 -1
- package/dist/sync/retire.js +3 -3
- package/dist/sync/retire.js.map +1 -1
- package/dist/sync/siblings.d.ts.map +1 -1
- package/dist/sync/siblings.js +3 -6
- package/dist/sync/siblings.js.map +1 -1
- package/dist/sync/ssh.d.ts +1 -1
- package/dist/sync/ssh.d.ts.map +1 -1
- package/dist/sync/ssh.js +8 -7
- package/dist/sync/ssh.js.map +1 -1
- package/dist/sync/swap-pause.d.ts.map +1 -1
- package/dist/sync/swap-pause.js +2 -2
- package/dist/sync/swap-pause.js.map +1 -1
- package/dist/upgrade.d.ts +7 -0
- package/dist/upgrade.d.ts.map +1 -1
- package/dist/upgrade.js +24 -13
- package/dist/upgrade.js.map +1 -1
- package/dist/upkeep/doctor.d.ts +4 -2
- package/dist/upkeep/doctor.d.ts.map +1 -1
- package/dist/upkeep/doctor.js +40 -26
- package/dist/upkeep/doctor.js.map +1 -1
- package/dist/upkeep/login.js +1 -1
- package/dist/upkeep/login.js.map +1 -1
- package/dist/upkeep/retention.d.ts +6 -0
- package/dist/upkeep/retention.d.ts.map +1 -1
- package/dist/upkeep/retention.js +55 -3
- package/dist/upkeep/retention.js.map +1 -1
- package/dist/upkeep/retired.js +1 -1
- package/dist/upkeep/retired.js.map +1 -1
- package/dist/upkeep/second-ic.d.ts.map +1 -1
- package/dist/upkeep/second-ic.js +4 -6
- package/dist/upkeep/second-ic.js.map +1 -1
- package/dist/upkeep/trash.d.ts.map +1 -1
- package/dist/upkeep/trash.js +5 -6
- package/dist/upkeep/trash.js.map +1 -1
- package/package.json +9 -9
- package/dist/device/tools/programs/tunnel.d.ts.map +0 -1
- package/dist/device/tools/programs/tunnel.js.map +0 -1
- package/dist/resident.d.ts.map +0 -1
- package/dist/resident.js.map +0 -1
- package/dist/supervision.d.ts.map +0 -1
- package/dist/supervision.js.map +0 -1
- package/dist/watchdog.d.ts +0 -13
- package/dist/watchdog.d.ts.map +0 -1
- package/dist/watchdog.js +0 -38
- package/dist/watchdog.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/environments/commands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/environments/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,14 @@ export interface MachineUpgradeAsk {
|
|
|
22
22
|
readonly force: boolean;
|
|
23
23
|
readonly level: boolean;
|
|
24
24
|
}
|
|
25
|
-
export
|
|
25
|
+
export interface MachineUpgradeEnd {
|
|
26
|
+
readonly landed: boolean;
|
|
27
|
+
readonly said: string;
|
|
28
|
+
readonly outcome?: UpgradeOutcome;
|
|
29
|
+
readonly legsFailed: readonly string[];
|
|
30
|
+
readonly delegated?: true;
|
|
31
|
+
}
|
|
32
|
+
export declare const upgradeMachine: (io: MachineIo, ask: MachineUpgradeAsk, log: Log, end?: (ending: MachineUpgradeEnd) => void) => Promise<boolean>;
|
|
26
33
|
export declare const realMachineIo: (ask: MachineUpgradeAsk, log: Log) => MachineIo;
|
|
27
34
|
export declare const upgradeHereToMachine: (log: Log) => Promise<UpgradeOutcome>;
|
|
28
35
|
export declare const launchUpgrade: (level: boolean) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine-upgrade.d.ts","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,GAAG,EAAiC,MAAM,uBAAuB,CAAC;AAO9F,OAAO,EAA+B,KAAK,cAAc,EAAiC,MAAM,eAAe,CAAC;AAGhH,OAAO,
|
|
1
|
+
{"version":3,"file":"machine-upgrade.d.ts","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,GAAG,EAAiC,MAAM,uBAAuB,CAAC;AAO9F,OAAO,EAA+B,KAAK,cAAc,EAAiC,MAAM,eAAe,CAAC;AAGhH,OAAO,EAA8B,KAAK,aAAa,EAAqE,MAAM,cAAc,CAAC;AAKjJ,eAAO,MAAM,WAAW,6BAA6B,CAAC;AAGtD,eAAO,MAAM,aAAa,cAAe,MAAM,GAAG,SAAS,aAAa,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,GAAG,SAGe,CAAC;AA4BnI,eAAO,MAAM,cAAc,WAAY,aAAa,UAAU,MAAM,SAAS,OAAO,KAAG,MAAM,GAAG,SAO/F,CAAC;AAKF,eAAO,MAAM,WAAW,WAAkB,MAAM,SAAS,OAAO,OAAO,GAAG,KAAG,OAAO,CAAC,cAAc,CAe7F,CAAC;AAGP,eAAO,MAAM,WAAW,WAAkB,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAI5E,CAAC;AAkCF,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACxD,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAC;IACtE,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IACpD,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtD,QAAQ,CAAC,aAAa,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtE,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACzE,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;IAClE,QAAQ,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1E;AAGD,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CAC3B;AAMD,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IAEvC,QAAQ,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC;CAC7B;AA+BD,eAAO,MAAM,cAAc,OACnB,SAAS,OACR,iBAAiB,OACjB,GAAG,QACH,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,KACzC,OAAO,CAAC,OAAO,CAIjB,CAAC;AAiCF,eAAO,MAAM,aAAa,QAAS,iBAAiB,OAAO,GAAG,KAAG,SAW/D,CAAC;AAaH,eAAO,MAAM,oBAAoB,QAAe,GAAG,KAAG,OAAO,CAAC,cAAc,CAI3E,CAAC;AAGF,eAAO,MAAM,aAAa,UAAiB,OAAO,KAAG,OAAO,CAAC,IAAI,CAEhE,CAAC"}
|
|
@@ -1,18 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { promisify } from "node:util";
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
3
2
|
import { pollUntil } from "@intentic/base/async";
|
|
3
|
+
import { execBounded } from "@intentic/base/process";
|
|
4
4
|
import { claimPidFile, releasePidFile, spawnDetached } from "@intentic/local-agent";
|
|
5
5
|
import { DEV_VERSION, isNewer } from "@intentic/sandbox-contract";
|
|
6
6
|
import { rollBackIfCrashLooping } from "../agent-trial.js";
|
|
7
7
|
import { agentLogPath, binDir, upgradeLockPath } from "../config.js";
|
|
8
8
|
import { installedBuild } from "../installed.js";
|
|
9
9
|
import { publishedVersion } from "../release.js";
|
|
10
|
-
import { machineLauncher, readResident, restartResident, waitOutSwaps } from "../supervision.js";
|
|
10
|
+
import { machineLauncher, readResident, restartResident, waitOutSwaps } from "../resident/supervision.js";
|
|
11
11
|
import { realUpgradeExec, runUpgrade, upgradeLanded, upgradeMessage } from "../upgrade.js";
|
|
12
12
|
import { MACHINE_VERSION } from "../version.js";
|
|
13
13
|
import { agentInDistro, crossEnv, NO_AGENT_EXIT } from "./crossing.js";
|
|
14
|
-
import { heldDistros, readMachineConfig, runOnWindows, updateMachineConfig, windowsRoot } from "./machine.js";
|
|
15
|
-
const exec = promisify(execFile);
|
|
14
|
+
import { handToWindows, heldDistros, readMachineConfig, runOnWindows, updateMachineConfig, windowsRoot } from "./machine.js";
|
|
16
15
|
export const UPGRADE_ENV = "INTENTIC_MACHINE_UPGRADE";
|
|
17
16
|
export const machineTarget = (published, installed) => [published, ...installed]
|
|
18
17
|
.filter((version) => version !== undefined && version !== DEV_VERSION)
|
|
@@ -45,25 +44,25 @@ export const skippedRefusal = (config, target, force) => {
|
|
|
45
44
|
return undefined;
|
|
46
45
|
}
|
|
47
46
|
const utcDay = new Date(skipped.at).toISOString().slice(0, 10);
|
|
48
|
-
return `the agent ${target} kept stopping on this
|
|
47
|
+
return `the agent ${target} kept stopping on this device and was rolled back on ${utcDay} (UTC), so it is skipped until a newer release is published.`;
|
|
49
48
|
};
|
|
50
49
|
export const upgradeHere = async (target, force, log) => await withUpgradeLock(log, async () => {
|
|
51
50
|
await rollBackIfCrashLooping(log);
|
|
52
51
|
const refused = skippedRefusal(await readMachineConfig().catch(() => ({})), target, force);
|
|
53
52
|
if (refused !== undefined) {
|
|
54
|
-
return { kind: "failed", reason: refused };
|
|
53
|
+
return { kind: "failed", reason: refused, fix: "intentic-machine upgrade --force" };
|
|
55
54
|
}
|
|
56
55
|
const running = async () => (await readResident())?.build;
|
|
57
56
|
const restart = async () => {
|
|
58
57
|
await waitOutSwaps(log);
|
|
59
|
-
await restartResident(() => undefined);
|
|
58
|
+
await restartResident(() => undefined, { reason: "update", detail: `for the update to ${target}` });
|
|
60
59
|
return await running();
|
|
61
60
|
};
|
|
62
61
|
return await runUpgrade(realUpgradeExec(restart, running, log), target, installedBuild() ?? MACHINE_VERSION, force, log);
|
|
63
62
|
});
|
|
64
63
|
export const installedIn = async (distro) => {
|
|
65
64
|
const { command, args } = agentInDistro(distro, ["version"]);
|
|
66
|
-
const answer = await
|
|
65
|
+
const answer = await execBounded(command, [...args], { timeoutMs: 60_000 }).catch(() => undefined);
|
|
67
66
|
return /^\d+\.\d+\.\d+$/.exec(answer?.stdout.trim() ?? "")?.[0];
|
|
68
67
|
};
|
|
69
68
|
const upgradeIn = async (distro, target, force, log) => await new Promise((resolve) => {
|
|
@@ -100,34 +99,44 @@ const upgradeFromRoot = async (io, ask, log) => {
|
|
|
100
99
|
const [published, ...theirs] = await Promise.all([ask.level ? Promise.resolve(undefined) : io.published(), ...children.map(io.installedIn)]);
|
|
101
100
|
const target = machineTarget(published, [io.installedHere(), ...theirs]);
|
|
102
101
|
if (target === undefined) {
|
|
103
|
-
|
|
104
|
-
? "Nothing to level: no side of this
|
|
105
|
-
:
|
|
106
|
-
return ask.level;
|
|
102
|
+
return ask.level
|
|
103
|
+
? { landed: true, said: "Nothing to level: no side of this device runs a released agent.", legsFailed: [] }
|
|
104
|
+
: { landed: false, said: "The release channel did not answer, so nothing was changed.", legsFailed: [] };
|
|
107
105
|
}
|
|
108
106
|
if (children.length > 0) {
|
|
109
|
-
log(`Bringing this
|
|
107
|
+
log(`Bringing every side of this device to ${target}: ${[...children, "this side"].join(", ")}.`);
|
|
110
108
|
}
|
|
111
|
-
const
|
|
109
|
+
const legsFailed = [];
|
|
112
110
|
for (const child of children) {
|
|
113
|
-
|
|
111
|
+
if (!(await io.upgradeIn(child, target))) {
|
|
112
|
+
legsFailed.push(child);
|
|
113
|
+
}
|
|
114
114
|
}
|
|
115
115
|
const here = await io.upgradeHere(target);
|
|
116
|
-
|
|
117
|
-
const landed = legs.every(Boolean) && upgradeLanded(here);
|
|
116
|
+
const landed = legsFailed.length === 0 && upgradeLanded(here);
|
|
118
117
|
await io.recorded(landed ? undefined : target);
|
|
119
|
-
return landed;
|
|
118
|
+
return { landed, said: upgradeMessage(here), outcome: here, legsFailed };
|
|
119
|
+
};
|
|
120
|
+
export const upgradeMachine = async (io, ask, log, end = (ending) => log(ending.said)) => {
|
|
121
|
+
const ending = await machineUpgradeEnding(io, ask, log);
|
|
122
|
+
end(ending);
|
|
123
|
+
return ending.landed;
|
|
120
124
|
};
|
|
121
|
-
|
|
125
|
+
const machineUpgradeEnding = async (io, ask, log) => {
|
|
122
126
|
if (io.leg !== undefined) {
|
|
123
127
|
const outcome = await io.upgradeHere(io.leg);
|
|
124
|
-
|
|
125
|
-
return upgradeLanded(outcome);
|
|
128
|
+
return { landed: upgradeLanded(outcome), said: upgradeMessage(outcome), outcome, legsFailed: [] };
|
|
126
129
|
}
|
|
127
130
|
const root = await io.windowsRoot();
|
|
128
131
|
if (root !== undefined) {
|
|
129
|
-
log("This is a WSL distro: the whole
|
|
130
|
-
|
|
132
|
+
log("This is a WSL distro: the whole device is updated from its Windows side.");
|
|
133
|
+
const landed = io.delegate(root, ["upgrade", ...askArgs(ask)]) === 0;
|
|
134
|
+
return {
|
|
135
|
+
landed,
|
|
136
|
+
said: landed ? "Updated the agent from the Windows side." : "The Windows side did not finish the update.",
|
|
137
|
+
legsFailed: [],
|
|
138
|
+
delegated: true,
|
|
139
|
+
};
|
|
131
140
|
}
|
|
132
141
|
return await upgradeFromRoot(io, ask, log);
|
|
133
142
|
};
|
|
@@ -144,7 +153,7 @@ const recordFailure = async (failedTarget) => {
|
|
|
144
153
|
export const realMachineIo = (ask, log) => ({
|
|
145
154
|
leg: process.env[UPGRADE_ENV],
|
|
146
155
|
windowsRoot,
|
|
147
|
-
delegate: (agent, args) =>
|
|
156
|
+
delegate: (agent, args) => handToWindows(agent, args),
|
|
148
157
|
children: heldDistros,
|
|
149
158
|
published: publishedVersion,
|
|
150
159
|
installedHere: installedBuild,
|
|
@@ -156,7 +165,7 @@ export const realMachineIo = (ask, log) => ({
|
|
|
156
165
|
const siblingVersions = async () => {
|
|
157
166
|
const root = await windowsRoot();
|
|
158
167
|
if (root !== undefined) {
|
|
159
|
-
const answer = runOnWindows(root, ["version"]);
|
|
168
|
+
const answer = await runOnWindows(root, ["version"]);
|
|
160
169
|
return [answer.status === 0 ? /^\d+\.\d+\.\d+$/.exec(answer.output)?.[0] : undefined];
|
|
161
170
|
}
|
|
162
171
|
return await Promise.all((await heldDistros()).map(installedIn));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine-upgrade.js","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAY,cAAc,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjG,OAAO,EAAE,eAAe,EAAE,UAAU,EAAuB,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAChH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,WAAW,EAAsB,iBAAiB,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIlI,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGjC,MAAM,CAAC,MAAM,WAAW,GAAG,0BAA0B,CAAC;AAGtD,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,SAA6B,EAAE,SAA0C,EAAsB,EAAE,CAC3H,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC;KACpB,MAAM,CAAC,CAAC,OAAO,EAAqB,EAAE,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,WAAW,CAAC;KACxF,MAAM,CAAqB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;AAGnI,MAAM,YAAY,GAAG,EAAE,GAAG,MAAM,CAAC;AACjC,MAAM,YAAY,GAAG,KAAK,CAAC;AAE3B,MAAM,eAAe,GAAG,KAAK,EAAE,GAAQ,EAAE,GAAkC,EAA2B,EAAE;IACpG,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,OAAO,GAAG,KAAK,IAAsB,EAAE;QACzC,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,qDAAqD,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC;QACnD,OAAO,KAAK,CAAC,OAAO,CAAC;IACzB,CAAC,CAAC;IACF,IAAI,CAAC,CAAC,MAAM,SAAS,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC;QACrF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,wBAAwB,MAAM,0BAA0B,EAAE,CAAC;IAChG,CAAC;IACD,IAAI,CAAC;QACD,OAAO,MAAM,GAAG,EAAE,CAAC;IACvB,CAAC;YAAS,CAAC;QACP,MAAM,cAAc,CAAC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;AACL,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAqB,EAAE,MAAc,EAAE,KAAc,EAAsB,EAAE;IACxG,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IACpC,IAAI,KAAK,IAAI,OAAO,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/D,OAAO,aAAa,MAAM,yDAAyD,MAAM,wHAAwH,CAAC;AACtN,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,MAAc,EAAE,KAAc,EAAE,GAAQ,EAA2B,EAAE,CACnG,MAAM,eAAe,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;IAClC,MAAM,sBAAsB,CAAC,GAAG,CAAC,CAAC;IAElC,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,iBAAiB,EAAE,CAAC,KAAK,CAAC,GAAkB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1G,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAC/C,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,IAAiC,EAAE,CAAC,CAAC,MAAM,YAAY,EAAE,CAAC,EAAE,KAAK,CAAC;IACvF,MAAM,OAAO,GAAG,KAAK,IAAiC,EAAE;QACpD,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;QACxB,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,MAAM,OAAO,EAAE,CAAC;IAC3B,CAAC,CAAC;IACF,OAAO,MAAM,UAAU,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAC7H,CAAC,CAAC,CAAC;AAGP,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,MAAc,EAA+B,EAAE;IAC7E,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC7G,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACpE,CAAC,CAAC;AAGF,MAAM,SAAS,GAAG,KAAK,EAAE,MAAc,EAAE,MAAc,EAAE,KAAc,EAAE,GAAQ,EAAoB,EAAE,CACnG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IAC1B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5F,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE;QACpC,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;QACjC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC;KAChD,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,CAAC,KAAa,EAAQ,EAAE;QAClC,KAAK,MAAM,IAAI,IAAI,KAAK;aACnB,QAAQ,CAAC,MAAM,CAAC;aAChB,KAAK,CAAC,OAAO,CAAC;aACd,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;YACtC,GAAG,CAAC,MAAM,MAAM,KAAK,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;IACL,CAAC,CAAC;IACF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/B,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1B,GAAG,CAAC,MAAM,MAAM,2CAA2C,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;QAC9E,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QACzB,IAAI,IAAI,KAAK,aAAa,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,MAAM,8DAA8D,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,aAAa,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC;AAsBP,MAAM,OAAO,GAAG,CAAC,GAAsB,EAAqB,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAGtI,MAAM,eAAe,GAAG,KAAK,EAAE,EAAa,EAAE,GAAsB,EAAE,GAAQ,EAAoB,EAAE;IAChG,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;IACrC,MAAM,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7I,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IAEzE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,GAAG,CACC,GAAG,CAAC,KAAK;YACL,CAAC,CAAC,kEAAkE;YACpE,CAAC,CAAC,iFAAiF,CAC1F,CAAC;QACF,OAAO,GAAG,CAAC,KAAK,CAAC;IACrB,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,GAAG,CAAC,uBAAuB,MAAM,KAAK,CAAC,GAAG,QAAQ,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,IAAI,GAAc,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EAAa,EAAE,GAAsB,EAAE,GAAQ,EAAoB,EAAE;IACtG,IAAI,EAAE,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC7C,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7B,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;IACpC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,GAAG,CAAC,uEAAuE,CAAC,CAAC;QAC7E,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,MAAM,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAC/C,CAAC,CAAC;AAGF,MAAM,aAAa,GAAG,KAAK,EAAE,YAAgC,EAAiB,EAAE;IAC5E,MAAM,mBAAmB,CAAC,CAAC,MAAM,EAAE,EAAE;QACjC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;QACrD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,EAAE,MAAM,KAAK,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzE,OAAO,EAAE,GAAG,IAAI,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;IACxF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAsB,EAAE,GAAQ,EAAa,EAAE,CAAC,CAAC;IAC3E,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IAC7B,WAAW;IACX,QAAQ,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM;IAC9E,QAAQ,EAAE,WAAW;IACrB,SAAS,EAAE,gBAAgB;IAC3B,aAAa,EAAE,cAAc;IAC7B,WAAW;IACX,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC;IACpF,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC;IACxE,QAAQ,EAAE,aAAa;CAC1B,CAAC,CAAC;AAGH,MAAM,eAAe,GAAG,KAAK,IAA8C,EAAE;IACzE,MAAM,IAAI,GAAG,MAAM,WAAW,EAAE,CAAC;IACjC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;AACrE,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAQ,EAA2B,EAAE;IAC5E,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IACzF,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,EAAE,CAAC,eAAe,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;IACxE,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAC3I,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAAE,KAAc,EAAiB,EAAE;IACjE,MAAM,aAAa,CAAC,YAAY,EAAE,eAAe,EAAE,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACzH,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"machine-upgrade.js","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface MachineConfig {
|
|
|
8
8
|
readonly sandboxBackups?: boolean;
|
|
9
9
|
readonly sandboxTidy?: boolean;
|
|
10
10
|
readonly sandboxKeeper?: boolean;
|
|
11
|
+
readonly sandboxSleepMinutes?: number;
|
|
11
12
|
readonly upgradeFailure?: {
|
|
12
13
|
readonly target: string;
|
|
13
14
|
readonly count: number;
|
|
@@ -25,13 +26,13 @@ export declare const heldDistros: () => Promise<readonly string[]>;
|
|
|
25
26
|
export declare const withChild: (config: MachineConfig, distro: string) => MachineConfig;
|
|
26
27
|
export declare const withoutChild: (config: MachineConfig, distro: string) => MachineConfig;
|
|
27
28
|
export declare const windowsRoot: () => Promise<string | undefined>;
|
|
28
|
-
export declare const runOnWindows: (agent: string, args: readonly string[], { vars
|
|
29
|
+
export declare const runOnWindows: (agent: string, args: readonly string[], { vars }?: {
|
|
29
30
|
readonly vars?: Readonly<Record<string, string>>;
|
|
30
|
-
|
|
31
|
-
}) => {
|
|
31
|
+
}) => Promise<{
|
|
32
32
|
readonly status: number;
|
|
33
33
|
readonly output: string;
|
|
34
|
-
}
|
|
34
|
+
}>;
|
|
35
|
+
export declare const handToWindows: (agent: string, args: readonly string[]) => number;
|
|
35
36
|
export declare const attachArgs: (distro: string) => readonly string[];
|
|
36
37
|
export declare const attachToWindows: (log: (message: string) => void) => Promise<boolean>;
|
|
37
38
|
//# sourceMappingURL=machine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,cAAc,gCAAgC,CAAC;AAC5D,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,mBAAmB,SAAS,MAAM,CAAC,UAAU,KAAiB,OAAqD,CAAC;AAOjI,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IAGjC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACnG,QAAQ,CAAC,YAAY,CAAC,EAAE;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7E;AAGD,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,aAAa,CAQ/D,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAkB,CAAC,MAAM,EAAE,aAAa,KAAK,aAAa,KAAG,OAAO,CAAC,aAAa,CAIjH,CAAC;AAEF,eAAO,MAAM,UAAU,WAAY,aAAa,KAAG,SAAS,MAAM,EAA2B,CAAC;AAG9F,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,SAAS,MAAM,EAAE,CAAgE,CAAC;AAE/H,eAAO,MAAM,SAAS,WAAY,aAAa,UAAU,MAAM,KAAG,aACoD,CAAC;AAEvH,eAAO,MAAM,YAAY,WAAY,aAAa,UAAU,MAAM,KAAG,aAIpE,CAAC;AA4BF,eAAO,MAAM,WAAW,QAAO,OAAO,CAAC,MAAM,GAAG,SAAS,CAShD,CAAC;AAaV,eAAO,MAAM,YAAY,UACd,MAAM,QACP,SAAS,MAAM,EAAE,aACR;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;CAAE,KACpE,OAAO,CAAC;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAG9D,CAAC;AAKF,eAAO,MAAM,aAAa,UAAW,MAAM,QAAQ,SAAS,MAAM,EAAE,KAAG,MAEnD,CAAC;AAErB,eAAO,MAAM,UAAU,WAAY,MAAM,KAAG,SAAS,MAAM,EAAuC,CAAC;AAGnG,eAAO,MAAM,eAAe,QAAe,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAG,OAAO,CAAC,OAAO,CAWrF,CAAC"}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { spawnSync } from "node:child_process";
|
|
2
2
|
import { existsSync } from "node:fs";
|
|
3
3
|
import { readFile } from "node:fs/promises";
|
|
4
4
|
import { posix } from "node:path";
|
|
5
|
-
import {
|
|
5
|
+
import { execBounded, runBounded } from "@intentic/base/process";
|
|
6
6
|
import { STATE_DIR } from "@intentic/constants";
|
|
7
7
|
import { writeSecretFile } from "@intentic/local-agent";
|
|
8
8
|
import { wslPathOf } from "@intentic/sandbox-contract";
|
|
9
9
|
import { baseDir, machineConfigPath } from "../config.js";
|
|
10
10
|
import { registeredDistro, WINDOWS_SIDE } from "./wsl.js";
|
|
11
11
|
import { crossEnv } from "./crossing.js";
|
|
12
|
-
const exec = promisify(execFile);
|
|
13
12
|
export const SUPERVISOR_ENV = "INTENTIC_MACHINE_SUPERVISOR";
|
|
14
13
|
export const WINDOWS_SUPERVISOR = "windows";
|
|
15
14
|
export const supervisedByWindows = (env = process.env) => env[SUPERVISOR_ENV] === WINDOWS_SUPERVISOR;
|
|
@@ -40,7 +39,7 @@ const interopCwd = () => (existsSync(INTEROP_CWD) ? INTEROP_CWD : undefined);
|
|
|
40
39
|
const CMD_EXE = ["cmd.exe", "/mnt/c/Windows/System32/cmd.exe"];
|
|
41
40
|
const windowsProfile = async () => {
|
|
42
41
|
for (const cmd of CMD_EXE) {
|
|
43
|
-
const answer = await
|
|
42
|
+
const answer = await execBounded(cmd, ["/c", "echo %USERPROFILE%"], { timeoutMs: 10_000, cwd: interopCwd() }).catch(() => undefined);
|
|
44
43
|
const profile = answer?.stdout.trim();
|
|
45
44
|
if (profile !== undefined && /^[A-Za-z]:\\/.test(profile)) {
|
|
46
45
|
return profile;
|
|
@@ -49,7 +48,7 @@ const windowsProfile = async () => {
|
|
|
49
48
|
return undefined;
|
|
50
49
|
};
|
|
51
50
|
const linuxPathOf = async (windowsPath) => {
|
|
52
|
-
const answer = await
|
|
51
|
+
const answer = await execBounded("wslpath", ["-u", windowsPath], { timeoutMs: 5_000 }).catch(() => undefined);
|
|
53
52
|
const mapped = answer?.stdout.trim();
|
|
54
53
|
return mapped === undefined || mapped === "" ? wslPathOf(windowsPath) : mapped;
|
|
55
54
|
};
|
|
@@ -63,25 +62,23 @@ export const windowsRoot = () => (root ??= (async () => {
|
|
|
63
62
|
const agent = home === undefined ? undefined : posix.join(home, STATE_DIR, "machine", "bin", "intentic-machine.exe");
|
|
64
63
|
return agent !== undefined && existsSync(agent) ? agent : undefined;
|
|
65
64
|
})());
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
stdio: inherit ? "inherit" : "pipe",
|
|
72
|
-
windowsHide: true,
|
|
73
|
-
});
|
|
74
|
-
return { status: result.status ?? 1, output: `${result.stdout ?? ""}${result.stderr ?? ""}`.trim() };
|
|
65
|
+
const WINDOWS_ASK_TIMEOUT_MS = 60_000;
|
|
66
|
+
const WINDOWS_HANDOFF_TIMEOUT_MS = 30 * 60_000;
|
|
67
|
+
export const runOnWindows = async (agent, args, { vars = {} } = {}) => {
|
|
68
|
+
const result = await runBounded(agent, args, { cwd: interopCwd(), env: crossEnv(vars, "w"), timeoutMs: WINDOWS_ASK_TIMEOUT_MS });
|
|
69
|
+
return { status: result.exitCode ?? 1, output: `${result.stdout.text}${result.stderr.text}`.trim() };
|
|
75
70
|
};
|
|
71
|
+
export const handToWindows = (agent, args) => spawnSync(agent, [...args], { cwd: interopCwd(), env: crossEnv({}, "w"), stdio: "inherit", windowsHide: true, timeout: WINDOWS_HANDOFF_TIMEOUT_MS })
|
|
72
|
+
.status ?? 1;
|
|
76
73
|
export const attachArgs = (distro) => ["environment", "attach", distro];
|
|
77
74
|
export const attachToWindows = async (log) => {
|
|
78
75
|
const [agent, distro] = await Promise.all([windowsRoot(), registeredDistro()]);
|
|
79
76
|
if (agent === undefined || distro === undefined) {
|
|
80
77
|
return false;
|
|
81
78
|
}
|
|
82
|
-
const attached = runOnWindows(agent, attachArgs(distro));
|
|
79
|
+
const attached = await runOnWindows(agent, attachArgs(distro));
|
|
83
80
|
if (attached.status !== 0) {
|
|
84
|
-
log(`
|
|
81
|
+
log(`The Windows side's agent would not take this distro over (${attached.output.split("\n")[0] ?? "no reason given"}); this distro starts its own.`);
|
|
85
82
|
return false;
|
|
86
83
|
}
|
|
87
84
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKzC,MAAM,CAAC,MAAM,cAAc,GAAG,6BAA6B,CAAC;AAC5D,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;AAC5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,GAAG,GAAsB,OAAO,CAAC,GAAG,EAAW,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,kBAAkB,CAAC;AAsBjI,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,IAA4B,EAAE;IAChE,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,KAA4B,EAAE,EAAE;QACzF,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,MAAM,KAAK,CAAC;IAChB,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAmB,CAAC;AACvE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAAgD,EAA0B,EAAE;IAClH,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,iBAAiB,EAAE,CAAC,CAAC;IAC/C,MAAM,eAAe,CAAC,iBAAiB,EAAE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IACtF,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAqB,EAAqB,EAAE,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;AAG9F,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,IAAgC,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAE/H,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAqB,EAAE,MAAc,EAAiB,EAAE,CAC9E,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;AAEvH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAqB,EAAE,MAAc,EAAiB,EAAE;IACjF,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IACtE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;IAC5C,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC;AAChE,CAAC,CAAC;AAGF,MAAM,WAAW,GAAG,QAAQ,CAAC;AAC7B,MAAM,UAAU,GAAG,GAAuB,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAEjG,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,iCAAiC,CAAC,CAAC;AAE/D,MAAM,cAAc,GAAG,KAAK,IAAiC,EAAE;IAC3D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAExB,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACrI,MAAM,OAAO,GAAG,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;QACtC,IAAI,OAAO,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YACxD,OAAO,OAAO,CAAC;QACnB,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,EAAE,WAAmB,EAA+B,EAAE;IAC3E,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9G,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACrC,OAAO,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACnF,CAAC,CAAC;AAGF,IAAI,IAA6C,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,GAAgC,EAAE,CACzD,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,EAAE;IAClB,IAAI,CAAC,MAAM,gBAAgB,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,sBAAsB,CAAC,CAAC;IACrH,OAAO,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,CAAC,CAAC,EAAE,CAAC,CAAC;AAKV,MAAM,sBAAsB,GAAG,MAAM,CAAC;AAItC,MAAM,0BAA0B,GAAG,EAAE,GAAG,MAAM,CAAC;AAI/C,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAC7B,KAAa,EACb,IAAuB,EACvB,EAAE,IAAI,GAAG,EAAE,EAAE,GAAyD,EAAE,EACX,EAAE;IAC/D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACjI,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;AACzG,CAAC,CAAC;AAKF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,IAAuB,EAAU,EAAE,CAC5E,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,0BAA0B,EAAE,CAAC;KAC/I,MAAM,IAAI,CAAC,CAAC;AAErB,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAqB,EAAE,CAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAGnG,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,GAA8B,EAAoB,EAAE;IACtF,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAC/E,IAAI,KAAK,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,GAAG,CAAC,6DAA6D,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,iBAAiB,gCAAgC,CAAC,CAAC;QACtJ,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsl.d.ts","sourceRoot":"","sources":["../../src/environments/wsl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wsl.d.ts","sourceRoot":"","sources":["../../src/environments/wsl.ts"],"names":[],"mappings":"AAsBA,eAAO,MAAM,kBAAkB,cAAe,MAAM,GAAG,SAAS,WAAW,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SACtB,CAAC;AAMpF,eAAO,MAAM,OAAO,gBACH,MAAM,GAAG,SAAS,aACpB,MAAM,GAAG,SAAS,aAClB,MAAM,GAAG,SAAS,YACnB,MAAM,GAAG,SAAS,KAC7B;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAMhC,CAAC;AAkBF,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAItF,CAAC;AAGF,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAKnE,CAAC;AAGF,eAAO,MAAM,WAAW,WAAY,MAAM,KAAG,MAAM,EAKoB,CAAC;AAKxE,eAAO,MAAM,WAAW,6BAGrB;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,KAAQ,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAMjG,CAAC;AAGF,MAAM,MAAM,IAAI,GAAG,SAAS,GAAG,KAAK,GAAG,QAAQ,CAAC;AAGhD,eAAO,MAAM,YAAY,SAA+B,CAAC;AAGzD,eAAO,MAAM,QAAQ,QAAO,OAAO,CAAC,IAAI,CACyF,CAAC"}
|
package/dist/environments/wsl.js
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import { execFile } from "node:child_process";
|
|
2
1
|
import { readFile } from "node:fs/promises";
|
|
3
|
-
import {
|
|
2
|
+
import { execBounded } from "@intentic/base/process";
|
|
4
3
|
import { WSL_SYSTEM_DISTROS } from "@intentic/sandbox-contract";
|
|
5
4
|
const WSL_KERNEL = /microsoft/i;
|
|
6
|
-
const exec = promisify(execFile);
|
|
7
5
|
const registeredFrom = (wslRoot) => /^\\\\wsl(?:\.localhost|\$)\\([^\\]+)/.exec((wslRoot ?? "").trim())?.[1] ?? "";
|
|
8
6
|
export const registeredNameFrom = (distroEnv, wslRoot) => [registeredFrom(wslRoot), (distroEnv ?? "").trim()].find((name) => name !== "");
|
|
9
7
|
export const wslFrom = (procVersion, distroEnv, osRelease, wslRoot) => {
|
|
@@ -19,7 +17,7 @@ const nameFrom = (osRelease) => {
|
|
|
19
17
|
};
|
|
20
18
|
const readable = (path) => readFile(path, "utf8").catch(() => undefined);
|
|
21
19
|
const WSLPATH_TIMEOUT_MS = 2_000;
|
|
22
|
-
const wslRoot = async () => (await
|
|
20
|
+
const wslRoot = async () => (await execBounded("wslpath", ["-w", "/"], { timeoutMs: WSLPATH_TIMEOUT_MS }).catch(() => undefined))?.stdout;
|
|
23
21
|
export const wslEnvironment = async () => {
|
|
24
22
|
const [procVersion, osRelease] = await Promise.all([readable("/proc/version"), readable("/etc/os-release")]);
|
|
25
23
|
const root = WSL_KERNEL.test(procVersion ?? "") ? await wslRoot() : undefined;
|
|
@@ -37,9 +35,8 @@ export const distrosFrom = (stdout) => stdout
|
|
|
37
35
|
.map((line) => line.trim())
|
|
38
36
|
.filter((line) => line !== "" && !WSL_SYSTEM_DISTROS.has(line));
|
|
39
37
|
export const listDistros = async ({ running = false, timeoutMs = 5_000, } = {}) => {
|
|
40
|
-
const answer = await
|
|
41
|
-
|
|
42
|
-
windowsHide: true,
|
|
38
|
+
const answer = await execBounded("wsl.exe", ["-l", "-q", ...(running ? ["--running"] : [])], {
|
|
39
|
+
timeoutMs,
|
|
43
40
|
env: { ...process.env, WSL_UTF8: "1" },
|
|
44
41
|
}).catch(() => undefined);
|
|
45
42
|
return answer === undefined ? undefined : distrosFrom(answer.stdout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wsl.js","sourceRoot":"","sources":["../../src/environments/wsl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"wsl.js","sourceRoot":"","sources":["../../src/environments/wsl.ts"],"names":[],"mappings":"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"}
|
package/dist/install.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAOA,OAAO,EAAW,KAAK,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAQ1D,OAAO,EAAE,KAAK,cAAc,EAAkB,MAAM,cAAc,CAAC;AAOnE,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,CAAC;IAChD,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,KAAK,KAAK,CAAC;CACxE;AAID,eAAO,MAAM,qBAAqB,OAC1B,YAAY,OACX,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,QACjC,SAAS,MAAM,EAAE,OAClB,GAAG,KACT,OAAO,CAAC,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAS,GAAG,KAAG,YAU1C,CAAC;AAwBH,eAAO,MAAM,qBAAqB,WAAY,MAAM,UAAU,MAAM,KAAG,MAAM,GAAG,SAM/E,CAAC;AAcF,eAAO,MAAM,eAAe,YAAa,MAAM,KAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAajG,CAAC;AA6DF,eAAO,MAAM,YAAY,QAAe,GAAG,QAAQ,SAAS,MAAM,EAAE,KAAG,OAAO,CAAC,IAAI,CAWlF,CAAC;AAIF,eAAO,MAAM,aAAa,QAAe,GAAG,KAAG,OAAO,CAAC,IAAI,CAW1D,CAAC"}
|
package/dist/install.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { spawnSync } from "node:child_process";
|
|
2
2
|
import { existsSync } from "node:fs";
|
|
3
|
-
import { mkdir,
|
|
3
|
+
import { mkdir, rm, symlink } from "node:fs/promises";
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { errorMessage } from "@intentic/base/errors";
|
|
6
|
+
import { runBounded } from "@intentic/base/process";
|
|
7
|
+
import { renameOver } from "@intentic/base/fs";
|
|
6
8
|
import { homeDir } from "@intentic/local-agent";
|
|
7
9
|
import { DEV_VERSION } from "@intentic/sandbox-contract";
|
|
8
10
|
import { binDir } from "./config.js";
|
|
@@ -23,7 +25,7 @@ export const selfUpdateBeforeSetup = async (io, env, args, out) => {
|
|
|
23
25
|
io.reexec(args, outcome.to);
|
|
24
26
|
}
|
|
25
27
|
if (outcome.kind === "failed") {
|
|
26
|
-
out(`
|
|
28
|
+
out(`Couldn't update the agent first (${outcome.reason}); continuing with ${io.installed}.`);
|
|
27
29
|
}
|
|
28
30
|
};
|
|
29
31
|
export const realSelfUpdateIo = (out) => ({
|
|
@@ -44,11 +46,11 @@ const posixPathRepair = async (out) => {
|
|
|
44
46
|
await symlink(agentPath, link);
|
|
45
47
|
}
|
|
46
48
|
catch (error) {
|
|
47
|
-
out(`
|
|
49
|
+
out(`Couldn't link ${link} (${errorMessage(error)}); run ${agentPath} directly.`);
|
|
48
50
|
return;
|
|
49
51
|
}
|
|
50
52
|
if (!(process.env["PATH"] ?? "").split(":").includes(linkDir)) {
|
|
51
|
-
out(`
|
|
53
|
+
out(`Add ~/.local/bin to your PATH to run intentic-machine by name, or run ${agentPath}.`);
|
|
52
54
|
}
|
|
53
55
|
};
|
|
54
56
|
export const addToWindowsPathValue = (stored, folder) => {
|
|
@@ -78,39 +80,35 @@ export const windowsPathFrom = (listing) => {
|
|
|
78
80
|
}
|
|
79
81
|
return { kind, stored: data.trimEnd() };
|
|
80
82
|
};
|
|
81
|
-
const readWindowsPath = () => {
|
|
82
|
-
const query =
|
|
83
|
-
if (query.
|
|
84
|
-
throw query.
|
|
83
|
+
const readWindowsPath = async () => {
|
|
84
|
+
const query = await runBounded("reg", ["query", "HKCU\\Environment"], { timeoutMs: 15_000 });
|
|
85
|
+
if (query.spawnError !== undefined) {
|
|
86
|
+
throw query.spawnError;
|
|
85
87
|
}
|
|
86
|
-
if (query.
|
|
87
|
-
throw new Error(query.stderr.trim() === "" ? `reg query exited ${String(query.
|
|
88
|
+
if (query.exitCode !== 0) {
|
|
89
|
+
throw new Error(query.stderr.text.trim() === "" ? `reg query exited ${String(query.exitCode)}` : query.stderr.text.trim());
|
|
88
90
|
}
|
|
89
|
-
return windowsPathFrom(query.stdout);
|
|
91
|
+
return windowsPathFrom(query.stdout.text);
|
|
90
92
|
};
|
|
91
|
-
const writeWindowsPath = (kind, value) => {
|
|
92
|
-
const add =
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
});
|
|
97
|
-
if (add.status !== 0) {
|
|
98
|
-
throw new Error(add.stderr.trim() === "" ? `reg add exited ${String(add.status)}` : add.stderr.trim());
|
|
99
|
-
}
|
|
100
|
-
spawnSync("powershell", ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_ENV_BROADCAST], { windowsHide: true, timeout: 15_000 });
|
|
93
|
+
const writeWindowsPath = async (kind, value) => {
|
|
94
|
+
const add = await runBounded("reg", ["add", "HKCU\\Environment", "/v", "Path", "/t", kind, "/d", value, "/f"], { timeoutMs: 15_000 });
|
|
95
|
+
if (add.exitCode !== 0) {
|
|
96
|
+
throw new Error(add.stderr.text.trim() === "" ? `reg add exited ${String(add.exitCode)}` : add.stderr.text.trim());
|
|
97
|
+
}
|
|
98
|
+
await runBounded("powershell", ["-NoProfile", "-NonInteractive", "-Command", WINDOWS_ENV_BROADCAST], { timeoutMs: 15_000 });
|
|
101
99
|
};
|
|
102
|
-
const windowsPathRepair = (out) => {
|
|
100
|
+
const windowsPathRepair = async (out) => {
|
|
103
101
|
try {
|
|
104
|
-
const { kind, stored } = readWindowsPath();
|
|
102
|
+
const { kind, stored } = await readWindowsPath();
|
|
105
103
|
const next = addToWindowsPathValue(stored, binDir);
|
|
106
104
|
if (next === undefined) {
|
|
107
105
|
return;
|
|
108
106
|
}
|
|
109
|
-
writeWindowsPath(kind, next);
|
|
110
|
-
out(
|
|
107
|
+
await writeWindowsPath(kind, next);
|
|
108
|
+
out(`${binDir} was added to your PATH: a new terminal runs intentic-machine by name.`);
|
|
111
109
|
}
|
|
112
110
|
catch (error) {
|
|
113
|
-
out(`
|
|
111
|
+
out(`Couldn't put ${binDir} on your PATH (${errorMessage(error)}). Run intentic-machine from that folder, or add it to your PATH yourself.`);
|
|
114
112
|
}
|
|
115
113
|
};
|
|
116
114
|
const ensureWindowsLauncher = async (out) => {
|
|
@@ -121,11 +119,11 @@ const ensureWindowsLauncher = async (out) => {
|
|
|
121
119
|
try {
|
|
122
120
|
await rm(staged, { force: true });
|
|
123
121
|
await download(launcherAssetUrl(MACHINE_VERSION), staged);
|
|
124
|
-
await
|
|
122
|
+
await renameOver(staged, launcherPath);
|
|
125
123
|
}
|
|
126
124
|
catch (error) {
|
|
127
125
|
await rm(staged, { force: true }).catch(() => undefined);
|
|
128
|
-
out(`
|
|
126
|
+
out(`Couldn't download the windowless launcher (${errorMessage(error)}). Everything still works; a console window flashes on your desktop when this device starts the agent at login.`);
|
|
129
127
|
}
|
|
130
128
|
};
|
|
131
129
|
export const prepareSetup = async (out, args) => {
|
|
@@ -134,7 +132,7 @@ export const prepareSetup = async (out, args) => {
|
|
|
134
132
|
return;
|
|
135
133
|
}
|
|
136
134
|
if (process.platform === "win32") {
|
|
137
|
-
windowsPathRepair(out);
|
|
135
|
+
await windowsPathRepair(out);
|
|
138
136
|
await ensureWindowsLauncher(out);
|
|
139
137
|
return;
|
|
140
138
|
}
|
|
@@ -147,6 +145,6 @@ export const completeSetup = async (out) => {
|
|
|
147
145
|
return;
|
|
148
146
|
}
|
|
149
147
|
delete process.env[UPGRADE_ENV];
|
|
150
|
-
await launchUpgrade(true).catch((error) => out(`
|
|
148
|
+
await launchUpgrade(true).catch((error) => out(`Couldn't bring the rest of this device to this release (${errorMessage(error)}); it catches up within the hour.`));
|
|
151
149
|
};
|
|
152
150
|
//# sourceMappingURL=install.js.map
|