@wix/himalaya-cli 0.1308.0 → 0.1310.0

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

@@ -161,7 +161,7 @@ function createPurchaseCoordinator(deps) {
       if (!isCurrent(session)) return noDelivery();
       const wasAllowed = item.finishAllowed;
       if (delivered.signInLost && !wasAllowed) {
-        blockWithoutSession(item, context);
+        blockWithoutSession(item);
         continue;
       }
       if (await deliverItem(session, item, context)) delivered.finished = true;
@@ -170,9 +170,8 @@ function createPurchaseCoordinator(deps) {
     }
     return delivered;
   }
-  function blockWithoutSession(item, context) {
-    const foreign = context !== void 0 && !sameAccount(item.transaction.appAccountToken, context.appAccountToken);
-    block(item.state, foreign ? "ownershipConflict" : "signInRequired", null);
+  function blockWithoutSession(item) {
+    block(item.state, item.transaction.appAccountToken === null ? "ownershipConflict" : "signInRequired", null);
   }
   async function deliverItem(session, item, context) {
     if (!item.finishAllowed) {
@@ -181,7 +180,7 @@ function createPurchaseCoordinator(deps) {
     return complete(session, item);
   }
   async function confirmAccess(session, item, context) {
-    if (!sameAccount(item.transaction.appAccountToken, context.appAccountToken)) {
+    if (item.transaction.appAccountToken === null) {
       block(item.state, "ownershipConflict", null);
       return false;
     }
@@ -373,6 +372,7 @@ function createPurchaseCoordinator(deps) {
     const known = new Set([...items.keys()].filter((key) => items.get(key).state.productId === context.productId));
     pendingApproval = { productId: context.productId, token: context.appAccountToken, known };
     setOutcome("awaitingApproval");
+    deps.onAwaitingApproval?.(context.productId);
     return true;
   }
   function setOutcome(next) {
@@ -464,10 +464,10 @@ function decodeContext(settled, isContext) {
   return { kind: "unavailable", retryAfterMs: retryAfter(raw.retryAfterMs) };
 }
 function isPurchaseContext(value) {
-  return isMemberContext(value) && isObject(value) && isNonEmpty(value.productId);
+  return isMemberContext(value) && isObject(value) && isNonEmpty(value.productId) && isNonEmpty(value.appAccountToken);
 }
 function isMemberContext(value) {
-  return isObject(value) && isNonEmpty(value.appAccountToken) && isNonEmpty(value.scopeKey);
+  return isObject(value) && isNonEmpty(value.scopeKey);
 }
 function retryAfter(value) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
@@ -529,6 +529,14 @@ function createSerialQueue() {
   };
 }
 
+// ../../core/sdk/iap/src/host-session.ts
+function readIdentityBound() {
+  return wixApiGlobal()?.identityBound === true;
+}
+function wixApiGlobal() {
+  return globalThis.himalaya?.wixApi;
+}
+
 // ../../core/sdk/iap/src/index.ts
 async function purchaseForVerification(input) {
   if (!nonempty(input?.productId) || !isUUID2(input?.appAccountToken)) return failure2("invalidArgument");
@@ -661,6 +669,7 @@ var COMPLETE_PAYMENT_REFUSALS = {
   PURCHASE_REVOKED: "refusedFinal",
   ZERO_PRICE: "refusedFinal",
   NO_MATCHING_PAYMENT: "refusedFinal",
+  PAYMENT_NOT_PENDING: "refusedFinal",
   // Before recordPurchase: nothing is recorded. Held pending owner confirmation.
   INVALID_PURCHASE: "hold",
   APP_NOT_CONFIGURED: "hold",
@@ -702,8 +711,8 @@ function createWorkerOrderRefStore(storage) {
   }
   function hasRefs(app) {
     if (!isUUID3(app.purchasesAppId) || !isUUID3(app.siteId)) return null;
-    const customers = readIndex(kv(), indexKey(app));
-    return customers && customers.length > 0;
+    const members = readIndex(kv(), indexKey(app));
+    return members && members.length > 0;
   }
   return { open, hasRefs };
 }
@@ -715,12 +724,12 @@ function upsert(refs, ref) {
 }
 function updateIndex(store, key, holdsRefs) {
   const location = indexKey(key);
-  const customers = readIndex(store, location);
-  if (customers === null) return false;
-  const customer = customerKey(key.customerId);
-  const others = customers.filter((stored) => stored !== customer);
-  const next = holdsRefs ? [...others, customer] : others;
-  return next.length === customers.length && next.every((c, i) => c === customers[i]) || writeVerified(store, location, serialize({ v: VERSION, customers: next }));
+  const members = readIndex(store, location);
+  if (members === null) return false;
+  const member = memberKey(key.memberId);
+  const others = members.filter((stored) => stored !== member);
+  const next = holdsRefs ? [...others, member] : others;
+  return next.length === members.length && next.every((m, i) => m === members[i]) || writeVerified(store, location, serialize({ v: VERSION, members: next }));
 }
 function readRefs(store, location) {
   const parsed = readVersioned(store, location);
@@ -731,8 +740,8 @@ function readRefs(store, location) {
 function readIndex(store, location) {
   const parsed = readVersioned(store, location);
   if (parsed === "empty") return [];
-  if (!parsed || !Array.isArray(parsed.customers) || !parsed.customers.every(isCustomerKey)) return null;
-  return parsed.customers;
+  if (!parsed || !Array.isArray(parsed.members) || !parsed.members.every(isMemberKey)) return null;
+  return parsed.members;
 }
 function readVersioned(store, location) {
   if (!store) return null;
@@ -752,18 +761,18 @@ function writeVerified(store, location, value) {
 function isOrderRef(value) {
   if (!isObject4(value) || typeof value.key !== "string" || !STAGES.has(value.stage)) return false;
   if (typeof value.updatedAt !== "number") return false;
-  const optional = ["kind", "cashierOrderId", "wixTransactionId", "paymentId", "storeProductId", "appProductId", "appleTransactionId"];
+  const optional = ["kind", "cashierOrderId", "wixTransactionId", "paymentId", "storeProductId", "appProductId", "appleTransactionId", "appAccountToken"];
   if (!optional.every((field) => value[field] === void 0 || typeof value[field] === "string")) return false;
   return value.verticalRef === void 0 || isStringMap(value.verticalRef);
 }
 function isPartitionKey(key) {
-  return isUUID3(key.purchasesAppId) && isUUID3(key.siteId) && isUUID3(key.customerId);
+  return isUUID3(key.purchasesAppId) && isUUID3(key.siteId) && isUUID3(key.memberId);
 }
 function partitionKey(key) {
-  return `${PREFIX}.${key.purchasesAppId}.${key.siteId}.${customerKey(key.customerId)}`;
+  return `${PREFIX}.${key.purchasesAppId}.${key.siteId}.${memberKey(key.memberId)}`;
 }
-function customerKey(customerId) {
-  const text = customerId.toLowerCase();
+function memberKey(memberId) {
+  const text = memberId.toLowerCase();
   let h1 = 3735928559;
   let h2 = 1103547991;
   for (let i = 0; i < text.length; i++) {
@@ -773,13 +782,13 @@ function customerKey(customerId) {
   }
   h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507) ^ Math.imul(h2 ^ h2 >>> 13, 3266489909);
   h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507) ^ Math.imul(h1 ^ h1 >>> 13, 3266489909);
-  return `c${(4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(16).padStart(14, "0")}`;
+  return `m${(4294967296 * (2097151 & h2) + (h1 >>> 0)).toString(16).padStart(14, "0")}`;
 }
-function isCustomerKey(value) {
-  return typeof value === "string" && /^c[0-9a-f]{14}$/.test(value);
+function isMemberKey(value) {
+  return typeof value === "string" && /^m[0-9a-f]{14}$/.test(value);
 }
 function indexKey(app) {
-  return `${PREFIX}.${app.purchasesAppId}.${app.siteId}.customers`;
+  return `${PREFIX}.${app.purchasesAppId}.${app.siteId}.members`;
 }
 function hostStorage() {
   const storage = globalThis.himalaya?.storage;
@@ -815,7 +824,9 @@ function bindBridge(session, provider, bridge) {
   const isCurrent = () => session.kind === "member" && provider.current().generation === session.generation;
   async function call(method, path, body) {
     if (!isCurrent()) return SESSION_CHANGED;
-    const outcome = await attempt(bridge, method, path, body);
+    const expectation = boundExpectation(session, provider, bridge);
+    if (expectation === "refuse") return { status: "notEnabled" };
+    const outcome = await attempt(bridge, method, path, body, expectation);
     return isCurrent() ? outcome : SESSION_CHANGED;
   }
   return { call, isCurrent };
@@ -826,13 +837,25 @@ function hostBridge() {
   return typeof bridge?.call === "function" ? bridge : void 0;
 }
 var MISSING_BRIDGE = { call: () => Promise.reject(new Error("wixApi not enabled")) };
-async function attempt(bridge, method, path, body) {
+async function attempt(bridge, method, path, body, expectation) {
   try {
-    return { status: "ok", body: await bridge.call(method, path, body) };
+    const answer = expectation ? await bridge.call(method, path, body, void 0, expectation) : await bridge.call(method, path, body);
+    return { status: "ok", body: answer };
   } catch (error) {
     return refusalOf(error);
   }
 }
+function boundExpectation(session, provider, bridge) {
+  const source = provider;
+  const live = isLiveHost(bridge);
+  if (live && (source.identityBound !== true || !readIdentityBound())) return "refuse";
+  if (typeof source.identity !== "function") return live ? "refuse" : void 0;
+  return source.identity(session) ?? "refuse";
+}
+function isLiveHost(bridge) {
+  const api = globalThis.himalaya?.wixApi;
+  return api != null && (bridge === api || bridge.call === api.call);
+}
 function refusalOf(error) {
   const message = error?.message;
   const text = typeof message === "string" ? message : "";
@@ -863,16 +886,17 @@ function createWixOrderBackend(deps) {
     if (!isCurrent(session)) return STALE2;
     if (binding === void 0) return retry("unavailable");
     if (!binding) return stopWith("rejected", "notConfigured");
-    const customer = await deps.wixIap.getCustomerId();
+    const memberId = await readMemberId(deps.identity, session);
     if (!isCurrent(session)) return STALE2;
-    if (customer.status !== "found") return failureStop(customer);
-    const member = memberFor(binding, customer.customerId);
+    if (memberId === void 0) return retry("unavailable");
+    if (!memberId) return SIGN_IN;
+    const member = memberFor(binding, memberId);
     cached = { generation: session.generation, member };
     return member;
   }
-  function memberFor(binding, customerId) {
-    const partition = deps.refs.open({ purchasesAppId: binding.purchasesAppId, siteId: binding.siteId, customerId });
-    return { customerId, scopeKey: `${binding.purchasesAppId}:${customerId}`, partition };
+  function memberFor(binding, memberId) {
+    const partition = deps.refs.open({ purchasesAppId: binding.purchasesAppId, siteId: binding.siteId, memberId });
+    return { memberId, scopeKey: `${binding.purchasesAppId}:${memberId.toLowerCase()}`, partition };
   }
   async function getPurchaseContext(session, catalogRef) {
     const sale = await saleFor(session, catalogRef);
@@ -909,6 +933,7 @@ function createWixOrderBackend(deps) {
     if (existing?.stage === "submitted") return stopWith("rejected", "paymentInProgress");
     if (existing?.stage === "held") return stopWith("rejected", "paymentHeld");
     if (existing?.stage === "needsSupport") return stopWith("rejected", "needsSupport");
+    if (deps.productBusy?.(sale.appleProduct.productId)) return stopWith("rejected", "paymentInProgress");
     const attempt2 = existing?.cashierOrderId && existing.verticalRef ? await reopenOrOpen(sale, { cashierOrderId: existing.cashierOrderId, verticalRef: existing.verticalRef }) : await sale.adapter.openOrder(sale.item, sale.bridge);
     return recordOrder(sale, existing, attempt2);
   }
@@ -977,14 +1002,14 @@ function createWixOrderBackend(deps) {
       stage: "started",
       paymentId: started.payment.paymentId,
       storeProductId: started.storeProductId,
+      appAccountToken: started.appAccountToken.toLowerCase(),
       ...started.payment.appProductId ? { appProductId: started.payment.appProductId } : {},
       updatedAt: now()
     });
     if (isStop(recorded)) return contextResult(sale.catalogRef, recorded);
-    return { status: "ok", context: { productId: started.storeProductId, appAccountToken: sale.member.customerId, scopeKey: sale.member.scopeKey } };
+    return { status: "ok", context: { productId: started.storeProductId, appAccountToken: started.appAccountToken, scopeKey: sale.member.scopeKey } };
   }
   function startedMismatch(sale, started) {
-    if (!sameUUID(started.customerId, sale.member.customerId)) return "invalidAssociation";
     return sale.appleProduct.productId === started.storeProductId ? null : "productChanged";
   }
   async function startRefusal(sale, ref, failure3) {
@@ -1019,9 +1044,8 @@ function createWixOrderBackend(deps) {
   }
   async function matchedProof(proof, payment) {
     const refs = proof.member.partition?.refs() ?? [];
-    const ref = refs.find((stored) => stored.paymentId === payment.paymentId) ?? refs.find((stored) => stored.wixTransactionId === payment.wixTransactionId);
+    const ref = refs.find((stored) => stored.paymentId === payment.paymentId) ?? refs.find((stored) => stored.wixTransactionId === payment.wixTransactionId) ?? refByToken(refs, proof.transaction);
     if (ref?.storeProductId && ref.storeProductId !== proof.transaction.productId) return holdAssociation(ref);
-    reportOtherOrders(refs, ref, payment, proof.transaction);
     const tracking = trackingRef(ref, payment, proof.transaction, now());
     if (isFinalRefusal(payment.status)) return finalRefusal(proof, tracking);
     if (payment.status === "pending") return RETRYABLE;
@@ -1036,12 +1060,6 @@ function createWixOrderBackend(deps) {
     deps.report({ key: ref.key, failure: "invalidAssociation" });
     return { status: "rejected" };
   }
-  function reportOtherOrders(refs, matched, payment, transaction) {
-    for (const other of refs) {
-      if (other.key === matched?.key || other.stage !== "started" || other.storeProductId !== transaction.productId) continue;
-      if (other.paymentId !== payment.paymentId) deps.report({ key: other.key, failure: "matchedOtherOrder" });
-    }
-  }
   async function accessGranted(proof, ref) {
     const adapter = adapterFor(ref.kind);
     if (!adapter || !ref.verticalRef) return false;
@@ -1064,7 +1082,8 @@ function createWixOrderBackend(deps) {
   function finalRefusal(proof, ref) {
     const hold = ref ?? unassociatedHold(proof.transaction, now());
     const partition = proof.member.partition;
-    if (!partition || !isCurrent(proof.session) || !partition.put({ ...hold, stage: "needsSupport", updatedAt: now() })) return RETRYABLE;
+    const stored = { ...hold, stage: "needsSupport", appleTransactionId: proof.transaction.transactionId, updatedAt: now() };
+    if (!partition || !isCurrent(proof.session) || !partition.put(stored)) return RETRYABLE;
     deps.report({ key: hold.key, access: "needsSupport" });
     return { status: "refusedFinal", acknowledgement: proof.acknowledgement };
   }
@@ -1083,12 +1102,16 @@ function createWixOrderBackend(deps) {
   }
   function startedRefFor(proof) {
     const refs = proof.member.partition?.refs() ?? [];
-    return refs.find((ref) => (ref.stage === "started" || ref.stage === "held") && ref.storeProductId === proof.transaction.productId);
+    const { productId, transactionId } = proof.transaction;
+    const holding = refs.find((ref) => (ref.stage === "held" || ref.stage === "needsSupport") && ref.appleTransactionId === transactionId);
+    if (holding) return holding;
+    if (proof.transaction.appAccountToken) return refByToken(refs, proof.transaction);
+    return refs.filter((ref) => ref.stage === "started" && ref.storeProductId === productId).reduce((newest, ref) => !newest || ref.updatedAt >= newest.updatedAt ? ref : newest, void 0);
   }
   async function getMemberContext(session) {
     const member = await memberOf(session);
     if (isStop(member)) return { status: member.result };
-    return { status: "ok", context: { appAccountToken: member.customerId, scopeKey: member.scopeKey } };
+    return { status: "ok", context: { scopeKey: member.scopeKey } };
   }
   return { getPurchaseContext, getMemberContext, submitProof };
 }
@@ -1142,6 +1165,17 @@ function acknowledgementOf(transaction, scopeKey) {
 function refAt(partition, key) {
   return partition.refs().find((ref) => ref.key === key);
 }
+async function readMemberId(identity, session) {
+  try {
+    return await identity.memberId(session);
+  } catch {
+    return void 0;
+  }
+}
+function refByToken(refs, transaction) {
+  const token = transaction.appAccountToken?.toLowerCase();
+  return token ? refs.find((ref) => ref.appAccountToken === token) : void 0;
+}
 async function readBinding(source) {
   try {
     return await source.current();
@@ -1149,14 +1183,12 @@ async function readBinding(source) {
     return void 0;
   }
 }
-function sameUUID(a, b) {
-  return a.toLowerCase() === b.toLowerCase();
-}
 
 // ../../stdlib/flows/iap-checkout/src/apple-iap-core.ts
 function createAppleIapCheckoutWith(deps) {
   return deps.enabled ? enabledCheckout(deps) : disabledCheckout();
 }
+var ASK_TO_BUY_HOLD_MS = 60 * 6e4;
 function enabledCheckout(deps) {
   const refs = deps.refs ?? createWorkerOrderRefStore();
   const bridge = deps.bridge ?? hostBridge() ?? MISSING_BRIDGE;
@@ -1166,10 +1198,11 @@ function enabledCheckout(deps) {
   let generation = deps.session.current().generation;
   let disposed = false;
   let tracking = Promise.resolve();
-  let trackedCustomer = null;
   let partitionRead = null;
+  const awaitingApproval = /* @__PURE__ */ new Map();
   const backend = createWixOrderBackend({
     wixIap: deps.wixIap,
+    identity: deps.identity,
     binding: deps.binding,
     session: deps.session,
     clock: deps.clock,
@@ -1178,6 +1211,7 @@ function enabledCheckout(deps) {
     refs,
     bridge,
     itemFor: (key) => sales.get(key),
+    productBusy,
     report: onEvent
   });
   const coordinator = createPurchaseCoordinator({
@@ -1186,7 +1220,8 @@ function enabledCheckout(deps) {
     session: deps.session,
     clock: deps.clock,
     jitter: deps.jitter,
-    onState: publish
+    onState: publish,
+    onAwaitingApproval: reserveAskToBuy
   });
   async function start() {
     resetIfSessionChanged();
@@ -1264,16 +1299,31 @@ function enabledCheckout(deps) {
     if (current.failure) return "refused";
     if (OVERLAY_PHASES.has(purchase.phase)) return purchase.phase;
     if (current.buying) return "preparing";
-    if (mine?.access === "processing" || purchase.items.some(isProcessing)) return "processing";
+    if (mine?.access === "processing" || purchase.items.some(isInFlight)) return "processing";
+    if (!current.item && progress.some((payment) => payment.access === "processing")) return "processing";
     return "idle";
   }
+  function reserveAskToBuy(productId) {
+    awaitingApproval.set(productId, { items: itemsFor(productId).length, since: deps.clock.now() });
+  }
+  function productBusy(productId) {
+    const items = itemsFor(productId);
+    const pending = awaitingApproval.get(productId);
+    if (pending && (items.length > pending.items || deps.clock.now() - pending.since >= ASK_TO_BUY_HOLD_MS)) {
+      awaitingApproval.delete(productId);
+    }
+    return awaitingApproval.has(productId) || items.some(isUnfinished);
+  }
+  function itemsFor(productId) {
+    return coordinator.getState().items.filter((held) => held.productId === productId);
+  }
   function resetIfSessionChanged() {
     const next = deps.session.current().generation;
     if (next === generation) return;
     generation = next;
     sales.clear();
     payments.clear();
-    trackedCustomer = null;
+    awaitingApproval.clear();
     partitionRead = null;
     current = { item: null, failure: null, buying: false };
   }
@@ -1314,17 +1364,17 @@ function enabledCheckout(deps) {
     if (!binding || !isCurrent(session)) return binding === null ? "none" : null;
     const stored = refs.hasRefs(binding);
     if (stored !== true) return stored === false ? "none" : null;
-    const customerId = await customerIdFor(session);
-    if (!customerId || !isCurrent(session)) return null;
-    const partition = refs.open({ purchasesAppId: binding.purchasesAppId, siteId: binding.siteId, customerId });
+    const memberId = await memberIdOf(session);
+    if (!memberId || !isCurrent(session)) return null;
+    const partition = refs.open({ purchasesAppId: binding.purchasesAppId, siteId: binding.siteId, memberId });
     return partition && { partition };
   }
-  async function customerIdFor(session) {
-    if (trackedCustomer?.generation === session.generation) return trackedCustomer.customerId;
-    const customer = await deps.wixIap.getCustomerId();
-    if (customer.status !== "found" || !isCurrent(session)) return null;
-    trackedCustomer = { generation: session.generation, customerId: customer.customerId };
-    return customer.customerId;
+  async function memberIdOf(session) {
+    try {
+      return await deps.identity.memberId(session);
+    } catch {
+      return null;
+    }
   }
   function backOffDue() {
     const attempts = (partitionRead?.attempts ?? 0) + 1;
@@ -1415,7 +1465,11 @@ function blankState(enabled) {
     purchase: { phase: "idle", errorCode: null, items: [], unfinishedCount: null, nextWakeAt: null }
   };
 }
-function isProcessing(item) {
+function isUnfinished(item) {
+  return item.completion === "pending" || item.completion === "retryRequired";
+}
+function isInFlight(item) {
+  if (item.completion === "finished") return false;
   return item.access === "processing" || item.access === "confirming" || item.access === "pending" || item.access === "waitingToRetry";
 }
 function itemKey(item) {