功能实现，但是存在缺陷(当订阅数多的时候会卡顿)

Author: coder163

README.md

@@ -1,6 +1,3 @@
-
-
-
 ## 缓存目录
 
 Linux: $XDG_CACHE_HOME or ~/.cache/electron/
@@ -29,19 +26,6 @@ npm install electron-rebuild --save .\node_modules\.bin\electron-rebuild.cmd
 
 
 
-## TODO
-
-1. 文章内容显示还会出现滚动条(横向)，很难排查具体是什么元素撑开的(文章的样式还待优化)
-
-2. 新增订阅
-
-3. 收藏订阅、文章
-   
-4. 取消订阅 
- 
-5. 文章数据的存储策略
-
-6. 以绝对路径替换 img 标签，在后期移动整个目录会导致图片无法使用
 
 ## 错误记录
 

config/articles.db

@@ -1,3 +1,3 @@
 provider: generic
-url: http://127.0.0.1:10086/public
+url: https://coder163.com/rss-reader
 updaterCacheDirName: cache

config/dev-app-update.yml

@@ -6,8 +6,8 @@
   "publish": [
     {
       "provider": "generic",
-      "url": "http://127.0.0.1:10086/public",
-      //更新服务器地址,可为空
+      "url": "https://coder163.com/rss-reader",
+
     }
   ],
 //  "publish": {
@@ -19,7 +19,7 @@
   "appId": "com.coder163",
   "productName": "猿阅",//项目名，也是生成的安装文件名，即aDemo.exe
   "copyright": "Copyright © 2022",//版权信息
-  "asar": true,
+  "asar": false,
   "directories": {
     "output": "release/${version}"
   },
@@ -62,5 +62,6 @@
     "perMachine": false,
     "allowToChangeInstallationDirectory": true,
     "deleteAppDataOnUninstall": false,
+
   }
 }

electron-builder.json5

@@ -1,6 +1,6 @@
-import {app, BrowserWindow, globalShortcut, ipcMain, protocol, shell} from 'electron'
-import {release} from 'os'
-import {join} from 'path'
+import { app, BrowserWindow, globalShortcut, ipcMain, protocol, shell } from 'electron'
+import { release } from 'os'
+import { join } from 'path'
 import Update from "../update";
 
 
@@ -28,17 +28,19 @@ export const ROOT_PATH = {
 let win: BrowserWindow | null = null
 // Here, you can also use other preload
 const preload = join(__dirname, '../preload/index.js')
+log.info(preload)
 // 🚧 Use ['ENV_NAME'] avoid vite:define plugin
 const url = `http://${process.env['VITE_DEV_SERVER_HOST']}:${process.env['VITE_DEV_SERVER_PORT']}`
 const indexHtml = join(ROOT_PATH.dist, 'index.html')
-
+// 禁用当前应用程序的硬件加速
+app.disableHardwareAcceleration()
 async function createWindow() {
     win = new BrowserWindow({
         height: 800,
         width: 1200,
-        frame: false,//添加这一行采用无边框窗口
+        // frame: false,//添加这一行采用无边框窗口
         icon: join(ROOT_PATH.public, 'favicon.ico'),
-        transparent:false,//透明 为true会影响页面缩放
+        transparent: false,//透明 为true会影响页面缩放
         resizable: true,//可否缩放 为false会影响页面缩放
         movable: true,//可否移动 为false会影响页面缩放
         webPreferences: {
@@ -56,10 +58,10 @@ async function createWindow() {
         win?.webContents.send('key-event-l')
     })
     win.on('maximize', () => {
-        win.webContents.send('WINDOW_MAXIMIZE',true)
+        win.webContents.send('WINDOW_MAXIMIZE', true)
     })
     win.on('unmaximize', () => {
-        win.webContents.send('WINDOW_MAXIMIZE',false)
+        win.webContents.send('WINDOW_MAXIMIZE', false)
     })
 
     // win.setMenu(null)
@@ -79,9 +81,9 @@ async function createWindow() {
     })
 
     // Make all links open with the browser, not with the application
-    win.webContents.setWindowOpenHandler(({url}) => {
+    win.webContents.setWindowOpenHandler(({ url }) => {
         if (url.startsWith('https:')) shell.openExternal(url)
-        return {action: 'deny'}
+        return { action: 'deny' }
     })
     //引用本地图片问题https://blog.csdn.net/Takayamaaren/article/details/107289994
     protocol.interceptFileProtocol('file', (req, callback) => {
@@ -132,17 +134,18 @@ ipcMain.handle('open-win', (event, arg) => {
     })
 
     if (app.isPackaged) {
-        childWindow.loadFile(indexHtml, {hash: arg})
+        childWindow.loadFile(indexHtml, { hash: arg })
     } else {
         childWindow.loadURL(`${url}/#${arg}`)
         // childWindow.webContents.openDevTools({ mode: "undocked", activate: true })
     }
 })
 
 
-ipcMain.on("read-content", (event, url) => {
+ipcMain.on("read-content", (event, item) => {
+    console.log(item)
     //通知content.vue渲染
-    win?.webContents.send('read-content-done', url)
+    win?.webContents.send('read-content-done', item)
 })
 ipcMain.on("update-item-list", (event, ...args) => {
 
@@ -155,7 +158,7 @@ ipcMain.on('refresh-sub-list', (event, url) => {
     win?.webContents.send('refresh-sub-list-done')
 })
 // @ts-ignore
-import {ChannelMessage} from "../../src/domain/enum"
+import { ChannelMessage } from "../../src/domain/enum"
 
 ipcMain.on(ChannelMessage.WINDOW_OPERATION, (event, operation) => {
     switch (operation) {
@@ -178,31 +181,31 @@ ipcMain.on(ChannelMessage.WINDOW_OPERATION, (event, operation) => {
 /**
  * 菜单-更新检查
  */
-ipcMain.on(ChannelMessage.CHECK_UPDATES,()=>{
-    const path = require("path")
-    //测试环境下使用自动更新
-    Object.defineProperty(app,"isPackaged",{
-      get(){
-        return true
-      }
-    })
-    if (app.isPackaged) {
-      autoUpdater.updateConfigPath = path.join(__dirname, '../../../config/dev-app-update.yml');
-    }
+ipcMain.on(ChannelMessage.CHECK_UPDATES, () => {
+    // const path = require("path")
+    // //测试环境下使用自动更新
+    // Object.defineProperty(app,"isPackaged",{
+    //   get(){
+    //     return true
+    //   }
+    // })
+    // if (app.isPackaged) {
+    //   autoUpdater.updateConfigPath = path.join(__dirname, '../../../config/dev-app-update.yml');
+    // }
 
     autoUpdater.checkForUpdatesAndNotify()
 
 })
 
 import log from './../../src/util/log'
-import {autoUpdater} from "electron-updater";
+import { autoUpdater } from "electron-updater";
 /**
  * 菜单-应用设置
  */
-ipcMain.on(ChannelMessage.APP_SETTINGS_DIALOG,()=>{
+ipcMain.on(ChannelMessage.APP_SETTINGS_DIALOG, () => {
 
-  win.webContents.send(ChannelMessage.APP_SETTINGS_DIALOG_DONE)
+    win.webContents.send(ChannelMessage.APP_SETTINGS_DIALOG_DONE)
 })
-ipcMain.on('open-dev-tool',()=>{
+ipcMain.on('open-dev-tool', () => {
     win.webContents.openDevTools()
 })

electron/main/index.ts

@@ -1,28 +1,28 @@
 function domReady(condition: DocumentReadyState[] = ['complete', 'interactive']) {
-  return new Promise(resolve => {
-    if (condition.includes(document.readyState)) {
-      resolve(true)
-    } else {
-      document.addEventListener('readystatechange', () => {
+    return new Promise(resolve => {
         if (condition.includes(document.readyState)) {
-          resolve(true)
+            resolve(true)
+        } else {
+            document.addEventListener('readystatechange', () => {
+                if (condition.includes(document.readyState)) {
+                    resolve(true)
+                }
+            })
         }
-      })
-    }
-  })
+    })
 }
 
 const safeDOM = {
-  append(parent: HTMLElement, child: HTMLElement) {
-    if (!Array.from(parent.children).find(e => e === child)) {
-      return parent.appendChild(child)
-    }
-  },
-  remove(parent: HTMLElement, child: HTMLElement) {
-    if (Array.from(parent.children).find(e => e === child)) {
-      return parent.removeChild(child)
-    }
-  },
+    append(parent: HTMLElement, child: HTMLElement) {
+        if (!Array.from(parent.children).find(e => e === child)) {
+            return parent.appendChild(child)
+        }
+    },
+    remove(parent: HTMLElement, child: HTMLElement) {
+        if (Array.from(parent.children).find(e => e === child)) {
+            return parent.removeChild(child)
+        }
+    },
 }
 
 /**
@@ -32,10 +32,10 @@ const safeDOM = {
  * https://matejkustec.github.io/SpinThatShit
  */
 function useLoading() {
-  const className = `loading`
-  const styleContent = `
+    const className = `loading`
+    const styleContent = `
   body {
-
+    background: #ecf0f6;
     text-align: center;
     padding: 20%;
   }
@@ -83,39 +83,39 @@ function useLoading() {
   }
 }
     `
-  const oStyle = document.createElement('style')
-  const oDiv = document.createElement('div')
+    const oStyle = document.createElement('style')
+    const oDiv = document.createElement('div')
 
-  oStyle.id = 'app-loading-style'
-  oStyle.innerHTML = styleContent
-  oDiv.className = className
-  oDiv.innerHTML = `
+    oStyle.id = 'app-loading-style'
+    oStyle.innerHTML = styleContent
+    oDiv.className = className
+    oDiv.innerHTML = `
   <h4>正在努力加载,请稍后</h4>
   <span></span> <span></span> <span></span>
   <span></span> <span></span> <span></span>
   <span></span> <span></span> <span></span>
  `
 
-  return {
-    appendLoading() {
-      safeDOM.append(document.head, oStyle)
-      safeDOM.append(document.body, oDiv)
-    },
-    removeLoading() {
-      safeDOM.remove(document.head, oStyle)
-      safeDOM.remove(document.body, oDiv)
-    },
-  }
+    return {
+        appendLoading() {
+            safeDOM.append(document.head, oStyle)
+            safeDOM.append(document.body, oDiv)
+        },
+        removeLoading() {
+            safeDOM.remove(document.head, oStyle)
+            safeDOM.remove(document.body, oDiv)
+        },
+    }
 }
 
 // ----------------------------------------------------------------------
 
-const { appendLoading, removeLoading } = useLoading()
+const {appendLoading, removeLoading} = useLoading()
 domReady().then(appendLoading)
 
 window.onmessage = ev => {
 
-  ev.data.payload === 'removeLoading' && removeLoading()
+    ev.data.payload === 'removeLoading' && removeLoading()
 }
 
 // setTimeout(removeLoading, 10)

electron/preload/index.ts

@@ -16,14 +16,15 @@ function Message(mainWindow: BrowserWindow, type: Number, data?: any) {
     }
     mainWindow.webContents.send('UpdateMsg', senddata)
 }
-
+const path=require('path')
 // 更新应用的方法
 export default (mainWindow: BrowserWindow) => {
     // log.info('%cRed text. %cGreen text', 'color: red', 'color: green')
     // 在下载之前将autoUpdater的autoDownload属性设置成false，通过渲染进程触发主进程事件来实现这一设置(将自动更新设置成false)
     autoUpdater.autoDownload = false
     //设置版本更新地址，即将打包后的latest.yml文件和exe文件同时放在
     // autoUpdater.setFeedURL('http://localhost:10086/public')
+
     // 当更新发生错误的时候触发。
     autoUpdater.on('error', (err: any) => {
         log.log(err)
@@ -46,7 +47,7 @@ export default (mainWindow: BrowserWindow) => {
     })
     // 下载监听
     autoUpdater.on('download-progress', (progressObj: any) => {
-        log.log('download-progress', '下载监听', progressObj)
+        log.log('download-progress', '下载监听')
         Message(mainWindow, 3, progressObj)
     })
     // 下载完成

electron/update/index.ts

@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="UTF-8" />
-  <link rel="icon" href="/favicon.ico" />
+  <link rel="icon" href="/logox32.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
   <title>猿阅</title>

favicon.ico

@@ -7,7 +7,8 @@
   "private": true,
   "scripts": {
     "dev": " vite",
-    "build": " vite build && electron-builder"
+    "build": " vite build && electron-builder",
+    "release": "cross-env GH_TOKEN=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 electron-builder"
   },
   "engines": {
     "node": ">=14.17.0"
@@ -16,6 +17,7 @@
     "@quasar/vite-plugin": "^1.0.10",
     "@types/request": "^2.48.8",
     "@vitejs/plugin-vue": "^2.3.3",
+    "axios": "^0.27.2",
     "electron": "^19.0.8",
     "electron-builder": "^23.1.0",
     "highlight.js": "^11.6.0",
@@ -38,7 +40,6 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.14.3",
-    "axios": "^0.27.2",
     "cheerio": "^1.0.0-rc.12",
     "download": "^8.0.0",
     "electron-log": "^4.4.8",
@@ -49,5 +50,4 @@
     "request": "^2.88.2",
     "sqlite3": "^5.0.9"
   }
-
 }