Merge TS context isolation branch onto Typescript master branch

demo/index.html

@@ -132,7 +132,9 @@ <h1>Symphony Electron API Demo</h1>
 
             num++;
 
-            var notf = new ssf.Notification(title, {
+            var notf = {
+                id: num,
+                title,
                 body: (body + ' num=' + num + ' tag=' + tag),
                 image: imageUrl,
                 flash: shouldFlash,
@@ -142,24 +144,11 @@ <h1>Symphony Electron API Demo</h1>
                     hello: 'hello word'
                 },
                 tag: tag,
-                company: company
-            });
-
-            notf.addEventListener('click', onclick);
-            function onclick(event) {
-                event.target.close();
-                alert('notification clicked: ' + event.target.data.hello);
-            }
-
-            notf.addEventListener('close', onclose);
-            function onclose() {
-                alert('notification closed');
+                company: company,
+                method: 'notification',
             };
 
-            notf.addEventListener('error', onerror);
-            function onerror(event) {
-                alert('error=' + event.result);
-            };
+            window.postMessage({ method: 'notification', data: notf }, '*');
         });
 
         var badgeCount = 0;
@@ -292,5 +281,7 @@ <h1>Symphony Electron API Demo</h1>
             document.location.reload();
         });
 
+        window.addEventListener('message', (event) => console.log(event));
+
     </script>
 </html>

gulpfile.js

@@ -12,7 +12,7 @@ gulp.task('clean', function() {
 });
 
 gulp.task('compile', function() {
-    return gulp.src(['src/**/*.ts'])
+    return gulp.src(['src/**/*.ts', 'src/**/*.tsx'])
         .pipe(tsc({ project: './tsconfig.json' }))
         .pipe(gulp.dest('lib/'))
 });
@@ -35,4 +35,4 @@ gulp.task('copy', function () {
     }).pipe(gulp.dest('lib/src'))
 });
 
-gulp.task('build', gulp.series('clean', 'compile', 'less', 'copy'));
+gulp.task('build', gulp.series('clean', 'compile', 'less', 'copy'));

package.json

@@ -1,8 +1,8 @@
 {
   "name": "Symphony",
   "productName": "Symphony",
-  "version": "4.4.2",
-  "clientVersion": "1.54",
+  "version": "5.0.0",
+  "clientVersion": "1.55",
   "buildNumber": "0",
   "description": "Symphony desktop app (Foundation ODP)",
   "author": "Symphony",
@@ -16,7 +16,7 @@
     "browserify-preload": "browserify -o lib/src/renderer/_preload-main.js -x electron --insert-global-vars=__filename,__dirname lib/src/renderer/preload-main.js",
     "rebuild": "electron-rebuild -f",
     "dev": "npm run prebuild && cross-env ELECTRON_DEV=true electron .",
-    "test": "npm run lint && npm rebuild --build-from-source && cross-env ELECTRON_QA=true jest --config jest.unit.config.json --runInBand && npm run rebuild",
+    "test": "npm run lint && cross-env ELECTRON_QA=true jest --config jest.unit.config.json --runInBand",
     "spectron-test": "npm run lint && npm rebuild --build-from-source robotjs && cross-env ELECTRON_QA=true jest --config jest.spectron.config.json --runInBand --detectOpenHandles",
     "demo-win": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file:///demo/index.html",
     "demo-mac": "npm run prebuild && cross-env ELECTRON_DEV=true electron . --url=file://$(pwd)/demo/index.html",

spec/screenSharingIndicator.spec.ts

@@ -30,9 +30,11 @@ describe('screen sharing indicator', () => {
         const closeIpcRendererMock = {
             cmd: 'close-window',
             windowType: 'screen-sharing-indicator',
+            winKey: 'id-123',
         };
         const spy = jest.spyOn(ipcRenderer, sendEventLabel);
         const wrapper = shallow(React.createElement(ScreenSharingIndicator));
+        wrapper.setState({ streamId: 'id-123' });
         wrapper.find(customSelector).simulate('click');
         expect(spy).lastCalledWith(symphonyAPIEventLabel, closeIpcRendererMock);
     });

src/app/activity-detection.ts

@@ -46,7 +46,9 @@ class ActivityDetection {
         const idleTimeInMillis = idleTime * 1000;
         if (idleTimeInMillis < this.idleThreshold) {
             this.sendActivity(idleTimeInMillis);
-            if (this.timer) clearInterval(this.timer);
+            if (this.timer) {
+                clearInterval(this.timer);
+            }
             this.timer = undefined;
             logger.info(`activity-detection: activity occurred`);
             return;
@@ -78,4 +80,4 @@ class ActivityDetection {
 
 const activityDetection = new ActivityDetection();
 
-export { activityDetection };
+export { activityDetection };

src/app/app-cache-handler.ts

@@ -22,4 +22,4 @@ export const cleanUpAppCache = async (): Promise<void> => {
  */
 export const createAppCacheFile = (): void => {
     fs.writeFileSync(cacheCheckFilePath, '');
-};
+};

src/app/auto-launch-controller.ts

@@ -111,4 +111,4 @@ const autoLaunchInstance = new AutoLaunchController(props);
 
 export {
     autoLaunchInstance,
-};
+};

src/app/child-window-handler.ts

@@ -33,8 +33,12 @@ const getParsedUrl = (configURL: string): Url => {
 export const handleChildWindow = (webContents: WebContents): void => {
     const childWindow = (event, newWinUrl, frameName, disposition, newWinOptions): void => {
         const mainWindow = windowHandler.getMainWindow();
-        if (!mainWindow || mainWindow.isDestroyed()) return;
-        if (!windowHandler.url) return;
+        if (!mainWindow || mainWindow.isDestroyed()) {
+            return;
+        }
+        if (!windowHandler.url) {
+            return;
+        }
 
         if (!newWinOptions.webPreferences) {
             newWinOptions.webPreferences = {};
@@ -104,7 +108,9 @@ export const handleChildWindow = (webContents: WebContents): void => {
 
             childWebContents.once('did-finish-load', async () => {
                 const browserWin: ICustomBrowserWindow = BrowserWindow.fromWebContents(childWebContents) as ICustomBrowserWindow;
-                if (!browserWin) return;
+                if (!browserWin) {
+                    return;
+                }
                 windowHandler.addWindow(newWinKey, browserWin);
                 browserWin.webContents.send('page-load', { isWindowsOS });
                 // Inserts css on to the window
@@ -129,4 +135,4 @@ export const handleChildWindow = (webContents: WebContents): void => {
         }
     };
     webContents.on('new-window', childWindow);
-};
+};

src/app/chrome-flags.ts

@@ -63,4 +63,4 @@ export const setChromeFlags = () => {
             }
         }
     }
-};
+};

src/app/config-handler.ts

@@ -224,4 +224,4 @@ const config = new Config();
 
 export {
     config,
-};
+};

src/app/crypto-handler.ts

@@ -10,7 +10,7 @@ import { logger } from '../common/logger';
 const TAG_LENGTH = 16;
 const arch = process.arch === 'ia32';
 const winLibraryPath = isDevEnv ? path.join(__dirname, '..', '..', 'library') : path.join(execPath, 'library');
-const macLibraryPath = isDevEnv ? path.join(__dirname, '..', '..', 'library') : path.join(execPath, '..', 'library');
+const macLibraryPath = isDevEnv ? path.join(__dirname, '..', '..', '..', 'library') : path.join(execPath, '..', 'library');
 
 const cryptoLibPath = isMac ?
     path.join(macLibraryPath, 'cryptoLib.dylib') :
@@ -133,4 +133,4 @@ class CryptoLibrary implements ICryptoLib {
 
 const cryptoLibrary = new CryptoLibrary();
 
-export { cryptoLibrary };
+export { cryptoLibrary };

src/app/dialog-handler.ts

@@ -96,8 +96,12 @@ electron.app.on('certificate-error', (event, webContents, url, error, _certifica
  */
 export const showLoadFailure = (browserWindow: Electron.BrowserWindow, url: string, errorDesc: string, errorCode: number, retryCallback: () => void, showDialog: boolean): void => {
     let message = url ? `${i18n.t('Error loading URL')()}:\n${url}` : i18n.t('Error loading window')();
-    if (errorDesc) message += `\n\n${errorDesc}`;
-    if (errorCode) message += `\n\nError Code: ${errorCode}`;
+    if (errorDesc) {
+        message += `\n\n${errorDesc}`;
+    }
+    if (errorCode) {
+        message += `\n\nError Code: ${errorCode}`;
+    }
 
     // async handle of user input
     const response = (buttonId: number): void => {
@@ -132,4 +136,4 @@ export const showLoadFailure = (browserWindow: Electron.BrowserWindow, url: stri
 export const showNetworkConnectivityError = (browserWindow: Electron.BrowserWindow, url: string = '', retryCallback: () => void): void => {
     const errorDesc = i18n.t('Network connectivity has been lost. Check your internet connection.')();
     showLoadFailure(browserWindow, url, errorDesc, 0, retryCallback, true);
-};
+};

src/app/main-api-handler.ts

@@ -80,7 +80,9 @@ ipcMain.on(apiName.symphonyApi, (event: Electron.Event, arg: IApiArgs) => {
             // validates the user bring to front config and activates the wrapper
             if (typeof arg.reason === 'string' && arg.reason === 'notification') {
                 const shouldBringToFront = config.getConfigFields([ 'bringToFront' ]);
-                if (shouldBringToFront) activate(arg.windowName, false);
+                if (shouldBringToFront) {
+                    activate(arg.windowName, false);
+                }
             }
             break;
         case apiCmds.openScreenPickerWindow:
@@ -95,21 +97,6 @@ ipcMain.on(apiName.symphonyApi, (event: Electron.Event, arg: IApiArgs) => {
             }
             break;
         }
-        /*case ApiCmds.optimizeMemoryConsumption:
-            if (typeof arg.memory === 'object'
-                && typeof arg.cpuUsage === 'object'
-                && typeof arg.memory.workingSetSize === 'number') {
-                setPreloadMemoryInfo(arg.memory, arg.cpuUsage);
-            }
-            break;
-        case ApiCmds.optimizeMemoryRegister:
-            setPreloadWindow(event.sender);
-            break;
-        case ApiCmds.setIsInMeeting:
-            if (typeof arg.isInMeeting === 'boolean') {
-                setIsInMeeting(arg.isInMeeting);
-            }
-            break;*/
         case apiCmds.setLocale:
             if (typeof arg.locale === 'string') {
                 updateLocale(arg.locale as LocaleType);
@@ -124,12 +111,12 @@ ipcMain.on(apiName.symphonyApi, (event: Electron.Event, arg: IApiArgs) => {
             screenSnippet.capture(event.sender);
             break;
         case apiCmds.closeWindow:
-            windowHandler.closeWindow(arg.windowType);
+            windowHandler.closeWindow(arg.windowType, arg.winKey);
             break;
         case apiCmds.openScreenSharingIndicator:
-            const { displayId, id } = arg;
-            if (typeof displayId === 'string' && typeof id === 'number') {
-                windowHandler.createScreenSharingIndicatorWindow(event.sender, displayId, id);
+            const { displayId, id, streamId } = arg;
+            if (typeof displayId === 'string' && typeof id === 'number' && typeof streamId === 'string') {
+                windowHandler.createScreenSharingIndicatorWindow(event.sender, displayId, id, streamId);
             }
             break;
         case apiCmds.downloadManagerAction:

src/app/main.ts

@@ -66,7 +66,9 @@ if (!allowMultiInstance) {
             // Someone tried to run a second instance, we should focus our window.
             const mainWindow = windowHandler.getMainWindow();
             if (mainWindow && !mainWindow.isDestroyed()) {
-                if (isMac) return mainWindow.show();
+                if (isMac) {
+                    return mainWindow.show();
+                }
                 if (mainWindow.isMinimized()) {
                     mainWindow.restore();
                 }
@@ -117,4 +119,4 @@ app.on('activate', () => {
  *
  * This event is emitted only on macOS at this moment
  */
-app.on('open-url', (_event, url) => protocolHandler.sendProtocol(url));
+app.on('open-url', (_event, url) => protocolHandler.sendProtocol(url));

src/app/protocol-handler.ts

@@ -69,4 +69,4 @@ class ProtocolHandler {
 
 const protocolHandler = new ProtocolHandler();
 
-export { protocolHandler };
+export { protocolHandler };

src/app/reports-handler.ts

@@ -131,4 +131,4 @@ export const exportCrashDumps = (): void => {
                 });
             }
         });
-};
+};

src/app/screen-snippet-handler.ts

@@ -53,7 +53,9 @@ class ScreenSnippet {
             updateAlwaysOnTop(false, false);
         }
         // only allow one screen capture at a time.
-        if (this.child) this.child.kill();
+        if (this.child) {
+            this.child.kill();
+        }
         try {
             await this.execCmd(this.captureUtil, this.captureUtilArgs);
             const { message, data, type }: IScreenSnippet = await this.convertFileToData();
@@ -86,7 +88,9 @@ class ScreenSnippet {
     private execCmd(captureUtil: string, captureUtilArgs: ReadonlyArray<string>): Promise<ChildProcess> {
         return new Promise<ChildProcess>((resolve, reject) => {
             return this.child = execFile(captureUtil, captureUtilArgs, (error: ExecException | null) => {
-                if (this.isAlwaysOnTop) updateAlwaysOnTop(true, false);
+                if (this.isAlwaysOnTop) {
+                    updateAlwaysOnTop(true, false);
+                }
                 if (error && error.killed) {
                     // processs was killed, just resolve with no data.
                     return reject(error);
@@ -140,4 +144,4 @@ class ScreenSnippet {
 
 const screenSnippet = new ScreenSnippet();
 
-export { screenSnippet };
+export { screenSnippet };

src/app/spell-check-handler.ts

@@ -99,4 +99,4 @@ export class SpellChecker {
         }
         return menu;
     }
-}
+}