fix: websocket imports

dherault · Jun 28, 2022 · eae5400 · eae5400
1 parent 8ea5a8d
commit eae5400
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/events/websocket/WebSocketClients.js b/src/events/websocket/WebSocketClients.js
@@ -1,4 +1,4 @@
-import WebSocket from 'ws'
+import { WebSocket } from 'ws'
 import { isBoom } from '@hapi/boom'
 import { log } from '@serverless/utils/log.js'
 import {
@@ -275,6 +275,7 @@ export default class WebSocketClients {
 
     const authorizerData = this.#webSocketAuthorizersCache.get(connectionId)
     let authorizedEvent
+
     if (authorizerData) {
       authorizedEvent = event
       authorizedEvent.requestContext.identity = authorizerData.identity

diff --git a/src/events/websocket/WebSocketServer.js b/src/events/websocket/WebSocketServer.js
@@ -1,5 +1,5 @@
 import { log } from '@serverless/utils/log.js'
-import WebSocket from 'ws'
+import { WebSocketServer as WsWebSocketServer } from 'ws'
 import { createUniqueId } from '../../utils/index.js'
 
 export default class WebSocketServer {
@@ -13,7 +13,7 @@ export default class WebSocketServer {
     this.#options = options
     this.#webSocketClients = webSocketClients
 
-    const server = new WebSocket.WebSocketServer({
+    const server = new WsWebSocketServer({
       server: sharedServer,
       verifyClient: ({ req }, cb) => {
         const connectionId = createUniqueId()

diff --git a/tests/integration/websocket-authorizer/websocket-authorizer.test.js b/tests/integration/websocket-authorizer/websocket-authorizer.test.js
@@ -2,7 +2,7 @@ import assert from 'node:assert'
 import { dirname, resolve } from 'node:path'
 import { env } from 'node:process'
 import { fileURLToPath } from 'node:url'
-import WebSocket from 'ws'
+import { WebSocket } from 'ws'
 import { joinUrl, setup, teardown } from '../_testHelpers/index.js'
 import websocketSend from '../_testHelpers/websocketPromise.js'
 

diff --git a/tests/integration/websocket-oneway/websocket-oneway.test.js b/tests/integration/websocket-oneway/websocket-oneway.test.js
@@ -2,7 +2,7 @@ import assert from 'node:assert'
 import { dirname, resolve } from 'node:path'
 import { env } from 'node:process'
 import { fileURLToPath } from 'node:url'
-import WebSocket from 'ws'
+import { WebSocket } from 'ws'
 import { joinUrl, setup, teardown } from '../_testHelpers/index.js'
 import websocketSend from '../_testHelpers/websocketPromise.js'
 

diff --git a/tests/integration/websocket-twoway/websocket-twoway.test.js b/tests/integration/websocket-twoway/websocket-twoway.test.js
@@ -2,7 +2,7 @@ import assert from 'node:assert'
 import { dirname, resolve } from 'node:path'
 import { env } from 'node:process'
 import { fileURLToPath } from 'node:url'
-import WebSocket from 'ws'
+import { WebSocket } from 'ws'
 import { joinUrl, setup, teardown } from '../_testHelpers/index.js'
 import websocketSend from '../_testHelpers/websocketPromise.js'