Fix firefox & chrome startup bugs caused by server bundling

pimterry · pimterry · commit f0de7335c169 · 2019-09-22T14:49:17.000+02:00
diff --git a/src/cert-check-server.ts b/src/cert-check-server.ts
@@ -15,31 +15,7 @@ let installingCert: boolean;
 // If it doesn't, redirect to the certificate itself (the browser will prompt to install)
 // Note that this function is stringified, and run in the browser, not here in node.
 function ensureCertificateIsInstalled() {
-    const testUrl = window.location.href.replace('http://', 'https://').replace('check-cert', 'test-https');
-    const downloadUrl = window.location.href.replace('check-cert', 'download-cert');
-    const reportSuccessUrl = window.location.href.replace('check-cert', 'report-success');
-
-    fetch(testUrl)
-        .then(() => true)
-        .catch(() => false)
-        .then((certificateIsTrusted) => {
-            if (certificateIsTrusted) {
-                // Report success (ignoring errors) then continue.
-                fetch(reportSuccessUrl).catch(() => {}).then(() => {
-                    window.location.replace(targetUrl);
-                });
-            } else {
-                // Start trying to prompt the user to install the cert
-                if (!installingCert) {
-                    installingCert = true;
-                    document.body.className = 'show-content';
-                    const iframe = document.createElement('iframe');
-                    iframe.src = downloadUrl;
-                    document.body.appendChild(iframe);
-                    setInterval(ensureCertificateIsInstalled, 500);
-                }
-            }
-        });
+
 }
 
 export class CertCheckServer {
@@ -91,8 +67,34 @@ export class CertCheckServer {
                         let installingCert = false;
                         const targetUrl = ${JSON.stringify(targetUrl)};
 
-                        ${ensureCertificateIsInstalled.toString()}
-                        ensureCertificateIsInstalled();
+                        function ensureCertificateIsInstalled() {
+                            const testUrl = window.location.href.replace('http://', 'https://').replace('check-cert', 'test-https');
+                            const downloadUrl = window.location.href.replace('check-cert', 'download-cert');
+                            const reportSuccessUrl = window.location.href.replace('check-cert', 'report-success');
+
+                            fetch(testUrl)
+                                .then(() => true)
+                                .catch(() => false)
+                                .then((certificateIsTrusted) => {
+                                    if (certificateIsTrusted) {
+                                        // Report success (ignoring errors) then continue.
+                                        fetch(reportSuccessUrl).catch(() => {}).then(() => {
+                                            window.location.replace(targetUrl);
+                                        });
+                                    } else {
+                                        // Start trying to prompt the user to install the cert
+                                        if (!installingCert) {
+                                            installingCert = true;
+                                            document.body.className = 'show-content';
+                                            const iframe = document.createElement('iframe');
+                                            iframe.src = downloadUrl;
+                                            document.body.appendChild(iframe);
+                                            setInterval(ensureCertificateIsInstalled, 500);
+                                        }
+                                    }
+                                });
+                            }
+                            ensureCertificateIsInstalled();
                     </script>
                     <body>
                         <h1>
diff --git a/src/hide-chrome-warning-server.ts b/src/hide-chrome-warning-server.ts
@@ -5,11 +5,7 @@ let targetUrl: string;
 
 // The first tab that opens opens with a Chrome warning about dangerous flags
 // Closing it and immediately opening a new one is a bit cheeky, but
-// is completely gets rid that, more or less invisibly.
-function jumpToNewTab() {
-    window.open(targetUrl, '_blank');
-    window.close();
-}
+// is completely gets rid that, more or less invisibly:
 
 export class HideChromeWarningServer {
 
@@ -37,9 +33,8 @@ export class HideChromeWarningServer {
                 </style>
                 <script>
                     const targetUrl = ${JSON.stringify(targetUrl)};
-
-                    ${jumpToNewTab.toString()}
-                    jumpToNewTab();
+                    window.open(targetUrl, '_blank');
+                    window.close();
                 </script>
                 <body>
                     This page should disappear momentarily. If it doesn't, click
