verteilen-core 1.2.21 → 1.3.0

package/dist/script/execute_manager.js

@@ -2,21 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecuteManager = void 0;
 const interface_1 = require("../interface");
+const region_project_1 = require("./execute/region_project");
+const region_task_1 = require("./execute/region_task");
 const runner_1 = require("./execute/runner");
 class ExecuteManager extends runner_1.ExecuteManager_Runner {
     Update = () => {
         if (this.state != interface_1.ExecuteState.RUNNING)
             return;
-        else if (this.current_p == undefined && this.current_projects.length > 0) {
-            this.current_p = this.current_projects[0];
-            this.messager_log(`[Execute] Project Start ${this.current_p.uuid}`);
-            this.proxy?.executeProjectStart([this.current_p, 0]);
-            this.SyncDatabase(this.current_p);
+        else if (this.runner == undefined && this.current_projects.length > 0) {
+            this.runner = new region_project_1.Region_Project(this, this.current_projects[0]);
+            this.messager_log(`[Execute] Project Start ${this.runner.project.uuid}`);
+            this.proxy?.executeProjectStart([this.runner.project, 0]);
+            this.SyncDatabase(this.runner.project);
         }
-        else if (this.current_p != undefined) {
+        else if (this.runner != undefined) {
             if (this.first)
                 this.first = false;
-            this.ExecuteProject(this.current_p);
+            this.runner.RUN();
         }
     };
     Stop = () => {
@@ -48,7 +50,7 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
             this.messager_log(`[Execute] Node count should be bigger than one`);
             return -1;
         }
-        if (this.current_projects.map(x => x.task.length).reduce((acc, cur) => acc + cur, 0) == 0) {
+        if (this.current_projects.map(x => x.tasks.length).reduce((acc, cur) => acc + cur, 0) == 0) {
             this.messager_log(`[Execute] No task can be executing`);
             return -1;
         }
@@ -64,7 +66,7 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         this.messager_log(`[Execute] Init successfully, Enter process right now, length: ${this.current_projects.length}`);
         let i = 0;
         for (const x of this.current_projects) {
-            if (x.task.length > 0) {
+            if (x.tasks.length > 0) {
                 break;
             }
             else {
@@ -75,12 +77,8 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
     };
     Clean = () => {
         this.current_projects = [];
-        this.current_p = undefined;
-        this.current_t = undefined;
-        this.current_cron = [];
-        this.current_job = [];
+        this.runner = undefined;
         this.current_nodes = [];
-        this.current_multithread = 1;
         this.state = interface_1.ExecuteState.NONE;
     };
     Release = () => {
@@ -122,7 +120,8 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         if (this.current_t == undefined)
             return;
         if (this.current_job.length > 0) {
-            this.current_job = [];
+            if (this.runner?.runner)
+                this.runner.runner.job = [];
             this.proxy?.executeSubtaskUpdate([this.current_t, 0, '', interface_1.ExecuteState.NONE]);
         }
         else if (this.current_cron.length > 0) {
@@ -190,7 +189,7 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         }
     };
     skipProjectFirst = () => {
-        this.current_p = this.current_projects[1];
+        this.runner = new region_project_1.Region_Project(this, this.current_projects[1]);
         this.proxy?.executeProjectStart([this.current_p, 1]);
         this.SyncDatabase(this.current_p);
         this.state = interface_1.ExecuteState.RUNNING;
@@ -203,14 +202,12 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         const atend = forward ? index == this.current_projects.length - 1 : index == 0;
         if (atend) {
             if (forward) {
-                this.current_p = undefined;
-                this.current_t = undefined;
+                this.runner = undefined;
                 this.state = interface_1.ExecuteState.FINISH;
                 this.messager_log(`[Execute] Skip project to Finish !`);
             }
             else {
-                this.current_p = this.current_projects[0];
-                this.current_t = undefined;
+                this.runner = new region_project_1.Region_Project(this, this.current_projects[0]);
                 this.state = interface_1.ExecuteState.RUNNING;
                 this.messager_log(`[Execute] Previous project to Begining !`);
             }
@@ -218,8 +215,7 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         }
         else {
             const next = forward ? this.current_projects[index + 1] : this.current_projects[index - 1];
-            this.current_p = next;
-            this.current_t = undefined;
+            this.runner = new region_project_1.Region_Project(this, next);
             this.state = interface_1.ExecuteState.RUNNING;
             if (forward) {
                 this.messager_log(`[Execute] Skip project ${index}. ${this.current_p.uuid}`);
@@ -233,11 +229,11 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
         }
     };
     skipTaskFirst = () => {
-        if (this.current_p.task.length > 0) {
-            this.current_t = this.current_p.task[0];
+        if (this.current_p.tasks.length > 0 && this.runner != undefined) {
+            this.runner.runner = new region_task_1.Region_Task(this, this.current_p.tasks[0]);
             const taskCount = this.get_task_state_count(this.current_t);
-            if (this.current_t.cronjob) {
-                this.Init_CronContainer(this.current_t, taskCount);
+            if (this.current_t?.cronjob) {
+                this.runner.runner?.Init_CronContainer(taskCount);
             }
             this.t_state = interface_1.ExecuteState.NONE;
             this.proxy?.executeTaskStart([this.current_t, taskCount]);
@@ -250,47 +246,53 @@ class ExecuteManager extends runner_1.ExecuteManager_Runner {
     };
     previousTaskFirst = () => {
         const index = this.current_projects.findIndex(x => x.uuid == this.current_p.uuid);
-        if (index == 0) {
-            this.current_t = undefined;
+        if (index == 0 && this.runner != undefined) {
+            this.runner.runner = undefined;
         }
         else {
-            this.current_p = this.current_projects[index - 1];
-            this.messager_log(`[Execute] Previous task ${index}. Jump Project: ${this.current_p.uuid}`);
+            this.runner = new region_project_1.Region_Project(this, this.current_projects[index - 1]);
+            this.messager_log(`[Execute] Previous task ${index}. Jump Project: ${this.current_p?.uuid}`);
         }
-        this.current_job = [];
+        if (this.runner?.runner)
+            this.runner.runner.job = [];
         this.t_state = interface_1.ExecuteState.NONE;
         return index;
     };
     skipTask = () => {
-        const index = this.current_p.task.findIndex(x => x.uuid == this.current_t.uuid);
-        if (index == this.current_p.task.length - 1) {
-            this.proxy?.executeTaskFinish(this.current_t);
-            this.current_t = undefined;
-            this.messager_log(`[Execute] Skip task to Finish !`);
-        }
-        else {
-            this.proxy?.executeTaskFinish(this.current_t);
-            this.current_t = this.current_p.task[index + 1];
-            this.messager_log(`[Execute] Skip task ${index}. ${this.current_t.uuid}`);
-            const taskCount = this.get_task_state_count(this.current_t);
-            if (this.current_t.cronjob) {
-                this.Init_CronContainer(this.current_t, taskCount);
+        const index = this.current_p.tasks.findIndex(x => x.uuid == this.current_t.uuid);
+        if (this.runner) {
+            if (index == this.current_p.tasks.length - 1) {
+                this.proxy?.executeTaskFinish(this.current_t);
+                this.runner.runner = undefined;
+                this.messager_log(`[Execute] Skip task to Finish !`);
+            }
+            else {
+                this.proxy?.executeTaskFinish(this.current_t);
+                this.runner.runner = new region_task_1.Region_Task(this, this.current_p.tasks[index + 1]);
+                this.messager_log(`[Execute] Skip task ${index}. ${this.current_t.uuid}`);
+                const taskCount = this.get_task_state_count(this.current_t);
+                if (this.current_t.cronjob) {
+                    this.runner.runner.Init_CronContainer(taskCount);
+                }
+                this.proxy?.executeTaskStart([this.current_t, taskCount]);
             }
-            this.proxy?.executeTaskStart([this.current_t, taskCount]);
         }
-        this.current_job = [];
+        if (this.runner?.runner)
+            this.runner.runner.job = [];
         this.t_state = interface_1.ExecuteState.NONE;
         return index;
     };
     previousTask = () => {
-        const index = this.current_p.task.findIndex(x => x.uuid == this.current_t.uuid);
-        this.current_t = this.current_p.task[index - 1];
-        const taskCount = this.get_task_state_count(this.current_t);
-        if (this.current_t.cronjob) {
-            this.Init_CronContainer(this.current_t, taskCount);
+        const index = this.current_p.tasks.findIndex(x => x.uuid == this.current_t.uuid);
+        if (this.runner?.runner) {
+            this.runner.runner = new region_task_1.Region_Task(this, this.current_p.tasks[index - 1]);
+            const taskCount = this.get_task_state_count(this.current_t);
+            if (this.current_t.cronjob) {
+                this.runner.runner.Init_CronContainer(taskCount);
+            }
+            this.t_state = interface_1.ExecuteState.NONE;
+            this.proxy?.executeTaskStart([this.current_t, taskCount]);
         }
-        this.t_state = interface_1.ExecuteState.NONE;
-        this.proxy?.executeTaskStart([this.current_t, taskCount]);
         return 0;
     };
 }

package/dist/server/detail.js

@@ -64,7 +64,7 @@ class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         };
         if (this.feedback.electron) {
-            this.feedback.electron('makeToast', p);
+            this.feedback.electron()?.send('makeToast', p);
         }
         if (this.feedback.socket && this.backend.Boradcasting) {
             this.backend.Boradcasting('makeToast', p);
@@ -80,7 +80,7 @@ class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         };
         if (this.feedback.electron) {
-            this.feedback.electron('makeToast', p);
+            this.feedback.electron()?.send('makeToast', p);
         }
         if (this.feedback.socket && this.backend.Boradcasting) {
             this.backend.Boradcasting('makeToast', p);
@@ -94,7 +94,7 @@ class ServerDetail {
     };
     shellReply = (data, p) => {
         if (this.feedback.electron) {
-            this.feedback.electron("shellReply", data);
+            this.feedback.electron()?.send("shellReply", data);
         }
         if (this.feedback.socket) {
             if (p == undefined)
@@ -110,7 +110,7 @@ class ServerDetail {
     };
     folderReply = (data, p) => {
         if (this.feedback.electron) {
-            this.feedback.electron("folderReply", data);
+            this.feedback.electron()?.send("folderReply", data);
         }
         if (this.feedback.socket) {
             if (p == undefined)
@@ -371,7 +371,7 @@ class ServerDetail {
                 if (target.record.project_index < 0) {
                     target.record.project_index = 0;
                 }
-                target.record.task_state = target.record.projects[target.record.project_index].task.map(x => {
+                target.record.task_state = target.record.projects[target.record.project_index].tasks.map(x => {
                     return {
                         uuid: x.uuid,
                         state: interface_1.ExecuteState.NONE
@@ -379,7 +379,7 @@ class ServerDetail {
                 });
                 target.record.task_detail = [];
                 const p = target.record.projects[target.record.project_index];
-                const t = p.task[target.record.task_index];
+                const t = p.tasks[target.record.task_index];
                 const count = target.manager.get_task_state_count(t);
                 for (let i = 0; i < count; i++) {
                     target.record.task_detail.push({
@@ -410,7 +410,7 @@ class ServerDetail {
                     target.record.task_state[target.record.task_index].state = interface_1.ExecuteState.RUNNING;
                 target.record.task_detail = [];
                 const p = target.record.projects[target.record.project_index];
-                const t = p.task[target.record.task_index];
+                const t = p.tasks[target.record.task_index];
                 const count = target.manager.get_task_state_count(t);
                 for (let i = 0; i < count; i++) {
                     target.record.task_detail.push({

package/dist/server/io.d.ts

@@ -1,6 +1,8 @@
-import { Project, RecordType, Database, UserProfile, Library, ExecutionLog, Node } from "../interface";
+import { Project, RecordType, Database, UserProfile, Library, ExecutionLog, Node, Task, Job } from "../interface";
 export interface MemoryData {
     projects: Array<Project>;
+    tasks: Array<Task>;
+    jobs: Array<Job>;
     database: Array<Database>;
     nodes: Array<Node>;
     logs: Array<ExecutionLog>;
@@ -18,6 +20,8 @@ export interface RecordIOLoader {
 }
 export interface RecordLoader {
     project: RecordIOLoader;
+    task: RecordIOLoader;
+    job: RecordIOLoader;
     database: RecordIOLoader;
     node: RecordIOLoader;
     log: RecordIOLoader;

package/dist/server/io.js

@@ -7,7 +7,9 @@ const _CreateRecordMemoryLoader = (loader, type) => {
         switch (type) {
             default:
             case interface_1.RecordType.PROJECT: return loader.projects;
-            case interface_1.RecordType.Database: return loader.database;
+            case interface_1.RecordType.TASK: return loader.tasks;
+            case interface_1.RecordType.JOB: return loader.jobs;
+            case interface_1.RecordType.DATABASE: return loader.database;
             case interface_1.RecordType.NODE: return loader.nodes;
             case interface_1.RecordType.LOG: return loader.logs;
             case interface_1.RecordType.LIB: return loader.libs;
@@ -58,7 +60,9 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
         switch (type) {
             default:
             case interface_1.RecordType.PROJECT: return memory.projects;
-            case interface_1.RecordType.Database: return memory.database;
+            case interface_1.RecordType.TASK: return memory.tasks;
+            case interface_1.RecordType.JOB: return memory.jobs;
+            case interface_1.RecordType.DATABASE: return memory.database;
             case interface_1.RecordType.NODE: return memory.nodes;
             case interface_1.RecordType.LOG: return memory.logs;
             case interface_1.RecordType.LIB: return memory.libs;
@@ -148,7 +152,9 @@ exports._CreateRecordIOLoader = _CreateRecordIOLoader;
 const CreateRecordMemoryLoader = (loader) => {
     return {
         project: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.PROJECT),
-        database: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.Database),
+        task: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.TASK),
+        job: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.JOB),
+        database: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.DATABASE),
         node: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.NODE),
         log: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.LOG),
         lib: (0, exports._CreateRecordMemoryLoader)(loader, interface_1.RecordType.LIB),
@@ -158,8 +164,10 @@ const CreateRecordMemoryLoader = (loader) => {
 exports.CreateRecordMemoryLoader = CreateRecordMemoryLoader;
 const CreateRecordIOLoader = (loader, memory) => {
     return {
-        project: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.PROJECT, "record"),
-        database: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.Database, "database"),
+        project: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.PROJECT, "project"),
+        task: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.TASK, "task"),
+        job: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.JOB, "job"),
+        database: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.DATABASE, "database"),
         node: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.NODE, "node"),
         log: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.LOG, "log"),
         lib: (0, exports._CreateRecordIOLoader)(loader, memory, interface_1.RecordType.LIB, "lib", ""),

package/dist/server/module/project.d.ts

@@ -0,0 +1,14 @@
+import { Project, Task } from "../../interface";
+import { MemoryData, RecordLoader } from "../io";
+import { Server } from "../server";
+export declare class Project_Module {
+    server: Server;
+    constructor(memory: Server);
+    get memory(): MemoryData;
+    get loader(): RecordLoader;
+    ProjectJobCount(uuid: string): number;
+    PopulateProject(uuid: string): Project | undefined;
+    PopulateTask(uuid: string): Task | undefined;
+    CascadeDeleteProject(uuid: string): void;
+    CascadeDeleteTask(uuid: string): void;
+}

package/dist/server/module/project.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Project_Module = void 0;
+class Project_Module {
+    server;
+    constructor(memory) {
+        this.server = memory;
+    }
+    get memory() { return this.server.memory; }
+    get loader() { return this.server.current_loader; }
+    ProjectJobCount(uuid) {
+        const p = this.memory.projects.find(p => p.uuid == uuid);
+        if (!p)
+            return 0;
+        const t = p.tasks_uuid.map(t_uuid => this.memory.tasks.find(t => t.uuid == t_uuid)).filter(t => t != undefined);
+        const counts = t.map(x => x.jobs_uuid.length);
+        return counts.reduce((a, b) => a + b, 0);
+    }
+    PopulateProject(uuid) {
+        const p = this.memory.projects.find(p => p.uuid == uuid);
+        if (!p)
+            return undefined;
+        const buffer = Object.assign({}, p);
+        for (var x of buffer.tasks_uuid) {
+            const t = this.PopulateTask(x);
+            if (!t)
+                return undefined;
+            buffer.tasks.push(t);
+        }
+        return buffer;
+    }
+    PopulateTask(uuid) {
+        const p = this.memory.tasks.find(p => p.uuid == uuid);
+        if (!p)
+            return undefined;
+        const buffer = Object.assign({}, p);
+        for (var x of buffer.jobs_uuid) {
+            const t = this.memory.jobs.find(t => t.uuid == x);
+            if (!t)
+                return undefined;
+            buffer.jobs.push(t);
+        }
+        return buffer;
+    }
+    CascadeDeleteProject(uuid) {
+        const p = this.memory.projects.find(p => p.uuid == uuid);
+        if (!p)
+            return;
+        p.tasks_uuid.forEach(t_uuid => {
+            this.CascadeDeleteTask(t_uuid);
+        });
+        this.loader.project.delete(p.uuid);
+    }
+    CascadeDeleteTask(uuid) {
+        const p = this.memory.tasks.find(p => p.uuid == uuid);
+        if (!p)
+            return;
+        p.jobs_uuid.forEach(j_uuid => {
+            this.loader.job.delete(j_uuid);
+        });
+        this.loader.task.delete(p.uuid);
+    }
+}
+exports.Project_Module = Project_Module;

package/dist/server/module/service.d.ts

@@ -0,0 +1,5 @@
+import { MemoryData } from "../io";
+export declare class Service_Module {
+    memory: MemoryData;
+    constructor(memory: MemoryData);
+}

package/dist/server/module/service.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Service_Module = void 0;
+class Service_Module {
+    memory;
+    constructor(memory) {
+        this.memory = memory;
+    }
+}
+exports.Service_Module = Service_Module;

package/dist/server/plugin.js

@@ -133,7 +133,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 const p = { title: "Import Failed", type: "error", message: `Cannot find the json from url ${url}, or maybe just the wrong token` };
                 const h = { name: "makeToast", data: JSON.stringify(p) };
                 if (feedback.electron) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));
@@ -189,7 +189,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 const p = { title: x[0], type: "error", message: x[1] };
                 const h = { name: "makeToast", data: JSON.stringify(p) };
                 if (feedback.electron) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));
@@ -237,7 +237,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 const p = { title: "Import Failed", type: "error", message: `Cannot find the json from url ${url}, or maybe just the wrong token` };
                 const h = { name: "makeToast", data: JSON.stringify(p) };
                 if (feedback.electron) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));

package/dist/server/server.d.ts

@@ -1,14 +1,18 @@
 import { Execute_ConsoleServerManager, PluginPageData } from "../interface";
 import { ServerDetail } from "./detail";
 import { MemoryData, RecordIOBase, RecordLoader } from "./io";
+import { Project_Module } from "./module/project";
 import { PluginLoader } from "./plugin";
-export type Caller_Electron = (channel: string, ...args: any[]) => void;
+export type Caller_Electron_Send = (channel: string, ...args: any[]) => void;
+export interface Caller_Electron {
+    send: Caller_Electron_Send;
+}
 export type Caller_Socket = (data: any) => void;
 export type TypeMap = {
     [key: string]: Function;
 };
 export interface PluginFeedback {
-    electron: Caller_Electron | undefined;
+    electron: (() => (Caller_Electron | undefined)) | undefined;
     socket: Caller_Socket | undefined;
 }
 export declare class Server {
@@ -20,6 +24,7 @@ export declare class Server {
     plugin_loader: PluginLoader | undefined;
     memory_loader: RecordLoader;
     detail: ServerDetail | undefined;
+    module_project: Project_Module;
     constructor();
     get current_loader(): RecordLoader;
     LoadFromDisk: () => Promise<Array<Array<string>>>;

package/dist/server/server.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Server = void 0;
 const io_1 = require("./io");
+const project_1 = require("./module/project");
 class Server {
     manager = [];
     memory = {
         projects: [],
+        tasks: [],
+        jobs: [],
         database: [],
         nodes: [],
         logs: [],
@@ -21,8 +24,10 @@ class Server {
     plugin_loader = undefined;
     memory_loader;
     detail;
+    module_project;
     constructor() {
         this.memory_loader = (0, io_1.CreateRecordMemoryLoader)(this.memory);
+        this.module_project = new project_1.Project_Module(this);
     }
     get current_loader() {
         if (this.loader)
@@ -32,6 +37,8 @@ class Server {
     LoadFromDisk = () => {
         const ts = [
             this.current_loader.project.load_all(),
+            this.current_loader.task.load_all(),
+            this.current_loader.job.load_all(),
             this.current_loader.database.load_all(),
             this.current_loader.node.load_all(),
             this.current_loader.log.load_all(),

package/dist/util/console_handle.js

@@ -21,7 +21,7 @@ class Util_Server_Console {
         model.record.project_index = pass;
         model.record.project = record.projects[pass].uuid;
         model.record.task_index = 0;
-        model.record.task_state = model.record.projects[0].task.map(x => {
+        model.record.task_state = model.record.projects[0].tasks.map(x => {
             return {
                 uuid: x.uuid,
                 state: interface_1.ExecuteState.NONE
@@ -29,7 +29,7 @@ class Util_Server_Console {
         });
         model.record.task_state[0].state = interface_1.ExecuteState.RUNNING;
         model.record.task_detail = [];
-        const task = model.record.projects[model.record.project_index]?.task[model.record.task_index];
+        const task = model.record.projects[model.record.project_index]?.tasks[model.record.task_index];
         const count = task.cronjob ? (task?.jobs.length ?? 0) : 1;
         for (let i = 0; i < count; i++) {
             model.record.task_detail.push({
@@ -72,14 +72,14 @@ class Util_Server_Console_Proxy {
         this.model.record.project = d[0].uuid;
         this.model.record.project_index = index;
         this.model.record.project_state[index].state = interface_1.ExecuteState.RUNNING;
-        this.model.record.task_state = this.model.record.projects[index].task.map(x => {
+        this.model.record.task_state = this.model.record.projects[index].tasks.map(x => {
             return {
                 uuid: x.uuid,
                 state: interface_1.ExecuteState.NONE
             };
         });
         this.model.record.task_detail = [];
-        const task = this.model.record.projects[this.model.record.project_index]?.task[this.model.record.task_index];
+        const task = this.model.record.projects[this.model.record.project_index]?.tasks[this.model.record.task_index];
         const count = task.cronjob ? (task?.jobs.length ?? 0) : 1;
         for (let i = 0; i < count; i++) {
             this.model.record.task_detail.push({
@@ -111,7 +111,7 @@ class Util_Server_Console_Proxy {
     execute_task_start = (d) => {
         if (this.model.record.project_index == -1)
             return;
-        const index = this.model.record.projects[this.model.record.project_index].task.findIndex(x => x.uuid == d[0].uuid);
+        const index = this.model.record.projects[this.model.record.project_index].tasks.findIndex(x => x.uuid == d[0].uuid);
         if (index == -1)
             return;
         this.model.record.useCron = d[0].cronjob;
@@ -124,7 +124,7 @@ class Util_Server_Console_Proxy {
             this.model.record.task_state[i].state = interface_1.ExecuteState.NONE;
         this.model.record.task_detail = [];
         const p = this.model.record.projects[this.model.record.project_index];
-        const t = p.task[this.model.record.task_index];
+        const t = p.tasks[this.model.record.task_index];
         const count = this.model.manager.get_task_state_count(t);
         for (let i = 0; i < count; i++) {
             this.model.record.task_detail.push({
@@ -142,7 +142,7 @@ class Util_Server_Console_Proxy {
         }
         if (this.model.record.project_index == -1)
             return;
-        const index = this.model.record.projects[this.model.record.project_index].task.findIndex(x => x.uuid == d.uuid);
+        const index = this.model.record.projects[this.model.record.project_index].tasks.findIndex(x => x.uuid == d.uuid);
         if (index == -1)
             return;
         this.model.record.useCron = false;
@@ -187,7 +187,7 @@ class Util_Server_Console_Proxy {
     };
     execute_job_finish = (d) => {
         if (d[3] == 1) {
-            const task = this.model.record.projects[this.model.record.project_index].task[this.model.record.task_index];
+            const task = this.model.record.projects[this.model.record.project_index].tasks[this.model.record.task_index];
             const index = task.jobs.findIndex(x => x.uuid == d[0].uuid);
             if (index != -1 && task.jobs[index].category == interface_1.JobCategory.Condition) {
                 const cr = task.jobs[index].number_args[0];

package/dist/util/log_handle.js

@@ -81,7 +81,7 @@ class Util_Server_Log_Proxy {
             start_timer: Date.now(),
             database: d[0].database,
             end_timer: 0,
-            logs: target.task.map(x => {
+            logs: target.tasks.map(x => {
                 return {
                     start_timer: 0,
                     end_timer: 0,
@@ -105,13 +105,13 @@ class Util_Server_Log_Proxy {
     execute_task_start = (d) => {
         if (this.target_log == undefined)
             return;
-        const index = this.target_log.project.task.findIndex(x => x.uuid == d[0].uuid);
+        const index = this.target_log.project.tasks.findIndex(x => x.uuid == d[0].uuid);
         if (index == -1)
             return;
         this.task_index = index;
         this.target_log.logs[this.task_index].task_detail = [];
         const p = this.model.record.projects[this.model.record.project_index];
-        const t = p.task[this.task_index];
+        const t = p.tasks[this.task_index];
         const count = this.model.manager.get_task_state_count(t);
         for (let i = 0; i < count; i++) {
             this.target_log.logs[this.task_index].task_detail.push({
@@ -167,7 +167,7 @@ class Util_Server_Log_Proxy {
             return;
         if (d[3] == 1) {
             const currentLog = this.target_log;
-            const task = currentLog.project.task[this.task_index];
+            const task = currentLog.project.tasks[this.task_index];
             const index = task.jobs.findIndex(x => x.uuid == d[0].uuid);
             if (index != -1 && task.jobs[index].category == interface_1.JobCategory.Condition) {
                 const cr = task.jobs[index].number_args[0];

package/package.json

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