Temporarily fixed websocket development proxy and set device name to noWrap in device list

1 files changed, 5 insertions, 2 deletions

diff --git a/modern/src/setupProxy.js b/modern/src/setupProxy.js
index 7161414..96ffb95 100644
--- a/modern/src/setupProxy.js
+++ b/modern/src/setupProxy.js
@@ -4,6 +4,9 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 
 
 module.exports = (app) => {
-  app.use('/api/socket', createProxyMiddleware({ target: `wss://${process.env.REACT_APP_URL_NAME}`, changeOrigin: true, ws: true, protocolRewrite: 'wss' }));
-  app.use('/api', createProxyMiddleware({ target: `https://${process.env.REACT_APP_URL_NAME}`, changeOrigin: true, protocolRewrite: 'https', headers: { "Connection": "keep-alive" } }));
+  const proxy = createProxyMiddleware('/api/socket', { target: `wss://${process.env.REACT_APP_URL_NAME}`, changeOrigin: true, logLevel: 'debug' });
+  const server = app.listen(3000);
+  server.on('upgrade', proxy.upgrade);
+  
+  app.use('/api', createProxyMiddleware(`https://${process.env.REACT_APP_URL_NAME}/api`, { changeOrigin: true, headers: { "Connection": "keep-alive" }, logLevel: 'debug' }));
 };