feat: show new admin vars to admin

jsdelivr · Nov 23, 2023 · 395605f · 395605f
1 parent cc03c96
commit 395605f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/probe/builder.ts b/src/probe/builder.ts
@@ -27,11 +27,23 @@ export const buildProbe = async (socket: Socket): Promise<Probe> => {
 		geoipClient = createGeoipClient();
 	}
 
-	const version = String(socket.handshake.query['version']);
+	const version = socket.handshake.query['version'] as string;
 
-	const nodeVersion = String(socket.handshake.query['nodeVersion']);
+	const nodeVersion = (socket.handshake.query['nodeVersion'] as string | undefined) ?? null;
 
-	const uuid = String(socket.handshake.query['uuid']);
+	const uuid = (socket.handshake.query['uuid'] as string | undefined) ?? null;
+
+	let isHardware: boolean | null;
+
+	if (!socket.handshake.query['isHardware']) {
+		isHardware = null;
+	} else if (socket.handshake.query['isHardware'] === 'true' || socket.handshake.query['isHardware'] === '1') {
+		isHardware = true;
+	} else {
+		isHardware = false;
+	}
+
+	const hardwareDevice = (socket.handshake.query['hardwareDevice'] as string | undefined) ?? null;
 
 	const host = process.env['HOSTNAME'] ?? '';
 
@@ -71,6 +83,8 @@ export const buildProbe = async (socket: Socket): Promise<Probe> => {
 		version,
 		nodeVersion,
 		uuid,
+		isHardware,
+		hardwareDevice,
 		ipAddress: ip,
 		host,
 		location,

diff --git a/src/probe/route/get-probes.ts b/src/probe/route/get-probes.ts
@@ -16,6 +16,7 @@ const handle = async (ctx: ParameterizedContext<DefaultState, DefaultContext & R
 		version: socket.data.probe.version,
 		nodeVersion: isAdmin ? socket.data.probe.nodeVersion : undefined,
 		uuid: isAdmin ? socket.data.probe.uuid : undefined,
+		ipAddress: isAdmin ? socket.data.probe.ipAddress : undefined,
 		location: {
 			continent: socket.data.probe.location.continent,
 			region: socket.data.probe.location.region,
@@ -28,8 +29,9 @@ const handle = async (ctx: ParameterizedContext<DefaultState, DefaultContext & R
 			network: socket.data.probe.location.network,
 		},
 		tags: socket.data.probe.tags.map(({ value }) => value),
+		...(isAdmin && socket.data.probe.isHardware ? { isHardware: socket.data.probe.isHardware } : null),
+		...(isAdmin && socket.data.probe.hardwareDevice ? { hardwareDevice: socket.data.probe.hardwareDevice } : null),
 		resolvers: socket.data.probe.resolvers,
-		ipAddress: isAdmin ? socket.data.probe.ipAddress : undefined,
 		host: isAdmin ? socket.data.probe.host : undefined,
 		stats: isAdmin ? socket.data.probe.stats : undefined,
 	}));