diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json index 15542439247..8955c0d9203 100644 --- a/superset-websocket/package-lock.json +++ b/superset-websocket/package-lock.json @@ -36,7 +36,7 @@ "ts-jest": "^29.4.11", "ts-node": "^10.9.2", "tscw-config": "^1.1.2", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "typescript-eslint": "^8.59.4" }, "engines": { @@ -6185,9 +6185,9 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -11038,9 +11038,9 @@ "dev": true }, "typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "dev": true }, "typescript-eslint": { diff --git a/superset-websocket/package.json b/superset-websocket/package.json index c72376a4598..d6e25e62609 100644 --- a/superset-websocket/package.json +++ b/superset-websocket/package.json @@ -44,7 +44,7 @@ "ts-jest": "^29.4.11", "ts-node": "^10.9.2", "tscw-config": "^1.1.2", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "typescript-eslint": "^8.59.4" }, "engines": { diff --git a/superset-websocket/src/index.ts b/superset-websocket/src/index.ts index 5a1587e88b6..4fa1ede672f 100644 --- a/superset-websocket/src/index.ts +++ b/superset-websocket/src/index.ts @@ -18,7 +18,7 @@ */ import * as http from 'http'; import * as net from 'net'; -import WebSocket from 'ws'; +import WebSocket, { WebSocketServer } from 'ws'; import { randomUUID } from 'crypto'; import jwt, { Algorithm } from 'jsonwebtoken'; import { parse } from 'cookie'; @@ -141,7 +141,7 @@ export const buildRedisOpts = (baseConfig: RedisConfig) => { // initialize servers const redis = new Redis(buildRedisOpts(opts.redis)); const httpServer = http.createServer(); -export const wss = new WebSocket.Server({ +export const wss = new WebSocketServer({ noServer: true, clientTracking: false, }); @@ -466,7 +466,7 @@ export const cleanChannel = (channel: string) => { if (startServer) { // init server event listeners - wss.on('connection', function (ws) { + wss.on('connection', function (ws: WebSocket) { ws.on('error', console.error); }); wss.on('connection', wsConnection); diff --git a/superset-websocket/tsconfig.json b/superset-websocket/tsconfig.json index 346f8a0ee7d..df47ee8496a 100644 --- a/superset-websocket/tsconfig.json +++ b/superset-websocket/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "rootDir": "src", "outDir": "dist", "target": "es2019", "module": "commonjs",