diff --git a/src/server.ts b/src/server.ts index 98f9836..c6237b0 100644 --- a/src/server.ts +++ b/src/server.ts @@ -3,7 +3,6 @@ import bunExpress from 'bun-serve-express'; import express from 'express'; import pako from 'pako'; -// import { webSocketServer } from './ws/websocketServer'; process.env.TZ = 'Europe/London'; type WebSocketData = { diff --git a/src/ws/rgbWebsocketClient.ts b/src/ws/rgbWebsocketClient.ts deleted file mode 100644 index 4eab298..0000000 --- a/src/ws/rgbWebsocketClient.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { OPEN, WebSocket } from "ws"; - -let url = process.env.RGB_WS ?? 'ws://192.168.0.114'; -let ws: WebSocket; - -export const connect = () => { - ws = new WebSocket(url); - - ws.onclose = (e) => { - console.log('Socket is closed. Reconnect will be attempted in 1 second.', e.reason); - setTimeout(function () { - connect(); - }, 1000); - }; - - ws.onerror = (err) => { - console.error('Socket encountered error: ', err.message, 'Closing socket'); - ws.close(); - }; - - return { - getWs: () => ws - }; -} - -export const updateURL = (newUrl: string) => { - url = newUrl; - if (ws.readyState == OPEN) ws.close(); -} diff --git a/src/ws/websocketServer.ts b/src/ws/websocketServer.ts deleted file mode 100644 index 9a958da..0000000 --- a/src/ws/websocketServer.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Server } from 'http'; -import { parse } from 'url'; -import { WebSocketServer } from "ws"; - -type App = { - use: (callback: (req: Request, res: Response, next: () => void) => void) => void -} - -export const webSocketServer = (app: App, path = '/ws') => { - const wss = new WebSocketServer({ noServer: true, path }); - app.use((req, res, next) => { - const server = req.connection.server as Server; - - if (!server[`hooked${path}`]) { - server[`hooked${path}`] = true; - - server.on('upgrade', (request, socket, head) => { - const { pathname } = parse(request.url || ''); - if (pathname === path) { - wss.handleUpgrade(request, socket, head, function done(ws) { - wss.emit('connection', ws, request); - }); - } - }); - } - next(); - }); - - return wss; -} \ No newline at end of file