persistence session: additionally save the "proton session" on interv…

…al, #227 * every 15 minutes by default (interval value is configurable in "config.json") * this should improve preserving by the app actually alive session
vladimiry · Nov 12, 2020 · 5d99b47 · 5d99b47
1 parent cd1a0c6
commit 5d99b47
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 19 deletions.
diff --git a/src/electron-main/storage-upgrade.ts b/src/electron-main/storage-upgrade.ts
@@ -320,6 +320,20 @@ const CONFIG_UPGRADES: Record<string, (config: Config) => void> = {
             }
         }
     },
+    "4.9.3": (config) => {
+        for (
+            const key of [
+            "persistentSessionSavingInterval",
+            "dbSyncingIntervalTrigger",
+            "dbSyncingOnlineTriggerDelay",
+            "dbSyncingFiredTriggerDebounce",
+        ] as const
+        ) {
+            if (typeof config[key] === "undefined") {
+                config[key] = INITIAL_STORES.config()[key];
+            }
+        }
+    },
     // WARN needs to be the last updater
     "100.0.0": (config) => {
         // ensuring default base props are set

diff --git a/src/shared/model/options.ts b/src/shared/model/options.ts
@@ -43,6 +43,10 @@ export interface Config extends BaseConfig, Partial<StoreModel.StoreEntity> {
     localDbMailsListViewMode: "plain" | "conversation"
     userAgents: string[]
     zoomFactorDisabled: boolean;
+    persistentSessionSavingInterval: number;
+    dbSyncingIntervalTrigger: number;
+    dbSyncingOnlineTriggerDelay: number;
+    dbSyncingFiredTriggerDebounce: number;
     // base
     calendarNotification: boolean
     checkUpdateAndNotify: boolean

diff --git a/src/shared/util.ts b/src/shared/util.ts
@@ -79,6 +79,10 @@ export function initialConfig(): Config {
                 /* eslint-enable max-len */
             ],
             zoomFactorDisabled: false,
+            persistentSessionSavingInterval: ONE_MINUTE_MS * 15,
+            dbSyncingIntervalTrigger: ONE_MINUTE_MS * 5,
+            dbSyncingOnlineTriggerDelay: ONE_SECOND_MS * 3,
+            dbSyncingFiredTriggerDebounce: ONE_SECOND_MS * 5,
             // base
             calendarNotification: false,
             checkUpdateAndNotify: false,

diff --git a/src/web/browser-window/app/_accounts/account-view-abstract.component.ts b/src/web/browser-window/app/_accounts/account-view-abstract.component.ts
@@ -103,15 +103,15 @@ export abstract class AccountViewAbstractComponent extends NgChangesObservableCo
             })(),
         );
 
-        this.subscription.add(
-            this.filterDomReadyEvent()
-                .pipe(take(1))
-                .subscribe(({webView}) => {
-                    if ((BUILD_ENVIRONMENT === "development")) {
-                        webView.openDevTools();
-                    }
-                }),
-        );
+        // this.subscription.add(
+        //     this.filterDomReadyEvent()
+        //         .pipe(take(1))
+        //         .subscribe(({webView}) => {
+        //             if ((BUILD_ENVIRONMENT === "development")) {
+        //                 webView.openDevTools();
+        //             }
+        //         }),
+        // );
     }
 
     ngOnDestroy(): void {

diff --git a/src/web/browser-window/app/_accounts/account.component.ts b/src/web/browser-window/app/_accounts/account.component.ts
@@ -317,13 +317,21 @@ export class AccountComponent extends NgChangesObservableComponent implements On
         };
 
         this.subscription.add(
-            combineLatest([
-                this.loggedIn$,
-                this.persistentSession$,
-            ]).pipe(
-                filter(([loggedIn, persistentSession]) => persistentSession && loggedIn),
-                withLatestFrom(this.account$),
+            this.store.pipe(
+                select(OptionsSelectors.CONFIG.persistentSessionSavingInterval),
+                switchMap((persistentSessionSavingInterval) => {
+                    return combineLatest([
+                        this.loggedIn$,
+                        this.persistentSession$,
+                        timer(0, persistentSessionSavingInterval),
+                    ]).pipe(
+                        filter(([loggedIn, persistentSession]) => persistentSession && loggedIn),
+                        withLatestFrom(this.account$),
+                    );
+                }),
             ).subscribe(([, {accountConfig}]) => {
+                this.logger.verbose("saving proton session");
+
                 (async () => {
                     await this.ipcMainClient("saveProtonSession")({
                         login: accountConfig.login,

diff --git a/src/web/browser-window/app/_accounts/accounts.effects.ts b/src/web/browser-window/app/_accounts/accounts.effects.ts
@@ -420,15 +420,22 @@ export class AccountsEffects {
 
                     // syncing
                     this.api.primaryWebViewClient(webView, {finishPromise}).pipe(
-                        mergeMap((webViewClient) => {
+                        withLatestFrom(
+                            this.store.pipe(
+                                select(OptionsSelectors.FEATURED.config),
+                            ),
+                        ),
+                        mergeMap((
+                            [webViewClient, {dbSyncingIntervalTrigger, dbSyncingOnlineTriggerDelay, dbSyncingFiredTriggerDebounce}],
+                        ) => {
                             const syncingIterationTrigger$: Observable<null> = merge(
-                                timer(0, ONE_MINUTE_MS * 5).pipe(
+                                timer(0, dbSyncingIntervalTrigger).pipe(
                                     tap(() => logger.verbose(`triggered by: timer`)),
                                     map(() => null),
                                 ),
                                 fromEvent(window, "online").pipe(
                                     tap(() => logger.verbose(`triggered by: "window.online" event`)),
-                                    delay(ONE_SECOND_MS * 3),
+                                    delay(dbSyncingOnlineTriggerDelay),
                                     map(() => null),
                                 ),
                                 FIRE_SYNCING_ITERATION$.pipe(
@@ -437,7 +444,7 @@ export class AccountsEffects {
                                     // user might be moving emails from here to there while syncing/"buildDbPatch" cycle is in progress
                                     // debounce call reduces 404 fetch errors as we don't trigger fetching until user got settled down
                                     // debouncing the fetching signal we strive to process larger group of events in a single sync iteration
-                                    debounceTime(ONE_SECOND_MS * 5),
+                                    debounceTime(dbSyncingFiredTriggerDebounce),
                                 ),
                             ).pipe(
                                 map(() => null),

diff --git a/src/web/browser-window/app/store/selectors/options.ts b/src/web/browser-window/app/store/selectors/options.ts
@@ -31,6 +31,7 @@ export const CONFIG = {
     localDbMailsListViewMode: createSelector(FEATURED.config, (config) => config.localDbMailsListViewMode),
     doNotRenderNotificationBadgeValue: createSelector(FEATURED.config, (config) => config.doNotRenderNotificationBadgeValue),
     zoomFactorDisabled: createSelector(FEATURED.config, (config) => config.zoomFactorDisabled),
+    persistentSessionSavingInterval: createSelector(FEATURED.config, (config) => config.persistentSessionSavingInterval),
 } as const;
 
 export const SETTINGS = (