@intentic/machine 1.309.0 → 1.310.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/dist/daemon-base.d.ts +7 -0
- package/dist/daemon-base.d.ts.map +1 -1
- package/dist/daemon-base.js +22 -0
- package/dist/daemon-base.js.map +1 -1
- package/dist/device/commands.d.ts.map +1 -1
- package/dist/device/commands.js +12 -41
- package/dist/device/commands.js.map +1 -1
- package/dist/device/tools/agent.d.ts.map +1 -1
- package/dist/device/tools/agent.js +9 -12
- package/dist/device/tools/agent.js.map +1 -1
- package/dist/device/tools/describe.d.ts +0 -1
- package/dist/device/tools/describe.d.ts.map +1 -1
- package/dist/device/tools/describe.js +3 -12
- package/dist/device/tools/describe.js.map +1 -1
- package/dist/device/tools/shell.d.ts.map +1 -1
- package/dist/device/tools/shell.js +2 -4
- package/dist/device/tools/shell.js.map +1 -1
- package/dist/environments/auto-upgrade.d.ts +1 -1
- package/dist/environments/auto-upgrade.d.ts.map +1 -1
- package/dist/environments/auto-upgrade.js +4 -10
- package/dist/environments/auto-upgrade.js.map +1 -1
- package/dist/environments/commands.d.ts.map +1 -1
- package/dist/environments/commands.js +6 -6
- package/dist/environments/commands.js.map +1 -1
- package/dist/environments/crossing.d.ts +2 -5
- package/dist/environments/crossing.d.ts.map +1 -1
- package/dist/environments/crossing.js +6 -6
- package/dist/environments/crossing.js.map +1 -1
- package/dist/environments/machine-upgrade.d.ts +2 -1
- package/dist/environments/machine-upgrade.d.ts.map +1 -1
- package/dist/environments/machine-upgrade.js +24 -20
- package/dist/environments/machine-upgrade.js.map +1 -1
- package/dist/environments/machine.d.ts +1 -0
- package/dist/environments/machine.d.ts.map +1 -1
- package/dist/environments/machine.js +2 -1
- package/dist/environments/machine.js.map +1 -1
- package/dist/install.d.ts +1 -1
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +5 -13
- package/dist/install.js.map +1 -1
- package/dist/release.d.ts +1 -10
- package/dist/release.d.ts.map +1 -1
- package/dist/release.js +4 -16
- package/dist/release.js.map +1 -1
- package/dist/resident.d.ts.map +1 -1
- package/dist/resident.js +6 -9
- package/dist/resident.js.map +1 -1
- package/dist/status.js +3 -3
- package/dist/status.js.map +1 -1
- package/dist/supervision.d.ts.map +1 -1
- package/dist/supervision.js +12 -14
- package/dist/supervision.js.map +1 -1
- package/dist/sync/commands.d.ts.map +1 -1
- package/dist/sync/commands.js +91 -141
- package/dist/sync/commands.js.map +1 -1
- package/dist/sync/mutagen.d.ts.map +1 -1
- package/dist/sync/mutagen.js +6 -9
- package/dist/sync/mutagen.js.map +1 -1
- package/dist/sync/residue.d.ts +1 -1
- package/dist/sync/residue.d.ts.map +1 -1
- package/dist/sync/residue.js +17 -47
- package/dist/sync/residue.js.map +1 -1
- package/dist/upgrade.d.ts +1 -2
- package/dist/upgrade.d.ts.map +1 -1
- package/dist/upgrade.js +6 -13
- package/dist/upgrade.js.map +1 -1
- package/dist/wsl.d.ts +3 -0
- package/dist/wsl.d.ts.map +1 -1
- package/dist/wsl.js +5 -2
- package/dist/wsl.js.map +1 -1
- package/package.json +8 -8
|
@@ -20,9 +20,9 @@ export const WINDOWS_POWERSHELL = [
|
|
|
20
20
|
"/mnt/c/Program Files/PowerShell/7-preview/pwsh.exe",
|
|
21
21
|
"/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe",
|
|
22
22
|
];
|
|
23
|
-
const wslInterpreter = (distro, script, cwd,
|
|
24
|
-
if (
|
|
25
|
-
throw new Error(
|
|
23
|
+
const wslInterpreter = (distro, script, cwd, side) => {
|
|
24
|
+
if (side !== "windows") {
|
|
25
|
+
throw new Error("Only a Windows PC can run a command in WSL; this device is not one.");
|
|
26
26
|
}
|
|
27
27
|
return {
|
|
28
28
|
command: "wsl.exe",
|
|
@@ -31,8 +31,8 @@ const wslInterpreter = (distro, script, cwd, platform) => {
|
|
|
31
31
|
env: { ...process.env, WSL_UTF8: "1" },
|
|
32
32
|
};
|
|
33
33
|
};
|
|
34
|
-
const windowsInterpreter = (script, cwd,
|
|
35
|
-
if (
|
|
34
|
+
const windowsInterpreter = (script, cwd, side, exists) => {
|
|
35
|
+
if (side !== "wsl") {
|
|
36
36
|
throw new Error("Only a WSL distro can run a command on Windows; this device is not one.");
|
|
37
37
|
}
|
|
38
38
|
const command = WINDOWS_POWERSHELL.find(exists);
|
|
@@ -50,7 +50,7 @@ const windowsInterpreter = (script, cwd, inWsl, exists) => {
|
|
|
50
50
|
env: process.env,
|
|
51
51
|
};
|
|
52
52
|
};
|
|
53
|
-
export const crossInterpreter = (target, script, cwd,
|
|
53
|
+
export const crossInterpreter = (target, script, cwd, side, exists) => (target.kind === "wsl" ? wslInterpreter(target.distro, script, cwd, side) : windowsInterpreter(script, cwd, side, exists));
|
|
54
54
|
export const crossEnv = (vars, direction, base = process.env) => {
|
|
55
55
|
const existing = (base["WSLENV"] ?? "").split(":").filter((entry) => entry !== "" && !Object.hasOwn(vars, entry.split("/")[0] ?? ""));
|
|
56
56
|
return { ...base, ...vars, WSLENV: [...existing, ...Object.keys(vars).map((name) => `${name}/${direction}`)].join(":") };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crossing.js","sourceRoot":"","sources":["../../src/environments/crossing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"crossing.js","sourceRoot":"","sources":["../../src/environments/crossing.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,5 +22,6 @@ export interface MachineUpgradeAsk {
|
|
|
22
22
|
}
|
|
23
23
|
export declare const upgradeMachine: (io: MachineIo, ask: MachineUpgradeAsk, log: Log) => Promise<boolean>;
|
|
24
24
|
export declare const realMachineIo: (ask: MachineUpgradeAsk, log: Log) => MachineIo;
|
|
25
|
-
export declare const
|
|
25
|
+
export declare const upgradeHereToMachine: (log: Log) => Promise<UpgradeOutcome>;
|
|
26
|
+
export declare const launchUpgrade: (level: boolean) => Promise<void>;
|
|
26
27
|
//# sourceMappingURL=machine-upgrade.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine-upgrade.d.ts","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,GAAG,
|
|
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;AAM9F,OAAO,EAA+B,KAAK,cAAc,EAAiC,MAAM,eAAe,CAAC;AAUhH,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;AA2BnI,eAAO,MAAM,WAAW,WAAkB,MAAM,SAAS,OAAO,OAAO,GAAG,KAAG,OAAO,CAAC,cAAc,CAQ7F,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;AAkCD,eAAO,MAAM,cAAc,OAAc,SAAS,OAAO,iBAAiB,OAAO,GAAG,KAAG,OAAO,CAAC,OAAO,CAYrG,CAAC;AAcF,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,16 +1,16 @@
|
|
|
1
1
|
import { execFile, spawn } from "node:child_process";
|
|
2
|
-
import { setTimeout as sleep } from "node:timers/promises";
|
|
3
2
|
import { promisify } from "node:util";
|
|
4
|
-
import {
|
|
3
|
+
import { pollUntil } from "@intentic/base/async";
|
|
4
|
+
import { claimPidFile, releasePidFile, spawnDetached } from "@intentic/local-agent";
|
|
5
5
|
import { DEV_VERSION, isNewer } from "@intentic/sandbox-contract";
|
|
6
|
-
import { binDir, upgradeLockPath } from "../config.js";
|
|
6
|
+
import { agentLogPath, binDir, upgradeLockPath } from "../config.js";
|
|
7
7
|
import { installedBuild } from "../installed.js";
|
|
8
8
|
import { publishedVersion } from "../release.js";
|
|
9
|
-
import { readResident, restartResident } from "../supervision.js";
|
|
9
|
+
import { machineLauncher, readResident, restartResident } from "../supervision.js";
|
|
10
10
|
import { realUpgradeExec, runUpgrade, upgradeLanded, upgradeMessage } from "../upgrade.js";
|
|
11
11
|
import { MACHINE_VERSION } from "../version.js";
|
|
12
12
|
import { agentInDistro, crossEnv, NO_AGENT_EXIT } from "./crossing.js";
|
|
13
|
-
import {
|
|
13
|
+
import { heldDistros, runOnWindows, updateMachineConfig, windowsRoot } from "./machine.js";
|
|
14
14
|
const exec = promisify(execFile);
|
|
15
15
|
export const UPGRADE_ENV = "INTENTIC_MACHINE_UPGRADE";
|
|
16
16
|
export const machineTarget = (published, installed) => [published, ...installed]
|
|
@@ -19,21 +19,17 @@ export const machineTarget = (published, installed) => [published, ...installed]
|
|
|
19
19
|
const LOCK_WAIT_MS = 15 * 60_000;
|
|
20
20
|
const LOCK_POLL_MS = 2_000;
|
|
21
21
|
const withUpgradeLock = async (log, run) => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
for (;;) {
|
|
22
|
+
let holder = 0;
|
|
23
|
+
const claimed = async () => {
|
|
25
24
|
const claim = await claimPidFile(upgradeLockPath, binDir, { pid: process.pid });
|
|
26
|
-
if (claim.claimed) {
|
|
27
|
-
break;
|
|
28
|
-
}
|
|
29
|
-
if (Date.now() > deadline) {
|
|
30
|
-
return { kind: "failed", reason: `another upgrade (pid ${claim.holder.pid}) is still running here.` };
|
|
31
|
-
}
|
|
32
|
-
if (!said) {
|
|
33
|
-
said = true;
|
|
25
|
+
if (!claim.claimed && holder === 0) {
|
|
34
26
|
log(`Waiting for the upgrade already running here (pid ${claim.holder.pid})…`);
|
|
35
27
|
}
|
|
36
|
-
|
|
28
|
+
holder = claim.claimed ? holder : claim.holder.pid;
|
|
29
|
+
return claim.claimed;
|
|
30
|
+
};
|
|
31
|
+
if (!(await pollUntil(claimed, { intervalMs: LOCK_POLL_MS, timeoutMs: LOCK_WAIT_MS }))) {
|
|
32
|
+
return { kind: "failed", reason: `another upgrade (pid ${holder}) is still running here.` };
|
|
37
33
|
}
|
|
38
34
|
try {
|
|
39
35
|
return await run();
|
|
@@ -134,7 +130,7 @@ export const realMachineIo = (ask, log) => ({
|
|
|
134
130
|
leg: process.env[UPGRADE_ENV],
|
|
135
131
|
windowsRoot,
|
|
136
132
|
delegate: (agent, args) => runOnWindows(agent, args, { inherit: true }).status,
|
|
137
|
-
children:
|
|
133
|
+
children: heldDistros,
|
|
138
134
|
published: publishedVersion,
|
|
139
135
|
installedHere: installedBuild,
|
|
140
136
|
installedIn,
|
|
@@ -142,12 +138,20 @@ export const realMachineIo = (ask, log) => ({
|
|
|
142
138
|
upgradeHere: async (target) => await upgradeHere(target, ask.force, log),
|
|
143
139
|
recorded: recordFailure,
|
|
144
140
|
});
|
|
145
|
-
|
|
141
|
+
const siblingVersions = async () => {
|
|
146
142
|
const root = await windowsRoot();
|
|
147
143
|
if (root !== undefined) {
|
|
148
144
|
const answer = runOnWindows(root, ["version"]);
|
|
149
145
|
return [answer.status === 0 ? /^\d+\.\d+\.\d+$/.exec(answer.output)?.[0] : undefined];
|
|
150
146
|
}
|
|
151
|
-
return
|
|
147
|
+
return await Promise.all((await heldDistros()).map(installedIn));
|
|
148
|
+
};
|
|
149
|
+
export const upgradeHereToMachine = async (log) => {
|
|
150
|
+
const [published, siblings] = await Promise.all([publishedVersion(), siblingVersions()]);
|
|
151
|
+
const target = machineTarget(published, [MACHINE_VERSION, ...siblings]);
|
|
152
|
+
return target === undefined ? { kind: "failed", reason: "couldn't reach the release channel" } : await upgradeHere(target, false, log);
|
|
153
|
+
};
|
|
154
|
+
export const launchUpgrade = async (level) => {
|
|
155
|
+
await spawnDetached(agentLogPath, machineLauncher(), ["upgrade", ...(level ? ["--level"] : [])], { finishes: true });
|
|
152
156
|
};
|
|
153
157
|
//# sourceMappingURL=machine-upgrade.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"machine-upgrade.js","sourceRoot":"","sources":["../../src/environments/machine-upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export interface MachineConfig {
|
|
|
14
14
|
export declare const readMachineConfig: () => Promise<MachineConfig>;
|
|
15
15
|
export declare const updateMachineConfig: (mutate: (config: MachineConfig) => MachineConfig) => Promise<MachineConfig>;
|
|
16
16
|
export declare const childrenOf: (config: MachineConfig) => readonly string[];
|
|
17
|
+
export declare const heldDistros: () => Promise<readonly string[]>;
|
|
17
18
|
export declare const withChild: (config: MachineConfig, distro: string) => MachineConfig;
|
|
18
19
|
export declare const withoutChild: (config: MachineConfig, distro: string) => MachineConfig;
|
|
19
20
|
export declare const windowsRoot: () => Promise<string | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,cAAc,gCAAgC,CAAC;AAC5D,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,mBAAmB,SAAS,MAAM,CAAC,UAAU,KAAiB,OAAqD,CAAC;AAGjI,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;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtG;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;
|
|
1
|
+
{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,cAAc,gCAAgC,CAAC;AAC5D,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAC5C,eAAO,MAAM,mBAAmB,SAAS,MAAM,CAAC,UAAU,KAAiB,OAAqD,CAAC;AAGjI,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;QAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;CACtG;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;AAGV,eAAO,MAAM,YAAY,UACd,MAAM,QACP,SAAS,MAAM,EAAE,sBACS;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,KACjH;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CASpD,CAAC;AAEF,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"}
|
|
@@ -7,7 +7,7 @@ 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
|
-
import { registeredDistro } from "../wsl.js";
|
|
10
|
+
import { registeredDistro, WINDOWS_SIDE } from "../wsl.js";
|
|
11
11
|
import { crossEnv } from "./crossing.js";
|
|
12
12
|
const exec = promisify(execFile);
|
|
13
13
|
export const SUPERVISOR_ENV = "INTENTIC_MACHINE_SUPERVISOR";
|
|
@@ -28,6 +28,7 @@ export const updateMachineConfig = async (mutate) => {
|
|
|
28
28
|
return next;
|
|
29
29
|
};
|
|
30
30
|
export const childrenOf = (config) => config.children ?? [];
|
|
31
|
+
export const heldDistros = async () => (WINDOWS_SIDE ? childrenOf(await readMachineConfig()) : []);
|
|
31
32
|
export const withChild = (config, distro) => childrenOf(config).includes(distro) ? config : { ...config, children: [...childrenOf(config), distro].toSorted() };
|
|
32
33
|
export const withoutChild = (config, distro) => {
|
|
33
34
|
const children = childrenOf(config).filter((held) => held !== distro);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACzD,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,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/environments/machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACzD,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,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,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,WAAW,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIzC,MAAM,IAAI,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAGjC,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;AAWjI,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,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC5H,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,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACrG,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;AAGV,MAAM,CAAC,MAAM,YAAY,GAAG,CACxB,KAAa,EACb,IAAuB,EACvB,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,KAAK,EAAE,GAAqF,EAAE,EACjE,EAAE;IACtD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE;QACvC,GAAG,EAAE,UAAU,EAAE;QACjB,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC;QACxB,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;QACnC,WAAW,EAAE,IAAI;KACpB,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;AACzG,CAAC,CAAC;AAEF,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,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,GAAG,CAAC,mEAAmE,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,iBAAiB,gCAAgC,CAAC,CAAC;QAC5J,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC"}
|
package/dist/install.d.ts
CHANGED
package/dist/install.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAOjD,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,YAQ1C,CAAC;AAwBH,eAAO,MAAM,qBAAqB,WAAY,MAAM,UAAU,MAAM,KAAG,MAAM,GAAG,SAM/E,CAAC;AAqEF,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,CAS1D,CAAC"}
|
package/dist/install.js
CHANGED
|
@@ -4,14 +4,12 @@ import { mkdir, rename, rm, symlink } from "node:fs/promises";
|
|
|
4
4
|
import { homedir } from "node:os";
|
|
5
5
|
import { join } from "node:path";
|
|
6
6
|
import { errorMessage } from "@intentic/base/errors";
|
|
7
|
-
import { spawnDetached } from "@intentic/local-agent";
|
|
8
7
|
import { DEV_VERSION } from "@intentic/sandbox-contract";
|
|
9
|
-
import {
|
|
8
|
+
import { binDir } from "./config.js";
|
|
10
9
|
import { adoptRunningDistros } from "./environments/commands.js";
|
|
11
|
-
import {
|
|
10
|
+
import { launchUpgrade, UPGRADE_ENV, upgradeHereToMachine } from "./environments/machine-upgrade.js";
|
|
12
11
|
import { runningAsInstalledAgent } from "./installed.js";
|
|
13
|
-
import { agentPath, download, launcherAssetUrl, launcherPath
|
|
14
|
-
import { machineLauncher } from "./supervision.js";
|
|
12
|
+
import { agentPath, download, launcherAssetUrl, launcherPath } from "./release.js";
|
|
15
13
|
import { upgradeMessage } from "./upgrade.js";
|
|
16
14
|
import { MACHINE_VERSION } from "./version.js";
|
|
17
15
|
export const selfUpdateBeforeSetup = async (io, env, args, out) => {
|
|
@@ -27,15 +25,10 @@ export const selfUpdateBeforeSetup = async (io, env, args, out) => {
|
|
|
27
25
|
out(`note: couldn't update the agent first (${outcome.reason}) — continuing with ${io.installed}.`);
|
|
28
26
|
}
|
|
29
27
|
};
|
|
30
|
-
const machineUpgradeHere = async (out) => {
|
|
31
|
-
const [published, siblings] = await Promise.all([publishedVersion(), siblingVersions()]);
|
|
32
|
-
const target = machineTarget(published, [MACHINE_VERSION, ...siblings]);
|
|
33
|
-
return target === undefined ? { kind: "failed", reason: "couldn't reach the release channel" } : await upgradeHere(target, false, out);
|
|
34
|
-
};
|
|
35
28
|
export const realSelfUpdateIo = (out) => ({
|
|
36
29
|
installed: MACHINE_VERSION,
|
|
37
30
|
installedAgent: runningAsInstalledAgent,
|
|
38
|
-
upgrade: async () => await
|
|
31
|
+
upgrade: async () => await upgradeHereToMachine(out),
|
|
39
32
|
reexec: (args, version) => {
|
|
40
33
|
const child = spawnSync(agentPath, [...args], { stdio: "inherit", env: { ...process.env, [UPGRADE_ENV]: version }, windowsHide: true });
|
|
41
34
|
process.exit(child.status ?? 1);
|
|
@@ -108,7 +101,6 @@ const ensureWindowsLauncher = async (out) => {
|
|
|
108
101
|
try {
|
|
109
102
|
await rm(staged, { force: true });
|
|
110
103
|
await download(launcherAssetUrl(MACHINE_VERSION), staged);
|
|
111
|
-
await setAside(launcherPath, `${launcherPath}.old`);
|
|
112
104
|
await rename(staged, launcherPath);
|
|
113
105
|
}
|
|
114
106
|
catch (error) {
|
|
@@ -134,6 +126,6 @@ export const completeSetup = async (out) => {
|
|
|
134
126
|
return;
|
|
135
127
|
}
|
|
136
128
|
delete process.env[UPGRADE_ENV];
|
|
137
|
-
await
|
|
129
|
+
await launchUpgrade(true).catch((error) => out(`note: couldn't bring the rest of this PC to this release (${errorMessage(error)}); it catches up within the hour.`));
|
|
138
130
|
};
|
|
139
131
|
//# sourceMappingURL=install.js.map
|
package/dist/install.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
|
package/dist/release.d.ts
CHANGED
|
@@ -6,22 +6,13 @@ export declare const launcherPath: string;
|
|
|
6
6
|
export declare const agentAssetUrl: (version: string) => string;
|
|
7
7
|
export declare const launcherAssetUrl: (version: string) => string;
|
|
8
8
|
export declare const publishedVersion: () => Promise<string | undefined>;
|
|
9
|
-
export type Probe = {
|
|
10
|
-
readonly kind: "version";
|
|
11
|
-
readonly version: string;
|
|
12
|
-
} | {
|
|
13
|
-
readonly kind: "no-version-command";
|
|
14
|
-
} | {
|
|
15
|
-
readonly kind: "unusable";
|
|
16
|
-
};
|
|
17
|
-
export declare const probeVersion: (binary: string) => Probe;
|
|
18
9
|
export declare const versionOf: (binary: string) => string | undefined;
|
|
19
10
|
export interface DownloadOptions {
|
|
20
11
|
readonly resume?: boolean;
|
|
21
12
|
readonly onProgress?: (received: number, total: number) => void;
|
|
22
13
|
}
|
|
23
14
|
export declare const download: (url: string, dest: string, options?: DownloadOptions) => Promise<void>;
|
|
24
|
-
export declare const
|
|
15
|
+
export declare const renameIfPresent: (from: string, to: string) => Promise<void>;
|
|
25
16
|
export declare const isLeftover: (name: string) => boolean;
|
|
26
17
|
export declare const sweepBin: () => Promise<void>;
|
|
27
18
|
//# sourceMappingURL=release.d.ts.map
|
package/dist/release.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,GAAG,QAA6C,CAAC;AAE9D,eAAO,MAAM,OAAO,QAAO,OAAO,GAAG,QAAQ,GAAG,SAQ/C,CAAC;AAEF,eAAO,MAAM,SAAS,QAAO,OAAO,GAAG,OAQtC,CAAC;AAEF,eAAO,MAAM,SAAS,QAAyC,CAAC;AAChE,eAAO,MAAM,YAAY,QAAoC,CAAC;AAK9D,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,MAA+F,CAAC;AAChJ,eAAO,MAAM,gBAAgB,YAAa,MAAM,KAAG,MAAuF,CAAC;AAG3I,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAOnE,CAAC;
|
|
1
|
+
{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,GAAG,QAA6C,CAAC;AAE9D,eAAO,MAAM,OAAO,QAAO,OAAO,GAAG,QAAQ,GAAG,SAQ/C,CAAC;AAEF,eAAO,MAAM,SAAS,QAAO,OAAO,GAAG,OAQtC,CAAC;AAEF,eAAO,MAAM,SAAS,QAAyC,CAAC;AAChE,eAAO,MAAM,YAAY,QAAoC,CAAC;AAK9D,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,MAA+F,CAAC;AAChJ,eAAO,MAAM,gBAAgB,YAAa,MAAM,KAAG,MAAuF,CAAC;AAG3I,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAOnE,CAAC;AAMF,eAAO,MAAM,SAAS,WAAY,MAAM,KAAG,MAAM,GAAG,SAGnD,CAAC;AAGF,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CACnE;AA4DD,eAAO,MAAM,QAAQ,QAAe,MAAM,QAAQ,MAAM,YAAW,eAAe,KAAQ,OAAO,CAAC,IAAI,CASrG,CAAC;AAGF,eAAO,MAAM,eAAe,SAAgB,MAAM,MAAM,MAAM,KAAG,OAAO,CAAC,IAAI,CAM5E,CAAC;AAUF,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,OAAyD,CAAC;AAGpG,eAAO,MAAM,QAAQ,QAAa,OAAO,CAAC,IAAI,CAM7C,CAAC"}
|
package/dist/release.js
CHANGED
|
@@ -39,20 +39,9 @@ export const publishedVersion = async () => {
|
|
|
39
39
|
}
|
|
40
40
|
};
|
|
41
41
|
const PROBE_TIMEOUT_MS = 30_000;
|
|
42
|
-
export const probeVersion = (binary) => {
|
|
43
|
-
const result = spawnSync(binary, ["version"], { encoding: "utf8", timeout: PROBE_TIMEOUT_MS, windowsHide: true });
|
|
44
|
-
if (result.error !== undefined) {
|
|
45
|
-
return { kind: "unusable" };
|
|
46
|
-
}
|
|
47
|
-
const version = result.status === 0 ? /^\d+\.\d+\.\d+$/.exec(result.stdout.trim())?.[0] : undefined;
|
|
48
|
-
if (version !== undefined) {
|
|
49
|
-
return { kind: "version", version };
|
|
50
|
-
}
|
|
51
|
-
return { kind: result.status === 0 ? "unusable" : "no-version-command" };
|
|
52
|
-
};
|
|
53
42
|
export const versionOf = (binary) => {
|
|
54
|
-
const
|
|
55
|
-
return
|
|
43
|
+
const result = spawnSync(binary, ["version"], { encoding: "utf8", timeout: PROBE_TIMEOUT_MS, windowsHide: true });
|
|
44
|
+
return result.error === undefined && result.status === 0 ? /^\d+\.\d+\.\d+$/.exec(result.stdout.trim())?.[0] : undefined;
|
|
56
45
|
};
|
|
57
46
|
const fileSize = async (path) => {
|
|
58
47
|
try {
|
|
@@ -107,9 +96,8 @@ export const download = async (url, dest, options = {}) => {
|
|
|
107
96
|
const file = createWriteStream(dest, stream.appending ? { flags: "a" } : {});
|
|
108
97
|
await drainInto(file, stream.body, stream.appending ? have : 0, stream.total, options.onProgress);
|
|
109
98
|
};
|
|
110
|
-
export const
|
|
111
|
-
await
|
|
112
|
-
await rename(path, aside).catch((error) => {
|
|
99
|
+
export const renameIfPresent = async (from, to) => {
|
|
100
|
+
await rename(from, to).catch((error) => {
|
|
113
101
|
if (error.code !== "ENOENT") {
|
|
114
102
|
throw error;
|
|
115
103
|
}
|
package/dist/release.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAItD,MAAM,CAAC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9D,MAAM,CAAC,MAAM,OAAO,GAAG,GAAmC,EAAE;IACxD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,CAAC,QAAQ,0DAA0D,CAAC,CAAC;AACpI,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAsB,EAAE;IAC7C,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,0DAA0D,CAAC,CAAC;AACpH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,EAAE,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAE9D,MAAM,QAAQ,GAAG,+CAA+C,CAAC;AAGjE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,GAAG,QAAQ,cAAc,OAAO,qBAAqB,OAAO,EAAE,IAAI,SAAS,EAAE,GAAG,GAAG,EAAE,CAAC;AAChJ,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,GAAG,QAAQ,cAAc,OAAO,4BAA4B,SAAS,EAAE,MAAM,CAAC;AAG3I,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAiC,EAAE;IACpE,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,QAAQ,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChI,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"release.js","sourceRoot":"","sources":["../src/release.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,iBAAiB,EAAoB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAItD,MAAM,CAAC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAE9D,MAAM,CAAC,MAAM,OAAO,GAAG,GAAmC,EAAE;IACxD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChE,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,OAAO,CAAC,QAAQ,0DAA0D,CAAC,CAAC;AACpI,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAsB,EAAE;IAC7C,IAAI,OAAO,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,OAAO,CAAC,IAAI,0DAA0D,CAAC,CAAC;AACpH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,GAAG,EAAE,CAAC,CAAC;AAChE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAE9D,MAAM,QAAQ,GAAG,+CAA+C,CAAC;AAGjE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,GAAG,QAAQ,cAAc,OAAO,qBAAqB,OAAO,EAAE,IAAI,SAAS,EAAE,GAAG,GAAG,EAAE,CAAC;AAChJ,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAU,EAAE,CAAC,GAAG,QAAQ,cAAc,OAAO,4BAA4B,SAAS,EAAE,MAAM,CAAC;AAG3I,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAiC,EAAE;IACpE,IAAI,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,QAAQ,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChI,OAAO,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAGhC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,MAAc,EAAsB,EAAE;IAC5D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAClH,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7H,CAAC,CAAC;AAQF,MAAM,QAAQ,GAAG,KAAK,EAAE,IAAY,EAAmB,EAAE;IACrD,IAAI,CAAC;QACD,OAAO,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACnC,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,CAAC,CAAC;IACb,CAAC;AACL,CAAC,CAAC;AAGF,MAAM,YAAY,GAAG,KAAK,EACtB,GAAW,EACX,IAAY,EAC2G,EAAE;IACzH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,SAAS,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,oBAAoB,QAAQ,CAAC,MAAM,MAAM,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,KAAK,GAAG,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;AAC5G,CAAC,CAAC;AAGF,MAAM,SAAS,GAAG,KAAK,EACnB,IAAiB,EACjB,IAAgC,EAChC,IAAY,EACZ,KAAa,EACb,UAAyC,EAC5B,EAAE;IACf,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;IAChC,IAAI,QAAQ,GAAG,IAAI,CAAC;IACpB,IAAI,CAAC;QACD,SAAS,CAAC;YAEN,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAClC,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACb,MAAM;YACV,CAAC;YACD,QAAQ,IAAI,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;YACnC,UAAU,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;gBAE3B,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9B,CAAC;QACL,CAAC;QACD,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,KAAK,CAAC;IAChB,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAW,EAAE,IAAY,EAAE,OAAO,GAAoB,EAAE,EAAiB,EAAE;IACtG,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC7C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO;IACX,CAAC;IACD,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC7E,MAAM,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACtG,CAAC,CAAC;AAGF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAE,EAAU,EAAiB,EAAE;IAC7E,MAAM,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAA4B,EAAE,EAAE;QAC1D,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAGF,MAAM,QAAQ,GAAG;IACb,gDAAgD;IAChD,8CAA8C;IAC9C,0BAA0B;IAC1B,oBAAoB;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAGpG,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,IAAmB,EAAE;IAC9C,IAAI,CAAC,MAAM,aAAa,CAAC,eAAe,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QACvD,OAAO;IACX,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACpD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC1I,CAAC,CAAC"}
|
package/dist/resident.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resident.d.ts","sourceRoot":"","sources":["../src/resident.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwC,KAAK,GAAG,EAA+C,MAAM,uBAAuB,CAAC;AACpI,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,KAAK,QAAQ,EAA8E,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"resident.d.ts","sourceRoot":"","sources":["../src/resident.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwC,KAAK,GAAG,EAA+C,MAAM,uBAAuB,CAAC;AACpI,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAIrE,OAAO,EAAE,KAAK,QAAQ,EAA8E,MAAM,oBAAoB,CAAC;AAe/H,eAAO,MAAM,eAAe,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAgC,CAAC;AAGpG,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAkC,CAAC;AAGxG,eAAO,MAAM,cAAc,WAAY,MAAM,CAAC,OAAO,KAAG,MAAiD,CAAC;AAG1G,eAAO,MAAM,aAAa,KAAK,CAAC;AAqBhC,eAAO,MAAM,cAAc,QAAe,GAAG,KAAG,OAAO,CAAC,IAAI,CAM3D,CAAC;AA2BF,UAAU,UAAU;IAChB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CAC3B;AAMD,eAAO,MAAM,cAAc,gBACV,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,SAC7B,SAAS,QAAQ,EAAE,QACpB,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,OAC7B,GAAG,KACT,IAiBF,CAAC;AAmIF,eAAO,MAAM,aAAa,QAAe,GAAG,KAAG,OAAO,CAAC,IAAI,CAiB1D,CAAC"}
|
package/dist/resident.js
CHANGED
|
@@ -11,25 +11,22 @@ import { LINK_STAMP_MS, linkStatePath, readLinks, stampLinkStates } from "./devi
|
|
|
11
11
|
import { connect } from "./device/connection.js";
|
|
12
12
|
import { superviseChildren } from "./environments/children.js";
|
|
13
13
|
import { startAutoUpgrade } from "./environments/auto-upgrade.js";
|
|
14
|
-
import {
|
|
14
|
+
import { heldDistros, SUPERVISOR_ENV, supervisedByWindows, updateMachineConfig, withoutChild } from "./environments/machine.js";
|
|
15
15
|
import { UPGRADE_ENV } from "./environments/machine-upgrade.js";
|
|
16
16
|
import { sweepBin } from "./release.js";
|
|
17
17
|
import { assertSupervisor, machineLauncher, readResident, retireResident, startResident } from "./supervision.js";
|
|
18
18
|
import { mirrorHeartbeatPath, readState } from "./sync/config.js";
|
|
19
19
|
import { runMirrorWatch } from "./sync/mirror.js";
|
|
20
20
|
import { MACHINE_VERSION } from "./version.js";
|
|
21
|
+
import { WINDOWS_SIDE } from "./wsl.js";
|
|
21
22
|
export const readResidentPid = async () => (await readResident())?.pid;
|
|
22
23
|
export const readResidentBuild = async () => (await readResident())?.build;
|
|
23
24
|
export const signalExitCode = (signal) => 128 + (constants.signals[signal] ?? 15);
|
|
24
25
|
export const EXIT_REPLACED = 75;
|
|
25
26
|
const TICK_MS = LINK_STAMP_MS;
|
|
26
27
|
const readServed = async () => {
|
|
27
|
-
const [links, state,
|
|
28
|
-
|
|
29
|
-
readState(),
|
|
30
|
-
process.platform === "win32" ? readMachineConfig() : Promise.resolve({}),
|
|
31
|
-
]);
|
|
32
|
-
return { links, pairings: state.pairings.length, children: childrenOf(machine) };
|
|
28
|
+
const [links, state, children] = await Promise.all([readLinks(), readState(), heldDistros()]);
|
|
29
|
+
return { links, pairings: state.pairings.length, children };
|
|
33
30
|
};
|
|
34
31
|
const nothingToServe = (served) => served.links.length === 0 && served.pairings === 0 && served.children.length === 0;
|
|
35
32
|
export const ensureResident = async (log) => {
|
|
@@ -108,7 +105,7 @@ const startSyncIfDue = (sync, pairings, log) => {
|
|
|
108
105
|
};
|
|
109
106
|
const runtimeOf = (supervised, log) => {
|
|
110
107
|
const connections = new Map();
|
|
111
|
-
const children =
|
|
108
|
+
const children = WINDOWS_SIDE
|
|
112
109
|
? superviseChildren(log, async (distro) => void (await updateMachineConfig((config) => withoutChild(config, distro))))
|
|
113
110
|
: undefined;
|
|
114
111
|
const autoPrepare = supervised ? undefined : startAutoPrepare(log);
|
|
@@ -176,7 +173,7 @@ const begin = async (supervised, log) => {
|
|
|
176
173
|
const serving = (served) => [
|
|
177
174
|
plural(served.links.length, "linked sandbox"),
|
|
178
175
|
plural(served.pairings, "sync pairing"),
|
|
179
|
-
...(
|
|
176
|
+
...(WINDOWS_SIDE ? [plural(served.children.length, "WSL distro")] : []),
|
|
180
177
|
].join(", ");
|
|
181
178
|
export const runForeground = async (log) => {
|
|
182
179
|
const supervised = supervisedByWindows();
|
package/dist/resident.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resident.js","sourceRoot":"","sources":["../src/resident.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAA4B,cAAc,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpI,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAiB,aAAa,EAAoB,aAAa,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC/H,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAiB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,EAAoB,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resident.js","sourceRoot":"","sources":["../src/resident.ts"],"names":[],"mappings":"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"}
|
package/dist/status.js
CHANGED
|
@@ -4,7 +4,7 @@ import { agentBuildSkew, agentStalled } from "@intentic/sandbox-contract";
|
|
|
4
4
|
import { auditPath, readLinks, readLinkStates } from "./device/config.js";
|
|
5
5
|
import { PAUSE_HOTKEY, readPausedAt } from "./device/indicator.js";
|
|
6
6
|
import { runLogPath } from "./config.js";
|
|
7
|
-
import {
|
|
7
|
+
import { heldDistros } from "./environments/machine.js";
|
|
8
8
|
import { readResidentPid } from "./resident.js";
|
|
9
9
|
import { readResident } from "./supervision.js";
|
|
10
10
|
import { registeredDistro } from "./wsl.js";
|
|
@@ -242,8 +242,8 @@ export const status = buildCommand({
|
|
|
242
242
|
out("");
|
|
243
243
|
out(`intentic-machine v${report.version}`);
|
|
244
244
|
out(agentLine(report.sync.agent, Date.now()));
|
|
245
|
-
const [distro, held,
|
|
246
|
-
const where = machineLine(distro, held?.supervisor,
|
|
245
|
+
const [distro, held, children] = await Promise.all([registeredDistro(), readResident(), heldDistros().catch(() => [])]);
|
|
246
|
+
const where = machineLine(distro, held?.supervisor, children);
|
|
247
247
|
if (where !== undefined) {
|
|
248
248
|
out(where);
|
|
249
249
|
}
|