cleanup

Author: jkyberneees

index.d.ts

@@ -43,7 +43,7 @@ declare namespace fastgateway {
   }
 
   interface WebSocketHooks {
-    onOpen?: Function;
+    onOpen?: (ws: any, searchParams: URLSearchParams) => Promise<void>;
   }
 
   interface Hooks {

index.js

@@ -8,7 +8,7 @@ const defaultProxyHandler = (req, res, url, proxy, proxyOpts) => proxy(req, res,
 const DEFAULT_METHODS = require('restana/libs/methods').filter(method => method !== 'all')
 const send = require('@polka/send-type')
 const PROXY_TYPES = ['http', 'lambda']
-const wsProxy = require('./lib/ws-proxy')
+const registerWebSocketRoutes = require('./lib/ws-proxy')
 
 const gateway = (opts) => {
   const proxyFactory = opts.proxyFactory || defaultProxyFactory
@@ -35,9 +35,8 @@ const gateway = (opts) => {
   })
 
   // processing websocket routes
-  const wsRoutes = opts.routes.filter(route => route.proxyType === 'websocket')
-  wsProxy({
-    routes: wsRoutes,
+  registerWebSocketRoutes({
+    routes: opts.routes.filter(route => route.proxyType === 'websocket'),
     server: router.getServer()
   })
 

lib/ws-proxy.js

@@ -14,7 +14,7 @@ module.exports = (config) => {
 
   server.on('upgrade', async (req, socket, body) => {
     if (WebSocket.isWebSocket(req)) {
-      const url = new URL('http://dummy' + req.url)
+      const url = new URL('http://fw' + req.url)
       const route = prefix2route[url.pathname]
 
       if (route) {
@@ -32,13 +32,11 @@ module.exports = (config) => {
           client.pipe(remote)
           remote.pipe(client)
         } catch (err) {
-          client.close(err.closeEventCode || 4000, err.message)
+          client.close(err.closeEventCode || 4500, err.message)
         }
       } else {
-        socket.destroy()
+        socket.end()
       }
-    } else {
-      socket.destroy()
-    }
+    } 
   })
 }