Fix import/export filter (close #2016)

Author: DmitryAstafyev

application/holder/src/service/electron/dialogs.ts

@@ -67,9 +67,9 @@ export class Dialogs extends Implementation {
     } {
         const opener = async (target: number, ext?: string): Promise<string[]> => {
             let results;
+            this.fixFocusAndMouse();
             switch (target) {
                 case 0:
-                    this.fixFocusAndMouse();
                     results = await dialog.showOpenDialog(this._window, {
                         title: 'Opening a file',
                         properties: ['openFile', 'multiSelections'],
@@ -85,23 +85,20 @@ export class Dialogs extends Implementation {
                     });
                     break;
                 case 1:
-                    this.fixFocusAndMouse();
                     results = await dialog.showOpenDialog(this._window, {
                         title: 'Opening a DLT file',
                         properties: ['openFile', 'multiSelections'],
                         filters: [{ name: 'DLT files', extensions: ['dlt'] }],
                     });
                     break;
                 case 2:
-                    this.fixFocusAndMouse();
                     results = await dialog.showOpenDialog(this._window, {
                         title: 'Opening a PCAPNG file',
                         properties: ['openFile', 'multiSelections'],
                         filters: [{ name: 'PCAPNG Files', extensions: ['pcapng'] }],
                     });
                     break;
                 case 3:
-                    this.fixFocusAndMouse();
                     results = await dialog.showOpenDialog(this._window, {
                         title: 'Opening a PCAP file',
                         properties: ['openFile', 'multiSelections'],

application/holder/src/service/storage.ts

@@ -181,7 +181,7 @@ export class Service extends Implementation {
                                     }
                                 } else if (request.file !== undefined) {
                                     const file = new FileController(request.file).init();
-                                    const error = file.write(JSON.stringify(request.entries));
+                                    const error = file.write(JSON.stringify(entries));
                                     if (error instanceof Error) {
                                         return Promise.reject(error);
                                     }

application/holder/src/service/storage/entries.ts

@@ -10,7 +10,14 @@ export type Reader = (key: string) => Promise<string>;
 export class Entries {
     static from(str: string, storageKey: string, logger: Logger): Map<string, Entry> {
         const entries = new Map<string, Entry>();
-        const parsed = JSON.parse(str) as Entry[];
+        const parsed = ((): Entry[] => {
+            try {
+                const inner = JSON.parse(str);
+                return typeof inner === 'string' ? JSON.parse(inner) : inner;
+            } catch (e) {
+                throw new Error(`Fail to parse Entry[] from string: ${error(e)}`);
+            }
+        })();
         if (!(parsed instanceof Array)) {
             throw new Error(
                 `Invalid format: expecting an Entry[], but has been gotten: ${typeof parsed}`,