obsidian-launcher 2.1.2 → 2.1.4

package/dist/{chunk-HMKNUWAY.js → chunk-RFPT36TQ.js}

@@ -360,12 +360,14 @@ var ChromeLocalStorage = class {
 import fsAsync3 from "fs/promises";
 import fs3 from "fs";
 import path4 from "path";
+import { promisify } from "util";
 import child_process from "child_process";
 import semver from "semver";
 import _3 from "lodash";
 import { pipeline } from "stream/promises";
 import zlib from "zlib";
 import { fileURLToPath } from "url";
+var execFile = promisify(child_process.execFile);
 function normalizeGitHubRepo(repo) {
   return repo.match(/^(https?:\/\/)?(github.com\/)?(.*?)\/?$/)?.[3] ?? repo;
 }
@@ -424,15 +426,82 @@ async function extractObsidianExe(exe, arch, dest) {
 async function extractObsidianDmg(dmg, dest) {
   dest = path4.resolve(dest);
   await atomicCreate(dest, async (scratch) => {
-    await sevenZ(["x", "-o.", path4.relative(scratch, dmg), "*/Obsidian.app", "Obsidian.app"], { cwd: scratch });
-    const files = await fsAsync3.readdir(scratch);
-    if (files.includes("Obsidian.app")) {
-      return "Obsidian.app";
+    if (process.platform == "darwin") {
+      const proc = await execFile("hdiutil", ["attach", "-nobrowse", "-readonly", dmg]);
+      const volume = proc.stdout.match(/\/Volumes\/.*$/m)[0];
+      const files = await fsAsync3.readdir(volume);
+      let obsidianApp = files.includes("Obsidian.app") ? "Obsidian.app" : path4.join(files[0], "Obsidian.app");
+      obsidianApp = path4.join(volume, obsidianApp);
+      try {
+        await fsAsync3.cp(obsidianApp, scratch, { recursive: true, verbatimSymlinks: true, preserveTimestamps: true });
+      } finally {
+        await execFile("hdiutil", ["detach", volume]);
+      }
+      return scratch;
     } else {
-      return path4.join(files[0], "Obsidian.app");
+      await sevenZ(["x", "-o.", path4.relative(scratch, dmg), "*/Obsidian.app", "Obsidian.app"], { cwd: scratch });
+      const files = await fsAsync3.readdir(scratch);
+      const obsidianApp = files.includes("Obsidian.app") ? "Obsidian.app" : path4.join(files[0], "Obsidian.app");
+      return path4.join(scratch, obsidianApp);
     }
   });
 }
+async function extractInstallerInfo(installerKey, url) {
+  const installerName = url.split("/").at(-1);
+  console.log(`Extrating installer info for ${installerName}...`);
+  const tmpDir = await makeTmpDir("obsidian-launcher-");
+  try {
+    const installerPath = path4.join(tmpDir, url.split("/").at(-1));
+    await downloadResponse(await fetch(url), installerPath);
+    const exractedPath = path4.join(tmpDir, "Obsidian");
+    let platforms = [];
+    if (installerKey == "appImage" || installerKey == "appImageArm") {
+      await extractObsidianAppImage(installerPath, exractedPath);
+      platforms = ["linux-" + (installerKey == "appImage" ? "x64" : "arm64")];
+    } else if (installerKey == "tar" || installerKey == "tarArm") {
+      await extractObsidianTar(installerPath, exractedPath);
+      platforms = ["linux-" + (installerKey == "tar" ? "x64" : "arm64")];
+    } else if (installerKey == "exe") {
+      await extractObsidianExe(installerPath, "x64", exractedPath);
+      const { stdout } = await sevenZ(["l", "-ba", path4.relative(tmpDir, installerPath)], { cwd: tmpDir });
+      const lines = stdout.trim().split("\n").map((l) => l.trim());
+      const files = lines.map((l) => l.split(/\s+/).at(-1).replace(/\\/g, "/"));
+      if (files.includes("$PLUGINSDIR/app-arm64.7z")) platforms.push("win32-arm64");
+      if (files.includes("$PLUGINSDIR/app-32.7z")) platforms.push("win32-ia32");
+      if (files.includes("$PLUGINSDIR/app-64.7z")) platforms.push("win32-x64");
+    } else if (installerKey == "dmg") {
+      await extractObsidianDmg(installerPath, exractedPath);
+      platforms = ["darwin-arm64", "darwin-x64"];
+    } else {
+      throw new Error(`Unknown installer key ${installerKey}`);
+    }
+    const matches = [];
+    const installerFiles = await fsAsync3.readdir(exractedPath, { recursive: true, withFileTypes: true });
+    for (const file of installerFiles) {
+      if (file.isFile() && !file.name.endsWith(".asar")) {
+        const stream = fs3.createReadStream(path4.join(file.parentPath, file.name), { encoding: "utf-8" });
+        let prev = "";
+        for await (let chunk of stream) {
+          const regex = /Chrome\/\d+\.\d+\.\d+\.\d+|Electron\/\d+\.\d+\.\d+/g;
+          chunk = prev + chunk;
+          matches.push(...[...(prev + chunk).matchAll(regex)].map((m) => m[0]));
+          prev = chunk.slice(-64);
+        }
+      }
+    }
+    const versionSortKey = (v) => v.split(".").map((s) => s.padStart(9, "0")).join(".");
+    const versions = _3(matches).map((m) => m.split("/")).groupBy(0).mapValues((ms) => ms.map((m) => m[1])).mapValues((ms) => _3.sortBy(ms, versionSortKey).at(-1)).value();
+    const electron = versions["Electron"];
+    const chrome = versions["Chrome"];
+    if (!electron || !chrome) {
+      throw new Error(`Failed to extract Electron and Chrome versions from binary ${installerPath}`);
+    }
+    console.log(`Extracted installer info for ${installerName}`);
+    return { electron, chrome, platforms };
+  } finally {
+    await fsAsync3.rm(tmpDir, { recursive: true, force: true });
+  }
+}
 async function fetchObsidianDesktopReleases(sinceDate, sinceSha) {
   const repo = "obsidianmd/obsidian-releases";
   let commitHistory = await fetchGitHubAPIPaginated(`repos/${repo}/commits`, {
@@ -582,62 +651,6 @@ function updateObsidianVersionList(args) {
   }
   return Object.values(newVersions).map(normalizeObsidianVersionInfo).sort((a, b) => semver.compare(a.version, b.version));
 }
-async function extractInstallerInfo(installerKey, url) {
-  const installerName = url.split("/").at(-1);
-  console.log(`Extrating installer info for ${installerName}...`);
-  const tmpDir = await makeTmpDir("obsidian-launcher-");
-  try {
-    const installerPath = path4.join(tmpDir, url.split("/").at(-1));
-    await downloadResponse(await fetch(url), installerPath);
-    const exractedPath = path4.join(tmpDir, "Obsidian");
-    let platforms = [];
-    if (installerKey == "appImage" || installerKey == "appImageArm") {
-      await extractObsidianAppImage(installerPath, exractedPath);
-      platforms = ["linux-" + (installerKey == "appImage" ? "x64" : "arm64")];
-    } else if (installerKey == "tar" || installerKey == "tarArm") {
-      await extractObsidianTar(installerPath, exractedPath);
-      platforms = ["linux-" + (installerKey == "tar" ? "x64" : "arm64")];
-    } else if (installerKey == "exe") {
-      await extractObsidianExe(installerPath, "x64", exractedPath);
-      const { stdout } = await sevenZ(["l", "-ba", path4.relative(tmpDir, installerPath)], { cwd: tmpDir });
-      const lines = stdout.trim().split("\n").map((l) => l.trim());
-      const files = lines.map((l) => l.split(/\s+/).at(-1).replace(/\\/g, "/"));
-      if (files.includes("$PLUGINSDIR/app-arm64.7z")) platforms.push("win32-arm64");
-      if (files.includes("$PLUGINSDIR/app-32.7z")) platforms.push("win32-ia32");
-      if (files.includes("$PLUGINSDIR/app-64.7z")) platforms.push("win32-x64");
-    } else if (installerKey == "dmg") {
-      await extractObsidianDmg(installerPath, exractedPath);
-      platforms = ["darwin-arm64", "darwin-x64"];
-    } else {
-      throw new Error(`Unknown installer key ${installerKey}`);
-    }
-    const matches = [];
-    const installerFiles = await fsAsync3.readdir(exractedPath, { recursive: true, withFileTypes: true });
-    for (const file of installerFiles) {
-      if (file.isFile() && !file.name.endsWith(".asar")) {
-        const stream = fs3.createReadStream(path4.join(file.parentPath, file.name), { encoding: "utf-8" });
-        let prev = "";
-        for await (let chunk of stream) {
-          const regex = /Chrome\/\d+\.\d+\.\d+\.\d+|Electron\/\d+\.\d+\.\d+/g;
-          chunk = prev + chunk;
-          matches.push(...[...(prev + chunk).matchAll(regex)].map((m) => m[0]));
-          prev = chunk.slice(-64);
-        }
-      }
-    }
-    const versionSortKey = (v) => v.split(".").map((s) => s.padStart(9, "0")).join(".");
-    const versions = _3(matches).map((m) => m.split("/")).groupBy(0).mapValues((ms) => ms.map((m) => m[1])).mapValues((ms) => _3.sortBy(ms, versionSortKey).at(-1)).value();
-    const electron = versions["Electron"];
-    const chrome = versions["Chrome"];
-    if (!electron || !chrome) {
-      throw new Error(`Failed to extract Electron and Chrome versions from binary ${installerPath}`);
-    }
-    console.log(`Extracted installer info for ${installerName}`);
-    return { electron, chrome, platforms };
-  } finally {
-    await fsAsync3.rm(tmpDir, { recursive: true, force: true });
-  }
-}
 function normalizeObsidianVersionInfo(versionInfo) {
   versionInfo = _3.cloneDeep(versionInfo);
   versionInfo.electronVersion = versionInfo.installers?.appImage?.electron;
@@ -1583,4 +1596,4 @@ export {
   watchFiles,
   ObsidianLauncher
 };
-//# sourceMappingURL=chunk-HMKNUWAY.js.map
+//# sourceMappingURL=chunk-RFPT36TQ.js.map