12 files changed, 175 insertions, 115 deletions

diff --git a/src/electron/ipc-api/appIndicator.js b/src/electron/ipc-api/appIndicator.ts
index c6c261d0f..a51ed8161 100644
--- a/src/electron/ipc-api/appIndicator.js
+++ b/src/electron/ipc-api/appIndicator.ts
@@ -6,15 +6,22 @@ import { isMac, isWindows, isLinux } from '../../environment';
 const INDICATOR_TASKBAR = 'taskbar';
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 
-let isTrayIconEnabled;
+let isTrayIconEnabled: boolean;
 
-function getAsset(type, asset) {
+function getAsset(type: 'tray' | 'taskbar', asset: string) {
   return join(
-    __dirname, '..', '..', 'assets', 'images', type, process.platform, `${asset}.${FILE_EXTENSION}`,
+    __dirname,
+    '..',
+    '..',
+    'assets',
+    'images',
+    type,
+    process.platform,
+    `${asset}.${FILE_EXTENSION}`,
   );
 }
 
-export default (params) => {
+export default params => {
   autorun(() => {
     isTrayIconEnabled = params.settings.app.get('enableSystemTray');
 
@@ -25,36 +32,37 @@ export default (params) => {
     }
   });
 
-  ipcMain.on('updateAppIndicator', (event, args) => {
+  ipcMain.on('updateAppIndicator', (_event, args) => {
     // Flash TaskBar for windows, bounce Dock on Mac
-    if (!app.mainWindow.isFocused()) {
-      if (params.settings.app.get('notifyTaskBarOnMessage')) {
+    if (!(app as any).mainWindow.isFocused() && params.settings.app.get('notifyTaskBarOnMessage')) {
         if (isWindows) {
-          app.mainWindow.flashFrame(true);
-          app.mainWindow.once('focus', () => app.mainWindow.flashFrame(false));
+          (app as any).mainWindow.flashFrame(true);
+          (app as any).mainWindow.once('focus', () =>
+            (app as any).mainWindow.flashFrame(false),
+          );
         } else if (isMac) {
           app.dock.bounce('informational');
         }
       }
-    }
 
     // Update badge
-    if (isMac
-      && typeof (args.indicator) === 'string') {
+    if (isMac && typeof args.indicator === 'string') {
       app.dock.setBadge(args.indicator);
     }
 
-    if ((isMac || isLinux)
-      && typeof (args.indicator) === 'number'
-    ) {
+    if ((isMac || isLinux) && typeof args.indicator === 'number') {
       app.badgeCount = args.indicator;
     }
 
     if (isWindows) {
-      if (typeof args.indicator === 'number'
-        && args.indicator !== 0) {
+      if (typeof args.indicator === 'number' && args.indicator !== 0) {
         params.mainWindow.setOverlayIcon(
-          getAsset('taskbar', `${INDICATOR_TASKBAR}-${(args.indicator >= 10 ? 10 : args.indicator)}`),
+          getAsset(
+            'taskbar',
+            `${INDICATOR_TASKBAR}-${
+              args.indicator >= 10 ? 10 : args.indicator
+            }`,
+          ),
           '',
         );
       } else if (typeof args.indicator === 'string') {
diff --git a/src/electron/ipc-api/autoUpdate.js b/src/electron/ipc-api/autoUpdate.ts
index 255595b9e..e6b805edc 100644
--- a/src/electron/ipc-api/autoUpdate.js
+++ b/src/electron/ipc-api/autoUpdate.ts
@@ -1,11 +1,10 @@
-import { app, ipcMain } from 'electron';
+import { app, ipcMain, BrowserWindow } from 'electron';
 import { autoUpdater } from 'electron-updater';
-import { GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
 import { isMac, isWindows } from '../../environment';
 
 const debug = require('debug')('Ferdi:ipcApi:autoUpdate');
 
-export default (params) => {
+export default (params: { mainWindow: BrowserWindow; settings: any }) => {
   const enableUpdate = Boolean(params.settings.app.get('automaticUpdates'));
 
   if (!enableUpdate) {
@@ -16,17 +15,16 @@ export default (params) => {
       if (enableUpdate) {
         try {
           autoUpdater.autoInstallOnAppQuit = false;
-          autoUpdater.allowPrerelease = Boolean(params.settings.app.get('beta'));
+          autoUpdater.allowPrerelease = Boolean(
+            params.settings.app.get('beta'),
+          );
           autoUpdater.channel = autoUpdater.allowPrerelease ? 'beta' : 'latest';
 
           if (params.settings.app.get('nightly')) {
-            autoUpdater.allowPrerelease = Boolean(params.settings.app.get('nightly'));
+            autoUpdater.allowPrerelease = Boolean(
+              params.settings.app.get('nightly'),
+            );
             autoUpdater.channel = 'alpha';
-            autoUpdater.setFeedURL({
-              provider: 'github',
-              owner: GITHUB_ORG_NAME,
-              repo: GITHUB_NIGHTLIES_REPO_NAME,
-            });
           }
 
           if (args.action === 'check') {
@@ -40,8 +38,8 @@ export default (params) => {
               app.quit();
             }, 20);
           }
-        } catch (e) {
-          console.error(e);
+        } catch (error) {
+          console.error(error);
           event.sender.send('autoUpdate', { error: true });
         }
       }
@@ -52,7 +50,7 @@ export default (params) => {
       params.mainWindow.webContents.send('autoUpdate', { available: false });
     });
 
-    autoUpdater.on('update-available', (event) => {
+    autoUpdater.on('update-available', event => {
       debug('update-available');
 
       if (enableUpdate) {
@@ -63,7 +61,7 @@ export default (params) => {
       }
     });
 
-    autoUpdater.on('download-progress', (progressObj) => {
+    autoUpdater.on('download-progress', progressObj => {
       let logMessage = `Download speed: ${progressObj.bytesPerSecond}`;
       logMessage = `${logMessage} - Downloaded ${progressObj.percent}%`;
       logMessage = `${logMessage} (${progressObj.transferred}/${progressObj.total})`;
diff --git a/src/electron/ipc-api/cld.js b/src/electron/ipc-api/cld.ts
index 73e320ad9..4221f9b22 100644
--- a/src/electron/ipc-api/cld.js
+++ b/src/electron/ipc-api/cld.ts
@@ -4,17 +4,20 @@ import cld from 'cld';
 const debug = require('debug')('Ferdi:ipcApi:cld');
 
 export default async () => {
-  ipcMain.handle('detect-language', async (event, { sample }) => {
+  ipcMain.handle('detect-language', async (_event, { sample }) => {
     try {
       const result = await cld.detect(sample);
       debug('Checking language', 'probability', result.languages);
       if (result.reliable) {
-        debug('Language detected reliably, setting spellchecker language to', result.languages[0].code);
+        debug(
+          'Language detected reliably, setting spellchecker language to',
+          result.languages[0].code,
+        );
 
         return result.languages[0].code;
       }
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
     }
   });
 };
diff --git a/src/electron/ipc-api/dnd.js b/src/electron/ipc-api/dnd.ts
index 6fb8999a3..afaef9a66 100644
--- a/src/electron/ipc-api/dnd.js
+++ b/src/electron/ipc-api/dnd.ts
@@ -15,8 +15,8 @@ export default async () => {
       const isDND = getDoNotDisturb();
       debug('Fetching DND state, set to', isDND);
       return isDND;
-    } catch (e) {
-      console.error(e);
+    } catch (error) {
+      console.error(error);
       return false;
     }
   });
diff --git a/src/electron/ipc-api/download.js b/src/electron/ipc-api/download.js
deleted file mode 100644
index ba261ba1e..000000000
--- a/src/electron/ipc-api/download.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ipcMain, dialog, BrowserWindow } from 'electron';
-import { download } from 'electron-dl';
-import mime from 'mime-types';
-import { writeFileSync } from 'fs-extra';
-
-const debug = require('debug')('Ferdi:ipcApi:download');
-
-function decodeBase64Image(dataString) {
-  const matches = dataString.match(/^data:([A-Za-z-+/]+);base64,(.+)$/);
-
-  if (matches.length !== 3) {
-    return new Error('Invalid input string');
-  }
-
-  return Buffer.from(matches[2], 'base64');
-}
-
-export default (params) => {
-  ipcMain.on('download-file', async (event, { url, content, fileOptions = {} }) => {
-    const win = BrowserWindow.getFocusedWindow();
-
-    try {
-      if (!content) {
-        const dl = await download(win, url, {
-          saveAs: true,
-        });
-        debug('File saved to', dl.savePath);
-      } else {
-        const extension = mime.extension(fileOptions.mime);
-        const filename = `${fileOptions.name}.${extension}`;
-
-        try {
-          const saveDialog = await dialog.showSaveDialog(params.mainWindow, {
-            defaultPath: filename,
-          });
-
-          if (saveDialog.canceled) return;
-
-          const binaryImage = decodeBase64Image(content);
-          writeFileSync(saveDialog.filePath, binaryImage, 'binary');
-
-          debug('File blob saved to', saveDialog.filePath);
-        } catch (err) {
-          console.log(err);
-        }
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  });
-};
diff --git a/src/electron/ipc-api/download.ts b/src/electron/ipc-api/download.ts
new file mode 100644
index 000000000..af15b157e
--- /dev/null
+++ b/src/electron/ipc-api/download.ts
@@ -0,0 +1,59 @@
+import { ipcMain, dialog, BrowserWindow } from 'electron';
+import { download } from 'electron-dl';
+import mime from 'mime-types';
+import { writeFileSync } from 'fs-extra';
+import { PathLike } from 'fs';
+
+const debug = require('debug')('Ferdi:ipcApi:download');
+
+function decodeBase64Image(dataString: string) {
+  const matches = dataString.match(/^data:([+/A-Za-z-]+);base64,(.+)$/);
+
+  if (matches?.length !== 3) {
+    return new Error('Invalid input string');
+  }
+
+  return Buffer.from(matches[2], 'base64');
+}
+
+export default (params: { mainWindow: BrowserWindow }) => {
+  ipcMain.on(
+    'download-file',
+    async (_event, { url, content, fileOptions = {} }) => {
+      const win = BrowserWindow.getFocusedWindow();
+
+      try {
+        if (!content) {
+          const dl = await download(win!, url, {
+            saveAs: true,
+          });
+          debug('File saved to', dl.savePath);
+        } else {
+          const extension = mime.extension(fileOptions.mime);
+          const filename = `${fileOptions.name}.${extension}`;
+
+          try {
+            const saveDialog = await dialog.showSaveDialog(params.mainWindow, {
+              defaultPath: filename,
+            });
+
+            if (saveDialog.canceled) return;
+
+            const binaryImage = decodeBase64Image(content);
+            writeFileSync(
+              saveDialog.filePath as PathLike,
+              binaryImage as unknown as string,
+              'binary',
+            );
+
+            debug('File blob saved to', saveDialog.filePath);
+          } catch (error) {
+            console.log(error);
+          }
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    },
+  );
+};
diff --git a/src/electron/ipc-api/focusState.js b/src/electron/ipc-api/focusState.ts
index 0b4a0d8f3..01aa1a971 100644
--- a/src/electron/ipc-api/focusState.js
+++ b/src/electron/ipc-api/focusState.ts
@@ -1,4 +1,6 @@
-export default (params) => {
+import { BrowserWindow } from 'electron';
+
+export default (params: { mainWindow: BrowserWindow }) => {
   params.mainWindow.on('focus', () => {
     params.mainWindow.webContents.send('isWindowFocused', true);
   });
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.ts
index 5da1edc39..f03f61517 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.ts
@@ -1,5 +1,7 @@
+import { BrowserWindow, Tray } from 'electron';
 import autoUpdate from './autoUpdate';
 import settings from './settings';
+import sessionStorage from './sessionStorage';
 import appIndicator from './appIndicator';
 import download from './download';
 import localServer from './localServer';
@@ -7,13 +9,18 @@ import cld from './cld';
 import dnd from './dnd';
 import focusState from './focusState';
 
-export default (params) => {
+export default (params: {
+  mainWindow: BrowserWindow;
+  settings: any;
+  tray: Tray;
+}) => {
   settings(params);
+  sessionStorage();
   autoUpdate(params);
   appIndicator(params);
   download(params);
   localServer(params);
-  cld(params);
+  cld();
   dnd();
   focusState(params);
 };
diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.ts
index 591e70504..7ee642101 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.ts
@@ -1,12 +1,12 @@
-import { ipcMain } from 'electron';
+import { ipcMain, BrowserWindow } from 'electron';
 import net from 'net';
 import { LOCAL_HOSTNAME, LOCAL_PORT } from '../../config';
-import { userDataPath } from '../../environment';
-import startServer from '../../internal-server/start';
+import { userDataPath } from '../../environment-remote';
+import { server } from '../../internal-server/start';
 
-const portInUse = function (port) {
-  return new Promise((resolve) => {
-    const server = net.createServer((socket) => {
+const portInUse = (port: number): Promise<boolean> =>
+  new Promise(resolve => {
+    const server = net.createServer(socket => {
       socket.write('Echo server\r\n');
       socket.pipe(socket);
     });
@@ -20,11 +20,10 @@ const portInUse = function (port) {
       resolve(false);
     });
   });
-};
 
 let localServerStarted = false;
 
-export default (params) => {
+export default (params: { mainWindow: BrowserWindow }) => {
   ipcMain.on('startLocalServer', () => {
     if (!localServerStarted) {
       // Find next unused port for server
@@ -36,7 +35,7 @@ export default (params) => {
         }
         console.log('Starting local server on port', port);
 
-        startServer(userDataPath(), port);
+        server(userDataPath(), port);
 
         params.mainWindow.webContents.send('localServerPort', {
           port,
diff --git a/src/electron/ipc-api/sessionStorage.ts b/src/electron/ipc-api/sessionStorage.ts
new file mode 100644
index 000000000..3eda568a1
--- /dev/null
+++ b/src/electron/ipc-api/sessionStorage.ts
@@ -0,0 +1,35 @@
+import { ipcMain, Session, session } from 'electron';
+
+import { TODOS_PARTITION_ID } from '../../config';
+
+const debug = require('debug')('Ferdi:ipcApi:sessionStorage');
+
+function deduceSession(serviceId: string | undefined | null): Session {
+  if (serviceId) {
+    return session.fromPartition(serviceId === TODOS_PARTITION_ID ? TODOS_PARTITION_ID : `persist:service-${serviceId}`);
+  }
+  return session.defaultSession;
+}
+
+export default async () => {
+  ipcMain.on('clear-storage-data', (_event, { serviceId, targetsToClear }) => {
+    try {
+      const serviceSession = deduceSession(serviceId);
+      serviceSession.flushStorageData();
+      if (targetsToClear) {
+        debug('Clearing targets:', targetsToClear);
+        serviceSession.clearStorageData(targetsToClear);
+      } else {
+        debug('Clearing all targets');
+        serviceSession.clearStorageData();
+      }
+    } catch (error) {
+      debug(error);
+    }
+  });
+
+  ipcMain.handle('clear-cache', (_event, { serviceId }) => {
+    const serviceSession = deduceSession(serviceId);
+    return serviceSession.clearCache();
+  });
+};
diff --git a/src/electron/ipc-api/settings.js b/src/electron/ipc-api/settings.js
deleted file mode 100644
index 15182739c..000000000
--- a/src/electron/ipc-api/settings.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ipcMain } from 'electron';
-
-export default (params) => {
-  ipcMain.on('getAppSettings', (event, type) => {
-    params.mainWindow.webContents.send('appSettings', {
-      type,
-      data: params.settings[type].allSerialized,
-    });
-  });
-
-  ipcMain.on('updateAppSettings', (event, args) => {
-    params.settings[args.type].set(args.data);
-  });
-};
diff --git a/src/electron/ipc-api/settings.ts b/src/electron/ipc-api/settings.ts
new file mode 100644
index 000000000..72de6866d
--- /dev/null
+++ b/src/electron/ipc-api/settings.ts
@@ -0,0 +1,14 @@
+import { ipcMain, BrowserWindow, Settings } from 'electron';
+
+export default (params: { mainWindow: BrowserWindow; settings: Settings }) => {
+  ipcMain.on('getAppSettings', (_event, type) => {
+    params.mainWindow.webContents.send('appSettings', {
+      type,
+      data: params.settings[type].allSerialized,
+    });
+  });
+
+  ipcMain.on('updateAppSettings', (_event, args) => {
+    params.settings[args.type].set(args.data);
+  });
+};