hylid-bridge 6.4.0 → 6.5.0

package/lib/clients/web/kaspi/getSystemInfo.d.ts

@@ -1,2 +1,2 @@
-import fill from '../../../common/apis/custom/web/h5/getSystemInfo';
+import fill from '../../../common/apis/custom/web/kaspi/getSystemInfo';
 export default fill;

package/lib/clients/web/kaspi/getSystemInfo.js

@@ -1,3 +1,3 @@
 // auto-generated
-import fill from '../../../common/apis/custom/web/h5/getSystemInfo';
+import fill from '../../../common/apis/custom/web/kaspi/getSystemInfo';
 export default fill;

package/lib/code/authLoginSrcCode.js

@@ -195,14 +195,14 @@ var authLoginPromise;
 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, walletAuthCodeRes, _requestParams, _httpParams, _signData;
+    var sessionIdPreTime, clientKeyPreTime, httpRequest, getAuthParams, saveAuthParams, getAuthCode, getAppId, siteName, _loginModeBase, 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;
+          httpRequest = params.httpRequest, getAuthParams = params.getAuthParams, saveAuthParams = params.saveAuthParams, getAuthCode = params.getAuthCode, getAppId = params.getAppId, siteName = params.siteName, _loginModeBase = params._loginModeBase;
           AUTH_LOGIN = authLoginApiMap[siteName];
           _k.label = 1;
         case 1:
@@ -238,7 +238,7 @@ var sendLoginHttp = function sendLoginHttp(params) {
           }
           requestParams.authCode = authCodeRes.authCode || '';
           if (siteName === "HUAWEI_ATOMIC") {
-            requestParams.loginMode = "AUTH_LOGIN";
+            requestParams.loginMode = _loginModeBase ? _loginModeBase : "GUEST_LOGIN";
             requestParams.trafficSideId = authCodeRes.trafficSideId;
           }
           httpParams = {
@@ -326,28 +326,34 @@ var sendLoginHttp = function sendLoginHttp(params) {
  * @param saveAuthParams 保持auth相关参数
  * @param getAuthCode 获取系统AuthCode
  * @param getAppId 获取小程序的appId
+ * @param _loginModeBase 外部传过来的登录模式
  */
 export var checkIsLogin = function checkIsLogin(params) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var _a, isForceLogin, getAuthParams, authParamsRes, _b, sessionIdExpiresTime, sessionIdLastTime;
+    var _a, isForceLogin, getAuthParams, _loginModeBase, authParamsRes, _b, sessionIdExpiresTime, sessionIdLastTime, hasValidSession;
     return __generator(this, function (_c) {
       switch (_c.label) {
         case 0:
-          _a = params.isForceLogin, isForceLogin = _a === void 0 ? false : _a, getAuthParams = params.getAuthParams;
+          _a = params.isForceLogin, isForceLogin = _a === void 0 ? false : _a, getAuthParams = params.getAuthParams, _loginModeBase = params._loginModeBase;
           return [4 /*yield*/, getAuthParams()];
         case 1:
           authParamsRes = _c.sent();
           _b = authParamsRes.data || {}, sessionIdExpiresTime = _b.sessionIdExpiresTime, sessionIdLastTime = _b.sessionIdLastTime;
-          // 如果sessionId未过期
-          if (!isForceLogin && sessionIdLastTime && sessionIdExpiresTime && Date.now() - sessionIdLastTime < sessionIdExpiresTime) {
+          hasValidSession = !isForceLogin && sessionIdLastTime && sessionIdExpiresTime && Date.now() - sessionIdLastTime < sessionIdExpiresTime;
+          if (hasValidSession && !_loginModeBase) {
             return [2 /*return*/];
           }
           if (client === CLIENT.HUAWEI_ATOMIC) {
-            // 如果已有正在执行的checkIsLogin，直接返回共享的Promise
+            // 如果已有正在执行的checkIsLogin，且不需要切换登录模式，直接返回共享的Promise
             // 所有并发请求等待同一个结果：成功则继续，超时/失败则都被拦截
-            if (checkIsLoginPromise) {
+            if (checkIsLoginPromise && !_loginModeBase) {
               return [2 /*return*/, checkIsLoginPromise];
             }
+            // _loginModeBase存在时，废弃旧的登录Promise，强制重新执行
+            if (_loginModeBase) {
+              authLoginPromise = undefined;
+              checkIsLoginPromise = null;
+            }
             // 用Promise包起整个登录流程，所有并发请求共享同一个Promise
             checkIsLoginPromise = new Promise(function (resolve, reject) {
               authLoginPromise = authLoginPromise || sendLoginHttp(params);
@@ -357,7 +363,8 @@ export var checkIsLogin = function checkIsLogin(params) {
                 resolve();
               }).catch(function (error) {
                 // getAuthCode授权超时，拦截所有排队的接口请求
-                if (error.errorCode !== "GET_WALLET_AUTHCODE_TIMEOUT") {
+                // _loginModeBase 参数存在时，超时需要释放锁，不然会导致第二次无法发起
+                if (error.errorCode !== "GET_WALLET_AUTHCODE_TIMEOUT" || _loginModeBase) {
                   // 非超时授权异常解锁，允许后续新的登录请求
                   checkIsLoginPromise = null;
                 }