@nativesquare/soma 0.9.3 → 0.10.0

package/dist/component/strava/private.js

@@ -1,7 +1,57 @@
-// ─── Internal Token CRUD ─────────────────────────────────────────────────────
-// These are only callable from within the component (actions in this file).
+// ─── Internal Token & Pending OAuth CRUD ─────────────────────────────────────
+// Called only from strava/public.ts. Not exposed to the host app.
 import { v } from "convex/values";
 import { internalMutation, internalQuery, } from "../_generated/server";
+// ─── Internal Pending OAuth CRUD ─────────────────────────────────────────────
+// Temporary storage for in-progress Strava OAuth flows.
+// Bridges getStravaAuthUrl and completeStravaOAuth.
+export const storePendingOAuth = internalMutation({
+    args: {
+        provider: v.string(),
+        state: v.string(),
+        userId: v.string(),
+    },
+    returns: v.null(),
+    handler: async (ctx, args) => {
+        await ctx.db.insert("pendingOAuth", {
+            ...args,
+            createdAt: Date.now(),
+        });
+        return null;
+    },
+});
+export const getPendingOAuth = internalQuery({
+    args: { state: v.string() },
+    returns: v.union(v.object({
+        _id: v.id("pendingOAuth"),
+        _creationTime: v.number(),
+        provider: v.string(),
+        state: v.string(),
+        userId: v.string(),
+        createdAt: v.number(),
+    }), v.null()),
+    handler: async (ctx, args) => {
+        return await ctx.db
+            .query("pendingOAuth")
+            .withIndex("by_state", (q) => q.eq("state", args.state))
+            .first();
+    },
+});
+export const deletePendingOAuth = internalMutation({
+    args: { state: v.string() },
+    returns: v.null(),
+    handler: async (ctx, args) => {
+        const pending = await ctx.db
+            .query("pendingOAuth")
+            .withIndex("by_state", (q) => q.eq("state", args.state))
+            .first();
+        if (pending) {
+            await ctx.db.delete(pending._id);
+        }
+        return null;
+    },
+});
+// ─── Internal Token CRUD ─────────────────────────────────────────────────────
 /**
  * Store or update OAuth tokens for a connection.
  * Upserts by connectionId — one token record per connection.

package/dist/component/strava/private.js.map

@@ -1 +1 @@
-{"version":3,"file":"private.js","sourceRoot":"","sources":["../../../src/component/strava/private.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"private.js","sourceRoot":"","sources":["../../../src/component/strava/private.ts"],"names":[],"mappings":"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"}

package/dist/component/strava/public.d.ts

@@ -1,27 +1,78 @@
 import type { Id } from "../_generated/dataModel";
 /**
- * Full Strava OAuth callback handler.
+ * Generate a Strava OAuth authorization URL.
+ *
+ * If `userId` is provided, the state parameter is stored in the component's
+ * `pendingOAuth` table so that `completeStravaOAuth` can look it up
+ * automatically when the callback fires. This is the recommended flow
+ * when using `registerRoutes`.
+ *
+ * If `userId` is omitted, the host app must store the returned `state`
+ * itself and pass the userId to `connectStrava` manually.
+ */
+export declare const getStravaAuthUrl: import("convex/server").RegisteredAction<"public", {
+    userId?: string | undefined;
+    scope?: string | undefined;
+    clientId: string;
+    redirectUri: string;
+}, Promise<{
+    authUrl: string;
+    state: string;
+}>>;
+/**
+ * Full Strava OAuth callback handler (manual flow).
  *
  * Exchanges the authorization code for tokens, creates/reactivates the
  * Soma connection, stores tokens securely, syncs the athlete profile,
  * and syncs all activities.
  *
+ * Used when the host app handles the callback itself and passes the
+ * userId directly (analogous to `connectGarmin`).
+ *
  * Returns `{ connectionId, synced, errors }`.
  */
 export declare const connectStrava: import("convex/server").RegisteredAction<"public", {
-    baseUrl?: string | undefined;
-    includeStreams?: boolean | undefined;
     userId: string;
     clientId: string;
     clientSecret: string;
     code: string;
 }, Promise<{
     connectionId: Id<"connections">;
-    synced: number;
-    errors: {
-        activityId: number;
+    synced: {
+        athletes: number;
+        activities: number;
+    };
+    errors: Array<{
+        type: string;
+        id: string;
         error: string;
-    }[];
+    }>;
+}>>;
+/**
+ * Complete a Strava OAuth flow using stored pending state.
+ *
+ * Used by `registerRoutes` — the callback handler calls this with the
+ * `code` and `state` from the redirect. The action looks up the pending
+ * state (userId) stored during `getStravaAuthUrl`, exchanges for tokens,
+ * creates the connection, syncs data, and cleans up the pending entry.
+ */
+export declare const completeStravaOAuth: import("convex/server").RegisteredAction<"public", {
+    state: string;
+    clientId: string;
+    clientSecret: string;
+    code: string;
+}, Promise<{
+    connectionId: Id<"connections">;
+    userId: string;
+    synced: {
+        athletes: number;
+        activities: number;
+    };
+    errors: Array<{
+        type: string;
+        id: string;
+        error: string;
+    }>;
 }>>;
 /**
  * Incremental Strava sync for an already-connected user.
@@ -32,16 +83,41 @@ export declare const connectStrava: import("convex/server").RegisteredAction<"pu
  * Returns `{ synced, errors }`.
  */
 export declare const syncStrava: import("convex/server").RegisteredAction<"public", {
-    baseUrl?: string | undefined;
-    includeStreams?: boolean | undefined;
     after?: number | undefined;
     userId: string;
     clientId: string;
     clientSecret: string;
 }, Promise<{
-    synced: number;
+    synced: {
+        athletes: number;
+        activities: number;
+    };
+    errors: Array<{
+        type: string;
+        id: string;
+        error: string;
+    }>;
+}>>;
+/**
+ * Fetch and ingest all Strava data types for a connected user.
+ *
+ * Called by the public actions (connectStrava, completeStravaOAuth, syncStrava)
+ * after obtaining a valid access token.
+ */
+export declare const syncAllTypes: import("convex/server").RegisteredAction<"public", {
+    after?: number | undefined;
+    before?: number | undefined;
+    connectionId: import("convex/values").GenericId<"connections">;
+    userId: string;
+    accessToken: string;
+}, Promise<{
+    synced: {
+        athletes: number;
+        activities: number;
+    };
     errors: {
-        activityId: number;
+        type: string;
+        id: string;
         error: string;
     }[];
 }>>;
@@ -52,7 +128,6 @@ export declare const syncStrava: import("convex/server").RegisteredAction<"publi
  * and sets the connection to inactive.
  */
 export declare const disconnectStrava: import("convex/server").RegisteredAction<"public", {
-    baseUrl?: string | undefined;
     userId: string;
     clientId: string;
     clientSecret: string;

package/dist/component/strava/public.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../../src/component/strava/public.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAO,EAAE,EAAE,MAAM,yBAAyB,CAAC;AAWvD;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;oBAiEY,MAAM;eAAS,MAAM;;GAqCzD,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;oBAkGe,MAAM;eAAS,MAAM;;GAqCzD,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB;;;;;iBAyD3B,CAAC"}
+{"version":3,"file":"public.d.ts","sourceRoot":"","sources":["../../../src/component/strava/public.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAO,EAAE,EAAE,MAAM,yBAAyB,CAAC;AAmBvD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;GA2B3B,CAAC;AAEH;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,aAAa;;;;;;kBAeR,EAAE,CAAC,aAAa,CAAC;YACvB;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;YACxC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;GA+C5D,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB;;;;;;kBAgBd,EAAE,CAAC,aAAa,CAAC;YACvB,MAAM;YACN;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;YACxC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;GAsE5D,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU;;;;;;YAcX;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE;YACxC,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;GA+E5D,CAAC;AAIH;;;;;GAKG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;cAaO,MAAM;YAAM,MAAM;eAAS,MAAM;;GAmE/D,CAAC;AAIH;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB;;;;iBAoD3B,CAAC"}

package/dist/component/strava/public.js

@@ -5,33 +5,73 @@
 import { v } from "convex/values";
 import { action } from "../_generated/server";
 import { api, internal } from "../_generated/api";
-import { StravaClient } from "../../strava/client";
-import { exchangeCode, refreshToken as refreshStravaToken, } from "../../strava/auth";
-import { transformActivity } from "../../strava/activity";
-import { transformAthlete } from "../../strava/athlete";
+import { createStravaClient } from "./client.js";
+import { listAllActivities } from "./utils.js";
+import { getLoggedInAthlete, getActivityById, getActivityStreams, } from "./types/stravaApi/sdk.gen.js";
+import { generateState } from "../utils.js";
+import { buildAuthUrl, exchangeCode, refreshToken as refreshStravaToken, } from "./auth.js";
+import { transformActivity } from "./transform/activity.js";
+import { transformAthlete } from "./transform/athlete.js";
 // ─── Public Actions ──────────────────────────────────────────────────────────
 /**
- * Full Strava OAuth callback handler.
+ * Generate a Strava OAuth authorization URL.
+ *
+ * If `userId` is provided, the state parameter is stored in the component's
+ * `pendingOAuth` table so that `completeStravaOAuth` can look it up
+ * automatically when the callback fires. This is the recommended flow
+ * when using `registerRoutes`.
+ *
+ * If `userId` is omitted, the host app must store the returned `state`
+ * itself and pass the userId to `connectStrava` manually.
+ */
+export const getStravaAuthUrl = action({
+    args: {
+        clientId: v.string(),
+        redirectUri: v.string(),
+        scope: v.optional(v.string()),
+        userId: v.optional(v.string()),
+    },
+    handler: async (ctx, args) => {
+        const state = generateState();
+        const authUrl = buildAuthUrl({
+            clientId: args.clientId,
+            redirectUri: args.redirectUri,
+            scope: args.scope,
+            state,
+        });
+        if (args.userId) {
+            await ctx.runMutation(internal.strava.private.storePendingOAuth, {
+                provider: "STRAVA",
+                state,
+                userId: args.userId,
+            });
+        }
+        return { authUrl, state };
+    },
+});
+/**
+ * Full Strava OAuth callback handler (manual flow).
  *
  * Exchanges the authorization code for tokens, creates/reactivates the
  * Soma connection, stores tokens securely, syncs the athlete profile,
  * and syncs all activities.
  *
+ * Used when the host app handles the callback itself and passes the
+ * userId directly (analogous to `connectGarmin`).
+ *
  * Returns `{ connectionId, synced, errors }`.
  */
 export const connectStrava = action({
     args: {
         userId: v.string(),
-        code: v.string(),
         clientId: v.string(),
         clientSecret: v.string(),
-        baseUrl: v.optional(v.string()),
-        includeStreams: v.optional(v.boolean()),
+        code: v.string(),
     },
     returns: v.object({
         connectionId: v.string(),
-        synced: v.number(),
-        errors: v.array(v.object({ activityId: v.number(), error: v.string() })),
+        synced: v.object({ athletes: v.number(), activities: v.number() }),
+        errors: v.array(v.object({ type: v.string(), id: v.string(), error: v.string() })),
     }),
     handler: async (ctx, args) => {
         // 1. Exchange authorization code for tokens
@@ -39,7 +79,6 @@ export const connectStrava = action({
             clientId: args.clientId,
             clientSecret: args.clientSecret,
             code: args.code,
-            baseUrl: args.baseUrl,
         });
         // 2. Create/reactivate the Soma connection
         const connectionId = await ctx.runMutation(api.public.connect, {
@@ -47,55 +86,91 @@ export const connectStrava = action({
             provider: "STRAVA",
         });
         // 3. Store OAuth tokens in providerTokens table
-        const _stored = await ctx.runMutation(internal.strava.private.storeTokens, {
+        await ctx.runMutation(internal.strava.private.storeTokens, {
             connectionId,
             accessToken: tokens.access_token,
             refreshToken: tokens.refresh_token,
             expiresAt: tokens.expires_at,
         });
-        // 4. Sync athlete profile
-        const client = new StravaClient({
+        // 4. Sync all data types
+        const result = await ctx.runAction(api.strava.public.syncAllTypes, {
             accessToken: tokens.access_token,
-            baseUrl: args.baseUrl,
-        });
-        const athlete = await client.getAthlete();
-        const athleteData = transformAthlete(athlete);
-        const _athleteId = await ctx.runMutation(api.public.ingestAthlete, {
             connectionId,
             userId: args.userId,
-            ...athleteData,
         });
-        // 5. Sync all activities
-        const summaries = await client.listAllActivities();
-        let synced = 0;
-        const errors = [];
-        for (const summary of summaries) {
-            try {
-                const detailed = await client.getActivity(summary.id);
-                const streams = args.includeStreams
-                    ? await client.getActivityStreams(summary.id)
-                    : undefined;
-                const data = transformActivity(detailed, { streams });
-                const _activityId = await ctx.runMutation(api.public.ingestActivity, {
-                    connectionId,
-                    userId: args.userId,
-                    ...data,
-                });
-                synced++;
-            }
-            catch (err) {
-                errors.push({
-                    activityId: summary.id,
-                    error: err instanceof Error ? err.message : String(err),
-                });
-            }
+        // 5. Update lastDataUpdate timestamp
+        await ctx.runMutation(api.public.updateConnection, {
+            connectionId,
+            lastDataUpdate: new Date().toISOString(),
+        });
+        return { connectionId, synced: result.synced, errors: result.errors };
+    },
+});
+/**
+ * Complete a Strava OAuth flow using stored pending state.
+ *
+ * Used by `registerRoutes` — the callback handler calls this with the
+ * `code` and `state` from the redirect. The action looks up the pending
+ * state (userId) stored during `getStravaAuthUrl`, exchanges for tokens,
+ * creates the connection, syncs data, and cleans up the pending entry.
+ */
+export const completeStravaOAuth = action({
+    args: {
+        code: v.string(),
+        state: v.string(),
+        clientId: v.string(),
+        clientSecret: v.string(),
+    },
+    returns: v.object({
+        connectionId: v.string(),
+        userId: v.string(),
+        synced: v.object({ athletes: v.number(), activities: v.number() }),
+        errors: v.array(v.object({ type: v.string(), id: v.string(), error: v.string() })),
+    }),
+    handler: async (ctx, args) => {
+        // 1. Look up pending state
+        const pending = await ctx.runQuery(internal.strava.private.getPendingOAuth, { state: args.state });
+        if (!pending) {
+            throw new Error("No pending Strava OAuth state found for this state parameter. " +
+                "The authorization may have expired or was already used.");
         }
-        // 6. Update lastDataUpdate timestamp
-        const _updated = await ctx.runMutation(api.public.updateConnection, {
+        // 2. Exchange authorization code for tokens
+        const tokens = await exchangeCode({
+            clientId: args.clientId,
+            clientSecret: args.clientSecret,
+            code: args.code,
+        });
+        // 3. Clean up pending entry
+        await ctx.runMutation(internal.strava.private.deletePendingOAuth, { state: args.state });
+        // 4. Create/reactivate the Soma connection
+        const connectionId = await ctx.runMutation(api.public.connect, {
+            userId: pending.userId,
+            provider: "STRAVA",
+        });
+        // 5. Store OAuth tokens
+        await ctx.runMutation(internal.strava.private.storeTokens, {
+            connectionId,
+            accessToken: tokens.access_token,
+            refreshToken: tokens.refresh_token,
+            expiresAt: tokens.expires_at,
+        });
+        // 6. Sync all data types
+        const result = await ctx.runAction(api.strava.public.syncAllTypes, {
+            accessToken: tokens.access_token,
+            connectionId,
+            userId: pending.userId,
+        });
+        // 7. Update lastDataUpdate timestamp
+        await ctx.runMutation(api.public.updateConnection, {
             connectionId,
             lastDataUpdate: new Date().toISOString(),
         });
-        return { connectionId, synced, errors };
+        return {
+            connectionId,
+            userId: pending.userId,
+            synced: result.synced,
+            errors: result.errors,
+        };
     },
 });
 /**
@@ -111,13 +186,11 @@ export const syncStrava = action({
         userId: v.string(),
         clientId: v.string(),
         clientSecret: v.string(),
-        baseUrl: v.optional(v.string()),
-        includeStreams: v.optional(v.boolean()),
         after: v.optional(v.number()),
     },
     returns: v.object({
-        synced: v.number(),
-        errors: v.array(v.object({ activityId: v.number(), error: v.string() })),
+        synced: v.object({ athletes: v.number(), activities: v.number() }),
+        errors: v.array(v.object({ type: v.string(), id: v.string(), error: v.string() })),
     }),
     handler: async (ctx, args) => {
         // 1. Look up connection
@@ -148,64 +221,119 @@ export const syncStrava = action({
                 clientId: args.clientId,
                 clientSecret: args.clientSecret,
                 refreshToken: tokenDoc.refreshToken,
-                baseUrl: args.baseUrl,
             });
             accessToken = refreshed.access_token;
-            const _refreshed = await ctx.runMutation(internal.strava.private.storeTokens, {
+            await ctx.runMutation(internal.strava.private.storeTokens, {
                 connectionId,
                 accessToken: refreshed.access_token,
                 refreshToken: refreshed.refresh_token,
                 expiresAt: refreshed.expires_at,
             });
         }
-        // 4. Create client and sync
-        const client = new StravaClient({
+        // 4. Sync all data types
+        const result = await ctx.runAction(api.strava.public.syncAllTypes, {
             accessToken,
-            baseUrl: args.baseUrl,
-        });
-        // Sync athlete profile
-        const athlete = await client.getAthlete();
-        const athleteData = transformAthlete(athlete);
-        const _athleteId = await ctx.runMutation(api.public.ingestAthlete, {
             connectionId,
             userId: args.userId,
-            ...athleteData,
-        });
-        // Sync activities (optionally incremental via `after`)
-        const summaries = await client.listAllActivities({
             after: args.after,
         });
-        let synced = 0;
-        const errors = [];
-        for (const summary of summaries) {
-            try {
-                const detailed = await client.getActivity(summary.id);
-                const streams = args.includeStreams
-                    ? await client.getActivityStreams(summary.id)
-                    : undefined;
-                const data = transformActivity(detailed, { streams });
-                const _activityId = await ctx.runMutation(api.public.ingestActivity, {
-                    connectionId,
-                    userId: args.userId,
-                    ...data,
-                });
-                synced++;
-            }
-            catch (err) {
-                errors.push({
-                    activityId: summary.id,
-                    error: err instanceof Error ? err.message : String(err),
-                });
-            }
-        }
         // 5. Update lastDataUpdate timestamp
-        const _updated = await ctx.runMutation(api.public.updateConnection, {
+        await ctx.runMutation(api.public.updateConnection, {
             connectionId,
             lastDataUpdate: new Date().toISOString(),
         });
+        return { synced: result.synced, errors: result.errors };
+    },
+});
+// ─── Sync Engine ────────────────────────────────────────────────────────────
+/**
+ * Fetch and ingest all Strava data types for a connected user.
+ *
+ * Called by the public actions (connectStrava, completeStravaOAuth, syncStrava)
+ * after obtaining a valid access token.
+ */
+export const syncAllTypes = action({
+    args: {
+        accessToken: v.string(),
+        connectionId: v.id("connections"),
+        userId: v.string(),
+        after: v.optional(v.number()),
+        before: v.optional(v.number()),
+    },
+    handler: async (ctx, args) => {
+        const { accessToken, connectionId, userId } = args;
+        const client = createStravaClient(accessToken);
+        const synced = { athletes: 0, activities: 0 };
+        const errors = [];
+        // ── Athlete ──────────────────────────────────────────────────────────
+        try {
+            const { data: athlete, error } = await getLoggedInAthlete({ client });
+            if (error || !athlete)
+                throw new Error(error ? JSON.stringify(error) : "No athlete data");
+            const data = transformAthlete(athlete);
+            await ctx.runMutation(api.public.ingestAthlete, {
+                connectionId,
+                userId,
+                ...data,
+            });
+            synced.athletes++;
+        }
+        catch (err) {
+            errors.push({
+                type: "athlete",
+                id: "fetch",
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+        // ── Activities ───────────────────────────────────────────────────────
+        try {
+            const summaries = await listAllActivities(client, {
+                after: args.after,
+                before: args.before,
+            });
+            for (const summary of summaries) {
+                if (summary.id == null)
+                    continue;
+                try {
+                    const { data: detailed, error: detailError } = await getActivityById({ client, path: { id: summary.id } });
+                    if (detailError || !detailed)
+                        throw new Error(detailError ? JSON.stringify(detailError) : "No activity data");
+                    const { data: streams } = await getActivityStreams({
+                        client,
+                        path: { id: summary.id },
+                        query: {
+                            keys: ["time", "heartrate", "watts", "cadence", "latlng", "altitude", "velocity_smooth", "grade_smooth", "distance", "temp"],
+                            key_by_type: true,
+                        },
+                    });
+                    const data = transformActivity(detailed, { streams: streams ?? undefined });
+                    await ctx.runMutation(api.public.ingestActivity, {
+                        connectionId,
+                        userId,
+                        ...data,
+                    });
+                    synced.activities++;
+                }
+                catch (err) {
+                    errors.push({
+                        type: "activity",
+                        id: String(summary.id),
+                        error: err instanceof Error ? err.message : String(err),
+                    });
+                }
+            }
+        }
+        catch (err) {
+            errors.push({
+                type: "activity",
+                id: "fetch",
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
         return { synced, errors };
     },
 });
+// ─── Disconnect ─────────────────────────────────────────────────────────────
 /**
  * Disconnect a user from Strava.
  *
@@ -217,7 +345,6 @@ export const disconnectStrava = action({
         userId: v.string(),
         clientId: v.string(),
         clientSecret: v.string(),
-        baseUrl: v.optional(v.string()),
     },
     returns: v.null(),
     handler: async (ctx, args) => {
@@ -231,8 +358,7 @@ export const disconnectStrava = action({
         const tokenDoc = await ctx.runQuery(internal.strava.private.getTokens, { connectionId });
         if (tokenDoc) {
             try {
-                const base = (args.baseUrl ?? "https://www.strava.com").replace(/\/+$/, "");
-                await fetch(`${base}/oauth/deauthorize`, {
+                await fetch("https://www.strava.com/oauth/deauthorize", {
                     method: "POST",
                     headers: { "Content-Type": "application/x-www-form-urlencoded" },
                     body: `access_token=${tokenDoc.accessToken}`,