verteilen-core 1.3.34 → 1.3.36

package/dist/server/plugin.d.ts

@@ -5,8 +5,8 @@ export type SocketGetter = (uuid: string) => WebsocketPack | undefined;
 export interface PluginLoader {
     load_all: () => Promise<PluginPageData>;
     get_plugins: () => Promise<PluginPageData>;
-    get_project: (name: string, group: string, filename: string) => string | undefined;
-    get_database: (name: string, group: string, filename: string) => string | undefined;
+    get_project: (name: string, group: string, filename: string) => Promise<string> | undefined;
+    get_database: (name: string, group: string, filename: string) => Promise<string> | undefined;
     import_plugin: (name: string, url: string, token: string) => Promise<PluginPageData>;
     delete_plugin: (name: string) => Promise<void>;
     plugin_download: (uuid: string, plugin: string, tokens: string) => Promise<void>;

package/dist/server/plugin.js

@@ -10,7 +10,7 @@ const GetCurrentPlugin = async (loader) => {
         if (!loader.exists(root))
             await loader.mkdir(root);
         const plugin_folder = await loader.read_dir_dir(root);
-        const plugin_folder_files = await Promise.all(plugin_folder.map(x => loader.read_dir_file(x)));
+        const plugin_folder_files = await Promise.all(plugin_folder.map(x => loader.read_dir_file(loader.join(root, x))));
         for (let i = 0; i < plugin_folder_files.length; i++) {
             const files = plugin_folder_files[i];
             const dirname = plugin_folder[i];
@@ -58,22 +58,12 @@ const CreatePluginLoader = (loader, memory, socket, feedback) => {
             return memory;
         },
         get_project: (name, group, filename) => {
-            const plugin = memory.plugins.find(x => x.title == name);
-            if (plugin == undefined)
-                return undefined;
-            const result = plugin.projects.find(x => x.group == group && x.filename == filename);
-            if (result == undefined)
-                return undefined;
-            return JSON.stringify(result);
+            const path = loader.join(loader.root, "plugin", name, "project", filename);
+            return loader.exists(path) ? loader.read_string(path) : undefined;
         },
         get_database: (name, group, filename) => {
-            const plugin = memory.plugins.find(x => x.title == name);
-            if (plugin == undefined)
-                return undefined;
-            const result = plugin.databases.find(x => x.group == group && x.filename == filename);
-            if (result == undefined)
-                return undefined;
-            return JSON.stringify(result);
+            const path = loader.join(loader.root, "plugin", name, "database", filename);
+            return loader.exists(path) ? loader.read_string(path) : undefined;
         },
         import_plugin: async (name, url, token) => {
             const error_children = [];

package/package.json

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

package/src/server/plugin.ts

@@ -41,14 +41,14 @@ export interface PluginLoader {
      * @param group Group search
      * @param filename Template filename
      */
-    get_project: (name:string, group:string, filename:string) => string | undefined
+    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) => string | undefined
+    get_database: (name:string, group:string, filename:string) => Promise<string> | undefined
     /**
      * Import plugin from web
      * @param name Plugin name
@@ -90,7 +90,7 @@ export const GetCurrentPlugin = async (loader:RecordIOBase):Promise<PluginPageDa
         if(!loader.exists(root)) await loader.mkdir(root)
 
         const plugin_folder = await loader.read_dir_dir(root)
-        const plugin_folder_files = await Promise.all(plugin_folder.map(x => loader.read_dir_file(x)))
+        const plugin_folder_files = await Promise.all(plugin_folder.map(x => loader.read_dir_file(loader.join(root, x))))
         for(let i = 0; i < plugin_folder_files.length; i++){
             const files = plugin_folder_files[i]
             const dirname = plugin_folder[i]
@@ -136,19 +136,13 @@ export const CreatePluginLoader = (loader:RecordIOBase, memory:PluginPageData, s
         get_plugins: async ():Promise<PluginPageData> => {
             return memory
         },
-        get_project: (name:string, group:string, filename:string):string | undefined => {
-            const plugin = memory.plugins.find(x => x.title == name)
-            if(plugin == undefined) return undefined
-            const result = plugin.projects.find(x => x.group == group && x.filename == filename)
-            if(result == undefined) return undefined
-            return JSON.stringify(result)
+        get_project: (name:string, group:string, filename:string):Promise<string> | undefined => {
+            const path = loader.join(loader.root, "plugin", name, "project", filename)
+            return loader.exists(path) ? loader.read_string(path) : undefined
         },
-        get_database: (name:string, group:string, filename:string):string | undefined => {
-            const plugin = memory.plugins.find(x => x.title == name)
-            if(plugin == undefined) return undefined
-            const result = plugin.databases.find(x => x.group == group && x.filename == filename)
-            if(result == undefined) return undefined
-            return JSON.stringify(result)
+        get_database: (name:string, group:string, filename:string):Promise<string> | undefined => {
+            const path = loader.join(loader.root, "plugin", name, "database", filename)
+            return loader.exists(path) ? loader.read_string(path) : undefined
         },
         import_plugin: async (name:string, url:string, token:string):Promise<PluginPageData> => {
             const error_children:Array<[string, string]> = []