xctc-utils 1.6.68 → 1.6.70

package/dist/weixin/index.js

@@ -23,28 +23,28 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onlinePay = exports.shareReady = exports.configReady = exports.getCode = exports.envSDK = exports.getUrlCode = exports.loadWeiXinSDK = void 0;
+exports.onlinePay = exports.shareReady = exports.configReady = exports.getCode = exports.envSDK = exports.getUrlCode = exports.initWeixinConfig = exports.loadWeiXinSDK = void 0;
 // import * as weixin from 'weixin-js-sdk' // 引入微信SDK
 // const weixin = require("weixin-js-sdk")
-var utils_1 = require("../utils");
-var crypto_1 = require("../crypto");
-var params = __importStar(require("../params"));
-var is_1 = require("../is");
-var index_1 = require("../storage/index");
-var utils_2 = require("../utils");
-var w = window;
-var loc = w.location;
-var defaultKey = "5uMz4R8r0926DkC8";
-var defaultIv = "5uMz4R8r0926DkC8";
+const utils_1 = require("../utils");
+const crypto_1 = require("../crypto");
+const params = __importStar(require("../params"));
+const is_1 = require("../is");
+const index_1 = require("../storage/index");
+const utils_2 = require("../utils");
+const w = window;
+const loc = w.location;
+const defaultKey = "5uMz4R8r0926DkC8";
+const defaultIv = "5uMz4R8r0926DkC8";
 var weixinConfig = {};
-var weixinUrl = "https://res.wx.qq.com/open/js/jweixin-1.6.0.js";
-var weixinJsSource = "";
+let weixinUrl = "https://res.wx.qq.com/open/js/jweixin-1.6.0.js";
+let weixinJsSource = "";
 function loadWeiXinSDK(url, callback) {
-    var win = window;
+    const win = window;
     if (url) {
         weixinUrl = url;
     }
-    (0, utils_2.loadScript)(weixinUrl, function () {
+    (0, utils_2.loadScript)(weixinUrl, () => {
         weixinJsSource = (win === null || win === void 0 ? void 0 : win.wx) || "";
         if (typeof callback === "function") {
             callback();
@@ -52,39 +52,35 @@ function loadWeiXinSDK(url, callback) {
     });
 }
 exports.loadWeiXinSDK = loadWeiXinSDK;
-function getUrlCode(config) {
+function initWeixinConfig(config) {
     var _a;
-    if (!(0, utils_1.weixinBrowser)()) {
-        console.error("非微信环境下，该函数将终止执行！");
-        return;
-    }
     config = config || {};
-    var appId = (config === null || config === void 0 ? void 0 : config.appId) || "";
+    let appId = (config === null || config === void 0 ? void 0 : config.appId) || "";
     if (!appId)
         return;
     weixinConfig = config;
-    var scope = (config === null || config === void 0 ? void 0 : config.scope) || "snsapi_userinfo";
-    var codeKey = (config === null || config === void 0 ? void 0 : config.codeKey) || "weixinAuthCode";
-    var stateKey = (config === null || config === void 0 ? void 0 : config.stateKey) || "weixinAuthState";
+    let scope = (config === null || config === void 0 ? void 0 : config.scope) || "snsapi_userinfo";
+    let codeKey = (config === null || config === void 0 ? void 0 : config.codeKey) || "weixinAuthCode";
+    let stateKey = (config === null || config === void 0 ? void 0 : config.stateKey) || "weixinAuthState";
     weixinConfig['scope'] = scope;
     weixinConfig['codeKey'] = codeKey;
     weixinConfig['stateKey'] = stateKey;
     (0, index_1.useSessionStorage)("weixinConfig", weixinConfig);
-    var _b = weixinConfig.cryptoiv, cryptoiv = _b === void 0 ? defaultIv : _b, _c = weixinConfig.cryptokey, cryptokey = _c === void 0 ? defaultKey : _c, _d = weixinConfig.debuggerStatus, debuggerStatus = _d === void 0 ? false : _d;
+    let { cryptoiv = defaultIv, cryptokey = defaultKey, debuggerStatus = false } = weixinConfig;
     initSdk(); // 加载微信sdk环境
     // 默认第一次通过链接进入系统，没有code和state
-    var codeIndex = -1;
-    var stateIndex = -1;
-    var msgStr = "";
-    var isAuth = false; // 是否完成 code 授权
-    var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
+    let codeIndex = -1;
+    let stateIndex = -1;
+    let msgStr = "";
+    let isAuth = false; // 是否完成 code 授权
+    let search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
     if (search) {
         codeIndex = search.indexOf("code=");
         stateIndex = search.indexOf("state=");
         isAuth = search.includes("state=state");
     }
     // 获取地址栏返回 code 参数值
-    var localParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+    const localParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
     // 本地未存储微信授权 code 值， 并且地址栏携带有 code 值 ，则先存储该值
     if (codeIndex != -1 && isAuth) {
         params.get({ keys: ['code'], cache: "session", key: cryptokey, iv: cryptoiv });
@@ -107,8 +103,8 @@ function getUrlCode(config) {
         }
         else {
             // 当前系统本地没有存储 code，流程为用户只需微信授权登录后返回系统，此时通过 CODE 执行微信登录
-            var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
-            var codeData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.code) === null || _a === void 0 ? void 0 : _a.str) || ""; // 第一次进入系统为空
+            const urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+            const codeData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.code) === null || _a === void 0 ? void 0 : _a.str) || ""; // 第一次进入系统为空
             login(codeData);
         }
         return;
@@ -130,6 +126,16 @@ function getUrlCode(config) {
         return getCode();
     }
 }
+exports.initWeixinConfig = initWeixinConfig;
+function getUrlCode(config) {
+    if (!(0, utils_1.weixinBrowser)()) {
+        console.error("非微信环境下，该函数将终止执行！");
+        return;
+    }
+    loadWeiXinSDK("", () => {
+        initWeixinConfig(config);
+    });
+}
 exports.getUrlCode = getUrlCode;
 function cryptoConfig(key, iv) {
     if (!key)
@@ -143,8 +149,7 @@ function cryptoConfig(key, iv) {
 }
 // 执行微信登录
 function login(code) {
-    var _a;
-    var appId = weixinConfig.appId, http = weixinConfig.http, redirectUri = weixinConfig.redirectUri, _b = weixinConfig.appIdKey, appIdKey = _b === void 0 ? "app_id" : _b, _c = weixinConfig.jsCodeKey, jsCodeKey = _c === void 0 ? "js_code" : _c, _d = weixinConfig.cb, cb = _d === void 0 ? "" : _d, _e = weixinConfig.debuggerStatus, debuggerStatus = _e === void 0 ? false : _e;
+    let { appId, http, redirectUri, appIdKey = "app_id", jsCodeKey = "js_code", cb = "", debuggerStatus = false } = weixinConfig;
     if (debuggerStatus) {
         alert("地址栏携带code已完成本地存储 ，执行微信授权逻辑");
     }
@@ -160,17 +165,17 @@ function login(code) {
         console.error("未正常传入微信授权登录http函数");
         return;
     }
-    var obj = (_a = {},
-        _a[appIdKey] = appId,
-        _a[jsCodeKey] = code,
-        _a);
+    let obj = {
+        [appIdKey]: appId,
+        [jsCodeKey]: code
+    };
     (0, index_1.useSessionStorage)("loginParams", JSON.stringify(obj));
     // 调试字段 isPassLogin ，为true 时不继续执行微信登录，前端可拿到 code 给后端测试
     // if(weixinConfig['isPassLogin']) return
-    weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.http(obj).then(function (res) {
+    weixinConfig === null || weixinConfig === void 0 ? void 0 : weixinConfig.http(obj).then((res) => {
         var _a;
         (0, index_1.useSessionStorage)("loginRes", res);
-        var code = -1;
+        let code = -1;
         if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("code")) {
             code = res.code;
         }
@@ -185,7 +190,7 @@ function login(code) {
             // 未登录则先执行登录
             return getCode();
         }
-        var data = {};
+        let data = {};
         if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
             data = res.data;
         }
@@ -196,44 +201,44 @@ function login(code) {
             console.error("http响应数据格式必须是：res:{code:xx,data:{}}");
             return;
         }
-        for (var key in data) {
-            var item = data[key];
+        for (let key in data) {
+            let item = data[key];
             if (item instanceof Object) {
                 item = JSON.stringify(item);
             }
             (0, index_1.useSessionStorage)(key, item);
             (0, index_1.useLocalStorage)(key, item);
         }
-        var url = loc.origin;
+        let url = loc.origin;
         if (redirectUri) {
             url = encodeURIComponent(redirectUri);
         }
-        var hashVal = loc.hash;
-        var urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
-        var stateData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.state) === null || _a === void 0 ? void 0 : _a.data) || ""; // 默认有值，链接携带
-        var str = "";
+        const hashVal = loc.hash;
+        const urlParamsData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+        const stateData = ((_a = urlParamsData === null || urlParamsData === void 0 ? void 0 : urlParamsData.state) === null || _a === void 0 ? void 0 : _a.data) || ""; // 默认有值，链接携带
+        let str = "";
         if ((0, is_1.isObject)(stateData)) {
-            for (var key in stateData) {
+            for (let key in stateData) {
                 if (key == "path") {
                     if (stateData[key][0] == "/") {
-                        url = "".concat(url, "/#").concat(stateData.path);
+                        url = `${url}/#${stateData.path}`;
                     }
                     else {
-                        url = "".concat(url, "/#/").concat(stateData.path);
+                        url = `${url}/#/${stateData.path}`;
                     }
                 }
                 else {
-                    str += "".concat(key, "=").concat(stateData[key], "&");
+                    str += `${key}=${stateData[key]}&`;
                 }
             }
             if (stateData === null || stateData === void 0 ? void 0 : stateData.path) {
                 if (str) {
-                    url = "".concat(url, "?").concat(str);
+                    url = `${url}?${str}`;
                 }
             }
         }
         else if (hashVal) {
-            url = "".concat(url, "/").concat(hashVal);
+            url = `${url}/${hashVal}`;
         }
         if (weixinConfig['isPassLogin']) {
             console.log("不执行跳转操作");
@@ -246,7 +251,7 @@ function login(code) {
                 loc.replace(url);
             }
         }
-    }).catch(function (err) {
+    }).catch((err) => {
         (0, index_1.useSessionStorage)("loginError", err);
     });
 }
@@ -255,21 +260,20 @@ function login(code) {
  * 获取地址栏中的 search 参数，将参数转换为数组，最终返回地址栏参数数组
  * keys 需要截取字符串开始字符
  */
-function formatSearch(search, keys) {
-    if (search === void 0) { search = ""; }
+function formatSearch(search = "", keys) {
     if (!search)
         return false;
-    var index = search.indexOf(keys);
+    let index = search.indexOf(keys);
     search = search.substr(index);
     if (search.startsWith("?")) {
         search = search.substring(1);
     }
-    var urlArr = search.split("&");
+    let urlArr = search.split("&");
     return urlArr;
 }
 // 加载当前微信sdk环境
 function initSdk() {
-    var wx = null;
+    let wx = null;
     if (w.wx && w.wx.ready) {
         wx = w.wx;
     }
@@ -286,14 +290,14 @@ function initSdk() {
 }
 // 返回微信环境 sdk
 function envSDK() {
-    var env = initSdk() || {};
+    const env = initSdk() || {};
     return env;
 }
 exports.envSDK = envSDK;
 // 前往微信授权登录页面
 function getCode(appId, scope) {
     if ((0, utils_1.weixinBrowser)()) {
-        var id = "";
+        let id = "";
         if (weixinConfig['appId']) {
             id = weixinConfig['appId'];
         }
@@ -304,20 +308,20 @@ function getCode(appId, scope) {
             console.log("调用跳转微信授权方法时getCode，请传入参数：appId");
             return;
         }
-        var scopeVal = "snsapi_userinfo";
+        let scopeVal = "snsapi_userinfo";
         if (weixinConfig['scope']) {
             scopeVal = weixinConfig.scope;
         }
         else if (scope) {
             scopeVal = scope;
         }
-        var uri = encodeURIComponent(loc.origin);
+        let uri = encodeURIComponent(loc.origin);
         if (weixinConfig['redirectUri']) {
             uri = encodeURIComponent(weixinConfig.redirectUri);
         }
-        var base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
-        var config = "appid=".concat(id, "&redirect_uri=").concat(uri, "&response_type=code&scope=").concat(scopeVal, "&state=state#wechat_redirect");
-        var wxJumpURL = base + config;
+        let base = "https://open.weixin.qq.com/connect/oauth2/authorize?";
+        let config = `appid=${id}&redirect_uri=${uri}&response_type=code&scope=${scopeVal}&state=state#wechat_redirect`;
+        let wxJumpURL = base + config;
         loc.replace(wxJumpURL);
     }
     else {
@@ -326,20 +330,20 @@ function getCode(appId, scope) {
     }
 }
 exports.getCode = getCode;
-var defaultJsApiList = [
+const defaultJsApiList = [
     'updateAppMessageShareData', 'updateTimelineShareData', "onMenuShareWeibo", "onMenuShareQZone", "startRecord", "stopRecord", "closeWindow", "scanQRCode", "chooseWXPay", "chooseCard", "openCard",
     "onVoiceRecordEnd", "playVoice", "pauseVoice", "stopVoice", "onVoicePlayEnd", "uploadVoice", "downloadVoice", "chooseImage", "previewImage", "uploadImage", "openProductSpecificView", "addCard",
     "downloadImage", "translateVoice", "getNetworkType", "openLocation", "getLocation", "hideOptionMenu", "showOptionMenu", "hideMenuItems", "showMenuItems", "hideAllNonBaseMenuItem", "showAllNonBaseMenuItem",
 ];
-var defaultOpenTagList = [
+const defaultOpenTagList = [
     "wx-open-subscribe", "wx-open-launch-app", "wx-open-launch-weapp",
     "wx-open-audio"
 ];
-var isContinue = function (dataType) {
-    var localCodeData = (0, index_1.getSessionStorage)("urlParamsData") || "";
-    var wxInfo = (0, index_1.getLocalStorage)("WxInfo") || "";
-    var search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
-    var codeIndex = -1;
+const isContinue = (dataType) => {
+    const localCodeData = (0, index_1.getSessionStorage)("urlParamsData") || "";
+    let wxInfo = (0, index_1.getLocalStorage)("WxInfo") || "";
+    let search = loc.search; // ?code=0916SzFa1KH9TA0Ke7Ha1AQx6446SzFr&state=123
+    let codeIndex = -1;
     if (search) {
         codeIndex = search.indexOf("code=");
     }
@@ -360,33 +364,32 @@ var isContinue = function (dataType) {
     }
 };
 function configReady(config) {
-    var _a;
     if (!isContinue(config === null || config === void 0 ? void 0 : config.dataType)) {
         console.error("还未执行微信登录流程");
         return;
     }
-    var _b = config || {}, appId = _b.appId, url = _b.url, _c = _b.urlKey, urlKey = _c === void 0 ? "url" : _c, _d = _b.appIdKey, appIdKey = _d === void 0 ? "appId" : _d, cb = _b.cb, _e = _b.jsApiList, jsApiList = _e === void 0 ? [] : _e, _f = _b.openTagList, openTagList = _f === void 0 ? [] : _f, _g = _b.http, http = _g === void 0 ? "" : _g;
+    const { appId, url, urlKey = "url", appIdKey = "appId", cb, jsApiList = [], openTagList = [], http = "" } = config || {};
     if (!http)
         return;
-    var currentUrl = loc.origin;
+    let currentUrl = loc.origin;
     if (url) {
         currentUrl = url;
     }
-    var param = (_a = {},
-        _a[urlKey] = currentUrl,
-        _a[appIdKey] = appId,
-        _a);
-    var jsApiListData = defaultJsApiList;
-    var openTagListData = defaultOpenTagList;
+    let param = {
+        [urlKey]: currentUrl,
+        [appIdKey]: appId,
+    };
+    let jsApiListData = defaultJsApiList;
+    let openTagListData = defaultOpenTagList;
     if (jsApiList === null || jsApiList === void 0 ? void 0 : jsApiList.length) {
         jsApiListData = jsApiListData;
     }
     if (openTagList === null || openTagList === void 0 ? void 0 : openTagList.length) {
         openTagListData = openTagList;
     }
-    config.http(param).then(function (res) {
+    config.http(param).then((res) => {
         if (res) {
-            var data = {};
+            let data = {};
             if (res === null || res === void 0 ? void 0 : res.hasOwnProperty("data")) {
                 data = res.data;
             }
@@ -397,15 +400,15 @@ function configReady(config) {
                 console.error("http响应数据格式必须是：res:{data:{appid:xx,timestamp:xx,noncestr:xx,signature:xx}}");
                 return;
             }
-            for (var key in data) {
-                var newKey = key.toLowerCase();
+            for (let key in data) {
+                const newKey = key.toLowerCase();
                 data[newKey] = data[key];
             }
             if (!(data === null || data === void 0 ? void 0 : data.appid)) {
                 console.error("后端响应的data数据中缺乏appid或者appId或者AppId字段！");
                 return;
             }
-            var obj = {
+            let obj = {
                 jsApiList: jsApiListData,
                 openTagList: openTagListData,
                 debug: false,
@@ -414,7 +417,7 @@ function configReady(config) {
                 nonceStr: data === null || data === void 0 ? void 0 : data.noncestr,
                 signature: data === null || data === void 0 ? void 0 : data.signature, //必填，生成的签名
             };
-            var wx = initSdk();
+            const wx = initSdk();
             console.log("wx.config.data：", obj);
             wx.config(obj);
             wx.ready(function (res) {
@@ -434,27 +437,27 @@ function shareReady(options) {
         console.error("还未执行微信登录流程");
         return;
     }
-    var title = "微信分享标题";
+    let title = "微信分享标题";
     if (options['title'])
         title = options.title;
-    var desc = "微信分享描述";
+    let desc = "微信分享描述";
     if (options['desc'])
         desc = options.desc;
-    var link = loc.origin;
+    let link = loc.origin;
     if (options['link'])
         link = options.link;
-    var imgUrl = "";
+    let imgUrl = "";
     if (options['imgUrl'])
         imgUrl = options.imgUrl;
     if (options && typeof options == "object") {
-        var state = "";
+        let state = "";
         if (options['data']) {
-            var data = options.data;
-            var key = options['key'] || defaultKey;
-            var iv = options['iv'] || defaultIv;
-            var cryptoObj = cryptoConfig(key, iv);
+            let data = options.data;
+            const key = options['key'] || defaultKey;
+            const iv = options['iv'] || defaultIv;
+            const cryptoObj = cryptoConfig(key, iv);
             state = (0, crypto_1.encrypt)(data, cryptoObj.key, cryptoObj.iv);
-            link = "".concat(link, "?state=").concat(state);
+            link = `${link}?state=${state}`;
         }
     }
     if (options['shareUrl'])
@@ -462,7 +465,7 @@ function shareReady(options) {
     if (options === null || options === void 0 ? void 0 : options.dbug) {
         alert(JSON.stringify(options));
     }
-    var wx = initSdk();
+    const wx = initSdk();
     (0, index_1.useSessionStorage)("weixinShareUrl", link);
     wx.ready(function () {
         (0, index_1.useSessionStorage)("shareReady", "success");
@@ -493,7 +496,7 @@ function shareReady(options) {
             }
         });
     });
-    wx.error(function (res) {
+    wx.error((res) => {
         console.log("配置进入错误：", res);
     });
 }
@@ -503,9 +506,9 @@ function onlinePay(config) {
         console.error("还未执行微信登录流程");
         return;
     }
-    var wx = initSdk();
+    const wx = initSdk();
     // let { timeStamp,signType,prepay_id,paySign,package,nonceStr,appId } = params
-    var cb = "";
+    let cb = "";
     if (config['cb'] && typeof config.cb === "function")
         cb = config.cb;
     wx.chooseWXPay({
@@ -515,7 +518,7 @@ function onlinePay(config) {
         signType: config.signType,
         paySign: config.paySign,
         success: function (res) {
-            var obj = {
+            const obj = {
                 status: "success",
                 data: res,
             };
@@ -523,7 +526,7 @@ function onlinePay(config) {
                 cb(obj);
         },
         cancel: function (cancel) {
-            var obj = {
+            const obj = {
                 status: "cancel",
                 data: cancel,
             };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "xctc-utils",
   "private": false,
-  "version": "1.6.68",
+  "version": "1.6.70",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -13,11 +13,12 @@
   "author": "dyb",
   "license": "ISC",
   "devDependencies": {
+    "@types/crypto-js": "^4.2.2",
     "@types/node": "^18.11.19",
     "typescript": "^4.9.5"
   },
   "dependencies": {
-
+    "crypto-js": "^4.2.0"
   },
   "repository": {
     "type": "git",

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2018",
     "module": "commonjs",
     "declaration": true,
     "outDir": "./dist",