pdfjs-reader-core 0.2.10 → 0.2.11

package/dist/index.cjs

@@ -86,16 +86,28 @@ async function loadDocument(options) {
     onProgress,
     enableRangeRequests = true,
     enableStreaming = true,
-    cacheDocument = true
+    cacheDocument = true,
+    signal
   } = options;
+  if (signal?.aborted) {
+    throw new DOMException("Aborted", "AbortError");
+  }
   await initializePDFJS({ workerSrc });
+  if (signal?.aborted) {
+    throw new DOMException("Aborted", "AbortError");
+  }
   const cacheKey = typeof src === "string" ? src : null;
   if (cacheKey && cacheDocument && documentCache.has(cacheKey)) {
     const cachedDoc = documentCache.get(cacheKey);
-    return {
-      document: cachedDoc,
-      numPages: cachedDoc.numPages
-    };
+    try {
+      const numPages = cachedDoc.numPages;
+      return {
+        document: cachedDoc,
+        numPages
+      };
+    } catch {
+      documentCache.delete(cacheKey);
+    }
   }
   const loadingParams = {
     password,
@@ -116,12 +128,37 @@ async function loadDocument(options) {
     loadingParams.data = src;
   }
   const loadingTask = pdfjsLib.getDocument(loadingParams);
+  let abortHandler = null;
+  if (signal) {
+    abortHandler = () => {
+      loadingTask.destroy();
+    };
+    signal.addEventListener("abort", abortHandler);
+  }
   if (onProgress) {
     loadingTask.onProgress = ({ loaded, total }) => {
       onProgress({ loaded, total });
     };
   }
-  const document2 = await loadingTask.promise;
+  let document2;
+  try {
+    document2 = await loadingTask.promise;
+  } catch (error) {
+    if (signal && abortHandler) {
+      signal.removeEventListener("abort", abortHandler);
+    }
+    if (signal?.aborted) {
+      throw new DOMException("Aborted", "AbortError");
+    }
+    throw error;
+  }
+  if (signal && abortHandler) {
+    signal.removeEventListener("abort", abortHandler);
+  }
+  if (signal?.aborted) {
+    document2.destroy();
+    throw new DOMException("Aborted", "AbortError");
+  }
   if (cacheKey && cacheDocument) {
     documentCache.set(cacheKey, document2);
   }
@@ -10002,18 +10039,36 @@ var init_PDFViewerClient = __esm({
         viewerStore.getState().setError(null);
         setLoadState("idle");
       }, [viewerStore]);
+      const abortControllerRef = (0, import_react41.useRef)(null);
       (0, import_react41.useEffect)(() => {
         mountedRef.current = true;
         return () => {
           mountedRef.current = false;
+          if (abortControllerRef.current) {
+            abortControllerRef.current.abort();
+            abortControllerRef.current = null;
+          }
+          srcIdRef.current = null;
+          const currentDoc = viewerStore.getState().document;
+          if (currentDoc) {
+            currentDoc.destroy();
+          }
+          viewerStore.getState().setDocument(null);
+          viewerStore.getState().setLoading(false);
+          viewerStore.getState().setError(null);
         };
-      }, []);
+      }, [viewerStore]);
       (0, import_react41.useEffect)(() => {
         if (srcIdRef.current === srcId && viewerStore.getState().document) {
           return;
         }
         const loadId = srcId;
         srcIdRef.current = srcId;
+        if (abortControllerRef.current) {
+          abortControllerRef.current.abort();
+        }
+        const abortController = new AbortController();
+        abortControllerRef.current = abortController;
         const currentDoc = viewerStore.getState().document;
         if (currentDoc) {
           currentDoc.destroy();
@@ -10023,14 +10078,15 @@ var init_PDFViewerClient = __esm({
         viewerStore.getState().setError(null);
         setLoadState("loading");
         const loadDoc = async () => {
-          if (!mountedRef.current) return;
+          if (!mountedRef.current || abortController.signal.aborted) return;
           try {
             viewerStore.getState().setLoadingProgress({ phase: "fetching" });
             const { document: document2, numPages } = await loadDocument({
               src,
               workerSrc,
+              signal: abortController.signal,
               onProgress: ({ loaded, total }) => {
-                if (mountedRef.current && srcIdRef.current === loadId) {
+                if (mountedRef.current && srcIdRef.current === loadId && !abortController.signal.aborted) {
                   const percent = total > 0 ? Math.round(loaded / total * 100) : void 0;
                   viewerStore.getState().setLoadingProgress({
                     phase: "fetching",
@@ -10041,10 +10097,10 @@ var init_PDFViewerClient = __esm({
                 }
               }
             });
-            if (mountedRef.current && srcIdRef.current === loadId) {
+            if (mountedRef.current && srcIdRef.current === loadId && !abortController.signal.aborted) {
               viewerStore.getState().setLoadingProgress({ phase: "parsing", percent: 100 });
             }
-            if (mountedRef.current && srcIdRef.current === loadId) {
+            if (mountedRef.current && srcIdRef.current === loadId && !abortController.signal.aborted) {
               viewerStore.getState().setDocument(document2);
               setLoadState("loaded");
               if (initialPage !== 1) {
@@ -10062,6 +10118,13 @@ var init_PDFViewerClient = __esm({
               document2.destroy();
             }
           } catch (err) {
+            if (err instanceof DOMException && err.name === "AbortError") {
+              return;
+            }
+            const errorMessage = err instanceof Error ? err.message : String(err);
+            if (abortController.signal.aborted || errorMessage.includes("network error") || errorMessage.includes("aborted")) {
+              return;
+            }
             if (mountedRef.current && srcIdRef.current === loadId) {
               const error2 = err instanceof Error ? err : new Error("Failed to load document");
               viewerStore.getState().setError(error2);
@@ -10073,6 +10136,7 @@ var init_PDFViewerClient = __esm({
         };
         loadDoc();
         return () => {
+          abortController.abort();
         };
       }, [srcId, src, workerSrc, initialPage, initialScale, viewerStore]);
       const prevPageRef = (0, import_react41.useRef)(currentPage);