Skip to content
Open
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
11 changes: 7 additions & 4 deletions packages/platform-socket.io/adapters/io-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import { Server, ServerOptions, Socket } from 'socket.io';
* @publicApi
*/
export class IoAdapter extends AbstractWsAdapter {
private readonly disconnectMap = new WeakMap<Socket, Observable<any>>();

public create(
port: number,
options?: ServerOptions & { namespace?: string; server?: any },
Expand Down Expand Up @@ -39,10 +41,11 @@ export class IoAdapter extends AbstractWsAdapter {
handlers: MessageMappingProperties[],
transform: (data: any) => Observable<any>,
) {
const disconnect$ = fromEvent(socket, DISCONNECT_EVENT).pipe(
share(),
first(),
);
let disconnect$ = this.disconnectMap.get(socket);
if (!disconnect$) {
disconnect$ = fromEvent(socket, DISCONNECT_EVENT).pipe(share(), first());
this.disconnectMap.set(socket, disconnect$);
}

handlers.forEach(({ message, callback, isAckHandledManually }) => {
const source$ = fromEvent(socket, message).pipe(
Expand Down
50 changes: 50 additions & 0 deletions packages/platform-socket.io/test/io-adapter.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { expect } from 'chai';
import * as sinon from 'sinon';
import { IoAdapter } from '../adapters/io-adapter';
import { of } from 'rxjs';

describe('IoAdapter', () => {
let adapter: IoAdapter;

beforeEach(() => {
adapter = new IoAdapter();
});

describe('bindMessageHandlers', () => {
it('should register only one disconnect listener regardless of call count', () => {
const addListenerSpy = sinon.spy();
const fakeSocket = {
on: addListenerSpy,
off: sinon.stub(),
addListener: addListenerSpy,
removeListener: sinon.stub(),
} as any;

const handler = {
message: 'test-event',
methodName: 'handleTestEvent',
callback: sinon.stub().returns({ data: 'response' }),
isAckHandledManually: false,
};

const transform = (data: any) => of(data);

// Call bindMessageHandlers twice on the same socket
// (simulates two gateways sharing the same socket)
adapter.bindMessageHandlers(fakeSocket, [handler], transform);
adapter.bindMessageHandlers(fakeSocket, [handler], transform);

const disconnectCalls = addListenerSpy
.getCalls()
.filter(call => call.args[0] === 'disconnect');

expect(disconnectCalls).to.have.lengthOf(1);

// message handlers should still be registered per call
const messageCalls = addListenerSpy
.getCalls()
.filter(call => call.args[0] === 'test-event');
expect(messageCalls).to.have.lengthOf(2);
});
});
});
3 changes: 3 additions & 0 deletions packages/platform-socket.io/test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../../../tsconfig.spec.json"
}