verteilen-core 1.2.9 → 1.2.11

package/dist/server/detail.d.ts

@@ -10,6 +10,7 @@ export interface BackendAction {
 export interface ServerDetailEvent {
     resource_start: (socket: any, uuid: string) => void;
     resource_end: (socket: any, uuid: string) => void;
+    plugin_info: (socket: any, uuid: string) => void;
     shell_enter: (socket: any, uuid: string, value: string) => void;
     shell_open: (socket: any, uuid: string) => void;
     shell_close: (socket: any, uuid: string) => void;
@@ -25,7 +26,7 @@ export interface ServerDetailEvent {
     console_clean: (socket: any, uuid: string) => void;
     console_skip: (socket: any, uuid: string, forward: boolean, type: number, state: ExecuteState) => void;
     console_skip2: (socket: any, uuid: string, v: number) => void;
-    console_add: (socket: any, name: string, record: Record, preference: Preference) => void;
+    console_add: (socket: any, name: string, record: Record, uuid: string | undefined) => void;
     console_update: (socket: any) => void;
 }
 export declare class ServerDetail {
@@ -51,6 +52,7 @@ export declare class ServerDetail {
     console_update: () => any[];
     resource_start: (socket: any, uuid: string) => void;
     resource_end: (socket: any, uuid: string) => void;
+    plugin_info: (socket: any, uuid: string) => void;
     shell_enter: (socket: any, uuid: string, value: string) => void;
     shell_open: (socket: any, uuid: string) => void;
     shell_close: (socket: any, uuid: string) => void;
@@ -63,7 +65,7 @@ export declare class ServerDetail {
     console_record: (socket: any, uuid: string) => string;
     console_execute: (socket: any, uuid: string, type: number) => void;
     console_stop: (socket: any, uuid: string) => void;
-    console_add: (socket: any, name: string, record: Record, preference: Preference) => ExecuteRecord | undefined;
+    console_add: (socket: any, name: string, record: Record, uuid: string | undefined) => ExecuteRecord | undefined;
     console_update_call: () => void;
     console_clean: (socket: any, uuid: string) => void;
     console_skip: (socket: any, uuid: string, forward: boolean, type: number, state?: ExecuteState) => void;

package/dist/server/detail.js

@@ -39,6 +39,7 @@ class ServerDetail {
         return {
             resource_start: this.resource_start,
             resource_end: this.resource_end,
+            plugin_info: this.plugin_info,
             shell_enter: this.shell_enter,
             shell_open: this.shell_open,
             shell_close: this.shell_close,
@@ -182,6 +183,11 @@ class ServerDetail {
         const d = { name: 'resource_end', data: 0 };
         p?.websocket.send(JSON.stringify(d));
     };
+    plugin_info = (socket, uuid) => {
+        const p = this.websocket_manager.targets.find(x => x.uuid == uuid);
+        const d = { name: 'plugin_info', data: 0 };
+        p?.websocket.send(JSON.stringify(d));
+    };
     shell_enter = (socket, uuid, value) => {
         this.websocket_manager.shell_enter(uuid, value);
     };
@@ -281,7 +287,7 @@ class ServerDetail {
         target.record.stop = true;
         target.manager.Stop();
     };
-    console_add = (socket, name, record, preference) => {
+    console_add = (socket, name, record, uuid) => {
         record.projects.forEach(x => x.uuid = (0, uuid_1.v6)());
         const em = new interface_1.Execute_ExecuteManager.ExecuteManager(name, this.websocket_manager, this.message, JSON.parse(JSON.stringify(record)));
         const er = {
@@ -305,7 +311,7 @@ class ServerDetail {
         em.libs = { libs: this.backend.memory.libs };
         const p = { manager: em, record: er };
         const uscp = new console_handle_1.Util_Server_Console_Proxy(p);
-        const uslp = new log_handle_1.Util_Server_Log_Proxy(p, { logs: this.backend.memory.logs }, preference);
+        const uslp = new log_handle_1.Util_Server_Log_Proxy(p, { logs: this.backend.memory.logs }, this.backend.GetPreference(uuid));
         em.proxy = this.CombineProxy([uscp.execute_proxy, uslp.execute_proxy]);
         const r = this.console.receivedPack(p, record);
         if (r)

package/dist/server/io.js

@@ -71,7 +71,7 @@ const _CreateRecordIOLoader = (loader, memory, type, folder, ext = ".json") => {
             if (!loader.exists(root))
                 await loader.mkdir(root);
             const files = await loader.read_dir_file(root);
-            const r = files.map(x => loader.read_string(x, { encoding: 'utf8', flag: 'r' }));
+            const r = files.map(x => loader.read_string(loader.join(root, x), { encoding: 'utf8', flag: 'r' }));
             const p = await Promise.all(r);
             const arr = get_array(type);
             arr.splice(0, arr.length);

package/package.json

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

package/src/server/detail.ts

@@ -40,6 +40,7 @@ export interface BackendAction {
 export interface ServerDetailEvent {
     resource_start: (socket:any, uuid:string) => void
     resource_end: (socket:any, uuid:string) => void
+    plugin_info: (socket:any, uuid:string) => void
     shell_enter: (socket:any, uuid:string, value:string) => void
     shell_open: (socket:any, uuid:string) => void
     shell_close: (socket:any, uuid:string) => void
@@ -55,7 +56,7 @@ export interface ServerDetailEvent {
     console_clean: (socket:any, uuid:string) => void
     console_skip: (socket:any, uuid:string, forward:boolean, type:number, state:ExecuteState) => void
     console_skip2: (socket:any, uuid:string, v:number) => void
-    console_add: (socket:any, name:string, record:Record, preference:Preference) => void
+    console_add: (socket:any, name:string, record:Record, uuid:string | undefined) => void
     console_update: (socket:any, ) => void
 }
 
@@ -115,6 +116,7 @@ export class ServerDetail {
         return {
             resource_start: this.resource_start,
             resource_end: this.resource_end,
+            plugin_info: this.plugin_info,
             shell_enter: this.shell_enter,
             shell_open: this.shell_open,
             shell_close: this.shell_close,
@@ -273,6 +275,13 @@ export class ServerDetail {
         const d:Header = { name: 'resource_end', data: 0 }
         p?.websocket.send(JSON.stringify(d))
     }
+
+    plugin_info = (socket:any, uuid:string) => {
+        const p = this.websocket_manager!.targets.find(x => x.uuid == uuid)
+        const d:Header = { name: 'plugin_info', data: 0 }
+        p?.websocket.send(JSON.stringify(d))
+    }
+
     shell_enter = (socket:any, uuid: string, value:string) => {
         this.websocket_manager!.shell_enter(uuid, value)
     }
@@ -369,7 +378,7 @@ export class ServerDetail {
         target.record!.stop = true
         target.manager!.Stop()
     }
-    console_add = (socket:any, name:string, record:Record, preference:Preference) => {
+    console_add = (socket:any, name:string, record:Record, uuid:string | undefined) => {
         record.projects.forEach(x => x.uuid = uuidv6())
         const em:Execute_ExecuteManager.ExecuteManager = new Execute_ExecuteManager.ExecuteManager(
             name,
@@ -399,7 +408,7 @@ export class ServerDetail {
         
         const p:ExecutePair = { manager: em, record: er }
         const uscp:Util_Server_Console_Proxy = new Util_Server_Console_Proxy(p)
-        const uslp:Util_Server_Log_Proxy = new Util_Server_Log_Proxy(p, { logs: this.backend.memory.logs }, preference!)
+        const uslp:Util_Server_Log_Proxy = new Util_Server_Log_Proxy(p, { logs: this.backend.memory.logs }, this.backend.GetPreference(uuid)!)
         em.proxy = this.CombineProxy([uscp.execute_proxy, uslp.execute_proxy])
         const r = this.console.receivedPack(p, record)
         if(r) this.execute_manager.push(p)

package/src/server/io.ts

@@ -140,7 +140,7 @@ export const _CreateRecordIOLoader = (loader:RecordIOBase, memory:MemoryData, ty
             if(!loader.exists(root)) await loader.mkdir(root)
             const files = await loader.read_dir_file(root)
             const r:Array<Promise<string>> = files.map(x => 
-                loader.read_string(x, { encoding: 'utf8', flag: 'r' })
+                loader.read_string(loader.join(root, x), { encoding: 'utf8', flag: 'r' })
             )
             const p = await Promise.all(r)
             const arr = get_array(type)