obsidian-integration-testing 9.2.1 → 9.2.2
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/library.cjs +1 -1
- package/dist/lib/cjs/obsidian-instance.cjs +5 -2
- package/dist/lib/cjs/obsidian-instance.d.cts +7 -0
- package/dist/lib/cjs/parent-liveness.cjs +93 -0
- package/dist/lib/cjs/parent-liveness.d.cts +76 -0
- package/dist/lib/cjs/transport-desktop-cdp.cjs +22 -1
- package/dist/lib/cjs/transport-desktop-cdp.d.cts +12 -0
- package/dist/lib/esm/library.mjs +1 -1
- package/dist/lib/esm/obsidian-instance.d.mts +7 -0
- package/dist/lib/esm/obsidian-instance.mjs +5 -2
- package/dist/lib/esm/parent-liveness.d.mts +76 -0
- package/dist/lib/esm/parent-liveness.mjs +67 -0
- package/dist/lib/esm/transport-desktop-cdp.d.mts +12 -0
- package/dist/lib/esm/transport-desktop-cdp.mjs +22 -1
- package/dist/obsidian-integration-testing-9.2.2.tgz +0 -0
- package/package.json +1 -1
- package/dist/obsidian-integration-testing-9.2.1.tgz +0 -0
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Ties a harness-owned Obsidian instance's lifetime to the harness process that
|
|
5
|
+
* launched it, in the one direction the operating system will not do for us.
|
|
6
|
+
*
|
|
7
|
+
* The owned instance is already a child of the harness process, but that link
|
|
8
|
+
* carries no lifetime guarantee. Windows never propagates a parent's death to
|
|
9
|
+
* its children — an orphan simply keeps running with a stale parent id — and on
|
|
10
|
+
* POSIX a `SIGKILL` aimed at a single pid never cascades either. The instance is
|
|
11
|
+
* additionally spawned `detached`, so it is not even in the harness's process
|
|
12
|
+
* group. Teardown therefore relies entirely on the harness running its own
|
|
13
|
+
* cleanup (`killProcessTree` from an `exit`/signal handler), which is exactly
|
|
14
|
+
* what a `SIGKILL`, a Task Manager kill, or an IDE stop button denies it. Every
|
|
15
|
+
* such kill leaks a hidden Obsidian holding a user-data dir and a CDP port, and
|
|
16
|
+
* they accumulate: the next run picks a fresh temp dir and a free port, so
|
|
17
|
+
* nothing collides and nothing complains.
|
|
18
|
+
*
|
|
19
|
+
* The guaranteed fix is an OS primitive — a Windows Job Object with
|
|
20
|
+
* `JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE`, or `prctl(PR_SET_PDEATHSIG)` on Linux —
|
|
21
|
+
* but neither is reachable from Node without a native addon, which is far too
|
|
22
|
+
* heavy a dependency for this harness.
|
|
23
|
+
*
|
|
24
|
+
* So we use the one cross-platform resource the kernel *does* reclaim
|
|
25
|
+
* deterministically on process death: a socket. The harness listens on a
|
|
26
|
+
* loopback port and the instance's renderer connects to it. However the harness
|
|
27
|
+
* dies — cleanly, `SIGKILL`ed, or crashed — the kernel closes its end, the
|
|
28
|
+
* renderer sees `close`, and the window destroys itself. No polling, no
|
|
29
|
+
* heartbeat interval, no timeout to tune.
|
|
30
|
+
*
|
|
31
|
+
* Deliberately fail-open: the renderer only arms the destroy handler after the
|
|
32
|
+
* connection is actually established. A watchdog that cannot reach the harness
|
|
33
|
+
* leaves the instance running rather than killing a window the developer is
|
|
34
|
+
* working in.
|
|
35
|
+
*/
|
|
36
|
+
/**
|
|
37
|
+
* A listening loopback server whose accepted connections act as liveness tokens
|
|
38
|
+
* for the harness process.
|
|
39
|
+
*/
|
|
40
|
+
export interface ParentLivenessServer {
|
|
41
|
+
/** Stops listening and drops every accepted connection. */
|
|
42
|
+
close(): void;
|
|
43
|
+
/** The loopback port the renderer watchdog should connect back to. */
|
|
44
|
+
readonly port: number;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Loopback host the liveness server binds to. Never exposed off-machine.
|
|
48
|
+
*/
|
|
49
|
+
export declare const PARENT_LIVENESS_HOST = "127.0.0.1";
|
|
50
|
+
/**
|
|
51
|
+
* Builds the expression evaluated in the owned instance's renderer to arm the
|
|
52
|
+
* watchdog.
|
|
53
|
+
*
|
|
54
|
+
* Written in ES5 style (`var`, `function`) with no optional chaining, matching
|
|
55
|
+
* {@link DISMISS_TRUST_DIALOG_EXPR}: the same expression has to parse on the
|
|
56
|
+
* Chromium 80-era renderers of the oldest supported Obsidian versions (L26).
|
|
57
|
+
*
|
|
58
|
+
* Arming is idempotent — a second evaluation finds the stored socket and
|
|
59
|
+
* returns without opening another connection, so a retried readiness pass does
|
|
60
|
+
* not pile up sockets.
|
|
61
|
+
*
|
|
62
|
+
* @param port - The loopback port returned by {@link startParentLivenessServer}.
|
|
63
|
+
* @returns The expression to evaluate, yielding `'armed'`, `'already-armed'`, or `'unavailable'`.
|
|
64
|
+
*/
|
|
65
|
+
export declare function buildParentLivenessWatchdogExpr(port: number): string;
|
|
66
|
+
/**
|
|
67
|
+
* Starts the loopback liveness server the owned instance's renderer connects
|
|
68
|
+
* back to.
|
|
69
|
+
*
|
|
70
|
+
* The server and every accepted socket are `unref`ed, so holding a watchdog
|
|
71
|
+
* connection open never keeps the harness process alive on its own — the
|
|
72
|
+
* connection is a token the kernel reclaims, not work to wait on.
|
|
73
|
+
*
|
|
74
|
+
* @returns A {@link Promise} resolving to the listening {@link ParentLivenessServer}.
|
|
75
|
+
*/
|
|
76
|
+
export declare function startParentLivenessServer(): Promise<ParentLivenessServer>;
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { createServer } from "node:net";
|
|
2
|
+
const PARENT_LIVENESS_HOST = "127.0.0.1";
|
|
3
|
+
function buildParentLivenessWatchdogExpr(port) {
|
|
4
|
+
return `(function() {
|
|
5
|
+
var FLAG = '__obsidianIntegrationTestingParentLiveness';
|
|
6
|
+
if (window[FLAG]) { return 'already-armed'; }
|
|
7
|
+
var net;
|
|
8
|
+
try {
|
|
9
|
+
net = window.require('node:net');
|
|
10
|
+
} catch (nodePrefixError) {
|
|
11
|
+
try {
|
|
12
|
+
net = window.require('net');
|
|
13
|
+
} catch (barePrefixError) {
|
|
14
|
+
return 'unavailable';
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
var socket = net.connect(${String(port)}, '${PARENT_LIVENESS_HOST}');
|
|
18
|
+
window[FLAG] = socket;
|
|
19
|
+
var isConnected = false;
|
|
20
|
+
socket.on('connect', function() { isConnected = true; });
|
|
21
|
+
socket.on('error', function() { /* Handled by the close listener below. */ });
|
|
22
|
+
socket.on('close', function() {
|
|
23
|
+
if (!isConnected) { return; }
|
|
24
|
+
try {
|
|
25
|
+
window.electronWindow.destroy();
|
|
26
|
+
} catch (destroyError) {
|
|
27
|
+
window.close();
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
return 'armed';
|
|
31
|
+
})()`;
|
|
32
|
+
}
|
|
33
|
+
async function startParentLivenessServer() {
|
|
34
|
+
const server = createServer((socket) => {
|
|
35
|
+
socket.unref();
|
|
36
|
+
socket.on("error", () => {
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
server.unref();
|
|
40
|
+
const port = await listenOnFreeLoopbackPort(server);
|
|
41
|
+
return {
|
|
42
|
+
close() {
|
|
43
|
+
server.close();
|
|
44
|
+
},
|
|
45
|
+
port
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
async function listenOnFreeLoopbackPort(server) {
|
|
49
|
+
return new Promise((resolve, reject) => {
|
|
50
|
+
server.once("error", reject);
|
|
51
|
+
server.listen(0, PARENT_LIVENESS_HOST, () => {
|
|
52
|
+
const address = server.address();
|
|
53
|
+
if (address === null || typeof address === "string") {
|
|
54
|
+
server.close();
|
|
55
|
+
reject(new Error("Failed to determine the parent-liveness port."));
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
resolve(address.port);
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
export {
|
|
63
|
+
PARENT_LIVENESS_HOST,
|
|
64
|
+
buildParentLivenessWatchdogExpr,
|
|
65
|
+
startParentLivenessServer
|
|
66
|
+
};
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/parent-liveness.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Ties a harness-owned Obsidian instance's lifetime to the harness process that\n * launched it, in the one direction the operating system will not do for us.\n *\n * The owned instance is already a child of the harness process, but that link\n * carries no lifetime guarantee. Windows never propagates a parent's death to\n * its children \u2014 an orphan simply keeps running with a stale parent id \u2014 and on\n * POSIX a `SIGKILL` aimed at a single pid never cascades either. The instance is\n * additionally spawned `detached`, so it is not even in the harness's process\n * group. Teardown therefore relies entirely on the harness running its own\n * cleanup (`killProcessTree` from an `exit`/signal handler), which is exactly\n * what a `SIGKILL`, a Task Manager kill, or an IDE stop button denies it. Every\n * such kill leaks a hidden Obsidian holding a user-data dir and a CDP port, and\n * they accumulate: the next run picks a fresh temp dir and a free port, so\n * nothing collides and nothing complains.\n *\n * The guaranteed fix is an OS primitive \u2014 a Windows Job Object with\n * `JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE`, or `prctl(PR_SET_PDEATHSIG)` on Linux \u2014\n * but neither is reachable from Node without a native addon, which is far too\n * heavy a dependency for this harness.\n *\n * So we use the one cross-platform resource the kernel *does* reclaim\n * deterministically on process death: a socket. The harness listens on a\n * loopback port and the instance's renderer connects to it. However the harness\n * dies \u2014 cleanly, `SIGKILL`ed, or crashed \u2014 the kernel closes its end, the\n * renderer sees `close`, and the window destroys itself. No polling, no\n * heartbeat interval, no timeout to tune.\n *\n * Deliberately fail-open: the renderer only arms the destroy handler after the\n * connection is actually established. A watchdog that cannot reach the harness\n * leaves the instance running rather than killing a window the developer is\n * working in.\n */\n\nimport type { Server } from 'node:net';\n\nimport { createServer } from 'node:net';\n\n/**\n * A listening loopback server whose accepted connections act as liveness tokens\n * for the harness process.\n */\nexport interface ParentLivenessServer {\n  /** Stops listening and drops every accepted connection. */\n  close(): void;\n\n  /** The loopback port the renderer watchdog should connect back to. */\n  readonly port: number;\n}\n\n/**\n * Loopback host the liveness server binds to. Never exposed off-machine.\n */\nexport const PARENT_LIVENESS_HOST = '127.0.0.1';\n\n/**\n * Builds the expression evaluated in the owned instance's renderer to arm the\n * watchdog.\n *\n * Written in ES5 style (`var`, `function`) with no optional chaining, matching\n * {@link DISMISS_TRUST_DIALOG_EXPR}: the same expression has to parse on the\n * Chromium 80-era renderers of the oldest supported Obsidian versions (L26).\n *\n * Arming is idempotent \u2014 a second evaluation finds the stored socket and\n * returns without opening another connection, so a retried readiness pass does\n * not pile up sockets.\n *\n * @param port - The loopback port returned by {@link startParentLivenessServer}.\n * @returns The expression to evaluate, yielding `'armed'`, `'already-armed'`, or `'unavailable'`.\n */\nexport function buildParentLivenessWatchdogExpr(port: number): string {\n  return `(function() {\n  var FLAG = '__obsidianIntegrationTestingParentLiveness';\n  if (window[FLAG]) { return 'already-armed'; }\n  var net;\n  try {\n    net = window.require('node:net');\n  } catch (nodePrefixError) {\n    try {\n      net = window.require('net');\n    } catch (barePrefixError) {\n      return 'unavailable';\n    }\n  }\n  var socket = net.connect(${String(port)}, '${PARENT_LIVENESS_HOST}');\n  window[FLAG] = socket;\n  var isConnected = false;\n  socket.on('connect', function() { isConnected = true; });\n  socket.on('error', function() { /* Handled by the close listener below. */ });\n  socket.on('close', function() {\n    if (!isConnected) { return; }\n    try {\n      window.electronWindow.destroy();\n    } catch (destroyError) {\n      window.close();\n    }\n  });\n  return 'armed';\n})()`;\n}\n\n/**\n * Starts the loopback liveness server the owned instance's renderer connects\n * back to.\n *\n * The server and every accepted socket are `unref`ed, so holding a watchdog\n * connection open never keeps the harness process alive on its own \u2014 the\n * connection is a token the kernel reclaims, not work to wait on.\n *\n * @returns A {@link Promise} resolving to the listening {@link ParentLivenessServer}.\n */\nexport async function startParentLivenessServer(): Promise<ParentLivenessServer> {\n  const server = createServer((socket) => {\n    socket.unref();\n    // The connection carries no data \u2014 it exists only so its close is observable.\n    socket.on('error', () => {\n      // A renderer torn down mid-connection resets rather than closes; not an error here.\n    });\n  });\n  server.unref();\n\n  const port = await listenOnFreeLoopbackPort(server);\n  return {\n    close(): void {\n      server.close();\n    },\n    port\n  };\n}\n\n/**\n * Binds the server to an ephemeral loopback port and reports which one it got.\n *\n * @param server - The server to bind.\n * @returns A {@link Promise} resolving to the assigned port.\n * @throws If the server reports an error before listening, or binds to a pipe rather than a port.\n */\nasync function listenOnFreeLoopbackPort(server: Server): Promise<number> {\n  return new Promise<number>((resolve, reject) => {\n    server.once('error', reject);\n    server.listen(0, PARENT_LIVENESS_HOST, () => {\n      const address = server.address();\n      if (address === null || typeof address === 'string') {\n        server.close();\n        reject(new Error('Failed to determine the parent-liveness port.'));\n        return;\n      }\n      resolve(address.port);\n    });\n  });\n}\n"],
  "mappings": "AAsCA,SAAS,oBAAoB;AAiBtB,MAAM,uBAAuB;AAiB7B,SAAS,gCAAgC,MAAsB;AACpE,SAAO;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,6BAaoB,OAAO,IAAI,CAAC,MAAM,oBAAoB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAenE;AAYA,eAAsB,4BAA2D;AAC/E,QAAM,SAAS,aAAa,CAAC,WAAW;AACtC,WAAO,MAAM;AAEb,WAAO,GAAG,SAAS,MAAM;AAAA,IAEzB,CAAC;AAAA,EACH,CAAC;AACD,SAAO,MAAM;AAEb,QAAM,OAAO,MAAM,yBAAyB,MAAM;AAClD,SAAO;AAAA,IACL,QAAc;AACZ,aAAO,MAAM;AAAA,IACf;AAAA,IACA;AAAA,EACF;AACF;AASA,eAAe,yBAAyB,QAAiC;AACvE,SAAO,IAAI,QAAgB,CAAC,SAAS,WAAW;AAC9C,WAAO,KAAK,SAAS,MAAM;AAC3B,WAAO,OAAO,GAAG,sBAAsB,MAAM;AAC3C,YAAM,UAAU,OAAO,QAAQ;AAC/B,UAAI,YAAY,QAAQ,OAAO,YAAY,UAAU;AACnD,eAAO,MAAM;AACb,eAAO,IAAI,MAAM,+CAA+C,CAAC;AACjE;AAAA,MACF;AACA,cAAQ,QAAQ,IAAI;AAAA,IACtB,CAAC;AAAA,EACH,CAAC;AACH;",
  "names": []
}

|
|
@@ -274,6 +274,18 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
274
274
|
* @param actualElectronVersion - The live Electron version, or `undefined` when unreadable.
|
|
275
275
|
*/
|
|
276
276
|
private applyElectronCompatibility;
|
|
277
|
+
/**
|
|
278
|
+
* Points the owned instance's renderer at this process's liveness socket so it
|
|
279
|
+
* destroys itself if we die without running teardown (see `parent-liveness.ts`).
|
|
280
|
+
*
|
|
281
|
+
* Best-effort by design. A renderer without Node access reports `'unavailable'`
|
|
282
|
+
* and an evaluation failure is logged and swallowed: the watchdog is a backstop
|
|
283
|
+
* for an already-abnormal exit, never a reason to fail an otherwise good launch.
|
|
284
|
+
*
|
|
285
|
+
* @param vaultPath - The vault path to evaluate in.
|
|
286
|
+
* @param parentLivenessPort - The loopback port the renderer should connect back to.
|
|
287
|
+
*/
|
|
288
|
+
private armParentLivenessWatchdog;
|
|
277
289
|
/**
|
|
278
290
|
* Verifies the running app (asar) version matches the swapped-in pin, storing the
|
|
279
291
|
* verdict on {@link getAsarFallback}. On a **silent fallback** (the installer ran
|