Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client-react/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions server/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
26 changes: 19 additions & 7 deletions server/src/server.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -256,7 +268,7 @@ class ServerImpl extends EventGenerator<Events> implements Server {
private readonly pingIntervalMilliseconds: number;

private pingInterval: ReturnType<typeof setInterval> | 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 {
Expand Down Expand Up @@ -326,7 +338,7 @@ class ServerImpl extends EventGenerator<Events> 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;
Expand Down Expand Up @@ -555,7 +567,7 @@ class ServerImpl extends EventGenerator<Events> 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 {
Expand Down
2 changes: 1 addition & 1 deletion server/src/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const VERSION = '0.6.9';
export const VERSION = '0.6.10';