verteilen-core 1.2.17 → 1.2.18

package/dist/server/plugin.js

@@ -7,8 +7,8 @@ const GetCurrentPlugin = async (loader) => {
             plugins: [],
             templates: []
         };
-        const root = loader.join(loader.root, 'plugin');
-        const root2 = loader.join(loader.root, 'template');
+        const root = loader.join(loader.root, 'template');
+        const root2 = loader.join(loader.root, 'plugin');
         if (!loader.exists(root))
             await loader.mkdir(root);
         if (!loader.exists(root2))

package/package.json

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

package/src/server/plugin.ts

@@ -43,8 +43,8 @@ export const GetCurrentPlugin = async (loader:RecordIOBase):Promise<PluginPageDa
             plugins: [],
             templates: []
         }
-        const root = loader.join(loader.root, 'plugin')
-        const root2 = loader.join(loader.root, 'template')
+        const root = loader.join(loader.root, 'template')
+        const root2 = loader.join(loader.root, 'plugin')
         if(!loader.exists(root)) await loader.mkdir(root)
         if(!loader.exists(root2)) await loader.mkdir(root2)
 

package/test/server/plugin.test.ts

@@ -0,0 +1,35 @@
+import * as path from "path"
+import * as os from "os"
+import * as fsp from "fs/promises"
+import * as fs from "fs"
+import { GetCurrentPlugin } from "../../src/server/plugin"
+import { DATA_FOLDER } from "../../src/interface"
+import { RecordIOBase } from "../../src/server/io"
+
+const CreateIO = ():RecordIOBase => {
+    return {
+        root: path.join(os.homedir(), DATA_FOLDER),
+        join: path.join,
+        read_dir: (path:string) => fsp.readdir(path, { withFileTypes: false }),
+        read_dir_dir: (path:string) => fsp.readdir(path, { withFileTypes: true }).then(x => x.filter(y => !y.isFile()).map(y => y.name)),
+        read_dir_file: (path:string) => fsp.readdir(path, { withFileTypes: true }).then(x => x.filter(y => y.isFile()).map(y => y.name)),
+        read_string: (path:string, options?:any) => fsp.readFile(path, options).then(x => x.toString('utf-8')),
+        write_string: (path:string, content:string) => fsp.writeFile(path, content),
+        exists: (path:string) => fs.existsSync(path),
+        mkdir: async (path:string) => { await fsp.mkdir(path, {recursive: true}) },
+        rm: (path:string) => fsp.rm(path, {recursive: true}),
+        cp: (path:string, newpath:string) => fsp.cp(path, newpath)
+    }
+}
+
+describe("Get plugin test", () => {
+    test("Query plugin", async () => {
+        const plugin = await GetCurrentPlugin(CreateIO())
+        const p = await fsp.readdir(path.join(os.homedir(), DATA_FOLDER, "plugin"), { withFileTypes: true })
+        const t = await fsp.readdir(path.join(os.homedir(), DATA_FOLDER, "template"), { withFileTypes: true })
+        const p2 = p.filter(x => x.isFile()).map(x => x.name)
+        const t2 = t.filter(x => x.isFile()).map(x => x.name)
+        expect(plugin.plugins.length).toBe(p2.length)
+        expect(plugin.templates.length).toBe(t2.length)
+    })
+})

package/test/TEST.d.ts

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

package/test/TEST.js

@@ -1,88 +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;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const pem = __importStar(require("pem"));
-const https = __importStar(require("https"));
-const ws = __importStar(require("ws"));
-let h = undefined;
-let w = undefined;
-async function get_pem() {
-    return new Promise(resolve => {
-        pem.createCertificate({ days: 1, selfSigned: true }, (err, keys) => {
-            resolve([keys.clientKey, keys.certificate]);
-        });
-    });
-}
-async function start_server() {
-    const pems = await get_pem();
-    h = https.createServer({ key: pems[0], cert: pems[1], minVersion: 'TLSv1.2', maxVersion: 'TLSv1.3' }, (req, res) => {
-        res.writeHead(200);
-        res.end('HTTPS server is running');
-    });
-    h.addListener('upgrade', (req, res, head) => console.log('UPGRADE:', req.url));
-    w = new ws.Server({ server: h });
-    w.on('listening', (socket) => {
-        console.log("Listen Event");
-    });
-    w.on('error', (err) => {
-        console.log("Error Event");
-    });
-    w.on('connection', (socket) => {
-        socket.on('message', (data) => {
-            console.log("Recevied Data: ", data.toString());
-        });
-    });
-    h.listen(10000, () => {
-        console.log("Listen to 10000");
-    });
-}
-async function start_client() {
-    return new Promise((resolve) => {
-        const cli = new ws.WebSocket("wss://127.0.0.1:10000", { agent: new https.Agent(), rejectUnauthorized: false });
-        cli.on('error', (err) => {
-            console.log("Socket Error: ", err);
-        });
-        setTimeout(() => {
-            cli.send("Hello World");
-            cli.close();
-            resolve(undefined);
-        }, 1000);
-    });
-}
-async function main() {
-    await start_server();
-    await start_client();
-}
-main();

package/test/client/execute.test.d.ts

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

package/test/client/execute.test.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const job_execute_1 = require("../../src/client/job_execute");
-const interface_1 = require("../../src/interface");
-describe("Client Execute Test", () => {
-    let execute = undefined;
-    let job = undefined;
-    afterAll(() => {
-        execute = undefined;
-    });
-    test("Testing condition (OS when path not exist)", async () => {
-        job = {
-            index: 0,
-            uuid: "UUID",
-            runtime_uuid: "Runtime",
-            category: interface_1.JobCategory.Condition,
-            type: interface_1.JobType2.CHECK_PATH,
-            script: "",
-            string_args: ["Not Exist"],
-            number_args: [],
-            boolean_args: [],
-            id_args: [],
-        };
-        execute = new job_execute_1.ClientJobExecute((str) => console.log(str), (str) => console.log(str), job, undefined, { plugins: [] });
-        await expect(execute.execute()).rejects.toBeDefined();
-    });
-    test("Testing condition (OS when path exist)", async () => {
-        job = {
-            index: 0,
-            uuid: "UUID",
-            runtime_uuid: "Runtime",
-            category: interface_1.JobCategory.Condition,
-            type: interface_1.JobType2.CHECK_PATH,
-            script: "",
-            string_args: [process.cwd()],
-            number_args: [],
-            boolean_args: [],
-            id_args: [],
-        };
-        execute = new job_execute_1.ClientJobExecute((str) => console.log(str), (str) => console.log(str), job, undefined, { plugins: [] });
-        await expect(execute.execute()).resolves.toBeDefined();
-    });
-});

package/test/client/javascript.test.d.ts

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

package/test/client/javascript.test.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const job_database_1 = require("../../src/client/job_database");
-const javascript_1 = require("../../src/client/javascript");
-const os_1 = require("../../src/client/os");
-const interface_1 = require("../../src/interface");
-describe("JS Test", () => {
-    let js = undefined;
-    let os = undefined;
-    let para = undefined;
-    let database = undefined;
-    let lib = undefined;
-    beforeAll(() => {
-        os = new os_1.ClientOS(() => "", () => "", (str) => console.log(str), (str) => console.log(str));
-        para = new job_database_1.ClientJobDatabase();
-        database = {
-            uuid: "",
-            title: "",
-            canWrite: true,
-            containers: [
-                { name: "n1", type: interface_1.DataType.Number, value: 7, hidden: false, runtimeOnly: false },
-                { name: "n2", type: interface_1.DataType.Number, value: 5, hidden: false, runtimeOnly: false },
-                { name: "s1", type: interface_1.DataType.String, value: "Hello World", hidden: false, runtimeOnly: false },
-                { name: "b1", type: interface_1.DataType.Boolean, value: true, hidden: false, runtimeOnly: false },
-                { name: "e1", type: interface_1.DataType.Expression, value: 0, meta: "n1 + n2", hidden: false, runtimeOnly: false },
-            ]
-        };
-        js = new javascript_1.ClientJavascript((str) => console.log(str), (str) => console.log(str), () => undefined);
-        javascript_1.ClientJavascript.Init((str) => console.log(str), (str) => console.log(str), os, para, () => lib, () => database, () => undefined);
-    });
-    afterAll(() => {
-        js = undefined;
-        os = undefined;
-        para = undefined;
-        database = undefined;
-        lib = undefined;
-    });
-    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++){
-            result += n;
-        }
-        return result;
-        `, [])).toBe(15);
-    });
-    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

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

package/test/client/server.test.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-describe("Client Test", () => {
-    let client;
-    beforeAll(() => {
-    });
-    afterAll(() => {
-    });
-    test("Check init state", () => {
-    });
-});

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

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

package/test/client/task.test.js

@@ -1,137 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const job_database_1 = require("../../src/client/job_database");
-const os_1 = require("../../src/client/os");
-const interface_1 = require("../../src/interface");
-const base_1 = require("../../src/script/execute/base");
-describe("Express Test", () => {
-    let os = undefined;
-    let para = undefined;
-    let database = undefined;
-    let lib = undefined;
-    const generateJob = (str) => {
-        return {
-            uuid: "test-job",
-            category: interface_1.JobCategory.Execution,
-            type: interface_1.JobType.JAVASCRIPT,
-            script: "",
-            string_args: str,
-            number_args: [],
-            boolean_args: [],
-            id_args: [],
-        };
-    };
-    const generateTask = (Job, property, cronjob) => {
-        return {
-            uuid: "test-task",
-            title: "Test Task",
-            description: "This is a test task",
-            setupjob: false,
-            cronjob: cronjob ? true : false,
-            cronjobKey: cronjob ?? "",
-            multi: false,
-            multiKey: "",
-            properties: property,
-            jobs: [Job],
-        };
-    };
-    beforeEach(() => {
-        os = new os_1.ClientOS(() => "", () => "", (str) => console.log(str), (str) => console.log(str));
-        para = new job_database_1.ClientJobDatabase();
-        database = {
-            uuid: "",
-            title: "",
-            canWrite: true,
-            containers: [
-                { name: "n1", type: interface_1.DataType.Number, value: 7, hidden: false, runtimeOnly: false },
-                { name: "n2", type: interface_1.DataType.Number, value: 5, hidden: false, runtimeOnly: false },
-                { name: "DATA_0", type: interface_1.DataType.Number, value: 10, hidden: false, runtimeOnly: false },
-                { name: "DATA_1", type: interface_1.DataType.Number, value: 1000, hidden: false, runtimeOnly: false },
-                { name: "HELLO_0", type: interface_1.DataType.Number, value: 99, hidden: false, runtimeOnly: false },
-                { name: "HELLO_1", type: interface_1.DataType.Number, value: 9999, hidden: false, runtimeOnly: false },
-                { name: "s1", type: interface_1.DataType.String, value: "Hello World", hidden: false, runtimeOnly: false },
-                { name: "b1", type: interface_1.DataType.Boolean, value: true, hidden: false, runtimeOnly: false },
-                { name: "e1", type: interface_1.DataType.Expression, value: 0, meta: "n1+n2", hidden: false, runtimeOnly: false },
-                { name: "b1", type: interface_1.DataType.Object, value: {
-                        data: [{ k: 5, p: 5, n: 5 }, { k: 10, p: 122, n: 5 }]
-                    }, hidden: false, runtimeOnly: false },
-            ]
-        };
-    });
-    afterEach(() => {
-        os = undefined;
-        para = undefined;
-        database = undefined;
-        lib = undefined;
-    });
-    test("Property getter", () => {
-        const job = generateJob(["%e1%", "KKK %s1%", "%POS%"]);
-        const task = generateTask(job, [{
-                name: "POS",
-                expression: "n1 + n2 + n1"
-            }]);
-        base_1.ExecuteManager_Base.string_args_transform(task, job, (str) => console.log(str), database, 1);
-        expect(job.string_args[0]).toBe("12");
-        expect(job.string_args[1]).toBe("KKK Hello World");
-        expect(job.string_args[2]).toBe("19");
-    });
-    test("Nest getter", () => {
-        const job = generateJob(["%POS%", "Hello %POS_Deep%", "%POS_Deepp%"]);
-        const task = generateTask(job, [
-            {
-                name: "POS",
-                expression: `STRING(["b1.data.", ck, ".p"])`
-            },
-            {
-                name: "POS_Deep",
-                expression: "POS",
-                deep: 2
-            },
-            {
-                name: "POS_Deepp",
-                expression: "POS_Deep + 1"
-            }
-        ]);
-        base_1.ExecuteManager_Base.string_args_transform(task, job, (str) => console.log(str), database, 1);
-        expect(job.string_args[0]).toBe("b1.data.1.p");
-        expect(job.string_args[1]).toBe("Hello 122");
-        expect(job.string_args[2]).toBe("123");
-    });
-    test("_ck_ getter 0", () => {
-        const job = generateJob(["%p1%", "%p2%"]);
-        const task = generateTask(job, [
-            {
-                name: "p1",
-                expression: `DATA__ck_`
-            },
-            {
-                name: "p2",
-                expression: "HELLO__ck_",
-            },
-        ]);
-        base_1.ExecuteManager_Base.string_args_transform(task, job, (str) => console.log(str), database, 0);
-        expect(job.string_args[0]).toBe("10");
-        expect(job.string_args[1]).toBe("99");
-    });
-    test("_ck_ getter 1", () => {
-        const job = generateJob(["%p1%", "%p2%"]);
-        const task = generateTask(job, [
-            {
-                name: "p1",
-                expression: `DATA__ck_`
-            },
-            {
-                name: "p2",
-                expression: "HELLO__ck_",
-            },
-        ]);
-        base_1.ExecuteManager_Base.string_args_transform(task, job, (str) => console.log(str), database, 1);
-        expect(job.string_args[0]).toBe("1000");
-        expect(job.string_args[1]).toBe("9999");
-    });
-    test("Cronjob Key Testing", () => {
-        expect(base_1.ExecuteManager_Base.get_number_global("e1", database)).toBe(12);
-        expect(base_1.ExecuteManager_Base.get_number_global("n1", database)).toBe(7);
-        expect(base_1.ExecuteManager_Base.get_number_global("b1.data.0.p", database)).toBe(5);
-    });
-});

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

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

package/test/script/parser.test.js

@@ -1,109 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const interface_1 = require("../../src/interface");
-const util_parser_1 = require("../../src/script/execute/util_parser");
-describe('Parser testing (Replace Text Feature)', () => {
-    test("Single replace", () => {
-        expect(util_parser_1.Util_Parser.replaceAll('E %YYY% KK', '%YYY%', '6')).toBe('E 6 KK');
-    });
-    test("Multiple replace", () => {
-        expect(util_parser_1.Util_Parser.replaceAll('E %YYY% KK %YYY%', '%YYY%', '6')).toBe('E 6 KK 6');
-    });
-});
-describe('Parser testing (ToKeyValue)', () => {
-    let p = undefined;
-    beforeAll(() => {
-        p = { uuid: '', title: '', canWrite: true, containers: [
-                { name: 'n1', value: 0, type: interface_1.DataType.Number, hidden: false, runtimeOnly: false },
-                { name: 's1', value: "Test", type: interface_1.DataType.Number, hidden: false, runtimeOnly: false },
-                { name: 'b1', value: true, type: interface_1.DataType.Number, hidden: false, runtimeOnly: false },
-            ] };
-    });
-    afterAll(() => {
-        p = undefined;
-    });
-    test("Testing value transform", () => {
-        const a = util_parser_1.Util_Parser.to_keyvalue(p);
-        expect(a.length).toBe(3);
-        expect(a[0].key).toBe("n1");
-        expect(a[0].value).toBe("0");
-        expect(a[1].key).toBe("s1");
-        expect(a[1].value).toBe("Test");
-        expect(a[2].key).toBe("b1");
-        expect(a[2].value).toBe("true");
-    });
-});
-describe('Parser testing (replacePara)', () => {
-    let p = undefined;
-    let e = undefined;
-    beforeAll(() => {
-        p = { uuid: '', title: '', canWrite: true, containers: [
-                { name: 'n1', value: 7, type: interface_1.DataType.Number, hidden: false, runtimeOnly: false },
-                { name: 'n2', value: 9, type: interface_1.DataType.Number, hidden: false, runtimeOnly: false },
-                { name: 's1', value: "Test", type: interface_1.DataType.String, hidden: false, runtimeOnly: false },
-                { name: 'b1', value: true, type: interface_1.DataType.Boolean, hidden: false, runtimeOnly: false },
-                { name: 'o1', value: {
-                        t: "Test", t2: "Hello",
-                        deep: { d: "World" },
-                        data: [{ iframe: 5, p: 5, n: 5 }, { iframe: 10, p: 5, n: 5 }]
-                    }, type: interface_1.DataType.Object, hidden: false, runtimeOnly: false },
-                { name: 'Se1', value: 0, meta: [123456], config: { types: [interface_1.DataTypeBase.Number] }, type: interface_1.DataType.Select, hidden: false, runtimeOnly: false },
-                { name: 'Li1', value: ["Hello", "World"], type: interface_1.DataType.List, hidden: false, runtimeOnly: false },
-            ] };
-        e = new util_parser_1.Util_Parser([...util_parser_1.Util_Parser.to_keyvalue(p), { key: 'ck', value: 1 }]);
-    });
-    afterAll(() => {
-        p = undefined;
-        e = undefined;
-    });
-    test("Number replace", () => {
-        expect(e.replacePara("%n1% Hello")).toBe("7 Hello");
-    });
-    test("String replace", () => {
-        expect(e.replacePara("%s1% Hello")).toBe("Test Hello");
-        expect(e.replacePara("%s1%/%s1%/Hello")).toBe("Test/Test/Hello");
-    });
-    test("Boolean replace", () => {
-        expect(e.replacePara("%b1% Hello")).toBe("true Hello");
-    });
-    test("Expression replace", () => {
-        expect(e.replacePara("%{ n1 * n2 }% Hello")).toBe("63 Hello");
-    });
-    test("Expression replace include index", () => {
-        expect(e.replacePara("%{ n_ck_ * n2 }% Hello")).toBe("63 Hello");
-    });
-    test("Prevent Failed Expression replace", () => {
-        expect(e.replacePara("%{ n1 * OK }% Hello")).toBe("0 Hello");
-    });
-    test("Prevent replace", () => {
-        expect(e.replacePara("%OK% Hello")).toBe("%OK% Hello");
-    });
-    test("Object replace", () => {
-        expect(e.replacePara("%o1.t%")).toBe("Test");
-        expect(e.replacePara("%o1.t2%")).toBe("Hello");
-        expect(e.replacePara("%o1.deep.d%")).toBe("World");
-        expect(e.replacePara("%o1.data.length%")).toBe("2");
-        expect(e.replacePara("%o1.data.length%")).toBe("2");
-        expect(e.replacePara("%o1.data.length%")).toBe("2");
-        expect(e.replacePara("%o1.data.0.iframe%")).toBe("5");
-        expect(e.replacePara("%o1.data.1.iframe%")).toBe("10");
-    });
-    test("List replace one", () => {
-        expect(e.replacePara("Hello %Li1.1%")).toBe("Hello World");
-    });
-    test("List replace both", () => {
-        expect(e.replacePara("%Li1.0% %Li1.1%")).toBe("Hello World");
-    });
-    test("List Length replace", () => {
-        expect(e.replacePara("D%Li1.length%")).toBe("D2");
-    });
-    test("List Length replace", () => {
-        expect(e.replacePara("D%Li1.length%")).toBe("D2");
-    });
-    test("Select replace", () => {
-        expect(e.replacePara("D%Se1%")).toBe("D123456");
-    });
-    test("Ignore", () => {
-        expect(e.replacePara("^%05d.png")).toBe("%05d.png");
-    });
-});

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

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

package/test/script/socket.test.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-describe("Execute Manager Test", () => {
-    let socket;
-    beforeAll(() => {
-    });
-    afterAll(() => {
-        socket = undefined;
-    });
-    test("Check init state", () => {
-    });
-});