@wix/himalaya-cli 0.1368.0 → 0.1369.0

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

@@ -938,15 +938,18 @@ var sameReference = (value, reference) => isObject2(value) && value.kind === ref
 
 // ../../core/sdk/iap/src/wix-payments-contract.ts
 var HIMALAYA_SERVE_IAP_ROUTE = { prefix: "/himalaya-serve/v1/iap" };
-var APPLE_SALE_RULES = {
-  onlineProgram: { appProductId: (id2) => id2, productType: "NON_CONSUMABLE" }
-};
+var STORES_ITEM_PAYMENT_ENABLED = false;
+var STORES_PRODUCT_SALE_RULE = { appProductId: (id2) => id2, productType: "NON_CONSUMABLE" };
+var ONLINE_PROGRAM_SALE_RULE = { appProductId: (id2) => id2, productType: "NON_CONSUMABLE" };
+var APPLE_SALE_RULES = STORES_ITEM_PAYMENT_ENABLED ? { onlineProgram: ONLINE_PROGRAM_SALE_RULE, storesProduct: STORES_PRODUCT_SALE_RULE } : { onlineProgram: ONLINE_PROGRAM_SALE_RULE };
 
 // ../../core/sdk/iap/src/mapping-source.ts
 function iapMappingSource() {
   return createWixIapMappingSource({ binding: sharedHostAppBindingSource(), call: hostWixCall });
 }
 function createWixIapMappingSource(deps) {
+  const rules = deps.rules ?? APPLE_SALE_RULES;
+  const appProductIdOf = (reference) => reference.id ? rules[reference.kind]?.appProductId(reference.id) : void 0;
   return {
     // Only a binding the host actually returned: a read that failed is re-asked on the next load.
     active: async () => await deps.binding.current() !== null,
@@ -957,14 +960,11 @@ function createWixIapMappingSource(deps) {
         if (scope.siteId && !sameId(scope.siteId, binding.siteId)) return references.map((reference) => ({ reference, route: "unavailable" }));
         const asked = [...new Set(references.flatMap((reference) => appProductIdOf(reference) ?? []))];
         const mapped = await resolveAll(deps.call, binding, asked);
-        return references.map((reference) => decide(reference, binding, mapped));
+        return references.map((reference) => decide(reference, binding, mapped.get(appProductIdOf(reference) ?? ""), rules[reference.kind]));
       }
     }
   };
 }
-function appProductIdOf(reference) {
-  return reference.id ? APPLE_SALE_RULES[reference.kind]?.appProductId(reference.id) : void 0;
-}
 var PATH = `${HIMALAYA_SERVE_IAP_ROUTE.prefix}/mappings`;
 var BATCH = 100;
 async function resolveAll(call, binding, ids) {
@@ -988,11 +988,9 @@ function decodeMappings(reply) {
     return [m.appProductId, { storeProductId: m.storeProductId, type: String(m.type ?? ""), active: m.active === true }];
   });
 }
-function decide(reference, binding, mapped) {
-  const id2 = appProductIdOf(reference);
-  const mapping = id2 ? mapped.get(id2) : void 0;
-  if (!mapping) return { reference, route: "regular" };
-  if (!mapping.active || mapping.type !== APPLE_SALE_RULES[reference.kind]?.productType) return { reference, route: "unavailable" };
+function decide(reference, binding, mapping, rule) {
+  if (!mapping || !rule) return { reference, route: "regular" };
+  if (!mapping.active || mapping.type !== rule.productType) return { reference, route: "unavailable" };
   return { reference, route: "appleIap", productId: mapping.storeProductId, mappingRevision: `${binding.purchasesAppId}:${mapping.storeProductId}` };
 }
 function sameId(a, b) {
@@ -1289,6 +1287,15 @@ function wixApiGlobal() {
 function startPaymentCall(scope, wixTransactionId) {
   return post(scope, "/payments/start", { appId: scope.binding.purchasesAppId, wixTransactionId });
 }
+function startItemPaymentCall(scope, item) {
+  return post(scope, "/payments/start-item", { appId: scope.binding.purchasesAppId, item: { catalogItemId: item.catalogItemId, catalogAppId: item.catalogAppId } });
+}
+function catalogItemOf(raw) {
+  const item = isObject3(raw) ? raw : {};
+  const { catalogItemId, catalogAppId } = item;
+  const valid = typeof catalogItemId === "string" && catalogItemId.length > 0 && catalogItemId.length <= 36 && isUUID(catalogAppId);
+  return valid ? { catalogItemId, catalogAppId } : null;
+}
 function completePaymentCall(scope, signedTransaction) {
   return post(scope, "/payments/complete", { appId: scope.binding.purchasesAppId, apple: { signedTransaction } });
 }
@@ -1303,6 +1310,12 @@ function decodeStarted(raw, expected) {
   const payment = decodePayment(raw.payment, expected);
   return payment && { payment, storeProductId: raw.storeProductId, appAccountToken: raw.appAccountToken };
 }
+function decodeStartedItem(raw, expected) {
+  if (!isObject3(raw) || !isUUID(raw.ecomOrderId)) return null;
+  const started = decodeStarted(raw, expected);
+  if (!started || started.payment.appProductId !== expected.catalogItemId) return null;
+  return { ...started, ecomOrderId: raw.ecomOrderId };
+}
 function decodePaymentAnswer(raw, expected) {
   return isObject3(raw) ? decodePayment(raw.payment, expected) : null;
 }
@@ -1425,6 +1438,19 @@ function createWixIapClient(deps) {
       }
     });
   }
+  function startItemPayment(input) {
+    const item = catalogItemOf(input.item);
+    if (!item) return Promise.resolve(failure("startItemPayment", "invalidArgument"));
+    return runUnrepeatable({
+      operation: "startItemPayment",
+      codes: START_ITEM_PAYMENT_CODES,
+      request: (scope) => startItemPaymentCall(scope, item),
+      decode: (raw, scope) => {
+        const started = decodeStartedItem(raw, { ...expectationOf2(scope), catalogItemId: item.catalogItemId });
+        return started && { status: "started", ...started };
+      }
+    });
+  }
   function completePayment(transaction) {
     const refusal = refuseProof(transaction);
     if (refusal) return Promise.resolve(refusal);
@@ -1451,11 +1477,18 @@ function createWixIapClient(deps) {
     });
   }
   async function run(spec) {
+    return (await execute(spec)).result;
+  }
+  async function runUnrepeatable(spec) {
+    const { result, handedOff } = await execute(spec);
+    return handedOff && isUndecided(result) ? outcomeUnknown(result) : result;
+  }
+  async function execute(spec) {
     const scope = await resolveScope(deps.session.current(), spec.operation);
-    if ("failure" in scope) return scope.failure;
+    if ("failure" in scope) return { result: scope.failure, handedOff: false };
     const sent = await send(scope, spec);
-    if ("failure" in sent) return sent.failure;
-    return spec.decode(sent.answer, scope) ?? failure(spec.operation, "invalidResponse");
+    if ("failure" in sent) return { result: sent.failure, handedOff: sent.handedOff };
+    return { result: spec.decode(sent.answer, scope) ?? failure(spec.operation, "invalidResponse"), handedOff: true };
   }
   async function resolveScope(session, operation) {
     if (session.kind !== "member") return refused(operation, "authRequired");
@@ -1476,12 +1509,12 @@ function createWixIapClient(deps) {
   }
   async function send(scope, spec) {
     const transport = deps.transport ?? bridgeTransport();
-    if (!transport) return refused(spec.operation, "notEnabled");
-    if (!isCurrent(scope.session)) return refused(spec.operation, "sessionChanged");
+    if (!transport) return notSent(spec.operation, "notEnabled");
+    if (!isCurrent(scope.session)) return notSent(spec.operation, "sessionChanged");
     const expectation = boundExpectation2(scope.session, deps.transport == null);
-    if (expectation === "refuse") return refused(spec.operation, "notEnabled");
+    if (expectation === "refuse") return notSent(spec.operation, "notEnabled");
     const outcome = await attempt2(transport, spec.request(scope), spec, expectation);
-    return isCurrent(scope.session) ? outcome : refused(spec.operation, "sessionChanged");
+    return isCurrent(scope.session) ? outcome : { failure: failure(spec.operation, "sessionChanged"), handedOff: true };
   }
   function boundExpectation2(session, liveHost) {
     const source = deps.session;
@@ -1492,16 +1525,27 @@ function createWixIapClient(deps) {
   function isCurrent(session) {
     return deps.session.current().generation === session.generation;
   }
-  return { startPayment, completePayment, getPayment };
+  return { startPayment, startItemPayment, completePayment, getPayment };
 }
 async function attempt2(transport, call, spec, expectation) {
   try {
     const answer = expectation ? await transport.call(call.method, call.path, call.body, call.headers, expectation) : await transport.call(call.method, call.path, call.body, call.headers);
     return { answer };
   } catch (error) {
-    return { failure: classifyFailure(error, spec.operation, spec.codes) };
+    return { failure: classifyFailure(error, spec.operation, spec.codes), handedOff: true };
   }
 }
+function notSent(operation, kind) {
+  return { failure: failure(operation, kind), handedOff: false };
+}
+function isUndecided(result) {
+  const failed = result;
+  return failed.status === "failed" && UNDECIDED.has(failed.kind);
+}
+function outcomeUnknown(failed) {
+  const status = failed.httpStatus === void 0 ? {} : { httpStatus: failed.httpStatus };
+  return { status: "outcomeUnknown", operation: "startItemPayment", kind: failed.kind, ...status };
+}
 async function read(call, operation) {
   try {
     return { value: await call() };
@@ -1537,6 +1581,14 @@ var START_PAYMENT_CODES = [
   "PRODUCT_NOT_AVAILABLE",
   "ALREADY_OWNED"
 ];
+var START_ITEM_PAYMENT_CODES = [
+  "PRODUCT_NOT_AVAILABLE",
+  "ALREADY_OWNED",
+  "ITEM_NOT_AVAILABLE",
+  "SITE_NOT_ACCEPTING_PAYMENTS",
+  "UNSUPPORTED_ORDER"
+];
+var UNDECIDED = /* @__PURE__ */ new Set(["unavailable", "sessionChanged", "invalidResponse"]);
 var COMPLETE_PAYMENT_CODES = [
   "INVALID_PURCHASE",
   "OWNED_BY_ANOTHER_CUSTOMER",
@@ -1651,6 +1703,9 @@ var HIMALAYA_SERVE_CHECKOUT_ROUTES = {
 function appleIapCheckoutRoutes() {
   return HIMALAYA_SERVE_CHECKOUT_ROUTES;
 }
+function itemPaymentEnabled() {
+  return STORES_ITEM_PAYMENT_ENABLED;
+}
 
 // ../../stdlib/flows/iap-checkout/src/cashier-charges.ts
 async function ensureAppleIapCharge(bridge, route, orderId) {
@@ -1747,8 +1802,9 @@ function isFinalRefusal(status) {
 
 // ../../stdlib/flows/iap-checkout/src/order-refs.ts
 var NEEDS_SUPPORT_HOLD_MS = 6048e5;
+var ITEM_START_HOLD_MS = 36e5;
 function pruneExpiredHolds(partition, now) {
-  const expired = partition.refs().filter((ref) => HOLDS.has(ref.stage) && now - ref.updatedAt >= NEEDS_SUPPORT_HOLD_MS);
+  const expired = partition.refs().filter((ref) => now - ref.updatedAt >= (HOLD_MS[ref.stage] ?? Infinity));
   return expired.filter((ref) => partition.remove(ref.key)).map((ref) => ref.key);
 }
 var MAX_ORDER_REFS = 16;
@@ -1881,8 +1937,8 @@ function isUUID3(value) {
 }
 var VERSION = 1;
 var PREFIX = "himi.iap.wix-checkout.v1";
-var STAGES = /* @__PURE__ */ new Set(["ordered", "charged", "started", "submitted", "held", "needsSupport"]);
-var HOLDS = /* @__PURE__ */ new Set(["held", "needsSupport"]);
+var STAGES = /* @__PURE__ */ new Set(["startingItem", "ordered", "charged", "started", "submitted", "held", "needsSupport"]);
+var HOLD_MS = { held: NEEDS_SUPPORT_HOLD_MS, needsSupport: NEEDS_SUPPORT_HOLD_MS, startingItem: ITEM_START_HOLD_MS };
 var EVICTABLE = /* @__PURE__ */ new Set(["ordered", "charged", "started"]);
 
 // ../../stdlib/flows/iap-checkout/src/wix-bridge.ts
@@ -1967,12 +2023,24 @@ function createWixOrderBackend(deps) {
   async function getPurchaseContext(session, catalogRef) {
     const sale = await saleFor(session, catalogRef);
     if (isStop(sale)) return contextResult(catalogRef, sale);
+    const blocked = saleBlocked(sale);
+    if (blocked) return contextResult(catalogRef, blocked);
+    const itemPayment = deps.itemPaymentEnabled ? sale.adapter.itemPayment?.(sale.item) : null;
+    return itemPayment ? startItemFor(sale, itemPayment) : startOrderFor(sale);
+  }
+  async function startOrderFor(sale) {
     const ordered = await orderFor(sale);
-    if (isStop(ordered)) return contextResult(catalogRef, ordered);
+    if (isStop(ordered)) return contextResult(sale.catalogRef, ordered);
     const charged = await chargeFor(sale, ordered, { reordered: false });
-    if (isStop(charged)) return contextResult(catalogRef, charged);
+    if (isStop(charged)) return contextResult(sale.catalogRef, charged);
     return startFor(sale, charged);
   }
+  function saleBlocked(sale) {
+    const stage = refAt(sale.partition, sale.catalogRef)?.stage;
+    const failure3 = stage && BLOCKING_STAGES[stage];
+    if (failure3) return stopWith("rejected", failure3);
+    return deps.productBusy?.(sale.appleProduct.productId) ? stopWith("rejected", "paymentInProgress") : null;
+  }
   async function saleFor(session, catalogRef) {
     const sold = deps.itemFor(catalogRef);
     const adapter = sold && adapterFor(sold.item.reference.kind);
@@ -1996,10 +2064,6 @@ function createWixOrderBackend(deps) {
   }
   async function orderFor(sale) {
     const existing = refAt(sale.partition, sale.catalogRef);
-    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 attempt4 = 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, attempt4);
   }
@@ -2075,6 +2139,40 @@ function createWixOrderBackend(deps) {
     if (isStop(recorded)) return contextResult(sale.catalogRef, recorded);
     return { status: "ok", context: { productId: started.storeProductId, appAccountToken: started.appAccountToken, scopeKey: sale.member.scopeKey } };
   }
+  async function startItemFor(sale, itemPayment) {
+    const attempt4 = persist(sale, { key: sale.catalogRef, stage: "startingItem", kind: sale.adapter.kind, storeProductId: sale.appleProduct.productId, updatedAt: now() });
+    if (isStop(attempt4)) return contextResult(sale.catalogRef, attempt4);
+    const started = await deps.wixIap.startItemPayment({ item: itemPayment.catalogItem });
+    if (started.status === "outcomeUnknown") return contextResult(sale.catalogRef, sale.bridge.isCurrent() ? OUTCOME_UNKNOWN : STALE2);
+    if (started.status !== "started") return contextResult(sale.catalogRef, itemRefusal(sale, started));
+    return startedItem(sale, itemPayment, started);
+  }
+  function startedItem(sale, itemPayment, started) {
+    if (started.storeProductId !== sale.appleProduct.productId) return contextResult(sale.catalogRef, stopWith("rejected", "productChanged"));
+    const { payment, storeProductId, appAccountToken } = started;
+    const recorded = persist(sale, {
+      key: sale.catalogRef,
+      stage: "started",
+      kind: sale.adapter.kind,
+      verticalRef: itemPayment.verticalRefOf(started.ecomOrderId),
+      wixTransactionId: payment.wixTransactionId,
+      paymentId: payment.paymentId,
+      storeProductId,
+      appAccountToken: appAccountToken.toLowerCase(),
+      ...payment.appProductId ? { appProductId: payment.appProductId } : {},
+      updatedAt: now()
+    });
+    if (isStop(recorded)) return contextResult(sale.catalogRef, recorded);
+    return { status: "ok", context: { productId: storeProductId, appAccountToken, scopeKey: sale.member.scopeKey } };
+  }
+  function itemRefusal(sale, failure3) {
+    if (failure3.kind === "application") return undoAttempt(sale, stopWith("rejected", ITEM_REFUSALS[failure3.code]));
+    return undoAttempt(sale, failure3.kind === "unrecognized" ? NOT_CONFIGURED : failureStop(failure3));
+  }
+  function undoAttempt(sale, stop) {
+    sale.partition.remove(sale.catalogRef);
+    return stop;
+  }
   function startedMismatch(sale, started) {
     return sale.appleProduct.productId === started.storeProductId ? null : "productChanged";
   }
@@ -2199,6 +2297,20 @@ function failureStop(failure3) {
 var SIGN_IN = { stop: true, result: "authRequired", failure: "signInRequired" };
 var NOT_CONFIGURED = { stop: true, result: "rejected", failure: "notConfigured" };
 var UNAVAILABLE = { stop: true, result: "retryable", failure: "unavailable" };
+var OUTCOME_UNKNOWN = { stop: true, result: "rejected", failure: "outcomeUnknown" };
+var BLOCKING_STAGES = {
+  startingItem: "outcomeUnknown",
+  submitted: "paymentInProgress",
+  held: "paymentHeld",
+  needsSupport: "needsSupport"
+};
+var ITEM_REFUSALS = {
+  PRODUCT_NOT_AVAILABLE: "paymentRefused",
+  ALREADY_OWNED: "paymentRefused",
+  ITEM_NOT_AVAILABLE: "orderRefused",
+  SITE_NOT_ACCEPTING_PAYMENTS: "orderRefused",
+  UNSUPPORTED_ORDER: "orderRefused"
+};
 var KIND_STOPS = {
   authRequired: SIGN_IN,
   notPermitted: SIGN_IN,
@@ -2280,6 +2392,7 @@ function enabledCheckout(deps) {
     bridge,
     itemFor: (key) => sales.get(key),
     productBusy,
+    itemPaymentEnabled: deps.itemPaymentEnabled,
     report: onEvent
   });
   const coordinator = createPurchaseCoordinator({
@@ -2643,6 +2756,8 @@ var REFUSALS = {
   paymentHeld: ["disabled", "support"],
   needsSupport: ["disabled", "support"],
   invalidAssociation: ["disabled", "support"],
+  // An order may exist for a StartItemPayment whose answer was lost: no second tap until it expires.
+  outcomeUnknown: ["disabled", "support"],
   // Nothing in the checkout clears this, so the action stays tappable: a tap re-reads the order
   // (never a second charge) and turns into access once the vertical grants it.
   paymentInProgress: ["enabled", "processing"],
@@ -2743,6 +2858,7 @@ function createIapCommerceWith(deps) {
     stopWatchingSession = void 0;
     checkout = createAppleIapCheckoutWith({
       enabled: true,
+      itemPaymentEnabled: deps.itemPaymentEnabled,
       wixIap: deps.wixIapClient({ host, route: routes.wixIap }),
       binding: deps.binding,
       session: deps.session,
@@ -2863,6 +2979,7 @@ function createIapCommerce(options = {}) {
   const binding = sharedHostAppBindingSource();
   return createIapCommerceWith({
     routes: appleIapCheckoutRoutes(),
+    itemPaymentEnabled: itemPaymentEnabled(),
     pricing: createIapCatalogPricing({ onChange: options.onChange }),
     binding,
     session,