@wix/himalaya-cli 0.1388.0 → 0.1389.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/commerce-contract.d.ts

@@ -50,6 +50,10 @@ export interface IapCommerce {
     buy(item: IapOrderItem): Promise<AppleIapCheckoutState>;
     /** On resume: re-reads Apple's unfinished queue and the payments being tracked. */
     reconcile(): Promise<AppleIapCheckoutState>;
+    /** Restore purchases (App Review 3.1.1): syncs Apple's purchase history to the device, then makes a
+     *  new attempt at every unfinished purchase (a scheduled retry is not waited out) and re-reads the
+     *  member's access. Needs a signed-in member; taps while one runs share it. */
+    restore(): Promise<IapRestoreResult>;
     tick(): Promise<AppleIapCheckoutState>;
     /** The screen's one `_poll` for prices and purchase, or undefined when the cadence it already
      *  armed still holds (or there is nothing to poll). Emit it from every publish. */
@@ -59,6 +63,26 @@ export interface IapCommerce {
     poll(): Promise<void>;
     dispose(): void;
 }
+/** What a restore found. Counts only: never a product, transaction or member id.
+ *  - `needsSignIn`: no member is signed in; Apple was not asked.
+ *  - `restored`: `recovered` purchases were taken by Wix during this restore; `refused` stay held,
+ *    unfinished, because Wix refused them (another member's purchase, say), plus any Wix refused for good
+ *    during this restore (finished; the member needs support); `pending` are charged but
+ *    not yet taken (Wix could not be reached, or asked to retry), and stay held for the next attempt.
+ *  - `failed`: `storeUnavailable` when the App Store sync or Apple's queue could not be read,
+ *    `unavailable` when this host does not sell through the App Store, `sessionChanged` when the
+ *    member changed. */
+export type IapRestoreResult = {
+    status: "needsSignIn";
+} | {
+    status: "restored";
+    recovered: number;
+    refused: number;
+    pending: number;
+} | {
+    status: "failed";
+    code: "storeUnavailable" | "unavailable" | "sessionChanged";
+};
 /** Labels from the screen's copy pack; the shared layer only chooses between them. */
 export interface IapPurchaseCopy {
     buy: string;

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/commerce-core.d.ts

@@ -24,6 +24,9 @@ export interface IapCommerceDependencies {
     identity: MemberIdentitySource;
     host: CommerceHost;
     store: TransactionStore;
+    /** StoreKit's `AppStore.sync()`: brings Apple's purchase history to the device and may ask the
+     *  person to sign in to their Apple Account. Rejects when the App Store cannot be reached. */
+    syncAppStore(): Promise<void>;
     refs: OrderRefStore;
     clock: Clock;
     adapters: readonly IapOrderAdapter[];

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/index.d.ts

@@ -5,4 +5,4 @@ export { onlineProgramOrders, pricingPlanOrders, storesProductOrders, classifyCa
 export { createWorkerOrderRefStore } from "./order-refs.js";
 export { itemPaymentEnabled, storesAppleSalesEnabled } from "./checkout-source.js";
 export type { AccessRead, AppleIapCheckout, AppleIapCheckoutDependencies, AppleIapCheckoutPhase, AppleIapCheckoutState, BridgeOutcome, BridgeRefusal, CashierRoute, IapEligibility, IapOrderAdapter, IapOrderItem, OrderAttempt, OrderFailureCode, OrderPartitionKey, OrderRef, OrderRefPartition, OrderRefStage, OrderRefStore, PaymentAccess, PaymentProgress, SessionBoundBridge, VerticalRef, WixBridge, } from "./apple-iap-contract.js";
-export type { AppleIapCheckoutRoutes, IapCommerce, IapCommerceOptions, IapPurchaseCopy, IapPurchaseFields, IapPurchaseGap, IapPurchaseReadiness, } from "./commerce-contract.js";
+export type { AppleIapCheckoutRoutes, IapCommerce, IapCommerceOptions, IapPurchaseCopy, IapPurchaseFields, IapPurchaseGap, IapPurchaseReadiness, IapRestoreResult, } from "./commerce-contract.js";

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap-checkout.mjs

@@ -1345,6 +1345,10 @@ async function getProducts(productIds) {
   });
   return Array.isArray(r?.products) ? r.products : [];
 }
+async function restore() {
+  const r = await dispatch("capability.iap.restore");
+  return Array.isArray(r?.entitlements) ? r.entitlements : [];
+}
 async function purchaseForVerification(input) {
   if (!nonempty2(input?.productId) || !isUUID2(input?.appAccountToken)) return failure2("invalidArgument");
   const result = await managedDispatch(() => dispatch("capability.iap.purchaseForVerification", input));
@@ -2526,6 +2530,7 @@ function createIapCommerceWith(deps) {
   let stopWatchingAccess;
   let checkoutStarted = false;
   let recheckAfterOpening = false;
+  let restoring;
   async function loadPrices(items) {
     if (!deps.pricing.enabled) return { scopeComplete: true };
     lastPricedAt = deps.clock.now();
@@ -2557,6 +2562,38 @@ function createIapCommerceWith(deps) {
   function start() {
     return recover((opened) => opened.start());
   }
+  function restore2() {
+    return restoring ?? (restoring = restoreOnce().finally(() => {
+      restoring = void 0;
+    }));
+  }
+  async function restoreOnce() {
+    const session = deps.session.current();
+    if (session.kind !== "member") return { status: "needsSignIn" };
+    const before = state().purchase.items;
+    const opened = await startedCheckout();
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    if (!opened) return { status: "failed", code: "unavailable" };
+    if (!await syncedAppStore()) return { status: "failed", code: "storeUnavailable" };
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    const purchase = (await recover((opened2) => opened2.retry())).purchase;
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    const after = purchase.items;
+    const newly = (matches) => Math.max(0, countOf(after, matches) - countOf(before, matches));
+    const result = {
+      status: "restored",
+      recovered: newly(isRecovered),
+      // Held refusals stay in the queue; a final refusal is finished, so only this restore's count.
+      refused: countOf(after, isHeldRefusal) + newly(isFinalRefusal2),
+      pending: countOf(after, isStillPending)
+    };
+    const settled = result.recovered + newly(isFinalRefusal2) > 0;
+    if (purchase.unfinishedCount === null && !settled) return { status: "failed", code: "storeUnavailable" };
+    return result;
+  }
+  function syncedAppStore() {
+    return deps.syncAppStore().then(() => true, () => false);
+  }
   async function buy(item) {
     if (unanswered2(deps.pricing.view(item.reference))) return state();
     const started = await startedCheckout();
@@ -2687,6 +2724,7 @@ function createIapCommerceWith(deps) {
     start,
     buy,
     reconcile: reconcile2,
+    restore: restore2,
     tick: () => checkout ? checkout.tick() : Promise.resolve(state()),
     pollDirective,
     poll,
@@ -2707,6 +2745,22 @@ var SUSPENDED_AFTER_MS = 2 * PRICE_REFRESH_MS;
 function unanswered2(view) {
   return view.route === "resolving" || view.reason === "mappingUnavailable";
 }
+function isRecovered(item) {
+  return item.completion === "finished" && item.access !== "rejected";
+}
+function isFinalRefusal2(item) {
+  return item.completion === "finished" && item.access === "rejected";
+}
+function isHeldRefusal(item) {
+  const unfinished = item.completion === "pending" || item.completion === "retryRequired";
+  return unfinished && (item.access === "ownershipConflict" || item.access === "rejected");
+}
+function isStillPending(item) {
+  return item.completion !== "finished" && item.completion !== "notFound" && !isHeldRefusal(item);
+}
+function countOf(items, matches) {
+  return items.filter(matches).length;
+}
 function hostFor(identity, binding) {
   if (binding.himalayaAppId !== identity.appId || binding.bundleId !== identity.bundleId) return null;
   return { appId: identity.appId, bundleId: identity.bundleId, siteId: binding.siteId };
@@ -2725,6 +2779,9 @@ function createIapCommerce(options = {}) {
     session,
     host: hostOfWorker(),
     store: appleManagedStore,
+    syncAppStore: async () => {
+      await restore();
+    },
     refs: createWorkerOrderRefStore(),
     clock: { now: () => Date.now() },
     adapters: options.adapters ?? [],

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/screens.mjs

@@ -1622,6 +1622,10 @@ async function getProducts(productIds) {
   });
   return Array.isArray(r?.products) ? r.products : [];
 }
+async function restore() {
+  const r = await dispatch2("capability.iap.restore");
+  return Array.isArray(r?.entitlements) ? r.entitlements : [];
+}
 async function purchaseForVerification(input) {
   if (!nonempty2(input?.productId) || !isUUID2(input?.appAccountToken)) return failure2("invalidArgument");
   const result = await managedDispatch(() => dispatch2("capability.iap.purchaseForVerification", input));
@@ -2797,6 +2801,7 @@ function createIapCommerceWith(deps) {
   let stopWatchingAccess;
   let checkoutStarted = false;
   let recheckAfterOpening = false;
+  let restoring;
   async function loadPrices(items) {
     if (!deps.pricing.enabled) return { scopeComplete: true };
     lastPricedAt = deps.clock.now();
@@ -2828,6 +2833,38 @@ function createIapCommerceWith(deps) {
   function start() {
     return recover((opened) => opened.start());
   }
+  function restore2() {
+    return restoring ?? (restoring = restoreOnce().finally(() => {
+      restoring = void 0;
+    }));
+  }
+  async function restoreOnce() {
+    const session = deps.session.current();
+    if (session.kind !== "member") return { status: "needsSignIn" };
+    const before = state().purchase.items;
+    const opened = await startedCheckout();
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    if (!opened) return { status: "failed", code: "unavailable" };
+    if (!await syncedAppStore()) return { status: "failed", code: "storeUnavailable" };
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    const purchase = (await recover((opened2) => opened2.retry())).purchase;
+    if (deps.session.current().generation !== session.generation) return { status: "failed", code: "sessionChanged" };
+    const after = purchase.items;
+    const newly = (matches) => Math.max(0, countOf(after, matches) - countOf(before, matches));
+    const result = {
+      status: "restored",
+      recovered: newly(isRecovered),
+      // Held refusals stay in the queue; a final refusal is finished, so only this restore's count.
+      refused: countOf(after, isHeldRefusal) + newly(isFinalRefusal2),
+      pending: countOf(after, isStillPending)
+    };
+    const settled = result.recovered + newly(isFinalRefusal2) > 0;
+    if (purchase.unfinishedCount === null && !settled) return { status: "failed", code: "storeUnavailable" };
+    return result;
+  }
+  function syncedAppStore() {
+    return deps.syncAppStore().then(() => true, () => false);
+  }
   async function buy(item) {
     if (unanswered2(deps.pricing.view(item.reference))) return state();
     const started = await startedCheckout();
@@ -2958,6 +2995,7 @@ function createIapCommerceWith(deps) {
     start,
     buy,
     reconcile: reconcile2,
+    restore: restore2,
     tick: () => checkout ? checkout.tick() : Promise.resolve(state()),
     pollDirective,
     poll,
@@ -2978,6 +3016,22 @@ var SUSPENDED_AFTER_MS = 2 * PRICE_REFRESH_MS;
 function unanswered2(view) {
   return view.route === "resolving" || view.reason === "mappingUnavailable";
 }
+function isRecovered(item) {
+  return item.completion === "finished" && item.access !== "rejected";
+}
+function isFinalRefusal2(item) {
+  return item.completion === "finished" && item.access === "rejected";
+}
+function isHeldRefusal(item) {
+  const unfinished = item.completion === "pending" || item.completion === "retryRequired";
+  return unfinished && (item.access === "ownershipConflict" || item.access === "rejected");
+}
+function isStillPending(item) {
+  return item.completion !== "finished" && item.completion !== "notFound" && !isHeldRefusal(item);
+}
+function countOf(items, matches) {
+  return items.filter(matches).length;
+}
 function hostFor(identity, binding) {
   if (binding.himalayaAppId !== identity.appId || binding.bundleId !== identity.bundleId) return null;
   return { appId: identity.appId, bundleId: identity.bundleId, siteId: binding.siteId };
@@ -2996,6 +3050,9 @@ function createIapCommerce(options = {}) {
     session,
     host: hostOfWorker(),
     store: appleManagedStore,
+    syncAppStore: async () => {
+      await restore();
+    },
     refs: createWorkerOrderRefStore(),
     clock: { now: () => Date.now() },
     adapters: options.adapters ?? [],