hevy-shared 1.0.875 → 1.0.877

package/built/API/APIClient.d.ts

@@ -95,6 +95,7 @@ export declare class HevyAPIClient<UserContext = never> {
     private _legacyAuthToken;
     private _httpClient;
     private _lastTokenRefresh;
+    private _lastSessionDelete;
     constructor(httpClient: HTTPClient, config: HevyAPIClientConfig<UserContext>);
     private get _authToken();
     private get _authHeaders();
@@ -121,9 +122,11 @@ export declare class HevyAPIClient<UserContext = never> {
     }): Promise<void>;
     clearAuthToken(): Promise<void>;
     get isAuthenticated(): boolean;
+    markSessionDeleted(): void;
     attachErrorHandler(onError: HTTPErrorHandler<{
         willRetry: boolean;
         isTokenRefreshedAfterRequest: boolean;
+        isPreviousSession: boolean;
     }>): void;
     removeErrorHandlers(): void;
     get<T = never>(url: string, config?: RequestConfig): Promise<HTTPResponse<T>>;

package/built/API/APIClient.js

@@ -161,9 +161,19 @@ class HevyAPIClient {
                  */
                 const isTokenRefreshedAfterRequest = this._lastTokenRefresh !== undefined &&
                     requestTime < this._lastTokenRefresh;
+                /**
+                 * Similar to the above, but this will be `true` if the user has logged
+                 * out after the request was made, i.e. the session that the request was
+                 * made within is is (probably) no longer valid. In this case, we don't
+                 * want to retry the request, but we also don't want to log the user out,
+                 * in case that they've logged in to another session in the meantime.
+                 */
+                const isPreviousSession = this._lastSessionDelete !== undefined &&
+                    requestTime < this._lastSessionDelete;
                 this._errorHandlers.forEach((cb) => cb(response, request, {
                     willRetry: retryOnFailure,
                     isTokenRefreshedAfterRequest,
+                    isPreviousSession,
                 }));
                 if (retryOnFailure && this.isAccessTokenExpiredResponse(response)) {
                     yield this.forceRefreshAuthToken(userContext);
@@ -171,7 +181,8 @@ class HevyAPIClient {
                 }
                 else if (retryOnFailure &&
                     this.isAccessTokenInvalidResponse(response) &&
-                    isTokenRefreshedAfterRequest) {
+                    isTokenRefreshedAfterRequest &&
+                    !isPreviousSession) {
                     yield this.waitForTokenRefresh();
                     return yield this._handleResponse(request, userContext, false);
                 }
@@ -224,6 +235,9 @@ class HevyAPIClient {
             return true;
         }
     }
+    markSessionDeleted() {
+        this._lastSessionDelete = new Date();
+    }
     attachErrorHandler(onError) {
         this._errorHandlers.push(onError);
     }

package/built/tests/utils.test.js

@@ -699,4 +699,76 @@ describe('utils', () => {
             expect((0, utils_1.calculateCurrentWeekStreak)(workouts, firstWeekday, untilUnix)).toBe(0);
         });
     });
+    describe('formatSetValue', () => {
+        const baseParams = {
+            set: {
+                weight_kg: 100,
+                reps: 10,
+                duration_seconds: 90,
+                distance_meters: 1500,
+                custom_metric: 15,
+            },
+            units: {
+                weight: 'kg',
+                distance: 'kilometers',
+            },
+            labels: {
+                weight: 'kg',
+                distance: ' km',
+                shortDistance: ' m',
+                steps: 'Steps',
+                floors: 'Floors',
+            },
+        };
+        it('formats weight and reps for weight-based exercises', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'weight_reps' }))).toBe('100 kg x 10');
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'bodyweight_reps' }))).toBe('100 kg x 10');
+        });
+        it('formats assisted bodyweight reps with negative weight', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'bodyweight_assisted_reps', set: Object.assign(Object.assign({}, baseParams.set), { weight_kg: 15, reps: 8 }) }))).toBe('-15 kg x 8');
+        });
+        it('formats reps-only exercises', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'reps_only' }))).toBe('10');
+        });
+        it('formats distance with duration', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'distance_duration' }))).toBe('1.5 km - 1min 30s');
+        });
+        it('formats duration-only exercises', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'duration' }))).toBe('1min 30s');
+        });
+        it('formats short distance with weight', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'short_distance_weight', set: Object.assign(Object.assign({}, baseParams.set), { distance_meters: 250 }) }))).toBe('100 kg - 250 m');
+        });
+        it('handles null reps as zero', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'weight_reps', set: Object.assign(Object.assign({}, baseParams.set), { reps: null }) }))).toBe('100 kg x 0');
+        });
+        it('formats weight with duration', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'weight_duration' }))).toBe('100 kg - 1min 30s');
+        });
+        it('formats floors with duration', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'floors_duration' }))).toBe('15 Floors - 1min 30s');
+        });
+        it('formats steps with duration', () => {
+            expect((0, utils_1.formatSetValue)(Object.assign(Object.assign({}, baseParams), { exerciseType: 'steps_duration' }))).toBe('15 Steps - 1min 30s');
+        });
+    });
+    describe('distance', () => {
+        it('converts meters to kilometers and rounds to two decimals', () => {
+            expect((0, utils_1.distance)(1555, 'kilometers')).toBe(1.56);
+        });
+        it('converts meters to miles and rounds to two decimals', () => {
+            expect((0, utils_1.distance)(1000, 'miles')).toBe(0.62);
+        });
+    });
+    describe('exerciseWeight', () => {
+        it('returns rounded kg values for metric units', () => {
+            expect((0, utils_1.exerciseWeight)(10.555, 'kg')).toBe(10.56);
+        });
+        it('converts kg to lbs and rounds to two decimals', () => {
+            expect((0, utils_1.exerciseWeight)(100, 'lbs')).toBe(220.46);
+        });
+        it('rounds lbs values to two decimals', () => {
+            expect((0, utils_1.exerciseWeight)(4.535, 'lbs')).toBe(10.0);
+        });
+    });
 });

package/built/utils.d.ts

@@ -1,5 +1,5 @@
 import { Dayjs } from 'dayjs';
-import { BaseExerciseTemplate, ExerciseInstructionsStep, ExerciseType, FormatAtText, Result, SetType, StrengthLevel, UserExerciseSet, UserFacingSetIndicator, Weekday } from '.';
+import { BaseExerciseTemplate, DistanceUnit, ExerciseInstructionsStep, ExerciseType, FormatAtText, Result, SetType, StrengthLevel, UserExerciseSet, UserFacingSetIndicator, Weekday, WeightUnit } from '.';
 /**
  * Doesn't matter what you throw in the function it'll
  * always return a number. Non number values will return
@@ -249,5 +249,29 @@ export declare const startOfWeek: (d: Dayjs, firstDayOfWeek: Weekday) => Dayjs;
 export declare const weekdayNumberMap: {
     [key in Weekday]: number;
 };
+export declare const distance: (value: number, distanceUnit: DistanceUnit) => number;
+export declare const exerciseWeight: (value: number, weightUnit: WeightUnit) => number;
+interface getSetValueParams {
+    exerciseType: ExerciseType;
+    set: {
+        weight_kg: number | null;
+        reps: number | null;
+        duration_seconds: number | null;
+        distance_meters: number | null;
+        custom_metric: number | null;
+    };
+    units: {
+        weight: WeightUnit;
+        distance: DistanceUnit;
+    };
+    labels: {
+        weight: string;
+        distance: string;
+        shortDistance: string;
+        steps: string;
+        floors: string;
+    };
+}
+export declare const formatSetValue: ({ exerciseType, set, units, labels, }: getSetValueParams) => string;
 export declare const rawInstructionsToIndexedSteps: (rawInstructions: string) => ExerciseInstructionsStep[];
 export {};

package/built/utils.js

@@ -4,8 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startOfWeek = exports.calculateCurrentWeekStreak = exports.getYoutubeVideoId = exports.validateYoutubeUrl = exports.splitAtUsernamesAndLinks = exports.isVersionAGreaterOrEqualToVersionB = exports.generateUserGroupValue = exports.generateUserGroup = exports.isBaseExerciseTemplate = exports.getStrengthLevelFromPercentile = exports.numberToLocaleString = exports.numberWithCommas = exports.setVolume = exports.oneRepMax = exports.oneRepMaxPercentageMap = exports.getEstimatedExercisesDurationSeconds = exports.ESTIMATED_REST_TIMER_DURATION = exports.ESTIMATED_SET_DURATION = exports.UserFacingIndicatorToSetIndicator = exports.workoutSetCount = exports.userExerciseSetWeight = exports.workoutDistanceMeters = exports.workoutReps = exports.workoutDurationSeconds = exports.removeAccents = exports.getClosestDataPointAroundTargetDate = exports.getClosestDataPointBeforeTargetDate = exports.findMapped = exports.stringToNumber = exports.forceStringToNumber = exports.formatDurationInput = exports.isValidFormattedTime = exports.isWholeNumber = exports.isNumber = exports.isValidUuid = exports.isValidPhoneNumber = exports.isValidWebUrl = exports.URL_REGEX = exports.isValidEmail = exports.secondsToWordFormatMinutes = exports.secondsToWordFormat = exports.secondsToClockFormat = exports.secondsToClockParts = exports.isValidUsername = exports.roundToWholeNumber = exports.roundToOneDecimal = exports.roundToTwoDecimal = exports.divide = exports.clampNumber = exports.num = void 0;
-exports.rawInstructionsToIndexedSteps = exports.weekdayNumberMap = void 0;
+exports.rawInstructionsToIndexedSteps = exports.formatSetValue = exports.exerciseWeight = exports.distance = exports.weekdayNumberMap = void 0;
 const dayjs_1 = __importDefault(require("dayjs"));
+const _1 = require(".");
 /**
  * Doesn't matter what you throw in the function it'll
  * always return a number. Non number values will return
@@ -775,6 +776,64 @@ exports.weekdayNumberMap = {
     friday: 5,
     saturday: 6,
 };
+const distance = (value, distanceUnit) => {
+    if (distanceUnit === 'miles') {
+        const unrounded = (0, _1.exactMetersToMiles)(value);
+        return (0, exports.roundToTwoDecimal)(unrounded);
+    }
+    return (0, exports.roundToTwoDecimal)(value / 1000);
+};
+exports.distance = distance;
+const exerciseWeight = (value, weightUnit) => {
+    if (weightUnit === 'lbs') {
+        return (0, exports.roundToTwoDecimal)((0, _1.exactKgtoLbs)(value));
+    }
+    return (0, exports.roundToTwoDecimal)(value);
+};
+exports.exerciseWeight = exerciseWeight;
+const formatSetValue = ({ exerciseType, set, units, labels, }) => {
+    var _a, _b, _c;
+    switch (exerciseType) {
+        case 'weight_reps':
+        case 'bodyweight_reps': {
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const reps = `${(_a = set.reps) !== null && _a !== void 0 ? _a : 0}`;
+            return `${weight} x ${reps}`;
+        }
+        case 'bodyweight_assisted_reps': {
+            const weight = `-${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const reps = `${(_b = set.reps) !== null && _b !== void 0 ? _b : 0}`;
+            return `${weight} x ${reps}`;
+        }
+        case 'reps_only':
+            return `${(_c = set.reps) !== null && _c !== void 0 ? _c : 0}`;
+        case 'distance_duration': {
+            const distanceValue = `${(0, exports.distance)(set.distance_meters || 0, units.distance)}${labels.distance}`;
+            const duration = `${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+            return `${distanceValue} - ${duration}`;
+        }
+        case 'duration':
+            return (0, exports.secondsToWordFormat)(Number(set.duration_seconds));
+        case 'short_distance_weight': {
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const shortDistance = (0, exports.roundToTwoDecimal)(set.distance_meters || 0);
+            return `${weight} - ${shortDistance}${labels.shortDistance}`;
+        }
+        case 'weight_duration': {
+            const weight = `${(0, exports.exerciseWeight)(set.weight_kg || 0, units.weight)} ${labels.weight}`;
+            const duration = `${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+            return `${weight} - ${duration}`;
+        }
+        case 'floors_duration':
+            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${labels.floors} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+        case 'steps_duration':
+            return `${set.custom_metric ? (0, exports.roundToWholeNumber)(set.custom_metric) : 0} ${labels.steps} - ${(0, exports.secondsToWordFormat)(Number(set.duration_seconds))}`;
+        default:
+            (0, _1.exhaustiveTypeCheck)(exerciseType);
+            return '';
+    }
+};
+exports.formatSetValue = formatSetValue;
 const rawInstructionsToIndexedSteps = (rawInstructions) => {
     const instructionsByLine = rawInstructions
         .split('\n')

package/package.json

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