@monetize.software/sdk 3.0.0-alpha.12 → 3.0.0-alpha.14

package/dist/core.d.ts

@@ -743,6 +743,17 @@ export declare class BillingClient {
         errorUrl?: string;
         shopUrl?: string;
         trialDays?: number;
+        /** Активный offer для этой цены — резолвится host'ом через
+         *  `paywall.getOfferForPrice(priceId)?.offer.id` или
+         *  `findApplicableOffer(client.getCachedOffers(), priceId)?.id`. Без
+         *  явной передачи бэк сделает auto-resolve по email — но только для
+         *  end_date-офферов. duration_minutes-офферы тикают в clientStorage и
+         *  сервер их не видит: для них offerId ОБЯЗАН прийти от клиента, иначе
+         *  скидка не применится на чекауте, хотя UI её показывал.
+         *
+         *  Передавать offer-id всегда безопасно — бэк сам проверит applicable
+         *  ли offer к этому юзеру (страна/email/режим) и игнорирует если нет. */
+        offerId?: string;
         /**
          * Stage 1 защиты от дубликатов покупок. Идемпотентный ключ запроса
          * (UUID). Повторный вызов с тем же ключом вернёт тот же checkout-URL

package/dist/core.js

@@ -20,24 +20,24 @@ class E {
     n.set("Accept", "application/json"), n.set("X-SDK-Version", m), n.set("X-Paywall-Id", this.opts.paywallId), this.opts.capabilities?.length && n.set("X-SDK-Capabilities", this.opts.capabilities.join(","));
     const o = await this.opts.getAuthToken?.();
     o && n.set("Authorization", `Bearer ${o}`);
-    const u = typeof FormData < "u" && e.body instanceof FormData;
-    e.body && !n.has("Content-Type") && !u && n.set("Content-Type", "application/json");
-    let d;
+    const d = typeof FormData < "u" && e.body instanceof FormData;
+    e.body && !n.has("Content-Type") && !d && n.set("Content-Type", "application/json");
+    let f;
     try {
-      d = await a(s, {
+      f = await a(s, {
         ...e,
         headers: n,
         credentials: "omit"
       });
-    } catch (c) {
-      throw (c && typeof c == "object" && "name" in c ? c.name : void 0) === "AbortError" ? new r("aborted", "Request aborted", { cause: c }) : new r("network_error", "Network request failed", { cause: c });
+    } catch (h) {
+      throw (h && typeof h == "object" && "name" in h ? h.name : void 0) === "AbortError" ? new r("aborted", "Request aborted", { cause: h }) : new r("network_error", "Network request failed", { cause: h });
     }
-    const y = (d.headers.get("content-type") ?? "").includes("application/json") ? await d.json().catch(() => null) : null;
-    if (!d.ok) {
-      const c = y && typeof y == "object" && "code" in y && String(y.code) || `http_${d.status}`, g = y && typeof y == "object" && "message" in y && String(y.message) || d.statusText || "Request failed";
-      throw new r(c, g, { status: d.status, cause: y });
+    const l = (f.headers.get("content-type") ?? "").includes("application/json") ? await f.json().catch(() => null) : null;
+    if (!f.ok) {
+      const h = l && typeof l == "object" && "code" in l && String(l.code) || `http_${f.status}`, g = l && typeof l == "object" && "message" in l && String(l.message) || f.statusText || "Request failed";
+      throw new r(h, g, { status: f.status, cause: l });
     }
-    return y;
+    return l;
   }
 }
 class D {
@@ -63,37 +63,37 @@ class D {
     a.set("X-SDK-Version", m), a.set("X-Paywall-Id", this.paywallId), this.capabilities?.length && a.set("X-SDK-Capabilities", this.capabilities.join(","));
     const n = await this.auth?.getAccessToken();
     n ? a.set("Authorization", `Bearer ${n}`) : this.userId && a.set("X-User-ID", this.userId);
-    const o = typeof FormData < "u" && t.body instanceof FormData, u = typeof Blob < "u" && t.body instanceof Blob, d = typeof ReadableStream < "u" && t.body instanceof ReadableStream, f = typeof t.body == "string";
-    let h;
-    t.body === void 0 || t.body === null ? h = void 0 : o || u || d || f ? h = t.body : (h = JSON.stringify(t.body), a.has("Content-Type") || a.set("Content-Type", "application/json"));
-    const y = this.customFetch ?? fetch;
+    const o = typeof FormData < "u" && t.body instanceof FormData, d = typeof Blob < "u" && t.body instanceof Blob, f = typeof ReadableStream < "u" && t.body instanceof ReadableStream, p = typeof t.body == "string";
     let c;
+    t.body === void 0 || t.body === null ? c = void 0 : o || d || f || p ? c = t.body : (c = JSON.stringify(t.body), a.has("Content-Type") || a.set("Content-Type", "application/json"));
+    const l = this.customFetch ?? fetch;
+    let h;
     try {
-      c = await y(s.toString(), {
+      h = await l(s.toString(), {
         method: t.method ?? "POST",
         headers: a,
-        body: h,
+        body: c,
         signal: t.signal,
         credentials: "omit"
       });
-    } catch (p) {
-      const P = p instanceof Error ? p.message : String(p);
-      throw new r("network_error", `Network request failed: ${P}`, { cause: p });
+    } catch (y) {
+      const P = y instanceof Error ? y.message : String(y);
+      throw new r("network_error", `Network request failed: ${P}`, { cause: y });
     }
-    if (c.status === 402) {
-      const p = await q(c);
-      throw this.onQuotaExceeded?.(p), p;
+    if (h.status === 402) {
+      const y = await q(h);
+      throw this.onQuotaExceeded?.(y), y;
     }
-    if (!c.ok) {
-      const p = await $(c.clone());
+    if (!h.ok) {
+      const y = await $(h.clone());
       throw new r(
-        p ?? `http_${c.status}`,
-        c.statusText || "Gateway request failed",
-        { status: c.status }
+        y ?? `http_${h.status}`,
+        h.statusText || "Gateway request failed",
+        { status: h.status }
       );
     }
-    const g = c.headers.get("X-Query-Type") ?? void 0;
-    return this.onChargeSuccess?.(g), c;
+    const g = h.headers.get("X-Query-Type") ?? void 0;
+    return this.onChargeSuccess?.(g), h;
   }
 }
 async function q(i) {
@@ -198,7 +198,7 @@ const M = {
 function L(i) {
   return i || (F() ? M : typeof window < "u" && "localStorage" in window ? x : J);
 }
-const l = {
+const u = {
   visitorId: "pw-visitor-id",
   lastLoginMethod: (i) => `pw-${i}-last-login-method`,
   lastLoginEmail: (i) => `pw-${i}-last-login-email`,
@@ -242,13 +242,13 @@ function C() {
 }
 async function b(i) {
   try {
-    const e = await i.getItem(l.visitorId);
+    const e = await i.getItem(u.visitorId);
     if (e && typeof e == "string" && e.length >= 16) return e;
   } catch {
   }
   const t = C();
   try {
-    await i.setItem(l.visitorId, t);
+    await i.setItem(u.visitorId, t);
   } catch {
   }
   return t;
@@ -444,7 +444,7 @@ class yt {
   async hydrateBootstrapFromStorage() {
     if (!this.cachedBootstrap)
       try {
-        const t = await this.storage.getItem(l.bootstrap(this.paywallId));
+        const t = await this.storage.getItem(u.bootstrap(this.paywallId));
         if (!t) return;
         const e = JSON.parse(t);
         if (!e?.bootstrap || Date.now() - e.at > _ || this.cachedBootstrap) return;
@@ -463,7 +463,7 @@ class yt {
       try {
         const { user: e, ...s } = t;
         await this.storage.setItem(
-          l.bootstrap(this.paywallId),
+          u.bootstrap(this.paywallId),
           JSON.stringify({ at: Date.now(), bootstrap: s })
         );
       } catch {
@@ -474,7 +474,7 @@ class yt {
   // no-op, всё работает как раньше через сеть.
   subscribeBootstrapStorage() {
     typeof this.storage.watch == "function" && (this.bootstrapStorageUnwatch = this.storage.watch(
-      l.bootstrap(this.paywallId),
+      u.bootstrap(this.paywallId),
       (t) => {
         if (t)
           try {
@@ -620,7 +620,7 @@ class yt {
     }
   }
   storageKey() {
-    return l.userState(this.paywallId, B(this.identity));
+    return u.userState(this.paywallId, B(this.identity));
   }
   async hydrateUserFromStorage() {
     if (!this.cachedUser)
@@ -775,7 +775,7 @@ class yt {
         }
   }
   balancesStorageKey() {
-    return l.balances(this.paywallId, B(this.identity));
+    return u.balances(this.paywallId, B(this.identity));
   }
   async hydrateBalancesFromStorage() {
     if (!this.cachedBalances)
@@ -832,20 +832,24 @@ class yt {
       "Idempotency-Key": t.idempotencyKey ?? C()
     };
     this.apiKey && (n["X-Api-Key"] = this.apiKey);
-    const o = this.cachedBootstrap?.settings, u = t.successUrl ?? o?.success_redirect_url ?? void 0, d = t.shopUrl ?? o?.checkout_shop_url ?? void 0, f = this.api.request(`/api/v1/paywall/${this.paywallId}/start-checkout`, {
+    const o = this.cachedBootstrap?.settings, d = t.successUrl ?? o?.success_redirect_url ?? void 0, f = t.shopUrl ?? o?.checkout_shop_url ?? void 0, c = this.cachedBootstrap?.prices.find(
+      (h) => h.id === t.priceId
+    )?.local?.currency ?? void 0, l = this.api.request(`/api/v1/paywall/${this.paywallId}/start-checkout`, {
       method: "POST",
       headers: n,
       signal: t.signal,
       body: JSON.stringify({
         email: this.identity.email,
         priceId: Number(t.priceId),
-        successUrl: u,
+        offerId: t.offerId,
+        successUrl: d,
         errorUrl: t.errorUrl,
-        shopUrl: d,
+        shopUrl: f,
         productName: o?.checkout_product_name ?? void 0,
         trial_days: t.trialDays,
         ignoreActivePurchase: t.ignoreActivePurchase ? !0 : void 0,
-        userMeta: this.identity.userId ? { userId: this.identity.userId } : void 0
+        userMeta: this.identity.userId ? { userId: this.identity.userId } : void 0,
+        localCurrency: c
       })
     }).then((h) => ({ url: h.checkoutUrl, acquiring: h.acquiring })).catch((h) => {
       throw h instanceof r && h.status === 409 && h.cause && typeof h.cause == "object" && h.cause.hasActivePurchase === !0 ? new r(
@@ -854,10 +858,10 @@ class yt {
         { status: 409, cause: h.cause }
       ) : h;
     });
-    return this.inflightCheckouts.set(e, f), f.finally(() => {
-      this.inflightCheckouts.get(e) === f && this.inflightCheckouts.delete(e);
+    return this.inflightCheckouts.set(e, l), l.finally(() => {
+      this.inflightCheckouts.get(e) === l && this.inflightCheckouts.delete(e);
     }).catch(() => {
-    }), f;
+    }), l;
   }
   /**
    * URL Stripe/Paddle/Chargebee customer portal — место, где залогиненный
@@ -1453,8 +1457,8 @@ class pt {
       id: a.user.id,
       email: a.user.email,
       is_anonymous: a.user.is_anonymous ?? !1
-    }, u = { ...n, user: o };
-    return this.setSession(u, { event: "USER_UPDATED" }), await this.clearAnonRefreshToken(), { kind: "updated", session: u };
+    }, d = { ...n, user: o };
+    return this.setSession(d, { event: "USER_UPDATED" }), await this.clearAnonRefreshToken(), { kind: "updated", session: d };
   }
   /**
    * OAuth signin через popup с PKCE. Жизненный цикл:
@@ -1513,7 +1517,7 @@ class pt {
     await this.hydrated, this.gcOAuthFlows();
     const e = Z(), s = await tt(e), a = et(), n = {}, o = await this.getAccessToken().catch(() => null);
     o && (n.Authorization = `Bearer ${o}`);
-    const { authorize_url: u } = await this.api.request(
+    const { authorize_url: d } = await this.api.request(
       `/api/v1/paywall/${this.paywallId}/auth/oauth/init`,
       {
         method: "POST",
@@ -1531,7 +1535,7 @@ class pt {
       userMeta: t.userMeta,
       provider: t.provider,
       startedAt: Date.now()
-    }), this.recordLastLoginMethod(t.provider), { authorize_url: u, state: a };
+    }), this.recordLastLoginMethod(t.provider), { authorize_url: d, state: a };
   }
   /**
    * Шаг 2 OAuth split-API: обменивает code (полученный из popup) на session,
@@ -1718,7 +1722,7 @@ class pt {
       }
   }
   storageKey() {
-    return l.authSession(this.paywallId);
+    return u.authSession(this.paywallId);
   }
   async hydrate() {
     try {
@@ -1772,7 +1776,7 @@ class pt {
   }
   async readAnonRefreshToken() {
     try {
-      const t = await this.storage.getItem(l.anonRefreshToken(this.paywallId));
+      const t = await this.storage.getItem(u.anonRefreshToken(this.paywallId));
       return typeof t == "string" && t.length > 0 ? t : null;
     } catch {
       return null;
@@ -1781,7 +1785,7 @@ class pt {
   async writeAnonRefreshToken(t) {
     try {
       await this.storage.setItem(
-        l.anonRefreshToken(this.paywallId),
+        u.anonRefreshToken(this.paywallId),
         t
       );
     } catch {
@@ -1790,7 +1794,7 @@ class pt {
   async clearAnonRefreshToken() {
     try {
       await this.storage.removeItem(
-        l.anonRefreshToken(this.paywallId)
+        u.anonRefreshToken(this.paywallId)
       );
     } catch {
     }
@@ -1803,8 +1807,8 @@ class pt {
   async getLastLogin() {
     try {
       const [t, e] = await Promise.all([
-        this.storage.getItem(l.lastLoginMethod(this.paywallId)),
-        this.storage.getItem(l.lastLoginEmail(this.paywallId))
+        this.storage.getItem(u.lastLoginMethod(this.paywallId)),
+        this.storage.getItem(u.lastLoginEmail(this.paywallId))
       ]);
       return !t || !ot(t) ? null : { method: t, email: typeof e == "string" && e ? e : null };
     } catch {
@@ -1818,11 +1822,11 @@ class pt {
     this.recordLastLoginMethod(t), e && this.recordLastLoginEmail(e);
   }
   recordLastLoginMethod(t) {
-    this.storage.setItem(l.lastLoginMethod(this.paywallId), t).catch(() => {
+    this.storage.setItem(u.lastLoginMethod(this.paywallId), t).catch(() => {
     });
   }
   recordLastLoginEmail(t) {
-    this.storage.setItem(l.lastLoginEmail(this.paywallId), t).catch(() => {
+    this.storage.setItem(u.lastLoginEmail(this.paywallId), t).catch(() => {
     });
   }
   /**
@@ -1834,7 +1838,7 @@ class pt {
    */
   async readVisitorId() {
     try {
-      const t = await this.storage.getItem(l.visitorId);
+      const t = await this.storage.getItem(u.visitorId);
       return typeof t == "string" && t.length >= 16 ? t : void 0;
     } catch {
       return;
@@ -1846,19 +1850,19 @@ function rt(i, t) {
   return new Promise((e, s) => {
     let a = !1;
     const n = () => {
-      a = !0, window.removeEventListener("message", o), clearInterval(u), clearTimeout(d);
-    }, o = (f) => {
+      a = !0, window.removeEventListener("message", o), clearInterval(d), clearTimeout(f);
+    }, o = (p) => {
       if (a) return;
-      const h = f.data;
-      if (!(!h || h.type !== "pw-oauth") && h.messageId === t) {
-        if (h.status === "success" && h.code) {
+      const c = p.data;
+      if (!(!c || c.type !== "pw-oauth") && c.messageId === t) {
+        if (c.status === "success" && c.code) {
           n();
           try {
             i.close();
           } catch {
           }
-          e(h.code);
-        } else if (h.status === "error") {
+          e(c.code);
+        } else if (c.status === "error") {
           n();
           try {
             i.close();
@@ -1867,21 +1871,21 @@ function rt(i, t) {
           s(
             new r(
               "oauth_failed",
-              h.description || h.error || "OAuth provider returned error"
+              c.description || c.error || "OAuth provider returned error"
             )
           );
         }
       }
-    }, u = setInterval(() => {
+    }, d = setInterval(() => {
       if (a) return;
-      let f;
+      let p;
       try {
-        f = i.closed;
+        p = i.closed;
       } catch {
         return;
       }
-      f && (n(), s(new r("oauth_cancelled", "auth popup was closed")));
-    }, nt), d = setTimeout(() => {
+      p && (n(), s(new r("oauth_cancelled", "auth popup was closed")));
+    }, nt), f = setTimeout(() => {
       if (!a) {
         n();
         try {
@@ -2050,7 +2054,7 @@ export {
   r as PaywallError,
   R as QuotaExceededError,
   m as SDK_VERSION,
-  l as STORAGE_KEYS,
+  u as STORAGE_KEYS,
   L as createStorage,
   b as ensureVisitorId,
   wt as findApplicableOffer,