@alipay/ams-checkout 1.11.1 → 1.13.0

package/esm/util/logger.d.ts

@@ -12,6 +12,7 @@ type Extra = Record<string, any>;
 export interface LogMetaData {
     platform?: string;
     sdkVersion?: string;
+    webAppVersion?: string;
     fistLogTime?: number;
     fsDuration?: number;
     instanceId?: string;
@@ -23,6 +24,7 @@ export interface LogMetaData {
     paymentMethodType?: string;
     paymentMethodCategoryType?: string;
     requestSeq?: string;
+    trackId?: string;
 }
 interface Config {
     scriptUrl: string;
@@ -41,7 +43,11 @@ export declare class Logger {
     private debug;
     private componentStartTime;
     private isLoaded;
+    private static instance;
+    private trackId;
     constructor(config: Config, debug: boolean);
+    static setInstance(instance: Logger): Logger;
+    static getInstance(): Logger;
     setMedta(mdata: LogMetaData): void;
     logError(error: LogPayload, extra?: Extra): Logger;
     logInfo(info: LogPayload, extra?: Extra): Logger;
@@ -51,6 +57,8 @@ export declare class Logger {
     initTracker(): void;
     send(): void;
     setComponentStartTime(val: number): void;
+    setTrackId(trackId: string): void;
+    getComponentStartTime(): number;
 }
 export declare const LogConfig: Config;
 export {};

package/esm/util/logger.js

@@ -15,6 +15,7 @@ export var Logger = /*#__PURE__*/function () {
     _defineProperty(this, "debug", void 0);
     _defineProperty(this, "componentStartTime", void 0);
     _defineProperty(this, "isLoaded", void 0);
+    _defineProperty(this, "trackId", void 0);
     this.logs = [];
     this.config = config;
     this.debug = debug;
@@ -99,19 +100,28 @@ export var Logger = /*#__PURE__*/function () {
         try {
           var log = logs.pop();
           if (log.type === 'error') {
+            var _log$logPayload;
             logError(log.logPayload, _objectSpread({
               fsDuration: fsDuration,
-              timeStamp: now
+              timeStamp: now,
+              trackId: this.trackId,
+              title: (_log$logPayload = log.logPayload) === null || _log$logPayload === void 0 ? void 0 : _log$logPayload.title
             }, log === null || log === void 0 ? void 0 : log.extra));
           } else if (log.type === 'info') {
+            var _log$logPayload2;
             logInfo(log.logPayload, _objectSpread({
               fsDuration: fsDuration,
-              timeStamp: now
+              timeStamp: now,
+              trackId: this.trackId,
+              title: (_log$logPayload2 = log.logPayload) === null || _log$logPayload2 === void 0 ? void 0 : _log$logPayload2.title
             }, log === null || log === void 0 ? void 0 : log.extra));
           } else if (log.type === 'rpc') {
+            var _log$logPayload3;
             reportRPC(log.logPayload, _objectSpread({
               fsDuration: fsDuration,
-              timeStamp: now
+              timeStamp: now,
+              trackId: this.trackId,
+              title: (_log$logPayload3 = log.logPayload) === null || _log$logPayload3 === void 0 ? void 0 : _log$logPayload3.title
             }, log === null || log === void 0 ? void 0 : log.extra));
           }
         } catch (error) {
@@ -166,9 +176,30 @@ export var Logger = /*#__PURE__*/function () {
     value: function setComponentStartTime(val) {
       this.componentStartTime = val;
     }
+  }, {
+    key: "setTrackId",
+    value: function setTrackId(trackId) {
+      this.trackId = trackId;
+    }
+  }, {
+    key: "getComponentStartTime",
+    value: function getComponentStartTime() {
+      return this.componentStartTime;
+    }
+  }], [{
+    key: "setInstance",
+    value: function setInstance(instance) {
+      return this.instance = instance;
+    }
+  }, {
+    key: "getInstance",
+    value: function getInstance() {
+      return this.instance;
+    }
   }]);
   return Logger;
 }();
+_defineProperty(Logger, "instance", void 0);
 export var LogConfig = {
   scriptUrl: 'https://gw.alipayobjects.com/render/p/yuyan_npm/@alipay_intl-tracker/1.6.0/dist/common.min.js',
   spmConfig: {},

package/esm/util/storage.d.ts

@@ -0,0 +1,2 @@
+export declare const getStorageString: (key: string, fallback?: string) => string;
+export declare const setStorageString: (key: string, value: string) => boolean;

package/esm/util/storage.js

@@ -0,0 +1,23 @@
+export var getStorageString = function getStorageString(key) {
+  var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  try {
+    if (key && window) {
+      var storageValue = window.localStorage.getItem(key);
+      if (storageValue) {
+        return storageValue;
+      }
+      return fallback;
+    }
+  } catch (error) {
+    return fallback;
+  }
+};
+export var setStorageString = function setStorageString(key, value) {
+  try {
+    if (key && window) {
+      window.localStorage.setItem(key, value);
+      return true;
+    }
+  } catch (error) {}
+  return false;
+};

package/esm/util/upgrade.d.ts

@@ -0,0 +1,39 @@
+export declare function isWebPlatform(platform?: string): boolean;
+export interface UpgradeItem {
+    productScene?: string;
+    v: string;
+    appVersion: string;
+    platform?: string;
+    mid?: string;
+    greyscale?: string;
+}
+export interface UpgradeSdkInfo {
+    productScene?: string;
+    sdkVersion: string;
+    appVersion?: string;
+    greyscale?: number;
+    mid?: string;
+}
+export declare function findUpgradeVersion(upgradeItems: UpgradeItem[], sdkInfo: UpgradeSdkInfo): string;
+export declare const getGrascaleId: (key?: string) => string;
+export declare function getGrayscaleValue(seed?: string): number;
+export declare function isGreyscaleMatch(item: UpgradeItem, randomGreyscale: number): boolean;
+/**
+ * 查询匹配到的版本
+ * @param _extendInfo
+ * @param param1
+ * @returns
+ */
+export declare const getMatchAppVersion: (_extendInfo: string, sdkInfo: UpgradeSdkInfo) => string;
+/**
+ * 获取保存的加载版本
+ * @param productScene
+ * @returns
+ */
+export declare const getLastAppVersion: (productScene: string) => string;
+/**
+ * 保存指定场景的加载版本供下次使用
+ * @param productScene
+ * @returns
+ */
+export declare const setLastAppVersion: (productScene: string, appVersion: string) => boolean;

package/esm/util/upgrade.js

@@ -0,0 +1,115 @@
+import { v4 as uuid } from 'uuid';
+import { getStorageString, setStorageString } from "./storage";
+import { compareVersion, isVersionInStringRange } from "./versionCompare";
+export function isWebPlatform(platform) {
+  if (platform) {
+    return platform.toUpperCase().includes('Web'.toUpperCase()) || platform === '';
+  }
+  return true;
+}
+export function findUpgradeVersion(upgradeItems, sdkInfo) {
+  var sortedItems = upgradeItems.sort(function (a, b) {
+    return compareVersion(b.appVersion, a.appVersion);
+  });
+  //   console.log("sortedItems",sortedItems)
+  var upgradeItem = sortedItems.find(function (item) {
+    if (isVersionInStringRange(sdkInfo.sdkVersion, item.v) && isWebPlatform(item.platform)) {
+      var _item$productScene, _sdkInfo$productScene, _item$mid, _sdkInfo$mid, _sdkInfo$greyscale;
+      var matchProductScene = (_item$productScene = item.productScene) !== null && _item$productScene !== void 0 && _item$productScene.trim() ? item.productScene.toUpperCase().includes(sdkInfo === null || sdkInfo === void 0 || (_sdkInfo$productScene = sdkInfo.productScene) === null || _sdkInfo$productScene === void 0 ? void 0 : _sdkInfo$productScene.toUpperCase()) : true;
+      var matchMid = (_item$mid = item.mid) !== null && _item$mid !== void 0 && _item$mid.trim() ? item.mid.toUpperCase().includes(sdkInfo === null || sdkInfo === void 0 || (_sdkInfo$mid = sdkInfo.mid) === null || _sdkInfo$mid === void 0 ? void 0 : _sdkInfo$mid.toUpperCase()) : true;
+      var matchGreyscale = isGreyscaleMatch(item, (_sdkInfo$greyscale = sdkInfo.greyscale) !== null && _sdkInfo$greyscale !== void 0 ? _sdkInfo$greyscale : getGrayscaleValue());
+      if (matchProductScene && matchMid && matchGreyscale) {
+        return item;
+      }
+    }
+  });
+  return (upgradeItem === null || upgradeItem === void 0 ? void 0 : upgradeItem.appVersion) || null;
+}
+export var getGrascaleId = function getGrascaleId() {
+  var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'AntomDefaultGrascaleId';
+  try {
+    if (key && window) {
+      var storageValue = getStorageString(key, '');
+      if (storageValue) {
+        return storageValue;
+      }
+      var grascaleId = uuid();
+      if (key && grascaleId) {
+        setStorageString(key, grascaleId);
+      }
+    }
+  } catch (error) {
+    return '';
+  }
+};
+export function getGrayscaleValue() {
+  var seed = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : getGrascaleId();
+  if (!seed) {
+    return 0;
+  }
+  // 取倒数2、3位
+  var sub = seed.substring(seed.length - 3, seed.length - 1);
+  // 将16进制转成10进制值
+  var decimal = parseInt(sub, 16);
+  var finalValue = Math.floor(decimal * 100 / 255);
+  return finalValue;
+}
+export function isGreyscaleMatch(item, randomGreyscale) {
+  if (!(item !== null && item !== void 0 && item.greyscale)) {
+    return true;
+  }
+  try {
+    var greyscale = parseInt(item === null || item === void 0 ? void 0 : item.greyscale);
+    if (greyscale === 0) {
+      return false;
+    }
+    return greyscale >= randomGreyscale;
+  } catch (error) {
+    return false;
+  }
+}
+
+/**
+ * 查询匹配到的版本
+ * @param _extendInfo
+ * @param param1
+ * @returns
+ */
+export var getMatchAppVersion = function getMatchAppVersion(_extendInfo, sdkInfo) {
+  try {
+    var _info$sdkUpgradeInfo;
+    var info = JSON.parse(_extendInfo);
+    var versions = info === null || info === void 0 || (_info$sdkUpgradeInfo = info.sdkUpgradeInfo) === null || _info$sdkUpgradeInfo === void 0 ? void 0 : _info$sdkUpgradeInfo.versions;
+    var appVersion = findUpgradeVersion(versions, sdkInfo);
+    return appVersion;
+  } catch (error) {
+    return '';
+  }
+};
+
+/**
+ * 获取保存的加载版本
+ * @param productScene
+ * @returns
+ */
+export var getLastAppVersion = function getLastAppVersion(productScene) {
+  try {
+    var key = "Antom_".concat(productScene, "_LastAppVersion");
+    return getStorageString(key, '');
+  } catch (error) {
+    return '';
+  }
+};
+/**
+ * 保存指定场景的加载版本供下次使用
+ * @param productScene
+ * @returns
+ */
+export var setLastAppVersion = function setLastAppVersion(productScene, appVersion) {
+  try {
+    var key = "Antom_".concat(productScene, "_LastAppVersion");
+    return setStorageString(key, appVersion);
+  } catch (error) {
+    return false;
+  }
+};

package/esm/util/versionCompare.d.ts

@@ -3,6 +3,13 @@
  * @param v1
  * @param v2
  */
-export declare function compareVersion(v1: string, v2: string): 1 | 0 | -1;
+export declare function compareVersion(v1: string, v2: string): 0 | 1 | -1;
+/**
+ * 判断version版本是否在range参数版本的范围内
+ * @param version
+ * @param range
+ * @returns
+ */
+export declare function isVersionInStringRange(version: string, range: string): boolean;
 export declare function isVersionInRange(currentVersion: any, minVersion: any, maxVersion: any): boolean;
 export declare function matchVersion(config: any, currentVersion: any): boolean;

package/esm/util/versionCompare.js

@@ -49,6 +49,28 @@ export function compareVersion(v1, v2) {
     return 1;
   }
 }
+/**
+ * 判断version版本是否在range参数版本的范围内
+ * @param version 
+ * @param range 
+ * @returns 
+ */
+export function isVersionInStringRange(version, range) {
+  if (!range) {
+    // 未指定版本限制
+    return true;
+  }
+  if (range.includes(',')) {
+    return range.split(',').includes(version);
+  }
+  if (!range.includes('|')) {
+    return version === range;
+  }
+  var minVersion = range.split('|')[0];
+  var maxVersion = range.split('|')[1] || '999999.9.9';
+  var matchVersion = compareVersion(version, minVersion) >= 0 && compareVersion(maxVersion, version) >= 0;
+  return matchVersion;
+}
 export function isVersionInRange(currentVersion, minVersion, maxVersion) {
   function splitVersion(version) {
     return version.split('.').map(function (num) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alipay/ams-checkout",
-  "version": "1.11.1",
+  "version": "1.13.0",
   "description": "",
   "author": "",
   "main": "esm/index.js",