From 6b2b734ef90bd37953e0ce6d162556cc14d67524 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Fri, 25 May 2018 14:29:13 -0400
Subject: [PATCH] Rewrite Switchboard in a way that will hopefully make it more
 robust. Make sure Switchboard works on every Twitch page we can think of.

---
 changelog.html                           |   6 ++
 src/main.js                              |   2 +-
 src/raven.js                             |   2 +-
 src/sites/twitch-twilight/switchboard.js | 124 +++++++++--------------
 4 files changed, 55 insertions(+), 79 deletions(-)

diff --git a/changelog.html b/changelog.html
index 41fc42a0..fb2cc2de 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">4.0.0-rc1.12<span>@b04d3c600e5260fcd7cd</span> <time datetime="2018-05-25">(2018-05-25)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Changed: Disable including user IDs in error reports by default.</li>
+	<li>Fixed: Rewrite Switchboard to be more robust and to hook into the router on all known pages, including dashboard pages.</li>
+</ul>
+
 <div class="list-header">4.0.0-rc1.11<span>@eed9eb9f5eb9acdb58ac</span> <time datetime="2018-05-22">(2018-05-22)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Setting to always display deleted chat messages.</li>
diff --git a/src/main.js b/src/main.js
index 2127c5d4..7a0eba77 100644
--- a/src/main.js
+++ b/src/main.js
@@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
 FrankerFaceZ.Logger = Logger;
 
 const VER = FrankerFaceZ.version_info = {
-	major: 4, minor: 0, revision: 0, extra: '-rc1.11',
+	major: 4, minor: 0, revision: 0, extra: '-rc1.12',
 	build: __webpack_hash__,
 	toString: () =>
 		`${VER.major}.${VER.minor}.${VER.revision}${VER.extra || ''}${DEBUG ? '-dev' : ''}`
diff --git a/src/raven.js b/src/raven.js
index 65d1de80..b365dd0e 100644
--- a/src/raven.js
+++ b/src/raven.js
@@ -70,7 +70,7 @@ export default class RavenLogger extends Module {
 			});
 
 			this.settings.add('reports.error.include-user', {
-				default: true,
+				default: false,
 				ui: {
 					path: 'Data Management > Reporting >> Error Reports',
 					title: 'Include user IDs in reports.',
diff --git a/src/sites/twitch-twilight/switchboard.js b/src/sites/twitch-twilight/switchboard.js
index a52436e7..35c62807 100644
--- a/src/sites/twitch-twilight/switchboard.js
+++ b/src/sites/twitch-twilight/switchboard.js
@@ -6,6 +6,7 @@
 // ============================================================================
 
 import Module from 'utilities/module';
+import pathToRegexp from 'path-to-regexp';
 
 
 export default class Switchboard extends Module {
@@ -19,7 +20,12 @@ export default class Switchboard extends Module {
 
 
 	awaitRouter() {
-		const router = this.fine.searchTree(null, n => n.logger && n.logger.category === 'default-root-router', 100);
+		const router = this.fine.searchTree(null,
+			n => (n.logger && n.logger.category === 'default-root-router') ||
+				(n.onHistoryChange && n.reportInteractive) ||
+				(n.onHistoryChange && n.props && n.props.location),
+			100);
+
 		if ( router )
 			return Promise.resolve(router);
 
@@ -27,95 +33,59 @@ export default class Switchboard extends Module {
 	}
 
 
-	awaitMinimalRouter() {
-		const router = this.fine.searchTree(null, n => n.onHistoryChange && n.reportInteractive);
-		if ( router )
-			return Promise.resolve(router);
-
-		return new Promise(r => setTimeout(r, 50)).then(() => this.awaitMinimalRouter());
-	}
-
-
-	hijinx(da_switch, path) {
-		const real_context = da_switch.context;
-		let output;
-
-		try {
-			da_switch.context = {
-				router: {
-					route: {
-						location: {
-							pathname: path
-						}
-					}
-				}
-			}
-
-			output = da_switch.render();
-
-		} catch(err) {
-			this.log.error('Error forcing router to render another page.', err);
-			da_switch.context = real_context;
-			return;
-		}
-
-		da_switch.context = real_context;
-
-		if ( ! output || ! output.props || ! output.props.component )
-			return this.log.warn('Unexpected output from router render.');
-
-		let component;
-
-		try {
-			component = new output.props.component;
-		} catch(err) {
-			this.log.error('Error instantiating component for forced loading of another chunk.', err);
-			return;
-		}
-
-		try {
-			component.props.children.props.loader().then(() => {
-				this.log.info('Successfully forced a chunk to load.');
-			});
-		} catch(err) {
-			this.log.warn('Unexpected result trying to use component loader to force loading of another chunk.', err);
-		}
-	}
-
-
 	async onEnable() {
-		const root = await this.parent.awaitElement('.twilight-minimal-root,.twilight-root'),
-			is_minimal = root && root.classList.contains('twilight-minimal-root');
-
+		await this.parent.awaitElement('.twilight-minimal-root,.twilight-root');
 		if ( this.web_munch._require || this.web_munch.v4 === false )
 			return;
 
-		if ( is_minimal )
-			return this.enableMinimal();
-
 		const router = await this.awaitRouter(),
-			child = router && this.fine.getFirstChild(router),
-			da_switch = child && child.stateNode;
+			da_switch = router && this.fine.searchTree(router, n => n.context && n.context.router && n.props && n.props.children && n.componentWillMount && n.componentWillMount.toString().includes('Switch'));
 
 		if ( ! da_switch )
 			return new Promise(r => setTimeout(r, 50)).then(() => this.onEnable());
 
-		const on_settings = da_switch.context.router.route.location.pathname.includes('settings');
-		return this.hijinx(da_switch, on_settings ? '/inventory' : '/settings');
-	}
 
+		// Identify Router
+		this.log.info(`Found Router and Switch with ${da_switch.props.children.length} routes.`);
 
-	async enableMinimal() {
-		const router = await this.awaitMinimalRouter(),
-			da_switch = router && this.fine.searchTree(router, n => n.context && n.context.router);
+		const location = da_switch.context.router.route.location.pathname;
 
-		if ( this.web_munch._require || this.web_munch.v4 === false )
-			return;
+		for(const route of da_switch.props.children) {
+			if ( ! route.props || ! route.props.component )
+				continue;
 
-		if ( ! da_switch )
-			return new Promise(r => setTimeout(r, 50)).then(() => this.enableMinimal());
+			try {
+				const reg = pathToRegexp(route.props.path);
+				if ( ! reg.exec || reg.exec(location) )
+					continue;
 
-		const on_prime = da_switch.context.router.route.location.pathname.includes('prime');
-		return this.hijinx(da_switch, on_prime ? '/subs' : '/prime')
+			} catch(err) {
+				continue;
+			}
+
+			this.log.info('Found Non-Matching Route', route.props.path);
+
+			let component;
+
+			try {
+				component = new route.props.component;
+			} catch(err) {
+				this.log.error('Error instantiating component for forced chunk loading.', err);
+				component = null;
+			}
+
+			if ( ! component || ! component.props || ! component.props.children || ! component.props.children.props || ! component.props.children.props.loader )
+				continue;
+
+			try {
+				component.props.children.props.loader().then(() => {
+					this.log.info('Successfully forced a chunk to load using route', route.props.path)
+				});
+			} catch(err) {
+				this.log.warn('Unexpected result trying to use component loader to force loading of another chunk.');
+			}
+
+			break;
+		}
 	}
 }
\ No newline at end of file