feat: add opt in handling for teams v2

app/appConfiguration/index.js

@@ -7,7 +7,8 @@ let _AppConfiguration_settingsStore = new WeakMap();
 
 class AppConfiguration {
 	/**
-	 * @param {string} configPath 
+	 * @param {string} configPath
+	 * @param appVersion
 	 */
 	constructor(configPath, appVersion) {
 		_AppConfiguration_configPath.set(this, configPath);

app/browser/tools/activityHub.js

@@ -56,15 +56,31 @@ class ActivityHub {
 	 * @param {number} state 
 	 */
 	setMachineState(state) {
-		instance.whenReady().then((inst) => {
-			if (state === 1) {
-				this.refreshAppState(inst.controller, state);
-			} else {
-				inst.controller.appStateService.setMachineState(state);
+		const teams2IdleTracker = instance.getTeams2IdleTracker();
+		if (teams2IdleTracker) {
+			try {
+				console.log(`setMachineState teams2 state=${state}`);
+				if (state === 1) {
+					// ALTERNATIVE: teams2IdleTracker._idleStateBehaviorSubject.next('Active');
+					teams2IdleTracker.handleMonitoredWindowEvent();
+				} else {
+					// ALTERNATIVE: teams2IdleTracker._idleStateBehaviorSubject.next('Inactive');
+					teams2IdleTracker.transitionToIdle();
+				}
+			} catch(e) {
+				console.error('Failed to set teams2 Machine State', e);
 			}
-		}).catch(() => {
-			console.error('Failed to set Machine State');
-		});
+		} else {
+			instance.whenReady().then((inst) => {
+				if (state === 1) {
+					this.refreshAppState(inst.controller, state);
+				} else {
+					inst.controller.appStateService.setMachineState(state);
+				}
+			}).catch(() => {
+				console.error('Failed to set Machine State');
+			});
+		}
 	}
 
 	/**

app/browser/tools/instance.js

@@ -15,6 +15,18 @@ 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/config/index.js

@@ -172,6 +172,11 @@ function argv(configPath, appVersion) {
 				describe: 'BrowserWindow webpreferences partition',
 				type: 'string'
 			},
+			optInTeamsV2: {
+				default: false,
+				describe: 'opt in to use V2',
+				type: 'boolean'
+			},
 			proxyServer: {
 				default: null,
 				describe: 'Proxy Server with format address:port',

app/mainAppWindow/index.js

@@ -117,6 +117,8 @@ function applyAppConfiguration(config, window) {
 		});
 	}
 
+	handleTeamsV2OptIn(config);
+
 	window.webContents.setUserAgent(config.chromeUserAgent);
 
 	if (!config.minimized) {
@@ -130,6 +132,28 @@ function applyAppConfiguration(config, window) {
 	}
 }
 
+function handleTeamsV2OptIn(config) {
+	if (config.optInTeamsV2) {
+		config.url = 'https://teams.microsoft.com/v2/';
+		window.webContents.executeJavaScript('localStorage.getItem("tmp.isOptedIntoT2Web");', true)
+			.then(result => {
+				if ((result == null) || !result) {
+					window.webContents.executeJavaScript('localStorage.setItem("tmp.isOptedIntoT2Web", true);', true)
+						.then(window.reload())
+						.catch(err => {
+							console.log('could not set localStorage variable', err);
+						});
+				}
+			})
+			.catch(err => {
+				console.log('could not read localStorage variable', err);
+			});
+		return;
+	}
+	window.webContents.executeJavaScript('localStorage.removeItem("tmp.isOptedIntoT2Web");', true)
+		.then(window.reload());
+}
+
 /**
  * Applies Electron's spell checker capabilities if language codes are provided.
  * @param {Array<string>} languages Array of language codes to use with spell checker.
@@ -180,7 +204,7 @@ function onDidFrameFinishLoad(event, isMainFrame, frameProcessId, frameRoutingId
 	}
 
 	const wf = webFrameMain.fromId(frameProcessId, frameRoutingId);
-	customCSS.onDidFrameFinishLoad(wf, config)
+	customCSS.onDidFrameFinishLoad(wf, config);
 }
 
 function restoreWindow() {
@@ -355,7 +379,7 @@ function addEventHandlers() {
 	window.webContents.session.webRequest.onBeforeSendHeaders(getWebRequestFilterFromURL(), onBeforeSendHeadersHandler);
 	login.handleLoginDialogTry(window);
 	window.webContents.on('did-finish-load', onDidFinishLoad);
-	window.webContents.on("did-frame-finish-load", onDidFrameFinishLoad);
+	window.webContents.on('did-frame-finish-load', onDidFrameFinishLoad);
 	window.on('closed', onWindowClosed);
 	window.webContents.addListener('before-input-event', onBeforeInput);
 }

package.json

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