OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Use WebSocketServer instead of WebSocket.Server in streaming (#30788)

pull/30819/head
Essem 2024-06-24 05:29:00 -05:00 committed by GitHub
parent b3710098a8
commit 54cc204473
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
streaming/index.js
View File

@ -12,7 +12,7 @@ import { Redis } from 'ioredis';
import { JSDOM } from 'jsdom'; import { JSDOM } from 'jsdom';
import pg from 'pg'; import pg from 'pg';
import pgConnectionString from 'pg-connection-string'; import pgConnectionString from 'pg-connection-string';
import WebSocket from 'ws'; import { WebSocketServer } from 'ws';
import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js'; import { AuthenticationError, RequestError, extractStatusAndMessage as extractErrorStatusAndMessage } from './errors.js';
import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js'; import { logger, httpLogger, initializeLogLevel, attachWebsocketHttpLogger, createWebsocketLogger } from './logging.js';
@ -289,7 +289,7 @@ const CHANNEL_NAMES = [
const startServer = async () => { const startServer = async () => {
const pgPool = new pg.Pool(pgConfigFromEnv(process.env)); const pgPool = new pg.Pool(pgConfigFromEnv(process.env));
const server = http.createServer(); const server = http.createServer();
const wss = new WebSocket.Server({ noServer: true }); const wss = new WebSocketServer({ noServer: true });
// Set the X-Request-Id header on WebSockets: // Set the X-Request-Id header on WebSockets:
wss.on("headers", function onHeaders(headers, req) { wss.on("headers", function onHeaders(headers, req) {