hevy-shared 1.0.820 → 1.0.822

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 | null;
 }
 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,28 @@ 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 (authToken === null) {
+                    // We were de-authenticated, there is nothing to refresh.
+                    return;
+                }
+                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/async.d.ts

@@ -38,10 +38,4 @@ type MethodDecorator<T> = (target: unknown, propertyKey: string | symbol, descri
 export declare function synchronized(queue: boolean): MethodDecorator<Promise<any>>;
 export declare function synchronized(queue: boolean, id: any): MethodDecorator<Promise<any>>;
 export declare function synchronized(target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>): void;
-/** @deprecated Using this on a synchronous function has no effect */
-export declare function synchronized(queue: boolean): MethodDecorator<any>;
-/** @deprecated Using this on a synchronous function has no effect */
-export declare function synchronized(queue: boolean, id: any): MethodDecorator<any>;
-/** @deprecated Using this on a synchronous function has no effect */
-export declare function synchronized(target: unknown, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<(...args: any[]) => any>): void;
 export {};

package/built/index.d.ts

@@ -558,7 +558,6 @@ export interface UserProfile {
     routines: RoutineMetadata[];
     weekly_workout_durations: WeeklyWorkoutDuration[];
     mutual_followers: PreviewMutualUser[];
-    streak_count: number;
 }
 export interface PublicUserProfile {
     private_profile: boolean;

package/package.json

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