verteilen-core 1.3.37 → 1.3.40

package/dist/client/javascript.js

@@ -385,6 +385,7 @@ class ClientJavascript {
                 parse: JSON.parse,
                 stringify: JSON.stringify
             },
+            Promise: Promise,
             math: {
                 floor: Math.floor,
                 abs: Math.abs,

package/dist/interface/enum.d.ts

@@ -2,9 +2,11 @@ export declare enum TaskLogicType {
     GROUP = 0,
     CONDITION = 1,
     EXECUTION = 2,
-    Single = 3,
-    ADD = 4,
-    OR = 5
+    FAILED = 3,
+    SINGLE = 4,
+    ADD = 5,
+    OR = 6,
+    NOT = 7
 }
 export declare enum SocketState {
     CONNECTING = 0,

package/dist/interface/enum.js

@@ -6,9 +6,11 @@ var TaskLogicType;
     TaskLogicType[TaskLogicType["GROUP"] = 0] = "GROUP";
     TaskLogicType[TaskLogicType["CONDITION"] = 1] = "CONDITION";
     TaskLogicType[TaskLogicType["EXECUTION"] = 2] = "EXECUTION";
-    TaskLogicType[TaskLogicType["Single"] = 3] = "Single";
-    TaskLogicType[TaskLogicType["ADD"] = 4] = "ADD";
-    TaskLogicType[TaskLogicType["OR"] = 5] = "OR";
+    TaskLogicType[TaskLogicType["FAILED"] = 3] = "FAILED";
+    TaskLogicType[TaskLogicType["SINGLE"] = 4] = "SINGLE";
+    TaskLogicType[TaskLogicType["ADD"] = 5] = "ADD";
+    TaskLogicType[TaskLogicType["OR"] = 6] = "OR";
+    TaskLogicType[TaskLogicType["NOT"] = 7] = "NOT";
 })(TaskLogicType || (exports.TaskLogicType = TaskLogicType = {}));
 var SocketState;
 (function (SocketState) {

package/dist/interface/struct.d.ts

@@ -115,7 +115,6 @@ export interface TaskLogicUnit {
     job_uuid?: string;
     job?: Job;
     children: Array<TaskLogicUnit>;
-    children2?: Array<TaskLogicUnit>;
 }
 export interface TaskLogic {
     group: Array<TaskLogicUnit>;

package/dist/lan/en.json

@@ -141,7 +141,8 @@
         "delete-task-confirm": "Are you sure you want to delete these tasks?",
         "create-service": "Create Service",
         "delete-service": "Delete Service",
-        "delete-service-confirm": "Are you sure you want to delete these services?"
+        "delete-service-confirm": "Are you sure you want to delete these services?",
+        "new-condition": "Create Condition"
     },
     "toolbar": {
         "server": "Server",
@@ -349,6 +350,16 @@
             "messager_log": "messager_log(message:string)"
         }
     },
+    "condition": {
+        "group": "Group",
+        "condition": "Condition",
+        "execution": "Execution (Success)",
+        "failed": "Execution (Failed)",
+        "single": "Job Content",
+        "or": "Or",
+        "and": "And",
+        "not": "Not"
+    },
     "token": "Token",
     "info": "Information",
     "search": "Search",

package/dist/lan/zh_TW.json

@@ -141,7 +141,8 @@
         "delete-task-confirm": "確定刪除選取的工作嗎?",
         "create-service": "建立服務",
         "delete-service": "刪除服務",
-        "delete-service-confirm": "確定刪除選取的服務嗎?"
+        "delete-service-confirm": "確定刪除選取的服務嗎?",
+        "new-condition": "建立條件"
     },
     "toolbar": {
         "server": "伺服器",
@@ -349,6 +350,16 @@
             "messager_log": "messager_log(message:string)"
         }
     },
+    "condition": {
+        "group": "群組",
+        "condition": "條件",
+        "execution": "執行 (成功)",
+        "failed": "執行 (失敗)",
+        "single": "工作內容",
+        "or": "Or",
+        "and": "And",
+        "not": "Not"
+    },
     "token": "密鑰",
     "info": "資訊",
     "search": "搜尋",

package/dist/plugins/i18n.d.ts

@@ -150,6 +150,7 @@ export declare const i18nDefaultData: {
                 "create-service": string;
                 "delete-service": string;
                 "delete-service-confirm": string;
+                "new-condition": string;
             };
             toolbar: {
                 server: string;
@@ -357,6 +358,16 @@ export declare const i18nDefaultData: {
                     messager_log: string;
                 };
             };
+            condition: {
+                group: string;
+                condition: string;
+                execution: string;
+                failed: string;
+                single: string;
+                or: string;
+                and: string;
+                not: string;
+            };
             token: string;
             info: string;
             search: string;
@@ -581,6 +592,7 @@ export declare const i18nDefaultData: {
                 "create-service": string;
                 "delete-service": string;
                 "delete-service-confirm": string;
+                "new-condition": string;
             };
             toolbar: {
                 server: string;
@@ -788,6 +800,16 @@ export declare const i18nDefaultData: {
                     messager_log: string;
                 };
             };
+            condition: {
+                group: string;
+                condition: string;
+                execution: string;
+                failed: string;
+                single: string;
+                or: string;
+                and: string;
+                not: string;
+            };
             token: string;
             info: string;
             search: string;
@@ -1015,6 +1037,7 @@ export declare const i18n: import("vue-i18n").I18n<{
             "create-service": string;
             "delete-service": string;
             "delete-service-confirm": string;
+            "new-condition": string;
         };
         toolbar: {
             server: string;
@@ -1222,6 +1245,16 @@ export declare const i18n: import("vue-i18n").I18n<{
                 messager_log: string;
             };
         };
+        condition: {
+            group: string;
+            condition: string;
+            execution: string;
+            failed: string;
+            single: string;
+            or: string;
+            and: string;
+            not: string;
+        };
         token: string;
         info: string;
         search: string;
@@ -1446,6 +1479,7 @@ export declare const i18n: import("vue-i18n").I18n<{
             "create-service": string;
             "delete-service": string;
             "delete-service-confirm": string;
+            "new-condition": string;
         };
         toolbar: {
             server: string;
@@ -1653,6 +1687,16 @@ export declare const i18n: import("vue-i18n").I18n<{
                 messager_log: string;
             };
         };
+        condition: {
+            group: string;
+            condition: string;
+            execution: string;
+            failed: string;
+            single: string;
+            or: string;
+            and: string;
+            not: string;
+        };
         token: string;
         info: string;
         search: string;

package/dist/server/io.d.ts

@@ -44,6 +44,7 @@ export interface RecordIOBase {
 export interface RecordMongoBase {
 }
 export declare const _CreateRecordMemoryLoader: (loader: MemoryData, type: RecordType) => RecordIOLoader;
+export declare const ObsoleteSupport: (loader: RecordIOBase, type: RecordType, folder: string) => Promise<void>;
 export declare const _CreateRecordIOLoader: (loader: RecordIOBase, memory: MemoryData, type: RecordType, folder: string, ext?: string) => RecordIOLoader;
 export declare const CreateRecordMemoryLoader: (loader: MemoryData) => RecordLoader;
 export declare const CreateRecordIOLoader: (loader: RecordIOBase, memory: MemoryData) => RecordLoader;

package/dist/server/io.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreateRecordMongoLoader = exports.CreateRecordIOLoader = exports.CreateRecordMemoryLoader = exports._CreateRecordIOLoader = exports._CreateRecordMemoryLoader = void 0;
+exports.CreateRecordMongoLoader = exports.CreateRecordIOLoader = exports.CreateRecordMemoryLoader = exports._CreateRecordIOLoader = exports.ObsoleteSupport = exports._CreateRecordMemoryLoader = void 0;
 const interface_1 = require("../interface");
 const _CreateRecordMemoryLoader = (loader, type) => {
     const get_array = (type) => {
@@ -55,6 +55,60 @@ const _CreateRecordMemoryLoader = (loader, type) => {
     };
 };
 exports._CreateRecordMemoryLoader = _CreateRecordMemoryLoader;
+const ObsoleteSupport = async (loader, type, folder) => {
+    if (type == interface_1.RecordType.PROJECT) {
+        const path = loader.join(loader.root, "record");
+        if (!loader.exists(path))
+            return;
+        const p = await loader.read_dir_file(path);
+        const ps = p.filter(x => x.endsWith(".json")).map(x => {
+            const path_r = loader.join(path, x);
+            return loader.read_string(path_r);
+        });
+        const allRecordText = await Promise.all(ps);
+        const allRecord = allRecordText.map(x => JSON.parse(x));
+        const execute = allRecord.map(async (x) => {
+            x.tasks = [];
+            x.databaser_uuid = x.parameter_uuid;
+            x.tasks_uuid = x.task.map(y => y.uuid);
+            const tasks = x.task;
+            delete x.parameter_uuid;
+            delete x.task;
+            const execute_task = tasks.map(async (y) => {
+                const jobs = y.jobs;
+                y.jobs = [];
+                y.jobs_uuid = y.jobs.map(z => z.uuid);
+                const execute_jobs = jobs.map(async (z) => {
+                    z.id_args = [];
+                    const d3 = loader.join(loader.root, "job", `${z.uuid}.json`);
+                    return loader.write_string(d3, JSON.stringify(z, null, 4));
+                });
+                await Promise.all(execute_jobs);
+                const d2 = loader.join(loader.root, "task", `${y.uuid}.json`);
+                return loader.write_string(d2, JSON.stringify(y, null, 4));
+            });
+            await Promise.all(execute_task);
+            const d1 = loader.join(loader.root, "project", `${x.uuid}.json`);
+            return loader.write_string(d1, JSON.stringify(x, null, 4));
+        });
+        await Promise.all(execute);
+        await loader.rm(path);
+    }
+    else if (type == interface_1.RecordType.DATABASE) {
+        const path = loader.join(loader.root, "parameter");
+        if (!loader.exists(path))
+            return;
+        const p = await loader.read_dir_file(path);
+        const ps = p.filter(x => x.endsWith(".json")).map(x => {
+            const path2 = loader.join(path, x);
+            const path3 = loader.join(loader.root, folder, x);
+            return loader.cp(path2, path3);
+        });
+        await Promise.all(ps);
+        loader.rm(path);
+    }
+};
+exports.ObsoleteSupport = ObsoleteSupport;
 const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
     const get_array = (type) => {
         switch (type) {
@@ -74,6 +128,7 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
             const root = loader.join(loader.root, folder);
             if (!loader.exists(root))
                 await loader.mkdir(root);
+            await (0, exports.ObsoleteSupport)(loader, type, folder);
             const files = await loader.read_dir_file(root);
             const r = files.map(x => loader.read_string(loader.join(root, x), { encoding: 'utf8', flag: 'r' }));
             const p = await Promise.all(r);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verteilen-core",
-  "version": "1.3.37",
+  "version": "1.3.40",
   "license": "MIT",
   "homepage": "https://verteilen.github.io/wiki/",
   "author": "Elly",

package/src/client/javascript.ts

@@ -389,6 +389,7 @@ export class ClientJavascript {
                 parse: JSON.parse,
                 stringify: JSON.stringify
             },
+            Promise: Promise,
             math: {
                 floor: Math.floor,
                 abs: Math.abs,

package/src/interface/enum.ts

@@ -13,7 +13,7 @@
  * It effect the decoder behaviour
  */
 export enum TaskLogicType {
-    GROUP, CONDITION, EXECUTION, Single, ADD, OR
+    GROUP, CONDITION, EXECUTION, FAILED, SINGLE, ADD, OR, NOT
 }
 
 /**

package/src/interface/struct.ts

@@ -264,14 +264,6 @@ export interface TaskLogicUnit {
      * **Common Logic Group**
      */
     children: Array<TaskLogicUnit>
-    /**
-     * **False Logic Group**
-     * - Group
-     *   - Condition
-     *   - Execution (True)
-     *   - Execution (False) <- This part
-     */
-    children2?: Array<TaskLogicUnit>
 }
 
 /**

package/src/lan/en.json

@@ -141,7 +141,8 @@
         "delete-task-confirm": "Are you sure you want to delete these tasks?",
         "create-service": "Create Service",
         "delete-service": "Delete Service",
-        "delete-service-confirm": "Are you sure you want to delete these services?"
+        "delete-service-confirm": "Are you sure you want to delete these services?",
+        "new-condition": "Create Condition"
     },
     "toolbar": {
         "server": "Server",
@@ -349,6 +350,16 @@
             "messager_log": "messager_log(message:string)"
         }
     },
+    "condition": {
+        "group": "Group",
+        "condition": "Condition",
+        "execution": "Execution (Success)",
+        "failed": "Execution (Failed)",
+        "single": "Job Content",
+        "or": "Or",
+        "and": "And",
+        "not": "Not"
+    },
     "token": "Token",
     "info": "Information",
     "search": "Search",

package/src/lan/zh_TW.json

@@ -141,7 +141,8 @@
         "delete-task-confirm": "確定刪除選取的工作嗎?",
         "create-service": "建立服務",
         "delete-service": "刪除服務",
-        "delete-service-confirm": "確定刪除選取的服務嗎?"
+        "delete-service-confirm": "確定刪除選取的服務嗎?",
+        "new-condition": "建立條件"
     },
     "toolbar": {
         "server": "伺服器",
@@ -349,6 +350,16 @@
             "messager_log": "messager_log(message:string)"
         }
     },
+    "condition": {
+        "group": "群組",
+        "condition": "條件",
+        "execution": "執行 (成功)",
+        "failed": "執行 (失敗)",
+        "single": "工作內容",
+        "or": "Or",
+        "and": "And",
+        "not": "Not"
+    },
     "token": "密鑰",
     "info": "資訊",
     "search": "搜尋",

package/src/server/io.ts

@@ -136,6 +136,59 @@ export const _CreateRecordMemoryLoader = (loader:MemoryData, type:RecordType):Re
         }
     }
 }
+export const ObsoleteSupport = async (loader:RecordIOBase, type:RecordType, folder:string) => {
+    if(type == RecordType.PROJECT){
+        const path = loader.join(loader.root, "record")
+        if(!loader.exists(path)) return
+        const p = await loader.read_dir_file(path)
+        const ps = p.filter(x => x.endsWith(".json")).map(x => {
+            const path_r = loader.join(path, x)
+            return loader.read_string(path_r)
+        })
+        const allRecordText:Array<string> = await Promise.all(ps)
+        const allRecord:Array<any> = allRecordText.map(x => JSON.parse(x))
+        const execute = allRecord.map(async x => {
+            x.tasks = []
+            x.databaser_uuid = x.parameter_uuid
+            x.tasks_uuid = x.task.map(y => y.uuid)
+            const tasks:Array<any> = x.task
+            delete x.parameter_uuid
+            delete x.task
+
+            const execute_task = tasks.map(async y => {
+                const jobs = y.jobs
+                y.jobs = []
+                y.jobs_uuid = y.jobs.map(z => z.uuid)
+
+                const execute_jobs = jobs.map(async z => {
+                    z.id_args = []
+                    const d3 = loader.join(loader.root, "job", `${z.uuid}.json`)
+                    return loader.write_string(d3, JSON.stringify(z, null, 4))
+                })
+                await Promise.all(execute_jobs)
+                const d2 = loader.join(loader.root, "task", `${y.uuid}.json`)
+                return loader.write_string(d2, JSON.stringify(y, null, 4))
+            })
+            await Promise.all(execute_task)
+            const d1 = loader.join(loader.root, "project", `${x.uuid}.json`)
+            return loader.write_string(d1, JSON.stringify(x, null, 4))
+        })
+        await Promise.all(execute)
+        await loader.rm(path)
+    }
+    else if(type == RecordType.DATABASE){
+        const path = loader.join(loader.root, "parameter")
+        if(!loader.exists(path)) return
+        const p = await loader.read_dir_file(path)
+        const ps = p.filter(x => x.endsWith(".json")).map(x => {
+            const path2 = loader.join(path, x)
+            const path3 = loader.join(loader.root, folder, x)
+            return loader.cp(path2, path3)
+        })
+        await Promise.all(ps)
+        loader.rm(path)
+    }
+}
 /**
  * **Create the interface for record files storage**\
  * Generate a loader interface for register to server event
@@ -162,6 +215,7 @@ export const _CreateRecordIOLoader = (loader:RecordIOBase, memory:MemoryData, ty
         load_all: async ():Promise<Array<string>> => {
             const root = loader.join(loader.root, folder)
             if(!loader.exists(root)) await loader.mkdir(root)
+            await ObsoleteSupport(loader, type, folder)
             const files = await loader.read_dir_file(root)
             const r:Array<Promise<string>> = files.map(x => 
                 loader.read_string(loader.join(root, x), { encoding: 'utf8', flag: 'r' })