verteilen-core 1.2.4 → 1.2.7

package/{dist/test → test}/client/javascript.test.js

@@ -1,13 +1,4 @@
 "use strict";
-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 });
 const job_database_1 = require("../../src/client/job_database");
 const javascript_1 = require("../../src/client/javascript");
@@ -44,17 +35,17 @@ describe("JS Test", () => {
         database = undefined;
         lib = undefined;
     });
-    test("Env test getter", () => __awaiter(void 0, void 0, void 0, function* () {
-        expect(yield js.JavascriptExecuteWithLib(`return env.getnumber("n1");`, [])).toBe(7);
-        expect(yield js.JavascriptExecuteWithLib(`return env.getnumber("n2");`, [])).toBe(5);
-        expect(yield js.JavascriptExecuteWithLib(`return env.getstring("s1");`, [])).toBe("Hello World");
-        expect(yield js.JavascriptExecuteWithLib(`return env.getboolean("b1");`, [])).toBe(true);
-        expect(yield js.JavascriptExecuteWithLib(`return env.getnumber("nnn");`, [])).toBe(undefined);
-        expect(yield js.JavascriptExecuteWithLib(`return env.getstring("sss");`, [])).toBe(undefined);
-        expect(yield js.JavascriptExecuteWithLib(`return env.getboolean("bbb");`, [])).toBe(undefined);
-    }));
-    test("Env test loop", () => __awaiter(void 0, void 0, void 0, function* () {
-        expect(yield js.JavascriptExecuteWithLib(`
+    test("Env test getter", async () => {
+        expect(await js.JavascriptExecuteWithLib(`return env.getnumber("n1");`, [])).toBe(7);
+        expect(await js.JavascriptExecuteWithLib(`return env.getnumber("n2");`, [])).toBe(5);
+        expect(await js.JavascriptExecuteWithLib(`return env.getstring("s1");`, [])).toBe("Hello World");
+        expect(await js.JavascriptExecuteWithLib(`return env.getboolean("b1");`, [])).toBe(true);
+        expect(await js.JavascriptExecuteWithLib(`return env.getnumber("nnn");`, [])).toBe(undefined);
+        expect(await js.JavascriptExecuteWithLib(`return env.getstring("sss");`, [])).toBe(undefined);
+        expect(await js.JavascriptExecuteWithLib(`return env.getboolean("bbb");`, [])).toBe(undefined);
+    });
+    test("Env test loop", async () => {
+        expect(await js.JavascriptExecuteWithLib(`
         result = 0;
         n = env.getnumber("n2");
         for(i=0;i<3;i++){
@@ -62,14 +53,14 @@ describe("JS Test", () => {
         }
         return result;
         `, [])).toBe(15);
-    }));
-    test("Env test has", () => __awaiter(void 0, void 0, void 0, function* () {
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasnumber("n1");`, [])).toBe(true);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasnumber("n2");`, [])).toBe(true);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasstring("s1");`, [])).toBe(true);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasboolean("b1");`, [])).toBe(true);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasnumber("nnn");`, [])).toBe(false);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasstring("sss");`, [])).toBe(false);
-        expect(yield js.JavascriptExecuteWithLib(`return env.hasboolean("bbb");`, [])).toBe(false);
-    }));
+    });
+    test("Env test has", async () => {
+        expect(await js.JavascriptExecuteWithLib(`return env.hasnumber("n1");`, [])).toBe(true);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasnumber("n2");`, [])).toBe(true);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasstring("s1");`, [])).toBe(true);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasboolean("b1");`, [])).toBe(true);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasnumber("nnn");`, [])).toBe(false);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasstring("sss");`, [])).toBe(false);
+        expect(await js.JavascriptExecuteWithLib(`return env.hasboolean("bbb");`, [])).toBe(false);
+    });
 });

package/test/client/server.test.d.ts

@@ -0,0 +1 @@
+export {};

package/test/client/task.test.d.ts

@@ -0,0 +1 @@
+export {};

package/{dist/test → test}/client/task.test.js

@@ -28,7 +28,7 @@ describe("Express Test", () => {
             description: "This is a test task",
             setupjob: false,
             cronjob: cronjob ? true : false,
-            cronjobKey: cronjob !== null && cronjob !== void 0 ? cronjob : "",
+            cronjobKey: cronjob ?? "",
             multi: false,
             multiKey: "",
             properties: property,

package/test/script/parser.test.d.ts

@@ -0,0 +1 @@
+export {};

package/test/script/socket.test.d.ts

@@ -0,0 +1 @@
+export {};

package/tsconfig.json

@@ -1,15 +1,19 @@
 {
   "compilerOptions": {
-    "target": "ES2015",
-    "module": "commonjs",
+    "target": "es2024",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "strict": true,
+    "declaration": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "skipLibCheck": false,
     "forceConsistentCasingInFileNames": true,
     "outDir": "dist",
+    "rootDir": "src",
     "allowJs": true,
     "removeComments": true,
-    "noImplicitAny": false,
-  }
+    "noImplicitAny": false
+  },
+  "exclude": ["coverage", "test", "index.ts", "jest.config.js", "dist"]
 }

package/dist/jest.config.js

@@ -1,8 +0,0 @@
-"use strict";
-module.exports = {
-    verbose: true,
-    testEnvironment: "node",
-    transform: {
-        "^.+\.tsx?$": ["ts-jest", {}],
-    }
-};

package/dist/src/client/analysis.js

@@ -1,383 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        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.ClientAnalysis = void 0;
-const child_process_1 = require("child_process");
-const interface_1 = require("../interface");
-const client_1 = require("./client");
-const execute_1 = require("./execute");
-const shell_1 = require("./shell");
-const fs_1 = require("fs");
-const path = __importStar(require("path"));
-const os = __importStar(require("os"));
-class ClientAnalysis {
-    constructor(_messager, _messager_log, _client) {
-        this.resource_wanter = [];
-        this.resource_thread = undefined;
-        this.resource_cache = undefined;
-        this.analysis = (h, source) => {
-            const typeMap = {
-                'execute_job': this.execute_job,
-                'release': this.release,
-                'stop_job': this.stop_all,
-                'set_database': this.set_database,
-                'set_libs': this.set_libs,
-                'shell_folder': this.shell.shell_folder,
-                'open_shell': this.shell.open_shell,
-                'close_shell': this.shell.close_shell,
-                'enter_shell': this.shell.enter_shell,
-                'resource_start': this.resource_start,
-                'resource_end': this.resource_end,
-                'ping': this.pong,
-                'plugin_info': this.plugin_info,
-                'plugin_download': this.plugin_download,
-                'plugin_remove': this.plugin_remove,
-            };
-            if (h == undefined) {
-                this.messager_log('[Client Analysis] Analysis Failed, Value is undefined');
-                return 1;
-            }
-            if (h.message != undefined && h.message.length > 0) {
-                this.messager_log(`[Client Analysis] ${h.message}`);
-            }
-            if (h.data == undefined) {
-                this.messager_log('[Client Analysis] Analysis Warn, Data is undefined');
-                h.data = 0;
-            }
-            if (typeMap.hasOwnProperty(h.name)) {
-                const castingFunc = typeMap[h.name];
-                castingFunc(h.data, source, h.channel);
-                return 0;
-            }
-            else {
-                this.messager_log(`[Client Analysis] Analysis Failed, Unknowed header, name: ${h.name}, meta: ${h.meta}`);
-                return 2;
-            }
-        };
-        this.execute_job = (job, source, channel) => {
-            if (channel == undefined)
-                return;
-            const target = this.exec_checker(channel);
-            target.execute_job(job, source);
-        };
-        this.release = (dummy, source, channel) => {
-            if (channel == undefined)
-                return;
-            const index = this.exec.findIndex(x => x.uuid == channel);
-            if (index == -1)
-                return;
-            this.exec.splice(index, 1);
-        };
-        this.set_database = (data, source, channel) => {
-            if (channel == undefined)
-                return;
-            const target = this.exec_checker(channel);
-            target.set_database(data);
-        };
-        this.set_libs = (data, source, channel) => {
-            if (channel == undefined)
-                return;
-            const target = this.exec_checker(channel);
-            target.set_libs(data);
-        };
-        this.exec_checker = (uuid) => {
-            let r = undefined;
-            const index = this.exec.findIndex(x => x.uuid == uuid);
-            if (index == -1) {
-                r = new execute_1.ClientExecute(uuid, this.messager, this.messager_log, this.client);
-                this.exec.push(r);
-            }
-            else {
-                r = this.exec[index];
-            }
-            return r;
-        };
-        this.pong = (data, source) => {
-            const h = { name: 'pong', data: data };
-            source.send(JSON.stringify(h));
-        };
-        this.plugin_info = (data, source) => {
-            const pat = path.join(os.homedir(), interface_1.DATA_FOLDER, "plugin.json");
-            if ((0, fs_1.existsSync)(pat)) {
-                const p = JSON.parse((0, fs_1.readFileSync)(pat).toString());
-                const h = { name: 'plugin_info_reply', data: p.plugins };
-                source.send(JSON.stringify(h));
-            }
-            else {
-                const p = { plugins: [] };
-                const h = { name: 'plugin_info_reply', data: p.plugins };
-                (0, fs_1.writeFileSync)(pat, JSON.stringify(p));
-                source.send(JSON.stringify(h));
-            }
-        };
-        this.get_releases = (repo, token) => __awaiter(this, void 0, void 0, function* () {
-            const qu = yield fetch(`https://api.github.com/repos/${repo}/releases`, {
-                headers: {
-                    Authorization: token ? `token ${token}` : '',
-                    Accept: "application/vnd.github.v3.raw",
-                }
-            });
-            return qu.text();
-        });
-        this.filterout = (repo, token, version, filename) => __awaiter(this, void 0, void 0, function* () {
-            const text = yield this.get_releases(repo, token);
-            const json = JSON.parse(text);
-            const v = json.find(x => x.tag_name == version);
-            if (!v)
-                return;
-            const f = v.assets.find(x => x.name == filename);
-            if (!f)
-                return;
-            return f.id;
-        });
-        this.write_plugin = (t, plugin, source) => {
-            const list = this.client.plugins.plugins;
-            const index = list.findIndex(x => x.name == plugin.name);
-            plugin.token = t ? [t] : [];
-            plugin.progress = 0;
-            if (index == -1) {
-                list.push(plugin);
-            }
-            else {
-                list[index] = plugin;
-            }
-            this.client.savePlugin();
-            this.plugin_info(0, source);
-        };
-        this.finish_plugin = (plugin, source) => {
-            const list = this.client.plugins.plugins;
-            const index = list.findIndex(x => x.name == plugin.name);
-            plugin.progress = 1;
-            if (index == -1) {
-                list.push(plugin);
-            }
-            else {
-                list[index] = plugin;
-            }
-            this.client.savePlugin();
-            this.plugin_info(0, source);
-        };
-        this.plugin_download = (plugin, source) => __awaiter(this, void 0, void 0, function* () {
-            const target = plugin.contents.find(x => x.arch == process.arch && x.platform == process.platform);
-            if (target == undefined) {
-                this.messager_log(`[Plugin] Cannot find target plugin for ${plugin.name} on ${process.platform} ${process.arch}`);
-                return;
-            }
-            const links = target.url.split('/');
-            const filename = links[links.length - 1];
-            const version = links[links.length - 2];
-            const REPO = `${links[3]}/${links[4]}`;
-            const dir = path.join(os.homedir(), interface_1.DATA_FOLDER, "exe");
-            if (!(0, fs_1.existsSync)(dir))
-                (0, fs_1.mkdirSync)(dir, { recursive: true });
-            let req = {};
-            const tokens = [undefined, ...plugin.token];
-            const fileStream = (0, fs_1.createWriteStream)(path.join(dir, target.filename), { flags: 'a' });
-            let pass = false;
-            for (let t of tokens) {
-                if (pass)
-                    break;
-                try {
-                    const id = yield this.filterout(REPO, t, version, filename);
-                    req = {
-                        method: 'GET',
-                        credentials: 'include',
-                        headers: {
-                            Authorization: t ? `token ${t}` : '',
-                            Accept: "application/octet-stream"
-                        }
-                    };
-                    const url = `https://api.github.com/repos/${REPO}/releases/assets/${id}`;
-                    fetch(url, req).then((res) => __awaiter(this, void 0, void 0, function* () {
-                        if (!res.ok) {
-                            throw new Error(`Failed to download file: ${res.status} ${res.statusText}`);
-                        }
-                        this.write_plugin(t, plugin, source);
-                        return res.blob();
-                    })).then(blob => {
-                        return blob.stream().getReader().read();
-                    })
-                        .then(reader => {
-                        if (!reader.done) {
-                            fileStream.write(Buffer.from(reader.value));
-                        }
-                    }).finally(() => {
-                        this.messager_log(`[Plugin] Downloaded ${plugin.name} successfully`);
-                        fileStream.end();
-                        if (process.platform == 'linux') {
-                            (0, child_process_1.exec)(`chmod +x ${path.join(dir, target.filename)}`, (err) => {
-                                this.messager_log(`[Plugin] Permission failed ${err === null || err === void 0 ? void 0 : err.message}`);
-                            });
-                        }
-                        this.finish_plugin(plugin, source);
-                        pass = true;
-                    });
-                }
-                catch (err) {
-                    this.messager_log(`[Plugin] Download failed for ${plugin.name}: ${err.message}`);
-                }
-            }
-        });
-        this.plugin_remove = (plugin, source) => {
-            this.client.plugins.plugins = this.client.plugins.plugins.filter(x => x.name != plugin.name);
-            this.client.savePlugin();
-            const dir = path.join(os.homedir(), interface_1.DATA_FOLDER, "exe");
-            if (!(0, fs_1.existsSync)(dir))
-                (0, fs_1.mkdirSync)(dir, { recursive: true });
-            plugin.contents.forEach(x => {
-                if ((0, fs_1.existsSync)(path.join(dir, x.filename))) {
-                    (0, fs_1.rmSync)(path.join(dir, x.filename));
-                }
-            });
-            this.plugin_info(0, source);
-        };
-        this.resource_start = (data, source) => {
-            this.resource_wanter.push(source);
-            this.messager_log(`Register resource_wanter!, count: ${this.resource_wanter.length}`);
-            if (this.resource_cache != undefined)
-                source.send(JSON.stringify(this.resource_cache));
-        };
-        this.resource_end = (data, source) => {
-            const index = this.resource_wanter.findIndex(x => x == source);
-            if (index != -1) {
-                this.resource_wanter.splice(index, 1);
-                this.messager_log(`UnRegister resource_wanter!, count: ${this.resource_wanter.length}`);
-            }
-        };
-        this.update = (client) => {
-            this.resource_require();
-            if (this.resource_cache != undefined) {
-                this.resource_wanter.forEach(x => x.send(JSON.stringify(this.resource_cache)));
-            }
-        };
-        this.disconnect = (source) => {
-            this.shell.disconnect(source);
-            this.exec.forEach(x => x.stop_job());
-        };
-        this.stop_all = () => {
-            this.exec.forEach(x => x.stop_job());
-        };
-        this.destroy = () => {
-            if (this.resource_thread != undefined)
-                this.resource_thread.kill();
-        };
-        this.resource_require = () => {
-            var _a, _b, _c, _d;
-            if (this.resource_thread != undefined)
-                return;
-            const shouldRun = this.resource_thread == undefined && (this.resource_cache == undefined || this.resource_wanter.length > 0);
-            if (!shouldRun)
-                return;
-            this.resource_thread = (0, child_process_1.spawn)(client_1.Client.workerPath(), [], {
-                stdio: ['inherit', 'pipe', 'pipe'],
-                shell: true,
-                windowsHide: true,
-                env: Object.assign(Object.assign({}, process.env), { type: "RESOURCE", cache: this.resource_cache == undefined ? undefined : JSON.stringify(this.resource_cache.data) })
-            });
-            let k = "";
-            const workerFeedbackExec = (str) => {
-                try {
-                    const msg = JSON.parse(str);
-                    if (msg.name == 'messager') {
-                        this.messager(msg.data, "RESOURCE");
-                    }
-                    else if (msg.name == 'messager_log') {
-                        this.messager_log(msg.data, "RESOURCE");
-                    }
-                    else if (msg.name == 'resource') {
-                        const h = {
-                            name: 'system_info',
-                            data: msg.data
-                        };
-                        this.resource_cache = h;
-                        this.resource_wanter.forEach(x => x.send(JSON.stringify(h)));
-                    }
-                    else if (msg.name == 'error') {
-                        if (msg.data instanceof String)
-                            this.messager_log(msg.data.toString(), "RESOURCE");
-                        else
-                            this.messager_log(JSON.stringify(msg.data), "RESOURCE");
-                    }
-                }
-                catch (err) {
-                    console.log("str: " + str);
-                    console.log(err.name + "\n" + err.message);
-                }
-            };
-            const workerFeedback = (str) => {
-                for (let i = 0; i < str.length; i++) {
-                    if (str[i] != '\n')
-                        k += str[i];
-                    else {
-                        workerFeedbackExec(k);
-                        k = '';
-                    }
-                }
-            };
-            this.resource_thread.on('error', (err) => {
-                this.messager_log(`[Worker Error] ${err}`);
-            });
-            this.resource_thread.on('exit', (code, signal) => {
-                this.resource_thread = undefined;
-            });
-            this.resource_thread.on('message', (message, sendHandle) => {
-                workerFeedback(message.toString());
-            });
-            (_a = this.resource_thread.stdout) === null || _a === void 0 ? void 0 : _a.setEncoding('utf8');
-            (_b = this.resource_thread.stdout) === null || _b === void 0 ? void 0 : _b.on('data', (chunk) => {
-                workerFeedback(chunk.toString());
-            });
-            (_c = this.resource_thread.stderr) === null || _c === void 0 ? void 0 : _c.setEncoding('utf8');
-            (_d = this.resource_thread.stderr) === null || _d === void 0 ? void 0 : _d.on('data', (chunk) => {
-                workerFeedback(chunk.toString());
-            });
-        };
-        this.client = _client;
-        this.messager = _messager;
-        this.messager_log = _messager_log;
-        this.shell = new shell_1.ClientShell(_messager, _messager_log, this.client);
-        this.exec = [];
-    }
-}
-exports.ClientAnalysis = ClientAnalysis;