obsidian-launcher 1.1.1 → 1.2.0

package/dist/{chunk-CGVVDO5H.js → chunk-IHBVELTU.js}

@@ -1,6 +1,6 @@
 // src/launcher.ts
-import fsAsync4 from "fs/promises";
-import fs from "fs";
+import fsAsync3 from "fs/promises";
+import fs2 from "fs";
 import zlib from "zlib";
 import path4 from "path";
 import crypto from "crypto";
@@ -9,6 +9,7 @@ import { pipeline } from "stream/promises";
 import { downloadArtifact } from "@electron/get";
 import child_process2 from "child_process";
 import semver2 from "semver";
+import { fileURLToPath } from "url";
 
 // src/utils.ts
 import fsAsync from "fs/promises";
@@ -87,8 +88,9 @@ function mergeKeepUndefined(object, ...sources) {
 
 // src/apis.ts
 import _2 from "lodash";
-import fsAsync2 from "fs/promises";
-import { fileURLToPath } from "url";
+import fs from "fs";
+import { finished } from "stream/promises";
+import { Readable } from "stream";
 function parseLinkHeader(linkHeader) {
   function parseLinkData(linkData) {
     return Object.fromEntries(
@@ -157,17 +159,10 @@ async function fetchObsidianAPI(url) {
   });
   return response;
 }
-async function fetchWithFileUrl(url) {
-  if (url.startsWith("file:")) {
-    return await fsAsync2.readFile(fileURLToPath(url), "utf-8");
-  } else {
-    const response = await fetch(url);
-    if (response.ok) {
-      return response.text();
-    } else {
-      throw Error(`Request failed with ${response.status}: ${response.text()}`);
-    }
-  }
+async function downloadResponse(response, dest) {
+  const fileStream = fs.createWriteStream(dest, { flags: "w" });
+  const fetchStream = Readable.fromWeb(response.body);
+  await finished(fetchStream.pipe(fileStream));
 }
 
 // src/chromeLocalStorage.ts
@@ -244,7 +239,7 @@ var ChromeLocalStorage = class {
 };
 
 // src/launcherUtils.ts
-import fsAsync3 from "fs/promises";
+import fsAsync2 from "fs/promises";
 import path3 from "path";
 import { promisify } from "util";
 import child_process from "child_process";
@@ -258,7 +253,7 @@ function normalizeGitHubRepo(repo) {
 }
 async function extractObsidianAppImage(appImage, dest) {
   await withTmpDir(dest, async (tmpDir) => {
-    await fsAsync3.chmod(appImage, 493);
+    await fsAsync2.chmod(appImage, 493);
     await execFile(appImage, ["--appimage-extract"], { cwd: tmpDir });
     return path3.join(tmpDir, "squashfs-root");
   });
@@ -288,7 +283,7 @@ async function extractObsidianDmg(dmg, dest) {
     const volume = proc.stdout.match(/\/Volumes\/.*$/m)[0];
     const obsidianApp = path3.join(volume, "Obsidian.app");
     try {
-      await fsAsync3.cp(obsidianApp, tmpDir, { recursive: true, verbatimSymlinks: true });
+      await fsAsync2.cp(obsidianApp, tmpDir, { recursive: true, verbatimSymlinks: true });
     } finally {
       await execFile("hdiutil", ["detach", volume]);
     }
@@ -362,7 +357,7 @@ async function getElectronVersionInfo(version, binaryPath) {
     }
     await procExit;
     await sleep(1e3);
-    await fsAsync3.rm(configDir, { recursive: true, force: true });
+    await fsAsync2.rm(configDir, { recursive: true, force: true });
   }
   if (!dependencyVersions?.electron || !dependencyVersions?.chrome) {
     throw Error(`Failed to extract electron and chrome versions for ${version}`);
@@ -443,27 +438,31 @@ var ObsidianLauncher = class {
    * cacheDuration ms or if there are network errors.
    */
   async cachedFetch(url, dest) {
-    dest = path4.resolve(dest);
+    dest = path4.join(this.cacheDir, dest);
     if (!(dest in this.metadataCache)) {
       let fileContent;
-      const mtime = await fileExists(dest) ? (await fsAsync4.stat(dest)).mtime : void 0;
-      if (mtime && (/* @__PURE__ */ new Date()).getTime() - mtime.getTime() < this.cacheDuration) {
-        fileContent = await fsAsync4.readFile(dest, "utf-8");
+      if (url.startsWith("file:")) {
+        fileContent = await fsAsync3.readFile(fileURLToPath(url), "utf-8");
       } else {
-        const request = await maybe(fetchWithFileUrl(url));
-        if (request.success) {
-          await fsAsync4.mkdir(path4.dirname(dest), { recursive: true });
-          await withTmpDir(dest, async (tmpDir) => {
-            await fsAsync4.writeFile(path4.join(tmpDir, "download.json"), request.result);
-            return path4.join(tmpDir, "download.json");
-          });
-          fileContent = request.result;
-        } else if (await fileExists(dest)) {
-          console.warn(request.error);
-          console.warn(`Unable to download ${dest}, using cached file.`);
-          fileContent = await fsAsync4.readFile(dest, "utf-8");
+        const mtime = await fileExists(dest) ? (await fsAsync3.stat(dest)).mtime : void 0;
+        if (mtime && (/* @__PURE__ */ new Date()).getTime() - mtime.getTime() < this.cacheDuration) {
+          fileContent = await fsAsync3.readFile(dest, "utf-8");
         } else {
-          throw request.error;
+          const request = await maybe(fetch(url).then((r) => r.text()));
+          if (request.success) {
+            await fsAsync3.mkdir(path4.dirname(dest), { recursive: true });
+            await withTmpDir(dest, async (tmpDir) => {
+              await fsAsync3.writeFile(path4.join(tmpDir, "download.json"), request.result);
+              return path4.join(tmpDir, "download.json");
+            });
+            fileContent = request.result;
+          } else if (await fileExists(dest)) {
+            console.warn(request.error);
+            console.warn(`Unable to download ${dest}, using cached file.`);
+            fileContent = await fsAsync3.readFile(dest, "utf-8");
+          } else {
+            throw request.error;
+          }
         }
       }
       this.metadataCache[dest] = JSON.parse(fileContent);
@@ -482,7 +481,7 @@ var ObsidianLauncher = class {
       }
       const manifestPath = path4.join(dir, "manifest.json");
       if (await fileExists(manifestPath)) {
-        this.metadataCache["manifest.json"] = JSON.parse(await fsAsync4.readFile(manifestPath, "utf-8"));
+        this.metadataCache["manifest.json"] = JSON.parse(await fsAsync3.readFile(manifestPath, "utf-8"));
       } else {
         this.metadataCache["manifest.json"] = null;
       }
@@ -493,29 +492,26 @@ var ObsidianLauncher = class {
    * Get information about all available Obsidian versions.
    */
   async getVersions() {
-    const dest = path4.join(this.cacheDir, "obsidian-versions.json");
-    return (await this.cachedFetch(this.versionsUrl, dest)).versions;
+    return (await this.cachedFetch(this.versionsUrl, "obsidian-versions.json")).versions;
   }
   /**
    * Get information about all available community plugins.
    */
   async getCommunityPlugins() {
-    const dest = path4.join(this.cacheDir, "obsidian-community-plugins.json");
-    return await this.cachedFetch(this.communityPluginsUrl, dest);
+    return await this.cachedFetch(this.communityPluginsUrl, "obsidian-community-plugins.json");
   }
   /**
    * Get information about all available community themes.
    */
   async getCommunityThemes() {
-    const dest = path4.join(this.cacheDir, "obsidian-community-css-themes.json");
-    return await this.cachedFetch(this.communityThemesUrl, dest);
+    return await this.cachedFetch(this.communityThemesUrl, "obsidian-community-css-themes.json");
   }
   /**
    * Resolves Obsidian app and installer version strings to absolute versions.
    * @param appVersion Obsidian version string or one of 
    *   - "latest": Get the current latest non-beta Obsidian version
    *   - "latest-beta": Get the current latest beta Obsidian version (or latest is there is no current beta)
-   *   - "earliest": Get the `minAppVersion` set in set in your `manifest.json`
+   *   - "earliest": Get the `minAppVersion` set in your `manifest.json`
    * @param installerVersion Obsidian version string or one of 
    *   - "latest": Get the latest Obsidian installer compatible with `appVersion`
    *   - "earliest": Get the oldest Obsidian installer compatible with `appVersion`
@@ -601,7 +597,7 @@ var ObsidianLauncher = class {
       if (installerUrl) {
         downloader = async (tmpDir) => {
           const appImage = path4.join(tmpDir, "Obsidian.AppImage");
-          await fsAsync4.writeFile(appImage, (await fetch(installerUrl)).body);
+          await downloadResponse(await fetch(installerUrl), appImage);
           const obsidianFolder = path4.join(tmpDir, "Obsidian");
           await extractObsidianAppImage(appImage, obsidianFolder);
           return obsidianFolder;
@@ -621,7 +617,7 @@ var ObsidianLauncher = class {
       if (installerUrl && appArch) {
         downloader = async (tmpDir) => {
           const installerExecutable = path4.join(tmpDir, "Obsidian.exe");
-          await fsAsync4.writeFile(installerExecutable, (await fetch(installerUrl)).body);
+          await downloadResponse(await fetch(installerUrl), installerExecutable);
           const obsidianFolder = path4.join(tmpDir, "Obsidian");
           await extractObsidianExe(installerExecutable, appArch, obsidianFolder);
           return obsidianFolder;
@@ -633,7 +629,7 @@ var ObsidianLauncher = class {
       if (installerUrl) {
         downloader = async (tmpDir) => {
           const dmg = path4.join(tmpDir, "Obsidian.dmg");
-          await fsAsync4.writeFile(dmg, (await fetch(installerUrl)).body);
+          await downloadResponse(await fetch(installerUrl), dmg);
           const obsidianFolder = path4.join(tmpDir, "Obsidian");
           await extractObsidianDmg(dmg, obsidianFolder);
           return obsidianFolder;
@@ -647,7 +643,7 @@ var ObsidianLauncher = class {
     }
     if (!await fileExists(installerPath)) {
       console.log(`Downloading Obsidian installer v${installerVersion}...`);
-      await fsAsync4.mkdir(path4.dirname(cacheDir), { recursive: true });
+      await fsAsync3.mkdir(path4.dirname(cacheDir), { recursive: true });
       await withTmpDir(cacheDir, downloader);
     }
     return installerPath;
@@ -669,14 +665,14 @@ var ObsidianLauncher = class {
     const appPath = path4.join(this.cacheDir, "obsidian-app", `obsidian-${appVersionInfo.version}.asar`);
     if (!await fileExists(appPath)) {
       console.log(`Downloading Obsidian app v${appVersion} ...`);
-      await fsAsync4.mkdir(path4.dirname(appPath), { recursive: true });
+      await fsAsync3.mkdir(path4.dirname(appPath), { recursive: true });
       await withTmpDir(appPath, async (tmpDir) => {
         const isInsidersBuild = new URL(appUrl).hostname.endsWith(".obsidian.md");
         const response = isInsidersBuild ? await fetchObsidianAPI(appUrl) : await fetch(appUrl);
         const archive = path4.join(tmpDir, "app.asar.gz");
         const asar = path4.join(tmpDir, "app.asar");
-        await fsAsync4.writeFile(archive, response.body);
-        await pipeline(fs.createReadStream(archive), zlib.createGunzip(), fs.createWriteStream(asar));
+        await downloadResponse(response, archive);
+        await pipeline(fs2.createReadStream(archive), zlib.createGunzip(), fs2.createWriteStream(asar));
         return asar;
       });
     }
@@ -725,7 +721,7 @@ var ObsidianLauncher = class {
   async getLatestPluginVersion(repo) {
     repo = normalizeGitHubRepo(repo);
     const manifestUrl = `https://raw.githubusercontent.com/${repo}/HEAD/manifest.json`;
-    const cacheDest = path4.join(this.cacheDir, "obsidian-plugins", repo, "latest.json");
+    const cacheDest = path4.join("obsidian-plugins", repo, "latest.json");
     const manifest = await this.cachedFetch(manifestUrl, cacheDest);
     return manifest.version;
   }
@@ -746,7 +742,7 @@ var ObsidianLauncher = class {
     version = semver2.valid(version);
     const pluginDir = path4.join(this.cacheDir, "obsidian-plugins", repo, version);
     if (!await fileExists(pluginDir)) {
-      await fsAsync4.mkdir(path4.dirname(pluginDir), { recursive: true });
+      await fsAsync3.mkdir(path4.dirname(pluginDir), { recursive: true });
       await withTmpDir(pluginDir, async (tmpDir) => {
         const assetsToDownload = { "manifest.json": true, "main.js": true, "styles.css": false };
         await Promise.all(
@@ -754,7 +750,7 @@ var ObsidianLauncher = class {
             const url = `https://github.com/${repo}/releases/download/${version}/${file}`;
             const response = await fetch(url);
             if (response.ok) {
-              await fsAsync4.writeFile(path4.join(tmpDir, file), response.body);
+              await downloadResponse(response, path4.join(tmpDir, file));
             } else if (required) {
               throw Error(`No ${file} found for ${repo} version ${version}`);
             }
@@ -818,7 +814,7 @@ var ObsidianLauncher = class {
         }
         let pluginId = typeof plugin == "object" && "id" in plugin ? plugin.id : void 0;
         if (!pluginId) {
-          pluginId = JSON.parse(await fsAsync4.readFile(manifestPath, "utf8").catch(() => "{}")).id;
+          pluginId = JSON.parse(await fsAsync3.readFile(manifestPath, "utf8").catch(() => "{}")).id;
           if (!pluginId) {
             throw Error(`${manifestPath} malformed.`);
           }
@@ -840,7 +836,7 @@ var ObsidianLauncher = class {
   async getLatestThemeVersion(repo) {
     repo = normalizeGitHubRepo(repo);
     const manifestUrl = `https://raw.githubusercontent.com/${repo}/HEAD/manifest.json`;
-    const cacheDest = path4.join(this.cacheDir, "obsidian-themes", repo, "latest.json");
+    const cacheDest = path4.join("obsidian-themes", repo, "latest.json");
     const manifest = await this.cachedFetch(manifestUrl, cacheDest);
     return manifest.version;
   }
@@ -854,7 +850,7 @@ var ObsidianLauncher = class {
     const version = await this.getLatestThemeVersion(repo);
     const themeDir = path4.join(this.cacheDir, "obsidian-themes", repo, version);
     if (!await fileExists(themeDir)) {
-      await fsAsync4.mkdir(path4.dirname(themeDir), { recursive: true });
+      await fsAsync3.mkdir(path4.dirname(themeDir), { recursive: true });
       await withTmpDir(themeDir, async (tmpDir) => {
         const assetsToDownload = ["manifest.json", "theme.css"];
         await Promise.all(
@@ -862,7 +858,7 @@ var ObsidianLauncher = class {
             const url = `https://raw.githubusercontent.com/${repo}/HEAD/${file}`;
             const response = await fetch(url);
             if (response.ok) {
-              await fsAsync4.writeFile(path4.join(tmpDir, file), response.body);
+              await downloadResponse(response, path4.join(tmpDir, file));
             } else {
               throw Error(`No ${file} found for ${repo}`);
             }
@@ -926,7 +922,7 @@ var ObsidianLauncher = class {
         let themeName = typeof theme == "object" && "name" in theme ? theme.name : void 0;
         if (!themeName) {
           const manifestPath2 = path4.join(themePath, "manifest.json");
-          themeName = JSON.parse(await fsAsync4.readFile(manifestPath2, "utf8").catch(() => "{}")).name;
+          themeName = JSON.parse(await fsAsync3.readFile(manifestPath2, "utf8").catch(() => "{}")).name;
           if (!themeName) {
             throw Error(`${themePath}/manifest.json malformed.`);
           }
@@ -952,21 +948,21 @@ var ObsidianLauncher = class {
   async installPlugins(vault, plugins) {
     const downloadedPlugins = await this.downloadPlugins(plugins);
     const obsidianDir = path4.join(vault, ".obsidian");
-    await fsAsync4.mkdir(obsidianDir, { recursive: true });
+    await fsAsync3.mkdir(obsidianDir, { recursive: true });
     const enabledPluginsPath = path4.join(obsidianDir, "community-plugins.json");
     let originalEnabledPlugins = [];
     if (await fileExists(enabledPluginsPath)) {
-      originalEnabledPlugins = JSON.parse(await fsAsync4.readFile(enabledPluginsPath, "utf-8"));
+      originalEnabledPlugins = JSON.parse(await fsAsync3.readFile(enabledPluginsPath, "utf-8"));
     }
     let enabledPlugins = [...originalEnabledPlugins];
     for (const { path: pluginPath, enabled = true, originalType } of downloadedPlugins) {
       const manifestPath = path4.join(pluginPath, "manifest.json");
-      const pluginId = JSON.parse(await fsAsync4.readFile(manifestPath, "utf8").catch(() => "{}")).id;
+      const pluginId = JSON.parse(await fsAsync3.readFile(manifestPath, "utf8").catch(() => "{}")).id;
       if (!pluginId) {
         throw Error(`${manifestPath} missing or malformed.`);
       }
       const pluginDest = path4.join(obsidianDir, "plugins", pluginId);
-      await fsAsync4.mkdir(pluginDest, { recursive: true });
+      await fsAsync3.mkdir(pluginDest, { recursive: true });
       const files = {
         "manifest.json": [true, true],
         "main.js": [true, true],
@@ -979,7 +975,7 @@ var ObsidianLauncher = class {
         } else if (required) {
           throw Error(`${pluginPath}/${file} missing.`);
         } else if (deleteIfMissing) {
-          await fsAsync4.rm(path4.join(pluginDest, file), { force: true });
+          await fsAsync3.rm(path4.join(pluginDest, file), { force: true });
         }
       }
       const pluginAlreadyListed = enabledPlugins.includes(pluginId);
@@ -989,11 +985,11 @@ var ObsidianLauncher = class {
         enabledPlugins = enabledPlugins.filter((p) => p != pluginId);
       }
       if (originalType == "local") {
-        await fsAsync4.writeFile(path4.join(pluginDest, ".hotreload"), "");
+        await fsAsync3.writeFile(path4.join(pluginDest, ".hotreload"), "");
       }
     }
     if (!_4.isEqual(enabledPlugins, originalEnabledPlugins)) {
-      await fsAsync4.writeFile(enabledPluginsPath, JSON.stringify(enabledPlugins, void 0, 2));
+      await fsAsync3.writeFile(enabledPluginsPath, JSON.stringify(enabledPlugins, void 0, 2));
     }
   }
   /** 
@@ -1004,12 +1000,12 @@ var ObsidianLauncher = class {
   async installThemes(vault, themes) {
     const downloadedThemes = await this.downloadThemes(themes);
     const obsidianDir = path4.join(vault, ".obsidian");
-    await fsAsync4.mkdir(obsidianDir, { recursive: true });
+    await fsAsync3.mkdir(obsidianDir, { recursive: true });
     let enabledTheme = void 0;
     for (const { path: themePath, enabled = true } of downloadedThemes) {
       const manifestPath = path4.join(themePath, "manifest.json");
       const cssPath = path4.join(themePath, "theme.css");
-      const themeName = JSON.parse(await fsAsync4.readFile(manifestPath, "utf8").catch(() => "{}")).name;
+      const themeName = JSON.parse(await fsAsync3.readFile(manifestPath, "utf8").catch(() => "{}")).name;
       if (!themeName) {
         throw Error(`${manifestPath} missing or malformed.`);
       }
@@ -1017,7 +1013,7 @@ var ObsidianLauncher = class {
         throw Error(`${cssPath} missing.`);
       }
       const themeDest = path4.join(obsidianDir, "themes", themeName);
-      await fsAsync4.mkdir(themeDest, { recursive: true });
+      await fsAsync3.mkdir(themeDest, { recursive: true });
       await linkOrCp(manifestPath, path4.join(themeDest, "manifest.json"));
       await linkOrCp(cssPath, path4.join(themeDest, "theme.css"));
       if (enabledTheme && enabled) {
@@ -1030,10 +1026,10 @@ var ObsidianLauncher = class {
       const appearancePath = path4.join(obsidianDir, "appearance.json");
       let appearance = {};
       if (await fileExists(appearancePath)) {
-        appearance = JSON.parse(await fsAsync4.readFile(appearancePath, "utf-8"));
+        appearance = JSON.parse(await fsAsync3.readFile(appearancePath, "utf-8"));
       }
       appearance.cssTheme = enabledTheme ?? "";
-      await fsAsync4.writeFile(appearancePath, JSON.stringify(appearance, void 0, 2));
+      await fsAsync3.writeFile(appearancePath, JSON.stringify(appearance, void 0, 2));
     }
   }
   /**
@@ -1077,7 +1073,7 @@ var ObsidianLauncher = class {
         // Disable "safe mode" and enable plugins
       };
     }
-    await fsAsync4.writeFile(path4.join(configDir, "obsidian.json"), JSON.stringify(obsidianJson));
+    await fsAsync3.writeFile(path4.join(configDir, "obsidian.json"), JSON.stringify(obsidianJson));
     let appPath = params.appPath;
     if (!appPath) {
       appPath = await this.downloadApp(appVersion);
@@ -1101,7 +1097,7 @@ var ObsidianLauncher = class {
     let vault = params.vault;
     if (params.copy) {
       const dest = await makeTmpDir(`${path4.basename(vault)}-`);
-      await fsAsync4.cp(vault, dest, { recursive: true, preserveTimestamps: true });
+      await fsAsync3.cp(vault, dest, { recursive: true, preserveTimestamps: true });
       vault = dest;
     }
     await this.installPlugins(vault, params.plugins ?? []);
@@ -1158,11 +1154,11 @@ var ObsidianLauncher = class {
     const repo = "obsidianmd/obsidian-releases";
     let commitHistory = await fetchGitHubAPIPaginated(`repos/${repo}/commits`, {
       path: "desktop-releases.json",
-      since: original?.metadata.commit_date
+      since: original?.metadata.commitDate
     });
     commitHistory.reverse();
     if (original) {
-      commitHistory = _4.takeRightWhile(commitHistory, (c) => c.sha != original.metadata.commit_sha);
+      commitHistory = _4.takeRightWhile(commitHistory, (c) => c.sha != original.metadata.commitSha);
     }
     const fileHistory = await pool(
       8,
@@ -1226,8 +1222,8 @@ var ObsidianLauncher = class {
     }
     const result = {
       metadata: {
-        commit_date: commitHistory.at(-1)?.commit.committer.date ?? original?.metadata.commit_date,
-        commit_sha: commitHistory.at(-1)?.sha ?? original?.metadata.commit_sha,
+        commitDate: commitHistory.at(-1)?.commit.committer.date ?? original?.metadata.commitDate,
+        commitSha: commitHistory.at(-1)?.sha ?? original?.metadata.commitSha,
         timestamp: original?.metadata.timestamp ?? ""
         // set down below
       },
@@ -1277,4 +1273,4 @@ var ObsidianLauncher = class {
 export {
   ObsidianLauncher
 };
-//# sourceMappingURL=chunk-CGVVDO5H.js.map
+//# sourceMappingURL=chunk-IHBVELTU.js.map