Feat: Jumps, Mapbox Integration & Dynamic Map Clusters

.agent/rules/rules.md

@@ -14,9 +14,10 @@ trigger: always_on
 - **Dependency Injection**:
   - Supported: Constructor Injection (Legacy/Current).
   - Preferred for New Code: `inject()` function.
-- **Signals & Observables Naming**:
-  - **STRICT RULE**: Do **NOT** use the `$` suffix for Observables or Signals (e.g., use `isLoading`, not `isLoading$`). This applies to all variables.
-  - Reason: Consistency and readability, avoiding "Swiss cheese" code style.
+  - **Signals & Observables Naming**:
+  - **STRICT RULE**: **ALWAYS** use the `$` suffix for Observables (e.g., `user$`, `isLoading$`).
+  - **Signals**: Do **NOT** use the `$` suffix for Signals (e.g., `isLoading`, `user`).
+  - Reason: Clear distinction between streams (Observables) and reactive state (Signals).
 
 ### Firebase
 - Use **Modular SDK** (`@angular/fire` v20+, `firebase` v9+).

angular.json

@@ -28,9 +28,8 @@
               "src/sitemap.xml"
             ],
             "styles": [
-              "./node_modules/material-design-icons-iconfont/dist/material-design-icons.css",
-              "./node_modules/leaflet/dist/leaflet.css",
-              "./node_modules/leaflet-fullscreen/dist/leaflet.fullscreen.css",
+              "./node_modules/material-symbols/rounded.css",
+              "./node_modules/mapbox-gl/dist/mapbox-gl.css",
               "./src/styles.scss"
             ],
             "scripts": [],

firestore.indexes.json

@@ -1,5 +1,24 @@
 {
   "indexes": [
+    {
+      "collectionGroup": "changelogs",
+      "queryScope": "COLLECTION",
+      "fields": [
+        {
+          "fieldPath": "published",
+          "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "date",
+          "order": "DESCENDING"
+        },
+        {
+          "fieldPath": "__name__",
+          "order": "DESCENDING"
+        }
+      ],
+      "density": "SPARSE_ALL"
+    },
     {
       "collectionGroup": "COROSAPIWorkoutQueue",
       "queryScope": "COLLECTION",
@@ -1087,8 +1106,8 @@
       ]
     },
     {
-      "collectionGroup": "tokens",
-      "fieldPath": "dateRefreshed",
+      "collectionGroup": "system",
+      "fieldPath": "gracePeriodUntil",
       "ttl": false,
       "indexes": [
         {
@@ -1111,7 +1130,7 @@
     },
     {
       "collectionGroup": "tokens",
-      "fieldPath": "openId",
+      "fieldPath": "dateRefreshed",
       "ttl": false,
       "indexes": [
         {
@@ -1134,7 +1153,7 @@
     },
     {
       "collectionGroup": "tokens",
-      "fieldPath": "userName",
+      "fieldPath": "openId",
       "ttl": false,
       "indexes": [
         {
@@ -1156,8 +1175,8 @@
       ]
     },
     {
-      "collectionGroup": "system",
-      "fieldPath": "gracePeriodUntil",
+      "collectionGroup": "tokens",
+      "fieldPath": "userName",
       "ttl": false,
       "indexes": [
         {
@@ -1179,4 +1198,4 @@
       ]
     }
   ]
-}
+}

firestore.rules

@@ -159,6 +159,11 @@ service cloud.firestore {
       allow read: if isAdmin();
       allow write: if false;
     }
+
+    match /changelogs/{docId} {
+      allow read: if resource.data.published == true || isAdmin();
+      allow write: if isAdmin();
+    }
   }
 }
 

functions/package.json

@@ -8,7 +8,7 @@
     "@google-cloud/billing": "^5.1.1",
     "@google-cloud/billing-budgets": "^6.1.1",
     "@google-cloud/tasks": "^6.2.1",
-    "@sports-alliance/sports-lib": "^7.2.2",
+    "@sports-alliance/sports-lib": "^8.0.5",
     "blob": "^0.1.0",
     "bs58": "^4.0.1",
     "cors": "^2.8.5",

functions/src/OAuth2.spec.ts

@@ -109,7 +109,7 @@
     isCorsAllowed: vi.fn().mockReturnValue(true),
     setAccessControlHeadersOnResponse: vi.fn(),
     getUserIDFromFirebaseToken: vi.fn().mockResolvedValue('testUserID'),
-    isProUser: vi.fn().mockResolvedValue(true),
+    hasProAccess: vi.fn().mockResolvedValue(true),
     PRO_REQUIRED_MESSAGE: 'Service sync is a Pro feature.'
 }));
 
@@ -586,7 +586,7 @@
             expect(mockCollection).toHaveBeenCalledWith('garminAPITokens');
 
             // Verify state and codeVerifier were saved
             const setCall = (mockDocInstance.set as any).mock.calls[0][0];
             expect(setCall.state).toBeDefined();
             expect(setCall.codeVerifier).toBeDefined();
         });
@@ -604,7 +604,7 @@
             mockGet.mockResolvedValue({
                 exists: true,
                 data: () => ({ state: correctState }),
             } as any);
 
             const result = await validateOAuth2State(userID, ServiceNames.SuuntoApp, correctState);
 
@@ -615,7 +615,7 @@
             mockGet.mockResolvedValue({
                 exists: true,
                 data: () => ({ state: 'different-state' }),
             } as any);
 
             const result = await validateOAuth2State(userID, ServiceNames.SuuntoApp, correctState);
 
@@ -626,7 +626,7 @@
             mockGet.mockResolvedValue({
                 exists: false,
                 data: () => undefined,
             } as any);
 
             const result = await validateOAuth2State(userID, ServiceNames.SuuntoApp, correctState);
 
@@ -668,7 +668,7 @@
             expect(result.serviceName).toBe(ServiceNames.GarminAPI);
             expect(result.accessToken).toBe('garmin-access-token');
             expect(result.refreshToken).toBe('garmin-refresh-token');
             expect((result as any).userID).toBe('garmin-user-123');
             expect(result.dateCreated).toBeDefined();
             expect(result.dateRefreshed).toBeDefined();
         });
@@ -690,7 +690,7 @@
                 'override-user-id'
             );
 
             expect((result as any).userID).toBe('override-user-id');
         });
 
         it('should use default token_type and scope for Garmin when missing', () => {
@@ -808,7 +808,7 @@
 
             // Simulate 500 error from API
             const error500 = new Error('Internal Server Error');
             (error500 as any).statusCode = 500;
             (requestPromise.get as ReturnType<typeof vi.fn>).mockRejectedValue(error500);
 
             await deauthorizeServiceForUser(userID, ServiceNames.SuuntoApp);
@@ -837,7 +837,7 @@
 
             // Simulate 502 error from API
             const error502 = new Error('Bad Gateway');
             (error502 as any).statusCode = 502;
             (requestPromise.get as ReturnType<typeof vi.fn>).mockRejectedValue(error502);
 
             await deauthorizeServiceForUser(userID, ServiceNames.SuuntoApp);
@@ -867,7 +867,7 @@
 
             // Simulate 404 error from API
             const error404 = new Error('Not Found');
             (error404 as any).statusCode = 404;
             (requestPromise.get as ReturnType<typeof vi.fn>).mockRejectedValue(error404);
 
             await deauthorizeServiceForUser(userID, ServiceNames.SuuntoApp);
@@ -917,7 +917,7 @@
                 data: () => ({}),
                 empty: true,
                 docs: [],
             } as any);
         });
 
         it('should throw error when getToken returns no results', async () => {

functions/src/config.spec.ts

@@ -0,0 +1,60 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+
+// Hoisted admin mock & dotenv noop
+const adminMock = vi.hoisted(() => ({
+    instanceId: vi.fn(() => ({
+        app: { options: { projectId: 'mock-project' } }
+    }))
+}));
+
+vi.mock('dotenv', () => ({ config: vi.fn() }));
+
+vi.mock('firebase-admin', () => ({
+    default: {
+        instanceId: adminMock.instanceId
+    },
+    instanceId: adminMock.instanceId
+}));
+
+const envBackup: NodeJS.ProcessEnv = { ...process.env };
+
+describe('config.ts', () => {
+    beforeEach(() => {
+        vi.resetModules();
+        Object.assign(process.env, {
+            SUUNTOAPP_CLIENT_ID: 'suunto-id',
+            SUUNTOAPP_CLIENT_SECRET: 'suunto-secret',
+            SUUNTOAPP_SUBSCRIPTION_KEY: 'suunto-sub',
+            COROSAPI_CLIENT_ID: 'coros-id',
+            COROSAPI_CLIENT_SECRET: 'coros-secret',
+            GARMINAPI_CLIENT_ID: 'garmin-id',
+            GARMINAPI_CLIENT_SECRET: 'garmin-secret',
+        });
+        delete process.env.GCLOUD_PROJECT; // force fallback to admin.instanceId
+    });
+
+    afterEach(() => {
+        process.env = { ...envBackup };
+        vi.clearAllMocks();
+    });
+
+    it('returns configured values and derives cloudtasks defaults from admin project', async () => {
+        const { config } = await import('./config');
+
+        expect(config.suuntoapp.client_id).toBe('suunto-id');
+        expect(config.suuntoapp.subscription_key).toBe('suunto-sub');
+        expect(config.corosapi.client_secret).toBe('coros-secret');
+        expect(config.garminapi.client_id).toBe('garmin-id');
+
+        expect(config.cloudtasks.projectId).toBe('mock-project');
+        expect(config.cloudtasks.serviceAccountEmail).toBe('[email protected]');
+        expect(config.debug.bucketName).toBe('quantified-self-io-debug-files');
+    });
+
+    it('throws when a required env var is missing', async () => {
+        delete process.env.SUUNTOAPP_CLIENT_ID;
+        const { config } = await import('./config');
+
+        expect(() => config.suuntoapp.client_id).toThrow(/Missing required environment variable: SUUNTOAPP_CLIENT_ID/);
+    });
+});

functions/src/config.ts

@@ -27,16 +27,18 @@ interface CloudTasksConfig {
     serviceAccountEmail: string;
 }
 
+interface DebugConfig {
+    bucketName: string;
+}
+
 interface AppConfig {
     suuntoapp: SuuntoAppConfig;
     corosapi: CorosApiConfig;
     garminapi: GarminApiConfig;
     cloudtasks: CloudTasksConfig;
-
+    debug: DebugConfig;
 }
 
-
-
 function getEnvVar(name: string): string {
     const value = process.env[name];
     if (!value) {
@@ -74,4 +76,9 @@ export const config: AppConfig = {
             serviceAccountEmail: `${process.env.GCLOUD_PROJECT || admin.instanceId().app.options.projectId}@appspot.gserviceaccount.com`,
         };
     },
+    get debug() {
+        return {
+            bucketName: 'quantified-self-io-debug-files',
+        };
+    },
 };

functions/src/coros/auth/wrapper.spec.ts

@@ -28,7 +28,7 @@ vi.mock('firebase-functions/v1', () => ({
 }));
 
 vi.mock('../../utils', () => ({
-    isProUser: vi.fn().mockResolvedValue(true),
+    hasProAccess: vi.fn().mockResolvedValue(true),
     PRO_REQUIRED_MESSAGE: 'Service sync is a Pro feature.'
 }));
 
@@ -52,7 +52,7 @@ describe('COROS Auth Wrapper', () => {
 
     beforeEach(() => {
         vi.clearAllMocks();
-        (utils.isProUser as any).mockResolvedValue(true);
+        (utils.hasProAccess as any).mockResolvedValue(true);
 
         context = {
             app: { appId: 'test-app' },
@@ -67,7 +67,7 @@ describe('COROS Auth Wrapper', () => {
         it('should return redirect URI for pro user', async () => {
             const result = await getCOROSAPIAuthRequestTokenRedirectURI(data, context);
 
-            expect(utils.isProUser).toHaveBeenCalledWith('testUserID');
+            expect(utils.hasProAccess).toHaveBeenCalledWith('testUserID');
             expect(oauth2.getServiceOAuth2CodeRedirectAndSaveStateToUser).toHaveBeenCalledWith(
                 'testUserID',
                 SERVICE_NAME,
@@ -77,7 +77,7 @@ describe('COROS Auth Wrapper', () => {
         });
 
         it('should throw error for non-pro user', async () => {
-            (utils.isProUser as any).mockResolvedValue(false);
+            (utils.hasProAccess as any).mockResolvedValue(false);
 
             await expect(getCOROSAPIAuthRequestTokenRedirectURI(data, context))
                 .rejects.toThrow('Service sync is a Pro feature.');

functions/src/coros/auth/wrapper.ts

@@ -2,7 +2,7 @@
 
 import * as functions from 'firebase-functions/v1';
 import * as logger from 'firebase-functions/logger';
-import { isProUser, PRO_REQUIRED_MESSAGE } from '../../utils';
+import { hasProAccess, PRO_REQUIRED_MESSAGE } from '../../utils';
 import {
   deauthorizeServiceForUser,
   getAndSetServiceOAuth2AccessTokenForUser,
@@ -38,7 +38,7 @@ export const getCOROSAPIAuthRequestTokenRedirectURI = functions
     const userID = context.auth.uid;
 
     // Enforce Pro Access
-    if (!(await isProUser(userID))) {
+    if (!(await hasProAccess(userID))) {
       logger.warn(`Blocking COROS Auth for non-pro user ${userID}`);
       throw new functions.https.HttpsError('permission-denied', PRO_REQUIRED_MESSAGE);
     }
@@ -77,7 +77,7 @@ export const requestAndSetCOROSAPIAccessToken = functions
     const userID = context.auth.uid;
 
     // Enforce Pro Access
-    if (!(await isProUser(userID))) {
+    if (!(await hasProAccess(userID))) {
       logger.warn(`Blocking COROS Token Set for non-pro user ${userID}`);
       throw new functions.https.HttpsError('permission-denied', PRO_REQUIRED_MESSAGE);
     }

functions/src/coros/history-to-queue.spec.ts

@@ -29,7 +29,7 @@ vi.mock('firebase-functions/v1', () => ({
 }));
 
 vi.mock('../utils', () => ({
-    isProUser: vi.fn().mockResolvedValue(true),
+    hasProAccess: vi.fn().mockResolvedValue(true),
     PRO_REQUIRED_MESSAGE: 'Service sync is a Pro feature.'
 }));
 
@@ -47,7 +47,7 @@ describe('COROS History to Queue', () => {
 
     beforeEach(() => {
         vi.clearAllMocks();
-        (utils.isProUser as any).mockResolvedValue(true);
+        (utils.hasProAccess as any).mockResolvedValue(true);
         (history.getNextAllowedHistoryImportDate as any).mockResolvedValue(null);
 
         const recentDate = new Date();
@@ -177,7 +177,7 @@ describe('COROS History to Queue', () => {
         });
 
         it('should throw error for non-pro user', async () => {
-            (utils.isProUser as any).mockResolvedValue(false);
+            (utils.hasProAccess as any).mockResolvedValue(false);
 
             await expect(addCOROSAPIHistoryToQueue(data, context))
                 .rejects.toThrow('Service sync is a Pro feature.');

functions/src/coros/history-to-queue.ts

@@ -2,7 +2,7 @@
 
 import * as functions from 'firebase-functions/v1';
 import * as logger from 'firebase-functions/logger';
-import { isProUser, PRO_REQUIRED_MESSAGE } from '../utils';
+import { hasProAccess, PRO_REQUIRED_MESSAGE } from '../utils';
 import { SERVICE_NAME } from './constants';
 import { COROS_HISTORY_IMPORT_LIMIT_MONTHS } from '../shared/history-import.constants';
 import { HistoryImportResult, addHistoryToQueue, getNextAllowedHistoryImportDate } from '../history';
@@ -38,7 +38,7 @@ export const addCOROSAPIHistoryToQueue = functions
     const userID = context.auth.uid;
 
     // Enforce Pro Access
-    if (!(await isProUser(userID))) {
+    if (!(await hasProAccess(userID))) {
       logger.warn(`Blocking history import for non-pro user ${userID}`);
       throw new functions.https.HttpsError('permission-denied', PRO_REQUIRED_MESSAGE);
     }