adding how to debug in bug report, moving react logic into its own ha… (#1176)

* adding how to debug in bug report, moving react logic into its own handler, moving theme.js to use react instead of angular, change regex in mainAppWindow to allow for v1 and v2 versions and removing some rough lines

* adding some extra escape characters for the dots in the url

Author: IsmaelMartinez

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,5 +28,14 @@ If applicable, add screenshots to help explain your problem.
  - Installation package [deb, rpm, snap, AppImage, tar.gz, source...]
  - Version [e.g. 0.1.17]
 
+**Debug**
+When possible, please run the application from the terminal using `--webDebug` and try to reproduce the error.
+
+The provide in this section the output from both the terminal and the browser debug console.
+
+```bash
+teams-for-linux --webDebug --appLogLevels=error,info,warn,debug
+```
+
 **Additional context**
 Add any other context about the problem here.

app/appConfiguration/index.js

@@ -47,4 +47,4 @@ class AppConfiguration {
 	}
 }
 
-module.exports = { AppConfiguration };
+module.exports = { AppConfiguration };

app/browser/tools/activityHub.js

@@ -1,4 +1,5 @@
 const instance = require('./instance');
+const ReactHandler = require('./reactHandler');
 /**
  * @type {Array<{handler:(data)=>void,event:string,handle:number}>}
  */
@@ -56,7 +57,7 @@ class ActivityHub {
 	 * @param {number} state 
 	 */
 	setMachineState(state) {
-		const teams2IdleTracker = instance.getTeams2IdleTracker();
+		const teams2IdleTracker = ReactHandler.getTeams2IdleTracker();
 		if (teams2IdleTracker) {
 			try {
 				console.log(`setMachineState teams2 state=${state}`);

app/browser/tools/instance.js

@@ -15,18 +15,6 @@ class Instance {
 			return await this.whenReady(tries + 1);
 		}
 	}
-
-	getTeams2ReactElement() {
-		return document.getElementById('app');
-	}
-
-	getTeams2CoreServices() {
-		return this.getTeams2ReactElement()?._reactRootContainer?._internalRoot?.current?.updateQueue?.baseState?.element?.props?.coreServices;
-	}
-
-	getTeams2IdleTracker() {
-		return this.getTeams2CoreServices()?.clientState?._idleTracker;
-	}
 }
 
 function getAppObjects() {

app/browser/tools/reactHandler.js

@@ -0,0 +1,20 @@
+class ReactHandler {
+
+    _getTeams2ReactElement() {
+        return document.getElementById('app');
+    }
+
+    _getTeams2CoreServices() {
+        return this._getTeams2ReactElement()?._reactRootContainer?._internalRoot?.current?.updateQueue?.baseState?.element?.props?.coreServices;
+    }
+
+    getTeams2IdleTracker() {
+        return this._getTeams2CoreServices()?.clientState?._idleTracker;
+    }
+
+    getTeams2ClientPreferences() {
+        return this._getTeams2CoreServices()?.clientPreferences?.clientPreferences;
+    }
+}
+
+module.exports = new ReactHandler();

app/browser/tools/theme.js

@@ -1,4 +1,4 @@
-const instance = require('./instance');
+const ReactHandler = require('./reactHandler');
 
 class ThemeManager {
     /**
@@ -8,17 +8,18 @@ class ThemeManager {
     init(config, ipcRenderer) {
         this.ipcRenderer = ipcRenderer;
         this.config = config;
+        ReactHandler.getTeams2ClientPreferences().followOsTheme = config.followSystemTheme;
         if (config.followSystemTheme) {
-            this.ipcRenderer.on('system-theme-changed', this.applyTheme);
+            console.log('followSystemTheme', config.followSystemTheme);
+            this.ipcRenderer.on('system-theme-changed', this.applyTheme);   
         }
     }
 
     applyTheme = async (event, ...args) => {
         const theme = args[0] ? 'dark' : 'default';
-        const inst = await instance.whenReady().catch(() => {
-            console.error('Failed to apply Theme');
-        });
-        inst.controller.layoutService.setTheme(theme);
+        const clientPreferences = ReactHandler.getTeams2ClientPreferences();
+        clientPreferences.useTheme = theme;
+        console.log('Theme changed to', theme);
     }
 }
 

app/browser/tools/wakeLock.js

@@ -1,36 +1,36 @@
 var _WakeLock_lock = new WeakMap();
 class WakeLock {
-    constructor() {
-        _WakeLock_lock.set(this, null);
-    }
+	constructor() {
+		_WakeLock_lock.set(this, null);
+	}
 
-    async enable() {
-        try {
-            var lock = await navigator.wakeLock.request('screen');
-            lock.addEventListener('release', () => {
-                console.log('Wake Lock was released');
-            });
-            console.log('Wake Lock is active');
-            _WakeLock_lock.set(this, lock);
+	async enable() {
+		try {
+			var lock = await navigator.wakeLock.request('screen');
+			lock.addEventListener('release', () => {
+				console.log('Wake Lock was released');
+			});
+			console.log('Wake Lock is active');
+			_WakeLock_lock.set(this, lock);
 
-        } catch (err) {
-            console.error(`${err.name}, ${err.message}`);
-        }
-    }
+		} catch (err) {
+			console.error(`${err.name}, ${err.message}`);
+		}
+	}
 
-    async disable() {
-        var lock = _WakeLock_lock.get(this);
-        if (!lock) {
-            return;
-        }
-        try {
-            await lock.release();
-            lock = null;
-            _WakeLock_lock.set(this, lock);
-        } catch (err) {
-            console.error(`${err.name}, ${err.message}`);
-        }
-    }
+	async disable() {
+		var lock = _WakeLock_lock.get(this);
+		if (!lock) {
+			return;
+		}
+		try {
+			await lock.release();
+			lock = null;
+			_WakeLock_lock.set(this, lock);
+		} catch (err) {
+			console.error(`${err.name}, ${err.message}`);
+		}
+	}
 }
 
 const wakeLock = new WakeLock();

app/index.js

@@ -335,4 +335,4 @@ function onCustomBGServiceConfigDownloadFailure(err) {
 	catch (err) {
 		logger.error(`Failed to save remote configuration at '${dlpath}'`);
 	}
-}
+}

app/mainAppWindow/index.js

@@ -222,8 +222,8 @@ function restoreWindow() {
 }
 
 function processArgs(args) {
-	var regHttps = /^https:\/\/teams.microsoft.com\/l\/(meetup-join|channel)\//g;
-	var regMS = /^msteams:\/l\/(meetup-join|channel)\//g;
+	var regHttps = /^https:\/\/teams\.microsoft\.com\/.*(?:meetup-join|channel)/g;
+	var regMS = /^msteams:\/.*(?:meetup-join|channel)/g;
 	logger.debug('processArgs:', args);
 	for (const arg of args) {
 		if (regHttps.test(arg)) {
@@ -317,7 +317,7 @@ function onBeforeSendHeadersHandler(detail, callback) {
  * @returns {{action: 'deny'} | {action: 'allow', outlivesOpener?: boolean, overrideBrowserWindowOptions?: Electron.BrowserWindowConstructorOptions}}
  */
 function onNewWindow(details) {
-	if (details.url.startsWith('https://teams.microsoft.com/l/meetup-join')) {
+	if (details.url.startsWith('https://teams.microsoft.com/l/meetup-join') || details.url.startsWith('https://teams.microsoft.com/v2/l/meetup-join')) {
 		logger.debug('DEBUG - captured meetup-join url');
 		return { action: 'deny' };
 	} else if (details.url === 'about:blank' || details.url === 'about:blank#blocked') {
@@ -619,4 +619,4 @@ function enableWakeLockOnWindowRestore() {
 	if (isOnCall) {
 		window.webContents.send('enable-wakelock');
 	}
-}
+}

app/menus/application.js

@@ -109,4 +109,4 @@ function getNotificationsMenu(Menus) {
 			}
 		]
 	};
-}
+}

app/menus/tray.js

@@ -34,4 +34,4 @@ class ApplicationTray {
 		this.tray.destroy();
 	}
 }
-exports = module.exports = ApplicationTray;
+exports = module.exports = ApplicationTray;

app/spellCheckProvider/codes.js

@@ -701,4 +701,4 @@ const codes = [
 	}
 ];
 
-module.exports = codes;
+module.exports = codes;

app/spellCheckProvider/index.js

@@ -136,4 +136,4 @@ function stringCompare(str1, str2) {
 	return le ? -1 : gr ? 1 : 0;
 }
 
-module.exports = { SpellCheckProvider };
+module.exports = { SpellCheckProvider };

app/streamSelector/browser.js

@@ -123,4 +123,3 @@ function createQualitySelector(properties) {
 	defaultSelection = defaultSelection > -1 ? defaultSelection : properties.screens.length - 1;
 	properties.sscontainer.selectedIndex = defaultSelection;
 }
-

app/streamSelector/index.js

@@ -151,5 +151,3 @@ function createScreenRequestHandler() {
 }
 
 module.exports = { StreamSelector };
-
-

package.json

@@ -1,6 +1,6 @@
 {
   "name": "teams-for-linux",
-  "version": "1.4.17",
+  "version": "1.4.18",
   "main": "app/index.js",
   "description": "Unofficial client for Microsoft Teams for Linux",
   "homepage": "https://github.com/IsmaelMartinez/teams-for-linux",

scripts/afterpack.js

@@ -2,19 +2,19 @@ const {flipFuses, FuseVersion, FuseV1Options} = require('@electron/fuses');
 const {chmod} = require('fs/promises');
 
 function getAppFileName(context) {
-	const productFileName = context.packager.appInfo.productFilename
+	const productFileName = context.packager.appInfo.productFilename;
 
 	switch (context.electronPlatformName) {
-		case 'win32':
-			return `${productFileName}.exe`;
-		case 'darwin':
-			return `${productFileName}.app`;
-		case 'mas':
-			return `${productFileName}.app`;
-		case 'linux':
-			return context.packager.executableName;
-		default:
-			return '';
+	case 'win32':
+		return `${productFileName}.exe`;
+	case 'darwin':
+		return `${productFileName}.app`;
+	case 'mas':
+		return `${productFileName}.app`;
+	case 'linux':
+		return context.packager.executableName;
+	default:
+		return '';
 	}
 }
 
@@ -25,11 +25,10 @@ exports.default = async function afterPack(context) {
 		await flipFuses(
 			path,
 			{
-			  version: FuseVersion.V1,
-			  [FuseV1Options.EnableCookieEncryption]: true,
+				version: FuseVersion.V1,
+				[FuseV1Options.EnableCookieEncryption]: true,
 			},
-		);          
-		  
+		);
 	} catch (error) {
 		console.error('afterPack error: ', error);
 		process.exit(1);