obsidian-integration-testing 9.2.1 → 10.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +45 -45
- package/dist/lib/cjs/appium-dependencies.cjs +5 -5
- package/dist/lib/cjs/appium-dependencies.d.cts +4 -2
- package/dist/lib/cjs/appium-session-config.cjs +1 -1
- package/dist/lib/cjs/asar-fallback-detection.cjs +4 -4
- package/dist/lib/cjs/asar-fallback-detection.d.cts +15 -7
- package/dist/lib/cjs/avd-list.cjs +1 -1
- package/dist/lib/cjs/avd-list.d.cts +6 -2
- package/dist/lib/cjs/cli.cjs +4 -4
- package/dist/lib/cjs/compatibility-options.cjs +13 -13
- package/dist/lib/cjs/compatibility-options.d.cts +24 -12
- package/dist/lib/cjs/connect-to-cdp.cjs +4 -4
- package/dist/lib/cjs/connect-to-cdp.d.cts +6 -6
- package/dist/lib/cjs/context-id.cjs +5 -5
- package/dist/lib/cjs/context-id.d.cts +1 -1
- package/dist/lib/cjs/context-provider.cjs +5 -5
- package/dist/lib/cjs/context-provider.d.cts +4 -4
- package/dist/lib/cjs/demo-vault-populate.cjs +5 -5
- package/dist/lib/cjs/demo-vault-populate.d.cts +4 -4
- package/dist/lib/cjs/demo-vault-tree.cjs +4 -4
- package/dist/lib/cjs/demo-vault-tree.d.cts +3 -3
- package/dist/lib/cjs/device-readiness.cjs +3 -3
- package/dist/lib/cjs/device-readiness.d.cts +7 -3
- package/dist/lib/cjs/ecmascript-version.cjs +1 -1
- package/dist/lib/cjs/electron-compatibility.cjs +4 -4
- package/dist/lib/cjs/electron-compatibility.d.cts +33 -17
- package/dist/lib/cjs/emulator-arguments.cjs +36 -0
- package/dist/lib/{esm/emulator-args.d.mts → cjs/emulator-arguments.d.cts} +6 -4
- package/dist/lib/cjs/enable-plugin.cjs +29 -29
- package/dist/lib/cjs/enable-plugin.d.cts +6 -6
- package/dist/lib/cjs/eval-in-obsidian.cjs +9 -9
- package/dist/lib/cjs/eval-in-obsidian.d.cts +23 -23
- package/dist/lib/cjs/exec.cjs +49 -53
- package/dist/lib/cjs/exec.d.cts +9 -9
- package/dist/lib/cjs/function-expression.cjs +8 -8
- package/dist/lib/cjs/function-expression.d.cts +4 -4
- package/dist/lib/cjs/generate-function-call.cjs +6 -6
- package/dist/lib/cjs/generate-function-call.d.cts +15 -9
- package/dist/lib/cjs/global-setup-core.cjs +43 -43
- package/dist/lib/cjs/global-setup-core.d.cts +19 -9
- package/dist/lib/cjs/incompatible-installer-version-error.cjs +10 -4
- package/dist/lib/cjs/incompatible-installer-version-error.d.cts +18 -6
- package/dist/lib/cjs/index.cjs +10 -10
- package/dist/lib/cjs/index.d.cts +8 -8
- package/dist/lib/cjs/installer-asset.cjs +4 -4
- package/dist/lib/cjs/installer-asset.d.cts +21 -7
- package/dist/lib/cjs/installer-compatibility.cjs +4 -4
- package/dist/lib/cjs/installer-compatibility.d.cts +36 -18
- package/dist/lib/cjs/jest/global-setup-no-plugin.cjs +3 -3
- package/dist/lib/cjs/jest/global-setup-no-plugin.d.cts +1 -1
- package/dist/lib/cjs/jest/global-setup.cjs +11 -11
- package/dist/lib/cjs/jest/global-setup.d.cts +12 -8
- package/dist/lib/cjs/jest/global-teardown-no-plugin.cjs +2 -3
- package/dist/lib/cjs/jest/global-teardown-no-plugin.d.cts +1 -2
- package/dist/lib/cjs/jest/global-teardown.cjs +2 -3
- package/dist/lib/cjs/jest/global-teardown.d.cts +1 -2
- package/dist/lib/cjs/jest/setup.cjs +2 -2
- package/dist/lib/cjs/jest/setup.d.cts +1 -1
- package/dist/lib/cjs/json-with-functions.cjs +7 -7
- package/dist/lib/cjs/leftover-cleanup.cjs +14 -14
- package/dist/lib/cjs/leftover-cleanup.d.cts +42 -20
- package/dist/lib/cjs/library.cjs +2 -2
- package/dist/lib/cjs/namespace-bootstrap.cjs +46 -40
- package/dist/lib/cjs/native-dialog-monitor.cjs +15 -13
- package/dist/lib/cjs/normalize-optional-properties.cjs +3 -3
- package/dist/lib/cjs/normalize-optional-properties.d.cts +2 -2
- package/dist/lib/cjs/obsidian-config.cjs +30 -31
- package/dist/lib/cjs/obsidian-config.d.cts +8 -8
- package/dist/lib/cjs/obsidian-executable.cjs +2 -2
- package/dist/lib/cjs/obsidian-installer.cjs +37 -37
- package/dist/lib/cjs/obsidian-installer.d.cts +7 -3
- package/dist/lib/cjs/obsidian-instance.cjs +7 -4
- package/dist/lib/cjs/obsidian-instance.d.cts +25 -8
- package/dist/lib/cjs/obsidian-metadata.cjs +1 -1
- package/dist/lib/cjs/obsidian-metadata.d.cts +36 -12
- package/dist/lib/cjs/obsidian-namespace.cjs +1 -1
- package/dist/lib/cjs/obsidian-namespace.d.cts +25 -11
- package/dist/lib/cjs/obsidian-version-switch.cjs +9 -9
- package/dist/lib/cjs/obsidian-version-switch.d.cts +14 -10
- package/dist/lib/cjs/obsidian-version.cjs +3 -3
- package/dist/lib/cjs/obsidian-version.d.cts +15 -5
- package/dist/lib/cjs/owned-vault-seed.cjs +1 -1
- package/dist/lib/cjs/owned-vault-seed.d.cts +24 -8
- package/dist/lib/cjs/parent-liveness.cjs +93 -0
- package/dist/lib/cjs/parent-liveness.d.cts +80 -0
- package/dist/lib/cjs/poll-in-obsidian.cjs +5 -5
- package/dist/lib/cjs/poll-in-obsidian.d.cts +12 -12
- package/dist/lib/cjs/poll-until.cjs +1 -1
- package/dist/lib/cjs/poll-until.d.cts +21 -7
- package/dist/lib/cjs/process-exit-message.cjs +1 -1
- package/dist/lib/cjs/process-exit-message.d.cts +21 -7
- package/dist/lib/cjs/renderer-boot-detection.cjs +9 -9
- package/dist/lib/cjs/renderer-boot-detection.d.cts +31 -27
- package/dist/lib/cjs/renderer-failed-to-initialize-error.cjs +1 -1
- package/dist/lib/cjs/renderer-failed-to-initialize-error.d.cts +1 -1
- package/dist/lib/cjs/setup-lock.cjs +26 -26
- package/dist/lib/cjs/setup-lock.d.cts +6 -2
- package/dist/lib/cjs/silent-asar-fallback-error.cjs +7 -3
- package/dist/lib/cjs/silent-asar-fallback-error.d.cts +12 -4
- package/dist/lib/cjs/spawn-options.cjs +1 -1
- package/dist/lib/cjs/spawn-options.d.cts +3 -1
- package/dist/lib/cjs/strict-proxy.cjs +25 -25
- package/dist/lib/cjs/strict-proxy.d.cts +3 -3
- package/dist/lib/cjs/temporary-vault.cjs +166 -0
- package/dist/lib/cjs/{temp-vault.d.cts → temporary-vault.d.cts} +3 -3
- package/dist/lib/cjs/transport-appium.cjs +7 -7
- package/dist/lib/cjs/transport-appium.d.cts +7 -3
- package/dist/lib/cjs/transport-desktop-cdp.cjs +77 -56
- package/dist/lib/cjs/transport-desktop-cdp.d.cts +41 -17
- package/dist/lib/cjs/transport-factory.cjs +62 -63
- package/dist/lib/cjs/type-guards.cjs +3 -3
- package/dist/lib/cjs/type-guards.d.cts +2 -2
- package/dist/lib/cjs/vault-path-match.cjs +9 -9
- package/dist/lib/cjs/vault-path-match.d.cts +11 -11
- package/dist/lib/cjs/version-matrix.cjs +1 -1
- package/dist/lib/cjs/version-matrix.d.cts +51 -17
- package/dist/lib/cjs/visibility.cjs +7 -7
- package/dist/lib/cjs/visibility.d.cts +5 -5
- package/dist/lib/cjs/vitest/global-setup-no-plugin.cjs +3 -3
- package/dist/lib/cjs/vitest/global-setup-no-plugin.d.cts +2 -2
- package/dist/lib/cjs/vitest/global-setup.cjs +9 -9
- package/dist/lib/cjs/vitest/global-setup.d.cts +4 -4
- package/dist/lib/cjs/vitest/setup.cjs +2 -2
- package/dist/lib/cjs/vitest/typings.d.cts +2 -2
- package/dist/lib/esm/appium-dependencies.d.mts +4 -2
- package/dist/lib/esm/appium-dependencies.mjs +4 -4
- package/dist/lib/esm/appium-session-config.mjs +1 -1
- package/dist/lib/esm/asar-fallback-detection.d.mts +15 -7
- package/dist/lib/esm/asar-fallback-detection.mjs +3 -3
- package/dist/lib/esm/avd-list.d.mts +6 -2
- package/dist/lib/esm/avd-list.mjs +1 -1
- package/dist/lib/esm/cli.mjs +4 -4
- package/dist/lib/esm/compatibility-options.d.mts +24 -12
- package/dist/lib/esm/compatibility-options.mjs +10 -10
- package/dist/lib/esm/connect-to-cdp.d.mts +6 -6
- package/dist/lib/esm/connect-to-cdp.mjs +6 -6
- package/dist/lib/esm/context-id.d.mts +1 -1
- package/dist/lib/esm/context-id.mjs +5 -5
- package/dist/lib/esm/context-provider.d.mts +4 -4
- package/dist/lib/esm/context-provider.mjs +5 -5
- package/dist/lib/esm/demo-vault-populate.d.mts +4 -4
- package/dist/lib/esm/demo-vault-populate.mjs +5 -5
- package/dist/lib/esm/demo-vault-tree.d.mts +3 -3
- package/dist/lib/esm/demo-vault-tree.mjs +4 -4
- package/dist/lib/esm/device-readiness.d.mts +7 -3
- package/dist/lib/esm/device-readiness.mjs +3 -3
- package/dist/lib/esm/ecmascript-version.mjs +1 -1
- package/dist/lib/esm/electron-compatibility.d.mts +33 -17
- package/dist/lib/esm/electron-compatibility.mjs +3 -3
- package/dist/lib/{cjs/emulator-args.d.cts → esm/emulator-arguments.d.mts} +6 -4
- package/dist/lib/esm/emulator-arguments.mjs +12 -0
- package/dist/lib/esm/enable-plugin.d.mts +6 -6
- package/dist/lib/esm/enable-plugin.mjs +29 -29
- package/dist/lib/esm/eval-in-obsidian.d.mts +23 -23
- package/dist/lib/esm/eval-in-obsidian.mjs +9 -9
- package/dist/lib/esm/exec.d.mts +9 -9
- package/dist/lib/esm/exec.mjs +49 -53
- package/dist/lib/esm/function-expression.d.mts +4 -4
- package/dist/lib/esm/function-expression.mjs +8 -8
- package/dist/lib/esm/generate-function-call.d.mts +15 -9
- package/dist/lib/esm/generate-function-call.mjs +6 -6
- package/dist/lib/esm/global-setup-core.d.mts +19 -9
- package/dist/lib/esm/global-setup-core.mjs +45 -45
- package/dist/lib/esm/incompatible-installer-version-error.d.mts +18 -6
- package/dist/lib/esm/incompatible-installer-version-error.mjs +10 -4
- package/dist/lib/esm/index.d.mts +8 -8
- package/dist/lib/esm/index.mjs +9 -9
- package/dist/lib/esm/installer-asset.d.mts +21 -7
- package/dist/lib/esm/installer-asset.mjs +4 -4
- package/dist/lib/esm/installer-compatibility.d.mts +36 -18
- package/dist/lib/esm/installer-compatibility.mjs +3 -3
- package/dist/lib/esm/jest/global-setup-no-plugin.d.mts +1 -1
- package/dist/lib/esm/jest/global-setup-no-plugin.mjs +3 -3
- package/dist/lib/esm/jest/global-setup.d.mts +12 -8
- package/dist/lib/esm/jest/global-setup.mjs +10 -10
- package/dist/lib/esm/jest/global-teardown-no-plugin.d.mts +1 -2
- package/dist/lib/esm/jest/global-teardown-no-plugin.mjs +2 -3
- package/dist/lib/esm/jest/global-teardown.d.mts +1 -2
- package/dist/lib/esm/jest/global-teardown.mjs +2 -3
- package/dist/lib/esm/jest/setup.d.mts +1 -1
- package/dist/lib/esm/jest/setup.mjs +2 -2
- package/dist/lib/esm/json-with-functions.mjs +7 -7
- package/dist/lib/esm/leftover-cleanup.d.mts +42 -20
- package/dist/lib/esm/leftover-cleanup.mjs +12 -12
- package/dist/lib/esm/library.mjs +2 -2
- package/dist/lib/esm/namespace-bootstrap.mjs +46 -40
- package/dist/lib/esm/native-dialog-monitor.mjs +15 -13
- package/dist/lib/esm/normalize-optional-properties.d.mts +2 -2
- package/dist/lib/esm/normalize-optional-properties.mjs +3 -3
- package/dist/lib/esm/obsidian-config.d.mts +8 -8
- package/dist/lib/esm/obsidian-config.mjs +27 -28
- package/dist/lib/esm/obsidian-executable.mjs +2 -2
- package/dist/lib/esm/obsidian-installer.d.mts +7 -3
- package/dist/lib/esm/obsidian-installer.mjs +36 -36
- package/dist/lib/esm/obsidian-instance.d.mts +25 -8
- package/dist/lib/esm/obsidian-instance.mjs +7 -4
- package/dist/lib/esm/obsidian-metadata.d.mts +36 -12
- package/dist/lib/esm/obsidian-metadata.mjs +1 -1
- package/dist/lib/esm/obsidian-namespace.d.mts +25 -11
- package/dist/lib/esm/obsidian-version-switch.d.mts +14 -10
- package/dist/lib/esm/obsidian-version-switch.mjs +9 -9
- package/dist/lib/esm/obsidian-version.d.mts +15 -5
- package/dist/lib/esm/obsidian-version.mjs +3 -3
- package/dist/lib/esm/owned-vault-seed.d.mts +24 -8
- package/dist/lib/esm/owned-vault-seed.mjs +1 -1
- package/dist/lib/esm/parent-liveness.d.mts +80 -0
- package/dist/lib/esm/parent-liveness.mjs +67 -0
- package/dist/lib/esm/poll-in-obsidian.d.mts +12 -12
- package/dist/lib/esm/poll-in-obsidian.mjs +5 -5
- package/dist/lib/esm/poll-until.d.mts +21 -7
- package/dist/lib/esm/poll-until.mjs +1 -1
- package/dist/lib/esm/process-exit-message.d.mts +21 -7
- package/dist/lib/esm/process-exit-message.mjs +1 -1
- package/dist/lib/esm/renderer-boot-detection.d.mts +31 -27
- package/dist/lib/esm/renderer-boot-detection.mjs +7 -7
- package/dist/lib/esm/renderer-failed-to-initialize-error.d.mts +1 -1
- package/dist/lib/esm/renderer-failed-to-initialize-error.mjs +1 -1
- package/dist/lib/esm/setup-lock.d.mts +6 -2
- package/dist/lib/esm/setup-lock.mjs +26 -26
- package/dist/lib/esm/silent-asar-fallback-error.d.mts +12 -4
- package/dist/lib/esm/silent-asar-fallback-error.mjs +7 -3
- package/dist/lib/esm/spawn-options.d.mts +3 -1
- package/dist/lib/esm/spawn-options.mjs +1 -1
- package/dist/lib/esm/strict-proxy.d.mts +3 -3
- package/dist/lib/esm/strict-proxy.mjs +25 -25
- package/dist/lib/esm/{temp-vault.d.mts → temporary-vault.d.mts} +3 -3
- package/dist/lib/esm/temporary-vault.mjs +157 -0
- package/dist/lib/esm/transport-appium.d.mts +7 -3
- package/dist/lib/esm/transport-appium.mjs +7 -7
- package/dist/lib/esm/transport-desktop-cdp.d.mts +41 -17
- package/dist/lib/esm/transport-desktop-cdp.mjs +86 -65
- package/dist/lib/esm/transport-factory.mjs +71 -72
- package/dist/lib/esm/type-guards.d.mts +2 -2
- package/dist/lib/esm/type-guards.mjs +3 -3
- package/dist/lib/esm/vault-path-match.d.mts +11 -11
- package/dist/lib/esm/vault-path-match.mjs +7 -7
- package/dist/lib/esm/version-matrix.d.mts +51 -17
- package/dist/lib/esm/version-matrix.mjs +1 -1
- package/dist/lib/esm/visibility.d.mts +5 -5
- package/dist/lib/esm/visibility.mjs +5 -5
- package/dist/lib/esm/vitest/global-setup-no-plugin.d.mts +2 -2
- package/dist/lib/esm/vitest/global-setup-no-plugin.mjs +3 -3
- package/dist/lib/esm/vitest/global-setup.d.mts +4 -4
- package/dist/lib/esm/vitest/global-setup.mjs +8 -8
- package/dist/lib/esm/vitest/setup.mjs +2 -2
- package/dist/lib/esm/vitest/typings.d.mts +2 -2
- package/dist/obsidian-integration-testing-10.0.0.tgz +0 -0
- package/package.json +15 -13
- package/dist/lib/cjs/emulator-args.cjs +0 -36
- package/dist/lib/cjs/temp-vault.cjs +0 -166
- package/dist/lib/esm/emulator-args.mjs +0 -12
- package/dist/lib/esm/temp-vault.mjs +0 -157
- package/dist/obsidian-integration-testing-9.2.1.tgz +0 -0
|
@@ -9,21 +9,31 @@
|
|
|
9
9
|
* Parameters for the registered `evalWrapper` function.
|
|
10
10
|
*/
|
|
11
11
|
export interface EvalWrapperNamespaceParams {
|
|
12
|
-
/**
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
/**
|
|
13
|
+
The user function to evaluate.
|
|
14
|
+
*/
|
|
15
|
+
callback(input: Record<string, unknown>): unknown;
|
|
16
|
+
/**
|
|
17
|
+
Optional context ID for persistent storage.
|
|
18
|
+
*/
|
|
15
19
|
readonly contextId?: string;
|
|
16
|
-
/**
|
|
17
|
-
|
|
20
|
+
/**
|
|
21
|
+
User-supplied arguments to pass to `callback`.
|
|
22
|
+
*/
|
|
23
|
+
readonly input: Record<string, unknown>;
|
|
18
24
|
}
|
|
19
25
|
/**
|
|
20
26
|
* Parameters for {@link ObsidianIntegrationTestingNamespace.ipcSendSync}.
|
|
21
27
|
*/
|
|
22
28
|
export interface IpcSendSyncNamespaceParams {
|
|
23
|
-
/**
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
/**
|
|
30
|
+
The IPC channel name.
|
|
31
|
+
*/
|
|
26
32
|
readonly channel: string;
|
|
33
|
+
/**
|
|
34
|
+
The IPC arguments.
|
|
35
|
+
*/
|
|
36
|
+
readonly channelArguments: unknown[];
|
|
27
37
|
}
|
|
28
38
|
/**
|
|
29
39
|
* Holder interface for type-safe access to `window.__obsidianIntegrationTesting`.
|
|
@@ -65,7 +75,7 @@ export interface ObsidianIntegrationTestingNamespace {
|
|
|
65
75
|
* The top-level wrapper that sets up context, resolves the obsidian module,
|
|
66
76
|
* calls the user's function, and returns a JSON envelope.
|
|
67
77
|
*
|
|
68
|
-
* @param params - Parameters including the user's function,
|
|
78
|
+
* @param params - Parameters including the user's function, input, and context ID.
|
|
69
79
|
* @returns A JSON-stringified result envelope.
|
|
70
80
|
*/
|
|
71
81
|
evalWrapper(params: EvalWrapperNamespaceParams): Promise<string>;
|
|
@@ -107,8 +117,12 @@ export interface ObsidianIntegrationTestingNamespace {
|
|
|
107
117
|
* Parameters for {@link ObsidianIntegrationTestingNamespace.setLocalStorageItem}.
|
|
108
118
|
*/
|
|
109
119
|
export interface SetLocalStorageItemNamespaceParams {
|
|
110
|
-
/**
|
|
120
|
+
/**
|
|
121
|
+
The localStorage key.
|
|
122
|
+
*/
|
|
111
123
|
readonly key: string;
|
|
112
|
-
/**
|
|
124
|
+
/**
|
|
125
|
+
The localStorage value.
|
|
126
|
+
*/
|
|
113
127
|
readonly value: string;
|
|
114
128
|
}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
* @file
|
|
3
3
|
*
|
|
4
4
|
* Integration-time helpers for provisioning a specific Obsidian **asar** (the
|
|
5
|
-
* app code) into an isolated user-data
|
|
5
|
+
* app code) into an isolated user-data directory.
|
|
6
6
|
*
|
|
7
7
|
* Obsidian's bootstrap loads the highest of (its shell's bundled
|
|
8
8
|
* `resources/obsidian.asar`, the `obsidian-<version>.asar` files in the
|
|
9
|
-
* user-data
|
|
9
|
+
* user-data directory). So placing an asar here only takes effect when its version is
|
|
10
10
|
* **>= the shell's bundled version** (upgrade-only — confirmed by the Phase 0
|
|
11
11
|
* spike). Running an older version requires pinning the installer/shell instead
|
|
12
12
|
* (see `obsidian-installer.ts`).
|
|
@@ -16,20 +16,24 @@ import type { DesktopReleasesManifest } from './obsidian-version.mjs';
|
|
|
16
16
|
* A discovered `obsidian-<version>.asar` file.
|
|
17
17
|
*/
|
|
18
18
|
export interface DiscoveredAsar {
|
|
19
|
-
/**
|
|
19
|
+
/**
|
|
20
|
+
Absolute path to the asar file.
|
|
21
|
+
*/
|
|
20
22
|
readonly path: string;
|
|
21
|
-
/**
|
|
23
|
+
/**
|
|
24
|
+
The `x.y.z` version parsed from the file name.
|
|
25
|
+
*/
|
|
22
26
|
readonly version: string;
|
|
23
27
|
}
|
|
24
28
|
/**
|
|
25
|
-
* Copies an asar file into a user-data
|
|
29
|
+
* Copies an asar file into a user-data directory under its canonical
|
|
26
30
|
* `obsidian-<version>.asar` name.
|
|
27
31
|
*
|
|
28
32
|
* @param asarPath - Source asar path.
|
|
29
33
|
* @param version - The asar's version (used for the destination file name).
|
|
30
|
-
* @param
|
|
34
|
+
* @param userDataDirectory - Destination user-data directory.
|
|
31
35
|
*/
|
|
32
|
-
export declare function copyAsarIntoUserData(asarPath: string, version: string,
|
|
36
|
+
export declare function copyAsarIntoUserData(asarPath: string, version: string, userDataDirectory: string): void;
|
|
33
37
|
/**
|
|
34
38
|
* Ensures the asar for a concrete version is present in the local cache,
|
|
35
39
|
* downloading and decompressing it if necessary.
|
|
@@ -49,10 +53,10 @@ export declare function fetchDesktopReleasesManifest(): Promise<DesktopReleasesM
|
|
|
49
53
|
/**
|
|
50
54
|
* Finds the newest `obsidian-<version>.asar` in a directory.
|
|
51
55
|
*
|
|
52
|
-
* @param
|
|
53
|
-
* @returns The newest discovered asar, or `undefined` if none / the
|
|
56
|
+
* @param directory - The directory to scan (e.g. the user's Obsidian config directory).
|
|
57
|
+
* @returns The newest discovered asar, or `undefined` if none / the directory is unreadable.
|
|
54
58
|
*/
|
|
55
|
-
export declare function findNewestAsar(
|
|
59
|
+
export declare function findNewestAsar(directory: string): DiscoveredAsar | undefined;
|
|
56
60
|
/**
|
|
57
61
|
* Returns the local cache path for a concrete version's asar (the file may not
|
|
58
62
|
* yet exist).
|
|
@@ -23,11 +23,11 @@ const CATALYST_ASAR_RELEASE_BASE_URL = "https://releases.obsidian.md/release";
|
|
|
23
23
|
const CACHE_ROOT = join(tmpdir(), "obsidian-integration-testing");
|
|
24
24
|
const ASAR_CACHE_DIR = join(CACHE_ROOT, "asar-cache");
|
|
25
25
|
const ASAR_FILE_PATTERN = /^obsidian-(?<version>\d+\.\d+\.\d+)\.asar$/;
|
|
26
|
-
function copyAsarIntoUserData(asarPath, version,
|
|
27
|
-
mkdirSync(
|
|
28
|
-
const
|
|
29
|
-
copyFileSync(asarPath,
|
|
30
|
-
log(`[version-switch] Provisioned ${getVersionAsarFileName(version)} into ${
|
|
26
|
+
function copyAsarIntoUserData(asarPath, version, userDataDirectory) {
|
|
27
|
+
mkdirSync(userDataDirectory, { recursive: true });
|
|
28
|
+
const destination = join(userDataDirectory, getVersionAsarFileName(version));
|
|
29
|
+
copyFileSync(asarPath, destination);
|
|
30
|
+
log(`[version-switch] Provisioned ${getVersionAsarFileName(version)} into ${userDataDirectory}.`);
|
|
31
31
|
}
|
|
32
32
|
async function ensureAsarCached(version) {
|
|
33
33
|
mkdirSync(ASAR_CACHE_DIR, { recursive: true });
|
|
@@ -56,10 +56,10 @@ async function fetchDesktopReleasesManifest() {
|
|
|
56
56
|
}
|
|
57
57
|
return await response.json();
|
|
58
58
|
}
|
|
59
|
-
function findNewestAsar(
|
|
59
|
+
function findNewestAsar(directory) {
|
|
60
60
|
let entries;
|
|
61
61
|
try {
|
|
62
|
-
entries = readdirSync(
|
|
62
|
+
entries = readdirSync(directory);
|
|
63
63
|
} catch {
|
|
64
64
|
return void 0;
|
|
65
65
|
}
|
|
@@ -71,7 +71,7 @@ function findNewestAsar(dir) {
|
|
|
71
71
|
}
|
|
72
72
|
const version = match.groups?.["version"] ?? "";
|
|
73
73
|
if (!newest || compareVersions(version, newest.version) > 0) {
|
|
74
|
-
newest = { path: join(
|
|
74
|
+
newest = { path: join(directory, entry), version };
|
|
75
75
|
}
|
|
76
76
|
}
|
|
77
77
|
return newest;
|
|
@@ -116,4 +116,4 @@ export {
|
|
|
116
116
|
getCachedAsarPath,
|
|
117
117
|
resolveConcreteVersion
|
|
118
118
|
};
|
|
119
|
-
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/obsidian-version-switch.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Integration-time helpers for provisioning a specific Obsidian **asar** (the\n * app code) into an isolated user-data dir.\n *\n * Obsidian's bootstrap loads the highest of (its shell's bundled\n * `resources/obsidian.asar`, the `obsidian-<version>.asar` files in the\n * user-data dir). So placing an asar here only takes effect when its version is\n * **>= the shell's bundled version** (upgrade-only \u2014 confirmed by the Phase 0\n * spike). Running an older version requires pinning the installer/shell instead\n * (see `obsidian-installer.ts`).\n */\n\n/* v8 ignore start -- Integration-time download/filesystem glue covered by integration tests, not unit tests. */\n\nimport {\n  copyFileSync,\n  existsSync,\n  mkdirSync,\n  readdirSync,\n  writeFileSync\n} from 'node:fs';\nimport { tmpdir } from 'node:os';\nimport { join } from 'node:path';\nimport { gunzipSync } from 'node:zlib';\n\nimport type { DesktopReleasesManifest } from './obsidian-version.mjs';\n\nimport { log } from './log.mjs';\nimport { getVersionMetadata } from './obsidian-metadata.mjs';\nimport {\n  compareVersions,\n  DESKTOP_RELEASES_MANIFEST_URL,\n  getVersionAsarFileName,\n  parseVersionSpec,\n  resolveVersionFromManifest\n} from './obsidian-version.mjs';\n\n/**\n * Browser User-Agent required to fetch asar packages from\n * `releases.obsidian.md` (the endpoint is Cloudflare-gated against non-browser\n * clients). Matches the UA documented in the obsidian-versions repo.\n */\nconst DOWNLOAD_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36';\n\n/**\n * Base URL for **public** (stable) release asars, published as GitHub release\n * assets under `.../download/v<version>/obsidian-<version>.asar.gz`.\n */\nconst PUBLIC_ASAR_RELEASE_BASE_URL = 'https://github.com/obsidianmd/obsidian-releases/releases/download';\n\n/**\n * Base URL for **catalyst** (early access / insider) release asars, served from\n * the Obsidian CDN as `.../release/obsidian-<version>.asar.gz`. Public versions\n * are NOT hosted here (the CDN returns an empty body for them).\n */\nconst CATALYST_ASAR_RELEASE_BASE_URL = 'https://releases.obsidian.md/release';\n\nconst CACHE_ROOT = join(tmpdir(), 'obsidian-integration-testing');\nconst ASAR_CACHE_DIR = join(CACHE_ROOT, 'asar-cache');\nconst ASAR_FILE_PATTERN = /^obsidian-(?<version>\\d+\\.\\d+\\.\\d+)\\.asar$/;\n\n/**\n * A discovered `obsidian-<version>.asar` file.\n */\nexport interface DiscoveredAsar {\n  /** Absolute path to the asar file. */\n  readonly path: string;\n\n  /** The `x.y.z` version parsed from the file name. */\n  readonly version: string;\n}\n\n/**\n * Copies an asar file into a user-data dir under its canonical\n * `obsidian-<version>.asar` name.\n *\n * @param asarPath - Source asar path.\n * @param version - The asar's version (used for the destination file name).\n * @param userDataDir - Destination user-data dir.\n */\nexport function copyAsarIntoUserData(asarPath: string, version: string, userDataDir: string): void {\n  mkdirSync(userDataDir, { recursive: true });\n  const dest = join(userDataDir, getVersionAsarFileName(version));\n  copyFileSync(asarPath, dest);\n  log(`[version-switch] Provisioned ${getVersionAsarFileName(version)} into ${userDataDir}.`);\n}\n\n/**\n * Ensures the asar for a concrete version is present in the local cache,\n * downloading and decompressing it if necessary.\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The absolute path to the cached asar.\n * @throws Error if the download fails.\n */\nexport async function ensureAsarCached(version: string): Promise<string> {\n  mkdirSync(ASAR_CACHE_DIR, { recursive: true });\n  const cachedPath = getCachedAsarPath(version);\n  if (existsSync(cachedPath)) {\n    log(`[version-switch] Using cached asar for ${version}.`);\n    return cachedPath;\n  }\n\n  // A version's asar.gz lives on exactly one host depending on its channel\n  // (public \u2192 GitHub release assets, catalyst \u2192 the Obsidian CDN). The concrete\n  // Version alone does not tell us which, so try both and use the first that\n  // Returns a valid archive.\n  const errors: string[] = [];\n  for (const url of getAsarDownloadUrls(version)) {\n    try {\n      const asar = await downloadAndDecompressAsar(url);\n      writeFileSync(cachedPath, asar);\n      log(`[version-switch] Cached asar ${version} (${String(asar.length)} bytes) -> ${cachedPath}`);\n      return cachedPath;\n    } catch (error) {\n      errors.push(`${url}: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n\n  throw new Error(`Failed to download Obsidian asar ${version}. Attempts: ${errors.join('; ')}`);\n}\n\n/**\n * Fetches and parses Obsidian's desktop releases manifest.\n *\n * @returns The parsed manifest.\n * @throws Error if the manifest cannot be fetched.\n */\nexport async function fetchDesktopReleasesManifest(): Promise<DesktopReleasesManifest> {\n  const response = await fetch(DESKTOP_RELEASES_MANIFEST_URL);\n  if (!response.ok) {\n    throw new Error(`Failed to fetch desktop releases manifest: HTTP ${String(response.status)}`);\n  }\n  return await response.json() as DesktopReleasesManifest;\n}\n\n/**\n * Finds the newest `obsidian-<version>.asar` in a directory.\n *\n * @param dir - The directory to scan (e.g. the user's Obsidian config dir).\n * @returns The newest discovered asar, or `undefined` if none / the dir is unreadable.\n */\nexport function findNewestAsar(dir: string): DiscoveredAsar | undefined {\n  let entries: string[];\n  try {\n    entries = readdirSync(dir);\n  } catch {\n    return undefined;\n  }\n\n  let newest: DiscoveredAsar | undefined;\n  for (const entry of entries) {\n    const match = ASAR_FILE_PATTERN.exec(entry);\n    if (!match) {\n      continue;\n    }\n    const version = match.groups?.['version'] ?? '';\n    if (!newest || compareVersions(version, newest.version) > 0) {\n      newest = { path: join(dir, entry), version };\n    }\n  }\n  return newest;\n}\n\n/**\n * Returns the local cache path for a concrete version's asar (the file may not\n * yet exist).\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The absolute path the asar is cached at.\n */\nexport function getCachedAsarPath(version: string): string {\n  return join(ASAR_CACHE_DIR, getVersionAsarFileName(version));\n}\n\n/**\n * Resolves a version specifier (explicit or channel alias) to a concrete\n * `x.y.z` version, fetching the manifest only when a channel alias is used.\n *\n * @param spec - The version specifier.\n * @returns The concrete version.\n */\nexport async function resolveConcreteVersion(spec: string): Promise<string> {\n  const parsed = parseVersionSpec(spec);\n  if (parsed.kind === 'explicit') {\n    return parsed.version;\n  }\n  const manifest = await fetchDesktopReleasesManifest();\n  return resolveVersionFromManifest(manifest, parsed.channel);\n}\n\n/**\n * Downloads a gzip-compressed asar from a URL and decompresses it.\n *\n * @param url - The `.asar.gz` URL.\n * @returns The decompressed asar bytes.\n * @throws Error if the request fails, the body is empty, or decompression fails.\n */\nasync function downloadAndDecompressAsar(url: string): Promise<Buffer> {\n  log(`[version-switch] Downloading asar from ${url} ...`);\n  const response = await fetch(url, { headers: { 'User-Agent': DOWNLOAD_USER_AGENT } });\n  if (!response.ok) {\n    throw new Error(`HTTP ${String(response.status)}`);\n  }\n\n  const gz = Buffer.from(await response.arrayBuffer());\n  if (gz.length === 0) {\n    throw new Error('empty response body');\n  }\n  return gunzipSync(gz);\n}\n\n/**\n * Returns the candidate `.asar.gz` download URLs for a concrete version.\n *\n * The version's exact URL baked into the `metadata.json` catalog (from upstream\n * `obsidian-versions.json`) is tried first when present; the hand-rolled public\n * (GitHub) and catalyst (CDN) guesses follow as a fallback for versions absent\n * from the catalog (or a stale catalog).\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The URLs to try, in order.\n */\nfunction getAsarDownloadUrls(version: string): string[] {\n  const asarGzFileName = `${getVersionAsarFileName(version)}.gz`;\n  const fallbackUrls = [\n    `${PUBLIC_ASAR_RELEASE_BASE_URL}/v${version}/${asarGzFileName}`,\n    `${CATALYST_ASAR_RELEASE_BASE_URL}/${asarGzFileName}`\n  ];\n\n  const bakedUrl = getVersionMetadata(version)?.downloads?.asar;\n  return bakedUrl ? [bakedUrl, ...fallbackUrls] : fallbackUrls;\n}\n\n/* v8 ignore stop */\n"],
  "mappings": "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",
  "names": []
}

|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/obsidian-version-switch.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Integration-time helpers for provisioning a specific Obsidian **asar** (the\n * app code) into an isolated user-data directory.\n *\n * Obsidian's bootstrap loads the highest of (its shell's bundled\n * `resources/obsidian.asar`, the `obsidian-<version>.asar` files in the\n * user-data directory). So placing an asar here only takes effect when its version is\n * **>= the shell's bundled version** (upgrade-only \u2014 confirmed by the Phase 0\n * spike). Running an older version requires pinning the installer/shell instead\n * (see `obsidian-installer.ts`).\n */\n\n/* v8 ignore start -- Integration-time download/filesystem glue covered by integration tests, not unit tests. */\n\nimport {\n  copyFileSync,\n  existsSync,\n  mkdirSync,\n  readdirSync,\n  writeFileSync\n} from 'node:fs';\nimport { tmpdir } from 'node:os';\nimport { join } from 'node:path';\nimport { gunzipSync } from 'node:zlib';\n\nimport type { DesktopReleasesManifest } from './obsidian-version.mjs';\n\nimport { log } from './log.mjs';\nimport { getVersionMetadata } from './obsidian-metadata.mjs';\nimport {\n  compareVersions,\n  DESKTOP_RELEASES_MANIFEST_URL,\n  getVersionAsarFileName,\n  parseVersionSpec,\n  resolveVersionFromManifest\n} from './obsidian-version.mjs';\n\n/**\n * Browser User-Agent required to fetch asar packages from\n * `releases.obsidian.md` (the endpoint is Cloudflare-gated against non-browser\n * clients). Matches the UA documented in the obsidian-versions repo.\n */\nconst DOWNLOAD_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.183 Safari/537.36';\n\n/**\n * Base URL for **public** (stable) release asars, published as GitHub release\n * assets under `.../download/v<version>/obsidian-<version>.asar.gz`.\n */\nconst PUBLIC_ASAR_RELEASE_BASE_URL = 'https://github.com/obsidianmd/obsidian-releases/releases/download';\n\n/**\n * Base URL for **catalyst** (early access / insider) release asars, served from\n * the Obsidian CDN as `.../release/obsidian-<version>.asar.gz`. Public versions\n * are NOT hosted here (the CDN returns an empty body for them).\n */\nconst CATALYST_ASAR_RELEASE_BASE_URL = 'https://releases.obsidian.md/release';\n\nconst CACHE_ROOT = join(tmpdir(), 'obsidian-integration-testing');\nconst ASAR_CACHE_DIR = join(CACHE_ROOT, 'asar-cache');\nconst ASAR_FILE_PATTERN = /^obsidian-(?<version>\\d+\\.\\d+\\.\\d+)\\.asar$/;\n\n/**\n * A discovered `obsidian-<version>.asar` file.\n */\nexport interface DiscoveredAsar {\n  /**\n  Absolute path to the asar file.\n   */\n  readonly path: string;\n\n  /**\n  The `x.y.z` version parsed from the file name.\n   */\n  readonly version: string;\n}\n\n/**\n * Copies an asar file into a user-data directory under its canonical\n * `obsidian-<version>.asar` name.\n *\n * @param asarPath - Source asar path.\n * @param version - The asar's version (used for the destination file name).\n * @param userDataDirectory - Destination user-data directory.\n */\nexport function copyAsarIntoUserData(asarPath: string, version: string, userDataDirectory: string): void {\n  mkdirSync(userDataDirectory, { recursive: true });\n  const destination = join(userDataDirectory, getVersionAsarFileName(version));\n  copyFileSync(asarPath, destination);\n  log(`[version-switch] Provisioned ${getVersionAsarFileName(version)} into ${userDataDirectory}.`);\n}\n\n/**\n * Ensures the asar for a concrete version is present in the local cache,\n * downloading and decompressing it if necessary.\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The absolute path to the cached asar.\n * @throws Error if the download fails.\n */\nexport async function ensureAsarCached(version: string): Promise<string> {\n  mkdirSync(ASAR_CACHE_DIR, { recursive: true });\n  const cachedPath = getCachedAsarPath(version);\n  if (existsSync(cachedPath)) {\n    log(`[version-switch] Using cached asar for ${version}.`);\n    return cachedPath;\n  }\n\n  // A version's asar.gz lives on exactly one host depending on its channel\n  // (public \u2192 GitHub release assets, catalyst \u2192 the Obsidian CDN). The concrete\n  // Version alone does not tell us which, so try both and use the first that\n  // Returns a valid archive.\n  const errors: string[] = [];\n  for (const url of getAsarDownloadUrls(version)) {\n    try {\n      const asar = await downloadAndDecompressAsar(url);\n      writeFileSync(cachedPath, asar);\n      log(`[version-switch] Cached asar ${version} (${String(asar.length)} bytes) -> ${cachedPath}`);\n      return cachedPath;\n    } catch (error) {\n      errors.push(`${url}: ${error instanceof Error ? error.message : String(error)}`);\n    }\n  }\n\n  throw new Error(`Failed to download Obsidian asar ${version}. Attempts: ${errors.join('; ')}`);\n}\n\n/**\n * Fetches and parses Obsidian's desktop releases manifest.\n *\n * @returns The parsed manifest.\n * @throws Error if the manifest cannot be fetched.\n */\nexport async function fetchDesktopReleasesManifest(): Promise<DesktopReleasesManifest> {\n  const response = await fetch(DESKTOP_RELEASES_MANIFEST_URL);\n  if (!response.ok) {\n    throw new Error(`Failed to fetch desktop releases manifest: HTTP ${String(response.status)}`);\n  }\n  return await response.json() as DesktopReleasesManifest;\n}\n\n/**\n * Finds the newest `obsidian-<version>.asar` in a directory.\n *\n * @param directory - The directory to scan (e.g. the user's Obsidian config directory).\n * @returns The newest discovered asar, or `undefined` if none / the directory is unreadable.\n */\nexport function findNewestAsar(directory: string): DiscoveredAsar | undefined {\n  let entries: string[];\n  try {\n    entries = readdirSync(directory);\n  } catch {\n    return undefined;\n  }\n\n  let newest: DiscoveredAsar | undefined;\n  for (const entry of entries) {\n    const match = ASAR_FILE_PATTERN.exec(entry);\n    if (!match) {\n      continue;\n    }\n    const version = match.groups?.['version'] ?? '';\n    if (!newest || compareVersions(version, newest.version) > 0) {\n      newest = { path: join(directory, entry), version };\n    }\n  }\n  return newest;\n}\n\n/**\n * Returns the local cache path for a concrete version's asar (the file may not\n * yet exist).\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The absolute path the asar is cached at.\n */\nexport function getCachedAsarPath(version: string): string {\n  return join(ASAR_CACHE_DIR, getVersionAsarFileName(version));\n}\n\n/**\n * Resolves a version specifier (explicit or channel alias) to a concrete\n * `x.y.z` version, fetching the manifest only when a channel alias is used.\n *\n * @param spec - The version specifier.\n * @returns The concrete version.\n */\nexport async function resolveConcreteVersion(spec: string): Promise<string> {\n  const parsed = parseVersionSpec(spec);\n  if (parsed.kind === 'explicit') {\n    return parsed.version;\n  }\n  const manifest = await fetchDesktopReleasesManifest();\n  return resolveVersionFromManifest(manifest, parsed.channel);\n}\n\n/**\n * Downloads a gzip-compressed asar from a URL and decompresses it.\n *\n * @param url - The `.asar.gz` URL.\n * @returns The decompressed asar bytes.\n * @throws Error if the request fails, the body is empty, or decompression fails.\n */\nasync function downloadAndDecompressAsar(url: string): Promise<Buffer> {\n  log(`[version-switch] Downloading asar from ${url} ...`);\n  const response = await fetch(url, { headers: { 'User-Agent': DOWNLOAD_USER_AGENT } });\n  if (!response.ok) {\n    throw new Error(`HTTP ${String(response.status)}`);\n  }\n\n  const gz = Buffer.from(await response.arrayBuffer());\n  if (gz.length === 0) {\n    throw new Error('empty response body');\n  }\n  return gunzipSync(gz);\n}\n\n/**\n * Returns the candidate `.asar.gz` download URLs for a concrete version.\n *\n * The version's exact URL baked into the `metadata.json` catalog (from upstream\n * `obsidian-versions.json`) is tried first when present; the hand-rolled public\n * (GitHub) and catalyst (CDN) guesses follow as a fallback for versions absent\n * from the catalog (or a stale catalog).\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The URLs to try, in order.\n */\nfunction getAsarDownloadUrls(version: string): string[] {\n  const asarGzFileName = `${getVersionAsarFileName(version)}.gz`;\n  const fallbackUrls = [\n    `${PUBLIC_ASAR_RELEASE_BASE_URL}/v${version}/${asarGzFileName}`,\n    `${CATALYST_ASAR_RELEASE_BASE_URL}/${asarGzFileName}`\n  ];\n\n  const bakedUrl = getVersionMetadata(version)?.downloads?.asar;\n  return bakedUrl ? [bakedUrl, ...fallbackUrls] : fallbackUrls;\n}\n\n/* v8 ignore stop */\n"],
  "mappings": "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",
  "names": []
}

|
|
@@ -28,16 +28,22 @@ export declare const DESKTOP_RELEASES_MANIFEST_URL = "https://raw.githubusercont
|
|
|
28
28
|
* A version specifier resolved against a release channel.
|
|
29
29
|
*/
|
|
30
30
|
export interface ChannelVersionSpec {
|
|
31
|
-
/**
|
|
31
|
+
/**
|
|
32
|
+
The channel to resolve against the manifest.
|
|
33
|
+
*/
|
|
32
34
|
readonly channel: ReleaseChannel;
|
|
33
|
-
/**
|
|
35
|
+
/**
|
|
36
|
+
Discriminant.
|
|
37
|
+
*/
|
|
34
38
|
readonly kind: 'channel';
|
|
35
39
|
}
|
|
36
40
|
/**
|
|
37
41
|
* The `beta` (catalyst) entry of {@link DesktopReleasesManifest}.
|
|
38
42
|
*/
|
|
39
43
|
export interface DesktopReleasesBeta {
|
|
40
|
-
/**
|
|
44
|
+
/**
|
|
45
|
+
The latest catalyst version, e.g. `'1.13.1'`.
|
|
46
|
+
*/
|
|
41
47
|
readonly latestVersion: string;
|
|
42
48
|
}
|
|
43
49
|
/**
|
|
@@ -57,9 +63,13 @@ export interface DesktopReleasesManifest {
|
|
|
57
63
|
* A version specifier naming a concrete `x.y.z` version.
|
|
58
64
|
*/
|
|
59
65
|
export interface ExplicitVersionSpec {
|
|
60
|
-
/**
|
|
66
|
+
/**
|
|
67
|
+
Discriminant.
|
|
68
|
+
*/
|
|
61
69
|
readonly kind: 'explicit';
|
|
62
|
-
/**
|
|
70
|
+
/**
|
|
71
|
+
The concrete `x.y.z` version.
|
|
72
|
+
*/
|
|
63
73
|
readonly version: string;
|
|
64
74
|
}
|
|
65
75
|
/**
|
|
@@ -6,8 +6,8 @@ const VERSION_SEGMENT_COUNT = 3;
|
|
|
6
6
|
function compareVersions(a, b) {
|
|
7
7
|
const aSegments = parseVersionSegments(a);
|
|
8
8
|
const bSegments = parseVersionSegments(b);
|
|
9
|
-
for (let
|
|
10
|
-
const diff = (aSegments[
|
|
9
|
+
for (let index = 0; index < VERSION_SEGMENT_COUNT; index++) {
|
|
10
|
+
const diff = (aSegments[index] ?? 0) - (bSegments[index] ?? 0);
|
|
11
11
|
if (diff !== 0) {
|
|
12
12
|
return diff;
|
|
13
13
|
}
|
|
@@ -52,4 +52,4 @@ export {
|
|
|
52
52
|
parseVersionSpec,
|
|
53
53
|
resolveVersionFromManifest
|
|
54
54
|
};
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["../../../src/obsidian-version.ts"],
  "sourcesContent": ["/**\n * @file\n *\n * Pure helpers for resolving Obsidian desktop version specifiers.\n *\n * A version specifier is either an explicit `x.y.z` string or one of the\n * channel aliases {@link PUBLIC_LATEST} / {@link CATALYST_LATEST}, which resolve\n * against Obsidian's published desktop releases manifest.\n *\n * The network call that fetches the manifest lives in the integration-time\n * version-switch module; everything here is pure and unit-tested.\n */\n\n/**\n * Version specifier alias resolving to the latest **public** desktop release\n * (the manifest's `latestVersion`).\n */\nexport const PUBLIC_LATEST = 'public-latest';\n\n/**\n * Version specifier alias resolving to the latest **catalyst** (early access /\n * insider) desktop release (the manifest's `beta.latestVersion`).\n */\nexport const CATALYST_LATEST = 'catalyst-latest';\n\n/**\n * URL of Obsidian's desktop releases manifest (raw JSON).\n */\nexport const DESKTOP_RELEASES_MANIFEST_URL = 'https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json';\n\nconst EXPLICIT_VERSION_PATTERN = /^\\d+\\.\\d+\\.\\d+$/;\nconst VERSION_SEGMENT_COUNT = 3;\n\n/**\n * A version specifier resolved against a release channel.\n */\nexport interface ChannelVersionSpec {\n  /**\n  The channel to resolve against the manifest.\n   */\n  readonly channel: ReleaseChannel;\n\n  /**\n  Discriminant.\n   */\n  readonly kind: 'channel';\n}\n\n/**\n * The `beta` (catalyst) entry of {@link DesktopReleasesManifest}.\n */\nexport interface DesktopReleasesBeta {\n  /**\n  The latest catalyst version, e.g. `'1.13.1'`.\n   */\n  readonly latestVersion: string;\n}\n\n/**\n * The subset of Obsidian's `desktop-releases.json` this library reads.\n */\nexport interface DesktopReleasesManifest {\n  /**\n   * The latest catalyst (early access / insider) release, when present.\n   */\n  readonly beta?: DesktopReleasesBeta;\n\n  /**\n   * The latest public (stable) version, e.g. `'1.12.7'`.\n   */\n  readonly latestVersion: string;\n}\n\n/**\n * A version specifier naming a concrete `x.y.z` version.\n */\nexport interface ExplicitVersionSpec {\n  /**\n  Discriminant.\n   */\n  readonly kind: 'explicit';\n\n  /**\n  The concrete `x.y.z` version.\n   */\n  readonly version: string;\n}\n\n/**\n * A release channel resolved from a channel-alias specifier.\n *\n * - `public` \u2014 the latest stable release.\n * - `catalyst` \u2014 the latest early access / insider release.\n */\nexport type ReleaseChannel = 'catalyst' | 'public';\n\n/**\n * The parsed form of a version specifier.\n *\n * - `explicit` \u2014 a concrete `x.y.z` version.\n * - `channel` \u2014 a channel alias to be resolved against the manifest.\n */\nexport type VersionSpec = ChannelVersionSpec | ExplicitVersionSpec;\n\n/**\n * Compares two `x.y.z` version strings numerically, segment by segment.\n *\n * @param a - The first version.\n * @param b - The second version.\n * @returns A negative number if `a < b`, `0` if equal, a positive number if `a > b`.\n */\nexport function compareVersions(a: string, b: string): number {\n  const aSegments = parseVersionSegments(a);\n  const bSegments = parseVersionSegments(b);\n\n  for (let index = 0; index < VERSION_SEGMENT_COUNT; index++) {\n    const diff = (aSegments[index] ?? 0) - (bSegments[index] ?? 0);\n    if (diff !== 0) {\n      return diff;\n    }\n  }\n\n  return 0;\n}\n\n/**\n * Returns the user-data asar file name for a given version, matching the name\n * Obsidian itself uses when it downloads an update (`obsidian-<version>.asar`).\n *\n * @param version - A concrete `x.y.z` version.\n * @returns The asar file name.\n */\nexport function getVersionAsarFileName(version: string): string {\n  return `obsidian-${version}.asar`;\n}\n\n/**\n * Parses a version specifier into either an explicit version or a channel alias.\n *\n * @param spec - The specifier: an `x.y.z` string, {@link PUBLIC_LATEST}, or {@link CATALYST_LATEST}.\n * @returns The parsed {@link VersionSpec}.\n * @throws Error if the specifier is neither a valid `x.y.z` version nor a known alias.\n */\nexport function parseVersionSpec(spec: string): VersionSpec {\n  if (spec === PUBLIC_LATEST) {\n    return { channel: 'public', kind: 'channel' };\n  }\n\n  if (spec === CATALYST_LATEST) {\n    return { channel: 'catalyst', kind: 'channel' };\n  }\n\n  if (EXPLICIT_VERSION_PATTERN.test(spec)) {\n    return { kind: 'explicit', version: spec };\n  }\n\n  throw new Error(\n    `Invalid Obsidian version \"${spec}\". Expected an \"x.y.z\" version, \"${PUBLIC_LATEST}\", or \"${CATALYST_LATEST}\".`\n  );\n}\n\n/**\n * Resolves a channel to a concrete version using a desktop releases manifest.\n *\n * @param manifest - The parsed manifest.\n * @param channel - The channel to resolve.\n * @returns The concrete `x.y.z` version for the channel.\n * @throws Error if the catalyst channel is requested but the manifest has no `beta` entry.\n */\nexport function resolveVersionFromManifest(manifest: DesktopReleasesManifest, channel: ReleaseChannel): string {\n  if (channel === 'public') {\n    return manifest.latestVersion;\n  }\n\n  if (!manifest.beta) {\n    throw new Error('Desktop releases manifest has no catalyst (beta) release.');\n  }\n\n  return manifest.beta.latestVersion;\n}\n\n/**\n * Splits an `x.y.z` version into its numeric segments.\n *\n * @param version - The version string.\n * @returns The numeric segments.\n */\nfunction parseVersionSegments(version: string): number[] {\n  return version.split('.').map((segment) => Number.parseInt(segment, 10));\n}\n"],
  "mappings": "AAiBO,MAAM,gBAAgB;AAMtB,MAAM,kBAAkB;AAKxB,MAAM,gCAAgC;AAE7C,MAAM,2BAA2B;AACjC,MAAM,wBAAwB;AAgFvB,SAAS,gBAAgB,GAAW,GAAmB;AAC5D,QAAM,YAAY,qBAAqB,CAAC;AACxC,QAAM,YAAY,qBAAqB,CAAC;AAExC,WAAS,QAAQ,GAAG,QAAQ,uBAAuB,SAAS;AAC1D,UAAM,QAAQ,UAAU,KAAK,KAAK,MAAM,UAAU,KAAK,KAAK;AAC5D,QAAI,SAAS,GAAG;AACd,aAAO;AAAA,IACT;AAAA,EACF;AAEA,SAAO;AACT;AASO,SAAS,uBAAuB,SAAyB;AAC9D,SAAO,YAAY,OAAO;AAC5B;AASO,SAAS,iBAAiB,MAA2B;AAC1D,MAAI,SAAS,eAAe;AAC1B,WAAO,EAAE,SAAS,UAAU,MAAM,UAAU;AAAA,EAC9C;AAEA,MAAI,SAAS,iBAAiB;AAC5B,WAAO,EAAE,SAAS,YAAY,MAAM,UAAU;AAAA,EAChD;AAEA,MAAI,yBAAyB,KAAK,IAAI,GAAG;AACvC,WAAO,EAAE,MAAM,YAAY,SAAS,KAAK;AAAA,EAC3C;AAEA,QAAM,IAAI;AAAA,IACR,6BAA6B,IAAI,oCAAoC,aAAa,UAAU,eAAe;AAAA,EAC7G;AACF;AAUO,SAAS,2BAA2B,UAAmC,SAAiC;AAC7G,MAAI,YAAY,UAAU;AACxB,WAAO,SAAS;AAAA,EAClB;AAEA,MAAI,CAAC,SAAS,MAAM;AAClB,UAAM,IAAI,MAAM,2DAA2D;AAAA,EAC7E;AAEA,SAAO,SAAS,KAAK;AACvB;AAQA,SAAS,qBAAqB,SAA2B;AACvD,SAAO,QAAQ,MAAM,GAAG,EAAE,IAAI,CAAC,YAAY,OAAO,SAAS,SAAS,EAAE,CAAC;AACzE;",
  "names": []
}

|
|
@@ -24,11 +24,17 @@
|
|
|
24
24
|
* Parameters for {@link buildOwnedObsidianJson}.
|
|
25
25
|
*/
|
|
26
26
|
export interface BuildOwnedObsidianJsonParams {
|
|
27
|
-
/**
|
|
27
|
+
/**
|
|
28
|
+
Last-access timestamp to stamp on the vault entry.
|
|
29
|
+
*/
|
|
28
30
|
readonly ts: number;
|
|
29
|
-
/**
|
|
31
|
+
/**
|
|
32
|
+
The randomly-generated vault id used as the registry key and `last_open`.
|
|
33
|
+
*/
|
|
30
34
|
readonly vaultId: string;
|
|
31
|
-
/**
|
|
35
|
+
/**
|
|
36
|
+
Absolute path to the harness vault folder.
|
|
37
|
+
*/
|
|
32
38
|
readonly vaultPath: string;
|
|
33
39
|
}
|
|
34
40
|
/**
|
|
@@ -40,20 +46,30 @@ export interface OwnedObsidianJson {
|
|
|
40
46
|
* ignored as an unknown key by newer versions that use the per-entry `open`.
|
|
41
47
|
*/
|
|
42
48
|
readonly last_open: string;
|
|
43
|
-
/**
|
|
49
|
+
/**
|
|
50
|
+
Disables the throwaway instance's self-update.
|
|
51
|
+
*/
|
|
44
52
|
readonly updateDisabled: true;
|
|
45
|
-
/**
|
|
53
|
+
/**
|
|
54
|
+
Vault registry keyed by vault id.
|
|
55
|
+
*/
|
|
46
56
|
readonly vaults: Readonly<Record<string, OwnedObsidianVaultEntry>>;
|
|
47
57
|
}
|
|
48
58
|
/**
|
|
49
59
|
* A single vault entry in the seeded `obsidian.json`.
|
|
50
60
|
*/
|
|
51
61
|
export interface OwnedObsidianVaultEntry {
|
|
52
|
-
/**
|
|
62
|
+
/**
|
|
63
|
+
Per-entry auto-open flag honored by newer Obsidian versions.
|
|
64
|
+
*/
|
|
53
65
|
readonly open: true;
|
|
54
|
-
/**
|
|
66
|
+
/**
|
|
67
|
+
Absolute path to the harness vault folder.
|
|
68
|
+
*/
|
|
55
69
|
readonly path: string;
|
|
56
|
-
/**
|
|
70
|
+
/**
|
|
71
|
+
Last-access timestamp.
|
|
72
|
+
*/
|
|
57
73
|
readonly ts: number;
|
|
58
74
|
}
|
|
59
75
|
/**
|
|
@@ -11,4 +11,4 @@ function buildOwnedObsidianJson(params) {
|
|
|
11
11
|
export {
|
|
12
12
|
buildOwnedObsidianJson
|
|
13
13
|
};
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL293bmVkLXZhdWx0LXNlZWQudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbIi8qKlxuICogQGZpbGVcbiAqXG4gKiBCdWlsZHMgdGhlIGlzb2xhdGVkIGBvYnNpZGlhbi5qc29uYCB0aGUgaGFybmVzcyBwcmUtc2VlZHMgaW50byBhbiBvd25lZFxuICogaW5zdGFuY2UncyB0ZW1wIGAtLXVzZXItZGF0YS1kaXJgIHNvIE9ic2lkaWFuIG9wZW5zIHRoZSBoYXJuZXNzIHZhdWx0IGRpcmVjdGx5XG4gKiBpbnN0ZWFkIG9mIHNob3dpbmcgdGhlIGZpcnN0LXJ1biB2YXVsdC1zZWxlY3RvciAodGhlIGBzdGFydGVyLXNjcmVlbmApLlxuICpcbiAqIFRoZSBhdXRvLW9wZW4gbWFya2VyIGNoYW5nZWQgYWNyb3NzIE9ic2lkaWFuJ3MgaGlzdG9yeSwgc28gdGhlIHNlZWQgY2Fycmllc1xuICogQk9USCBmb3JtcyBhbmQgZWFjaCB2ZXJzaW9uIHJlYWRzIHRoZSBvbmUgaXQgdW5kZXJzdGFuZHMgKGlnbm9yaW5nIHRoZSBvdGhlclxuICogdW5rbm93biBrZXkpIFx1MjAxNCBubyBwZXItdmVyc2lvbiBicmFuY2hpbmc6XG4gKlxuICogLSAqKk9sZCB2ZXJzaW9ucyoqIChjb25maXJtZWQgMC42LjQpIGF1dG8tb3BlbiBmcm9tIGEgKip0b3AtbGV2ZWwgYGxhc3Rfb3BlbmAqKlxuICogICBob2xkaW5nIHRoZSB2YXVsdCBpZCAoYG1haW4uanNgOiBgaWYgKGlkICYmIHZhdWx0cy5oYXNPd25Qcm9wZXJ0eShpZCkpXG4gKiAgIGNyZWF0ZVdpbmRvdyhpZCk7IGVsc2Ugb3BlblN0YXJ0ZXIoKTtgKSwgYW5kIHN0b3JlIGVhY2ggdmF1bHQgZW50cnkgYXMganVzdFxuICogICBgeyBwYXRoLCB0cyB9YC4gV2l0aG91dCBgbGFzdF9vcGVuYCB0aGV5IGZhbGwgdGhyb3VnaCB0byB0aGUgdmF1bHQtc2VsZWN0b3IuXG4gKiAtICoqTmV3ZXIgdmVyc2lvbnMqKiAoY29uZmlybWVkIDAuMTQuNSspIGRyb3BwZWQgYGxhc3Rfb3BlbmAgYW5kIGF1dG8tb3BlbiBmcm9tXG4gKiAgIHRoZSBwZXItZW50cnkgKipgb3BlbjogdHJ1ZWAqKiBmbGFnLlxuICpcbiAqIFNlZWRpbmcgYm90aCB3YXMgdmVyaWZpZWQgdG8gb3BlbiB0aGUgdmF1bHQgZGlyZWN0bHkgKG5vIHNlbGVjdG9yKSBvbiAwLjYuNCxcbiAqIDAuOS4yMCwgMC4xMi4xOSwgMC4xMy4xOSwgMC4xNC41IGFuZCAxLjEyLjcuIGB1cGRhdGVEaXNhYmxlZGAgc3VwcHJlc3NlcyB0aGVcbiAqIHRocm93YXdheSBpbnN0YW5jZSdzIHNlbGYtdXBkYXRlLlxuICovXG5cbi8qKlxuICogUGFyYW1ldGVycyBmb3Ige0BsaW5rIGJ1aWxkT3duZWRPYnNpZGlhbkpzb259LlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkT3duZWRPYnNpZGlhbkpzb25QYXJhbXMge1xuICAvKipcbiAgTGFzdC1hY2Nlc3MgdGltZXN0YW1wIHRvIHN0YW1wIG9uIHRoZSB2YXVsdCBlbnRyeS5cbiAgICovXG4gIHJlYWRvbmx5IHRzOiBudW1iZXI7XG5cbiAgLyoqXG4gIFRoZSByYW5kb21seS1nZW5lcmF0ZWQgdmF1bHQgaWQgdXNlZCBhcyB0aGUgcmVnaXN0cnkga2V5IGFuZCBgbGFzdF9vcGVuYC5cbiAgICovXG4gIHJlYWRvbmx5IHZhdWx0SWQ6IHN0cmluZztcblxuICAvKipcbiAgQWJzb2x1dGUgcGF0aCB0byB0aGUgaGFybmVzcyB2YXVsdCBmb2xkZXIuXG4gICAqL1xuICByZWFkb25seSB2YXVsdFBhdGg6IHN0cmluZztcbn1cblxuLyoqXG4gKiBUaGUgYG9ic2lkaWFuLmpzb25gIHN0cnVjdHVyZSB0aGUgaGFybmVzcyBzZWVkcyBmb3IgYW4gb3duZWQgaW5zdGFuY2UuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgT3duZWRPYnNpZGlhbkpzb24ge1xuICAvKipcbiAgICogVG9wLWxldmVsIGF1dG8tb3BlbiBtYXJrZXIgKHZhdWx0IGlkKSBob25vcmVkIGJ5IG9sZCBPYnNpZGlhbiB2ZXJzaW9ucztcbiAgICogaWdub3JlZCBhcyBhbiB1bmtub3duIGtleSBieSBuZXdlciB2ZXJzaW9ucyB0aGF0IHVzZSB0aGUgcGVyLWVudHJ5IGBvcGVuYC5cbiAgICovXG4gIHJlYWRvbmx5IGxhc3Rfb3Blbjogc3RyaW5nO1xuXG4gIC8qKlxuICBEaXNhYmxlcyB0aGUgdGhyb3dhd2F5IGluc3RhbmNlJ3Mgc2VsZi11cGRhdGUuXG4gICAqL1xuICByZWFkb25seSB1cGRhdGVEaXNhYmxlZDogdHJ1ZTtcblxuICAvKipcbiAgVmF1bHQgcmVnaXN0cnkga2V5ZWQgYnkgdmF1bHQgaWQuXG4gICAqL1xuICByZWFkb25seSB2YXVsdHM6IFJlYWRvbmx5PFJlY29yZDxzdHJpbmcsIE93bmVkT2JzaWRpYW5WYXVsdEVudHJ5Pj47XG59XG5cbi8qKlxuICogQSBzaW5nbGUgdmF1bHQgZW50cnkgaW4gdGhlIHNlZWRlZCBgb2JzaWRpYW4uanNvbmAuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgT3duZWRPYnNpZGlhblZhdWx0RW50cnkge1xuICAvKipcbiAgUGVyLWVudHJ5IGF1dG8tb3BlbiBmbGFnIGhvbm9yZWQgYnkgbmV3ZXIgT2JzaWRpYW4gdmVyc2lvbnMuXG4gICAqL1xuICByZWFkb25seSBvcGVuOiB0cnVlO1xuXG4gIC8qKlxuICBBYnNvbHV0ZSBwYXRoIHRvIHRoZSBoYXJuZXNzIHZhdWx0IGZvbGRlci5cbiAgICovXG4gIHJlYWRvbmx5IHBhdGg6IHN0cmluZztcblxuICAvKipcbiAgTGFzdC1hY2Nlc3MgdGltZXN0YW1wLlxuICAgKi9cbiAgcmVhZG9ubHkgdHM6IG51bWJlcjtcbn1cblxuLyoqXG4gKiBCdWlsZHMgdGhlIGlzb2xhdGVkIGBvYnNpZGlhbi5qc29uYCB0aGF0IGZvcmNlLW9wZW5zIHRoZSBvd25lZCB2YXVsdCBhY3Jvc3MgYWxsXG4gKiBzdXBwb3J0ZWQgT2JzaWRpYW4gdmVyc2lvbnMgKHNlZSB0aGUgZmlsZSBvdmVydmlldyBmb3IgdGhlIGR1YWwtbWFya2VyXG4gKiByYXRpb25hbGUpLlxuICpcbiAqIEBwYXJhbSBwYXJhbXMgLSBUaGUgdmF1bHQgaWQsIHBhdGgsIGFuZCB0aW1lc3RhbXAgdG8gc2VlZC5cbiAqIEByZXR1cm5zIFRoZSBgb2JzaWRpYW4uanNvbmAgb2JqZWN0IHRvIHdyaXRlIGludG8gdGhlIG93bmVkIHVzZXItZGF0YSBkaXIuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiBidWlsZE93bmVkT2JzaWRpYW5Kc29uKHBhcmFtczogQnVpbGRPd25lZE9ic2lkaWFuSnNvblBhcmFtcyk6IE93bmVkT2JzaWRpYW5Kc29uIHtcbiAgcmV0dXJuIHtcbiAgICAvLyBlc2xpbnQtZGlzYWJsZS1uZXh0LWxpbmUgY2FtZWxjYXNlIC0tIE9ic2lkaWFuJ3Mgb3duIG9ic2lkaWFuLmpzb24gZmllbGQgbmFtZSAob2xkIHZlcnNpb25zJyBhdXRvLW9wZW4gbWFya2VyKS5cbiAgICBsYXN0X29wZW46IHBhcmFtcy52YXVsdElkLFxuICAgIHVwZGF0ZURpc2FibGVkOiB0cnVlLFxuICAgIHZhdWx0czoge1xuICAgICAgW3BhcmFtcy52YXVsdElkXTogeyBvcGVuOiB0cnVlLCBwYXRoOiBwYXJhbXMudmF1bHRQYXRoLCB0czogcGFyYW1zLnRzIH1cbiAgICB9XG4gIH07XG59XG4iXSwKICAibWFwcGluZ3MiOiAiQUE0Rk8sU0FBUyx1QkFBdUIsUUFBeUQ7QUFDOUYsU0FBTztBQUFBO0FBQUEsSUFFTCxXQUFXLE9BQU87QUFBQSxJQUNsQixnQkFBZ0I7QUFBQSxJQUNoQixRQUFRO0FBQUEsTUFDTixDQUFDLE9BQU8sT0FBTyxHQUFHLEVBQUUsTUFBTSxNQUFNLE1BQU0sT0FBTyxXQUFXLElBQUksT0FBTyxHQUFHO0FBQUEsSUFDeEU7QUFBQSxFQUNGO0FBQ0Y7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -0,0 +1,80 @@
|
|
|
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
|
+
/**
|
|
42
|
+
Stops listening and drops every accepted connection.
|
|
43
|
+
*/
|
|
44
|
+
close(): void;
|
|
45
|
+
/**
|
|
46
|
+
The loopback port the renderer watchdog should connect back to.
|
|
47
|
+
*/
|
|
48
|
+
readonly port: number;
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* Loopback host the liveness server binds to. Never exposed off-machine.
|
|
52
|
+
*/
|
|
53
|
+
export declare const PARENT_LIVENESS_HOST = "127.0.0.1";
|
|
54
|
+
/**
|
|
55
|
+
* Builds the expression evaluated in the owned instance's renderer to arm the
|
|
56
|
+
* watchdog.
|
|
57
|
+
*
|
|
58
|
+
* Written in ES5 style (`var`, `function`) with no optional chaining, matching
|
|
59
|
+
* {@link DISMISS_TRUST_DIALOG_EXPR}: the same expression has to parse on the
|
|
60
|
+
* Chromium 80-era renderers of the oldest supported Obsidian versions (L26).
|
|
61
|
+
*
|
|
62
|
+
* Arming is idempotent — a second evaluation finds the stored socket and
|
|
63
|
+
* returns without opening another connection, so a retried readiness pass does
|
|
64
|
+
* not pile up sockets.
|
|
65
|
+
*
|
|
66
|
+
* @param port - The loopback port returned by {@link startParentLivenessServer}.
|
|
67
|
+
* @returns The expression to evaluate, yielding `'armed'`, `'already-armed'`, or `'unavailable'`.
|
|
68
|
+
*/
|
|
69
|
+
export declare function buildParentLivenessWatchdogExpression(port: number): string;
|
|
70
|
+
/**
|
|
71
|
+
* Starts the loopback liveness server the owned instance's renderer connects
|
|
72
|
+
* back to.
|
|
73
|
+
*
|
|
74
|
+
* The server and every accepted socket are `unref`ed, so holding a watchdog
|
|
75
|
+
* connection open never keeps the harness process alive on its own — the
|
|
76
|
+
* connection is a token the kernel reclaims, not work to wait on.
|
|
77
|
+
*
|
|
78
|
+
* @returns A {@link Promise} resolving to the listening {@link ParentLivenessServer}.
|
|
79
|
+
*/
|
|
80
|
+
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 buildParentLivenessWatchdogExpression(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
|
+
buildParentLivenessWatchdogExpression,
|
|
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  /**\n  Stops listening and drops every accepted connection.\n   */\n  close(): void;\n\n  /**\n  The loopback port the renderer watchdog should connect back to.\n   */\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 buildParentLivenessWatchdogExpression(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;AAqBtB,MAAM,uBAAuB;AAiB7B,SAAS,sCAAsC,MAAsB;AAC1E,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": []
}

|
|
@@ -17,28 +17,28 @@
|
|
|
17
17
|
* integration test.
|
|
18
18
|
*/
|
|
19
19
|
import type { Promisable } from 'type-fest';
|
|
20
|
-
import type {
|
|
21
|
-
import type {
|
|
20
|
+
import type { ContextArguments } from './context-id.mjs';
|
|
21
|
+
import type { CommonArguments, GenericObject } from './eval-in-obsidian.mjs';
|
|
22
22
|
import type { ObsidianTransport } from './transport.mjs';
|
|
23
23
|
import { ContextId } from './context-id.mjs';
|
|
24
24
|
/**
|
|
25
25
|
* Parameters for {@link pollInObsidian}. Mirrors {@link EvalInObsidianParams} for
|
|
26
|
-
* the shared forwarded fields (`
|
|
26
|
+
* the shared forwarded fields (`input` / `contextId` / `transport` / `vaultPath`);
|
|
27
27
|
* `start` / `poll` are the in-Obsidian closures and `until` is the Node-side
|
|
28
28
|
* acceptance predicate.
|
|
29
29
|
*/
|
|
30
|
-
export interface PollInObsidianParams<
|
|
31
|
-
/**
|
|
32
|
-
* Additional arguments passed to both `start` and `poll` (serialized like
|
|
33
|
-
* {@link EvalInObsidianParams.args}).
|
|
34
|
-
*/
|
|
35
|
-
readonly args?: Args;
|
|
30
|
+
export interface PollInObsidianParams<Input extends GenericObject, PollResult, TContextId extends ContextId<unknown> | undefined = undefined> {
|
|
36
31
|
/**
|
|
37
32
|
* A {@link ContextId} shared by `start` and `poll`, so `start` can stash
|
|
38
33
|
* non-serializable state that `poll` later reads. When omitted, each closure
|
|
39
34
|
* gets a fresh empty `context`.
|
|
40
35
|
*/
|
|
41
36
|
readonly contextId?: TContextId;
|
|
37
|
+
/**
|
|
38
|
+
* Additional arguments passed to both `start` and `poll` (serialized like
|
|
39
|
+
* {@link EvalInObsidianParams.input}).
|
|
40
|
+
*/
|
|
41
|
+
readonly input?: Input;
|
|
42
42
|
/**
|
|
43
43
|
* Delay between `poll` attempts, in milliseconds.
|
|
44
44
|
*
|
|
@@ -50,13 +50,13 @@ export interface PollInObsidianParams<Args extends GenericObject, PollResult, TC
|
|
|
50
50
|
* ~30s CDP cap): it should read and return a JSON-serializable status, not
|
|
51
51
|
* await the long operation itself.
|
|
52
52
|
*/
|
|
53
|
-
poll(this: void,
|
|
53
|
+
poll(this: void, input: CommonArguments & ContextArguments<TContextId> & Input): Promisable<PollResult>;
|
|
54
54
|
/**
|
|
55
55
|
* An optional closure run **once** before polling begins, to kick off the
|
|
56
56
|
* long-running work (fire-and-forget from Node's perspective). Keep it short —
|
|
57
57
|
* start the work and return; do not await it to completion here.
|
|
58
58
|
*/
|
|
59
|
-
start?(this: void,
|
|
59
|
+
start?(this: void, input: CommonArguments & ContextArguments<TContextId> & Input): Promisable<unknown>;
|
|
60
60
|
/**
|
|
61
61
|
* Total budget before the poll rejects, in milliseconds.
|
|
62
62
|
*
|
|
@@ -89,4 +89,4 @@ export interface PollInObsidianParams<Args extends GenericObject, PollResult, TC
|
|
|
89
89
|
* @param params - The poll parameters.
|
|
90
90
|
* @returns A {@link Promise} that resolves with the first accepted `poll` result.
|
|
91
91
|
*/
|
|
92
|
-
export declare function pollInObsidian<
|
|
92
|
+
export declare function pollInObsidian<Input extends GenericObject, PollResult, TContextId extends ContextId<unknown> | undefined = undefined>(params: PollInObsidianParams<Input, PollResult, TContextId>): Promise<PollResult>;
|