switch to Chromium net stack, fixes #1120

Author: SnosMe

main/src/main.ts

@@ -33,11 +33,11 @@ app.on('ready', async () => {
   const gameConfig = new GameConfig(eventPipe, logger)
   const poeWindow = new GameWindow()
   const appUpdater = new AppUpdater(eventPipe)
-  const httpProxy = new HttpProxy(server, logger)
+  const _httpProxy = new HttpProxy(server, logger)
 
   setTimeout(
     async () => {
-      const overlay = new OverlayWindow(eventPipe, logger, poeWindow, httpProxy)
+      const overlay = new OverlayWindow(eventPipe, logger, poeWindow)
       new OverlayVisibility(eventPipe, overlay, gameConfig)
       const shortcuts = await Shortcuts.create(logger, overlay, poeWindow, gameConfig, eventPipe)
       eventPipe.onEventAnyClient('CLIENT->MAIN::update-host-config', (cfg) => {

main/src/proxy.ts

@@ -1,9 +1,8 @@
 import type { Server } from 'http'
-import * as https from 'https'
-import { app } from 'electron'
+import { app, net } from 'electron'
 import type { Logger } from './RemoteLogger'
 
-export const PROXY_HOSTS = [
+const PROXY_HOSTS = [
   { host: 'www.pathofexile.com', official: true },
   { host: 'ru.pathofexile.com', official: true },
   { host: 'pathofexile.tw', official: true },
@@ -13,8 +12,6 @@ export const PROXY_HOSTS = [
 ]
 
 export class HttpProxy {
-  cookiesForPoe = new Map<string, string>()
-
   constructor (
     server: Server,
     logger: Logger
@@ -26,31 +23,33 @@ export class HttpProxy {
       const official = PROXY_HOSTS.find(entry => entry.host === host)?.official
       if (official === undefined) return req.destroy()
 
-      const cookie = (official)
-        ? Array.from(this.cookiesForPoe.entries())
-            .map(([key, value]) => `${key}=${value}`)
-            .join('; ')
-        : ''
+      for (const key in req.headers) {
+        if (key.startsWith('sec-') || key === 'host' || key === 'origin' || key === 'content-length') {
+          delete req.headers[key]
+        }
+      }
 
-      const proxyReq = https.request(
-        'https://' + req.url.slice('/proxy/'.length),
-        {
-          method: req.method,
-          headers: {
-            ...req.headers,
-            host: host,
-            cookie: cookie,
-            'user-agent': app.userAgentFallback
-          }
-        }, (proxyRes) => {
-          res.writeHead(proxyRes.statusCode!, proxyRes.statusMessage!, proxyRes.rawHeaders)
-          proxyRes.pipe(res)
-        })
+      const proxyReq = net.request({
+        url: 'https://' + req.url.slice('/proxy/'.length),
+        method: req.method,
+        headers: {
+          ...req.headers,
+          'user-agent': app.userAgentFallback
+        },
+        useSessionCookies: true
+      })
+      proxyReq.addListener('response', (proxyRes) => {
+        const resHeaders = { ...proxyRes.headers }
+        // `net.request` returns an already decoded body
+        delete resHeaders['content-encoding']
+        res.writeHead(proxyRes.statusCode, proxyRes.statusMessage, resHeaders)
+        ;(proxyRes as unknown as NodeJS.ReadableStream).pipe(res)
+      })
       proxyReq.addListener('error', (err) => {
         logger.write(`error [cors-proxy] ${err.message} (${host})`)
         res.destroy(err)
       })
-      req.pipe(proxyReq)
+      req.pipe(proxyReq as unknown as NodeJS.WritableStream)
     })
   }
 }

main/src/windowing/OverlayWindow.ts

@@ -4,7 +4,6 @@ import { OverlayController, OVERLAY_WINDOW_OPTS } from 'electron-overlay-window'
 import type { ServerEvents } from '../server'
 import type { Logger } from '../RemoteLogger'
 import type { GameWindow } from './GameWindow'
-import { type HttpProxy, PROXY_HOSTS } from '../proxy'
 
 export class OverlayWindow {
   public isInteractable = false
@@ -17,7 +16,6 @@ export class OverlayWindow {
     private server: ServerEvents,
     private logger: Logger,
     private poeWindow: GameWindow,
-    proxy: HttpProxy
   ) {
     this.server.onEventAnyClient('OVERLAY->MAIN::focus-game', this.assertGameActive)
     this.poeWindow.on('active-change', this.handlePoeWindowActiveChange)
@@ -52,8 +50,6 @@ export class OverlayWindow {
       webviewWebContents.on('before-input-event', this.handleExtraCommands)
     })
 
-    spyOnPathofexileCookies(this.window.webContents, proxy.cookiesForPoe)
-
     this.window.webContents.setWindowOpenHandler((details) => {
       shell.openExternal(details.url)
       return { action: 'deny' }
@@ -174,35 +170,3 @@ export class OverlayWindow {
     this.isOverlayKeyUsed = false
   }
 }
-
-function spyOnPathofexileCookies (webContents: WebContents, map: Map<string, string>) {
-  const urls = PROXY_HOSTS
-    .filter(({ official }) => official)
-    .map(({ host }) => `https://${host}/*`)
-
-  webContents.session.webRequest.onHeadersReceived({ urls }, (details, next) => {
-    for (const key in details.responseHeaders) {
-      if (key.toLowerCase() === 'set-cookie') {
-        for (const cookie of details.responseHeaders[key]) {
-          const [key, value] = cookie.split(';', 1)[0].split('=', 2)
-          map.set(key, value)
-        }
-        break
-      }
-    }
-    next({ responseHeaders: details?.responseHeaders })
-  })
-
-  webContents.session.webRequest.onBeforeSendHeaders({ urls }, (details, next) => {
-    for (const key in details.requestHeaders) {
-      if (key.toLowerCase() === 'cookie') {
-        for (const part of details.requestHeaders[key].split(';')) {
-          const [key, value] = part.trim().split('=', 2)
-          map.set(key, value)
-        }
-        break
-      }
-    }
-    next({ requestHeaders: details.requestHeaders })
-  })
-}