@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":"describe.js","sourceRoot":"","sources":["../../../src/device/tools/describe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"describe.js","sourceRoot":"","sources":["../../../src/device/tools/describe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/device/tools/device.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,OAAO,EAEZ,KAAK,WAAW,EAChB,KAAK,SAAS,EAKd,KAAK,QAAQ,EAEhB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAW,KAAK,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAS5E,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC;AAEpC,eAAO,MAAM,cAAc,8BAAgB,CAAC;AAW5C,eAAO,MAAM,gBAAgB,UAAW,MAAM,KAAG,IAShD,CAAC;AAKF,eAAO,MAAM,aAAa,SAAU,MAAM,UAAU,YAAY,KAAG,
|
|
1
|
+
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../src/device/tools/device.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,OAAO,EAEZ,KAAK,WAAW,EAChB,KAAK,SAAS,EAKd,KAAK,QAAQ,EAEhB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAW,KAAK,SAAS,EAAoB,MAAM,iBAAiB,CAAC;AAS5E,MAAM,MAAM,YAAY,GAAG,WAAW,CAAC;AACvC,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC;AAEpC,eAAO,MAAM,cAAc,8BAAgB,CAAC;AAW5C,eAAO,MAAM,gBAAgB,UAAW,MAAM,KAAG,IAShD,CAAC;AAKF,eAAO,MAAM,aAAa,SAAU,MAAM,UAAU,YAAY,KAAG,IAclE,CAAC;AAIF,eAAO,MAAM,GAAG,WACJ,OAAO,SACR,WAAW,UACV,YAAY,cACT,SAAS,aACV,QAAQ,KACnB,OAAO,CAAC,IAAI,CAcd,CAAC;AAIF,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { sleep } from "@intentic/base/async";
|
|
|
3
3
|
import { COMMAND_CLASS_LABELS } from "@intentic/sandbox-contract";
|
|
4
4
|
import { calling, machineIndicator } from "../indicator.js";
|
|
5
5
|
import { assertScope, ScopeError } from "../policy.js";
|
|
6
|
-
import { destructiveClasses } from "./shell.js";
|
|
6
|
+
import { assertNoSandboxPower, destructiveClasses } from "./shell.js";
|
|
7
7
|
export const describeAction = describeInput;
|
|
8
8
|
const LOCKOUT_CHORDS = [
|
|
9
9
|
{ modifiers: ["super"], key: /^l$/i, why: "locks the screen" },
|
|
@@ -20,6 +20,7 @@ export const assertNotLockout = (combo) => {
|
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
22
|
export const assertTypable = (text, scopes) => {
|
|
23
|
+
assertNoSandboxPower(text, scopes, "typed");
|
|
23
24
|
if (scopes.destructive === "on") {
|
|
24
25
|
return;
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/device/tools/device.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EACZ,aAAa,EAEb,eAAe,EAGf,YAAY,EACZ,WAAW,EACX,UAAU,EACV,OAAO,EAEP,SAAS,GACZ,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAqB,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,OAAO,EAAkB,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../../src/device/tools/device.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,13 @@ export declare const icCandidates: (platform: NodeJS.Platform, home: string | un
|
|
|
3
3
|
export declare const icAssetUrl: (version: string) => string;
|
|
4
4
|
export declare const icVersionFrom: (stdout: string) => string | undefined;
|
|
5
5
|
export declare const icNeedsFetch: (installed: string | undefined, agent: string) => boolean;
|
|
6
|
+
export interface InstalledIc {
|
|
7
|
+
readonly path: string;
|
|
8
|
+
readonly version: string;
|
|
9
|
+
readonly modified?: string;
|
|
10
|
+
}
|
|
11
|
+
export declare const installedIc: () => Promise<InstalledIc | undefined>;
|
|
12
|
+
export declare const icOverrides: (env: NodeJS.ProcessEnv) => string[];
|
|
6
13
|
export declare const icStaleNote: (installed: string | undefined, agent: string, reason: string) => string;
|
|
7
14
|
export interface IcFetchIo {
|
|
8
15
|
readonly download: (url: string, to: string) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ic-binary.d.ts","sourceRoot":"","sources":["../../../src/device/tools/ic-binary.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ic-binary.d.ts","sourceRoot":"","sources":["../../../src/device/tools/ic-binary.ts"],"names":[],"mappings":"AAEA,OAAO,EAMH,KAAK,aAAa,EAErB,MAAM,4BAA4B,CAAC;AAepC,eAAO,MAAM,YAAY,aAAc,MAAM,CAAC,QAAQ,QAAQ,MAAM,GAAG,SAAS,KAAG,MAAM,EAKxF,CAAC;AAMF,eAAO,MAAM,UAAU,YAAa,MAAM,KAAG,MACgE,CAAC;AAG9G,eAAO,MAAM,aAAa,WAAY,MAAM,KAAG,MAAM,GAAG,SAA+D,CAAC;AAIxH,eAAO,MAAM,YAAY,cAAe,MAAM,GAAG,SAAS,SAAS,MAAM,KAAG,OACO,CAAC;AAKpF,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,WAAW,GAAG,SAAS,CAiBnE,CAAC;AAMF,eAAO,MAAM,WAAW,QAAS,MAAM,CAAC,UAAU,KAAG,MAAM,EAIxC,CAAC;AAKpB,eAAO,MAAM,WAAW,cAAe,MAAM,GAAG,SAAS,SAAS,MAAM,UAAU,MAAM,KAAG,MACiN,CAAC;AAE7S,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACzC;AAMD,eAAO,MAAM,OAAO,WAAkB,MAAM,aAAa,MAAM,GAAG,SAAS,SAAS,MAAM,MAAM,SAAS,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAgBrI,CAAC;AAuBF,eAAO,MAAM,cAAc,cAAe,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,MAAM,OAAO,CAAC,OAAO,CAAC,KAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAmBpH,CAAC;AAMF,eAAO,MAAM,WAAW,QAAO,MAAM,GAAG,SAAsB,CAAC;AAqB/D,eAAO,MAAM,eAAe,QAAO,OAAO,CAAC,IAAI,CAAoB,CAAC;AAgCpE,eAAO,MAAM,YAAY,cAAe,MAAM,GAAG,SAAS,iBAAiB,MAAM,gBAAgB,MAAM,KAAG,aAAa,EAItH,CAAC;AAKF,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,aAAa,EAAE,CAe9D,CAAC"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { execFile } from "node:child_process";
|
|
2
1
|
import { chmod, rename, rm, stat } from "node:fs/promises";
|
|
3
2
|
import { homeDir } from "@intentic/local-agent";
|
|
4
|
-
import { promisify } from "node:util";
|
|
5
3
|
import { DEV_VERSION, DEVICE_FEATURE_RESHAPE_LATER, DEVICE_FEATURE_ROLLBACK_TO, DEVICE_FEATURE_SET_SHAPE, DEVICE_FEATURE_BACKGROUND_PREPARE, isNewer, } from "@intentic/sandbox-contract";
|
|
6
4
|
import { archToken, download, exe, osToken } from "../../release.js";
|
|
7
5
|
import { MACHINE_VERSION } from "../../version.js";
|
|
8
6
|
import { errorMessage } from "@intentic/base/errors";
|
|
9
|
-
|
|
7
|
+
import { execBounded } from "@intentic/base/process";
|
|
10
8
|
export const icCandidates = (platform, home) => {
|
|
11
9
|
if (platform === "win32") {
|
|
12
10
|
return [...(home === undefined ? [] : [`${home}\\.intentic\\ic\\bin\\ic.exe`]), "ic.exe"];
|
|
@@ -17,15 +15,25 @@ const userIcPath = () => icCandidates(process.platform, homeDir())[0];
|
|
|
17
15
|
export const icAssetUrl = (version) => `https://github.com/intentic/intentic/releases/download/v${version}/ic-${osToken()}-${archToken()}${exe}`;
|
|
18
16
|
export const icVersionFrom = (stdout) => /^ic (\d+\.\d+\.\d+)\s*$/.exec(stdout.trim())?.[1];
|
|
19
17
|
export const icNeedsFetch = (installed, agent) => agent !== DEV_VERSION && (installed === undefined || isNewer(agent, installed));
|
|
20
|
-
const
|
|
18
|
+
export const installedIc = async () => {
|
|
21
19
|
for (const candidate of icCandidates(process.platform, homeDir())) {
|
|
22
|
-
const answer = await
|
|
20
|
+
const answer = await execBounded(candidate, ["--version"], { timeoutMs: 30_000 }).catch(() => undefined);
|
|
23
21
|
if (answer !== undefined) {
|
|
24
|
-
|
|
22
|
+
const info = await stat(candidate).catch(() => undefined);
|
|
23
|
+
const found = { path: candidate, version: icVersionFrom(answer.stdout) ?? DEV_VERSION };
|
|
24
|
+
if (info !== undefined) {
|
|
25
|
+
found.modified = info.mtime.toISOString();
|
|
26
|
+
}
|
|
27
|
+
return found;
|
|
25
28
|
}
|
|
26
29
|
}
|
|
27
30
|
return undefined;
|
|
28
31
|
};
|
|
32
|
+
const installedVersion = async () => (await installedIc())?.version;
|
|
33
|
+
export const icOverrides = (env) => Object.entries(env)
|
|
34
|
+
.filter((entry) => /^(?:IC|INTENTIC)_/.test(entry[0]) && entry[1] !== undefined)
|
|
35
|
+
.map(([name, value]) => (/TOKEN|SECRET|KEY|PASSWORD|AUTH|COOKIE/i.test(name) ? `${name}=<${value.length} characters>` : `${name}=${value}`))
|
|
36
|
+
.toSorted();
|
|
29
37
|
export const icStaleNote = (installed, agent, reason) => `ic is out of date: ${installed === undefined ? "none is installed" : `the installed ic is ${installed}`}, this agent is ${agent}, and fetching ic ${agent} failed (${reason}). Sandbox logs and saving a shape for the next restart need the newer ic; it is fetched again on the next sandbox action.`;
|
|
30
38
|
export const fetchIc = async (target, installed, agent, io) => {
|
|
31
39
|
const part = `${target}.download`;
|
|
@@ -75,7 +83,7 @@ export const checkPerIcFile = (signature, check) => {
|
|
|
75
83
|
let staleNote;
|
|
76
84
|
export const icOutOfDate = () => staleNote;
|
|
77
85
|
const warn = (line) => {
|
|
78
|
-
process.stderr.write(`
|
|
86
|
+
process.stderr.write(`intentic: ${line}\n`);
|
|
79
87
|
};
|
|
80
88
|
const ensureForFile = checkPerIcFile(icSignature, async () => {
|
|
81
89
|
const target = userIcPath();
|
|
@@ -90,7 +98,7 @@ const ensureForFile = checkPerIcFile(icSignature, async () => {
|
|
|
90
98
|
export const ensureCurrentIc = () => ensureForFile();
|
|
91
99
|
const helpOf = async (verb) => {
|
|
92
100
|
for (const candidate of icCandidates(process.platform, homeDir())) {
|
|
93
|
-
const answer = await
|
|
101
|
+
const answer = await execBounded(candidate, [...verb, "--help"], { timeoutMs: 30_000 }).then(({ stdout }) => stdout, (error) => (error.code === "ENOENT" ? undefined : ""));
|
|
94
102
|
if (answer !== undefined) {
|
|
95
103
|
return answer === "" ? undefined : answer;
|
|
96
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ic-binary.js","sourceRoot":"","sources":["../../../src/device/tools/ic-binary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ic-binary.js","sourceRoot":"","sources":["../../../src/device/tools/ic-binary.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { DeviceScopes } from "@intentic/sandbox-contract";
|
|
2
|
+
export declare const LOG_TAIL_BYTES: number;
|
|
3
|
+
export declare const DEFAULT_LOG_LINES = 200;
|
|
4
|
+
export declare const MAX_LOG_LINES = 2000;
|
|
5
|
+
export type DeviceLogKind = "agent" | "agent-update" | "audit" | "ic";
|
|
6
|
+
export interface DeviceLog {
|
|
7
|
+
readonly name: string;
|
|
8
|
+
readonly path: string;
|
|
9
|
+
readonly kind: DeviceLogKind;
|
|
10
|
+
readonly size: number;
|
|
11
|
+
readonly mtimeMs: number;
|
|
12
|
+
}
|
|
13
|
+
export declare const icLogDir: (env?: NodeJS.ProcessEnv, home?: string) => string;
|
|
14
|
+
export declare const listDeviceLogs: (dirs?: {
|
|
15
|
+
readonly ic?: string;
|
|
16
|
+
readonly agent?: readonly {
|
|
17
|
+
path: string;
|
|
18
|
+
kind: DeviceLogKind;
|
|
19
|
+
}[];
|
|
20
|
+
}) => Promise<DeviceLog[]>;
|
|
21
|
+
export declare const listingText: (logs: readonly DeviceLog[], icDir: string) => string;
|
|
22
|
+
export interface LogFilter {
|
|
23
|
+
readonly lines: number;
|
|
24
|
+
readonly grep?: string | undefined;
|
|
25
|
+
readonly tool?: string | undefined;
|
|
26
|
+
readonly failedOnly?: boolean | undefined;
|
|
27
|
+
}
|
|
28
|
+
export declare const filterLines: (all: readonly string[], kind: DeviceLogKind, filter: LogFilter) => string[];
|
|
29
|
+
export declare const deviceLogs: (name: string | undefined, filter: LogFilter, scopes: DeviceScopes) => Promise<string>;
|
|
30
|
+
//# sourceMappingURL=logs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/logs/logs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAe/D,eAAO,MAAM,cAAc,QAAc,CAAC;AAC1C,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,aAAa,OAAQ,CAAC;AAInC,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,cAAc,GAAG,OAAO,GAAG,IAAI,CAAC;AAEtE,MAAM,WAAW,SAAS;IAEtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC5B;AAGD,eAAO,MAAM,QAAQ,SAAS,MAAM,CAAC,UAAU,SAAsB,MAAM,KAAe,MAGzF,CAAC;AAyBF,eAAO,MAAM,cAAc,UAAgB;IAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAE,EAAE,CAAA;CAAE,KAAQ,OAAO,CAAC,SAAS,EAAE,CAqBhK,CAAC;AAMF,eAAO,MAAM,WAAW,SAAU,SAAS,SAAS,EAAE,SAAS,MAAM,KAAG,MAiBvE,CAAC;AAuBF,MAAM,WAAW,SAAS;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7C;AAsBD,eAAO,MAAM,WAAW,QAAS,SAAS,MAAM,EAAE,QAAQ,aAAa,UAAU,SAAS,KAAG,MAAM,EAUlG,CAAC;AAkBF,eAAO,MAAM,UAAU,SAAgB,MAAM,GAAG,SAAS,UAAU,SAAS,UAAU,YAAY,KAAG,OAAO,CAAC,MAAM,CAkBlH,CAAC"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { open, readdir, stat } from "node:fs/promises";
|
|
2
|
+
import { basename, join } from "node:path";
|
|
3
|
+
import { STATE_DIR } from "@intentic/constants";
|
|
4
|
+
import { errorMessage } from "@intentic/base/errors";
|
|
5
|
+
import { homeDir } from "@intentic/local-agent";
|
|
6
|
+
import { z } from "zod";
|
|
7
|
+
import { agentLogPath, baseDir, runLogPath } from "../../../config.js";
|
|
8
|
+
import { auditPath } from "../../config.js";
|
|
9
|
+
import { assertScope } from "../../policy.js";
|
|
10
|
+
export const LOG_TAIL_BYTES = 1024 * 1024;
|
|
11
|
+
export const DEFAULT_LOG_LINES = 200;
|
|
12
|
+
export const MAX_LOG_LINES = 2_000;
|
|
13
|
+
const IC_LISTED = 40;
|
|
14
|
+
export const icLogDir = (env = process.env, home = homeDir()) => {
|
|
15
|
+
const set = env["INTENTIC_LOG_DIR"];
|
|
16
|
+
return set !== undefined && set !== "" ? set : join(home, STATE_DIR, "logs");
|
|
17
|
+
};
|
|
18
|
+
const KIND_PURPOSE = {
|
|
19
|
+
agent: "this agent's own log: links, keeper, upkeep, restarts, the watchdog",
|
|
20
|
+
"agent-update": "what an agent update or restart asked from a sandbox did",
|
|
21
|
+
audit: "every tool call agents made here, one JSON line each (filter with `tool` or `failedOnly`)",
|
|
22
|
+
ic: "one ic run (connect, recreate, update): docker builds and pulls end up here",
|
|
23
|
+
};
|
|
24
|
+
const agentFiles = () => [
|
|
25
|
+
{ path: runLogPath, kind: "agent" },
|
|
26
|
+
{ path: `${runLogPath}.1`, kind: "agent" },
|
|
27
|
+
{ path: agentLogPath, kind: "agent-update" },
|
|
28
|
+
{ path: auditPath, kind: "audit" },
|
|
29
|
+
{ path: `${auditPath}.1`, kind: "audit" },
|
|
30
|
+
];
|
|
31
|
+
const statOf = async (path) => {
|
|
32
|
+
const info = await stat(path).catch(() => undefined);
|
|
33
|
+
return info?.isFile() === true ? { size: info.size, mtimeMs: info.mtimeMs } : undefined;
|
|
34
|
+
};
|
|
35
|
+
export const listDeviceLogs = async (dirs = {}) => {
|
|
36
|
+
const own = await Promise.all((dirs.agent ?? agentFiles()).map(async ({ path, kind }) => {
|
|
37
|
+
const info = await statOf(path);
|
|
38
|
+
return info === undefined ? undefined : { name: basename(path), path, kind, ...info };
|
|
39
|
+
}));
|
|
40
|
+
const icDir = dirs.ic ?? icLogDir();
|
|
41
|
+
const names = await readdir(icDir).catch(() => []);
|
|
42
|
+
const ic = await Promise.all(names.map(async (file) => {
|
|
43
|
+
const path = join(icDir, file);
|
|
44
|
+
const info = await statOf(path);
|
|
45
|
+
return info === undefined ? undefined : { name: `ic/${file}`, path, kind: "ic", ...info };
|
|
46
|
+
}));
|
|
47
|
+
return [
|
|
48
|
+
...own.filter((log) => log !== undefined),
|
|
49
|
+
...ic.filter((log) => log !== undefined).toSorted((a, b) => b.mtimeMs - a.mtimeMs),
|
|
50
|
+
];
|
|
51
|
+
};
|
|
52
|
+
const sizeText = (bytes) => bytes >= 1024 * 1024 ? `${(bytes / 1024 / 1024).toFixed(1)} MB` : bytes >= 1024 ? `${Math.round(bytes / 1024)} KB` : `${bytes} B`;
|
|
53
|
+
export const listingText = (logs, icDir) => {
|
|
54
|
+
const ic = logs.filter((log) => log.kind === "ic");
|
|
55
|
+
const row = (log) => `${log.name} ${sizeText(log.size)} modified ${new Date(log.mtimeMs).toISOString()}`;
|
|
56
|
+
const own = logs.filter((log) => log.kind !== "ic");
|
|
57
|
+
const kinds = [...new Set(own.map((log) => log.kind))];
|
|
58
|
+
return [
|
|
59
|
+
`This agent's records (${baseDir}):`,
|
|
60
|
+
...(own.length === 0 ? [" (none yet)"] : own.map((log) => ` ${row(log)}`)),
|
|
61
|
+
...kinds.map((kind) => ` ${kind}: ${KIND_PURPOSE[kind]}`),
|
|
62
|
+
"",
|
|
63
|
+
`ic's logs (${icDir}), newest first:`,
|
|
64
|
+
...(ic.length === 0 ? [" (none)"] : ic.slice(0, IC_LISTED).map((log) => ` ${row(log)}`)),
|
|
65
|
+
...(ic.length > IC_LISTED ? [` …and ${ic.length - IC_LISTED} older`] : []),
|
|
66
|
+
` ic: ${KIND_PURPOSE.ic}`,
|
|
67
|
+
"",
|
|
68
|
+
"Read one with `name` (and `grep`, `lines`).",
|
|
69
|
+
].join("\n");
|
|
70
|
+
};
|
|
71
|
+
const tailOf = async (path) => {
|
|
72
|
+
const handle = await open(path, "r");
|
|
73
|
+
try {
|
|
74
|
+
const { size } = await handle.stat();
|
|
75
|
+
const from = Math.max(0, size - LOG_TAIL_BYTES);
|
|
76
|
+
const buffer = Buffer.alloc(size - from);
|
|
77
|
+
await handle.read(buffer, 0, buffer.byteLength, from);
|
|
78
|
+
const lines = buffer.toString("utf8").replace(/\r\n/g, "\n").split("\n");
|
|
79
|
+
if (from > 0) {
|
|
80
|
+
lines.shift();
|
|
81
|
+
}
|
|
82
|
+
if (lines.at(-1) === "") {
|
|
83
|
+
lines.pop();
|
|
84
|
+
}
|
|
85
|
+
return { lines, size, cut: from > 0 };
|
|
86
|
+
}
|
|
87
|
+
finally {
|
|
88
|
+
await handle.close();
|
|
89
|
+
}
|
|
90
|
+
};
|
|
91
|
+
const AuditLineSchema = z.object({ tool: z.string(), ok: z.boolean() }).loose();
|
|
92
|
+
const auditPasses = (line, { tool, failedOnly }) => {
|
|
93
|
+
if (tool === undefined && failedOnly !== true) {
|
|
94
|
+
return true;
|
|
95
|
+
}
|
|
96
|
+
let parsed;
|
|
97
|
+
try {
|
|
98
|
+
parsed = JSON.parse(line);
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
const entry = AuditLineSchema.safeParse(parsed);
|
|
104
|
+
return entry.success && (tool === undefined || entry.data.tool === tool) && (failedOnly !== true || !entry.data.ok);
|
|
105
|
+
};
|
|
106
|
+
export const filterLines = (all, kind, filter) => {
|
|
107
|
+
let pattern;
|
|
108
|
+
if (filter.grep !== undefined) {
|
|
109
|
+
try {
|
|
110
|
+
pattern = new RegExp(filter.grep, "i");
|
|
111
|
+
}
|
|
112
|
+
catch (error) {
|
|
113
|
+
throw new Error(`grep is not a usable pattern: ${errorMessage(error)}`, { cause: error });
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return all.filter((line) => (pattern === undefined || pattern.test(line)) && (kind !== "audit" || auditPasses(line, filter))).slice(-filter.lines);
|
|
117
|
+
};
|
|
118
|
+
const filterText = (filter) => [
|
|
119
|
+
...(filter.grep === undefined ? [] : [`matching /${filter.grep}/i`]),
|
|
120
|
+
...(filter.tool === undefined ? [] : [`tool ${filter.tool}`]),
|
|
121
|
+
...(filter.failedOnly === true ? ["failed or refused only"] : []),
|
|
122
|
+
].join(", ");
|
|
123
|
+
const assertReadable = (scopes) => {
|
|
124
|
+
if (scopes.shell !== "on") {
|
|
125
|
+
assertScope(scopes, "sandboxes");
|
|
126
|
+
}
|
|
127
|
+
};
|
|
128
|
+
export const deviceLogs = async (name, filter, scopes) => {
|
|
129
|
+
assertReadable(scopes);
|
|
130
|
+
const logs = await listDeviceLogs();
|
|
131
|
+
if (name === undefined) {
|
|
132
|
+
return listingText(logs, icLogDir());
|
|
133
|
+
}
|
|
134
|
+
if ((filter.tool !== undefined || filter.failedOnly === true) && !name.startsWith("audit.jsonl")) {
|
|
135
|
+
throw new Error("`tool` and `failedOnly` filter audit.jsonl's calls; for any other log use `grep`.");
|
|
136
|
+
}
|
|
137
|
+
const log = logs.find((candidate) => candidate.name === name);
|
|
138
|
+
if (log === undefined) {
|
|
139
|
+
throw new Error(`This device has no log called "${name}". Call device_logs with no name for the list.`);
|
|
140
|
+
}
|
|
141
|
+
const { lines, size, cut } = await tailOf(log.path);
|
|
142
|
+
const shown = filterLines(lines, log.kind, filter);
|
|
143
|
+
const how = filterText(filter);
|
|
144
|
+
const head = `${log.path}, ${sizeText(size)}${cut ? `, its last ${sizeText(LOG_TAIL_BYTES)} read` : ""}${how === "" ? "" : `, ${how}`}:`;
|
|
145
|
+
return shown.length === 0 ? `${head}\n(nothing${how === "" ? " in it yet" : " matches"})` : `${head}\n${shown.join("\n")}`;
|
|
146
|
+
};
|
|
147
|
+
//# sourceMappingURL=logs.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../../src/device/tools/logs/logs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAenG,eAAO,MAAM,QAAQ,QAAO,MAA+B,CAAC;AAI5D,eAAO,MAAM,cAAc,eAAgB,MAAM,KAAG,MASnD,CAAC;AAIF,eAAO,MAAM,MAAM,SAAU,MAAM,cAAc,MAAM,KAAG,OAAqD,CAAC;AA4FhH,eAAO,MAAM,aAAa,OAAc,aAAa,UAAU,YAAY,cAAc,MAAM,KAAG,OAAO,CAAC,mBAAmB,CA0C5H,CAAC;AAGF,eAAO,MAAM,aAAa,eAAsB,MAAM,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,IAAI,CAAA;CAAE,EAAE,CAa3H,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import { execFile } from "node:child_process";
|
|
2
1
|
import { createHash } from "node:crypto";
|
|
3
2
|
import { mkdir, open, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
|
|
4
|
-
import { join
|
|
5
|
-
import {
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { isInside } from "@intentic/base/contained";
|
|
6
5
|
import { errorMessage, undefinedIfMissing } from "@intentic/base/errors";
|
|
6
|
+
import { execBounded } from "@intentic/base/process";
|
|
7
7
|
import { baseDir } from "../../../config.js";
|
|
8
8
|
import { assertScope } from "../../policy.js";
|
|
9
|
-
const exec = promisify(execFile);
|
|
10
9
|
const COMPLETE = ".intentic-complete";
|
|
11
10
|
const STALE_UPLOAD_MS = 60 * 60 * 1000;
|
|
12
11
|
export const runsRoot = () => join(baseDir, "runs");
|
|
@@ -20,11 +19,7 @@ export const sandboxRunsDir = (sandboxUrl) => {
|
|
|
20
19
|
const safe = label.replace(/[^A-Za-z0-9-]/g, "-").slice(0, 63) || "sandbox";
|
|
21
20
|
return join(runsRoot(), safe);
|
|
22
21
|
};
|
|
23
|
-
export const inRuns = (path, sandboxUrl) =>
|
|
24
|
-
const root = resolve(sandboxRunsDir(sandboxUrl));
|
|
25
|
-
const target = resolve(path);
|
|
26
|
-
return target === root || target.startsWith(`${root}${sep}`);
|
|
27
|
-
};
|
|
22
|
+
export const inRuns = (path, sandboxUrl) => isInside(sandboxRunsDir(sandboxUrl), path);
|
|
28
23
|
const uploads = new Map();
|
|
29
24
|
const incomingDir = (sandboxUrl) => join(sandboxRunsDir(sandboxUrl), ".incoming");
|
|
30
25
|
const finalDir = (sandboxUrl, name, sha256) => join(sandboxRunsDir(sandboxUrl), name, sha256.slice(0, 12));
|
|
@@ -64,7 +59,7 @@ const uploadFor = async (sandboxUrl, id, offset) => {
|
|
|
64
59
|
const unpack = async (archive, into) => {
|
|
65
60
|
await mkdir(into, { recursive: true });
|
|
66
61
|
try {
|
|
67
|
-
await
|
|
62
|
+
await execBounded("tar", ["-xf", archive, "-C", into], { timeoutMs: 10 * 60_000, maxOutput: 4 * 1024 * 1024 });
|
|
68
63
|
}
|
|
69
64
|
catch (error) {
|
|
70
65
|
throw new Error(`could not unpack the pushed folder: ${errorMessage(error)}`, { cause: error });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/artifacts.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,4 @@ export declare const tunnelSocketUrl: (base: string) => string;
|
|
|
3
3
|
export declare const dialLoopback: (input: DialLoopback, scopes: DeviceScopes, base: string | undefined) => Promise<{
|
|
4
4
|
ok: true;
|
|
5
5
|
}>;
|
|
6
|
-
//# sourceMappingURL=tunnel.d.ts.map
|
|
6
|
+
//# sourceMappingURL=device-tunnel.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-tunnel.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/device-tunnel.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAc7E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAiF,CAAC;AA0BjI,eAAO,MAAM,YAAY,UAAiB,YAAY,UAAU,YAAY,QAAQ,MAAM,GAAG,SAAS,KAAG,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CA6C5H,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"device-tunnel.js","sourceRoot":"","sources":["../../../../src/device/tools/programs/device-tunnel.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ export declare const SANDBOX_LOG_DIR = "C:\\intentic-log";
|
|
|
3
3
|
export declare const SANDBOX_CLIENTS: readonly ["WindowsSandbox.exe", "WindowsSandboxClient.exe", "WindowsSandboxRemoteSession.exe"];
|
|
4
4
|
export declare const windowsSandboxExe: () => string;
|
|
5
5
|
export declare const windowsSandboxMissing: () => Promise<string | undefined>;
|
|
6
|
-
export declare const psQuote: (text: string) => string;
|
|
7
6
|
export interface IsolatedSpec {
|
|
8
7
|
readonly appFolder: string;
|
|
9
8
|
readonly program: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isolated.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"isolated.d.ts","sourceRoot":"","sources":["../../../../src/device/tools/programs/isolated.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,qBAAqB,CAAC;AAGlD,eAAO,MAAM,eAAe,YAAI,oBAAoB,EAAE,0BAA0B,EAAE,iCAAiC,CAAU,CAAC;AAE9H,eAAO,MAAM,iBAAiB,QAAO,MAA4F,CAAC;AAGlI,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAWxE,CAAC;AAIF,MAAM,WAAW,YAAY;IAEzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAE/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC7B;AAGD,eAAO,MAAM,SAAS,SAAU,YAAY,KAAG,MAyB7B,CAAC;AAKnB,eAAO,MAAM,WAAW,SAAU,YAAY,KAAG,MAiBhD,CAAC;AAGF,eAAO,MAAM,qBAAqB,QAAa,OAAO,CAAC,OAAO,CAO7D,CAAC;AAGF,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,IAAI,CAMvD,CAAC;AAGF,eAAO,MAAM,YAAY,SAAU,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAMhE,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { psText } from "@intentic/desktop-automation";
|
|
2
2
|
import { stat } from "node:fs/promises";
|
|
3
3
|
import { join } from "node:path";
|
|
4
|
-
import {
|
|
5
|
-
const exec = promisify(execFile);
|
|
4
|
+
import { execBounded } from "@intentic/base/process";
|
|
6
5
|
export const SANDBOX_APP_DIR = "C:\\app";
|
|
7
6
|
export const SANDBOX_LOG_DIR = "C:\\intentic-log";
|
|
8
7
|
export const SANDBOX_CLIENTS = ["WindowsSandbox.exe", "WindowsSandboxClient.exe", "WindowsSandboxRemoteSession.exe"];
|
|
@@ -17,7 +16,6 @@ export const windowsSandboxMissing = async () => {
|
|
|
17
16
|
: "Windows Sandbox is not turned on here. On Windows Pro, Enterprise or Education an administrator turns it on with `Enable-WindowsOptionalFeature -Online -FeatureName Containers-DisposableClientVM -All` and a restart (virtualization must be on in the firmware); Windows Home does not have it. Start it without `isolated` meanwhile.";
|
|
18
17
|
};
|
|
19
18
|
const xml = (text) => text.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">").replace(/"/g, """);
|
|
20
|
-
export const psQuote = (text) => `'${text.replace(/'/g, "''")}'`;
|
|
21
19
|
export const wsbConfig = (spec) => [
|
|
22
20
|
"<Configuration>",
|
|
23
21
|
` <Networking>${spec.network ? "Enable" : "Disable"}</Networking>`,
|
|
@@ -45,14 +43,14 @@ export const wsbConfig = (spec) => [
|
|
|
45
43
|
].join("\r\n");
|
|
46
44
|
export const startScript = (spec) => {
|
|
47
45
|
const program = `${SANDBOX_APP_DIR}\\${spec.program.replace(/\//g, "\\")}`;
|
|
48
|
-
const log = (name) =>
|
|
49
|
-
const args = spec.args.length === 0 ? "" : ` -ArgumentList @(${spec.args.map((arg) =>
|
|
46
|
+
const log = (name) => `'${SANDBOX_LOG_DIR}\\${name}'`;
|
|
47
|
+
const args = spec.args.length === 0 ? "" : ` -ArgumentList @(${spec.args.map((arg) => psText(arg.includes(" ") ? `"${arg}"` : arg)).join(", ")})`;
|
|
50
48
|
return [
|
|
51
49
|
"$ErrorActionPreference = 'Stop'",
|
|
52
|
-
...Object.entries(spec.env).map(([key, value]) => `[Environment]::SetEnvironmentVariable(${
|
|
50
|
+
...Object.entries(spec.env).map(([key, value]) => `[Environment]::SetEnvironmentVariable(${psText(key)}, ${psText(value)}, 'Process')`),
|
|
53
51
|
`Set-Content -Path ${log("started")} -Value (Get-Date -Format o)`,
|
|
54
52
|
"try {",
|
|
55
|
-
` $p = Start-Process -FilePath ${
|
|
53
|
+
` $p = Start-Process -FilePath ${psText(program)}${args} -WorkingDirectory '${SANDBOX_APP_DIR}' -RedirectStandardOutput ${log("output.log")} -RedirectStandardError ${log("error.log")} -PassThru -Wait`,
|
|
56
54
|
` Set-Content -Path ${log("exit-code")} -Value $p.ExitCode`,
|
|
57
55
|
"} catch {",
|
|
58
56
|
` Add-Content -Path ${log("error.log")} -Value $_.Exception.Message`,
|
|
@@ -65,13 +63,13 @@ export const windowsSandboxRunning = async () => {
|
|
|
65
63
|
if (process.platform !== "win32") {
|
|
66
64
|
return false;
|
|
67
65
|
}
|
|
68
|
-
const { stdout } = await
|
|
66
|
+
const { stdout } = await execBounded("tasklist", ["/FO", "CSV", "/NH"], { timeoutMs: 30_000, maxOutput: 8 * 1024 * 1024 });
|
|
69
67
|
const names = new Set(stdout.split(/\r?\n/).map((line) => line.split('","')[0]?.replace(/^"/, "").toLowerCase()));
|
|
70
68
|
return SANDBOX_CLIENTS.some((name) => names.has(name.toLowerCase()));
|
|
71
69
|
};
|
|
72
70
|
export const stopWindowsSandbox = async () => {
|
|
73
71
|
for (const name of SANDBOX_CLIENTS) {
|
|
74
|
-
await
|
|
72
|
+
await execBounded("taskkill", ["/IM", name, "/T", "/F"], { timeoutMs: 30_000 }).catch(() => undefined);
|
|
75
73
|
}
|
|
76
74
|
};
|
|
77
75
|
export const isolatedExit = (text) => {
|