@freelog/tools-lib 0.1.108 → 0.1.109

package/dist/utils/tools.d.ts

@@ -20,4 +20,9 @@ interface TransformServerAPIContractStateParams {
     authStatus: 1 | 2 | 128 | number;
 }
 export declare function transformServerAPIContractState({ status, authStatus, }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception';
+/**
+ * 暂时休眠
+ * @param ms 休眠时常(毫秒)
+ */
+export declare function promiseSleep(ms?: number): Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.108",
+  "version": "0.1.109",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/service-API/combinations/index.ts

@@ -1,27 +1,65 @@
+import * as FUtil from '../../utils/tools';
 import * as Storage from '../storages';
 
 interface FileInfo {
   sha1: string;
   state: 'success' | 'fail' | 'nonentity';
-  dataSource: {
+  info: {
     [key: string]: any;
   }
 }
 
 interface GetFileInfosBySha1Params {
   sha1: string[];
-  cdPartiallySuccess?: (s: any[]) => void;
-  cdPartiallyFail?: (f: any[]) => void;
 }
 
-export async function getFilesSha1Info({sha1, cdPartiallySuccess, cdPartiallyFail}: GetFileInfosBySha1Params) {
-  const {data} = await Storage.filesListInfo({
-    sha1: sha1,
-  });
+export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<FileInfo[]> {
+  if (sha1.length === 0) {
+    return [];
+  }
+
+  let needHandleSha1: string[] = [...sha1];
 
-  const all: FileInfo[] = [];
-  const success: any = [];
-  const fail: any = [];
+  let allData: FileInfo[] = [];
 
-  console.log(data, all, success, fail, cdPartiallySuccess, cdPartiallyFail, '093oijsdlkfsjdl')
+  while (true) {
+    const {data} = await Storage.filesListInfo({
+      sha1: needHandleSha1,
+    });
+    needHandleSha1 = data
+      .filter((d: any) => {
+        return d.metaAnalyzeStatus && d.metaAnalyzeStatus === 1;
+      })
+      .map((d: any) => {
+        return d.sha1;
+      });
+    const finishedInfo: FileInfo[] = data
+      .filter((d: any) => {
+        return !d.metaAnalyzeStatus || d.metaAnalyzeStatus !== 1;
+      })
+      .map((d: any) => {
+        let state: 'success' | 'fail' | 'nonentity' = 'fail';
+        if (!d.metaAnalyzeStatus) {
+          state = 'nonentity';
+        } else if (d.metaAnalyzeStatus === 2) {
+          state = 'success';
+        }
+        return {
+          sha1: d.sha1,
+          state,
+          info: d,
+        };
+      });
+    cdPartially && cdPartially(finishedInfo);
+    allData = [
+      ...allData,
+      ...finishedInfo,
+    ];
+
+    if (needHandleSha1.length === 0) {
+      break;
+    }
+    await FUtil.promiseSleep(3000)
+  }
+  return allData;
 }

package/src/service-API/index.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';
 
 const FServiceAPI = {
   Node,
@@ -31,7 +31,7 @@ const FServiceAPI = {
   TestQualification,
   Statistic,
   I18n,
-  C,
+  combination,
 };
 
 export default FServiceAPI;

package/src/service-API/user.ts

@@ -201,5 +201,5 @@ export function registerOrBind(params: RegisterOrBindParamsType) {
     method: 'POST',
     url: `/v2/thirdParty/registerOrBind`,
     data: params,
-  });
+  }, {noRedirect: true});
 }

package/src/utils/tools.ts

@@ -1,72 +1,85 @@
-import * as CryptoJS from 'crypto-js';
-
-/**
- * 根据 File 获取 SHA1 Hash 字符串
- * @param file
- * @return {Promise<string>}
- */
-export function getSHA1Hash(file: File): Promise<string> {
-  return new Promise((resolve) => {
-    const reader: FileReader = new FileReader();
-    reader.onload = function () {
-      const wordArray = CryptoJS.lib.WordArray.create(reader.result as any);
-      const hash = CryptoJS.SHA1(wordArray).toString();
-      resolve(hash);
-    };
-    reader.readAsArrayBuffer(file);
-  });
-}
-
-/**
- * 生成随机码
- */
-export function generateRandomCode(strLen: number = 5): string {
-  const allStr: string = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
-  const newStrArr: string[] = [];
-  for (let i = 0; i < strLen; i++) {
-    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
-  }
-  return newStrArr.join('');
-}
-
-/**
- * 通过读取 cookies 获取用户 ID
- */
-export function getUserIDByCookies(): number {
-  const uid: string | undefined = document.cookie.split('; ').find((co) => co.startsWith('uid='));
-  if (!uid) {
-    return -1;
-  }
-  return Number(uid.replace('uid=', ''));
-}
-
-
-/**
- * 将服务端的合约状态转换成前端需要的状态
- */
-interface TransformServerAPIContractStateParams {
-  status: 0 | 1 | 2; // 合同综合状态: 0:正常 1:已终止(不接受任何事件,也不给授权,事实上无效的合约) 2:异常
-  authStatus: 1 | 2 | 128 | number; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权
-}
-
-export function transformServerAPIContractState({
-                                           status,
-                                           authStatus,
-                                         }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception' {
-  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';
-}
+import * as CryptoJS from 'crypto-js';
+
+/**
+ * 根据 File 获取 SHA1 Hash 字符串
+ * @param file
+ * @return {Promise<string>}
+ */
+export function getSHA1Hash(file: File): Promise<string> {
+  return new Promise((resolve) => {
+    const reader: FileReader = new FileReader();
+    reader.onload = function () {
+      const wordArray = CryptoJS.lib.WordArray.create(reader.result as any);
+      const hash = CryptoJS.SHA1(wordArray).toString();
+      resolve(hash);
+    };
+    reader.readAsArrayBuffer(file);
+  });
+}
+
+/**
+ * 生成随机码
+ */
+export function generateRandomCode(strLen: number = 5): string {
+  const allStr: string = 'ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890';
+  const newStrArr: string[] = [];
+  for (let i = 0; i < strLen; i++) {
+    newStrArr.push(allStr[Math.floor(Math.random() * 61)]);
+  }
+  return newStrArr.join('');
+}
+
+/**
+ * 通过读取 cookies 获取用户 ID
+ */
+export function getUserIDByCookies(): number {
+  const uid: string | undefined = document.cookie.split('; ').find((co) => co.startsWith('uid='));
+  if (!uid) {
+    return -1;
+  }
+  return Number(uid.replace('uid=', ''));
+}
+
+
+/**
+ * 将服务端的合约状态转换成前端需要的状态
+ */
+interface TransformServerAPIContractStateParams {
+  status: 0 | 1 | 2; // 合同综合状态: 0:正常 1:已终止(不接受任何事件,也不给授权,事实上无效的合约) 2:异常
+  authStatus: 1 | 2 | 128 | number; // 合同授权状态 1:正式授权 2:测试授权 128:未获得授权
+}
+
+export function transformServerAPIContractState({
+                                                  status,
+                                                  authStatus,
+                                                }: TransformServerAPIContractStateParams): 'active' | 'testActive' | 'inactive' | 'terminal' | 'exception' {
+  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 休眠时常(毫秒)
+ */
+export function promiseSleep(ms: number = 300): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, ms);
+  });
+}
+