test: add more adopted sockets tests

src/lib/server.ts

@@ -8,6 +8,7 @@ import { populateMemList as populateIpWhiteList } from './geoip/whitelist.js';
 import { populateCitiesList } from './geoip/city-approximation.js';
 import { adoptedProbes } from './adopted-probes.js';
 import { reconnectProbes } from './ws/helper/reconnect-probes.js';
+import { getWsServer } from './ws/server.js';
 
 export const createServer = async (): Promise<Server> => {
 	await initRedis();
@@ -28,7 +29,6 @@ export const createServer = async (): Promise<Server> => {
 
 	reconnectProbes();
 
-	const { getWsServer } = await import('./ws/server.js');
 	const { getHttpServer } = await import('./http/server.js');
 
 	const httpServer = getHttpServer();

test/tests/unit/probe/router.test.ts

@@ -819,5 +819,26 @@ describe('probe router', () => {
 
 			expect(probes.length).to.equal(0);
 		});
+
+		it('should return match for user tag', async () => {
+			const socket = await buildSocket(String(Date.now()), location);
+			socket.data.probe.tags = [
+				...socket.data.probe.tags,
+				{ type: 'user', value: 'u-jimaek-dashboardtag' },
+			];
+
+			const sockets: DeepPartial<RemoteProbeSocket[]> = [ socket ];
+
+			const locations: Location[] = [
+				{ tags: [ 'u-jimaek-dashboardtag' ] },
+			];
+
+			fetchSocketsMock.resolves(sockets as never);
+
+			const probes = await router.findMatchingProbes(locations, 100);
+
+			expect(probes.length).to.equal(1);
+			expect(probes[0]!.location.country).to.equal('GB');
+		});
 	});
 });

test/tests/unit/ws/fetch-sockets.test.ts

@@ -13,14 +13,12 @@ const getUpdatedTags = sinon.stub();
 describe('fetchSockets', () => {
 	let fetchSockets: (options?: LRUOptions) => Promise<RemoteProbeSocket[]>;
 
-	before(async () => {
+	beforeEach(async () => {
+		sinon.resetHistory();
+		td.reset();
 		await td.replaceEsm('../../../../src/lib/ws/server.ts', { fetchRawSockets });
 		await td.replaceEsm('../../../../src/lib/adopted-probes.ts', { adoptedProbes: { getByIp, getUpdatedLocation, getUpdatedTags } });
-	});
-
-	beforeEach(async () => {
 		({ fetchSockets } = await import('../../../../src/lib/ws/fetch-sockets.js'));
-		sinon.resetHistory();
 	});
 
 	after(() => {
@@ -162,6 +160,17 @@ describe('fetchSockets', () => {
 		]);
 	});
 
+	it('should return same socket object if there is no adoption data or it is not edited', async () => {
+		const socket1 = { id: '1', data: { probe: { ipAddress: '' } } };
+		const socket2 = { id: '2', data: { probe: { ipAddress: '' } } };
+		fetchRawSockets.resolves([ socket1, socket2 ]);
+		getByIp.onCall(0).returns(undefined);
+		getByIp.onCall(1).returns({ isCustomCity: false, tags: [] });
+		const result = await fetchSockets();
+		expect(result[0]).to.equal(socket1);
+		expect(result[1]).to.equal(socket2);
+	});
+
 	it('multiple calls to fetchSockets should result in one socket.io fetchSockets call', async () => {
 		expect(fetchRawSockets.callCount).to.equal(0);