@cotal-ai/workspace 0.100.2 → 0.101.1
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/build/Release/darwin-arm64/build.json +21 -0
- package/build/Release/darwin-arm64/process.node +0 -0
- package/build/Release/darwin-x64/build.json +21 -0
- package/build/Release/darwin-x64/process.node +0 -0
- package/build/Release/win32-arm64/build.json +7 -5
- package/build/Release/win32-arm64/creation.node +0 -0
- package/build/Release/win32-x64/build.json +7 -5
- package/build/Release/win32-x64/creation.node +0 -0
- package/dist/agent-grants.d.ts +21 -0
- package/dist/agent-grants.d.ts.map +1 -0
- package/dist/agent-grants.js +21 -0
- package/dist/agent-grants.js.map +1 -0
- package/dist/auth-paths.d.ts +34 -0
- package/dist/auth-paths.d.ts.map +1 -1
- package/dist/auth-paths.js +99 -3
- package/dist/auth-paths.js.map +1 -1
- package/dist/broker-display.d.ts +12 -0
- package/dist/broker-display.d.ts.map +1 -1
- package/dist/broker-display.js +14 -0
- package/dist/broker-display.js.map +1 -1
- package/dist/connect.d.ts +21 -7
- package/dist/connect.d.ts.map +1 -1
- package/dist/connect.js +152 -22
- package/dist/connect.js.map +1 -1
- package/dist/control-target.d.ts.map +1 -1
- package/dist/control-target.js +12 -10
- package/dist/control-target.js.map +1 -1
- package/dist/cotal-config.d.ts +7 -0
- package/dist/cotal-config.d.ts.map +1 -1
- package/dist/cotal-config.js +29 -2
- package/dist/cotal-config.js.map +1 -1
- package/dist/cotal-home.d.ts +23 -0
- package/dist/cotal-home.d.ts.map +1 -0
- package/dist/cotal-home.js +36 -0
- package/dist/cotal-home.js.map +1 -0
- package/dist/credential-actions.d.ts +17 -3
- package/dist/credential-actions.d.ts.map +1 -1
- package/dist/credential-actions.js +62 -10
- package/dist/credential-actions.js.map +1 -1
- package/dist/darwin-process.d.ts +20 -0
- package/dist/darwin-process.d.ts.map +1 -0
- package/dist/darwin-process.js +24 -0
- package/dist/darwin-process.js.map +1 -0
- package/dist/deprecated-daemon-entries.d.ts +3 -0
- package/dist/deprecated-daemon-entries.d.ts.map +1 -1
- package/dist/deprecated-daemon-entries.js +6 -1
- package/dist/deprecated-daemon-entries.js.map +1 -1
- package/dist/extensions.d.ts +4 -2
- package/dist/extensions.d.ts.map +1 -1
- package/dist/extensions.js +7 -2
- package/dist/extensions.js.map +1 -1
- package/dist/flags.d.ts +2 -0
- package/dist/flags.d.ts.map +1 -1
- package/dist/flags.js +1 -1
- package/dist/flags.js.map +1 -1
- package/dist/index.d.ts +9 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/join-target.d.ts +3 -1
- package/dist/join-target.d.ts.map +1 -1
- package/dist/join-target.js +15 -3
- package/dist/join-target.js.map +1 -1
- package/dist/maintenance.d.ts +61 -2
- package/dist/maintenance.d.ts.map +1 -1
- package/dist/maintenance.js +153 -14
- package/dist/maintenance.js.map +1 -1
- package/dist/manager-name.d.ts +15 -0
- package/dist/manager-name.d.ts.map +1 -0
- package/dist/manager-name.js +54 -0
- package/dist/manager-name.js.map +1 -0
- package/dist/mesh-registry.d.ts +39 -35
- package/dist/mesh-registry.d.ts.map +1 -1
- package/dist/mesh-registry.js +57 -36
- package/dist/mesh-registry.js.map +1 -1
- package/dist/mesh-target.d.ts +120 -3
- package/dist/mesh-target.d.ts.map +1 -1
- package/dist/mesh-target.js +319 -48
- package/dist/mesh-target.js.map +1 -1
- package/dist/official-connectors.d.ts +3 -0
- package/dist/official-connectors.d.ts.map +1 -1
- package/dist/official-connectors.js +5 -0
- package/dist/official-connectors.js.map +1 -1
- package/dist/output.d.ts +34 -6
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +38 -5
- package/dist/output.js.map +1 -1
- package/dist/pid.d.ts +42 -7
- package/dist/pid.d.ts.map +1 -1
- package/dist/pid.js +196 -27
- package/dist/pid.js.map +1 -1
- package/dist/preferences.d.ts +25 -3
- package/dist/preferences.d.ts.map +1 -1
- package/dist/preferences.js +77 -14
- package/dist/preferences.js.map +1 -1
- package/dist/preflight.d.ts +17 -5
- package/dist/preflight.d.ts.map +1 -1
- package/dist/preflight.js +22 -32
- package/dist/preflight.js.map +1 -1
- package/dist/prepared-spaces.d.ts +20 -2
- package/dist/prepared-spaces.d.ts.map +1 -1
- package/dist/prepared-spaces.js +90 -15
- package/dist/prepared-spaces.js.map +1 -1
- package/dist/present.d.ts +2 -12
- package/dist/present.d.ts.map +1 -1
- package/dist/present.js +24 -40
- package/dist/present.js.map +1 -1
- package/dist/protected-records.d.ts +22 -3
- package/dist/protected-records.d.ts.map +1 -1
- package/dist/protected-records.js +198 -27
- package/dist/protected-records.js.map +1 -1
- package/dist/registration-policy.d.ts +2 -1
- package/dist/registration-policy.d.ts.map +1 -1
- package/dist/render.d.ts +2 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +42 -11
- package/dist/render.js.map +1 -1
- package/dist/renewal.d.ts +4 -0
- package/dist/renewal.d.ts.map +1 -1
- package/dist/renewal.js +20 -1
- package/dist/renewal.js.map +1 -1
- package/dist/service-adapter.d.ts +1 -2
- package/dist/service-adapter.d.ts.map +1 -1
- package/dist/service-adapter.js +9 -4
- package/dist/service-adapter.js.map +1 -1
- package/dist/service-custody.js +2 -2
- package/dist/service-custody.js.map +1 -1
- package/dist/service-definition.d.ts +3 -0
- package/dist/service-definition.d.ts.map +1 -1
- package/dist/service-definition.js +56 -2
- package/dist/service-definition.js.map +1 -1
- package/dist/service-definition.schema.json +2 -1
- package/dist/service-identity.js +4 -4
- package/dist/service-identity.js.map +1 -1
- package/dist/service-stop.js +3 -3
- package/dist/service-stop.js.map +1 -1
- package/dist/service-target.d.ts.map +1 -1
- package/dist/service-target.js +9 -2
- package/dist/service-target.js.map +1 -1
- package/dist/signer-export.d.ts +1 -0
- package/dist/signer-export.d.ts.map +1 -1
- package/dist/signer-export.js +20 -4
- package/dist/signer-export.js.map +1 -1
- package/dist/space-streams.d.ts +18 -0
- package/dist/space-streams.d.ts.map +1 -0
- package/dist/space-streams.js +41 -0
- package/dist/space-streams.js.map +1 -0
- package/dist/space.d.ts +5 -0
- package/dist/space.d.ts.map +1 -1
- package/dist/space.js +5 -0
- package/dist/space.js.map +1 -1
- package/dist/store-entries.d.ts +6 -0
- package/dist/store-entries.d.ts.map +1 -0
- package/dist/store-entries.js +17 -0
- package/dist/store-entries.js.map +1 -0
- package/dist/system-rotation.d.ts +3 -1
- package/dist/system-rotation.d.ts.map +1 -1
- package/dist/system-rotation.js +19 -4
- package/dist/system-rotation.js.map +1 -1
- package/dist/text-wrap.d.ts +18 -0
- package/dist/text-wrap.d.ts.map +1 -0
- package/dist/text-wrap.js +60 -0
- package/dist/text-wrap.js.map +1 -0
- package/dist/win32-custodian.d.ts +2 -0
- package/dist/win32-custodian.d.ts.map +1 -0
- package/dist/win32-custodian.js +85 -0
- package/dist/win32-custodian.js.map +1 -0
- package/dist/win32-custody.d.ts +57 -0
- package/dist/win32-custody.d.ts.map +1 -0
- package/dist/win32-custody.js +220 -0
- package/dist/win32-custody.js.map +1 -0
- package/dist/win32-process.d.ts +38 -0
- package/dist/win32-process.d.ts.map +1 -1
- package/dist/win32-process.js +63 -5
- package/dist/win32-process.js.map +1 -1
- package/native/README.md +6 -4
- package/native/darwin-process.c +173 -0
- package/native/win32-process.c +317 -14
- package/native/win32-system-id.cpp +32 -0
- package/package.json +2 -2
- package/scripts/assert-shipped-natives.mjs +3 -3
- package/scripts/build-native.mjs +46 -26
- package/scripts/native-contract.mjs +36 -16
package/dist/preferences.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { existsSync, lstatSync, mkdirSync, readFileSync, readlinkSync } from "node:fs";
|
|
2
2
|
import { dirname, join } from "node:path";
|
|
3
|
-
import { acquireLock, globalConfigDir, token, writeSecretFileAtomic } from "@cotal-ai/core";
|
|
3
|
+
import { acquireLock, globalConfigDir, token, utf16Problem, writeSecretFileAtomic } from "@cotal-ai/core";
|
|
4
4
|
import { CommandFailure, isCommandFailure } from "./output.js";
|
|
5
|
-
import { localRecordAccess } from "./protected-records.js";
|
|
5
|
+
import { localRecordAccess, protectedLocalDirectory, shellPath } from "./protected-records.js";
|
|
6
6
|
import { DEFAULT_CONNECTOR, OFFICIAL_CONNECTORS } from "./official-connectors.js";
|
|
7
7
|
/**
|
|
8
8
|
* Personal workstation preferences: defaults a person sets for their own commands, saved for the
|
|
@@ -11,7 +11,8 @@ import { DEFAULT_CONNECTOR, OFFICIAL_CONNECTORS } from "./official-connectors.js
|
|
|
11
11
|
* that reads the key uses.
|
|
12
12
|
*/
|
|
13
13
|
export const PREFERENCES_SCHEMA_VERSION = 1;
|
|
14
|
-
|
|
14
|
+
/** The values `color` takes. */
|
|
15
|
+
export const COLOR_VALUES = ["auto", "always", "never"];
|
|
15
16
|
/** A detach key spelled `ctrl-<char>` or `^<char>`: a letter, or one of `@ [ \ ] ^ _`. */
|
|
16
17
|
export function parseDetachKey(spec) {
|
|
17
18
|
const m = /^(?:ctrl-|\^)([a-z@[\\\]^_])$/i.exec(spec.trim());
|
|
@@ -77,7 +78,7 @@ export const PREFERENCE_KEYS = KEYS.map((k) => k.key);
|
|
|
77
78
|
function specOf(key) {
|
|
78
79
|
const spec = KEYS.find((k) => k.key === key);
|
|
79
80
|
if (!spec)
|
|
80
|
-
throw new CommandFailure("refused", "USAGE_INVALID", `unknown preference "${key}"; valid keys: ${PREFERENCE_KEYS.join(", ")}`);
|
|
81
|
+
throw new CommandFailure("refused", "USAGE_INVALID", `unknown preference "${key}"; valid keys: ${PREFERENCE_KEYS.join(", ")}`, { remedy: "run `cotal config` to see each key and its value" });
|
|
81
82
|
return spec;
|
|
82
83
|
}
|
|
83
84
|
/** What `key` means, whether it may be saved per space, and the variables that supply it. */
|
|
@@ -93,6 +94,7 @@ export function preferencesPath() {
|
|
|
93
94
|
const invalid = (problem) => new CommandFailure("refused", "SCHEMA_INVALID", `the preferences file ${preferencesPath()} is invalid: ${problem}`, {
|
|
94
95
|
remedy: `fix or remove ${preferencesPath()}; nothing resets it`,
|
|
95
96
|
});
|
|
97
|
+
const SPACE_NAME_REMEDY = "run `cotal space` for the names of the spaces this machine knows";
|
|
96
98
|
/** Why a space name cannot hold preferences, or undefined. */
|
|
97
99
|
export function preferenceSpaceProblem(space) {
|
|
98
100
|
return space && token(space) === space ? undefined : `"${space}" is not a space name: use letters, digits, - and _`;
|
|
@@ -116,9 +118,14 @@ function checkScope(where, value, perSpaceOnly) {
|
|
|
116
118
|
}
|
|
117
119
|
/** Validate a parsed preferences document. Anything unexpected refuses; nothing is dropped. */
|
|
118
120
|
function parsePreferences(text) {
|
|
121
|
+
const encoding = utf16Problem(text);
|
|
122
|
+
if (encoding)
|
|
123
|
+
throw invalid(`${encoding}; save it as UTF-8`);
|
|
119
124
|
let doc;
|
|
120
125
|
try {
|
|
121
|
-
|
|
126
|
+
// A hand edit on Windows can begin the file with a UTF-8 byte-order mark, which RFC 8259 lets a
|
|
127
|
+
// reader ignore; the next write leaves it out.
|
|
128
|
+
doc = JSON.parse(text.replace(/^\uFEFF/, ""));
|
|
122
129
|
}
|
|
123
130
|
catch (e) {
|
|
124
131
|
throw invalid(`not JSON (${e.message})`);
|
|
@@ -154,13 +161,60 @@ function assertPreferencesNotLinked(path) {
|
|
|
154
161
|
remedy: `replace the link ${path} with a regular copy of the file it names`,
|
|
155
162
|
});
|
|
156
163
|
}
|
|
164
|
+
/** Refuse a preferences write into a folder another local account could write, by the rule every
|
|
165
|
+
* protected path follows (see {@link protectedLocalDirectory}): that account could replace the file,
|
|
166
|
+
* and `editor` runs as a shell command. A folder not made yet is checked from the nearest one above
|
|
167
|
+
* it that exists. */
|
|
168
|
+
export function assertPreferencesFolderProtected() {
|
|
169
|
+
let dir = globalConfigDir();
|
|
170
|
+
while (!lstatSync(dir, { throwIfNoEntry: false }) && dirname(dir) !== dir)
|
|
171
|
+
dir = dirname(dir);
|
|
172
|
+
try {
|
|
173
|
+
protectedLocalDirectory(dir, "the preferences folder");
|
|
174
|
+
}
|
|
175
|
+
catch (e) {
|
|
176
|
+
if (!isCommandFailure(e) || e.code !== "PERMISSION_DENIED")
|
|
177
|
+
throw e;
|
|
178
|
+
throw new CommandFailure(e.outcome, e.code, `${e.message}; nothing was changed`, { remedy: e.remedy, target: e.target });
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
/** The warning a command gives when the preferences file it read sits in a folder another local
|
|
182
|
+
* account could write, and the change that fixes the folder; undefined when there is no file or the
|
|
183
|
+
* folder is protected. The saved values still apply, and a write is refused (see
|
|
184
|
+
* {@link assertPreferencesFolderProtected}). */
|
|
185
|
+
export function preferencesFolderWarning() {
|
|
186
|
+
if (!lstatSync(preferencesPath(), { throwIfNoEntry: false }))
|
|
187
|
+
return undefined;
|
|
188
|
+
try {
|
|
189
|
+
protectedLocalDirectory(globalConfigDir(), "the preferences folder");
|
|
190
|
+
return undefined;
|
|
191
|
+
}
|
|
192
|
+
catch (e) {
|
|
193
|
+
if (!isCommandFailure(e) || e.code !== "PERMISSION_DENIED")
|
|
194
|
+
throw e;
|
|
195
|
+
const remedy = e.remedy ?? `make ${globalConfigDir()} a folder only you can write`;
|
|
196
|
+
return { warning: { code: "PREFERENCES_FOLDER_UNPROTECTED", target: e.target, message: `${e.message}; the saved preferences still apply, and a write to them is refused until this is fixed: ${remedy}` }, remedy };
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
/** Refuse a preferences path that is a FIFO, a device or a folder: opening one would block or fail,
|
|
200
|
+
* and preferences are kept only in a regular file. */
|
|
201
|
+
function assertPreferencesRegular(path) {
|
|
202
|
+
const stat = lstatSync(path, { throwIfNoEntry: false });
|
|
203
|
+
if (stat && !stat.isFile())
|
|
204
|
+
throw new CommandFailure("refused", "PERMISSION_DENIED", `the preferences file ${path} is not a regular file, such as a FIFO or a device; preferences are kept only in a regular file, so nothing was read or changed`, {
|
|
205
|
+
target: { path },
|
|
206
|
+
remedy: `remove ${path}, or replace it with a regular file`,
|
|
207
|
+
});
|
|
208
|
+
}
|
|
157
209
|
/** The saved preferences. A missing file is no preferences at revision 0; a file that does not
|
|
158
210
|
* validate refuses with `SCHEMA_INVALID`, and is never reset. A linked file refuses with
|
|
159
|
-
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked})
|
|
211
|
+
* `PERMISSION_DENIED` (see {@link assertPreferencesNotLinked}), and so does a FIFO or another file
|
|
212
|
+
* that is not regular (see {@link assertPreferencesRegular}). */
|
|
160
213
|
export function readPreferences() {
|
|
161
214
|
let text;
|
|
162
215
|
try {
|
|
163
216
|
assertPreferencesNotLinked(preferencesPath());
|
|
217
|
+
assertPreferencesRegular(preferencesPath());
|
|
164
218
|
text = readFileSync(preferencesPath(), "utf8");
|
|
165
219
|
}
|
|
166
220
|
catch (e) {
|
|
@@ -183,22 +237,28 @@ export function preferenceValueProblem(key, value) {
|
|
|
183
237
|
* Set (`value` a string) or clear (`value` undefined) one key in one scope, and report whether the
|
|
184
238
|
* file changed. The write holds the preferences lock, refuses with `CONFLICT` when the file is no
|
|
185
239
|
* longer at `expectedRevision`, and replaces the file atomically, so a concurrent edit is never lost.
|
|
240
|
+
* A folder another local account could write refuses it with `PERMISSION_DENIED` before anything is
|
|
241
|
+
* written (see {@link assertPreferencesFolderProtected}).
|
|
242
|
+
* The new file is private (`0600`); `replacedMode` is the old file's mode when it was another, such as
|
|
243
|
+
* a read-only `0400`, so the caller can say the mode changed.
|
|
186
244
|
*/
|
|
187
245
|
export function writePreference(scope, key, value, expectedRevision) {
|
|
188
246
|
const spec = specOf(key);
|
|
189
247
|
if (scope.space !== undefined) {
|
|
190
248
|
const problem = preferenceSpaceProblem(scope.space);
|
|
191
249
|
if (problem)
|
|
192
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
250
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: SPACE_NAME_REMEDY });
|
|
193
251
|
if (!spec.perSpace)
|
|
194
|
-
throw new CommandFailure("refused", "USAGE_INVALID", `${key} has no per-space value; set it for the user
|
|
252
|
+
throw new CommandFailure("refused", "USAGE_INVALID", `${key} has no per-space value; set it for the user`, { remedy: "run it again without --space" });
|
|
195
253
|
}
|
|
196
254
|
if (value !== undefined) {
|
|
197
255
|
const problem = preferenceValueProblem(key, value);
|
|
256
|
+
const space = scope.space === undefined ? "" : ` --space ${scope.space}`;
|
|
198
257
|
if (problem)
|
|
199
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
258
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: `give ${key} a value of that form; \`cotal config unset ${key}${space}\` returns it to its default` });
|
|
200
259
|
}
|
|
201
260
|
const dir = globalConfigDir();
|
|
261
|
+
assertPreferencesFolderProtected();
|
|
202
262
|
let lock;
|
|
203
263
|
try {
|
|
204
264
|
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
@@ -210,7 +270,7 @@ export function writePreference(scope, key, value, expectedRevision) {
|
|
|
210
270
|
if (code === "EACCES" || code === "EPERM" || code === "EROFS")
|
|
211
271
|
throw new CommandFailure("refused", "PERMISSION_DENIED", `the preferences folder ${dir} cannot be ${existsSync(dir) ? "written" : "created"} (${code}); nothing was changed`, {
|
|
212
272
|
target: { path: dir },
|
|
213
|
-
remedy: existsSync(dir) ? `make ${dir} writable by you, for example with \`chmod u+w ${dir}\`` : `make ${dirname(dir)} writable by you, or create ${dir} yourself`,
|
|
273
|
+
remedy: existsSync(dir) ? `make ${dir} writable by you, for example with \`chmod u+w ${shellPath(dir)}\`` : `make ${dirname(dir)} writable by you, or create ${dir} yourself`,
|
|
214
274
|
});
|
|
215
275
|
throw e;
|
|
216
276
|
}
|
|
@@ -236,26 +296,29 @@ export function writePreference(scope, key, value, expectedRevision) {
|
|
|
236
296
|
delete spaces[scope.space];
|
|
237
297
|
}
|
|
238
298
|
const next = { schemaVersion: PREFERENCES_SCHEMA_VERSION, revision: current.revision + 1, defaults, spaces };
|
|
299
|
+
const old = localRecordAccess() === "posix" ? lstatSync(preferencesPath(), { throwIfNoEntry: false }) : undefined;
|
|
239
300
|
writeSecretFileAtomic(preferencesPath(), `${JSON.stringify(next, null, 2)}\n`);
|
|
240
301
|
cached = { path: preferencesPath(), prefs: next };
|
|
241
|
-
|
|
302
|
+
const oldMode = old ? old.mode & 0o777 : undefined;
|
|
303
|
+
return { changed: true, revision: next.revision, ...(oldMode !== undefined && oldMode !== 0o600 ? { replacedMode: oldMode } : {}) };
|
|
242
304
|
}
|
|
243
305
|
finally {
|
|
244
306
|
lock.release();
|
|
245
307
|
}
|
|
246
308
|
}
|
|
247
309
|
/**
|
|
248
|
-
* Clear every value saved for `space`, under the same lock and `expectedRevision` check
|
|
249
|
-
* {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
310
|
+
* Clear every value saved for `space`, under the same folder check, lock and `expectedRevision` check
|
|
311
|
+
* as {@link writePreference}, in one atomic replace. Returns what was removed, empty when the space had none.
|
|
250
312
|
*/
|
|
251
313
|
export function removeSpacePreferences(space, expectedRevision) {
|
|
252
314
|
const problem = preferenceSpaceProblem(space);
|
|
253
315
|
if (problem)
|
|
254
|
-
throw new CommandFailure("refused", "USAGE_INVALID", problem);
|
|
316
|
+
throw new CommandFailure("refused", "USAGE_INVALID", problem, { remedy: SPACE_NAME_REMEDY });
|
|
255
317
|
// A space with nothing saved needs no write, so no lock and no configuration folder.
|
|
256
318
|
const before = readPreferences();
|
|
257
319
|
if (!Object.keys(before.spaces[space] ?? {}).length)
|
|
258
320
|
return { removed: {}, revision: before.revision };
|
|
321
|
+
assertPreferencesFolderProtected();
|
|
259
322
|
const lock = acquireLock(`${preferencesPath()}.lock`, { label: "a preferences write", waitMs: 10_000 });
|
|
260
323
|
try {
|
|
261
324
|
const current = readPreferences();
|
package/dist/preferences.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../src/preferences.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"preferences.js","sourceRoot":"","sources":["../src/preferences.ts"],"names":[],"mappings":"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"}
|
package/dist/preflight.d.ts
CHANGED
|
@@ -24,7 +24,10 @@ export type PreflightFailure = "unreachable" | "registry-creds-rejected" | "regi
|
|
|
24
24
|
* NEVER a prune signal: a slow or jittery link is not a dead broker (#851). Distinct from
|
|
25
25
|
* `tls-trust`, whose evidence is an actual plaintext INFO greeting; a bare timeout has none, so
|
|
26
26
|
* it must not borrow that verdict's CA guidance. */
|
|
27
|
-
| "slow-link"
|
|
27
|
+
| "slow-link"
|
|
28
|
+
/** The first dial timed out and the process holding the loopback listener is stopped, so the
|
|
29
|
+
* confirm budget is not spent on it. NEVER a prune signal: the broker is there, only paused. */
|
|
30
|
+
| "broker-stopped";
|
|
28
31
|
/** Pure decision tree — separated from I/O so the whole branch tree is unit-testable (it's the
|
|
29
32
|
* riskiest logic: a wrong branch prunes a LIVE registry entry). Only a registry-OWNED source
|
|
30
33
|
* (`registry`/`current`/`flag-space`/`local-recorded`) is ever pruned. A non-registry source —
|
|
@@ -45,7 +48,14 @@ export declare function preflightTarget(target: MeshTarget, probeCreds?: string)
|
|
|
45
48
|
ok: false;
|
|
46
49
|
kind: PreflightFailure;
|
|
47
50
|
prune: boolean;
|
|
51
|
+
pid?: number;
|
|
48
52
|
}>;
|
|
53
|
+
/** Read the pre-auth NATS INFO greeting (plaintext, before any STARTTLS). Returns null if nothing
|
|
54
|
+
* usable answered. Used to distinguish a TLS-required NATS listener from a plaintext substitute
|
|
55
|
+
* without a TLS handshake. It does NOT establish mesh identity — INFO is unauthenticated. */
|
|
56
|
+
export declare function readNatsInfoGreeting(server: string, timeoutMs?: number): Promise<{
|
|
57
|
+
tls_required?: boolean;
|
|
58
|
+
} | null>;
|
|
49
59
|
/** The confirming budget for a single target's preflight. Larger than {@link PRUNE_CONFIRM_TIMEOUT_MS}
|
|
50
60
|
* because this probe completes an AUTH HANDSHAKE, not just a TCP+INFO liveness check. Exported so
|
|
51
61
|
* {@link renderWorkspaceError}'s `slow-link` sentence can name the real budget instead of a copy. */
|
|
@@ -54,13 +64,15 @@ export declare const PREFLIGHT_CONFIRM_TIMEOUT_MS = 8000;
|
|
|
54
64
|
* every origin, because a liveness miss is not a deletion. A surface that lists meshes renders
|
|
55
65
|
* that as a state instead of probing every broker a second time. */
|
|
56
66
|
export interface MeshSweep {
|
|
57
|
-
/** Spaces whose dead record was dropped. Empty after a liveness-only sweep. */
|
|
58
|
-
pruned: string[];
|
|
59
67
|
/** Spaces kept despite a dead broker. */
|
|
60
68
|
offline: string[];
|
|
61
69
|
}
|
|
62
70
|
/** Whether `server` answers a liveness probe. A first miss is confirmed with a second, longer probe
|
|
63
|
-
* before it counts, so a slow link reads as live.
|
|
71
|
+
* before it counts, so a slow link reads as live. A miss whose loopback listener is a stopped
|
|
72
|
+
* process counts at once. */
|
|
64
73
|
export declare function brokerAnswers(server: string): Promise<boolean>;
|
|
65
|
-
|
|
74
|
+
/** Sweep liveness without deleting records. Catalog entries are not probed. Given the `--server` a
|
|
75
|
+
* command resolves with, only the records at that address are probed: that resolve reads no other
|
|
76
|
+
* record's liveness. Other explicitly requested checks, such as status --all, have their own scope. */
|
|
77
|
+
export declare function pruneStaleMeshes(server?: string): Promise<MeshSweep>;
|
|
66
78
|
//# sourceMappingURL=preflight.d.ts.map
|
package/dist/preflight.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../src/preflight.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"preflight.d.ts","sourceRoot":"","sources":["../src/preflight.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD;;;;;;;;;;GAUG;AAEH;;kGAEkG;AAClG,MAAM,MAAM,gBAAgB,GACxB,aAAa,GACb,yBAAyB,GACzB,wBAAwB,GACxB,gBAAgB,GAChB,iBAAiB,GACjB,YAAY;AACd;;;8DAG8D;GAC5D,WAAW;AACb;;;;qDAIqD;GACnD,WAAW;AACb;iGACiG;GAC/F,gBAAgB,CAAC;AAErB;;;;;oGAKoG;AACpG,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,EAC5B,MAAM,EAAE,eAAe,GAAG,YAAY,GAAG,aAAa,GAAG,SAAS,EAClE,OAAO,EAAE,OAAO,EAChB,QAAQ,UAAQ,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAwB5C;AAED;;;uFAGuF;AACvF,wBAAsB,eAAe,CACnC,MAAM,EAAE,UAAU,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAmE7F;AAED;;8FAE8F;AAC9F,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,SAAS,SAAQ,GAChB,OAAO,CAAC;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC,CA0C5C;AAMD;;sGAEsG;AACtG,eAAO,MAAM,4BAA4B,OAAQ,CAAC;AAElD;;qEAEqE;AACrE,MAAM,WAAW,SAAS;IACxB,yCAAyC;IACzC,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;8BAE8B;AAC9B,wBAAsB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAIpE;AAED;;wGAEwG;AACxG,wBAAsB,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAc1E"}
|
package/dist/preflight.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createConnection } from "node:net";
|
|
2
2
|
import { mintCreds, newIdentity, probeConnect, isReachable } from "@cotal-ai/core";
|
|
3
|
-
import { loadMeshes
|
|
3
|
+
import { loadMeshes } from "./mesh-registry.js";
|
|
4
|
+
import { stoppedLoopbackListener } from "./pid.js";
|
|
4
5
|
/** Pure decision tree — separated from I/O so the whole branch tree is unit-testable (it's the
|
|
5
6
|
* riskiest logic: a wrong branch prunes a LIVE registry entry). Only a registry-OWNED source
|
|
6
7
|
* (`registry`/`current`/`flag-space`/`local-recorded`) is ever pruned. A non-registry source —
|
|
@@ -63,6 +64,10 @@ export async function preflightTarget(target, probeCreds) {
|
|
|
63
64
|
let probe = await probeConnect(target.server, auth);
|
|
64
65
|
if (probe.ok)
|
|
65
66
|
return { ok: true };
|
|
67
|
+
// A stopped broker never answers, so its pid is named now instead of after the confirm budget.
|
|
68
|
+
const stopped = probe.reason === "timeout" ? stoppedLoopbackListener(target.server) : undefined;
|
|
69
|
+
if (stopped !== undefined)
|
|
70
|
+
return { ok: false, kind: "broker-stopped", prune: false, pid: stopped };
|
|
66
71
|
// CONFIRM BEFORE CONDEMNING. `probeConnect`'s default budget is 1s, and this is a CREDENTIALED
|
|
67
72
|
// connect: TCP, INFO, then the JWT exchange — several round trips. A perfectly healthy broker
|
|
68
73
|
// across a slow or jittery link (a relayed overlay VPN, a loaded host) misses that routinely.
|
|
@@ -107,7 +112,7 @@ export async function preflightTarget(target, probeCreds) {
|
|
|
107
112
|
/** Read the pre-auth NATS INFO greeting (plaintext, before any STARTTLS). Returns null if nothing
|
|
108
113
|
* usable answered. Used to distinguish a TLS-required NATS listener from a plaintext substitute
|
|
109
114
|
* without a TLS handshake. It does NOT establish mesh identity — INFO is unauthenticated. */
|
|
110
|
-
async function readNatsInfoGreeting(server, timeoutMs = 1_000) {
|
|
115
|
+
export async function readNatsInfoGreeting(server, timeoutMs = 1_000) {
|
|
111
116
|
let host;
|
|
112
117
|
let port;
|
|
113
118
|
try {
|
|
@@ -159,42 +164,28 @@ async function readNatsInfoGreeting(server, timeoutMs = 1_000) {
|
|
|
159
164
|
});
|
|
160
165
|
});
|
|
161
166
|
}
|
|
162
|
-
/**
|
|
163
|
-
*
|
|
164
|
-
* `cotal down` leaves a record behind. This is liveness-only and we hold NO creds for these meshes,
|
|
165
|
-
* so it uses the silent TCP+INFO {@link isReachable} probe — NOT a credless `probeConnect`, whose
|
|
166
|
-
* auth-rejection-as-liveness would log a broker auth error on every live AUTH mesh it sweeps.
|
|
167
|
-
* `isReachable` is true for any live broker (open or auth, since INFO precedes auth); only a truly
|
|
168
|
-
* dead one (refused/timeout) prunes. An EXPLICIT call (never wired into resolution itself), so
|
|
169
|
-
* registry mutation stays opt-in: callers that act on the registry (`spawn`/`use`/`meshes`, the
|
|
170
|
-
* manager control commands) invoke it; `<TAB>` completion must not.
|
|
171
|
-
*
|
|
172
|
-
* A dead broker is never enough to delete a record: {@link pruneMesh} keeps both an
|
|
173
|
-
* operator-registered (`cotal meshes add`) mesh and an `up` / pre-origin one on a liveness miss,
|
|
174
|
-
* and this reports them as `offline` instead. Mismatch deletion is a different path.
|
|
175
|
-
*
|
|
176
|
-
* **Deletion needs CONFIRMATION, not one timeout.** Pruning is destructive: a wrongly pruned mesh
|
|
177
|
-
* costs the operator a re-`up` (or, for a remote one, the exact registration line again) and every
|
|
178
|
-
* command in between fails on a mesh that was live all along. `isReachable`'s default budget is 1s, which a
|
|
179
|
-
* perfectly healthy broker across a slow or jittery link (a relayed overlay VPN, a loaded host)
|
|
180
|
-
* misses routinely — one such blip silently unregistered a live remote mesh. So a first failure
|
|
181
|
-
* only makes it a CANDIDATE: confirm with a second, longer probe and prune only if that also
|
|
182
|
-
* fails. A live-but-slow broker keeps its entry; a genuinely dead one still prunes on the next
|
|
183
|
-
* sweep, one extra probe later.
|
|
184
|
-
*/
|
|
167
|
+
/** Confirm a missed TCP+INFO liveness probe with a longer budget before reporting offline.
|
|
168
|
+
* This probe holds no credentials and cannot establish a mismatch or authorize deletion. */
|
|
185
169
|
const PRUNE_CONFIRM_TIMEOUT_MS = 5_000;
|
|
186
170
|
/** The confirming budget for a single target's preflight. Larger than {@link PRUNE_CONFIRM_TIMEOUT_MS}
|
|
187
171
|
* because this probe completes an AUTH HANDSHAKE, not just a TCP+INFO liveness check. Exported so
|
|
188
172
|
* {@link renderWorkspaceError}'s `slow-link` sentence can name the real budget instead of a copy. */
|
|
189
173
|
export const PREFLIGHT_CONFIRM_TIMEOUT_MS = 8_000;
|
|
190
174
|
/** Whether `server` answers a liveness probe. A first miss is confirmed with a second, longer probe
|
|
191
|
-
* before it counts, so a slow link reads as live.
|
|
175
|
+
* before it counts, so a slow link reads as live. A miss whose loopback listener is a stopped
|
|
176
|
+
* process counts at once. */
|
|
192
177
|
export async function brokerAnswers(server) {
|
|
193
|
-
|
|
178
|
+
if (await isReachable(server))
|
|
179
|
+
return true;
|
|
180
|
+
// A stopped broker never answers, so the longer confirm is not spent on it.
|
|
181
|
+
return stoppedLoopbackListener(server) === undefined && await isReachable(server, { timeoutMs: PRUNE_CONFIRM_TIMEOUT_MS });
|
|
194
182
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
183
|
+
/** Sweep liveness without deleting records. Catalog entries are not probed. Given the `--server` a
|
|
184
|
+
* command resolves with, only the records at that address are probed: that resolve reads no other
|
|
185
|
+
* record's liveness. Other explicitly requested checks, such as status --all, have their own scope. */
|
|
186
|
+
export async function pruneStaleMeshes(server) {
|
|
187
|
+
const sweep = { offline: [] };
|
|
188
|
+
await Promise.all(loadMeshes().filter((m) => server === undefined || m.server === server).map(async (m) => {
|
|
198
189
|
// A catalog snapshot is registry preparation, not broker discovery. Catalog-owned entries are
|
|
199
190
|
// never pruned from liveness and must not be probed here either: `meshes`, `use`, and a
|
|
200
191
|
// space-less control command may prepare hundreds of registrations, while only the command's
|
|
@@ -203,8 +194,7 @@ export async function pruneStaleMeshes() {
|
|
|
203
194
|
return;
|
|
204
195
|
if (await brokerAnswers(m.server))
|
|
205
196
|
return;
|
|
206
|
-
|
|
207
|
-
(pruneMesh(m.space) ? sweep.pruned : sweep.offline).push(m.space);
|
|
197
|
+
sweep.offline.push(m.space);
|
|
208
198
|
}));
|
|
209
199
|
return sweep;
|
|
210
200
|
}
|
package/dist/preflight.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../src/preflight.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"preflight.js","sourceRoot":"","sources":["../src/preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { MeshRegistryError } from "./mesh-registry.js";
|
|
2
|
+
import { type OutputWarning } from "./output.js";
|
|
1
3
|
/**
|
|
2
4
|
* A local space `cotal space create` prepared and no `cotal up` has started: its name and root.
|
|
3
5
|
*
|
|
@@ -14,9 +16,25 @@ export interface PreparedSpace {
|
|
|
14
16
|
readonly ts: string;
|
|
15
17
|
}
|
|
16
18
|
export declare function preparedSpacesDir(): string;
|
|
17
|
-
/**
|
|
18
|
-
|
|
19
|
+
/** The space a prepared record's file is named for, or undefined for a name no record is written under. */
|
|
20
|
+
export declare function preparedRecordSpace(file: string): string | undefined;
|
|
21
|
+
/** Every prepared space, with each record that cannot be read returned beside them instead of thrown,
|
|
22
|
+
* so a report can name it. A folder that exists and cannot be read throws a {@link MeshRegistryError}
|
|
23
|
+
* naming it, and so does a file in its place, with the step that moves it aside. A record removed
|
|
24
|
+
* between listing and reading is absent. */
|
|
25
|
+
export declare function readPreparedSpaces(): {
|
|
26
|
+
spaces: PreparedSpace[];
|
|
27
|
+
unusable: MeshRegistryError[];
|
|
28
|
+
};
|
|
29
|
+
/** Every prepared space this build can read. A record it cannot read is skipped with a warning naming
|
|
30
|
+
* its file and the forget that removes it, so one damaged record stops only a command about its own
|
|
31
|
+
* space, which {@link findPreparedSpace} refuses. */
|
|
19
32
|
export declare function loadPreparedSpaces(): PreparedSpace[];
|
|
33
|
+
/** The warning a prepared record that cannot be read is skipped with, naming its file and the step
|
|
34
|
+
* that removes it. */
|
|
35
|
+
export declare function preparedRecordSkipped(e: MeshRegistryError): OutputWarning;
|
|
36
|
+
/** The space prepared under `space`. Its own record that cannot be read throws, naming the file; a
|
|
37
|
+
* damaged record of another space is skipped with a warning, as in {@link loadPreparedSpaces}. */
|
|
20
38
|
export declare function findPreparedSpace(space: string): PreparedSpace | undefined;
|
|
21
39
|
/** The space prepared at `root`, matched by its canonical path. */
|
|
22
40
|
export declare function preparedSpaceAt(root: string): PreparedSpace | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepared-spaces.d.ts","sourceRoot":"","sources":["../src/prepared-spaces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prepared-spaces.d.ts","sourceRoot":"","sources":["../src/prepared-spaces.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAoD,MAAM,oBAAoB,CAAC;AACzG,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAGzE;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,wFAAwF;IACxF,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAID,2GAA2G;AAC3G,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEpE;AAED;;;6CAG6C;AAC7C,wBAAgB,kBAAkB,IAAI;IAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAA;CAAE,CA4B/F;AAED;;sDAEsD;AACtD,wBAAgB,kBAAkB,IAAI,aAAa,EAAE,CAIpD;AAQD;uBACuB;AACvB,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,iBAAiB,GAAG,aAAa,CAMzE;AAwBD;mGACmG;AACnG,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAM1E;AAED,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAGvE;AAED,sGAAsG;AACtG,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAQ5D;AAED,gDAAgD;AAChD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAEvD"}
|
package/dist/prepared-spaces.js
CHANGED
|
@@ -1,40 +1,114 @@
|
|
|
1
|
-
import { isAbsolute, join } from "node:path";
|
|
2
|
-
import { readFileSync, readdirSync, renameSync, rmSync } from "node:fs";
|
|
1
|
+
import { basename, isAbsolute, join } from "node:path";
|
|
2
|
+
import { readFileSync, readdirSync, renameSync, rmSync, statSync } from "node:fs";
|
|
3
3
|
import { mkSecretDir, writeSecretFile } from "@cotal-ai/core";
|
|
4
|
-
import { spaceSegment } from "./auth-paths.js";
|
|
5
|
-
import { canonicalRoot, homeCotalDir } from "./mesh-registry.js";
|
|
4
|
+
import { spaceFromSegment, spaceSegment } from "./auth-paths.js";
|
|
5
|
+
import { MeshRegistryError, canonicalRoot, homeCotalDir, isMeshRegistryError } from "./mesh-registry.js";
|
|
6
|
+
import { recordOperationWarning } from "./output.js";
|
|
7
|
+
import { prepareCotalHomeForWrite } from "./protected-records.js";
|
|
6
8
|
export function preparedSpacesDir() {
|
|
7
9
|
return join(homeCotalDir(), "prepared");
|
|
8
10
|
}
|
|
9
11
|
const preparedFile = (space) => join(preparedSpacesDir(), `${spaceSegment(space)}.json`);
|
|
10
|
-
/**
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
/** The space a prepared record's file is named for, or undefined for a name no record is written under. */
|
|
13
|
+
export function preparedRecordSpace(file) {
|
|
14
|
+
return spaceFromSegment(basename(file, ".json"));
|
|
15
|
+
}
|
|
16
|
+
/** Every prepared space, with each record that cannot be read returned beside them instead of thrown,
|
|
17
|
+
* so a report can name it. A folder that exists and cannot be read throws a {@link MeshRegistryError}
|
|
18
|
+
* naming it, and so does a file in its place, with the step that moves it aside. A record removed
|
|
19
|
+
* between listing and reading is absent. */
|
|
20
|
+
export function readPreparedSpaces() {
|
|
13
21
|
let files;
|
|
14
22
|
try {
|
|
15
23
|
files = readdirSync(preparedSpacesDir()).filter((f) => f.endsWith(".json"));
|
|
16
24
|
}
|
|
17
25
|
catch (e) {
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
26
|
+
const dir = preparedSpacesDir(), code = e.code;
|
|
27
|
+
if (code === "ENOENT")
|
|
28
|
+
return { spaces: [], unusable: [] };
|
|
29
|
+
// Something other than a folder at its path holds no records: moving it aside loses none. A
|
|
30
|
+
// folder above it that is not one fails the stat too, and is the read failure below.
|
|
31
|
+
let stat;
|
|
32
|
+
try {
|
|
33
|
+
stat = code === "ENOTDIR" ? statSync(dir) : undefined;
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
stat = undefined;
|
|
37
|
+
}
|
|
38
|
+
if (stat) {
|
|
39
|
+
const summary = stat.isFile() ? `${dir} is a file, not a folder` : `${dir} is not a folder`;
|
|
40
|
+
throw new MeshRegistryError(dir, summary, { cause: e, summary, remedy: `move ${dir} aside, for example \`mv ${dir} ${dir}.old\`; Cotal makes the folder when it next prepares a space` });
|
|
41
|
+
}
|
|
42
|
+
throw new MeshRegistryError(dir, `the prepared spaces folder ${dir} could not be read: ${e.message}`, { cause: e });
|
|
21
43
|
}
|
|
22
|
-
|
|
44
|
+
const spaces = [], unusable = [];
|
|
45
|
+
for (const f of files.sort()) {
|
|
46
|
+
try {
|
|
47
|
+
const p = readPreparedFile(join(preparedSpacesDir(), f));
|
|
48
|
+
if (p)
|
|
49
|
+
spaces.push(p);
|
|
50
|
+
}
|
|
51
|
+
catch (e) {
|
|
52
|
+
if (!isMeshRegistryError(e))
|
|
53
|
+
throw e;
|
|
54
|
+
unusable.push(e);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return { spaces, unusable };
|
|
23
58
|
}
|
|
59
|
+
/** Every prepared space this build can read. A record it cannot read is skipped with a warning naming
|
|
60
|
+
* its file and the forget that removes it, so one damaged record stops only a command about its own
|
|
61
|
+
* space, which {@link findPreparedSpace} refuses. */
|
|
62
|
+
export function loadPreparedSpaces() {
|
|
63
|
+
const { spaces, unusable } = readPreparedSpaces();
|
|
64
|
+
for (const e of unusable)
|
|
65
|
+
warnSkipped(e);
|
|
66
|
+
return spaces;
|
|
67
|
+
}
|
|
68
|
+
/** The step that removes a damaged record: `space forget` for a file named for a space. */
|
|
69
|
+
const removeStep = (file) => {
|
|
70
|
+
const space = preparedRecordSpace(file);
|
|
71
|
+
return space === undefined ? "remove it" : `remove it with \`cotal space forget ${space}\``;
|
|
72
|
+
};
|
|
73
|
+
/** The warning a prepared record that cannot be read is skipped with, naming its file and the step
|
|
74
|
+
* that removes it. */
|
|
75
|
+
export function preparedRecordSkipped(e) {
|
|
76
|
+
return {
|
|
77
|
+
code: "PREPARED_RECORD_SKIPPED",
|
|
78
|
+
target: { file: e.file, space: preparedRecordSpace(e.file) ?? null },
|
|
79
|
+
message: `${e.message.slice(0, -` - ${removeStep(e.file)}`.length)}, so it is skipped; ${removeStep(e.file)}`,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
function warnSkipped(e) {
|
|
83
|
+
recordOperationWarning(preparedRecordSkipped(e));
|
|
84
|
+
}
|
|
85
|
+
/** The refusal of a command about the space a damaged record was written for names the file and the
|
|
86
|
+
* forget that removes it, and repeats nothing the file holds. */
|
|
87
|
+
const unusableRecord = (file, problem, cause) => new MeshRegistryError(file, `${file} ${problem} - ${removeStep(file)}`, { cause, summary: `${file} is not a usable prepared space record`, remedy: removeStep(file) });
|
|
24
88
|
function readPreparedFile(file) {
|
|
25
89
|
let doc;
|
|
26
90
|
try {
|
|
27
91
|
doc = JSON.parse(readFileSync(file, "utf8"));
|
|
28
92
|
}
|
|
29
93
|
catch (e) {
|
|
30
|
-
|
|
94
|
+
if (e.code === "ENOENT")
|
|
95
|
+
return undefined;
|
|
96
|
+
throw unusableRecord(file, `does not parse as a prepared space record (${e.message})`, e);
|
|
31
97
|
}
|
|
32
|
-
if (typeof doc.space !== "string" || typeof doc.root !== "string" || !isAbsolute(doc.root) || typeof doc.ts !== "string" || file !==
|
|
33
|
-
throw
|
|
98
|
+
if (typeof doc.space !== "string" || typeof doc.root !== "string" || !isAbsolute(doc.root) || typeof doc.ts !== "string" || preparedRecordSpace(file) !== doc.space)
|
|
99
|
+
throw unusableRecord(file, "is not a usable prepared space record");
|
|
34
100
|
return { space: doc.space, root: doc.root, ts: doc.ts };
|
|
35
101
|
}
|
|
102
|
+
/** The space prepared under `space`. Its own record that cannot be read throws, naming the file; a
|
|
103
|
+
* damaged record of another space is skipped with a warning, as in {@link loadPreparedSpaces}. */
|
|
36
104
|
export function findPreparedSpace(space) {
|
|
37
|
-
|
|
105
|
+
const { spaces, unusable } = readPreparedSpaces();
|
|
106
|
+
const own = unusable.find((e) => preparedRecordSpace(e.file) === space);
|
|
107
|
+
if (own)
|
|
108
|
+
throw own;
|
|
109
|
+
for (const e of unusable)
|
|
110
|
+
warnSkipped(e);
|
|
111
|
+
return spaces.find((p) => p.space === space);
|
|
38
112
|
}
|
|
39
113
|
/** The space prepared at `root`, matched by its canonical path. */
|
|
40
114
|
export function preparedSpaceAt(root) {
|
|
@@ -43,6 +117,7 @@ export function preparedSpaceAt(root) {
|
|
|
43
117
|
}
|
|
44
118
|
/** Write a prepared space: atomic, 0600, in a directory only this user can list. Returns the file. */
|
|
45
119
|
export function recordPreparedSpace(p) {
|
|
120
|
+
prepareCotalHomeForWrite();
|
|
46
121
|
mkSecretDir(preparedSpacesDir());
|
|
47
122
|
const file = preparedFile(p.space);
|
|
48
123
|
const tmp = `${file}.${process.pid}.tmp`;
|