hevy-shared 1.0.819 → 1.0.821

package/built/API/APIClient.d.ts

@@ -74,6 +74,16 @@ interface HevyAPIClientConfig {
      * @default ...
      */
     isAccessTokenInvalidResponse?(response: HTTPResponse<unknown>): boolean;
+    /**
+     * Callback for checking for a new token before calling the refresh endpoint.
+     * Used in cases where multiple APIClients are using the same credentials,
+     * such as multiple browser tabs with the web app.
+     *
+     * Optional.
+     *
+     * @default {undefined}
+     */
+    localRefresh?(): ClientAuthToken;
 }
 export declare class HevyAPIClient {
     private static readonly DEFAULT_TOKEN_EXPIRY_SAFETY_THRESHOLD_MS;
@@ -89,6 +99,7 @@ export declare class HevyAPIClient {
     constructor(httpClient: HTTPClient, config: HevyAPIClientConfig);
     private get _authHeaders();
     private _addAuthHeaders;
+    private _isExpired;
     private refreshExpiredAuthToken;
     private forceRefreshAuthToken;
     private waitForTokenRefresh;

package/built/API/APIClient.js

@@ -24,6 +24,9 @@ class HevyAPIClient {
         this._authToken = null;
         this._legacyAuthToken = null;
         this._addAuthHeaders = (config) => (Object.assign(Object.assign({}, config), { headers: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.headers), this._authHeaders) }));
+        this._isExpired = ({ now, authToken, }) => now.valueOf() >=
+            new Date(authToken.expires_at).valueOf() -
+                this._config.tokenExpirySafetyThresholdMs;
         this._httpClient = httpClient;
         this._config = Object.assign({ tokenExpirySafetyThresholdMs: HevyAPIClient.DEFAULT_TOKEN_EXPIRY_SAFETY_THRESHOLD_MS, accessTokenMinimumValidAgeMs: HevyAPIClient.DEFAULT_ACCESS_TOKEN_MINIMUM_VALID_AGE_MS, tokenRefreshThrottleMs: HevyAPIClient.DEFAULT_TOKEN_REFRESH_THROTTLE_MS, refreshAuthTokenApiEndpoint: HevyAPIClient.DEFAULT_REFRESH_AUTH_TOKEN_API_ENDPOINT, isAccessTokenExpiredResponse: (response) => response.status === 401 &&
                 (0, types_1.isHTTPErrorResponse)(response) &&
@@ -45,16 +48,24 @@ class HevyAPIClient {
     }
     refreshExpiredAuthToken() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { _authToken } = this;
-            if (!_authToken)
+            const { _authToken: authToken } = this;
+            if (!authToken)
                 return;
-            if (new Date().valueOf() <=
-                new Date(_authToken.expires_at).valueOf() -
-                    this._config.tokenExpirySafetyThresholdMs) {
+            const now = new Date();
+            if (!this._isExpired({ now, authToken })) {
                 // Token is still valid, at least according to the client. Don't refresh.
                 return;
             }
-            yield this._refreshAuthToken(_authToken);
+            if (this._config.localRefresh !== undefined) {
+                const authToken = this._config.localRefresh();
+                this._authToken = authToken;
+                this._lastTokenRefresh = undefined; // This isn't shared across processes
+                if (!this._isExpired({ now, authToken })) {
+                    // Token was refreshed by a different process (e.g. other browser tab).
+                    return;
+                }
+            }
+            yield this._refreshAuthToken(authToken);
         });
     }
     forceRefreshAuthToken() {

package/built/index.d.ts

@@ -1250,25 +1250,6 @@ export interface PostHevyTrainerProgramRequestBody {
         workout_duration_minutes?: WorkoutDurationMinutes;
     };
 }
-export interface UpdateHevyTrainerProgramRequestBody {
-    program: {
-        programId: string;
-        title: string;
-        level: TrainingLevel;
-        goal: TrainingGoal;
-        equipments: HevyTrainerProgramEquipment[];
-        weekly_frequency: WeeklyTrainingFrequency;
-        focus_muscle?: SimplifiedMuscleGroup;
-        next_workout_index?: number;
-        workout_duration_minutes?: WorkoutDurationMinutes;
-        routines: {
-            id: string;
-            title: string;
-            notes: string | null;
-            exercises: RoutineUpdateExercise[];
-        }[];
-    };
-}
 export declare const measurementsList: readonly ["weight_kg", "lean_mass_kg", "fat_percent", "neck_cm", "shoulder_cm", "chest_cm", "left_bicep_cm", "right_bicep_cm", "left_forearm_cm", "right_forearm_cm", "abdomen", "waist", "hips", "left_thigh", "right_thigh", "left_calf", "right_calf"];
 type MeasurementProperties = {
     [key in typeof measurementsList[number]]?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.819",
+  "version": "1.0.821",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",