@einlogic/mcp-fitbit 2.0.0 → 2.2.0

package/README.md

@@ -23,8 +23,7 @@ the Google Health API and returns its raw JSON.
 ## ⚠️ Breaking changes from the Fitbit version
 
 - You must create a **Google Cloud** OAuth client (see below) and re-authorize. Old Fitbit tokens cannot be reused.
-- Credentials are now `GOOGLE_HEALTH_CLIENT_ID` / `GOOGLE_HEALTH_CLIENT_SECRET` (the old `FITBIT_*` names still work as a fallback).
-- The token file is now `.google-health-token.json` (the old `.fitbit-token.json` is ignored and can be deleted).
+- Credentials are now `GOOGLE_HEALTH_CLIENT_ID` / `GOOGLE_HEALTH_CLIENT_SECRET`.- The token file is now `.google-health-token.json` (the old `.fitbit-token.json` is ignored and can be deleted).
 - Responses are the Google Health API's JSON, not Fitbit's. Fitbit-style `period` (`1d`, `7d`, ...) parameters are gone: tools take explicit start/end times, as the API does.
 - `get_activity_goals` was removed: the Google Health API has no goals endpoint.
 - New tools: `get_identity`, `get_settings`, `list_paired_devices`, `list_data_points`, `reconcile_data_points`.
@@ -131,6 +130,7 @@ List tools accept `pageSize` and `pageToken` (use `nextPageToken` from the respo
 | `get_identity` | `users/me/identity` | none |
 | `get_settings` | `users/me/settings` | none |
 | `list_paired_devices` | `users/me/pairedDevices` | none |
+| `reauthenticate` | not an API call: deletes the local tokens (memory + `.google-health-token.json`) and opens a new Google sign-in; new tokens are saved on approval, no restart needed. Cancels a pending sign-in. Confirm with `get_identity` | none |
 | `list_data_points` | any of the 38 data types | `dataType`, optional raw `filter` |
 | `reconcile_data_points` | `dataPoints:reconcile` for any data type | `dataType`, optional `filter`, `dataSourceFamily` |
 

package/build/auth-tools.js

@@ -0,0 +1,31 @@
+import { registerTool, createSuccessResponse, createErrorResponse, } from './utils.js';
+/**
+ * Registers the re-authorization tool.
+ * @param server The McpServer instance.
+ * @param reauthenticate Clears the local tokens and starts a new OAuth flow.
+ */
+export function registerAuthTools(server, reauthenticate) {
+    registerTool(server, {
+        name: 'reauthenticate',
+        description: "Clear this MCP server's locally stored Google Health tokens (memory and .google-health-token.json) and start a new Google sign-in. A browser window opens for consent; once approved, new tokens are saved and the other tools work again without restarting the server. Use when the token has expired (testing-mode refresh tokens last 7 days), was revoked, or the wrong Google account is connected. Cancels any sign-in that is still pending. Verify afterwards with get_identity.",
+        parametersSchema: {},
+        handler: async () => {
+            try {
+                const { tokenFileCleared, authUrl } = await reauthenticate();
+                if (!authUrl) {
+                    return createErrorResponse('Local tokens were cleared, but the authorization flow could not start. Check GOOGLE_HEALTH_CLIENT_ID / GOOGLE_HEALTH_CLIENT_SECRET and that the OAuth callback port is free, then call reauthenticate again.');
+                }
+                return createSuccessResponse({
+                    status: 'authorization_started',
+                    tokenFileCleared,
+                    authUrl,
+                    next: `Approve access in the browser window that opened (or open ${authUrl} manually). Tools will fail until you finish; then call get_identity to confirm.`,
+                });
+            }
+            catch (error) {
+                console.error('Re-authentication failed:', error);
+                return createErrorResponse(`Re-authentication failed: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        },
+    });
+}

package/build/auth.js

@@ -280,6 +280,55 @@ export function startAuthorizationFlow() {
         oauthServer = null;
     });
 }
+/**
+ * Stops a pending authorization callback server (if any) and waits until its
+ * port is free, so a new flow can bind to it.
+ */
+async function stopAuthorizationServer() {
+    const server = oauthServer;
+    if (!server)
+        return;
+    oauthServer = null;
+    await new Promise((resolve) => {
+        server.close(() => resolve());
+        // Drop keep-alive connections (e.g. an open browser tab) so close() completes
+        server.closeAllConnections?.();
+    });
+}
+/**
+ * Forgets the current token: clears it from memory and deletes the token file.
+ * @returns true when a token file was deleted, false when there was none.
+ */
+export async function clearStoredToken() {
+    accessToken = null;
+    tokenData = null;
+    try {
+        await fs.unlink(TOKEN_FILE_PATH);
+        console.error(`Token file deleted: ${TOKEN_FILE_PATH}`);
+        return true;
+    }
+    catch (error) {
+        if (error.code === 'ENOENT')
+            return false;
+        throw error;
+    }
+}
+/**
+ * Clears the local tokens and starts a fresh authorization flow. Any flow that
+ * is still waiting for a callback is cancelled first. The new token is stored
+ * (in memory and on disk) once the user finishes consent in the browser.
+ * @returns whether a token file was removed, and the URL that starts consent
+ *          (null when the flow could not start, e.g. missing client credentials).
+ */
+export async function reauthenticate() {
+    await stopAuthorizationServer();
+    const tokenFileCleared = await clearStoredToken();
+    startAuthorizationFlow();
+    return {
+        tokenFileCleared,
+        authUrl: oauthServer ? `http://localhost:${PORT}/auth` : null,
+    };
+}
 /**
  * Retrieves the current Google Health access token.
  * Automatically checks for token expiry and refreshes if necessary.

package/build/config.js

@@ -20,16 +20,11 @@ export const GOOGLE_OAUTH_CONFIG = {
         `${SCOPE_PREFIX}.settings.readonly`,
     ].join(' '),
 };
-/**
- * Resolves OAuth client credentials from the environment.
- * GOOGLE_HEALTH_* is preferred; the legacy FITBIT_* names are accepted as a fallback.
- */
+/** Resolves the Google OAuth client credentials from GOOGLE_HEALTH_CLIENT_ID / _SECRET. */
 export function resolveClientCredentials() {
     return {
-        id: process.env.GOOGLE_HEALTH_CLIENT_ID || process.env.FITBIT_CLIENT_ID || '',
-        secret: process.env.GOOGLE_HEALTH_CLIENT_SECRET ||
-            process.env.FITBIT_CLIENT_SECRET ||
-            '',
+        id: process.env.GOOGLE_HEALTH_CLIENT_ID || '',
+        secret: process.env.GOOGLE_HEALTH_CLIENT_SECRET || '',
     };
 }
 export function resolveOutputMode() {

package/build/index.js

@@ -5,7 +5,7 @@ import dotenv from 'dotenv';
 import path from 'path';
 import { fileURLToPath } from 'url';
 // Import authentication functions
-import { initializeAuth, startAuthorizationFlow, getAccessToken, } from './auth.js';
+import { initializeAuth, startAuthorizationFlow, getAccessToken, reauthenticate, } from './auth.js';
 // Import tool registration function(s)
 import { registerWeightTool } from './weight.js';
 import { registerSleepTool } from './sleep.js';
@@ -18,6 +18,7 @@ import { registerActivityTimeSeriesTool } from './activity-timeseries.js';
 import { registerAzmTimeSeriesTool } from './azm-timeseries.js';
 import { registerHrvTools } from './hrv.js';
 import { registerAccountTools } from './account.js';
+import { registerAuthTools } from './auth-tools.js';
 import { registerDataPointTools } from './data-points.js';
 import { registerCompatTools } from './compat/tools.js';
 import { resolveClientCredentials, resolveOutputMode } from './config.js';
@@ -32,7 +33,6 @@ const envPath = path.resolve(__dirname, '..', '.env');
 dotenv.config({ path: envPath });
 // Validate required environment variables
 function validateEnvironment() {
-    // GOOGLE_HEALTH_* is preferred; legacy FITBIT_* names are accepted as a fallback
     const credentials = resolveClientCredentials();
     const requiredVars = {
         GOOGLE_HEALTH_CLIENT_ID: credentials.id,
@@ -58,7 +58,7 @@ console.error('✅ Environment variables loaded successfully');
 // Create the main MCP server instance
 const server = new McpServer({
     name: 'google-health',
-    version: '2.0.0',
+    version: '2.2.0',
     capabilities: {
         resources: {},
         tools: {}, // Tools are registered dynamically below
@@ -84,6 +84,7 @@ else {
 registerProfileTool(server, getAccessToken);
 registerActivitiesTool(server, getAccessToken);
 registerAccountTools(server, getAccessToken);
+registerAuthTools(server, reauthenticate);
 registerDataPointTools(server, getAccessToken);
 // --- Main Application Entry Point ---
 async function main() {

package/package.json

@@ -1,74 +1,74 @@
-{
-  "name": "@einlogic/mcp-fitbit",
-  "version": "2.0.0",
-  "type": "module",
-  "main": "./build/index.js",
-  "bin": {
-    "mcp-fitbit": "./build/index.js",
-    "mkoziel2000-mcp-fitbit": "./build/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/mkoziel2000/mcp-fitbit.git"
-  },
-  "homepage": "https://github.com/mkoziel2000/mcp-fitbit",
-  "bugs": {
-    "url": "https://github.com/mkoziel2000/mcp-fitbit/issues"
-  },
-  "scripts": {
-    "test": "vitest run",
-    "test:ui": "vitest --ui",
-    "test:coverage": "vitest run --coverage",
-    "build": "tsc",
-    "start": "node build/index.js",
-    "dev": "npm run build && npx @modelcontextprotocol/inspector node build/index.js",
-    "lint": "eslint src/**/*.ts --ignore-pattern src/**/*.test.ts",
-    "lint:fix": "eslint src/**/*.ts --fix",
-    "format": "prettier --write src/**/*.ts",
-    "format:check": "prettier --check src/**/*.ts",
-    "prepublishOnly": "npm run build && npm run test && npm run lint",
-    "prepack": "npm run build"
-  },
-  "keywords": [
-    "mcp",
-    "fitbit",
-    "google-health-api",
-    "mcp-server",
-    "claude",
-    "model-context-protocol",
-    "health-data",
-    "fitness-tracking",
-    "ai-assistant",
-    "typescript"
-  ],
-  "author": "mkoziel2000",
-  "license": "MIT",
-  "description": "MCP server for accessing Fitbit / Pixel Watch health and fitness data through the Google Health API. Connect AI assistants like Claude to your data for personalized health insights.",
-  "files": [
-    "build/",
-    "README.md",
-    "LICENSE"
-  ],
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.11.0",
-    "@types/express": "^5.0.1",
-    "dotenv": "^16.5.0",
-    "express": "^5.1.0",
-    "open": "^10.1.2",
-    "simple-oauth2": "^5.1.0",
-    "zod": "^3.24.3"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.27.0",
-    "@types/node": "^22.15.3",
-    "@types/simple-oauth2": "^5.0.7",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.32.1",
-    "@vitest/coverage-v8": "^3.1.4",
-    "@vitest/ui": "^3.1.4",
-    "eslint": "^9.27.0",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
-    "vitest": "^3.1.4"
-  }
-}
+{
+  "name": "@einlogic/mcp-fitbit",
+  "version": "2.2.0",
+  "type": "module",
+  "main": "./build/index.js",
+  "bin": {
+    "mcp-fitbit": "./build/index.js",
+    "mkoziel2000-mcp-fitbit": "./build/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mkoziel2000/mcp-fitbit.git"
+  },
+  "homepage": "https://github.com/mkoziel2000/mcp-fitbit",
+  "bugs": {
+    "url": "https://github.com/mkoziel2000/mcp-fitbit/issues"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest run --coverage",
+    "build": "tsc",
+    "start": "node build/index.js",
+    "dev": "npm run build && npx @modelcontextprotocol/inspector node build/index.js",
+    "lint": "eslint src/**/*.ts --ignore-pattern src/**/*.test.ts",
+    "lint:fix": "eslint src/**/*.ts --fix",
+    "format": "prettier --write src/**/*.ts",
+    "format:check": "prettier --check src/**/*.ts",
+    "prepublishOnly": "npm run build && npm run test && npm run lint",
+    "prepack": "npm run build"
+  },
+  "keywords": [
+    "mcp",
+    "fitbit",
+    "google-health-api",
+    "mcp-server",
+    "claude",
+    "model-context-protocol",
+    "health-data",
+    "fitness-tracking",
+    "ai-assistant",
+    "typescript"
+  ],
+  "author": "mkoziel2000",
+  "license": "MIT",
+  "description": "MCP server for accessing Fitbit / Pixel Watch health and fitness data through the Google Health API. Connect AI assistants like Claude to your data for personalized health insights.",
+  "files": [
+    "build/",
+    "README.md",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.11.0",
+    "@types/express": "^5.0.1",
+    "dotenv": "^16.5.0",
+    "express": "^5.1.0",
+    "open": "^10.1.2",
+    "simple-oauth2": "^5.1.0",
+    "zod": "^3.24.3"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.27.0",
+    "@types/node": "^22.15.3",
+    "@types/simple-oauth2": "^5.0.7",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.32.1",
+    "@vitest/coverage-v8": "^3.1.4",
+    "@vitest/ui": "^3.1.4",
+    "eslint": "^9.27.0",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.4"
+  }
+}