@freelog/tools-lib 0.1.111 → 0.1.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/tools-lib",
-  "version": "0.1.111",
+  "version": "0.1.114",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -56,7 +56,6 @@
   },
   "dependencies": {
     "@freelog/resource-policy-lang": "1.1.26",
-    "@freelog/tools-lib": "^0.1.43",
     "axios": "^0.21.1",
     "crypto-js": "^4.0.0",
     "i18next": "^21.8.10",

package/src/i18n/I18nNext.ts

@@ -104,6 +104,8 @@ class I18nNext {
 
         interpolation: {
           escapeValue: false, // react already safes from xss => https://www.i18next.com/translation-function/interpolation#unescape
+          prefix: '{',
+          suffix: '}',
         },
       });
   }

package/src/service-API/index.ts

@@ -1,37 +1,37 @@
-import * as Node from './nodes';
-import * as Exhibit from './presentables';
-import * as Storage from './storages';
-import * as Collection from './collections';
-import * as Resource from './resources';
-import * as User from './user';
-import * as InformalNode from './informalNodes';
-import * as Contract from './contracts';
-import * as Transaction from './transactions';
-import * as Captcha from './captcha';
-import * as Event from './events';
-import * as Activity from './activities';
-import * as TestQualification from './testQualifications';
-import * as Statistic from './statistics';
-import * as I18n from './i18n';
-import * as recombination from './recombinations';
-
-const FServiceAPI = {
-  Node,
-  Exhibit,
-  Storage,
-  Collection,
-  Resource,
-  User,
-  InformalNode,
-  Contract,
-  Transaction,
-  Captcha,
-  Event,
-  Activity,
-  TestQualification,
-  Statistic,
-  I18n,
-  recombination,
-};
-
-export default FServiceAPI;
+import * as Node from './nodes';
+import * as Exhibit from './presentables';
+import * as Storage from './storages';
+import * as Collection from './collections';
+import * as Resource from './resources';
+import * as User from './user';
+import * as InformalNode from './informalNodes';
+import * as Contract from './contracts';
+import * as Transaction from './transactions';
+import * as Captcha from './captcha';
+import * as Event from './events';
+import * as Activity from './activities';
+import * as TestQualification from './testQualifications';
+import * as Statistic from './statistics';
+import * as I18n from './i18n';
+import * as recombination from './recombinations';
+
+const FServiceAPI = {
+  Node,
+  Exhibit,
+  Storage,
+  Collection,
+  Resource,
+  User,
+  InformalNode,
+  Contract,
+  Transaction,
+  Captcha,
+  Event,
+  Activity,
+  TestQualification,
+  Statistic,
+  I18n,
+  recombination,
+};
+
+export default FServiceAPI;

package/src/service-API/presentables.ts

@@ -13,6 +13,11 @@ export interface CreatePresentableParamsType {
   }[];
   presentableName: string;
   tags?: string[];
+  policies?: {
+    policyName: string;
+    policyText: string;
+    status?: 0 | 1;
+  }[];
 }
 
 export function createPresentable(params: CreatePresentableParamsType) {

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

@@ -1,65 +1,69 @@
-import * as FUtil 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<FileInfo[]> {
-  if (sha1.length === 0) {
-    return [];
-  }
-
-  let needHandleSha1: string[] = [...sha1];
-
-  let allData: FileInfo[] = [];
-
-  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;
-}
+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<FileInfo[]> {
+  if (sha1.length === 0) {
+    return [];
+  }
+
+  let delay: number = 500;
+
+  let needHandleSha1: string[] = [...sha1];
+
+  let allData: FileInfo[] = [];
+
+  while (true) {
+    // console.log(needHandleSha1.join(','), 'needHandleSha1.join()90ojlskdfjsdlk')
+    const {data} = await Storage.filesListInfo({
+      sha1: needHandleSha1.join(','),
+    });
+    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 Tool.promiseSleep(delay);
+    // delay += 500;
+  }
+  return allData;
+}

package/src/service-API/resources.ts

@@ -87,6 +87,7 @@ interface ListParamsType {
   isLoadLatestVersionInfo?: 0 | 1;
   projection?: string;
   sort?: string;
+  userId?: number;
 }
 
 interface ListReturnType extends CommonReturn {
@@ -504,7 +505,7 @@ interface ResourcesRecommendParamsType {
 export function resourcesRecommend({...params}: ResourcesRecommendParamsType) {
   return FUtil.Request({
     method: 'GET',
-    url: `/v2/resources/recommend?recommendType=2`,
+    url: `/v2/resources/recommend`,
     params: params,
   });
 }