markpdfdown 0.4.5 → 0.4.7

package/dist/renderer/assets/{index-BDl2RVlc.js → index-CG2nvY4Z.js}

@@ -71129,11 +71129,14 @@ function mapCloudTasksToTasks(cloudTasks) {
 }
 const { Text: Text$4 } = Typography;
 const CLOUD_MODEL_TIERS$1 = ["lite", "pro", "ultra"];
+const cloudProgressCache = /* @__PURE__ */ new Map();
 const List = () => {
   const { message: message2, modal } = App$1.useApp();
   const { t: t2 } = useTranslation("list");
   const { t: tCommon } = useTranslation("common");
   const cloudContext = reactExports.useContext(CloudContext);
+  const cloudIsAuthenticated = cloudContext?.isAuthenticated ?? false;
+  const cloudGetTasks = cloudContext?.getTasks;
   const [loading, setLoading] = reactExports.useState(false);
   const [data, setData] = reactExports.useState([]);
   const [pagination, setPagination] = reactExports.useState({
@@ -71146,6 +71149,10 @@ const List = () => {
   const pollTimerRef = reactExports.useRef(null);
   const paginationRef = reactExports.useRef(pagination);
   paginationRef.current = pagination;
+  const pendingRefreshRef = reactExports.useRef(false);
+  const refreshTimerRef = reactExports.useRef(null);
+  const dataRef = reactExports.useRef(data);
+  dataRef.current = data;
   const MAX_FETCH_ITEMS = 100;
   const buildLocalModelValue = (modelId, providerId) => `${modelId}@${providerId}`;
   const parseLocalModelValue = (value) => {
@@ -71192,8 +71199,8 @@ const List = () => {
       const promises = [
         window.api.task.getAll({ page: 1, pageSize: MAX_FETCH_ITEMS })
       ];
-      if (cloudContext?.isAuthenticated) {
-        promises.push(cloudContext.getTasks(1, MAX_FETCH_ITEMS));
+      if (cloudIsAuthenticated && cloudGetTasks) {
+        promises.push(cloudGetTasks(1, MAX_FETCH_ITEMS));
       }
       const results = await Promise.all(promises);
       const localResult = results[0];
@@ -71228,7 +71235,50 @@ const List = () => {
       combinedList.sort((a2, b) => getTimestamp(b) - getTimestamp(a2));
       const startIndex = (page - 1) * pageSize;
       const paginatedList = combinedList.slice(startIndex, startIndex + pageSize);
-      setData(paginatedList);
+      setData((prevData) => {
+        const existingMap = /* @__PURE__ */ new Map();
+        for (const item of prevData) {
+          if (item.isCloud && item.id) {
+            existingMap.set(item.id, item);
+          }
+        }
+        return paginatedList.map((task) => {
+          if (task.isCloud && task.id) {
+            const fromState = existingMap.get(task.id);
+            const fromCache = cloudProgressCache.get(task.id);
+            const maxProgress = Math.max(
+              task.progress || 0,
+              fromState?.progress || 0,
+              fromCache?.progress || 0
+            );
+            const maxCompleted = Math.max(
+              task.completed_count || 0,
+              fromState?.completed_count || 0,
+              fromCache?.completed_count || 0
+            );
+            const maxFailed = Math.max(
+              task.failed_count || 0,
+              fromState?.failed_count || 0,
+              fromCache?.failed_count || 0
+            );
+            cloudProgressCache.set(task.id, {
+              progress: maxProgress,
+              completed_count: maxCompleted,
+              failed_count: maxFailed,
+              status: task.status ?? fromCache?.status ?? 0
+            });
+            if (maxProgress > (task.progress || 0) || maxCompleted > (task.completed_count || 0)) {
+              return {
+                ...task,
+                progress: maxProgress,
+                completed_count: maxCompleted,
+                failed_count: maxFailed
+              };
+            }
+          }
+          return task;
+        });
+      });
       setPagination((prev2) => ({
         ...prev2,
         current: page,
@@ -71241,7 +71291,7 @@ const List = () => {
     } finally {
       setLoading(false);
     }
-  }, [message2, t2, cloudContext]);
+  }, [message2, t2, cloudIsAuthenticated, cloudGetTasks]);
   const handleTaskEvent = reactExports.useCallback((event) => {
     const { type: type4, taskId, task } = event;
     console.log(`[List] Received task event: ${type4}`, { taskId, task });
@@ -71291,27 +71341,33 @@ const List = () => {
   reactExports.useEffect(() => {
     if (!window.api?.events?.onCloudTaskEvent) return;
     console.log("[List] Registering cloud SSE event listener");
-    let pendingRefresh = false;
     const handleCloudEvent = (event) => {
-      const { type: type4, data: data2 } = event;
+      const { type: type4, data: eventData } = event;
       if (type4 === "heartbeat" || type4 === "connected") return;
-      const taskId = data2.task_id;
+      const taskId = eventData.task_id;
       if (!taskId) return;
       console.log(`[List] Cloud SSE event: type=${type4}, task_id=${taskId}`);
-      setData((prevData) => {
-        const index2 = prevData.findIndex((t22) => t22.id === taskId);
-        if (index2 === -1) {
-          if (!pendingRefresh) {
-            pendingRefresh = true;
-            queueMicrotask(() => {
-              pendingRefresh = false;
-              fetchTasks(paginationRef.current.current, paginationRef.current.pageSize);
-            });
-          }
-          return prevData;
+      const currentData = dataRef.current;
+      const index2 = currentData.findIndex((t22) => t22.id === taskId);
+      if (index2 === -1) {
+        if (!pendingRefreshRef.current) {
+          pendingRefreshRef.current = true;
+          refreshTimerRef.current = setTimeout(async () => {
+            try {
+              await fetchTasks(paginationRef.current.current, paginationRef.current.pageSize);
+            } finally {
+              pendingRefreshRef.current = false;
+              refreshTimerRef.current = null;
+            }
+          }, 500);
         }
+        return;
+      }
+      setData((prevData) => {
+        const idx = prevData.findIndex((t22) => t22.id === taskId);
+        if (idx === -1) return prevData;
         const newData = [...prevData];
-        const task = { ...newData[index2] };
+        const task = { ...newData[idx] };
         switch (type4) {
           case "page_started":
           case "page_retry_started": {
@@ -71319,11 +71375,15 @@ const List = () => {
             break;
           }
           case "page_completed": {
-            const pageNumber = data2.page;
-            const totalPages = data2.total_pages || task.pages || 1;
-            const completed = Math.max(task.completed_count || 0, pageNumber || 0);
-            task.completed_count = completed;
-            task.progress = Math.round(completed / totalPages * 100);
+            const pageNumber = eventData.page;
+            const totalPages = eventData.total_pages || task.pages || 1;
+            if (task.status === 8) {
+              task.completed_count = (task.completed_count || 0) + 1;
+              task.failed_count = Math.max(0, (task.failed_count || 0) - 1);
+            } else {
+              task.completed_count = Math.max(task.completed_count || 0, pageNumber || 0);
+            }
+            task.progress = Math.round((task.completed_count || 0) / totalPages * 100);
             task.status = 3;
             break;
           }
@@ -71332,15 +71392,15 @@ const List = () => {
             break;
           }
           case "completed": {
-            task.status = data2.status || 6;
+            task.status = eventData.status || 6;
             task.progress = 100;
-            task.completed_count = data2.pages_completed;
-            task.failed_count = data2.pages_failed;
+            task.completed_count = eventData.pages_completed;
+            task.failed_count = eventData.pages_failed;
             break;
           }
           case "error": {
             task.status = 0;
-            task.error = data2.error;
+            task.error = eventData.error;
             break;
           }
           case "cancelled": {
@@ -71349,13 +71409,26 @@ const List = () => {
           }
           case "pdf_ready": {
             task.status = 3;
-            task.pages = data2.page_count;
+            task.pages = eventData.page_count;
             break;
           }
           default:
             return prevData;
         }
-        newData[index2] = task;
+        newData[idx] = task;
+        if (task.id) {
+          const terminalStatuses = [0, 6, 7, 8];
+          if (terminalStatuses.includes(task.status ?? -1)) {
+            cloudProgressCache.delete(task.id);
+          } else {
+            cloudProgressCache.set(task.id, {
+              progress: task.progress || 0,
+              completed_count: task.completed_count || 0,
+              failed_count: task.failed_count || 0,
+              status: task.status ?? 0
+            });
+          }
+        }
         return newData;
       });
     };
@@ -71363,6 +71436,11 @@ const List = () => {
     return () => {
       console.log("[List] Cleaning up cloud SSE event listener");
       cleanup2();
+      if (refreshTimerRef.current) {
+        clearTimeout(refreshTimerRef.current);
+        refreshTimerRef.current = null;
+        pendingRefreshRef.current = false;
+      }
     };
   }, [fetchTasks]);
   reactExports.useEffect(() => {
@@ -126300,13 +126378,20 @@ const CloudPreview = () => {
             }
             return [...prev2, { page, status: 2, status_name: "COMPLETED", markdown: markdown2, width_mm: 210, height_mm: 297 }];
           });
-          setTask((prev2) => prev2 ? {
-            ...prev2,
-            pages_completed: (prev2.pages_completed || 0) + 1
-          } : null);
+          setTask((prev2) => {
+            if (!prev2) return null;
+            const updates = {
+              pages_completed: (prev2.pages_completed || 0) + 1
+            };
+            if (prev2.status === 8) {
+              updates.pages_failed = Math.max(0, (prev2.pages_failed || 0) - 1);
+            }
+            return { ...prev2, ...updates };
+          });
           break;
         }
-        case "page_started": {
+        case "page_started":
+        case "page_retry_started": {
           const { page } = event.data;
           setPages((prev2) => {
             const idx = prev2.findIndex((p2) => p2.page === page);
@@ -126344,6 +126429,9 @@ const CloudPreview = () => {
             pages_completed: data.pages_completed,
             pages_failed: data.pages_failed
           } : null);
+          if (data.pages_failed === 0) {
+            setPages((prev2) => prev2.map((p2) => p2.status !== 2 ? { ...p2, status: 2, status_name: "COMPLETED" } : p2));
+          }
           break;
         }
         case "error": {
@@ -130469,41 +130557,64 @@ const CloudProvider = ({ children }) => {
     });
     return cleanup2;
   }, [isAuthenticated, refreshCredits]);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(
-    CloudContext.Provider,
-    {
-      value: {
-        user,
-        credits,
-        isAuthenticated,
-        isLoading,
-        deviceFlowStatus,
-        userCode,
-        verificationUrl,
-        authError,
-        login,
-        logout,
-        cancelLogin,
-        refreshCredits,
-        convertFile,
-        getTasks,
-        getTaskById,
-        getTaskPages,
-        cancelTask,
-        retryTask,
-        deleteTask,
-        retryPage,
-        getTaskResult,
-        downloadResult,
-        createCheckout,
-        getCheckoutStatus,
-        reconcileCheckout,
-        getCreditHistory,
-        getPaymentHistory
-      },
-      children
-    }
-  );
+  const contextValue = reactExports.useMemo(() => ({
+    user,
+    credits,
+    isAuthenticated,
+    isLoading,
+    deviceFlowStatus,
+    userCode,
+    verificationUrl,
+    authError,
+    login,
+    logout,
+    cancelLogin,
+    refreshCredits,
+    convertFile,
+    getTasks,
+    getTaskById,
+    getTaskPages,
+    cancelTask,
+    retryTask,
+    deleteTask,
+    retryPage,
+    getTaskResult,
+    downloadResult,
+    createCheckout,
+    getCheckoutStatus,
+    reconcileCheckout,
+    getCreditHistory,
+    getPaymentHistory
+  }), [
+    user,
+    credits,
+    isAuthenticated,
+    isLoading,
+    deviceFlowStatus,
+    userCode,
+    verificationUrl,
+    authError,
+    login,
+    logout,
+    cancelLogin,
+    refreshCredits,
+    convertFile,
+    getTasks,
+    getTaskById,
+    getTaskPages,
+    cancelTask,
+    retryTask,
+    deleteTask,
+    retryPage,
+    getTaskResult,
+    downloadResult,
+    createCheckout,
+    getCheckoutStatus,
+    reconcileCheckout,
+    getCreditHistory,
+    getPaymentHistory
+  ]);
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(CloudContext.Provider, { value: contextValue, children });
 };
 clientExports.createRoot(document.getElementById("root")).render(
   /* @__PURE__ */ jsxRuntimeExports.jsx(reactExports.StrictMode, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(CloudProvider, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(App, {}) }) })

package/dist/renderer/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MarkPDFdown</title>
-    <script type="module" crossorigin src="./assets/index-BDl2RVlc.js"></script>
+    <script type="module" crossorigin src="./assets/index-CG2nvY4Z.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-DXcyx2Q8.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markpdfdown",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.",
   "author": "MarkPDFdown",
   "main": "dist/main/index.js",