feat: move method

jsdelivr · Apr 9, 2024 · 7af1a5e · 7af1a5e
1 parent 0713f5d
commit 7af1a5e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/src/lib/adopted-probes.ts b/src/lib/adopted-probes.ts
@@ -5,6 +5,7 @@ import { scopedLogger } from './logger.js';
 import type { fetchProbesWithAdminData as serverFetchProbesWithAdminData } from './ws/server.js';
 import type { Probe } from '../probe/types.js';
 import { normalizeFromPublicName } from './geoip/utils.js';
+import { getIndex } from '../probe/builder.js';
 
 const logger = scopedLogger('adopted-probes');
 
@@ -125,6 +126,34 @@ export class AdoptedProbes {
 		];
 	}
 
+	getUpdatedProbes (probes: Probe[]) {
+		return probes.map((probe) => {
+			const adopted = this.getByIp(probe.ipAddress);
+
+			if (!adopted) {
+				return probe;
+			}
+
+			const isCustomCity = adopted.isCustomCity;
+			const hasUserTags = adopted.tags && adopted.tags.length;
+
+			if (!isCustomCity && !hasUserTags) {
+				return probe;
+			}
+
+			const newLocation = this.getUpdatedLocation(probe);
+
+			const newTags = this.getUpdatedTags(probe);
+
+			return {
+				...probe,
+				location: newLocation,
+				tags: newTags,
+				index: getIndex(newLocation, newTags),
+			};
+		});
+	}
+
 	scheduleSync () {
 		setTimeout(() => {
 			this.syncDashboardData()

diff --git a/src/lib/probe-override.ts b/src/lib/probe-override.ts
@@ -1,4 +1,3 @@
-import { getIndex } from '../probe/builder.js';
 import type { Probe } from '../probe/types.js';
 import type { AdoptedProbes } from './adopted-probes.js';
 import type { AdminData } from './admin-data.js';
@@ -32,30 +31,6 @@ export class ProbeOverride {
 	}
 
 	addAdoptedData (probes: Probe[]) {
-		return probes.map((probe) => {
-			const adopted = this.adoptedProbes.getByIp(probe.ipAddress);
-
-			if (!adopted) {
-				return probe;
-			}
-
-			const isCustomCity = adopted.isCustomCity;
-			const hasUserTags = adopted.tags && adopted.tags.length;
-
-			if (!isCustomCity && !hasUserTags) {
-				return probe;
-			}
-
-			const newLocation = this.adoptedProbes.getUpdatedLocation(probe);
-
-			const newTags = this.adoptedProbes.getUpdatedTags(probe);
-
-			return {
-				...probe,
-				location: newLocation,
-				tags: newTags,
-				index: getIndex(newLocation, newTags),
-			};
-		});
+		return this.adoptedProbes.getUpdatedProbes(probes);
 	}
 }