verteilen-core 1.2.3 → 1.2.6

package/dist/src/client/http.js

@@ -2,36 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientHTTP = void 0;
 class ClientHTTP {
+    url;
+    method;
+    params;
     constructor(_url, _method, _params) {
-        this.RUN = () => {
-            fetch(this.url, {
-                method: this.method,
-                body: this.params
-            }).then(x => {
-                x.text().then(y => {
-                    const h = {
-                        name: "result",
-                        data: {
-                            status: x.status,
-                            statusText: x.statusText,
-                            headers: x.headers,
-                            ok: x.ok,
-                            data: y
-                        }
-                    };
-                    console.log(JSON.stringify(h));
-                });
-            }).catch((reason) => {
-                const h = {
-                    name: "error",
-                    data: reason
-                };
-                console.log(JSON.stringify(h));
-            });
-        };
         this.url = _url;
         this.method = _method;
         this.params = _params;
     }
+    RUN = () => {
+        fetch(this.url, {
+            method: this.method,
+            body: this.params
+        }).then(x => {
+            x.text().then(y => {
+                const h = {
+                    name: "result",
+                    data: {
+                        status: x.status,
+                        statusText: x.statusText,
+                        headers: x.headers,
+                        ok: x.ok,
+                        data: y
+                    }
+                };
+                console.log(JSON.stringify(h));
+            });
+        }).catch((reason) => {
+            const h = {
+                name: "error",
+                data: reason
+            };
+            console.log(JSON.stringify(h));
+        });
+    };
 }
 exports.ClientHTTP = ClientHTTP;

package/dist/src/client/javascript.d.ts

@@ -0,0 +1,47 @@
+import * as vm from 'vm';
+import { Job, Libraries, Messager, Messager_log, Database } from '../interface';
+import { ClientJobDatabase } from './job_database';
+import { ClientOS } from './os';
+export declare const safeEval: (code: string, context?: any, opts?: vm.RunningCodeInNewContextOptions | string) => any;
+type Getlib = () => Libraries | undefined;
+type Getpara = () => Database | undefined;
+type Getjob = () => Job | undefined;
+export declare class ClientJavascript {
+    path: any;
+    os: any;
+    env: any;
+    message: any;
+    http: any;
+    constructor(_messager: Messager, _messager_log: Messager_log, _getjob: Getjob);
+    static Init: (_messager: Messager, _messager_log: Messager, _clientos: ClientOS, _para: ClientJobDatabase, _getlib: Getlib, _getpara: Getpara, _getjob: Getjob) => void;
+    JavascriptExecuteWithLib: (javascript: string, libs: Array<string>, log?: Messager) => Promise<any>;
+    JavascriptExecute: (javascript: string, log?: Messager) => Promise<any>;
+    private getJavascriptEnv;
+    private filename;
+    private extname;
+    private dirname;
+    private exec;
+    private command;
+    private plugin_exec;
+    private plugin_command;
+    private copyfile;
+    private copydir;
+    private deletefile;
+    private deletedir;
+    private rename;
+    private exist;
+    private listfile;
+    private listdir;
+    private createdir;
+    private writefile;
+    private readfile;
+    private wait;
+    private sleep;
+    private httpGet;
+    private httpPost;
+    private httpDelete;
+    private httpPatch;
+    private httpPut;
+    private httpGo;
+}
+export {};

package/dist/src/client/javascript.js

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientJavascript = exports.safeEval = void 0;
 const vm = __importStar(require("vm"));
@@ -80,11 +71,10 @@ let messager_log;
 let clientos;
 let para = undefined;
 let waiting = 0;
-const tag = () => { var _a, _b; return (_b = (_a = getjob === null || getjob === void 0 ? void 0 : getjob()) === null || _a === void 0 ? void 0 : _a.uuid) !== null && _b !== void 0 ? _b : 'unknown'; };
-const runtime = () => { var _a, _b; return (_b = (_a = getjob === null || getjob === void 0 ? void 0 : getjob()) === null || _a === void 0 ? void 0 : _a.runtime_uuid) !== null && _b !== void 0 ? _b : 'unknown'; };
+const tag = () => getjob?.()?.uuid ?? 'unknown';
+const runtime = () => getjob?.()?.runtime_uuid ?? 'unknown';
 function has(key, checker) {
-    var _a;
-    const p = (_a = getpara === null || getpara === void 0 ? void 0 : getpara()) !== null && _a !== void 0 ? _a : undefined;
+    const p = getpara?.() ?? undefined;
     if (p == undefined)
         return false;
     return p.containers.findIndex(x => x.name == key && (checker ? checker(x.type) : true)) != -1;
@@ -108,19 +98,17 @@ function hasselect(key) {
     return has(key, (x) => x == interface_1.DataType.Select);
 }
 function get(key, checker) {
-    var _a, _b, _c;
-    const p = (_a = getpara === null || getpara === void 0 ? void 0 : getpara()) !== null && _a !== void 0 ? _a : undefined;
+    const p = getpara?.() ?? undefined;
     if (p == undefined)
         return undefined;
-    return (_c = (_b = p.containers.find(x => x.name == key && (checker ? checker(x.type) : true))) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : undefined;
+    return p.containers.find(x => x.name == key && (checker ? checker(x.type) : true))?.value ?? undefined;
 }
 function getboolean(key) {
     return get(key, (x) => x == interface_1.DataType.Boolean);
 }
 function getnumber(key) {
-    var _a;
     if (key == 'ck') {
-        const r = (_a = getjob === null || getjob === void 0 ? void 0 : getjob()) === null || _a === void 0 ? void 0 : _a.index;
+        const r = getjob?.()?.index;
         if (r != undefined)
             return r;
         return 0;
@@ -138,19 +126,18 @@ function getlist(key) {
 }
 function getselect(key) {
     const s = get(key, (x) => x == interface_1.DataType.Select);
-    if ((s === null || s === void 0 ? void 0 : s.meta) == undefined)
+    if (s?.meta == undefined)
         return undefined;
     return s.meta[s.value];
 }
 function getselectlendth(key) {
     const s = get(key, (x) => x == interface_1.DataType.Select);
-    if ((s === null || s === void 0 ? void 0 : s.meta) == undefined)
+    if (s?.meta == undefined)
         return undefined;
     return s.meta.length;
 }
 function _set(key, checker, created = true) {
-    var _a;
-    const p = (_a = getpara === null || getpara === void 0 ? void 0 : getpara()) !== null && _a !== void 0 ? _a : undefined;
+    const p = getpara?.() ?? undefined;
     if (p == undefined)
         return undefined;
     if (!p.canWrite)
@@ -191,7 +178,7 @@ function setboolean(key, value) {
     else {
         target.value = value;
     }
-    para === null || para === void 0 ? void 0 : para.feedbackboolean({ key: key, value: value });
+    para?.feedbackboolean({ key: key, value: value });
 }
 function setnumber(key, value) {
     if (key == 'ck') {
@@ -205,7 +192,7 @@ function setnumber(key, value) {
     else {
         target.value = value;
     }
-    para === null || para === void 0 ? void 0 : para.feedbacknumber({ key: key, value: value });
+    para?.feedbacknumber({ key: key, value: value });
 }
 function setstring(key, value) {
     let target = _set(key, (x) => x == interface_1.DataType.String);
@@ -215,7 +202,7 @@ function setstring(key, value) {
     else {
         target.value = value;
     }
-    para === null || para === void 0 ? void 0 : para.feedbackstring({ key: key, value: value });
+    para?.feedbackstring({ key: key, value: value });
 }
 function setobject(key, value) {
     let target = _set(key, (x) => x == interface_1.DataType.Object);
@@ -225,7 +212,7 @@ function setobject(key, value) {
     else {
         target.value = value;
     }
-    para === null || para === void 0 ? void 0 : para.feedbackobject({ key: key, value: value });
+    para?.feedbackobject({ key: key, value: value });
 }
 function setlist(key, value) {
     let target = _set(key, (x) => x == interface_1.DataType.List);
@@ -235,66 +222,22 @@ function setlist(key, value) {
     else {
         target.value = value;
     }
-    para === null || para === void 0 ? void 0 : para.feedbackobject({ key: key, value: value });
+    para?.feedbackobject({ key: key, value: value });
 }
 function setselect(key, value) {
     const target = _set(key, (x) => x == interface_1.DataType.Select);
     if (target == undefined)
         return;
     target.value = value;
-    para === null || para === void 0 ? void 0 : para.feedbackobject({ key: key, value: value });
+    para?.feedbackobject({ key: key, value: value });
 }
 class ClientJavascript {
+    path;
+    os;
+    env;
+    message;
+    http;
     constructor(_messager, _messager_log, _getjob) {
-        this.JavascriptExecuteWithLib = (javascript, libs, log) => {
-            var _a;
-            waiting = 0;
-            let context = this.getJavascriptEnv(interface_1.JavascriptLib.ALL, log);
-            let result = 0;
-            context = Object.assign(context, { result: result });
-            let script = '';
-            const p = (_a = getlib === null || getlib === void 0 ? void 0 : getlib()) !== null && _a !== void 0 ? _a : undefined;
-            if (p != undefined) {
-                libs.forEach(x => {
-                    const t = p.libs.find(y => y.name == x);
-                    if (t != undefined)
-                        script += ("\n" + t.content + "\n");
-                });
-            }
-            script += javascript;
-            const r = (0, exports.safeEval)(script, context);
-            let time = -1;
-            return new Promise((resolve) => {
-                let handle = undefined;
-                handle = setInterval(() => {
-                    if (waiting == 0 && time > 1) {
-                        clearInterval(handle);
-                        resolve(r);
-                    }
-                    time = time + 1;
-                }, 100);
-            });
-        };
-        this.JavascriptExecute = (javascript, log) => {
-            waiting = 0;
-            let context = this.getJavascriptEnv(interface_1.JavascriptLib.OS | interface_1.JavascriptLib.MESSAGE | interface_1.JavascriptLib.HTTP | interface_1.JavascriptLib.PATH, log);
-            let result = 0;
-            context = Object.assign(context, { result: result });
-            let script = '';
-            script += javascript;
-            const r = (0, exports.safeEval)(script, context);
-            let time = -1;
-            return new Promise((resolve) => {
-                let handle = undefined;
-                handle = setInterval(() => {
-                    if (waiting == 0 && time > 1) {
-                        clearInterval(handle);
-                        resolve(r);
-                    }
-                    time = time + 1;
-                }, 100);
-            });
-        };
         messager = _messager;
         messager_log = _messager_log;
         this.path = {
@@ -355,6 +298,63 @@ class ClientJavascript {
             patch: this.httpPatch,
         };
     }
+    static Init = (_messager, _messager_log, _clientos, _para, _getlib, _getpara, _getjob) => {
+        messager = _messager;
+        messager_log = _messager_log;
+        clientos = _clientos;
+        para = _para;
+        getlib = _getlib;
+        getpara = _getpara;
+        getjob = _getjob;
+    };
+    JavascriptExecuteWithLib = (javascript, libs, log) => {
+        waiting = 0;
+        let context = this.getJavascriptEnv(interface_1.JavascriptLib.ALL, log);
+        let result = 0;
+        context = Object.assign(context, { result: result });
+        let script = '';
+        const p = getlib?.() ?? undefined;
+        if (p != undefined) {
+            libs.forEach(x => {
+                const t = p.libs.find(y => y.name == x);
+                if (t != undefined)
+                    script += ("\n" + t.content + "\n");
+            });
+        }
+        script += javascript;
+        const r = (0, exports.safeEval)(script, context);
+        let time = -1;
+        return new Promise((resolve) => {
+            let handle = undefined;
+            handle = setInterval(() => {
+                if (waiting == 0 && time > 1) {
+                    clearInterval(handle);
+                    resolve(r);
+                }
+                time = time + 1;
+            }, 100);
+        });
+    };
+    JavascriptExecute = (javascript, log) => {
+        waiting = 0;
+        let context = this.getJavascriptEnv(interface_1.JavascriptLib.OS | interface_1.JavascriptLib.MESSAGE | interface_1.JavascriptLib.HTTP | interface_1.JavascriptLib.PATH, log);
+        let result = 0;
+        context = Object.assign(context, { result: result });
+        let script = '';
+        script += javascript;
+        const r = (0, exports.safeEval)(script, context);
+        let time = -1;
+        return new Promise((resolve) => {
+            let handle = undefined;
+            handle = setInterval(() => {
+                if (waiting == 0 && time > 1) {
+                    clearInterval(handle);
+                    resolve(r);
+                }
+                time = time + 1;
+            }, 100);
+        });
+    };
     getJavascriptEnv(flags = interface_1.JavascriptLib.ALL, log) {
         let javascriptEnv = {};
         if ((flags & interface_1.JavascriptLib.PATH) == interface_1.JavascriptLib.PATH)
@@ -435,12 +435,12 @@ class ClientJavascript {
     }
     exec(command, args, cwd) {
         waiting += 1;
-        clientos === null || clientos === void 0 ? void 0 : clientos.command_exec(command, args, cwd);
+        clientos?.command_exec(command, args, cwd);
         waiting -= 1;
     }
     command(command, args, cwd) {
         waiting += 1;
-        return clientos === null || clientos === void 0 ? void 0 : clientos.command_sync(command, args, cwd).then(() => {
+        return clientos?.command_sync(command, args, cwd).then(() => {
             waiting -= 1;
         }).catch(() => {
             waiting -= 1;
@@ -450,104 +450,78 @@ class ClientJavascript {
         waiting += 1;
         const cwd = path.join(os.homedir(), interface_1.DATA_FOLDER, 'exe');
         const cc = process.platform == "win32" ? command : "./" + command;
-        clientos === null || clientos === void 0 ? void 0 : clientos.command_exec(cc, args, cwd);
+        clientos?.command_exec(cc, args, cwd);
         waiting -= 1;
     }
     plugin_command(command, args) {
         waiting += 1;
         const cwd = path.join(os.homedir(), interface_1.DATA_FOLDER, 'exe');
         const cc = process.platform == "win32" ? command : "./" + command;
-        return clientos === null || clientos === void 0 ? void 0 : clientos.command_sync(cc, args, cwd).then(() => {
+        return clientos?.command_sync(cc, args, cwd).then(() => {
             waiting -= 1;
         }).catch(() => {
             waiting -= 1;
         });
     }
     copyfile(from, to) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.file_copy({ from: from, to: to });
+        clientos?.file_copy({ from: from, to: to });
     }
     copydir(from, to) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.dir_copy({ from: from, to: to });
+        clientos?.dir_copy({ from: from, to: to });
     }
     deletefile(path) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.file_delete({ path: path });
+        clientos?.file_delete({ path: path });
     }
     deletedir(path) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.dir_delete({ path: path });
+        clientos?.dir_delete({ path: path });
     }
     rename(from, to) {
-        return clientos === null || clientos === void 0 ? void 0 : clientos.rename({ from: from, to: to });
+        return clientos?.rename({ from: from, to: to });
     }
     exist(path) {
-        var _a;
-        return (_a = clientos === null || clientos === void 0 ? void 0 : clientos.fs_exist({ path: path })) !== null && _a !== void 0 ? _a : false;
+        return clientos?.fs_exist({ path: path }) ?? false;
     }
     listfile(path) {
-        return clientos === null || clientos === void 0 ? void 0 : clientos.dir_files({ path: path });
+        return clientos?.dir_files({ path: path });
     }
     listdir(path) {
-        return clientos === null || clientos === void 0 ? void 0 : clientos.dir_dirs({ path: path });
+        return clientos?.dir_dirs({ path: path });
     }
     createdir(path) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.dir_create({ path: path });
+        clientos?.dir_create({ path: path });
     }
     writefile(path, data) {
-        clientos === null || clientos === void 0 ? void 0 : clientos.file_write({ from: path, to: data });
+        clientos?.file_write({ from: path, to: data });
     }
     readfile(path) {
-        return clientos === null || clientos === void 0 ? void 0 : clientos.file_read({ path: path });
+        return clientos?.file_read({ path: path });
     }
-    wait(time) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => setTimeout(resolve, time * 1000));
-        });
+    async wait(time) {
+        return new Promise((resolve) => setTimeout(resolve, time * 1000));
     }
-    sleep(n) {
-        return __awaiter(this, void 0, void 0, function* () {
-            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, n * 1000);
-        });
+    async sleep(n) {
+        Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, n * 1000);
     }
-    httpGet(url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpGo('GET', url, p.toObject());
-        });
+    async httpGet(url, p) {
+        return this.httpGo('GET', url, p.toObject());
     }
-    httpPost(url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpGo('POST', url, p.toObject());
-        });
+    async httpPost(url, p) {
+        return this.httpGo('POST', url, p.toObject());
     }
-    httpDelete(url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpGo('DELETE', url, p.toObject());
-        });
+    async httpDelete(url, p) {
+        return this.httpGo('DELETE', url, p.toObject());
     }
-    httpPatch(url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpGo('PATCH', url, p.toObject());
-        });
+    async httpPatch(url, p) {
+        return this.httpGo('PATCH', url, p.toObject());
     }
-    httpPut(url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.httpGo('PUT', url, p.toObject());
-        });
+    async httpPut(url, p) {
+        return this.httpGo('PUT', url, p.toObject());
     }
-    httpGo(method, url, p) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return fetch(url, {
-                method: method,
-                body: p
-            });
+    async httpGo(method, url, p) {
+        return fetch(url, {
+            method: method,
+            body: p
         });
     }
 }
 exports.ClientJavascript = ClientJavascript;
-ClientJavascript.Init = (_messager, _messager_log, _clientos, _para, _getlib, _getpara, _getjob) => {
-    messager = _messager;
-    messager_log = _messager_log;
-    clientos = _clientos;
-    para = _para;
-    getlib = _getlib;
-    getpara = _getpara;
-    getjob = _getjob;
-};

package/dist/src/client/job_database.d.ts

@@ -0,0 +1,10 @@
+import { Setter } from "../interface";
+export declare class ClientJobDatabase {
+    feedbacknumber: (data: Setter) => void;
+    feedbackboolean: (data: Setter) => void;
+    feedbackstring: (data: Setter) => void;
+    feedbackobject: (data: Setter) => void;
+    feedbacklist: (data: Setter) => void;
+    feedbackselect: (data: Setter) => void;
+    private feedback;
+}

package/dist/src/client/job_database.js

@@ -2,35 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientJobDatabase = void 0;
 class ClientJobDatabase {
-    constructor() {
-        this.feedbacknumber = (data) => {
-            this.feedback("feedbacknumber", data);
+    feedbacknumber = (data) => {
+        this.feedback("feedbacknumber", data);
+    };
+    feedbackboolean = (data) => {
+        this.feedback("feedbackboolean", data);
+    };
+    feedbackstring = (data) => {
+        this.feedback("feedbackstring", data);
+    };
+    feedbackobject = (data) => {
+        this.feedback("feedbackobject", data);
+    };
+    feedbacklist = (data) => {
+        this.feedback("feedbacklist", data);
+    };
+    feedbackselect = (data) => {
+        this.feedback("feedbackselect", data);
+    };
+    feedback = (title, data) => {
+        const p = {
+            name: title,
+            data: {
+                key: data.key,
+                value: data.value
+            }
         };
-        this.feedbackboolean = (data) => {
-            this.feedback("feedbackboolean", data);
-        };
-        this.feedbackstring = (data) => {
-            this.feedback("feedbackstring", data);
-        };
-        this.feedbackobject = (data) => {
-            this.feedback("feedbackobject", data);
-        };
-        this.feedbacklist = (data) => {
-            this.feedback("feedbacklist", data);
-        };
-        this.feedbackselect = (data) => {
-            this.feedback("feedbackselect", data);
-        };
-        this.feedback = (title, data) => {
-            const p = {
-                name: title,
-                data: {
-                    key: data.key,
-                    value: data.value
-                }
-            };
-            console.log(JSON.stringify(p));
-        };
-    }
+        console.log(JSON.stringify(p));
+    };
 }
 exports.ClientJobDatabase = ClientJobDatabase;

package/dist/src/client/job_execute.d.ts

@@ -0,0 +1,20 @@
+import WebSocket from "ws";
+import { Job, Libraries, Messager, Messager_log, Database, PluginList } from "../interface";
+export declare class ClientJobExecute {
+    database: Database | undefined;
+    libraries: Libraries | undefined;
+    tag: string;
+    runtime: string;
+    private messager;
+    private messager_log;
+    private javascript;
+    private os;
+    private para;
+    private job;
+    private plugin;
+    constructor(_messager: Messager, _messager_log: Messager_log, _job: Job, _source: WebSocket | undefined, _plugin: PluginList);
+    execute: () => Promise<string>;
+    stop_all: () => void;
+    private execute_job_exe;
+    private execute_job_con;
+}