@freelog/tools-lib 0.1.108 → 0.1.109

package/dist/service-API/combinations/index.d.ts

@@ -1,7 +1,12 @@
+interface FileInfo {
+    sha1: string;
+    state: 'success' | 'fail' | 'nonentity';
+    info: {
+        [key: string]: any;
+    };
+}
 interface GetFileInfosBySha1Params {
     sha1: string[];
-    cdPartiallySuccess?: (s: any[]) => void;
-    cdPartiallyFail?: (f: any[]) => void;
 }
-export declare function getFilesSha1Info({ sha1, cdPartiallySuccess, cdPartiallyFail }: GetFileInfosBySha1Params): Promise<void>;
+export declare function getFilesSha1Info({ sha1 }: GetFileInfosBySha1Params, cdPartially?: (s: any[]) => void): Promise<FileInfo[]>;
 export {};

package/dist/service-API/index.d.ts

@@ -13,7 +13,7 @@ import * as Activity from './activities';
 import * as TestQualification from './testQualifications';
 import * as Statistic from './statistics';
 import * as I18n from './i18n';
-import * as C from './combinations';
+import * as combination from './combinations';
 declare const FServiceAPI: {
     Node: typeof Node;
     Exhibit: typeof Exhibit;
@@ -30,6 +30,6 @@ declare const FServiceAPI: {
     TestQualification: typeof TestQualification;
     Statistic: typeof Statistic;
     I18n: typeof I18n;
-    C: typeof C;
+    combination: typeof combination;
 };
 export default FServiceAPI;

package/dist/tools-lib.cjs.development.js

@@ -2264,6 +2264,8 @@ function registerOrBind(params) {
     method: 'POST',
     url: "/v2/thirdParty/registerOrBind",
     data: params
+  }, {
+    noRedirect: true
   });
 }
 
@@ -2749,33 +2751,193 @@ var I18n = {
   configsList: configsList
 };
 
-function getFilesSha1Info(_x) {
+/**
+ * 根据 File 获取 SHA1 Hash 字符串
+ * @param file
+ * @return {Promise<string>}
+ */
+
+function getSHA1Hash(file) {
+  return new Promise(function (resolve) {
+    var reader = new FileReader();
+
+    reader.onload = function () {
+      var wordArray = CryptoJS.lib.WordArray.create(reader.result);
+      var hash = CryptoJS.SHA1(wordArray).toString();
+      resolve(hash);
+    };
+
+    reader.readAsArrayBuffer(file);
+  });
+}
+/**
+ * 生成随机码
+ */
+
+function generateRandomCode(strLen) {
+  if (strLen === void 0) {
+    strLen = 5;
+  }
+
+  var allStr = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
+  var newStrArr = [];
+
+  for (var i = 0; i < strLen; i++) {
+    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
+  }
+
+  return newStrArr.join('');
+}
+/**
+ * 通过读取 cookies 获取用户 ID
+ */
+
+function getUserIDByCookies() {
+  var uid = document.cookie.split('; ').find(function (co) {
+    return co.startsWith('uid=');
+  });
+
+  if (!uid) {
+    return -1;
+  }
+
+  return Number(uid.replace('uid=', ''));
+}
+function transformServerAPIContractState(_ref) {
+  var status = _ref.status,
+      authStatus = _ref.authStatus;
+
+  if (status === 0) {
+    if (authStatus === 1 || authStatus === 3) {
+      return 'active';
+    }
+
+    if (authStatus === 2) {
+      return 'testActive';
+    }
+
+    if (authStatus === 128) {
+      return 'inactive';
+    }
+  }
+
+  if (status === 1) {
+    return 'terminal';
+  }
+
+  return 'exception';
+}
+/**
+ * 暂时休眠
+ * @param ms 休眠时常(毫秒)
+ */
+
+function promiseSleep(ms) {
+  if (ms === void 0) {
+    ms = 300;
+  }
+
+  return new Promise(function (resolve) {
+    setTimeout(function () {
+      resolve();
+    }, ms);
+  });
+}
+
+var Tool = {
+  __proto__: null,
+  getSHA1Hash: getSHA1Hash,
+  generateRandomCode: generateRandomCode,
+  getUserIDByCookies: getUserIDByCookies,
+  transformServerAPIContractState: transformServerAPIContractState,
+  promiseSleep: promiseSleep
+};
+
+function getFilesSha1Info(_x, _x2) {
   return _getFilesSha1Info.apply(this, arguments);
 }
 
 function _getFilesSha1Info() {
-  _getFilesSha1Info = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(_ref) {
-    var sha1, cdPartiallySuccess, cdPartiallyFail, _yield$Storage$filesL, data, all, success, fail;
+  _getFilesSha1Info = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(_ref, cdPartially) {
+    var sha1, needHandleSha1, allData, _yield$Storage$filesL, data, finishedInfo;
 
     return runtime_1.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            sha1 = _ref.sha1, cdPartiallySuccess = _ref.cdPartiallySuccess, cdPartiallyFail = _ref.cdPartiallyFail;
-            _context.next = 3;
+            sha1 = _ref.sha1;
+
+            if (cdPartially === void 0) {
+              cdPartially = function cdPartially() {
+                return undefined;
+              };
+            }
+
+            if (!(sha1.length === 0)) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return", []);
+
+          case 4:
+            needHandleSha1 = [].concat(sha1);
+            allData = [];
+
+          case 6:
+
+            _context.next = 9;
             return filesListInfo({
-              sha1: sha1
+              sha1: needHandleSha1
             });
 
-          case 3:
+          case 9:
             _yield$Storage$filesL = _context.sent;
             data = _yield$Storage$filesL.data;
-            all = [];
-            success = [];
-            fail = [];
-            console.log(data, all, success, fail, cdPartiallySuccess, cdPartiallyFail, '093oijsdlkfsjdl');
+            needHandleSha1 = data.filter(function (d) {
+              return d.metaAnalyzeStatus && d.metaAnalyzeStatus === 1;
+            }).map(function (d) {
+              return d.sha1;
+            });
+            finishedInfo = data.filter(function (d) {
+              return !d.metaAnalyzeStatus || d.metaAnalyzeStatus !== 1;
+            }).map(function (d) {
+              var state = 'fail';
+
+              if (!d.metaAnalyzeStatus) {
+                state = 'nonentity';
+              } else if (d.metaAnalyzeStatus === 2) {
+                state = 'success';
+              }
 
-          case 9:
+              return {
+                sha1: d.sha1,
+                state: state,
+                info: d
+              };
+            });
+            cdPartially && cdPartially(finishedInfo);
+            allData = [].concat(allData, finishedInfo);
+
+            if (!(needHandleSha1.length === 0)) {
+              _context.next = 17;
+              break;
+            }
+
+            return _context.abrupt("break", 21);
+
+          case 17:
+            _context.next = 19;
+            return promiseSleep(3000);
+
+          case 19:
+            _context.next = 6;
+            break;
+
+          case 21:
+            return _context.abrupt("return", allData);
+
+          case 22:
           case "end":
             return _context.stop();
         }
@@ -2785,7 +2947,7 @@ function _getFilesSha1Info() {
   return _getFilesSha1Info.apply(this, arguments);
 }
 
-var C = {
+var combination = {
   __proto__: null,
   getFilesSha1Info: getFilesSha1Info
 };
@@ -2806,7 +2968,7 @@ var FServiceAPI = {
   TestQualification: TestQualification,
   Statistic: Statistic,
   I18n: I18n,
-  C: C
+  combination: combination
 };
 
 var codeMessage = {
@@ -2964,91 +3126,6 @@ function _request() {
   return _request.apply(this, arguments);
 }
 
-/**
- * 根据 File 获取 SHA1 Hash 字符串
- * @param file
- * @return {Promise<string>}
- */
-
-function getSHA1Hash(file) {
-  return new Promise(function (resolve) {
-    var reader = new FileReader();
-
-    reader.onload = function () {
-      var wordArray = CryptoJS.lib.WordArray.create(reader.result);
-      var hash = CryptoJS.SHA1(wordArray).toString();
-      resolve(hash);
-    };
-
-    reader.readAsArrayBuffer(file);
-  });
-}
-/**
- * 生成随机码
- */
-
-function generateRandomCode(strLen) {
-  if (strLen === void 0) {
-    strLen = 5;
-  }
-
-  var allStr = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
-  var newStrArr = [];
-
-  for (var i = 0; i < strLen; i++) {
-    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
-  }
-
-  return newStrArr.join('');
-}
-/**
- * 通过读取 cookies 获取用户 ID
- */
-
-function getUserIDByCookies() {
-  var uid = document.cookie.split('; ').find(function (co) {
-    return co.startsWith('uid=');
-  });
-
-  if (!uid) {
-    return -1;
-  }
-
-  return Number(uid.replace('uid=', ''));
-}
-function transformServerAPIContractState(_ref) {
-  var status = _ref.status,
-      authStatus = _ref.authStatus;
-
-  if (status === 0) {
-    if (authStatus === 1 || authStatus === 3) {
-      return 'active';
-    }
-
-    if (authStatus === 2) {
-      return 'testActive';
-    }
-
-    if (authStatus === 128) {
-      return 'inactive';
-    }
-  }
-
-  if (status === 1) {
-    return 'terminal';
-  }
-
-  return 'exception';
-}
-
-var Tool = {
-  __proto__: null,
-  getSHA1Hash: getSHA1Hash,
-  generateRandomCode: generateRandomCode,
-  getUserIDByCookies: getUserIDByCookies,
-  transformServerAPIContractState: transformServerAPIContractState
-};
-
 var FUtil = {
   Format: Format,
   Regexp: Regexp,