Enable HTTP for overlay

Author: kellertobias

readme.md

@@ -115,7 +115,6 @@ In order to build this application, you need to do the following:
 this application supports multiple flags that can be set via environment variables:
 - SPY=1 disables internal functionality and just displays requests and respones to original KUVO
 - LOG=1 enables request logging
-- UNSAFE=1 disables https and falls back to http. this will not work with Rekordbox, but might help debugging ssl related stuff
 - RENEW=1 recreates all certificates (cannot be undone, you need to install the new root certificate)
 
 # Roadmap:

src/config.ts

@@ -1,6 +1,6 @@
 export const HOST = "localhost";
-export const WEB_PORT = 443;
-export const PROXY_PORT = 8080;
+export const HTTP_PORT = 80;
+export const HTTPS_PORT = 443;
 export const PROXY_DOMAINS = [
     'kuvo.com',
     '*.kuvo.com',

src/server/webserver.ts

@@ -2,7 +2,7 @@ import http from 'http'
 import https from 'https'
 import ws from 'ws'
 
-import { HOST, WEB_PORT } from '../config'
+import { HOST, HTTPS_PORT, HTTP_PORT } from '../config'
 import { createOrLoadKeys } from './encryption'
 import { requestHandler } from './webhandler'
 import { setupSystem } from './system-setup'
@@ -21,15 +21,19 @@ const setupWebserver = () => {
     setupSystem().then(() => {
         return createOrLoadKeys()
     }).then((certificates) => {
-    const encrypted = process.env.UNSAFE !== '1'
-    const webserver = !encrypted ? http.createServer(requestHandler) : https.createServer({
+    
+        const webserver = http.createServer(requestHandler);
+        
+        const secureWebserver = https.createServer({
             key: certificates.key,
             cert: certificates.cert,
-
         }, requestHandler)
-    
-        webserver.listen(WEB_PORT, () => {
-            console.log(`WebServer is running on ${encrypted ? 'https' : 'http'}://${HOST}:${WEB_PORT}`);
+        
+        secureWebserver.listen(HTTPS_PORT, () => {
+            console.log(`SecureWebServer is running on https://${HOST}:${HTTPS_PORT}`);
+        })
+        webserver.listen(HTTP_PORT, () => {
+            console.log(`WebServer is running on http://${HOST}:${HTTP_PORT}`);
         })
 
         const wsServer = new ws.Server({noServer: true});
@@ -46,6 +50,11 @@ const setupWebserver = () => {
             socket.send(lastMessage)
         })
 
+        secureWebserver.on('upgrade', (request, socket, head) => {
+            wsServer.handleUpgrade(request, socket, head, (s) => {
+                wsServer.emit('connection', s, request)
+            })
+        })
         webserver.on('upgrade', (request, socket, head) => {
             wsServer.handleUpgrade(request, socket, head, (s) => {
                 wsServer.emit('connection', s, request)

src/ui/settings.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { ipcRenderer } from 'electron';
 
-import { HOST, WEB_PORT } from '../config';
+import { HOST } from '../config';
 import { CertificateStore } from '../types/certificate';
 
 import download from './helpers/download';
@@ -149,7 +149,7 @@ const SettingsView: React.FC<{}> = () => {
 					<br />
 					<img src="/static/overlay.png" />
 				</p>
-				<input readOnly value="https://localhost/overlay" />
+				<input readOnly value="http://localhost/overlay" />
 			</div>
 		</div>
 	);