From 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Wed, 8 Sep 2021 20:47:39 +0530 Subject: chore: proxy feature is always turned on: remove 'enabled' flag --- src/features/serviceProxy/index.js | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'src/features/serviceProxy') 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 @@ -import { autorun, observable } from 'mobx'; +import { autorun } from 'mobx'; import { session } from '@electron/remote'; const debug = require('debug')('Ferdi:feature:serviceProxy'); -export const config = observable({ - isEnabled: true, -}); - export default function init(stores) { debug('Initializing `serviceProxy` feature'); autorun(() => { - config.isEnabled = true; - const services = stores.services.enabled; const proxySettings = stores.settings.proxy; debug('Service Proxy autorun'); services.forEach((service) => { - const s = session.fromPartition(`persist:service-${service.id}`); - - if (config.isEnabled) { - const serviceProxyConfig = proxySettings[service.id]; - - if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { - const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`; - debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost); - - s.setProxy({ proxyRules: proxyHost }, () => { - debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`); - }); - } + const serviceProxyConfig = proxySettings[service.id]; + if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { + const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`; + debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost); + + session.fromPartition(`persist:service-${service.id}`).setProxy({ proxyRules: proxyHost }, () => { + debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`); + }); } }); }); -- cgit v1.2.3-54-g00ecf