@lingxiteam/assets 0.7.30-alpha.31 → 0.7.30-alpha.34

package/es/security/fetch.d.ts

@@ -1,4 +1,5 @@
 declare const fetch: (url: any, fetchOptions?: any, config?: {
     mode: string;
+    signKeyOptions: any;
 }) => Promise<Response>;
 export default fetch;

package/es/security/fetch.js

@@ -6,6 +6,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { createHttpSignStr } from './sign';
 var originFetch = window.fetch;
+var defaultSignKey = 'X-SIGN';
+var MODE = {
+  SIGN_KEY: 'signKey' // 参数签名
+
+};
 var envKey = process.env.LING_XI_HTTP_SIGN_HEADER_KEY || process.env.REACT_APP_HTTP_SIGN_HEADER_KEY || process.env.UMI_APP_HTTP_SIGN_HEADER_KEY || process.env.FISHX_APP_HTTP_SIGN_HEADER_KEY;
 
 var fetch = function fetch(url) {
@@ -14,8 +19,10 @@ var fetch = function fetch(url) {
 
   var opts = _objectSpread({}, fetchOptions);
 
-  if (!config || !config.mode || config.mode === 'signKey') {
-    opts.headers = _objectSpread(_objectSpread({}, opts.headers), {}, _defineProperty({}, envKey || 'X-SIGN', createHttpSignStr(url, fetchOptions)));
+  if ((!config || !config.mode || config.mode === MODE.SIGN_KEY) && (fetchOptions === null || fetchOptions === void 0 ? void 0 : fetchOptions.disabledSignKey) !== true) {
+    var _config$signKeyOption;
+
+    opts.headers = _objectSpread(_objectSpread({}, opts.headers), {}, _defineProperty({}, (config === null || config === void 0 ? void 0 : (_config$signKeyOption = config.signKeyOptions) === null || _config$signKeyOption === void 0 ? void 0 : _config$signKeyOption.key) || envKey || defaultSignKey, createHttpSignStr(url, fetchOptions)));
   }
 
   return originFetch(url, opts);

package/es/security/httpEncryption.js

@@ -34,7 +34,8 @@ function start(_ref) {
           window.fetch = function (url) {
             var fetchOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
             return fetch(url, fetchOptions, {
-              mode: mode
+              mode: mode,
+              signKeyOptions: signKeyOptions
             });
           };
         } else {

package/es/security/index.d.ts

@@ -7,11 +7,13 @@ declare const _default: {
         stop: () => void;
         fetch: (url: any, fetchOptions?: any, config?: {
             mode: string;
+            signKeyOptions: any;
         } | undefined) => Promise<Response>;
         createHttpSignStr: (url: string, options: any) => string;
     };
     sign: {
         createHttpSignStr: (url: string, options: any) => string;
+        getApiPath: (url: string) => any;
     };
 };
 export default _default;

package/es/security/index.js

@@ -1,5 +1,5 @@
-import sign from './sign';
 import httpEncryption from './httpEncryption';
+import sign from './sign';
 export default {
   httpEncryption: httpEncryption,
   sign: sign

package/es/security/sign.d.ts

@@ -1,5 +1,6 @@
 export declare const createHttpSignStr: (url: string, options: any) => string;
 declare const _default: {
     createHttpSignStr: (url: string, options: any) => string;
+    getApiPath: (url: string) => any;
 };
 export default _default;

package/es/security/sign.js

@@ -1,5 +1,17 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 import { sha256 } from 'js-sha256';
 import { obj2QueryString } from '../utils/url';
 var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9RWfzCS'; // 1、签名算法：
@@ -13,7 +25,6 @@ var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9R
 // ● header ：取X-开头的header，或者APP-ID，多个则逗号分隔拼接。比如X-AA=a;APP-ID=88888
 // ● get 参数：就是url 问号后面的串
 // ● body：post 请求体
-// ● 秘钥固定：zrT5bi2escXilaH1fs653uZiH9RWfzCS
 
 /**
  * 组装X-SIGN请求头
@@ -24,9 +35,54 @@ var SIGN_KEY = process.env.LING_XI_HTTP_SIGN_KEY || 'zrT5bi2escXilaH1fs653uZiH9R
 // 由于X-B 的规则可能被业务网关使用，并往请求头增加内容，导致前后端加密不一致
 // 2022.08.09 使用以下3个固定值 + X-LX-*匹配 方式
 
-var hKeys = ['X-B-AUTH', 'X-B-TARGET-ID', 'APP-ID'];
+var hKeys = ['X-B-AUTH', 'X-B-TARGET-ID', 'APP-ID']; // 配置指定接口前缀
+
+var apiPrefix = process.env.LING_XI_HTTP_SIGN_API_PERFIX || process.env.REACT_APP_HTTP_SIGN_API_PERFIX || process.env.UMI_APP_HTTP_SIGN_API_PERFIX || process.env.FISHX_APP_HTTP_SIGN_API_PERFIX || 'portal,asset,rhin,lcdp,ncdp,flow'; // 获取接口路径
+// =========================
+// api/a/b/c
+// ../api/a/b/c
+// ../../api/a/b/c
+// /api/a/b/c
+// http://host.com/api/a/b/c
+// https://host.com/api/a/b/c
+// //host.com/api/a/b/c
+//  => /api/a/b/c
+// =========================
+
+var getApiPath = function getApiPath(url) {
+  // 移除host、相对路径部分，保证地址前都是'/'开头
+  var fixurl = "/".concat(url.replace(/(^(http:\/\/|https:\/\/|\/\/)[^/]*)|(^\.[./]*)/g, '')).replace('//', '/');
+
+  if (apiPrefix) {
+    // 配了接口前缀规则，通过前缀匹配
+    // =========================
+    // /api/a/api/b => /api/b
+    // api/c        => /api/c
+    // /lapi/d      => ''
+    // =========================
+    return apiPrefix.split(',').reduce(function (pre, n) {
+      var matchPath = fixurl.split("/".concat(n, "/")).pop();
+
+      if (matchPath !== fixurl) {
+        pre.push("/".concat(n, "/").concat(matchPath));
+      }
+
+      return pre;
+    }, []).sort(function (a, b) {
+      return a.length - b.length;
+    })[0] || '';
+  } // 没有配置接口前缀，使用接口最后三级路径，不足三级取最大层级路径
+  // =========================
+  // /a/b/c/d => /b/c/d
+  // a/b     => /a/b
+  // =========================
+
+
+  return "".concat(fixurl.split('/').slice(-3).join('/'));
+};
+
 export var createHttpSignStr = function createHttpSignStr(url, options) {
-  if (!url || !options) {
+  if (!url || !options || !options.method) {
     return '';
   }
 
@@ -41,32 +97,49 @@ export var createHttpSignStr = function createHttpSignStr(url, options) {
     mixUrl += (url.indexOf('?') !== -1 ? '&' : '?') + obj2QueryString(search);
   }
 
-  var apiName = mixUrl.split('?')[0].split('/').pop(); // 获取参数2: 请求头部参数
+  var _mixUrl$split = mixUrl.split('?'),
+      _mixUrl$split2 = _slicedToArray(_mixUrl$split, 2),
+      urlPath = _mixUrl$split2[0],
+      _mixUrl$split2$ = _mixUrl$split2[1],
+      urlSearch = _mixUrl$split2$ === void 0 ? '' : _mixUrl$split2$;
+
+  var apiPath = getApiPath(urlPath); // 获取参数2: 请求头部参数
 
   var headerParams = '';
   var headersKeyArr = [];
-  Object.keys(headers).forEach(function (key) {
-    if (key.startsWith('X-LX-') || hKeys.includes(key)) {
-      headersKeyArr.push("".concat(key.toLowerCase(), "=").concat(headers[key]));
-    }
-  });
+
+  if (headers) {
+    Object.keys(headers).forEach(function (key) {
+      if (key.startsWith('X-LX-') || hKeys.includes(key)) {
+        headersKeyArr.push("".concat(key.toLowerCase(), "=").concat(headers[key]));
+      }
+    });
+  }
+
   headerParams = headersKeyArr.sort().join(';'); // 获取参数3: 请求参数
 
   var params = '';
 
   if (method.toLowerCase() === 'get') {
-    params = mixUrl.split('?')[1] || '';
+    params = urlSearch;
   } else {
     params = _typeof(body) === 'object' ? JSON.stringify(body) : body;
-  }
+  } // 组装加密字符串
+
+
+  var str = [apiPath, headerParams, params, SIGN_KEY].join('#');
 
-  if (window.signDebug) {
-    console.log('sign', [apiName, headerParams, params, SIGN_KEY].join('#'));
+  if (typeof window !== 'undefined' && (window.signDebug || window.localStorage.getItem('signDebug'))) {
+    console.log(' --- signDebug ---');
+    console.log('url', url);
+    console.log('str', str);
+    console.log('sign', sha256(str));
   } // 生成约定签名
 
 
-  return sha256([apiName, headerParams, params, SIGN_KEY].join('#'));
+  return sha256(str);
 };
 export default {
-  createHttpSignStr: createHttpSignStr
+  createHttpSignStr: createHttpSignStr,
+  getApiPath: getApiPath
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/assets",
-  "version": "0.7.30-alpha.31",
+  "version": "0.7.30-alpha.34",
   "description": "灵犀低代码平台移动端 - 工具类",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -19,14 +19,19 @@
     "exports": "node ./scripts/exports.js",
     "prebuild-component": "npm run exports",
     "build-component": "father-build",
-    "watch": "father-build -w"
+    "watch": "father-build -w",
+    "test": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha"
   },
   "keywords": [],
   "peerDependencies": {
     "react": ">=16.8.6"
   },
   "devDependencies": {
-    "father-build": "1.20.4"
+    "babel-preset-env": "^1.7.0",
+    "babel-register": "^6.26.0",
+    "father-build": "1.20.4",
+    "mocha": "^10.0.0",
+    "ts-node": "^10.9.1"
   },
   "gitHead": "bcd338198e2c14459538542d10600ab03abc92f2",
   "dependencies": {