1 files changed, 16 insertions, 13 deletions
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index b0db71f9c..805da1d43 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -22,6 +22,7 @@ import { Database } from './database';
 import RouteManager from './RouteManager';
 import RouteSubscriber from './RouteSubscriber';
 import { WebSocket } from './websocket';
+import brotli = require('brotli');
 import expressFlash = require('express-flash');
 import flash = require('connect-flash');
 const MongoStore = require('connect-mongo')(session);
@@ -171,31 +172,29 @@ function registerCorsProxy(server: express.Express) {
 function proxyServe(req: any, requrl: string, response: any) {
     const htmlBodyMemoryStream = new (require('memorystream'))();
     var retrieveHTTPBody: any;
+    var wasinBrFormat = false;
     const sendModifiedBody = () => {
         const header = response.headers['content-encoding'];
+        const httpsToCors = (match: any, href: string, offset: any, string: any) => `href="${resolvedServerUrl + '/corsProxy/http' + href}"`;
         if (header?.includes('gzip')) {
             try {
-                const replacer = (match: any, href: string, offset: any, string: any) => {
-                    return `href="${resolvedServerUrl + '/corsProxy/http' + href}"`;
-                };
-                const zipToStringDecoder = new (require('string_decoder').StringDecoder)('utf8');
                 const bodyStream = htmlBodyMemoryStream.read();
                 if (bodyStream) {
-                    const htmlText = zipToStringDecoder.write(
-                        zlib
-                            .gunzipSync(bodyStream)
-                            .toString('utf8')
-                            .replace('<head>', '<head> <style>[id ^= "google"] { display: none; } </style>')
-                            .replace(/href="https?([^"]*)"/g, replacer)
-                            .replace(/target="_blank"/g, '')
-                    );
+                    const htmlInputText = wasinBrFormat ? Buffer.from(brotli.decompress(bodyStream)) : zlib.gunzipSync(bodyStream);
+                    const htmlText = htmlInputText
+                        .toString('utf8')
+                        .replace('<head>', '<head> <style>[id ^= "google"] { display: none; } </style>')
+                        .replace(/href="https?([^"]*)"/g, httpsToCors)
+                        .replace(/data-srcset="[^"]*"/g, '')
+                        .replace(/srcset="[^"]*"/g, '')
+                        .replace(/target="_blank"/g, '');
                     response.send(zlib.gzipSync(htmlText));
                 } else {
                     req.pipe(request(requrl)).pipe(response);
                     console.log('EMPTY body:' + req.url);
                 }
             } catch (e) {
-                console.log('EROR?: ', e);
+                console.log('ERROR?: ', e);
             }
         } else {
             req.pipe(htmlBodyMemoryStream).pipe(response);
@@ -216,6 +215,10 @@ function proxyServe(req: any, requrl: string, response: any) {
                     } else if (headerCharRegex.test(header || '')) {
                         delete res.headers[headerName];
                     } else res.headers[headerName] = header;
+                    if (headerName === 'content-encoding') {
+                        wasinBrFormat = res.headers[headerName] === 'br';
+                        res.headers[headerName] = 'gzip';
+                    }
                 });
                 res.headers['x-permitted-cross-domain-policies'] = 'all';
                 res.headers['x-frame-options'] = '';