fix: reader browser window lifecycle (PR #3464 Fixes #3439)

Author: panaC

package.json

@@ -44,7 +44,7 @@
     "start:dev:renderer:reader": "webpack-dev-server --config webpack.config.renderer-reader.js",
     "start:dev:renderer:pdf": "webpack --config webpack.config.renderer-pdf.js && webpack --config webpack.config.renderer-pdf-extract.js",
     "start:dev:renderer:preload": "webpack --config webpack.config.preload.js",
-    "start:dev:main:electron": "cross-env DEBUG=r2:*,readium-desktop:*,proxy-agent NODE_ENV=development electron  --remote-debugging-port=9223 --remote-allow-origins=\"*\" .",
+    "start:dev:main:electron": "cross-env DEBUG=r2:*,readium-desktop:*,proxy-agent,-readium-desktop:main#streamerNoHttp,-readium-desktop:main#streamerCommon,-readium-desktop:main#sessions NODE_ENV=development electron  --remote-debugging-port=9223 --remote-allow-origins=\"*\" .",
     "start:dev:main": "npm run build:dev:main && npm run start:dev:main:electron",
     "start:devex": "cross-env WEBPACK=bundle-external npm run start:dev",
     "start:dev": "cross-env DEBUG_COLORS=true npm run start:dev:renderer:pdf && cross-env DEBUG_COLORS=true npm run start:dev:renderer:preload && cross-env DEBUG_COLORS=true concurrently --kill-others \"npm run start:dev:renderer:library\" \"npm run start:dev:renderer:reader\" \"npm run start:dev:main\"",

src/common/constant.ts

@@ -19,3 +19,5 @@ export const FORCE_PROD_DB_IN_DEV = false;
 
 export const USER_DATA_FOLDER = app.getPath("userData");
 debug("set userData folder to", USER_DATA_FOLDER);
+
+export const TIMEOUT_BROWSER_WINDOW_INITIALISATION = 20000;

src/common/models/sync.ts

@@ -15,6 +15,7 @@ export enum SenderType {
 export interface WindowSender {
     type: SenderType;
     identifier: string;
+    reader_pubId: string | undefined; // undefined in the library only from the reader
 }
 
 export interface WithSender {

src/common/redux/actions/index.ts

@@ -31,6 +31,7 @@ import * as settingsActions from "./settings";
 import * as noteExport from "./noteExport";
 import * as customizationActions from "./customization";
 import * as opdsActions from "./opds";
+import * as winCommonActions from "./win";
 
 export {
     historyActions,
@@ -59,4 +60,5 @@ export {
     noteExport,
     customizationActions,
     opdsActions,
+    winCommonActions,
 };

src/common/redux/actions/reader/closeRequest.ts

@@ -12,16 +12,20 @@ export const ID = "READER_CLOSE_REQUEST";
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface Payload {
+    windowIdentifier?: string; // can be undefined if sent from reader can added to sender key from sync process
+    publicationIdentifier?: string; // can be used to close all reader with the same publicationIdentifier
 }
 
-export function build():
+export function build(windowIdentifier?: string, publicationIdentifier?: string):
     Action<typeof ID, Payload>
     & Omit<ActionWithSender<typeof ID, Payload>, keyof WithSender> & Partial<WithSender>
     {
 
     return {
         type: ID,
         payload: {
+            windowIdentifier,
+            publicationIdentifier,
         },
     };
 }

src/common/redux/actions/reader/closeRequestFromPublication.ts

@@ -10,15 +10,13 @@ import * as clipboardCopy from "./clipboardCopy";
 import * as print from "./print";
 import * as closeError from "./closeError";
 import * as closeRequest from "./closeRequest";
-import * as closeRequestFromPublication from "./closeRequestFromPublication";
 import * as closeSuccess from "./closeSuccess";
 import * as configSetDefault from "./configSetDefault";
 import * as detachModeRequest from "./detachModeRequest";
 import * as detachModeSuccess from "./detachModeSuccess";
 import * as fullScreenRequest from "./fullScreenRequest";
 import * as openError from "./openError";
 import * as openRequest from "./openRequest";
-import * as setReduxState from "./setReduxState";
 import * as disableRTLFlip from "./rtlFlip";
 import * as setTheLock from "./setTheLock";
 import * as note from "./note";
@@ -39,8 +37,6 @@ export {
     detachModeRequest,
     detachModeSuccess,
     configSetDefault,
-    setReduxState,
-    closeRequestFromPublication,
     fullScreenRequest,
     clipboardCopy,
     disableRTLFlip,