verteilen-core 1.4.21 → 1.4.22

package/dist/client/analysis.d.ts

@@ -1,9 +1,6 @@
 import { WebSocket } from 'ws';
 import { Header, Messager, Messager_log } from "../interface";
 import { Client } from './client';
-/**
- * The analysis worker. decode the message received from cluster server
- */
 export declare class ClientAnalysis {
     private messager;
     private messager_log;
@@ -14,26 +11,12 @@ export declare class ClientAnalysis {
     private resource_thread;
     private resource_cache;
     constructor(_messager: Messager, _messager_log: Messager_log, _client: Client);
-    /**
-     * Analysis the package
-     * @param h Package
-     * @param source Websocket instance
-     * @return
-     * * 0: Successfully execute command
-     * * 1: The header is undefined, cannot process
-     * * 2: Cannot find the header name match with function typeMap
-     */
     analysis: (h: Header | undefined, source: WebSocket) => 0 | 1 | 2;
     private execute_job;
     private release;
     private set_database;
     private set_libs;
     private exec_checker;
-    /**
-     * Network delay request
-     * @param data Dummy value, should always be 0
-     * @param source The cluster server websocket instance
-     */
     private pong;
     private plugin_info;
     private get_releases;

package/dist/client/analysis.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { exec, spawn } from 'child_process';
 import { DATA_FOLDER } from "../interface";
 import { Client } from './client';
@@ -11,9 +6,6 @@ import { ClientShell } from './shell';
 import { createWriteStream, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs';
 import * as path from 'path';
 import * as os from 'os';
-/**
- * The analysis worker. decode the message received from cluster server
- */
 export class ClientAnalysis {
     messager;
     messager_log;
@@ -30,15 +22,6 @@ export class ClientAnalysis {
         this.shell = new ClientShell(_messager, _messager_log, this.client);
         this.exec = [];
     }
-    /**
-     * Analysis the package
-     * @param h Package
-     * @param source Websocket instance
-     * @return
-     * * 0: Successfully execute command
-     * * 1: The header is undefined, cannot process
-     * * 2: Cannot find the header name match with function typeMap
-     */
     analysis = (h, source) => {
         const typeMap = {
             'execute_job': this.execute_job,
@@ -116,11 +99,6 @@ export class ClientAnalysis {
         }
         return r;
     };
-    /**
-     * Network delay request
-     * @param data Dummy value, should always be 0
-     * @param source The cluster server websocket instance
-     */
     pong = (data, source) => {
         const h = { name: 'pong', data: data };
         source.send(JSON.stringify(h));

package/dist/client/client.d.ts

@@ -1,9 +1,5 @@
 import { WebSocket } from 'ws';
 import { Messager, Messager_log, PluginNode } from '../interface';
-/**
- * **Compute Client**\
- * The calculation node worker
- */
 export declare class Client {
     plugins: PluginNode;
     private httpss;
@@ -13,27 +9,14 @@ export declare class Client {
     private messager_log;
     private analysis;
     private updatehandle;
-    /**
-     * Get connected client count
-     */
     get count(): number;
-    /**
-     * Get connected client list instance
-     */
     get clients(): Array<WebSocket>;
     constructor(_messager: Messager, _messager_log: Messager_log);
     Dispose(): void;
-    /**
-     * Start a websocket server, and waiting for cluster server to connect
-     */
     Init: () => Promise<void>;
     Destroy: () => void;
     Release: () => void;
     savePlugin: () => void;
-    /**
-     * The node update function, It will do things below
-     * * Send system info to cluster server
-     */
     private update;
     private loadPlugins;
     private get_pem;

package/dist/client/client.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import * as path from 'path';
 import { check } from 'tcp-port-used';
 import * as ws from 'ws';
@@ -12,10 +7,6 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import * as os from 'os';
 import * as pem from 'pem';
 import * as https from 'https';
-/**
- * **Compute Client**\
- * The calculation node worker
- */
 export class Client {
     plugins = { plugins: [] };
     httpss = undefined;
@@ -25,15 +16,9 @@ export class Client {
     messager_log;
     analysis;
     updatehandle;
-    /**
-     * Get connected client count
-     */
     get count() {
         return this.sources.length;
     }
-    /**
-     * Get connected client list instance
-     */
     get clients() {
         return this.sources;
     }
@@ -47,9 +32,6 @@ export class Client {
     Dispose() {
         clearInterval(this.updatehandle);
     }
-    /**
-     * Start a websocket server, and waiting for cluster server to connect
-     */
     Init = async () => {
         let port_result = PORT;
         let canbeuse = false;
@@ -68,7 +50,7 @@ export class Client {
             res.end('HTTPS server is running');
         });
         this.httpss.addListener('upgrade', (req, res, head) => console.log('UPGRADE:', req.url));
-        this.client = new ws.Server({ server: this.httpss });
+        this.client = new ws.WebSocketServer({ server: this.httpss });
         this.client.on('listening', () => {
             this.messager_log('[Server] Listen PORT: ' + port_result.toString());
         });
@@ -126,10 +108,6 @@ export class Client {
             mkdirSync(f, { recursive: true });
         writeFileSync(pluginPath, JSON.stringify(this.plugins, null, 4));
     };
-    /**
-     * The node update function, It will do things below
-     * * Send system info to cluster server
-     */
     update = () => {
         this.analysis.forEach(x => x.update(this));
     };
@@ -165,17 +143,16 @@ export class Client {
         });
     };
     static workerPath = (filename = "worker", extension = ".exe") => {
-        // @ts-ignore
         const isExe = process.pkg?.entrypoint != undefined;
         const exe = process.platform == 'win32' ? filename + extension : filename;
         let workerExe = "";
         let p = 0;
-        if (isExe && path.basename(process.execPath) == (process.platform ? "app.exe" : 'app')) { // Node build
+        if (isExe && path.basename(process.execPath) == (process.platform ? "app.exe" : 'app')) {
             workerExe = path.join(process.execPath, "..", "bin", exe);
             p = 1;
         }
         else if ((process.mainModule && process.mainModule.filename.indexOf('app.asar') !== -1) ||
-            process.argv.filter(a => a.indexOf('app.asar') !== -1).length > 0) { // Electron package
+            process.argv.filter(a => a.indexOf('app.asar') !== -1).length > 0) {
             workerExe = path.join("bin", exe);
             p = 2;
         }
@@ -183,29 +160,22 @@ export class Client {
             workerExe = path.join(process.cwd(), "bin", exe);
             p = 3;
         }
-        else { // Node un-build
+        else {
             workerExe = Client.isTypescript() ? path.join(__dirname, "bin", exe) : path.join(__dirname, "..", "bin", exe);
             p = 4;
         }
         return workerExe;
     };
     static isTypescript = () => {
-        // if this file is typescript, we are running typescript :D
-        // this is the best check, but fails when actionhero is compiled to js though...
         const extension = path.extname(__filename);
         if (extension === ".ts") {
             return true;
         }
-        // are we running via a ts-node/ts-node-dev shim?
         const lastArg = process.execArgv[process.execArgv.length - 1];
         if (lastArg && path.parse(lastArg).name.indexOf("ts-node") > 0) {
             return true;
         }
         try {
-            /**
-             * Are we running in typescript at the moment?
-             * see https://github.com/TypeStrong/ts-node/pull/858 for more details
-             */
             return process[Symbol.for("ts-node.register.instance")] ||
                 (process.env.NODE_ENV === "test" &&
                     process.env.ACTIONHERO_TEST_FILE_EXTENSION !== "js")

package/dist/client/cluster.d.ts

@@ -1,4 +1 @@
-/**
- * The entry point for the cluster thread.
- */
 export declare function RUN(): void;

package/dist/client/cluster.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { ResourceType } from '../interface';
 import { ClientHTTP } from './http';
 import { ClientJobExecute } from './job_execute';
@@ -18,11 +13,6 @@ process.stdin.on('data', (chunk) => {
         setTimeout(process.exit(1), 1000);
     }
 });
-/**
- * The message handle for reply
- * @param msg Message
- * @param tag Message prefix
- */
 const messager = (msg, tag) => {
     const d = {
         name: 'messager',
@@ -31,11 +21,6 @@ const messager = (msg, tag) => {
     };
     console.log(JSON.stringify(d));
 };
-/**
- * The message handle for reply with print on screen ffeature
- * @param msg Message
- * @param tag Message prefix
- */
 const messager_log = (msg, tag, meta) => {
     const d = {
         name: 'messager_log',
@@ -44,10 +29,6 @@ const messager_log = (msg, tag, meta) => {
     };
     console.log(JSON.stringify(d));
 };
-/**
- * Return the error message to main thread
- * @param err Error instance
- */
 const ERROR = (err) => {
     const d = {
         name: "error",
@@ -57,9 +38,6 @@ const ERROR = (err) => {
     console.log(JSON.stringify(d));
     process.exit(1);
 };
-/**
- * Job execute task
- */
 const execute_job = () => {
     if (process.env.job == undefined || process.env.plugin == undefined) {
         process.exit(1);
@@ -73,9 +51,6 @@ const execute_job = () => {
     })
         .catch(err => ERROR(err));
 };
-/**
- * Query resource task
- */
 const execute_resource = () => {
     const r = new ClientResource();
     messager("Resource query");
@@ -89,9 +64,6 @@ const execute_resource = () => {
         console.log(JSON.stringify(h));
     }).catch(err => ERROR(err));
 };
-/**
- * Query http task
- */
 const execute_http = () => {
     const m = process.env.method || 'GET';
     const u = process.env.url || '';
@@ -99,11 +71,7 @@ const execute_http = () => {
     const r = new ClientHTTP(u, m, p);
     r.RUN();
 };
-/**
- * The entry point for the cluster thread.
- */
 export function RUN() {
-    // The cluster currently spawn should execute a job
     switch (process.env.type) {
         case 'JOB':
             execute_job();

package/dist/client/database.d.ts

@@ -1,26 +1,10 @@
 import WebSocket from "ws";
 import { Setter } from "../interface";
-/**
- * The database feedback helper\
- * Update the main database container on the cluster server
- */
 export declare class ClientDatabase {
     private source;
     constructor(_source: WebSocket | undefined);
-    /**
-     * Update database number on the cluster server
-     * @param data Target KeyValue
-     */
     feedbacknumber: (data: Setter) => void;
-    /**
-     * Update database boolean on the cluster server
-     * @param data Target KeyValue
-     */
     feedbackboolean: (data: Setter) => void;
-    /**
-     * Update database string on the cluster server
-     * @param data Target KeyValue
-     */
     feedbackstring: (data: Setter) => void;
     feedbackobject: (data: Setter) => void;
     feedbacklist: (data: Setter) => void;

package/dist/client/database.js

@@ -1,30 +1,14 @@
-/**
- * The database feedback helper\
- * Update the main database container on the cluster server
- */
 export class ClientDatabase {
     source;
     constructor(_source) {
         this.source = _source;
     }
-    /**
-     * Update database number on the cluster server
-     * @param data Target KeyValue
-     */
     feedbacknumber = (data) => {
         this.feedback("feedback_number", data);
     };
-    /**
-     * Update database boolean on the cluster server
-     * @param data Target KeyValue
-     */
     feedbackboolean = (data) => {
         this.feedback("feedback_boolean", data);
     };
-    /**
-     * Update database string on the cluster server
-     * @param data Target KeyValue
-     */
     feedbackstring = (data) => {
         this.feedback("feedback_string", data);
     };

package/dist/client/execute.d.ts

@@ -1,9 +1,6 @@
 import { WebSocket } from 'ws';
 import { Job, Libraries, Messager, Messager_log, Database, Setter } from "../interface";
 import { Client } from "./client";
-/**
- * Execute worker, Execute the job container
- */
 export declare class ClientExecute {
     uuid: string;
     private database;
@@ -15,43 +12,13 @@ export declare class ClientExecute {
     private messager_log;
     get count(): number;
     constructor(_uuid: string, _messager: Messager, _messager_log: Messager_log, _client: Client);
-    /**
-     * The stop signal, It will trying to kill the process if currently running
-     */
     stop_job: () => void;
-    /**
-     * The entry function to execute the job container
-     * @param job Target job
-     */
     execute_job: (job: Job, source: WebSocket) => void;
     private execute_job_worker;
     private job_finish;
-    /**
-     * Update database, Called by cluster server
-     * @param data Target container
-     */
     set_database: (data: Database) => void;
-    /**
-     * Update libraries, Called by cluster server
-     * @param data Target container
-     */
     set_libs: (data: Libraries) => void;
-    /**
-     * Update database string, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_string: (data: Setter) => void;
-    /**
-     * Update database number, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_number: (data: Setter) => void;
-    /**
-     * Update database boolean, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_boolean: (data: Setter) => void;
 }

package/dist/client/execute.js

@@ -1,17 +1,9 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { spawn } from 'child_process';
 import { WebSocket } from 'ws';
 import { DataType, JobCategory, JobType2Text, JobTypeText } from "../interface";
 import { i18n } from "../plugins/i18n";
 import { Client } from "./client";
 import { ClientDatabase } from './database';
-/**
- * Execute worker, Execute the job container
- */
 export class ClientExecute {
     uuid;
     database = undefined;
@@ -30,9 +22,6 @@ export class ClientExecute {
         this.messager = _messager;
         this.messager_log = _messager_log;
     }
-    /**
-     * The stop signal, It will trying to kill the process if currently running
-     */
     stop_job = () => {
         this.messager_log(`[Execute] Stop All: ${this.workers.length}`);
         this.workers.forEach(x => {
@@ -42,10 +31,6 @@ export class ClientExecute {
             x.stdin.end();
         });
     };
-    /**
-     * The entry function to execute the job container
-     * @param job Target job
-     */
     execute_job = (job, source) => {
         this.messager_log(`[Execute] ${job.uuid}  ${job.category == JobCategory.Execution ? i18n.global.t(JobTypeText[job.type]) : i18n.global.t(JobType2Text[job.type])}`, job.uuid, job.runtime_uuid);
         this.tag = job.uuid;
@@ -150,25 +135,12 @@ export class ClientExecute {
         }
         this.tag = '';
     }
-    /**
-     * Update database, Called by cluster server
-     * @param data Target container
-     */
     set_database = (data) => {
         this.database = data;
     };
-    /**
-     * Update libraries, Called by cluster server
-     * @param data Target container
-     */
     set_libs = (data) => {
         this.libraries = data;
     };
-    /**
-     * Update database string, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_string = (data) => {
         if (this.database == undefined)
             return;
@@ -177,11 +149,6 @@ export class ClientExecute {
             this.database.containers[index].value = data.value;
         this.messager_log(`[Database string sync] ${data.key} = ${data.value}`);
     };
-    /**
-     * Update database number, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_number = (data) => {
         if (this.database == undefined)
             return;
@@ -190,11 +157,6 @@ export class ClientExecute {
             this.database.containers[index].value = data.value;
         this.messager_log(`[Database number sync] ${data.key} = ${data.value}`);
     };
-    /**
-     * Update database boolean, Called by cluster server
-     * @deprecated The method should not be used
-     * @param data Target keyvalue
-     */
     set_boolean = (data) => {
         if (this.database == undefined)
             return;

package/dist/client/javascript.d.ts

@@ -13,31 +13,8 @@ export declare class ClientJavascript {
     message: any;
     http: any;
     constructor(_messager: Messager, _messager_log: Messager_log, _getjob: Getjob);
-    /**
-     * Before running the js scripts, We must init first.\
-     * ! Otherwise it won't work or throw error
-     * @param _messager Message habndle
-     * @param _messager_log Message habndle with print on screen feature
-     * @param _clientos OS worker
-     * @param _para Database worker
-     * @param _getlib library getter method
-     * @param _getpara Database getter method
-     * @param _getjob Job getter method
-     */
     static Init: (_messager: Messager, _messager_log: Messager, _clientos: ClientOS, _para: ClientJobDatabase, _getlib: Getlib, _getpara: Getpara, _getjob: Getjob) => void;
-    /**
-     * Running js\
-     * With reference libraries\
-     * @param js js script text
-     * @param libs Libraries header names
-     * @returns Calcuate result
-     */
     JavascriptExecuteWithLib: (javascript: string, libs: Array<string>, log?: Messager) => Promise<any>;
-    /**
-     * Running js
-     * @param js js script text
-     * @returns Calcuate result
-     */
     JavascriptExecute: (javascript: string, log?: Messager) => Promise<any>;
     private getJavascriptEnv;
     private filename;

package/dist/client/javascript.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import * as vm from 'vm';
 import { DATA_FOLDER, DataType, JavascriptLib } from '../interface';
 import * as path from 'path';
@@ -41,7 +36,6 @@ let para = undefined;
 let waiting = 0;
 const tag = () => getjob?.()?.uuid ?? 'unknown';
 const runtime = () => getjob?.()?.runtime_uuid ?? 'unknown';
-//#region Global
 function has(key, checker) {
     const p = getpara?.() ?? undefined;
     if (p == undefined)
@@ -200,7 +194,6 @@ function setselect(key, value) {
     target.value = value;
     para?.feedbackobject({ key: key, value: value });
 }
-//#endregion
 export class ClientJavascript {
     path;
     os;
@@ -268,17 +261,6 @@ export class ClientJavascript {
             patch: this.httpPatch,
         };
     }
-    /**
-     * Before running the js scripts, We must init first.\
-     * ! Otherwise it won't work or throw error
-     * @param _messager Message habndle
-     * @param _messager_log Message habndle with print on screen feature
-     * @param _clientos OS worker
-     * @param _para Database worker
-     * @param _getlib library getter method
-     * @param _getpara Database getter method
-     * @param _getjob Job getter method
-     */
     static Init = (_messager, _messager_log, _clientos, _para, _getlib, _getpara, _getjob) => {
         messager = _messager;
         messager_log = _messager_log;
@@ -288,13 +270,6 @@ export class ClientJavascript {
         getpara = _getpara;
         getjob = _getjob;
     };
-    /**
-     * Running js\
-     * With reference libraries\
-     * @param js js script text
-     * @param libs Libraries header names
-     * @returns Calcuate result
-     */
     JavascriptExecuteWithLib = (javascript, libs, log) => {
         waiting = 0;
         let context = this.getJavascriptEnv(JavascriptLib.ALL, log);
@@ -323,11 +298,6 @@ export class ClientJavascript {
             }, 100);
         });
     };
-    /**
-     * Running js
-     * @param js js script text
-     * @returns Calcuate result
-     */
     JavascriptExecute = (javascript, log) => {
         waiting = 0;
         let context = this.getJavascriptEnv(JavascriptLib.OS | JavascriptLib.MESSAGE | JavascriptLib.HTTP | JavascriptLib.PATH, log);
@@ -490,16 +460,12 @@ export class ClientJavascript {
     readfile(path) {
         return clientos?.file_read({ path: path });
     }
-    //#region Databases
     async wait(time) {
         return new Promise((resolve) => setTimeout(resolve, time * 1000));
     }
     async sleep(n) {
         Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, n * 1000);
     }
-    //#endregion
-    //#endregion
-    //#region Http
     async httpGet(url, p) {
         return this.httpGo('GET', url, p.toObject());
     }

package/dist/client/job_database.d.ts

@@ -1,9 +1,5 @@
 import { Setter } from "../interface";
 export declare class ClientJobDatabase {
-    /**
-     * Update database number on the cluster server
-     * @param data Target KeyValue
-     */
     feedbacknumber: (data: Setter) => void;
     feedbackboolean: (data: Setter) => void;
     feedbackstring: (data: Setter) => void;

package/dist/client/job_database.js

@@ -1,8 +1,4 @@
 export class ClientJobDatabase {
-    /**
-     * Update database number on the cluster server
-     * @param data Target KeyValue
-     */
     feedbacknumber = (data) => {
         this.feedback("feedbacknumber", data);
     };