verteilen-core 1.3.1 → 1.3.2

package/dist/interface/enum.d.ts

@@ -45,7 +45,12 @@ export declare enum ResourceType {
 export declare enum FrontendUpdate {
     ALL = 1023,
     PROJECT = 1,
-    PARAMETER = 2
+    TASK = 2,
+    JOB = 4,
+    DATABASE = 8,
+    NODE = 16,
+    SERVICE = 32,
+    LOG = 64
 }
 export declare enum JobCategory {
     Condition = 0,
@@ -92,12 +97,6 @@ export declare enum ExecuteState {
     ERROR = 3,
     SKIP = 4
 }
-export declare enum RenderUpdateType {
-    All = 127,
-    Project = 1,
-    Node = 2,
-    Database = 4
-}
 export declare enum RecordType {
     PROJECT = 0,
     TASK = 1,

package/dist/interface/enum.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DatabaseTemplateText = exports.ProjectTemplateText = exports.JobType2Text = exports.JobTypeText = exports.JobResultText = exports.ConnectionText = exports.JobCategoryText = exports.ExecuteStateText = exports.DataTypeText = exports.ServiceMode = exports.JavascriptLib = exports.RecordType = exports.RenderUpdateType = exports.ExecuteState = exports.DatabaseTemplate = exports.ProjectTemplate = exports.JobType2 = exports.JobType = exports.ConditionResult = exports.JobCategory = exports.FrontendUpdate = exports.ResourceType = exports.DataTypeBase = exports.BackendType = exports.DataType = exports.SocketState = exports.TaskLogicType = void 0;
+exports.DatabaseTemplateText = exports.ProjectTemplateText = exports.JobType2Text = exports.JobTypeText = exports.JobResultText = exports.ConnectionText = exports.JobCategoryText = exports.ExecuteStateText = exports.DataTypeText = exports.ServiceMode = exports.JavascriptLib = exports.RecordType = exports.ExecuteState = exports.DatabaseTemplate = exports.ProjectTemplate = exports.JobType2 = exports.JobType = exports.ConditionResult = exports.JobCategory = exports.FrontendUpdate = exports.ResourceType = exports.DataTypeBase = exports.BackendType = exports.DataType = exports.SocketState = exports.TaskLogicType = void 0;
 var TaskLogicType;
 (function (TaskLogicType) {
     TaskLogicType[TaskLogicType["GROUP"] = 0] = "GROUP";
@@ -55,7 +55,12 @@ var FrontendUpdate;
 (function (FrontendUpdate) {
     FrontendUpdate[FrontendUpdate["ALL"] = 1023] = "ALL";
     FrontendUpdate[FrontendUpdate["PROJECT"] = 1] = "PROJECT";
-    FrontendUpdate[FrontendUpdate["PARAMETER"] = 2] = "PARAMETER";
+    FrontendUpdate[FrontendUpdate["TASK"] = 2] = "TASK";
+    FrontendUpdate[FrontendUpdate["JOB"] = 4] = "JOB";
+    FrontendUpdate[FrontendUpdate["DATABASE"] = 8] = "DATABASE";
+    FrontendUpdate[FrontendUpdate["NODE"] = 16] = "NODE";
+    FrontendUpdate[FrontendUpdate["SERVICE"] = 32] = "SERVICE";
+    FrontendUpdate[FrontendUpdate["LOG"] = 64] = "LOG";
 })(FrontendUpdate || (exports.FrontendUpdate = FrontendUpdate = {}));
 var JobCategory;
 (function (JobCategory) {
@@ -109,13 +114,6 @@ var ExecuteState;
     ExecuteState[ExecuteState["ERROR"] = 3] = "ERROR";
     ExecuteState[ExecuteState["SKIP"] = 4] = "SKIP";
 })(ExecuteState || (exports.ExecuteState = ExecuteState = {}));
-var RenderUpdateType;
-(function (RenderUpdateType) {
-    RenderUpdateType[RenderUpdateType["All"] = 127] = "All";
-    RenderUpdateType[RenderUpdateType["Project"] = 1] = "Project";
-    RenderUpdateType[RenderUpdateType["Node"] = 2] = "Node";
-    RenderUpdateType[RenderUpdateType["Database"] = 4] = "Database";
-})(RenderUpdateType || (exports.RenderUpdateType = RenderUpdateType = {}));
 var RecordType;
 (function (RecordType) {
     RecordType[RecordType["PROJECT"] = 0] = "PROJECT";

package/dist/server/io.js

@@ -110,8 +110,8 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
                 arr[b] = JSON.parse(data);
         },
         load: async (name, cache) => {
+            const arr = get_array(type);
             if (cache) {
-                const arr = get_array(type);
                 const b = arr.findIndex(x => x.uuid == name);
                 if (b != -1)
                     return arr[b];
@@ -120,7 +120,10 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
             if (!loader.exists(root))
                 await loader.mkdir(root);
             const file = loader.join(root, name + ext);
-            return loader.read_string(file);
+            const a = await loader.read_string(file);
+            if (cache)
+                arr.push(JSON.parse(a));
+            return a;
         },
         rename: async (name, newname) => {
             const root = loader.join(loader.root, folder);

package/dist/server/observer.d.ts

@@ -0,0 +1,33 @@
+import { RecordType } from "../interface";
+import { RecordIOLoader, RecordLoader } from "./io";
+export interface EventObserverAction {
+    loaded: (type: RecordType) => void;
+    changed: (type: RecordType) => void;
+}
+export declare class EventObserver implements RecordLoader {
+    loader: RecordLoader;
+    action: EventObserverAction;
+    constructor(loader: RecordLoader, action: EventObserverAction);
+    get project(): RecordIOLoader;
+    get task(): RecordIOLoader;
+    get job(): RecordIOLoader;
+    get database(): RecordIOLoader;
+    get node(): RecordIOLoader;
+    get log(): RecordIOLoader;
+    get lib(): RecordIOLoader;
+    get user(): RecordIOLoader;
+}
+export declare class ProxyRecordIOLoader implements RecordIOLoader {
+    loader: RecordIOLoader;
+    type: RecordType;
+    action: EventObserverAction;
+    constructor(loader: RecordIOLoader, type: RecordType, action: EventObserverAction);
+    load_all: () => Promise<Array<string>>;
+    delete_all: () => Promise<void>;
+    list_all: () => Promise<Array<string>>;
+    save: (name: string, data: string) => Promise<void>;
+    load: (name: string, cache: boolean) => Promise<string>;
+    rename: (name: string, newname: string) => Promise<void>;
+    delete: (name: string) => Promise<void>;
+}
+export declare const CreateEventObserver: (loader: RecordLoader, event: EventObserverAction) => EventObserver;

package/dist/server/observer.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateEventObserver = exports.ProxyRecordIOLoader = exports.EventObserver = void 0;
+const interface_1 = require("../interface");
+class EventObserver {
+    loader;
+    action;
+    constructor(loader, action) {
+        this.loader = loader;
+        this.action = action;
+        this.loader.project = new ProxyRecordIOLoader(loader.project, interface_1.RecordType.PROJECT, action);
+        this.loader.task = new ProxyRecordIOLoader(loader.task, interface_1.RecordType.TASK, action);
+        this.loader.job = new ProxyRecordIOLoader(loader.job, interface_1.RecordType.JOB, action);
+        this.loader.database = new ProxyRecordIOLoader(loader.database, interface_1.RecordType.DATABASE, action);
+        this.loader.node = new ProxyRecordIOLoader(loader.node, interface_1.RecordType.NODE, action);
+        this.loader.log = new ProxyRecordIOLoader(loader.log, interface_1.RecordType.LOG, action);
+        this.loader.lib = new ProxyRecordIOLoader(loader.lib, interface_1.RecordType.LIB, action);
+        this.loader.user = new ProxyRecordIOLoader(loader.user, interface_1.RecordType.USER, action);
+    }
+    get project() { return this.loader.project; }
+    get task() { return this.loader.task; }
+    get job() { return this.loader.job; }
+    get database() { return this.loader.database; }
+    get node() { return this.loader.node; }
+    get log() { return this.loader.log; }
+    get lib() { return this.loader.lib; }
+    get user() { return this.loader.user; }
+}
+exports.EventObserver = EventObserver;
+class ProxyRecordIOLoader {
+    loader;
+    type;
+    action;
+    constructor(loader, type, action) {
+        this.loader = loader;
+        this.type = type;
+        this.action = action;
+    }
+    load_all = () => {
+        return this.loader.load_all().then(x => {
+            this.action.loaded(this.type);
+            return x;
+        });
+    };
+    delete_all = () => {
+        return this.loader.delete_all().then(() => this.action.changed(this.type));
+    };
+    list_all = () => this.loader.list_all();
+    save = (name, data) => {
+        return this.loader.save(name, data).then(() => this.action.changed(this.type));
+    };
+    load = (name, cache) => {
+        return this.loader.load(name, cache).then(x => {
+            this.action.loaded(this.type);
+            return x;
+        });
+    };
+    rename = (name, newname) => {
+        return this.loader.rename(name, newname).then(() => this.action.changed(this.type));
+    };
+    delete = (name) => {
+        return this.loader.delete(name).then(() => this.action.changed(this.type));
+    };
+}
+exports.ProxyRecordIOLoader = ProxyRecordIOLoader;
+const CreateEventObserver = (loader, event) => {
+    return new EventObserver(loader, event);
+};
+exports.CreateEventObserver = CreateEventObserver;

package/dist/server/server.d.ts

@@ -2,6 +2,7 @@ import { Execute_ConsoleServerManager, PluginPageData } from "../interface";
 import { ServerDetail } from "./detail";
 import { MemoryData, RecordIOBase, RecordLoader } from "./io";
 import { Project_Module } from "./module/project";
+import { EventObserver } from "./observer";
 import { PluginLoader } from "./plugin";
 export type Caller_Electron_Send = (channel: string, ...args: any[]) => void;
 export interface Caller_Electron {
@@ -20,7 +21,7 @@ export declare class Server {
     memory: MemoryData;
     plugin: PluginPageData;
     io: RecordIOBase | undefined;
-    loader: RecordLoader | undefined;
+    loader: RecordLoader | EventObserver | undefined;
     plugin_loader: PluginLoader | undefined;
     memory_loader: RecordLoader;
     detail: ServerDetail | undefined;

package/dist/server.d.ts

@@ -1,5 +1,6 @@
 export * from './server/detail';
 export * from './server/io';
+export * from './server/observer';
 export * from './server/plugin';
 export * from './server/server';
 export * from './server/module/project';

package/dist/server.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./server/detail"), exports);
 __exportStar(require("./server/io"), exports);
+__exportStar(require("./server/observer"), exports);
 __exportStar(require("./server/plugin"), exports);
 __exportStar(require("./server/server"), exports);
 __exportStar(require("./server/module/project"), exports);

package/package.json

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

package/src/interface/enum.ts

@@ -79,7 +79,12 @@ export enum ResourceType {
 export enum FrontendUpdate {
     ALL = ~(~0 << 10),
     PROJECT = 1 << 0,
-    PARAMETER = 1 << 1,
+    TASK = 1 << 1,
+    JOB = 1 << 2,
+    DATABASE = 1 << 3,
+    NODE = 1 << 4,
+    SERVICE = 1 << 5,
+    LOG = 1 << 6,
 }
 /**
  * **Job Category Type**
@@ -138,13 +143,6 @@ export enum DatabaseTemplate {
 export enum ExecuteState {
     NONE, RUNNING, FINISH, ERROR, SKIP
 }
-
-export enum RenderUpdateType {
-    All= ~(~0 << 7),
-    Project = 1 << 0, 
-    Node = 1 << 1, 
-    Database = 1 << 2
-}
 /**
  * **Database Table Type**
  */

package/src/server/io.ts

@@ -13,7 +13,6 @@ import {
     Node,
     Task,
     Job,
-    DataHeader,
 } from "../interface"
 
 export interface MemoryData {
@@ -40,7 +39,10 @@ export interface RecordIOLoader {
     rename: (name:string, newname:string) => Promise<void>
     delete: (name:string) => Promise<void>
 }
-
+/**
+ * **IO Loader Worker**\
+ * Fetch data from storage space, could be disk or mongoDB
+ */
 export interface RecordLoader {
     project: RecordIOLoader
     task: RecordIOLoader
@@ -190,15 +192,17 @@ export const _CreateRecordIOLoader = (loader:RecordIOBase, memory:MemoryData, ty
             else arr[b] = JSON.parse(data)
         },
         load: async (name:string, cache: boolean):Promise<string> => {
+            const arr = get_array(type)
             if(cache){
-                const arr = get_array(type)
                 const b = arr.findIndex(x => x.uuid == name)
                 if(b != -1) return arr[b]
             }
             const root = loader.join(loader.root, folder)
             if(!loader.exists(root)) await loader.mkdir(root)
             const file = loader.join(root, name + ext)
-            return loader.read_string(file)
+            const a = await loader.read_string(file)
+            if(cache) arr.push(JSON.parse(a))
+            return a
         },
         rename: async (name:string, newname:string):Promise<void> => {
             const root = loader.join(loader.root, folder)

package/src/server/observer.ts

@@ -0,0 +1,76 @@
+import { RecordType } from "../interface";
+import { RecordIOLoader, RecordLoader } from "./io";
+
+export interface EventObserverAction {
+    loaded:(type:RecordType) => void
+    changed:(type:RecordType) => void
+}
+
+export class EventObserver implements RecordLoader {
+    loader:RecordLoader
+    action:EventObserverAction
+
+    constructor(loader:RecordLoader, action:EventObserverAction){
+        this.loader = loader
+        this.action = action
+        this.loader.project = new ProxyRecordIOLoader(loader.project, RecordType.PROJECT, action)
+        this.loader.task = new ProxyRecordIOLoader(loader.task, RecordType.TASK, action)
+        this.loader.job = new ProxyRecordIOLoader(loader.job, RecordType.JOB, action)
+        this.loader.database = new ProxyRecordIOLoader(loader.database, RecordType.DATABASE, action)
+        this.loader.node = new ProxyRecordIOLoader(loader.node, RecordType.NODE, action)
+        this.loader.log = new ProxyRecordIOLoader(loader.log, RecordType.LOG, action)
+        this.loader.lib = new ProxyRecordIOLoader(loader.lib, RecordType.LIB, action)
+        this.loader.user = new ProxyRecordIOLoader(loader.user, RecordType.USER, action)
+    }
+
+    public get project() : RecordIOLoader { return this.loader.project }
+    public get task() : RecordIOLoader { return this.loader.task }
+    public get job() : RecordIOLoader { return this.loader.job }
+    public get database() : RecordIOLoader { return this.loader.database }
+    public get node() : RecordIOLoader { return this.loader.node }
+    public get log() : RecordIOLoader { return this.loader.log }
+    public get lib() : RecordIOLoader { return this.loader.lib }
+    public get user() : RecordIOLoader { return this.loader.user }
+}
+
+export class ProxyRecordIOLoader implements RecordIOLoader {
+    loader:RecordIOLoader
+    type: RecordType
+    action:EventObserverAction
+
+    constructor(loader:RecordIOLoader, type: RecordType, action:EventObserverAction){
+        this.loader = loader
+        this.type = type
+        this.action = action
+    }
+
+    load_all = (): Promise<Array<string>> => {
+        return this.loader.load_all().then(x => {
+            this.action.loaded(this.type)
+            return x
+        })
+    }
+    delete_all = (): Promise<void> => {
+        return this.loader.delete_all().then(() => this.action.changed(this.type))
+    }
+    list_all = (): Promise<Array<string>> => this.loader.list_all()
+    save = (name: string, data: string): Promise<void> => {
+        return this.loader.save(name, data).then(() => this.action.changed(this.type))
+    }
+    load = (name: string, cache: boolean): Promise<string> => {
+        return this.loader.load(name, cache).then(x => {
+            this.action.loaded(this.type)
+            return x
+        })
+    }
+    rename = (name: string, newname: string): Promise<void> => {
+        return this.loader.rename(name, newname).then(() => this.action.changed(this.type))
+    }
+    delete = (name: string): Promise<void> => {
+        return this.loader.delete(name).then(() => this.action.changed(this.type))
+    }
+}
+
+export const CreateEventObserver = (loader:RecordLoader, event:EventObserverAction):EventObserver => {
+    return new EventObserver(loader, event)
+}

package/src/server/server.ts

@@ -7,6 +7,7 @@ import { Execute_ConsoleServerManager, Header, PluginPageData } from "../interfa
 import { ServerDetail } from "./detail";
 import { CreateRecordMemoryLoader, MemoryData, RecordIOBase, RecordLoader } from "./io";
 import { Project_Module } from "./module/project";
+import { EventObserver } from "./observer";
 import { PluginLoader } from "./plugin";
 
 export type Caller_Electron_Send = (channel: string, ...args: any[]) => void
@@ -53,7 +54,7 @@ export class Server {
         plugins: [],
     }
     io:RecordIOBase | undefined = undefined
-    loader:RecordLoader | undefined = undefined
+    loader:RecordLoader | EventObserver | undefined = undefined
     plugin_loader: PluginLoader | undefined = undefined
     memory_loader:RecordLoader
     detail: ServerDetail | undefined

package/src/server.ts

@@ -3,6 +3,7 @@
  */
 export * from './server/detail'
 export * from './server/io'
+export * from './server/observer'
 export * from './server/plugin'
 export * from './server/server'
 export * from './server/module/project'