feat(desktop): fallback readability if server error

Innei · Innei · commit e6aa58e25e62 · 2025-04-28T23:31:42.000+08:00
- Added '@follow-app/readability' to the project and updated its import paths.
- Removed the obsolete readability utility from internal utils.
- Updated pnpm-lock.yaml to reflect new dependencies, including '@mozilla/readability' and adjustments to optional dependencies.
- Modified package.json files to include new dependencies and ensure proper workspace linking.

Signed-off-by: Innei &lt;tukon479@gmail.com&gt;
diff --git a/apps/desktop/layer/main/package.json b/apps/desktop/layer/main/package.json
@@ -25,6 +25,7 @@
     "@electron-toolkit/preload": "3.0.2",
     "@electron-toolkit/utils": "4.0.0",
     "@eneris/push-receiver": "4.3.0",
+    "@follow-app/readability": "workspace:*",
     "@follow/shared": "workspace:*",
     "@follow/utils": "workspace:*",
     "@openpanel/web": "1.0.1",
diff --git a/apps/desktop/layer/main/src/tipc/reader.ts b/apps/desktop/layer/main/src/tipc/reader.ts
@@ -2,7 +2,7 @@ import fs from "node:fs"
 import path from "node:path"
 
 import { callWindowExpose } from "@follow/shared/bridge"
-import { readability } from "@follow/utils/readability"
+import { readability } from "@follow-app/readability"
 import { app, BrowserWindow } from "electron"
 import { MsEdgeTTS, OUTPUT_FORMAT } from "msedge-tts"
 import type { ModelResult } from "vscode-languagedetection"
diff --git a/apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx b/apps/desktop/layer/renderer/src/hooks/biz/useEntryActions.tsx
@@ -18,6 +18,7 @@ import { useShowSourceContent } from "~/atoms/source-content"
 import { useUserRole, whoami } from "~/atoms/user"
 import { shortcuts } from "~/constants/shortcuts"
 import { apiClient } from "~/lib/api-fetch"
+import { tipcClient } from "~/lib/client"
 import { COMMAND_ID } from "~/modules/command/commands/id"
 import { getCommand, useRunCommandFn } from "~/modules/command/hooks/use-command"
 import type { FollowCommandId } from "~/modules/command/types"
@@ -57,9 +58,19 @@ export const toggleEntryReadability = async ({ id, url }: { id: string; url: str
         })
       }
     } catch {
-      setReadabilityStatus({
-        [id]: ReadabilityStatus.FAILURE,
-      })
+      const result = await tipcClient?.readability({ url })
+      if (result) {
+        setReadabilityContent({
+          [id]: result,
+        })
+        setReadabilityStatus({
+          [id]: ReadabilityStatus.SUCCESS,
+        })
+      } else {
+        setReadabilityStatus({
+          [id]: ReadabilityStatus.FAILURE,
+        })
+      }
     }
   } else {
     setReadabilityStatus({
diff --git a/packages/internal/utils/src/readability.ts b/packages/internal/utils/src/readability.ts
diff --git a/packages/readability/package.json b/packages/readability/package.json
@@ -12,11 +12,11 @@
   },
   "devDependencies": {
     "@follow/configs": "workspace:*",
+    "@mozilla/readability": "0.6.0",
     "chardet": "2.1.0",
     "dompurify": "3.2.5",
     "linkedom": "0.18.10",
     "nbump": "2.1.2",
-    "readability": "0.1.0",
     "tsup": "8.4.0"
   },
   "publishConfig": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
