@@ -248,17 +248,19 @@ export async function render(container, params, router) {
+${config.oidc_enabled ? html`
${t('map.gps_description')}
@@ -283,7 +285,7 @@ export async function render(container, params, router) {
const typeFilter = container.querySelector('#filter-type').value;
const filteredNodes = allNodes.filter(node => {
- if (categoryFilter === 'infra' && !node.is_infra) return false;
+ if (categoryFilter === 'infra' && !node.is_adopted) return false;
const nodeType = normalizeType(node.adv_type);
if (typeFilter && nodeType !== typeFilter) return false;
return true;
@@ -292,8 +294,8 @@ export async function render(container, params, router) {
clearMarkers();
filteredNodes.forEach(node => {
- const marker = L.marker([node.lat, node.lon], { icon: createNodeIcon(node) }).addTo(map);
- marker.bindPopup(createPopupContent(node));
+ const marker = L.marker([node.lat, node.lon], { icon: createNodeIcon(node, config.oidc_enabled) }).addTo(map);
+ marker.bindPopup(createPopupContent(node, config.oidc_enabled));
markers.push(marker);
});
@@ -327,12 +329,20 @@ export async function render(container, params, router) {
return () => map.remove();
}
- const infraNodes = allNodes.filter(n => n.is_infra);
- if (infraNodes.length > 0) {
- const bounds = L.latLngBounds(infraNodes.map(n => [n.lat, n.lon]));
- map.fitBounds(bounds, { padding: BOUNDS_PADDING });
+ if (config.oidc_enabled) {
+ const adoptedNodes = allNodes.filter(n => n.is_adopted);
+ if (adoptedNodes.length > 0) {
+ const bounds = L.latLngBounds(adoptedNodes.map(n => [n.lat, n.lon]));
+ map.fitBounds(bounds, { padding: BOUNDS_PADDING });
+ } else if (allNodes.length > 0) {
+ const anchor = getAnchorPoint(allNodes, adoptedCenter);
+ const nearbyNodes = getNodesWithinRadius(allNodes, anchor.lat, anchor.lon, MAX_BOUNDS_RADIUS_KM);
+ const nodesToFit = nearbyNodes.length > 0 ? nearbyNodes : allNodes;
+ const bounds = L.latLngBounds(nodesToFit.map(n => [n.lat, n.lon]));
+ map.fitBounds(bounds, { padding: BOUNDS_PADDING });
+ }
} else if (allNodes.length > 0) {
- const anchor = getAnchorPoint(allNodes, infraCenter);
+ const anchor = getAnchorPoint(allNodes, null);
const nearbyNodes = getNodesWithinRadius(allNodes, anchor.lat, anchor.lon, MAX_BOUNDS_RADIUS_KM);
const nodesToFit = nearbyNodes.length > 0 ? nearbyNodes : allNodes;
const bounds = L.latLngBounds(nodesToFit.map(n => [n.lat, n.lon]));
diff --git a/tests/test_api/test_metrics.py b/tests/test_api/test_metrics.py
index 59b91f8..a076ee9 100644
--- a/tests/test_api/test_metrics.py
+++ b/tests/test_api/test_metrics.py
@@ -13,7 +13,7 @@ from meshcore_hub.api.dependencies import (
get_db_session,
get_mqtt_client,
)
-from meshcore_hub.common.models import Node, NodeTag
+from meshcore_hub.common.models import Node, UserProfile, UserProfileNode
def _make_basic_auth(username: str, password: str) -> str:
@@ -58,6 +58,7 @@ class TestMetricsEndpoint:
assert "meshcore_trace_paths_total" in content
assert "meshcore_user_profiles_total" in content
assert "meshcore_user_profiles_by_role" in content
+ assert "meshcore_nodes_adopted" in content
def test_metrics_info_has_version(self, client_no_auth):
"""Test that meshcore_info includes version label."""
@@ -171,8 +172,8 @@ class TestMetricsData:
assert response.status_code == 200
assert "meshcore_trace_paths_total 1.0" in response.text
- def test_node_last_seen_timestamp_present(self, api_db_session, client_no_auth):
- """Test that node_last_seen_timestamp is present for nodes with last_seen."""
+ def test_node_last_seen_timestamp_no_adoption(self, api_db_session, client_no_auth):
+ """Test that node_last_seen_timestamp includes adopted=false for unadopted nodes."""
seen_at = datetime(2025, 6, 15, 12, 0, 0, tzinfo=timezone.utc)
node = Node(
public_key="lastseen1234lastseen1234lastseen",
@@ -187,30 +188,49 @@ class TestMetricsData:
_clear_metrics_cache()
response = client_no_auth.get("/metrics")
assert response.status_code == 200
- # Labels are sorted alphabetically by prometheus_client
assert (
"meshcore_node_last_seen_timestamp_seconds"
- '{adv_type="REPEATER",'
+ '{adopted="false",'
+ 'adv_type="REPEATER",'
'node_name="Seen Node",'
- 'public_key="lastseen1234lastseen1234lastseen",'
- 'role=""}'
+ 'public_key="lastseen1234lastseen1234lastseen"}'
) in response.text
- def test_node_last_seen_timestamp_with_role(self, api_db_session, client_no_auth):
- """Test that node_last_seen_timestamp includes role label from node tags."""
+ def test_node_last_seen_timestamp_with_adoption(
+ self, api_db_session, client_no_auth
+ ):
+ """Test that node_last_seen_timestamp includes adopted label from adoption."""
seen_at = datetime(2025, 6, 15, 12, 0, 0, tzinfo=timezone.utc)
- node = Node(
- public_key="rolenode1234rolenode1234rolenode",
- name="Infra Node",
+
+ profile = UserProfile(
+ user_id="auth0|test123",
+ name="Test Operator",
+ )
+ api_db_session.add(profile)
+ api_db_session.flush()
+
+ adopted_node = Node(
+ public_key="adopted1234adopted1234adopted12",
+ name="Adopted Node",
adv_type="REPEATER",
first_seen=seen_at,
last_seen=seen_at,
)
- api_db_session.add(node)
+ unadopted_node = Node(
+ public_key="unadopted1234unadopted1234unad",
+ name="Unadopted Node",
+ adv_type="CLIENT",
+ first_seen=seen_at,
+ last_seen=seen_at,
+ )
+ api_db_session.add_all([adopted_node, unadopted_node])
api_db_session.flush()
- tag = NodeTag(node_id=node.id, key="role", value="infra")
- api_db_session.add(tag)
+ adoption = UserProfileNode(
+ user_profile_id=profile.id,
+ node_id=adopted_node.id,
+ )
+ api_db_session.add(adoption)
api_db_session.commit()
_clear_metrics_cache()
@@ -218,10 +238,17 @@ class TestMetricsData:
assert response.status_code == 200
assert (
"meshcore_node_last_seen_timestamp_seconds"
- '{adv_type="REPEATER",'
- 'node_name="Infra Node",'
- 'public_key="rolenode1234rolenode1234rolenode",'
- 'role="infra"}'
+ '{adopted="true",'
+ 'adv_type="REPEATER",'
+ 'node_name="Adopted Node",'
+ 'public_key="adopted1234adopted1234adopted12"}'
+ ) in response.text
+ assert (
+ "meshcore_node_last_seen_timestamp_seconds"
+ '{adopted="false",'
+ 'adv_type="CLIENT",'
+ 'node_name="Unadopted Node",'
+ 'public_key="unadopted1234unadopted1234unad"}'
) in response.text
def test_node_last_seen_timestamp_skips_null(self, api_db_session, client_no_auth):
@@ -289,6 +316,36 @@ class TestMetricsData:
assert response.status_code == 200
assert "meshcore_nodes_with_location 1.0" in response.text
+ def test_nodes_adopted_metric(self, api_db_session, client_no_auth):
+ """Test that meshcore_nodes_adopted gauge reflects adopted node count."""
+ seen_at = datetime(2025, 6, 15, 12, 0, 0, tzinfo=timezone.utc)
+
+ profile = UserProfile(user_id="auth0|metric_test", name="Metric Op")
+ api_db_session.add(profile)
+ api_db_session.flush()
+
+ node1 = Node(
+ public_key="adopted_metric_0000000000000000",
+ first_seen=seen_at,
+ last_seen=seen_at,
+ )
+ node2 = Node(
+ public_key="unadopted_metric_00000000000000",
+ first_seen=seen_at,
+ last_seen=seen_at,
+ )
+ api_db_session.add_all([node1, node2])
+ api_db_session.flush()
+
+ adoption = UserProfileNode(user_profile_id=profile.id, node_id=node1.id)
+ api_db_session.add(adoption)
+ api_db_session.commit()
+
+ _clear_metrics_cache()
+ response = client_no_auth.get("/metrics")
+ assert response.status_code == 200
+ assert "meshcore_nodes_adopted 1.0" in response.text
+
class TestMetricsDisabled:
"""Tests for when metrics are disabled."""
diff --git a/tests/test_web/test_map.py b/tests/test_web/test_map.py
index 169f75c..ef828fc 100644
--- a/tests/test_web/test_map.py
+++ b/tests/test_web/test_map.py
@@ -275,13 +275,13 @@ class TestMapDataFiltering:
assert data["nodes"][0]["lon"] == -74.0060
-class TestMapDataInfrastructure:
- """Tests for infrastructure node handling in map data."""
+class TestMapDataAdoptedNodes:
+ """Tests for adopted node handling in map data."""
- def test_map_data_includes_infra_center(
+ def test_map_data_includes_adopted_center(
self, web_app: Any, mock_http_client: MockHttpClient
) -> None:
- """Test that map data includes infrastructure center when infra nodes exist."""
+ """Test that map data includes adopted center when adopted nodes exist."""
mock_http_client.set_response(
"GET",
"/api/v1/nodes",
@@ -291,10 +291,16 @@ class TestMapDataInfrastructure:
{
"id": "node-1",
"public_key": "abc123",
- "name": "Infra Node",
+ "name": "Adopted Node",
"lat": 40.0,
"lon": -74.0,
- "tags": [{"key": "role", "value": "infra"}],
+ "tags": [],
+ "adopted_by": {
+ "user_id": "user-1",
+ "name": "Operator",
+ "callsign": "W1ABC",
+ "profile_id": "profile-1",
+ },
},
{
"id": "node-2",
@@ -314,15 +320,14 @@ class TestMapDataInfrastructure:
response = client.get("/map/data")
data = response.json()
- # Should have infra_center based on infra node only
- assert data["infra_center"] is not None
- assert data["infra_center"]["lat"] == 40.0
- assert data["infra_center"]["lon"] == -74.0
+ assert data["adopted_center"] is not None
+ assert data["adopted_center"]["lat"] == 40.0
+ assert data["adopted_center"]["lon"] == -74.0
- def test_map_data_infra_center_null_when_no_infra(
+ def test_map_data_adopted_center_null_when_no_adopted(
self, web_app: Any, mock_http_client: MockHttpClient
) -> None:
- """Test that infra_center is null when no infrastructure nodes exist."""
+ """Test that adopted_center is null when no adopted nodes exist."""
mock_http_client.set_response(
"GET",
"/api/v1/nodes",
@@ -347,12 +352,12 @@ class TestMapDataInfrastructure:
response = client.get("/map/data")
data = response.json()
- assert data["infra_center"] is None
+ assert data["adopted_center"] is None
- def test_map_data_sets_is_infra_flag(
+ def test_map_data_sets_is_adopted_flag(
self, web_app: Any, mock_http_client: MockHttpClient
) -> None:
- """Test that nodes have correct is_infra flag based on role tag."""
+ """Test that nodes have correct is_adopted flag based on adoption."""
mock_http_client.set_response(
"GET",
"/api/v1/nodes",
@@ -362,10 +367,16 @@ class TestMapDataInfrastructure:
{
"id": "node-1",
"public_key": "abc123",
- "name": "Infra Node",
+ "name": "Adopted Node",
"lat": 40.0,
"lon": -74.0,
- "tags": [{"key": "role", "value": "infra"}],
+ "tags": [],
+ "adopted_by": {
+ "user_id": "user-1",
+ "name": "Operator",
+ "callsign": "W1ABC",
+ "profile_id": "profile-1",
+ },
},
{
"id": "node-2",
@@ -373,7 +384,7 @@ class TestMapDataInfrastructure:
"name": "Regular Node",
"lat": 41.0,
"lon": -75.0,
- "tags": [{"key": "role", "value": "other"}],
+ "tags": [],
},
],
"total": 2,
@@ -386,13 +397,13 @@ class TestMapDataInfrastructure:
data = response.json()
nodes_by_name = {n["name"]: n for n in data["nodes"]}
- assert nodes_by_name["Infra Node"]["is_infra"] is True
- assert nodes_by_name["Regular Node"]["is_infra"] is False
+ assert nodes_by_name["Adopted Node"]["is_adopted"] is True
+ assert nodes_by_name["Regular Node"]["is_adopted"] is False
- def test_map_data_debug_includes_infra_count(
+ def test_map_data_debug_includes_adopted_count(
self, web_app: Any, mock_http_client: MockHttpClient
) -> None:
- """Test that debug info includes infrastructure node count."""
+ """Test that debug info includes adopted node count."""
mock_http_client.set_response(
"GET",
"/api/v1/nodes",
@@ -402,10 +413,16 @@ class TestMapDataInfrastructure:
{
"id": "node-1",
"public_key": "abc123",
- "name": "Infra Node",
+ "name": "Adopted Node",
"lat": 40.0,
"lon": -74.0,
- "tags": [{"key": "role", "value": "infra"}],
+ "tags": [],
+ "adopted_by": {
+ "user_id": "user-1",
+ "name": "Operator",
+ "callsign": "W1ABC",
+ "profile_id": "profile-1",
+ },
},
],
"total": 1,
@@ -417,7 +434,7 @@ class TestMapDataInfrastructure:
response = client.get("/map/data")
data = response.json()
- assert data["debug"]["infra_nodes"] == 1
+ assert data["debug"]["adopted_nodes"] == 1
class TestMapDataAdoptedByFilter: