更新默认设置;更新规则;规则加载失败时使用内置规则

package.json

@@ -1,15 +1,15 @@
 {
   "name": "magnetw",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "磁力链接聚合搜索",
   "license": "GNU General Public License v3.0",
   "main": "./dist/electron/main.js",
   "scripts": {
-    "build": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder --platform=all",
+    "build": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder -mwl",
     "build:dir": "cross-env BUILD_TARGET=electronnode .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
-    "build:mac": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder --platform=mac",
-    "build:win": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder --platform=win",
+    "build:mac": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder --mac",
+    "build:win": "cross-env BUILD_TARGET=electron node .electron-vue/build.js && electron-builder --win",
     "build:service": "node scripts/build-service.js",
     "dev": "cross-env BUILD_TARGET=electron node .electron-vue/dev-runner.js",
     "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src",
@@ -85,6 +85,7 @@
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
     "socks-proxy-agent": "^4.0.2",
+    "tunnel": "0.0.6",
     "urijs": "^1.19.2",
     "vue": "^2.6.11",
     "vue-clipboard2": "^0.3.1",
@@ -116,8 +117,8 @@
     "del": "^3.0.0",
     "devtron": "^1.4.0",
     "electron": "^7.1.8",
-    "electron-builder": "^21.2.0",
-    "electron-debug": "^1.5.0",
+    "electron-builder": "^22.2.0",
+    "electron-debug": "^3.0.0",
     "electron-devtools-installer": "^2.2.4",
     "element-ui": "^2.13.0",
     "eslint": "^4.19.1",

rule.json

@@ -106,6 +106,7 @@
   {
     "id": "btdb",
     "name": " BTDB",
+    "proxy": true,
     "url": "https://btdb.io",
     "paths": {
       "time": "?s={k}&sort=time&page={p}",
@@ -124,7 +125,7 @@
   {
     "id": "btdiguo",
     "name": "BT目录",
-    "url": "https://www.btweb.xyz",
+    "url": "https://www.aixiazai.xyz",
     "paths": {
       "time": "/search-update/{k}/page-{p}.html",
       "size": "/search-size/{k}/page-{p}.html",
@@ -160,7 +161,7 @@
   {
     "id": "bthub",
     "name": "BThub",
-    "url": "https://bthub.site",
+    "url": "https://bthub.xyz",
     "paths": {
       "preset": "/main-search-kw-{k}-{p}.html",
       "size": "/main-search-kw-{k}-length-{p}.html",
@@ -194,6 +195,21 @@
       "hot": "./div[2]/span[5]/b[1]"
     }
   },
+  {
+    "id": "alibt",
+    "name": " 阿里BT",
+    "url": "https://alibt.pw",
+    "paths": {
+      "preset": "/zh-cn/s/{p}/{k}"
+    },
+    "xpath": {
+      "group": "//*[@id=\"wrapper\"]/ul/li",
+      "magnet": "./p[1]/a/@href",
+      "name": "./p[1]/a",
+      "size": "./p[2]/span[2]",
+      "date": "./p[2]/span[1]"
+    }
+  },
   {
     "id": "mag",
     "name": "MAG磁力站",
@@ -274,7 +290,7 @@
   {
     "id": "btfox",
     "name": " btfox",
-    "url": "http://www.btfox.biz",
+    "url": "http://www.btfox.in",
     "paths": {
       "time": "/s?wd={k}&sort=time&page={p}",
       "size": "/s?wd={k}&sort=length&page={p}",

scripts/merge-filter-db.js

@@ -42,4 +42,4 @@ function unique (arr) {
   return result
 }
 
-fs.writeFileSync('src/main/filter/keywords.txt', Buffer.from(uniqueWords.join('\n')).toString('base64'))
+fs.writeFileSync('static/keywords.txt', Buffer.from(uniqueWords.join('\n')).toString('base64'))

src/main/axios.js

@@ -1,5 +1,3 @@
-import {remote} from 'electron'
-
 const axios = require('axios')
 const tunnel = require('tunnel')
 const SocksProxyAgent = require('socks-proxy-agent')

src/main/defaultConfig.js

@@ -21,9 +21,9 @@ module.exports = function () {
     // 使用代理
     proxy: false,
     // http|socks5
-    proxyType: 'http',
+    proxyType: 'socks5',
     proxyHost: '127.0.0.1',
-    proxyPort: 1087,
+    proxyPort: 1080,
     // 是否启用预加载 启用后会预加载下一页和下一个源站
     preload: true,
     // 缓存过期时间

src/main/filter/filter.js

@@ -4,12 +4,15 @@ const fs = require('fs')
 const map = {}
 let load = false
 
+const isDev = process.env.NODE_ENV === 'development'
+
 async function loadFilterData () {
   if (load) {
     return
   }
   load = true
-  const original = Buffer.from(fs.readFileSync(path.resolve(__dirname, './keywords.txt'), 'utf-8'), 'base64')
+  const file = isDev ? path.resolve('static/keywords.txt') : path.resolve(__dirname, './static/keywords.txt')
+  const original = Buffer.from(fs.readFileSync(file, 'utf-8'), 'base64')
   const words = original.toString().split('\n')
   words.forEach((line) => {
     if (line) {

src/main/ipc.js

@@ -1,5 +1,4 @@
-// import fs from 'fs'
-
+const moment = require('moment')
 const logger = require('./logger')
 const path = require('path')
 const {ipcMain, app} = require('electron')
@@ -30,6 +29,12 @@ function getLocalConfig () {
 }
 
 function registerIPC (mainWindow) {
+  ipcMain.on('get-server-info', function (event) {
+    const configVariable = store.get('config_variable')
+    const newConfig = getConfig(configVariable)
+    event.sender.send('on-get-server-info', getServerInfo(), newConfig)
+  })
+
   ipcMain.on('window-max', function () {
     if (mainWindow.isMaximized()) {
       mainWindow.unmaximize()

src/main/middleware/response-template.js

@@ -13,10 +13,13 @@ module.exports = async (ctx, next) => {
       ctx.throw(ctx.status, ctx.message)
     }
   } catch (e) {
+    let message = e.message
     const statusCode = e.statusCode || 500
     console.error(statusCode, e.message)
     const maxLength = 100
-    const message = `${statusCode} - 请求异常，请查看日志`
+    if (statusCode !== 500) {
+      message = `${statusCode} - 请求源站异常，请查看日志`
+    }
     ctx.status = statusCode
     ctx.body = {
       success: false,

src/main/repository.js

@@ -251,16 +251,21 @@ function parseDetailDocument (document, expression) {
 async function loadRuleByURL () {
   const url = config.ruleUrl
   let rule
-  if (url.startsWith('http')) {
-    // 如果是网络文件
-    console.info('获取网络规则文件', url)
-    rule = await request(url, {timeout: 8000, json: true})
-  } else {
-    console.info('读取本地规则文件', url)
-    rule = JSON.parse(fs.readFileSync(url))
-  }
-  if (!Array.isArray(rule) || rule.length <= 0) {
-    throw new Error('规则格式不正确')
+  try {
+    if (url.startsWith('http')) {
+      // 如果是网络文件
+      console.info('获取网络规则文件', url)
+      rule = await request(url, {timeout: 8000, json: true})
+    } else {
+      console.info('读取本地规则文件', url)
+      rule = JSON.parse(fs.readFileSync(url))
+    }
+    if (!Array.isArray(rule) || rule.length <= 0) {
+      throw new Error('规则格式不正确')
+    }
+  } catch (e) {
+    console.error(e.message, '规则加载失败，将使用内置规则')
+    rule = require('../../rule.json')
   }
   cacheManager.set('rule_json', JSON.stringify(rule))
 

src/renderer/components/GuidePage.vue

@@ -10,6 +10,15 @@
       <span slot="title">{{title}}</span>
     </el-alert>
     <div class="guide-page-content">
+      <div class="guide-page-log" v-if="serverInfo">
+        <div>搜索服务已启动，启动模式：{{serverInfo.customServerPort?'自定义':'自动分配'}}，<span class="guide-page-log-success">{{serverInfo.local}}:{{serverInfo.port}}</span>
+        </div>
+        <div v-if="serverInfo.proxy">
+          代理已启用：<span class="guide-page-log-success">{{serverInfo.proxyType}}://{{serverInfo.proxyHost}}:{{serverInfo.proxyPort}}</span>，请在设置中“测试连接”检查代理是否可用
+        </div>
+        <div v-if="serverInfo.filterBare||serverInfo.filterEmpty">内容过滤已启用</div>
+        <div v-show="serverInfo.message" class="guide-page-log-error">{{serverInfo.message}}</div>
+      </div>
       <div v-for="it in $config.guide.content" class="guide-content">
         <span class="guide-title">{{it.title}}</span>
         <div class="guide-content-item" v-for="item in it.items">
@@ -23,18 +32,35 @@
 
 <script>
   import BrowserLink from './BrowserLink'
+  import {ipcRenderer} from 'electron'
 
   export default {
     props: ['message', 'type', 'title'],
     components: {
       BrowserLink
     },
     data () {
-      return {}
+      return {
+        serverInfo: null
+      }
     },
     computed: {},
     methods: {},
     created () {
+      // 接收设置刷新的通知
+      this.$on('global:event-config-refreshed', (config, oldConfig) => {
+        ipcRenderer.send('get-server-info')
+      })
+      ipcRenderer.on('on-get-server-info', (event, serverInfo, config) => {
+        if (serverInfo) {
+          const info = {}
+          Object.assign(info, serverInfo, config)
+          this.serverInfo = info
+        } else {
+          this.serverInfo = {message: '搜索服务启动失败，请查看日志'}
+        }
+      })
+      ipcRenderer.send('get-server-info')
     }
   }
 </script>
@@ -90,4 +116,17 @@
     color: $color-text-gray;
     font-size: $font-size;
   }
+
+  .guide-page-log {
+    color: $--color-text-primary;
+    line-height: 300%;
+  }
+
+  .guide-page-log-success {
+    color: $--color-success;
+  }
+
+  .guide-page-log-error {
+    color: $--color-danger;
+  }
 </style>

src/renderer/pages/Index.vue

@@ -31,12 +31,12 @@
               </div>
             </div>
             <!--搜索结果-->
+            <div class="search-items-message" v-if="page.originalCount">
+              搜索到{{page.originalCount}}条结果
+              <span v-show="getItemsCount>0">，已过滤{{getItemsCount}}条，如需显示请更改设置</span>
+            </div>
             <div ref="pagerSearchItems" class="pager-search-items" v-loading="loading.table">
               <div class="index-main-content" v-if="page.items">
-                <div class="search-items-message">
-                  搜索到{{page.originalCount}}条结果
-                  <span v-show="getItemsCount>0">，已过滤{{getItemsCount}}条，如需显示请更改设置</span>
-                </div>
                 <pager-items :items="page.items"
                              :emptyMessage="page.emptyMessage"
                              :keyword="page.current.keyword"
@@ -268,6 +268,8 @@
   .search-items-message {
     color: $--color-success;
     font-size: 14px;
+    line-height: 14px;
+    margin-top: 15px;
   }
 
 </style>

src/renderer/pages/Setting.vue

@@ -30,9 +30,7 @@
           const after = JSON.stringify(this.config)
           const local = JSON.stringify(this.localConfig)
           // 如果设置改变
-          if (after !== local) {
-            this.saveDisabled = false
-          }
+          this.saveDisabled = after === local
         },
         deep: true
       }