obsidian-integration-testing 8.2.1 → 8.4.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/asar-fallback-detection.cjs +48 -0
- package/dist/lib/cjs/asar-fallback-detection.d.cts +75 -0
- package/dist/lib/cjs/compatibility-options.cjs +68 -0
- package/dist/lib/cjs/compatibility-options.d.cts +112 -0
- package/dist/lib/cjs/connect-to-cdp.cjs +19 -11
- package/dist/lib/cjs/connect-to-cdp.d.cts +64 -2
- package/dist/lib/cjs/ecmascript-version.cjs +63 -0
- package/dist/lib/cjs/ecmascript-version.d.cts +28 -0
- package/dist/lib/cjs/electron-compatibility.cjs +46 -0
- package/dist/lib/cjs/electron-compatibility.d.cts +74 -0
- package/dist/lib/cjs/index.cjs +10 -1
- package/dist/lib/cjs/index.d.cts +7 -1
- package/dist/lib/cjs/installer-asset.cjs +18 -3
- package/dist/lib/cjs/installer-asset.d.cts +26 -0
- package/dist/lib/cjs/installer-compatibility.cjs +1 -1
- package/dist/lib/cjs/installer-compatibility.d.cts +4 -1
- package/dist/lib/cjs/library.cjs +1 -1
- package/dist/lib/cjs/namespace-bootstrap.cjs +44 -7
- package/dist/lib/cjs/normalize-optional-properties.cjs +31 -0
- package/dist/lib/cjs/normalize-optional-properties.d.cts +26 -0
- package/dist/lib/cjs/obsidian-installer.cjs +6 -1
- package/dist/lib/cjs/obsidian-metadata.cjs +3775 -302
- package/dist/lib/cjs/obsidian-metadata.d.cts +71 -0
- package/dist/lib/cjs/obsidian-version-switch.cjs +5 -2
- package/dist/lib/cjs/owned-vault-seed.cjs +38 -0
- package/dist/lib/cjs/owned-vault-seed.d.cts +67 -0
- package/dist/lib/cjs/silent-asar-fallback-error.cjs +48 -0
- package/dist/lib/cjs/silent-asar-fallback-error.d.cts +40 -0
- package/dist/lib/cjs/transport-desktop-cdp.cjs +223 -45
- package/dist/lib/cjs/transport-desktop-cdp.d.cts +105 -1
- package/dist/lib/cjs/transport-factory.cjs +36 -16
- package/dist/lib/cjs/transport-options.cjs +1 -1
- package/dist/lib/cjs/transport-options.d.cts +48 -0
- package/dist/lib/esm/asar-fallback-detection.d.mts +75 -0
- package/dist/lib/esm/asar-fallback-detection.mjs +24 -0
- package/dist/lib/esm/compatibility-options.d.mts +112 -0
- package/dist/lib/esm/compatibility-options.mjs +40 -0
- package/dist/lib/esm/connect-to-cdp.d.mts +64 -2
- package/dist/lib/esm/connect-to-cdp.mjs +19 -11
- package/dist/lib/esm/ecmascript-version.d.mts +28 -0
- package/dist/lib/esm/ecmascript-version.mjs +39 -0
- package/dist/lib/esm/electron-compatibility.d.mts +74 -0
- package/dist/lib/esm/electron-compatibility.mjs +22 -0
- package/dist/lib/esm/index.d.mts +7 -1
- package/dist/lib/esm/index.mjs +7 -1
- package/dist/lib/esm/installer-asset.d.mts +26 -0
- package/dist/lib/esm/installer-asset.mjs +16 -2
- package/dist/lib/esm/installer-compatibility.d.mts +4 -1
- package/dist/lib/esm/installer-compatibility.mjs +1 -1
- package/dist/lib/esm/library.mjs +1 -1
- package/dist/lib/esm/namespace-bootstrap.mjs +44 -7
- package/dist/lib/esm/normalize-optional-properties.d.mts +26 -0
- package/dist/lib/esm/normalize-optional-properties.mjs +7 -0
- package/dist/lib/esm/obsidian-installer.mjs +8 -2
- package/dist/lib/esm/obsidian-metadata.d.mts +71 -0
- package/dist/lib/esm/obsidian-metadata.mjs +3775 -302
- package/dist/lib/esm/obsidian-version-switch.mjs +5 -2
- package/dist/lib/esm/owned-vault-seed.d.mts +67 -0
- package/dist/lib/esm/owned-vault-seed.mjs +14 -0
- package/dist/lib/esm/silent-asar-fallback-error.d.mts +40 -0
- package/dist/lib/esm/silent-asar-fallback-error.mjs +24 -0
- package/dist/lib/esm/transport-desktop-cdp.d.mts +105 -1
- package/dist/lib/esm/transport-desktop-cdp.mjs +223 -45
- package/dist/lib/esm/transport-factory.mjs +41 -16
- package/dist/lib/esm/transport-options.d.mts +48 -0
- package/dist/obsidian-integration-testing-8.4.0.tgz +0 -0
- package/package.json +3 -1
- package/dist/obsidian-integration-testing-8.2.1.tgz +0 -0
|
@@ -9,6 +9,7 @@ import { tmpdir } from "node:os";
|
|
|
9
9
|
import { join } from "node:path";
|
|
10
10
|
import { gunzipSync } from "node:zlib";
|
|
11
11
|
import { log } from "./log.mjs";
|
|
12
|
+
import { getVersionMetadata } from "./obsidian-metadata.mjs";
|
|
12
13
|
import {
|
|
13
14
|
compareVersions,
|
|
14
15
|
DESKTOP_RELEASES_MANIFEST_URL,
|
|
@@ -100,10 +101,12 @@ async function downloadAndDecompressAsar(url) {
|
|
|
100
101
|
}
|
|
101
102
|
function getAsarDownloadUrls(version) {
|
|
102
103
|
const asarGzFileName = `${getVersionAsarFileName(version)}.gz`;
|
|
103
|
-
|
|
104
|
+
const fallbackUrls = [
|
|
104
105
|
`${PUBLIC_ASAR_RELEASE_BASE_URL}/v${version}/${asarGzFileName}`,
|
|
105
106
|
`${CATALYST_ASAR_RELEASE_BASE_URL}/${asarGzFileName}`
|
|
106
107
|
];
|
|
108
|
+
const bakedUrl = getVersionMetadata(version)?.downloads?.asar;
|
|
109
|
+
return bakedUrl ? [bakedUrl, ...fallbackUrls] : fallbackUrls;
|
|
107
110
|
}
|
|
108
111
|
export {
|
|
109
112
|
copyAsarIntoUserData,
|
|
@@ -113,4 +116,4 @@ export {
|
|
|
113
116
|
getCachedAsarPath,
|
|
114
117
|
resolveConcreteVersion
|
|
115
118
|
};
|
|
116
|
-
//# 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 {\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, public\n * (GitHub) first, then catalyst (CDN).\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  return [\n    `${PUBLIC_ASAR_RELEASE_BASE_URL}/v${version}/${asarGzFileName}`,\n    `${CATALYST_ASAR_RELEASE_BASE_URL}/${asarGzFileName}`\n  ];\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 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": "AAgBA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,YAAY;AACrB,SAAS,kBAAkB;AAI3B,SAAS,WAAW;AACpB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAOP,MAAM,sBAAsB;AAM5B,MAAM,+BAA+B;AAOrC,MAAM,iCAAiC;AAEvC,MAAM,aAAa,KAAK,OAAO,GAAG,8BAA8B;AAChE,MAAM,iBAAiB,KAAK,YAAY,YAAY;AACpD,MAAM,oBAAoB;AAqBnB,SAAS,qBAAqB,UAAkB,SAAiB,aAA2B;AACjG,YAAU,aAAa,EAAE,WAAW,KAAK,CAAC;AAC1C,QAAM,OAAO,KAAK,aAAa,uBAAuB,OAAO,CAAC;AAC9D,eAAa,UAAU,IAAI;AAC3B,MAAI,gCAAgC,uBAAuB,OAAO,CAAC,SAAS,WAAW,GAAG;AAC5F;AAUA,eAAsB,iBAAiB,SAAkC;AACvE,YAAU,gBAAgB,EAAE,WAAW,KAAK,CAAC;AAC7C,QAAM,aAAa,kBAAkB,OAAO;AAC5C,MAAI,WAAW,UAAU,GAAG;AAC1B,QAAI,0CAA0C,OAAO,GAAG;AACxD,WAAO;AAAA,EACT;AAMA,QAAM,SAAmB,CAAC;AAC1B,aAAW,OAAO,oBAAoB,OAAO,GAAG;AAC9C,QAAI;AACF,YAAM,OAAO,MAAM,0BAA0B,GAAG;AAChD,oBAAc,YAAY,IAAI;AAC9B,UAAI,gCAAgC,OAAO,KAAK,OAAO,KAAK,MAAM,CAAC,cAAc,UAAU,EAAE;AAC7F,aAAO;AAAA,IACT,SAAS,OAAO;AACd,aAAO,KAAK,GAAG,GAAG,KAAK,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK,CAAC,EAAE;AAAA,IACjF;AAAA,EACF;AAEA,QAAM,IAAI,MAAM,oCAAoC,OAAO,eAAe,OAAO,KAAK,IAAI,CAAC,EAAE;AAC/F;AAQA,eAAsB,+BAAiE;AACrF,QAAM,WAAW,MAAM,MAAM,6BAA6B;AAC1D,MAAI,CAAC,SAAS,IAAI;AAChB,UAAM,IAAI,MAAM,mDAAmD,OAAO,SAAS,MAAM,CAAC,EAAE;AAAA,EAC9F;AACA,SAAO,MAAM,SAAS,KAAK;AAC7B;AAQO,SAAS,eAAe,KAAyC;AACtE,MAAI;AACJ,MAAI;AACF,cAAU,YAAY,GAAG;AAAA,EAC3B,QAAQ;AACN,WAAO;AAAA,EACT;AAEA,MAAI;AACJ,aAAW,SAAS,SAAS;AAC3B,UAAM,QAAQ,kBAAkB,KAAK,KAAK;AAC1C,QAAI,CAAC,OAAO;AACV;AAAA,IACF;AACA,UAAM,UAAU,MAAM,SAAS,SAAS,KAAK;AAC7C,QAAI,CAAC,UAAU,gBAAgB,SAAS,OAAO,OAAO,IAAI,GAAG;AAC3D,eAAS,EAAE,MAAM,KAAK,KAAK,KAAK,GAAG,QAAQ;AAAA,IAC7C;AAAA,EACF;AACA,SAAO;AACT;AASO,SAAS,kBAAkB,SAAyB;AACzD,SAAO,KAAK,gBAAgB,uBAAuB,OAAO,CAAC;AAC7D;AASA,eAAsB,uBAAuB,MAA+B;AAC1E,QAAM,SAAS,iBAAiB,IAAI;AACpC,MAAI,OAAO,SAAS,YAAY;AAC9B,WAAO,OAAO;AAAA,EAChB;AACA,QAAM,WAAW,MAAM,6BAA6B;AACpD,SAAO,2BAA2B,UAAU,OAAO,OAAO;AAC5D;AASA,eAAe,0BAA0B,KAA8B;AACrE,MAAI,0CAA0C,GAAG,MAAM;AACvD,QAAM,WAAW,MAAM,MAAM,KAAK,EAAE,SAAS,EAAE,cAAc,oBAAoB,EAAE,CAAC;AACpF,MAAI,CAAC,SAAS,IAAI;AAChB,UAAM,IAAI,MAAM,QAAQ,OAAO,SAAS,MAAM,CAAC,EAAE;AAAA,EACnD;AAEA,QAAM,KAAK,OAAO,KAAK,MAAM,SAAS,YAAY,CAAC;AACnD,MAAI,GAAG,WAAW,GAAG;AACnB,UAAM,IAAI,MAAM,qBAAqB;AAAA,EACvC;AACA,SAAO,WAAW,EAAE;AACtB;AAaA,SAAS,oBAAoB,SAA2B;AACtD,QAAM,iBAAiB,GAAG,uBAAuB,OAAO,CAAC;AACzD,QAAM,eAAe;AAAA,IACnB,GAAG,4BAA4B,KAAK,OAAO,IAAI,cAAc;AAAA,IAC7D,GAAG,8BAA8B,IAAI,cAAc;AAAA,EACrD;AAEA,QAAM,WAAW,mBAAmB,OAAO,GAAG,WAAW;AACzD,SAAO,WAAW,CAAC,UAAU,GAAG,YAAY,IAAI;AAClD;",
  "names": []
}

|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* Builds the isolated `obsidian.json` the harness pre-seeds into an owned
|
|
5
|
+
* instance's temp `--user-data-dir` so Obsidian opens the harness vault directly
|
|
6
|
+
* instead of showing the first-run vault-selector (the `starter-screen`).
|
|
7
|
+
*
|
|
8
|
+
* The auto-open marker changed across Obsidian's history, so the seed carries
|
|
9
|
+
* BOTH forms and each version reads the one it understands (ignoring the other
|
|
10
|
+
* unknown key) — no per-version branching:
|
|
11
|
+
*
|
|
12
|
+
* - **Old versions** (confirmed 0.6.4) auto-open from a **top-level `last_open`**
|
|
13
|
+
* holding the vault id (`main.js`: `if (id && vaults.hasOwnProperty(id))
|
|
14
|
+
* createWindow(id); else openStarter();`), and store each vault entry as just
|
|
15
|
+
* `{ path, ts }`. Without `last_open` they fall through to the vault-selector.
|
|
16
|
+
* - **Newer versions** (confirmed 0.14.5+) dropped `last_open` and auto-open from
|
|
17
|
+
* the per-entry **`open: true`** flag.
|
|
18
|
+
*
|
|
19
|
+
* Seeding both was verified to open the vault directly (no selector) on 0.6.4,
|
|
20
|
+
* 0.9.20, 0.12.19, 0.13.19, 0.14.5 and 1.12.7. `updateDisabled` suppresses the
|
|
21
|
+
* throwaway instance's self-update.
|
|
22
|
+
*/
|
|
23
|
+
/**
|
|
24
|
+
* Parameters for {@link buildOwnedObsidianJson}.
|
|
25
|
+
*/
|
|
26
|
+
export interface BuildOwnedObsidianJsonParams {
|
|
27
|
+
/** Last-access timestamp to stamp on the vault entry. */
|
|
28
|
+
readonly ts: number;
|
|
29
|
+
/** The randomly-generated vault id used as the registry key and `last_open`. */
|
|
30
|
+
readonly vaultId: string;
|
|
31
|
+
/** Absolute path to the harness vault folder. */
|
|
32
|
+
readonly vaultPath: string;
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* The `obsidian.json` structure the harness seeds for an owned instance.
|
|
36
|
+
*/
|
|
37
|
+
export interface OwnedObsidianJson {
|
|
38
|
+
/**
|
|
39
|
+
* Top-level auto-open marker (vault id) honored by old Obsidian versions;
|
|
40
|
+
* ignored as an unknown key by newer versions that use the per-entry `open`.
|
|
41
|
+
*/
|
|
42
|
+
readonly last_open: string;
|
|
43
|
+
/** Disables the throwaway instance's self-update. */
|
|
44
|
+
readonly updateDisabled: true;
|
|
45
|
+
/** Vault registry keyed by vault id. */
|
|
46
|
+
readonly vaults: Readonly<Record<string, OwnedObsidianVaultEntry>>;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* A single vault entry in the seeded `obsidian.json`.
|
|
50
|
+
*/
|
|
51
|
+
export interface OwnedObsidianVaultEntry {
|
|
52
|
+
/** Per-entry auto-open flag honored by newer Obsidian versions. */
|
|
53
|
+
readonly open: true;
|
|
54
|
+
/** Absolute path to the harness vault folder. */
|
|
55
|
+
readonly path: string;
|
|
56
|
+
/** Last-access timestamp. */
|
|
57
|
+
readonly ts: number;
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Builds the isolated `obsidian.json` that force-opens the owned vault across all
|
|
61
|
+
* supported Obsidian versions (see the file overview for the dual-marker
|
|
62
|
+
* rationale).
|
|
63
|
+
*
|
|
64
|
+
* @param params - The vault id, path, and timestamp to seed.
|
|
65
|
+
* @returns The `obsidian.json` object to write into the owned user-data dir.
|
|
66
|
+
*/
|
|
67
|
+
export declare function buildOwnedObsidianJson(params: BuildOwnedObsidianJsonParams): OwnedObsidianJson;
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
function buildOwnedObsidianJson(params) {
|
|
2
|
+
return {
|
|
3
|
+
// eslint-disable-next-line camelcase -- Obsidian's own obsidian.json field name (old versions' auto-open marker).
|
|
4
|
+
last_open: params.vaultId,
|
|
5
|
+
updateDisabled: true,
|
|
6
|
+
vaults: {
|
|
7
|
+
[params.vaultId]: { open: true, path: params.vaultPath, ts: params.ts }
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
}
|
|
11
|
+
export {
|
|
12
|
+
buildOwnedObsidianJson
|
|
13
|
+
};
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL293bmVkLXZhdWx0LXNlZWQudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbIi8qKlxuICogQGZpbGVcbiAqXG4gKiBCdWlsZHMgdGhlIGlzb2xhdGVkIGBvYnNpZGlhbi5qc29uYCB0aGUgaGFybmVzcyBwcmUtc2VlZHMgaW50byBhbiBvd25lZFxuICogaW5zdGFuY2UncyB0ZW1wIGAtLXVzZXItZGF0YS1kaXJgIHNvIE9ic2lkaWFuIG9wZW5zIHRoZSBoYXJuZXNzIHZhdWx0IGRpcmVjdGx5XG4gKiBpbnN0ZWFkIG9mIHNob3dpbmcgdGhlIGZpcnN0LXJ1biB2YXVsdC1zZWxlY3RvciAodGhlIGBzdGFydGVyLXNjcmVlbmApLlxuICpcbiAqIFRoZSBhdXRvLW9wZW4gbWFya2VyIGNoYW5nZWQgYWNyb3NzIE9ic2lkaWFuJ3MgaGlzdG9yeSwgc28gdGhlIHNlZWQgY2Fycmllc1xuICogQk9USCBmb3JtcyBhbmQgZWFjaCB2ZXJzaW9uIHJlYWRzIHRoZSBvbmUgaXQgdW5kZXJzdGFuZHMgKGlnbm9yaW5nIHRoZSBvdGhlclxuICogdW5rbm93biBrZXkpIFx1MjAxNCBubyBwZXItdmVyc2lvbiBicmFuY2hpbmc6XG4gKlxuICogLSAqKk9sZCB2ZXJzaW9ucyoqIChjb25maXJtZWQgMC42LjQpIGF1dG8tb3BlbiBmcm9tIGEgKip0b3AtbGV2ZWwgYGxhc3Rfb3BlbmAqKlxuICogICBob2xkaW5nIHRoZSB2YXVsdCBpZCAoYG1haW4uanNgOiBgaWYgKGlkICYmIHZhdWx0cy5oYXNPd25Qcm9wZXJ0eShpZCkpXG4gKiAgIGNyZWF0ZVdpbmRvdyhpZCk7IGVsc2Ugb3BlblN0YXJ0ZXIoKTtgKSwgYW5kIHN0b3JlIGVhY2ggdmF1bHQgZW50cnkgYXMganVzdFxuICogICBgeyBwYXRoLCB0cyB9YC4gV2l0aG91dCBgbGFzdF9vcGVuYCB0aGV5IGZhbGwgdGhyb3VnaCB0byB0aGUgdmF1bHQtc2VsZWN0b3IuXG4gKiAtICoqTmV3ZXIgdmVyc2lvbnMqKiAoY29uZmlybWVkIDAuMTQuNSspIGRyb3BwZWQgYGxhc3Rfb3BlbmAgYW5kIGF1dG8tb3BlbiBmcm9tXG4gKiAgIHRoZSBwZXItZW50cnkgKipgb3BlbjogdHJ1ZWAqKiBmbGFnLlxuICpcbiAqIFNlZWRpbmcgYm90aCB3YXMgdmVyaWZpZWQgdG8gb3BlbiB0aGUgdmF1bHQgZGlyZWN0bHkgKG5vIHNlbGVjdG9yKSBvbiAwLjYuNCxcbiAqIDAuOS4yMCwgMC4xMi4xOSwgMC4xMy4xOSwgMC4xNC41IGFuZCAxLjEyLjcuIGB1cGRhdGVEaXNhYmxlZGAgc3VwcHJlc3NlcyB0aGVcbiAqIHRocm93YXdheSBpbnN0YW5jZSdzIHNlbGYtdXBkYXRlLlxuICovXG5cbi8qKlxuICogUGFyYW1ldGVycyBmb3Ige0BsaW5rIGJ1aWxkT3duZWRPYnNpZGlhbkpzb259LlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEJ1aWxkT3duZWRPYnNpZGlhbkpzb25QYXJhbXMge1xuICAvKiogTGFzdC1hY2Nlc3MgdGltZXN0YW1wIHRvIHN0YW1wIG9uIHRoZSB2YXVsdCBlbnRyeS4gKi9cbiAgcmVhZG9ubHkgdHM6IG51bWJlcjtcblxuICAvKiogVGhlIHJhbmRvbWx5LWdlbmVyYXRlZCB2YXVsdCBpZCB1c2VkIGFzIHRoZSByZWdpc3RyeSBrZXkgYW5kIGBsYXN0X29wZW5gLiAqL1xuICByZWFkb25seSB2YXVsdElkOiBzdHJpbmc7XG5cbiAgLyoqIEFic29sdXRlIHBhdGggdG8gdGhlIGhhcm5lc3MgdmF1bHQgZm9sZGVyLiAqL1xuICByZWFkb25seSB2YXVsdFBhdGg6IHN0cmluZztcbn1cblxuLyoqXG4gKiBUaGUgYG9ic2lkaWFuLmpzb25gIHN0cnVjdHVyZSB0aGUgaGFybmVzcyBzZWVkcyBmb3IgYW4gb3duZWQgaW5zdGFuY2UuXG4gKi9cbmV4cG9ydCBpbnRlcmZhY2UgT3duZWRPYnNpZGlhbkpzb24ge1xuICAvKipcbiAgICogVG9wLWxldmVsIGF1dG8tb3BlbiBtYXJrZXIgKHZhdWx0IGlkKSBob25vcmVkIGJ5IG9sZCBPYnNpZGlhbiB2ZXJzaW9ucztcbiAgICogaWdub3JlZCBhcyBhbiB1bmtub3duIGtleSBieSBuZXdlciB2ZXJzaW9ucyB0aGF0IHVzZSB0aGUgcGVyLWVudHJ5IGBvcGVuYC5cbiAgICovXG4gIHJlYWRvbmx5IGxhc3Rfb3Blbjogc3RyaW5nO1xuXG4gIC8qKiBEaXNhYmxlcyB0aGUgdGhyb3dhd2F5IGluc3RhbmNlJ3Mgc2VsZi11cGRhdGUuICovXG4gIHJlYWRvbmx5IHVwZGF0ZURpc2FibGVkOiB0cnVlO1xuXG4gIC8qKiBWYXVsdCByZWdpc3RyeSBrZXllZCBieSB2YXVsdCBpZC4gKi9cbiAgcmVhZG9ubHkgdmF1bHRzOiBSZWFkb25seTxSZWNvcmQ8c3RyaW5nLCBPd25lZE9ic2lkaWFuVmF1bHRFbnRyeT4+O1xufVxuXG4vKipcbiAqIEEgc2luZ2xlIHZhdWx0IGVudHJ5IGluIHRoZSBzZWVkZWQgYG9ic2lkaWFuLmpzb25gLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIE93bmVkT2JzaWRpYW5WYXVsdEVudHJ5IHtcbiAgLyoqIFBlci1lbnRyeSBhdXRvLW9wZW4gZmxhZyBob25vcmVkIGJ5IG5ld2VyIE9ic2lkaWFuIHZlcnNpb25zLiAqL1xuICByZWFkb25seSBvcGVuOiB0cnVlO1xuXG4gIC8qKiBBYnNvbHV0ZSBwYXRoIHRvIHRoZSBoYXJuZXNzIHZhdWx0IGZvbGRlci4gKi9cbiAgcmVhZG9ubHkgcGF0aDogc3RyaW5nO1xuXG4gIC8qKiBMYXN0LWFjY2VzcyB0aW1lc3RhbXAuICovXG4gIHJlYWRvbmx5IHRzOiBudW1iZXI7XG59XG5cbi8qKlxuICogQnVpbGRzIHRoZSBpc29sYXRlZCBgb2JzaWRpYW4uanNvbmAgdGhhdCBmb3JjZS1vcGVucyB0aGUgb3duZWQgdmF1bHQgYWNyb3NzIGFsbFxuICogc3VwcG9ydGVkIE9ic2lkaWFuIHZlcnNpb25zIChzZWUgdGhlIGZpbGUgb3ZlcnZpZXcgZm9yIHRoZSBkdWFsLW1hcmtlclxuICogcmF0aW9uYWxlKS5cbiAqXG4gKiBAcGFyYW0gcGFyYW1zIC0gVGhlIHZhdWx0IGlkLCBwYXRoLCBhbmQgdGltZXN0YW1wIHRvIHNlZWQuXG4gKiBAcmV0dXJucyBUaGUgYG9ic2lkaWFuLmpzb25gIG9iamVjdCB0byB3cml0ZSBpbnRvIHRoZSBvd25lZCB1c2VyLWRhdGEgZGlyLlxuICovXG5leHBvcnQgZnVuY3Rpb24gYnVpbGRPd25lZE9ic2lkaWFuSnNvbihwYXJhbXM6IEJ1aWxkT3duZWRPYnNpZGlhbkpzb25QYXJhbXMpOiBPd25lZE9ic2lkaWFuSnNvbiB7XG4gIHJldHVybiB7XG4gICAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1saW5lIGNhbWVsY2FzZSAtLSBPYnNpZGlhbidzIG93biBvYnNpZGlhbi5qc29uIGZpZWxkIG5hbWUgKG9sZCB2ZXJzaW9ucycgYXV0by1vcGVuIG1hcmtlcikuXG4gICAgbGFzdF9vcGVuOiBwYXJhbXMudmF1bHRJZCxcbiAgICB1cGRhdGVEaXNhYmxlZDogdHJ1ZSxcbiAgICB2YXVsdHM6IHtcbiAgICAgIFtwYXJhbXMudmF1bHRJZF06IHsgb3BlbjogdHJ1ZSwgcGF0aDogcGFyYW1zLnZhdWx0UGF0aCwgdHM6IHBhcmFtcy50cyB9XG4gICAgfVxuICB9O1xufVxuIl0sCiAgIm1hcHBpbmdzIjogIkFBNEVPLFNBQVMsdUJBQXVCLFFBQXlEO0FBQzlGLFNBQU87QUFBQTtBQUFBLElBRUwsV0FBVyxPQUFPO0FBQUEsSUFDbEIsZ0JBQWdCO0FBQUEsSUFDaEIsUUFBUTtBQUFBLE1BQ04sQ0FBQyxPQUFPLE9BQU8sR0FBRyxFQUFFLE1BQU0sTUFBTSxNQUFNLE9BQU8sV0FBVyxJQUFJLE9BQU8sR0FBRztBQUFBLElBQ3hFO0FBQUEsRUFDRjtBQUNGOyIsCiAgIm5hbWVzIjogW10KfQo=
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @file
|
|
3
|
+
*
|
|
4
|
+
* The distinct error thrown when a booted owned Obsidian instance is **not**
|
|
5
|
+
* running the pinned app (asar) version — the installer shell silently fell back
|
|
6
|
+
* to its own bundled asar instead of running the swapped-in pin (see
|
|
7
|
+
* `asar-fallback-detection`). Unlike `RendererFailedToInitializeError` (a
|
|
8
|
+
* black-screen dead boot) this fires on a *healthy* renderer running the wrong
|
|
9
|
+
* (older) version, so it is discovered post-boot from the live running version
|
|
10
|
+
* rather than from an empty `<body>`. It is exported so callers of `connectToCdp`
|
|
11
|
+
* / the transport can `instanceof`-match this specific failure.
|
|
12
|
+
*/
|
|
13
|
+
/**
|
|
14
|
+
* Parameters for the {@link SilentAsarFallbackError} constructor.
|
|
15
|
+
*/
|
|
16
|
+
export interface SilentAsarFallbackErrorConstructorParams {
|
|
17
|
+
/** The pinned Obsidian app (asar) version that was requested. */
|
|
18
|
+
readonly requestedVersion: string;
|
|
19
|
+
/** The Obsidian app (asar) version the instance is actually running. */
|
|
20
|
+
readonly runningApiVersion: string;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Thrown when a booted owned instance is running a different app (asar) version
|
|
24
|
+
* than the pinned {@link SilentAsarFallbackErrorConstructorParams.requestedVersion} —
|
|
25
|
+
* the installer shell was too old for the pin and silently reverted to its own
|
|
26
|
+
* bundled asar. Carries both versions so callers can `instanceof`-match and
|
|
27
|
+
* surface an actionable remedy (pin a newer installer).
|
|
28
|
+
*/
|
|
29
|
+
export declare class SilentAsarFallbackError extends Error {
|
|
30
|
+
/** The pinned Obsidian app (asar) version that was requested. */
|
|
31
|
+
readonly requestedVersion: string;
|
|
32
|
+
/** The Obsidian app (asar) version the instance is actually running. */
|
|
33
|
+
readonly runningApiVersion: string;
|
|
34
|
+
/**
|
|
35
|
+
* Creates the error from the pinned and actually-running versions.
|
|
36
|
+
*
|
|
37
|
+
* @param params - The requested pin and the version actually running.
|
|
38
|
+
*/
|
|
39
|
+
constructor(params: SilentAsarFallbackErrorConstructorParams);
|
|
40
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
class SilentAsarFallbackError extends Error {
|
|
2
|
+
/** The pinned Obsidian app (asar) version that was requested. */
|
|
3
|
+
requestedVersion;
|
|
4
|
+
/** The Obsidian app (asar) version the instance is actually running. */
|
|
5
|
+
runningApiVersion;
|
|
6
|
+
/**
|
|
7
|
+
* Creates the error from the pinned and actually-running versions.
|
|
8
|
+
*
|
|
9
|
+
* @param params - The requested pin and the version actually running.
|
|
10
|
+
*/
|
|
11
|
+
constructor(params) {
|
|
12
|
+
const { requestedVersion, runningApiVersion } = params;
|
|
13
|
+
super(
|
|
14
|
+
`Obsidian was pinned to app version ${requestedVersion} but is actually running ${runningApiVersion} \u2014 the installer shell is too old for the pin and silently fell back to its own bundled asar. Pin an obsidianInstallerVersion at or above ${requestedVersion}'s run floor so the pinned version runs.`
|
|
15
|
+
);
|
|
16
|
+
this.name = "SilentAsarFallbackError";
|
|
17
|
+
this.requestedVersion = requestedVersion;
|
|
18
|
+
this.runningApiVersion = runningApiVersion;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
export {
|
|
22
|
+
SilentAsarFallbackError
|
|
23
|
+
};
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjL3NpbGVudC1hc2FyLWZhbGxiYWNrLWVycm9yLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyIvKipcbiAqIEBmaWxlXG4gKlxuICogVGhlIGRpc3RpbmN0IGVycm9yIHRocm93biB3aGVuIGEgYm9vdGVkIG93bmVkIE9ic2lkaWFuIGluc3RhbmNlIGlzICoqbm90KipcbiAqIHJ1bm5pbmcgdGhlIHBpbm5lZCBhcHAgKGFzYXIpIHZlcnNpb24gXHUyMDE0IHRoZSBpbnN0YWxsZXIgc2hlbGwgc2lsZW50bHkgZmVsbCBiYWNrXG4gKiB0byBpdHMgb3duIGJ1bmRsZWQgYXNhciBpbnN0ZWFkIG9mIHJ1bm5pbmcgdGhlIHN3YXBwZWQtaW4gcGluIChzZWVcbiAqIGBhc2FyLWZhbGxiYWNrLWRldGVjdGlvbmApLiBVbmxpa2UgYFJlbmRlcmVyRmFpbGVkVG9Jbml0aWFsaXplRXJyb3JgIChhXG4gKiBibGFjay1zY3JlZW4gZGVhZCBib290KSB0aGlzIGZpcmVzIG9uIGEgKmhlYWx0aHkqIHJlbmRlcmVyIHJ1bm5pbmcgdGhlIHdyb25nXG4gKiAob2xkZXIpIHZlcnNpb24sIHNvIGl0IGlzIGRpc2NvdmVyZWQgcG9zdC1ib290IGZyb20gdGhlIGxpdmUgcnVubmluZyB2ZXJzaW9uXG4gKiByYXRoZXIgdGhhbiBmcm9tIGFuIGVtcHR5IGA8Ym9keT5gLiBJdCBpcyBleHBvcnRlZCBzbyBjYWxsZXJzIG9mIGBjb25uZWN0VG9DZHBgXG4gKiAvIHRoZSB0cmFuc3BvcnQgY2FuIGBpbnN0YW5jZW9mYC1tYXRjaCB0aGlzIHNwZWNpZmljIGZhaWx1cmUuXG4gKi9cblxuLyoqXG4gKiBQYXJhbWV0ZXJzIGZvciB0aGUge0BsaW5rIFNpbGVudEFzYXJGYWxsYmFja0Vycm9yfSBjb25zdHJ1Y3Rvci5cbiAqL1xuZXhwb3J0IGludGVyZmFjZSBTaWxlbnRBc2FyRmFsbGJhY2tFcnJvckNvbnN0cnVjdG9yUGFyYW1zIHtcbiAgLyoqIFRoZSBwaW5uZWQgT2JzaWRpYW4gYXBwIChhc2FyKSB2ZXJzaW9uIHRoYXQgd2FzIHJlcXVlc3RlZC4gKi9cbiAgcmVhZG9ubHkgcmVxdWVzdGVkVmVyc2lvbjogc3RyaW5nO1xuXG4gIC8qKiBUaGUgT2JzaWRpYW4gYXBwIChhc2FyKSB2ZXJzaW9uIHRoZSBpbnN0YW5jZSBpcyBhY3R1YWxseSBydW5uaW5nLiAqL1xuICByZWFkb25seSBydW5uaW5nQXBpVmVyc2lvbjogc3RyaW5nO1xufVxuXG4vKipcbiAqIFRocm93biB3aGVuIGEgYm9vdGVkIG93bmVkIGluc3RhbmNlIGlzIHJ1bm5pbmcgYSBkaWZmZXJlbnQgYXBwIChhc2FyKSB2ZXJzaW9uXG4gKiB0aGFuIHRoZSBwaW5uZWQge0BsaW5rIFNpbGVudEFzYXJGYWxsYmFja0Vycm9yQ29uc3RydWN0b3JQYXJhbXMucmVxdWVzdGVkVmVyc2lvbn0gXHUyMDE0XG4gKiB0aGUgaW5zdGFsbGVyIHNoZWxsIHdhcyB0b28gb2xkIGZvciB0aGUgcGluIGFuZCBzaWxlbnRseSByZXZlcnRlZCB0byBpdHMgb3duXG4gKiBidW5kbGVkIGFzYXIuIENhcnJpZXMgYm90aCB2ZXJzaW9ucyBzbyBjYWxsZXJzIGNhbiBgaW5zdGFuY2VvZmAtbWF0Y2ggYW5kXG4gKiBzdXJmYWNlIGFuIGFjdGlvbmFibGUgcmVtZWR5IChwaW4gYSBuZXdlciBpbnN0YWxsZXIpLlxuICovXG5leHBvcnQgY2xhc3MgU2lsZW50QXNhckZhbGxiYWNrRXJyb3IgZXh0ZW5kcyBFcnJvciB7XG4gIC8qKiBUaGUgcGlubmVkIE9ic2lkaWFuIGFwcCAoYXNhcikgdmVyc2lvbiB0aGF0IHdhcyByZXF1ZXN0ZWQuICovXG4gIHB1YmxpYyByZWFkb25seSByZXF1ZXN0ZWRWZXJzaW9uOiBzdHJpbmc7XG5cbiAgLyoqIFRoZSBPYnNpZGlhbiBhcHAgKGFzYXIpIHZlcnNpb24gdGhlIGluc3RhbmNlIGlzIGFjdHVhbGx5IHJ1bm5pbmcuICovXG4gIHB1YmxpYyByZWFkb25seSBydW5uaW5nQXBpVmVyc2lvbjogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBDcmVhdGVzIHRoZSBlcnJvciBmcm9tIHRoZSBwaW5uZWQgYW5kIGFjdHVhbGx5LXJ1bm5pbmcgdmVyc2lvbnMuXG4gICAqXG4gICAqIEBwYXJhbSBwYXJhbXMgLSBUaGUgcmVxdWVzdGVkIHBpbiBhbmQgdGhlIHZlcnNpb24gYWN0dWFsbHkgcnVubmluZy5cbiAgICovXG4gIHB1YmxpYyBjb25zdHJ1Y3RvcihwYXJhbXM6IFNpbGVudEFzYXJGYWxsYmFja0Vycm9yQ29uc3RydWN0b3JQYXJhbXMpIHtcbiAgICBjb25zdCB7IHJlcXVlc3RlZFZlcnNpb24sIHJ1bm5pbmdBcGlWZXJzaW9uIH0gPSBwYXJhbXM7XG4gICAgc3VwZXIoXG4gICAgICBgT2JzaWRpYW4gd2FzIHBpbm5lZCB0byBhcHAgdmVyc2lvbiAke3JlcXVlc3RlZFZlcnNpb259IGJ1dCBpcyBhY3R1YWxseSBydW5uaW5nICR7cnVubmluZ0FwaVZlcnNpb259IFx1MjAxNCBgXG4gICAgICAgICsgJ3RoZSBpbnN0YWxsZXIgc2hlbGwgaXMgdG9vIG9sZCBmb3IgdGhlIHBpbiBhbmQgc2lsZW50bHkgZmVsbCBiYWNrIHRvIGl0cyBvd24gYnVuZGxlZCBhc2FyLiAnXG4gICAgICAgICsgYFBpbiBhbiBvYnNpZGlhbkluc3RhbGxlclZlcnNpb24gYXQgb3IgYWJvdmUgJHtyZXF1ZXN0ZWRWZXJzaW9ufSdzIHJ1biBmbG9vciBzbyB0aGUgcGlubmVkIHZlcnNpb24gcnVucy5gXG4gICAgKTtcbiAgICB0aGlzLm5hbWUgPSAnU2lsZW50QXNhckZhbGxiYWNrRXJyb3InO1xuICAgIHRoaXMucmVxdWVzdGVkVmVyc2lvbiA9IHJlcXVlc3RlZFZlcnNpb247XG4gICAgdGhpcy5ydW5uaW5nQXBpVmVyc2lvbiA9IHJ1bm5pbmdBcGlWZXJzaW9uO1xuICB9XG59XG4iXSwKICAibWFwcGluZ3MiOiAiQUErQk8sTUFBTSxnQ0FBZ0MsTUFBTTtBQUFBO0FBQUEsRUFFakM7QUFBQTtBQUFBLEVBR0E7QUFBQTtBQUFBO0FBQUE7QUFBQTtBQUFBO0FBQUEsRUFPVCxZQUFZLFFBQWtEO0FBQ25FLFVBQU0sRUFBRSxrQkFBa0Isa0JBQWtCLElBQUk7QUFDaEQ7QUFBQSxNQUNFLHNDQUFzQyxnQkFBZ0IsNEJBQTRCLGlCQUFpQixrSkFFaEQsZ0JBQWdCO0FBQUEsSUFDckU7QUFDQSxTQUFLLE9BQU87QUFDWixTQUFLLG1CQUFtQjtBQUN4QixTQUFLLG9CQUFvQjtBQUFBLEVBQzNCO0FBQ0Y7IiwKICAibmFtZXMiOiBbXQp9Cg==
|
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
*
|
|
17
17
|
* Requirements: Node.js 22+ (uses built-in `WebSocket` and `fetch` globals).
|
|
18
18
|
*/
|
|
19
|
+
import type { AsarFallback } from './asar-fallback-detection.mjs';
|
|
20
|
+
import type { ElectronCompatibility } from './electron-compatibility.mjs';
|
|
19
21
|
import type { InstallerCompatibility } from './installer-compatibility.mjs';
|
|
20
22
|
import type { ObsidianTransport, TransportEvalOptions } from './transport.mjs';
|
|
21
23
|
/**
|
|
@@ -74,6 +76,25 @@ export interface DesktopCdpTransportConfig {
|
|
|
74
76
|
* @default `false`
|
|
75
77
|
*/
|
|
76
78
|
shouldDisableSandbox?: boolean;
|
|
79
|
+
/**
|
|
80
|
+
* Whether a post-boot **silent asar fallback** (the running app version differs
|
|
81
|
+
* from the swapped-in pin) fails fast with {@link SilentAsarFallbackError}. The
|
|
82
|
+
* verdict is always computed and surfaced via
|
|
83
|
+
* {@link DesktopCdpTransport.getAsarFallback}; this gates only the throw. Only
|
|
84
|
+
* meaningful in owned mode running a swapped-in asar.
|
|
85
|
+
*
|
|
86
|
+
* @default `true`
|
|
87
|
+
*/
|
|
88
|
+
shouldThrowOnSilentAsarFallback?: boolean;
|
|
89
|
+
/**
|
|
90
|
+
* Whether the post-boot runtime-Electron compatibility nag warning is emitted
|
|
91
|
+
* when the live Electron is below the app's recommended minimum. The verdict is
|
|
92
|
+
* always computed and surfaced via {@link DesktopCdpTransport.getElectronCompatibility};
|
|
93
|
+
* this only gates the log. Only meaningful in owned mode.
|
|
94
|
+
*
|
|
95
|
+
* @default `true`
|
|
96
|
+
*/
|
|
97
|
+
shouldWarnOnCompatibilityIssues?: boolean;
|
|
77
98
|
}
|
|
78
99
|
/**
|
|
79
100
|
* An asar to provision into a harness-owned instance's user-data dir before launch.
|
|
@@ -96,7 +117,10 @@ export interface OwnedInstanceConfig {
|
|
|
96
117
|
/**
|
|
97
118
|
* The resolved installer↔app compatibility verdict, when it could be determined
|
|
98
119
|
* (an asar-swap onto a known shell version). Surfaced by
|
|
99
|
-
* {@link DesktopCdpTransport.getCompatibility}.
|
|
120
|
+
* {@link DesktopCdpTransport.getCompatibility}. An `'unrunnable'` verdict reaches
|
|
121
|
+
* this surface only when the proactive throw is disabled
|
|
122
|
+
* (`shouldThrowOnIncompatibleInstaller: false`); otherwise it throws
|
|
123
|
+
* `IncompatibleInstallerVersionError` before the config is built.
|
|
100
124
|
*/
|
|
101
125
|
readonly compatibility?: InstallerCompatibility | undefined;
|
|
102
126
|
/** Absolute path to the Obsidian shell executable to launch. */
|
|
@@ -128,17 +152,21 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
128
152
|
*/
|
|
129
153
|
readonly isMobile = false;
|
|
130
154
|
private activeVaultPath;
|
|
155
|
+
private asarFallback;
|
|
131
156
|
private readonly cdpHost;
|
|
132
157
|
private cdpPort;
|
|
133
158
|
private cdpUrl;
|
|
134
159
|
private readonly commandTimeoutInMilliseconds;
|
|
135
160
|
private readonly deadBootGraceInMilliseconds;
|
|
161
|
+
private electronCompatibility;
|
|
136
162
|
private readonly isHarnessOwnedInstance;
|
|
137
163
|
private readonly isObsidianAppVisible;
|
|
138
164
|
private messageId;
|
|
139
165
|
private readonly ownedConfig;
|
|
140
166
|
private ownedInstance;
|
|
141
167
|
private readonly shouldDisableSandbox;
|
|
168
|
+
private readonly shouldThrowOnSilentAsarFallback;
|
|
169
|
+
private readonly shouldWarnOnCompatibilityIssues;
|
|
142
170
|
private ws;
|
|
143
171
|
/**
|
|
144
172
|
* Creates a new CDP transport.
|
|
@@ -170,6 +198,19 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
170
198
|
* @returns The normalized result string.
|
|
171
199
|
*/
|
|
172
200
|
evaluate(expression: string, options: TransportEvalOptions): Promise<string>;
|
|
201
|
+
/**
|
|
202
|
+
* Returns the silent-asar-fallback verdict for this owned instance — whether the
|
|
203
|
+
* app version it is actually running matches the swapped-in pin, or the installer
|
|
204
|
+
* silently reverted to its own bundled asar (read live post-boot). Returns
|
|
205
|
+
* `undefined` when this is not an owned instance, the instance has not booted
|
|
206
|
+
* yet, or the verdict could not be determined (no asar was swapped, or the live
|
|
207
|
+
* version was unreadable). A `'fallback'` verdict reaches this surface only when
|
|
208
|
+
* the throw is disabled ({@link DesktopCdpTransportConfig.shouldThrowOnSilentAsarFallback}
|
|
209
|
+
* `false`); otherwise it throws `SilentAsarFallbackError`.
|
|
210
|
+
*
|
|
211
|
+
* @returns The silent-asar-fallback verdict, or `undefined`.
|
|
212
|
+
*/
|
|
213
|
+
getAsarFallback(): AsarFallback | undefined;
|
|
173
214
|
/**
|
|
174
215
|
* Returns the resolved installer↔app compatibility verdict for this owned
|
|
175
216
|
* instance, so callers can assert on it. Returns `undefined` when this is not
|
|
@@ -179,6 +220,17 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
179
220
|
* @returns The compatibility verdict, or `undefined`.
|
|
180
221
|
*/
|
|
181
222
|
getCompatibility(): InstallerCompatibility | undefined;
|
|
223
|
+
/**
|
|
224
|
+
* Returns the runtime Electron compatibility verdict for this owned instance —
|
|
225
|
+
* whether the Electron version it is actually running is new enough for the
|
|
226
|
+
* running app version (read live post-boot; see {@link ObsidianVersionMetadata.minRecommendedElectronVersion}).
|
|
227
|
+
* Returns `undefined` when this is not an owned instance, the instance has not
|
|
228
|
+
* booted yet, or the verdict could not be determined (the live version was
|
|
229
|
+
* unreadable, or the app version carries no recommended Electron version).
|
|
230
|
+
*
|
|
231
|
+
* @returns The runtime Electron compatibility verdict, or `undefined`.
|
|
232
|
+
*/
|
|
233
|
+
getElectronCompatibility(): ElectronCompatibility | undefined;
|
|
182
234
|
/**
|
|
183
235
|
* Returns the CDP endpoint of the owned, launched instance so the global setup
|
|
184
236
|
* can hand it to test workers (which then **attach** to it instead of
|
|
@@ -212,6 +264,47 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
212
264
|
* @param vaultPath - The absolute path to the vault folder.
|
|
213
265
|
*/
|
|
214
266
|
unregisterVault(vaultPath: string): Promise<void>;
|
|
267
|
+
/**
|
|
268
|
+
* Computes and stores the runtime-Electron compatibility verdict (on
|
|
269
|
+
* {@link getElectronCompatibility}) from an already-read version pair, warning
|
|
270
|
+
* when the live Electron is below the app's recommended minimum. Never throws; a
|
|
271
|
+
* boot whose running app version was unreadable is skipped (nothing to judge).
|
|
272
|
+
*
|
|
273
|
+
* @param appVersion - The live running app version, or `undefined` when unreadable.
|
|
274
|
+
* @param actualElectronVersion - The live Electron version, or `undefined` when unreadable.
|
|
275
|
+
*/
|
|
276
|
+
private applyElectronCompatibility;
|
|
277
|
+
/**
|
|
278
|
+
* Verifies the running app (asar) version matches the swapped-in pin, storing the
|
|
279
|
+
* verdict on {@link getAsarFallback}. On a **silent fallback** (the installer ran
|
|
280
|
+
* its own bundled asar instead of the pin) it throws {@link SilentAsarFallbackError}
|
|
281
|
+
* when the throw is enabled, otherwise warns (when warnings are on) and lets the
|
|
282
|
+
* boot proceed. A boot with no swapped-in asar, or an unreadable running version,
|
|
283
|
+
* is `'unknown'` — nothing is thrown or warned. This is the healthy-UI companion to
|
|
284
|
+
* the black-screen {@link RendererFailedToInitializeError} dead-boot fast-fail.
|
|
285
|
+
*
|
|
286
|
+
* @param runningApiVersion - The live running app version, or `undefined` when unreadable.
|
|
287
|
+
*/
|
|
288
|
+
private checkRuntimeAsarFallback;
|
|
289
|
+
/**
|
|
290
|
+
* Runs the post-boot runtime compatibility checks for an owned instance, once the
|
|
291
|
+
* vault is ready. Reads the live running app version and Electron version **once**
|
|
292
|
+
* from the booted renderer's main process, then: (1) verifies the running app
|
|
293
|
+
* version matches the swapped-in pin — throwing {@link SilentAsarFallbackError} on
|
|
294
|
+
* a silent fallback (when enabled); and (2) runs the best-effort runtime-Electron
|
|
295
|
+
* nag. Only the asar-fallback check can throw, so this must run outside the
|
|
296
|
+
* readiness poll's try/catch (a swallowed throw would loop until timeout).
|
|
297
|
+
*
|
|
298
|
+
* Both are read at the renderer top level: `ipcRenderer.sendSync('version')` (the
|
|
299
|
+
* running app version, truthful even under a silent asar fallback) and
|
|
300
|
+
* `process.versions.electron` (the live shell Electron); neither uses
|
|
301
|
+
* `require('obsidian')`, which resolves only inside a plugin-load context. A read
|
|
302
|
+
* failure leaves both unknown (logged, non-fatal) — an unreadable running version
|
|
303
|
+
* cannot be judged a fallback, so the boot is not broken by a flaky read.
|
|
304
|
+
*
|
|
305
|
+
* @param vaultPath - The vault path to evaluate in.
|
|
306
|
+
*/
|
|
307
|
+
private checkRuntimeCompatibility;
|
|
215
308
|
/**
|
|
216
309
|
* Connects to a CDP target's WebSocket endpoint.
|
|
217
310
|
*
|
|
@@ -275,6 +368,17 @@ export declare class DesktopCdpTransport implements ObsidianTransport {
|
|
|
275
368
|
* @returns The list of page targets.
|
|
276
369
|
*/
|
|
277
370
|
private getPageTargets;
|
|
371
|
+
/**
|
|
372
|
+
* Kills the currently-running owned instance (if any) and waits for it to exit,
|
|
373
|
+
* so the next launch gets a pristine single-window instance.
|
|
374
|
+
*
|
|
375
|
+
* Relaunching over a live instance is forwarded by Electron's single-instance
|
|
376
|
+
* lock on the shared user-data dir and surfaces the vault picker, and opening a
|
|
377
|
+
* second window via IPC leaves stale windows that break vault-target routing —
|
|
378
|
+
* hence a full kill + wait-for-exit (releasing the lock) between launches. A
|
|
379
|
+
* no-op on the first attempt, when no instance is running yet.
|
|
380
|
+
*/
|
|
381
|
+
private killRunningOwnedInstance;
|
|
278
382
|
/**
|
|
279
383
|
* Moves the owned instance's window off-screen so a hidden run never steals
|
|
280
384
|
* focus. Uses Electron's remote bridge (`window.electron.remote`) — the only
|