@gjzq/sdk 1.3.1-beta.1 → 1.4.0-beta.1

package/es/loginWithTokenForWeb/index.mjs

@@ -9,7 +9,7 @@ import { LoginType } from '../utils/const.mjs';
 
 function loginWithTokenForWeb(loginType) {
   return __awaiter(this, void 0, void 0, function () {
-    var accountType, instantToken, oldInstantToken, fundAccountLoginResult, marginAccountLoginResult, opStation, _a, code, data, _b, code, data;
+    var accountType, instantToken, oldInstantToken, fundAccountLoginResult, marginAccountLoginResult, opStation, _a, code_1, data_1, _b, code, data;
     return __generator(this, function (_c) {
       switch (_c.label) {
         case 0:
@@ -25,10 +25,9 @@ function loginWithTokenForWeb(loginType) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ pid: null, clientId: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(fundAccountLoginResult.data);
-            return [2 /*return*/, true];
           }
+          bindInfo(fundAccountLoginResult.data);
+          return [2 /*return*/, true];
         case 2:
           if (!(loginType === LoginType.MARGINACCOUNT)) return [3 /*break*/, 4];
           return [4 /*yield*/, checkMarginAccountLogin()];
@@ -38,14 +37,15 @@ function loginWithTokenForWeb(loginType) {
             // 2025.01.02 经讨论 退登不解绑！！
             // bindInfo({ pid: null, clientId: null })
             return [2 /*return*/, false];
-          } else {
-            bindInfo(marginAccountLoginResult.data);
-            return [2 /*return*/, true];
           }
+          bindInfo(marginAccountLoginResult.data);
+          return [2 /*return*/, true];
         case 4:
           return [3 /*break*/, 6];
         case 5:
-          instantToken !== 'notoken' ? localStorage.setItem('instant_token', instantToken) : null;
+          if (instantToken && instantToken !== 'notoken') {
+            localStorage.setItem('instant_token', instantToken);
+          }
           _c.label = 6;
         case 6:
           opStation = getQueryString('op_station');
@@ -61,9 +61,9 @@ function loginWithTokenForWeb(loginType) {
             instant_token: instantToken
           })];
         case 7:
-          _a = _c.sent(), code = _a.code, data = _a.data;
-          bindInfo(data);
-          return [2 /*return*/, code === 0];
+          _a = _c.sent(), code_1 = _a.code, data_1 = _a.data;
+          bindInfo(data_1);
+          return [2 /*return*/, code_1 === 0];
         case 8:
           return [4 /*yield*/, fundAccountLogin({
             op_station: opStation,

package/es/logoutForWeb/index.mjs

@@ -9,10 +9,9 @@ import { http } from '../http/index.mjs';
  */
 function logoutForWeb(loginType) {
   if (loginType) {
-    return http.post(API_URL + "/logout/".concat(loginType));
-  } else {
-    return http.post(API_URL + '/logout', {});
+    return http.post("".concat(API_URL, "/logout/").concat(loginType));
   }
+  return http.post("".concat(API_URL, "/logout"), {});
 }
 
 export { logoutForWeb };

package/es/marginAccountLogin/index.mjs

@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse> }
  */
 function marginAccountLogin(param) {
-  return http.post(API_URL + '/login/marginAccount', param);
+  return http.post("".concat(API_URL, "/login/marginAccount"), param);
 }
 
 export { marginAccountLogin };

package/es/openAppForWeb/index.mjs

@@ -8,9 +8,9 @@ import { pageInit } from '../pageInit/index.mjs';
 import { getAppId } from '../getAppId/index.mjs';
 
 //特殊环境情况可通过全局变量修改
-var EVOLUTION_UNIVERSAL_URL = window.EVOLUTION_UNIVERSAL_URL || window.location.toString().indexOf('https://devwebapps.yjbtest.com') > -1 ? "https://linkm.yjbtest.com/download/app-download.html" : "https://linkm.yongjinbao.com.cn/download/app-download.html";
-var EVOLUTION_TXAPP_URL = window.EVOLUTION_TXAPP_URL || "https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.gjzq.yjb2";
-var EVOLUTION_ANDOWNLOAD_URL = window.EVOLUTION_ANDOWNLOAD_URL || "https://appdl.yongjinbao.com.cn/yjb/android/yongjinbao.apk";
+var EVOLUTION_UNIVERSAL_URL = window.EVOLUTION_UNIVERSAL_URL || window.location.toString().indexOf('https://devwebapps.yjbtest.com') > -1 ? 'https://linkm.yjbtest.com/download/app-download.html' : 'https://linkm.yongjinbao.com.cn/download/app-download.html';
+var EVOLUTION_TXAPP_URL = window.EVOLUTION_TXAPP_URL || 'https://a.app.qq.com/o/simple.jsp?pkgname=cn.com.gjzq.yjb2';
+var EVOLUTION_ANDOWNLOAD_URL = window.EVOLUTION_ANDOWNLOAD_URL || 'https://appdl.yongjinbao.com.cn/yjb/android/yongjinbao.apk';
 var EVOLUTION_MINIAPP_URL = window.EVOLUTION_MINIAPP_URL || EVOLUTION_UNIVERSAL_URL;
 /**
  * 跳转至APP下载并传参
@@ -77,8 +77,8 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                   case 5:
                     oConfig = config || {};
                     /**
-                     * 处理可能存在的url中包含多余分享字段
-                     */
+                         * 处理可能存在的url中包含多余分享字段
+                         */
                     if (oConfig && oConfig.param && oConfig.param.url) {
                       url = new CustomURI(oConfig.param.url);
                       url.setQuery({
@@ -91,7 +91,7 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                     try {
                       searchParams = new URLSearchParams(location.search);
                       shareMarkInfo = encodeURIComponent(searchParams.get('shareMarkInfo') || '');
-                    } catch (e) {}
+                    } catch (e) {/* empty */}
                     schemeUrl = "com.yjb.jy://?action=".concat(action);
                     if (isIos) {
                       //TOTO 地址后面需要灵活配置
@@ -119,7 +119,7 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                   config = JSON.parse(data);
                   if (dataUrl) urlConfig = JSON.parse(dataUrl);
                   setConfigParams(config, urlConfig);
-                } catch (e) {}
+                } catch (e) {/* empty */}
               }
               return isIos ? 'yjbapp://' : schemeUrl;
             }
@@ -164,30 +164,28 @@ var openAppForWeb = function openAppForWeb(selector, config, urlConfig) {
                 var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
                 pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
               }
-            } else {
-              if (isAndroid) {
-                //原设置为4000
-                var t_1 = 1000,
-                  hasApp_1 = true;
-                //设置定时器,判断如果没有呼起app,则调用定时器,跳转下载(至腾讯应用宝 or apk下载)
-                setTimeout(function () {
-                  if (!hasApp_1) {
-                    var url = evolution_scene_url || (appId === 'insertApp' ? "".concat(evolution_txapp_url, "&android_schema=").concat(encodeURIComponent(schemeUrl)) : evolution_andownload_url);
-                    pageInit("".concat(url), false, {});
-                  }
-                }, 1500);
-                var t1_1 = Date.now();
-                window.location.href = schemeUrl;
-                setTimeout(function () {
-                  var t2 = Date.now();
-                  if (t2 - t1_1 < t_1 + 100) {
-                    hasApp_1 = false;
-                  }
-                }, t_1);
-              } else if (isIos) {
-                var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
-                pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
-              }
+            } else if (isAndroid) {
+              //原设置为4000
+              var t_1 = 1000,
+                hasApp_1 = true;
+              //设置定时器,判断如果没有呼起app,则调用定时器,跳转下载(至腾讯应用宝 or apk下载)
+              setTimeout(function () {
+                if (!hasApp_1) {
+                  var url = evolution_scene_url || (appId === 'insertApp' ? "".concat(evolution_txapp_url, "&android_schema=").concat(encodeURIComponent(schemeUrl)) : evolution_andownload_url);
+                  pageInit("".concat(url), false, {});
+                }
+              }, 1500);
+              var t1_1 = Date.now();
+              window.location.href = schemeUrl;
+              setTimeout(function () {
+                var t2 = Date.now();
+                if (t2 - t1_1 < t_1 + 100) {
+                  hasApp_1 = false;
+                }
+              }, t_1);
+            } else if (isIos) {
+              var url = "".concat(evolution_universal_url).concat(evolution_universal_url.includes('?') ? '&' : '?', "action=").concat(action, "&shareMarkInfo=").concat(shareMarkInfo);
+              pageInit(evolution_scene_url ? "".concat(url, "&sceneUrl=").concat(encodeURIComponent(evolution_scene_url)) : "".concat(url), false, {});
             }
           };
           return [2 /*return*/];

package/es/syncLoginStatusBetweenNativeAndServer/index.mjs

@@ -3,6 +3,9 @@ import { LoginType } from '../utils/const.mjs';
 import { getFundAccountTokenForHybrid, getUserTokenForHybrid } from '../utils/loginFuncs.mjs';
 import { multiLogin } from '../multiLogin/index.mjs';
 
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+/* eslint-disable no-async-promise-executor */
 /**
  * 客户端与服务端登录态同步
  * @function syncLoginStatusBetweenNativeAndServer
@@ -19,7 +22,7 @@ function syncLoginStatusBetweenNativeAndServer(syncLoginTypes) {
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            console.log("syncLoginTypes", syncLoginTypes);
+            console.log('syncLoginTypes', syncLoginTypes);
             getLoginParamPromises = [];
             if (syncLoginTypes.includes(LoginType.FUNDACCOUNT)) {
               getLoginParamPromises.push(getFundAccountTokenForHybrid());

package/es/userLoginForWeb/index.mjs

@@ -8,7 +8,7 @@ import { http } from '../http/index.mjs';
  * @returns {Promise<HttpResponse>}
  */
 function userLoginForWeb(param) {
-  return http.post(API_URL + '/login/user', param);
+  return http.post("".concat(API_URL, "/login/user"), param);
 }
 
 export { userLoginForWeb };

package/es/utils/funcs.mjs

@@ -1,10 +1,7 @@
-import { __awaiter, __generator } from '../node_modules/tslib/tslib.es6.mjs';
 import AES from 'crypto-js/aes.js';
 import Utf8 from 'crypto-js/enc-utf8.js';
 import ECB from 'crypto-js/mode-ecb.js';
-import { Env, WEBAPPS_HOST, PAYMENT_DOMAIN, HYBRID, WEBAPPS, MESSAGE, ALL_NO_SYSTEM_PARAM_KEYS, envRules } from './const.mjs';
-import { nativeIOOperation } from '../nativeIOOperation/index.mjs';
-import { ready } from '../ready/index.mjs';
+import { Env, WEBAPPS_HOST, PAYMENT_DOMAIN, HYBRID, WEBAPPS, envRules } from './const.mjs';
 
 /**
  * 判断一个值是否是函数
@@ -215,67 +212,6 @@ var getSysTimeDomain = function getSysTimeDomain() {
 function isWeixinClient() {
   return !!navigator.userAgent.match(/MicroMessenger/i);
 }
-/**
- * hybrid 读取非系统参数
- * @param keys
- * @returns
- */
-function readHybridNoSystemParam() {
-  return __awaiter(this, arguments, void 0, function (keys) {
-    if (keys === void 0) {
-      keys = ALL_NO_SYSTEM_PARAM_KEYS;
-    }
-    return __generator(this, function (_a) {
-      switch (_a.label) {
-        case 0:
-          return [4 /*yield*/, ready()];
-        case 1:
-          _a.sent();
-          return [2 /*return*/, nativeIOOperation(4004, {
-            keys: keys
-          })];
-      }
-    });
-  });
-}
-/**
- * hybrid 读取系统参数，native异常时，返回空对象
- * @param keys
- * @returns
- */
-function readHybridSystemParamIgnoreError(keys) {
-  var _this = this;
-  if (keys === void 0) {
-    keys = ALL_NO_SYSTEM_PARAM_KEYS;
-  }
-  return new Promise(function (resolve, reject) {
-    return __awaiter(_this, void 0, void 0, function () {
-      var nonSystemParamRes;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            return [4 /*yield*/, readHybridNoSystemParam(keys)];
-          case 1:
-            nonSystemParamRes = _a.sent();
-            if (nonSystemParamRes.code != 0) {
-              resolve && resolve({
-                code: 0,
-                result: {},
-                message: nonSystemParamRes.message || MESSAGE.NATIVE_ERROR
-              });
-            } else {
-              resolve && resolve({
-                code: 0,
-                result: nonSystemParamRes.result,
-                message: MESSAGE.SUCCESS
-              });
-            }
-            return [2 /*return*/];
-        }
-      });
-    });
-  });
-}
 /**
  * 判断是否是iframe嵌套环境
  * @returns 是否是iframe嵌套环境
@@ -290,4 +226,4 @@ function iframePostMessage(data) {
   window.top && window.top.postMessage(data, '*');
 }
 
-export { decrypt, detectDevice, deviceReady, getApiUrlPath, getEnv, getPreOrderDomain, getSysTimeDomain, getWebappsEnv, getWebappsPath, getWechatAuthDomain, getWechatUserInfoDomain, iframePostMessage, isBridgeReady, isFunction$2 as isFunction, isIframeClient, isObject$1 as isObject, isWKWebView, isWeixinClient, readHybridNoSystemParam, readHybridSystemParamIgnoreError, setWindowObjectValue };
+export { decrypt, detectDevice, deviceReady, getApiUrlPath, getEnv, getPreOrderDomain, getSysTimeDomain, getWebappsEnv, getWebappsPath, getWechatAuthDomain, getWechatUserInfoDomain, iframePostMessage, isBridgeReady, isFunction$2 as isFunction, isIframeClient, isObject$1 as isObject, isWKWebView, isWeixinClient, setWindowObjectValue };

package/es/utils/loginFuncs.mjs

@@ -1,12 +1,22 @@
 import { __awaiter, __generator, __assign as _assign } from '../node_modules/tslib/tslib.es6.mjs';
 import { http } from '../http/index.mjs';
 import { API_URL } from './urls.mjs';
-import { LoginType, NO_TOKEN, MESSAGE, CHANNELID, DEFAULT_RESPONSE } from './const.mjs';
-import { readHybridNoSystemParam } from './funcs.mjs';
+import { LoginType, NO_TOKEN, MESSAGE, CHANNELID, ALL_NO_SYSTEM_PARAM_KEYS, DEFAULT_RESPONSE } from './const.mjs';
 import { getUserUKeysByChannelId } from '../getUserUKeysByChannelId/index.mjs';
 import { nativeIOOperation } from '../nativeIOOperation/index.mjs';
-import { ready } from '../ready/index.mjs';
 
+function readHybridNoSystemParam$1() {
+  return __awaiter(this, arguments, void 0, function (keys) {
+    if (keys === void 0) {
+      keys = ALL_NO_SYSTEM_PARAM_KEYS;
+    }
+    return __generator(this, function (_a) {
+      return [2 /*return*/, nativeIOOperation(4004, {
+        keys: keys
+      })];
+    });
+  });
+}
 function checkFundAccountLoginFromServer() {
   return http.get(API_URL + '/login/fundAccount');
 }
@@ -27,13 +37,10 @@ function fetchYJBAPI(param_1) {
           return __generator(this, function (_a) {
             switch (_a.label) {
               case 0:
-                return [4 /*yield*/, ready()];
-              case 1:
-                _a.sent();
                 return [4 /*yield*/, nativeIOOperation(1001, Object.assign({}, options, {
                   param: param
                 }))];
-              case 2:
+              case 1:
                 nativeResponse = _a.sent();
                 if (nativeResponse.code != 0) {
                   //客户端调用失败或网络错误
@@ -100,7 +107,7 @@ function getFundAccountTokenForHybrid() {
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
-            return [4 /*yield*/, readHybridNoSystemParam(['fundAccount', 'opStation'])];
+            return [4 /*yield*/, readHybridNoSystemParam$1(['fundAccount', 'opStation'])];
           case 1:
             nonSystemParamRes = _a.sent();
             if (nonSystemParamRes.code != 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gjzq/sdk",
-  "version": "1.3.1-beta.1",
+  "version": "1.4.0-beta.1",
   "main": "dist/index.js",
   "module": "es/index.mjs",
   "types": "./dist/index.d.ts",
@@ -111,5 +111,8 @@
     "./es/pure.mjs"
   ],
   "author": "佣金宝前端",
-  "license": "MIT"
+  "license": "MIT",
+  "volta": {
+    "node": "20.11.1"
+  }
 }