aboutsummaryrefslogtreecommitdiffstats
path: root/src/features/serviceProxy
diff options
context:
space:
mode:
authorLibravatar Vijay A <avijayr@protonmail.com>2021-09-08 20:47:39 +0530
committerLibravatar Vijay A <avijayr@protonmail.com>2021-09-08 20:55:44 +0530
commit2772cb2e3e75f16b3dc96a2441518ed0772e3ba1 (patch)
tree98f5ec36534927581b1b0688837f407774d5f76a /src/features/serviceProxy
parentrefactor: expose some more methods for session handling on the main repo (#1887) (diff)
downloadferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.tar.gz
ferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.tar.zst
ferdium-app-2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.zip
chore: proxy feature is always turned on: remove 'enabled' flag
Diffstat (limited to 'src/features/serviceProxy')
-rw-r--r--src/features/serviceProxy/index.js29
1 files changed, 9 insertions, 20 deletions
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index eb7116651..125b4729f 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,37 +1,26 @@
1import { autorun, observable } from 'mobx'; 1import { autorun } from 'mobx';
2import { session } from '@electron/remote'; 2import { session } from '@electron/remote';
3 3
4const debug = require('debug')('Ferdi:feature:serviceProxy'); 4const debug = require('debug')('Ferdi:feature:serviceProxy');
5 5
6export const config = observable({
7 isEnabled: true,
8});
9
10export default function init(stores) { 6export default function init(stores) {
11 debug('Initializing `serviceProxy` feature'); 7 debug('Initializing `serviceProxy` feature');
12 8
13 autorun(() => { 9 autorun(() => {
14 config.isEnabled = true;
15
16 const services = stores.services.enabled; 10 const services = stores.services.enabled;
17 const proxySettings = stores.settings.proxy; 11 const proxySettings = stores.settings.proxy;
18 12
19 debug('Service Proxy autorun'); 13 debug('Service Proxy autorun');
20 14
21 services.forEach((service) => { 15 services.forEach((service) => {
22 const s = session.fromPartition(`persist:service-${service.id}`); 16 const serviceProxyConfig = proxySettings[service.id];
23 17 if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
24 if (config.isEnabled) { 18 const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
25 const serviceProxyConfig = proxySettings[service.id]; 19 debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
26 20
27 if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { 21 session.fromPartition(`persist:service-${service.id}`).setProxy({ proxyRules: proxyHost }, () => {
28 const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`; 22 debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
29 debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost); 23 });
30
31 s.setProxy({ proxyRules: proxyHost }, () => {
32 debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
33 });
34 }
35 } 24 }
36 }); 25 });
37 }); 26 });