From 55d6894fd6525c5b8bacd0e68e452ccd91b979d5 Mon Sep 17 00:00:00 2001
From: zhiwei liu <44311483+baicie@users.noreply.github.com>
Date: Tue, 9 Jan 2024 22:25:43 +0800
Subject: [PATCH] fix: epub parse & add useproce (#13)

---
 .../client/modules/common-reader/main.vue     |   5 +-
 .../modules/common-reader/use-reader.ts       |   2 +
 packages/epub/src/index.ts                    |  48 ++---
 packages/extension/src/book-parse/epub.ts     |  22 +--
 packages/extension/src/message.ts             |  61 +++---
 packages/extension/src/receive-message.ts     | 175 +++++++++++++-----
 packages/extension/src/utils/read-file.ts     |   5 +-
 7 files changed, 194 insertions(+), 124 deletions(-)

diff --git a/packages/client/modules/common-reader/main.vue b/packages/client/modules/common-reader/main.vue
index 4edc0c8..2220f25 100644
--- a/packages/client/modules/common-reader/main.vue
+++ b/packages/client/modules/common-reader/main.vue
@@ -1,9 +1,8 @@
 <script lang='ts' setup>
+import type { SearchOnlineResult } from '@b-reader/utils'
 import { ConfigProvider, Layout, LayoutContent, LayoutSider, Tree } from 'ant-design-vue'
 import type { DataNode, EventDataNode, TreeProps } from 'ant-design-vue/es/tree'
-import { computed, onBeforeMount, reactive } from 'vue'
-import type { SearchOnlineResult } from '@b-reader/utils'
-import { useThrottleFn } from '@vueuse/core'
+import { computed, onBeforeMount } from 'vue'
 import { locale, theme } from '../../src/theme'
 import { useCommonReader } from './use-reader'
 
diff --git a/packages/client/modules/common-reader/use-reader.ts b/packages/client/modules/common-reader/use-reader.ts
index df9d0e2..5f33b66 100644
--- a/packages/client/modules/common-reader/use-reader.ts
+++ b/packages/client/modules/common-reader/use-reader.ts
@@ -49,6 +49,8 @@ export function useCommonReader() {
               title: state.navs[0].name,
             },
           })
+          // eslint-disable-next-line no-console
+          console.log('navs', state.navs)
           break
         case 'reader:common:content:res': {
           const { path, content, scroll, title } = data.data
diff --git a/packages/epub/src/index.ts b/packages/epub/src/index.ts
index 2859772..e07140f 100644
--- a/packages/epub/src/index.ts
+++ b/packages/epub/src/index.ts
@@ -114,36 +114,28 @@ export class Epub {
   }
 
   private async parseConent(options?: ParserOptions) {
-    try {
-      for (const item of this.spine ?? []) {
-        const manifest = this.manifest?.find(manifest => manifest.id === item.idref)
-        if (manifest && manifest.href) {
-          const filePath = resolveId(this.fullPath, manifest?.href)
-          const content = await this.usezip.fileFileContent(filePath)
-          const xml = await this.usexml.parse(content, {
-            preserveChildrenOrder: true,
-            explicitChildren: true,
-            ...options,
-          })
-          if (!xml)
-            continue
-          this.traverseImages(xml, filePath).then(() => {
-            const temp = expandedData(xml)
-            const result = {
-              id: manifest.href,
-              content: temp,
-            }
-            this.content.push(result)
-          }).catch((error) => {
-            console.error('traverseImages error', error)
-          })
+    for (const item of this.spine ?? []) {
+      const manifest = this.manifest?.find(manifest => manifest.id === item.idref)
+      if (manifest && manifest.href) {
+        const filePath = resolveId(this.fullPath, manifest?.href)
+        const content = await this.usezip.fileFileContent(filePath)
+        const xml = await this.usexml.parse(content, {
+          preserveChildrenOrder: true,
+          explicitChildren: true,
+          ...options,
+        })
+
+        if (!xml)
+          continue
+        await this.traverseImages(xml, filePath)
+        const temp = expandedData(xml)
+        const result = {
+          id: manifest.href,
+          content: temp,
         }
+        this.content.push(result)
       }
     }
-    catch (error) {
-      // eslint-disable-next-line no-console
-      console.log('parseConent error', error)
-    }
   }
 
   private async traverseImages(node: any, importer = this.fullPath) {
@@ -169,7 +161,7 @@ export class Epub {
   }
 
   // 将 img 标签中的图片转换为 base64
-  private async updateImageToBase64(imgNode, importer: string = this.fullPath) {
+  private async updateImageToBase64(imgNode: any, importer: string = this.fullPath) {
     if (imgNode && imgNode[0] && imgNode[0].$ && (imgNode[0].$.src || imgNode[0].$['xlink:href']) && !imgNode[0].$.base64) {
       const imageFilePath = resolveId(importer, imgNode[0].$.src || imgNode[0].$['xlink:href'])
       try {
diff --git a/packages/extension/src/book-parse/epub.ts b/packages/extension/src/book-parse/epub.ts
index 3fc361a..0a6314a 100644
--- a/packages/extension/src/book-parse/epub.ts
+++ b/packages/extension/src/book-parse/epub.ts
@@ -11,21 +11,15 @@ export async function parseEpub(
   config: BReaderContext,
   bookCache: BookCache,
 ) {
-  try {
-    const { config: bookConfig } = book
-    const epub = new Epub(bookConfig.path)
-    await epub.parse()
+  const { config: bookConfig } = book
+  const epub = new Epub(bookConfig.path)
+  await epub.parse()
 
-    // cache
-    // 先去json中找，如果没有再去epub 实例中找
-    // 意味着每次都要构建一个epub实例
-    bookCache[book.md5] = epub
-    cacheBook(book, config, epub)
-  }
-  catch (error) {
-    // eslint-disable-next-line no-console
-    console.log('parseEpub error', error)
-  }
+  // cache
+  // 先去json中找，如果没有再去epub 实例中找
+  // 意味着每次都要构建一个epub实例
+  bookCache[book.md5] = epub
+  cacheBook(book, config, epub)
 }
 
 async function cacheBook(
diff --git a/packages/extension/src/message.ts b/packages/extension/src/message.ts
index e1e5da4..8fe03d4 100644
--- a/packages/extension/src/message.ts
+++ b/packages/extension/src/message.ts
@@ -7,9 +7,16 @@ export function useMessage() {
     window.showInformationMessage(message)
   }
 
-  function berror(message: string) {
+  function berror(err: Error | string) {
+    let message = ''
+    if (err instanceof Error)
+      message = `${err.message}\n${err.stack}`
+
+    else
+      message = err
+
     window.showErrorMessage(message)
-    error(message)
+    error(err)
   }
 
   function bwarn(message: string) {
@@ -23,39 +30,35 @@ export function useMessage() {
   }
 }
 
-export function useProgress(title?: string) {
-  const options: ProgressOptions = {
-    location: ProgressLocation.Notification,
-    title: title ?? 'B-Reader',
+export function useProgress(options: ProgressOptions = {
+  location: ProgressLocation.Notification,
+}) {
+  let isStop = false
+  const _options: ProgressOptions = {
+    ...options,
+    title: 'Loading...',
   }
 
-  function start(message: string) {
-    window.withProgress(
-      {
-        location: 15,
-        title: message,
-        cancellable: true,
-      },
-      (progress, token) => {
-        token.onCancellationRequested(() => {
-          // eslint-disable-next-line no-console
-          console.log('User canceled the long running operation')
-        })
-
-        progress.report({ increment: 0 })
-
-        return new Promise<void>((resolve) => {
-          setTimeout(() => {
-            resolve()
-          }, 1000)
-        })
-      },
-    )
+  function start(message?: string) {
+    isStop = false
+    if (message)
+      _options.title = message
+    window.withProgress(_options, async () => {
+      await new Promise((resolve) => {
+        setInterval(() => {
+          if (isStop)
+            resolve(1)
+        }, 100)
+      })
+    })
   }
 
-  function stop() {}
+  function stop() {
+    isStop = true
+  }
 
   return {
     start,
+    stop,
   }
 }
diff --git a/packages/extension/src/receive-message.ts b/packages/extension/src/receive-message.ts
index 912fa74..7bbe854 100644
--- a/packages/extension/src/receive-message.ts
+++ b/packages/extension/src/receive-message.ts
@@ -16,12 +16,13 @@ import { isEmpty } from 'lodash'
 import { parseBook } from './book-parse'
 import { Commands, StoreKeys } from './config'
 import { useDatabase } from './db'
-import { useMessage } from './message'
+import { useMessage, useProgress } from './message'
 import { getCacheBook } from './utils/book'
 import { writeBook, writeBookInfor } from './utils/read-file'
 import { sendMessage, sendMessageToAll } from './utils/send-message'
 
 const { berror } = useMessage()
+const { start, stop } = useProgress()
 
 export async function receiveMessage(
   webview: Webview,
@@ -65,7 +66,7 @@ export async function receiveMessage(
           receiveOnlieSearch(message.data, config, webview)
           break
         case 'online:read:req':
-          receiveOnlineReadReq(message.data)
+          receiveOnlineReadReq(message.data, config)
           break
         case 'online:add_bookshelf:req':
           receiveOnlineAddBookshelfReq(message.data, config)
@@ -85,6 +86,7 @@ export async function receiveMessage(
 
 async function receiveCommonReaderContent(book: MessageTypeOnlineContentReq['data'], config: BReaderContext, webview: Webview) {
   try {
+    start(`获取章节内容${book.title}`)
     const { getValue, setValue } = useDatabase(config)
     const cachePath = `${StoreKeys.cache}/${book.md5}`
     const cache = await getValue<any>(cachePath)
@@ -107,6 +109,7 @@ async function receiveCommonReaderContent(book: MessageTypeOnlineContentReq['dat
       scroll: book.scroll,
       title: book.title,
     })
+    stop()
   }
   catch (error) {
     berror(error)
@@ -114,89 +117,163 @@ async function receiveCommonReaderContent(book: MessageTypeOnlineContentReq['dat
 }
 
 async function receiveCommonReaderNav(book: Book, config: BReaderContext, webview: Webview) {
-  const { getValue, setValue } = useDatabase(config)
-  const cachePath = `${StoreKeys.cache}/${book.md5}`
-  const cache = await getValue<any>(cachePath)
-  let navs = cache?.navs
-  if (isEmpty(navs) || !navs) {
-    navs = await getChapter(config.biquge!, book.config.path)
-    await setValue(cachePath, {
-      ...cache,
-      navs,
-    })
-  }
+  try {
+    start(`获取目录${book.config.name}`)
+    const { getValue, setValue } = useDatabase(config)
+    const cachePath = `${StoreKeys.cache}/${book.md5}`
+    const cache = await getValue<any>(cachePath)
+    let navs = cache?.navs
+    if (isEmpty(navs) || !navs) {
+      navs = await getChapter(config.biquge!, book.config.path)
+      await setValue(cachePath, {
+        ...cache,
+        navs,
+      })
+    }
 
-  await sendMessage(webview, 'reader:common:get_nav:res', navs)
+    await sendMessage(webview, 'reader:common:get_nav:res', navs)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveNav(bookId: string, config: BReaderContext, webview: Webview) {
-  const { getValue } = useDatabase(config)
-  const cache = await getValue<Epub>(`${StoreKeys.cache}/${bookId}`)
-  await sendMessage(webview, 'snedNav', cache.nva)
+  try {
+    start('获取目录')
+    const { getValue } = useDatabase(config)
+    const cache = await getValue<Epub>(`${StoreKeys.cache}/${bookId}`)
+    await sendMessage(webview, 'snedNav', cache.nva)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveBook(book: BookConfig, config: BReaderContext) {
-  await writeBook(book, config)
-  await writeBookInfor(book, config)
-  const { getValue } = useDatabase(config)
-  const res = await getValue<Record<string, Book>>(StoreKeys.book)
-  await sendMessageToAll('bookself', 'bookInfor', res)
+  try {
+    start('下载中...')
+    await writeBook(book, config)
+    await writeBookInfor(book, config)
+    const { getValue } = useDatabase(config)
+    const res = await getValue<Record<string, Book>>(StoreKeys.book)
+    await sendMessageToAll('bookself', 'bookInfor', res)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveBookInfor(config: BReaderContext, webview: Webview) {
-  const { getValue } = useDatabase(config)
-  const res = await getValue<Record<string, Book>>(StoreKeys.book)
-  await sendMessage(webview, 'bookInfor', res)
+  try {
+    start('获取书架中...')
+    const { getValue } = useDatabase(config)
+    const res = await getValue<Record<string, Book>>(StoreKeys.book)
+    await sendMessage(webview, 'bookInfor', res)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function openWebview(data: string) {
-  await commands.executeCommand(`b-reader.local.${data}`, data)
+  try {
+    start('打开中...')
+    await commands.executeCommand(`b-reader.local.${data}`, data)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveOpenBook(bookId: string, config: BReaderContext) {
-  const bookinfo = await getCacheBook(bookId, config)
-  switch (bookinfo.config.type) {
-    case 'application/epub+zip':
-      await commands.executeCommand(Commands.openReader, bookinfo)
-      break
-    default:
-      await commands.executeCommand(Commands.openCommonReader, bookinfo)
-      break
+  try {
+    start('打开中...')
+    const bookinfo = await getCacheBook(bookId, config)
+    switch (bookinfo.config.type) {
+      case 'application/epub+zip':
+        await commands.executeCommand(Commands.openReader, bookinfo)
+        break
+      default:
+        await commands.executeCommand(Commands.openCommonReader, bookinfo)
+        break
+    }
+    stop()
+  }
+  catch (error) {
+    berror(error)
   }
 }
 
 // 获取章节内容
 async function receiveContent(data: MessageTypeGetContent['data'], config: BReaderContext, webview: Webview) {
-  const bookinfo = await getCacheBook(data.bookId, config)
-  const bookInstance = await parseBook(bookinfo, config)
-  const chapter = await bookInstance.getContent()
-  await sendMessage(webview, 'sendContent', chapter)
-  // cache
+  try {
+    start('获取章节内容')
+    const bookinfo = await getCacheBook(data.bookId, config)
+    const bookInstance = await parseBook(bookinfo, config)
+    const chapter = await bookInstance.getContent()
+    await sendMessage(webview, 'sendContent', chapter)
+    // cache
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveOnlieSearch(data: string, config: BReaderContext, webview: Webview) {
   try {
+    start('搜索中...')
     const res = await search(config.biquge!, data)
     await sendMessage(webview, 'online:search:res', res)
+    stop()
   }
   catch (error) {
     berror(error)
   }
 }
 
-async function receiveOnlineReadReq(data: SearchOnlineResult) {
-  await commands.executeCommand(Commands.openCommonReader, data)
+async function receiveOnlineReadReq(data: SearchOnlineResult, config: BReaderContext) {
+  try {
+    start('打开中...')
+    const book: BookConfig = {
+      ...data,
+      name: data.title,
+      path: data.path,
+      type: 'online/biquge',
+    }
+
+    const _book = await writeBookInfor(book, config, false)
+    await commands.executeCommand(Commands.openCommonReader, _book)
+    stop()
+  }
+  catch (error) {
+    berror(error)
+  }
 }
 
 async function receiveOnlineAddBookshelfReq(data: SearchOnlineResult, config: BReaderContext) {
-  const book: BookConfig = {
-    ...data,
-    name: data.title,
-    path: data.path,
-    type: 'online/biquge',
-  }
+  try {
+    start('添加中...')
+    const book: BookConfig = {
+      ...data,
+      name: data.title,
+      path: data.path,
+      type: 'online/biquge',
+    }
 
-  writeBookInfor(book, config).catch((error) => {
+    await writeBookInfor(book, config)
+    const { getValue } = useDatabase(config)
+    const res = await getValue<Record<string, Book>>(StoreKeys.book)
+    await sendMessageToAll('bookself', 'bookInfor', res)
+    stop()
+  }
+  catch (error) {
     berror(error)
-  })
+  }
 }
diff --git a/packages/extension/src/utils/read-file.ts b/packages/extension/src/utils/read-file.ts
index ab2d2dc..14d9a74 100644
--- a/packages/extension/src/utils/read-file.ts
+++ b/packages/extension/src/utils/read-file.ts
@@ -35,7 +35,7 @@ export async function writeBook(book: BookConfig, config: BReaderContext) {
   }
 }
 
-export async function writeBookInfor(book: BookConfig, config: BReaderContext) {
+export async function writeBookInfor(book: BookConfig, config: BReaderContext, save = true) {
   const { setValue, getValue } = useDatabase(config)
   const bookid = crypto.createHash('md5').update(book.path, 'utf-8').digest('hex')
   const _book: Book = {
@@ -48,6 +48,9 @@ export async function writeBookInfor(book: BookConfig, config: BReaderContext) {
   if (result && !_book.img)
     _book.img = await result.getCover?.() ?? ''
 
+  if (!save)
+    return _book
+
   const bookStore = await getValue<Record<string, Book>>(StoreKeys.book)
 
   bookStore[bookid] = _book