From 295ea6d1ecc485f7980740add37dca0e7678c9f1 Mon Sep 17 00:00:00 2001 From: csett86 Date: Mon, 20 Sep 2021 10:40:27 +0200 Subject: [PATCH] Switch to local storage and migrate old settings (#638) This is a preparation for electron 14+, where electron-store is no longer in a usable state (currently used version does not work due to remote module removed in electron 14, latest version extends every app startup to 10 seconds). Once sufficient migration period has passed, electron-store and redux-persist-electron-storage and the ipc call introduced here (electron-store-exists) can be removed. --- app/features/redux/store.js | 28 ++++++++++++++++++++++++++-- app/preload/preload.js | 1 + main.js | 4 ++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/app/features/redux/store.js b/app/features/redux/store.js index 3700012..4af76d1 100644 --- a/app/features/redux/store.js +++ b/app/features/redux/store.js @@ -1,14 +1,38 @@ // @flow import { createStore } from 'redux'; -import { persistReducer } from 'redux-persist'; +import { persistReducer, getStoredState } from 'redux-persist'; +import storage from 'redux-persist/lib/storage'; // uses localStorage import middleware from './middleware'; import reducers from './reducers'; +const migrateFromElectronStore = async state => { + // migrate to local storage by checking if state is undefined + // (first launch or first launch after switch to local storage) + // and previous electron-store config.json exists. + if (state === undefined && window.jitsiNodeAPI.electronStoreExists) { + const electronStoreState = await getStoredState({ + key: 'root', + storage: window.jitsiNodeAPI.createElectronStorage(), + debug: true + }); + + if ('onboarding' in electronStoreState) { + return electronStoreState; + } + } + + return state; +}; + const persistConfig = { key: 'root', - storage: window.jitsiNodeAPI.createElectronStorage(), + + // remove this and all electron-store-related dependencies end of 2021 + // (3 months migration period from electron-store to local storage) + migrate: migrateFromElectronStore, + storage, whitelist: [ 'onboarding', 'recentList', diff --git a/app/preload/preload.js b/app/preload/preload.js index 54bf79b..5693c86 100644 --- a/app/preload/preload.js +++ b/app/preload/preload.js @@ -15,6 +15,7 @@ window.jitsiNodeAPI = { openExternalLink, platform: process.platform, jitsiMeetElectronUtils, + electronStoreExists: ipcRenderer.sendSync('electron-store-exists'), ipc: { on: (channel, listener) => { if (!whitelistedIpcChannels.includes(channel)) { diff --git a/main.js b/main.js index 70530ea..933a84b 100644 --- a/main.js +++ b/main.js @@ -396,3 +396,7 @@ ipcMain.on('renderer-ready', () => { .send('protocol-data-msg', protocolDataForFrontApp); } }); + +ipcMain.on('electron-store-exists', event => { + event.returnValue = existsSync(path.join(app.getPath('userData'), 'config.json')); +});