hylid-bridge 6.3.2 → 6.4.1

package/lib/code/authLoginSrcCode.js

@@ -133,6 +133,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
  *
  */
 import md5 from 'crypto-js/md5';
+import { client, CLIENT } from '@hylid/env';
 // 钱包密钥，混淆代码前，填入真实的密钥
 var appSecretMap = {
   TOSS: '',
@@ -144,7 +145,8 @@ var appSecretMap = {
   HIPAY: '',
   SCB_PLANETPLUS: '',
   CHANGIPAY: '',
-  KASPI: ''
+  KASPI: '',
+  HUAWEI_ATOMIC: ''
 };
 // 登录接口， 当前MPAY用新的，TOSS本期保留rewards的，后续服务端统一迁移到新的alipayplusvoyager
 var authLoginApiMap = {
@@ -157,7 +159,8 @@ var authLoginApiMap = {
   MPAY: 'ap.alipayplusvoyager.auth.authlogin',
   ALIPAY: 'ap.alipayplusvoyager.auth.authlogin',
   CHANGIPAY: 'ap.alipayplusvoyager.auth.authlogin',
-  KASPI: 'ap.alipayplusvoyager.auth.authlogin'
+  KASPI: 'ap.alipayplusvoyager.auth.authlogin',
+  HUAWEI_ATOMIC: 'ap.alipayplusvoyager.traffic.auth.authlogin'
 };
 // http加签
 export var httpSign = function httpSign(params, siteName) {
@@ -188,23 +191,25 @@ function randomUUID() {
 }
 // 避免authLogin重复请求
 var authLoginPromise;
+// checkIsLogin Promise锁，用于授权超时时拦截排队的请求
+var checkIsLoginPromise = null;
 var sendLoginHttp = function sendLoginHttp(params) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var sessionIdPreTime, clientKeyPreTime, httpRequest, getAuthParams, saveAuthParams, getAuthCode, getAppId, siteName, AUTH_LOGIN, tokenRes, token, requestParams, appId, authCodeRes, httpParams, signData, res;
-    var _a, _b;
-    return __generator(this, function (_c) {
-      switch (_c.label) {
+    var sessionIdPreTime, clientKeyPreTime, httpRequest, getAuthParams, saveAuthParams, getAuthCode, getAppId, siteName, AUTH_LOGIN, tokenRes, token, requestParams, appId, authCodeRes, httpParams, signData, res, walletAuthCodeRes, _requestParams, _httpParams, _signData;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+      switch (_k.label) {
         case 0:
           sessionIdPreTime = 60 * 1000;
           clientKeyPreTime = 3600 * 1000;
           httpRequest = params.httpRequest, getAuthParams = params.getAuthParams, saveAuthParams = params.saveAuthParams, getAuthCode = params.getAuthCode, getAppId = params.getAppId, siteName = params.siteName;
           AUTH_LOGIN = authLoginApiMap[siteName];
-          _c.label = 1;
+          _k.label = 1;
         case 1:
-          _c.trys.push([1,, 8, 9]);
+          _k.trys.push([1,, 12, 13]);
           return [4 /*yield*/, getAuthParams()];
         case 2:
-          tokenRes = _c.sent();
+          tokenRes = _k.sent();
           token = '';
           if ((tokenRes === null || tokenRes === void 0 ? void 0 : tokenRes.data) && ((_a = tokenRes === null || tokenRes === void 0 ? void 0 : tokenRes.data) === null || _a === void 0 ? void 0 : _a.token)) {
             token = (_b = tokenRes === null || tokenRes === void 0 ? void 0 : tokenRes.data) === null || _b === void 0 ? void 0 : _b.token;
@@ -217,21 +222,25 @@ var sendLoginHttp = function sendLoginHttp(params) {
           if (!getAppId) return [3 /*break*/, 4];
           return [4 /*yield*/, getAppId()];
         case 3:
-          appId = _c.sent().appId;
+          appId = _k.sent().appId;
           requestParams.appId = appId;
           return [3 /*break*/, 5];
         case 4:
           // H5场景没有appId时，terminalType传WAP，服务会跳过appId的强校验逻辑
           requestParams.terminalType = "WAP";
-          _c.label = 5;
+          _k.label = 5;
         case 5:
           return [4 /*yield*/, getAuthCode()];
         case 6:
-          authCodeRes = _c.sent();
+          authCodeRes = _k.sent();
           if (!(authCodeRes === null || authCodeRes === void 0 ? void 0 : authCodeRes.authCode)) {
             throw authCodeRes;
           }
           requestParams.authCode = authCodeRes.authCode || '';
+          if (siteName === "HUAWEI_ATOMIC") {
+            requestParams.loginMode = "AUTH_LOGIN";
+            requestParams.trafficSideId = authCodeRes.trafficSideId;
+          }
           httpParams = {
             operationType: AUTH_LOGIN,
             requestData: JSON.stringify([requestParams])
@@ -241,10 +250,46 @@ var sendLoginHttp = function sendLoginHttp(params) {
             headers: __assign({}, signData)
           }))];
         case 7:
-          res = _c.sent();
+          res = _k.sent();
+          if (!(!res || !res.success)) return [3 /*break*/, 11];
+          if (!(res.errorCode === "USER_IS_NOT_BOUND" && client === CLIENT.HUAWEI_ATOMIC)) return [3 /*break*/, 10];
+          return [4 /*yield*/, getAuthCode({
+            scopes: "alipay"
+          })];
+        case 8:
+          walletAuthCodeRes = _k.sent();
+          if (!((_e = (_d = (_c = walletAuthCodeRes === null || walletAuthCodeRes === void 0 ? void 0 : walletAuthCodeRes.authCode) === null || _c === void 0 ? void 0 : _c.result) === null || _d === void 0 ? void 0 : _d.parameters) === null || _e === void 0 ? void 0 : _e.auth_code)) {
+            throw {
+              success: false,
+              errorCode: 'GET_WALLET_AUTHCODE_TIMEOUT',
+              errorMsg: ((_f = walletAuthCodeRes === null || walletAuthCodeRes === void 0 ? void 0 : walletAuthCodeRes.authCode) === null || _f === void 0 ? void 0 : _f.message) || 'GET_WALLET_AUTHCODE_TIMEOUT'
+            };
+          }
+          _requestParams = __assign(__assign({}, requestParams), {
+            authCode: ((_j = (_h = (_g = walletAuthCodeRes.authCode) === null || _g === void 0 ? void 0 : _g.result) === null || _h === void 0 ? void 0 : _h.parameters) === null || _j === void 0 ? void 0 : _j.auth_code) || '',
+            loginMode: 'AUTH_LOGIN_BIND',
+            bindUserToken: authCodeRes.authCode,
+            trafficSideId: authCodeRes.trafficSideId
+          });
+          _httpParams = {
+            operationType: AUTH_LOGIN,
+            requestData: JSON.stringify([_requestParams])
+          };
+          _signData = httpSign(_httpParams, siteName);
+          return [4 /*yield*/, httpRequest(__assign(__assign({}, _httpParams), {
+            headers: __assign({}, _signData)
+          }))];
+        case 9:
+          // 绑定并登录
+          res = _k.sent();
           if (!res || !res.success) {
             throw res;
           }
+          return [3 /*break*/, 11];
+        case 10:
+          // 非 USER_IS_NOT_BOUND 错误，抛出错误
+          throw res;
+        case 11:
           // 存储sessionID 及 clientKey、openId
           saveAuthParams({
             sessionIdLastTime: Date.now(),
@@ -253,14 +298,15 @@ var sendLoginHttp = function sendLoginHttp(params) {
             clientKeyExpiresTime: (res.clientKeyExpireTime || 0) * 1000 - clientKeyPreTime,
             clientKey: res.clientKey || '',
             openId: res.openId || '',
-            token: token
+            token: token,
+            trafficMemberSessionId: (res === null || res === void 0 ? void 0 : res.trafficMemberSessionId) || ''
           });
-          return [3 /*break*/, 9];
-        case 8:
+          return [3 /*break*/, 13];
+        case 12:
           // 释放登录中的标志
           authLoginPromise = undefined;
           return [7 /*endfinally*/];
-        case 9:
+        case 13:
           return [2 /*return*/];
       }
     });
@@ -296,6 +342,33 @@ export var checkIsLogin = function checkIsLogin(params) {
           if (!isForceLogin && sessionIdLastTime && sessionIdExpiresTime && Date.now() - sessionIdLastTime < sessionIdExpiresTime) {
             return [2 /*return*/];
           }
+          if (client === CLIENT.HUAWEI_ATOMIC) {
+            // 如果已有正在执行的checkIsLogin，直接返回共享的Promise
+            // 所有并发请求等待同一个结果：成功则继续，超时/失败则都被拦截
+            if (checkIsLoginPromise) {
+              return [2 /*return*/, checkIsLoginPromise];
+            }
+            // 用Promise包起整个登录流程，所有并发请求共享同一个Promise
+            checkIsLoginPromise = new Promise(function (resolve, reject) {
+              authLoginPromise = authLoginPromise || sendLoginHttp(params);
+              authLoginPromise.then(function () {
+                // 登录成功后解锁
+                checkIsLoginPromise = null;
+                resolve();
+              }).catch(function (error) {
+                // getAuthCode授权超时，拦截所有排队的接口请求
+                if (error.errorCode !== "GET_WALLET_AUTHCODE_TIMEOUT") {
+                  // 非超时授权异常解锁，允许后续新的登录请求
+                  checkIsLoginPromise = null;
+                }
+                reject(error);
+              }).finally(function () {
+                // 执行完成后重置，允许后续新的登录请求
+                // checkIsLoginPromise = null;
+              });
+            });
+            return [2 /*return*/, checkIsLoginPromise];
+          }
           authLoginPromise = authLoginPromise || sendLoginHttp(params);
           return [4 /*yield*/, authLoginPromise];
         case 2:

package/lib/common/apis/custom/web/huawei_atomic/getAuthCode.d.ts

@@ -0,0 +1,3 @@
+import { PickMPAttr } from '@hylid/types';
+declare const getAuthCode: PickMPAttr<'getAuthCode'>;
+export default getAuthCode;

package/lib/common/apis/custom/web/huawei_atomic/getAuthCode.js

@@ -0,0 +1,201 @@
+var __awaiter = this && this.__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+var __generator = this && this.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        if (t[0] & 1) throw t[1];
+        return t[1];
+      },
+      trys: [],
+      ops: []
+    },
+    f,
+    y,
+    t,
+    g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+    while (_) try {
+      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+      if (y = 0, t) op = [op[0] & 2, t.value];
+      switch (op[0]) {
+        case 0:
+        case 1:
+          t = op;
+          break;
+        case 4:
+          _.label++;
+          return {
+            value: op[1],
+            done: false
+          };
+        case 5:
+          _.label++;
+          y = op[1];
+          op = [0];
+          continue;
+        case 7:
+          op = _.ops.pop();
+          _.trys.pop();
+          continue;
+        default:
+          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+            _ = 0;
+            continue;
+          }
+          if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+            _.label = op[1];
+            break;
+          }
+          if (op[0] === 6 && _.label < t[1]) {
+            _.label = t[1];
+            t = op;
+            break;
+          }
+          if (t && _.label < t[2]) {
+            _.label = t[2];
+            _.ops.push(op);
+            break;
+          }
+          if (t[2]) _.ops.pop();
+          _.trys.pop();
+          continue;
+      }
+      op = body.call(thisArg, _);
+    } catch (e) {
+      op = [6, e];
+      y = 0;
+    } finally {
+      f = t = 0;
+    }
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
+/**
+ * 创建带超时的 Promise
+ * @param promise 原始 Promise
+ * @param timeout 超时时间（毫秒）
+ * @param errorMessage 超时错误信息
+ */
+function withTimeout(promise, timeout, errorMessage) {
+  var timeoutId;
+  var timeoutPromise = new Promise(function (_, reject) {
+    timeoutId = setTimeout(function () {
+      reject({
+        success: false,
+        errorCode: 'GET_WALLET_AUTHCODE_TIMEOUT',
+        errorMsg: errorMessage
+      });
+    }, timeout);
+  });
+  // @ts-ignore
+  return Promise.race([promise, timeoutPromise]).finally(function () {
+    clearTimeout(timeoutId);
+  });
+}
+var getAuthCode = function getAuthCode(options) {
+  if (options === void 0) {
+    options = {
+      scopes: "container"
+    };
+  }
+  return __awaiter(void 0, void 0, void 0, function () {
+    var huaweiOpenId, walletAuthCodeTimeout, aliPayAuthCode, error_1;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          console.log('getAuthCode-start');
+          _a.label = 1;
+        case 1:
+          _a.trys.push([1, 6,, 7]);
+          if (!(options.scopes === "container")) return [3 /*break*/, 3];
+          return [4 /*yield*/, window.atomicsdk.invokeMethod({
+            appMethod: 'getHuaweiOpenId',
+            jsMethod: '',
+            data: {
+              authCode: ''
+            } // 参数对象
+          })];
+        case 2:
+          huaweiOpenId = _a.sent();
+          console.log('getAuthCode-end');
+          return [2 /*return*/, {
+            authCode: huaweiOpenId,
+            trafficSideId: "HUAWEI_TRAFFIC_2026"
+          }];
+        case 3:
+          if (!(options.scopes === "alipay")) return [3 /*break*/, 5];
+          walletAuthCodeTimeout = Number(sessionStorage.getItem('__hylid-bridge__walletAuthCodeTimeout') || 10000);
+          return [4 /*yield*/, withTimeout(
+          // @ts-ignore
+          window.atomicsdk.invokeMethod({
+            appMethod: 'getAliPayAuth',
+            jsMethod: '',
+            data: {}
+          }), walletAuthCodeTimeout, "getAliPayAuth timeout after ".concat(walletAuthCodeTimeout, "ms"))];
+        case 4:
+          aliPayAuthCode = _a.sent();
+          console.log('getAuthCode-end', aliPayAuthCode);
+          // @ts-ignore
+          return [2 /*return*/, {
+            authCode: aliPayAuthCode
+          }];
+        case 5:
+          // 兜底
+          throw {
+            errorCode: 'NO_BRIDGE',
+            errorMsg: 'getAuthCode_Bridge_huawei_atomic error'
+          };
+        case 6:
+          error_1 = _a.sent();
+          console.log('getAuthCode-error', error_1);
+          throw error_1;
+        case 7:
+          return [2 /*return*/];
+      }
+    });
+  });
+};
+export default getAuthCode;

package/lib/common/apis/custom/web/huawei_atomic/getLocation.d.ts

@@ -0,0 +1 @@
+export default function getLocation(options?: any): void;

package/lib/common/apis/custom/web/huawei_atomic/getLocation.js

@@ -0,0 +1,34 @@
+export default function getLocation(options) {
+  // @ts-ignore
+  window.atomicsdk.invokeMethod({
+    appMethod: 'getLocation',
+    data: {
+      cacheTimeout: (options === null || options === void 0 ? void 0 : options.cacheTimeout) || 30000
+    }
+  }).then(function (data) {
+    var _a, _b;
+    if (!(data === null || data === void 0 ? void 0 : data.error)) {
+      // 成功回调
+      var result = {
+        accuracy: "".concat(data === null || data === void 0 ? void 0 : data.accuracy),
+        horizontalAccuracy: "".concat(data === null || data === void 0 ? void 0 : data.horizontalAccuracy),
+        latitude: "".concat(data === null || data === void 0 ? void 0 : data.latitude),
+        longitude: "".concat(data === null || data === void 0 ? void 0 : data.longitude)
+      };
+      (_a = options.success) === null || _a === void 0 ? void 0 : _a.call(options, result);
+    } else {
+      // 错误码映射：code为1表示用户拒绝授权，对应错误码11；其他错误对应错误码13
+      var error = (data === null || data === void 0 ? void 0 : data.error) === 1 || (data === null || data === void 0 ? void 0 : data.error) === 11 ? 11 : 13;
+      (_b = options.fail) === null || _b === void 0 ? void 0 : _b.call(options, {
+        error: error
+      });
+    }
+  }).catch(function (err) {
+    var _a;
+    // 错误码映射：code为1表示用户拒绝授权，对应错误码11；其他错误对应错误码13
+    var error = (err === null || err === void 0 ? void 0 : err.error) === 1 || (err === null || err === void 0 ? void 0 : err.error) === 11 ? 11 : 13;
+    (_a = options.fail) === null || _a === void 0 ? void 0 : _a.call(options, {
+      error: error
+    });
+  });
+}

package/lib/common/apis/custom/web/huawei_atomic/navigateBack.d.ts

@@ -0,0 +1,3 @@
+import { PickMPAttr } from '@hylid/types';
+declare const navigateBack: PickMPAttr<'navigateBack'>;
+export default navigateBack;

package/lib/common/apis/custom/web/huawei_atomic/navigateBack.js

@@ -0,0 +1,6 @@
+import { webCall as call } from '@hylid/call';
+var navigateBack = function navigateBack() {
+  // @ts-ignore
+  call('executeBackPress', -1);
+};
+export default navigateBack;

package/lib/common/apis/custom/web/huawei_atomic/navigateTo.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="miniprogram" />
+export default function navigateTo(options: NavigateToArgs): Window | null;

package/lib/common/apis/custom/web/huawei_atomic/navigateTo.js

@@ -0,0 +1,3 @@
+export default function navigateTo(options) {
+  return window.open(options.url, '_blank');
+}

package/lib/common/apis/custom/web/huawei_atomic/setClipboard.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="miniprogram" />
+export default function setClipboard(options: SetClipboardArgs): void;

package/lib/common/apis/custom/web/huawei_atomic/setClipboard.js

@@ -0,0 +1,38 @@
+function _setClipboard(options) {
+  var _a, _b, _c, _d, _e, _f;
+  if (!options.text) {
+    (_a = options.fail) === null || _a === void 0 ? void 0 : _a.call(options);
+    (_b = options.complete) === null || _b === void 0 ? void 0 : _b.call(options, {
+      success: false
+    });
+    return;
+  }
+  var input = document.createElement('input');
+  input.style.position = 'fixed';
+  input.style.opacity = '0';
+  input.style.zIndex = '-1000';
+  document.body.appendChild(input);
+  input.setAttribute('readonly', 'readonly');
+  input.setAttribute('value', options.text);
+  input.setSelectionRange(0, options.text.length);
+  input.focus();
+  input.select();
+  document.execCommand('copy');
+  if (document.execCommand('copy')) {
+    (_c = options.success) === null || _c === void 0 ? void 0 : _c.call(options, {
+      success: true
+    });
+    (_d = options.complete) === null || _d === void 0 ? void 0 : _d.call(options, {
+      success: true
+    });
+  } else {
+    (_e = options.fail) === null || _e === void 0 ? void 0 : _e.call(options);
+    (_f = options.complete) === null || _f === void 0 ? void 0 : _f.call(options, {
+      success: false
+    });
+  }
+  document.body.removeChild(input);
+}
+export default function setClipboard(options) {
+  return _setClipboard(options);
+}

package/lib/common/apis/custom/web/huawei_atomic/showLBSAuthGuide.d.ts

@@ -0,0 +1 @@
+export default function showAuthGuide(options?: any): void;

package/lib/common/apis/custom/web/huawei_atomic/showLBSAuthGuide.js

@@ -0,0 +1,13 @@
+export default function showAuthGuide(options) {
+  // @ts-ignore
+  window.atomicsdk.invokeMethod({
+    appMethod: 'showLBSAuthGuide',
+    data: options
+  }).then(function (data) {
+    var _a;
+    (_a = options.success) === null || _a === void 0 ? void 0 : _a.call(options, data);
+  }).catch(function (error) {
+    var _a;
+    (_a = options.fail) === null || _a === void 0 ? void 0 : _a.call(options, error);
+  });
+}