@moonbase.sh/storefront-api 3.6.0 → 3.7.0

package/dist/index.cjs

@@ -51,6 +51,7 @@ __export(index_exports, {
   SubscriptionCancellationReason: () => SubscriptionCancellationReason,
   SubscriptionStatus: () => SubscriptionStatus,
   TokenStore: () => TokenStore,
+  accessTokenLifetime: () => accessTokenLifetime,
   imageWidths: () => imageWidths,
   isLocalStorageAvailable: () => isLocalStorageAvailable,
   isPromotionDisplay: () => isPromotionDisplay,
@@ -460,7 +461,10 @@ var activationRequestSchema = import_zod4.z.object({
     requiresAccount: import_zod4.z.boolean(),
     requiresNewsletterOptIn: import_zod4.z.boolean(),
     numberOfDaysPerProduct: import_zod4.z.number(),
-    numberOfDaysRemaining: import_zod4.z.number()
+    numberOfDaysRemaining: import_zod4.z.number(),
+    // The trial never expires, so the day counts are not worth showing. Absent from a backend that
+    // predates endless trials.
+    endless: import_zod4.z.boolean().default(false)
   }).optional(),
   licenseEligibility: import_zod4.z.object({
     eligible: import_zod4.z.boolean()
@@ -874,8 +878,13 @@ var IdentityEndpoints = class {
     this.tokenStore.setUser(identity);
     return { status: "signed-in", user: userSchema.parse(identity) };
   }
+  /**
+   * Signs the buyer out here at once, and ends the session on the server so its refresh
+   * token stops working too. Resolves once the server has answered, and never rejects:
+   * the buyer is signed out in this browser whatever happens to that request.
+   */
   async signOut() {
-    this.tokenStore.clear();
+    await this.tokenStore.signOut();
   }
   async update(name, email, emailConfirmationToken, communicationPreferences) {
     const response = await this.api.authenticatedFetch("/api/customer/identity", userSchema, {
@@ -1108,7 +1117,7 @@ var ProductEndpoints = class {
 var import_zod14 = require("zod");
 
 // package.json
-var version = "3.6.0";
+var version = "3.7.0";
 
 // src/utils/client.ts
 function buildClientHeader(sdk) {
@@ -1787,24 +1796,36 @@ var InMemoryStore = class {
 };
 
 // src/utils/tokenStore.ts
+var defaultAccessTokenLifetime = 15 * 60 * 1e3;
+var renewBeforeExpiry = 5 * 60 * 1e3;
+var expiryMargin = 30 * 1e3;
+var refreshLockName = "moonbase_auth_refresh";
+function accessTokenLifetime(accessToken) {
+  try {
+    const payload = accessToken.split(".")[1].replaceAll("-", "+").replaceAll("_", "/");
+    const claims = JSON.parse(atob(payload.padEnd(Math.ceil(payload.length / 4) * 4, "=")));
+    const lifetime = (Number(claims.exp) - Number(claims.iat)) * 1e3;
+    if (Number.isFinite(lifetime) && lifetime > 0 && lifetime <= 24 * 60 * 60 * 1e3)
+      return lifetime;
+  } catch (e) {
+  }
+  return defaultAccessTokenLifetime;
+}
 var _TokenStore = class _TokenStore {
   constructor(configuration) {
     this.configuration = configuration;
     this.tokens = null;
     this.refreshTimeoutId = null;
     this.refreshPromise = null;
+    this.waitingForVisibility = false;
+    this.sessionEndedListeners = [];
     var _a, _b;
     this.logger = (_a = configuration.logger) != null ? _a : new ConsoleLogger();
     this.store = (_b = configuration.store) != null ? _b : isLocalStorageAvailable() ? new LocalStorageStore((err) => this.warnAboutStorage(err)) : new InMemoryStore();
     if (typeof window !== "undefined" && !configuration.store && !(this.store instanceof LocalStorageStore))
       this.warnAboutStorage();
-    const storedToken = this.store.get(_TokenStore.storageKey);
-    if (storedToken) {
-      this.tokens = {
-        ...storedToken,
-        expiresAt: new Date(storedToken.expiresAt)
-      };
-    }
+    this.tokens = this.readStoredTokens();
+    this.scheduleRefresh();
     this.store.listen(_TokenStore.storageKey, (updatedTokens) => this.handleStorageUpdate(updatedTokens));
   }
   get user() {
@@ -1838,29 +1859,91 @@ var _TokenStore = class _TokenStore {
     } else {
       this.tokens = {
         ...identity,
-        // Hardcoded 15 minutes now, might want to check the JWT tho
-        expiresAt: new Date((/* @__PURE__ */ new Date()).getTime() + 15 * 60 * 1e3)
+        expiresAt: new Date(Date.now() + accessTokenLifetime(identity.accessToken))
       };
     }
     this.store.set(_TokenStore.storageKey, this.tokens);
-    if (typeof window !== "undefined") {
-      if (this.refreshTimeoutId != null)
-        window.clearTimeout(this.refreshTimeoutId);
-      this.refreshTimeoutId = window.setTimeout(() => {
-        this.startRefresh().catch((err) => this.logger.warn("Could not refresh access token", err));
-      }, 10 * 60 * 1e3);
-    }
+    this.scheduleRefresh();
     return this.tokens;
   }
   clear() {
     this.tokens = null;
     this.store.remove(_TokenStore.storageKey);
-    if (this.refreshTimeoutId != null && typeof window !== "undefined")
-      window.clearTimeout(this.refreshTimeoutId);
+    this.scheduleRefresh();
     return null;
   }
+  async signOut() {
+    const tokens = this.tokens;
+    this.clear();
+    if (!tokens)
+      return;
+    try {
+      await fetch(`${this.configuration.endpoint}/api/customer/identity/revoke?token=${encodeURIComponent(tokens.refreshToken)}`, {
+        method: "POST",
+        keepalive: true,
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "text/plain",
+          "x-mb-cors": "1",
+          "x-mb-client": buildClientHeader(this.configuration.sdk)
+        },
+        body: tokens.accessToken
+      });
+    } catch (err) {
+      this.logger.warn("Could not end the session on the server", err);
+    }
+  }
+  onSessionEnded(listener) {
+    this.sessionEndedListeners.push(listener);
+  }
   get isExpired() {
-    return this.tokens != null && this.tokens.expiresAt < /* @__PURE__ */ new Date();
+    return this.tokens != null && this.tokens.expiresAt.getTime() - expiryMargin < Date.now();
+  }
+  readStoredTokens() {
+    const stored = this.store.get(_TokenStore.storageKey);
+    return stored ? { ...stored, expiresAt: new Date(stored.expiresAt) } : null;
+  }
+  /**
+   * (Re)arms the timer that renews the access token shortly before it runs out, or disarms
+   * it when there is nothing to renew. Every tab arms one, and `refreshTokens` makes sure
+   * only one of them actually renews.
+   */
+  scheduleRefresh() {
+    if (typeof window === "undefined")
+      return;
+    if (this.refreshTimeoutId != null)
+      window.clearTimeout(this.refreshTimeoutId);
+    this.refreshTimeoutId = null;
+    if (!this.tokens)
+      return;
+    const delay = Math.max(0, this.renewalDueAt(this.tokens) - Date.now());
+    this.refreshTimeoutId = window.setTimeout(() => this.renewInBackground(), delay);
+  }
+  renewalDueAt(tokens) {
+    const lead = Math.min(renewBeforeExpiry, accessTokenLifetime(tokens.accessToken) / 3);
+    return tokens.expiresAt.getTime() - lead;
+  }
+  renewInBackground() {
+    var _a;
+    this.refreshTimeoutId = null;
+    if (!this.tokens)
+      return;
+    if (this.renewalDueAt(this.tokens) > Date.now()) {
+      this.scheduleRefresh();
+      return;
+    }
+    if (typeof document !== "undefined" && document.visibilityState === "hidden") {
+      if (!this.waitingForVisibility) {
+        this.waitingForVisibility = true;
+        document.addEventListener("visibilitychange", () => {
+          this.waitingForVisibility = false;
+          this.renewInBackground();
+        }, { once: true });
+      }
+      return;
+    }
+    const pending = (_a = this.refreshPromise) != null ? _a : this.startRefresh();
+    pending.catch((err) => this.logger.warn("Could not refresh access token", err));
   }
   /**
    * Start a refresh and hold it so concurrent callers join it rather than firing
@@ -1877,7 +1960,45 @@ var _TokenStore = class _TokenStore {
     this.refreshPromise = pending;
     return pending;
   }
+  /**
+   * A refresh token can be used once: the server answers a second use by revoking the
+   * session, taking it for a stolen token. So refreshes are serialised across every tab of
+   * the origin, and whoever gets the lock second takes up what the first one stored rather
+   * than spending the same refresh token again. The stored copy has to be read, not waited
+   * for: storage events never reach the document that wrote them, so a second client on
+   * the same page would not hear about it.
+   */
   async refreshTokens() {
+    var _a;
+    const spending = (_a = this.tokens) == null ? void 0 : _a.refreshToken;
+    const locks = typeof navigator !== "undefined" ? navigator.locks : void 0;
+    if (locks == null ? void 0 : locks.request) {
+      let held = false;
+      try {
+        return await locks.request(refreshLockName, () => {
+          held = true;
+          return this.refreshHoldingLock(spending);
+        });
+      } catch (err) {
+        if (held)
+          throw err;
+      }
+    }
+    return await this.refreshHoldingLock(spending);
+  }
+  /**
+   * @param spending The refresh token this refresh set out to use. If the session has moved
+   * on from it while we waited for the lock, someone else has renewed already.
+   */
+  async refreshHoldingLock(spending) {
+    var _a;
+    const stored = this.readStoredTokens();
+    if (stored && stored.refreshToken !== ((_a = this.tokens) == null ? void 0 : _a.refreshToken))
+      this.tokens = stored;
+    if (this.tokens && this.tokens.refreshToken !== spending && !this.isExpired) {
+      this.scheduleRefresh();
+      return this.tokens;
+    }
     if (!this.tokens)
       throw new Error("No tokens found to refresh");
     const response = await fetch(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${encodeURIComponent(this.tokens.refreshToken)}`, {
@@ -1893,6 +2014,13 @@ var _TokenStore = class _TokenStore {
     if (response.status !== 200) {
       if (response.status === 403 || response.status === 404) {
         this.clear();
+        for (const listener of this.sessionEndedListeners) {
+          try {
+            listener();
+          } catch (err) {
+            this.logger.warn("A listener for the end of the session failed", err);
+          }
+        }
         return null;
       }
       throw new MoonbaseError("Unexpected result", `Could not refresh access token, status code ${response.status}`, response.status);
@@ -1903,11 +2031,10 @@ var _TokenStore = class _TokenStore {
   }
   handleStorageUpdate(updatedTokens) {
     this.tokens = updatedTokens;
-    if (this.refreshTimeoutId != null && typeof window !== "undefined")
-      window.clearTimeout(this.refreshTimeoutId);
     if (this.tokens) {
       this.tokens.expiresAt = new Date(this.tokens.expiresAt);
     }
+    this.scheduleRefresh();
   }
   warnAboutStorage(err) {
     this.logger.warn(
@@ -2663,6 +2790,7 @@ var MoonbaseClient = class {
   SubscriptionCancellationReason,
   SubscriptionStatus,
   TokenStore,
+  accessTokenLifetime,
   imageWidths,
   isLocalStorageAvailable,
   isPromotionDisplay,

package/dist/index.d.cts

@@ -80,18 +80,28 @@ declare class InMemoryStore implements IStore {
 type IdentityWithExpiry = Identity & {
     expiresAt: Date;
 };
+/**
+ * How long the server issued an access token for, from its `iat` and `exp`. The lifetime rather than
+ * `exp` itself, measured against this browser's clock from the moment the token arrives: a clock that is
+ * minutes off would otherwise make every token look expired, or none.
+ */
+declare function accessTokenLifetime(accessToken: string): number;
 interface ITokenStore {
     get user(): User | null;
     get isPersistent(): boolean;
     getAccessToken: () => Promise<string | null>;
     setUser: (user: Identity | User) => User | null;
     clear: () => void;
+    signOut: () => Promise<void>;
+    onSessionEnded: (listener: () => void) => void;
 }
 declare class TokenStore implements ITokenStore {
     private configuration;
     private tokens;
     private refreshTimeoutId;
     private refreshPromise;
+    private waitingForVisibility;
+    private readonly sessionEndedListeners;
     private readonly store;
     private readonly logger;
     static readonly storageKey = "moonbase_auth";
@@ -101,7 +111,18 @@ declare class TokenStore implements ITokenStore {
     getAccessToken(): Promise<string | null>;
     setUser(user: Identity | User): IdentityWithExpiry | null;
     clear(): null;
+    signOut(): Promise<void>;
+    onSessionEnded(listener: () => void): void;
     private get isExpired();
+    private readStoredTokens;
+    /**
+     * (Re)arms the timer that renews the access token shortly before it runs out, or disarms
+     * it when there is nothing to renew. Every tab arms one, and `refreshTokens` makes sure
+     * only one of them actually renews.
+     */
+    private scheduleRefresh;
+    private renewalDueAt;
+    private renewInBackground;
     /**
      * Start a refresh and hold it so concurrent callers join it rather than firing
      * their own. The slot is cleared as soon as it settles: a retained promise
@@ -110,7 +131,20 @@ declare class TokenStore implements ITokenStore {
      * anonymous ones) for the rest of the session.
      */
     private startRefresh;
+    /**
+     * A refresh token can be used once: the server answers a second use by revoking the
+     * session, taking it for a stolen token. So refreshes are serialised across every tab of
+     * the origin, and whoever gets the lock second takes up what the first one stored rather
+     * than spending the same refresh token again. The stored copy has to be read, not waited
+     * for: storage events never reach the document that wrote them, so a second client on
+     * the same page would not hear about it.
+     */
     private refreshTokens;
+    /**
+     * @param spending The refresh token this refresh set out to use. If the session has moved
+     * on from it while we waited for the lock, someone else has renewed already.
+     */
+    private refreshHoldingLock;
     private handleStorageUpdate;
     private warnAboutStorage;
 }
@@ -797,6 +831,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: z.ZodBoolean;
         numberOfDaysPerProduct: z.ZodNumber;
         numberOfDaysRemaining: z.ZodNumber;
+        endless: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         eligible: boolean;
         existing: boolean;
@@ -804,6 +839,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless: boolean;
     }, {
         eligible: boolean;
         existing: boolean;
@@ -811,6 +847,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless?: boolean | undefined;
     }>>;
     licenseEligibility: z.ZodOptional<z.ZodObject<{
         eligible: z.ZodBoolean;
@@ -937,6 +974,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless: boolean;
     } | undefined;
     licenseEligibility?: {
         eligible: boolean;
@@ -1059,6 +1097,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless?: boolean | undefined;
     } | undefined;
     licenseEligibility?: {
         eligible: boolean;
@@ -1696,6 +1735,11 @@ declare class IdentityEndpoints {
     get(): Promise<User>;
     signIn(email: string, password: string): Promise<User>;
     signUp(name: string, email: string, password: string, address: Address | null | undefined, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean, communicationOptIn?: boolean, options?: SignUpOptions): Promise<SignUpResult>;
+    /**
+     * Signs the buyer out here at once, and ends the session on the server so its refresh
+     * token stops working too. Resolves once the server has answered, and never rejects:
+     * the buyer is signed out in this browser whatever happens to that request.
+     */
     signOut(): Promise<void>;
     update(name: string | null, email: string, emailConfirmationToken?: string, communicationPreferences?: CommunicationPreferences): Promise<{
         needsEmailConfirmationToken: boolean;
@@ -47310,4 +47354,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };

package/dist/index.d.ts

@@ -80,18 +80,28 @@ declare class InMemoryStore implements IStore {
 type IdentityWithExpiry = Identity & {
     expiresAt: Date;
 };
+/**
+ * How long the server issued an access token for, from its `iat` and `exp`. The lifetime rather than
+ * `exp` itself, measured against this browser's clock from the moment the token arrives: a clock that is
+ * minutes off would otherwise make every token look expired, or none.
+ */
+declare function accessTokenLifetime(accessToken: string): number;
 interface ITokenStore {
     get user(): User | null;
     get isPersistent(): boolean;
     getAccessToken: () => Promise<string | null>;
     setUser: (user: Identity | User) => User | null;
     clear: () => void;
+    signOut: () => Promise<void>;
+    onSessionEnded: (listener: () => void) => void;
 }
 declare class TokenStore implements ITokenStore {
     private configuration;
     private tokens;
     private refreshTimeoutId;
     private refreshPromise;
+    private waitingForVisibility;
+    private readonly sessionEndedListeners;
     private readonly store;
     private readonly logger;
     static readonly storageKey = "moonbase_auth";
@@ -101,7 +111,18 @@ declare class TokenStore implements ITokenStore {
     getAccessToken(): Promise<string | null>;
     setUser(user: Identity | User): IdentityWithExpiry | null;
     clear(): null;
+    signOut(): Promise<void>;
+    onSessionEnded(listener: () => void): void;
     private get isExpired();
+    private readStoredTokens;
+    /**
+     * (Re)arms the timer that renews the access token shortly before it runs out, or disarms
+     * it when there is nothing to renew. Every tab arms one, and `refreshTokens` makes sure
+     * only one of them actually renews.
+     */
+    private scheduleRefresh;
+    private renewalDueAt;
+    private renewInBackground;
     /**
      * Start a refresh and hold it so concurrent callers join it rather than firing
      * their own. The slot is cleared as soon as it settles: a retained promise
@@ -110,7 +131,20 @@ declare class TokenStore implements ITokenStore {
      * anonymous ones) for the rest of the session.
      */
     private startRefresh;
+    /**
+     * A refresh token can be used once: the server answers a second use by revoking the
+     * session, taking it for a stolen token. So refreshes are serialised across every tab of
+     * the origin, and whoever gets the lock second takes up what the first one stored rather
+     * than spending the same refresh token again. The stored copy has to be read, not waited
+     * for: storage events never reach the document that wrote them, so a second client on
+     * the same page would not hear about it.
+     */
     private refreshTokens;
+    /**
+     * @param spending The refresh token this refresh set out to use. If the session has moved
+     * on from it while we waited for the lock, someone else has renewed already.
+     */
+    private refreshHoldingLock;
     private handleStorageUpdate;
     private warnAboutStorage;
 }
@@ -797,6 +831,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: z.ZodBoolean;
         numberOfDaysPerProduct: z.ZodNumber;
         numberOfDaysRemaining: z.ZodNumber;
+        endless: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         eligible: boolean;
         existing: boolean;
@@ -804,6 +839,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless: boolean;
     }, {
         eligible: boolean;
         existing: boolean;
@@ -811,6 +847,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless?: boolean | undefined;
     }>>;
     licenseEligibility: z.ZodOptional<z.ZodObject<{
         eligible: z.ZodBoolean;
@@ -937,6 +974,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless: boolean;
     } | undefined;
     licenseEligibility?: {
         eligible: boolean;
@@ -1059,6 +1097,7 @@ declare const activationRequestSchema: z.ZodObject<{
         requiresNewsletterOptIn: boolean;
         numberOfDaysPerProduct: number;
         numberOfDaysRemaining: number;
+        endless?: boolean | undefined;
     } | undefined;
     licenseEligibility?: {
         eligible: boolean;
@@ -1696,6 +1735,11 @@ declare class IdentityEndpoints {
     get(): Promise<User>;
     signIn(email: string, password: string): Promise<User>;
     signUp(name: string, email: string, password: string, address: Address | null | undefined, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean, communicationOptIn?: boolean, options?: SignUpOptions): Promise<SignUpResult>;
+    /**
+     * Signs the buyer out here at once, and ends the session on the server so its refresh
+     * token stops working too. Resolves once the server has answered, and never rejects:
+     * the buyer is signed out in this browser whatever happens to that request.
+     */
     signOut(): Promise<void>;
     update(name: string | null, email: string, emailConfirmationToken?: string, communicationPreferences?: CommunicationPreferences): Promise<{
         needsEmailConfirmationToken: boolean;
@@ -47310,4 +47354,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };

package/dist/index.js

@@ -397,7 +397,10 @@ var activationRequestSchema = z4.object({
     requiresAccount: z4.boolean(),
     requiresNewsletterOptIn: z4.boolean(),
     numberOfDaysPerProduct: z4.number(),
-    numberOfDaysRemaining: z4.number()
+    numberOfDaysRemaining: z4.number(),
+    // The trial never expires, so the day counts are not worth showing. Absent from a backend that
+    // predates endless trials.
+    endless: z4.boolean().default(false)
   }).optional(),
   licenseEligibility: z4.object({
     eligible: z4.boolean()
@@ -811,8 +814,13 @@ var IdentityEndpoints = class {
     this.tokenStore.setUser(identity);
     return { status: "signed-in", user: userSchema.parse(identity) };
   }
+  /**
+   * Signs the buyer out here at once, and ends the session on the server so its refresh
+   * token stops working too. Resolves once the server has answered, and never rejects:
+   * the buyer is signed out in this browser whatever happens to that request.
+   */
   async signOut() {
-    this.tokenStore.clear();
+    await this.tokenStore.signOut();
   }
   async update(name, email, emailConfirmationToken, communicationPreferences) {
     const response = await this.api.authenticatedFetch("/api/customer/identity", userSchema, {
@@ -1045,7 +1053,7 @@ var ProductEndpoints = class {
 import { z as z14 } from "zod";
 
 // package.json
-var version = "3.6.0";
+var version = "3.7.0";
 
 // src/utils/client.ts
 function buildClientHeader(sdk) {
@@ -1724,24 +1732,36 @@ var InMemoryStore = class {
 };
 
 // src/utils/tokenStore.ts
+var defaultAccessTokenLifetime = 15 * 60 * 1e3;
+var renewBeforeExpiry = 5 * 60 * 1e3;
+var expiryMargin = 30 * 1e3;
+var refreshLockName = "moonbase_auth_refresh";
+function accessTokenLifetime(accessToken) {
+  try {
+    const payload = accessToken.split(".")[1].replaceAll("-", "+").replaceAll("_", "/");
+    const claims = JSON.parse(atob(payload.padEnd(Math.ceil(payload.length / 4) * 4, "=")));
+    const lifetime = (Number(claims.exp) - Number(claims.iat)) * 1e3;
+    if (Number.isFinite(lifetime) && lifetime > 0 && lifetime <= 24 * 60 * 60 * 1e3)
+      return lifetime;
+  } catch (e) {
+  }
+  return defaultAccessTokenLifetime;
+}
 var _TokenStore = class _TokenStore {
   constructor(configuration) {
     this.configuration = configuration;
     this.tokens = null;
     this.refreshTimeoutId = null;
     this.refreshPromise = null;
+    this.waitingForVisibility = false;
+    this.sessionEndedListeners = [];
     var _a, _b;
     this.logger = (_a = configuration.logger) != null ? _a : new ConsoleLogger();
     this.store = (_b = configuration.store) != null ? _b : isLocalStorageAvailable() ? new LocalStorageStore((err) => this.warnAboutStorage(err)) : new InMemoryStore();
     if (typeof window !== "undefined" && !configuration.store && !(this.store instanceof LocalStorageStore))
       this.warnAboutStorage();
-    const storedToken = this.store.get(_TokenStore.storageKey);
-    if (storedToken) {
-      this.tokens = {
-        ...storedToken,
-        expiresAt: new Date(storedToken.expiresAt)
-      };
-    }
+    this.tokens = this.readStoredTokens();
+    this.scheduleRefresh();
     this.store.listen(_TokenStore.storageKey, (updatedTokens) => this.handleStorageUpdate(updatedTokens));
   }
   get user() {
@@ -1775,29 +1795,91 @@ var _TokenStore = class _TokenStore {
     } else {
       this.tokens = {
         ...identity,
-        // Hardcoded 15 minutes now, might want to check the JWT tho
-        expiresAt: new Date((/* @__PURE__ */ new Date()).getTime() + 15 * 60 * 1e3)
+        expiresAt: new Date(Date.now() + accessTokenLifetime(identity.accessToken))
       };
     }
     this.store.set(_TokenStore.storageKey, this.tokens);
-    if (typeof window !== "undefined") {
-      if (this.refreshTimeoutId != null)
-        window.clearTimeout(this.refreshTimeoutId);
-      this.refreshTimeoutId = window.setTimeout(() => {
-        this.startRefresh().catch((err) => this.logger.warn("Could not refresh access token", err));
-      }, 10 * 60 * 1e3);
-    }
+    this.scheduleRefresh();
     return this.tokens;
   }
   clear() {
     this.tokens = null;
     this.store.remove(_TokenStore.storageKey);
-    if (this.refreshTimeoutId != null && typeof window !== "undefined")
-      window.clearTimeout(this.refreshTimeoutId);
+    this.scheduleRefresh();
     return null;
   }
+  async signOut() {
+    const tokens = this.tokens;
+    this.clear();
+    if (!tokens)
+      return;
+    try {
+      await fetch(`${this.configuration.endpoint}/api/customer/identity/revoke?token=${encodeURIComponent(tokens.refreshToken)}`, {
+        method: "POST",
+        keepalive: true,
+        headers: {
+          "Accept": "application/json",
+          "Content-Type": "text/plain",
+          "x-mb-cors": "1",
+          "x-mb-client": buildClientHeader(this.configuration.sdk)
+        },
+        body: tokens.accessToken
+      });
+    } catch (err) {
+      this.logger.warn("Could not end the session on the server", err);
+    }
+  }
+  onSessionEnded(listener) {
+    this.sessionEndedListeners.push(listener);
+  }
   get isExpired() {
-    return this.tokens != null && this.tokens.expiresAt < /* @__PURE__ */ new Date();
+    return this.tokens != null && this.tokens.expiresAt.getTime() - expiryMargin < Date.now();
+  }
+  readStoredTokens() {
+    const stored = this.store.get(_TokenStore.storageKey);
+    return stored ? { ...stored, expiresAt: new Date(stored.expiresAt) } : null;
+  }
+  /**
+   * (Re)arms the timer that renews the access token shortly before it runs out, or disarms
+   * it when there is nothing to renew. Every tab arms one, and `refreshTokens` makes sure
+   * only one of them actually renews.
+   */
+  scheduleRefresh() {
+    if (typeof window === "undefined")
+      return;
+    if (this.refreshTimeoutId != null)
+      window.clearTimeout(this.refreshTimeoutId);
+    this.refreshTimeoutId = null;
+    if (!this.tokens)
+      return;
+    const delay = Math.max(0, this.renewalDueAt(this.tokens) - Date.now());
+    this.refreshTimeoutId = window.setTimeout(() => this.renewInBackground(), delay);
+  }
+  renewalDueAt(tokens) {
+    const lead = Math.min(renewBeforeExpiry, accessTokenLifetime(tokens.accessToken) / 3);
+    return tokens.expiresAt.getTime() - lead;
+  }
+  renewInBackground() {
+    var _a;
+    this.refreshTimeoutId = null;
+    if (!this.tokens)
+      return;
+    if (this.renewalDueAt(this.tokens) > Date.now()) {
+      this.scheduleRefresh();
+      return;
+    }
+    if (typeof document !== "undefined" && document.visibilityState === "hidden") {
+      if (!this.waitingForVisibility) {
+        this.waitingForVisibility = true;
+        document.addEventListener("visibilitychange", () => {
+          this.waitingForVisibility = false;
+          this.renewInBackground();
+        }, { once: true });
+      }
+      return;
+    }
+    const pending = (_a = this.refreshPromise) != null ? _a : this.startRefresh();
+    pending.catch((err) => this.logger.warn("Could not refresh access token", err));
   }
   /**
    * Start a refresh and hold it so concurrent callers join it rather than firing
@@ -1814,7 +1896,45 @@ var _TokenStore = class _TokenStore {
     this.refreshPromise = pending;
     return pending;
   }
+  /**
+   * A refresh token can be used once: the server answers a second use by revoking the
+   * session, taking it for a stolen token. So refreshes are serialised across every tab of
+   * the origin, and whoever gets the lock second takes up what the first one stored rather
+   * than spending the same refresh token again. The stored copy has to be read, not waited
+   * for: storage events never reach the document that wrote them, so a second client on
+   * the same page would not hear about it.
+   */
   async refreshTokens() {
+    var _a;
+    const spending = (_a = this.tokens) == null ? void 0 : _a.refreshToken;
+    const locks = typeof navigator !== "undefined" ? navigator.locks : void 0;
+    if (locks == null ? void 0 : locks.request) {
+      let held = false;
+      try {
+        return await locks.request(refreshLockName, () => {
+          held = true;
+          return this.refreshHoldingLock(spending);
+        });
+      } catch (err) {
+        if (held)
+          throw err;
+      }
+    }
+    return await this.refreshHoldingLock(spending);
+  }
+  /**
+   * @param spending The refresh token this refresh set out to use. If the session has moved
+   * on from it while we waited for the lock, someone else has renewed already.
+   */
+  async refreshHoldingLock(spending) {
+    var _a;
+    const stored = this.readStoredTokens();
+    if (stored && stored.refreshToken !== ((_a = this.tokens) == null ? void 0 : _a.refreshToken))
+      this.tokens = stored;
+    if (this.tokens && this.tokens.refreshToken !== spending && !this.isExpired) {
+      this.scheduleRefresh();
+      return this.tokens;
+    }
     if (!this.tokens)
       throw new Error("No tokens found to refresh");
     const response = await fetch(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${encodeURIComponent(this.tokens.refreshToken)}`, {
@@ -1830,6 +1950,13 @@ var _TokenStore = class _TokenStore {
     if (response.status !== 200) {
       if (response.status === 403 || response.status === 404) {
         this.clear();
+        for (const listener of this.sessionEndedListeners) {
+          try {
+            listener();
+          } catch (err) {
+            this.logger.warn("A listener for the end of the session failed", err);
+          }
+        }
         return null;
       }
       throw new MoonbaseError("Unexpected result", `Could not refresh access token, status code ${response.status}`, response.status);
@@ -1840,11 +1967,10 @@ var _TokenStore = class _TokenStore {
   }
   handleStorageUpdate(updatedTokens) {
     this.tokens = updatedTokens;
-    if (this.refreshTimeoutId != null && typeof window !== "undefined")
-      window.clearTimeout(this.refreshTimeoutId);
     if (this.tokens) {
       this.tokens.expiresAt = new Date(this.tokens.expiresAt);
     }
+    this.scheduleRefresh();
   }
   warnAboutStorage(err) {
     this.logger.warn(
@@ -2599,6 +2725,7 @@ export {
   SubscriptionCancellationReason,
   SubscriptionStatus,
   TokenStore,
+  accessTokenLifetime,
   imageWidths,
   isLocalStorageAvailable,
   isPromotionDisplay,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/storefront-api",
   "type": "module",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Package to let you build storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",