suunto-api-wrapper 1.3.0 → 1.4.0

package/dist/index.d.mts

@@ -81,6 +81,19 @@ interface LoginResponse {
     [key: string]: unknown;
 }
 
+interface AuthSessionInit {
+    email?: string;
+    sessionKey?: string;
+}
+declare class AuthSession {
+    private readonly XTOTP_HEADER;
+    private readonly AUTH_HEADER;
+    readonly email?: string;
+    readonly sessionKey?: string;
+    constructor(init?: AuthSessionInit);
+    applyTo(ctx: Pick<RequestContext, "headers">): Promise<void>;
+}
+
 declare const SPORTS_TRACKER_API = "https://api.sports-tracker.com";
 declare const DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36";
 declare function login(options: LoginOptions): Promise<LoginResponse>;
@@ -646,18 +659,6 @@ interface WorkoutStatsResponse {
     };
 }
 
-declare function getWorkouts(client: HttpClient, username: string, params?: GetWorkoutsParams): Promise<WorkoutsResponse>;
-declare function getOwnWorkouts(client: HttpClient, params?: GetOwnWorkoutsParams): Promise<WorkoutsResponse>;
-/**
- * Public workouts whose center position falls inside the given geographic
- * bounding box. Used by the "explore nearby" map view. Unauthenticated.
- */
-declare function getWorkoutsWithin(client: HttpClient, params: GetWorkoutsWithinParams): Promise<WorkoutsWithinResponse>;
-/**
- * Aggregated workout stats per activity for a user. Unauthenticated — no
- * session required.
- */
-declare function getWorkoutStats(client: HttpClient, username: string): Promise<WorkoutStatsResponse>;
 /** Workout endpoints, bound to an {@link HttpClient}. Accessed via `suunto.workouts`. */
 declare class WorkoutsResource {
     private readonly client;
@@ -676,17 +677,13 @@ declare class WorkoutsResource {
      * unauthenticated.
      */
     stats(username: string): Promise<WorkoutStatsResponse>;
-    /** Public workouts whose center falls inside a geographic bounding box. */
+    /**
+     * Public workouts whose center position falls inside the given geographic
+     * bounding box. Used by the "explore nearby" map view. Unauthenticated.
+     */
     within(params: GetWorkoutsWithinParams): Promise<WorkoutsWithinResponse>;
 }
 
-/**
- * Fetch a user's public profile by username. Unauthenticated — no session
- * required.
- */
-declare function getUserByName(client: HttpClient, username: string): Promise<UserProfileResponse>;
-/** Search for users by name/username. */
-declare function searchUsers(client: HttpClient, searchTerms: string): Promise<UserSearchResponse>;
 /** User endpoints, bound to an {@link HttpClient}. Accessed via `suunto.users`. */
 declare class UsersResource {
     private readonly client;
@@ -714,13 +711,11 @@ interface GearResponse {
     };
 }
 
-/** A user's latest gear. */
-declare function getLatestGear(client: HttpClient, username: string, params?: GetLatestGearParams): Promise<GearResponse>;
 /** Gear endpoints, bound to an {@link HttpClient}. Accessed via `suunto.gear`. */
 declare class GearResource {
     private readonly client;
     constructor(client: HttpClient);
-    /** A user's latest (?) gear. */
+    /** A user's latest gear. */
     latest(username: string, params?: GetLatestGearParams): Promise<GearResponse>;
 }
 
@@ -790,25 +785,26 @@ type SleepStagesExportResponse = SleepStageInterval[];
 type RecoveryExportResponse = RecoveryEntry[];
 type ActivityExportResponse = ActivityEntry[];
 
-/** Sleep summaries from the 247 service. */
-declare function getSleepExport(client: HttpClient, params?: ExportParams): Promise<SleepExportResponse>;
-/** Per-stage sleep intervals from the 247 service. */
-declare function getSleepStagesExport(client: HttpClient, params?: ExportParams): Promise<SleepStagesExportResponse>;
-/** Recovery entries (balance + stress state) from the 247 service. */
-declare function getRecoveryExport(client: HttpClient, params?: ExportParams): Promise<RecoveryExportResponse>;
-/** Daily activity entries from the 247 service. */
-declare function getActivityExport(client: HttpClient, params?: ExportParams): Promise<ActivityExportResponse>;
+interface WellnessResourceOptions extends Omit<HttpClientOptions, "beforeRequest" | "baseUrl"> {
+    auth: AuthSession;
+    baseUrl?: string;
+}
 /**
  * Endpoints served by `https://247.sports-tracker.com` (sleep, recovery,
- * activity). Bound to a dedicated {@link HttpClient} configured against that
- * host. Accessed via `suunto.wellness`.
+ * activity). Owns its own {@link HttpClient} configured against that host,
+ * including the wellness-specific wildcard accept header. Accessed via
+ * `suunto.wellness`.
  */
 declare class WellnessResource {
-    private readonly client;
-    constructor(client: HttpClient);
+    readonly http: HttpClient;
+    constructor(options: WellnessResourceOptions);
+    /** Sleep summaries from the 247 service. */
     sleep(params?: ExportParams): Promise<SleepExportResponse>;
+    /** Per-stage sleep intervals from the 247 service. */
     sleepStages(params?: ExportParams): Promise<SleepStagesExportResponse>;
+    /** Recovery entries (balance + stress state) from the 247 service. */
     recovery(params?: ExportParams): Promise<RecoveryExportResponse>;
+    /** Daily activity entries from the 247 service. */
     activity(params?: ExportParams): Promise<ActivityExportResponse>;
 }
 
@@ -840,8 +836,6 @@ declare class SuuntoClient {
     readonly http: HttpClient;
     /** Session key in use, if the client was authenticated. */
     readonly sessionKey?: string;
-    /** Dedicated HTTP client for the 247 host (sleep/recovery/activity). */
-    readonly http247: HttpClient;
     readonly workouts: WorkoutsResource;
     readonly users: UsersResource;
     readonly gear: GearResource;
@@ -856,4 +850,4 @@ declare class SuuntoClient {
     static unauthenticated(options?: Omit<SuuntoClientOptions, "email" | "sessionKey">): SuuntoClient;
 }
 
-export { type ActivityCounts, type ActivityData, type ActivityEntry, type ActivityExportResponse, type Cadence, type ClientCalculatedAchievements, type CumulativeAchievement, DEFAULT_USER_AGENT, type ExportEntry, type ExportParams, type FitnessExtension, type Gear, GearResource, type GearResponse, type GearSummary, type GetLatestGearParams, type GetOwnWorkoutsParams, type GetWorkoutsParams, type GetWorkoutsWithinParams, type HeartRateRecovery, type HrData, HttpClient, type HttpClientOptions, HttpError, type HttpResponse, type IntensityExtension, type IntensityZone, type IntensityZones, type LoginOptions, type LoginResponse, type PersonalBestAchievement, type Position, type Query, type Rankings, type RecoveryData, type RecoveryEntry, type RecoveryExportResponse, type RequestBody, type RequestContext, type RequestOptions, type RouteRanking, SPORTS_TRACKER_247_API, SPORTS_TRACKER_API, type SearchUser, type SleepExportResponse, type SleepStage, type SleepStageData, type SleepStageInterval, type SleepStagesExportResponse, type SleepSummary, type SleepSummaryData, type SummaryExtension, SuuntoActivityType, SuuntoClient, type SuuntoClientOptions, type SwimmingHeaderExtension, type TssEntry, type UserProfile, type UserProfileResponse, type UserSearchResponse, type UserSearchResult, UsersResource, type WeatherExtension, WellnessResource, type Workout, type WorkoutComment, type WorkoutExtension, type WorkoutReaction, type WorkoutStats, type WorkoutStatsEntry, type WorkoutStatsResponse, WorkoutsResource, type WorkoutsResponse, type WorkoutsWithinItem, type WorkoutsWithinResponse, generateXtotp, getActivityExport, getLatestGear, getOwnWorkouts, getRecoveryExport, getSleepExport, getSleepStagesExport, getUserByName, getWorkoutStats, getWorkouts, getWorkoutsWithin, login, searchUsers, secondsUntilRollover, sessionTokenFrom };
+export { type ActivityCounts, type ActivityData, type ActivityEntry, type ActivityExportResponse, type Cadence, type ClientCalculatedAchievements, type CumulativeAchievement, DEFAULT_USER_AGENT, type ExportEntry, type ExportParams, type FitnessExtension, type Gear, GearResource, type GearResponse, type GearSummary, type GetLatestGearParams, type GetOwnWorkoutsParams, type GetWorkoutsParams, type GetWorkoutsWithinParams, type HeartRateRecovery, type HrData, HttpClient, type HttpClientOptions, HttpError, type HttpResponse, type IntensityExtension, type IntensityZone, type IntensityZones, type LoginOptions, type LoginResponse, type PersonalBestAchievement, type Position, type Query, type Rankings, type RecoveryData, type RecoveryEntry, type RecoveryExportResponse, type RequestBody, type RequestContext, type RequestOptions, type RouteRanking, SPORTS_TRACKER_247_API, SPORTS_TRACKER_API, type SearchUser, type SleepExportResponse, type SleepStage, type SleepStageData, type SleepStageInterval, type SleepStagesExportResponse, type SleepSummary, type SleepSummaryData, type SummaryExtension, SuuntoActivityType, SuuntoClient, type SuuntoClientOptions, type SwimmingHeaderExtension, type TssEntry, type UserProfile, type UserProfileResponse, type UserSearchResponse, type UserSearchResult, UsersResource, type WeatherExtension, WellnessResource, type Workout, type WorkoutComment, type WorkoutExtension, type WorkoutReaction, type WorkoutStats, type WorkoutStatsEntry, type WorkoutStatsResponse, WorkoutsResource, type WorkoutsResponse, type WorkoutsWithinItem, type WorkoutsWithinResponse, generateXtotp, login, secondsUntilRollover, sessionTokenFrom };

package/dist/index.d.ts

@@ -81,6 +81,19 @@ interface LoginResponse {
     [key: string]: unknown;
 }
 
+interface AuthSessionInit {
+    email?: string;
+    sessionKey?: string;
+}
+declare class AuthSession {
+    private readonly XTOTP_HEADER;
+    private readonly AUTH_HEADER;
+    readonly email?: string;
+    readonly sessionKey?: string;
+    constructor(init?: AuthSessionInit);
+    applyTo(ctx: Pick<RequestContext, "headers">): Promise<void>;
+}
+
 declare const SPORTS_TRACKER_API = "https://api.sports-tracker.com";
 declare const DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36";
 declare function login(options: LoginOptions): Promise<LoginResponse>;
@@ -646,18 +659,6 @@ interface WorkoutStatsResponse {
     };
 }
 
-declare function getWorkouts(client: HttpClient, username: string, params?: GetWorkoutsParams): Promise<WorkoutsResponse>;
-declare function getOwnWorkouts(client: HttpClient, params?: GetOwnWorkoutsParams): Promise<WorkoutsResponse>;
-/**
- * Public workouts whose center position falls inside the given geographic
- * bounding box. Used by the "explore nearby" map view. Unauthenticated.
- */
-declare function getWorkoutsWithin(client: HttpClient, params: GetWorkoutsWithinParams): Promise<WorkoutsWithinResponse>;
-/**
- * Aggregated workout stats per activity for a user. Unauthenticated — no
- * session required.
- */
-declare function getWorkoutStats(client: HttpClient, username: string): Promise<WorkoutStatsResponse>;
 /** Workout endpoints, bound to an {@link HttpClient}. Accessed via `suunto.workouts`. */
 declare class WorkoutsResource {
     private readonly client;
@@ -676,17 +677,13 @@ declare class WorkoutsResource {
      * unauthenticated.
      */
     stats(username: string): Promise<WorkoutStatsResponse>;
-    /** Public workouts whose center falls inside a geographic bounding box. */
+    /**
+     * Public workouts whose center position falls inside the given geographic
+     * bounding box. Used by the "explore nearby" map view. Unauthenticated.
+     */
     within(params: GetWorkoutsWithinParams): Promise<WorkoutsWithinResponse>;
 }
 
-/**
- * Fetch a user's public profile by username. Unauthenticated — no session
- * required.
- */
-declare function getUserByName(client: HttpClient, username: string): Promise<UserProfileResponse>;
-/** Search for users by name/username. */
-declare function searchUsers(client: HttpClient, searchTerms: string): Promise<UserSearchResponse>;
 /** User endpoints, bound to an {@link HttpClient}. Accessed via `suunto.users`. */
 declare class UsersResource {
     private readonly client;
@@ -714,13 +711,11 @@ interface GearResponse {
     };
 }
 
-/** A user's latest gear. */
-declare function getLatestGear(client: HttpClient, username: string, params?: GetLatestGearParams): Promise<GearResponse>;
 /** Gear endpoints, bound to an {@link HttpClient}. Accessed via `suunto.gear`. */
 declare class GearResource {
     private readonly client;
     constructor(client: HttpClient);
-    /** A user's latest (?) gear. */
+    /** A user's latest gear. */
     latest(username: string, params?: GetLatestGearParams): Promise<GearResponse>;
 }
 
@@ -790,25 +785,26 @@ type SleepStagesExportResponse = SleepStageInterval[];
 type RecoveryExportResponse = RecoveryEntry[];
 type ActivityExportResponse = ActivityEntry[];
 
-/** Sleep summaries from the 247 service. */
-declare function getSleepExport(client: HttpClient, params?: ExportParams): Promise<SleepExportResponse>;
-/** Per-stage sleep intervals from the 247 service. */
-declare function getSleepStagesExport(client: HttpClient, params?: ExportParams): Promise<SleepStagesExportResponse>;
-/** Recovery entries (balance + stress state) from the 247 service. */
-declare function getRecoveryExport(client: HttpClient, params?: ExportParams): Promise<RecoveryExportResponse>;
-/** Daily activity entries from the 247 service. */
-declare function getActivityExport(client: HttpClient, params?: ExportParams): Promise<ActivityExportResponse>;
+interface WellnessResourceOptions extends Omit<HttpClientOptions, "beforeRequest" | "baseUrl"> {
+    auth: AuthSession;
+    baseUrl?: string;
+}
 /**
  * Endpoints served by `https://247.sports-tracker.com` (sleep, recovery,
- * activity). Bound to a dedicated {@link HttpClient} configured against that
- * host. Accessed via `suunto.wellness`.
+ * activity). Owns its own {@link HttpClient} configured against that host,
+ * including the wellness-specific wildcard accept header. Accessed via
+ * `suunto.wellness`.
  */
 declare class WellnessResource {
-    private readonly client;
-    constructor(client: HttpClient);
+    readonly http: HttpClient;
+    constructor(options: WellnessResourceOptions);
+    /** Sleep summaries from the 247 service. */
     sleep(params?: ExportParams): Promise<SleepExportResponse>;
+    /** Per-stage sleep intervals from the 247 service. */
     sleepStages(params?: ExportParams): Promise<SleepStagesExportResponse>;
+    /** Recovery entries (balance + stress state) from the 247 service. */
     recovery(params?: ExportParams): Promise<RecoveryExportResponse>;
+    /** Daily activity entries from the 247 service. */
     activity(params?: ExportParams): Promise<ActivityExportResponse>;
 }
 
@@ -840,8 +836,6 @@ declare class SuuntoClient {
     readonly http: HttpClient;
     /** Session key in use, if the client was authenticated. */
     readonly sessionKey?: string;
-    /** Dedicated HTTP client for the 247 host (sleep/recovery/activity). */
-    readonly http247: HttpClient;
     readonly workouts: WorkoutsResource;
     readonly users: UsersResource;
     readonly gear: GearResource;
@@ -856,4 +850,4 @@ declare class SuuntoClient {
     static unauthenticated(options?: Omit<SuuntoClientOptions, "email" | "sessionKey">): SuuntoClient;
 }
 
-export { type ActivityCounts, type ActivityData, type ActivityEntry, type ActivityExportResponse, type Cadence, type ClientCalculatedAchievements, type CumulativeAchievement, DEFAULT_USER_AGENT, type ExportEntry, type ExportParams, type FitnessExtension, type Gear, GearResource, type GearResponse, type GearSummary, type GetLatestGearParams, type GetOwnWorkoutsParams, type GetWorkoutsParams, type GetWorkoutsWithinParams, type HeartRateRecovery, type HrData, HttpClient, type HttpClientOptions, HttpError, type HttpResponse, type IntensityExtension, type IntensityZone, type IntensityZones, type LoginOptions, type LoginResponse, type PersonalBestAchievement, type Position, type Query, type Rankings, type RecoveryData, type RecoveryEntry, type RecoveryExportResponse, type RequestBody, type RequestContext, type RequestOptions, type RouteRanking, SPORTS_TRACKER_247_API, SPORTS_TRACKER_API, type SearchUser, type SleepExportResponse, type SleepStage, type SleepStageData, type SleepStageInterval, type SleepStagesExportResponse, type SleepSummary, type SleepSummaryData, type SummaryExtension, SuuntoActivityType, SuuntoClient, type SuuntoClientOptions, type SwimmingHeaderExtension, type TssEntry, type UserProfile, type UserProfileResponse, type UserSearchResponse, type UserSearchResult, UsersResource, type WeatherExtension, WellnessResource, type Workout, type WorkoutComment, type WorkoutExtension, type WorkoutReaction, type WorkoutStats, type WorkoutStatsEntry, type WorkoutStatsResponse, WorkoutsResource, type WorkoutsResponse, type WorkoutsWithinItem, type WorkoutsWithinResponse, generateXtotp, getActivityExport, getLatestGear, getOwnWorkouts, getRecoveryExport, getSleepExport, getSleepStagesExport, getUserByName, getWorkoutStats, getWorkouts, getWorkoutsWithin, login, searchUsers, secondsUntilRollover, sessionTokenFrom };
+export { type ActivityCounts, type ActivityData, type ActivityEntry, type ActivityExportResponse, type Cadence, type ClientCalculatedAchievements, type CumulativeAchievement, DEFAULT_USER_AGENT, type ExportEntry, type ExportParams, type FitnessExtension, type Gear, GearResource, type GearResponse, type GearSummary, type GetLatestGearParams, type GetOwnWorkoutsParams, type GetWorkoutsParams, type GetWorkoutsWithinParams, type HeartRateRecovery, type HrData, HttpClient, type HttpClientOptions, HttpError, type HttpResponse, type IntensityExtension, type IntensityZone, type IntensityZones, type LoginOptions, type LoginResponse, type PersonalBestAchievement, type Position, type Query, type Rankings, type RecoveryData, type RecoveryEntry, type RecoveryExportResponse, type RequestBody, type RequestContext, type RequestOptions, type RouteRanking, SPORTS_TRACKER_247_API, SPORTS_TRACKER_API, type SearchUser, type SleepExportResponse, type SleepStage, type SleepStageData, type SleepStageInterval, type SleepStagesExportResponse, type SleepSummary, type SleepSummaryData, type SummaryExtension, SuuntoActivityType, SuuntoClient, type SuuntoClientOptions, type SwimmingHeaderExtension, type TssEntry, type UserProfile, type UserProfileResponse, type UserSearchResponse, type UserSearchResult, UsersResource, type WeatherExtension, WellnessResource, type Workout, type WorkoutComment, type WorkoutExtension, type WorkoutReaction, type WorkoutStats, type WorkoutStatsEntry, type WorkoutStatsResponse, WorkoutsResource, type WorkoutsResponse, type WorkoutsWithinItem, type WorkoutsWithinResponse, generateXtotp, login, secondsUntilRollover, sessionTokenFrom };

package/dist/index.js

@@ -32,18 +32,7 @@ __export(index_exports, {
   WellnessResource: () => WellnessResource,
   WorkoutsResource: () => WorkoutsResource,
   generateXtotp: () => generateXtotp,
-  getActivityExport: () => getActivityExport,
-  getLatestGear: () => getLatestGear,
-  getOwnWorkouts: () => getOwnWorkouts,
-  getRecoveryExport: () => getRecoveryExport,
-  getSleepExport: () => getSleepExport,
-  getSleepStagesExport: () => getSleepStagesExport,
-  getUserByName: () => getUserByName,
-  getWorkoutStats: () => getWorkoutStats,
-  getWorkouts: () => getWorkouts,
-  getWorkoutsWithin: () => getWorkoutsWithin,
   login: () => login,
-  searchUsers: () => searchUsers,
   secondsUntilRollover: () => secondsUntilRollover,
   sessionTokenFrom: () => sessionTokenFrom
 });
@@ -61,6 +50,12 @@ var HttpError = class extends Error {
   }
 };
 
+// src/http/endpoint.ts
+async function endpoint(client, spec) {
+  const res = spec.query === void 0 ? await client.get(spec.path) : await client.get(spec.path, { query: spec.query });
+  return res.data;
+}
+
 // src/http/index.ts
 var DEFAULTS = {
   timeoutMs: 3e4,
@@ -273,6 +268,20 @@ function secondsUntilRollover(now = Date.now()) {
   return periodSeconds - Math.floor(now / 1e3) % periodSeconds;
 }
 
+// src/auth/session.ts
+var AuthSession = class {
+  constructor(init = {}) {
+    this.XTOTP_HEADER = "x-totp";
+    this.AUTH_HEADER = "sttauthorization";
+    this.email = init.email;
+    this.sessionKey = init.sessionKey;
+  }
+  async applyTo(ctx) {
+    if (this.email) ctx.headers[this.XTOTP_HEADER] = await generateXtotp(this.email);
+    if (this.sessionKey) ctx.headers[this.AUTH_HEADER] = this.sessionKey;
+  }
+};
+
 // src/auth/index.ts
 var SPORTS_TRACKER_API = "https://api.sports-tracker.com";
 var DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36";
@@ -288,13 +297,14 @@ async function login(options) {
   } = options;
   const http = new HttpClient({ baseUrl, fetch: fetchImpl, timeoutMs });
   const body = new URLSearchParams({ l: email, p: password, version });
+  const headers = {
+    "user-agent": userAgent,
+    "content-type": "application/x-www-form-urlencoded"
+  };
+  await new AuthSession({ email }).applyTo({ headers });
   const response = await http.post("/apiserver/v1/login2", {
     body,
-    headers: {
-      "user-agent": userAgent,
-      "x-totp": await generateXtotp(email),
-      "content-type": "application/x-www-form-urlencoded"
-    }
+    headers
   });
   return response.data;
 }
@@ -439,138 +449,100 @@ var DEFAULT_WORKOUT_ADDITIONAL_DATA = [
   "comments" /* Comments */,
   "user_reacted" /* UserReacted */
 ];
-async function getWorkouts(client, username, params = {}) {
-  const { limit = 40, sortonst = true } = params;
-  const res = await client.get(
-    `/apiserver/v1/workouts/${encodeURIComponent(username)}/public`,
-    { query: { limit, sortonst } }
-  );
-  return res.data;
-}
-async function getOwnWorkouts(client, params = {}) {
-  const { offset = 0, limit = 50, since = 0 } = params;
-  const searchParams = new URLSearchParams();
-  searchParams.append("offset", String(offset));
-  searchParams.append("limit", String(limit));
-  searchParams.append("since", String(since));
-  const res = await client.get(
-    `/apiserver/v1/workouts?${searchParams.toString()}`
-  );
-  return res.data;
-}
-async function getWorkout(client, username, workoutKey, params = {}) {
-  const {
-    extensions = DEFAULT_WORKOUT_EXTENSIONS,
-    additionalData = DEFAULT_WORKOUT_ADDITIONAL_DATA
-  } = params;
-  const res = await client.get(
-    `/apiserver/v2/workouts/${encodeURIComponent(username)}/${encodeURIComponent(workoutKey)}/combined`,
-    {
-      query: {
-        extensions: extensions.join(","),
-        additionalData: additionalData.join(",")
-      }
-    }
-  );
-  return res.data;
-}
-async function getWorkoutsWithin(client, params) {
-  const { lowerLat, lowerLng, upperLat, upperLng, limit = 50 } = params;
-  const res = await client.get(
-    "/apiserver/v1/workouts/public/within",
-    {
-      query: {
-        lowerlat: lowerLat,
-        lowerlng: lowerLng,
-        upperlat: upperLat,
-        upperlng: upperLng,
-        limit
-      }
-    }
-  );
-  return res.data;
-}
-async function getWorkoutStats(client, username) {
-  const res = await client.get(
-    `/apiserver/v1/workouts/${encodeURIComponent(username)}/stats`
-  );
-  return res.data;
-}
 var WorkoutsResource = class {
   constructor(client) {
     this.client = client;
   }
   /** The authenticated user's own workouts. */
-  own(params) {
-    return getOwnWorkouts(this.client, params);
+  own(params = {}) {
+    return endpoint(this.client, {
+      path: "/apiserver/v1/workouts",
+      query: {
+        offset: params.offset ?? 0,
+        limit: params.limit ?? 50,
+        since: params.since ?? 0
+      }
+    });
   }
   /** A given user's public workouts. */
-  public(username, params) {
-    return getWorkouts(this.client, username, params);
+  public(username, params = {}) {
+    return endpoint(this.client, {
+      path: `/apiserver/v1/workouts/${encodeURIComponent(username)}/public`,
+      query: { limit: params.limit ?? 40, sortonst: params.sortonst ?? true }
+    });
   }
   /**
    * A single workout by username and workout key. Works for any public workout
    * and, when the client is authenticated as the owner, for private ones too.
    */
-  byKey(username, workoutKey, params) {
-    return getWorkout(this.client, username, workoutKey, params);
+  byKey(username, workoutKey, params = {}) {
+    const extensions = params.extensions ?? DEFAULT_WORKOUT_EXTENSIONS;
+    const additionalData = params.additionalData ?? DEFAULT_WORKOUT_ADDITIONAL_DATA;
+    return endpoint(this.client, {
+      path: `/apiserver/v2/workouts/${encodeURIComponent(username)}/${encodeURIComponent(workoutKey)}/combined`,
+      query: {
+        extensions: extensions.join(","),
+        additionalData: additionalData.join(",")
+      }
+    });
   }
   /**
    * Aggregated workout stats per activity for the given user. Works
    * unauthenticated.
    */
   stats(username) {
-    return getWorkoutStats(this.client, username);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/workouts/${encodeURIComponent(username)}/stats`
+    });
   }
-  /** Public workouts whose center falls inside a geographic bounding box. */
+  /**
+   * Public workouts whose center position falls inside the given geographic
+   * bounding box. Used by the "explore nearby" map view. Unauthenticated.
+   */
   within(params) {
-    return getWorkoutsWithin(this.client, params);
+    return endpoint(this.client, {
+      path: "/apiserver/v1/workouts/public/within",
+      query: {
+        lowerlat: params.lowerLat,
+        lowerlng: params.lowerLng,
+        upperlat: params.upperLat,
+        upperlng: params.upperLng,
+        limit: params.limit ?? 50
+      }
+    });
   }
 };
 
 // src/users/index.ts
-async function getUserByName(client, username) {
-  const res = await client.get(
-    `/apiserver/v1/user/name/${encodeURIComponent(username)}`
-  );
-  return res.data;
-}
-async function searchUsers(client, searchTerms) {
-  const res = await client.get(
-    `/apiserver/v1/user/search/${encodeURIComponent(searchTerms)}`
-  );
-  return res.data;
-}
 var UsersResource = class {
   constructor(client) {
     this.client = client;
   }
   /** A user's public profile, by username. */
   byName(username) {
-    return getUserByName(this.client, username);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/user/name/${encodeURIComponent(username)}`
+    });
   }
   /** Search for users by name/username. */
   search(searchTerms) {
-    return searchUsers(this.client, searchTerms);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/user/search/${encodeURIComponent(searchTerms)}`
+    });
   }
 };
 
 // src/gear/index.ts
-async function getLatestGear(client, username, params = {}) {
-  const { allTypes = true } = params;
-  const res = await client.get(
-    `/apiserver/v1/gear/${encodeURIComponent(username)}/latest`,
-    { query: { allTypes } }
-  );
-  return res.data;
-}
 var GearResource = class {
   constructor(client) {
     this.client = client;
   }
-  /** A user's latest (?) gear. */
-  latest(username, params) {
-    return getLatestGear(this.client, username, params);
+  /** A user's latest gear. */
+  latest(username, params = {}) {
+    return endpoint(this.client, {
+      path: `/apiserver/v1/gear/${encodeURIComponent(username)}/latest`,
+      query: { allTypes: params.allTypes ?? true }
+    });
   }
 };
 
@@ -578,49 +550,46 @@ var GearResource = class {
 var SPORTS_TRACKER_247_API = "https://247.sports-tracker.com";
 
 // src/wellness/index.ts
-function exportQuery(params) {
-  return params.since == null ? void 0 : { since: params.since };
-}
-async function getSleepExport(client, params = {}) {
-  const res = await client.get("/v1/sleep/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
-async function getSleepStagesExport(client, params = {}) {
-  const res = await client.get(
-    "/v1/sleepstages/export",
-    { query: exportQuery(params) }
-  );
-  return res.data;
-}
-async function getRecoveryExport(client, params = {}) {
-  const res = await client.get("/v1/recovery/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
-async function getActivityExport(client, params = {}) {
-  const res = await client.get("/v1/activity/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
+var exportQuery = (params) => params.since == null ? void 0 : { since: params.since };
 var WellnessResource = class {
-  constructor(client) {
-    this.client = client;
+  constructor(options) {
+    const { auth, baseUrl, ...rest } = options;
+    this.http = new HttpClient({
+      ...rest,
+      baseUrl: baseUrl ?? SPORTS_TRACKER_247_API,
+      beforeRequest: async (ctx) => {
+        await auth.applyTo(ctx);
+        ctx.headers["accept"] = "*/*";
+      }
+    });
   }
-  sleep(params) {
-    return getSleepExport(this.client, params);
+  /** Sleep summaries from the 247 service. */
+  sleep(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/sleep/export",
+      query: exportQuery(params)
+    });
   }
-  sleepStages(params) {
-    return getSleepStagesExport(this.client, params);
+  /** Per-stage sleep intervals from the 247 service. */
+  sleepStages(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/sleepstages/export",
+      query: exportQuery(params)
+    });
   }
-  recovery(params) {
-    return getRecoveryExport(this.client, params);
+  /** Recovery entries (balance + stress state) from the 247 service. */
+  recovery(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/recovery/export",
+      query: exportQuery(params)
+    });
   }
-  activity(params) {
-    return getActivityExport(this.client, params);
+  /** Daily activity entries from the 247 service. */
+  activity(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/activity/export",
+      query: exportQuery(params)
+    });
   }
 };
 
@@ -637,27 +606,23 @@ var SuuntoClient = class _SuuntoClient {
       ...rest
     } = options;
     this.sessionKey = sessionKey;
-    const beforeRequest = async (ctx) => {
-      if (email) ctx.headers["x-totp"] = await generateXtotp(email);
-      if (sessionKey) ctx.headers["sttauthorization"] = sessionKey;
-    };
+    const auth = new AuthSession({ email, sessionKey });
     const sharedHeaders = { "user-agent": userAgent, ...headers };
     this.http = new HttpClient({
       baseUrl: baseUrl ?? SPORTS_TRACKER_API,
       headers: sharedHeaders,
       ...rest,
-      beforeRequest
-    });
-    this.http247 = new HttpClient({
-      baseUrl: baseUrl247 ?? SPORTS_TRACKER_247_API,
-      headers: sharedHeaders,
-      ...rest,
-      beforeRequest
+      beforeRequest: (ctx) => auth.applyTo(ctx)
     });
     this.workouts = new WorkoutsResource(this.http);
     this.users = new UsersResource(this.http);
     this.gear = new GearResource(this.http);
-    this.wellness = new WellnessResource(this.http247);
+    this.wellness = new WellnessResource({
+      auth,
+      baseUrl: baseUrl247,
+      headers: sharedHeaders,
+      ...rest
+    });
   }
   /** Log in with email/password and return an authenticated client. */
   static async login(options) {
@@ -688,18 +653,7 @@ var SuuntoClient = class _SuuntoClient {
   WellnessResource,
   WorkoutsResource,
   generateXtotp,
-  getActivityExport,
-  getLatestGear,
-  getOwnWorkouts,
-  getRecoveryExport,
-  getSleepExport,
-  getSleepStagesExport,
-  getUserByName,
-  getWorkoutStats,
-  getWorkouts,
-  getWorkoutsWithin,
   login,
-  searchUsers,
   secondsUntilRollover,
   sessionTokenFrom
 });

package/dist/index.mjs

@@ -10,6 +10,12 @@ var HttpError = class extends Error {
   }
 };
 
+// src/http/endpoint.ts
+async function endpoint(client, spec) {
+  const res = spec.query === void 0 ? await client.get(spec.path) : await client.get(spec.path, { query: spec.query });
+  return res.data;
+}
+
 // src/http/index.ts
 var DEFAULTS = {
   timeoutMs: 3e4,
@@ -222,6 +228,20 @@ function secondsUntilRollover(now = Date.now()) {
   return periodSeconds - Math.floor(now / 1e3) % periodSeconds;
 }
 
+// src/auth/session.ts
+var AuthSession = class {
+  constructor(init = {}) {
+    this.XTOTP_HEADER = "x-totp";
+    this.AUTH_HEADER = "sttauthorization";
+    this.email = init.email;
+    this.sessionKey = init.sessionKey;
+  }
+  async applyTo(ctx) {
+    if (this.email) ctx.headers[this.XTOTP_HEADER] = await generateXtotp(this.email);
+    if (this.sessionKey) ctx.headers[this.AUTH_HEADER] = this.sessionKey;
+  }
+};
+
 // src/auth/index.ts
 var SPORTS_TRACKER_API = "https://api.sports-tracker.com";
 var DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36";
@@ -237,13 +257,14 @@ async function login(options) {
   } = options;
   const http = new HttpClient({ baseUrl, fetch: fetchImpl, timeoutMs });
   const body = new URLSearchParams({ l: email, p: password, version });
+  const headers = {
+    "user-agent": userAgent,
+    "content-type": "application/x-www-form-urlencoded"
+  };
+  await new AuthSession({ email }).applyTo({ headers });
   const response = await http.post("/apiserver/v1/login2", {
     body,
-    headers: {
-      "user-agent": userAgent,
-      "x-totp": await generateXtotp(email),
-      "content-type": "application/x-www-form-urlencoded"
-    }
+    headers
   });
   return response.data;
 }
@@ -388,138 +409,100 @@ var DEFAULT_WORKOUT_ADDITIONAL_DATA = [
   "comments" /* Comments */,
   "user_reacted" /* UserReacted */
 ];
-async function getWorkouts(client, username, params = {}) {
-  const { limit = 40, sortonst = true } = params;
-  const res = await client.get(
-    `/apiserver/v1/workouts/${encodeURIComponent(username)}/public`,
-    { query: { limit, sortonst } }
-  );
-  return res.data;
-}
-async function getOwnWorkouts(client, params = {}) {
-  const { offset = 0, limit = 50, since = 0 } = params;
-  const searchParams = new URLSearchParams();
-  searchParams.append("offset", String(offset));
-  searchParams.append("limit", String(limit));
-  searchParams.append("since", String(since));
-  const res = await client.get(
-    `/apiserver/v1/workouts?${searchParams.toString()}`
-  );
-  return res.data;
-}
-async function getWorkout(client, username, workoutKey, params = {}) {
-  const {
-    extensions = DEFAULT_WORKOUT_EXTENSIONS,
-    additionalData = DEFAULT_WORKOUT_ADDITIONAL_DATA
-  } = params;
-  const res = await client.get(
-    `/apiserver/v2/workouts/${encodeURIComponent(username)}/${encodeURIComponent(workoutKey)}/combined`,
-    {
-      query: {
-        extensions: extensions.join(","),
-        additionalData: additionalData.join(",")
-      }
-    }
-  );
-  return res.data;
-}
-async function getWorkoutsWithin(client, params) {
-  const { lowerLat, lowerLng, upperLat, upperLng, limit = 50 } = params;
-  const res = await client.get(
-    "/apiserver/v1/workouts/public/within",
-    {
-      query: {
-        lowerlat: lowerLat,
-        lowerlng: lowerLng,
-        upperlat: upperLat,
-        upperlng: upperLng,
-        limit
-      }
-    }
-  );
-  return res.data;
-}
-async function getWorkoutStats(client, username) {
-  const res = await client.get(
-    `/apiserver/v1/workouts/${encodeURIComponent(username)}/stats`
-  );
-  return res.data;
-}
 var WorkoutsResource = class {
   constructor(client) {
     this.client = client;
   }
   /** The authenticated user's own workouts. */
-  own(params) {
-    return getOwnWorkouts(this.client, params);
+  own(params = {}) {
+    return endpoint(this.client, {
+      path: "/apiserver/v1/workouts",
+      query: {
+        offset: params.offset ?? 0,
+        limit: params.limit ?? 50,
+        since: params.since ?? 0
+      }
+    });
   }
   /** A given user's public workouts. */
-  public(username, params) {
-    return getWorkouts(this.client, username, params);
+  public(username, params = {}) {
+    return endpoint(this.client, {
+      path: `/apiserver/v1/workouts/${encodeURIComponent(username)}/public`,
+      query: { limit: params.limit ?? 40, sortonst: params.sortonst ?? true }
+    });
   }
   /**
    * A single workout by username and workout key. Works for any public workout
    * and, when the client is authenticated as the owner, for private ones too.
    */
-  byKey(username, workoutKey, params) {
-    return getWorkout(this.client, username, workoutKey, params);
+  byKey(username, workoutKey, params = {}) {
+    const extensions = params.extensions ?? DEFAULT_WORKOUT_EXTENSIONS;
+    const additionalData = params.additionalData ?? DEFAULT_WORKOUT_ADDITIONAL_DATA;
+    return endpoint(this.client, {
+      path: `/apiserver/v2/workouts/${encodeURIComponent(username)}/${encodeURIComponent(workoutKey)}/combined`,
+      query: {
+        extensions: extensions.join(","),
+        additionalData: additionalData.join(",")
+      }
+    });
   }
   /**
    * Aggregated workout stats per activity for the given user. Works
    * unauthenticated.
    */
   stats(username) {
-    return getWorkoutStats(this.client, username);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/workouts/${encodeURIComponent(username)}/stats`
+    });
   }
-  /** Public workouts whose center falls inside a geographic bounding box. */
+  /**
+   * Public workouts whose center position falls inside the given geographic
+   * bounding box. Used by the "explore nearby" map view. Unauthenticated.
+   */
   within(params) {
-    return getWorkoutsWithin(this.client, params);
+    return endpoint(this.client, {
+      path: "/apiserver/v1/workouts/public/within",
+      query: {
+        lowerlat: params.lowerLat,
+        lowerlng: params.lowerLng,
+        upperlat: params.upperLat,
+        upperlng: params.upperLng,
+        limit: params.limit ?? 50
+      }
+    });
   }
 };
 
 // src/users/index.ts
-async function getUserByName(client, username) {
-  const res = await client.get(
-    `/apiserver/v1/user/name/${encodeURIComponent(username)}`
-  );
-  return res.data;
-}
-async function searchUsers(client, searchTerms) {
-  const res = await client.get(
-    `/apiserver/v1/user/search/${encodeURIComponent(searchTerms)}`
-  );
-  return res.data;
-}
 var UsersResource = class {
   constructor(client) {
     this.client = client;
   }
   /** A user's public profile, by username. */
   byName(username) {
-    return getUserByName(this.client, username);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/user/name/${encodeURIComponent(username)}`
+    });
   }
   /** Search for users by name/username. */
   search(searchTerms) {
-    return searchUsers(this.client, searchTerms);
+    return endpoint(this.client, {
+      path: `/apiserver/v1/user/search/${encodeURIComponent(searchTerms)}`
+    });
   }
 };
 
 // src/gear/index.ts
-async function getLatestGear(client, username, params = {}) {
-  const { allTypes = true } = params;
-  const res = await client.get(
-    `/apiserver/v1/gear/${encodeURIComponent(username)}/latest`,
-    { query: { allTypes } }
-  );
-  return res.data;
-}
 var GearResource = class {
   constructor(client) {
     this.client = client;
   }
-  /** A user's latest (?) gear. */
-  latest(username, params) {
-    return getLatestGear(this.client, username, params);
+  /** A user's latest gear. */
+  latest(username, params = {}) {
+    return endpoint(this.client, {
+      path: `/apiserver/v1/gear/${encodeURIComponent(username)}/latest`,
+      query: { allTypes: params.allTypes ?? true }
+    });
   }
 };
 
@@ -527,49 +510,46 @@ var GearResource = class {
 var SPORTS_TRACKER_247_API = "https://247.sports-tracker.com";
 
 // src/wellness/index.ts
-function exportQuery(params) {
-  return params.since == null ? void 0 : { since: params.since };
-}
-async function getSleepExport(client, params = {}) {
-  const res = await client.get("/v1/sleep/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
-async function getSleepStagesExport(client, params = {}) {
-  const res = await client.get(
-    "/v1/sleepstages/export",
-    { query: exportQuery(params) }
-  );
-  return res.data;
-}
-async function getRecoveryExport(client, params = {}) {
-  const res = await client.get("/v1/recovery/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
-async function getActivityExport(client, params = {}) {
-  const res = await client.get("/v1/activity/export", {
-    query: exportQuery(params)
-  });
-  return res.data;
-}
+var exportQuery = (params) => params.since == null ? void 0 : { since: params.since };
 var WellnessResource = class {
-  constructor(client) {
-    this.client = client;
+  constructor(options) {
+    const { auth, baseUrl, ...rest } = options;
+    this.http = new HttpClient({
+      ...rest,
+      baseUrl: baseUrl ?? SPORTS_TRACKER_247_API,
+      beforeRequest: async (ctx) => {
+        await auth.applyTo(ctx);
+        ctx.headers["accept"] = "*/*";
+      }
+    });
   }
-  sleep(params) {
-    return getSleepExport(this.client, params);
+  /** Sleep summaries from the 247 service. */
+  sleep(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/sleep/export",
+      query: exportQuery(params)
+    });
   }
-  sleepStages(params) {
-    return getSleepStagesExport(this.client, params);
+  /** Per-stage sleep intervals from the 247 service. */
+  sleepStages(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/sleepstages/export",
+      query: exportQuery(params)
+    });
   }
-  recovery(params) {
-    return getRecoveryExport(this.client, params);
+  /** Recovery entries (balance + stress state) from the 247 service. */
+  recovery(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/recovery/export",
+      query: exportQuery(params)
+    });
   }
-  activity(params) {
-    return getActivityExport(this.client, params);
+  /** Daily activity entries from the 247 service. */
+  activity(params = {}) {
+    return endpoint(this.http, {
+      path: "/v1/activity/export",
+      query: exportQuery(params)
+    });
   }
 };
 
@@ -586,27 +566,23 @@ var SuuntoClient = class _SuuntoClient {
       ...rest
     } = options;
     this.sessionKey = sessionKey;
-    const beforeRequest = async (ctx) => {
-      if (email) ctx.headers["x-totp"] = await generateXtotp(email);
-      if (sessionKey) ctx.headers["sttauthorization"] = sessionKey;
-    };
+    const auth = new AuthSession({ email, sessionKey });
     const sharedHeaders = { "user-agent": userAgent, ...headers };
     this.http = new HttpClient({
       baseUrl: baseUrl ?? SPORTS_TRACKER_API,
       headers: sharedHeaders,
       ...rest,
-      beforeRequest
-    });
-    this.http247 = new HttpClient({
-      baseUrl: baseUrl247 ?? SPORTS_TRACKER_247_API,
-      headers: sharedHeaders,
-      ...rest,
-      beforeRequest
+      beforeRequest: (ctx) => auth.applyTo(ctx)
     });
     this.workouts = new WorkoutsResource(this.http);
     this.users = new UsersResource(this.http);
     this.gear = new GearResource(this.http);
-    this.wellness = new WellnessResource(this.http247);
+    this.wellness = new WellnessResource({
+      auth,
+      baseUrl: baseUrl247,
+      headers: sharedHeaders,
+      ...rest
+    });
   }
   /** Log in with email/password and return an authenticated client. */
   static async login(options) {
@@ -636,18 +612,7 @@ export {
   WellnessResource,
   WorkoutsResource,
   generateXtotp,
-  getActivityExport,
-  getLatestGear,
-  getOwnWorkouts,
-  getRecoveryExport,
-  getSleepExport,
-  getSleepStagesExport,
-  getUserByName,
-  getWorkoutStats,
-  getWorkouts,
-  getWorkoutsWithin,
   login,
-  searchUsers,
   secondsUntilRollover,
   sessionTokenFrom
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suunto-api-wrapper",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Unofficial typed TypeScript client for the Suunto app API (Sports Tracker backend). Not affiliated with or endorsed by Suunto or Sports Tracker.",
   "repository": {
     "url": "https://github.com/Marius-Ar/suunto-api-wrapper"