refactor: simplify API to /workouts/{index}, remove /metrics suffix

Single data endpoint at /workouts/{index} returns all metrics + GPS.
Log shows metric and GPS counts separately. Updated fetch script,
mock server, tests, and README.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: brtkwr

HealthKitExporter/HTTPServer.swift

@@ -128,16 +128,16 @@ final class HTTPServer: ObservableObject {
             return
         }
 
-        if let index = parseWorkoutSubpath(path: path, suffix: "metrics") {
-            await handleGetMetrics(connection: connection, index: index)
+        if let index = parseWorkoutIndex(path: path) {
+            await handleGetWorkout(connection: connection, index: index)
             return
         }
 
         sendResponse(connection: connection, status: 404, body: "{\"error\": \"Not found\"}")
     }
 
-    private func parseWorkoutSubpath(path: String, suffix: String) -> Int? {
-        let pattern = "^/workouts/(\\d+)/\(suffix)$"
+    private func parseWorkoutIndex(path: String) -> Int? {
+        let pattern = "^/workouts/(\\d+)$"
         guard let regex = try? NSRegularExpression(pattern: pattern),
             let match = regex.firstMatch(
                 in: path, range: NSRange(path.startIndex..., in: path)),
@@ -178,7 +178,7 @@ final class HTTPServer: ObservableObject {
     }
 
     @MainActor
-    private func handleGetMetrics(connection: NWConnection, index: Int) async {
+    private func handleGetWorkout(connection: NWConnection, index: Int) async {
         guard let manager = healthKitManager else {
             sendResponse(
                 connection: connection, status: 500,
@@ -198,13 +198,13 @@ final class HTTPServer: ObservableObject {
                 return
             }
 
-            let metrics = try await manager.fetchAllMetrics(for: workouts[index])
-            let routeCount = (metrics["route"] as? [[String: Any]])?.count ?? 0
-            let metricCount = metrics.values.compactMap { ($0 as? [[String: Any]])?.count }.reduce(0, +) - routeCount
-            log("/workouts/\(index)/metrics", status: 200, detail: "\(metricCount) metrics, \(routeCount) GPS")
-            sendJSONResponse(connection: connection, object: metrics)
+            let data = try await manager.fetchAllMetrics(for: workouts[index])
+            let routeCount = (data["route"] as? [[String: Any]])?.count ?? 0
+            let metricCount = data.values.compactMap { ($0 as? [[String: Any]])?.count }.reduce(0, +) - routeCount
+            log("/workouts/\(index)", status: 200, detail: "\(metricCount) metrics, \(routeCount) GPS")
+            sendJSONResponse(connection: connection, object: data)
         } catch {
-            log("/workouts/\(index)/metrics", status: 500, detail: error.localizedDescription)
+            log("/workouts/\(index)", status: 500, detail: error.localizedDescription)
             sendResponse(
                 connection: connection, status: 500,
                 body: "{\"error\": \"\(error.localizedDescription)\"}")

README.md

@@ -85,10 +85,10 @@ This is a [known limitation](https://discussions.apple.com/thread/253843222) of
 
 The iOS app serves JSON on port 8080:
 
-| Endpoint                        | Description                           |
-| ------------------------------- | ------------------------------------- |
-| `GET /workouts`                 | List all workouts with metadata       |
-| `GET /workouts/{index}/metrics` | All metrics + GPS route for a workout |
+| Endpoint               | Description                           |
+| ---------------------- | ------------------------------------- |
+| `GET /workouts`        | List all workouts with metadata       |
+| `GET /workouts/{index}` | All metrics + GPS route for a workout |
 
 ## Development
 

fetch_healthkit.py

@@ -53,7 +53,7 @@ def main():
 
         try:
             # Metrics response includes route data
-            data = fetch_json(f"{base}/workouts/{idx}/metrics", timeout=120)
+            data = fetch_json(f"{base}/workouts/{idx}", timeout=120)
             route = data.pop('route', [])
             workout_file = output_dir / f"{label}_{idx}.json"
             with open(workout_file, "w") as f:

mock_server.py

@@ -158,7 +158,7 @@ def do_GET(self):
             self._send_json(self.workouts or [])
             return
 
-        match = re.match(r"^/workouts/(\d+)/metrics$", self.path)
+        match = re.match(r"^/workouts/(\d+)$", self.path)
         if match:
             idx = int(match.group(1))
             if 0 <= idx < len(self.workouts or []):
@@ -210,7 +210,7 @@ def main():
     print(f"Serving {num_workouts} sample workouts")
     print("Endpoints:")
     print("  GET /workouts")
-    print("  GET /workouts/{index}/metrics")
+    print("  GET /workouts/{index}")
     print("  GET /workouts/{index}/heart_rate")
     try:
         server.serve_forever()

test_fetch_healthkit.py

@@ -114,15 +114,15 @@ def test_workouts_endpoint(self):
         self.assertIn("activity_type", data[0])
 
     def test_metrics_endpoint(self):
-        data = self._fetch("/workouts/0/metrics")
+        data = self._fetch("/workouts/0")
         self.assertIn("heart_rate", data)
         self.assertIn("route", data)
         self.assertGreater(len(data["heart_rate"]), 0)
 
     def test_metrics_endpoint_invalid_index(self):
         import urllib.error
         with self.assertRaises(urllib.error.HTTPError) as ctx:
-            self._fetch("/workouts/999/metrics")
+            self._fetch("/workouts/999")
         self.assertEqual(ctx.exception.code, 404)
 
     def test_404_for_unknown_path(self):