Implements tasks 1.3, 3.2-3.3, 4.1-4.4, 5.1-5.6, 6.1 of
deepen-connected-services. Built TDD: contract test red, adapter green
for each capability seam.
Capability adapters (providers/wahoo/):
- importer.ts: Importer seam — listImportable + importOne against
Wahoo /v1/workouts. Filters fitness_app_id >= 1000 (Wahoo doesn't
share third-party data). 2 contract tests green.
- pusher.ts: RoutePusher seam — pushRoute(ctx, input) -> {remoteId,
version}. FIT-Course conversion, route:<id> external_id, PUT-vs-POST
decision, PUT->POST-on-404 fallback all internal to the adapter
(per ADR-0003). Idempotency via sync_pushes preserved. 4 contract
tests green.
- webhook.ts: WebhookReceiver seam — parseWebhook + handle. Routes
events to local users via provider_user_id; unknown user returns
silently. 6 contract tests green.
- manifest.ts: declares credential_kind=oauth, OAuth config, scopes,
buildAuthUrl, exchangeCode, and references each capability adapter.
Module shape:
- connected-services/index.ts: side-effect imports providers/index.ts
to register manifests, then re-exports manager + registry + types.
- connected-services/providers/index.ts: barrel that calls
registerManifest(wahooManifest).
- connected-services/oauth-state.server.ts: OAuth state encode/decode
(extracted from legacy pushes.server.ts).
- connected-services/push-action.server.ts: orchestration above the
RoutePusher seam — load route, ownership check, scope check, build
RoutePushInput, invoke pusher, return PushOutcome union. Replaces
the legacy pushRouteToProvider in lib/sync/pushes.server.ts.
Caller migration (group 5):
- api.sync.connect.$provider.ts -> manifest.buildAuthUrl
- api.sync.callback.$provider.ts -> manifest.exchangeCode + link()
- api.sync.disconnect.$provider.ts -> unlinkByUserProvider (calls
best-effort revoke via the credential adapter, then deletes locally)
- api.sync.webhook.$provider.ts -> manifest.webhookReceiver dispatch
- api.sync.push.$provider.$routeId.ts -> push-action.pushRouteToProvider
- sync.import.$provider.tsx -> manifest.importer.listImportable +
inline FIT->GPX in the action (form-supplied metadata bypasses the
Importer seam which is reserved for automatic / webhook imports)
- routes.$id.tsx -> getService instead of getConnection
- settings.connections.tsx -> getAllManifests instead of legacy registry
Legacy lib/sync/ deleted except imports.server.ts (which manages the
sync_imports table, untouched by this change).
DB migration verified locally (task 1.3): pnpm db:migrate-data renamed
the table and backfilled credentials JSONB; pnpm db:push then dropped
the legacy access_token/refresh_token/expires_at columns. Final shape
matches the schema; check constraints + unique index in place.
Test status (task 6.1):
- pnpm typecheck: green across all 15 workspaces
- pnpm lint: green
- @trails-cool/journal: 112 passed, 31 skipped — 12 fewer tests than
before because pushes.server.test.ts and the legacy wahoo.test.ts
were deleted. Their coverage is replaced by the new contract tests
(importer/pusher/webhook) plus manager.test.ts + oauth.test.ts.
Remaining: 6.2 (e2e), 6.3-6.4 (manual smoke + staging migration test),
7.1-7.3 (followups + spec deltas at archive).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
115 lines
3.9 KiB
TypeScript
115 lines
3.9 KiB
TypeScript
// Orchestrates a route push: load route, check ownership, check scopes,
|
|
// build the RoutePushInput, and invoke the provider's RoutePusher
|
|
// capability. Replaces the legacy pushRouteToProvider in lib/sync.
|
|
//
|
|
// The pusher (per-provider) handles HTTP, FIT conversion, idempotency,
|
|
// and PUT/POST/404 fallback. This module is the orchestration layer
|
|
// callers use (route handlers, OAuth callback resume).
|
|
|
|
import { desc, eq } from "drizzle-orm";
|
|
import { parseGpxAsync } from "@trails-cool/gpx";
|
|
import { routeVersions } from "@trails-cool/db/schema/journal";
|
|
import { getDb } from "../db.ts";
|
|
import { getRoute } from "../routes.server.ts";
|
|
import {
|
|
ConnectionNotActiveError,
|
|
NeedsRelinkError,
|
|
} from "./types.ts";
|
|
import { capabilityContextFor, getService } from "./manager.ts";
|
|
import { getManifest, type RoutePushInput } from "./registry.ts";
|
|
|
|
export type PushOutcome =
|
|
| { status: "success"; remoteId: string; pushedAt: Date }
|
|
| { status: "scope_missing" }
|
|
| { status: "no_connection" }
|
|
| { status: "not_owner" }
|
|
| { status: "not_found" }
|
|
| { status: "unsupported_provider" }
|
|
| { status: "no_geometry" }
|
|
| { status: "needs_relink" }
|
|
| {
|
|
status: "error";
|
|
code: "validation" | "rate_limit" | "token_expired" | "generic";
|
|
message: string;
|
|
};
|
|
|
|
export interface PushRouteOptions {
|
|
userId: string;
|
|
providerId: string;
|
|
routeId: string;
|
|
}
|
|
|
|
export async function pushRouteToProvider(
|
|
opts: PushRouteOptions,
|
|
): Promise<PushOutcome> {
|
|
const { userId, providerId, routeId } = opts;
|
|
const db = getDb();
|
|
|
|
const manifest = getManifest(providerId);
|
|
if (!manifest) return { status: "not_found" };
|
|
if (!manifest.routePusher) return { status: "unsupported_provider" };
|
|
|
|
const route = await getRoute(routeId);
|
|
if (!route) return { status: "not_found" };
|
|
if (route.ownerId !== userId) return { status: "not_owner" };
|
|
|
|
const service = await getService(userId, providerId);
|
|
if (!service) return { status: "no_connection" };
|
|
if (!service.grantedScopes.includes("routes_write")) {
|
|
return { status: "scope_missing" };
|
|
}
|
|
|
|
// Pull the locked-in version GPX (not routes.gpx, which is the working copy).
|
|
const [latestVersion] = await db
|
|
.select()
|
|
.from(routeVersions)
|
|
.where(eq(routeVersions.routeId, routeId))
|
|
.orderBy(desc(routeVersions.version))
|
|
.limit(1);
|
|
|
|
const versionGpx = latestVersion?.gpx ?? route.gpx;
|
|
const versionNumber = latestVersion?.version ?? 1;
|
|
if (!versionGpx) return { status: "no_geometry" };
|
|
|
|
const parsed = await parseGpxAsync(versionGpx);
|
|
const points = parsed.tracks.flat();
|
|
if (points.length === 0) return { status: "no_geometry" };
|
|
|
|
const input: RoutePushInput = {
|
|
routeId,
|
|
routeName: route.name,
|
|
description: route.description ?? undefined,
|
|
gpx: versionGpx,
|
|
startLat: points[0]!.lat,
|
|
startLng: points[0]!.lon,
|
|
distance: parsed.distance,
|
|
ascent: parsed.elevation.gain,
|
|
localVersion: versionNumber,
|
|
};
|
|
|
|
try {
|
|
const ctx = capabilityContextFor(service.id);
|
|
const result = await manifest.routePusher.pushRoute(ctx, input);
|
|
return {
|
|
status: "success",
|
|
remoteId: result.remoteId,
|
|
pushedAt: new Date(),
|
|
};
|
|
} catch (err) {
|
|
if (err instanceof NeedsRelinkError) return { status: "needs_relink" };
|
|
if (err instanceof ConnectionNotActiveError) return { status: "needs_relink" };
|
|
const message = err instanceof Error ? err.message : String(err);
|
|
// Map known HTTP-shape errors. The pusher throws Error / WahooHttpError;
|
|
// we don't try to recover further here.
|
|
if (message.includes("422")) {
|
|
return { status: "error", code: "validation", message };
|
|
}
|
|
if (message.includes("429")) {
|
|
return { status: "error", code: "rate_limit", message };
|
|
}
|
|
if (message.includes("401") || message.includes("403")) {
|
|
return { status: "error", code: "token_expired", message };
|
|
}
|
|
return { status: "error", code: "generic", message };
|
|
}
|
|
}
|