obsidian-integration-testing 12.0.0 → 12.1.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/lib/cjs/adb-device-list.cjs +54 -0
- package/dist/lib/cjs/adb-device-list.d.cts +72 -0
- package/dist/lib/cjs/android-sdk.cjs +52 -0
- package/dist/lib/cjs/android-sdk.d.cts +29 -0
- package/dist/lib/cjs/app-startup-progress.cjs +87 -0
- package/dist/lib/cjs/app-startup-progress.d.cts +128 -0
- package/dist/lib/cjs/appium-server-marker.cjs +29 -32
- package/dist/lib/cjs/appium-server-marker.d.cts +22 -0
- package/dist/lib/cjs/avd-probe-verdict.cjs +90 -0
- package/dist/lib/cjs/avd-probe-verdict.d.cts +175 -0
- package/dist/lib/cjs/community-plugin-registry.cjs +1 -1
- package/dist/lib/cjs/community-plugin-registry.d.cts +1 -1
- package/dist/lib/cjs/config-directory-fallback-error.cjs +57 -0
- package/dist/lib/cjs/config-directory-fallback-error.d.cts +64 -0
- package/dist/lib/cjs/config-directory.cjs +46 -0
- package/dist/lib/cjs/config-directory.d.cts +45 -0
- package/dist/lib/cjs/connect-to-cdp.cjs +13 -7
- package/dist/lib/cjs/connect-to-cdp.d.cts +19 -0
- package/dist/lib/cjs/demo-vault-bootstrap.cjs +1 -1
- package/dist/lib/cjs/demo-vault-bootstrap.d.cts +3 -2
- package/dist/lib/cjs/demo-vault-populate.cjs +3 -2
- package/dist/lib/cjs/device-readiness.cjs +38 -3
- package/dist/lib/cjs/device-readiness.d.cts +83 -9
- package/dist/lib/cjs/emulator-arguments.cjs +6 -2
- package/dist/lib/cjs/emulator-arguments.d.cts +26 -0
- package/dist/lib/cjs/emulator-backend.cjs +71 -0
- package/dist/lib/cjs/emulator-backend.d.cts +76 -0
- package/dist/lib/cjs/emulator-liveness.cjs +72 -0
- package/dist/lib/cjs/emulator-liveness.d.cts +158 -0
- package/dist/lib/cjs/emulator-snapshot.cjs +57 -0
- package/dist/lib/cjs/emulator-snapshot.d.cts +68 -0
- package/dist/lib/cjs/global-setup-core.cjs +30 -30
- package/dist/lib/cjs/global-setup-core.d.cts +27 -2
- package/dist/lib/cjs/headless-vault-config.cjs +51 -0
- package/dist/lib/cjs/headless-vault-config.d.cts +67 -0
- package/dist/lib/cjs/index.cjs +12 -1
- package/dist/lib/cjs/index.d.cts +6 -1
- package/dist/lib/cjs/library.cjs +1 -1
- package/dist/lib/cjs/mobile-input.cjs +14 -2
- package/dist/lib/cjs/mobile-input.d.cts +5 -9
- package/dist/lib/cjs/namespace-bootstrap.cjs +1 -1
- package/dist/lib/cjs/obsidian-instance.cjs +52 -3
- package/dist/lib/cjs/obsidian-instance.d.cts +12 -0
- package/dist/lib/cjs/open-obsidian-settings-tab.cjs +1 -1
- package/dist/lib/cjs/open-obsidian-settings-tab.d.cts +3 -2
- package/dist/lib/cjs/owned-instance-exit-marker.cjs +99 -0
- package/dist/lib/cjs/owned-instance-exit-marker.d.cts +106 -0
- package/dist/lib/cjs/owned-instance-exited-error.cjs +106 -0
- package/dist/lib/cjs/owned-instance-exited-error.d.cts +98 -0
- package/dist/lib/cjs/owned-vault-seed.cjs +9 -5
- package/dist/lib/cjs/owned-vault-seed.d.cts +24 -3
- package/dist/lib/cjs/parent-liveness.cjs +42 -5
- package/dist/lib/cjs/parent-liveness.d.cts +37 -5
- package/dist/lib/cjs/port-owner.cjs +61 -0
- package/dist/lib/cjs/port-owner.d.cts +47 -0
- package/dist/lib/cjs/process-capture.cjs +62 -0
- package/dist/lib/cjs/process-capture.d.cts +83 -0
- package/dist/lib/cjs/process-exit-message.cjs +14 -8
- package/dist/lib/cjs/process-exit-message.d.cts +37 -3
- package/dist/lib/cjs/process-liveness.cjs +51 -0
- package/dist/lib/cjs/process-liveness.d.cts +18 -0
- package/dist/lib/cjs/run-version-matrix.cjs +1 -1
- package/dist/lib/cjs/run-version-matrix.d.cts +1 -1
- package/dist/lib/cjs/teardown-verdict.cjs +53 -0
- package/dist/lib/cjs/teardown-verdict.d.cts +69 -0
- package/dist/lib/cjs/temporary-vault.cjs +43 -8
- package/dist/lib/cjs/temporary-vault.d.cts +47 -5
- package/dist/lib/cjs/transport-appium.cjs +102 -17
- package/dist/lib/cjs/transport-appium.d.cts +53 -3
- package/dist/lib/cjs/transport-desktop-cdp.cjs +195 -6
- package/dist/lib/cjs/transport-desktop-cdp.d.cts +99 -0
- package/dist/lib/cjs/transport-factory.cjs +951 -133
- package/dist/lib/cjs/transport-options.cjs +11 -3
- package/dist/lib/cjs/transport-options.d.cts +131 -12
- package/dist/lib/cjs/transport.cjs +1 -1
- package/dist/lib/cjs/transport.d.cts +7 -1
- package/dist/lib/cjs/vault-plugin-install.cjs +40 -0
- package/dist/lib/cjs/vault-plugin-install.d.cts +64 -0
- package/dist/lib/cjs/vault-teardown-verdict.cjs +42 -0
- package/dist/lib/cjs/vault-teardown-verdict.d.cts +57 -0
- package/dist/lib/cjs/version-matrix.cjs +1 -1
- package/dist/lib/cjs/version-matrix.d.cts +2 -2
- package/dist/lib/cjs/webview-cdp.cjs +6 -7
- package/dist/lib/cjs/webview-cdp.d.cts +5 -1
- package/dist/lib/esm/adb-device-list.d.mts +72 -0
- package/dist/lib/esm/adb-device-list.mjs +28 -0
- package/dist/lib/esm/android-sdk.d.mts +29 -0
- package/dist/lib/esm/android-sdk.mjs +18 -0
- package/dist/lib/esm/app-startup-progress.d.mts +128 -0
- package/dist/lib/esm/app-startup-progress.mjs +59 -0
- package/dist/lib/esm/appium-server-marker.d.mts +22 -0
- package/dist/lib/esm/appium-server-marker.mjs +28 -22
- package/dist/lib/esm/avd-probe-verdict.d.mts +175 -0
- package/dist/lib/esm/avd-probe-verdict.mjs +62 -0
- package/dist/lib/esm/community-plugin-registry.d.mts +1 -1
- package/dist/lib/esm/community-plugin-registry.mjs +1 -1
- package/dist/lib/esm/config-directory-fallback-error.d.mts +64 -0
- package/dist/lib/esm/config-directory-fallback-error.mjs +33 -0
- package/dist/lib/esm/config-directory.d.mts +45 -0
- package/dist/lib/esm/config-directory.mjs +21 -0
- package/dist/lib/esm/connect-to-cdp.d.mts +19 -0
- package/dist/lib/esm/connect-to-cdp.mjs +13 -7
- package/dist/lib/esm/demo-vault-bootstrap.d.mts +3 -2
- package/dist/lib/esm/demo-vault-bootstrap.mjs +1 -1
- package/dist/lib/esm/demo-vault-populate.mjs +3 -2
- package/dist/lib/esm/device-readiness.d.mts +83 -9
- package/dist/lib/esm/device-readiness.mjs +34 -2
- package/dist/lib/esm/emulator-arguments.d.mts +26 -0
- package/dist/lib/esm/emulator-arguments.mjs +6 -2
- package/dist/lib/esm/emulator-backend.d.mts +76 -0
- package/dist/lib/esm/emulator-backend.mjs +45 -0
- package/dist/lib/esm/emulator-liveness.d.mts +158 -0
- package/dist/lib/esm/emulator-liveness.mjs +47 -0
- package/dist/lib/esm/emulator-snapshot.d.mts +68 -0
- package/dist/lib/esm/emulator-snapshot.mjs +32 -0
- package/dist/lib/esm/global-setup-core.d.mts +27 -2
- package/dist/lib/esm/global-setup-core.mjs +34 -35
- package/dist/lib/esm/headless-vault-config.d.mts +67 -0
- package/dist/lib/esm/headless-vault-config.mjs +31 -0
- package/dist/lib/esm/index.d.mts +6 -1
- package/dist/lib/esm/index.mjs +11 -1
- package/dist/lib/esm/library.mjs +1 -1
- package/dist/lib/esm/mobile-input.d.mts +5 -9
- package/dist/lib/esm/mobile-input.mjs +14 -2
- package/dist/lib/esm/namespace-bootstrap.mjs +1 -1
- package/dist/lib/esm/obsidian-instance.d.mts +12 -0
- package/dist/lib/esm/obsidian-instance.mjs +55 -3
- package/dist/lib/esm/open-obsidian-settings-tab.d.mts +3 -2
- package/dist/lib/esm/open-obsidian-settings-tab.mjs +1 -1
- package/dist/lib/esm/owned-instance-exit-marker.d.mts +106 -0
- package/dist/lib/esm/owned-instance-exit-marker.mjs +78 -0
- package/dist/lib/esm/owned-instance-exited-error.d.mts +98 -0
- package/dist/lib/esm/owned-instance-exited-error.mjs +81 -0
- package/dist/lib/esm/owned-vault-seed.d.mts +24 -3
- package/dist/lib/esm/owned-vault-seed.mjs +9 -5
- package/dist/lib/esm/parent-liveness.d.mts +37 -5
- package/dist/lib/esm/parent-liveness.mjs +42 -5
- package/dist/lib/esm/port-owner.d.mts +47 -0
- package/dist/lib/esm/port-owner.mjs +36 -0
- package/dist/lib/esm/process-capture.d.mts +83 -0
- package/dist/lib/esm/process-capture.mjs +38 -0
- package/dist/lib/esm/process-exit-message.d.mts +37 -3
- package/dist/lib/esm/process-exit-message.mjs +13 -8
- package/dist/lib/esm/process-liveness.d.mts +18 -0
- package/dist/lib/esm/process-liveness.mjs +17 -0
- package/dist/lib/esm/run-version-matrix.d.mts +1 -1
- package/dist/lib/esm/run-version-matrix.mjs +1 -1
- package/dist/lib/esm/teardown-verdict.d.mts +69 -0
- package/dist/lib/esm/teardown-verdict.mjs +28 -0
- package/dist/lib/esm/temporary-vault.d.mts +47 -5
- package/dist/lib/esm/temporary-vault.mjs +43 -8
- package/dist/lib/esm/transport-appium.d.mts +53 -3
- package/dist/lib/esm/transport-appium.mjs +108 -17
- package/dist/lib/esm/transport-desktop-cdp.d.mts +99 -0
- package/dist/lib/esm/transport-desktop-cdp.mjs +202 -7
- package/dist/lib/esm/transport-factory.mjs +995 -138
- package/dist/lib/esm/transport-options.d.mts +131 -12
- package/dist/lib/esm/transport-options.mjs +9 -2
- package/dist/lib/esm/transport.d.mts +7 -1
- package/dist/lib/esm/vault-plugin-install.d.mts +64 -0
- package/dist/lib/esm/vault-plugin-install.mjs +20 -0
- package/dist/lib/esm/vault-teardown-verdict.d.mts +57 -0
- package/dist/lib/esm/vault-teardown-verdict.mjs +18 -0
- package/dist/lib/esm/version-matrix.d.mts +2 -2
- package/dist/lib/esm/version-matrix.mjs +1 -1
- package/dist/lib/esm/webview-cdp.d.mts +5 -1
- package/dist/lib/esm/webview-cdp.mjs +6 -7
- package/package.json +24 -23
- package/dist/lib/cjs/native-dialog-monitor.cjs +0 -192
- package/dist/lib/cjs/native-dialog-monitor.d.cts +0 -66
- package/dist/lib/cjs/obsidian-namespace.cjs +0 -17
- package/dist/lib/cjs/obsidian-namespace.d.cts +0 -128
- package/dist/lib/esm/native-dialog-monitor.d.mts +0 -66
- package/dist/lib/esm/native-dialog-monitor.mjs +0 -158
- package/dist/lib/esm/obsidian-namespace.d.mts +0 -128
- package/dist/lib/esm/obsidian-namespace.mjs +0 -1
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var owned_instance_exit_marker_exports = {};
|
|
20
|
+
__export(owned_instance_exit_marker_exports, {
|
|
21
|
+
clearOwnedInstanceExitMarker: () => clearOwnedInstanceExitMarker,
|
|
22
|
+
readOwnedInstanceExitMarker: () => readOwnedInstanceExitMarker,
|
|
23
|
+
writeOwnedInstanceExitMarker: () => writeOwnedInstanceExitMarker
|
|
24
|
+
});
|
|
25
|
+
module.exports = __toCommonJS(owned_instance_exit_marker_exports);
|
|
26
|
+
var import_node_fs = require("node:fs");
|
|
27
|
+
var import_node_os = require("node:os");
|
|
28
|
+
var import_node_path = require("node:path");
|
|
29
|
+
var import_log = require("./log.cjs");
|
|
30
|
+
const MARKER_DIR_NAME = "obsidian-integration-testing";
|
|
31
|
+
const MARKER_FILE_SUFFIX = ".owned-instance-exit.json";
|
|
32
|
+
function clearOwnedInstanceExitMarker(port) {
|
|
33
|
+
try {
|
|
34
|
+
(0, import_node_fs.rmSync)(getMarkerFilePath(port), { force: true });
|
|
35
|
+
} catch (error) {
|
|
36
|
+
(0, import_log.log)(`[owned-instance-exit-marker] Could not remove the marker for port ${String(port)}: ${getErrorMessage(error)}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function readOwnedInstanceExitMarker(port) {
|
|
40
|
+
let parsed;
|
|
41
|
+
try {
|
|
42
|
+
parsed = JSON.parse((0, import_node_fs.readFileSync)(getMarkerFilePath(port), "utf-8"));
|
|
43
|
+
} catch {
|
|
44
|
+
return void 0;
|
|
45
|
+
}
|
|
46
|
+
return parseMarker(parsed, port);
|
|
47
|
+
}
|
|
48
|
+
function writeOwnedInstanceExitMarker(params) {
|
|
49
|
+
const marker = {
|
|
50
|
+
code: params.code,
|
|
51
|
+
exitedAtInMilliseconds: Date.now(),
|
|
52
|
+
outputTail: params.outputTail,
|
|
53
|
+
pid: params.pid,
|
|
54
|
+
port: params.port,
|
|
55
|
+
signal: params.signal,
|
|
56
|
+
...params.spawnError !== void 0 && { spawnError: params.spawnError }
|
|
57
|
+
};
|
|
58
|
+
try {
|
|
59
|
+
(0, import_node_fs.mkdirSync)(getMarkerDirectory(), { recursive: true });
|
|
60
|
+
(0, import_node_fs.writeFileSync)(getMarkerFilePath(marker.port), JSON.stringify(marker));
|
|
61
|
+
} catch (error) {
|
|
62
|
+
(0, import_log.log)(`[owned-instance-exit-marker] Could not record the exit on port ${String(marker.port)}: ${getErrorMessage(error)}`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function getErrorMessage(error) {
|
|
66
|
+
return error instanceof Error ? error.message : String(error);
|
|
67
|
+
}
|
|
68
|
+
function getMarkerDirectory() {
|
|
69
|
+
return (0, import_node_path.join)((0, import_node_os.tmpdir)(), MARKER_DIR_NAME);
|
|
70
|
+
}
|
|
71
|
+
function getMarkerFilePath(port) {
|
|
72
|
+
return (0, import_node_path.join)(getMarkerDirectory(), `${String(port)}${MARKER_FILE_SUFFIX}`);
|
|
73
|
+
}
|
|
74
|
+
function parseMarker(parsed, port) {
|
|
75
|
+
if (typeof parsed !== "object" || parsed === null) {
|
|
76
|
+
return void 0;
|
|
77
|
+
}
|
|
78
|
+
const record = parsed;
|
|
79
|
+
const { code, exitedAtInMilliseconds, outputTail, pid, port: markedPort, signal, spawnError } = record;
|
|
80
|
+
if (typeof exitedAtInMilliseconds !== "number" || markedPort !== port) {
|
|
81
|
+
return void 0;
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
code: typeof code === "number" ? code : null,
|
|
85
|
+
exitedAtInMilliseconds,
|
|
86
|
+
outputTail: typeof outputTail === "string" ? outputTail : "",
|
|
87
|
+
pid: typeof pid === "number" ? pid : void 0,
|
|
88
|
+
port,
|
|
89
|
+
signal: typeof signal === "string" ? signal : null,
|
|
90
|
+
...typeof spawnError === "string" && { spawnError }
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
94
|
+
0 && (module.exports = {
|
|
95
|
+
clearOwnedInstanceExitMarker,
|
|
96
|
+
readOwnedInstanceExitMarker,
|
|
97
|
+
writeOwnedInstanceExitMarker
|
|
98
|
+
});
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/owned-instance-exit-marker.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Records that the harness-owned Obsidian instance on a CDP port died, so a\n * process that did not spawn it can still say **why** it is unreachable.\n *\n * Only the process that launched the instance holds the child handle and sees\n * `exit`; the test workers get nothing but the port (see the repo's L9). So the\n * one fact worth having \u2014 the exit code \u2014 has to cross a process boundary, and\n * this is the channel: a small JSON sentinel next to the setup lock\n * (`setup-lock.ts`) and the Appium server marker (`appium-server-marker.ts`),\n * keyed by port.\n *\n * Written **only for a death the harness did not order.** A deliberate kill\n * (teardown, or the relaunch loop killing an instance before starting the next)\n * clears the marker instead, because a marker left behind by a clean run would\n * convict the next run's healthy instance of an exit that never happened.\n *\n * Reads are deliberately tolerant, exactly as the Appium marker's are: missing,\n * unreadable, or describing another port all read as \"no marker\", and the\n * caller falls back to saying only that the instance is gone.\n */\n\nimport {\n  mkdirSync,\n  readFileSync,\n  rmSync,\n  writeFileSync\n} from 'node:fs';\nimport { tmpdir } from 'node:os';\nimport { join } from 'node:path';\n\nimport { log } from './log.cjs';\n\nconst MARKER_DIR_NAME = 'obsidian-integration-testing';\nconst MARKER_FILE_SUFFIX = '.owned-instance-exit.json';\n\n/**\n * Records the death of the owned instance that was serving CDP on a port.\n */\nexport interface OwnedInstanceExitMarker {\n  /**\n  Exit code, or `null` when terminated by a signal or when it failed to spawn.\n   */\n  readonly code: null | number;\n\n  /**\n  When the instance exited (`Date.now()` epoch milliseconds).\n   */\n  readonly exitedAtInMilliseconds: number;\n\n  /**\n  The tail of everything the instance wrote to stdout/stderr (empty when it wrote nothing).\n   */\n  readonly outputTail: string;\n\n  /**\n  PID of the instance's process, or `undefined` when it never got one.\n   */\n  readonly pid: number | undefined;\n\n  /**\n  The CDP port the dead instance was serving.\n   */\n  readonly port: number;\n\n  /**\n  Terminating signal, or `null` when it exited normally or failed to spawn.\n   */\n  readonly signal: NodeJS.Signals | null;\n\n  /**\n  The spawn-failure message when the instance never started (e.g. `ENOENT`), otherwise absent.\n   */\n  readonly spawnError?: string | undefined;\n}\n\n/**\n * Parameters for {@link writeOwnedInstanceExitMarker}.\n */\nexport interface WriteOwnedInstanceExitMarkerParams {\n  /**\n  Exit code, or `null` when terminated by a signal or when it failed to spawn.\n   */\n  readonly code: null | number;\n\n  /**\n  The tail of everything the instance wrote to stdout/stderr.\n   */\n  readonly outputTail: string;\n\n  /**\n  PID of the instance's process, or `undefined` when it never got one.\n   */\n  readonly pid: number | undefined;\n\n  /**\n  The CDP port the dead instance was serving.\n   */\n  readonly port: number;\n\n  /**\n  Terminating signal, or `null` when it exited normally or failed to spawn.\n   */\n  readonly signal: NodeJS.Signals | null;\n\n  /**\n  The spawn-failure message when the instance never started, otherwise absent.\n   */\n  readonly spawnError?: string | undefined;\n}\n\n/**\n * Removes the marker for a port. Called when an instance is launched on it (a\n * recycled port must not inherit an older instance's death) and whenever the\n * harness kills an instance on purpose.\n *\n * @param port - The CDP port.\n */\nexport function clearOwnedInstanceExitMarker(port: number): void {\n  try {\n    rmSync(getMarkerFilePath(port), { force: true });\n  } catch (error: unknown) {\n    log(`[owned-instance-exit-marker] Could not remove the marker for port ${String(port)}: ${getErrorMessage(error)}`);\n  }\n}\n\n/**\n * Reads the marker for a port.\n *\n * @param port - The CDP port.\n * @returns The marker, or `undefined` when there is none, it is unreadable, or it does not describe this port.\n */\nexport function readOwnedInstanceExitMarker(port: number): OwnedInstanceExitMarker | undefined {\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(readFileSync(getMarkerFilePath(port), 'utf-8'));\n  } catch {\n    return undefined;\n  }\n\n  return parseMarker(parsed, port);\n}\n\n/**\n * Records that the instance serving a port has died, stamping it with the\n * current time so a reader can report how long ago it happened.\n *\n * @param params - The dead instance's port, exit details, and output tail.\n */\nexport function writeOwnedInstanceExitMarker(params: WriteOwnedInstanceExitMarkerParams): void {\n  const marker: OwnedInstanceExitMarker = {\n    code: params.code,\n    exitedAtInMilliseconds: Date.now(),\n    outputTail: params.outputTail,\n    pid: params.pid,\n    port: params.port,\n    signal: params.signal,\n    ...(params.spawnError !== undefined && { spawnError: params.spawnError })\n  };\n\n  try {\n    mkdirSync(getMarkerDirectory(), { recursive: true });\n    writeFileSync(getMarkerFilePath(marker.port), JSON.stringify(marker));\n  } catch (error: unknown) {\n    log(`[owned-instance-exit-marker] Could not record the exit on port ${String(marker.port)}: ${getErrorMessage(error)}`);\n  }\n}\n\nfunction getErrorMessage(error: unknown): string {\n  return error instanceof Error ? error.message : String(error);\n}\n\nfunction getMarkerDirectory(): string {\n  return join(tmpdir(), MARKER_DIR_NAME);\n}\n\nfunction getMarkerFilePath(port: number): string {\n  return join(getMarkerDirectory(), `${String(port)}${MARKER_FILE_SUFFIX}`);\n}\n\nfunction parseMarker(parsed: unknown, port: number): OwnedInstanceExitMarker | undefined {\n  if (typeof parsed !== 'object' || parsed === null) {\n    return undefined;\n  }\n\n  const record = parsed as Record<string, unknown>;\n  const { code, exitedAtInMilliseconds, outputTail, pid, port: markedPort, signal, spawnError } = record;\n\n  if (typeof exitedAtInMilliseconds !== 'number' || markedPort !== port) {\n    return undefined;\n  }\n\n  return {\n    code: typeof code === 'number' ? code : null,\n    exitedAtInMilliseconds,\n    outputTail: typeof outputTail === 'string' ? outputTail : '',\n    pid: typeof pid === 'number' ? pid : undefined,\n    port,\n    signal: typeof signal === 'string' ? signal as NodeJS.Signals : null,\n    ...(typeof spawnError === 'string' && { spawnError })\n  };\n}\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAuBA,qBAKO;AACP,qBAAuB;AACvB,uBAAqB;AAErB,iBAAoB;AAEpB,MAAM,kBAAkB;AACxB,MAAM,qBAAqB;AAoFpB,SAAS,6BAA6B,MAAoB;AAC/D,MAAI;AACF,+BAAO,kBAAkB,IAAI,GAAG,EAAE,OAAO,KAAK,CAAC;AAAA,EACjD,SAAS,OAAgB;AACvB,wBAAI,qEAAqE,OAAO,IAAI,CAAC,KAAK,gBAAgB,KAAK,CAAC,EAAE;AAAA,EACpH;AACF;AAQO,SAAS,4BAA4B,MAAmD;AAC7F,MAAI;AACJ,MAAI;AACF,aAAS,KAAK,UAAM,6BAAa,kBAAkB,IAAI,GAAG,OAAO,CAAC;AAAA,EACpE,QAAQ;AACN,WAAO;AAAA,EACT;AAEA,SAAO,YAAY,QAAQ,IAAI;AACjC;AAQO,SAAS,6BAA6B,QAAkD;AAC7F,QAAM,SAAkC;AAAA,IACtC,MAAM,OAAO;AAAA,IACb,wBAAwB,KAAK,IAAI;AAAA,IACjC,YAAY,OAAO;AAAA,IACnB,KAAK,OAAO;AAAA,IACZ,MAAM,OAAO;AAAA,IACb,QAAQ,OAAO;AAAA,IACf,GAAI,OAAO,eAAe,UAAa,EAAE,YAAY,OAAO,WAAW;AAAA,EACzE;AAEA,MAAI;AACF,kCAAU,mBAAmB,GAAG,EAAE,WAAW,KAAK,CAAC;AACnD,sCAAc,kBAAkB,OAAO,IAAI,GAAG,KAAK,UAAU,MAAM,CAAC;AAAA,EACtE,SAAS,OAAgB;AACvB,wBAAI,kEAAkE,OAAO,OAAO,IAAI,CAAC,KAAK,gBAAgB,KAAK,CAAC,EAAE;AAAA,EACxH;AACF;AAEA,SAAS,gBAAgB,OAAwB;AAC/C,SAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAC9D;AAEA,SAAS,qBAA6B;AACpC,aAAO,2BAAK,uBAAO,GAAG,eAAe;AACvC;AAEA,SAAS,kBAAkB,MAAsB;AAC/C,aAAO,uBAAK,mBAAmB,GAAG,GAAG,OAAO,IAAI,CAAC,GAAG,kBAAkB,EAAE;AAC1E;AAEA,SAAS,YAAY,QAAiB,MAAmD;AACvF,MAAI,OAAO,WAAW,YAAY,WAAW,MAAM;AACjD,WAAO;AAAA,EACT;AAEA,QAAM,SAAS;AACf,QAAM,EAAE,MAAM,wBAAwB,YAAY,KAAK,MAAM,YAAY,QAAQ,WAAW,IAAI;AAEhG,MAAI,OAAO,2BAA2B,YAAY,eAAe,MAAM;AACrE,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL,MAAM,OAAO,SAAS,WAAW,OAAO;AAAA,IACxC;AAAA,IACA,YAAY,OAAO,eAAe,WAAW,aAAa;AAAA,IAC1D,KAAK,OAAO,QAAQ,WAAW,MAAM;AAAA,IACrC;AAAA,IACA,QAAQ,OAAO,WAAW,WAAW,SAA2B;AAAA,IAChE,GAAI,OAAO,eAAe,YAAY,EAAE,WAAW;AAAA,EACrD;AACF;",
  "names": []
}

|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Records that the harness-owned Obsidian instance on a CDP port died, so a
|
|
5
|
+
* process that did not spawn it can still say **why** it is unreachable.
|
|
6
|
+
*
|
|
7
|
+
* Only the process that launched the instance holds the child handle and sees
|
|
8
|
+
* `exit`; the test workers get nothing but the port (see the repo's L9). So the
|
|
9
|
+
* one fact worth having — the exit code — has to cross a process boundary, and
|
|
10
|
+
* this is the channel: a small JSON sentinel next to the setup lock
|
|
11
|
+
* (`setup-lock.ts`) and the Appium server marker (`appium-server-marker.ts`),
|
|
12
|
+
* keyed by port.
|
|
13
|
+
*
|
|
14
|
+
* Written **only for a death the harness did not order.** A deliberate kill
|
|
15
|
+
* (teardown, or the relaunch loop killing an instance before starting the next)
|
|
16
|
+
* clears the marker instead, because a marker left behind by a clean run would
|
|
17
|
+
* convict the next run's healthy instance of an exit that never happened.
|
|
18
|
+
*
|
|
19
|
+
* Reads are deliberately tolerant, exactly as the Appium marker's are: missing,
|
|
20
|
+
* unreadable, or describing another port all read as "no marker", and the
|
|
21
|
+
* caller falls back to saying only that the instance is gone.
|
|
22
|
+
*/
|
|
23
|
+
/**
|
|
24
|
+
* Records the death of the owned instance that was serving CDP on a port.
|
|
25
|
+
*/
|
|
26
|
+
export interface OwnedInstanceExitMarker {
|
|
27
|
+
/**
|
|
28
|
+
Exit code, or `null` when terminated by a signal or when it failed to spawn.
|
|
29
|
+
*/
|
|
30
|
+
readonly code: null | number;
|
|
31
|
+
/**
|
|
32
|
+
When the instance exited (`Date.now()` epoch milliseconds).
|
|
33
|
+
*/
|
|
34
|
+
readonly exitedAtInMilliseconds: number;
|
|
35
|
+
/**
|
|
36
|
+
The tail of everything the instance wrote to stdout/stderr (empty when it wrote nothing).
|
|
37
|
+
*/
|
|
38
|
+
readonly outputTail: string;
|
|
39
|
+
/**
|
|
40
|
+
PID of the instance's process, or `undefined` when it never got one.
|
|
41
|
+
*/
|
|
42
|
+
readonly pid: number | undefined;
|
|
43
|
+
/**
|
|
44
|
+
The CDP port the dead instance was serving.
|
|
45
|
+
*/
|
|
46
|
+
readonly port: number;
|
|
47
|
+
/**
|
|
48
|
+
Terminating signal, or `null` when it exited normally or failed to spawn.
|
|
49
|
+
*/
|
|
50
|
+
readonly signal: NodeJS.Signals | null;
|
|
51
|
+
/**
|
|
52
|
+
The spawn-failure message when the instance never started (e.g. `ENOENT`), otherwise absent.
|
|
53
|
+
*/
|
|
54
|
+
readonly spawnError?: string | undefined;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Parameters for {@link writeOwnedInstanceExitMarker}.
|
|
58
|
+
*/
|
|
59
|
+
export interface WriteOwnedInstanceExitMarkerParams {
|
|
60
|
+
/**
|
|
61
|
+
Exit code, or `null` when terminated by a signal or when it failed to spawn.
|
|
62
|
+
*/
|
|
63
|
+
readonly code: null | number;
|
|
64
|
+
/**
|
|
65
|
+
The tail of everything the instance wrote to stdout/stderr.
|
|
66
|
+
*/
|
|
67
|
+
readonly outputTail: string;
|
|
68
|
+
/**
|
|
69
|
+
PID of the instance's process, or `undefined` when it never got one.
|
|
70
|
+
*/
|
|
71
|
+
readonly pid: number | undefined;
|
|
72
|
+
/**
|
|
73
|
+
The CDP port the dead instance was serving.
|
|
74
|
+
*/
|
|
75
|
+
readonly port: number;
|
|
76
|
+
/**
|
|
77
|
+
Terminating signal, or `null` when it exited normally or failed to spawn.
|
|
78
|
+
*/
|
|
79
|
+
readonly signal: NodeJS.Signals | null;
|
|
80
|
+
/**
|
|
81
|
+
The spawn-failure message when the instance never started, otherwise absent.
|
|
82
|
+
*/
|
|
83
|
+
readonly spawnError?: string | undefined;
|
|
84
|
+
}
|
|
85
|
+
/**
|
|
86
|
+
* Removes the marker for a port. Called when an instance is launched on it (a
|
|
87
|
+
* recycled port must not inherit an older instance's death) and whenever the
|
|
88
|
+
* harness kills an instance on purpose.
|
|
89
|
+
*
|
|
90
|
+
* @param port - The CDP port.
|
|
91
|
+
*/
|
|
92
|
+
export declare function clearOwnedInstanceExitMarker(port: number): void;
|
|
93
|
+
/**
|
|
94
|
+
* Reads the marker for a port.
|
|
95
|
+
*
|
|
96
|
+
* @param port - The CDP port.
|
|
97
|
+
* @returns The marker, or `undefined` when there is none, it is unreadable, or it does not describe this port.
|
|
98
|
+
*/
|
|
99
|
+
export declare function readOwnedInstanceExitMarker(port: number): OwnedInstanceExitMarker | undefined;
|
|
100
|
+
/**
|
|
101
|
+
* Records that the instance serving a port has died, stamping it with the
|
|
102
|
+
* current time so a reader can report how long ago it happened.
|
|
103
|
+
*
|
|
104
|
+
* @param params - The dead instance's port, exit details, and output tail.
|
|
105
|
+
*/
|
|
106
|
+
export declare function writeOwnedInstanceExitMarker(params: WriteOwnedInstanceExitMarkerParams): void;
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var owned_instance_exited_error_exports = {};
|
|
20
|
+
__export(owned_instance_exited_error_exports, {
|
|
21
|
+
OwnedInstanceExitedError: () => OwnedInstanceExitedError,
|
|
22
|
+
buildOwnedInstanceExitedErrorFromMarker: () => buildOwnedInstanceExitedErrorFromMarker
|
|
23
|
+
});
|
|
24
|
+
module.exports = __toCommonJS(owned_instance_exited_error_exports);
|
|
25
|
+
var import_process_exit_message = require("./process-exit-message.cjs");
|
|
26
|
+
const MILLISECONDS_PER_SECOND = 1e3;
|
|
27
|
+
class OwnedInstanceExitedError extends Error {
|
|
28
|
+
/**
|
|
29
|
+
The CDP URL the dead instance was serving.
|
|
30
|
+
*/
|
|
31
|
+
cdpUrl;
|
|
32
|
+
/**
|
|
33
|
+
Exit code, when known.
|
|
34
|
+
*/
|
|
35
|
+
code;
|
|
36
|
+
/**
|
|
37
|
+
When the instance exited (`Date.now()` epoch milliseconds), when known.
|
|
38
|
+
*/
|
|
39
|
+
exitedAtInMilliseconds;
|
|
40
|
+
/**
|
|
41
|
+
Terminating signal, when known.
|
|
42
|
+
*/
|
|
43
|
+
signal;
|
|
44
|
+
/**
|
|
45
|
+
* Creates the error from whatever is known about the instance's death.
|
|
46
|
+
*
|
|
47
|
+
* @param params - The CDP URL, and the exit details when they are available.
|
|
48
|
+
*/
|
|
49
|
+
constructor(params) {
|
|
50
|
+
super(buildMessage(params));
|
|
51
|
+
this.name = "OwnedInstanceExitedError";
|
|
52
|
+
this.cdpUrl = params.cdpUrl;
|
|
53
|
+
this.code = params.code;
|
|
54
|
+
this.exitedAtInMilliseconds = params.exitedAtInMilliseconds;
|
|
55
|
+
this.signal = params.signal;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
function buildOwnedInstanceExitedErrorFromMarker(cdpUrl, marker) {
|
|
59
|
+
if (!marker) {
|
|
60
|
+
return new OwnedInstanceExitedError({ cdpUrl });
|
|
61
|
+
}
|
|
62
|
+
return new OwnedInstanceExitedError({
|
|
63
|
+
cdpUrl,
|
|
64
|
+
code: marker.code,
|
|
65
|
+
exitedAtInMilliseconds: marker.exitedAtInMilliseconds,
|
|
66
|
+
outputTail: marker.outputTail,
|
|
67
|
+
pid: marker.pid,
|
|
68
|
+
signal: marker.signal,
|
|
69
|
+
spawnError: marker.spawnError
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
function buildMessage(params) {
|
|
73
|
+
const message = `The harness-owned Obsidian instance at ${params.cdpUrl} is gone: ${describeExit(params)}. Whatever ran after it had no app to talk to, so these failures are not test results \u2014 look for the \`!!! OWNED OBSIDIAN EXITED\` line in the run log for the moment it happened.`;
|
|
74
|
+
return (0, import_process_exit_message.appendProcessOutputTail)(message, { output: params.outputTail ?? "", outputLabel: "Obsidian output" });
|
|
75
|
+
}
|
|
76
|
+
function describeExit(params) {
|
|
77
|
+
if (params.spawnError !== void 0) {
|
|
78
|
+
return `it failed to start (${params.spawnError})`;
|
|
79
|
+
}
|
|
80
|
+
if (params.code === void 0 && params.signal === void 0) {
|
|
81
|
+
return "it exited at some point during this run, and the harness recorded nothing about how (the run that owns it logs the exit code; a worker sees only what the exit marker preserved)";
|
|
82
|
+
}
|
|
83
|
+
return `${describeProcess(params)} ${describeReason(params)}${describeWhen(params.exitedAtInMilliseconds)}`;
|
|
84
|
+
}
|
|
85
|
+
function describeProcess(params) {
|
|
86
|
+
return params.pid === void 0 ? "it" : `its process (pid ${String(params.pid)})`;
|
|
87
|
+
}
|
|
88
|
+
function describeReason(params) {
|
|
89
|
+
if (params.signal !== void 0 && params.signal !== null) {
|
|
90
|
+
return `was terminated by signal ${params.signal}`;
|
|
91
|
+
}
|
|
92
|
+
return params.code === void 0 || params.code === null ? "exited with no exit code" : `exited with code ${String(params.code)}`;
|
|
93
|
+
}
|
|
94
|
+
function describeWhen(exitedAtInMilliseconds) {
|
|
95
|
+
if (exitedAtInMilliseconds === void 0) {
|
|
96
|
+
return "";
|
|
97
|
+
}
|
|
98
|
+
const elapsedInSeconds = Math.max(0, Math.round((Date.now() - exitedAtInMilliseconds) / MILLISECONDS_PER_SECOND));
|
|
99
|
+
return ` ${String(elapsedInSeconds)}s ago, at ${new Date(exitedAtInMilliseconds).toISOString()}`;
|
|
100
|
+
}
|
|
101
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
102
|
+
0 && (module.exports = {
|
|
103
|
+
OwnedInstanceExitedError,
|
|
104
|
+
buildOwnedInstanceExitedErrorFromMarker
|
|
105
|
+
});
|
|
106
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/owned-instance-exited-error.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * The distinct error thrown when the harness-owned Obsidian instance is gone \u2014\n * it exited, and the CDP endpoint it was serving answers nothing.\n *\n * It exists to replace an anonymous cascade with one named cause. Before it,\n * every test file scheduled after a mid-run death failed in ~60\u201390 ms with\n * `TypeError: fetch failed` wrapping `connect ECONNREFUSED 127.0.0.1:<port>` \u2014\n * measured at **156 such failures across 21 files** in `obsidian-patterns` on\n * 2026-09-05, not one of them a test result. The absence of an app is not a test\n * outcome, and this error says so in the words a reader needs: the instance\n * died, here is its exit code, and these failures are not about your code.\n *\n * Exported so callers can `instanceof`-match it, like `SilentAsarFallbackError`\n * and `RendererFailedToInitializeError`.\n */\n\nimport type { OwnedInstanceExitMarker } from './owned-instance-exit-marker.cjs';\n\nimport { appendProcessOutputTail } from './process-exit-message.cjs';\n\nconst MILLISECONDS_PER_SECOND = 1000;\n\n/**\n * Parameters for the {@link OwnedInstanceExitedError} constructor.\n *\n * Everything but the URL is optional: the exit details come from the process\n * that launched the instance, and a caller in another process has them only\n * when the exit marker survived (see `owned-instance-exit-marker.ts`).\n */\nexport interface OwnedInstanceExitedErrorConstructorParams {\n  /**\n  The CDP URL the dead instance was serving.\n   */\n  readonly cdpUrl: string;\n\n  /**\n  Exit code, when known.\n   */\n  readonly code?: null | number | undefined;\n\n  /**\n  When the instance exited (`Date.now()` epoch milliseconds), when known.\n   */\n  readonly exitedAtInMilliseconds?: number | undefined;\n\n  /**\n  The tail of what the instance wrote to stdout/stderr, when any was captured.\n   */\n  readonly outputTail?: string | undefined;\n\n  /**\n  PID of the dead instance, when known.\n   */\n  readonly pid?: number | undefined;\n\n  /**\n  Terminating signal, when known.\n   */\n  readonly signal?: NodeJS.Signals | null | undefined;\n\n  /**\n  The spawn-failure message when the instance never started, otherwise absent.\n   */\n  readonly spawnError?: string | undefined;\n}\n\n/**\n * Thrown when the harness-owned Obsidian instance has exited and its CDP\n * endpoint is therefore unreachable. Carries whatever is known about the death\n * \u2014 exit code, signal, when it happened, and the output tail \u2014 so the failure\n * names its own cause instead of a refused connection.\n */\nexport class OwnedInstanceExitedError extends Error {\n  /**\n  The CDP URL the dead instance was serving.\n   */\n  public readonly cdpUrl: string;\n\n  /**\n  Exit code, when known.\n   */\n  public readonly code: null | number | undefined;\n\n  /**\n  When the instance exited (`Date.now()` epoch milliseconds), when known.\n   */\n  public readonly exitedAtInMilliseconds: number | undefined;\n\n  /**\n  Terminating signal, when known.\n   */\n  public readonly signal: NodeJS.Signals | null | undefined;\n\n  /**\n   * Creates the error from whatever is known about the instance's death.\n   *\n   * @param params - The CDP URL, and the exit details when they are available.\n   */\n  public constructor(params: OwnedInstanceExitedErrorConstructorParams) {\n    super(buildMessage(params));\n    this.name = 'OwnedInstanceExitedError';\n    this.cdpUrl = params.cdpUrl;\n    this.code = params.code;\n    this.exitedAtInMilliseconds = params.exitedAtInMilliseconds;\n    this.signal = params.signal;\n  }\n}\n\n/**\n * Builds the error from an exit marker, for a process that did not launch the\n * instance and so has nothing else to go on.\n *\n * A missing marker is expected rather than exceptional \u2014 it is cleared on every\n * deliberate kill, and a hard enough kill records nothing \u2014 so the error is\n * still built, naming the instance without claiming to know how it died.\n *\n * @param cdpUrl - The CDP URL the dead instance was serving.\n * @param marker - The exit marker read for its port, or `undefined` when there is none.\n * @returns The error to throw in place of a refused connection.\n */\nexport function buildOwnedInstanceExitedErrorFromMarker(cdpUrl: string, marker: OwnedInstanceExitMarker | undefined): OwnedInstanceExitedError {\n  if (!marker) {\n    return new OwnedInstanceExitedError({ cdpUrl });\n  }\n\n  return new OwnedInstanceExitedError({\n    cdpUrl,\n    code: marker.code,\n    exitedAtInMilliseconds: marker.exitedAtInMilliseconds,\n    outputTail: marker.outputTail,\n    pid: marker.pid,\n    signal: marker.signal,\n    spawnError: marker.spawnError\n  });\n}\n\nfunction buildMessage(params: OwnedInstanceExitedErrorConstructorParams): string {\n  const message = `The harness-owned Obsidian instance at ${params.cdpUrl} is gone: ${describeExit(params)}. `\n    + 'Whatever ran after it had no app to talk to, so these failures are not test results \u2014 '\n    + 'look for the `!!! OWNED OBSIDIAN EXITED` line in the run log for the moment it happened.';\n\n  return appendProcessOutputTail(message, { output: params.outputTail ?? '', outputLabel: 'Obsidian output' });\n}\n\nfunction describeExit(params: OwnedInstanceExitedErrorConstructorParams): string {\n  if (params.spawnError !== undefined) {\n    return `it failed to start (${params.spawnError})`;\n  }\n\n  if (params.code === undefined && params.signal === undefined) {\n    return 'it exited at some point during this run, and the harness recorded nothing about how '\n      + '(the run that owns it logs the exit code; a worker sees only what the exit marker preserved)';\n  }\n\n  return `${describeProcess(params)} ${describeReason(params)}${describeWhen(params.exitedAtInMilliseconds)}`;\n}\n\nfunction describeProcess(params: OwnedInstanceExitedErrorConstructorParams): string {\n  return params.pid === undefined ? 'it' : `its process (pid ${String(params.pid)})`;\n}\n\nfunction describeReason(params: OwnedInstanceExitedErrorConstructorParams): string {\n  if (params.signal !== undefined && params.signal !== null) {\n    return `was terminated by signal ${params.signal}`;\n  }\n\n  return params.code === undefined || params.code === null ? 'exited with no exit code' : `exited with code ${String(params.code)}`;\n}\n\nfunction describeWhen(exitedAtInMilliseconds: number | undefined): string {\n  if (exitedAtInMilliseconds === undefined) {\n    return '';\n  }\n\n  const elapsedInSeconds = Math.max(0, Math.round((Date.now() - exitedAtInMilliseconds) / MILLISECONDS_PER_SECOND));\n  return ` ${String(elapsedInSeconds)}s ago, at ${new Date(exitedAtInMilliseconds).toISOString()}`;\n}\n"],
  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAoBA,kCAAwC;AAExC,MAAM,0BAA0B;AAoDzB,MAAM,iCAAiC,MAAM;AAAA;AAAA;AAAA;AAAA,EAIlC;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA,EAKA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOT,YAAY,QAAmD;AACpE,UAAM,aAAa,MAAM,CAAC;AAC1B,SAAK,OAAO;AACZ,SAAK,SAAS,OAAO;AACrB,SAAK,OAAO,OAAO;AACnB,SAAK,yBAAyB,OAAO;AACrC,SAAK,SAAS,OAAO;AAAA,EACvB;AACF;AAcO,SAAS,wCAAwC,QAAgB,QAAuE;AAC7I,MAAI,CAAC,QAAQ;AACX,WAAO,IAAI,yBAAyB,EAAE,OAAO,CAAC;AAAA,EAChD;AAEA,SAAO,IAAI,yBAAyB;AAAA,IAClC;AAAA,IACA,MAAM,OAAO;AAAA,IACb,wBAAwB,OAAO;AAAA,IAC/B,YAAY,OAAO;AAAA,IACnB,KAAK,OAAO;AAAA,IACZ,QAAQ,OAAO;AAAA,IACf,YAAY,OAAO;AAAA,EACrB,CAAC;AACH;AAEA,SAAS,aAAa,QAA2D;AAC/E,QAAM,UAAU,0CAA0C,OAAO,MAAM,aAAa,aAAa,MAAM,CAAC;AAIxG,aAAO,qDAAwB,SAAS,EAAE,QAAQ,OAAO,cAAc,IAAI,aAAa,kBAAkB,CAAC;AAC7G;AAEA,SAAS,aAAa,QAA2D;AAC/E,MAAI,OAAO,eAAe,QAAW;AACnC,WAAO,uBAAuB,OAAO,UAAU;AAAA,EACjD;AAEA,MAAI,OAAO,SAAS,UAAa,OAAO,WAAW,QAAW;AAC5D,WAAO;AAAA,EAET;AAEA,SAAO,GAAG,gBAAgB,MAAM,CAAC,IAAI,eAAe,MAAM,CAAC,GAAG,aAAa,OAAO,sBAAsB,CAAC;AAC3G;AAEA,SAAS,gBAAgB,QAA2D;AAClF,SAAO,OAAO,QAAQ,SAAY,OAAO,oBAAoB,OAAO,OAAO,GAAG,CAAC;AACjF;AAEA,SAAS,eAAe,QAA2D;AACjF,MAAI,OAAO,WAAW,UAAa,OAAO,WAAW,MAAM;AACzD,WAAO,4BAA4B,OAAO,MAAM;AAAA,EAClD;AAEA,SAAO,OAAO,SAAS,UAAa,OAAO,SAAS,OAAO,6BAA6B,oBAAoB,OAAO,OAAO,IAAI,CAAC;AACjI;AAEA,SAAS,aAAa,wBAAoD;AACxE,MAAI,2BAA2B,QAAW;AACxC,WAAO;AAAA,EACT;AAEA,QAAM,mBAAmB,KAAK,IAAI,GAAG,KAAK,OAAO,KAAK,IAAI,IAAI,0BAA0B,uBAAuB,CAAC;AAChH,SAAO,IAAI,OAAO,gBAAgB,CAAC,aAAa,IAAI,KAAK,sBAAsB,EAAE,YAAY,CAAC;AAChG;",
  "names": []
}

|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* The distinct error thrown when the harness-owned Obsidian instance is gone —
|
|
5
|
+
* it exited, and the CDP endpoint it was serving answers nothing.
|
|
6
|
+
*
|
|
7
|
+
* It exists to replace an anonymous cascade with one named cause. Before it,
|
|
8
|
+
* every test file scheduled after a mid-run death failed in ~60–90 ms with
|
|
9
|
+
* `TypeError: fetch failed` wrapping `connect ECONNREFUSED 127.0.0.1:<port>` —
|
|
10
|
+
* measured at **156 such failures across 21 files** in `obsidian-patterns` on
|
|
11
|
+
* 2026-09-05, not one of them a test result. The absence of an app is not a test
|
|
12
|
+
* outcome, and this error says so in the words a reader needs: the instance
|
|
13
|
+
* died, here is its exit code, and these failures are not about your code.
|
|
14
|
+
*
|
|
15
|
+
* Exported so callers can `instanceof`-match it, like `SilentAsarFallbackError`
|
|
16
|
+
* and `RendererFailedToInitializeError`.
|
|
17
|
+
*/
|
|
18
|
+
import type { OwnedInstanceExitMarker } from './owned-instance-exit-marker.cjs';
|
|
19
|
+
/**
|
|
20
|
+
* Parameters for the {@link OwnedInstanceExitedError} constructor.
|
|
21
|
+
*
|
|
22
|
+
* Everything but the URL is optional: the exit details come from the process
|
|
23
|
+
* that launched the instance, and a caller in another process has them only
|
|
24
|
+
* when the exit marker survived (see `owned-instance-exit-marker.ts`).
|
|
25
|
+
*/
|
|
26
|
+
export interface OwnedInstanceExitedErrorConstructorParams {
|
|
27
|
+
/**
|
|
28
|
+
The CDP URL the dead instance was serving.
|
|
29
|
+
*/
|
|
30
|
+
readonly cdpUrl: string;
|
|
31
|
+
/**
|
|
32
|
+
Exit code, when known.
|
|
33
|
+
*/
|
|
34
|
+
readonly code?: null | number | undefined;
|
|
35
|
+
/**
|
|
36
|
+
When the instance exited (`Date.now()` epoch milliseconds), when known.
|
|
37
|
+
*/
|
|
38
|
+
readonly exitedAtInMilliseconds?: number | undefined;
|
|
39
|
+
/**
|
|
40
|
+
The tail of what the instance wrote to stdout/stderr, when any was captured.
|
|
41
|
+
*/
|
|
42
|
+
readonly outputTail?: string | undefined;
|
|
43
|
+
/**
|
|
44
|
+
PID of the dead instance, when known.
|
|
45
|
+
*/
|
|
46
|
+
readonly pid?: number | undefined;
|
|
47
|
+
/**
|
|
48
|
+
Terminating signal, when known.
|
|
49
|
+
*/
|
|
50
|
+
readonly signal?: NodeJS.Signals | null | undefined;
|
|
51
|
+
/**
|
|
52
|
+
The spawn-failure message when the instance never started, otherwise absent.
|
|
53
|
+
*/
|
|
54
|
+
readonly spawnError?: string | undefined;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Thrown when the harness-owned Obsidian instance has exited and its CDP
|
|
58
|
+
* endpoint is therefore unreachable. Carries whatever is known about the death
|
|
59
|
+
* — exit code, signal, when it happened, and the output tail — so the failure
|
|
60
|
+
* names its own cause instead of a refused connection.
|
|
61
|
+
*/
|
|
62
|
+
export declare class OwnedInstanceExitedError extends Error {
|
|
63
|
+
/**
|
|
64
|
+
The CDP URL the dead instance was serving.
|
|
65
|
+
*/
|
|
66
|
+
readonly cdpUrl: string;
|
|
67
|
+
/**
|
|
68
|
+
Exit code, when known.
|
|
69
|
+
*/
|
|
70
|
+
readonly code: null | number | undefined;
|
|
71
|
+
/**
|
|
72
|
+
When the instance exited (`Date.now()` epoch milliseconds), when known.
|
|
73
|
+
*/
|
|
74
|
+
readonly exitedAtInMilliseconds: number | undefined;
|
|
75
|
+
/**
|
|
76
|
+
Terminating signal, when known.
|
|
77
|
+
*/
|
|
78
|
+
readonly signal: NodeJS.Signals | null | undefined;
|
|
79
|
+
/**
|
|
80
|
+
* Creates the error from whatever is known about the instance's death.
|
|
81
|
+
*
|
|
82
|
+
* @param params - The CDP URL, and the exit details when they are available.
|
|
83
|
+
*/
|
|
84
|
+
constructor(params: OwnedInstanceExitedErrorConstructorParams);
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Builds the error from an exit marker, for a process that did not launch the
|
|
88
|
+
* instance and so has nothing else to go on.
|
|
89
|
+
*
|
|
90
|
+
* A missing marker is expected rather than exceptional — it is cleared on every
|
|
91
|
+
* deliberate kill, and a hard enough kill records nothing — so the error is
|
|
92
|
+
* still built, naming the instance without claiming to know how it died.
|
|
93
|
+
*
|
|
94
|
+
* @param cdpUrl - The CDP URL the dead instance was serving.
|
|
95
|
+
* @param marker - The exit marker read for its port, or `undefined` when there is none.
|
|
96
|
+
* @returns The error to throw in place of a refused connection.
|
|
97
|
+
*/
|
|
98
|
+
export declare function buildOwnedInstanceExitedErrorFromMarker(cdpUrl: string, marker: OwnedInstanceExitMarker | undefined): OwnedInstanceExitedError;
|
|
@@ -22,17 +22,21 @@ __export(owned_vault_seed_exports, {
|
|
|
22
22
|
});
|
|
23
23
|
module.exports = __toCommonJS(owned_vault_seed_exports);
|
|
24
24
|
function buildOwnedObsidianJson(params) {
|
|
25
|
+
const shouldAutoOpenVault = params.shouldAutoOpenVault ?? true;
|
|
26
|
+
const entry = shouldAutoOpenVault ? { open: true, path: params.vaultPath, ts: params.ts } : { path: params.vaultPath, ts: params.ts };
|
|
25
27
|
return {
|
|
28
|
+
// Spread rather than `last_open: undefined`, so the key is genuinely absent from
|
|
29
|
+
// The written JSON: this seed is read by Obsidian versions spanning a decade, and
|
|
30
|
+
// A present-but-undefined auto-open marker is not a shape any of them was tested
|
|
31
|
+
// Against.
|
|
26
32
|
// eslint-disable-next-line camelcase -- Obsidian's own obsidian.json field name (old versions' auto-open marker).
|
|
27
|
-
last_open: params.vaultId,
|
|
33
|
+
...shouldAutoOpenVault && { last_open: params.vaultId },
|
|
28
34
|
updateDisabled: true,
|
|
29
|
-
vaults: {
|
|
30
|
-
[params.vaultId]: { open: true, path: params.vaultPath, ts: params.ts }
|
|
31
|
-
}
|
|
35
|
+
vaults: { [params.vaultId]: entry }
|
|
32
36
|
};
|
|
33
37
|
}
|
|
34
38
|
// Annotate the CommonJS export names for ESM import in node:
|
|
35
39
|
0 && (module.exports = {
|
|
36
40
|
buildOwnedObsidianJson
|
|
37
41
|
});
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL293bmVkLXZhdWx0LXNlZWQudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbIi8qKlxuICogQGZpbGVcbiAqXG4gKiBCdWlsZHMgdGhlIGlzb2xhdGVkIGBvYnNpZGlhbi5qc29uYCB0aGUgaGFybmVzcyBwcmUtc2VlZHMgaW50byBhbiBvd25lZFxuICogaW5zdGFuY2UncyB0ZW1wIGAtLXVzZXItZGF0YS1kaXJgIHNvIE9ic2lkaWFuIG9wZW5zIHRoZSBoYXJuZXNzIHZhdWx0IGRpcmVjdGx5XG4gKiBpbnN0ZWFkIG9mIHNob3dpbmcgdGhlIGZpcnN0LXJ1biB2YXVsdC1zZWxlY3RvciAodGhlIGBzdGFydGVyLXNjcmVlbmApLlxuICpcbiAqIFRoZSBhdXRvLW9wZW4gbWFya2VyIGNoYW5nZWQgYWNyb3NzIE9ic2lkaWFuJ3MgaGlzdG9yeSwgc28gdGhlIHNlZWQgY2Fycmllc1xuICogQk9USCBmb3JtcyBhbmQgZWFjaCB2ZXJzaW9uIHJlYWRzIHRoZSBvbmUgaXQgdW5kZXJzdGFuZHMgKGlnbm9yaW5nIHRoZSBvdGhlclxuICogdW5rbm93biBrZXkpIFx1MjAxNCBubyBwZXItdmVyc2lvbiBicmFuY2hpbmc6XG4gKlxuICogLSAqKk9sZCB2ZXJzaW9ucyoqIChjb25maXJtZWQgMC42LjQpIGF1dG8tb3BlbiBmcm9tIGEgKip0b3AtbGV2ZWwgYGxhc3Rfb3BlbmAqKlxuICogICBob2xkaW5nIHRoZSB2YXVsdCBpZCAoYG1haW4uanNgOiBgaWYgKGlkICYmIHZhdWx0cy5oYXNPd25Qcm9wZXJ0eShpZCkpXG4gKiAgIGNyZWF0ZVdpbmRvdyhpZCk7IGVsc2Ugb3BlblN0YXJ0ZXIoKTtgKSwgYW5kIHN0b3JlIGVhY2ggdmF1bHQgZW50cnkgYXMganVzdFxuICogICBgeyBwYXRoLCB0cyB9YC4gV2l0aG91dCBgbGFzdF9vcGVuYCB0aGV5IGZhbGwgdGhyb3VnaCB0byB0aGUgdmF1bHQtc2VsZWN0b3IuXG4gKiAtICoqTmV3ZXIgdmVyc2lvbnMqKiAoY29uZmlybWVkIDAuMTQuNSspIGRyb3BwZWQgYGxhc3Rfb3BlbmAgYW5kIGF1dG8tb3BlbiBmcm9tXG4gKiAgIHRoZSBwZXItZW50cnkgKipgb3BlbjogdHJ1ZWAqKiBmbGFnLlxuICpcbiAqIFNlZWRpbmcgYm90aCB3YXMgdmVyaWZpZWQgdG8gb3BlbiB0aGUgdmF1bHQgZGlyZWN0bHkgKG5vIHNlbGVjdG9yKSBvbiAwLjYuNCxcbiAqIDAuOS4yMCwgMC4xMi4xOSwgMC4xMy4xOSwgMC4xNC41IGFuZCAxLjEyLjcuIGB1cGRhdGVEaXNhYmxlZGAgc3VwcHJlc3NlcyB0aGVcbiAqIHRocm93YXdheSBpbnN0YW5jZSdzIHNlbGYtdXBkYXRlLlxuICpcbiAqIEJvdGggbWFya2VycyBjYW4gYWxzbyBiZSAqKndpdGhoZWxkKiogXHUyMDE0IHNlZVxuICoge0BsaW5rIEJ1aWxkT3duZWRPYnNpZGlhbkpzb25QYXJhbXMuc2hvdWxkQXV0b09wZW5WYXVsdH0uIFRoZSBvbmUgY2FsbGVyIHRoYXRcbiAqIGRvZXMgc28gd2FudHMgdGhlIHN0YXJ0ZXIgc2NyZWVuIG9uIHB1cnBvc2U6IGEgYGNvbmZpZ0RpcmVjdG9yeWAgb3ZlcnJpZGUgaXMgYVxuICogYGxvY2FsU3RvcmFnZWAgZW50cnksIGFuZCBgbG9jYWxTdG9yYWdlYCBvbmx5IGV4aXN0cyBvbmNlIGEgcmVuZGVyZXIgZG9lcywgc29cbiAqIHRoZSBvdmVycmlkZSBoYXMgdG8gYmUgd3JpdHRlbiBpbiB0aGUgc3RhcnRlciBzY3JlZW4ncyByZW5kZXJlciBiZWZvcmUgdGhlXG4gKiB2YXVsdCdzIG93biB3aW5kb3cgaXMgY3JlYXRlZC4gVGhlIHZhdWx0IHN0YXlzIHJlZ2lzdGVyZWQgdW5kZXIgdGhlIGhhcm5lc3Mnc1xuICogaWQgZWl0aGVyIHdheSwgYW5kIHRoZSBsYXRlciBgdmF1bHQtb3BlbmAgSVBDIHJldXNlcyB0aGF0IGlkICh2ZXJpZmllZCBvblxuICogMS4xMy43KSByYXRoZXIgdGhhbiBtaW50aW5nIGEgc2Vjb25kIGVudHJ5IFx1MjAxNCB3aGljaCBpcyB3aGF0IG1ha2VzIHRoZVxuICogYDx2YXVsdElkPi1jb25maWdgIGtleSBuYW1lIGtub3dhYmxlIGJlZm9yZSBsYXVuY2guXG4gKi9cblxuLyoqXG4gKiBQYXJhbWV0ZXJzIGZvciB7QGxpbmsgYnVpbGRPd25lZE9ic2lkaWFuSnNvbn0uXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgQnVpbGRPd25lZE9ic2lkaWFuSnNvblBhcmFtcyB7XG4gIC8qKlxuICAgKiBXaGV0aGVyIHRvIGluY2x1ZGUgdGhlIGF1dG8tb3BlbiBtYXJrZXJzLCBzbyBPYnNpZGlhbiBvcGVucyB0aGUgdmF1bHRcbiAgICogZGlyZWN0bHkgaW5zdGVhZCBvZiBzaG93aW5nIHRoZSBzdGFydGVyIHNjcmVlbi4gUGFzcyBgZmFsc2VgIHRvIGtlZXAgdGhlXG4gICAqIHZhdWx0IHJlZ2lzdGVyZWQgYnV0IGNsb3NlZCBcdTIwMTQgdGhlIGNhbGxlciB0aGVuIG9wZW5zIGl0IGl0c2VsZiwgb3ZlciB0aGVcbiAgICogYHZhdWx0LW9wZW5gIElQQywgb25jZSBpdCBoYXMgcHJlcGFyZWQgdGhlIHN0YXJ0ZXIgc2NyZWVuJ3MgcmVuZGVyZXIuXG4gICAqXG4gICAqIEBkZWZhdWx0IGB0cnVlYFxuICAgKi9cbiAgcmVhZG9ubHkgc2hvdWxkQXV0b09wZW5WYXVsdD86IGJvb2xlYW47XG5cbiAgLyoqXG4gIExhc3QtYWNjZXNzIHRpbWVzdGFtcCB0byBzdGFtcCBvbiB0aGUgdmF1bHQgZW50cnkuXG4gICAqL1xuICByZWFkb25seSB0czogbnVtYmVyO1xuXG4gIC8qKlxuICBUaGUgcmFuZG9tbHktZ2VuZXJhdGVkIHZhdWx0IGlkIHVzZWQgYXMgdGhlIHJlZ2lzdHJ5IGtleSBhbmQgYGxhc3Rfb3BlbmAuXG4gICAqL1xuICByZWFkb25seSB2YXVsdElkOiBzdHJpbmc7XG5cbiAgLyoqXG4gIEFic29sdXRlIHBhdGggdG8gdGhlIGhhcm5lc3MgdmF1bHQgZm9sZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgdmF1bHRQYXRoOiBzdHJpbmc7XG59XG5cbi8qKlxuICogVGhlIGBvYnNpZGlhbi5qc29uYCBzdHJ1Y3R1cmUgdGhlIGhhcm5lc3Mgc2VlZHMgZm9yIGFuIG93bmVkIGluc3RhbmNlLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIE93bmVkT2JzaWRpYW5Kc29uIHtcbiAgLyoqXG4gICAqIFRvcC1sZXZlbCBhdXRvLW9wZW4gbWFya2VyICh2YXVsdCBpZCkgaG9ub3JlZCBieSBvbGQgT2JzaWRpYW4gdmVyc2lvbnM7XG4gICAqIGlnbm9yZWQgYXMgYW4gdW5rbm93biBrZXkgYnkgbmV3ZXIgdmVyc2lvbnMgdGhhdCB1c2UgdGhlIHBlci1lbnRyeSBgb3BlbmAuXG4gICAqIE9taXR0ZWQgd2hlbiB0aGUgY2FsbGVyIHdpdGhoZWxkIHRoZSBhdXRvLW9wZW4gbWFya2Vycy5cbiAgICovXG4gIHJlYWRvbmx5IGxhc3Rfb3Blbj86IHN0cmluZztcblxuICAvKipcbiAgRGlzYWJsZXMgdGhlIHRocm93YXdheSBpbnN0YW5jZSdzIHNlbGYtdXBkYXRlLlxuICAgKi9cbiAgcmVhZG9ubHkgdXBkYXRlRGlzYWJsZWQ6IHRydWU7XG5cbiAgLyoqXG4gIFZhdWx0IHJlZ2lzdHJ5IGtleWVkIGJ5IHZhdWx0IGlkLlxuICAgKi9cbiAgcmVhZG9ubHkgdmF1bHRzOiBSZWFkb25seTxSZWNvcmQ8c3RyaW5nLCBPd25lZE9ic2lkaWFuVmF1bHRFbnRyeT4+O1xufVxuXG4vKipcbiAqIEEgc2luZ2xlIHZhdWx0IGVudHJ5IGluIHRoZSBzZWVkZWQgYG9ic2lkaWFuLmpzb25gLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIE93bmVkT2JzaWRpYW5WYXVsdEVudHJ5IHtcbiAgLyoqXG4gICAqIFBlci1lbnRyeSBhdXRvLW9wZW4gZmxhZyBob25vcmVkIGJ5IG5ld2VyIE9ic2lkaWFuIHZlcnNpb25zLiBPbWl0dGVkIHdoZW5cbiAgICogdGhlIGNhbGxlciB3aXRoaGVsZCB0aGUgYXV0by1vcGVuIG1hcmtlcnMuXG4gICAqL1xuICByZWFkb25seSBvcGVuPzogdHJ1ZTtcblxuICAvKipcbiAgQWJzb2x1dGUgcGF0aCB0byB0aGUgaGFybmVzcyB2YXVsdCBmb2xkZXIuXG4gICAqL1xuICByZWFkb25seSBwYXRoOiBzdHJpbmc7XG5cbiAgLyoqXG4gIExhc3QtYWNjZXNzIHRpbWVzdGFtcC5cbiAgICovXG4gIHJlYWRvbmx5IHRzOiBudW1iZXI7XG59XG5cbi8qKlxuICogQnVpbGRzIHRoZSBpc29sYXRlZCBgb2JzaWRpYW4uanNvbmAgdGhhdCBmb3JjZS1vcGVucyB0aGUgb3duZWQgdmF1bHQgYWNyb3NzIGFsbFxuICogc3VwcG9ydGVkIE9ic2lkaWFuIHZlcnNpb25zIChzZWUgdGhlIGZpbGUgb3ZlcnZpZXcgZm9yIHRoZSBkdWFsLW1hcmtlclxuICogcmF0aW9uYWxlKS5cbiAqXG4gKiBAcGFyYW0gcGFyYW1zIC0gVGhlIHZhdWx0IGlkLCBwYXRoLCBhbmQgdGltZXN0YW1wIHRvIHNlZWQuXG4gKiBAcmV0dXJucyBUaGUgYG9ic2lkaWFuLmpzb25gIG9iamVjdCB0byB3cml0ZSBpbnRvIHRoZSBvd25lZCB1c2VyLWRhdGEgZGlyLlxuICovXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRPd25lZE9ic2lkaWFuSnNvbihwYXJhbXM6IEJ1aWxkT3duZWRPYnNpZGlhbkpzb25QYXJhbXMpOiBPd25lZE9ic2lkaWFuSnNvbiB7XG4gIGNvbnN0IHNob3VsZEF1dG9PcGVuVmF1bHQgPSBwYXJhbXMuc2hvdWxkQXV0b09wZW5WYXVsdCA/PyB0cnVlO1xuICBjb25zdCBlbnRyeTogT3duZWRPYnNpZGlhblZhdWx0RW50cnkgPSBzaG91bGRBdXRvT3BlblZhdWx0XG4gICAgPyB7IG9wZW46IHRydWUsIHBhdGg6IHBhcmFtcy52YXVsdFBhdGgsIHRzOiBwYXJhbXMudHMgfVxuICAgIDogeyBwYXRoOiBwYXJhbXMudmF1bHRQYXRoLCB0czogcGFyYW1zLnRzIH07XG5cbiAgcmV0dXJuIHtcbiAgICAvLyBTcHJlYWQgcmF0aGVyIHRoYW4gYGxhc3Rfb3BlbjogdW5kZWZpbmVkYCwgc28gdGhlIGtleSBpcyBnZW51aW5lbHkgYWJzZW50IGZyb21cbiAgICAvLyBUaGUgd3JpdHRlbiBKU09OOiB0aGlzIHNlZWQgaXMgcmVhZCBieSBPYnNpZGlhbiB2ZXJzaW9ucyBzcGFubmluZyBhIGRlY2FkZSwgYW5kXG4gICAgLy8gQSBwcmVzZW50LWJ1dC11bmRlZmluZWQgYXV0by1vcGVuIG1hcmtlciBpcyBub3QgYSBzaGFwZSBhbnkgb2YgdGhlbSB3YXMgdGVzdGVkXG4gICAgLy8gQWdhaW5zdC5cbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgY2FtZWxjYXNlIC0tIE9ic2lkaWFuJ3Mgb3duIG9ic2lkaWFuLmpzb24gZmllbGQgbmFtZSAob2xkIHZlcnNpb25zJyBhdXRvLW9wZW4gbWFya2VyKS5cbiAgICAuLi5zaG91bGRBdXRvT3BlblZhdWx0ICYmIHsgbGFzdF9vcGVuOiBwYXJhbXMudmF1bHRJZCB9LFxuICAgIHVwZGF0ZURpc2FibGVkOiB0cnVlLFxuICAgIHZhdWx0czogeyBbcGFyYW1zLnZhdWx0SWRdOiBlbnRyeSB9XG4gIH07XG59XG4iXSwKICAibWFwcGluZ3MiOiAiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBa0hPLFNBQVMsdUJBQXVCLFFBQXlEO0FBQzlGLFFBQU0sc0JBQXNCLE9BQU8sdUJBQXVCO0FBQzFELFFBQU0sUUFBaUMsc0JBQ25DLEVBQUUsTUFBTSxNQUFNLE1BQU0sT0FBTyxXQUFXLElBQUksT0FBTyxHQUFHLElBQ3BELEVBQUUsTUFBTSxPQUFPLFdBQVcsSUFBSSxPQUFPLEdBQUc7QUFFNUMsU0FBTztBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUE7QUFBQSxJQU1MLEdBQUcsdUJBQXVCLEVBQUUsV0FBVyxPQUFPLFFBQVE7QUFBQSxJQUN0RCxnQkFBZ0I7QUFBQSxJQUNoQixRQUFRLEVBQUUsQ0FBQyxPQUFPLE9BQU8sR0FBRyxNQUFNO0FBQUEsRUFDcEM7QUFDRjsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -19,11 +19,30 @@
|
|
|
19
19
|
* Seeding both was verified to open the vault directly (no selector) on 0.6.4,
|
|
20
20
|
* 0.9.20, 0.12.19, 0.13.19, 0.14.5 and 1.12.7. `updateDisabled` suppresses the
|
|
21
21
|
* throwaway instance's self-update.
|
|
22
|
+
*
|
|
23
|
+
* Both markers can also be **withheld** — see
|
|
24
|
+
* {@link BuildOwnedObsidianJsonParams.shouldAutoOpenVault}. The one caller that
|
|
25
|
+
* does so wants the starter screen on purpose: a `configDirectory` override is a
|
|
26
|
+
* `localStorage` entry, and `localStorage` only exists once a renderer does, so
|
|
27
|
+
* the override has to be written in the starter screen's renderer before the
|
|
28
|
+
* vault's own window is created. The vault stays registered under the harness's
|
|
29
|
+
* id either way, and the later `vault-open` IPC reuses that id (verified on
|
|
30
|
+
* 1.13.7) rather than minting a second entry — which is what makes the
|
|
31
|
+
* `<vaultId>-config` key name knowable before launch.
|
|
22
32
|
*/
|
|
23
33
|
/**
|
|
24
34
|
* Parameters for {@link buildOwnedObsidianJson}.
|
|
25
35
|
*/
|
|
26
36
|
export interface BuildOwnedObsidianJsonParams {
|
|
37
|
+
/**
|
|
38
|
+
* Whether to include the auto-open markers, so Obsidian opens the vault
|
|
39
|
+
* directly instead of showing the starter screen. Pass `false` to keep the
|
|
40
|
+
* vault registered but closed — the caller then opens it itself, over the
|
|
41
|
+
* `vault-open` IPC, once it has prepared the starter screen's renderer.
|
|
42
|
+
*
|
|
43
|
+
* @default `true`
|
|
44
|
+
*/
|
|
45
|
+
readonly shouldAutoOpenVault?: boolean;
|
|
27
46
|
/**
|
|
28
47
|
Last-access timestamp to stamp on the vault entry.
|
|
29
48
|
*/
|
|
@@ -44,8 +63,9 @@ export interface OwnedObsidianJson {
|
|
|
44
63
|
/**
|
|
45
64
|
* Top-level auto-open marker (vault id) honored by old Obsidian versions;
|
|
46
65
|
* ignored as an unknown key by newer versions that use the per-entry `open`.
|
|
66
|
+
* Omitted when the caller withheld the auto-open markers.
|
|
47
67
|
*/
|
|
48
|
-
readonly last_open
|
|
68
|
+
readonly last_open?: string;
|
|
49
69
|
/**
|
|
50
70
|
Disables the throwaway instance's self-update.
|
|
51
71
|
*/
|
|
@@ -60,9 +80,10 @@ export interface OwnedObsidianJson {
|
|
|
60
80
|
*/
|
|
61
81
|
export interface OwnedObsidianVaultEntry {
|
|
62
82
|
/**
|
|
63
|
-
|
|
83
|
+
* Per-entry auto-open flag honored by newer Obsidian versions. Omitted when
|
|
84
|
+
* the caller withheld the auto-open markers.
|
|
64
85
|
*/
|
|
65
|
-
readonly open
|
|
86
|
+
readonly open?: true;
|
|
66
87
|
/**
|
|
67
88
|
Absolute path to the harness vault folder.
|
|
68
89
|
*/
|