@clazic/kordoc 2.7.2 → 2.7.4

package/dist/index.js

@@ -3112,7 +3112,7 @@ import JSZip2 from "jszip";
 import { DOMParser } from "@xmldom/xmldom";
 
 // src/utils.ts
-var VERSION = true ? "2.7.2" : "0.0.0-dev";
+var VERSION = true ? "2.7.3" : "0.0.0-dev";
 function toArrayBuffer(buf) {
   if (buf.byteOffset === 0 && buf.byteLength === buf.buffer.byteLength) {
     return buf.buffer;
@@ -11343,8 +11343,13 @@ async function installForPlatform(pkg, onProgress) {
 async function installMacOS(pkg, downloadPath) {
   const mountPoint = `/Volumes/LibreOffice_${Date.now()}`;
   await new Promise((resolve4, reject) => {
-    const child = spawn2("hdiutil", ["attach", "-nobrowse", "-mountpoint", mountPoint, downloadPath]);
-    child.on("close", (code) => code === 0 ? resolve4() : reject(new Error("dmg \uB9C8\uC6B4\uD2B8 \uC2E4\uD328")));
+    const stderr = [];
+    const child = spawn2("hdiutil", ["attach", "-nobrowse", "-noverify", "-mountpoint", mountPoint, downloadPath]);
+    child.stderr?.on("data", (d) => stderr.push(d.toString()));
+    child.on(
+      "close",
+      (code) => code === 0 ? resolve4() : reject(new Error(`dmg \uB9C8\uC6B4\uD2B8 \uC2E4\uD328 (code=${code}): ${stderr.join("").trim()}`))
+    );
   });
   try {
     const appSource = join4(mountPoint, "LibreOffice.app");
@@ -11472,14 +11477,15 @@ async function resolveSoffice(emitter, autoInstall = true) {
 
 // src/convert/libreoffice.ts
 var libreConvert = libre.convert;
-async function convertBuffer(buffer, targetExt, timeoutMs = 6e4) {
+var libreConvertWithOptions = libre.convertWithOptions;
+async function convertBuffer(buffer, targetExt, timeoutMs = 6e4, sofficePath) {
   return new Promise((resolve4, reject) => {
     const timer = setTimeout(() => {
       reject(
         new ConvertError("TIMEOUT", `\uBCC0\uD658 \uD0C0\uC784\uC544\uC6C3 (${timeoutMs}ms \uCD08\uACFC)`)
       );
     }, timeoutMs);
-    libreConvert(buffer, targetExt, void 0, (err, done) => {
+    const cb = (err, done) => {
       clearTimeout(timer);
       if (err || !done) {
         reject(
@@ -11491,7 +11497,12 @@ async function convertBuffer(buffer, targetExt, timeoutMs = 6e4) {
         return;
       }
       resolve4(done);
-    });
+    };
+    if (sofficePath) {
+      libreConvertWithOptions(buffer, targetExt, void 0, { sofficeBinaryPaths: [sofficePath] }, cb);
+    } else {
+      libreConvert(buffer, targetExt, void 0, cb);
+    }
   });
 }
 
@@ -11647,7 +11658,7 @@ async function convertToPdf(input, options) {
     try {
       emitter.convertStart("\uBCC0\uD658 \uC2DC\uC791...");
       emitter.progress(10, "\uBCC0\uD658 \uC911...");
-      const pdf = await convertBuffer(buffer, ".pdf", options?.timeoutMs);
+      const pdf = await convertBuffer(buffer, ".pdf", options?.timeoutMs, sofficePath);
       emitter.progress(100, "\uBCC0\uD658 \uC644\uB8CC");
       emitter.convertDone("\uBCC0\uD658 \uC644\uB8CC");
       const result = {
@@ -12000,16 +12011,18 @@ async function runUnifiedOcrPipeline(inputPath, options = {}) {
           }
         });
       }
+      let resolvedSofficePath;
       if (options.sofficePath) {
         const sofficeDir = dirname3(options.sofficePath);
         process.env.PATH = `${sofficeDir}${delimiter2}${process.env.PATH ?? ""}`;
         convertEmitter.validate("soffice_found", "\uC9C1\uC811 \uC9C0\uC815\uB41C LibreOffice \uACBD\uB85C \uC0AC\uC6A9", { sofficePath: options.sofficePath });
+        resolvedSofficePath = options.sofficePath;
       } else {
-        await resolveSoffice(convertEmitter, options.autoInstallLibreOffice ?? false);
+        resolvedSofficePath = await resolveSoffice(convertEmitter, options.autoInstallLibreOffice ?? false);
       }
       workingPdfPath = join5(workspaceDir, `${stem}.pdf`);
       const inputBuffer = await readFile2(absInput);
-      const out = await convertBuffer(inputBuffer, ".pdf");
+      const out = await convertBuffer(inputBuffer, ".pdf", 5 * 6e4, resolvedSofficePath);
       await writeFile2(workingPdfPath, out);
     }
     timingsMs.convert = elapsedMs(convertStart);