@intentic/machine 1.347.0 → 1.348.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/keyring/commands.d.ts.map +1 -1
- package/dist/keyring/commands.js +4 -1
- package/dist/keyring/commands.js.map +1 -1
- package/dist/keyring/keyring-status.d.ts +2 -0
- package/dist/keyring/keyring-status.d.ts.map +1 -1
- package/dist/keyring/keyring-status.js +9 -2
- package/dist/keyring/keyring-status.js.map +1 -1
- package/dist/keyring/service.d.ts +5 -1
- package/dist/keyring/service.d.ts.map +1 -1
- package/dist/keyring/service.js +69 -13
- package/dist/keyring/service.js.map +1 -1
- package/package.json +9 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/keyring/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,SAAS,EAA+F,MAAM,mBAAmB,CAAC;AAC5J,OAAO,KAAK,EAAiB,IAAI,EAAM,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EAAoC,KAAK,cAAc,EAAgB,MAAM,eAAe,CAAC;AAyMpG,eAAO,MAAM,kBAAkB,+GAA+G,CAAC;AAM/I,eAAO,MAAM,SAAS,UAAW,SAAS,KAAG,IAW3C,CAAC;
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/keyring/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,SAAS,EAA+F,MAAM,mBAAmB,CAAC;AAC5J,OAAO,KAAK,EAAiB,IAAI,EAAM,MAAM,uBAAuB,CAAC;AAGrE,OAAO,EAAoC,KAAK,cAAc,EAAgB,MAAM,eAAe,CAAC;AAyMpG,eAAO,MAAM,kBAAkB,+GAA+G,CAAC;AAM/I,eAAO,MAAM,SAAS,UAAW,SAAS,KAAG,IAW3C,CAAC;AAgWH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;CAqB3B,CAAC"}
|
package/dist/keyring/commands.js
CHANGED
|
@@ -332,11 +332,14 @@ const syncStatus = buildCommand({
|
|
|
332
332
|
});
|
|
333
333
|
},
|
|
334
334
|
});
|
|
335
|
+
const stepLine = (cli) => (step) => {
|
|
336
|
+
cli.process.stderr.write(`intentic-step ${JSON.stringify({ step })}\n`);
|
|
337
|
+
};
|
|
335
338
|
const upgrade = buildCommand({
|
|
336
339
|
docs: { brief: "Move the keyring to this agent's release, once the running keyring has asked you" },
|
|
337
340
|
parameters: { flags: { json } },
|
|
338
341
|
async func(flags) {
|
|
339
|
-
await keyringAnswer(this, flags.json, { doing: `Updating the keyring to ${MACHINE_VERSION}`, failed: "The keyring was not updated." }, async (ui) => await upgradeKeyring(MACHINE_VERSION, ui.note), (result, ui) => ui.done(result.upgraded ? `Updated the keyring from ${result.from} to ${result.to}.` : `The keyring is already on ${result.to}. Nothing to do.`));
|
|
342
|
+
await keyringAnswer(this, flags.json, { doing: `Updating the keyring to ${MACHINE_VERSION}`, failed: "The keyring was not updated." }, async (ui) => await upgradeKeyring(MACHINE_VERSION, ui.note, flags.json ? stepLine(this) : undefined), (result, ui) => ui.done(result.upgraded ? `Updated the keyring from ${result.from} to ${result.to}.` : `The keyring is already on ${result.to}. Nothing to do.`));
|
|
340
343
|
},
|
|
341
344
|
});
|
|
342
345
|
const uninstall = buildCommand({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/keyring/commands.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/keyring/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export interface KeyringSummary {
|
|
|
5
5
|
readonly running: boolean;
|
|
6
6
|
readonly setUp: boolean;
|
|
7
7
|
readonly state?: KeyringState;
|
|
8
|
+
readonly serviceDown?: true;
|
|
8
9
|
}
|
|
9
10
|
export declare const readKeyringSummary: () => Promise<KeyringSummary>;
|
|
10
11
|
export interface AskpassAnswer {
|
|
@@ -34,6 +35,7 @@ export interface KeyringStatusLine {
|
|
|
34
35
|
readonly locked?: boolean;
|
|
35
36
|
readonly unlockedUntil?: number;
|
|
36
37
|
readonly version?: string;
|
|
38
|
+
readonly serviceDown?: true;
|
|
37
39
|
}
|
|
38
40
|
export declare const keyringStatusLine: (summary: KeyringSummary) => KeyringStatusLine;
|
|
39
41
|
//# sourceMappingURL=keyring-status.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring-status.d.ts","sourceRoot":"","sources":["../../src/keyring/keyring-status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAQ/E,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring-status.d.ts","sourceRoot":"","sources":["../../src/keyring/keyring-status.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAQ/E,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,CAAC;IAG9B,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;CAC/B;AAED,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,cAAc,CAQjE,CAAC;AAGF,MAAM,WAAW,aAAa;IAC1B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,aAAa,CAG/D,CAAC;AAGF,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;CACrD;AAoBD,eAAO,MAAM,SAAS,aAAc,MAAM,CAAC,QAAQ,QAAO,MAAM,CAAC,UAAU,WAAwB,MAAM,OAAO,KAA6C,IAAI,CAAC,cAAc,EAAE,OAAO,CAiBxL,CAAC;AAUF,MAAM,WAAW,mBAAoB,SAAQ,cAAc;IACvD,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;CACpC;AAED,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,mBAAmB,CAGrE,CAAC;AAGF,eAAO,MAAM,KAAK,OAAQ,MAAM,KAAG,MAAsC,CAAC;AAG1E,eAAO,MAAM,WAAW,SAAU,iBAAiB,KAAG,IAerD,CAAC;AAGF,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC;CAC/B;AAED,eAAO,MAAM,iBAAiB,YAAa,cAAc,KAAG,iBAQ3D,CAAC"}
|
|
@@ -3,11 +3,14 @@ import { delimiter, join } from "node:path";
|
|
|
3
3
|
import { helloHere, KeyringUnavailable, NOT_ON_MAC, realRunner } from "@intentic/keyring";
|
|
4
4
|
import { localZone, wallClockIn } from "@intentic/sandbox-contract/time/zone";
|
|
5
5
|
import { askpassStatus } from "./askpass.js";
|
|
6
|
-
import { keyringInstalled, keyringState } from "./service.js";
|
|
6
|
+
import { keyringInstalled, keyringState, serviceDown, serviceHere } from "./service.js";
|
|
7
7
|
export const readKeyringSummary = async () => {
|
|
8
8
|
const state = await keyringState();
|
|
9
9
|
const running = !(state instanceof KeyringUnavailable);
|
|
10
10
|
const summary = { installed: keyringInstalled(), running, setUp: running && state.ok && state.setUp };
|
|
11
|
+
if (serviceDown(state) && (await serviceHere())) {
|
|
12
|
+
return { ...summary, serviceDown: true };
|
|
13
|
+
}
|
|
11
14
|
return running && state.ok ? { ...summary, state: state.state } : summary;
|
|
12
15
|
};
|
|
13
16
|
export const readAskpassAnswer = async () => {
|
|
@@ -59,6 +62,9 @@ export const keyringLine = (line) => {
|
|
|
59
62
|
if (!line.running) {
|
|
60
63
|
return { tone: "fail", name: "keyring", meta: "installed, not running (`intentic-machine keyring setup` starts it)" };
|
|
61
64
|
}
|
|
65
|
+
if (line.serviceDown === true) {
|
|
66
|
+
return { tone: "fail", name: "keyring", meta: "its service does not answer (`intentic-machine keyring upgrade` repairs it)" };
|
|
67
|
+
}
|
|
62
68
|
if (!line.setUp) {
|
|
63
69
|
return { tone: "warn", name: "keyring", meta: "running, not set up (`intentic-machine keyring setup`)" };
|
|
64
70
|
}
|
|
@@ -66,7 +72,8 @@ export const keyringLine = (line) => {
|
|
|
66
72
|
return { tone: "ok", name: "keyring", meta: `running${line.version === undefined ? "" : ` ${line.version}`} · ${lockWords}` };
|
|
67
73
|
};
|
|
68
74
|
export const keyringStatusLine = (summary) => {
|
|
69
|
-
const
|
|
75
|
+
const base = { installed: summary.installed, running: summary.running, setUp: summary.setUp };
|
|
76
|
+
const line = summary.serviceDown === true ? { ...base, serviceDown: true } : base;
|
|
70
77
|
if (summary.state === undefined) {
|
|
71
78
|
return line;
|
|
72
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyring-status.js","sourceRoot":"","sources":["../../src/keyring/keyring-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG1F,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"keyring-status.js","sourceRoot":"","sources":["../../src/keyring/keyring-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { type KeyringResponse, KeyringUnavailable } from "@intentic/keyring";
|
|
2
2
|
import { type AutostartKind, type Log } from "@intentic/local-agent";
|
|
3
3
|
import type { KeyringRefusalCode } from "@intentic/sandbox-contract/schemas/keyring";
|
|
4
|
+
export type KeyringStep = "download" | "consent" | "install" | "start";
|
|
5
|
+
export type StepReport = (step: KeyringStep) => void;
|
|
4
6
|
export declare const keyringInstalled: () => boolean;
|
|
5
7
|
export type KeyringStateAnswer = KeyringResponse<"state">;
|
|
6
8
|
export declare const keyringState: (timeoutMs?: number) => Promise<KeyringStateAnswer | KeyringUnavailable>;
|
|
@@ -19,6 +21,8 @@ export declare const startKeyring: (log: Log) => Promise<{
|
|
|
19
21
|
readonly autostart: AutostartKind;
|
|
20
22
|
readonly state: KeyringStateAnswer;
|
|
21
23
|
}>;
|
|
24
|
+
export declare const serviceDown: (state: KeyringStateAnswer | KeyringUnavailable) => boolean;
|
|
25
|
+
export declare const awaitService: (first: KeyringStateAnswer) => Promise<KeyringStateAnswer | undefined>;
|
|
22
26
|
export declare const stopKeyring: () => Promise<number | undefined>;
|
|
23
27
|
export interface KeyringInstalled {
|
|
24
28
|
readonly path: string;
|
|
@@ -36,7 +40,7 @@ export type KeyringUpgrade = {
|
|
|
36
40
|
readonly code: KeyringRefusalCode;
|
|
37
41
|
readonly refusal: string;
|
|
38
42
|
};
|
|
39
|
-
export declare const upgradeKeyring: (version: string, log: Log) => Promise<KeyringUpgrade>;
|
|
43
|
+
export declare const upgradeKeyring: (version: string, log: Log, step?: StepReport) => Promise<KeyringUpgrade>;
|
|
40
44
|
export declare const ensureService: (log: Log) => Promise<{
|
|
41
45
|
readonly autostart: AutostartKind;
|
|
42
46
|
readonly state: KeyringStateAnswer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":"AAQA,OAAO,EAA4B,KAAK,eAAe,EAAE,kBAAkB,EAAoC,MAAM,mBAAmB,CAAC;AACzI,OAAO,EAAE,KAAK,aAAa,EAAiD,KAAK,GAAG,EAA8B,MAAM,uBAAuB,CAAC;AAEhJ,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":"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"}
|
package/dist/keyring/service.js
CHANGED
|
@@ -20,6 +20,8 @@ const START_TIMEOUT_MS = 20_000;
|
|
|
20
20
|
const START_POLL_MS = 300;
|
|
21
21
|
const STOP_TIMEOUT_MS = 5_000;
|
|
22
22
|
const ELEVATED_TIMEOUT_MS = 10 * 60_000;
|
|
23
|
+
const SERVICE_TIMEOUT_MS = 30_000;
|
|
24
|
+
const noSteps = () => undefined;
|
|
23
25
|
export const keyringInstalled = () => existsSync(keyringPath);
|
|
24
26
|
export const keyringState = async (timeoutMs = STATE_TIMEOUT_MS) => {
|
|
25
27
|
try {
|
|
@@ -105,7 +107,17 @@ export const serviceHere = async () => await serviceInstalledHere(realRunner);
|
|
|
105
107
|
const psQuoted = (text) => `'${text.replaceAll("'", "''")}'`;
|
|
106
108
|
export const NEEDS_ADMIN = "Passwords needs an administrator's approval once, to install its protected service. Nothing was changed.";
|
|
107
109
|
export const elevatedCommand = (args, platform = process.platform) => platform === "win32"
|
|
108
|
-
? {
|
|
110
|
+
? {
|
|
111
|
+
command: "powershell.exe",
|
|
112
|
+
args: [
|
|
113
|
+
"-NoProfile",
|
|
114
|
+
"-NonInteractive",
|
|
115
|
+
"-WindowStyle",
|
|
116
|
+
"Hidden",
|
|
117
|
+
"-Command",
|
|
118
|
+
`$p = Start-Process -FilePath ${psQuoted(keyringPath)} -ArgumentList ${args.map(psQuoted).join(",")} -Verb RunAs -WindowStyle Hidden -Wait -PassThru; exit $p.ExitCode`,
|
|
119
|
+
],
|
|
120
|
+
}
|
|
109
121
|
: { command: "pkexec", args: [keyringPath, ...args] };
|
|
110
122
|
export const approvalRefused = (exitCode, said, platform = process.platform) => platform === "win32" ? /canceled by the user/iu.test(said) : exitCode === 126 || exitCode === 127;
|
|
111
123
|
const runElevated = async (args) => {
|
|
@@ -146,6 +158,20 @@ export const startKeyring = async (log) => {
|
|
|
146
158
|
}
|
|
147
159
|
return { autostart: kind, state: came };
|
|
148
160
|
};
|
|
161
|
+
export const serviceDown = (state) => !(state instanceof KeyringUnavailable) && !state.ok && state.code === "no-keyring";
|
|
162
|
+
export const awaitService = async (first) => {
|
|
163
|
+
if (!serviceDown(first)) {
|
|
164
|
+
return first;
|
|
165
|
+
}
|
|
166
|
+
let answer;
|
|
167
|
+
await pollUntil(async () => {
|
|
168
|
+
const state = await keyringState();
|
|
169
|
+
answer = state instanceof KeyringUnavailable || serviceDown(state) ? undefined : state;
|
|
170
|
+
return answer !== undefined;
|
|
171
|
+
}, { intervalMs: START_POLL_MS, timeoutMs: SERVICE_TIMEOUT_MS });
|
|
172
|
+
return answer;
|
|
173
|
+
};
|
|
174
|
+
const SERVICE_SILENT = `Passwords' service was started but does not answer, so nothing can reach your passwords yet. Restarting the computer starts it again; updating Passwords repairs it.`;
|
|
149
175
|
export const stopKeyring = async () => {
|
|
150
176
|
const pid = await keyringPid();
|
|
151
177
|
if (pid !== undefined) {
|
|
@@ -162,7 +188,7 @@ export const installKeyring = async (version, log) => {
|
|
|
162
188
|
return { path: keyringPath, fresh: true, askpass: await linkAskpass() };
|
|
163
189
|
};
|
|
164
190
|
const previousOf = (path) => `${path}.previous`;
|
|
165
|
-
export const upgradeKeyring = async (version, log) => {
|
|
191
|
+
export const upgradeKeyring = async (version, log, step = noSteps) => {
|
|
166
192
|
if (!keyringInstalled()) {
|
|
167
193
|
throw new KeyringCliError("no-keyring", "No keyring is installed on this computer: `intentic-machine keyring setup` installs one.");
|
|
168
194
|
}
|
|
@@ -170,17 +196,26 @@ export const upgradeKeyring = async (version, log) => {
|
|
|
170
196
|
if (before instanceof KeyringUnavailable) {
|
|
171
197
|
throw new KeyringCliError("no-keyring", "The keyring is not running, and only a running keyring can ask you about an upgrade: `intentic-machine keyring setup` starts it.");
|
|
172
198
|
}
|
|
199
|
+
const repairing = serviceDown(before) && (await serviceHere());
|
|
173
200
|
const from = before.ok ? before.state.version : "unknown";
|
|
174
|
-
if (from === version && version !== DEV_VERSION) {
|
|
201
|
+
if (from === version && version !== DEV_VERSION && !repairing) {
|
|
175
202
|
return { ok: true, upgraded: false, from, to: version };
|
|
176
203
|
}
|
|
204
|
+
step("download");
|
|
177
205
|
const staged = await stageKeyring(version, log);
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
206
|
+
step("consent");
|
|
207
|
+
if (repairing) {
|
|
208
|
+
log("Passwords' service does not answer, so the administrator's yes stands for the keyring's own.");
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
log("Asking the keyring, which asks you, before anything is replaced…");
|
|
212
|
+
const consent = await askKeyring({ address: keyringPaths().address }, { op: "consent-upgrade", version });
|
|
213
|
+
if (!consent.ok) {
|
|
214
|
+
await rm(staged, { force: true }).catch(() => undefined);
|
|
215
|
+
return consent;
|
|
216
|
+
}
|
|
183
217
|
}
|
|
218
|
+
step("install");
|
|
184
219
|
await stopKeyring();
|
|
185
220
|
await rm(previousOf(keyringPath), { force: true });
|
|
186
221
|
await renameIfPresent(keyringPath, previousOf(keyringPath));
|
|
@@ -188,10 +223,10 @@ export const upgradeKeyring = async (version, log) => {
|
|
|
188
223
|
await linkAskpass();
|
|
189
224
|
log((await serviceHere()) ? "Asking for an administrator's yes to put the new keyring in place for Passwords' service…" : "Asking for an administrator's yes, once, to move Passwords under its protected service…");
|
|
190
225
|
await runElevated(["service", "install"]);
|
|
226
|
+
step("start");
|
|
227
|
+
let started;
|
|
191
228
|
try {
|
|
192
|
-
|
|
193
|
-
const to = state.ok ? state.state.version : version;
|
|
194
|
-
return { ok: true, upgraded: true, from, to };
|
|
229
|
+
started = (await startKeyring(log)).state;
|
|
195
230
|
}
|
|
196
231
|
catch (error) {
|
|
197
232
|
log(`The new keyring did not answer (${errorMessage(error)}): putting the one before it back.`);
|
|
@@ -201,18 +236,39 @@ export const upgradeKeyring = async (version, log) => {
|
|
|
201
236
|
await startKeyring(log);
|
|
202
237
|
throw new KeyringCliError("failed", `The keyring ${version} did not start, so ${from} was put back and is running again.`, { cause: error });
|
|
203
238
|
}
|
|
239
|
+
const state = await awaitService(started);
|
|
240
|
+
if (state === undefined) {
|
|
241
|
+
throw new KeyringCliError("no-keyring", SERVICE_SILENT);
|
|
242
|
+
}
|
|
243
|
+
return { ok: true, upgraded: true, from, to: state.ok ? state.state.version : version };
|
|
204
244
|
};
|
|
205
245
|
export const ensureService = async (log) => {
|
|
206
246
|
if (!keyringInstalled()) {
|
|
207
247
|
throw new KeyringCliError("no-keyring", "No keyring is installed on this computer: `intentic-machine keyring setup` installs one.");
|
|
208
248
|
}
|
|
209
249
|
if (await serviceHere()) {
|
|
210
|
-
|
|
250
|
+
const running = await startKeyring(log);
|
|
251
|
+
const state = await awaitService(running.state);
|
|
252
|
+
if (state !== undefined) {
|
|
253
|
+
return { ...running, state, installedNow: false };
|
|
254
|
+
}
|
|
255
|
+
log("Passwords' service does not answer: asking for an administrator's yes to repair it…");
|
|
256
|
+
await runElevated(["service", "install"]);
|
|
257
|
+
const repaired = await awaitService((await startKeyring(log)).state);
|
|
258
|
+
if (repaired === undefined) {
|
|
259
|
+
throw new KeyringCliError("no-keyring", SERVICE_SILENT);
|
|
260
|
+
}
|
|
261
|
+
return { ...running, state: repaired, installedNow: false };
|
|
211
262
|
}
|
|
212
263
|
await stopKeyring();
|
|
213
264
|
log("Asking for an administrator's yes, once, to install Passwords' protected service…");
|
|
214
265
|
await runElevated(["service", "install"]);
|
|
215
|
-
|
|
266
|
+
const running = await startKeyring(log);
|
|
267
|
+
const state = await awaitService(running.state);
|
|
268
|
+
if (state === undefined) {
|
|
269
|
+
throw new KeyringCliError("no-keyring", SERVICE_SILENT);
|
|
270
|
+
}
|
|
271
|
+
return { ...running, state, installedNow: true };
|
|
216
272
|
};
|
|
217
273
|
export const uninstallKeyring = async (log) => {
|
|
218
274
|
const service = await serviceHere();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/keyring/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intentic/machine",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.348.0",
|
|
4
4
|
"description": "The one agent that lives on a user's own device: lets an intentic sandbox work on it (outbound WebSocket, MCP tools, scopes enforced here) and keeps folders and ports mirrored with it (Mutagen over tunnel SSH, or through Docker for a project on this machine)",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"intentic-machine": "./dist/cli.js"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@intentic/base": "1.
|
|
24
|
-
"@intentic/browser": "1.
|
|
25
|
-
"@intentic/constants": "1.
|
|
26
|
-
"@intentic/desktop-automation": "1.
|
|
27
|
-
"@intentic/keyring": "1.
|
|
28
|
-
"@intentic/local-agent": "1.
|
|
29
|
-
"@intentic/sandbox-contract": "1.
|
|
30
|
-
"@intentic/sandbox-run": "1.
|
|
23
|
+
"@intentic/base": "1.348.0",
|
|
24
|
+
"@intentic/browser": "1.348.0",
|
|
25
|
+
"@intentic/constants": "1.348.0",
|
|
26
|
+
"@intentic/desktop-automation": "1.348.0",
|
|
27
|
+
"@intentic/keyring": "1.348.0",
|
|
28
|
+
"@intentic/local-agent": "1.348.0",
|
|
29
|
+
"@intentic/sandbox-contract": "1.348.0",
|
|
30
|
+
"@intentic/sandbox-run": "1.348.0",
|
|
31
31
|
"@orpc/server": "1.15.4",
|
|
32
32
|
"@stricli/core": "1.3.0",
|
|
33
33
|
"tslib": "2.8.1",
|