verteilen-core 1.4.21 → 1.4.22

package/dist/script/execute/region_task.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { DataType, ExecuteState } from "../../interface";
 import { Region_Job } from "./region_job";
 import { Region_Subtask } from "./region_subtask";
@@ -28,9 +23,6 @@ export class Region_Task {
         return this.target.runner;
     }
     RUN = () => {
-        /**
-         * When it's the first iteration for this task
-         */
         if (this.target.t_state == ExecuteState.NONE) {
             this.target.t_state = ExecuteState.RUNNING;
             this.multithread = this.task.multi ? this.get_task_multi_count(this.task) : 1;
@@ -38,11 +30,7 @@ export class Region_Task {
         }
         let allJobFinish = false;
         const hasJob = this.task.jobs.length > 0;
-        /**
-         * If a task has no job... we have to skip it...
-         */
         if (!hasJob) {
-            // We end it gracefully.
             this.target.proxy?.executeTaskStart([this.task, this.task_count]);
             this.target.proxy?.executeTaskFinish(this.task);
             this.target.messager_log(`[Execute] Skip ! No job exists ${this.task.uuid}`);
@@ -62,30 +50,14 @@ export class Region_Task {
             this.ExecuteTask_AllFinish(this.project, this.task);
         }
     };
-    /**
-     * It will spawn amounts of cronjob and send the tasks for assigned node to execute them one by one
-     * @param taskCount Should be equal to cronjob result
-     * @returns Is finish executing
-     */
     ExecuteTask_Cronjob(project, task, taskCount) {
         let ns = this.get_idle_open();
         let allJobFinish = false;
-        /**
-         * if current_cron length is zero\
-         * this means the init process has not been run yet
-         */
         if (this.cron.length == 0) {
-            // First time
             this.Init_CronContainer(taskCount);
             this.target.messager_log(`[Execute] TaskCount: ${taskCount}`);
         }
         else {
-            // If disconnect or deleted...
-            /**
-             * We query all the cron state and get all the processing first and count it\
-             * All we want is to filter out the node which is fully load\
-             * So we can follow the multithread limit to send the mission
-             */
             const worker = this.cron.filter(x => x.uuid != '').map(x => x.uuid);
             const counter = [];
             worker.forEach(uuid => {
@@ -102,15 +74,12 @@ export class Region_Task {
             allJobFinish = true;
         }
         else {
-            // Assign worker
-            // Find the cron which is need to be execute by a node
             const needs = this.cron.filter(x => x.uuid == '' && x.work.filter(y => y.state != ExecuteState.FINISH && y.state != ExecuteState.ERROR).length > 0);
             const min = Math.min(needs.length, ns.length);
             for (let i = 0; i < min; i++) {
                 needs[i].uuid = ns[i].uuid;
             }
             const single = this.cron.filter(x => x.uuid != '');
-            // Execute
             for (var cronwork of single) {
                 const index = this.target.current_nodes.findIndex(x => x.uuid == cronwork.uuid);
                 if (index != -1) {
@@ -123,16 +92,10 @@ export class Region_Task {
         }
         return allJobFinish;
     }
-    /**
-     * There will be no CronTask be called, it will go straight to the Execute job section
-     * @param taskCount Must be 1
-     * @returns Is finish executing
-     */
     ExecuteTask_Single(project, task, taskCount) {
         let allJobFinish = false;
         let ns = [];
         if (this.target.current_job.length > 0) {
-            // If disconnect or deleted...
             const last = this.target.current_nodes.find(x => x.uuid == this.job[0].uuid);
             if (last == undefined) {
                 ns = this.get_idle();
@@ -147,7 +110,6 @@ export class Region_Task {
             }
         }
         else {
-            // First time
             this.sync_local_para(this.target.localPara);
             ns = this.get_idle();
             if (ns.length > 0) {
@@ -182,12 +144,7 @@ export class Region_Task {
     ExecuteTask_Setup(project, task, taskCount) {
         let ns = this.get_idle_open();
         let allJobFinish = false;
-        /**
-         * if current_cron length is zero\
-         * this means the init process has not been run yet
-         */
         if (this.cron.length == 0) {
-            // First time
             this.Init_CronContainer(taskCount);
             this.target.messager_log(`[Execute] TaskCount: ${taskCount}`);
             for (let i = 0; i < this.cron.length; i++) {
@@ -199,7 +156,6 @@ export class Region_Task {
         }
         else {
             const single = this.cron.filter(x => x.uuid != '');
-            // Execute
             for (var cronwork of single) {
                 const index = this.target.current_nodes.findIndex(x => x.uuid == cronwork.uuid);
                 if (index != -1) {
@@ -217,12 +173,10 @@ export class Region_Task {
         this.target.messager_log(`[Execute] Task Finish ${task.uuid}`);
         const index = project.tasks.findIndex(x => x.uuid == task.uuid);
         if (index == project.tasks.length - 1) {
-            // Finish
             this.parent.runner = undefined;
             this.target.t_state = ExecuteState.FINISH;
         }
         else {
-            // Next
             this.parent.runner = new Region_Task(this.target, project.tasks[index + 1]);
             this.target.t_state = ExecuteState.NONE;
         }
@@ -232,7 +186,6 @@ export class Region_Task {
     Init_CronContainer = (taskCount) => {
         this.sync_local_para(this.target.localPara);
         this.cron = [];
-        // Create the cronjob instance here
         for (let i = 0; i < taskCount; i++) {
             const d = {
                 id: i,
@@ -250,21 +203,12 @@ export class Region_Task {
         }
         this.target.proxy?.executeTaskStart([this.task, taskCount]);
     };
-    //#region Uility
-    /**
-     * Filter out the idle and connection open nodes
-     * @returns All idle and open connection nodes
-     */
     get_idle = () => {
         return this.target.current_nodes.filter(x => this.check_socket_state(x) != ExecuteState.RUNNING && x.websocket.readyState == 1);
     };
     check_socket_state = (target) => {
         return target.current_job.length == 0 ? ExecuteState.NONE : ExecuteState.RUNNING;
     };
-    /**
-     * This will let nodes update the database and lib
-     * @param target
-     */
     sync_local_para = (target) => {
         this.target.current_nodes.forEach(x => this.sync_para(target, x));
         this.target.proxy?.updateDatabase(target);
@@ -286,41 +230,22 @@ export class Region_Task {
     get_idle_open = () => {
         return this.target.current_nodes.filter(x => x.websocket.readyState == 1);
     };
-    /**
-     * Check all the cronjob is finish or not
-     */
     check_all_cron_end = () => {
         return this.cron.filter(x => !this.check_cron_end(x)).length == 0;
     };
-    /**
-     * Check input cronjob is finish or not
-     * @param cron target cronjob instance
-     */
     check_cron_end = (cron) => {
         return cron.work.filter(x => x.state == ExecuteState.RUNNING || x.state == ExecuteState.NONE).length == 0;
     };
-    /**
-     * Check current single is finish or not
-     */
     check_single_end = () => {
         if (this.task == undefined)
             return false;
         return this.job.length == this.task.jobs.length &&
             this.job.filter(y => y.state == ExecuteState.RUNNING || y.state == ExecuteState.NONE).length == 0;
     };
-    /**
-     * Get the multi-core setting\
-     * Find in the database setting
-     * @param key The multi-core-key
-     * @returns
-     */
     get_task_multi_count = (t) => {
         const r = this.get_number(t.multiKey);
         return r == -1 ? 1 : r;
     };
-    /**
-     * Get the task's cronjob count
-     */
     get_task_state_count(t) {
         if (t.setupjob)
             return this.target.current_nodes.length;

package/dist/script/execute/runner.d.ts

@@ -1,12 +1,5 @@
 import { Project } from "../../interface";
 import { ExecuteManager_Feedback } from "./feedback";
-/**
- * The execute runner
- */
 export declare class ExecuteManager_Runner extends ExecuteManager_Feedback {
-    /**
-     * Boradcasting all the database and library to all the websocket nodes
-     * @param p Target project
-     */
     SyncDatabase: (p: Project) => void;
 }

package/dist/script/execute/runner.js

@@ -1,25 +1,11 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { DataType } from "../../interface";
 import { ExecuteManager_Feedback } from "./feedback";
 import { Util_Parser } from './util_parser';
-/**
- * The execute runner
- */
 export class ExecuteManager_Runner extends ExecuteManager_Feedback {
-    /**
-     * Boradcasting all the database and library to all the websocket nodes
-     * @param p Target project
-     */
     SyncDatabase = (p) => {
-        // Get the clone para from it
         this.localPara = JSON.parse(JSON.stringify(p.database));
         this.messager_log("[Execute] Sync Database !");
         this.messager_log("[Execute] Generate local database object");
-        // Then phrase the expression to value
         for (let i = 0; i < this.localPara.containers.length; i++) {
             if (this.localPara.containers[i].type == DataType.Expression && this.localPara.containers[i].meta != undefined) {
                 const text = `%{${this.localPara.containers[i].meta}}%`;
@@ -27,7 +13,6 @@ export class ExecuteManager_Runner extends ExecuteManager_Feedback {
                 this.localPara.containers[i].value = e.replacePara(text);
             }
         }
-        // Boradcasting
         this.sync_local_para(this.localPara);
     };
 }

package/dist/script/execute/util_parser.d.ts

@@ -1,55 +1,14 @@
 import { KeyValue, Database, DatabaseContainer } from "../../interface";
-/**
- * The worker which helps parsing database variables into argument\
- * Including expression executing
- */
 export declare class Util_Parser {
     paras: Array<KeyValue>;
     get count(): number;
     constructor(_paras: Array<KeyValue>);
     clone: () => Util_Parser;
-    /**
-     * Turn database into a list of keyvalue structure\
-     * Exclude the expression datatype
-     * @param p Target database instance
-     * @returns The list of keyvalue
-     */
     static to_keyvalue: (p: Database) => Array<KeyValue>;
-    /**
-     * Input a object data, and deep search all of subobject\
-     * Phrasing it into keyvalue data
-     * @param obj Object
-     * @returns Array of keyvalue data
-     */
     private static getDeepKeys;
-    /**
-     * Database containers into keyvalue list
-     */
     static _to_keyvalue: (p: Array<DatabaseContainer>) => Array<KeyValue>;
-    /**
-     * Search all the string result and replace to target string\
-     * @example
-     * replaceAll("ABCBCAB", "AB", "KK") // Result: KKCBCKK
-     * @param str string data
-     * @param fi feature
-     * @param tar replace target
-     */
     static replaceAll: (str: string, fi: string, tar: string) => string;
-    /**
-     * Replace a string to environment string\
-     * * Include Expression calculation
-     * * Include Env string, boolean, number replacing
-     * @param text Input text
-     * @param paras The keyvalue list
-     * @returns The result string
-     */
     replacePara: (text: string) => string;
-    /**
-     * Expression magic
-     * @param str Input string, the expression part of string only, not the entire sentence
-     * @param paras Keyvalue list
-     * @returns Result calculation
-     */
     parse: (str: string) => string;
     private _replacePara;
 }

package/dist/script/execute/util_parser.js

@@ -1,14 +1,5 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { formula, init } from "expressionparser";
 import { DataType, ENV_CHARACTER, IGNORE_CHARACTER } from "../../interface";
-/**
- * The worker which helps parsing database variables into argument\
- * Including expression executing
- */
 export class Util_Parser {
     paras = [];
     get count() {
@@ -21,23 +12,11 @@ export class Util_Parser {
         const b = JSON.parse(JSON.stringify(this.paras));
         return new Util_Parser(b);
     };
-    /**
-     * Turn database into a list of keyvalue structure\
-     * Exclude the expression datatype
-     * @param p Target database instance
-     * @returns The list of keyvalue
-     */
     static to_keyvalue = (p) => {
         return [
             ...this._to_keyvalue(p.containers)
         ];
     };
-    /**
-     * Input a object data, and deep search all of subobject\
-     * Phrasing it into keyvalue data
-     * @param obj Object
-     * @returns Array of keyvalue data
-     */
     static getDeepKeys = (obj, name) => {
         let keys = [];
         for (var key in obj) {
@@ -56,9 +35,6 @@ export class Util_Parser {
         }
         return keys;
     };
-    /**
-     * Database containers into keyvalue list
-     */
     static _to_keyvalue = (p) => {
         const r = [];
         r.push(...p.filter(x => x.type == DataType.Boolean || x.type == DataType.String || x.type == DataType.Textarea || x.type == DataType.Number || x.type == DataType.Expression).map(x => { return { key: x.name, value: x.value.toString() }; }));
@@ -82,28 +58,12 @@ export class Util_Parser {
         }
         return r;
     };
-    /**
-     * Search all the string result and replace to target string\
-     * @example
-     * replaceAll("ABCBCAB", "AB", "KK") // Result: KKCBCKK
-     * @param str string data
-     * @param fi feature
-     * @param tar replace target
-     */
     static replaceAll = (str, fi, tar) => {
         let p = str;
         while (p.includes(fi))
             p = p.replace(fi, tar);
         return p;
     };
-    /**
-     * Replace a string to environment string\
-     * * Include Expression calculation
-     * * Include Env string, boolean, number replacing
-     * @param text Input text
-     * @param paras The keyvalue list
-     * @returns The result string
-     */
     replacePara = (text) => {
         let buffer = '';
         let store = '';
@@ -121,7 +81,7 @@ export class Util_Parser {
                 ignore = -1;
             if (v == ENV_CHARACTER && ignore == -1) {
                 state = !state;
-                if (!state) { // End
+                if (!state) {
                     if (useExp) {
                         buffer += this.parse(store);
                     }
@@ -141,12 +101,6 @@ export class Util_Parser {
         }
         return buffer;
     };
-    /**
-     * Expression magic
-     * @param str Input string, the expression part of string only, not the entire sentence
-     * @param paras Keyvalue list
-     * @returns Result calculation
-     */
     parse = (str) => {
         str = str.substring(1, str.length - 1);
         const parser = init(formula, (term) => {

package/dist/script/execute_manager.d.ts

@@ -1,54 +1,16 @@
 import { Libraries, WebsocketPack } from "../interface";
 import { ExecuteManager_Runner } from "./execute/runner";
-/**
- * Cluster server calculation worker\
- * The most important worker in the entire application
- */
 export declare class ExecuteManager extends ExecuteManager_Runner {
-    /**
-     * The update function for let this worker start each iteration
-     */
     Update: () => void;
-    /**
-     * Pause has been called
-     */
     Stop: () => void;
-    /**
-     * Register projects to worker\
-     * If failed register, the buffer will remind empty
-     * @param projects Target
-     * @returns -1: register failed, 0: successfully
-     */
     Register: (lib?: Libraries) => number;
-    /**
-     * This will reset the state, and emppty all the buffer
-     */
     Clean: () => void;
-    /**
-     * Tell clients release lib and database data
-     */
     Release: () => void;
-    /**
-     * When new connection (Node) has benn connected
-     * @param source Target
-     */
     NewConnection: (source: WebsocketPack) => void;
     Disconnect: (source: WebsocketPack) => void;
     ClearState: (task_index: number) => void;
-    /**
-     * When user trying to skip project
-     * @returns The index of the project
-     * -1: Skip to finish
-     * -2: Skip failed
-     */
     SkipProject: () => number;
     PreviousProject: () => number;
-    /**
-     * When user trying to skip task
-     * @returns The index of the task
-     * -1: Skip to finish
-     * -2: Skip failed
-     */
     SkipTask: () => number;
     PreviousTask: () => number;
     SkipSubTask: (v: number) => number;

package/dist/script/execute_manager.js

@@ -1,22 +1,9 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { ExecuteState } from "../interface";
 import { Region_Project } from "./execute/region_project";
 import { Region_Task } from "./execute/region_task";
 import { ExecuteManager_Runner } from "./execute/runner";
-/**
- * Cluster server calculation worker\
- * The most important worker in the entire application
- */
 export class ExecuteManager extends ExecuteManager_Runner {
-    /**
-     * The update function for let this worker start each iteration
-     */
     Update = () => {
-        // Only works when state is set to running
         if (this.state != ExecuteState.RUNNING)
             return;
         else if (this.runner == undefined && this.current_projects.length > 0) {
@@ -31,9 +18,6 @@ export class ExecuteManager extends ExecuteManager_Runner {
             this.runner.RUN();
         }
     };
-    /**
-     * Pause has been called
-     */
     Stop = () => {
         this.current_nodes.forEach(x => {
             const h = {
@@ -46,12 +30,6 @@ export class ExecuteManager extends ExecuteManager_Runner {
         this.jobstack = 0;
         this.current_nodes.forEach(x => x.current_job = []);
     };
-    /**
-     * Register projects to worker\
-     * If failed register, the buffer will remind empty
-     * @param projects Target
-     * @returns -1: register failed, 0: successfully
-     */
     Register = (lib) => {
         this.current_projects = this.record.projects;
         this.current_nodes = [];
@@ -94,25 +72,15 @@ export class ExecuteManager extends ExecuteManager_Runner {
         }
         return i;
     };
-    /**
-     * This will reset the state, and emppty all the buffer
-     */
     Clean = () => {
         this.current_projects = [];
         this.runner = undefined;
         this.current_nodes = [];
         this.state = ExecuteState.NONE;
     };
-    /**
-     * Tell clients release lib and database data
-     */
     Release = () => {
         this.current_nodes.forEach(x => this.release(x));
     };
-    /**
-     * When new connection (Node) has benn connected
-     * @param source Target
-     */
     NewConnection = (source) => {
         if (this.state == ExecuteState.RUNNING && this.localPara != undefined) {
             this.sync_para(this.localPara, source);
@@ -162,24 +130,12 @@ export class ExecuteManager extends ExecuteManager_Runner {
             this.proxy?.executeSubtaskUpdate([this.current_t, target.id - 1, '', ExecuteState.NONE]);
         }
     };
-    /**
-     * When user trying to skip project
-     * @returns The index of the project
-     * -1: Skip to finish
-     * -2: Skip failed
-     */
     SkipProject = () => {
         return this.jumpProject(true);
     };
     PreviousProject = () => {
         return this.jumpProject(false);
     };
-    /**
-     * When user trying to skip task
-     * @returns The index of the task
-     * -1: Skip to finish
-     * -2: Skip failed
-     */
     SkipTask = () => {
         return this.jumpTask(true);
     };
@@ -213,26 +169,19 @@ export class ExecuteManager extends ExecuteManager_Runner {
             return -2;
         }
         if (this.current_p == undefined) {
-            // Not yet start
             return forward ? this.skipProjectFirst() : -2;
         }
         else {
-            // When it's in the processing stage
-            // Let's find the current processing project, and increments it's index for it
             return this._jumpProject(forward);
         }
     };
     jumpTask = (forward) => {
-        // There is no project exists
         if (this.current_p == undefined)
             return -2;
         if (this.current_t == undefined) {
-            // If we are in the start
             return forward ? this.skipTaskFirst() : this.previousTaskFirst();
         }
         else {
-            // When it's in the processing stage
-            // Let's find the current processing task, and increments it's index for it
             return forward ? this.skipTask() : this.previousTask();
         }
     };
@@ -249,7 +198,6 @@ export class ExecuteManager extends ExecuteManager_Runner {
             this.proxy?.executeProjectFinish([this.current_p, index]);
         const atend = forward ? index == this.current_projects.length - 1 : index == 0;
         if (atend) {
-            // If it's last project
             if (forward) {
                 this.runner = undefined;
                 this.state = ExecuteState.FINISH;
@@ -296,7 +244,6 @@ export class ExecuteManager extends ExecuteManager_Runner {
     previousTaskFirst = () => {
         const index = this.current_projects.findIndex(x => x.uuid == this.current_p.uuid);
         if (index == 0 && this.runner != undefined) {
-            // If it's first task and first project
             this.runner.runner = undefined;
         }
         else {
@@ -312,7 +259,6 @@ export class ExecuteManager extends ExecuteManager_Runner {
         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) {
-                // If it's last task
                 this.proxy?.executeTaskFinish(this.current_t);
                 this.runner.runner = undefined;
                 this.messager_log(`[Execute] Skip task to Finish !`);