@clipin/convex-wearables 0.2.1 → 0.3.0

package/src/component/garminWebhooks.test.ts

@@ -1,7 +1,7 @@
 import { convexTest } from "convex-test";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import { api, internal } from "./_generated/api";
-import { GARMIN_BACKFILL_TYPES } from "./garminBackfill";
+import { GARMIN_BACKFILL_TYPES, getGarminBackfillTypesForJob } from "./garminBackfill";
 import { triggerBackfill } from "./providers/garmin";
 import schema from "./schema";
 import { modules } from "./test.setup";
@@ -301,7 +301,7 @@ describe("garminWebhooks", () => {
             },
           },
         ],
-        respiration: [
+        allDayRespiration: [
           {
             userId: "garmin-user-1",
             summaryId: "resp-1",
@@ -364,7 +364,7 @@ describe("garminWebhooks", () => {
             respiration: 13.8,
           },
         ],
-        moveiq: [
+        moveIQActivities: [
           {
             userId: "garmin-user-1",
             summaryId: "moveiq-1",
@@ -413,6 +413,7 @@ describe("garminWebhooks", () => {
     });
 
     expect(result.connection?.scope).toBe("ACTIVITY_EXPORT HEALTH_EXPORT");
+    expect(result.connection?.lastSyncedAt).toEqual(expect.any(Number));
     expect(result.events).toHaveLength(4);
     expect(result.events.map((event) => event.type)).toEqual(
       expect.arrayContaining(["running", "cycling", "sleep_session", "moveiq_walking"]),
@@ -448,7 +449,7 @@ describe("garminWebhooks", () => {
       restingHeartRate: 48,
       avgStressLevel: 30,
       bodyBattery: 45,
-      hrvAvg: 55,
+      hrvRmssd: 55,
       spo2Avg: 97,
     });
     expect(bodySummary).toMatchObject({
@@ -476,7 +477,7 @@ describe("garminWebhooks", () => {
         "garmin_fitness_age",
         "garmin_stress_level",
         "heart_rate",
-        "heart_rate_variability_sdnn",
+        "heart_rate_variability_rmssd",
         "oxygen_saturation",
         "respiratory_rate",
         "resting_heart_rate",
@@ -722,18 +723,23 @@ describe("garminBackfill", () => {
         "bodyComps",
         "hrv",
         "stressDetails",
-        "respiration",
+        "allDayRespiration",
         "pulseOx",
         "bloodPressures",
         "userMetrics",
         "skinTemp",
         "healthSnapshot",
-        "moveiq",
+        "moveIQActivities",
         "mct",
       ]),
     );
   });
 
+  it("limits recent Garmin backfills to freshness-critical feeds", () => {
+    expect(getGarminBackfillTypesForJob("recent")).toEqual(["dailies", "epochs", "sleeps"]);
+    expect(getGarminBackfillTypesForJob("full")).toEqual(GARMIN_BACKFILL_TYPES);
+  });
+
   it("triggers extended Garmin backfill endpoints even when Garmin returns an empty 202 body", async () => {
     const fetchMock = vi.fn().mockResolvedValue(new Response(null, { status: 202 }));
     vi.stubGlobal("fetch", fetchMock as unknown as typeof fetch);
@@ -751,4 +757,15 @@ describe("garminBackfill", () => {
       Accept: "application/json",
     });
   });
+
+  it("maps legacy Garmin backfill aliases to Garmin's current endpoint names", async () => {
+    const fetchMock = vi.fn().mockResolvedValue(new Response(null, { status: 202 }));
+    vi.stubGlobal("fetch", fetchMock as unknown as typeof fetch);
+
+    await triggerBackfill("garmin-token", "respiration", 100, 200);
+    await triggerBackfill("garmin-token", "moveiq", 100, 200);
+
+    expect(String(fetchMock.mock.calls[0]?.[0])).toContain("/backfill/allDayRespiration?");
+    expect(String(fetchMock.mock.calls[1]?.[0])).toContain("/backfill/moveIQActivities?");
+  });
 });

package/src/component/garminWebhooks.ts

@@ -244,8 +244,12 @@ export const processPushPayload = action({
       }
     }
 
-    if (payload.respiration?.length) {
-      for (const respiration of payload.respiration) {
+    const respirationEntries =
+      payload.allDayRespiration && payload.allDayRespiration.length > 0
+        ? payload.allDayRespiration
+        : payload.respiration;
+    if (respirationEntries?.length) {
+      for (const respiration of respirationEntries) {
         const connection = await resolveConnection(ctx, respiration.userId);
         if (!connection) continue;
 
@@ -257,12 +261,14 @@ export const processPushPayload = action({
           dataSourceId,
           normalizeRespirationDataPoints(respiration),
         );
-        addSignal(signalBuckets, "respiration", connection._id);
+        addSignal(signalBuckets, "allDayRespiration", connection._id);
       }
     }
 
-    if (payload.pulseOx?.length) {
-      for (const pulseOx of payload.pulseOx) {
+    const pulseOxEntries =
+      payload.pulseOx && payload.pulseOx.length > 0 ? payload.pulseOx : payload.pulseox;
+    if (pulseOxEntries?.length) {
+      for (const pulseOx of pulseOxEntries) {
         const connection = await resolveConnection(ctx, pulseOx.userId);
         if (!connection) continue;
 
@@ -344,8 +350,12 @@ export const processPushPayload = action({
       }
     }
 
-    if (payload.moveiq?.length) {
-      for (const moveIQ of payload.moveiq) {
+    const moveIQEntries =
+      payload.moveIQActivities && payload.moveIQActivities.length > 0
+        ? payload.moveIQActivities
+        : payload.moveiq;
+    if (moveIQEntries?.length) {
+      for (const moveIQ of moveIQEntries) {
         const connection = await resolveConnection(ctx, moveIQ.userId);
         if (!connection) continue;
 
@@ -365,7 +375,7 @@ export const processPushPayload = action({
           externalId: event.externalId,
         });
 
-        addSignal(signalBuckets, "moveiq", connection._id);
+        addSignal(signalBuckets, "moveIQActivities", connection._id);
       }
     }
 
@@ -444,6 +454,15 @@ export const processPushPayload = action({
       }
     }
 
+    const syncedConnectionIds = new Set(
+      [...signalBuckets.values()].flatMap((connectionIds) => [...connectionIds]),
+    );
+    for (const connectionId of syncedConnectionIds) {
+      await ctx.runMutation(internal.connections.markSynced, {
+        connectionId: connectionId as Id<"connections">,
+      });
+    }
+
     return null;
   },
 });
@@ -744,10 +763,10 @@ function getPayloadItemCount(payload: GarminPushPayload, dataType: string): numb
       return payload.hrv?.length;
     case "stressDetails":
       return payload.stressDetails?.length;
-    case "respiration":
-      return payload.respiration?.length;
+    case "allDayRespiration":
+      return payload.allDayRespiration?.length ?? payload.respiration?.length;
     case "pulseOx":
-      return payload.pulseOx?.length;
+      return payload.pulseOx?.length ?? payload.pulseox?.length;
     case "bloodPressures":
       return payload.bloodPressures?.length;
     case "userMetrics":
@@ -756,8 +775,8 @@ function getPayloadItemCount(payload: GarminPushPayload, dataType: string): numb
       return payload.skinTemp?.length;
     case "healthSnapshot":
       return payload.healthSnapshot?.length;
-    case "moveiq":
-      return payload.moveiq?.length;
+    case "moveIQActivities":
+      return payload.moveIQActivities?.length ?? payload.moveiq?.length;
     case "mct":
       return payload.menstrualCycleTracking && payload.menstrualCycleTracking.length > 0
         ? payload.menstrualCycleTracking.length

package/src/component/providers/garmin.ts

@@ -148,6 +148,7 @@ export interface GarminHrv {
   userId: string;
   summaryId?: string;
   startTimeInSeconds: number;
+  startTimeOffsetInSeconds?: number;
   calendarDate?: string;
   lastNightAvg?: number;
   hrvValues?: Record<string, number>;
@@ -258,12 +259,15 @@ export interface GarminPushPayload {
   bodyComps?: GarminBodyComp[];
   hrv?: GarminHrv[];
   stressDetails?: GarminStressDetails[];
+  allDayRespiration?: GarminRespiration[];
   respiration?: GarminRespiration[];
   pulseOx?: GarminPulseOx[];
+  pulseox?: GarminPulseOx[];
   bloodPressures?: GarminBloodPressure[];
   userMetrics?: GarminUserMetrics[];
   skinTemp?: GarminSkinTemp[];
   healthSnapshot?: GarminHealthSnapshot[];
+  moveIQActivities?: GarminMoveIQ[];
   moveiq?: GarminMoveIQ[];
   menstrualCycleTracking?: GarminMCTSummary[];
   mct?: GarminMCTSummary[];
@@ -282,6 +286,13 @@ function isoDateFromCalendarDate(
   return calendarDate ?? isoDateFromTimestamp(fallbackTimestampMs);
 }
 
+function isoDateFromTimestampWithOffset(timestampMs: number, offsetSeconds?: number): string {
+  if (offsetSeconds === undefined) {
+    return isoDateFromTimestamp(timestampMs);
+  }
+  return isoDateFromTimestamp(timestampMs + offsetSeconds * 1000);
+}
+
 function calendarDateToMiddayTimestamp(calendarDate: string | undefined): number | null {
   if (!calendarDate) {
     return null;
@@ -541,8 +552,9 @@ export function normalizeSleep(sleep: GarminSleep): NormalizedEvent {
 }
 
 export function normalizeSleepSummary(sleep: GarminSleep): NormalizedDailySummary {
+  const endMs = (sleep.startTimeInSeconds + sleep.durationInSeconds) * 1000;
   return {
-    date: isoDateFromTimestamp(sleep.startTimeInSeconds * 1000),
+    date: isoDateFromTimestampWithOffset(endMs, sleep.startTimeOffsetInSeconds),
     category: "sleep",
     sleepDurationMinutes: Math.floor(sleep.durationInSeconds / 60),
     sleepEfficiency: sleep.overallSleepScore?.value,
@@ -734,7 +746,7 @@ export function normalizeHrvDataPoints(hrv: GarminHrv): NormalizedDataPoint[] {
   const points: NormalizedDataPoint[] = [];
   if (hrv.lastNightAvg != null) {
     points.push({
-      seriesType: "heart_rate_variability_sdnn",
+      seriesType: "heart_rate_variability_rmssd",
       recordedAt: hrv.startTimeInSeconds * 1000,
       value: hrv.lastNightAvg,
       externalId: hrv.summaryId,
@@ -745,7 +757,7 @@ export function normalizeHrvDataPoints(hrv: GarminHrv): NormalizedDataPoint[] {
     ...buildOffsetDataPoints(
       hrv.hrvValues,
       hrv.startTimeInSeconds,
-      "heart_rate_variability_sdnn",
+      "heart_rate_variability_rmssd",
       hrv.summaryId,
     ),
   );
@@ -761,7 +773,7 @@ export function normalizeHrvSummary(hrv: GarminHrv): NormalizedDailySummary | nu
   return {
     date: isoDateFromCalendarDate(hrv.calendarDate, hrv.startTimeInSeconds * 1000),
     category: "recovery",
-    hrvAvg: hrv.lastNightAvg,
+    hrvRmssd: hrv.lastNightAvg,
   };
 }
 
@@ -1138,6 +1150,7 @@ export async function triggerBackfill(
   startTimeSeconds: number,
   endTimeSeconds: number,
 ): Promise<void> {
+  const endpointDataType = normalizeBackfillDataType(dataType);
   const validTypes = [
     "activities",
     "activityDetails",
@@ -1147,23 +1160,34 @@ export async function triggerBackfill(
     "bodyComps",
     "hrv",
     "stressDetails",
-    "respiration",
+    "allDayRespiration",
     "pulseOx",
     "bloodPressures",
     "userMetrics",
     "skinTemp",
     "healthSnapshot",
-    "moveiq",
+    "moveIQActivities",
     "mct",
   ];
-  if (!validTypes.includes(dataType)) {
+  if (!validTypes.includes(endpointDataType)) {
     throw new Error(`Invalid backfill data type: ${dataType}`);
   }
 
-  await makeAuthenticatedRequest(API_BASE, `/wellness-api/rest/backfill/${dataType}`, accessToken, {
-    params: {
-      summaryStartTimeInSeconds: String(startTimeSeconds),
-      summaryEndTimeInSeconds: String(endTimeSeconds),
+  await makeAuthenticatedRequest(
+    API_BASE,
+    `/wellness-api/rest/backfill/${endpointDataType}`,
+    accessToken,
+    {
+      params: {
+        summaryStartTimeInSeconds: String(startTimeSeconds),
+        summaryEndTimeInSeconds: String(endTimeSeconds),
+      },
     },
-  });
+  );
+}
+
+function normalizeBackfillDataType(dataType: string): string {
+  if (dataType === "respiration") return "allDayRespiration";
+  if (dataType === "moveiq") return "moveIQActivities";
+  return dataType;
 }

package/src/component/sdkPush.test.ts

@@ -245,7 +245,17 @@ describe("sdkPush", () => {
         model: "Pixel 9 Pro",
         softwareVersion: "Android 16",
         source: "health-connect",
+        appId: "com.thirdparty.writer",
       },
+      events: [
+        {
+          category: "workout",
+          type: "CYCLING_STATIONARY",
+          startDatetime: Date.parse("2026-03-18T08:00:00Z"),
+          endDatetime: Date.parse("2026-03-18T08:45:00Z"),
+          externalId: "hc-cycling-1",
+        },
+      ],
       dataPoints: [
         {
           seriesType: "hrv_rmssd",
@@ -271,6 +281,30 @@ describe("sdkPush", () => {
           value: 340,
           externalId: "hc-active-calories-1",
         },
+        {
+          seriesType: "POWER",
+          recordedAt: Date.parse("2026-03-18T12:03:00Z"),
+          value: 220,
+          externalId: "hc-power-1",
+        },
+        {
+          seriesType: "SPEED",
+          recordedAt: Date.parse("2026-03-18T12:04:00Z"),
+          value: 7.5,
+          externalId: "hc-speed-1",
+        },
+        {
+          seriesType: "CYCLING_PEDALING_CADENCE",
+          recordedAt: Date.parse("2026-03-18T12:05:00Z"),
+          value: 88,
+          externalId: "hc-cadence-1",
+        },
+        {
+          seriesType: "TOTAL_CALORIES_BURNED",
+          recordedAt: Date.parse("2026-03-18T12:06:00Z"),
+          value: 830,
+          externalId: "hc-total-calories-1",
+        },
       ],
       dailySummaries: [
         {
@@ -293,6 +327,22 @@ describe("sdkPush", () => {
       deviceModel: "Pixel 9 Pro",
       softwareVersion: "Android 16",
       source: "health-connect",
+      originalSourceName: "com.thirdparty.writer",
+    });
+
+    const events = await t.run(async (ctx) => {
+      return await ctx.db
+        .query("events")
+        .withIndex("by_user_category_time", (idx) =>
+          idx.eq("userId", "user-3").eq("category", "workout"),
+        )
+        .collect();
+    });
+
+    expect(events).toHaveLength(1);
+    expect(events[0]).toMatchObject({
+      type: "indoor_cycling",
+      externalId: "hc-cycling-1",
     });
 
     const points = await t.run(async (ctx) => {
@@ -304,9 +354,13 @@ describe("sdkPush", () => {
 
     expect(points.map((point) => point.seriesType).sort()).toEqual([
       "active_calories",
+      "cadence",
       "distance",
       "floors_climbed",
       "heart_rate_variability_rmssd",
+      "power",
+      "speed",
+      "total_calories",
     ]);
 
     const summaries = await t.run(async (ctx) => {

package/src/component/sdkPush.ts

@@ -13,6 +13,14 @@ const MAX_DATA_POINTS_PER_REQUEST = 10000;
 const MAX_SUMMARIES_PER_REQUEST = 1000;
 const SERIES_TYPE_ALIASES = {
   hrv_rmssd: "heart_rate_variability_rmssd",
+  POWER: "power",
+  power: "power",
+  SPEED: "speed",
+  speed: "speed",
+  CYCLING_PEDALING_CADENCE: "cadence",
+  cycling_pedaling_cadence: "cadence",
+  TOTAL_CALORIES_BURNED: "total_calories",
+  total_calories_burned: "total_calories",
 } as const;
 const validSeriesTypes = new Set(Object.keys(SERIES_TYPES));
 
@@ -22,6 +30,10 @@ const deviceMetadataValidator = v.object({
   source: v.optional(v.string()),
   deviceType: v.optional(v.string()),
   originalSourceName: v.optional(v.string()),
+  appId: v.optional(v.string()),
+  app_id: v.optional(v.string()),
+  bundleIdentifier: v.optional(v.string()),
+  bundle_identifier: v.optional(v.string()),
 });
 
 const sourceMetadataValidator = v.object({
@@ -30,6 +42,10 @@ const sourceMetadataValidator = v.object({
   source: v.optional(v.string()),
   deviceType: v.optional(v.string()),
   originalSourceName: v.optional(v.string()),
+  appId: v.optional(v.string()),
+  app_id: v.optional(v.string()),
+  bundleIdentifier: v.optional(v.string()),
+  bundle_identifier: v.optional(v.string()),
 });
 
 const sdkEventValidator = v.object({
@@ -76,6 +92,10 @@ const sdkEventValidator = v.object({
   source: v.optional(v.string()),
   deviceType: v.optional(v.string()),
   originalSourceName: v.optional(v.string()),
+  appId: v.optional(v.string()),
+  app_id: v.optional(v.string()),
+  bundleIdentifier: v.optional(v.string()),
+  bundle_identifier: v.optional(v.string()),
 });
 
 const sdkDataPointValidator = v.object({
@@ -88,6 +108,10 @@ const sdkDataPointValidator = v.object({
   source: v.optional(v.string()),
   deviceType: v.optional(v.string()),
   originalSourceName: v.optional(v.string()),
+  appId: v.optional(v.string()),
+  app_id: v.optional(v.string()),
+  bundleIdentifier: v.optional(v.string()),
+  bundle_identifier: v.optional(v.string()),
 });
 
 const sdkSummaryValidator = v.object({
@@ -95,6 +119,10 @@ const sdkSummaryValidator = v.object({
   category: v.string(),
   source: v.optional(v.string()),
   originalSourceName: v.optional(v.string()),
+  appId: v.optional(v.string()),
+  app_id: v.optional(v.string()),
+  bundleIdentifier: v.optional(v.string()),
+  bundle_identifier: v.optional(v.string()),
   totalSteps: v.optional(v.number()),
   totalCalories: v.optional(v.number()),
   activeCalories: v.optional(v.number()),
@@ -133,6 +161,10 @@ type SourceMetadata = {
   source?: string;
   deviceType?: string;
   originalSourceName?: string;
+  appId?: string;
+  app_id?: string;
+  bundleIdentifier?: string;
+  bundle_identifier?: string;
 };
 
 type DataSourceCache = Map<string, Id<"dataSources">>;
@@ -158,7 +190,17 @@ function resolveSourceMetadata(
     softwareVersion: item.softwareVersion ?? defaults?.softwareVersion,
     source: item.source ?? defaults?.source,
     deviceType: item.deviceType ?? defaults?.deviceType,
-    originalSourceName: item.originalSourceName ?? defaults?.originalSourceName,
+    originalSourceName:
+      item.originalSourceName ??
+      item.appId ??
+      item.app_id ??
+      item.bundleIdentifier ??
+      item.bundle_identifier ??
+      defaults?.originalSourceName,
+    appId: item.appId ?? defaults?.appId,
+    app_id: item.app_id ?? defaults?.app_id,
+    bundleIdentifier: item.bundleIdentifier ?? defaults?.bundleIdentifier,
+    bundle_identifier: item.bundle_identifier ?? defaults?.bundle_identifier,
   };
 }
 
@@ -245,6 +287,10 @@ export const ingestNormalizedPayload = action({
           source: event.source,
           deviceType: event.deviceType,
           originalSourceName: event.originalSourceName,
+          appId: event.appId,
+          app_id: event.app_id,
+          bundleIdentifier: event.bundleIdentifier,
+          bundle_identifier: event.bundle_identifier,
         });
         const dataSourceId = await ensureDataSource(
           ctx,
@@ -261,7 +307,7 @@ export const ingestNormalizedPayload = action({
           dataSourceId,
           userId: args.userId,
           category: event.category,
-          type: event.type,
+          type: event.category === "workout" ? normalizeWorkoutType(event.type) : event.type,
           sourceName: event.sourceName ?? defaultSourceName(args.provider),
           durationSeconds: event.durationSeconds,
           startDatetime: event.startDatetime,
@@ -322,6 +368,10 @@ export const ingestNormalizedPayload = action({
           source: point.source,
           deviceType: point.deviceType,
           originalSourceName: point.originalSourceName,
+          appId: point.appId,
+          app_id: point.app_id,
+          bundleIdentifier: point.bundleIdentifier,
+          bundle_identifier: point.bundle_identifier,
         });
         const dataSourceId = await ensureDataSource(
           ctx,
@@ -360,12 +410,27 @@ export const ingestNormalizedPayload = action({
     }
 
     for (const summary of summaries) {
+      const {
+        appId,
+        app_id,
+        bundleIdentifier,
+        bundle_identifier,
+        originalSourceName,
+        source,
+        ...summaryMetrics
+      } = summary;
       await ctx.runMutation(internal.summaries.upsert, {
         userId: args.userId,
         provider: args.provider,
-        ...summary,
-        source: summary.source ?? defaultMetadata.source,
-        originalSourceName: summary.originalSourceName ?? defaultMetadata.originalSourceName,
+        ...summaryMetrics,
+        source: source ?? defaultMetadata.source,
+        originalSourceName:
+          originalSourceName ??
+          appId ??
+          app_id ??
+          bundleIdentifier ??
+          bundle_identifier ??
+          defaultMetadata.originalSourceName,
       });
     }
 
@@ -390,6 +455,10 @@ function sourceMetadataFromDevice(
         source?: string;
         deviceType?: string;
         originalSourceName?: string;
+        appId?: string;
+        app_id?: string;
+        bundleIdentifier?: string;
+        bundle_identifier?: string;
       }
     | undefined,
 ): SourceMetadata | undefined {
@@ -399,7 +468,16 @@ function sourceMetadataFromDevice(
     softwareVersion: device.softwareVersion,
     source: device.source,
     deviceType: device.deviceType,
-    originalSourceName: device.originalSourceName,
+    originalSourceName:
+      device.originalSourceName ??
+      device.appId ??
+      device.app_id ??
+      device.bundleIdentifier ??
+      device.bundle_identifier,
+    appId: device.appId,
+    app_id: device.app_id,
+    bundleIdentifier: device.bundleIdentifier,
+    bundle_identifier: device.bundle_identifier,
   };
 }
 
@@ -412,6 +490,42 @@ function normalizeSeriesType(seriesType: string): string {
   return normalized;
 }
 
+const SDK_WORKOUT_TYPE_ALIASES: Record<string, string> = {
+  cycling_stationary: "indoor_cycling",
+  boot_camp: "cardio_training",
+  calisthenics: "strength_training",
+  dancing: "dance",
+  exercise_class: "cardio_training",
+  football_american: "american_football",
+  football_australian: "football",
+  frisbee_disc: "disc_sports",
+  guided_breathing: "meditation",
+  ice_hockey: "hockey",
+  ice_skating: "ice_skating",
+  paddling: "paddling",
+  paragliding: "paragliding",
+  rock_climbing: "rock_climbing",
+  roller_hockey: "hockey",
+  rowing_machine: "rowing_machine",
+  running_treadmill: "treadmill",
+  scuba_diving: "diving",
+  skiing: "alpine_skiing",
+  snowshoeing: "snowshoeing",
+  stair_climbing_machine: "stair_climbing",
+  stretching: "stretching",
+  swimming_open_water: "open_water_swimming",
+  swimming_pool: "pool_swimming",
+  weightlifting: "strength_training",
+  wheelchair: "wheelchair",
+};
+
+function normalizeWorkoutType(type: string | undefined): string | undefined {
+  if (type === undefined) return undefined;
+  const normalized = type.trim().toLowerCase();
+  if (!normalized) return undefined;
+  return SDK_WORKOUT_TYPE_ALIASES[normalized] ?? normalized;
+}
+
 function assertPayloadWithinLimits(args: {
   events: unknown[];
   dataPoints: unknown[];

package/src/component/syncWorkflow.ts

@@ -525,9 +525,11 @@ export const runConnectionSync = durableWorkflow.define({
       }
     }
 
-    await step.runMutation(internal.connections.markSynced, {
-      connectionId: connection._id,
-    });
+    if (processed > 0) {
+      await step.runMutation(internal.connections.markSynced, {
+        connectionId: connection._id,
+      });
+    }
 
     return { recordsProcessed: processed };
   },