diff --git a/src/electron/ipcMain.js b/src/electron/ipcMain.js index 60a778d..c8fa912 100644 --- a/src/electron/ipcMain.js +++ b/src/electron/ipcMain.js @@ -103,4 +103,22 @@ export function initIpcMain(win, store) { instance: true, }); }); + + ipcMain.on('setProxy', (event, config) => { + console.log(config); + const proxyRules = `${config.protocol}://${config.server}:${config.port}`; + win.webContents.session.setProxy( + { + proxyRules, + }, + () => { + console.log('finished setProxy'); + } + ); + }); + + ipcMain.on('removeProxy', (event, arg) => { + console.log('removeProxy'); + win.webContents.session.setProxy({}); + }); } diff --git a/src/store/initLocalStorage.js b/src/store/initLocalStorage.js index 8d25f67..17a9ed1 100644 --- a/src/store/initLocalStorage.js +++ b/src/store/initLocalStorage.js @@ -25,6 +25,11 @@ let localStorage = { enableGlobalShortcut: true, showLibraryDefault: false, enabledPlaylistCategories, + proxyConfig: { + protocol: 'noProxy', + server: '', + port: null, + }, }, data: { user: {}, diff --git a/src/views/settings.vue b/src/views/settings.vue index 1c49b02..0354685 100644 --- a/src/views/settings.vue +++ b/src/views/settings.vue @@ -25,7 +25,7 @@ -

{{ $t('settings.settings') }}

+
{{ $t('settings.language') }}
@@ -54,6 +54,8 @@
+ +

音质

{{ $t('settings.musicQuality.text') }}
@@ -92,6 +94,8 @@
+ +

缓存

@@ -143,6 +147,8 @@
+ +

歌词

{{ $t('settings.showLyricsTranslation') }}
@@ -198,23 +204,8 @@
-
-
-
{{ $t('settings.minimizeToTray') }}
-
-
-
- - -
-
-
+

第三方

@@ -232,24 +223,6 @@
- -
-
-
{{ $t('settings.showLibraryDefault') }}
-
-
-
- - -
-
-
-
+
+
+
+ {{ $t('settings.enableDiscordRichPresence') }}
+
+
+
+ + +
+
+
+ +

其他

+
+
+
{{ $t('settings.minimizeToTray') }}
+
+
+
+ + +
+
+
+ +
+
+
{{ $t('settings.showLibraryDefault') }}
+
+
+
+ + +
+
+
@@ -292,24 +318,6 @@
-
-
-
- {{ $t('settings.enableDiscordRichPresence') }}
-
-
-
- - -
-
-
{{ $t('settings.enableGlobalShortcut') }}
@@ -343,6 +351,40 @@
+
+

代理

+
+
+
代理协议
+
+
+ +
+
+
+ + +
+
+

MADE BY @@ -362,6 +404,11 @@ import { changeAppearance, bytesToSize } from '@/utils/common'; import { countDBSize, clearDB } from '@/utils/db'; import pkg from '../../package.json'; +const electron = + process.env.IS_ELECTRON === true ? window.require('electron') : null; +const ipcRenderer = + process.env.IS_ELECTRON === true ? electron.ipcRenderer : null; + export default { name: 'Settings', data() { @@ -438,16 +485,17 @@ export default { }, outputDevice: { get() { - if (this.withoutAudioPrivilege === true) this.getAllOutputDevices(); - const isValidDevice = this.allOutputDevices.find( - device => device.deviceId === this.settings.outputDevice - ); - if ( - this.settings.outputDevice === undefined || - isValidDevice === undefined - ) - return 'default'; // Default deviceId - return this.settings.outputDevice; + // if (this.withoutAudioPrivilege === true) this.getAllOutputDevices(); + // const isValidDevice = this.allOutputDevices.find( + // device => device.deviceId === this.settings.outputDevice + // ); + // if ( + // this.settings.outputDevice === undefined || + // isValidDevice === undefined + // ) + // return 'default'; // Default deviceId + // return this.settings.outputDevice; + return 'default'; // Default deviceId }, set(deviceId) { if (deviceId === this.settings.outputDevice || deviceId === undefined) @@ -583,6 +631,48 @@ export default { }); }, }, + proxyProtocol: { + get() { + return this.settings.proxyConfig?.protocol || 'noProxy'; + }, + set(value) { + let config = this.settings.proxyConfig || {}; + config.protocol = value; + if (value === 'noProxy') { + ipcRenderer.send('removeProxy'); + } + this.$store.commit('updateSettings', { + key: 'proxyConfig', + value: config, + }); + }, + }, + proxyServer: { + get() { + return this.settings.proxyConfig?.server || ''; + }, + set(value) { + let config = this.settings.proxyConfig || {}; + config.server = value; + this.$store.commit('updateSettings', { + key: 'proxyConfig', + value: config, + }); + }, + }, + proxyPort: { + get() { + return this.settings.proxyConfig?.port || ''; + }, + set(value) { + let config = this.settings.proxyConfig || {}; + config.port = value; + this.$store.commit('updateSettings', { + key: 'proxyConfig', + value: config, + }); + }, + }, isLastfmConnected() { return this.lastfm.key !== undefined; }, @@ -650,6 +740,19 @@ export default { localStorage.removeItem('lastfm'); this.$store.commit('updateLastfm', {}); }, + sendProxyConfig() { + if (this.proxyProtocol === 'noProxy') return; + const config = this.settings.proxyConfig; + if ( + config.server === '' || + !config.port || + config.protocol === 'noProxy' + ) { + ipcRenderer.send('removeProxy'); + } else { + ipcRenderer.send('setProxy', config); + } + }, }, }; @@ -669,6 +772,14 @@ h2 { color: var(--color-text); } +h3 { + margin-top: 48px; + padding-bottom: 12px; + font-size: 26px; + color: var(--color-text); + border-bottom: 1px solid rgba(128, 128, 128, 0.18); +} + .user { display: flex; align-items: center; @@ -677,6 +788,7 @@ h2 { color: var(--color-text); padding: 16px 20px; border-radius: 16px; + margin-bottom: 48px; img.avatar { border-radius: 50%; height: 64px; @@ -751,40 +863,69 @@ h2 { color: var(--color-text); .title { - font-size: 18px; - font-weight: 600; - opacity: 0.88; + font-size: 16px; + font-weight: 500; + opacity: 0.68; } +} - select { - min-width: 192px; - font-weight: 600; - border: none; - padding: 8px 12px 8px 12px; - border-radius: 8px; - color: var(--color-text); - background: var(--color-secondary-bg); - appearance: none; - &:focus { - outline: none; - color: var(--color-primary); - background: var(--color-primary-bg); - } +select { + min-width: 192px; + font-weight: 600; + border: none; + padding: 8px 12px 8px 12px; + border-radius: 8px; + color: var(--color-text); + background: var(--color-secondary-bg); + appearance: none; + &:focus { + outline: none; + color: var(--color-primary); + background: var(--color-primary-bg); } +} - button { - color: var(--color-text); - background: var(--color-secondary-bg); - padding: 8px 12px 8px 12px; - font-weight: 600; - border-radius: 8px; - transition: 0.2s; - &:hover { - transform: scale(1.06); - } - &:active { - transform: scale(0.94); - } +button { + color: var(--color-text); + background: var(--color-secondary-bg); + padding: 8px 12px 8px 12px; + font-weight: 600; + border-radius: 8px; + transition: 0.2s; + &:hover { + transform: scale(1.06); + } + &:active { + transform: scale(0.94); + } +} + +input.text-input { + background: var(--color-secondary-bg); + border: none; + margin-right: 22px; + padding: 8px 12px 8px 12px; + border-radius: 8px; + color: var(--color-text); + font-weight: 600; + font-size: 16px; +} +input::-webkit-outer-spin-button, +input::-webkit-inner-spin-button { + -webkit-appearance: none; +} +input[type='number'] { + -moz-appearance: textfield; +} + +#proxy-form { + display: flex; + align-items: center; +} +#proxy-form.disabled { + opacity: 0.47; + button:hover { + transform: unset; } }