chore: bump version v1.6.10

fix: app style

.babelrc

@@ -2,19 +2,11 @@
   "comments": false,
   "env": {
     "main": {
-      "presets": [
-        ["env", {
-          "targets": { "node": 7 }
-        }],
-        "stage-0"
-      ]
+      "presets": ["@babel/preset-env"]
     },
     "renderer": {
       "presets": [
-        ["env", {
-          "modules": false
-        }],
-        "stage-0"
+        "@babel/preset-env"
       ],
       "plugins": [
         [
@@ -27,12 +19,7 @@
       ]
     },
     "web": {
-      "presets": [
-        ["env", {
-          "modules": false
-        }],
-        "stage-0"
-      ],
+      "presets": ["@babel/preset-env"],
       "plugins": [
         [
           "component",
@@ -44,5 +31,8 @@
       ]
     }
   },
-  "plugins": ["transform-runtime"]
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-transform-runtime"
+  ]
 }

.electron-vue/build.js

@@ -7,8 +7,7 @@ const chalk = require('chalk')
 const del = require('del')
 const { spawn } = require('child_process')
 const webpack = require('webpack')
-const Multispinner = require('multispinner')
-
+const Multispinner = require('@motrix/multispinner')
 
 const mainConfig = require('./webpack.main.config')
 const rendererConfig = require('./webpack.renderer.config')
@@ -19,12 +18,16 @@ const errorLog = chalk.bgRed.white(' ERROR ') + ' '
 const okayLog = chalk.bgBlue.white(' OKAY ') + ' '
 const isCI = process.env.CI || false
 
-if (process.env.BUILD_TARGET === 'clean') clean()
-else if (process.env.BUILD_TARGET === 'web') web()
-else build()
+if (process.env.BUILD_TARGET === 'clean') {
+  clean()
+} else if (process.env.BUILD_TARGET === 'web') {
+  web()
+} else {
+  build()
+}
 
 function clean () {
-  del.sync(['build/*', '!build/icons', '!build/icons/icon.*'])
+  del.sync(['release/*', '!.gitkeep'])
   console.log(`\n${doneLog}\n`)
   process.exit()
 }
@@ -74,8 +77,9 @@ function pack (config) {
   return new Promise((resolve, reject) => {
     config.mode = 'production'
     webpack(config, (err, stats) => {
-      if (err) reject(err.stack || err)
-      else if (stats.hasErrors()) {
+      if (err) {
+        reject(err.stack || err)
+      } else if (stats.hasErrors()) {
         let err = ''
 
         stats.toString({
@@ -129,4 +133,4 @@ function greeting () {
     })
   } else console.log(chalk.yellow.bold('\n  lets-build'))
   console.log()
-}
+}

.electron-vue/dev-runner.js

@@ -8,6 +8,7 @@ const { spawn } = require('child_process')
 const webpack = require('webpack')
 const WebpackDevServer = require('webpack-dev-server')
 const webpackHotMiddleware = require('webpack-hot-middleware')
+const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 const mainConfig = require('./webpack.main.config')
 const rendererConfig = require('./webpack.renderer.config')
@@ -49,7 +50,7 @@ function startRenderer () {
     })
 
     compiler.hooks.compilation.tap('compilation', compilation => {
-      compilation.hooks.htmlWebpackPluginAfterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
+      HtmlWebpackPlugin.getHooks(compilation).afterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
         hotMiddleware.publish({ action: 'reload' })
         cb()
       })

.electron-vue/webpack.main.config.js

@@ -6,8 +6,8 @@ const devMode = process.env.NODE_ENV !== 'production'
 const path = require('path')
 const { dependencies, build } = require('../package.json')
 const webpack = require('webpack')
-
-const BabiliWebpackPlugin = require('babili-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin');
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 let mainConfig = {
   entry: {
@@ -18,17 +18,6 @@ let mainConfig = {
   ],
   module: {
     rules: [
-      {
-        test: /\.(js)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
-        use: {
-          loader: 'eslint-loader',
-          options: {
-            formatter: require('eslint-friendly-formatter')
-          }
-        }
-      },
       {
         test: /\.js$/,
         use: 'babel-loader',
@@ -50,7 +39,10 @@ let mainConfig = {
     path: path.join(__dirname, '../dist/electron')
   },
   plugins: [
-    new webpack.NoEmitOnErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin(),
+    new ESLintPlugin({
+      formatter: require('eslint-friendly-formatter')
+    })
   ],
   resolve: {
     alias: {
@@ -59,7 +51,15 @@ let mainConfig = {
     },
     extensions: ['.js', '.json', '.node']
   },
-  target: 'electron-main'
+  target: 'electron-main',
+  optimization: {
+    minimize: !devMode,
+    minimizer: [
+      new TerserPlugin({
+        extractComments: false,
+      })
+    ],
+  },
 }
 
 /**
@@ -79,7 +79,6 @@ if (devMode) {
  */
 if (!devMode) {
   mainConfig.plugins.push(
-    new BabiliWebpackPlugin(),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': '"production"',
       'appId': `"${build.appId}"`

.electron-vue/webpack.renderer.config.js

@@ -6,13 +6,13 @@ const devMode = process.env.NODE_ENV !== 'production'
 const path = require('path')
 const { dependencies } = require('../package.json')
 const webpack = require('webpack')
-
-const BabiliWebpackPlugin = require('babili-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const { VueLoaderPlugin } = require('vue-loader')
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 /**
  * List of node_modules to include in webpack bundle
@@ -24,7 +24,6 @@ const { VueLoaderPlugin } = require('vue-loader')
 let whiteListedModules = ['vue']
 
 let rendererConfig = {
-  devtool: '#cheap-module-eval-source-map',
   entry: {
     index: path.join(__dirname, '../src/renderer/pages/index/main.js')
   },
@@ -34,14 +33,10 @@ let rendererConfig = {
   module: {
     rules: [
       {
-        test: /\.(js|vue)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
+        test: /\.worker\.js$/,
         use: {
-          loader: 'eslint-loader',
-          options: {
-            formatter: require('eslint-friendly-formatter')
-          }
+          loader: 'worker-loader',
+          options: { filename: '[name].js' }
         }
       },
       {
@@ -52,8 +47,11 @@ let rendererConfig = {
           {
             loader: 'sass-loader',
             options: {
-              data: '@import "@/components/Theme/Variables.scss";',
-              includePaths:[__dirname, 'src']
+              implementation: require('sass'),
+              additionalData: '@import "@/components/Theme/Variables.scss";',
+              sassOptions: {
+                includePaths:[__dirname, 'src']
+              }
             },
           }
         ]
@@ -66,9 +64,12 @@ let rendererConfig = {
           {
             loader: 'sass-loader',
             options: {
+              implementation: require('sass'),
               indentedSyntax: true,
-              data: '@import "@/components/Theme/Variables.scss";',
-              includePaths:[__dirname, 'src']
+              additionalData: '@import "@/components/Theme/Variables.scss";',
+              sassOptions: {
+                includePaths:[__dirname, 'src']
+              }
             },
           }
         ]
@@ -88,10 +89,6 @@ let rendererConfig = {
           'css-loader'
         ]
       },
-      {
-        test: /\.html$/,
-        use: 'vue-html-loader'
-      },
       {
         test: /\.js$/,
         use: 'babel-loader',
@@ -119,7 +116,7 @@ let rendererConfig = {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         use: {
           loader: 'url-loader',
-          query: {
+          options: {
             limit: 10000,
             name: 'imgs/[name]--[folder].[ext]'
           }
@@ -137,7 +134,7 @@ let rendererConfig = {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         use: {
           loader: 'url-loader',
-          query: {
+          options: {
             limit: 10000,
             name: 'fonts/[name]--[folder].[ext]'
           }
@@ -155,12 +152,6 @@ let rendererConfig = {
       filename: '[name].css',
       chunkFilename: '[id].css'
     }),
-    new OptimizeCSSPlugin({
-      cssProcessorOptions: {
-        safe: true,
-        discardComments: { removeAll: true }
-      }
-    }),
     new HtmlWebpackPlugin({
       title: 'Motrix',
       filename: 'index.html',
@@ -171,17 +162,25 @@ let rendererConfig = {
       //   removeAttributeQuotes: true,
       //   removeComments: true
       // },
+      isBrowser: false,
+      isDev: process.env.NODE_ENV !== 'production',
       nodeModules: devMode
         ? path.resolve(__dirname, '../node_modules')
         : false
     }),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoEmitOnErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin(),
+    new ESLintPlugin({
+      extensions: ['js', 'vue'],
+      formatter: require('eslint-friendly-formatter')
+    })
   ],
   output: {
     filename: '[name].js',
     libraryTarget: 'commonjs2',
-    path: path.join(__dirname, '../dist/electron')
+    path: path.join(__dirname, '../dist/electron'),
+    globalObject: 'this',
+    publicPath: ''
   },
   resolve: {
     alias: {
@@ -191,13 +190,24 @@ let rendererConfig = {
     },
     extensions: ['.js', '.vue', '.json', '.css', '.node']
   },
-  target: 'electron-renderer'
+  target: 'electron-renderer',
+  optimization: {
+    minimize: !devMode,
+    minimizer: [
+      new TerserPlugin({
+        extractComments: false,
+      }),
+      new CssMinimizerPlugin(),
+    ],
+  },
 }
 
 /**
  * Adjust rendererConfig for development settings
  */
 if (devMode) {
+  rendererConfig.devtool = 'eval-cheap-module-source-map'
+
   rendererConfig.plugins.push(
     new webpack.DefinePlugin({
       '__static': `"${path.join(__dirname, '../static').replace(/\\/g, '\\\\')}"`
@@ -209,17 +219,14 @@ if (devMode) {
  * Adjust rendererConfig for production settings
  */
 if (!devMode) {
-  rendererConfig.devtool = ''
-
   rendererConfig.plugins.push(
-    new BabiliWebpackPlugin(),
-    new CopyWebpackPlugin([
-      {
+    new CopyWebpackPlugin({
+      patterns: [{
         from: path.join(__dirname, '../static'),
         to: path.join(__dirname, '../dist/electron/static'),
-        ignore: ['.*']
-      }
-    ]),
+        globOptions: { ignore: [ '.*' ] }
+      }]
+    }),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': '"production"'
     }),

.electron-vue/webpack.web.config.js

@@ -6,13 +6,13 @@ const devMode = process.env.NODE_ENV !== 'production'
 const path = require('path')
 const { dependencies } = require('../package.json')
 const webpack = require('webpack')
-
-const BabiliWebpackPlugin = require('babili-webpack-plugin')
+const TerserPlugin = require('terser-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
-const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const { VueLoaderPlugin } = require('vue-loader')
+const ESLintPlugin = require('eslint-webpack-plugin');
 
 /**
  * List of node_modules to include in webpack bundle
@@ -24,7 +24,6 @@ const { VueLoaderPlugin } = require('vue-loader')
 let whiteListedModules = ['vue']
 
 let webConfig = {
-  devtool: '#cheap-module-eval-source-map',
   entry: {
     index: path.join(__dirname, '../src/renderer/pages/index/main.js')
   },
@@ -34,14 +33,10 @@ let webConfig = {
   module: {
     rules: [
       {
-        test: /\.(js|vue)$/,
-        enforce: 'pre',
-        exclude: /node_modules/,
+        test: /\.worker\.js$/,
         use: {
-          loader: 'eslint-loader',
-          options: {
-            formatter: require('eslint-friendly-formatter')
-          }
+          loader: 'worker-loader',
+          options: { filename: '[name].js' }
         }
       },
       {
@@ -49,7 +44,16 @@ let webConfig = {
         use: [
           devMode ? 'vue-style-loader' : MiniCssExtractPlugin.loader,
           'css-loader',
-          'sass-loader'
+          {
+            loader: 'sass-loader',
+            options: {
+              implementation: require('sass'),
+              additionalData: '@import "@/components/Theme/Variables.scss";',
+              sassOptions: {
+                includePaths:[__dirname, 'src']
+              }
+            },
+          }
         ]
       },
       {
@@ -57,7 +61,17 @@ let webConfig = {
         use: [
           devMode ? 'vue-style-loader' : MiniCssExtractPlugin.loader,
           'css-loader',
-          'sass-loader?indentedSyntax'
+          {
+            loader: 'sass-loader',
+            options: {
+              implementation: require('sass'),
+              indentedSyntax: true,
+              additionalData: '@import "@/components/Theme/Variables.scss";',
+              sassOptions: {
+                includePaths:[__dirname, 'src']
+              }
+            },
+          }
         ]
       },
       {
@@ -99,7 +113,7 @@ let webConfig = {
         test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
         use: {
           loader: 'url-loader',
-          query: {
+          options: {
             limit: 10000,
             name: 'imgs/[name].[ext]'
           }
@@ -109,7 +123,7 @@ let webConfig = {
         test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
         use: {
           loader: 'url-loader',
-          query: {
+          options: {
             limit: 10000,
             name: 'fonts/[name].[ext]'
           }
@@ -123,12 +137,6 @@ let webConfig = {
       filename: '[name].css',
       chunkFilename: '[id].css'
     }),
-    new OptimizeCSSPlugin({
-      cssProcessorOptions: {
-        safe: true,
-        discardComments: { removeAll: true }
-      }
-    }),
     new HtmlWebpackPlugin({
       title: 'Motrix',
       filename: 'index.html',
@@ -139,6 +147,8 @@ let webConfig = {
       //   removeAttributeQuotes: true,
       //   removeComments: true
       // },
+      isBrowser: true,
+      isDev: process.env.NODE_ENV !== 'production',
       nodeModules: devMode
         ? path.resolve(__dirname, '../node_modules')
         : false
@@ -147,11 +157,17 @@ let webConfig = {
       'process.env.IS_WEB': 'true'
     }),
     new webpack.HotModuleReplacementPlugin(),
-    new webpack.NoEmitOnErrorsPlugin()
+    new webpack.NoEmitOnErrorsPlugin(),
+    new ESLintPlugin({
+      extensions: ['js', 'vue'],
+      formatter: require('eslint-friendly-formatter')
+    })
   ],
   output: {
     filename: '[name].js',
-    path: path.join(__dirname, '../dist/web')
+    path: path.join(__dirname, '../dist/web'),
+    globalObject: 'this',
+    publicPath: ''
   },
   resolve: {
     alias: {
@@ -161,24 +177,37 @@ let webConfig = {
     },
     extensions: ['.js', '.vue', '.json', '.css']
   },
-  target: 'web'
+  target: 'web',
+  optimization: {
+    minimize: !devMode,
+    minimizer: [
+      new TerserPlugin({
+        extractComments: false,
+      }),
+      new CssMinimizerPlugin(),
+    ],
+  },
+}
+
+/**
+ * Adjust webConfig for development settings
+ */
+if (devMode) {
+  webConfig.devtool = 'eval-cheap-module-source-map'
 }
 
 /**
  * Adjust webConfig for production settings
  */
 if (!devMode) {
-  webConfig.devtool = ''
-
   webConfig.plugins.push(
-    new BabiliWebpackPlugin(),
-    new CopyWebpackPlugin([
-      {
+    new CopyWebpackPlugin({
+      patterns: [{
         from: path.join(__dirname, '../static'),
-        to: path.join(__dirname, '../dist/web/static'),
-        ignore: ['.*']
-      }
-    ]),
+        to: path.join(__dirname, '../dist/electron/static'),
+        globOptions: { ignore: [ '.*' ] }
+      }]
+    }),
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': '"production"'
     }),

.eslintignore

@@ -0,0 +1,7 @@
+src/renderer/components/Icons/*.js
+
+src/shared/locales/*
+!src/shared/locales/all.js
+!src/shared/locales/app.js
+!src/shared/locales/index.js
+!src/shared/locales/LocalManager.js

.eslintrc.js

@@ -1,27 +1,34 @@
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
-  parserOptions: {
-    sourceType: 'module'
-  },
   env: {
     browser: true,
     node: true
   },
-  extends: 'standard',
+  extends: [
+    'plugin:vue/essential',
+    '@vue/standard'
+  ],
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
   globals: {
     appId: true,
     __static: true
   },
-  plugins: [
-    'html'
-  ],
-  'rules': {
-    // allow paren-less arrow functions
-    'arrow-parens': 0,
-    // allow async-await
-    'generator-star-spacing': 0,
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}
+  rules: {
+    'no-console': 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'indent': ['error', 2],
+    'vue/script-indent': ['error', 2, {
+      'baseIndent': 1
+    }],
+  },
+  overrides: [
+    {
+      'files': ['*.vue'],
+      'rules': {
+        'indent': 'off'
+      }
+    }
+  ]
+};

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,6 +11,7 @@ assignees: ''
 Before you feedback, please search for the issues to see if there are similar problems that can solve your problem.
 
 **Please delete the above and the contents of this line, then fill in the feedback form in the following format, Thanks.**
+<!-- Windows and Linux versions hide the application menu by default. Please use the keyboard shortcut "Ctrl+Shift+I" to open "Developer Tools" -->
 
 **Describe the bug**
 A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/bug_report_cn.md

@@ -6,12 +6,14 @@ labels: ''
 assignees: ''
 
 ---
-**反馈之前**
+
+<!--
 反馈之前请搜索一下已有 issues 和 帮助文档，看是否有类似问题可以解决你的问题
 https://github.com/agalwood/Motrix/issues
 http://motrix.app/support
 
-**请删除上面和本行的内容，然后按以下格式填写反馈信息，谢谢**
+按以下格式填写反馈信息，谢谢
+-->
 
 **错误描述**
 清楚简洁地描述错误，方便我们复现之后处理。
@@ -24,11 +26,12 @@ http://motrix.app/support
 4. 发现报错
 
 **预期的行为**
-清楚简洁地描述您期望发生的事情。
+清楚简洁地描述你期望发生的事情。
 
 **截图**
-请添加屏幕截图以帮助解释您的问题：
+请添加屏幕截图以帮助解释你的问题：
 打开应用菜单中的「帮助」——「开发者工具」—— 切换到 console，然后**完整**截图。
+<!-- Windows 和 Linux 版本默认隐藏了应用菜单，请使用键盘快捷键 Ctrl+Shift+I 打开「开发者工具」 -->
 
 **运行环境**
  - 操作系统类型： [如 macOS, Windows, Linux]
@@ -37,4 +40,4 @@ http://motrix.app/support
  - 安装包类型：[如 dmg, AppImage]
 
 **更多信息**
-添加有关此问题的任何其他上下文信息。
+补充有关该问题的其他信息。

.github/ISSUE_TEMPLATE/feature_request_cn.md

@@ -0,0 +1,28 @@
+---
+name: 新功能请求
+about: 你期望 Motrix 未来添加的新功能
+title: ''
+labels: enhancement ✨
+assignees: ''
+
+---
+
+<!--
+反馈之前请搜索一下已有 issues 和 帮助文档，看是否已经有人提交了类似的新功能请求
+https://github.com/agalwood/Motrix/issues
+http://motrix.app/support
+
+按以下格式填写反馈信息，谢谢
+-->
+
+**请描述一下你的新功能请求是否与已知问题有关？**
+简明扼要地描述了问题所在。
+
+**描述你想要的解决方案**
+简明扼要地描述你想要的解决方案。
+
+**描述你考虑过的替代方案**
+简明扼要地描述你考虑过的任何替代解决方案或功能。
+
+**更多信息**
+补充有关该新功能的其他信息。

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,16 @@
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+## Description
+<!-- Write a brief description of the changes introduced by this PR -->
+
+## Related Issues
+<!--
+  Link to the issue that is fixed by this PR (if there is one)
+  e.g. Fixes #1234, Addresses #1234, Related to #1234, etc.
+-->
+
+### Checklist:
+
+* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../../pulls) for the same update/change?
+* [ ] Have you linted your code locally prior to submission?
+* [ ] Have you successfully ran app with your changes locally?

.github/lock.yml

@@ -1,7 +1,7 @@
 # Configuration for Lock Threads - https://github.com/dessant/lock-threads
 
 # Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 30
+daysUntilLock: 60
 
 # Skip issues and pull requests created before a given timestamp. Timestamp must
 # follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable

.github/workflows/release.yml

@@ -0,0 +1,60 @@
+name: Build/release
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    # Platforms to build on/for
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v1
+        # Only install Snapcraft on Ubuntu
+        if: startsWith(matrix.os, 'ubuntu')
+        with:
+          # Log in to Snap Store
+          snapcraft_token: ${{ secrets.snapcraft_token }}
+
+      - name: Prepare for app notarization (macOS)
+        if: startsWith(matrix.os, 'macos')
+        # Import Apple API key for app notarization on macOS
+        run: |
+          mkdir -p ~/private_keys/
+          echo '${{ secrets.api_key }}' > ~/private_keys/AuthKey_${{ secrets.api_key_id }}.p8
+
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          build_script_name: 'build:github'
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
+          github_token: ${{ secrets.github_token }}
+
+          # macOS code signing certificate
+          mac_certs: ${{ secrets.mac_certs }}
+          mac_certs_password: ${{ secrets.mac_certs_password }}
+
+          # If the commit is tagged with a version (e.g. "v1.0.0"),
+          # release the app after building
+          release: ${{ secrets.force_release == 'true' || startsWith(github.ref, 'refs/tags/v') }}
+        env:
+          # macOS notarization API key
+          API_KEY_ID: ${{ secrets.api_key_id }}
+          API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}

.travis.yml

@@ -1,32 +1,44 @@
-osx_image: xcode10.1
 sudo: required
 dist: trusty
+
 language: c
-matrix:
+
+jobs:
   include:
   - os: osx
+    osx_image: xcode11.3
   - os: linux
     env: CC=clang CXX=clang++ npm_config_clang=1
     compiler: clang
+
 cache:
   directories:
   - node_modules
-  - "$HOME/.electron"
-  - "$HOME/.cache"
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+
 addons:
   apt:
     packages:
     - libgnome-keyring-dev
     - icnsutils
+    - rpm
+
 before_install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils; fi
+
 install:
-- nvm install 10
+- nvm install 12.14.1
 - source ~/.bashrc
 - npm install -g xvfb-maybe
 - npm install
+
 script:
 - npm run release
+
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+
 branches:
   only:
   - master

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at agalwood.net@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING-CN.md

@@ -1,8 +1,10 @@
 # Motrix 贡献指南
 
+开始贡献之前，确保你已经理解了 [GitHub 的协作流程](https://guides.github.com/introduction/flow/)。
+
 ## 🌍 翻译指南
 
-首先你要确定一个语言的英文简写作为 **locale**，如 en-US，这个 locale 值请严格参考 [Electron 的 Locales 文档](https://electronjs.org/docs/api/locales)
+首先你要确定一个语言的英文简写作为 **locale**，如 en-US，这个 locale 值请严格参考 [Electron 的 Locales 文档](https://www.electronjs.org/docs/api/app#appgetlocale)
 
 Motrix 的国际化分两部分：
 

CONTRIBUTING.md

@@ -1,8 +1,10 @@
 # Motrix Contributing Guide
 
+Before you start contributing, make sure you already understand [GitHub flow](https://guides.github.com/introduction/flow/).
+
 ## 🌍 Translation Guide
 
-First you need to determine the English abbreviation of a language as **locale**, such as en-US, this locale value should strictly refer to the [electron's documentation](https://electronjs.org/docs/api/locales).
+First you need to determine the English abbreviation of a language as **locale**, such as en-US, this locale value should strictly refer to the [electron's documentation](https://www.electronjs.org/docs/api/app#appgetlocale).
 
 The internationalization of Motrix is divided into two parts:
 

LICENSE

@@ -1,4 +1,6 @@
-Copyright 2018 Dr_rOot
+The MIT License
+
+Copyright 2018-present Dr_rOot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README-CN.md

@@ -1,18 +1,18 @@
 # Motrix
 
 <a href="https://motrix.app">
-  <img src="https://cdn.nlark.com/yuque/0/2018/png/129147/1543735425232-a5d2c99f-d788-43e4-9781-558ff6d21027.png" width="256" alt="App Icon" />
+  <img src="./static/512x512.png" width="256" alt="App Icon" />
 </a>
 
-[English](./README.md) | 简体中文
-
 ## 一款全能的下载工具
 
-[![GitHub release](https://img.shields.io/github/release/agalwood/Motrix.svg)](https://github.com/agalwood/Motrix/releases) [![Build Status](https://travis-ci.org/agalwood/Motrix.svg?branch=master)](https://travis-ci.org/agalwood/Motrix) [![Build status](https://ci.appveyor.com/api/projects/status/l11d5h05xwwcvoux/branch/master?svg=true)](https://ci.appveyor.com/project/agalwood/motrix/branch/master) [![Total Downloads](https://img.shields.io/github/downloads/agalwood/Motrix/total.svg)](https://github.com/agalwood/Motrix/releases) ![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)
+[![GitHub release](https://img.shields.io/github/v/release/agalwood/Motrix.svg)](https://github.com/agalwood/Motrix/releases) ![Build/release](https://github.com/agalwood/Motrix/workflows/Build/release/badge.svg) ![Total Downloads](https://img.shields.io/github/downloads/agalwood/Motrix/total.svg) ![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)
+
+[English](./README.md) | 简体中文
 
 我是个兴趣使然的桌面应用开发者🤓，利用搬砖之余开发了 Motrix。
 
-Motrix 是一款全能的下载工具，支持下载 HTTP、FTP、BT、磁力链、百度网盘等资源。它的界面简洁易用，希望大家喜欢 👻。
+Motrix 是一款全能的下载工具，支持下载 HTTP、FTP、BT、磁力链等资源。它的界面简洁易用，希望大家喜欢 👻。
 
 ✈️ 去 [官网](https://motrix.app/zh-CN) 逛逛  |  📖 查看 [帮助手册](http://motrix.app/support/issues)
 
@@ -20,20 +20,56 @@ Motrix 是一款全能的下载工具，支持下载 HTTP、FTP、BT、磁力链
 
 [GitHub](https://github.com/agalwood/Motrix/releases) 和 [官网](https://motrix.app/zh-CN) 提供了已经编译好的稳定版安装包，当然你也可以自己克隆代码编译打包。
 
-### macOS
+### Windows
 
-更新：macOS 用户支持 `brew cask` 安装，感谢 [Mitscherlich](https://github.com/Mitscherlich) 的 [PR](https://github.com/Homebrew/homebrew-cask/pull/59494)。
+建议使用安装包（Motrix-Setup-x.y.z.exe）安装 Motrix 以确保完整的体验，例如关联 torrent 文件，捕获磁力链等。
+
+如果你更喜欢便携版，你可以使用 [scoop](https://github.com/lukesampson/scoop)（需要 Windows 7+，天朝用户可能需要设置 Git 代理）安装最新便携版本的 Motrix。
 
 ```bash
-brew update && brew cask install motrix
+scoop bucket add extras
+scoop install motrix
+```
+
+### macOS
+
+macOS 用户可以使用 `brew cask` 安装 Motrix，感谢 [Mitscherlich](https://github.com/Mitscherlich) 的 [PR](https://github.com/Homebrew/homebrew-cask/pull/59494)。
+
+```bash
+brew update && brew install --cask motrix
 ```
 
 ### Linux
 
-您可以下载 AppImage（适用于所有Linux发行版）软件包或 snap 或从源代码构建。
+你可以下载 `AppImage` （适用于所有 Linux 发行版）或 `snap` 来安装 Motrix，更多 Linux 安装包格式请查看 [GitHub/release](https://github.com/agalwood/Motrix/releases) 。
 
-构建请阅读 **编译打包** 部分。
+如果你想自己通过编译源码来安装，请阅读 **编译打包** 部分。
 
+#### AppImage
+最新版的 Motrix AppImage 需要自己手动进执行桌面集成。请查看 [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) 的文档进行操作。
+
+> 桌面集成
+> electron-builder v21 之后，桌面集成不再是 AppImage 文件的一部分。
+> 推荐使用 [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) 集成 AppImage。
+
+Deepin 20 Beta 用户安装 Motrix 失败的问题，请按照以下方法处理：
+
+打开`终端`，黏贴运行如下命令之后再次安装 Motrix。
+```bash
+sudo apt --fix-broken install
+```
+
+#### Snap
+Motrix 已经上架 [Snapcraft](https://snapcraft.io/motrix) ，Ubuntu 用户推荐从 Snap 商店下载。
+
+v1.5.10 提示
+
+系统托盘可能无法正常显示指示器，导致退出应用程序不方便。
+请取消勾选 偏好设置——基本设置——隐藏应用程序菜单（仅限Windows和Linux），点击保存并应用。然后点击 "文件 "菜单中的 "退出"，退出应用程序。
+
+请更新到 v1.5.12 及以上版本，可以使用键盘组合快捷键 <kbd>Ctrl</kbd> + <kbd>q</kbd> 快速退出应用。
+
+#### AUR
 对于 Arch Linux 用户，可以使用 [aur](https://aur.archlinux.org/packages/motrix/) 安装 Motrix，感谢维护者 [weearc](https://github.com/weearc)。
 
 运行以下命令进行安装：
@@ -42,25 +78,31 @@ brew update && brew cask install motrix
 yay motrix
 ```
 
+Motrix 在 Linux 中首次启动可能需要使用 `sudo` 运行，因为可能没有创建下载会话文件的权限 (`/var/cache/aria2.session`)。
+
 ## ✨ 特性
 
 - 🕹 简洁明了的图形操作界面
 - 🦄 支持BT和磁力链任务
-- 💾 支持下载百度云盘资源
+- ☑️ 支持选择性下载BT部分文件
+- 📡 每天自动更新 Tracker 服务器列表
+- 🔌 UPnP & NAT-PMP 端口映射
 - 🎛 最高支持 10 个任务同时下载
 - 🚀 单任务最高支持 64 线程下载
+- 🚥 设置上传/下载限速
 - 🕶 模拟用户代理UA
 - 🔔 下载完成后通知
-- 💻 支持触控栏快捷健 (Mac 专享)
+- 💻 支持触控栏快捷键 (Mac 专享)
 - 🤖 常驻系统托盘，操作更加便捷
+- 📟 系统托盘速度仪表显示实时速度 (Mac 专享)
 - 🌑 深色模式
 - 🗑 移除任务时可同时删除相关文件
 - 🌍 国际化，[查看已可选的语言](#-国际化)
-- 🎏 ...
+- 🛠 更多特性开发中
 
 ## 🖥 应用界面
 
-![motrix-screenshot-task-cn.png](https://cdn.nlark.com/yuque/0/2019/png/129147/1550151234585-e513bd4f-e127-402f-accb-1ebbba9b3c41.png)
+![motrix-screenshot-task-cn.png](https://cdn.nlark.com/yuque/0/2020/png/129147/1589782239990-fecb9065-19ac-4c35-938b-0be45621ca3a.png)
 
 ## ⌨️ 本地开发
 
@@ -74,29 +116,32 @@ git clone git@github.com:agalwood/Motrix.git
 
 ```bash
 cd Motrix
-npm install
+yarn
 ```
 
 天朝大陆用户建议使用淘宝的 npm 源
 
 ```bash
+yarn config set registry 'https://registry.npm.taobao.org'
 npm config set registry 'https://registry.npm.taobao.org'
 export ELECTRON_MIRROR='https://npm.taobao.org/mirrors/electron/'
 export SASS_BINARY_SITE='https://npm.taobao.org/mirrors/node-sass'
 ```
 
-如果喜欢 [Yarn](https://yarnpkg.com/)，也可以使用 `yarn` 安装依赖
+> Error: Electron failed to install correctly, please delete node_modules/electron and try installing again
+
+`Electron` 下载安装失败的问题，解决方式请参考 https://github.com/electron/electron/issues/8466#issuecomment-571425574
 
 ### 开发模式
 
 ```bash
-npm run dev
+yarn run dev
 ```
 
 ### 编译打包
 
 ```bash
-npm run build
+yarn run build
 ```
 
 完成之后可以在项目的 `release` 目录看到编译打包好的应用文件
@@ -121,14 +166,27 @@ npm run build
 
 | Key   | Name                | Status       |
 |-------|:--------------------|:-------------|
-| de    | German              | ✔️ [@Schloemicher](https://github.com/Schloemicher) |
+| ar    | Arabic              | ✔️ [@hadialqattan](https://github.com/hadialqattan), [@AhmedElTabarani](https://github.com/AhmedElTabarani) |
+| bg    | Българският език    | ✔️ [@null-none](https://github.com/null-none) |
+| ca    | Català              | ✔️ [@marcizhu](https://github.com/marcizhu) |
+| de    | Deutsch             | ✔️ [@Schloemicher](https://github.com/Schloemicher) |
+| el    | Ελληνικά            | ✔️ [@Likecinema](https://github.com/Likecinema) |
 | en-US | English             | ✔️           |
+| es    | Español             | ✔️ [@Chofito](https://github.com/Chofito)|
 | fa    | فارسی               | ✔️ [@Nima-Ra](https://github.com/Nima-Ra) |
 | fr    | Français            | ✔️ [@gpatarin](https://github.com/gpatarin) |
+| hu    | Hungarian           | ✔️ [@zalnaRs](https://github.com/zalnaRs) |
+| id    | Indonesia           | ✔️ [@aarestu](https://github.com/aarestu) |
+| it    | Italiano            | ✔️ [@blackcat-917](https://github.com/blackcat-917) |
 | ja    | 日本語               | ✔️ [@hbkrkzk](https://github.com/hbkrkzk) |
 | ko    | 한국어                | ✔️ [@KOZ39](https://github.com/KOZ39) |
+| pl    | Polski              | ✔️ [@KanarekLife](https://github.com/KanarekLife) |
 | pt-BR | Portuguese (Brazil) | ✔️ [@andrenoberto](https://github.com/andrenoberto) |
+| ro    | Română              | ✔️ [@alyn3d](https://github.com/alyn3d) |
+| ru    | Русский             | ✔️ [@bladeaweb](https://github.com/bladeaweb) |
 | tr    | Türkçe              | ✔️ [@abdullah](https://github.com/abdullah) |
+| uk    | Українська          | ✔️ [@bladeaweb](https://github.com/bladeaweb) |
+| vi    | Tiếng Việt          | ✔️ [@duythanhvn](https://github.com/duythanhvn) |
 | zh-CN | 简体中文             | ✔️           |
 | zh-TW | 繁體中文             | ✔️ [@Yukaii](https://github.com/Yukaii) |
 

README.md

@@ -1,16 +1,16 @@
 # Motrix
 
 <a href="https://motrix.app">
-  <img src="https://cdn.nlark.com/yuque/0/2018/png/129147/1543735425232-a5d2c99f-d788-43e4-9781-558ff6d21027.png" width="256" alt="App Icon" />
+  <img src="./static/512x512.png" width="256" alt="App Icon" />
 </a>
 
 ## A full-featured download manager
 
-[![GitHub release](https://img.shields.io/github/release/agalwood/Motrix.svg)](https://github.com/agalwood/Motrix/releases) [![Build Status](https://travis-ci.org/agalwood/Motrix.svg?branch=master)](https://travis-ci.org/agalwood/Motrix) [![Build status](https://ci.appveyor.com/api/projects/status/l11d5h05xwwcvoux/branch/master?svg=true)](https://ci.appveyor.com/project/agalwood/motrix/branch/master) [![Total Downloads](https://img.shields.io/github/downloads/agalwood/Motrix/total.svg)](https://github.com/agalwood/Motrix/releases) ![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)
+[![GitHub release](https://img.shields.io/github/v/release/agalwood/Motrix.svg)](https://github.com/agalwood/Motrix/releases) ![Build/release](https://github.com/agalwood/Motrix/workflows/Build/release/badge.svg) ![Total Downloads](https://img.shields.io/github/downloads/agalwood/Motrix/total.svg) ![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)
 
 English | [简体中文](./README-CN.md)
 
-Motrix is a full-featured download manager that supports downloading HTTP, FTP, BitTorrent, Magnet, Baidu Net Disk, etc.
+Motrix is a full-featured download manager that supports downloading HTTP, FTP, BitTorrent, Magnet, etc.
 
 Motrix has a clean and easy to use interface. I hope you will like it 👻.
 
@@ -20,20 +20,58 @@ Motrix has a clean and easy to use interface. I hope you will like it 👻.
 
 Download from [GitHub Releases](https://github.com/agalwood/Motrix/releases) and install it.
 
-### macOS
+### Windows
 
-Update: macOS user support `brew cask` installation, thanks to [PR](https://github.com/Homebrew/homebrew-cask/pull/59494) of [Mitscherlich](https://github.com/Mitscherlich).
+It is recommended to install Motrix using the installation package (Motrix-Setup-x.y.z.exe) to ensure a complete experience, such as associating torrent files, capturing magnet links, etc.
+
+If you prefer the portable version, you can use [scoop](https://github.com/lukesampson/scoop) (need Windows 7+) to install Motrix.
 
 ```bash
-brew update && brew cask install motrix
+scoop bucket add extras
+scoop install motrix
+```
+
+### macOS
+
+The macOS users can install Motrix using `brew cask`, thanks to [PR](https://github.com/Homebrew/homebrew-cask/pull/59494) of [Mitscherlich](https://github.com/Mitscherlich).
+
+```bash
+brew update && brew install --cask motrix
 ```
 
 ### Linux
 
-You can download the AppImage(for all Linux distributions) package or snap or just build from source code.
+You can download the `AppImage` (for all Linux distributions) or `snap` to install Motrix, see [GitHub/release](https://github.com/agalwood/Motrix/releases) for more Linux installation package formats.
 
-Please read the **Build** section.
+If you want to build from source code, please read the **Build** section.
 
+#### AppImage
+The latest version of Motrix AppImage requires you to manually perform desktop integration. Please check the documentation of [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) .
+
+> Desktop Integration
+> Since electron-builder 21 desktop integration is not a part of produced AppImage file.
+> [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) is the recommended way to integrate AppImages.
+
+Deepin 20 Beta users failed to install Motrix, please follow the steps below:
+
+Open the `Terminal`, paste and run the following command to install Motrix again.
+
+```bash
+sudo apt --fix-broken install
+```
+
+#### Snap
+Motrix has been listed on [Snapcraft](https://snapcraft.io/motrix) , Ubuntu users recommend downloading from the Snap Store.
+
+Tips for v1.5.10
+
+The tray may not display the indicator normally, which makes it inconvenient to exit the application.
+
+Please unchecked Preferences--Basic Settings--Hide App Menu (Windows & Linux Only), click Save & Apply. Then click "Exit" in the File menu to exit the application.
+
+Please update to v1.5.12 and above, you can use the keyboard shortcut <kbd>Ctrl</kbd> + <kbd>q</kbd> to quickly exit the application.
+
+#### AUR
 For Arch Linux users, Motrix is available in [aur](https://aur.archlinux.org/packages/motrix/), thanks to the maintainer [weearc](https://github.com/weearc).
 
 Run the following command to install:
@@ -42,25 +80,31 @@ Run the following command to install:
 yay motrix
 ```
 
+Motrix may need to run with `sudo` for the first time in Linux because there is no permission to create the download session file (`/var/cache/aria2.session`).
+
 ## ✨ Features
 
 - 🕹 Simple and clear user interface
 - 🦄 Supports BitTorrent & Magnet
-- 💾 Supports downloading Baidu Net Disk
+- ☑️ BitTorrent selective download
+- 📡 Update tracker list every day automatically
+- 🔌 UPnP & NAT-PMP Port Mapping
 - 🎛 Up to 10 concurrent download tasks
 - 🚀 Supports 64 threads in a single task
+- 🚥 Supports speed limit
 - 🕶 Mock User-Agent
 - 🔔 Download completed Notification
 - 💻 Ready for Touch Bar (Mac only)
 - 🤖 Resident system tray for quick operation
+- 📟 Tray speed meter displays real-time speed (Mac only)
 - 🌑 Dark mode
 - 🗑 Delete related files when removing tasks (optional)
 - 🌍 I18n, [View supported languages](#-internationalization).
-- 🎏 ...
+- 🛠 More features in development
 
 ## 🖥 User Interface
 
-![motrix-screenshot-task-en.png](https://cdn.nlark.com/yuque/0/2019/png/129147/1550151166169-94b4bfb0-746e-42b8-aad7-0b6890f89abb.png)
+![motrix-screenshot-task-en.png](https://cdn.nlark.com/yuque/0/2020/png/129147/1589782238501-e7b39166-da58-4152-ae34-65a061cafa48.png)
 
 ## ⌨️ Development
 
@@ -74,21 +118,23 @@ git clone git@github.com:agalwood/Motrix.git
 
 ```bash
 cd Motrix
-npm install
+yarn
 ```
 
-If you like [Yarn](https://yarnpkg.com/), you can also use `yarn` to install dependencies.
+> Error: Electron failed to install correctly, please delete node_modules/electron and try installing again
+
+`Electron` failed to install correctly, please refer to https://github.com/electron/electron/issues/8466#issuecomment-571425574
 
 ### Dev Mode
 
 ```bash
-npm run dev
+yarn run dev
 ```
 
 ### Build Release
 
 ```bash
-npm run build
+yarn run build
 ```
 
 After building, the application will be found in the project's `release` directory.
@@ -113,14 +159,27 @@ Translations into versions for other languages are welcome 🧐! Please read the
 
 | Key   | Name                | Status       |
 |-------|:--------------------|:-------------|
-| de    | German              | ✔️ [@Schloemicher](https://github.com/Schloemicher) |
+| ar    | Arabic              | ✔️ [@hadialqattan](https://github.com/hadialqattan), [@AhmedElTabarani](https://github.com/AhmedElTabarani) |
+| bg    | Българският език    | ✔️ [@null-none](https://github.com/null-none) |
+| ca    | Català              | ✔️ [@marcizhu](https://github.com/marcizhu) |
+| de    | Deutsch             | ✔️ [@Schloemicher](https://github.com/Schloemicher) |
+| el    | Ελληνικά            | ✔️ [@Likecinema](https://github.com/Likecinema) |
 | en-US | English             | ✔️           |
+| es    | Español             | ✔️ [@Chofito](https://github.com/Chofito)|
 | fa    | فارسی               | ✔️ [@Nima-Ra](https://github.com/Nima-Ra) |
 | fr    | Français            | ✔️ [@gpatarin](https://github.com/gpatarin) |
+| hu    | Hungarian           | ✔️ [@zalnaRs](https://github.com/zalnaRs) |
+| id    | Indonesia           | ✔️ [@aarestu](https://github.com/aarestu) |
+| it    | Italiano            | ✔️ [@blackcat-917](https://github.com/blackcat-917) |
 | ja    | 日本語               | ✔️ [@hbkrkzk](https://github.com/hbkrkzk) |
 | ko    | 한국어                | ✔️ [@KOZ39](https://github.com/KOZ39) |
+| pl    | Polski              | ✔️ [@KanarekLife](https://github.com/KanarekLife) |
 | pt-BR | Portuguese (Brazil) | ✔️ [@andrenoberto](https://github.com/andrenoberto) |
+| ro    | Română              | ✔️ [@alyn3d](https://github.com/alyn3d) |
+| ru    | Русский             | ✔️ [@bladeaweb](https://github.com/bladeaweb) |
 | tr    | Türkçe              | ✔️ [@abdullah](https://github.com/abdullah) |
+| uk    | Українська          | ✔️ [@bladeaweb](https://github.com/bladeaweb) |
+| vi    | Tiếng Việt          | ✔️ [@duythanhvn](https://github.com/duythanhvn) |
 | zh-CN | 简体中文             | ✔️           |
 | zh-TW | 繁體中文             | ✔️ [@Yukaii](https://github.com/Yukaii) |
 

app-update.yml

@@ -1,2 +1,2 @@
 provider: generic
-url: 'https://motrix.app/release/'
+url: 'https://dl.motrix.app/release/'

appveyor.yml

@@ -1,24 +1,17 @@
-version: 1.0.{build}
-
-branches:
-  only:
-    - master
-
 image: Visual Studio 2017
+
 platform:
   - x64
 
 cache:
   - node_modules
-  - '%APPDATA%\npm-cache'
   - '%USERPROFILE%\.electron'
-  - '%USERPROFILE%\AppData\Local\Yarn\cache'
 
 init:
   - git config --global core.autocrlf input
 
 install:
-  - ps: Install-Product node 10 x64
+  - ps: Install-Product node 12.14.1 x64
   - git reset --hard HEAD
   - npm install
   - node --version
@@ -27,3 +20,7 @@ build_script:
   - npm run release
 
 test: off
+
+branches:
+  only:
+    - master

build/afterPackHook.js

@@ -0,0 +1,94 @@
+//  Forked from https://github.com/samuelmeuli/mini-diary/blob/master/scripts/after-pack.js
+
+/**
+ * Source: https://github.com/patrikx3/redis-ui/blob/master/src/build/after-pack.js
+ *
+ * Copyright (c) 2019 Patrik Laszlo / P3X / Corifeus and contributors.
+ *
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+// TODO: Remove script once https://github.com/electron/electron/issues/17972 is solved by
+// `electron-builder`
+
+const fs = require('fs')
+const { spawn } = require('child_process')
+const { chdir } = require('process')
+
+const pkg = require('../package.json')
+const binName = `${pkg.name}`.toLowerCase()
+
+const exec = async function exec (cmd, args = []) {
+  const child = spawn(cmd, args, { shell: true })
+  redirectOutputFor(child)
+  await waitFor(child)
+}
+
+const redirectOutputFor = child => {
+  const printStdout = data => {
+    process.stdout.write(data.toString())
+  }
+  const printStderr = data => {
+    process.stderr.write(data.toString())
+  }
+  child.stdout.on('data', printStdout)
+  child.stderr.on('data', printStderr)
+
+  child.once('close', () => {
+    child.stdout.off('data', printStdout)
+    child.stderr.off('data', printStderr)
+  })
+}
+
+const waitFor = async function (child) {
+  return new Promise(resolve => {
+    child.once('close', () => resolve())
+  })
+}
+
+const linuxTargets = [
+  'AppImage',
+  'deb',
+  'rpm',
+  'snap'
+]
+
+module.exports = async function (context) {
+  console.warn('after build; disable sandbox')
+  const isLinux = context.targets.find(
+    target => linuxTargets.includes(target)
+  )
+  if (!isLinux) {
+    return
+  }
+  const originalDir = process.cwd()
+  const dirname = context.appOutDir
+  chdir(dirname)
+
+  await exec('mv', [binName, binName + '.bin'])
+  const wrapperScript = `#!/bin/bash
+    "\${BASH_SOURCE%/*}"/${binName}.bin "$@" --no-sandbox
+  `
+  fs.writeFileSync(binName, wrapperScript)
+  await exec('chmod', ['+x', binName])
+
+  chdir(originalDir)
+}

build/afterSignHook.js

@@ -0,0 +1,27 @@
+require('dotenv').config()
+const { notarize } = require('electron-notarize')
+const pkg = require('../package.json')
+
+exports.default = async function (context) {
+  const { electronPlatformName, appOutDir } = context
+  if (electronPlatformName !== 'darwin') {
+    return
+  }
+
+  const skipNotarize = process.env.SKIP_NOTARIZE
+  if (skipNotarize === 'yes') {
+    console.log('skipping notarize')
+    return
+  }
+
+  const appBundleId = pkg.build.appId
+  const appName = context.packager.appInfo.productFilename
+
+  return await notarize({
+    appBundleId,
+    appPath: `${appOutDir}/${appName}.app`,
+    ascProvider: process.env.TEAM_ID,
+    appleId: process.env.APPLE_ID,
+    appleIdPassword: process.env.APPLE_ID_PWD
+  })
+}

extra/README.md

@@ -0,0 +1,3 @@
+# aria2
+
+Source code: https://github.com/agalwood/aria2

extra/darwin/engine/aria2.conf

@@ -1,108 +1,75 @@
-## '#'开头为注释内容, 选项都有相应的注释说明, 根据需要修改 ##
-## 被注释的选项填写的是默认值, 建议在需要修改时再取消注释  ##
-## 添加了@和默认启用的选项都是系统需要调用的，请不要随意改动否则可能无法正常运行
+###############################
+# Motrix macOS Aria2 config file
+#
+# @see https://aria2.github.io/manual/en/html/aria2c.html
+#
+###############################
 
-## 文件保存相关 ##
 
-# 文件的保存路径(可使用绝对路径或相对路径), 默认: 当前启动位置
-# 此项 OS X 无法使用 $HOME 及 ~/ 设置路径  建议使用 /users/用户名/downloads
-#@dir=$HOME/downloads
-# 启用磁盘缓存, 0为禁用缓存, 需1.16以上版本, 默认:16M
-#@disk-cache=32M
-# 文件预分配方式, 能有效降低磁盘碎片, 默认:prealloc
-# 预分配所需时间: none < falloc ? trunc < prealloc
-# falloc和trunc则需要文件系统和内核支持
-# NTFS建议使用falloc, EXT3/4建议trunc, MAC 下需要注释此项
-# file-allocation=none
-# 断点续传
-#@continue=true
-
-## 下载连接相关 ##
-
-# 最大同时下载任务数, 运行时可修改, 默认:5
-#@max-concurrent-downloads=10
-# 同一服务器连接数, 添加时可指定, 默认:1
-#@max-connection-per-server=15
-# 最小文件分片大小, 添加时可指定, 取值范围1M -1024M, 默认:20M
-# 假定size=10M, 文件为20MiB 则使用两个来源下载; 文件为15MiB 则使用一个来源下载
-#@min-split-size=10M
-# 单个任务最大线程数, 添加时可指定, 默认:5
-#@split=15
-# 整体下载速度限制, 运行时可修改, 默认:0
-#@max-overall-download-limit=0
-# 单个任务下载速度限制, 默认:0
-#@max-download-limit=0
-# 整体上传速度限制, 运行时可修改, 默认:0
-max-overall-upload-limit=128K
-# 单个任务上传速度限制, 默认:0
-#@max-upload-limit=0
-# 禁用IPv6, 默认:false
-disable-ipv6=false
-#运行覆盖已存在文件
-#@allow-overwrite=true
-#自动重命名
-#@auto-file-renaming=true
-
-## 进度保存相关 ##
-
-# 从会话文件中读取下载任务
-#@input-file=/Users/Shared/aria2.session
-# 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
-#@save-session=/Users/Shared/aria2.session
-# 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
-save-session-interval=30
-
-## RPC相关设置 ##
-
-# 启用RPC, 默认:false
+################ RPC ################
+# Enable JSON-RPC/XML-RPC server.
 enable-rpc=true
-# 允许所有来源, 默认:false
+# Add Access-Control-Allow-Origin header field with value * to the RPC response.
 rpc-allow-origin-all=true
-# 允许非外部访问, 默认:false
+# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces.
 rpc-listen-all=true
-# 事件轮询方式, 取值:[epoll, kqueue, port, poll, select], 不同系统默认值不同
-#event-poll=select
-# RPC监听端口, 端口被占用时可以修改, 默认:6800
-# 使用本客户端请勿修改此项
-# rpc-listen-port=6800
-# 设置的RPC授权令牌, v1.18.4新增功能, 取代 --rpc-user 和 --rpc-passwd 选项
-#rpc-secret=token
 
-## BT/PT下载相关 ##
 
-# 当下载的是一个种子(以.torrent结尾)时, 自动开始BT任务, 默认:true
-#follow-torrent=true
-# BT监听端口, 当端口被屏蔽时使用, 默认:6881-6999
-listen-port=50101-50109
-# 单个种子最大连接数, 默认:55
-#bt-max-peers=55
-# 打开DHT功能, PT需要禁用, 默认:true
-enable-dht=true
-# 打开IPv6 DHT功能, PT需要禁用
-enable-dht6=true
-# DHT网络监听端口, 默认:6881-6999
-dht-listen-port=50101-50109
+################ File system ################
+# Save a control file(*.aria2) every SEC seconds.
+auto-save-interval=10
+# Enable disk cache.
+disk-cache=32M
+# Specify file allocation method.
+file-allocation=falloc
+# Save error/unfinished downloads to a file specified by --save-session option every SEC seconds.
+save-session-interval=10
+
+
+################ Task ################
+# Exclude seed only downloads when counting concurrent active downloads
+bt-detach-seed-only=true
+# Verify the peer using certificates specified in --ca-certificate option.
+check-certificate=false
+# If aria2 receives "file not found" status from the remote HTTP/FTP servers NUM times
+# without getting a single byte, then force the download to fail.
+max-file-not-found=5
+# Set number of tries.
+max-tries=5
+# aria2 does not split less than 2*SIZE byte range.
+min-split-size=1M
+# Set user agent for HTTP(S) downloads.
+user-agent=Transmission/2.94
+# Send Accept: deflate, gzip request header
+http-accept-gzip=true
+
+
+################ BT Task ################
+# Enable Local Peer Discovery.
+bt-enable-lpd=true
+# Requires BitTorrent message payload encryption with arc4.
+# bt-force-encryption=true
+# If true is given, after hash check using --check-integrity option and file is complete, continue to seed file.
+bt-hash-check-seed=true
+# Specify the maximum number of peers per torrent.
+bt-max-peers=255
+# Try to download first and last pieces of each file first. This is useful for previewing files.
+bt-prioritize-piece=head
+# Removes the unselected files when download is completed in BitTorrent.
+bt-remove-unselected-file=true
+# Seed previously downloaded files without verifying piece hashes.
+bt-seed-unverified=true
 # Set host and port as an entry point to IPv4 DHT network.
 dht-entry-point=dht.transmissionbt.com:6881
 # Set host and port as an entry point to IPv6 DHT network.
 dht-entry-point6=dht.transmissionbt.com:6881
-# 本地节点查找, PT需要禁用, 默认:false
-bt-enable-lpd=true
-# 种子交换, PT需要禁用, 默认:true
+# Enable IPv4 DHT functionality. It also enables UDP tracker support.
+enable-dht=true
+# Enable IPv6 DHT functionality.
+enable-dht6=true
+# Enable Peer Exchange extension.
 enable-peer-exchange=true
-# 每个种子限速, 对少种的PT很有用, 默认:50K
-#bt-request-peer-speed-limit=50K
-# 客户端伪装, PT需要
-peer-id-prefix=-TR2770-
-user-agent=Transmission/2.94
-# 当种子的分享率达到这个数时, 自动停止做种, 0为一直做种, 默认:1.0
-seed-ratio=1.0
-# 强制保存会话, 即使任务已经完成, 默认:false
-# 较新的版本开启后会在任务完成后依然保留.aria2文件
-#force-save=false
-# BT校验相关, 默认:true
-#bt-hash-check-seed=true
-# 继续之前的BT任务时, 无需再次校验, 默认:false
-bt-seed-unverified=true
-# 保存磁力链接元数据为种子文件(.torrent文件), 默认:false
-bt-save-metadata=false
+# Specify the string used during the bitorrent extended handshake for the peer's client version.
+peer-agent=Transmission/2.94
+# Specify the prefix of peer ID.
+peer-id-prefix=-TR2940-

extra/linux/engine/aria2.conf

@@ -1,108 +1,75 @@
-## '#'开头为注释内容, 选项都有相应的注释说明, 根据需要修改 ##
-## 被注释的选项填写的是默认值, 建议在需要修改时再取消注释  ##
-## 添加了@和默认启用的选项都是系统需要调用的，请不要随意改动否则可能无法正常运行
+###############################
+# Motrix Linux Aria2 config file
+#
+# @see https://aria2.github.io/manual/en/html/aria2c.html
+#
+###############################
 
-## 文件保存相关 ##
 
-# 文件的保存路径(可使用绝对路径或相对路径), 默认: 当前启动位置
-# 此项 OS X 无法使用 $HOME 及 ~/ 设置路径  建议使用 /users/用户名/downloads
-#@dir=$HOME/downloads
-# 启用磁盘缓存, 0为禁用缓存, 需1.16以上版本, 默认:16M
-#@disk-cache=32M
-# 文件预分配方式, 能有效降低磁盘碎片, 默认:prealloc
-# 预分配所需时间: none < falloc ? trunc < prealloc
-# falloc和trunc则需要文件系统和内核支持
-# NTFS建议使用falloc, EXT3/4建议trunc, MAC 下需要注释此项
-file-allocation=trunc
-# 断点续传
-#@continue=true
-
-## 下载连接相关 ##
-
-# 最大同时下载任务数, 运行时可修改, 默认:5
-#@max-concurrent-downloads=10
-# 同一服务器连接数, 添加时可指定, 默认:1
-#@max-connection-per-server=15
-# 最小文件分片大小, 添加时可指定, 取值范围1M -1024M, 默认:20M
-# 假定size=10M, 文件为20MiB 则使用两个来源下载; 文件为15MiB 则使用一个来源下载
-#@min-split-size=10M
-# 单个任务最大线程数, 添加时可指定, 默认:5
-#@split=15
-# 整体下载速度限制, 运行时可修改, 默认:0
-#@max-overall-download-limit=0
-# 单个任务下载速度限制, 默认:0
-#@max-download-limit=0
-# 整体上传速度限制, 运行时可修改, 默认:0
-max-overall-upload-limit=128K
-# 单个任务上传速度限制, 默认:0
-#@max-upload-limit=0
-# 禁用IPv6, 默认:false
-disable-ipv6=false
-#运行覆盖已存在文件
-#@allow-overwrite=true
-#自动重命名
-#@auto-file-renaming=true
-
-## 进度保存相关 ##
-
-# 从会话文件中读取下载任务
-#@input-file=/Users/Shared/aria2.session
-# 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
-#@save-session=/Users/Shared/aria2.session
-# 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
-save-session-interval=30
-
-## RPC相关设置 ##
-
-# 启用RPC, 默认:false
+################ RPC ################
+# Enable JSON-RPC/XML-RPC server.
 enable-rpc=true
-# 允许所有来源, 默认:false
+# Add Access-Control-Allow-Origin header field with value * to the RPC response.
 rpc-allow-origin-all=true
-# 允许非外部访问, 默认:false
+# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces.
 rpc-listen-all=true
-# 事件轮询方式, 取值:[epoll, kqueue, port, poll, select], 不同系统默认值不同
-#event-poll=select
-# RPC监听端口, 端口被占用时可以修改, 默认:6800
-# 使用本客户端请勿修改此项
-# rpc-listen-port=6800
-# 设置的RPC授权令牌, v1.18.4新增功能, 取代 --rpc-user 和 --rpc-passwd 选项
-#rpc-secret=token
 
-## BT/PT下载相关 ##
 
-# 当下载的是一个种子(以.torrent结尾)时, 自动开始BT任务, 默认:true
-#follow-torrent=true
-# BT监听端口, 当端口被屏蔽时使用, 默认:6881-6999
-listen-port=50101-50109
-# 单个种子最大连接数, 默认:55
-#bt-max-peers=55
-# 打开DHT功能, PT需要禁用, 默认:true
-enable-dht=true
-# 打开IPv6 DHT功能, PT需要禁用
-enable-dht6=true
-# DHT网络监听端口, 默认:6881-6999
-dht-listen-port=50101-50109
+################ File system ################
+# Save a control file(*.aria2) every SEC seconds.
+auto-save-interval=10
+# Enable disk cache.
+disk-cache=32M
+# Specify file allocation method.
+file-allocation=trunc
+# Save error/unfinished downloads to a file specified by --save-session option every SEC seconds.
+save-session-interval=10
+
+
+################ Task ################
+# Exclude seed only downloads when counting concurrent active downloads
+bt-detach-seed-only=true
+# Verify the peer using certificates specified in --ca-certificate option.
+check-certificate=false
+# If aria2 receives "file not found" status from the remote HTTP/FTP servers NUM times
+# without getting a single byte, then force the download to fail.
+max-file-not-found=5
+# Set number of tries.
+max-tries=5
+# aria2 does not split less than 2*SIZE byte range.
+min-split-size=1M
+# Set user agent for HTTP(S) downloads.
+user-agent=Transmission/2.94
+# Send Accept: deflate, gzip request header
+http-accept-gzip=true
+
+
+################ BT Task ################
+# Enable Local Peer Discovery.
+bt-enable-lpd=true
+# Requires BitTorrent message payload encryption with arc4.
+# bt-force-encryption=true
+# If true is given, after hash check using --check-integrity option and file is complete, continue to seed file.
+bt-hash-check-seed=true
+# Specify the maximum number of peers per torrent.
+bt-max-peers=255
+# Try to download first and last pieces of each file first. This is useful for previewing files.
+bt-prioritize-piece=head
+# Removes the unselected files when download is completed in BitTorrent.
+bt-remove-unselected-file=true
+# Seed previously downloaded files without verifying piece hashes.
+bt-seed-unverified=true
 # Set host and port as an entry point to IPv4 DHT network.
 dht-entry-point=dht.transmissionbt.com:6881
 # Set host and port as an entry point to IPv6 DHT network.
 dht-entry-point6=dht.transmissionbt.com:6881
-# 本地节点查找, PT需要禁用, 默认:false
-bt-enable-lpd=true
-# 种子交换, PT需要禁用, 默认:true
+# Enable IPv4 DHT functionality. It also enables UDP tracker support.
+enable-dht=true
+# Enable IPv6 DHT functionality.
+enable-dht6=true
+# Enable Peer Exchange extension.
 enable-peer-exchange=true
-# 每个种子限速, 对少种的PT很有用, 默认:50K
-#bt-request-peer-speed-limit=50K
-# 客户端伪装, PT需要
-peer-id-prefix=-TR2770-
-user-agent=Transmission/2.94
-# 当种子的分享率达到这个数时, 自动停止做种, 0为一直做种, 默认:1.0
-seed-ratio=1.0
-# 强制保存会话, 即使任务已经完成, 默认:false
-# 较新的版本开启后会在任务完成后依然保留.aria2文件
-#force-save=false
-# BT校验相关, 默认:true
-#bt-hash-check-seed=true
-# 继续之前的BT任务时, 无需再次校验, 默认:false
-bt-seed-unverified=true
-# 保存磁力链接元数据为种子文件(.torrent文件), 默认:false
-bt-save-metadata=false
+# Specify the string used during the bitorrent extended handshake for the peer's client version.
+peer-agent=Transmission/2.94
+# Specify the prefix of peer ID.
+peer-id-prefix=-TR2940-

extra/win32/engine/aria2.conf

@@ -1,108 +1,75 @@
-## '#'开头为注释内容, 选项都有相应的注释说明, 根据需要修改 ##
-## 被注释的选项填写的是默认值, 建议在需要修改时再取消注释  ##
-## 添加了@和默认启用的选项都是系统需要调用的，请不要随意改动否则可能无法正常运行
+###############################
+# Motrix Windows Aria2 config file
+#
+# @see https://aria2.github.io/manual/en/html/aria2c.html
+#
+###############################
 
-## 文件保存相关 ##
 
-# 文件的保存路径(可使用绝对路径或相对路径), 默认: 当前启动位置
-# 此项 OS X 无法使用 $HOME 及 ~/ 设置路径  建议使用 /users/用户名/downloads
-#@dir=$HOME/downloads
-# 启用磁盘缓存, 0为禁用缓存, 需1.16以上版本, 默认:16M
-#@disk-cache=32M
-# 文件预分配方式, 能有效降低磁盘碎片, 默认:prealloc
-# 预分配所需时间: none < falloc ? trunc < prealloc
-# falloc和trunc则需要文件系统和内核支持
-# NTFS建议使用falloc, EXT3/4建议trunc, MAC 下需要注释此项
-file-allocation=falloc
-# 断点续传
-#@continue=true
-
-## 下载连接相关 ##
-
-# 最大同时下载任务数, 运行时可修改, 默认:5
-#@max-concurrent-downloads=10
-# 同一服务器连接数, 添加时可指定, 默认:1
-#@max-connection-per-server=15
-# 最小文件分片大小, 添加时可指定, 取值范围1M -1024M, 默认:20M
-# 假定size=10M, 文件为20MiB 则使用两个来源下载; 文件为15MiB 则使用一个来源下载
-#@min-split-size=10M
-# 单个任务最大线程数, 添加时可指定, 默认:5
-#@split=15
-# 整体下载速度限制, 运行时可修改, 默认:0
-#@max-overall-download-limit=0
-# 单个任务下载速度限制, 默认:0
-#@max-download-limit=0
-# 整体上传速度限制, 运行时可修改, 默认:0
-max-overall-upload-limit=128K
-# 单个任务上传速度限制, 默认:0
-#@max-upload-limit=0
-# 禁用IPv6, 默认:false
-disable-ipv6=false
-#运行覆盖已存在文件
-#@allow-overwrite=true
-#自动重命名
-#@auto-file-renaming=true
-
-## 进度保存相关 ##
-
-# 从会话文件中读取下载任务
-#@input-file=/Users/Shared/aria2.session
-# 在Aria2退出时保存`错误/未完成`的下载任务到会话文件
-#@save-session=/Users/Shared/aria2.session
-# 定时保存会话, 0为退出时才保存, 需1.16.1以上版本, 默认:0
-save-session-interval=30
-
-## RPC相关设置 ##
-
-# 启用RPC, 默认:false
+################ RPC ################
+# Enable JSON-RPC/XML-RPC server.
 enable-rpc=true
-# 允许所有来源, 默认:false
+# Add Access-Control-Allow-Origin header field with value * to the RPC response.
 rpc-allow-origin-all=true
-# 允许非外部访问, 默认:false
+# Listen incoming JSON-RPC/XML-RPC requests on all network interfaces.
 rpc-listen-all=true
-# 事件轮询方式, 取值:[epoll, kqueue, port, poll, select], 不同系统默认值不同
-#event-poll=select
-# RPC监听端口, 端口被占用时可以修改, 默认:6800
-# 使用本客户端请勿修改此项
-# rpc-listen-port=6800
-# 设置的RPC授权令牌, v1.18.4新增功能, 取代 --rpc-user 和 --rpc-passwd 选项
-#rpc-secret=token
 
-## BT/PT下载相关 ##
 
-# 当下载的是一个种子(以.torrent结尾)时, 自动开始BT任务, 默认:true
-#follow-torrent=true
-# BT监听端口, 当端口被屏蔽时使用, 默认:6881-6999
-listen-port=50101-50109
-# 单个种子最大连接数, 默认:55
-#bt-max-peers=55
-# 打开DHT功能, PT需要禁用, 默认:true
-enable-dht=true
-# 打开IPv6 DHT功能, PT需要禁用
-enable-dht6=true
-# DHT网络监听端口, 默认:6881-6999
-dht-listen-port=50101-50109
+################ File system ################
+# Save a control file(*.aria2) every SEC seconds.
+auto-save-interval=10
+# Enable disk cache.
+disk-cache=32M
+# Specify file allocation method.
+file-allocation=falloc
+# Save error/unfinished downloads to a file specified by --save-session option every SEC seconds.
+save-session-interval=10
+
+
+################ Task ################
+# Exclude seed only downloads when counting concurrent active downloads
+bt-detach-seed-only=true
+# Verify the peer using certificates specified in --ca-certificate option.
+check-certificate=false
+# If aria2 receives "file not found" status from the remote HTTP/FTP servers NUM times
+# without getting a single byte, then force the download to fail.
+max-file-not-found=5
+# Set number of tries.
+max-tries=5
+# aria2 does not split less than 2*SIZE byte range.
+min-split-size=1M
+# Set user agent for HTTP(S) downloads.
+user-agent=Transmission/2.94
+# Send Accept: deflate, gzip request header
+http-accept-gzip=true
+
+
+################ BT Task ################
+# Enable Local Peer Discovery.
+bt-enable-lpd=true
+# Requires BitTorrent message payload encryption with arc4.
+# bt-force-encryption=true
+# If true is given, after hash check using --check-integrity option and file is complete, continue to seed file.
+bt-hash-check-seed=true
+# Specify the maximum number of peers per torrent.
+bt-max-peers=255
+# Try to download first and last pieces of each file first. This is useful for previewing files.
+bt-prioritize-piece=head
+# Removes the unselected files when download is completed in BitTorrent.
+bt-remove-unselected-file=true
+# Seed previously downloaded files without verifying piece hashes.
+bt-seed-unverified=true
 # Set host and port as an entry point to IPv4 DHT network.
 dht-entry-point=dht.transmissionbt.com:6881
 # Set host and port as an entry point to IPv6 DHT network.
 dht-entry-point6=dht.transmissionbt.com:6881
-# 本地节点查找, PT需要禁用, 默认:false
-bt-enable-lpd=true
-# 种子交换, PT需要禁用, 默认:true
+# Enable IPv4 DHT functionality. It also enables UDP tracker support.
+enable-dht=true
+# Enable IPv6 DHT functionality.
+enable-dht6=true
+# Enable Peer Exchange extension.
 enable-peer-exchange=true
-# 每个种子限速, 对少种的PT很有用, 默认:50K
-#bt-request-peer-speed-limit=50K
-# 客户端伪装, PT需要
-peer-id-prefix=-TR2770-
-user-agent=Transmission/2.94
-# 当种子的分享率达到这个数时, 自动停止做种, 0为一直做种, 默认:1.0
-seed-ratio=1.0
-# 强制保存会话, 即使任务已经完成, 默认:false
-# 较新的版本开启后会在任务完成后依然保留.aria2文件
-#force-save=false
-# BT校验相关, 默认:true
-#bt-hash-check-seed=true
-# 继续之前的BT任务时, 无需再次校验, 默认:false
-bt-seed-unverified=true
-# 保存磁力链接元数据为种子文件(.torrent文件), 默认:false
-bt-save-metadata=false
+# Specify the string used during the bitorrent extended handshake for the peer's client version.
+peer-agent=Transmission/2.94
+# Specify the prefix of peer ID.
+peer-id-prefix=-TR2940-

jsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@/*": [
+        "./src/renderer/*"
+      ],
+      "@shared/*": [
+        "./src/shared/*"
+      ]
+    }
+  },
+  "exclude": ["node_modules", "dist"]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Motrix",
-  "version": "1.3.8",
+  "version": "1.6.10",
   "description": "A full-featured download manager",
   "homepage": "https://motrix.app",
   "author": {
@@ -17,6 +17,7 @@
   "scripts": {
     "release": "npm run build --publish onTagOrDraft",
     "build": "node .electron-vue/build.js && electron-builder",
+    "build:github": "node .electron-vue/build.js",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
     "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
@@ -27,11 +28,13 @@
     "pack": "npm run pack:main && npm run pack:renderer",
     "pack:main": "cross-env NODE_ENV=production webpack --mode production --progress --colors --config .electron-vue/webpack.main.config.js",
     "pack:renderer": "cross-env NODE_ENV=production webpack --mode production --progress --colors --config .electron-vue/webpack.renderer.config.js",
-    "postinstall": "npm run lint:fix"
+    "postinstall": "electron-builder install-app-deps && npm run lint:fix"
   },
   "build": {
     "productName": "Motrix",
     "appId": "net.agalwood.Motrix",
+    "afterPack": "./build/afterPackHook.js",
+    "afterSign": "electron-builder-notarize",
     "fileAssociations": [
       {
         "ext": "torrent",
@@ -60,6 +63,12 @@
         "schemes": [
           "magnet"
         ]
+      },
+      {
+        "name": "Thunder Protocol",
+        "schemes": [
+          "thunder"
+        ]
       }
     ],
     "dmg": {
@@ -83,11 +92,24 @@
     },
     "mac": {
       "target": [
-        "dmg",
-        "zip"
+        {
+          "target": "dmg",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        },
+        {
+          "target": "zip",
+          "arch": [
+            "x64",
+            "arm64"
+          ]
+        }
       ],
       "type": "distribution",
       "darkModeSupport": true,
+      "hardenedRuntime": true,
       "extraResources": {
         "from": "./extra/darwin/",
         "to": "./",
@@ -95,9 +117,6 @@
           "**/*"
         ]
       },
-      "binaries": [
-        "./release/mac/Motrix.app/Contents/Resources/engine/aria2c"
-      ],
       "category": "public.app-category.utilities"
     },
     "win": {
@@ -139,9 +158,10 @@
     "linux": {
       "category": "Network",
       "target": [
+        "AppImage",
         "deb",
-        "snap",
-        "AppImage"
+        "rpm",
+        "snap"
       ],
       "extraResources": {
         "from": "./extra/linux/",
@@ -151,10 +171,21 @@
         ]
       }
     },
+    "snap": {
+      "publish": [
+        {
+          "provider": "github"
+        },
+        {
+          "provider": "snapStore",
+          "channel": "edge"
+        }
+      ]
+    },
     "publish": [
       {
         "provider": "generic",
-        "url": "https://motrix.app/release/"
+        "url": "https://dl.motrix.app/release/"
       },
       {
         "provider": "github"
@@ -162,84 +193,83 @@
     ]
   },
   "dependencies": {
-    "@panter/vue-i18next": "^0.15.0",
-    "aria2": "^4.0.3",
-    "axios": "^0.18.0",
+    "@babel/runtime": "^7.14.0",
+    "@motrix/nat-api": "^0.3.1",
+    "@panter/vue-i18next": "^0.15.2",
+    "axios": "^0.21.1",
+    "bittorrent-peerid": "^1.3.3",
     "blob-util": "^2.0.2",
-    "clipboard-polyfill": "^2.8.0",
-    "electron-debug": "^2.2.0",
+    "clipboard-polyfill": "^3.0.3",
+    "electron-debug": "^3.2.0",
     "electron-is": "^3.0.0",
-    "electron-log": "^3.0.5",
-    "electron-updater": "^4.0.9",
-    "element-ui": "^2.7.2",
-    "forever-monitor": "^1.7.1",
-    "i18next": "^15.0.9",
-    "lodash": "^4.17.11",
+    "electron-log": "^4.3.5",
+    "electron-store": "^8.0.0",
+    "electron-updater": "^4.3.8",
+    "element-ui": "^2.15.1",
+    "i18next": "^20.2.2",
+    "lodash": "^4.17.21",
+    "node-fetch": "^2.6.1",
     "normalize.css": "^8.0.1",
-    "parse-torrent": "^6.1.2",
+    "parse-torrent": "^9.1.3",
+    "randomatic": "^3.1.1",
     "svg-innerhtml": "^1.1.0",
-    "vue": "^2.6.10",
+    "vue": "^2.6.12",
     "vue-electron": "^1.0.6",
-    "vue-router": "^3.0.6",
-    "vuex": "^3.1.0",
-    "vuex-router-sync": "^5.0.0"
+    "vue-router": "^3.5.1",
+    "vuex": "^3.6.2",
+    "vuex-router-sync": "^5.0.0",
+    "ws": "^7.4.5"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.6.0",
-    "@vue/cli-plugin-eslint": "^3.6.0",
-    "@vue/cli-service": "^3.6.0",
-    "@vue/eslint-config-standard": "^4.0.0",
-    "ajv": "^6.10.0",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^10.0.1",
-    "babel-loader": "^7.1.5",
+    "@babel/core": "^7.14.0",
+    "@babel/plugin-proposal-class-properties": "^7.13.0",
+    "@babel/plugin-transform-runtime": "^7.13.15",
+    "@babel/preset-env": "^7.14.1",
+    "@babel/register": "^7.13.16",
+    "@electron/remote": "^1.1.0",
+    "@motrix/multispinner": "^0.2.2",
+    "@vue/eslint-config-standard": "^6.0.0",
+    "ajv": "^8.2.0",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.2.2",
     "babel-plugin-component": "^1.1.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-stage-0": "^6.24.1",
-    "babel-register": "^6.26.0",
-    "babili-webpack-plugin": "^0.1.2",
-    "cfonts": "^2.4.2",
-    "chalk": "^2.4.2",
-    "copy-webpack-plugin": "^5.0.3",
-    "cross-env": "^5.1.6",
-    "css-loader": "^2.1.1",
-    "del": "^4.1.0",
-    "devtron": "^1.4.0",
-    "electron": "^4.1.5",
-    "electron-builder": "^20.39.0",
-    "electron-devtools-installer": "^2.2.4",
-    "electron-notarize": "^0.0.5",
-    "electron-osx-sign": "^0.4.11",
-    "electron-store": "^2.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-standard": "^12.0.0",
+    "cfonts": "^2.9.1",
+    "chalk": "^4.1.1",
+    "copy-webpack-plugin": "^8.1.1",
+    "cross-env": "^7.0.3",
+    "css-loader": "^5.2.4",
+    "css-minimizer-webpack-plugin": "^2.0.0",
+    "del": "^6.0.0",
+    "electron": "^11.4.5",
+    "electron-builder": "22.10.5",
+    "electron-builder-notarize": "^1.2.0",
+    "electron-devtools-installer": "^3.2.0",
+    "electron-notarize": "^1.0.0",
+    "electron-osx-sign": "^0.5.0",
+    "eslint": "^7.25.0",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^2.1.2",
-    "eslint-plugin-html": "^4.0.6",
-    "eslint-plugin-import": "^2.17.2",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.1.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "eslint-plugin-vue": "^5.2.2",
-    "file-loader": "^3.0.1",
-    "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "0.6.0",
-    "multispinner": "^0.2.1",
-    "node-loader": "^0.6.0",
-    "node-sass": "^4.10.0",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
-    "url-loader": "^1.1.2",
-    "vue-html-loader": "^1.2.4",
-    "vue-loader": "^15.7.0",
-    "vue-style-loader": "^4.1.2",
-    "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.1",
-    "webpack-dev-server": "^3.3.1",
-    "webpack-hot-middleware": "^2.24.3",
-    "webpack-merge": "^4.2.1"
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-vue": "^7.9.0",
+    "eslint-webpack-plugin": "^2.5.4",
+    "file-loader": "^6.2.0",
+    "html-webpack-plugin": "^5.3.1",
+    "mini-css-extract-plugin": "1.6.0",
+    "node-loader": "^2.0.0",
+    "sass": "^1.32.12",
+    "sass-loader": "^11.0.1",
+    "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.1.1",
+    "url-loader": "^4.1.1",
+    "vue-loader": "^15.9.6",
+    "vue-style-loader": "^4.1.3",
+    "vue-template-compiler": "^2.6.12",
+    "webpack": "^5.36.2",
+    "webpack-cli": "^4.7.0",
+    "webpack-dev-server": "^3.11.2",
+    "webpack-hot-middleware": "^2.25.0",
+    "webpack-merge": "^5.7.3",
+    "worker-loader": "^3.0.8"
   }
 }

src/index.ejs

@@ -23,9 +23,9 @@
       </section>
     </div>
     <!-- Set `__static` path to static files in production -->
-    <% if (!process.browser) { %>
+    <% if (!htmlWebpackPlugin.options.isBrowser && !htmlWebpackPlugin.options.isDev) { %>
       <script>
-        if (process.env.NODE_ENV !== 'development') window.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
+        window.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
       </script>
     <% } %>
 

src/main/Application.js

@@ -1,13 +1,27 @@
 import { EventEmitter } from 'events'
 import { app, shell, dialog, ipcMain } from 'electron'
 import is from 'electron-is'
-import { readFile } from 'fs'
+import { readFile, unlink } from 'fs'
 import { extname, basename } from 'path'
+import { isEmpty } from 'lodash'
 
+import {
+  APP_RUN_MODE,
+  AUTO_SYNC_TRACKER_INTERVAL,
+  AUTO_CHECK_UPDATE_INTERVAL
+} from '@shared/constants'
+import { checkIsNeedRun } from '@shared/utils'
+import {
+  convertTrackerDataToComma,
+  fetchBtTrackerFromSource
+} from '@shared/utils/tracker'
 import logger from './core/Logger'
 import ConfigManager from './core/ConfigManager'
-import { setupLocaleManager } from '@/ui/Locale'
+import { setupLocaleManager } from './ui/Locale'
 import Engine from './core/Engine'
+import EngineClient from './core/EngineClient'
+import UPnPManager from './core/UPnPManager'
+import AutoLaunchManager from './core/AutoLaunchManager'
 import UpdateManager from './core/UpdateManager'
 import EnergyManager from './core/EnergyManager'
 import ProtocolManager from './core/ProtocolManager'
@@ -15,7 +29,9 @@ import WindowManager from './ui/WindowManager'
 import MenuManager from './ui/MenuManager'
 import TouchBarManager from './ui/TouchBarManager'
 import TrayManager from './ui/TrayManager'
+import DockManager from './ui/DockManager'
 import ThemeManager from './ui/ThemeManager'
+import { getSessionPath } from './utils'
 
 export default class Application extends EventEmitter {
   constructor () {
@@ -25,31 +41,32 @@ export default class Application extends EventEmitter {
   }
 
   init () {
-    this.configManager = new ConfigManager()
+    this.configManager = this.initConfigManager()
 
     this.locale = this.configManager.getLocale()
     this.localeManager = setupLocaleManager(this.locale)
     this.i18n = this.localeManager.getI18n()
 
-    this.menuManager = new MenuManager()
-    this.menuManager.setup(this.locale)
+    this.setupApplicationMenu()
+
+    this.initWindowManager()
+
+    this.initUPnPManager()
+
+    this.startEngine()
+
+    this.initEngineClient()
 
     this.initTouchBarManager()
 
-    this.windowManager = new WindowManager({
-      userConfig: this.configManager.getUserConfig()
-    })
-
-    this.engine = new Engine({
-      systemConfig: this.configManager.getSystemConfig(),
-      userConfig: this.configManager.getUserConfig()
-    })
-    this.startEngine()
-
-    this.trayManager = new TrayManager()
-
     this.initThemeManager()
 
+    this.initTrayManager()
+
+    this.initDockManager()
+
+    this.autoLaunchManager = new AutoLaunchManager()
+
     this.energyManager = new EnergyManager()
 
     this.initUpdaterManager()
@@ -57,11 +74,56 @@ export default class Application extends EventEmitter {
     this.initProtocolManager()
 
     this.handleCommands()
+
+    this.handleEvents()
+
     this.handleIpcMessages()
+
+    this.handleIpcInvokes()
+
+    this.emit('application:initialized')
+  }
+
+  initConfigManager () {
+    this.configListeners = {}
+    return new ConfigManager()
+  }
+
+  offConfigListeners () {
+    try {
+      Object.keys(this.configListeners).forEach((key) => {
+        this.configListeners[key]()
+      })
+    } catch (e) {
+      logger.warn('[Motrix] offConfigListeners===>', e)
+    }
+    this.configListeners = {}
+  }
+
+  setupApplicationMenu () {
+    this.menuManager = new MenuManager()
+    this.menuManager.setup(this.locale)
+  }
+
+  adjustMenu () {
+    if (is.mas()) {
+      const visibleStates = {
+        'app.check-for-updates': false,
+        'task.new-bt-task': false
+      }
+      this.menuManager.updateMenuStates(visibleStates, null, null)
+      this.trayManager.updateMenuStates(visibleStates, null, null)
+    }
   }
 
   startEngine () {
+    const self = this
+
     try {
+      this.engine = new Engine({
+        systemConfig: this.configManager.getSystemConfig(),
+        userConfig: this.configManager.getUserConfig()
+      })
       this.engine.start()
     } catch (err) {
       const { message } = err
@@ -69,20 +131,262 @@ export default class Application extends EventEmitter {
         type: 'error',
         title: this.i18n.t('app.system-error-title'),
         message: this.i18n.t('app.system-error-message', { message })
-      }, () => {
+      }).then(_ => {
         setTimeout(() => {
-          app.quit()
+          self.quit()
         }, 100)
       })
     }
   }
 
-  start (page) {
-    this.showPage(page)
+  async stopEngine () {
+    try {
+      await this.engineClient.shutdown({ force: true })
+      setImmediate(() => {
+        this.engine.stop()
+      })
+    } catch (err) {
+      logger.warn('[Motrix] shutdown engine fail: ', err.message)
+    } finally {
+      // no finally
+    }
   }
 
-  showPage (page) {
-    const win = this.windowManager.openWindow(page)
+  initEngineClient () {
+    const port = this.configManager.getSystemConfig('rpc-listen-port')
+    const secret = this.configManager.getSystemConfig('rpc-secret')
+    this.engineClient = new EngineClient({
+      port,
+      secret
+    })
+  }
+
+  initTrayManager () {
+    this.trayManager = new TrayManager({
+      theme: this.configManager.getUserConfig('tray-theme'),
+      systemTheme: this.themeManager.getSystemTheme(),
+      speedometer: this.configManager.getUserConfig('tray-speedometer')
+    })
+
+    this.watchTraySpeedometerEnabledChange()
+
+    this.trayManager.on('mouse-down', ({ focused }) => {
+      this.sendCommandToAll('application:update-tray-focused', { focused })
+    })
+
+    this.trayManager.on('mouse-up', ({ focused }) => {
+      this.sendCommandToAll('application:update-tray-focused', { focused })
+    })
+
+    this.trayManager.on('drop-files', (files = []) => {
+      this.handleFile(files[0])
+    })
+
+    this.trayManager.on('drop-text', (text) => {
+      this.handleProtocol(text)
+    })
+  }
+
+  watchTraySpeedometerEnabledChange () {
+    const { userConfig } = this.configManager
+    const key = 'tray-speedometer'
+    this.configListeners[key] = userConfig.onDidChange('tray-speedometer', async (newValue, oldValue) => {
+      logger.info('[Motrix] detected tray speedometer value change event:', newValue, oldValue)
+      this.trayManager.handleSpeedometerEnableChange(newValue)
+    })
+  }
+
+  initDockManager () {
+    this.dockManager = new DockManager({
+      runMode: this.configManager.getUserConfig('run-mode')
+    })
+  }
+
+  initUPnPManager () {
+    this.upnp = new UPnPManager()
+
+    this.watchUPnPEnabledChange()
+
+    this.watchUPnPPortsChange()
+
+    const enabled = this.configManager.getUserConfig('enable-upnp')
+    if (!enabled) {
+      return
+    }
+
+    this.startUPnPMapping()
+  }
+
+  async startUPnPMapping () {
+    const btPort = this.configManager.getSystemConfig('listen-port')
+    const dhtPort = this.configManager.getSystemConfig('dht-listen-port')
+
+    const promises = [
+      this.upnp.map(btPort),
+      this.upnp.map(dhtPort)
+    ]
+    try {
+      await Promise.allSettled(promises)
+    } catch (e) {
+      logger.warn('[Motrix] start UPnP mapping fail', e)
+    }
+  }
+
+  async stopUPnPMapping () {
+    const btPort = this.configManager.getSystemConfig('listen-port')
+    const dhtPort = this.configManager.getSystemConfig('dht-listen-port')
+
+    const promises = [
+      this.upnp.unmap(btPort),
+      this.upnp.unmap(dhtPort)
+    ]
+    try {
+      await Promise.allSettled(promises)
+    } catch (e) {
+      logger.warn('[Motrix] stop UPnP mapping fail', e)
+    }
+  }
+
+  watchUPnPPortsChange () {
+    const { systemConfig } = this.configManager
+    const watchKeys = ['listen-port', 'dht-listen-port']
+
+    watchKeys.forEach((key) => {
+      this.configListeners[key] = systemConfig.onDidChange(key, async (newValue, oldValue) => {
+        logger.info('[Motrix] detected port change event:', key, newValue, oldValue)
+        const enable = this.configManager.getUserConfig('enable-upnp')
+        if (!enable) {
+          return
+        }
+
+        const promises = [
+          this.upnp.unmap(oldValue),
+          this.upnp.map(newValue)
+        ]
+        try {
+          await Promise.allSettled(promises)
+        } catch (e) {
+          logger.info('[Motrix] change UPnP port mapping failed:', e)
+        }
+      })
+    })
+  }
+
+  watchUPnPEnabledChange () {
+    const { userConfig } = this.configManager
+    const key = 'enable-upnp'
+    this.configListeners[key] = userConfig.onDidChange(key, async (newValue, oldValue) => {
+      logger.info('[Motrix] detected enable-upnp value change event:', newValue, oldValue)
+      if (newValue) {
+        this.startUPnPMapping()
+      } else {
+        await this.stopUPnPMapping()
+        this.upnp.closeClient()
+      }
+    })
+  }
+
+  async shutdownUPnPManager () {
+    const enable = this.configManager.getUserConfig('enable-upnp')
+    if (enable) {
+      await this.stopUPnPMapping()
+    }
+
+    this.upnp.closeClient()
+  }
+
+  autoSyncTracker () {
+    const enable = this.configManager.getUserConfig('auto-sync-tracker')
+    const lastTime = this.configManager.getUserConfig('last-sync-tracker-time')
+    const result = checkIsNeedRun(enable, lastTime, AUTO_SYNC_TRACKER_INTERVAL)
+    logger.info('[Motrix] auto sync tracker checkIsNeedRun:', result)
+    if (!result) {
+      return
+    }
+
+    const source = this.configManager.getUserConfig('tracker-source')
+    if (isEmpty(source)) {
+      return
+    }
+
+    setTimeout(() => {
+      fetchBtTrackerFromSource(source).then((data) => {
+        logger.warn('[Motrix] auto sync tracker data:', data)
+        if (!data || data.length === 0) {
+          return
+        }
+
+        const tracker = convertTrackerDataToComma(data)
+        this.savePreference({
+          system: {
+            'bt-tracker': tracker
+          },
+          user: {
+            'last-sync-tracker-time': Date.now()
+          }
+        })
+      }).catch((err) => {
+        logger.warn('[Motrix] auto sync tracker failed:', err.message)
+      })
+    }, 500)
+  }
+
+  autoResumeTask () {
+    const enabled = this.configManager.getUserConfig('resume-all-when-app-launched')
+    if (!enabled) {
+      return
+    }
+
+    this.engineClient.call('unpauseAll')
+  }
+
+  initWindowManager () {
+    this.windowManager = new WindowManager({
+      userConfig: this.configManager.getUserConfig()
+    })
+
+    this.windowManager.on('window-resized', (data) => {
+      this.storeWindowState(data)
+    })
+
+    this.windowManager.on('window-moved', (data) => {
+      this.storeWindowState(data)
+    })
+
+    this.windowManager.on('window-closed', (data) => {
+      this.storeWindowState(data)
+    })
+
+    this.windowManager.on('enter-full-screen', (window) => {
+      this.dockManager.show()
+    })
+
+    this.windowManager.on('leave-full-screen', (window) => {
+      const mode = this.configManager.getUserConfig('run-mode')
+      if (mode !== APP_RUN_MODE.STANDARD) {
+        this.dockManager.hide()
+      }
+    })
+  }
+
+  storeWindowState (data = {}) {
+    const enabled = this.configManager.getUserConfig('keep-window-state')
+    if (!enabled) {
+      return
+    }
+
+    const state = this.configManager.getUserConfig('window-state', {})
+    const { page, bounds } = data
+    const newState = {
+      ...state,
+      [page]: bounds
+    }
+    this.configManager.setUserConfig('window-state', newState)
+  }
+
+  start (page, options = {}) {
+    const win = this.showPage(page, options)
+
     win.once('ready-to-show', () => {
       this.isReady = true
       this.emit('ready')
@@ -92,6 +396,14 @@ export default class Application extends EventEmitter {
     }
   }
 
+  showPage (page, options = {}) {
+    const { openedAtLogin } = options
+    const autoHideWindow = this.configManager.getUserConfig('auto-hide-window')
+    return this.windowManager.openWindow(page, {
+      hidden: openedAtLogin || autoHideWindow
+    })
+  }
+
   show (page = 'index') {
     this.windowManager.showWindow(page)
   }
@@ -112,10 +424,23 @@ export default class Application extends EventEmitter {
     this.windowManager.destroyWindow(page)
   }
 
-  stop () {
-    this.engine.stop()
-    this.energyManager.stopPowerSaveBlocker()
-    this.trayManager.destroy()
+  async stop () {
+    try {
+      await this.shutdownUPnPManager()
+
+      this.energyManager.stopPowerSaveBlocker()
+
+      await this.stopEngine()
+
+      this.trayManager.destroy()
+    } catch (err) {
+      logger.warn('[Motrix] stop error: ', err.message)
+    }
+  }
+
+  async quit () {
+    await this.stop()
+    app.exit()
   }
 
   sendCommand (command, ...args) {
@@ -143,9 +468,9 @@ export default class Application extends EventEmitter {
 
   initThemeManager () {
     this.themeManager = new ThemeManager()
-    this.themeManager.on('system-theme-changed', (theme) => {
-      this.trayManager.changeIconTheme(theme)
-      this.sendCommandToAll('application:system-theme', theme)
+    this.themeManager.on('system-theme-change', (theme) => {
+      this.trayManager.handleSystemThemeChange(theme)
+      this.sendCommandToAll('application:update-system-theme', { theme })
     })
   }
 
@@ -153,21 +478,18 @@ export default class Application extends EventEmitter {
     if (!is.macOS()) {
       return
     }
+
     this.touchBarManager = new TouchBarManager()
   }
 
   initProtocolManager () {
-    if (is.dev() || is.mas()) {
-      return
-    }
-    this.protocolManager = new ProtocolManager()
+    const protocols = this.configManager.getUserConfig('protocols', {})
+    this.protocolManager = new ProtocolManager({
+      protocols
+    })
   }
 
   handleProtocol (url) {
-    if (is.dev() || is.mas()) {
-      return
-    }
-
     this.show()
 
     this.protocolManager.handle(url)
@@ -184,15 +506,17 @@ export default class Application extends EventEmitter {
 
     this.show()
 
-    const fileName = basename(filePath)
+    const name = basename(filePath)
     readFile(filePath, (err, data) => {
       if (err) {
         logger.warn(`[Motrix] read file error: ${filePath}`, err.message)
         return
       }
-      const file = Buffer.from(data).toString('base64')
-      const args = [fileName, file]
-      this.sendCommandToAll('application:new-bt-task-with-file', ...args)
+      const dataURL = Buffer.from(data).toString('base64')
+      this.sendCommandToAll('application:new-bt-task-with-file', {
+        name,
+        dataURL
+      })
     })
   }
 
@@ -200,11 +524,11 @@ export default class Application extends EventEmitter {
     if (is.mas()) {
       return
     }
+
+    const enabled = this.configManager.getUserConfig('auto-check-update')
+    const lastTime = this.configManager.getUserConfig('last-check-update-time')
     this.updateManager = new UpdateManager({
-      autoCheck: this.configManager.getUserConfig('auto-check-update')
-        ? (new Date().getTime() - this.configManager.getUserConfig('last-check-update-time') > 7 * 24 * 60 * 60 * 1000)
-        : false,
-      setCheckTime: this.configManager
+      autoCheck: checkIsNeedRun(enabled, lastTime, AUTO_CHECK_UPDATE_INTERVAL)
     })
     this.handleUpdaterEvents()
   }
@@ -212,6 +536,8 @@ export default class Application extends EventEmitter {
   handleUpdaterEvents () {
     this.updateManager.on('checking', (event) => {
       this.menuManager.updateMenuItemEnabledState('app.check-for-updates', false)
+      this.trayManager.updateMenuItemEnabledState('app.check-for-updates', false)
+      this.configManager.setUserConfig('last-check-update-time', Date.now())
     })
 
     this.updateManager.on('download-progress', (event) => {
@@ -221,10 +547,12 @@ export default class Application extends EventEmitter {
 
     this.updateManager.on('update-not-available', (event) => {
       this.menuManager.updateMenuItemEnabledState('app.check-for-updates', true)
+      this.trayManager.updateMenuItemEnabledState('app.check-for-updates', true)
     })
 
     this.updateManager.on('update-downloaded', (event) => {
       this.menuManager.updateMenuItemEnabledState('app.check-for-updates', true)
+      this.trayManager.updateMenuItemEnabledState('app.check-for-updates', true)
       const win = this.windowManager.getWindow('index')
       win.setProgressBar(0)
     })
@@ -235,41 +563,85 @@ export default class Application extends EventEmitter {
 
     this.updateManager.on('update-error', (event) => {
       this.menuManager.updateMenuItemEnabledState('app.check-for-updates', true)
+      this.trayManager.updateMenuItemEnabledState('app.check-for-updates', true)
     })
   }
 
-  relaunch (page = 'index') {
-    this.stop()
+  async relaunch () {
+    await this.stop()
     app.relaunch()
     app.exit()
-    // this.closePage(page)
-    // if (page === 'index') {
-    //   this.engine.restart()
-    // }
-    // setTimeout(() => {
-    //   this.showPage(page)
-    // }, 500)
+  }
+
+  async resetSession () {
+    await this.stopEngine()
+
+    app.clearRecentDocuments()
+
+    const sessionPath = this.configManager.getUserConfig('session-path') || getSessionPath()
+    setTimeout(() => {
+      unlink(sessionPath, function (err) {
+        logger.info('[Motrix] Removed the download seesion file:', err)
+      })
+
+      this.engine.start()
+    }, 3000)
+  }
+
+  savePreference (config = {}) {
+    logger.info('[Motrix] save preference:', config)
+    const { system, user } = config
+    if (!isEmpty(system)) {
+      console.info('[Motrix] main save system config: ', system)
+      this.configManager.setSystemConfig(system)
+      this.engineClient.changeGlobalOption(system)
+    }
+
+    if (!isEmpty(user)) {
+      console.info('[Motrix] main save user config: ', user)
+      this.configManager.setUserConfig(user)
+    }
   }
 
   handleCommands () {
+    this.on('application:save-preference', this.savePreference)
+
+    this.on('application:update-tray', (tray) => {
+      this.trayManager.updateTrayByImage(tray)
+    })
+
     this.on('application:relaunch', () => {
       this.relaunch()
     })
 
-    this.on('application:exit', () => {
-      this.engine.stop()
-      app.exit()
+    this.on('application:quit', () => {
+      this.quit()
     })
 
-    this.on('application:show', (page) => {
+    this.on('application:open-at-login', (openAtLogin) => {
+      if (is.linux()) {
+        return
+      }
+
+      if (openAtLogin) {
+        this.autoLaunchManager.enable()
+      } else {
+        this.autoLaunchManager.disable()
+      }
+    })
+
+    this.on('application:show', ({ page }) => {
       this.show(page)
     })
 
-    this.on('application:hide', (page) => {
+    this.on('application:hide', ({ page }) => {
       this.hide(page)
     })
 
+    this.on('application:reset-session', () => this.resetSession())
+
     this.on('application:reset', () => {
+      this.offConfigListeners()
       this.configManager.reset()
       this.relaunch()
     })
@@ -280,18 +652,40 @@ export default class Application extends EventEmitter {
 
     this.on('application:change-theme', (theme) => {
       this.themeManager.updateAppAppearance(theme)
-      this.sendCommandToAll('application:theme', theme)
+      this.sendCommandToAll('application:update-theme', { theme })
     })
 
     this.on('application:change-locale', (locale) => {
-      logger.info('[Motrix] application:change-locale===>', locale)
       this.localeManager.changeLanguageByLocale(locale)
         .then(() => {
-          this.menuManager.setup(locale)
-          this.trayManager.setup(locale)
+          this.menuManager.handleLocaleChange(locale)
+          this.trayManager.handleLocaleChange(locale)
         })
     })
 
+    this.on('application:toggle-dock', (visible) => {
+      if (visible) {
+        this.dockManager.show()
+      } else {
+        this.dockManager.hide()
+        // Hiding the dock icon will trigger the entire app to hide.
+        this.show()
+      }
+    })
+
+    this.on('application:auto-hide-window', (hide) => {
+      if (hide) {
+        this.windowManager.handleWindowBlur()
+      } else {
+        this.windowManager.unbindWindowBlur()
+      }
+    })
+
+    this.on('application:change-menu-states', (visibleStates, enabledStates, checkedStates) => {
+      this.menuManager.updateMenuStates(visibleStates, enabledStates, checkedStates)
+      this.trayManager.updateMenuStates(visibleStates, enabledStates, checkedStates)
+    })
+
     this.on('application:open-file', (event) => {
       dialog.showOpenDialog({
         properties: ['openFile'],
@@ -301,8 +695,8 @@ export default class Application extends EventEmitter {
             extensions: ['torrent']
           }
         ]
-      }, (filePaths) => {
-        if (!filePaths || filePaths.length === 0) {
+      }).then(({ canceled, filePaths }) => {
+        if (canceled || filePaths.length === 0) {
           return
         }
 
@@ -315,39 +709,109 @@ export default class Application extends EventEmitter {
       app.clearRecentDocuments()
     })
 
+    this.on('application:setup-protocols-client', (protocols) => {
+      if (is.dev() || is.mas()) {
+        return
+      }
+      logger.info('[Motrix] setup protocols client:', protocols)
+      this.protocolManager.setup(protocols)
+    })
+
+    this.on('application:open-external', (url) => {
+      this.openExternal(url)
+    })
+
     this.on('help:official-website', () => {
       const url = 'https://motrix.app/'
-      shell.openExternal(url)
+      this.openExternal(url)
     })
 
     this.on('help:manual', () => {
       const url = 'https://motrix.app/manual'
-      shell.openExternal(url)
+      this.openExternal(url)
     })
 
     this.on('help:release-notes', () => {
       const url = 'https://motrix.app/release'
-      shell.openExternal(url)
+      this.openExternal(url)
     })
 
     this.on('help:report-problem', () => {
       const url = 'https://motrix.app/report'
-      shell.openExternal(url)
+      this.openExternal(url)
+    })
+  }
+
+  openExternal (url) {
+    if (!url) {
+      return
+    }
+
+    shell.openExternal(url)
+  }
+
+  handleConfigChange (configName) {
+    this.sendCommandToAll('application:update-preference-config', { configName })
+  }
+
+  handleEvents () {
+    this.once('application:initialized', () => {
+      this.autoSyncTracker()
+
+      this.autoResumeTask()
+
+      this.adjustMenu()
+    })
+
+    this.configManager.userConfig.onDidAnyChange(() => this.handleConfigChange('user'))
+    this.configManager.systemConfig.onDidAnyChange(() => this.handleConfigChange('system'))
+
+    this.on('download-status-change', (downloading) => {
+      this.trayManager.handleDownloadStatusChange(downloading)
+      if (downloading) {
+        this.energyManager.startPowerSaveBlocker()
+      } else {
+        this.energyManager.stopPowerSaveBlocker()
+      }
+    })
+
+    this.on('speed-change', (speed) => {
+      this.dockManager.handleSpeedChange(speed)
+      this.trayManager.handleSpeedChange(speed)
+    })
+
+    this.on('task-download-complete', (task, path) => {
+      this.dockManager.openDock(path)
+
+      if (is.linux()) {
+        return
+      }
+      app.addRecentDocument(path)
     })
   }
 
   handleIpcMessages () {
     ipcMain.on('command', (event, command, ...args) => {
-      logger.log('receive command', command, ...args)
+      logger.log('[Motrix] ipc receive command', command, ...args)
       this.emit(command, ...args)
     })
 
-    ipcMain.on('update-menu-states', (event, visibleStates, enabledStates, checkedStates) => {
-      this.menuManager.updateStates(visibleStates, enabledStates, checkedStates)
+    ipcMain.on('event', (event, eventName, ...args) => {
+      logger.log('[Motrix] ipc receive event', eventName, ...args)
+      this.emit(eventName, ...args)
     })
+  }
 
-    ipcMain.on('download-status-change', (event, status) => {
-      this.trayManager.updateStatus(status)
+  handleIpcInvokes () {
+    ipcMain.handle('get-app-config', async () => {
+      const systemConfig = this.configManager.getSystemConfig()
+      const userConfig = this.configManager.getUserConfig()
+
+      const result = {
+        ...systemConfig,
+        ...userConfig
+      }
+      return result
     })
   }
 }

src/main/Launcher.js

@@ -5,9 +5,12 @@ import is from 'electron-is'
 import ExceptionHandler from './core/ExceptionHandler'
 import logger from './core/Logger'
 import Application from './Application'
-import { parseArgvAsUrl, parseArgvAsFile } from './utils'
-
-const EMPTY_STRING = ''
+import {
+  splitArgv,
+  parseArgvAsUrl,
+  parseArgvAsFile
+} from './utils'
+import { EMPTY_STRING } from '@shared/constants'
 
 export default class Launcher extends EventEmitter {
   constructor () {
@@ -23,7 +26,7 @@ export default class Launcher extends EventEmitter {
   makeSingleInstance (callback) {
     // Mac App Store Sandboxed App not support requestSingleInstanceLock
     if (is.mas()) {
-      callback()
+      callback && callback()
       return
     }
 
@@ -33,20 +36,29 @@ export default class Launcher extends EventEmitter {
       app.quit()
     } else {
       app.on('second-instance', (event, argv, workingDirectory) => {
-        logger.warn('second-instance====>', event, argv, workingDirectory)
         global.application.showPage('index')
-        if (!is.macOS() && argv.length > 1) { // Windows, Linux
+        if (!is.macOS() && argv.length > 1) {
           this.handleAppLaunchArgv(argv)
         }
       })
 
-      callback()
+      callback && callback()
     }
   }
 
   init () {
     this.exceptionHandler = new ExceptionHandler()
 
+    this.openedAtLogin = is.macOS()
+      ? app.getLoginItemSettings().wasOpenedAtLogin
+      : false
+
+    if (process.argv.length > 1) {
+      this.handleAppLaunchArgv(process.argv)
+    }
+
+    logger.info('[Motrix] openedAtLogin:', this.openedAtLogin)
+
     this.handleAppEvents()
   }
 
@@ -60,11 +72,12 @@ export default class Launcher extends EventEmitter {
 
   /**
    * handleOpenUrl
+   * Event 'open-url' macOS only
    * "name": "Motrix Protocol",
    * "schemes": ["mo", "motrix"]
    */
   handleOpenUrl () {
-    if (is.mas()) {
+    if (is.mas() || !is.macOS()) {
       return
     }
     app.on('open-url', (event, url) => {
@@ -77,30 +90,44 @@ export default class Launcher extends EventEmitter {
 
   /**
    * handleOpenFile
+   * Event 'open-file' macOS only
    * handle open torrent file
    */
   handleOpenFile () {
-    // macOS
-    if (is.macOS()) {
-      app.on('open-file', (event, path) => {
-        logger.info(`[Motrix] open-file: ${path}`)
-        event.preventDefault()
-        this.file = path
-        this.sendFileToApplication()
-      })
-    } else if (process.argv.length > 1) { // Windows, Linux
-      this.handleAppLaunchArgv(process.argv)
+    if (!is.macOS()) {
+      return
     }
+    app.on('open-file', (event, path) => {
+      logger.info(`[Motrix] open-file: ${path}`)
+      event.preventDefault()
+      this.file = path
+      this.sendFileToApplication()
+    })
   }
 
+  /**
+   * handleAppLaunchArgv
+   * For Windows, Linux
+   * @param {array} argv
+   */
   handleAppLaunchArgv (argv) {
-    const file = parseArgvAsFile(argv)
+    logger.info('[Motrix] handleAppLaunchArgv:', argv)
+
+    // args: array, extra: map
+    const { args, extra } = splitArgv(argv)
+    logger.info('[Motrix] split argv args:', args)
+    logger.info('[Motrix] split argv extra:', extra)
+    if (extra['--opened-at-login'] === '1') {
+      this.openedAtLogin = true
+    }
+
+    const file = parseArgvAsFile(args)
     if (file) {
       this.file = file
       this.sendFileToApplication()
     }
 
-    const url = parseArgvAsUrl(argv)
+    const url = parseArgvAsUrl(args)
     if (url) {
       this.url = url
       this.sendUrlToApplication()
@@ -125,7 +152,10 @@ export default class Launcher extends EventEmitter {
     app.on('ready', () => {
       global.application = new Application()
 
-      global.application.start('index')
+      const { openedAtLogin } = this
+      global.application.start('index', {
+        openedAtLogin
+      })
 
       global.application.on('ready', () => {
         this.sendUrlToApplication()

src/main/configs/engine.js

@@ -1,5 +1,5 @@
 export default {
-  'darwin': 'aria2c',
-  'win32': 'aria2c.exe',
-  'linux': 'aria2c'
+  darwin: 'aria2c',
+  win32: 'aria2c.exe',
+  linux: 'aria2c'
 }

src/main/configs/page.js

@@ -6,12 +6,12 @@ export default {
       title: 'Motrix',
       width: 1024,
       height: 768,
-      minWidth: 840,
+      minWidth: 400,
       minHeight: 420,
       // backgroundColor: '#FFFFFF',
       transparent: !is.windows()
     },
     bindCloseToHide: true,
-    url: is.dev() ? `http://localhost:9080` : `file://${__dirname}/index.html`
+    url: is.dev() ? 'http://localhost:9080' : require('path').join('file://', __dirname, '/index.html')
   }
 }

src/main/configs/protocol.js

@@ -1,3 +1,4 @@
+/* eslint quote-props: ["error", "always"] */
 export default {
   'task-list': 'application:task-list',
   'new-task': 'application:new-task',

src/main/core/AutoLaunchManager.js

@@ -0,0 +1,34 @@
+import { app } from 'electron'
+
+import { LOGIN_SETTING_OPTIONS } from '@shared/constants'
+
+export default class AutoLaunchManager {
+  enable () {
+    return new Promise((resolve, reject) => {
+      const enabled = app.getLoginItemSettings(LOGIN_SETTING_OPTIONS).openAtLogin
+      if (enabled) {
+        resolve()
+      }
+
+      app.setLoginItemSettings({
+        ...LOGIN_SETTING_OPTIONS,
+        openAtLogin: true
+      })
+      resolve()
+    })
+  }
+
+  disable () {
+    return new Promise((resolve, reject) => {
+      app.setLoginItemSettings({ openAtLogin: false })
+      resolve()
+    })
+  }
+
+  isEnabled () {
+    return new Promise((resolve, reject) => {
+      const enabled = app.getLoginItemSettings(LOGIN_SETTING_OPTIONS).openAtLogin
+      resolve(enabled)
+    })
+  }
+}

src/main/core/ConfigManager.js

@@ -1,12 +1,24 @@
 import { app } from 'electron'
 import is from 'electron-is'
 import Store from 'electron-store'
+
 import {
   getDhtPath,
   getLogPath,
   getSessionPath,
-  getUserDownloadsPath
+  getUserDownloadsPath,
+  getMaxConnectionPerServer
 } from '../utils/index'
+import {
+  APP_RUN_MODE,
+  APP_THEME,
+  EMPTY_STRING,
+  IP_VERSION,
+  LOGIN_SETTING_OPTIONS,
+  NGOSANG_TRACKERS_BEST_IP_URL_CDN,
+  NGOSANG_TRACKERS_BEST_URL_CDN
+} from '@shared/constants'
+import { separateConfig } from '@shared/utils'
 
 export default class ConfigManager {
   constructor () {
@@ -26,74 +38,46 @@ export default class ConfigManager {
    * https://aria2.github.io/manual/en/html/aria2c.html
    *
    * Best bt trackers
-   * https://github.com/ngosang/trackerslist
+   * @see https://github.com/ngosang/trackerslist
+   *
+   * @see https://github.com/XIU2/TrackersListCollection
    */
   initSystemConfig () {
     this.systemConfig = new Store({
       name: 'system',
+      /* eslint-disable quote-props */
       defaults: {
-        'all-proxy': '',
-        'allow-overwrite': true,
+        'all-proxy': EMPTY_STRING,
+        'allow-overwrite': false,
         'auto-file-renaming': true,
-        'bt-tracker': [
-          'udp://62.138.0.158:6969/announce',
-          'udp://188.241.58.209:6969/announce',
-          'udp://188.241.58.209:6969/announce',
-          'udp://208.83.20.20:6969/announce',
-          'udp://151.80.120.115:2710/announce',
-          'udp://185.225.17.100:1337/announce',
-          'udp://151.80.120.113:2710/announce',
-          'udp://62.210.88.151:1337/announce',
-          'http://176.113.71.19:6961/announce',
-          'http://104.27.134.253:8080/announce',
-          'udp://5.2.79.219:1337/announce',
-          'udp://91.216.110.52:451/announce',
-          'udp://5.206.58.23:6969/announce',
-          'udp://159.100.245.181:6969/announce',
-          'udp://5.2.79.22:6969/announce',
-          'udp://176.31.241.153:80/announce',
-          'udp://95.211.168.204:2710/announce',
-          'udp://188.246.227.212:80/announce',
-          'udp://51.38.184.185:6969/announce',
-          'udp://51.15.40.114:80/announce',
-          'udp://tracker.coppersurfer.tk:6969/announce',
-          'udp://tracker.open-internet.nl:6969/announce',
-          'udp://tracker.leechers-paradise.org:6969/announce',
-          'udp://exodus.desync.com:6969/announce',
-          'udp://tracker.internetwarriors.net:1337/announce',
-          'udp://9.rarbg.to:2710/announce',
-          'udp://9.rarbg.me:2710/announce',
-          'udp://tracker.opentrackr.org:1337/announce',
-          'http://tracker3.itzmx.com:6961/announce',
-          'http://tracker1.itzmx.com:8080/announce',
-          'udp://open.demonii.si:1337/announce',
-          'udp://tracker.torrent.eu.org:451/announce',
-          'udp://tracker.tiny-vps.com:6969/announce',
-          'udp://tracker.cyberia.is:6969/announce',
-          'udp://denis.stalker.upeer.me:6969/announce',
-          'udp://thetracker.org:80/announce',
-          'udp://bt.xxx-tracker.com:2710/announce',
-          'udp://open.stealth.si:80/announce',
-          'udp://tracker.port443.xyz:6969/announce',
-          'udp://ipv4.tracker.harry.lu:80/announce'
-        ].join(','),
+        'bt-exclude-tracker': EMPTY_STRING,
+        'bt-load-saved-metadata': true,
+        'bt-save-metadata': true,
+        'bt-tracker': EMPTY_STRING,
         'continue': true,
-        'dht-file-path': getDhtPath(4),
-        'dht-file-path6': getDhtPath(6),
+        'dht-file-path': getDhtPath(IP_VERSION.V4),
+        'dht-file-path6': getDhtPath(IP_VERSION.V6),
+        'dht-listen-port': 26701,
         'dir': getUserDownloadsPath(),
+        'listen-port': 21301,
         'max-concurrent-downloads': 5,
-        'max-connection-per-server': is.macOS() ? 64 : 16,
+        'max-connection-per-server': getMaxConnectionPerServer(),
         'max-download-limit': 0,
         'max-overall-download-limit': 0,
-        'max-overall-upload-limit': '128K',
+        'max-overall-upload-limit': '256K',
         'min-split-size': '1M',
+        'no-proxy': EMPTY_STRING,
         'pause': true,
         'rpc-listen-port': 16800,
-        'rpc-secret': '',
-        'split': 16,
+        'rpc-secret': EMPTY_STRING,
+        'seed-ratio': 1,
+        'seed-time': 60,
+        'split': getMaxConnectionPerServer(),
         'user-agent': 'Transmission/2.94'
       }
+      /* eslint-enable quote-props */
     })
+    this.fixSystemConfig()
   }
 
   initUserConfig () {
@@ -107,22 +91,71 @@ export default class ConfigManager {
       //     enum: ['auto', 'light', 'dark']
       //   }
       // },
+      /* eslint-disable quote-props */
       defaults: {
-        'all-proxy-backup': '',
-        'auto-check-update': false,
+        'all-proxy-backup': EMPTY_STRING,
+        'auto-check-update': is.macOS(),
+        'auto-hide-window': false,
+        'auto-sync-tracker': true,
+        'enable-upnp': true,
+        'engine-max-connection-per-server': getMaxConnectionPerServer(),
         'hide-app-menu': is.windows() || is.linux(),
+        'keep-seeding': false,
+        'keep-window-state': false,
         'last-check-update-time': 0,
+        'last-sync-tracker-time': 0,
         'locale': app.getLocale(),
         'log-path': getLogPath(),
         'new-task-show-downloading': true,
+        'no-confirm-before-delete-task': false,
+        'open-at-login': false,
+        'protocols': { 'magnet': true, 'thunder': false },
         'resume-all-when-app-launched': false,
+        'run-mode': APP_RUN_MODE.STANDARD,
         'session-path': getSessionPath(),
         'task-notification': true,
-        'theme': 'auto',
+        'theme': APP_THEME.AUTO,
+        'tracker-source': [
+          NGOSANG_TRACKERS_BEST_IP_URL_CDN,
+          NGOSANG_TRACKERS_BEST_URL_CDN
+        ],
+        'tray-theme': APP_THEME.AUTO,
+        'tray-speedometer': is.macOS(),
         'update-channel': 'latest',
-        'use-proxy': false
+        'use-proxy': false,
+        'window-state': {}
       }
+      /* eslint-enable quote-props */
     })
+    this.fixUserConfig()
+  }
+
+  fixSystemConfig () {
+    // Remove aria2c unrecognized options
+    const { others } = separateConfig(this.systemConfig.store)
+    if (!others) {
+      return
+    }
+
+    Object.keys(others).forEach(key => {
+      this.systemConfig.delete(key)
+    })
+  }
+
+  fixUserConfig () {
+    // Fix the value of open-at-login when the user delete
+    // the Motrix self-starting item through startup management.
+    const openAtLogin = app.getLoginItemSettings(LOGIN_SETTING_OPTIONS).openAtLogin
+    if (this.getUserConfig('open-at-login') !== openAtLogin) {
+      this.setUserConfig('open-at-login', openAtLogin)
+    }
+
+    if (this.getUserConfig('tracker-source').length === 0) {
+      this.setUserConfig('tracker-source', [
+        NGOSANG_TRACKERS_BEST_IP_URL_CDN,
+        NGOSANG_TRACKERS_BEST_URL_CDN
+      ])
+    }
   }
 
   getSystemConfig (key, defaultValue) {

src/main/core/EnergyManager.js

@@ -1,6 +1,8 @@
 import { powerSaveBlocker } from 'electron'
 
-let psbId = null
+import logger from './Logger'
+
+let psbId
 export default class EnergyManager {
   startPowerSaveBlocker () {
     if (psbId && powerSaveBlocker.isStarted(psbId)) {
@@ -8,16 +10,16 @@ export default class EnergyManager {
     }
 
     psbId = powerSaveBlocker.start('prevent-app-suspension')
-    console.log('startPowerSaveBlocker===>', psbId)
+    logger.info('[Motrix] start power save blocker:', psbId)
   }
 
   stopPowerSaveBlocker () {
-    if (!psbId || !powerSaveBlocker.isStarted(psbId)) {
+    if (typeof psbId === 'undefined' || !powerSaveBlocker.isStarted(psbId)) {
       return
     }
 
     powerSaveBlocker.stop(psbId)
-    console.log('stopPowerSaveBlocker===>', psbId)
-    psbId = null
+    logger.info('[Motrix] stop power save blocker:', psbId)
+    psbId = undefined
   }
 }

src/main/core/Engine.js

@@ -1,19 +1,22 @@
-'use strict'
-
 import { app } from 'electron'
 import is from 'electron-is'
-import { existsSync } from 'fs'
+import { existsSync, writeFile, unlink } from 'fs'
 import { resolve, join } from 'path'
-import forever from 'forever-monitor'
+import { spawn } from 'child_process'
+
 import logger from './Logger'
-import { getI18n } from '@/ui/Locale'
+import { getI18n } from '../ui/Locale'
 import {
   getEngineBin,
+  getEnginePidPath,
   getSessionPath,
   transformConfig
 } from '../utils/index'
 
+const { platform } = process
+
 export default class Engine {
+  // ChildProcess | null
   static instance = null
 
   constructor (options = {}) {
@@ -22,84 +25,116 @@ export default class Engine {
     this.i18n = getI18n()
     this.systemConfig = options.systemConfig
     this.userConfig = options.userConfig
+    this.basePath = this.getBasePath()
   }
 
-  getStartSh () {
-    const { platform } = process
-    let basePath = resolve(app.getAppPath(), '..')
+  start () {
+    const pidPath = getEnginePidPath()
+    logger.info('[Motrix] Engie pid path:', pidPath)
 
-    if (is.dev()) {
-      basePath = resolve(__dirname, `../../../extra/${platform}`)
+    if (this.instance) {
+      return
     }
 
+    const binPath = this.getBinPath()
+    const args = this.getStartArgs()
+    this.instance = spawn(binPath, args, {
+      windowsHide: false,
+      stdio: is.dev() ? 'pipe' : 'ignore'
+    })
+    const pid = this.instance.pid.toString()
+    this.writePidFile(pidPath, pid)
+
+    this.instance.once('close', function () {
+      try {
+        unlink(pidPath, function (err) {
+          if (err) {
+            logger.warn(`[Motrix] Unlink engine process pid file failed: ${err}`)
+          }
+        })
+      } catch (err) {
+        logger.warn(`[Motrix] Unlink engine process pid file failed: ${err}`)
+      }
+    })
+
+    if (is.dev()) {
+      this.instance.stdout.on('data', function (data) {
+        logger.log('[Motrix] engine stdout===>', data.toString())
+      })
+
+      this.instance.stderr.on('data', function (data) {
+        logger.log('[Motrix] engine stderr===>', data.toString())
+      })
+    }
+  }
+
+  stop () {
+    if (this.instance) {
+      this.instance.kill()
+      this.instance = null
+    }
+  }
+
+  writePidFile (pidPath, pid) {
+    writeFile(pidPath, pid, (err) => {
+      if (err) {
+        logger.error(`[Motrix] Write engine process pid failed: ${err}`)
+      }
+    })
+  }
+
+  getBinPath () {
     const binName = getEngineBin(platform)
     if (!binName) {
       throw new Error(this.i18n.t('app.engine-damaged-message'))
     }
 
-    let binPath = join(basePath, `/engine/${binName}`)
-    const binIsExist = existsSync(binPath)
+    const result = join(this.basePath, `/engine/${binName}`)
+    const binIsExist = existsSync(result)
     if (!binIsExist) {
-      logger.error('[Motrix] engine bin is not exist===>', binPath)
+      logger.error('[Motrix] engine bin is not exist:', result)
       throw new Error(this.i18n.t('app.engine-missing-message'))
     }
 
-    let confPath = join(basePath, '/engine/aria2.conf')
-
-    let sessionPath = this.userConfig['session-path'] || getSessionPath()
-    const sessionIsExist = existsSync(sessionPath)
-
-    let result = [`${binPath}`, `--conf-path=${confPath}`, `--save-session=${sessionPath}`]
-    if (sessionIsExist) {
-      result = [...result, `--input-file=${sessionPath}`]
-    }
-
-    const extraConfig = transformConfig(this.systemConfig)
-    result = [...result, ...extraConfig]
-
     return result
   }
 
-  start () {
-    const sh = this.getStartSh()
-    logger.info('[Motrix] Engine start sh===>', sh)
-    this.instance = forever.start(sh, {
-      max: 10,
-      parser: function (command, args) {
-        return {
-          command: command,
-          args: args
-        }
-      },
-      silent: !is.dev()
-    })
+  getBasePath () {
+    let result = resolve(app.getAppPath(), '..')
 
-    const { child } = this.instance
-    logger.info('[Motrix] Engine pid===>', child.pid)
+    if (is.dev()) {
+      result = resolve(__dirname, `../../../extra/${platform}`)
+    }
 
-    this.instance.on('error', (err) => {
-      logger.info(`[Motrix] Engine error===> ${err}`)
-    })
+    return result
+  }
 
-    this.instance.on('start', function (process, data) {
-      logger.info(`[Motrix] Engine started===>`)
-    })
+  getStartArgs () {
+    const confPath = join(this.basePath, '/engine/aria2.conf')
 
-    this.instance.on('stop', function (process) {
-      logger.info(`[Motrix] Engine stopped===>`)
-    })
+    const sessionPath = this.userConfig['session-path'] || getSessionPath()
+    const sessionIsExist = existsSync(sessionPath)
 
-    this.instance.on('restart', function (forever) {
-      logger.info(`[Motrix] Engine exit===>`)
-    })
+    let result = [`--conf-path=${confPath}`, `--save-session=${sessionPath}`]
+    if (sessionIsExist) {
+      result = [...result, `--input-file=${sessionPath}`]
+    }
 
-    this.instance.on('exit:code', function (code) {
-      logger.info(`[Motrix] Engine exit===> ${code}`)
-    })
+    const extraConfig = {
+      ...this.systemConfig
+    }
+    const keepSeeding = this.userConfig['keep-seeding']
+    const seedRatio = this.systemConfig['seed-ratio']
+    if (keepSeeding || seedRatio === 0) {
+      extraConfig['seed-ratio'] = 0
+      delete extraConfig['seed-time']
+    }
+    console.log('extraConfig===>', extraConfig)
 
-    // this.instance.on('stderr', (data) => {
-    //   logger.info(`[Motrix] Engine stderr===> ${data}`)
-    // })
+    const extra = transformConfig(extraConfig)
+    result = [...result, ...extra]
+
+    return result
   }
 
   isRunning (pid) {
@@ -110,28 +145,6 @@ export default class Engine {
     }
   }
 
-  stop () {
-    const { pid } = this.instance.child
-    try {
-      logger.info('[Motrix] Engine stopping===>')
-      this.instance.stop()
-    } catch (err) {
-      logger.error('[Motrix] Engine stop fail===>', err.message)
-      this.forceStop(pid)
-    } finally {
-    }
-  }
-
-  forceStop (pid) {
-    try {
-      if (pid && this.isRunning(pid)) {
-        process.kill(pid)
-      }
-    } catch (err) {
-      logger.warn('[Motrix] Engine forceStop fail===>', err)
-    }
-  }
-
   restart () {
     this.stop()
     this.start()

src/main/core/EngineClient.js

@@ -0,0 +1,70 @@
+'use strict'
+
+import { Aria2 } from '@shared/aria2'
+
+import logger from './Logger'
+import {
+  compactUndefined,
+  formatOptionsForEngine
+} from '@shared/utils'
+import {
+  ENGINE_RPC_HOST,
+  ENGINE_RPC_PORT,
+  EMPTY_STRING
+} from '@shared/constants'
+
+const defaults = {
+  host: ENGINE_RPC_HOST,
+  port: ENGINE_RPC_PORT,
+  secret: EMPTY_STRING
+}
+
+export default class EngineClient {
+  static instance = null
+  static client = null
+
+  constructor (options = {}) {
+    this.options = {
+      ...defaults,
+      ...options
+    }
+
+    this.init()
+  }
+
+  init () {
+    this.connect()
+  }
+
+  connect () {
+    logger.info('[Motrix] main engine client connect', this.options)
+    const { host, port, secret } = this.options
+    this.client = new Aria2({
+      host,
+      port,
+      secret
+    })
+  }
+
+  async call (method, ...args) {
+    return this.client.call(method, ...args).catch((err) => {
+      logger.warn('[Motrix] call client fail:', err.message)
+    })
+  }
+
+  async changeGlobalOption (options) {
+    logger.info('[Motrix] change engine global option:', options)
+    const args = formatOptionsForEngine(options)
+
+    return this.call('changeGlobalOption', args)
+  }
+
+  async shutdown (options = {}) {
+    const { force = false } = options
+    const { secret } = this.options
+
+    const method = force ? 'forceShutdown' : 'shutdown'
+    const args = compactUndefined([secret])
+    return this.call(method, ...args)
+  }
+}

src/main/core/ExceptionHandler.js

@@ -1,5 +1,6 @@
 import { app, dialog } from 'electron'
 import is from 'electron-is'
+
 import logger from './Logger'
 
 const defaults = {

src/main/core/Logger.js

@@ -2,7 +2,7 @@ import is from 'electron-is'
 import logger from 'electron-log'
 
 logger.transports.file.level = is.production() ? 'warn' : 'silly'
-logger.info('Logger init')
+logger.info('[Motrix] Logger init')
 logger.warn('[Motrix] Logger init')
 
 export default logger

src/main/core/ProtocolManager.js

@@ -1,35 +1,61 @@
-
 import { EventEmitter } from 'events'
 import { app } from 'electron'
+import is from 'electron-is'
+import { parse } from 'querystring'
+
 import logger from './Logger'
 import protocolMap from '../configs/protocol'
+import { ADD_TASK_TYPE } from '@shared/constants'
 
 export default class ProtocolManager extends EventEmitter {
   constructor (options = {}) {
     super()
     this.options = options
 
+    // package.json:build.protocols[].schemes[]
+    // options.protocols: { 'magnet': true, 'thunder': false }
+    this.protocols = {
+      mo: true,
+      motrix: true,
+      ...options.protocols
+    }
+
     this.init()
   }
 
   init () {
-    // package.json:build.protocols[].schemes[]
-    if (!app.isDefaultProtocolClient('mo')) {
-      app.setAsDefaultProtocolClient('mo')
-    }
-    if (!app.isDefaultProtocolClient('motrix')) {
-      app.setAsDefaultProtocolClient('motrix')
-    }
-    if (!app.isDefaultProtocolClient('magnet')) {
-      app.setAsDefaultProtocolClient('magnet')
+    const { protocols } = this
+    this.setup(protocols)
+  }
+
+  setup (protocols) {
+    if (is.dev() || is.mas()) {
+      return
     }
+
+    Object.keys(protocols).forEach((protocol) => {
+      const enabled = protocols[protocol]
+      if (enabled) {
+        if (!app.isDefaultProtocolClient(protocol)) {
+          app.setAsDefaultProtocolClient(protocol)
+        }
+      } else {
+        app.removeAsDefaultProtocolClient(protocol)
+      }
+    })
   }
 
   handle (url) {
     logger.info(`[Motrix] protocol url: ${url}`)
 
-    if (url.toLowerCase().startsWith('magnet:')) {
-      return this.handleMagnetProtocol(url)
+    if (
+      url.toLowerCase().startsWith('ftp:') ||
+      url.toLowerCase().startsWith('http:') ||
+      url.toLowerCase().startsWith('https:') ||
+      url.toLowerCase().startsWith('magnet:') ||
+      url.toLowerCase().startsWith('thunder:')
+    ) {
+      return this.handleResourceProtocol(url)
     }
 
     if (
@@ -40,18 +66,20 @@ export default class ProtocolManager extends EventEmitter {
     }
   }
 
-  handleMagnetProtocol (url) {
+  handleResourceProtocol (url) {
     if (!url) {
       return
     }
-    logger.error(`[Motrix] handleMagnetProtocol url: ${url}`)
 
-    global.application.sendCommandToAll('application:new-task', 'uri', url)
+    global.application.sendCommandToAll('application:new-task', {
+      type: ADD_TASK_TYPE.URI,
+      uri: url
+    })
   }
 
   handleMoProtocol (url) {
     const parsed = new URL(url)
-    const { host } = parsed
+    const { host, search } = parsed
     logger.info('[Motrix] protocol parsed:', parsed, host)
 
     const command = protocolMap[host]
@@ -59,10 +87,8 @@ export default class ProtocolManager extends EventEmitter {
       return
     }
 
-    // @TODO 没想明白怎么传参数好
-    // 如果按顺序传递，那 url 的 query string 就要求有序的了
-    // const query = queryString.parse(parsed.query)
-    const args = []
-    global.application.sendCommandToAll(command, ...args)
+    const query = search.startsWith('?') ? search.replace('?', '') : search
+    const args = parse(query)
+    global.application.sendCommandToAll(command, args)
   }
 }

src/main/core/UPnPManager.js

@@ -0,0 +1,99 @@
+import NatAPI from '@motrix/nat-api'
+
+import logger from './Logger'
+
+let client = null
+const mappingStatus = {}
+
+export default class UPnPManager {
+  constructor (options = {}) {
+    this.options = {
+      ...options
+    }
+  }
+
+  init () {
+    if (client) {
+      return
+    }
+
+    client = new NatAPI({
+      autoUpdate: true
+    })
+  }
+
+  map (port) {
+    this.init()
+
+    return new Promise((resolve, reject) => {
+      logger.info('[Motrix] UPnPManager port mapping: ', port)
+      if (!port) {
+        reject(new Error('[Motrix] port was not specified'))
+        return
+      }
+
+      try {
+        client.map(port, (err) => {
+          if (err) {
+            logger.warn(`[Motrix] UPnPManager map ${port} failed, error: `, err)
+            reject(err.message)
+            return
+          }
+
+          mappingStatus[port] = true
+          logger.info(`[Motrix] UPnPManager port ${port} mapping succeeded`)
+          resolve()
+        })
+      } catch (err) {
+        reject(err.message)
+      }
+    })
+  }
+
+  unmap (port) {
+    this.init()
+
+    return new Promise((resolve, reject) => {
+      logger.info('[Motrix] UPnPManager port unmapping: ', port)
+      if (!port) {
+        reject(new Error('[Motrix] port was not specified'))
+        return
+      }
+
+      if (!mappingStatus[port]) {
+        resolve()
+        return
+      }
+
+      try {
+        client.unmap(port, (err) => {
+          if (err) {
+            logger.warn(`[Motrix] UPnPManager unmap ${port} failed, error: `, err)
+            reject(err.message)
+            return
+          }
+
+          logger.info(`[Motrix] UPnPManager port ${port} unmapping succeeded`)
+          mappingStatus[port] = false
+          resolve()
+        })
+      } catch (err) {
+        reject(err.message)
+      }
+    })
+  }
+
+  closeClient () {
+    if (!client) {
+      return
+    }
+
+    try {
+      client.destroy(() => {
+        client = null
+      })
+    } catch (err) {
+      logger.warn('[Motrix] close UPnP client fail', err)
+    }
+  }
+}

src/main/core/UpdateManager.js

@@ -1,10 +1,11 @@
 import { EventEmitter } from 'events'
+import { resolve } from 'path'
 import { dialog } from 'electron'
 import is from 'electron-is'
 import { autoUpdater } from 'electron-updater'
-import { resolve } from 'path'
+
 import logger from './Logger'
-import { getI18n } from '@/ui/Locale'
+import { getI18n } from '../ui/Locale'
 
 if (is.dev()) {
   autoUpdater.updateConfigPath = resolve(__dirname, '../../../app-update.yml')
@@ -43,13 +44,11 @@ export default class UpdateManager extends EventEmitter {
 
     if (this.autoCheckData.checkEnable) {
       this.autoCheckData.userCheck = false
-      this.options.setCheckTime.setUserConfig('last-check-update-time', new Date().getTime())
       this.updater.checkForUpdates()
     }
   }
 
   check () {
-    this.options.setCheckTime.setUserConfig('last-check-update-time', new Date().getTime())
     this.autoCheckData.userCheck = true
     this.updater.checkForUpdates()
   }
@@ -66,8 +65,8 @@ export default class UpdateManager extends EventEmitter {
       message: this.i18n.t('app.update-available-message'),
       buttons: [this.i18n.t('app.yes'), this.i18n.t('app.no')],
       cancelId: 1
-    }, (buttonIndex) => {
-      if (buttonIndex === 0) {
+    }).then(({ response }) => {
+      if (response === 0) {
         this.updater.downloadUpdate()
       }
     })
@@ -102,7 +101,7 @@ export default class UpdateManager extends EventEmitter {
     dialog.showMessageBox({
       title: this.i18n.t('app.check-for-updates-title'),
       message: this.i18n.t('app.update-downloaded-message')
-    }, () => {
+    }).then(_ => {
       this.emit('will-updated')
       setImmediate(() => {
         this.updater.quitAndInstall()
@@ -112,7 +111,10 @@ export default class UpdateManager extends EventEmitter {
 
   updateError (event, error) {
     this.emit('update-error', error)
-    const msg = error == null ? this.i18n.t('update-error-message') : (error.stack || error).toString()
+    const msg = (error == null)
+      ? this.i18n.t('update-error-message')
+      : (error.stack || error).toString()
+
     this.updater.logger.warn(`[Motrix] update-error: ${msg}`)
     dialog.showErrorBox(msg)
   }

src/main/index.dev.js

@@ -14,7 +14,7 @@ require('electron-debug')({
 })
 
 // Install `vue-devtools`
-require('electron').app.on('ready', () => {
+require('electron').app.whenReady().then(() => {
   let installExtension = require('electron-devtools-installer')
   installExtension.default(installExtension.VUEJS_DEVTOOLS)
     .then(() => {})

src/main/index.js

@@ -1,8 +1,16 @@
 import { app } from 'electron'
 import is from 'electron-is'
+import { initialize } from '@electron/remote/main'
 
 import Launcher from './Launcher'
 
+/**
+ * initialize the main-process side of the remote module
+ */
+initialize()
+
+process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = 'true'
+
 if (process.env.NODE_ENV !== 'development') {
   global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
 }

src/main/menus/darwin.json

@@ -3,7 +3,7 @@
     {
       "id": "menu.app",
       "submenu": [
-        { "id": "app.about", "command": "application:about", "command-before": "application:show,index" },
+        { "id": "app.about", "command": "application:about", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "app.preferences", "command": "application:preferences" },
         { "id": "app.check-for-updates", "command": "application:check-for-updates" },
@@ -17,9 +17,9 @@
     {
       "id": "menu.task",
       "submenu": [
-        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show,index" },
-        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-arg": "torrent", "command-after": "application:show,index" },
-        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show,index" },
+        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show?page=index" },
+        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-after": "application:show?page=index" },
+        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "task.pause-task", "command": "application:pause-task" },
         { "id": "task.resume-task", "command": "application:resume-task" },
@@ -29,6 +29,7 @@
         { "type": "separator" },
         { "id": "task.pause-all-task", "command": "application:pause-all-task" },
         { "id": "task.resume-all-task", "command": "application:resume-all-task" },
+        { "id": "task.select-all-task", "command": "application:select-all-task" },
         { "type": "separator" },
         { "id": "task.clear-recent-tasks", "command": "application:clear-recent-tasks" }
       ]

src/main/menus/linux.json

@@ -3,11 +3,11 @@
     {
       "id": "menu.file",
       "submenu": [
-        { "id": "app.about", "command": "application:about", "command-before": "application:show,index" },
+        { "id": "app.about", "command": "application:about", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "app.preferences", "command": "application:preferences" },
         { "id": "app.check-for-updates", "command": "application:check-for-updates" },
-        { "id": "app.show", "command": "application:show", "command-arg": "index" },
+        { "id": "app.show", "command": "application:show", "command-arg": { "page": "index" } },
         { "type": "separator" },
         { "id": "app.quit", "role": "quit" }
       ]
@@ -15,9 +15,9 @@
     {
       "id": "menu.task",
       "submenu": [
-        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show,index" },
-        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-arg": "torrent", "command-after": "application:show,index" },
-        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show,index" },
+        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show?page=index" },
+        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-after": "application:show?page=index" },
+        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "task.pause-task", "command": "application:pause-task" },
         { "id": "task.resume-task", "command": "application:resume-task" },
@@ -26,7 +26,8 @@
         { "id": "task.move-task-down", "command": "application:move-task-down" },
         { "type": "separator" },
         { "id": "task.pause-all-task", "command": "application:pause-all-task" },
-        { "id": "task.resume-all-task", "command": "application:resume-all-task" }
+        { "id": "task.resume-all-task", "command": "application:resume-all-task" },
+        { "id": "task.select-all-task", "command": "application:select-all-task" }
       ]
     },
     {

src/main/menus/touchBar.json

@@ -1,6 +1,6 @@
 [
   {
-    "type": "button", "icon": "new-task", "id": "task.new-task", "command": "application:new-task", "command-arg": "uri", "command-after": "application:show,index"
+    "type": "button", "icon": "new-task", "id": "task.new-task", "command": "application:new-task", "command-after": "application:show?page=index"
   },
   {
     "type": "spacer", "size": "small"
@@ -10,13 +10,13 @@
     "id": "task.task-list",
     "items": [
       {
-        "type": "button", "icon": "task-active", "command": "application:task-list", "command-arg": "active"
+        "type": "button", "icon": "task-active", "command": "application:task-list", "command-arg": { "status": "active" }
       },
       {
-        "type": "button", "icon": "task-waiting", "command": "application:task-list", "command-arg": "waiting"
+        "type": "button", "icon": "task-waiting", "command": "application:task-list", "command-arg": { "status": "waiting" }
       },
       {
-        "type": "button", "icon": "task-stopped", "command": "application:task-list", "command-arg": "stopped"
+        "type": "button", "icon": "task-stopped", "command": "application:task-list", "command-arg": { "status": "stopped" }
       }
     ]
   },
@@ -30,6 +30,6 @@
     "type": "spacer", "size": "small"
   },
   {
-    "type": "button", "icon": "about", "id": "app.about", "command": "application:about", "command-before": "application:show,index"
+    "type": "button", "icon": "about", "id": "app.about", "command": "application:about", "command-before": "application:show?page=index"
   }
 ]

src/main/menus/tray.json

@@ -1,11 +1,12 @@
 [
-  { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show,index" },
-  { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-arg": "torrent", "command-after": "application:show,index" },
-  { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show,index" },
+  { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show?page=index" },
+  { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-arg": { "type": "torrent" }, "command-after": "application:show?page=index" },
+  { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show?page=index" },
   { "type": "separator" },
-  { "id": "app.show", "command": "application:show", "command-arg": "index" },
+  { "id": "app.show", "command": "application:show", "command-arg": { "page": "index" } },
   { "id": "help.manual", "command": "help:manual" },
+  { "id": "app.check-for-updates", "command": "application:check-for-updates" },
   { "type": "separator" },
-  { "id": "app.preferences", "command": "application:preferences", "command-before": "application:show,index" },
-  { "id": "app.quit", "role": "quit" }
+  { "id": "app.preferences", "command": "application:preferences", "command-before": "application:show?page=index" },
+  { "id": "app.quit", "command": "application:quit" }
 ]

src/main/menus/win32.json

@@ -3,11 +3,11 @@
     {
       "id": "menu.file",
       "submenu": [
-        { "id": "app.about", "command": "application:about", "command-before": "application:show,index" },
+        { "id": "app.about", "command": "application:about", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "app.preferences", "command": "application:preferences" },
         { "id": "app.check-for-updates", "command": "application:check-for-updates" },
-        { "id": "app.show", "command": "application:show", "command-arg": "index" },
+        { "id": "app.show", "command": "application:show", "command-arg": { "page": "index" } },
         { "type": "separator" },
         { "id": "app.quit", "role": "quit" }
       ]
@@ -15,9 +15,9 @@
     {
       "id": "menu.task",
       "submenu": [
-        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show,index" },
-        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-arg": "torrent", "command-after": "application:show,index" },
-        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show,index" },
+        { "id": "task.new-task", "command": "application:new-task", "command-after": "application:show?page=index" },
+        { "id": "task.new-bt-task", "command": "application:new-bt-task", "command-after": "application:show?page=index" },
+        { "id": "task.open-file", "command": "application:open-file", "command-before": "application:show?page=index" },
         { "type": "separator" },
         { "id": "task.pause-task", "command": "application:pause-task" },
         { "id": "task.resume-task", "command": "application:resume-task" },
@@ -27,6 +27,7 @@
         { "type": "separator" },
         { "id": "task.pause-all-task", "command": "application:pause-all-task" },
         { "id": "task.resume-all-task", "command": "application:resume-all-task" },
+        { "id": "task.select-all-task", "command": "application:select-all-task" },
         { "type": "separator" },
         { "id": "task.clear-recent-tasks", "command": "application:clear-recent-tasks" }
       ]

src/main/ui/DockManager.js

@@ -0,0 +1,62 @@
+import is from 'electron-is'
+import { EventEmitter } from 'events'
+import { app } from 'electron'
+
+import { bytesToSize } from '@shared/utils'
+
+import {
+  APP_RUN_MODE
+} from '@shared/constants'
+
+const isMac = is.macOS()
+
+export default class DockManager extends EventEmitter {
+  constructor (options) {
+    super()
+    this.options = options
+    const { runMode } = this.options
+    if (runMode !== APP_RUN_MODE.STANDARD) {
+      this.hide()
+    }
+  }
+
+  show = isMac
+    ? () => {
+      if (app.dock.isVisible()) {
+        return
+      }
+
+      return app.dock.show()
+    }
+    : () => {}
+
+  hide = isMac
+    ? () => {
+      if (!app.dock.isVisible()) {
+        return
+      }
+
+      app.dock.hide()
+    }
+    : () => {}
+
+  setBadge = isMac
+    ? (text) => {
+      app.dock.setBadge(text)
+    }
+    : (text) => {}
+
+  handleSpeedChange = isMac
+    ? (speed) => {
+      const { downloadSpeed } = speed
+      const text = downloadSpeed > 0 ? `${bytesToSize(downloadSpeed)}/s` : ''
+      this.setBadge(text)
+    }
+    : (text) => {}
+
+  openDock = isMac
+    ? (path) => {
+      app.dock.downloadFinished(path)
+    }
+    : (path) => {}
+}

src/main/ui/MenuManager.js

@@ -1,12 +1,13 @@
 import { EventEmitter } from 'events'
 import { Menu } from 'electron'
+
 import {
   translateTemplate,
   flattenMenuItems,
   updateStates
 } from '../utils/menu'
 import keymap from '@shared/keymap'
-import { getI18n } from '@/ui/Locale'
+import { getI18n } from '../ui/Locale'
 
 export default class MenuManager extends EventEmitter {
   constructor (options) {
@@ -23,13 +24,13 @@ export default class MenuManager extends EventEmitter {
   }
 
   load () {
-    let template = require(`../menus/${process.platform}.json`)
-    this.template = template['menu']
+    const template = require(`../menus/${process.platform}.json`)
+    this.template = template.menu
   }
 
   build () {
     const keystrokesByCommand = {}
-    for (let item in this.keymap) {
+    for (const item in this.keymap) {
       keystrokesByCommand[this.keymap[item]] = item
     }
 
@@ -46,11 +47,11 @@ export default class MenuManager extends EventEmitter {
     this.items = flattenMenuItems(menu)
   }
 
-  rebuild () {
+  handleLocaleChange (locale) {
     this.setup()
   }
 
-  updateStates (visibleStates, enabledStates, checkedStates) {
+  updateMenuStates (visibleStates, enabledStates, checkedStates) {
     updateStates(this.items, visibleStates, enabledStates, checkedStates)
   }
 
@@ -58,13 +59,13 @@ export default class MenuManager extends EventEmitter {
     const visibleStates = {
       [id]: flag
     }
-    this.updateStates(visibleStates, null, null)
+    this.updateMenuStates(visibleStates, null, null)
   }
 
   updateMenuItemEnabledState (id, flag) {
     const enabledStates = {
       [id]: flag
     }
-    this.updateStates(null, enabledStates, null)
+    this.updateMenuStates(null, enabledStates, null)
   }
 }

src/main/ui/ThemeManager.js

@@ -1,44 +1,47 @@
 import { EventEmitter } from 'events'
-import { systemPreferences } from 'electron'
+import { nativeTheme, systemPreferences } from 'electron'
 import is from 'electron-is'
-import { LIGHT_THEME, DARK_THEME } from '@shared/constants'
+
+import { APP_THEME } from '@shared/constants'
+import { getSystemTheme } from '../utils'
 
 export default class ThemeManager extends EventEmitter {
   constructor (options = {}) {
     super()
 
+    this.options = options
     this.init()
   }
 
   init () {
+    this.systemTheme = getSystemTheme()
+
     this.handleEvents()
   }
 
   getSystemTheme () {
-    let result = LIGHT_THEME
-    if (!is.macOS()) {
-      return result
-    }
-    result = systemPreferences.isDarkMode() ? DARK_THEME : LIGHT_THEME
-    return result
+    return this.systemTheme
   }
 
   handleEvents () {
     if (!is.macOS()) {
       return
     }
-    systemPreferences.subscribeNotification(
-      'AppleInterfaceThemeChangedNotification',
-      () => {
-        const theme = this.getSystemTheme()
-        this.updateAppAppearance(theme)
-        this.emit('system-theme-changed', theme)
-      }
-    )
+
+    nativeTheme.on('updated', () => {
+      const theme = getSystemTheme()
+      this.systemTheme = theme
+      console.log('nativeTheme updated===>', theme)
+      this.emit('system-theme-change', theme)
+    })
   }
 
+  /**
+   * deprecated
+   * @see https://www.electronjs.org/docs/all#systempreferencessetapplevelappearanceappearance-macos-deprecated
+   */
   updateAppAppearance (theme) {
-    if (!is.macOS() || theme !== LIGHT_THEME || theme !== DARK_THEME) {
+    if (!is.macOS() || theme !== APP_THEME.LIGHT || theme !== APP_THEME.DARK) {
       return
     }
     systemPreferences.setAppLevelAppearance(theme)

src/main/ui/TouchBarManager.js

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events'
 import { join } from 'path'
 import { TouchBar, nativeImage } from 'electron'
+
 import { handleCommand } from '../utils/menu'
 import logger from '../core/Logger'
 
@@ -15,7 +16,7 @@ export default class TouchBarManager extends EventEmitter {
   }
 
   load () {
-    this.template = require(`../menus/touchBar.json`)
+    this.template = require('../menus/touchBar.json')
   }
 
   getClickFn (item) {
@@ -41,30 +42,32 @@ export default class TouchBarManager extends EventEmitter {
     const { label, backgroundColor, textColor, size } = options
 
     switch (type) {
-      case 'button':
-        const icon = this.getIconImage(options.icon)
-        const click = this.getClickFn(options)
-        result = new TouchBarButton({
-          label,
-          backgroundColor,
-          icon,
-          click
+    case 'button':
+      result = new TouchBarButton({
+        label,
+        backgroundColor,
+        icon: this.getIconImage(options.icon),
+        click: this.getClickFn(options)
+      })
+      break
+    case 'label':
+      result = new TouchBarLabel({
+        label,
+        textColor
+      })
+      break
+    case 'spacer':
+      result = new TouchBarSpacer({ size })
+      break
+    case 'group':
+      result = new TouchBarGroup({
+        items: new TouchBar({
+          items: options.items
         })
-        break
-      case 'label':
-        result = new TouchBarLabel({
-          label,
-          textColor
-        })
-        break
-      case 'spacer':
-        result = new TouchBarSpacer({ size })
-        break
-      case 'group':
-        result = new TouchBarGroup({ items: options.items })
-        break
-      default:
-        result = null
+      })
+      break
+    default:
+      result = null
     }
 
     return result
@@ -90,7 +93,7 @@ export default class TouchBarManager extends EventEmitter {
     if (!bar) {
       try {
         const items = this.build(this.template)
-        bar = new TouchBar(items)
+        bar = new TouchBar({ items })
         this.bars[page] = bar
       } catch (e) {
         logger.info('getTouchBarByPage fail', e)

src/main/ui/TrayManager.js

@@ -1,43 +1,147 @@
 import { EventEmitter } from 'events'
 import { join } from 'path'
-import { Tray, Menu, systemPreferences } from 'electron'
+import { Tray, Menu, nativeImage } from 'electron'
 import is from 'electron-is'
-import { translateTemplate } from '../utils/menu'
-import { getI18n } from '@/ui/Locale'
-import { LIGHT_THEME, DARK_THEME } from '@shared/constants'
+
+import { APP_THEME } from '@shared/constants'
+import { getInverseTheme, getSystemMajorVersion } from '@shared/utils'
+import { getI18n } from './Locale'
+import {
+  translateTemplate,
+  flattenMenuItems,
+  updateStates
+} from '../utils/menu'
+import { convertArrayBufferToBuffer } from '../utils/index'
+// import logger from '../core/Logger'
 
 let tray = null
+const { platform } = process
 
 export default class TrayManager extends EventEmitter {
   constructor (options = {}) {
     super()
 
+    this.options = options
+    this.theme = options.theme || APP_THEME.AUTO
+
+    this.systemTheme = options.systemTheme
+    this.inverseSystemTheme = getInverseTheme(this.systemTheme)
+    this.bigSur = platform === 'darwin' && getSystemMajorVersion() >= 20
+
+    this.speedometer = options.speedometer
+
     this.i18n = getI18n()
-
     this.menu = null
+    this.cache = {}
+
+    this.uploadSpeed = 0
+    this.downloadSpeed = 0
+    this.status = false
+    this.focused = false
 
-    this.load()
     this.init()
-    this.setup()
+  }
+
+  init () {
+    this.loadTemplate()
+
+    this.loadImages()
+
+    this.initTray()
+
+    this.setupMenu()
+
     this.handleEvents()
   }
 
-  load () {
-    this.template = require(`../menus/tray.json`)
-    const theme = systemPreferences.isDarkMode() ? DARK_THEME : LIGHT_THEME
+  loadTemplate () {
+    this.template = require('../menus/tray.json')
+  }
 
-    if (is.macOS()) {
-      this.normalIcon = join(__static, `./mo-tray-${theme}-normal.png`)
-      this.activeIcon = join(__static, `./mo-tray-${theme}-active.png`)
-    } else {
-      this.normalIcon = join(__static, './mo-tray-colorful-normal.png')
-      this.activeIcon = join(__static, './mo-tray-colorful-active.png')
+  loadImages () {
+    switch (platform) {
+    case 'darwin':
+      this.loadImagesForMacOS()
+      break
+    case 'win32':
+      this.loadImagesForWindows()
+      break
+    case 'linux':
+      this.loadImagesForLinux()
+      break
+
+    default:
+      this.loadImagesForDefault()
+      break
     }
   }
 
-  build () {
+  loadImagesForMacOS () {
+    if (this.bigSur) {
+      const {
+        systemTheme,
+        inverseSystemTheme
+      } = this
+
+      this.normalIcon = this.getFromCacheOrCreateImage(`mo-tray-${systemTheme}-normal.png`)
+      this.activeIcon = this.getFromCacheOrCreateImage(`mo-tray-${systemTheme}-active.png`)
+
+      // if (systemTheme === APP_THEME.DARK) {
+      //   this.inverseNormalIcon = this.normalIcon
+      //   this.inverseActiveIcon = this.activeIcon
+      // } else {
+      this.inverseNormalIcon = this.getFromCacheOrCreateImage(`mo-tray-${inverseSystemTheme}-normal.png`)
+      this.inverseActiveIcon = this.getFromCacheOrCreateImage(`mo-tray-${inverseSystemTheme}-active.png`)
+      // }
+    } else {
+      this.normalIcon = this.getFromCacheOrCreateImage('mo-tray-light-normal.png')
+    }
+  }
+
+  loadImagesForWindows () {
+    this.normalIcon = this.getFromCacheOrCreateImage('mo-tray-colorful-normal.png')
+    this.activeIcon = this.getFromCacheOrCreateImage('mo-tray-colorful-active.png')
+  }
+
+  loadImagesForLinux () {
+    const { theme } = this
+    if (theme === APP_THEME.AUTO) {
+      this.normalIcon = this.getFromCacheOrCreateImage('mo-tray-dark-normal.png')
+      this.activeIcon = this.getFromCacheOrCreateImage('mo-tray-dark-active.png')
+    } else {
+      this.normalIcon = this.getFromCacheOrCreateImage(`mo-tray-${theme}-normal.png`)
+      this.activeIcon = this.getFromCacheOrCreateImage(`mo-tray-${theme}-active.png`)
+    }
+  }
+
+  loadImagesForDefault () {
+    this.normalIcon = this.getFromCacheOrCreateImage('mo-tray-light-normal.png')
+    this.activeIcon = this.getFromCacheOrCreateImage('mo-tray-light-active.png')
+  }
+
+  getFromCacheOrCreateImage (key) {
+    let file = this.getCache(key)
+    if (file) {
+      return file
+    }
+
+    file = nativeImage.createFromPath(join(__static, `./${key}`))
+    file.setTemplateImage(this.bigSur)
+    this.setCache(key, file)
+    return file
+  }
+
+  getCache (key) {
+    return this.cache[key]
+  }
+
+  setCache (key, value) {
+    this.cache[key] = value
+  }
+
+  buildMenu () {
     const keystrokesByCommand = {}
-    for (let item in this.keymap) {
+    for (const item in this.keymap) {
       keystrokesByCommand[this.keymap[item]] = item
     }
 
@@ -45,75 +149,209 @@ export default class TrayManager extends EventEmitter {
     const template = JSON.parse(JSON.stringify(this.template))
     const tpl = translateTemplate(template, keystrokesByCommand, this.i18n)
     this.menu = Menu.buildFromTemplate(tpl)
+    this.items = flattenMenuItems(this.menu)
   }
 
-  setup () {
-    this.build()
+  setupMenu () {
+    this.buildMenu()
 
-    /**
-     * Linux requires setContextMenu to be called
-     * in order for the context menu to populate correctly
-     */
-    if (process.platform === 'linux') {
-      tray.setContextMenu(this.menu)
-    }
+    this.updateContextMenu()
   }
 
-  init () {
-    tray = new Tray(this.normalIcon)
+  initTray () {
+    const { icon } = this.getIcons()
+    tray = new Tray(icon)
+    // tray.setPressedImage(inverseIcon)
+
     tray.setToolTip('Motrix')
   }
 
   handleEvents () {
+    // All OS
     tray.on('click', this.handleTrayClick)
-    tray.on('double-click', this.handleTrayDbClick)
-    tray.on('right-click', this.handleTrayRightClick)
 
-    tray.on('drop-files', this.handleTrayDropFile)
+    // macOS, Windows
+    // tray.on('double-click', this.handleTrayDbClick)
+    tray.on('right-click', this.handleTrayRightClick)
+    tray.on('mouse-down', this.handleTrayMouseDown)
+    tray.on('mouse-up', this.handleTrayMouseUp)
+
+    // macOS only
+    tray.setIgnoreDoubleClickEvents(true)
+    tray.on('drop-files', this.handleTrayDropFiles)
+    tray.on('drop-text', this.handleTrayDropText)
   }
 
   handleTrayClick = (event) => {
-    event.preventDefault()
     global.application.toggle()
   }
 
   handleTrayDbClick = (event) => {
-    event.preventDefault()
     global.application.show()
   }
 
   handleTrayRightClick = (event) => {
-    event.preventDefault()
     tray.popUpContextMenu(this.menu)
   }
 
-  handleTrayDropFile = (event, files) => {
-    global.application.show()
-    global.application.handleFile(files[0])
+  handleTrayMouseDown = (event) => {
+    this.focused = true
+    this.emit('mouse-down', {
+      focused: true,
+      theme: this.inverseSystemTheme
+    })
+    this.renderTray()
   }
 
-  updateStatus (status) {
-    this.status = status
-    this.updateIcon()
+  handleTrayMouseUp = (event) => {
+    this.focused = false
+    this.emit('mouse-up', {
+      focused: false,
+      theme: this.theme
+    })
+    this.renderTray()
   }
 
-  updateIcon () {
-    const icon = this.status ? this.activeIcon : this.normalIcon
+  handleTrayDropFiles = (event, files) => {
+    this.emit('drop-files', files)
+  }
+
+  handleTrayDropText = (event, text) => {
+    this.emit('drop-text', text)
+  }
+
+  toggleSpeedometer (enabled) {
+    this.speedometer = enabled
+  }
+
+  async renderTray () {
+    if (this.speedometer) {
+      return
+    }
+
+    const { icon } = this.getIcons()
+
     tray.setImage(icon)
+    // tray.setPressedImage(inverseIcon)
+
+    this.updateContextMenu()
   }
 
-  changeIconTheme (theme = LIGHT_THEME) {
+  getIcons () {
+    if (this.bigSur) {
+      return { icon: this.normalIcon }
+    }
+
+    const { focused, status, systemTheme } = this
+
+    const icon = status ? this.activeIcon : this.normalIcon
+    if (systemTheme === APP_THEME.DARK) {
+      return {
+        icon
+      }
+    }
+
+    const inverseIcon = status ? this.inverseActiveIcon : this.inverseNormalIcon
+
+    return {
+      icon: focused ? inverseIcon : icon
+      // inverseIcon: focused ? icon : inverseIcon
+    }
+  }
+
+  updateContextMenu () {
+    /**
+     * Linux requires setContextMenu to be called
+     * in order for the context menu to populate correctly
+     */
+    if (process.platform !== 'linux') {
+      return
+    }
+
+    tray.setContextMenu(this.menu)
+  }
+
+  updateMenuStates (visibleStates, enabledStates, checkedStates) {
+    updateStates(this.items, visibleStates, enabledStates, checkedStates)
+
+    this.updateContextMenu()
+  }
+
+  updateMenuItemVisibleState (id, flag) {
+    const visibleStates = {
+      [id]: flag
+    }
+    this.updateMenuStates(visibleStates, null, null)
+  }
+
+  updateMenuItemEnabledState (id, flag) {
+    const enabledStates = {
+      [id]: flag
+    }
+    this.updateMenuStates(null, enabledStates, null)
+  }
+
+  handleLocaleChange (locale) {
+    this.setupMenu()
+  }
+
+  handleSpeedometerEnableChange (enabled) {
+    this.toggleSpeedometer(enabled)
+
+    this.renderTray()
+  }
+
+  handleSystemThemeChange (systemTheme = APP_THEME.LIGHT) {
     if (!is.macOS()) {
       return
     }
 
-    this.normalIcon = join(__static, `./mo-tray-${theme}-normal.png`)
-    this.activeIcon = join(__static, `./mo-tray-${theme}-active.png`)
+    this.systemTheme = systemTheme
+    this.inverseSystemTheme = getInverseTheme(systemTheme)
 
-    this.updateIcon()
+    this.loadImages()
+
+    this.renderTray()
+  }
+
+  handleDownloadStatusChange (status) {
+    this.status = status
+
+    this.renderTray()
+  }
+
+  async handleSpeedChange ({ uploadSpeed, downloadSpeed }) {
+    if (!this.speedometer) {
+      return
+    }
+
+    this.uploadSpeed = uploadSpeed
+    this.downloadSpeed = downloadSpeed
+
+    await this.renderTray()
+  }
+
+  async updateTrayByImage (ab) {
+    const buffer = convertArrayBufferToBuffer(ab)
+    const image = nativeImage.createFromBuffer(buffer, {
+      scaleFactor: 2
+    })
+    image.setTemplateImage(this.bigSur)
+    tray.setImage(image)
   }
 
   destroy () {
+    if (tray) {
+      tray.removeListener('click', this.handleTrayClick)
+      // tray.removeListener('double-click', this.handleTrayDbClick)
+      tray.removeListener('right-click', this.handleTrayRightClick)
+      tray.removeListener('mouse-down', this.handleTrayMouseDown)
+      tray.removeListener('mouse-up', this.handleTrayMouseUp)
+
+      tray.removeListener('drop-files', this.handleTrayDropFiles)
+      tray.removeListener('drop-text', this.handleTrayDropText)
+    }
+
     tray.destroy()
   }
 }

src/main/ui/WindowManager.js

@@ -4,10 +4,10 @@ import { app, shell, screen, BrowserWindow } from 'electron'
 import is from 'electron-is'
 import pageConfig from '../configs/page'
 import logger from '../core/Logger'
+import { debounce } from 'lodash'
 
 const defaultBrowserOptions = {
   titleBarStyle: 'hiddenInset',
-  useContentSize: true,
   show: false,
   width: 1024,
   height: 768,
@@ -57,41 +57,78 @@ export default class WindowManager extends EventEmitter {
     return result
   }
 
-  openWindow (page) {
-    const options = this.getPageOptions(page)
+  getPageBounds (page) {
+    const enabled = this.userConfig['keep-window-state']
+    const windowStateMap = this.userConfig['window-state'] || {}
+    let result = null
+    if (enabled) {
+      result = windowStateMap[page]
+    }
 
+    return result
+  }
+
+  openWindow (page, options = {}) {
+    const pageOptions = this.getPageOptions(page)
+    const { hidden } = options
+    const autoHideWindow = this.userConfig['auto-hide-window']
     let window = this.windows[page] || null
     if (window) {
-      window.restore()
+      window.show()
       window.focus()
       return window
     }
 
     window = new BrowserWindow({
       ...defaultBrowserOptions,
-      ...options.attrs
+      ...pageOptions.attrs,
+      webPreferences: {
+        enableRemoteModule: true,
+        contextIsolation: false,
+        nodeIntegration: true,
+        nodeIntegrationInWorker: true
+      },
+      hasShadow: !is.macOS()
     })
 
+    const bounds = this.getPageBounds(page)
+    if (bounds) {
+      window.setBounds(bounds)
+    }
+
     window.webContents.on('new-window', (e, url) => {
       e.preventDefault()
       shell.openExternal(url)
     })
 
-    if (options.url) {
-      window.loadURL(options.url)
+    if (pageOptions.url) {
+      window.loadURL(pageOptions.url)
     }
 
     window.once('ready-to-show', () => {
-      window.show()
+      if (!hidden) {
+        window.show()
+      }
     })
 
-    if (options.bindCloseToHide) {
-      this.bindCloseToHide(page, window)
-    }
+    window.on('enter-full-screen', () => {
+      this.emit('enter-full-screen', window)
+    })
+
+    window.on('leave-full-screen', () => {
+      this.emit('leave-full-screen', window)
+    })
+
+    this.handleWindowState(page, window)
+
+    this.handleWindowClose(pageOptions, page, window)
 
     this.bindAfterClosed(page, window)
 
     this.addWindow(page, window)
+    if (autoHideWindow) {
+      this.handleWindowBlur()
+    }
     return window
   }
 
@@ -114,6 +151,9 @@ export default class WindowManager extends EventEmitter {
   destroyWindow (page) {
     const win = this.getWindow(page)
     this.removeWindow(page)
+    win.removeListener('closed')
+    win.removeListener('move')
+    win.removeListener('resize')
     win.destroy()
   }
 
@@ -127,26 +167,49 @@ export default class WindowManager extends EventEmitter {
     })
   }
 
-  bindCloseToHide (page, window) {
+  handleWindowState (page, window) {
+    window.on('resize', debounce(() => {
+      const bounds = window.getBounds()
+      this.emit('window-resized', { page, bounds })
+    }, 500))
+
+    window.on('move', debounce(() => {
+      const bounds = window.getBounds()
+      this.emit('window-moved', { page, bounds })
+    }, 500))
+  }
+
+  handleWindowClose (pageOptions, page, window) {
     window.on('close', (event) => {
-      if (!this.willQuit) {
+      if (pageOptions.bindCloseToHide && !this.willQuit) {
         event.preventDefault()
-        window.hide()
+
+        // @see https://github.com/electron/electron/issues/20263
+        if (window.isFullScreen()) {
+          window.once('leave-full-screen', () => window.hide())
+
+          window.setFullScreen(false)
+        } else {
+          window.hide()
+        }
       }
+      const bounds = window.getBounds()
+      this.emit('window-closed', { page, bounds })
     })
   }
 
   showWindow (page) {
     const window = this.getWindow(page)
-    if (!window) {
+    if (!window || window.isVisible()) {
       return
     }
+
     window.show()
   }
 
   hideWindow (page) {
     const window = this.getWindow(page)
-    if (!window) {
+    if (!window || !window.isVisible()) {
       return
     }
     window.hide()
@@ -163,10 +226,11 @@ export default class WindowManager extends EventEmitter {
     if (!window) {
       return
     }
-    if (window.isVisible()) {
-      window.hide()
-    } else {
+
+    if (!window.isVisible() || window.isFullScreen()) {
       window.show()
+    } else {
+      window.hide()
     }
   }
 
@@ -180,6 +244,18 @@ export default class WindowManager extends EventEmitter {
     })
   }
 
+  onWindowBlur (event, window) {
+    window.hide()
+  }
+
+  handleWindowBlur () {
+    app.on('browser-window-blur', this.onWindowBlur)
+  }
+
+  unbindWindowBlur () {
+    app.removeListener('browser-window-blur', this.onWindowBlur)
+  }
+
   handleAllWindowClosed () {
     app.on('window-all-closed', (event) => {
       event.preventDefault()
@@ -190,7 +266,7 @@ export default class WindowManager extends EventEmitter {
     if (!window) {
       return
     }
-    logger.info('[Motrix] sendCommandTo===>', window, command, ...args)
+    logger.info('[Motrix] send command to:', command, ...args)
     window.webContents.send('command', command, ...args)
   }
 

src/main/utils/index.js

@@ -1,16 +1,22 @@
-import { app } from 'electron'
+import { app, nativeTheme } from 'electron'
 import is from 'electron-is'
 import { resolve } from 'path'
 import { existsSync, lstatSync } from 'fs'
-import logger from '../core/Logger'
+
+import {
+  APP_THEME,
+  ENGINE_MAX_CONNECTION_PER_SERVER,
+  IP_VERSION
+} from '@shared/constants'
+
 import engineBinMap from '../configs/engine'
 
 export function getLogPath () {
-  return logger.transports.file.file
+  return app.getPath('logs')
 }
 
 export function getDhtPath (protocol) {
-  const name = protocol === 6 ? 'dht6.dat' : 'dht.dat'
+  const name = protocol === IP_VERSION.V6 ? 'dht6.dat' : 'dht.dat'
   return resolve(app.getPath('userData'), `./${name}`)
 }
 
@@ -18,6 +24,10 @@ export function getSessionPath () {
   return resolve(app.getPath('userData'), './download.session')
 }
 
+export function getEnginePidPath () {
+  return resolve(app.getPath('userData'), './engine.pid')
+}
+
 export function getUserDataPath () {
   return app.getPath('userData')
 }
@@ -27,12 +37,12 @@ export function getUserDownloadsPath () {
 }
 
 export function getEngineBin (platform) {
-  let result = engineBinMap.hasOwnProperty(platform) ? engineBinMap[platform] : ''
+  const result = engineBinMap[platform] || ''
   return result
 }
 
 export function transformConfig (config) {
-  let result = []
+  const result = []
   for (const [k, v] of Object.entries(config)) {
     if (v !== '') {
       result.push(`--${k}=${v}`)
@@ -65,25 +75,50 @@ export function moveAppToApplicationsFolder (errorMsg = '') {
   })
 }
 
+export function splitArgv (argv) {
+  const args = []
+  const extra = {}
+  for (const arg of argv) {
+    if (arg.startsWith('--')) {
+      const kv = arg.split('=')
+      const key = kv[0]
+      const value = kv[1] || '1'
+      extra[key] = value
+      continue
+    }
+    args.push(arg)
+  }
+  return { args, extra }
+}
+
 export function parseArgvAsUrl (argv) {
-  let arg = argv[1]
+  const arg = argv[1]
   if (!arg) {
     return
   }
 
-  if (
-    arg.toLowerCase().startsWith('mo:') ||
-    arg.toLowerCase().startsWith('motrix:') ||
-    arg.toLowerCase().startsWith('http:') ||
-    arg.toLowerCase().startsWith('https:') ||
-    arg.toLowerCase().startsWith('ftp:') ||
-    arg.toLowerCase().startsWith('magnet:') ||
-    arg.toLowerCase().startsWith('thunder:')
-  ) {
+  if (checkIsSupportedSchema(arg)) {
     return arg
   }
 }
 
+export function checkIsSupportedSchema (url = '') {
+  const str = url.toLowerCase()
+  if (
+    str.startsWith('ftp:') ||
+    str.startsWith('http:') ||
+    str.startsWith('https:') ||
+    str.startsWith('magnet:') ||
+    str.startsWith('thunder:') ||
+    str.startsWith('mo:') ||
+    str.startsWith('motrix:')
+  ) {
+    return true
+  } else {
+    return false
+  }
+}
+
 export function isDirectory (path) {
   return existsSync(path) && lstatSync(path).isDirectory()
 }
@@ -99,3 +134,22 @@ export function parseArgvAsFile (argv) {
   }
   return arg
 }
+
+export const getMaxConnectionPerServer = () => {
+  return ENGINE_MAX_CONNECTION_PER_SERVER
+}
+
+export const getSystemTheme = () => {
+  let result = APP_THEME.LIGHT
+  result = nativeTheme.shouldUseDarkColors ? APP_THEME.DARK : APP_THEME.LIGHT
+  return result
+}
+
+export const convertArrayBufferToBuffer = (arrayBuffer) => {
+  const buffer = Buffer.alloc(arrayBuffer.byteLength)
+  const view = new Uint8Array(arrayBuffer)
+  for (let i = 0; i < buffer.length; ++i) {
+    buffer[i] = view[i]
+  }
+  return buffer
+}

src/main/utils/menu.js

@@ -1,33 +1,35 @@
+import { parse } from 'querystring'
+
 export function concat (template, submenu, submenuToAdd) {
   submenuToAdd.forEach(sub => {
     let relativeItem = null
     if (sub.position) {
       switch (sub.position) {
-        case 'first':
-          submenu.unshift(sub)
-          break
-        case 'last':
-          submenu.push(sub)
-          break
-        case 'before':
-          relativeItem = findById(template, sub['relative-id'])
-          if (relativeItem) {
-            let array = relativeItem.__parent
-            let index = array.indexOf(relativeItem)
-            array.splice(index, 0, sub)
-          }
-          break
-        case 'after':
-          relativeItem = findById(template, sub['relative-id'])
-          if (relativeItem) {
-            let array = relativeItem.__parent
-            let index = array.indexOf(relativeItem)
-            array.splice(index + 1, 0, sub)
-          }
-          break
-        default:
-          submenu.push(sub)
-          break
+      case 'first':
+        submenu.unshift(sub)
+        break
+      case 'last':
+        submenu.push(sub)
+        break
+      case 'before':
+        relativeItem = findById(template, sub['relative-id'])
+        if (relativeItem) {
+          const array = relativeItem.__parent
+          const index = array.indexOf(relativeItem)
+          array.splice(index, 0, sub)
+        }
+        break
+      case 'after':
+        relativeItem = findById(template, sub['relative-id'])
+        if (relativeItem) {
+          const array = relativeItem.__parent
+          const index = array.indexOf(relativeItem)
+          array.splice(index + 1, 0, sub)
+        }
+        break
+      default:
+        submenu.push(sub)
+        break
       }
     } else {
       submenu.push(sub)
@@ -37,7 +39,7 @@ export function concat (template, submenu, submenuToAdd) {
 
 export function merge (template, item) {
   if (item.id) {
-    let matched = findById(template, item.id)
+    const matched = findById(template, item.id)
     if (matched) {
       if (item.submenu && Array.isArray(item.submenu)) {
         if (!Array.isArray(matched.submenu)) {
@@ -54,15 +56,15 @@ export function merge (template, item) {
 }
 
 function findById (template, id) {
-  for (let i in template) {
-    let item = template[i]
+  for (const i in template) {
+    const item = template[i]
     if (item.id === id) {
       // Returned item need to have a reference to parent Array (.__parent).
       // This is required to handle `position` and `relative-id`
       item.__parent = template
       return item
     } else if (Array.isArray(item.submenu)) {
-      let result = findById(item.submenu, id)
+      const result = findById(item.submenu, id)
       if (result) {
         return result
       }
@@ -72,8 +74,8 @@ function findById (template, id) {
 }
 
 export function translateTemplate (template, keystrokesByCommand, i18n) {
-  for (let i in template) {
-    let item = template[i]
+  for (const i in template) {
+    const item = template[i]
     if (item.command) {
       item.accelerator = acceleratorForCommand(item.command, keystrokesByCommand)
     }
@@ -112,30 +114,28 @@ export function handleCommand (item) {
 }
 
 function handleCommandBefore (item) {
-  console.log('handleCommandBefore==1=>', item)
   if (!item['command-before']) {
     return
   }
-  const [ command, ...args ] = item['command-before'].split(',')
-  console.log('handleCommandBefore==2=>', command, ...args)
-  global.application.sendCommandToAll(command, ...args)
+  const [command, params] = item['command-before'].split('?')
+  const args = parse(params)
+  global.application.sendCommandToAll(command, args)
 }
 
 function handleCommandAfter (item) {
-  console.log('handleCommandAfter==1=>', item)
   if (!item['command-after']) {
     return
   }
-  const [ command, ...args ] = item['command-after'].split(',')
-  console.log('handleCommandAfter==2=>', command, ...args)
-  global.application.sendCommandToAll(command, ...args)
+  const [command, params] = item['command-after'].split('?')
+  const args = parse(params)
+  global.application.sendCommandToAll(command, args)
 }
 
 function acceleratorForCommand (command, keystrokesByCommand) {
   const keystroke = keystrokesByCommand[command]
   if (keystroke) {
     let modifiers = keystroke.split(/-(?=.)/)
-    let key = modifiers.pop().toUpperCase()
+    const key = modifiers.pop().toUpperCase()
       .replace('+', 'Plus')
       .replace('MINUS', '-')
     modifiers = modifiers.map((modifier) => {
@@ -152,14 +152,14 @@ function acceleratorForCommand (command, keystrokesByCommand) {
           .replace(/alt/ig, 'Alt')
       }
     })
-    let keys = modifiers.concat([key])
+    const keys = modifiers.concat([key])
     return keys.join('+')
   }
   return null
 }
 
 export function flattenMenuItems (menu) {
-  let flattenItems = {}
+  const flattenItems = {}
   menu.items.forEach(item => {
     if (item.id) {
       flattenItems[item.id] = item
@@ -173,24 +173,24 @@ export function flattenMenuItems (menu) {
 
 export function updateStates (itemsById, visibleStates, enabledStates, checkedStates) {
   if (visibleStates) {
-    for (let command in visibleStates) {
-      let item = itemsById[command]
+    for (const command in visibleStates) {
+      const item = itemsById[command]
       if (item) {
         item.visible = visibleStates[command]
       }
     }
   }
   if (enabledStates) {
-    for (let command in enabledStates) {
-      let item = itemsById[command]
+    for (const command in enabledStates) {
+      const item = itemsById[command]
       if (item) {
         item.enabled = enabledStates[command]
       }
     }
   }
   if (checkedStates) {
-    for (let id in checkedStates) {
-      let item = itemsById[id]
+    for (const id in checkedStates) {
+      const item = itemsById[id]
       if (item) {
         item.checked = checkedStates[id]
       }

src/renderer/api/Api.js

@@ -1,32 +1,29 @@
-import { remote } from 'electron'
+import { ipcRenderer } from 'electron'
 import is from 'electron-is'
-import { isEmpty } from 'lodash'
-import Aria2 from 'aria2'
+import { isEmpty, clone } from 'lodash'
+import { Aria2 } from '@shared/aria2'
 import {
   separateConfig,
   compactUndefined,
+  formatOptionsForEngine,
   mergeTaskResult,
   changeKeysToCamelCase,
   changeKeysToKebabCase
 } from '@shared/utils'
-import {
-  BEST_TRACKERS_URL,
-  BEST_TRACKERS_IP_URL
-} from '@shared/constants'
-
-const application = remote.getGlobal('application')
+import { ENGINE_RPC_HOST } from '@shared/constants'
 
 export default class Api {
   constructor (options = {}) {
     this.options = options
 
-    this.client = null
     this.init()
   }
 
-  init () {
-    this.loadConfig()
-    this.initClient()
+  async init () {
+    this.config = await this.loadConfig()
+
+    this.client = this.initClient()
+    this.client.open()
   }
 
   loadConfigFromLocalStorage () {
@@ -35,21 +32,18 @@ export default class Api {
     return result
   }
 
-  loadConfigFromNativeStore () {
-    const systemConfig = application.configManager.getSystemConfig()
-    const userConfig = application.configManager.getUserConfig()
-
-    const result = { ...systemConfig, ...userConfig }
+  async loadConfigFromNativeStore () {
+    const result = await ipcRenderer.invoke('get-app-config')
     return result
   }
 
-  loadConfig () {
+  async loadConfig () {
     let result = is.renderer()
-      ? this.loadConfigFromNativeStore()
+      ? await this.loadConfigFromNativeStore()
       : this.loadConfigFromLocalStorage()
 
     result = changeKeysToCamelCase(result)
-    this.config = result
+    return result
   }
 
   initClient () {
@@ -57,11 +51,12 @@ export default class Api {
       rpcListenPort: port,
       rpcSecret: secret
     } = this.config
-    this.client = new Aria2({
+    const host = ENGINE_RPC_HOST
+    return new Aria2({
+      host,
       port,
       secret
     })
-    this.client.open()
   }
 
   closeClient () {
@@ -76,7 +71,7 @@ export default class Api {
 
   fetchPreference () {
     return new Promise((resolve) => {
-      this.loadConfig()
+      this.config = this.loadConfig()
       resolve(this.config)
     })
   }
@@ -84,9 +79,9 @@ export default class Api {
   savePreference (params = {}) {
     const kebabParams = changeKeysToKebabCase(params)
     if (is.renderer()) {
-      this.savePreferenceToNativeStore(kebabParams)
+      return this.savePreferenceToNativeStore(kebabParams)
     } else {
-      this.savePreferenceToLocalStorage(kebabParams)
+      return this.savePreferenceToLocalStorage(kebabParams)
     }
   }
 
@@ -96,25 +91,36 @@ export default class Api {
 
   savePreferenceToNativeStore (params = {}) {
     const { user, system, others } = separateConfig(params)
-    if (!isEmpty(system)) {
-      console.info('[Motrix] save system config: ', system)
-      application.configManager.setSystemConfig(system)
-    }
+    const config = {}
 
     if (!isEmpty(user)) {
       console.info('[Motrix] save user config: ', user)
-      application.configManager.setUserConfig(user)
+      config.user = user
+    }
+
+    if (!isEmpty(system)) {
+      console.info('[Motrix] save system config: ', system)
+      config.system = system
+      this.updateActiveTaskOption(system)
     }
 
     if (!isEmpty(others)) {
-      console.info('[Motrix] save config found iillegal key: ', others)
+      console.info('[Motrix] save config found illegal key: ', others)
     }
+
+    ipcRenderer.send('command', 'application:save-preference', config)
   }
 
   getVersion () {
     return this.client.call('getVersion')
   }
 
+  changeGlobalOption (options) {
+    const args = formatOptionsForEngine(options)
+
+    return this.client.call('changeGlobalOption', args)
+  }
+
   getGlobalOption () {
     return new Promise((resolve) => {
       this.client.call('getGlobalOption')
@@ -124,6 +130,39 @@ export default class Api {
     })
   }
 
+  getOption (params = {}) {
+    const { gid } = params
+    const args = compactUndefined([gid])
+
+    return new Promise((resolve) => {
+      this.client.call('getOption', ...args)
+        .then((data) => {
+          resolve(changeKeysToCamelCase(data))
+        })
+    })
+  }
+
+  updateActiveTaskOption (options) {
+    this.fetchTaskList({ type: 'active' })
+      .then((data) => {
+        if (isEmpty(data)) {
+          return
+        }
+
+        const gids = data.map((task) => task.gid)
+        this.batchChangeOption({ gids, options })
+      })
+  }
+
+  changeOption (params = {}) {
+    const { gid, options = {} } = params
+
+    const engineOptions = formatOptionsForEngine(options)
+    const args = compactUndefined([gid, engineOptions])
+
+    return this.client.call('changeOption', ...args)
+  }
+
   getGlobalStat () {
     return this.client.call('getGlobalStat')
   }
@@ -131,11 +170,16 @@ export default class Api {
   addUri (params) {
     const {
       uris,
+      outs,
       options
     } = params
-    const tasks = uris.map((uri) => {
-      const args = compactUndefined([[uri], options])
-      return [ 'aria2.addUri', ...args ]
+    const tasks = uris.map((uri, index) => {
+      const engineOptions = formatOptionsForEngine(options)
+      if (outs && outs[index]) {
+        engineOptions.out = outs[index]
+      }
+      const args = compactUndefined([[uri], engineOptions])
+      return ['aria2.addUri', ...args]
     })
     return this.client.multicall(tasks)
   }
@@ -145,7 +189,8 @@ export default class Api {
       torrent,
       options
     } = params
-    const args = compactUndefined([torrent, [], options])
+    const engineOptions = formatOptionsForEngine(options)
+    const args = compactUndefined([torrent, [], engineOptions])
     return this.client.call('addTorrent', ...args)
   }
 
@@ -154,7 +199,8 @@ export default class Api {
       metalink,
       options
     } = params
-    const args = compactUndefined([metalink, options])
+    const engineOptions = formatOptionsForEngine(options)
+    const args = compactUndefined([metalink, engineOptions])
     return this.client.call('addMetalink', ...args)
   }
 
@@ -164,14 +210,14 @@ export default class Api {
     const waitingArgs = compactUndefined([offset, num, keys])
     return new Promise((resolve, reject) => {
       this.client.multicall([
-        [ 'aria2.tellActive', ...activeArgs ],
-        [ 'aria2.tellWaiting', ...waitingArgs ]
+        ['aria2.tellActive', ...activeArgs],
+        ['aria2.tellWaiting', ...waitingArgs]
       ]).then((data) => {
-        console.log('fetchDownloadingTaskList data', data)
+        console.log('[Motrix] fetch downloading task list data:', data)
         const result = mergeTaskResult(data)
         resolve(result)
       }).catch((err) => {
-        console.log('fetchDownloadingTaskList fail===>', err)
+        console.log('[Motrix] fetch downloading task list fail:', err)
         reject(err)
       })
     })
@@ -192,14 +238,14 @@ export default class Api {
   fetchTaskList (params = {}) {
     const { type } = params
     switch (type) {
-      case 'active':
-        return this.fetchDownloadingTaskList(params)
-      case 'waiting':
-        return this.fetchWaitingTaskList(params)
-      case 'stopped':
-        return this.fetchStoppedTaskList(params)
-      default:
-        return this.fetchDownloadingTaskList(params)
+    case 'active':
+      return this.fetchDownloadingTaskList(params)
+    case 'waiting':
+      return this.fetchWaitingTaskList(params)
+    case 'stopped':
+      return this.fetchStoppedTaskList(params)
+    default:
+      return this.fetchDownloadingTaskList(params)
     }
   }
 
@@ -209,6 +255,36 @@ export default class Api {
     return this.client.call('tellStatus', ...args)
   }
 
+  fetchTaskItemWithPeers (params = {}) {
+    const { gid, keys } = params
+    const statusArgs = compactUndefined([gid, keys])
+    const peersArgs = compactUndefined([gid])
+    return new Promise((resolve, reject) => {
+      this.client.multicall([
+        ['aria2.tellStatus', ...statusArgs],
+        ['aria2.getPeers', ...peersArgs]
+      ]).then((data) => {
+        console.log('[Motrix] fetchTaskItemWithPeers:', data)
+        const result = data[0] && data[0][0]
+        const peers = data[1] && data[1][0]
+        result.peers = peers || []
+        console.log('[Motrix] fetchTaskItemWithPeers.result:', result)
+        console.log('[Motrix] fetchTaskItemWithPeers.peers:', peers)
+
+        resolve(result)
+      }).catch((err) => {
+        console.log('[Motrix] fetch downloading task list fail:', err)
+        reject(err)
+      })
+    })
+  }
+
+  fetchTaskItemPeers (params = {}) {
+    const { gid, keys } = params
+    const args = compactUndefined([gid, keys])
+    return this.client.call('getPeers', ...args)
+  }
+
   pauseTask (params = {}) {
     const { gid } = params
     const args = compactUndefined([gid])
@@ -265,24 +341,35 @@ export default class Api {
     return this.client.call('removeDownloadResult', ...args)
   }
 
-  startPowerSaveBlocker () {
-    application.energyManager.startPowerSaveBlocker()
-  }
+  multicall (method, params = {}) {
+    let { gids, options = {} } = params
+    options = formatOptionsForEngine(options)
 
-  stopPowerSaveBlocker () {
-    application.energyManager.stopPowerSaveBlocker()
-  }
-
-  fetchBtTrackerFromGitHub () {
-    const now = Date.now()
-    const promises = [
-      fetch(`${BEST_TRACKERS_IP_URL}?t=${now}`).then((res) => res.text()),
-      fetch(`${BEST_TRACKERS_URL}?t=${now}`).then((res) => res.text())
-    ]
-
-    return Promise.all(promises).then((values) => {
-      let result = values.join('\r\n').replace(/^\s*[\r\n]/gm, '')
-      return result
+    const data = gids.map((gid, index) => {
+      const _options = clone(options)
+      const args = compactUndefined([gid, _options])
+      return [method, ...args]
     })
+    return this.client.multicall(data)
+  }
+
+  batchChangeOption (params = {}) {
+    return this.multicall('aria2.changeOption', params)
+  }
+
+  batchRemoveTask (params = {}) {
+    return this.multicall('aria2.remove', params)
+  }
+
+  batchResumeTask (params = {}) {
+    return this.multicall('aria2.unpause', params)
+  }
+
+  batchPauseTask (params = {}) {
+    return this.multicall('aria2.pause', params)
+  }
+
+  batchForcePauseTask (params = {}) {
+    return this.multicall('aria2.forcePause', params)
   }
 }

src/renderer/assets/icons/arrow-down.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g class="nc-icon-wrapper" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <line data-cap="butt" data-color="color-2" fill="none" stroke-miterlimit="10" x1="12" y1="2" x2="12" y2="22"/>
+    <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="19,15 12,22 5,15 "/>
+  </g>
+</svg>

src/renderer/assets/icons/arrow-up.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g class="nc-icon-wrapper" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <line data-cap="butt" data-color="color-2" fill="none" stroke-miterlimit="10" x1="12" y1="22" x2="12" y2="2"/>
+    <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="5,9 12,2 19,9 "/>
+  </g>
+</svg>

src/renderer/assets/icons/audio.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <rect x="4" y="3" width="16" height="18" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+    <line data-color="color-2" x1="1" y1="6" x2="1" y2="18" fill="none" stroke-miterlimit="10"/>
+    <line data-color="color-2" x1="23" y1="6" x2="23" y2="18" fill="none" stroke-miterlimit="10"/>
+    <polyline data-cap="butt" points="10 15 10 8 16 8 16 14" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+    <circle data-stroke="none" cx="9" cy="15" r="2" stroke="none"/>
+    <circle data-stroke="none" cx="15" cy="14" r="2" stroke="none"/>
+  </g>
+</svg>

src/renderer/assets/icons/dice.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <polyline data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" points="17,23 17,7 1,7 "/>
+    <line data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" x1="17" y1="7" x2="23" y2="1"/>
+    <polygon fill="none" stroke="currentColor" stroke-miterlimit="10" points="17,23 23,17 23,1 7,1 1,7 1,23 "/>
+    <circle data-color="color-2" data-stroke="none" cx="12" cy="12" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+    <circle data-color="color-2" data-stroke="none" cx="6" cy="12" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+    <circle data-color="color-2" data-stroke="none" cx="12" cy="18" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+    <circle data-color="color-2" data-stroke="none" cx="6" cy="18" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+  </g>
+</svg>

src/renderer/assets/icons/image.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <polyline data-cap="butt" data-color="color-2" points="1 20 6 14 10 18 17 10 23 17" fill="none" stroke-miterlimit="10"/>
+    <rect x="1" y="3" width="22" height="18" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+    <circle data-color="color-2" cx="9" cy="8" r="2" fill="none" stroke-miterlimit="10"/>
+  </g>
+</svg>

src/renderer/assets/icons/magnet.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <g stroke-linecap="square" stroke-linejoin="miter" stroke-width="2" fill="#000000" stroke="#000000">
+    <line fill="none" stroke-miterlimit="10" x1="8.2" y1="4.5" x2="11.1" y2="7.3"></line>
+    <line fill="none" stroke-miterlimit="10" x1="16.7" y1="12.9" x2="19.5" y2="15.8"></line>
+    <path fill="none" stroke="#000000" stroke-miterlimit="10"
+      d="M12.5,17.2 c-1.6,1.6-4.1,1.6-5.7,0c-1.6-1.6-1.6-4.1,0-5.7l7.1-7.1l-2.8-2.8L4,8.7C0.9,11.8,0.9,16.9,4,20s8.2,3.1,11.3,0l7.1-7.1l-2.8-2.8 L12.5,17.2z">
+    </path>
+  </g>
+</svg>

src/renderer/assets/icons/node.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g class="nc-icon-wrapper" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <polyline data-cap="butt" fill="none" stroke-miterlimit="10" points="12,9 12,13 7.8,16.1 "/>
+    <line data-cap="butt" fill="none" stroke-miterlimit="10" x1="12" y1="13" x2="16.2" y2="16.1"/>
+    <circle fill="none" stroke="currentColor" stroke-miterlimit="10" cx="12" cy="5" r="4"/>
+    <circle fill="none" stroke="currentColor" stroke-miterlimit="10" cx="5" cy="19" r="4"/>
+    <circle fill="none" stroke="currentColor" stroke-miterlimit="10" cx="19" cy="19" r="4"/>
+  </g>
+</svg>

src/renderer/assets/icons/task-history.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g>
+    <path d="M12,0C5.383,0,0,5.383,0,12s5.383,12,12,12s12-5.383,12-12S18.617,0,12,0z M19,13h-8V5h2v6h6V13z"/>
+  </g>
+</svg>

src/renderer/assets/icons/task-restart.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <path data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" d="M6.121,20.121 C7.727,21.22,9.907,22,12,22c5.523,0,10-4.477,10-10c0-5.523-4.477-10-10-10C8.101,2,4.728,4.233,3.078,7.488"/>
+    <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="2.278,1.588 3.078,7.488 9.078,6.688 "/>
+    <circle data-color="color-2" fill="none" stroke-miterlimit="10" cx="4" cy="18" r="3"/>
+  </g>
+</svg>

src/renderer/assets/icons/video.svg

@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+  <g stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+    <line data-cap="butt" data-color="color-2" x1="2" y1="6" x2="22" y2="6" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="12" y1="2" x2="12" y2="22" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="7" y1="2" x2="7" y2="6" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="17" y1="2" x2="17" y2="6" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="2" y1="18" x2="22" y2="18" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="7" y1="22" x2="7" y2="18" fill="none" stroke-miterlimit="10"/>
+    <line data-cap="butt" data-color="color-2" x1="17" y1="22" x2="17" y2="18" fill="none" stroke-miterlimit="10"/>
+    <rect x="2" y="2" width="20" height="20" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+  </g>
+</svg>

src/renderer/components/About/AboutPanel.vue

@@ -12,10 +12,10 @@
 </template>
 
 <script>
-  import is from 'electron-is'
   import { mapState } from 'vuex'
   import AppInfo from '@/components/About/AppInfo'
   import Copyright from '@/components/About/Copyright'
+  import { app } from '@electron/remote'
 
   export default {
     name: 'mo-about-panel',
@@ -30,7 +30,7 @@
       }
     },
     data () {
-      const version = this.$electron.remote.app.getVersion()
+      const version = app.getVersion()
       return {
         version
       }
@@ -41,8 +41,6 @@
       })
     },
     methods: {
-      isRenderer: is.renderer,
-      isMas: is.mas,
       handleOpen () {
         this.$store.dispatch('app/fetchEngineInfo')
       },
@@ -56,11 +54,12 @@
 </script>
 
 <style lang="scss">
-  .app-about-dialog {
-    max-width: 632px;
-    .el-dialog__header {
-      padding-top: 0;
-      padding-bottom: 0;
-    }
+.app-about-dialog {
+  max-width: 632px;
+  min-width: 380px;
+  .el-dialog__header {
+    padding-top: 0;
+    padding-bottom: 0;
   }
+}
 </style>

src/renderer/components/About/AppInfo.vue

@@ -34,9 +34,11 @@
       },
       engine: {
         type: Object,
-        default: {
-          version: '',
-          enabledFeatures: []
+        default () {
+          return {
+            version: '',
+            enabledFeatures: []
+          }
         }
       }
     },
@@ -47,45 +49,45 @@
 </script>
 
 <style lang="scss">
-  .app-info {
-    position: relative;
-    margin: 8px 0;
-    .app-version span {
-      display: inline-block;
-      vertical-align: bottom;
-      font-size: $--font-size-large;
-      margin-left: 20px;
-      color: $--app-version-color;
-      line-height: 18px;
+.app-info {
+  position: relative;
+  margin: 8px 0;
+  .app-version span {
+    display: inline-block;
+    vertical-align: bottom;
+    font-size: $--font-size-large;
+    margin-left: 20px;
+    color: $--app-version-color;
+    line-height: 18px;
+  }
+  .app-icon {
+    position: absolute;
+    top: 0;
+    right: 0;
+    background: transparent url('~@/assets/app-icon.png') center center no-repeat;
+    background-size: 128px 128px;
+    width: 128px;
+    height: 128px;
+  }
+  .engine-info {
+    margin: 50px 35% 0 8px;
+    h4 {
+      font-size: $--font-size-base;
+      font-weight: normal;
+      color: $--app-engine-title-color;
     }
-    .app-icon {
-      position: absolute;
-      top: 0;
-      right: 0;
-      background: transparent url('~@/assets/app-icon.png') center center no-repeat;
-      background-size: 128px 128px;
-      width: 128px;
-      height: 128px;
-    }
-    .engine-info {
-      margin: 50px 35% 0 8px;
-      h4 {
-        font-size: $--font-size-base;
-        font-weight: $--font-weight-secondary;
-        color: $--app-engine-title-color;
-      }
-      ul {
-        font-size: 12px;
-        color: $--app-engine-info-color;
-        list-style: none;
-        padding: 0;
-        line-height: 20px;
-        @include clearfix();
-        li {
-          float: left;
-          width: 50%;
-        }
+    ul {
+      font-size: 12px;
+      color: $--app-engine-info-color;
+      list-style: none;
+      padding: 0;
+      line-height: 20px;
+      @include clearfix();
+      li {
+        float: left;
+        width: 50%;
       }
     }
   }
+}
 </style>

src/renderer/components/About/Copyright.vue

@@ -1,18 +1,21 @@
 <template>
   <el-row class="copyright">
     <el-col :span="6" class="copyright-left">
-      <a target="_blank" href="https://motrix.app/" rel="noopener noreferrer">
-        &copy;2018 Motrix
+      <a target="_blank" rel="noopener noreferrer" href="https://motrix.app/">
+        &copy;2021 Motrix
       </a>
     </el-col>
     <el-col :span="18" class="copyright-right">
-      <a target="_blank" href="https://motrix.app/about" rel="noopener noreferrer">
+      <a target="_blank" rel="noopener noreferrer" href="https://motrix.app/license">
+        {{ $t('about.license') }}
+      </a>
+      <a target="_blank" rel="noopener noreferrer" href="https://motrix.app/about">
         {{ $t('about.about') }}
       </a>
-      <a target="_blank" href="https://motrix.app/support" rel="noopener noreferrer">
+      <a target="_blank" rel="noopener noreferrer" href="https://motrix.app/support">
         {{ $t('about.support') }}
       </a>
-      <a target="_blank" href="https://motrix.app/release" rel="noopener noreferrer">
+      <a target="_blank" rel="noopener noreferrer" href="https://motrix.app/release">
         {{ $t('about.release') }}
       </a>
     </el-col>
@@ -26,22 +29,22 @@
 </script>
 
 <style lang="scss">
-  .copyright {
-    width: 100%;
-    font-size: $--font-size-small;
-    a {
-      color: $--app-copyright-color;
-      text-decoration: none;
-    }
-  }
-  .copyright-left {
-    text-align: left;
+.copyright {
+  width: 100%;
+  font-size: $--font-size-small;
+  a {
+    color: $--app-copyright-color;
+    text-decoration: none;
   }
+}
+.copyright-left {
+  text-align: left;
+}
 
-  .copyright-right {
-    text-align: right;
-    a {
-      margin-left: 30px;
-    }
+.copyright-right {
+  text-align: right;
+  a {
+    margin-left: 30px;
   }
+}
 </style>

src/renderer/components/Aside/Index.vue

@@ -1,20 +1,20 @@
 <template>
-  <el-aside width="78px" :class="['aside', { 'draggable': asideDraggable }]">
+  <el-aside width="78px" :class="['aside', 'hidden-sm-and-down', { 'draggable': asideDraggable }]">
     <div class="aside-inner">
       <mo-logo-mini />
       <ul class="menu top-menu">
-        <li @click="nav('/task')">
+        <li @click="nav('/task')" class="non-draggable">
           <mo-icon name="menu-task" width="20" height="20" />
         </li>
-        <li @click="showAddTask()">
+        <li @click="showAddTask()" class="non-draggable">
           <mo-icon name="menu-add" width="20" height="20" />
         </li>
       </ul>
       <ul class="menu bottom-menu">
-        <li @click="nav('/preference')">
+        <li @click="nav('/preference')" class="non-draggable">
           <mo-icon name="menu-preference" width="20" height="20" />
         </li>
-        <li @click="showAboutPanel">
+        <li @click="showAboutPanel" class="non-draggable">
           <mo-icon name="menu-about" width="20" height="20" />
         </li>
       </ul>
@@ -25,6 +25,7 @@
 <script>
   import is from 'electron-is'
   import { mapState } from 'vuex'
+  import { ADD_TASK_TYPE } from '@shared/constants'
   import LogoMini from '@/components/Logo/LogoMini'
   import '@/components/Icons/menu-task'
   import '@/components/Icons/menu-add'
@@ -40,27 +41,22 @@
       ...mapState('app', {
         currentPage: state => state.currentPage
       }),
-      asideDraggable: function () {
+      asideDraggable () {
         return is.macOS()
       }
     },
     methods: {
-      open (link) {
-        this.$electron.shell.openExternal(link)
-      },
-      showAddTask (taskType = 'uri') {
+      showAddTask (taskType = ADD_TASK_TYPE.URI) {
         this.$store.dispatch('app/showAddTaskDialog', taskType)
       },
       showAboutPanel () {
-        // if (is.renderer()) {
-        //   this.$electron.ipcRenderer.send('command', 'application:about')
-        // } else {
         this.$store.dispatch('app/showAboutPanel')
-        // }
       },
       nav (page) {
         this.$router.push({
           path: page
+        }).catch(err => {
+          console.log(err)
         })
       }
     }
@@ -68,40 +64,40 @@
 </script>
 
 <style lang="scss">
-  .aside-inner {
-    display: flex;
-    height: 100%;
-    flex-flow: column;
-  }
-  .logo-mini {
-    margin-top: 40px;
-  }
-  .menu {
-    list-style: none;
-    padding: 0;
-    margin: 0 auto;
-    user-select: none;
-    cursor: default;
-    > li {
-      width: 32px;
-      height: 32px;
-      margin-top: 24px;
-      cursor: pointer;
-      border-radius: 16px;
-      transition: background-color 0.25s;
-      &:hover {
-        background-color: rgba(255, 255, 255, 0.15);
-      }
-    }
-    svg {
-      padding: 6px;
-      color: #fff;
+.aside-inner {
+  display: flex;
+  height: 100%;
+  flex-flow: column;
+}
+.logo-mini {
+  margin-top: 40px;
+}
+.menu {
+  list-style: none;
+  padding: 0;
+  margin: 0 auto;
+  user-select: none;
+  cursor: default;
+  > li {
+    width: 32px;
+    height: 32px;
+    margin-top: 24px;
+    cursor: pointer;
+    border-radius: 16px;
+    transition: background-color 0.25s;
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.15);
     }
   }
-  .top-menu {
-    flex: 1;
-  }
-  .bottom-menu {
-    margin-bottom: 24px;
+  svg {
+    padding: 6px;
+    color: #fff;
   }
+}
+.top-menu {
+  flex: 1;
+}
+.bottom-menu {
+  margin-bottom: 24px;
+}
 </style>

src/renderer/components/Browser/index.vue

@@ -0,0 +1,75 @@
+<template>
+  <div ref="webviewViewport" class="webview-viewport">
+    <iframe
+      class="mo-webview"
+      ref="iframe"
+      :src="src"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+  import is from 'electron-is'
+  import { webContents } from '@electron/remote'
+  import { Loading } from 'element-ui'
+
+  export default {
+    name: 'mo-browser',
+    components: {
+    },
+    props: {
+      src: {
+        type: String,
+        default: ''
+      }
+    },
+    data () {
+      return {
+        loading: null
+      }
+    },
+    computed: {
+      isRenderer: () => is.renderer()
+    },
+    mounted () {
+      const { iframe } = this.$refs
+
+      iframe.addEventListener('did-start-loading', this.loadStart.bind(this))
+      iframe.addEventListener('did-stop-loading', this.loadStop.bind(this))
+      iframe.addEventListener('dom-ready', this.ready.bind(this))
+    },
+    methods: {
+      loadStart () {
+        const { webviewViewport } = this.$refs
+        this.loading = Loading.service({
+          target: webviewViewport
+        })
+      },
+      loadStop () {
+        this.$nextTick(() => {
+          this.loading.close()
+        })
+      },
+      ready () {
+        const { iframe } = this.$refs
+
+        const wc = webContents.fromId(iframe.getWebContentsId())
+        wc.setWindowOpenHandler((event, url) => {
+          event.preventDefault()
+          this.$electron.ipcRenderer.send('command', 'application:open-external', url)
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+.webview-viewport {
+  position: relative;
+}
+.mo-webview {
+  display: inline-flex;;
+  flex: 1;
+  flex-basis: auto;
+}
+</style>

src/renderer/components/Command/index.js

@@ -1,104 +0,0 @@
-import router from '@/router'
-import store from '@/store'
-import CommandManager from './CommandManager'
-import { Message } from 'element-ui'
-import { getLocaleManager } from '@/components/Locale'
-import { base64StringToBlob } from 'blob-util'
-import { buildFileList } from '@shared/utils'
-
-const commands = new CommandManager()
-const i18n = getLocaleManager().getI18n()
-
-function updateSystemTheme (theme) {
-  store.dispatch('app/updateSystemTheme', theme)
-}
-
-function updateTheme (theme) {
-  store.dispatch('preference/changeThemeConfig', theme)
-}
-
-function showAboutPanel () {
-  store.dispatch('app/showAboutPanel')
-}
-
-function showAddTask (taskType = 'uri', task = '') {
-  if (taskType === 'uri' && task) {
-    store.dispatch('app/updateAddTaskUrl', task)
-  }
-  store.dispatch('app/showAddTaskDialog', taskType)
-}
-
-function showAddBtTask () {
-  store.dispatch('app/showAddTaskDialog', 'torrent')
-}
-
-function showAddBtTaskWithFile (fileName, base64Data = '') {
-  const blob = base64StringToBlob(base64Data, 'application/x-bittorrent')
-  const file = new File([blob], fileName, { type: 'application/x-bittorrent' })
-  const fileList = buildFileList(file)
-  store.dispatch('app/showAddTaskDialog', 'torrent')
-  setTimeout(() => {
-    store.dispatch('app/addTaskAddTorrents', { fileList })
-  }, 200)
-}
-
-function navigateTaskList (status = 'active') {
-  router.push({ path: `/task/${status}` })
-}
-
-function navigatePreferences () {
-  router.push({ path: '/preference' })
-}
-
-function showUnderDevelopmentMessage () {
-  Message.info(i18n.t('app.under-development-message'))
-}
-
-function pauseTask () {
-  showUnderDevelopmentMessage()
-}
-
-function resumeTask () {
-  showUnderDevelopmentMessage()
-}
-
-function deleteTask () {
-  showUnderDevelopmentMessage()
-}
-
-function moveTaskUp () {
-  showUnderDevelopmentMessage()
-}
-
-function moveTaskDown () {
-  showUnderDevelopmentMessage()
-}
-
-function pauseAllTask () {
-  store.dispatch('task/pauseAllTask')
-}
-
-function resumeAllTask () {
-  store.dispatch('task/resumeAllTask')
-}
-
-commands.register('application:system-theme', updateSystemTheme)
-commands.register('application:theme', updateTheme)
-commands.register('application:about', showAboutPanel)
-commands.register('application:new-task', showAddTask)
-commands.register('application:new-bt-task', showAddBtTask)
-commands.register('application:new-bt-task-with-file', showAddBtTaskWithFile)
-commands.register('application:task-list', navigateTaskList)
-commands.register('application:preferences', navigatePreferences)
-
-commands.register('application:pause-task', pauseTask)
-commands.register('application:resume-task', resumeTask)
-commands.register('application:delete-task', deleteTask)
-commands.register('application:move-task-up', moveTaskUp)
-commands.register('application:move-task-down', moveTaskDown)
-commands.register('application:pause-all-task', pauseAllTask)
-commands.register('application:resume-all-task', resumeAllTask)
-
-export {
-  commands
-}

src/renderer/components/CommandManager/index.js

@@ -9,11 +9,11 @@ export default class CommandManager extends EventEmitter {
 
   register (id, fn) {
     if (this.commands[id]) {
-      console.log('Attempting to register an already-registered command: ' + id)
+      console.log('[Motrix] Attempting to register an already-registered command: ' + id)
       return null
     }
     if (!id || !fn) {
-      console.error('Attempting to register a command with a missing id, or command function.')
+      console.error('[Motrix] Attempting to register a command with a missing id, or command function.')
       return null
     }
     this.commands[id] = fn
@@ -21,8 +21,16 @@ export default class CommandManager extends EventEmitter {
     this.emit('commandRegistered', id)
   }
 
+  unregister (id) {
+    if (this.commands[id]) {
+      delete this.commands[id]
+
+      this.emit('commandUnregistered', id)
+    }
+  }
+
   execute (id, ...args) {
-    var fn = this.commands[id]
+    const fn = this.commands[id]
     if (fn) {
       try {
         this.emit('beforeExecuteCommand', id)

src/renderer/components/CommandManager/instance.js

@@ -0,0 +1,3 @@
+import CommandManager from '.'
+
+export const commands = new CommandManager()

src/renderer/components/DragSelect/Index.vue

@@ -0,0 +1,162 @@
+<template>
+  <div
+    ref="container"
+    style="position: relative; user-select: none; overflow-x: hidden; touch-action: none;"
+  >
+    <slot v-bind="{ selected: intersected }" />
+  </div>
+</template>
+
+<script>
+  const getDimensions = (p1, p2) => ({
+    width: Math.abs(p1.x - p2.x),
+    height: Math.abs(p1.y - p2.y)
+  })
+
+  const collisionCheck = (node1, node2) =>
+    node1.left < node2.left + node2.width &&
+    node1.left + node1.width > node2.left &&
+    node1.top < node2.top + node2.height &&
+    node1.top + node1.height > node2.top
+
+  export default {
+    name: 'mo-drag-select',
+    props: {
+      attribute: {
+        type: String,
+        required: true
+      },
+      color: {
+        type: String,
+        default: '#bad7fb'
+      },
+      opacity: {
+        type: Number,
+        default: 0.7
+      }
+    },
+    data () {
+      return {
+        intersected: [],
+        children: []
+      }
+    },
+    watch: {
+      intersected (i) {
+        this.$emit('change', i)
+      }
+    },
+    mounted () {
+      const { container } = this.$refs
+      const self = this
+
+      let containerRect = container.getBoundingClientRect()
+
+      const getCoords = e => ({
+        x: e.clientX - containerRect.left,
+        y: e.clientY - containerRect.top
+      })
+
+      const box = this.createBox()
+      let start = { x: 0, y: 0 }
+      let end = { x: 0, y: 0 }
+
+      function touchStart (e) {
+        e.preventDefault()
+        startDrag(e.touches[0])
+      }
+
+      function touchMove (e) {
+        e.preventDefault()
+        drag(e.touches[0])
+      }
+
+      function startDrag (e) {
+        containerRect = container.getBoundingClientRect()
+        self.children = container.childNodes
+        start = getCoords(e)
+        end = start
+        document.addEventListener('mousemove', drag)
+        document.addEventListener('touchmove', touchMove)
+
+        box.style.top = start.y + 'px'
+        box.style.left = start.x + 'px'
+
+        container.prepend(box)
+        self.intersection(box)
+      }
+
+      function drag (e) {
+        end = getCoords(e)
+        const dimensions = getDimensions(start, end)
+
+        if (end.x < start.x) {
+          box.style.left = end.x + 'px'
+        }
+        if (end.y < start.y) {
+          box.style.top = end.y + 'px'
+        }
+        box.style.width = dimensions.width + 'px'
+        box.style.height = dimensions.height + 'px'
+
+        self.intersection(box)
+      }
+
+      function endDrag () {
+        start = { x: 0, y: 0 }
+        end = { x: 0, y: 0 }
+
+        box.style.width = 0
+        box.style.height = 0
+
+        document.removeEventListener('mousemove', drag)
+        document.removeEventListener('touchmove', touchMove)
+        box.remove()
+      }
+
+      container.addEventListener('mousedown', startDrag)
+      container.addEventListener('touchstart', touchStart)
+
+      document.addEventListener('mouseup', endDrag)
+      document.addEventListener('touchend', endDrag)
+
+      this.$once('on:destroy', () => {
+        container.removeEventListener('mousedown', startDrag)
+        container.removeEventListener('touchstart', touchStart)
+        document.removeEventListener('mouseup', endDrag)
+        document.removeEventListener('touchend', endDrag)
+      })
+    },
+    methods: {
+      createBox () {
+        const box = document.createElement('div')
+        box.setAttribute('data-drag-box-component', '')
+        box.style.position = 'absolute'
+        box.style.backgroundColor = this.color
+        box.style.opacity = this.opacity
+        box.style.zIndex = 1000
+
+        return box
+      },
+      intersection (box) {
+        const { children } = this
+        const rect = box.getBoundingClientRect()
+        const intersected = []
+
+        for (let i = 0; i < children.length; i++) {
+          if (collisionCheck(rect, children[i].getBoundingClientRect())) {
+            const attr = children[i].getAttribute(this.attribute)
+            if (children[i].hasAttribute(this.attribute)) {
+              intersected.push(attr)
+            }
+          }
+        }
+
+        if (
+          JSON.stringify([...intersected]) !==
+          JSON.stringify([...this.intersected])
+        ) { this.intersected = intersected }
+      }
+    }
+  }
+</script>

src/renderer/components/Dragger/Index.vue

@@ -3,46 +3,48 @@
 </template>
 
 <script>
-export default {
-  name: 'mo-dragger',
-  mounted () {
-    this.preventDefault = ev => ev.preventDefault()
-    let count = 0
-    this.onDragEnter = (ev) => {
-      if (count === 0) {
-        this.$store.dispatch('app/showAddTaskDialog', 'torrent')
+  import { ADD_TASK_TYPE } from '@shared/constants'
+
+  export default {
+    name: 'mo-dragger',
+    mounted () {
+      this.preventDefault = ev => ev.preventDefault()
+      let count = 0
+      this.onDragEnter = (ev) => {
+        if (count === 0) {
+          this.$store.dispatch('app/showAddTaskDialog', ADD_TASK_TYPE.TORRENT)
+        }
+        count++
       }
-      count++
-    }
 
-    this.onDragLeave = (ev) => {
-      count--
-      if (count === 0) {
-        this.$store.dispatch('app/hideAddTaskDialog')
+      this.onDragLeave = (ev) => {
+        count--
+        if (count === 0) {
+          this.$store.dispatch('app/hideAddTaskDialog')
+        }
       }
-    }
 
-    this.onDrop = (ev) => {
-      count = 0
+      this.onDrop = (ev) => {
+        count = 0
 
-      const fileList = [...ev.dataTransfer.files]
-        .map(item => ({ raw: item, name: item.name }))
-        .filter(item => /\.torrent$/.test(item.name))
-      if (!fileList.length) {
-        this.$msg.error(this.$t('task.select-torrent'))
+        const fileList = [...ev.dataTransfer.files]
+          .map(item => ({ raw: item, name: item.name }))
+          .filter(item => /\.torrent$/.test(item.name))
+        if (!fileList.length) {
+          this.$msg.error(this.$t('task.select-torrent'))
+        }
       }
-    }
 
-    document.addEventListener('dragover', this.preventDefault)
-    document.body.addEventListener('dragenter', this.onDragEnter)
-    document.body.addEventListener('dragleave', this.onDragLeave)
-    document.body.addEventListener('drop', this.onDrop)
-  },
-  destroyed () {
-    document.removeEventListener('dragover', this.preventDefault)
-    document.body.removeEventListener('dragenter', this.onDragEnter)
-    document.body.removeEventListener('dragleave', this.onDragLeave)
-    document.body.removeEventListener('drop', this.onDrop)
+      document.addEventListener('dragover', this.preventDefault)
+      document.body.addEventListener('dragenter', this.onDragEnter)
+      document.body.addEventListener('dragleave', this.onDragLeave)
+      document.body.addEventListener('drop', this.onDrop)
+    },
+    destroyed () {
+      document.removeEventListener('dragover', this.preventDefault)
+      document.body.removeEventListener('dragenter', this.onDragEnter)
+      document.body.removeEventListener('dragleave', this.onDragLeave)
+      document.body.removeEventListener('drop', this.onDrop)
+    }
   }
-}
 </script>

src/renderer/components/Icons/Icon.vue

@@ -58,171 +58,171 @@
 </style>
 
 <script>
-let icons = {}
+  const icons = {}
 
-export default {
-  name: 'fa-icon',
-  props: {
-    name: {
-      type: String,
-      validator (val) {
-        if (val && !(val in icons)) {
-          console.warn(`Invalid prop: prop "name" is referring to an unregistered icon "${val}".` +
-            `\nPlease make sure you have imported this icon before using it.`)
+  export default {
+    name: 'fa-icon',
+    props: {
+      name: {
+        type: String,
+        validator (val) {
+          if (val && !(val in icons)) {
+            console.warn(`Invalid prop: prop "name" is referring to an unregistered icon "${val}".` +
+              '\nPlease make sure you have imported this icon before using it.')
+            return false
+          }
+          return true
+        }
+      },
+      scale: [Number, String],
+      spin: Boolean,
+      inverse: Boolean,
+      pulse: Boolean,
+      flip: {
+        validator (val) {
+          return val === 'horizontal' || val === 'vertical'
+        }
+      },
+      label: String
+    },
+    data () {
+      return {
+        x: false,
+        y: false,
+        childrenWidth: 0,
+        childrenHeight: 0,
+        outerScale: 1
+      }
+    },
+    computed: {
+      normalizedScale () {
+        let scale = this.scale
+        scale = typeof scale === 'undefined' ? 1 : Number(scale)
+        if (isNaN(scale) || scale <= 0) {
+          console.warn('Invalid prop: prop "scale" should be a number over 0.', this)
+          return this.outerScale
+        }
+        return scale * this.outerScale
+      },
+      klass () {
+        return {
+          'fa-icon': true,
+          'fa-spin': this.spin,
+          'fa-flip-horizontal': this.flip === 'horizontal',
+          'fa-flip-vertical': this.flip === 'vertical',
+          'fa-inverse': this.inverse,
+          'fa-pulse': this.pulse,
+          [this.$options.name]: true
+        }
+      },
+      icon () {
+        if (this.name) {
+          return icons[this.name]
+        }
+        return null
+      },
+      box () {
+        if (this.icon) {
+          return `0 0 ${this.icon.width} ${this.icon.height}`
+        }
+        return `0 0 ${this.width} ${this.height}`
+      },
+      ratio () {
+        if (!this.icon) {
+          return 1
+        }
+        const { width, height } = this.icon
+        return Math.max(width, height) / 16
+      },
+      width () {
+        return this.childrenWidth || (this.icon && this.icon.width / this.ratio * this.normalizedScale) || 0
+      },
+      height () {
+        return this.childrenHeight || (this.icon && this.icon.height / this.ratio * this.normalizedScale) || 0
+      },
+      style () {
+        if (this.normalizedScale === 1) {
           return false
         }
-        return true
+        return {
+          fontSize: this.normalizedScale + 'em'
+        }
+      },
+      raw () {
+        // generate unique id for each icon's SVG element with ID
+        if (!this.icon || !this.icon.raw) {
+          return null
+        }
+        let raw = this.icon.raw
+        const ids = {}
+        raw = raw.replace(/\s(?:xml:)?id=(["']?)([^"')\s]+)\1/g, (match, quote, id) => {
+          const uniqueId = getId()
+          ids[id] = uniqueId
+          return ` id="${uniqueId}"`
+        })
+        raw = raw.replace(/#(?:([^'")\s]+)|xpointer\(id\((['"]?)([^')]+)\2\)\))/g, (match, rawId, _, pointerId) => {
+          const id = rawId || pointerId
+          if (!id || !ids[id]) {
+            return match
+          }
+
+          return `#${ids[id]}`
+        })
+
+        return raw
       }
     },
-    scale: [Number, String],
-    spin: Boolean,
-    inverse: Boolean,
-    pulse: Boolean,
-    flip: {
-      validator (val) {
-        return val === 'horizontal' || val === 'vertical'
+    mounted () {
+      if (!this.name && this.$children.length === 0) {
+        console.warn('Invalid prop: prop "name" is required.')
+        return
       }
-    },
-    label: String
-  },
-  data () {
-    return {
-      x: false,
-      y: false,
-      childrenWidth: 0,
-      childrenHeight: 0,
-      outerScale: 1
-    }
-  },
-  computed: {
-    normalizedScale () {
-      let scale = this.scale
-      scale = typeof scale === 'undefined' ? 1 : Number(scale)
-      if (isNaN(scale) || scale <= 0) {
-        console.warn(`Invalid prop: prop "scale" should be a number over 0.`, this)
-        return this.outerScale
-      }
-      return scale * this.outerScale
-    },
-    klass () {
-      return {
-        'fa-icon': true,
-        'fa-spin': this.spin,
-        'fa-flip-horizontal': this.flip === 'horizontal',
-        'fa-flip-vertical': this.flip === 'vertical',
-        'fa-inverse': this.inverse,
-        'fa-pulse': this.pulse,
-        [this.$options.name]: true
-      }
-    },
-    icon () {
-      if (this.name) {
-        return icons[this.name]
-      }
-      return null
-    },
-    box () {
+
       if (this.icon) {
-        return `0 0 ${this.icon.width} ${this.icon.height}`
+        return
       }
-      return `0 0 ${this.width} ${this.height}`
-    },
-    ratio () {
-      if (!this.icon) {
-        return 1
-      }
-      let { width, height } = this.icon
-      return Math.max(width, height) / 16
-    },
-    width () {
-      return this.childrenWidth || (this.icon && this.icon.width / this.ratio * this.normalizedScale) || 0
-    },
-    height () {
-      return this.childrenHeight || (this.icon && this.icon.height / this.ratio * this.normalizedScale) || 0
-    },
-    style () {
-      if (this.normalizedScale === 1) {
-        return false
-      }
-      return {
-        fontSize: this.normalizedScale + 'em'
-      }
-    },
-    raw () {
-      // generate unique id for each icon's SVG element with ID
-      if (!this.icon || !this.icon.raw) {
-        return null
-      }
-      let raw = this.icon.raw
-      let ids = {}
-      raw = raw.replace(/\s(?:xml:)?id=(["']?)([^"')\s]+)\1/g, (match, quote, id) => {
-        let uniqueId = getId()
-        ids[id] = uniqueId
-        return ` id="${uniqueId}"`
+
+      let width = 0
+      let height = 0
+      this.$children.forEach(child => {
+        child.outerScale = this.normalizedScale
+
+        width = Math.max(width, child.width)
+        height = Math.max(height, child.height)
       })
-      raw = raw.replace(/#(?:([^'")\s]+)|xpointer\(id\((['"]?)([^')]+)\2\)\))/g, (match, rawId, _, pointerId) => {
-        let id = rawId || pointerId
-        if (!id || !ids[id]) {
-          return match
+      this.childrenWidth = width
+      this.childrenHeight = height
+      this.$children.forEach(child => {
+        child.x = (width - child.width) / 2
+        child.y = (height - child.height) / 2
+      })
+    },
+    register (data) {
+      for (const name in data) {
+        const icon = data[name]
+
+        if (!icon.paths) {
+          icon.paths = []
+        }
+        if (icon.d) {
+          icon.paths.push({ d: icon.d })
         }
 
-        return `#${ids[id]}`
-      })
+        if (!icon.polygons) {
+          icon.polygons = []
+        }
+        if (icon.points) {
+          icon.polygons.push({ points: icon.points })
+        }
 
-      return raw
-    }
-  },
-  mounted () {
-    if (!this.name && this.$children.length === 0) {
-      console.warn(`Invalid prop: prop "name" is required.`)
-      return
-    }
-
-    if (this.icon) {
-      return
-    }
-
-    let width = 0
-    let height = 0
-    this.$children.forEach(child => {
-      child.outerScale = this.normalizedScale
-
-      width = Math.max(width, child.width)
-      height = Math.max(height, child.height)
-    })
-    this.childrenWidth = width
-    this.childrenHeight = height
-    this.$children.forEach(child => {
-      child.x = (width - child.width) / 2
-      child.y = (height - child.height) / 2
-    })
-  },
-  register (data) {
-    for (let name in data) {
-      let icon = data[name]
-
-      if (!icon.paths) {
-        icon.paths = []
-      }
-      if (icon.d) {
-        icon.paths.push({ d: icon.d })
+        icons[name] = icon
       }
+    },
+    icons
+  }
 
-      if (!icon.polygons) {
-        icon.polygons = []
-      }
-      if (icon.points) {
-        icon.polygons.push({ points: icon.points })
-      }
-
-      icons[name] = icon
-    }
-  },
-  icons
-}
-
-let cursor = 0xd4937
-function getId () {
-  return `fa-${(cursor++).toString(16)}`
-}
+  let cursor = 0xd4937
+  function getId () {
+    return `fa-${(cursor++).toString(16)}`
+  }
 </script>

src/renderer/components/Icons/arrow-down.js

@@ -0,0 +1,18 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'arrow-down': {
+    'width': 24,
+    'height': 24,
+    'raw': `<g class="nc-icon-wrapper" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+      <line data-cap="butt" data-color="color-2" fill="none" stroke-miterlimit="10" x1="12" y1="2" x2="12" y2="22"/>
+      <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="19,15 12,22 5,15 "/>
+    </g>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/arrow-up.js

@@ -0,0 +1,18 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'arrow-up': {
+    'width': 24,
+    'height': 24,
+    'raw': `<g class="nc-icon-wrapper" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" stroke="currentColor">
+      <line data-cap="butt" data-color="color-2" fill="none" stroke-miterlimit="10" x1="12" y1="22" x2="12" y2="2"/>
+      <polyline fill="none" stroke="currentColor" stroke-miterlimit="10" points="5,9 12,2 19,9 "/>
+    </g>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/audio.js

@@ -0,0 +1,20 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'audio': {
+    'width': 24,
+    'height': 24,
+    'raw': `<rect x="4" y="3" width="16" height="18" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+      <line data-color="color-2" x1="1" y1="6" x2="1" y2="18" fill="none" stroke-miterlimit="10"/>
+      <line data-color="color-2" x1="23" y1="6" x2="23" y2="18" fill="none" stroke-miterlimit="10"/>
+      <polyline data-cap="butt" points="10 15 10 8 16 8 16 14" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+      <circle data-stroke="none" cx="9" cy="15" r="2" stroke="none"/>
+      <circle data-stroke="none" cx="15" cy="14" r="2" stroke="none"/>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/dice.js

@@ -0,0 +1,21 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'dice': {
+    'width': 24,
+    'height': 24,
+    'raw': `<polyline data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" points="17,23 17,7 1,7 "/>
+      <line data-cap="butt" fill="none" stroke="currentColor" stroke-miterlimit="10" x1="17" y1="7" x2="23" y2="1"/>
+      <polygon fill="none" stroke="currentColor" stroke-miterlimit="10" points="17,23 23,17 23,1 7,1 1,7 1,23 "/>
+      <circle data-color="color-2" data-stroke="none" cx="12" cy="12" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+      <circle data-color="color-2" data-stroke="none" cx="6" cy="12" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+      <circle data-color="color-2" data-stroke="none" cx="12" cy="18" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>
+      <circle data-color="color-2" data-stroke="none" cx="6" cy="18" r="1" stroke-linejoin="miter" stroke-linecap="square" stroke="none"/>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/image.js

@@ -0,0 +1,17 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'image': {
+    'width': 24,
+    'height': 24,
+    'raw': `<polyline data-cap="butt" data-color="color-2" points="1 20 6 14 10 18 17 10 23 17" fill="none" stroke-miterlimit="10"/>
+      <rect x="1" y="3" width="22" height="18" fill="none" stroke="currentColor" stroke-miterlimit="10"/>
+      <circle data-color="color-2" cx="9" cy="8" r="2" fill="none" stroke-miterlimit="10"/>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/magnet.js

@@ -0,0 +1,20 @@
+import Icon from '@/components/Icons/Icon'
+
+Icon.register({
+  'magnet': {
+    'width': 24,
+    'height': 24,
+    'raw': `
+      <line fill="none" stroke-miterlimit="10" x1="8.2" y1="4.5" x2="11.1" y2="7.3"></line>
+      <line fill="none" stroke-miterlimit="10" x1="16.7" y1="12.9" x2="19.5" y2="15.8"></line>
+      <path fill="none" stroke-miterlimit="10"
+        d="M12.5,17.2 c-1.6,1.6-4.1,1.6-5.7,0c-1.6-1.6-1.6-4.1,0-5.7l7.1-7.1l-2.8-2.8L4,8.7C0.9,11.8,0.9,16.9,4,20s8.2,3.1,11.3,0l7.1-7.1l-2.8-2.8 L12.5,17.2z">
+      </path>`,
+    'g': {
+      'stroke': 'currentColor',
+      'stroke-linecap': 'round',
+      'stroke-linejoin': 'round',
+      'stroke-width': '2'
+    }
+  }
+})

src/renderer/components/Icons/menu-add.js

@@ -4,8 +4,8 @@ Icon.register({
   'menu-add': {
     'width': 24,
     'height': 24,
-    'raw': `<line fill="none" stroke="#fff" stroke-miterlimit="10" x1="12" y1="2" x2="12" y2="22" />
-      <line fill="none" stroke="#fff" stroke-miterlimit="10" x1="22" y1="12" x2="2" y2="12" />`,
+    'raw': `<line fill="none" stroke-miterlimit="10" x1="12" y1="2" x2="12" y2="22" />
+      <line fill="none" stroke-miterlimit="10" x1="22" y1="12" x2="2" y2="12" />`,
     'g': {
       'stroke': 'currentColor',
       'stroke-linecap': 'round',