@alipay/ams-checkout 0.0.1710212811-dev.19 → 0.0.1710212811-dev.21

package/esm/core/bus/index.d.ts

@@ -52,6 +52,7 @@ export interface BusInterceptor {
  */
 export declare class BusManager {
     private static TAG;
+    private static _logSplit;
     private static interceptors;
     private static subscribersMap;
     private static isDebug;
@@ -60,7 +61,10 @@ export declare class BusManager {
     private static traceError;
     static clear(): void;
     static addInterceptor(interceptor: BusInterceptor): void;
-    static publishForResult(message: BusMessage, timeoutMs?: number): Promise<BusMessage>;
+    static publishForResult(message: BusMessage, config?: {
+        timeoutMs?: number;
+        fallback?: any;
+    }): Promise<BusMessage>;
     static publish(message: BusMessage, callback?: OnBusCallback): void;
     static subscribe(subscriber: BusSubscriber): void;
     static unsubscribe(subscriber: BusSubscriber): void;

package/esm/core/bus/index.js

@@ -116,7 +116,7 @@ export var BusManager = /*#__PURE__*/function () {
         for (var _len = arguments.length, optionalParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           optionalParams[_key - 1] = arguments[_key];
         }
-        console.log(message + "---" + (optionalParams === null || optionalParams === void 0 ? void 0 : optionalParams.join("---")));
+        console.log([BusManager.TAG, message].concat(optionalParams).join(this._logSplit));
       }
     }
   }, {
@@ -126,43 +126,47 @@ export var BusManager = /*#__PURE__*/function () {
         for (var _len2 = arguments.length, optionalParams = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
           optionalParams[_key2 - 1] = arguments[_key2];
         }
-        console.error(message + "---" + (optionalParams === null || optionalParams === void 0 ? void 0 : optionalParams.join("---")));
+        console.error([BusManager.TAG, message].concat(optionalParams).join(this._logSplit));
       }
     }
   }, {
     key: "clear",
     value: function clear() {
-      BusManager.traceLog(BusManager, 'clear');
+      BusManager.traceLog('clear');
       BusManager.interceptors.length = 0;
       BusManager.subscribersMap.clear();
     }
   }, {
     key: "addInterceptor",
     value: function addInterceptor(interceptor) {
-      BusManager.traceLog(BusManager, 'addInterceptor');
+      BusManager.traceLog('addInterceptor');
       if (!BusManager.interceptors.includes(interceptor)) {
         BusManager.interceptors.push(interceptor);
       }
     }
   }, {
     key: "publishForResult",
-    value: function publishForResult(message) {
+    value: function publishForResult(message, config) {
       var _this = this;
-      var timeoutMs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2000;
       return new Promise(function (resolve, reject) {
+        var _config$timeoutMs;
         _this.publish(message, function (result) {
           resolve(result);
         });
         setTimeout(function () {
-          reject('publish timeout');
-        }, timeoutMs);
+          if ((config === null || config === void 0 ? void 0 : config.fallback) !== null) {
+            resolve(message.result(config === null || config === void 0 ? void 0 : config.fallback));
+          } else {
+            reject('publish timeout');
+          }
+        }, (_config$timeoutMs = config === null || config === void 0 ? void 0 : config.timeoutMs) !== null && _config$timeoutMs !== void 0 ? _config$timeoutMs : 2000);
       });
     }
   }, {
     key: "publish",
     value: function publish(message, callback) {
       var _callBack = function _callBack(result) {
-        BusManager.traceLog(BusManager, 'publish result  ' + (message === null || message === void 0 ? void 0 : message.getAction()), result === null || result === void 0 ? void 0 : result.getData());
+        BusManager.traceLog('publish result  ' + (message === null || message === void 0 ? void 0 : message.getAction()), result === null || result === void 0 ? void 0 : result.getData());
         if (callback) {
           callback(result);
         }
@@ -170,7 +174,7 @@ export var BusManager = /*#__PURE__*/function () {
       var context = new BusContext(_callBack);
       var actionName = message.getAction();
       var subscribers = BusManager.subscribersMap.get(actionName);
-      BusManager.traceLog(BusManager, 'publish', message);
+      BusManager.traceLog('publish', JSON.stringify(message));
       if (subscribers) {
         var _iterator = _createForOfIteratorHelper(subscribers),
           _step;
@@ -180,7 +184,7 @@ export var BusManager = /*#__PURE__*/function () {
             try {
               subscriber.onMessage(context, message);
             } catch (e) {
-              BusManager.traceError(BusManager, 'excute onMessage error ', message, e);
+              BusManager.traceError('excute onMessage error ', message, e);
               var _iterator2 = _createForOfIteratorHelper(BusManager.interceptors),
                 _step2;
               try {
@@ -207,7 +211,7 @@ export var BusManager = /*#__PURE__*/function () {
         try {
           for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
             var _interceptor = _step3.value;
-            BusManager.traceLog(BusManager, 'onUnsubscribedAction', message);
+            BusManager.traceLog('onUnsubscribedAction', JSON.stringify(message));
             handle = handle || (_interceptor === null || _interceptor === void 0 ? void 0 : _interceptor.onUnsubscribedAction(message.getAction()));
           }
         } catch (err) {
@@ -218,14 +222,14 @@ export var BusManager = /*#__PURE__*/function () {
         if (handle) {
           BusManager.publish(message, callback); // Re-publish the message
         } else {
-          BusManager.traceError(BusManager, 'notSubscribeMessage', message);
+          BusManager.traceError('notSubscribeMessage', JSON.stringify(message));
         }
       }
     }
   }, {
     key: "subscribe",
     value: function subscribe(subscriber) {
-      BusManager.traceLog(BusManager, 'subscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
+      BusManager.traceLog('subscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
       var _iterator4 = _createForOfIteratorHelper(subscriber.actionNames()),
         _step4;
       try {
@@ -248,7 +252,7 @@ export var BusManager = /*#__PURE__*/function () {
   }, {
     key: "unsubscribe",
     value: function unsubscribe(subscriber) {
-      BusManager.traceLog(BusManager, 'unsubscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
+      BusManager.traceLog('unsubscribe', subscriber === null || subscriber === void 0 ? void 0 : subscriber.actionNames());
       var _iterator5 = _createForOfIteratorHelper(subscriber.actionNames()),
         _step5;
       try {
@@ -273,7 +277,7 @@ export var BusManager = /*#__PURE__*/function () {
     value: function isSubscribed(actionName) {
       var subscribers = BusManager.subscribersMap.get(actionName);
       if (subscribers && subscribers.length > 0) {
-        BusManager.traceLog(BusManager, 'isSubscribed: ' + actionName, true);
+        BusManager.traceLog('isSubscribed: ' + actionName, true);
         return true;
       }
       var handle = false;
@@ -292,13 +296,14 @@ export var BusManager = /*#__PURE__*/function () {
       if (handle) {
         return BusManager.subscribersMap.has(actionName);
       }
-      BusManager.traceLog(BusManager, 'isSubscribed: ' + actionName, false);
+      BusManager.traceLog('isSubscribed: ' + actionName, false);
       return false;
     }
   }]);
   return BusManager;
 }();
 _defineProperty(BusManager, "TAG", 'BusManager');
+_defineProperty(BusManager, "_logSplit", ' , ');
 _defineProperty(BusManager, "interceptors", []);
 _defineProperty(BusManager, "subscribersMap", new Map());
 _defineProperty(BusManager, "isDebug", true);

package/esm/core/component/index.js

@@ -241,8 +241,10 @@ export var AMSComponent = /*#__PURE__*/function (_CoreInstance) {
         if (paymentMethod === PaymentMethodTypeEnum.ApplePay) {
           BusManager.publishForResult(new BusMessage(ApplePayActionEnum.canMakePayments, JSON.stringify({
             subPaymentMethod: subPaymentMethod
-          }))).then(function (message) {
-            resolve(message.getData() === 'true');
+          })), {
+            fallback: false
+          }).then(function (message) {
+            resolve(message.getJSONObject());
           }).catch(function (e) {
             _this3.logger.logInfo({
               title: 'canMakePayments_error'

package/esm/index.d.ts

@@ -5,15 +5,12 @@
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
-import ApplePayComponent from './plugin/applepay/component';
 import { AMSComponent } from './core/component/index';
 import { IoptionsParams, componentSignEnum } from './types';
 export * from './types';
 export declare class AMSCheckout extends AMSComponent {
     constructor(_options: any, channelType?: componentSignEnum[], productSceneVersion?: string);
 }
-export declare class AMSApplePay extends ApplePayComponent {
-}
 export declare class AMSAutoDebit extends AMSCheckout {
     constructor(options: IoptionsParams);
 }

package/esm/index.js

@@ -18,7 +18,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
  * 1. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE; and
  * 2. If applicable, the use of the Software is also subject to the terms and conditions of any non-disclosure agreement signed by you and the relevant Ant Group entity.
  */
-import ApplePayComponent from "./plugin/applepay/component";
 import { AMSComponent } from "./core/component/index";
 import { componentSignEnum } from "./types";
 import { productSceneEnum } from "./types/index";
@@ -38,30 +37,21 @@ export var AMSCheckout = /*#__PURE__*/function (_AMSComponent) {
   }
   return _createClass(AMSCheckout);
 }(AMSComponent);
-export var AMSApplePay = /*#__PURE__*/function (_ApplePayComponent) {
-  _inherits(AMSApplePay, _ApplePayComponent);
-  var _super2 = _createSuper(AMSApplePay);
-  function AMSApplePay() {
-    _classCallCheck(this, AMSApplePay);
-    return _super2.apply(this, arguments);
-  }
-  return _createClass(AMSApplePay);
-}(ApplePayComponent);
 export var AMSAutoDebit = /*#__PURE__*/function (_AMSCheckout) {
   _inherits(AMSAutoDebit, _AMSCheckout);
-  var _super3 = _createSuper(AMSAutoDebit);
+  var _super2 = _createSuper(AMSAutoDebit);
   function AMSAutoDebit(options) {
     _classCallCheck(this, AMSAutoDebit);
     var _options = Object.assign({}, options, {
       product: productSceneEnum.AUTO_DEBIT
     });
-    return _super3.call(this, _options, [componentSignEnum.AUTO_DEBIT_WALLET]);
+    return _super2.call(this, _options, [componentSignEnum.AUTO_DEBIT_WALLET]);
   }
   return _createClass(AMSAutoDebit);
 }(AMSCheckout);
 export var AMSEasyPay = /*#__PURE__*/function (_AMSCheckout2) {
   _inherits(AMSEasyPay, _AMSCheckout2);
-  var _super4 = _createSuper(AMSEasyPay);
+  var _super3 = _createSuper(AMSEasyPay);
   function AMSEasyPay(options) {
     _classCallCheck(this, AMSEasyPay);
     var _options = Object.assign({}, options, {
@@ -86,13 +76,13 @@ export var AMSEasyPay = /*#__PURE__*/function (_AMSCheckout2) {
         error: error
       });
     }
-    return _super4.call(this, _options, [componentSignEnum.EASY_PAY_WALLET], currentProductSceneVersion);
+    return _super3.call(this, _options, [componentSignEnum.EASY_PAY_WALLET], currentProductSceneVersion);
   }
   return _createClass(AMSEasyPay);
 }(AMSCheckout);
 export var AMSCashierPayment = /*#__PURE__*/function (_AMSCheckout3) {
   _inherits(AMSCashierPayment, _AMSCheckout3);
-  var _super5 = _createSuper(AMSCashierPayment);
+  var _super4 = _createSuper(AMSCashierPayment);
   function AMSCashierPayment(options) {
     _classCallCheck(this, AMSCashierPayment);
     var _options = Object.assign({}, options, {
@@ -117,19 +107,19 @@ export var AMSCashierPayment = /*#__PURE__*/function (_AMSCheckout3) {
         error: error
       });
     }
-    return _super5.call(this, _options, currentChannelType);
+    return _super4.call(this, _options, currentChannelType);
   }
   return _createClass(AMSCashierPayment);
 }(AMSCheckout);
 export var AMSVaulting = /*#__PURE__*/function (_AMSCheckout4) {
   _inherits(AMSVaulting, _AMSCheckout4);
-  var _super6 = _createSuper(AMSVaulting);
+  var _super5 = _createSuper(AMSVaulting);
   function AMSVaulting(options) {
     _classCallCheck(this, AMSVaulting);
     var _options = Object.assign({}, options, {
       product: productSceneEnum.VAULTING
     });
-    return _super6.call(this, _options, [componentSignEnum.CASHIER_PAYMENT_CARD]);
+    return _super5.call(this, _options, [componentSignEnum.CASHIER_PAYMENT_CARD]);
   }
   return _createClass(AMSVaulting);
 }(AMSCheckout);

package/esm/plugin/applepay/component.js

@@ -137,7 +137,9 @@ var ApplePayComponent = /*#__PURE__*/function () {
                   deviceIdParameter: {
                     productScene: (_this$_parseData = _this._parseData) === null || _this$_parseData === void 0 || (_this$_parseData = _this$_parseData.paymentSessionConfig) === null || _this$_parseData === void 0 ? void 0 : _this$_parseData.productScene
                   }
-                })));
+                })), {
+                  fallback: ""
+                });
               case 2:
                 _context.t1 = _yield$BusManager$pub = _context.sent;
                 _context.t0 = _context.t1 === null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "0.0.1710212811-dev.19",
+  "version": "0.0.1710212811-dev.21",
   "description": "",
   "author": "",
   "main": "esm/index.js",