@clazic/kordoc 2.4.4 → 2.4.5

package/dist/index.js

@@ -2696,29 +2696,44 @@ async function ocrPagesBatch(doc, provider, pageFilter, effectivePageCount, warn
   let processed = 0;
   const batchTasks = pageBatches.map((batchPageNums, batchIdx) => async () => {
     const pageBlocks = [];
+    const batchImages = [];
     try {
-      const batchImages = [];
       for (const pageNum of batchPageNums) {
         const page = await doc.getPage(pageNum);
         const image = await renderPageToPng(page);
         batchImages.push({ image, pageNum });
       }
-      const results = await provider.processBatch(batchImages);
-      for (const { pageNum } of batchImages) {
-        const result = results.get(pageNum);
-        pageBlocks.push({
-          pageNum,
-          blocks: result ? ocrResultToBlocks(result, pageNum) : []
-        });
-      }
-    } catch (err) {
-      const range = `${batchPageNums[0]}-${batchPageNums[batchPageNums.length - 1]}`;
-      warnings?.push({
-        message: `\uBC30\uCE58 OCR \uC2E4\uD328 (\uD398\uC774\uC9C0 ${range}): ${err instanceof Error ? err.message : "\uC54C \uC218 \uC5C6\uB294 \uC624\uB958"}`,
-        code: "OCR_PAGE_FAILED"
-      });
+    } catch (renderErr) {
+      const rendered = new Set(batchImages.map((b) => b.pageNum));
       for (const pageNum of batchPageNums) {
-        pageBlocks.push({ pageNum, blocks: [] });
+        if (!rendered.has(pageNum)) pageBlocks.push({ pageNum, blocks: [] });
+      }
+    }
+    if (batchImages.length > 0) {
+      try {
+        const results = await provider.processBatch(batchImages);
+        for (const { pageNum } of batchImages) {
+          const result = results.get(pageNum);
+          pageBlocks.push({
+            pageNum,
+            blocks: result ? ocrResultToBlocks(result, pageNum) : []
+          });
+        }
+      } catch (err) {
+        const range = `${batchPageNums[0]}-${batchPageNums[batchPageNums.length - 1]}`;
+        warnings?.push({
+          message: `\uBC30\uCE58 OCR \uC2E4\uD328 (\uD398\uC774\uC9C0 ${range}): ${err instanceof Error ? err.message : "\uC54C \uC218 \uC5C6\uB294 \uC624\uB958"} \u2014 \uB2E8\uC77C \uD398\uC774\uC9C0\uB85C \uC7AC\uC2DC\uB3C4`,
+          code: "OCR_PAGE_FAILED"
+        });
+        for (const { image, pageNum } of batchImages) {
+          try {
+            const singleResult = await provider.processBatch([{ image, pageNum }]);
+            const r = singleResult.get(pageNum);
+            pageBlocks.push({ pageNum, blocks: r ? ocrResultToBlocks(r, pageNum) : [] });
+          } catch {
+            pageBlocks.push({ pageNum, blocks: [] });
+          }
+        }
       }
     }
     processed += batchPageNums.length;
@@ -2805,7 +2820,7 @@ import JSZip2 from "jszip";
 import { DOMParser } from "@xmldom/xmldom";
 
 // src/utils.ts
-var VERSION = true ? "2.4.4" : "0.0.0-dev";
+var VERSION = true ? "2.4.5" : "0.0.0-dev";
 function toArrayBuffer(buf) {
   if (buf.byteOffset === 0 && buf.byteLength === buf.buffer.byteLength) {
     return buf.buffer;
@@ -6365,9 +6380,9 @@ async function parsePdfDocument(buffer, options) {
       }
       const { resolveOcrProvider: resolveOcrProvider2 } = await Promise.resolve().then(() => (init_resolve(), resolve_exports));
       const { ocrPages: ocrPages2 } = await Promise.resolve().then(() => (init_provider(), provider_exports));
-      const tryProvider = async (provider) => {
+      const tryProvider = async (provider, filter) => {
         try {
-          return await ocrPages2(doc, provider, pageFilter, effectivePageCount, warnings, concurrency, options?.onProgress);
+          return await ocrPages2(doc, provider, filter, effectivePageCount, warnings, concurrency, options?.onProgress);
         } catch {
           return [];
         } finally {
@@ -6380,25 +6395,42 @@ async function parsePdfDocument(buffer, options) {
       };
       let ocrBlocks = [];
       if (options?.ocr) {
-        ocrBlocks = await tryProvider(options.ocr);
+        ocrBlocks = await tryProvider(options.ocr, pageFilter);
       } else if (ocrMode === "auto") {
         const { getAutoFallbackChain: getAutoFallbackChain2 } = await Promise.resolve().then(() => (init_auto_detect(), auto_detect_exports));
+        const pendingPages = /* @__PURE__ */ new Set();
+        for (let i = 1; i <= effectivePageCount; i++) {
+          if (!pageFilter || pageFilter.has(i)) pendingPages.add(i);
+        }
+        const allOcrBlocks = [];
         for (const mode of getAutoFallbackChain2()) {
+          if (pendingPages.size === 0) break;
           try {
+            const modeFilter = pendingPages.size < effectivePageCount ? new Set(pendingPages) : pageFilter;
             const provider = await resolveOcrProvider2(mode, warnings, concurrency, batchSize);
-            const blocks2 = await tryProvider(provider);
+            const blocks2 = await tryProvider(provider, modeFilter);
             if (blocks2.length > 0) {
-              ocrBlocks = blocks2;
-              break;
+              for (const b of blocks2) {
+                if (b.pageNumber !== void 0) pendingPages.delete(b.pageNumber);
+              }
+              for (const b of blocks2) allOcrBlocks.push(b);
+              if (pendingPages.size > 0) {
+                warnings.push({
+                  message: `OCR: '${mode}' \uC644\uB8CC (${pendingPages.size}\uD398\uC774\uC9C0 \uBBF8\uCC98\uB9AC \u2192 \uB2E4\uC74C \uC5D4\uC9C4\uC73C\uB85C \uC7AC\uC2DC\uB3C4)`,
+                  code: "OCR_CLI_FALLBACK"
+                });
+              }
+            } else {
+              warnings.push({ message: `OCR: '${mode}' \uACB0\uACFC \uC5C6\uC74C, \uB2E4\uC74C \uC5D4\uC9C4\uC73C\uB85C \uC2DC\uB3C4`, code: "OCR_CLI_FALLBACK" });
             }
-            warnings.push({ message: `OCR: '${mode}' \uACB0\uACFC \uC5C6\uC74C, \uB2E4\uC74C \uC5D4\uC9C4\uC73C\uB85C \uC2DC\uB3C4`, code: "OCR_CLI_FALLBACK" });
           } catch {
           }
         }
+        ocrBlocks = allOcrBlocks;
       } else {
         try {
           const provider = await resolveOcrProvider2(ocrMode, warnings, concurrency, batchSize);
-          ocrBlocks = await tryProvider(provider);
+          ocrBlocks = await tryProvider(provider, pageFilter);
         } catch (resolveErr) {
           throw Object.assign(
             new KordocError(resolveErr instanceof Error ? resolveErr.message : "OCR \uD504\uB85C\uBC14\uC774\uB354 \uCD08\uAE30\uD654 \uC2E4\uD328"),