verteilen-core 1.4.21 → 1.4.23

package/dist/server/io2.d.ts

@@ -1,23 +1,4 @@
 import { MemoryData, RecordIOBase, RecordLoader } from "./io";
-/**
- * **Create the interface for record memory storage**\
- * Generate a loader interface for register to server event
- * @param loader loader memory loader interface
- * @returns Interface for server calling
- */
 export declare const CreateRecordMemoryLoader: (loader: MemoryData) => RecordLoader;
-/**
- * **Create the interface for record files storage**\
- * Generate a loader interface for register to server event
- * @param loader loader IO loader interface
- * @param user should include user
- * @returns Interface for server calling
- */
 export declare const CreateRecordIOLoader: (loader: RecordIOBase, memory: MemoryData) => RecordLoader;
-/**
- * **Create the interface for record mongoDB storage**\
- * @param url MongoDB URL
- * @param memory loader memory loader interface
- * @returns
- */
 export declare const CreateRecordMongoLoader: (url: string, memory: MemoryData) => RecordLoader;

package/dist/server/io2.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { MongoClient } from "mongodb";
 import { RecordType, ACLType, SERECT, MONGODB_NAME, } from "../interface";
 import jwt from 'jsonwebtoken';
@@ -82,13 +77,6 @@ const obsoleteSupport = async (loader, type, folder) => {
         loader.rm(path);
     }
 };
-/**
- * **Create the interface for record memory storage**\
- * Generate a loader interface for register to server event
- * @param loader Memory loader interface
- * @param type Type of storage
- * @returns Interface for calling
- */
 const _CreateRecordMemoryLoader = (loader, type) => {
     const get_array = (type) => {
         switch (type) {
@@ -308,16 +296,6 @@ const _CreateRecordMemoryLoader = (loader, type) => {
         }
     };
 };
-/**
- * **Create the interface for record files storage**\
- * Generate a loader interface for register to server event
- * @param loader File loader interface
- * @param memory Memory loader interface
- * @param type Type of storage
- * @param folder Folder name
- * @param ext Store file extension
- * @returns Interface for calling
- */
 const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
     const mem = _CreateRecordMemoryLoader(memory, type);
     return {
@@ -344,9 +322,7 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
         },
         delete_all: async (token) => {
             const root = loader.join(loader.root, folder);
-            // Memory action
             const c = await mem.delete_all(token);
-            // Get the removed uuids and delete from disk
             const kill_all = c.map(x => {
                 return loader.rm(loader.join(root, x + ext));
             });
@@ -391,15 +367,6 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
         }
     };
 };
-/**
- * **Create the interface for record mongoDB storage**\
- * @param loader MongoDB loader client
- * @param memory Memory loader interface
- * @param type Type of storage
- * @param db Database name
- * @param collection Collection from database
- * @returns Interface for calling
- */
 const _CreateRecordMongoLoader = (loader, memory, type, db, collection) => {
     const mem = _CreateRecordMemoryLoader(memory, type);
     return {
@@ -417,11 +384,9 @@ const _CreateRecordMongoLoader = (loader, memory, type, db, collection) => {
             return mem.load_all(token);
         },
         delete_all: async (token) => {
-            // Memory action
             const c = await mem.delete_all(token);
             const database = loader.db(db);
             const col = database.collection(collection);
-            // Get the removed uuids and delete from disk
             const exec = c.map(x => {
                 return col.deleteOne({ uuid: x });
             });
@@ -454,12 +419,6 @@ const _CreateRecordMongoLoader = (loader, memory, type, db, collection) => {
         }
     };
 };
-/**
- * **Create the interface for record memory storage**\
- * Generate a loader interface for register to server event
- * @param loader loader memory loader interface
- * @returns Interface for server calling
- */
 export const CreateRecordMemoryLoader = (loader) => {
     return {
         project: _CreateRecordMemoryLoader(loader, RecordType.PROJECT),
@@ -472,13 +431,6 @@ export const CreateRecordMemoryLoader = (loader) => {
         user: _CreateRecordMemoryLoader(loader, RecordType.USER),
     };
 };
-/**
- * **Create the interface for record files storage**\
- * Generate a loader interface for register to server event
- * @param loader loader IO loader interface
- * @param user should include user
- * @returns Interface for server calling
- */
 export const CreateRecordIOLoader = (loader, memory) => {
     return {
         project: _CreateRecordIOLoader(loader, memory, RecordType.PROJECT, "project"),
@@ -491,12 +443,6 @@ export const CreateRecordIOLoader = (loader, memory) => {
         user: _CreateRecordIOLoader(loader, memory, RecordType.USER, "user"),
     };
 };
-/**
- * **Create the interface for record mongoDB storage**\
- * @param url MongoDB URL
- * @param memory loader memory loader interface
- * @returns
- */
 export const CreateRecordMongoLoader = (url, memory) => {
     const loader = new MongoClient(url);
     return {

package/dist/server/module/account.d.ts

@@ -3,11 +3,5 @@ export declare class Account_Module {
     loader: RecordLoader;
     memory: MemoryData;
     constructor(loader: RecordLoader, memory: MemoryData);
-    /**
-     * If login failed, it will throw error
-     * @param username Login Username Field
-     * @param password Login Password Field
-     * @returns Token string
-     */
     login: (username: string, password: string) => Promise<string>;
 }

package/dist/server/module/account.js

@@ -1,8 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import jwt from 'jsonwebtoken';
 import { SERECT } from '../../interface';
 export class Account_Module {
@@ -12,12 +7,6 @@ export class Account_Module {
         this.loader = loader;
         this.memory = memory;
     }
-    /**
-     * If login failed, it will throw error
-     * @param username Login Username Field
-     * @param password Login Password Field
-     * @returns Token string
-     */
     login = async (username, password) => {
         const data = await this.loader.user.load_all();
         const users = data.map(x => JSON.parse(x));

package/dist/server/module/project.d.ts

@@ -8,64 +8,15 @@ export declare class Project_Module {
     get loader(): RecordLoader;
     ProjectJobCount(uuid: string): Promise<number>;
     ReOrderProjectTask(uuid: string, uuids: Array<string>): Promise<void>;
-    /**
-     * Assign real data to instance
-     * @param uuid Project UUID
-     */
     PopulateProject(uuid: string): Promise<Project | undefined>;
-    /**
-     * Assign real data to instance
-     * @param uuid Task UUID
-     */
     PopulateTask(uuid: string): Promise<Task | undefined>;
-    /**
-     * Get tasks from project related
-     * @param uuid Project UUID
-     * @returns Related Tasks
-     */
     GetProjectRelatedTask(uuid: string): Promise<Array<Task>>;
-    /**
-     * Get jobs from task related
-     * @param uuid Task UUID
-     * @returns Related Jobs
-     */
     GetTaskRelatedJob(uuid: string): Promise<Array<Job>>;
-    /**
-     * Clone Project Container
-     * @param uuids project uuids
-     * @returns The new uuids list
-     */
     CloneProjects(uuids: Array<string>): Promise<Array<string>>;
-    /**
-     * Clone Task Container
-     * @param uuids task uuids
-     * @returns The new uuids list
-     */
     CloneTasks(uuids: Array<string>): Promise<Array<string>>;
-    /**
-     * Clone Job Container
-     * @param uuids job uuids
-     * @returns The new uuids list
-     */
     CloneJobs(uuids: Array<string>): Promise<Array<string>>;
-    /**
-     * Delete project related data and project itself
-     * @param uuid Project UUID
-     */
     CascadeDeleteProject(uuid: string, bind: boolean): Promise<void>;
-    /**
-     * Delete Task related data and project itself
-     * @param uuid Task UUID
-     */
     CascadeDeleteTask(uuid: string): Promise<void>;
-    /**
-     * Delete Task related data and project itself
-     * @param uuid Task UUID
-     */
     CascadeDeleteJob(uuid: string): Promise<void>;
-    /**
-     * Delete idle database
-     * @param uuid Database UUID
-     */
-    Delete_Database_Idle(uuid: string): Promise<any>;
+    Delete_Database_Idle(uuid: string): Promise<void>;
 }

package/dist/server/module/project.js

@@ -23,10 +23,6 @@ export class Project_Module {
         p.tasks_uuid = uuids;
         this.loader.project.save(uuid, JSON.stringify(p, null, 4));
     }
-    /**
-     * Assign real data to instance
-     * @param uuid Project UUID
-     */
     async PopulateProject(uuid) {
         await this.loader.project.load(uuid);
         const p = this.memory.projects.find(p => p.uuid == uuid);
@@ -37,10 +33,6 @@ export class Project_Module {
         buffer.tasks = (await Promise.all(ts)).filter(x => x != undefined);
         return buffer;
     }
-    /**
-     * Assign real data to instance
-     * @param uuid Task UUID
-     */
     async PopulateTask(uuid) {
         await this.loader.task.load(uuid);
         const p = this.memory.tasks.find(p => p.uuid == uuid);
@@ -54,11 +46,6 @@ export class Project_Module {
         buffer.jobs = (await Promise.all(js)).filter(x => x != undefined);
         return buffer;
     }
-    /**
-     * Get tasks from project related
-     * @param uuid Project UUID
-     * @returns Related Tasks
-     */
     async GetProjectRelatedTask(uuid) {
         await this.loader.project.load(uuid);
         const p = this.memory.projects.find(x => x.uuid == uuid);
@@ -71,11 +58,6 @@ export class Project_Module {
         const tasks = p.tasks_uuid.map(x => this.memory.tasks.find(y => y.uuid == x)).filter(x => x != undefined);
         return tasks;
     }
-    /**
-     * Get jobs from task related
-     * @param uuid Task UUID
-     * @returns Related Jobs
-     */
     async GetTaskRelatedJob(uuid) {
         await this.loader.task.load(uuid);
         const p = this.memory.tasks.find(x => x.uuid == uuid);
@@ -88,11 +70,6 @@ export class Project_Module {
         const jobs = p.jobs_uuid.map(x => this.memory.jobs.find(y => y.uuid == x)).filter(x => x != undefined);
         return jobs;
     }
-    /**
-     * Clone Project Container
-     * @param uuids project uuids
-     * @returns The new uuids list
-     */
     async CloneProjects(uuids) {
         const p = uuids.map(x => this.loader.project.load(x));
         const ps = await Promise.all(p);
@@ -107,11 +84,6 @@ export class Project_Module {
         await Promise.all(js);
         return projects.map(x => x.uuid);
     }
-    /**
-     * Clone Task Container
-     * @param uuids task uuids
-     * @returns The new uuids list
-     */
     async CloneTasks(uuids) {
         const p = uuids.map(x => this.loader.task.load(x));
         const ps = await Promise.all(p);
@@ -126,11 +98,6 @@ export class Project_Module {
         await Promise.all(js);
         return tasks.map(x => x.uuid);
     }
-    /**
-     * Clone Job Container
-     * @param uuids job uuids
-     * @returns The new uuids list
-     */
     async CloneJobs(uuids) {
         const p = uuids.map(x => this.loader.job.load(x));
         const ps = await Promise.all(p);
@@ -140,10 +107,6 @@ export class Project_Module {
         await Promise.all(js);
         return jobs.map(x => x.uuid);
     }
-    /**
-     * Delete project related data and project itself
-     * @param uuid Project UUID
-     */
     async CascadeDeleteProject(uuid, bind) {
         await this.loader.project.load(uuid);
         const p = this.memory.projects.find(p => p.uuid == uuid);
@@ -156,10 +119,6 @@ export class Project_Module {
         if (bind)
             await this.Delete_Database_Idle(db);
     }
-    /**
-     * Delete Task related data and project itself
-     * @param uuid Task UUID
-     */
     async CascadeDeleteTask(uuid) {
         await this.loader.task.load(uuid);
         const p = this.memory.tasks.find(p => p.uuid == uuid);
@@ -175,10 +134,6 @@ export class Project_Module {
                 this.memory.projects.splice(index, 1);
         }
     }
-    /**
-     * Delete Task related data and project itself
-     * @param uuid Task UUID
-     */
     async CascadeDeleteJob(uuid) {
         await this.loader.job.delete(uuid);
         const ps2 = this.memory.tasks.filter(x => x.jobs_uuid.includes(uuid)).map(x => x.uuid);
@@ -188,10 +143,6 @@ export class Project_Module {
                 this.memory.tasks.splice(index, 1);
         }
     }
-    /**
-     * Delete idle database
-     * @param uuid Database UUID
-     */
     async Delete_Database_Idle(uuid) {
         return this.loader.project.load_all().then(() => {
             const f = this.memory.projects.find(x => x.database_uuid == uuid);

package/dist/server/plugin.d.ts

@@ -1,67 +1,16 @@
 import { RecordIOBase } from "./io";
 import { PluginPageData, WebsocketPack } from "../interface";
 import { PluginFeedback } from "./server";
-/**
- * Get socket from websocket client method
- */
 export type SocketGetter = (uuid: string) => WebsocketPack | undefined;
-/**
- * **Plugin Function Interface**\
- * Use for access the plugin store function
- */
 export interface PluginLoader {
-    /**
-     * Loading all plugins
-     */
     load_all: () => Promise<PluginPageData>;
-    /**
-     * Loading plugins from cache
-     */
     get_plugins: () => Promise<PluginPageData>;
-    /**
-     * Get project template
-     * @param name Plugin name
-     * @param group Group search
-     * @param filename Template filename
-     */
     get_project: (name: string, group: string, filename: string) => Promise<string> | undefined;
-    /**
-     * Get database template
-     * @param name Plugin name
-     * @param group Group search
-     * @param filename Template filename
-     */
     get_database: (name: string, group: string, filename: string) => Promise<string> | undefined;
-    /**
-     * Import plugin from web
-     * @param name Plugin name
-     * @param url The URL for plugin manifest
-     * @param token Token list, use space to seperate
-     */
     import_plugin: (name: string, url: string, token: string) => Promise<PluginPageData>;
-    /**
-     * Delete plugin by name
-     * @param name Plugin name
-     */
     delete_plugin: (name: string) => Promise<void>;
-    /**
-     * Telling node Download plugin
-     * @param uuid Node ID
-     * @param plugin Plugin name
-     * @param token Token list, use space to seperate
-     */
     plugin_download: (uuid: string, plugin: string, tokens: string) => Promise<void>;
-    /**
-     * Telling node Remove plugin
-     * @param uuid Node ID
-     * @param plugin Plugin name
-     */
     plugin_remove: (uuid: string, plugin: string) => Promise<void>;
 }
-/**
- * **Get Current Plugin List**
- * @param loader The file io loader
- * @returns Current list in disk storage
- */
 export declare const GetCurrentPlugin: (loader: RecordIOBase) => Promise<PluginPageData>;
 export declare const CreatePluginLoader: (loader: RecordIOBase, memory: PluginPageData, socket: SocketGetter, feedback: PluginFeedback) => PluginLoader;

package/dist/server/plugin.js

@@ -1,8 +1,3 @@
-/**
- * **Get Current Plugin List**
- * @param loader The file io loader
- * @returns Current list in disk storage
- */
 export const GetCurrentPlugin = async (loader) => {
     return new Promise(async (resolve) => {
         const b = {
@@ -77,14 +72,10 @@ export const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 await loader.mkdir(project_folder);
             if (!loader.exists(database_folder))
                 await loader.mkdir(database_folder);
-            // Trying no token first
             const tokens = [undefined, ...token.split(' ')];
             let req = {};
             let ob = undefined;
             for (let t of tokens) {
-                // Do not store cache
-                // Even tho, some website have it's own CDN policy, You might still get old data
-                // But most of them only sustained couple minutes
                 req = t == undefined ? { method: 'GET', cache: "no-store" } : {
                     method: 'GET',
                     cache: "no-store",
@@ -92,7 +83,6 @@ export const CreatePluginLoader = (loader, memory, socket, feedback) => {
                         "Authorization": t ? `Bearer ${t}` : ''
                     }
                 };
-                // Get data
                 let tex = "";
                 try {
                     const res = await fetch(url, req);
@@ -106,7 +96,6 @@ export const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 }
             }
             if (ob == undefined) {
-                // Query data failed
                 const p = { title: "Import Failed", type: "error", message: `Cannot find the json from url ${url}, or maybe just the wrong token` };
                 const h = { name: "makeToast", data: JSON.stringify(p) };
                 if (feedback.electron) {
@@ -122,7 +111,6 @@ export const CreatePluginLoader = (loader, memory, socket, feedback) => {
             const folder = url.substring(0, url.lastIndexOf('/'));
             const project_calls = ob.projects.map(p => fetch(folder + "/project/" + p.filename + '.json', req));
             const database_calls = ob.databases.map(p => fetch(folder + "/database/" + p.filename + '.json', req));
-            // * Project template query
             const pss = await Promise.all(project_calls);
             const project_calls2 = pss.map(x => x.text());
             const pss_result = await Promise.all(project_calls2);
@@ -137,7 +125,6 @@ export const CreatePluginLoader = (loader, memory, socket, feedback) => {
                     error_children.push([`Import Project ${n} Error`, error.message]);
                 }
             });
-            // * Database template query
             const pss2 = await Promise.all(database_calls);
             const database_calls2 = pss2.map(x => x.text());
             const pss_result2 = await Promise.all(database_calls2);

package/dist/server/server.d.ts

@@ -11,19 +11,8 @@ export type Caller_Socket = (data: any) => void;
 export type TypeMap = {
     [key: string]: Function;
 };
-/**
- * **Backend Feedback**\
- * The config that which {@link ServerDetail} require to use\
- * Depends on what input value it have, it could have different type of response
- */
 export interface PluginFeedback {
-    /**
-     * Eletron feedback
-     */
     electron: (() => (Caller_Electron | undefined)) | undefined;
-    /**
-     * WebServer feedback
-     */
     socket: Caller_Socket | undefined;
 }
 export declare class ServerBase {
@@ -38,16 +27,6 @@ export declare class ServerBase {
     module_project: Project_Module;
     constructor();
     get current_loader(): RecordLoader;
-    /**
-     * **Data: Memory**\
-     * Load every type of data from disk, store them into memory
-     */
     LoadFromDisk: () => Promise<Array<Array<string>>>;
-    /**
-     * **Broadcast To Console**\
-     * Send messages to all console server
-     * @param name channel
-     * @param data raw data
-     */
     Boradcasting: (name: string, data: any) => void;
 }

package/dist/server/server.js

@@ -30,10 +30,6 @@ export class ServerBase {
             return this.loader;
         return this.memory_loader;
     }
-    /**
-     * **Data: Memory**\
-     * Load every type of data from disk, store them into memory
-     */
     LoadFromDisk = () => {
         const ts = [
             this.current_loader.project.fetch_all(),
@@ -47,12 +43,6 @@ export class ServerBase {
         ];
         return Promise.all(ts);
     };
-    /**
-     * **Broadcast To Console**\
-     * Send messages to all console server
-     * @param name channel
-     * @param data raw data
-     */
     Boradcasting = (name, data) => {
         const d = {
             name: name,

package/dist/server/server2.d.ts

@@ -1,7 +1,3 @@
 import { ServerBase } from "./server";
-/**
- * **Compute Server**\
- * The task schedule server
- */
 export declare class Server extends ServerBase {
 }

package/dist/server/server2.js

@@ -1,12 +1,3 @@
-// ========================
-//                           
-//      Share Codebase     
-//                           
-// ========================
 import { ServerBase } from "./server";
-/**
- * **Compute Server**\
- * The task schedule server
- */
 export class Server extends ServerBase {
 }

package/dist/server.d.ts

@@ -1,6 +1,3 @@
-/**
- * Server Components
- */
 export * from './server/detail';
 export * from './server/io';
 export * from './server/plugin';

package/dist/server.js

@@ -1,6 +1,3 @@
-/**
- * Server Components
- */
 export * from './server/detail';
 export * from './server/io';
 export * from './server/plugin';

package/jest.config.js

@@ -0,0 +1,11 @@
+import { createDefaultPreset } from "ts-jest"
+
+const tsJestTransformCfg = createDefaultPreset().transform;
+
+/** @type {import("jest").Config} **/
+export default {
+  testEnvironment: "node",
+  transform: {
+    ...tsJestTransformCfg,
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "verteilen-core",
-  "version": "1.4.21",
+  "version": "1.4.23",
   "license": "MIT",
   "type": "module",
   "homepage": "https://verteilen.github.io/wiki/",
@@ -12,7 +12,8 @@
     "url": "https://github.com/Verteilen/Verteilen-Core/issues"
   },
   "scripts": {
-    "test": "jest --coverage"
+    "test": "jest --coverage",
+    "test:init": "ts-jest config:init"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",

package/src/client/client.ts

@@ -75,7 +75,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())
         })

package/src/computed.ts

@@ -22,8 +22,4 @@ export * as Execute_WebhookServerManager from './script/webhook_server_manager'
  */
 export * as ServerWorker from './server/server2'
 export * as ServerIO from './server/io2'
-export * as ServerModule_Account from './server/module/account'
-/**
- * Util Components
- */
-export * as UtilPort from './util/port'
+export * as ServerModule_Account from './server/module/account'

package/src/interface/struct.ts

@@ -7,8 +7,8 @@
  * All kinds of data structure
  * It's a mess, i know
  */
+import * as ws from 'ws'
 import { Job } from "./base"
-import ws from 'ws'
 import { ServiceMode, TaskLogicType } from "./enum"
 import { Plugin } from "./plugin"
 

package/src/script/webhook_server_manager.ts

@@ -39,7 +39,7 @@ export class WebhookServerManager {
             res.end('HTTPS server is running');
         })
         this.httpss.addListener('upgrade', (req, res, head) => console.log('UPGRADE:', req.url))
-        this.server = new ws.Server({server: this.httpss})
+        this.server = new ws.WebSocketServer({server: this.httpss})
         this.server.on('listening', () => {
             this.messager_log('[Server] Listen PORT: ' + port_result.toString())
         })

package/test/call/print.ts

@@ -1,4 +1,4 @@
-import { CreateRecordIOLoader, DATA_FOLDER, RecordIOBase, Server } from '../../src'
+import { CreateRecordIOLoader, DATA_FOLDER, RecordIOBase, Server } from '../../src/index'
 import * as path from 'path'
 import * as os from 'os'
 import * as fs from "fs";