fix: some fix

build/afterSignHook.js

@@ -1,5 +1,6 @@
 require('dotenv').config()
-const { notarize } = require('electron-notarize')
+const { join } = require('path');
+const { notarize } = require('@electron/notarize')
 const { appId } = require('../electron-builder.json')
 
 exports.default = async function (context) {
@@ -10,18 +11,24 @@ exports.default = async function (context) {
 
   const skipNotarize = process.env.SKIP_NOTARIZE
   if (skipNotarize === 'true') {
-    console.log('skipping notarize')
+    console.log('Skipping notarize')
     return
   }
 
   const appBundleId = appId
   const appName = context.packager.appInfo.productFilename
+  const appPath = join(appOutDir, `${appName}.app`);
 
-  return await notarize({
-    appBundleId,
-    appPath: `${appOutDir}/${appName}.app`,
-    ascProvider: process.env.TEAM_ID,
-    appleId: process.env.APPLE_ID,
-    appleIdPassword: process.env.APPLE_ID_PWD
-  })
+  try {
+    await notarize({
+      appBundleId,
+      appPath,
+      appleId: process.env.APPLE_ID,
+      appleIdPassword: process.env.APPLE_ID_PASSWORD
+    })
+  } catch (error) {
+    console.error(error);
+  }
+
+  console.log(`Done notarizing ${appId}`);
 }

electron-builder.json

@@ -2,7 +2,7 @@
     "productName": "Motrix",
     "appId": "app.motrix.desktop",
     "afterPack": "./build/afterPackHook.js",
-    "afterSign": "electron-builder-notarize",
+    "afterSign": "./build/afterSignHook.js",
     "fileAssociations": [
       {
         "ext": "torrent",

extra/darwin/arm64/engine/aria2.conf

@@ -39,7 +39,7 @@ 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
+user-agent=Transmission/3.00
 # Send Accept: deflate, gzip request header
 http-accept-gzip=true
 
@@ -70,6 +70,6 @@ enable-dht6=true
 # Enable Peer Exchange extension.
 enable-peer-exchange=true
 # Specify the string used during the bitorrent extended handshake for the peer's client version.
-peer-agent=Transmission/2.94
+peer-agent=Transmission/3.00
 # Specify the prefix of peer ID.
-peer-id-prefix=-TR2940-
+peer-id-prefix=-TR3000-

extra/darwin/x64/engine/aria2.conf

@@ -39,7 +39,7 @@ 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
+user-agent=Transmission/3.00
 # Send Accept: deflate, gzip request header
 http-accept-gzip=true
 
@@ -70,6 +70,6 @@ enable-dht6=true
 # Enable Peer Exchange extension.
 enable-peer-exchange=true
 # Specify the string used during the bitorrent extended handshake for the peer's client version.
-peer-agent=Transmission/2.94
+peer-agent=Transmission/3.00
 # Specify the prefix of peer ID.
 peer-id-prefix=-TR2940-

extra/linux/engine/aria2.conf

@@ -39,7 +39,7 @@ 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
+user-agent=Transmission/3.00
 # Send Accept: deflate, gzip request header
 http-accept-gzip=true
 
@@ -70,6 +70,6 @@ enable-dht6=true
 # Enable Peer Exchange extension.
 enable-peer-exchange=true
 # Specify the string used during the bitorrent extended handshake for the peer's client version.
-peer-agent=Transmission/2.94
+peer-agent=Transmission/3.00
 # Specify the prefix of peer ID.
 peer-id-prefix=-TR2940-

extra/win32/ia32/engine/aria2.conf

@@ -39,7 +39,7 @@ 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
+user-agent=Transmission/3.00
 # Send Accept: deflate, gzip request header
 http-accept-gzip=true
 
@@ -70,6 +70,6 @@ enable-dht6=true
 # Enable Peer Exchange extension.
 enable-peer-exchange=true
 # Specify the string used during the bitorrent extended handshake for the peer's client version.
-peer-agent=Transmission/2.94
+peer-agent=Transmission/3.00
 # Specify the prefix of peer ID.
 peer-id-prefix=-TR2940-

extra/win32/x64/engine/aria2.conf

@@ -39,7 +39,7 @@ 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
+user-agent=Transmission/3.00
 # Send Accept: deflate, gzip request header
 http-accept-gzip=true
 
@@ -70,6 +70,6 @@ enable-dht6=true
 # Enable Peer Exchange extension.
 enable-peer-exchange=true
 # Specify the string used during the bitorrent extended handshake for the peer's client version.
-peer-agent=Transmission/2.94
+peer-agent=Transmission/3.00
 # Specify the prefix of peer ID.
 peer-id-prefix=-TR2940-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Motrix",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "A full-featured download manager",
   "homepage": "https://motrix.app",
   "author": {
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0",
-    "@motrix/nat-api": "^0.3.2",
+    "@motrix/nat-api": "^0.3.3",
     "@panter/vue-i18next": "^0.15.2",
     "axios": "^1.3.4",
     "bittorrent-peerid": "^1.3.6",
@@ -63,6 +63,8 @@
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
+    "@electron/notarize": "^1.2.3",
+    "@electron/osx-sign": "^1.0.4",
     "@electron/remote": "^2.0.9",
     "@motrix/multispinner": "^0.2.2",
     "@vue/eslint-config-standard": "^6.1.0",
@@ -79,10 +81,7 @@
     "del": "^6.1.1",
     "electron": "^22.3.3",
     "electron-builder": "^23.6.0",
-    "electron-builder-notarize": "^1.5.1",
     "electron-devtools-installer": "^3.2.0",
-    "electron-notarize": "^1.2.1",
-    "electron-osx-sign": "^0.6.0",
     "eslint": "^7.32.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-plugin-import": "^2.27.5",

src/main/Application.js

@@ -229,7 +229,7 @@ export default class Application extends EventEmitter {
     try {
       await Promise.allSettled(promises)
     } catch (e) {
-      logger.warn('[Motrix] start UPnP mapping fail', e)
+      logger.warn('[Motrix] start UPnP mapping fail', e.message)
     }
   }
 

src/main/core/ConfigManager.js

@@ -77,7 +77,7 @@ export default class ConfigManager {
         'seed-ratio': 1,
         'seed-time': 60,
         'split': getMaxConnectionPerServer(),
-        'user-agent': 'Transmission/2.94'
+        'user-agent': 'Transmission/3.00'
       }
       /* eslint-enable quote-props */
     })

src/main/core/UPnPManager.js

@@ -35,7 +35,7 @@ export default class UPnPManager {
       try {
         client.map(port, (err) => {
           if (err) {
-            logger.warn(`[Motrix] UPnPManager map ${port} failed, error: `, err)
+            logger.warn(`[Motrix] UPnPManager map ${port} failed, error: `, err.message)
             reject(err.message)
             return
           }

src/main/ui/DockManager.js

@@ -8,7 +8,7 @@ import {
   APP_RUN_MODE
 } from '@shared/constants'
 
-const isMac = is.macOS()
+const enabled = is.macOS()
 
 export default class DockManager extends EventEmitter {
   constructor (options) {
@@ -20,7 +20,7 @@ export default class DockManager extends EventEmitter {
     }
   }
 
-  show = isMac
+  show = enabled
     ? () => {
       if (app.dock.isVisible()) {
         return
@@ -30,7 +30,7 @@ export default class DockManager extends EventEmitter {
     }
     : () => {}
 
-  hide = isMac
+  hide = enabled
     ? () => {
       if (!app.dock.isVisible()) {
         return
@@ -40,21 +40,23 @@ export default class DockManager extends EventEmitter {
     }
     : () => {}
 
-  setBadge = isMac
+  // macOS setBadge not working
+  // @see https://github.com/electron/electron/issues/25745#issuecomment-702826143
+  setBadge = enabled
     ? (text) => {
       app.dock.setBadge(text)
     }
     : (text) => {}
 
-  handleSpeedChange = isMac
+  handleSpeedChange = enabled
     ? (speed) => {
       const { downloadSpeed } = speed
       const text = downloadSpeed > 0 ? `${bytesToSize(downloadSpeed)}/s` : ''
       this.setBadge(text)
     }
     : (text) => {}
 
-  openDock = isMac
+  openDock = enabled
     ? (path) => {
       app.dock.downloadFinished(path)
     }

src/shared/constants.js

@@ -54,10 +54,10 @@ export const NGOSANG_TRACKERS_BEST_IP_URL = 'https://raw.githubusercontent.com/n
 export const NGOSANG_TRACKERS_ALL_URL = 'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all.txt'
 export const NGOSANG_TRACKERS_ALL_IP_URL = 'https://raw.githubusercontent.com/ngosang/trackerslist/master/trackers_all_ip.txt'
 
-export const NGOSANG_TRACKERS_BEST_URL_CDN = 'https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_best.txt'
-export const NGOSANG_TRACKERS_BEST_IP_URL_CDN = 'https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_best_ip.txt'
-export const NGOSANG_TRACKERS_ALL_URL_CDN = 'https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt'
-export const NGOSANG_TRACKERS_ALL_IP_URL_CDN = 'https://cdn.jsdelivr.net/gh/ngosang/trackerslist/trackers_all_ip.txt'
+export const NGOSANG_TRACKERS_BEST_URL_CDN = 'https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_best.txt'
+export const NGOSANG_TRACKERS_BEST_IP_URL_CDN = 'https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_best_ip.txt'
+export const NGOSANG_TRACKERS_ALL_URL_CDN = 'https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_all.txt'
+export const NGOSANG_TRACKERS_ALL_IP_URL_CDN = 'https://fastly.jsdelivr.net/gh/ngosang/trackerslist/trackers_all_ip.txt'
 
 /**
  * @see https://github.com/XIU2/TrackersListCollection
@@ -66,12 +66,12 @@ export const XIU2_TRACKERS_BEST_URL = 'https://raw.githubusercontent.com/XIU2/Tr
 export const XIU2_TRACKERS_ALL_URL = 'https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/all.txt'
 export const XIU2_TRACKERS_HTTP_URL = 'https://raw.githubusercontent.com/XIU2/TrackersListCollection/master/http.txt'
 
-export const XIU2_TRACKERS_BEST_URL_CDN = 'https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection/best.txt'
-export const XIU2_TRACKERS_ALL_URL_CDN = 'https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection/all.txt'
-export const XIU2_TRACKERS_HTTP_URL_CDN = 'https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection/http.txt'
+export const XIU2_TRACKERS_BEST_URL_CDN = 'https://fastly.jsdelivr.net/gh/XIU2/TrackersListCollection/best.txt'
+export const XIU2_TRACKERS_ALL_URL_CDN = 'https://fastly.jsdelivr.net/gh/XIU2/TrackersListCollection/all.txt'
+export const XIU2_TRACKERS_HTTP_URL_CDN = 'https://fastly.jsdelivr.net/gh/XIU2/TrackersListCollection/http.txt'
 
 // For bt-exclude-tracker
-export const XIU2_TRACKERS_BLACK_URL = 'https://cdn.jsdelivr.net/gh/XIU2/TrackersListCollection/blacklist.txt'
+export const XIU2_TRACKERS_BLACK_URL = 'https://fastly.jsdelivr.net/gh/XIU2/TrackersListCollection/blacklist.txt'
 
 export const trackerSourceOptions = [
   {

src/shared/locales/en-US/task.js

@@ -112,7 +112,7 @@ export default {
   'bt-download-complete-message': 'Completed downloading {{taskName}}, seeding',
   'bt-download-complete-notify': 'BT Download Completed, seeding...',
   'bt-download-complete-tips': 'Tips: You can stop a task to end its seeding',
-  'bt-stopping-seeding-tip': 'Stopping seeding, it will take some time to disconnect, please wait...',
+  'bt-stopping-seeding-tip': 'Stopping seeding, it will take some time to disconnect, please wait patiently',
   'download-fail-message': 'Failed to download {{taskName}}',
   'download-fail-notify': 'Download Failed'
 }

src/shared/ua.js

@@ -1,6 +1,6 @@
 export default {
-  aria2: 'aria2/1.35.0',
-  transmission: 'Transmission/2.94',
-  chrome: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36',
+  aria2: 'aria2/1.36.0',
+  transmission: 'Transmission/3.00',
+  chrome: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/111.0.0.0 Safari/537.36',
   du: 'netdisk;6.0.0.12;PC;PC-Windows;10.0.16299;WindowsBaiduYunGuanJia'
 }