2 files changed, 54 insertions, 38 deletions

diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
deleted file mode 100644
index b9320cda9..000000000
--- a/src/features/serviceProxy/index.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { autorun, observable } 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');
-
-    for (const service of services) {
-      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})`);
-          });
-        }
-      }
-    }
-  });
-}
diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts
new file mode 100644
index 000000000..f095b286a
--- /dev/null
+++ b/src/features/serviceProxy/index.ts
@@ -0,0 +1,54 @@
+import { autorun, observable } 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: {
+  services: { enabled: any };
+  settings: { proxy: any };
+}) {
+  debug('Initializing `serviceProxy` feature');
+
+  autorun(() => {
+    config.isEnabled = true;
+
+    const services = stores.services.enabled;
+    const proxySettings = stores.settings.proxy;
+
+    debug('Service Proxy autorun');
+
+    for (const service of services) {
+      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 })
+            .then(() => {
+              debug(
+                `Using proxy "${proxyHost}" for "${service.name}" (${service.id})`,
+              );
+            })
+            .catch(error => console.error(error));
+        }
+      }
+    }
+  });
+}