@etweisberg/garmin-connect-mcp 0.1.13 → 0.1.14

package/dist/test.js

@@ -1,207 +1,356 @@
 /**
  * Integration test suite for garmin-connect-mcp.
+ * Tests the actual MCP tool handlers (not just raw API endpoints)
+ * to catch bugs in zip extraction, file I/O, date defaults, etc.
+ *
  * Requires a valid session at ~/.garmin-connect-mcp/session.json.
  * Run: npm test
  */
-import { GarminClient } from "./garmin-client.js";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { registerTools } from "./tools.js";
+import { existsSync, rmSync } from "node:fs";
+import { getSharedClient } from "./garmin-client.js";
+const TEST_FIT_DIR = "/tmp/garmin-mcp-test-fit";
+async function callTool(server, name, args = {}) {
+    // Access internal tool handler via the server's registered tools
+    const result = (await server._registeredTools[name].handler({ ...args }, { signal: new AbortController().signal }));
+    return result;
+}
+function getToolText(result) {
+    return result.content[0]?.text ?? "";
+}
+function getToolJson(result) {
+    return JSON.parse(getToolText(result));
+}
 const tests = [
-    // ── Session / Profile ──────────────────────────────────────────────
+    // ── Session ────────────────────────────────────────────────────────
     {
         name: "check-session",
-        run: ({ client }) => client.get("userprofile-service/userprofile/user-settings/"),
+        run: async (server) => {
+            const result = await callTool(server, "check-session");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (data.status !== "ok")
+                throw new Error("status not ok");
+        },
     },
     {
         name: "get-user-profile",
-        run: ({ client }) => client.get("userprofile-service/userprofile/user-settings/"),
+        run: async (server) => {
+            const result = await callTool(server, "get-user-profile");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!data.id)
+                throw new Error("no user id");
+        },
     },
     // ── Activities ─────────────────────────────────────────────────────
     {
         name: "list-activities",
-        run: ({ client }) => client.get("activitylist-service/activities/search/activities", {
-            limit: 2,
-            start: 0,
-        }),
+        run: async (server) => {
+            const result = await callTool(server, "list-activities", {
+                limit: 2,
+                start: 0,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!Array.isArray(data) || data.length === 0)
+                throw new Error("no activities");
+        },
     },
     {
         name: "get-activity",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity", {
+                activityId: activityId,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!data.summaryDTO)
+                throw new Error("no summaryDTO");
+        },
     },
     {
         name: "get-activity-details",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}/details`, {
-            maxChartSize: 100,
-            maxPolylineSize: 0,
-            maxHeatMapSize: 100,
-        }),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity-details", {
+                activityId: activityId,
+                maxChartSize: 10000,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!data.metricDescriptors)
+                throw new Error("no metricDescriptors");
+        },
     },
     {
         name: "get-activity-splits",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}/splits`),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity-splits", {
+                activityId: activityId,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!data.lapDTOs)
+                throw new Error("no lapDTOs");
+        },
     },
     {
         name: "get-activity-hr-zones",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}/hrTimeInZones`),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity-hr-zones", {
+                activityId: activityId,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!Array.isArray(data) || data.length !== 5)
+                throw new Error(`expected 5 zones, got ${data.length}`);
+        },
     },
     {
         name: "get-activity-polyline",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}/polyline/full-resolution/`),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity-polyline", {
+                activityId: activityId,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-activity-weather",
-        run: ({ client, activityId }) => client.get(`activity-service/activity/${activityId}/weather`),
+        run: async (server) => {
+            const result = await callTool(server, "get-activity-weather", {
+                activityId: activityId,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
-        name: "download-fit",
-        run: ({ client, activityId }) => client.getBytes(`download-service/files/activity/${activityId}`),
+        name: "download-fit (zip extraction + file write)",
+        run: async (server) => {
+            // Clean up from previous runs
+            if (existsSync(TEST_FIT_DIR))
+                rmSync(TEST_FIT_DIR, { recursive: true });
+            const result = await callTool(server, "download-fit", {
+                activityId: activityId,
+                outputDir: TEST_FIT_DIR,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const text = getToolText(result);
+            if (!text.includes("Downloaded FIT file"))
+                throw new Error(`unexpected response: ${text}`);
+            // Verify file actually exists on disk
+            const expectedPath = `${TEST_FIT_DIR}/${activityId}.fit`;
+            if (!existsSync(expectedPath))
+                throw new Error(`FIT file not found at ${expectedPath}`);
+        },
     },
-    // ── Daily Health ───────────────────────────────────────────────────
+    // ── Daily Health (test date defaults) ──────────────────────────────
     {
-        name: "get-daily-summary",
-        run: ({ client, displayName, today }) => client.get(`usersummary-service/usersummary/daily/${displayName}`, {
-            calendarDate: today,
-        }),
+        name: "get-daily-summary (default date)",
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-summary");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!data.calendarDate)
+                throw new Error("no calendarDate");
+        },
     },
     {
         name: "get-daily-heart-rate",
-        run: ({ client, today }) => client.get("wellness-service/wellness/dailyHeartRate", { date: today }),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-heart-rate");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-daily-stress",
-        run: ({ client, today }) => client.get(`wellness-service/wellness/dailyStress/${today}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-stress");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-daily-summary-chart",
-        run: ({ client, today }) => client.get("wellness-service/wellness/dailySummaryChart/", {
-            date: today,
-        }),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-summary-chart");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-daily-intensity-minutes",
-        run: ({ client, today }) => client.get(`wellness-service/wellness/daily/im/${today}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-intensity-minutes");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-daily-movement",
-        run: ({ client, today }) => client.get("wellness-service/wellness/dailyMovement", {
-            calendarDate: today,
-        }),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-movement");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-daily-respiration",
-        run: ({ client, today }) => client.get(`wellness-service/wellness/daily/respiration/${today}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-daily-respiration");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
-    // ── Sleep, Body Battery, HRV ───────────────────────────────────────
+    // ── Sleep / Body Battery / HRV ─────────────────────────────────────
     {
         name: "get-sleep",
-        run: ({ client, today }) => client.get("sleep-service/sleep/dailySleepData", {
-            date: today,
-            nonSleepBufferMinutes: 60,
-        }),
+        run: async (server) => {
+            const result = await callTool(server, "get-sleep");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-body-battery",
-        run: ({ client }) => client.get("wellness-service/wellness/bodyBattery/messagingToday"),
+        run: async (server) => {
+            const result = await callTool(server, "get-body-battery");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-hrv",
-        run: ({ client, today }) => client.get(`hrv-service/hrv/${today}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-hrv");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            // noData is acceptable
+        },
     },
-    // ── Weight ─────────────────────────────────────────────────────────
+    // ── Weight / Records / Fitness ─────────────────────────────────────
     {
         name: "get-weight",
-        run: ({ client, today, thirtyDaysAgo }) => client.get(`weight-service/weight/range/${thirtyDaysAgo}/${today}`, {
-            includeAll: "true",
-        }),
+        run: async (server) => {
+            const thirtyDaysAgo = new Date(Date.now() - 30 * 86400000)
+                .toISOString()
+                .slice(0, 10);
+            const today = new Date().toISOString().slice(0, 10);
+            const result = await callTool(server, "get-weight", {
+                startDate: thirtyDaysAgo,
+                endDate: today,
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
-    // ── Personal Records ───────────────────────────────────────────────
     {
-        name: "get-personal-records",
-        run: ({ client, displayName }) => client.get(`personalrecord-service/personalrecord/prs/${displayName}`, {
-            includeHistory: "true",
-        }),
+        name: "get-personal-records (displayName resolution)",
+        run: async (server) => {
+            const result = await callTool(server, "get-personal-records");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!Array.isArray(data))
+                throw new Error("expected array");
+        },
     },
-    // ── Fitness Stats / Reports ────────────────────────────────────────
     {
         name: "get-fitness-stats",
-        run: ({ client, today, thirtyDaysAgo }) => client.get("fitnessstats-service/activity", {
-            aggregation: "daily",
-            startDate: thirtyDaysAgo,
-            endDate: today,
-            groupByActivityType: "true",
-            standardizedUnits: "true",
-            groupByParentActivityType: "false",
-            userFirstDay: "sunday",
-            metric: "duration",
-        }),
+        run: async (server) => {
+            const thirtyDaysAgo = new Date(Date.now() - 30 * 86400000)
+                .toISOString()
+                .slice(0, 10);
+            const today = new Date().toISOString().slice(0, 10);
+            const result = await callTool(server, "get-fitness-stats", {
+                startDate: thirtyDaysAgo,
+                endDate: today,
+                aggregation: "daily",
+                metric: "duration",
+            });
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-vo2max",
-        run: ({ client, today }) => client.get(`metrics-service/metrics/maxmet/latest/${today}`),
+        run: async (server) => {
+            const result = await callTool(server, "get-vo2max");
+            if (result.isError)
+                throw new Error(getToolText(result));
+        },
     },
     {
         name: "get-hr-zones-config",
-        run: ({ client }) => client.get("biometric-service/heartRateZones/"),
+        run: async (server) => {
+            const result = await callTool(server, "get-hr-zones-config");
+            if (result.isError)
+                throw new Error(getToolText(result));
+            const data = getToolJson(result);
+            if (!Array.isArray(data) || data.length === 0)
+                throw new Error("no zones returned");
+        },
     },
 ];
+// Resolved during bootstrap
+let activityId = "";
 async function main() {
-    console.log("garmin-connect-mcp integration tests\n");
-    const client = new GarminClient();
-    const today = new Date().toISOString().slice(0, 10);
-    const thirtyDaysAgo = new Date(Date.now() - 30 * 86400000)
-        .toISOString()
-        .slice(0, 10);
-    // Bootstrap: resolve displayName
-    console.log("Bootstrapping...");
-    const settings = (await client.get("userprofile-service/userprofile/settings"));
-    const displayName = settings.displayName;
-    if (!displayName) {
-        console.error("FATAL: Could not resolve displayName from settings");
-        console.error("Response:", JSON.stringify(settings).slice(0, 500));
-        await client.close();
-        process.exit(1);
-    }
-    console.log(`  displayName: ${displayName}`);
+    console.log("garmin-connect-mcp integration tests (tool-level)\n");
+    // Set up a real MCP server with all tools registered
+    const server = new McpServer({
+        name: "garmin-connect-mcp-test",
+        version: "0.0.0",
+    });
+    registerTools(server);
     // Bootstrap: get a recent activityId
-    const activities = (await client.get("activitylist-service/activities/search/activities", { limit: 1, start: 0 }));
-    const activityId = String(activities?.[0]?.activityId ?? "");
+    console.log("Bootstrapping...");
+    const listResult = await callTool(server, "list-activities", {
+        limit: 1,
+        start: 0,
+    });
+    const activities = getToolJson(listResult);
+    activityId = String(activities[0]?.activityId ?? "");
     if (!activityId) {
         console.error("FATAL: No activities found");
-        await client.close();
         process.exit(1);
     }
-    console.log(`  activityId: ${activityId}`);
-    console.log(`  date range: ${thirtyDaysAgo} → ${today}\n`);
-    const ctx = {
-        client,
-        displayName,
-        activityId,
-        today,
-        thirtyDaysAgo,
-    };
+    console.log(`  activityId: ${activityId}\n`);
     let passed = 0;
     let failed = 0;
     for (const test of tests) {
         const start = Date.now();
         try {
-            const result = await test.run(ctx);
-            if (result === undefined) {
-                throw new Error("undefined response");
-            }
+            await test.run(server);
             const ms = Date.now() - start;
-            const noData = result && typeof result === "object" && "noData" in result;
-            console.log(`  PASS  ${test.name} (${ms}ms)${noData ? " [no data for date]" : ""}`);
+            console.log(`  PASS  ${test.name} (${ms}ms)`);
             passed++;
         }
         catch (e) {
             const ms = Date.now() - start;
             const msg = e instanceof Error ? e.message : String(e);
-            // Truncate long error messages
             const short = msg.length > 120 ? msg.slice(0, 120) + "..." : msg;
             console.log(`  FAIL  ${test.name} (${ms}ms) — ${short}`);
             failed++;
         }
     }
+    // Cleanup
+    if (existsSync(TEST_FIT_DIR))
+        rmSync(TEST_FIT_DIR, { recursive: true });
     console.log(`\nResults: ${passed} passed, ${failed} failed, ${passed + failed} total`);
-    await client.close();
+    await getSharedClient().close();
     process.exit(failed > 0 ? 1 : 0);
 }
 main().catch((err) => {

package/dist/tools.js

@@ -396,43 +396,59 @@ Present results as a markdown table: | Tool | Status | Notes |
 Count total passed vs failed at the end.`);
     });
 }
+import { inflateRawSync } from "node:zlib";
 /**
- * Minimal zip extraction — finds and extracts the first .fit file from a zip buffer.
- * Avoids needing a zip library dependency.
+ * Minimal zip extraction — finds the first .fit file using the central
+ * directory (which always has correct sizes, unlike local headers that
+ * may use data descriptors with size=0).
  */
 function extractFitFromZip(buf, activityId) {
-    // ZIP local file header signature: PK\x03\x04
-    let offset = 0;
-    while (offset < buf.length - 30) {
-        if (buf[offset] === 0x50 &&
-            buf[offset + 1] === 0x4b &&
-            buf[offset + 2] === 0x03 &&
-            buf[offset + 3] === 0x04) {
-            const compressionMethod = buf.readUInt16LE(offset + 8);
-            const compressedSize = buf.readUInt32LE(offset + 18);
-            const uncompressedSize = buf.readUInt32LE(offset + 22);
-            const nameLength = buf.readUInt16LE(offset + 26);
-            const extraLength = buf.readUInt16LE(offset + 28);
-            const name = buf.toString("utf-8", offset + 30, offset + 30 + nameLength);
-            const dataStart = offset + 30 + nameLength + extraLength;
-            if (name.endsWith(".fit") && compressionMethod === 0) {
-                // Stored (no compression) — just slice the data
+    // Find End of Central Directory (EOCD): PK\x05\x06
+    let eocdOffset = buf.length - 22;
+    while (eocdOffset >= 0) {
+        if (buf[eocdOffset] === 0x50 &&
+            buf[eocdOffset + 1] === 0x4b &&
+            buf[eocdOffset + 2] === 0x05 &&
+            buf[eocdOffset + 3] === 0x06)
+            break;
+        eocdOffset--;
+    }
+    if (eocdOffset < 0)
+        return null;
+    const cdOffset = buf.readUInt32LE(eocdOffset + 16);
+    const cdEntries = buf.readUInt16LE(eocdOffset + 10);
+    // Walk central directory entries: PK\x01\x02
+    let pos = cdOffset;
+    for (let i = 0; i < cdEntries; i++) {
+        if (buf[pos] !== 0x50 ||
+            buf[pos + 1] !== 0x4b ||
+            buf[pos + 2] !== 0x01 ||
+            buf[pos + 3] !== 0x02)
+            break;
+        const method = buf.readUInt16LE(pos + 10);
+        const compressedSize = buf.readUInt32LE(pos + 20);
+        const uncompressedSize = buf.readUInt32LE(pos + 24);
+        const nameLength = buf.readUInt16LE(pos + 28);
+        const extraLength = buf.readUInt16LE(pos + 30);
+        const commentLength = buf.readUInt16LE(pos + 32);
+        const localHeaderOffset = buf.readUInt32LE(pos + 42);
+        const name = buf.toString("utf-8", pos + 46, pos + 46 + nameLength);
+        if (name.endsWith(".fit")) {
+            // Read local header to find data start
+            const localNameLen = buf.readUInt16LE(localHeaderOffset + 26);
+            const localExtraLen = buf.readUInt16LE(localHeaderOffset + 28);
+            const dataStart = localHeaderOffset + 30 + localNameLen + localExtraLen;
+            if (method === 0) {
                 const data = buf.subarray(dataStart, dataStart + uncompressedSize);
                 return { name: `${activityId}.fit`, data: Buffer.from(data) };
             }
-            if (name.endsWith(".fit") && compressionMethod === 8) {
-                // Deflate compressed — use Node's zlib
+            if (method === 8) {
                 const compressed = buf.subarray(dataStart, dataStart + compressedSize);
                 const data = inflateRawSync(compressed);
                 return { name: `${activityId}.fit`, data };
             }
-            // Skip to next file header
-            offset = dataStart + compressedSize;
-        }
-        else {
-            offset++;
         }
+        pos += 46 + nameLength + extraLength + commentLength;
     }
     return null;
 }
-import { inflateRawSync } from "node:zlib";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etweisberg/garmin-connect-mcp",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "MCP server for Garmin Connect — access activities, metrics, and FIT files via Claude Code",
   "type": "module",
   "bin": {