@freelog/tools-lib 0.1.150 → 0.1.151

package/package.json

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

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

@@ -1,92 +1,97 @@
-import * as Tool from '../../utils/tools';
-import * as Storage from '../storages';
-
-interface FileInfo {
-  sha1: string;
-  state: 'success' | 'fail' | 'nonentity';
-  info: {
-    [key: string]: any;
-  }
-}
-
-interface GetFileInfosBySha1Params {
-  sha1: string[];
-}
-
-export async function getFilesSha1Info({sha1}: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<{
-  error: string;
-  result: FileInfo[],
-}> {
-  if (sha1.length === 0) {
-    return {
-      error: '',
-      result: [],
-    };
-  }
-
-  let delay: number = 500;
-
-  let needHandleSha1: string[] = [...sha1];
-
-  let allData: FileInfo[] = [];
-
-  while (true) {
-    // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
-    const {ret, errCode, data, msg}: any = await Storage.filesListInfo({
-      sha1: needHandleSha1.join(','),
-    });
-
-    if (ret !== 0 || errCode !== 0) {
-      console.log({
-        ret, errCode, data, msg
-      }, '09iowksdjaklfjs;oalijflskdjflsdkjflkj');
-      return {
-        error: msg,
-        result: allData,
-      };
-    }
-
-    needHandleSha1 = data
-      .filter((d: any) => {
-        return d.metaAnalyzeStatus === 0 || d.metaAnalyzeStatus === 1;
-      })
-      .map((d: any) => {
-        return d.sha1;
-      });
-    const finishedInfo: FileInfo[] = data
-      .filter((d: any) => {
-        return d.metaAnalyzeStatus !== 0 && d.metaAnalyzeStatus !== 1;
-      })
-      .map((d: any) => {
-        let state: 'success' | 'fail' | 'nonentity' = 'fail';
-        if (!d.metaAnalyzeStatus) {
-          state = 'nonentity';
-        } else if (d.metaAnalyzeStatus === 2) {
-          state = 'success';
-        } else if (d.metaAnalyzeStatus === 3) {
-          state = 'fail';
-        }
-        console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
-        return {
-          sha1: d.sha1,
-          state,
-          info: d,
-        };
-      });
-    cdPartially && cdPartially(finishedInfo);
-    allData = [
-      ...allData,
-      ...finishedInfo,
-    ];
-
-    if (needHandleSha1.length === 0) {
-      break;
-    }
-    await Tool.promiseSleep(delay);
-    // delay += 500;
-  }
-  return {
-    error: '',
-    result: allData,
-  };
-}
+import * as Tool from '../../utils/tools';
+import * as Storage from '../storages';
+
+interface FileInfo {
+  sha1: string;
+  state: 'success' | 'fail' | 'nonentity';
+  info: {
+    [key: string]: any;
+  }
+}
+
+interface GetFileInfosBySha1Params {
+  sha1: string[];
+  resourceTypeCode: string;
+}
+
+export async function getFilesSha1Info({
+                                         sha1,
+                                         resourceTypeCode
+                                       }: GetFileInfosBySha1Params, cdPartially: (s: any[]) => void = () => undefined): Promise<{
+  error: string;
+  result: FileInfo[],
+}> {
+  if (sha1.length === 0) {
+    return {
+      error: '',
+      result: [],
+    };
+  }
+
+  let delay: number = 500;
+
+  let needHandleSha1: string[] = [...sha1];
+
+  let allData: FileInfo[] = [];
+
+  while (true) {
+    // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
+    const {ret, errCode, data, msg}: any = await Storage.filesListInfo({
+      sha1: needHandleSha1.join(','),
+      resourceTypeCode: resourceTypeCode,
+    });
+
+    if (ret !== 0 || errCode !== 0) {
+      console.log({
+        ret, errCode, data, msg
+      }, '09iowksdjaklfjs;oalijflskdjflsdkjflkj');
+      return {
+        error: msg,
+        result: allData,
+      };
+    }
+
+    needHandleSha1 = data
+      .filter((d: any) => {
+        return d.metaAnalyzeStatus === 0 || d.metaAnalyzeStatus === 1;
+      })
+      .map((d: any) => {
+        return d.sha1;
+      });
+    const finishedInfo: FileInfo[] = data
+      .filter((d: any) => {
+        return d.metaAnalyzeStatus !== 0 && d.metaAnalyzeStatus !== 1;
+      })
+      .map((d: any) => {
+        let state: 'success' | 'fail' | 'nonentity' = 'fail';
+        if (!d.metaAnalyzeStatus) {
+          state = 'nonentity';
+        } else if (d.metaAnalyzeStatus === 2) {
+          state = 'success';
+        } else if (d.metaAnalyzeStatus === 3) {
+          state = 'fail';
+        }
+        // console.log(d, '90wieojiksdjf;lkasdjf;lksdjflksjdflkjsdlfkjsdlkj');
+        return {
+          sha1: d.sha1,
+          state,
+          info: d,
+        };
+      });
+    cdPartially && cdPartially(finishedInfo);
+    allData = [
+      ...allData,
+      ...finishedInfo,
+    ];
+
+    if (needHandleSha1.length === 0) {
+      break;
+    }
+    await Tool.promiseSleep(delay);
+    // delay += 500;
+  }
+  return {
+    error: '',
+    result: allData,
+  };
+}

package/src/service-API/resources.ts

@@ -604,3 +604,15 @@ export function getResourceAttrListSimple({...params}: GetResourceAttrListSimple
     params: params,
   });
 }
+
+interface ListSimple4RecentlySimple {
+
+}
+
+export function listSimple4Recently({...params}: ListSimple4RecentlySimple = {}) {
+  return FUtil.Request({
+    method: 'GET',
+    url: `/v2/resources/types/listSimple4Recently`,
+    params: params,
+  });
+}

package/src/service-API/storages.ts

@@ -349,6 +349,7 @@ export function clearUserNodeData({...params}: ClearUserNodeDataParamsType) {
 // 批量查询文件信息通过sha1
 interface FilesListInfoParamsType {
   sha1: string;
+  resourceTypeCode: string;
 }
 
 export function filesListInfo({...params}: FilesListInfoParamsType) {

package/src/utils/regexp.ts

@@ -1,52 +1,53 @@
-// 展品名称
-export const EXHIBIT_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
-
-// 资源名称
-export const RESOURCE_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
-
-// 资源类型
-// export const RESOURCE_TYPE: RegExp = new RegExp(/^(?!_)[a-z0-9_]{3,20}(?<!_)$/);
-export const RESOURCE_TYPE: RegExp = new RegExp(/^[a-z0-9][a-z0-9_]{1,18}[a-z0-9]$/);
-
-// 自定义属性键
-export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z0-9_]{1,20}$/);
-
-// 节点名称
-export const NODE_NAME: RegExp = new RegExp(/^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/);
-
-// 节点地址
-// export const NODE_DOMAIN: RegExp = new RegExp(/^(?!-)[a-z0-9-]{4,24}(?<!-)$/);
-export const NODE_DOMAIN: RegExp = new RegExp(/^[a-z0-9][a-z0-9-]{2,22}[a-z0-9]$/);
-
-// 支付密码
-export const PAY_PASSWORD: RegExp = new RegExp(/^\d{6}$/);
-
-// 手机号码
-export const MOBILE_PHONE_NUMBER = new RegExp(/^1[345789]\d{9}$/);
-// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
-
-// 邮箱地址
-export const EMAIL_ADDRESS: RegExp = new RegExp(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/);
-
-// 用户名
-// export const USERNAME: RegExp = new RegExp(/^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/);
-export const USERNAME: RegExp = new RegExp(/^([A-Za-z0-9][A-Za-z0-9-]{0,28})?[A-Za-z0-9]$/);
-
-// 用户密码
-// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
-export const PASSWORD: RegExp = new RegExp(/^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/);
-
-// 自然数
-export const NATURAL_NUMBER: RegExp = new RegExp(/^[0-9]*$/);
-
-// 正整数
-export const POSITIVE_INTEGER = new RegExp(/^[1-9]\d*$/);
-
-// 最多两位小数的正数
-export const MAX_2_DECIMAL_POSITIVE_NUMBER = new RegExp(/^\d+(.\d{1,2})?$/);
-
-// 对象的Bucket名称
-export const BUCKET_NAME: RegExp = new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/);
-
-// JS变量名称
-export const JS_VARIABLE_NAME: RegExp = new RegExp(/^[A-Za-z$_][\w$_]*$/);
+// 展品名称
+export const EXHIBIT_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
+
+// 资源名称
+export const RESOURCE_NAME: RegExp = new RegExp(/^(?!.*(\\|\/|:|\*|\?|"|<|>|\||\s|@|\$|#)).{1,60}$/);
+
+// 资源类型
+// export const RESOURCE_TYPE: RegExp = new RegExp(/^(?!_)[a-z0-9_]{3,20}(?<!_)$/);
+export const RESOURCE_TYPE: RegExp = new RegExp(/^[a-z0-9][a-z0-9_]{1,18}[a-z0-9]$/);
+
+// 自定义属性键
+// export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z0-9_]{1,20}$/);
+export const CUSTOM_KEY: RegExp = new RegExp(/^[a-zA-Z_][a-zA-Z0-9_]{1,19}$/);
+
+// 节点名称
+export const NODE_NAME: RegExp = new RegExp(/^[\u4E00-\u9FA5|a-zA-Z0-9]{2,24}$/);
+
+// 节点地址
+// export const NODE_DOMAIN: RegExp = new RegExp(/^(?!-)[a-z0-9-]{4,24}(?<!-)$/);
+export const NODE_DOMAIN: RegExp = new RegExp(/^[a-z0-9][a-z0-9-]{2,22}[a-z0-9]$/);
+
+// 支付密码
+export const PAY_PASSWORD: RegExp = new RegExp(/^\d{6}$/);
+
+// 手机号码
+export const MOBILE_PHONE_NUMBER = new RegExp(/^1[345789]\d{9}$/);
+// export const TELEPHONE_NUMBER = /^((13[0-9])|(14[5-9])|(15([0-3]|[5-9]))|(16[6-7])|(17[1-8])|(18[0-9])|(19[1|3])|(19[5|6])|(19[8|9]))\d{8}$/
+
+// 邮箱地址
+export const EMAIL_ADDRESS: RegExp = new RegExp(/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/);
+
+// 用户名
+// export const USERNAME: RegExp = new RegExp(/^(?!-)[A-Za-z0-9-]{1,30}(?<!-)$/);
+export const USERNAME: RegExp = new RegExp(/^([A-Za-z0-9][A-Za-z0-9-]{0,28})?[A-Za-z0-9]$/);
+
+// 用户密码
+// export const PASSWORD = /^(?=.*[a-zA-Z])(?=.*[0-9]).{6,24}$/;
+export const PASSWORD: RegExp = new RegExp(/^(?=.*[0-9])(?=.*[a-zA-Z])(.{6,24})$/);
+
+// 自然数
+export const NATURAL_NUMBER: RegExp = new RegExp(/^[0-9]*$/);
+
+// 正整数
+export const POSITIVE_INTEGER = new RegExp(/^[1-9]\d*$/);
+
+// 最多两位小数的正数
+export const MAX_2_DECIMAL_POSITIVE_NUMBER = new RegExp(/^\d+(.\d{1,2})?$/);
+
+// 对象的Bucket名称
+export const BUCKET_NAME: RegExp = new RegExp(/^([a-z0-9][a-z0-9-]{0,61})?[a-z0-9]$/);
+
+// JS变量名称
+export const JS_VARIABLE_NAME: RegExp = new RegExp(/^[A-Za-z$_][\w$_]*$/);