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.

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.10",
"version": "0.6.11",
"main": "dist/src/index.js",
"scripts": {
"start": "nodemon --exec \"ts-node src/index.ts\" src/index.ts",
Expand Down
7 changes: 5 additions & 2 deletions server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,11 @@ class ServerImpl extends EventGenerator<Events> implements Server {
}
private async onUnlinkedConnectionMessage(connectionId: string, message: FromClientMessage | Message): Promise<void> {
let rejected = false;
let timeoutId: ReturnType<typeof setTimeout> | undefined;
let timeoutResolver = () => { /*none*/ };
const reject = (reason: string) => {
if (rejected) { return; }
if (timeoutId !== undefined) { clearTimeout(timeoutId); }
timeoutResolver();
this.logger('debug', `connection ${connectionId} rejected, due to: ${reason}`);
const userRejectedMessage: RejectedMessage = { type: 'krmx/rejected', payload: { reason } };
Expand Down Expand Up @@ -483,18 +485,19 @@ class ServerImpl extends EventGenerator<Events> implements Server {
await Promise.race([
new Promise<void>((resolve) => {
timeoutResolver = resolve; // allows to resolve the promise immediately on rejection
setTimeout(() => {
timeoutId = setTimeout(() => {
reject('authentication timeout');
resolve();
}, this.authTimeoutMilliseconds);
}),
await Promise.all(promises),
Promise.all(promises).then(() => { /* resolve race when all handlers complete */ }),
]);
}
} catch (err: unknown) {
rejectFromError(err);
}
}
if (timeoutId !== undefined) { clearTimeout(timeoutId); }
if (rejected) {
return;
}
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.10';
export const VERSION = '0.6.11';
15 changes: 15 additions & 0 deletions server/test/server.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -674,4 +674,19 @@ describe('Krmx Server', () => {
expect(Date.now() - time).toBeLessThan(100); // should be rejected immediately
await expect(addUser('rens')).rejects.toBe('immediately rejected by throw');
}));

it('should not send a spurious rejection to a successfully authenticated async user after the timeout expires',
withCustomServer({ authTimeoutMilliseconds: 200 }, async ({ server, addUser }) => {
server.on('authenticate', (_username, _info, _reject, markAsync) => markAsync(async () => {
await sleep(100); // completes well before the 200ms timeout
}));
const simon = await addUser('simon');
// Wait longer than the authTimeoutMilliseconds to ensure no spurious rejection fires
await sleep(400);
// The user should NOT have received a krmx/rejected message after being accepted
const messages = simon.emit.message.mock.calls.map((call) => (call[0] as { type: string }).type);
expect(messages).not.toContain('krmx/rejected');
expect(messages).toContain('krmx/accepted');
}),
);
});
Loading