diff options
Diffstat (limited to 'src/server/websocket.ts')
| -rw-r--r-- | src/server/websocket.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/server/websocket.ts b/src/server/websocket.ts index be5cdb202..4453001b0 100644 --- a/src/server/websocket.ts +++ b/src/server/websocket.ts @@ -3,7 +3,7 @@ import * as express from 'express'; import { createServer, Server } from 'https'; import { networkInterfaces } from 'os'; import * as sio from 'socket.io'; -import { Socket } from 'socket.io'; +import * as _socket from 'socket.io'; import { Opt } from '../fields/Doc'; import { Utils } from '../Utils'; import { logPort } from './ActionUtilities'; @@ -19,6 +19,7 @@ import { Diff, GestureContent, MessageStore, MobileDocumentUploadContent, Mobile import { Search } from './Search'; import { resolvedPorts } from './server_Initialization'; var _ = require('lodash'); +type Socket = typeof _socket; export namespace WebSocket { export let _socket: Socket; @@ -67,7 +68,7 @@ export namespace WebSocket { socket.on('create or join', function (room) { console.log('Received request to create or join room ' + room); - const clientsInRoom = socket.adapter.rooms[room]; + const clientsInRoom = socket.rooms.has(room); const numClients = clientsInRoom ? Object.keys(clientsInRoom.sockets).length : 0; console.log('Room ' + room + ' now has ' + numClients + ' client(s)'); @@ -90,7 +91,7 @@ export namespace WebSocket { socket.on('ipaddr', function () { const ifaces = networkInterfaces(); for (const dev in ifaces) { - ifaces[dev].forEach(function (details) { + ifaces[dev]?.forEach(function (details) { if (details.family === 'IPv4' && details.address !== '127.0.0.1') { socket.emit('ipaddr', details.address); } |