@alipay/ams-checkout 0.0.1783403875-dev.2 → 0.0.1783496600-dev.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. package/ams-checkout.js +4 -3
  2. package/dist/ams-checkout.min.js +2 -1
  3. package/dist/ams-checkout.min.js.map +1 -0
  4. package/esm/config/index.d.ts +7 -0
  5. package/esm/config/index.js +2 -2
  6. package/esm/constant/element.d.ts +2 -1
  7. package/esm/constant/element.js +1 -0
  8. package/esm/constant/index.d.ts +4 -21
  9. package/esm/core/component/element/elementController/index.d.ts +3 -3
  10. package/esm/core/component/element/elementController/index.js +49 -59
  11. package/esm/core/component/element/elementProcessor/paymentProcessor.js +10 -13
  12. package/esm/core/component/element/index.d.ts +4 -1
  13. package/esm/core/component/element/index.js +19 -4
  14. package/esm/core/component/element/modernElementController/adapter.d.ts +19 -0
  15. package/esm/core/component/element/modernElementController/adapter.js +73 -0
  16. package/esm/core/component/element/modernElementController/index.d.ts +149 -0
  17. package/esm/core/component/element/modernElementController/index.js +1665 -0
  18. package/esm/core/component/element/type.d.ts +15 -19
  19. package/esm/foundation/service/event-center.js +1 -1
  20. package/esm/modern/global.d.ts +3 -0
  21. package/esm/modern/index.d.ts +5 -1
  22. package/esm/modern/index.js +1 -51
  23. package/esm/modern/tools.js +1 -0
  24. package/esm/plugin/component/channel.d.ts +2 -2
  25. package/esm/plugin/component/channel.js +18 -18
  26. package/esm/types/index.d.ts +1 -0
  27. package/esm/util/beforeConfirm.d.ts +2 -4
  28. package/esm/util/beforeConfirm.js +14 -15
  29. package/esm/util/logger.js +1 -2
  30. package/package.json +15 -9
  31. package/types.d.ts +785 -94
  32. package/types.untrimmed.d.ts +929 -108
  33. package/esm/modern/stageName.d.ts +0 -3
  34. package/esm/modern/stageName.js +0 -1
@@ -32,7 +32,7 @@ export declare class ApplePaySdk {
32
32
  */
33
33
  private paymentStatus;
34
34
  /**
35
- * @description oncancel 原因标记,用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止/超时
35
+ * @description oncancel 原因标记,用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
36
36
  */
37
37
  private cancelReason;
38
38
  private logger;
@@ -40,7 +40,7 @@ export declare class ApplePaySdk {
40
40
  private shipping?;
41
41
  private merchantAmount;
42
42
  private merchantCurrency;
43
- private onBeforeConfirm;
43
+ private onBeforeConfirm?;
44
44
  constructor({ paymentSessionData, parseData, logger, env, shipping, merchantAmount, merchantCurrency, }: {
45
45
  paymentSessionData: string;
46
46
  parseData: IPaymentSessionMetaData;
@@ -17,7 +17,7 @@ import { getDoubleFaUrlFromSession } from "../../foundation/utils/web_app_url_ut
17
17
  import { getApplePayPaymentSession, submitPayInfo } from "../../service";
18
18
  import { EnvironmentEnum } from "../../types";
19
19
  import { device, isEmpty } from "../../util";
20
- import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS, MERCHANT_CONFIRM_ABORT_CODE, MERCHANT_CONFIRM_TIMEOUT_CODE } from "../../util/beforeConfirm";
20
+ import { executeWithTimeout, BEFORE_CONFIRM_TIMEOUT_MS } from "../../util/beforeConfirm";
21
21
  import { APPLE_PAY_RECURRING_VERSION, APPLE_PAY_VERSION } from "../applepay/interface";
22
22
  var APPLEPAYERRORENUM = /*#__PURE__*/function (APPLEPAYERRORENUM) {
23
23
  APPLEPAYERRORENUM["APPLE_PAY_MISSING_DATA"] = "APPLE_PAY_MISSING_DATA";
@@ -155,7 +155,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
155
155
  */
156
156
  _defineProperty(this, "paymentStatus", void 0);
157
157
  /**
158
- * @description oncancel 原因标记,用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止/超时
158
+ * @description oncancel 原因标记,用于区分用户主动取消 vs 商户通过 onBeforeConfirm 中止
159
159
  */
160
160
  _defineProperty(this, "cancelReason", null);
161
161
  _defineProperty(this, "logger", void 0);
@@ -163,7 +163,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
163
163
  _defineProperty(this, "shipping", void 0);
164
164
  _defineProperty(this, "merchantAmount", void 0);
165
165
  _defineProperty(this, "merchantCurrency", void 0);
166
- _defineProperty(this, "onBeforeConfirm", null);
166
+ _defineProperty(this, "onBeforeConfirm", void 0);
167
167
  this.paymentSessionData = paymentSessionData;
168
168
  this.parseData = parseData;
169
169
  this.env = env;
@@ -213,7 +213,6 @@ export var ApplePaySdk = /*#__PURE__*/function () {
213
213
  try {
214
214
  if (!_this.session) return;
215
215
  _this.paymentStatus = PAYMENT_STATUS.PENDING;
216
- _this.cancelReason = 'USER_CANCEL';
217
216
  _this.session.onvalidatemerchant = /*#__PURE__*/function () {
218
217
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(event) {
219
218
  var requestParams, res, merchantSession, _this$logger, _this$logger2;
@@ -283,7 +282,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
283
282
  }();
284
283
  _this.session.onpaymentauthorized = /*#__PURE__*/function () {
285
284
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(event) {
286
- var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, _this$logger6, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, isTimeout, _this$logger5, _this$session2, _this$session2$comple, _this$logger7, _this$session3, _this$session3$comple, res, _this$logger8;
285
+ var exception, _event$payment, token, billingContact, shippingContact, _this$parseData, obj, _this$parseData$payme, requiredBillingContactFields, requiredShippingContactFields, _this$logger3, _this$logger4, _this$logger6, startTime, _yield$executeWithTim, rawResult, timedOut, shouldContinue, _this$logger5, _this$session2, _this$session2$comple, _this$logger7, _this$session3, _this$session3$comple, res, _this$logger8;
287
286
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
288
287
  while (1) switch (_context3.prev = _context3.next) {
289
288
  case 0:
@@ -324,25 +323,26 @@ export var ApplePaySdk = /*#__PURE__*/function () {
324
323
  _context3.next = 39;
325
324
  break;
326
325
  case 11:
326
+ // 清空回原始状态
327
+ _this.cancelReason = 'USER_CANCEL';
327
328
  (_this$logger4 = _this.logger) === null || _this$logger4 === void 0 || _this$logger4.logInfo({
328
329
  title: 'sdk_before_confirm_start'
329
330
  }, {
330
331
  paymentMethodType: 'APPLEPAY',
331
332
  path: 'applePay_chrome_sdk'
332
333
  });
333
- _context3.prev = 12;
334
+ _context3.prev = 13;
334
335
  startTime = Date.now();
335
- _context3.next = 16;
336
+ _context3.next = 17;
336
337
  return executeWithTimeout(function () {
337
338
  return _this.onBeforeConfirm();
338
339
  });
339
- case 16:
340
+ case 17:
340
341
  _yield$executeWithTim = _context3.sent;
341
342
  rawResult = _yield$executeWithTim.result;
342
343
  timedOut = _yield$executeWithTim.timedOut;
343
344
  shouldContinue = rawResult;
344
- isTimeout = timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS;
345
- if (isTimeout) {
345
+ if (timedOut || Date.now() - startTime >= BEFORE_CONFIRM_TIMEOUT_MS) {
346
346
  (_this$logger5 = _this.logger) === null || _this$logger5 === void 0 || _this$logger5.logError({
347
347
  title: 'sdk_before_confirm_timeout'
348
348
  });
@@ -357,11 +357,11 @@ export var ApplePaySdk = /*#__PURE__*/function () {
357
357
  _context3.next = 29;
358
358
  break;
359
359
  }
360
- _this.cancelReason = isTimeout ? 'MERCHANT_TIMEOUT' : 'MERCHANT_ABORT';
360
+ _this.cancelReason = 'MERCHANT_ABORT';
361
361
  (_this$session2 = _this.session) === null || _this$session2 === void 0 || (_this$session2$comple = _this$session2.completePayment) === null || _this$session2$comple === void 0 || _this$session2$comple.call(_this$session2, window.ApplePaySession.STATUS_FAILURE);
362
362
  _this.abortSession();
363
363
  reject({
364
- errorCode: isTimeout ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE
364
+ errorCode: 'MERCHANT_CONFIRM_ABORT'
365
365
  });
366
366
  return _context3.abrupt("return");
367
367
  case 29:
@@ -369,7 +369,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
369
369
  break;
370
370
  case 31:
371
371
  _context3.prev = 31;
372
- _context3.t0 = _context3["catch"](12);
372
+ _context3.t0 = _context3["catch"](13);
373
373
  (_this$logger7 = _this.logger) === null || _this$logger7 === void 0 || _this$logger7.logError({
374
374
  title: 'sdk_before_confirm_error'
375
375
  }, {
@@ -381,7 +381,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
381
381
  (_this$session3 = _this.session) === null || _this$session3 === void 0 || (_this$session3$comple = _this$session3.completePayment) === null || _this$session3$comple === void 0 || _this$session3$comple.call(_this$session3, window.ApplePaySession.STATUS_FAILURE);
382
382
  _this.abortSession();
383
383
  reject({
384
- errorCode: MERCHANT_CONFIRM_ABORT_CODE
384
+ errorCode: 'MERCHANT_CONFIRM_ABORT'
385
385
  });
386
386
  return _context3.abrupt("return");
387
387
  case 39:
@@ -402,7 +402,7 @@ export var ApplePaySdk = /*#__PURE__*/function () {
402
402
  case "end":
403
403
  return _context3.stop();
404
404
  }
405
- }, _callee3, null, [[12, 31]]);
405
+ }, _callee3, null, [[13, 31]]);
406
406
  }));
407
407
  return function (_x2) {
408
408
  return _ref3.apply(this, arguments);
@@ -420,10 +420,10 @@ export var ApplePaySdk = /*#__PURE__*/function () {
420
420
  title: 'a3753.b103030.c386485.d507498'
421
421
  });
422
422
  }
423
- // cancelReason 标识 onBeforeConfirm 主动中止/超时;其他情况视为用户主动取消付款界面
424
- var merchantCancelErrorCode = _this.cancelReason === 'MERCHANT_TIMEOUT' ? MERCHANT_CONFIRM_TIMEOUT_CODE : MERCHANT_CONFIRM_ABORT_CODE;
423
+ // cancelReason === 'MERCHANT_ABORT': onBeforeConfirm 返回 false 或异常,由商户主动中止
424
+ // 其他:用户主动取消付款界面
425
425
  reject({
426
- errorCode: _this.cancelReason === 'MERCHANT_ABORT' || _this.cancelReason === 'MERCHANT_TIMEOUT' ? merchantCancelErrorCode : APPLEPAYERRORENUM.APPLE_PAY_CANCEL
426
+ errorCode: _this.cancelReason === 'MERCHANT_ABORT' ? 'MERCHANT_CONFIRM_ABORT' : APPLEPAYERRORENUM.APPLE_PAY_CANCEL
427
427
  });
428
428
  };
429
429
  _this.session.begin();
@@ -354,6 +354,7 @@ export interface IPaymentSessionMetaData {
354
354
  };
355
355
  skipRenderPaymentMethod?: boolean;
356
356
  needAccountConfirmPage?: boolean;
357
+ modernWeb?: boolean;
357
358
  }
358
359
  export interface IPaymentSessionFactor {
359
360
  merchantInfo?: IMerchantInfo;
@@ -1,11 +1,9 @@
1
- export declare const BEFORE_CONFIRM_TIMEOUT_MS = 20000;
2
- export declare const MERCHANT_CONFIRM_ABORT_CODE = "MERCHANT_CONFIRM_ABORT";
3
- export declare const MERCHANT_CONFIRM_TIMEOUT_CODE = "MERCHANT_CONFIRM_TIMEOUT";
1
+ export declare const BEFORE_CONFIRM_TIMEOUT_MS = 15000;
4
2
  /**
5
3
  * 带超时的异步执行,始终清理定时器避免 unhandled promise rejection。
6
4
  *
7
5
  * @param fn - 要执行的异步函数
8
- * @param timeoutMs - 超时时间(毫秒),默认 20000
6
+ * @param timeoutMs - 超时时间(毫秒),默认 15000
9
7
  * @returns result 为 fn 的返回值(超时时为 undefined),timedOut 表示是否因超时返回
10
8
  */
11
9
  export declare function executeWithTimeout<T>(fn: () => Promise<T>, timeoutMs?: number): Promise<{
@@ -2,16 +2,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
2
2
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
3
3
  function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
4
4
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
5
- export var BEFORE_CONFIRM_TIMEOUT_MS = 20000;
6
- export var MERCHANT_CONFIRM_ABORT_CODE = 'MERCHANT_CONFIRM_ABORT';
7
- export var MERCHANT_CONFIRM_TIMEOUT_CODE = 'MERCHANT_CONFIRM_TIMEOUT';
8
- var BEFORE_CONFIRM_TIMEOUT_SIGNAL = Symbol('BEFORE_CONFIRM_TIMEOUT');
5
+ export var BEFORE_CONFIRM_TIMEOUT_MS = 15000;
9
6
 
10
7
  /**
11
8
  * 带超时的异步执行,始终清理定时器避免 unhandled promise rejection。
12
- *
9
+ *
13
10
  * @param fn - 要执行的异步函数
14
- * @param timeoutMs - 超时时间(毫秒),默认 20000
11
+ * @param timeoutMs - 超时时间(毫秒),默认 15000
15
12
  * @returns result 为 fn 的返回值(超时时为 undefined),timedOut 表示是否因超时返回
16
13
  */
17
14
  export function executeWithTimeout(_x) {
@@ -23,6 +20,7 @@ function _executeWithTimeout() {
23
20
  timerId,
24
21
  timeoutPromise,
25
22
  result,
23
+ isTimeout,
26
24
  _args = arguments;
27
25
  return _regeneratorRuntime().wrap(function _callee$(_context) {
28
26
  while (1) switch (_context.prev = _context.next) {
@@ -30,7 +28,7 @@ function _executeWithTimeout() {
30
28
  timeoutMs = _args.length > 1 && _args[1] !== undefined ? _args[1] : BEFORE_CONFIRM_TIMEOUT_MS;
31
29
  timeoutPromise = new Promise(function (_, reject) {
32
30
  timerId = setTimeout(function () {
33
- return reject(BEFORE_CONFIRM_TIMEOUT_SIGNAL);
31
+ return reject(new Error('timed out'));
34
32
  }, timeoutMs);
35
33
  });
36
34
  _context.prev = 2;
@@ -45,25 +43,26 @@ function _executeWithTimeout() {
45
43
  case 9:
46
44
  _context.prev = 9;
47
45
  _context.t0 = _context["catch"](2);
48
- if (!(_context.t0 === BEFORE_CONFIRM_TIMEOUT_SIGNAL)) {
49
- _context.next = 13;
46
+ isTimeout = _context.t0 instanceof Error && _context.t0.message === 'timed out';
47
+ if (!isTimeout) {
48
+ _context.next = 14;
50
49
  break;
51
50
  }
52
51
  return _context.abrupt("return", {
53
52
  result: undefined,
54
53
  timedOut: true
55
54
  });
56
- case 13:
57
- throw _context.t0;
58
55
  case 14:
59
- _context.prev = 14;
56
+ throw _context.t0;
57
+ case 15:
58
+ _context.prev = 15;
60
59
  clearTimeout(timerId);
61
- return _context.finish(14);
62
- case 17:
60
+ return _context.finish(15);
61
+ case 18:
63
62
  case "end":
64
63
  return _context.stop();
65
64
  }
66
- }, _callee, null, [[2, 9, 14, 17]]);
65
+ }, _callee, null, [[2, 9, 15, 18]]);
67
66
  }));
68
67
  return _executeWithTimeout.apply(this, arguments);
69
68
  }
@@ -7,7 +7,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
7
7
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
8
8
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
9
9
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
10
- import json from "../../package.json";
11
10
  import { LogComplianceProcessor } from "../foundation/service/log/processor";
12
11
  import { SPM_MAP } from "./spm-map";
13
12
  export var Logger = /*#__PURE__*/function () {
@@ -297,6 +296,6 @@ export var LogConfig = {
297
296
  version: 'iteration/20231021',
298
297
  mdata: {
299
298
  firstLogTime: Date.now(),
300
- sdkVersion: json === null || json === void 0 ? void 0 : json.version
299
+ sdkVersion: "0.0.1783496600-dev.2"
301
300
  }
302
301
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alipay/ams-checkout",
3
- "version": "0.0.1783403875-dev.2",
3
+ "version": "0.0.1783496600-dev.2",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "exports": {
@@ -36,14 +36,15 @@
36
36
  "README.md"
37
37
  ],
38
38
  "scripts": {
39
- "build": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father && npm run build:father:umd && npm run build:react",
39
+ "build": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:umd && npm run build:father:tools && npm run build:react",
40
40
  "build:analyze": "ANALYZE=1 father build",
41
- "build:father": "FATHER_TSCONFIG_NAME=tsconfig.build.json father build",
42
- "build:father:local": "STAGE_NAME=LOCAL FATHER_TSCONFIG_NAME=tsconfig.build.json father build",
43
- "build:father:pre": "FATHER_BUILD_TYPE=prebuild father build",
41
+ "build:father:pre": "father build",
42
+ "build:father:pre:local": "STAGE_NAME=LOCAL father build",
43
+ "build:father:tools": "FATHER_BUILD_TYPE=only-umd-tools father build --no-clean",
44
+ "build:father:tools:local": "STAGE_NAME=LOCAL FATHER_BUILD_TYPE=only-umd-tools father build --no-clean",
44
45
  "build:father:umd": "FATHER_BUILD_TYPE=only-umd father build",
45
46
  "build:father:umd:local": "STAGE_NAME=LOCAL FATHER_BUILD_TYPE=only-umd father build",
46
- "build:local": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:local && npm run build:father:umd:local && npm run build:react",
47
+ "build:local": "opensdk update && npm run build:father:pre && npm run extract && npm run build:father:umd:local && npm run build:father:tools:local && npm run build:react",
47
48
  "build:react": "tsc --project tsconfig.cjs.json && mv react-js.js react-js.cjs && tsc --project tsconfig.esm.json",
48
49
  "build:type": "dts-bundle-generator -o ./types/antom-web-sdk.d.ts ./src/index.ts --no-banner --silent --no-check",
49
50
  "build:w": "FATHER_BUILD_TYPE=only-umd STAGE_NAME=LOCAL father dev",
@@ -53,7 +54,7 @@
53
54
  "e2e": "nyc playwright test",
54
55
  "e2e:create": "node scripts/e2e-create.js",
55
56
  "e2e:ui": "playwright test --ui",
56
- "extract": "opensdk extract -p esm/modern/sdk",
57
+ "extract": "opensdk extract && tspc -p tsconfig.build.json && rm -rf esm/modern/sdk",
57
58
  "format": "prettier --write --no-error-on-unmatched-pattern \"**/*.{js,jsx,ts,tsx,md,json,css,less}\"",
58
59
  "generateApi": "intl-oneapi generate && prettier --write src/modern/sdk/oneapi",
59
60
  "lint": "eslint ./src",
@@ -85,12 +86,15 @@
85
86
  ]
86
87
  },
87
88
  "dependencies": {
88
- "@antglobal/create-sdk-loader": "^1.0.5",
89
89
  "axios": "^1.3.4",
90
90
  "proxy-polyfill": "^0.3.2",
91
91
  "uuid": "^9.0.0"
92
92
  },
93
+ "opensdk": {
94
+ "name": "Antom"
95
+ },
93
96
  "devDependencies": {
97
+ "@antglobal/create-sdk-loader": "^1.0.5",
94
98
  "@babel/core": "^7.20.7",
95
99
  "@babel/preset-env": "^7.20.2",
96
100
  "@commitlint/cli": "^17.3.0",
@@ -122,7 +126,9 @@
122
126
  "serve": "^14.2.5",
123
127
  "ts-jest": "^29.0.3",
124
128
  "ts-node": "^10.9.1",
125
- "typescript": "^5.x"
129
+ "ts-patch": "^3.3.0",
130
+ "typescript": "^5.x",
131
+ "typescript-transform-paths": "^3.5.6"
126
132
  },
127
133
  "engines": {
128
134
  "install-node": "20"