verteilen-core 1.2.20 → 1.2.22

package/dist/server/detail.js

@@ -64,7 +64,7 @@ class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         };
         if (this.feedback.electron) {
-            this.feedback.electron('makeToast', p);
+            this.feedback.electron()?.send('makeToast', p);
         }
         if (this.feedback.socket && this.backend.Boradcasting) {
             this.backend.Boradcasting('makeToast', p);
@@ -80,7 +80,7 @@ class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         };
         if (this.feedback.electron) {
-            this.feedback.electron('makeToast', p);
+            this.feedback.electron()?.send('makeToast', p);
         }
         if (this.feedback.socket && this.backend.Boradcasting) {
             this.backend.Boradcasting('makeToast', p);
@@ -94,7 +94,7 @@ class ServerDetail {
     };
     shellReply = (data, p) => {
         if (this.feedback.electron) {
-            this.feedback.electron("shellReply", data);
+            this.feedback.electron()?.send("shellReply", data);
         }
         if (this.feedback.socket) {
             if (p == undefined)
@@ -110,7 +110,7 @@ class ServerDetail {
     };
     folderReply = (data, p) => {
         if (this.feedback.electron) {
-            this.feedback.electron("folderReply", data);
+            this.feedback.electron()?.send("folderReply", data);
         }
         if (this.feedback.socket) {
             if (p == undefined)
@@ -217,33 +217,33 @@ class ServerDetail {
     };
     node_list = (socket) => {
         const p = this.websocket_manager?.targets;
-        if (socket != undefined) {
+        if (this.feedback.socket != undefined) {
             const h = {
                 name: "node_list-feedback",
                 data: this.websocket_manager?.targets
             };
-            socket.send(JSON.stringify(h));
+            this.feedback.socket(JSON.stringify(h));
         }
         return p;
     };
     node_add = (socket, url, id) => {
         const p = this.websocket_manager.server_start(url, id);
-        if (socket != undefined) {
+        if (this.feedback.socket != undefined) {
             const h = {
                 name: "node_add-feedback",
                 data: p
             };
-            socket.send(JSON.stringify(h));
+            this.feedback.socket(JSON.stringify(h));
         }
     };
     node_update = (socket) => {
         const p = this.websocket_manager?.server_update();
-        if (socket != undefined) {
+        if (this.feedback.socket != undefined) {
             const h = {
                 name: "node_update-feedback",
                 data: [p]
             };
-            socket.send(JSON.stringify(h));
+            this.feedback.socket(JSON.stringify(h));
         }
         return p;
     };

package/dist/server/plugin.js

@@ -133,7 +133,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 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) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));
@@ -189,7 +189,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 const p = { title: x[0], type: "error", message: x[1] };
                 const h = { name: "makeToast", data: JSON.stringify(p) };
                 if (feedback.electron) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));
@@ -237,7 +237,7 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
                 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) {
-                    feedback.electron("makeToast", JSON.stringify(p));
+                    feedback.electron()?.send("makeToast", JSON.stringify(p));
                 }
                 if (feedback.socket) {
                     feedback.socket(JSON.stringify(h));

package/dist/server/server.d.ts

@@ -2,13 +2,16 @@ import { Execute_ConsoleServerManager, PluginPageData } from "../interface";
 import { ServerDetail } from "./detail";
 import { MemoryData, RecordIOBase, RecordLoader } from "./io";
 import { PluginLoader } from "./plugin";
-export type Caller_Electron = (channel: string, ...args: any[]) => void;
+export type Caller_Electron_Send = (channel: string, ...args: any[]) => void;
+export interface Caller_Electron {
+    send: Caller_Electron_Send;
+}
 export type Caller_Socket = (data: any) => void;
 export type TypeMap = {
     [key: string]: Function;
 };
 export interface PluginFeedback {
-    electron: Caller_Electron | undefined;
+    electron: (() => (Caller_Electron | undefined)) | undefined;
     socket: Caller_Socket | undefined;
 }
 export declare class Server {

package/package.json

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

package/src/server/detail.ts

@@ -136,7 +136,7 @@ export class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         }
         if(this.feedback.electron){
-            this.feedback.electron('makeToast', p)
+            this.feedback.electron()?.send('makeToast', p)
         }
         if(this.feedback.socket && this.backend.Boradcasting){
             this.backend.Boradcasting('makeToast', p)
@@ -153,7 +153,7 @@ export class ServerDetail {
             message: `${x.websocket.url} \n${x.uuid}`
         }
         if(this.feedback.electron){
-            this.feedback.electron('makeToast', p)
+            this.feedback.electron()?.send('makeToast', p)
         }
         if(this.feedback.socket && this.backend.Boradcasting){
             this.backend.Boradcasting('makeToast', p)
@@ -175,7 +175,7 @@ export class ServerDetail {
      */
     shellReply = (data:Single, p?:WebsocketPack) => {
         if(this.feedback.electron){
-            this.feedback.electron("shellReply", data)
+            this.feedback.electron()?.send("shellReply", data)
         }
         if(this.feedback.socket){
             if(p == undefined) return
@@ -196,7 +196,7 @@ export class ServerDetail {
      */
     folderReply = (data:ShellFolder, p?:WebsocketPack) => {
         if(this.feedback.electron){
-            this.feedback.electron("folderReply", data)
+            this.feedback.electron()?.send("folderReply", data)
         }
         if(this.feedback.socket){
             if(p == undefined) return
@@ -303,33 +303,33 @@ export class ServerDetail {
 
     node_list = (socket:any) => {
         const p = this.websocket_manager?.targets
-        if(socket != undefined){
+        if(this.feedback.socket != undefined){
             const h:Header = {
                 name: "node_list-feedback",
                 data: this.websocket_manager?.targets
             }
-            socket.send(JSON.stringify(h))   
+            this.feedback.socket(JSON.stringify(h))   
         }
         return p
     }
     node_add = (socket:any, url:string, id:string) => {
         const p = this.websocket_manager!.server_start(url, id)
-        if(socket != undefined){
+        if(this.feedback.socket != undefined){
             const h:Header = {
                 name: "node_add-feedback",
                 data: p
             }
-            socket.send(JSON.stringify(h))
+            this.feedback.socket(JSON.stringify(h))
         }
     }
     node_update = (socket:any) => {
         const p = this.websocket_manager?.server_update()
-        if(socket != undefined){
+        if(this.feedback.socket != undefined){
             const h:Header = {
                 name: "node_update-feedback",
                 data: [p]
             }
-            socket.send(JSON.stringify(h))
+            this.feedback.socket(JSON.stringify(h))
         }
         return p
     }

package/src/server/plugin.ts

@@ -166,7 +166,7 @@ export const CreatePluginLoader = (loader:RecordIOBase, memory:PluginPageData, s
                 const p:ToastData = { title: "Import Failed", type: "error", message: `Cannot find the json from url ${url}, or maybe just the wrong token` }
                 const h:Header = { name: "makeToast", data: JSON.stringify(p) }
                 if (feedback.electron){
-                    feedback.electron("makeToast", JSON.stringify(p))
+                    feedback.electron()?.send("makeToast", JSON.stringify(p))
                 }
                 if (feedback.socket){
                     feedback.socket(JSON.stringify(h))
@@ -219,7 +219,7 @@ export const CreatePluginLoader = (loader:RecordIOBase, memory:PluginPageData, s
                 const p:ToastData = { title: x[0], type: "error", message: x[1] }
                 const h:Header = { name: "makeToast", data: JSON.stringify(p) }
                 if (feedback.electron){
-                    feedback.electron("makeToast", JSON.stringify(p))
+                    feedback.electron()?.send("makeToast", JSON.stringify(p))
                 }
                 if (feedback.socket){
                     feedback.socket(JSON.stringify(h))
@@ -264,7 +264,7 @@ export const CreatePluginLoader = (loader:RecordIOBase, memory:PluginPageData, s
                 const p:ToastData = { title: "Import Failed", type: "error", message: `Cannot find the json from url ${url}, or maybe just the wrong token` }
                 const h:Header = { name: "makeToast", data: JSON.stringify(p) }
                 if (feedback.electron){
-                    feedback.electron("makeToast", JSON.stringify(p))
+                    feedback.electron()?.send("makeToast", JSON.stringify(p))
                 }
                 if (feedback.socket){
                     feedback.socket(JSON.stringify(h))

package/src/server/server.ts

@@ -3,12 +3,15 @@ import { ServerDetail } from "./detail";
 import { CreateRecordMemoryLoader, MemoryData, RecordIOBase, RecordLoader } from "./io";
 import { PluginLoader } from "./plugin";
 
-export type Caller_Electron = (channel: string, ...args: any[]) => void
+export type Caller_Electron_Send = (channel: string, ...args: any[]) => void
+export interface Caller_Electron {
+    send: Caller_Electron_Send
+}
 export type Caller_Socket = (data: any) => void
 export type TypeMap = { [key:string]:Function }
 
 export interface PluginFeedback {
-    electron:Caller_Electron | undefined
+    electron:(() => (Caller_Electron | undefined)) | undefined
     socket:Caller_Socket | undefined
 }