fix: fix ts errors

Author: alexey-yarmosh

src/lib/adopted-probes.ts

@@ -14,7 +14,6 @@ type AdoptedProbe = {
 }
 
 export class AdoptedProbes {
-	private adoptedProbesByIp: Map<AdoptedProbe['ip'], Omit<AdoptedProbe, 'ip'>> = new Map();
 	private connectedIpToUuid: Map<string, string> = new Map();
 	private connectedUuidToIp: Map<string, string> = new Map();
 
@@ -37,7 +36,6 @@ export class AdoptedProbes {
 		this.connectedUuidToIp = new Map(allSockets.map(socket => [ socket.data.probe.uuid, socket.data.probe.ipAddress ]));
 
 		const adoptedProbes = await this.sql(TABLE_NAME).select<AdoptedProbe[]>('ip', 'uuid', 'lastSyncDate');
-		this.adoptedProbesByIp = new Map(adoptedProbes.map(({ ip, uuid, lastSyncDate }) => [ ip, { uuid, lastSyncDate }]));
 		await Promise.all(adoptedProbes.map(({ ip, uuid }) => this.syncProbeIds(ip, uuid)));
 		await Promise.all(adoptedProbes.map(({ ip, lastSyncDate }) => this.updateSyncDate(ip, lastSyncDate)));
 	}
@@ -62,18 +60,18 @@ export class AdoptedProbes {
 	}
 
 	private async updateSyncDate (ip: string, lastSyncDate: string) {
-		if (this.isToday(lastSyncDate)) {
+		if (this.isToday(lastSyncDate)) { // date is already synced
 			return;
 		}
 
 		const probeIsConnected = this.connectedIpToUuid.has(ip);
 
-		if (probeIsConnected) {
+		if (probeIsConnected) { // date is old, but probe is connected, therefore updating the sync date
 			await this.updateLastSyncDate(ip);
 			return;
 		}
 
-		if (this.isMoreThan30DaysAgo(lastSyncDate)) {
+		if (this.isMoreThan30DaysAgo(lastSyncDate)) { // probe wasn't connected for >30 days, removing adoption
 			await this.deleteAdoptedProbe(ip);
 		}
 	}

test/tests/unit/adopted-probes.test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { Knex } from 'knex';
+import type { Knex } from 'knex';
 import * as sinon from 'sinon';
 import { AdoptedProbes } from '../../../src/lib/adopted-probes.js';
 

test/tests/unit/middleware/only-admin.test.ts

@@ -13,7 +13,7 @@ beforeEach(() => {
 describe('rate limit middleware', () => {
 	it('should reject requests with "isAdmin" false', async () => {
 		const ctx = { isAdmin: false } as unknown as Context;
-		const err = await onlyAdmin()(ctx, next).catch(err => err);
+		const err = await onlyAdmin()(ctx, next).catch((err: unknown) => err);
 		expect(err).to.deep.equal(createHttpError(403, 'Forbidden', { type: 'access_forbidden' }));
 		expect(next.callCount).to.equal(0);
 	});