设置页面增加socks5选项;默认配置增加端口;

Author: xiandanin

.github/ISSUE_TEMPLATE/issue_template.md

@@ -13,7 +13,7 @@ assignees: ''
 #### 问题描述：
 
 
-#### 异常日志：
+#### 异常日志（上传文件到这里）：
 ```
 
 ```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "magnetw",
   "version": "3.1.0",
-  "appName": "磁力搜",
+  "appName": "magnetw",
   "description": "磁力链接聚合搜索",
   "license": "GNU General Public License v3.0",
   "main": "./dist/electron/main.js",
@@ -21,7 +21,7 @@
     "postinstall": "npm run lint:fix"
   },
   "build": {
-    "productName": "磁力搜 For magnetW",
+    "productName": "magnetW",
     "appId": "app.magnetw.desktop",
     "artifactName": "${name}-${version}-${os}.${ext}",
     "directories": {
@@ -83,6 +83,8 @@
     "moment": "^2.24.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
+    "socks5-http-client": "^1.0.4",
+    "socks5-https-client": "^1.2.1",
     "urijs": "^1.19.2",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",

scripts/build-service.js

@@ -5,26 +5,28 @@ const path = require('path')
 const fs = require('fs-extra')
 const Terser = require('terser')
 // 需要忽略的文件/文件夹
-const ignore = ['.DS_Store', 'service.js', 'index.js', 'index.dev.js', 'ipc.js', 'node_modules', 'electron-cache.js']
+const ignore = ['.DS_Store', 'service.js', 'index.js', 'index.dev.js', 'ipc.js', 'node_modules', 'electron-cache.js', 'menu.js']
 // 忽略压缩的文件
 const ignoreMinify = ['defaultConfig.js', 'process-config.js']
 
-const releases = 'build/releases/service'
+const releases = 'build/releases'
+if (!fs.existsSync(releases)) {
+  fs.mkdirsSync(releases)
+}
 
 // 源代码路径
 const source = 'src/main'
 const finder = require('findit2')(source)
 
 // 清空发布文件夹
-const releasesIgnore = ['package-lock.json', 'node_modules', 'package-lock.json']
+const releasesIgnore = ['package-lock.json', 'node_modules']
 const dir = fs.readdirSync(releases)
 dir.forEach((file) => {
   if (!isIgnore(file, releasesIgnore)) {
     fs.removeSync(`${releases}/${file}`)
   }
 })
 
-fs.copySync('package.json', `${releases}/package.json`)
 fs.copySync(`${source}/service.js`, `${releases}/index.js`)
 finder.on('file', function (file, stat, linkPath) {
   if (isIgnore(file)) {
@@ -46,6 +48,18 @@ finder.on('file', function (file, stat, linkPath) {
     // console.info('复制文件', file, target)
   }
 })
+// 生成package.json
+console.log('生成package.json')
+const json = require(path.resolve('package.json'))
+json.main = './index.js'
+json.scripts = {
+  'start': 'node index.js'
+}
+delete json.build
+delete json.appName
+delete json.description
+json.name = 'magnetw-service'
+fs.writeFileSync(path.resolve(releases, 'package.json'), JSON.stringify(json, '\t', 2))
 
 /**
  * 是否忽略此文件

src/main/api.js

@@ -81,7 +81,7 @@ async function reload (config, preload) {
 
 async function start (config, preload) {
   try {
-    const port = process.env.PORT || 9000
+    const port = config.port || 9000
     koaServer = app.listen(port)
 
     serverInfo = {

src/main/defaultConfig.js

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

src/main/ipc.js

@@ -6,6 +6,7 @@ const {ipcMain, app} = require('electron')
 const request = require('request-promise-native')
 const {reload, start, isStarting, getProxyNetworkInfo} = require('./api')
 const {defaultConfig, extractConfigVariable, getConfig} = require('./process-config')
+const is = require('electron-is')
 const Store = require('electron-store')
 const store = new Store()
 
@@ -76,6 +77,9 @@ function registerIPC (mainWindow) {
    * 检查更新
    */
   ipcMain.on('check-update', async (event) => {
+    if (is.dev()) {
+      return
+    }
     try {
       const response = await request({
         url: defaultConfig().checkUpdateURL,
@@ -107,8 +111,8 @@ function registerIPC (mainWindow) {
   /**
    * 获取网络信息
    */
-  ipcMain.on('get-network-info', async (event, proxy) => {
-    event.sender.send('on-get-network-info', await getProxyNetworkInfo(proxy))
+  ipcMain.on('get-network-info', async (event, config) => {
+    event.sender.send('on-get-network-info', await getProxyNetworkInfo(config))
   })
 }
 

src/main/logger.js

@@ -1,11 +1,12 @@
-import logger from 'electron-log'
-import moment from 'moment'
-import util from 'util'
+const logger = require('electron-log')
+const moment = require('moment')
+const util = require('util')
+const path = require('path')
 
 const level = process.env.NODE_ENV === 'development' ? 'debug' : 'silly'
 logger.transports.console.format = '[{y}-{m}-{d} {h}:{i}:{s}.{ms}] [{level}] {text}'
 logger.transports.console.level = level
-logger.transports.file.fileName = `${moment().format('YYYY-MM-DD')}.log`
+logger.transports.file.fileName = `${moment().format('YYYY-MM-DD_HH_mm')}.log`
 logger.transports.file.level = level
 
 const styles = {
@@ -57,13 +58,41 @@ logger.transports.console = (msg) => {
   if (messageLevel.id <= levels[level].id) {
     const time = moment(msg.date).format('YYYY-MM-DD HH:mm:ss.SSS')
     const color = messageLevel.color
-    const header = colorize(util.format('[%s][%s]', time, msg.level.toUpperCase()), color)
+    const stack = getStackInfo()
+    const header = colorize(util.format('[%s][%s][%s]', time, msg.level.toUpperCase(), `${stack.file}:${stack.line}`), color)
     const text = colorize(util.format(...msg.data), color)
     const message = util.format('%s %s', header, text)
+
     console.log(message)
   }
 }
 
+function getStackInfo () {
+  try {
+    const stackReg = /at\s+(.*)\s+\((.*):(\d*):(\d*)\)/i
+    const stackReg2 = /at\s+()(.*):(\d*):(\d*)/i
+    const stackList = (new Error()).stack.split('\n').slice(3)
+    const sp = stackReg.exec(stackList[1]) || stackReg2.exec(stackList[1])
+    const data = {}
+    if (sp && sp.length === 5) {
+      data.method = sp[1]
+      data.path = sp[2]
+      data.line = sp[3]
+      data.pos = sp[4]
+      data.file = path.basename(data.path)
+    }
+    return data
+  } catch (e) {
+    return {
+      method: '',
+      path: '',
+      line: '',
+      pos: '',
+      file: ''
+    }
+  }
+}
+
 console.error = logger.error
 console.warn = logger.warn
 console.info = logger.info

src/main/middleware/response-template.js

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

src/main/repository.js

@@ -58,7 +58,7 @@ function getRuleById (id) {
 
 async function requestDocument (url, clientHeaders) {
   const timeout = config.timeout || 10000
-  const proxyURL = config.proxy ? `http://${config.proxyHost}:${config.proxyPort}` : null
+  const proxyURL = getProxyURL(config)
 
   // header
   const uri = new URI(url)
@@ -259,22 +259,24 @@ async function getRule () {
   return rule
 }
 
-async function getProxyNetworkInfo (proxy) {
-  const proxyURL = proxy ? `http://${config.proxyHost}:${config.proxyPort}` : null
+function getProxyURL (newConfig) {
+  return newConfig.proxy ? `${newConfig.proxyType}://${newConfig.proxyHost}:${newConfig.proxyPort}` : null
+}
+
+async function getProxyNetworkInfo (config) {
+  let proxyURL = getProxyURL(config)
   const ipOptions = {url: 'https://gip.dog', proxy: proxyURL, timeout: 5000, headers: {'User-Agent': 'curl'}}
   const googleOptions = {url: 'https://www.google.com', proxy: proxyURL, timeout: 5000}
-  // console.info(ipOptions, googleOptions)
-  let info
-  try {
-    info = await request(ipOptions)
-  } catch (e) {
-    console.error(e)
-  }
+  console.info('测试代理', proxyURL)
   let googleTest = false
+  let info
   const start = Date.now()
   try {
     const google = await request(googleOptions)
+    console.log(google)
     googleTest = google.length > 0
+    info = await request(ipOptions)
+    console.log(info)
   } catch (e) {
     console.error(e.message)
   }

src/renderer/components/BrowserLink.vue

@@ -30,7 +30,9 @@
     },
     methods: {
       handleClickLink () {
-        shell.openExternal(this.href)
+        if (this.href) {
+          shell.openExternal(this.href)
+        }
       }
     }
   }
@@ -47,7 +49,7 @@
   }
 
   .browser-link-empty, .browser-link-empty:hover {
-    color: $--color-text-primary;
+    color: $--color-text-primary !important;
     cursor: inherit;
   }
 </style>