refactor: rename fetchsockets

src/lib/adopted-probes.ts

@@ -4,7 +4,7 @@ import _ from 'lodash';
 
 import { scopedLogger } from './logger.js';
 import { client } from './sql/client.js';
-import { fetchConnectedSockets } from './ws/server.js';
+import { fetchRawSockets } from './ws/server.js';
 import type { Probe } from '../probe/types.js';
 
 const logger = scopedLogger('adopted-probes');
@@ -68,7 +68,7 @@ export class AdoptedProbes {
 
 	constructor (
 		private readonly sql: Knex,
-		private readonly fetchWsSockets: typeof fetchConnectedSockets,
+		private readonly fetchSockets: typeof fetchRawSockets,
 	) {}
 
 	getAdoptedIpToProbe () {
@@ -84,7 +84,7 @@ export class AdoptedProbes {
 	}
 
 	async syncDashboardData () {
-		const allSockets = await this.fetchWsSockets();
+		const allSockets = await this.fetchSockets();
 		this.connectedIpToProbe = new Map(allSockets.map(socket => [ socket.data.probe.ipAddress, socket.data.probe ]));
 		this.connectedUuidToIp = new Map(allSockets.map(socket => [ socket.data.probe.uuid, socket.data.probe.ipAddress ]));
 
@@ -196,4 +196,4 @@ export class AdoptedProbes {
 	}
 }
 
-export const adoptedProbes = new AdoptedProbes(client, fetchConnectedSockets);
+export const adoptedProbes = new AdoptedProbes(client, fetchRawSockets);

src/lib/ws/fetch-sockets.ts

@@ -1,13 +1,13 @@
 import config from 'config';
 import { throttle, LRUOptions } from './helper/throttle.js';
-import { fetchConnectedSockets, RemoteProbeSocket } from './server.js';
+import { fetchRawSockets, RemoteProbeSocket } from './server.js';
 import { adoptedProbes } from '../adopted-probes.js';
 
 const throttledFetchSockets = throttle<RemoteProbeSocket[]>(
 	async () => {
-		const connected = await fetchConnectedSockets();
+		const connected = await fetchRawSockets();
 		const adopted = adoptedProbes.getAdoptedIpToProbe();
-		console.log('adopted', adopted.size);
+		console.log('adopted', adopted);
 		return connected;
 	},
 	config.get<number>('ws.fetchSocketsCacheTTL'),

src/lib/ws/server.ts

@@ -43,7 +43,7 @@ export const getWsServer = (): WsServer => {
 	return io;
 };
 
-export const fetchConnectedSockets = async () => {
+export const fetchRawSockets = async () => {
 	if (!io) {
 		throw new Error('WS server not initialized yet');
 	}

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

@@ -2,14 +2,14 @@ import * as sinon from 'sinon';
 import * as td from 'testdouble';
 import { expect } from 'chai';
 
-const fetchConnectedSockets = sinon.stub();
+const fetchRawSockets = sinon.stub();
 
 describe('fetchSockets', () => {
 	let fetchSockets;
 
 	before(async () => {
 		await td.replaceEsm('../../../../src/lib/ws/server.ts', {
-			fetchConnectedSockets,
+			fetchRawSockets,
 		});
 
 		({ fetchSockets } = await import('../../../../src/lib/ws/fetch-sockets.js'));
@@ -20,14 +20,14 @@ describe('fetchSockets', () => {
 	});
 
 	it('multiple calls to fetchSockets should result in one socket.io fetchSockets call', async () => {
-		expect(fetchConnectedSockets.callCount).to.equal(0);
+		expect(fetchRawSockets.callCount).to.equal(0);
 
 		await Promise.all([
 			fetchSockets(),
 			fetchSockets(),
 			fetchSockets(),
 		]);
 
-		expect(fetchConnectedSockets.callCount).to.equal(1);
+		expect(fetchRawSockets.callCount).to.equal(1);
 	});
 });

test/tests/unit/ws/reconnect-probes.test.ts

@@ -5,7 +5,7 @@ import { expect } from 'chai';
 const disconnect = sinon.stub();
 const fetchSockets = sinon.stub().resolves([{ disconnect }, {	disconnect }]);
 
-describe('fetchSockets', () => {
+describe('reconnectProbes', () => {
 	let sandbox: sinon.SinonSandbox;
 	let reconnectProbes;
 
@@ -29,7 +29,7 @@ describe('fetchSockets', () => {
 		td.reset();
 	});
 
-	it('multiple calls to fetchSockets should result in one socket.io fetchSockets call', async () => {
+	it('should disconnect every probe in configured time', async () => {
 		reconnectProbes();
 
 		expect(fetchSockets.callCount).to.equal(0);