diff --git a/client-react/package-lock.json b/client-react/package-lock.json index 9c4acfb..6c687ed 100644 --- a/client-react/package-lock.json +++ b/client-react/package-lock.json @@ -80,7 +80,7 @@ }, "../server": { "name": "@krmx/server", - "version": "0.6.9", + "version": "0.6.10", "dev": true, "license": "ISC", "dependencies": { diff --git a/client/package-lock.json b/client/package-lock.json index f3432df..3b63cdd 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -47,7 +47,7 @@ }, "../server": { "name": "@krmx/server", - "version": "0.6.9", + "version": "0.6.10", "dev": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 00895e6..d16364b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dev:client-react": "sleep 750 && npm run --prefix client-react dev", "dev:docs": "npm run --prefix docs dev", "versions": ".github/tools/version-check.sh && npm install && npm --prefix base run postversion && npm --prefix server run postversion && npm --prefix client run postversion && npm --prefix client-react run postversion && npm --prefix state run versions", - "patch": "npm --prefix base version patch && npm --prefix server version patch && npm --prefix client version patch && npm --prefix client-react version patch && .github/tools/version-check.sh" + "patch-all": "npm --prefix base version patch && npm --prefix server version patch && npm --prefix client version patch && npm --prefix client-react version patch && .github/tools/version-check.sh" }, "dependencies": { "npm-run-all": "^4.1.5", diff --git a/server/package-lock.json b/server/package-lock.json index e47d4a2..f2cf0ad 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@krmx/server", - "version": "0.6.9", + "version": "0.6.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@krmx/server", - "version": "0.6.9", + "version": "0.6.10", "license": "ISC", "dependencies": { "@krmx/base": "file:../base", diff --git a/server/package.json b/server/package.json index ff7973c..97efa5b 100644 --- a/server/package.json +++ b/server/package.json @@ -2,7 +2,7 @@ "name": "@krmx/server", "description": "krmx server", "author": "Simon Karman", - "version": "0.6.9", + "version": "0.6.10", "main": "dist/src/index.js", "scripts": { "start": "nodemon --exec \"ts-node src/index.ts\" src/index.ts", diff --git a/server/src/server.ts b/server/src/server.ts index 03ebdaf..2b1c22b 100644 --- a/server/src/server.ts +++ b/server/src/server.ts @@ -1,10 +1,22 @@ import http from 'http'; import { randomBytes } from 'node:crypto'; -import ws, { AddressInfo, RawData, WebSocket, WebSocketServer } from 'ws'; +import { AddressInfo, RawData, WebSocket, WebSocketServer } from 'ws'; import { - EventGenerator, EventEmitter, Logger, LogSeverity, FromServerMessage, FromClientMessage, - JoinedMessage, LinkedMessage, UnlinkedMessage, LeftMessage, RejectedMessage, AcceptedMessage, - Message, User, LinkMessage, + AcceptedMessage, + EventEmitter, + EventGenerator, + FromClientMessage, + FromServerMessage, + JoinedMessage, + LeftMessage, + LinkedMessage, + LinkMessage, + Logger, + LogSeverity, + Message, + RejectedMessage, + UnlinkedMessage, + User, } from '@krmx/base'; import { ExpectedQueryParams, hasExpectedQueryParams } from './utils'; import { VERSION } from './version'; @@ -256,7 +268,7 @@ class ServerImpl extends EventGenerator implements Server { private readonly pingIntervalMilliseconds: number; private pingInterval: ReturnType | undefined; - private readonly connections: { [connectionId: string]: { socket: ws.WebSocket, isAlive: boolean, username?: string } } = {}; + private readonly connections: { [connectionId: string]: { socket: WebSocket, isAlive: boolean, username?: string } } = {}; private readonly users: { [username: string]: { connectionId?: string } } = {}; private status: Status; private canOnly(action: string, when: Status[] | Status): void { @@ -326,7 +338,7 @@ class ServerImpl extends EventGenerator implements Server { for (const connectionId in this.connections) { const connection = this.connections[connectionId]; if (connection.isAlive) { - if (connection.socket.readyState === ws.WebSocket.OPEN) { + if (connection.socket.readyState === WebSocket.OPEN) { connection.socket.ping(connectionId); } connection.isAlive = false; @@ -555,7 +567,7 @@ class ServerImpl extends EventGenerator implements Server { if (connection === undefined) { throw new Error(`cannot send ${message.type} message to connection ${connectionId}, as that connection does not exist`); } - if (connection.socket.readyState === ws.WebSocket.OPEN) { + if (connection.socket.readyState === WebSocket.OPEN) { const data = JSON.stringify(message); connection.socket.send(data); } else { diff --git a/server/src/version.ts b/server/src/version.ts index f433902..64692cc 100644 --- a/server/src/version.ts +++ b/server/src/version.ts @@ -1 +1 @@ -export const VERSION = '0.6.9'; +export const VERSION = '0.6.10';