Fix module config reading

Innectic · Innectic · commit 830e9d003fc6 · 2017-09-04T02:33:43.000-07:00
diff --git a/API/src/main/java/me/innectic/permissify/api/PermissifyAPI.java b/API/src/main/java/me/innectic/permissify/api/PermissifyAPI.java
@@ -28,9 +28,9 @@
 import me.innectic.permissify.api.database.ConnectionInformation;
 import me.innectic.permissify.api.database.DatabaseHandler;
 import me.innectic.permissify.api.database.handlers.HandlerType;
+import me.innectic.permissify.api.module.registry.ModuleLoader;
 import me.innectic.permissify.api.module.registry.ModuleProvider;
 import me.innectic.permissify.api.profile.ProfileSerializer;
-import me.innectic.permissify.api.util.ChatModule;
 import me.innectic.permissify.api.util.DisplayUtil;
 
 import java.lang.reflect.InvocationTargetException;
@@ -51,17 +51,20 @@ public class PermissifyAPI {
     @Getter private DisplayUtil displayUtil;
     @Getter private ProfileSerializer profileSerializer;
     @Getter private Logger logger;
+
     @Getter private ModuleProvider moduleProvider;
+    @Getter private ModuleLoader moduleLoader;
 
     /**
      * Initialize Permissify's API
      */
-    public void initialize(HandlerType type, Optional<ConnectionInformation> connectionInformation, DisplayUtil displayUtil, Logger logger) throws Exception {
+    public void initialize(HandlerType type, Optional<ConnectionInformation> connectionInformation, DisplayUtil displayUtil, Logger logger, String moduleLocation, Object plugin) throws Exception {
         instance = Optional.of(this);
         this.logger = logger;
         this.displayUtil = displayUtil;
         profileSerializer = new ProfileSerializer();
         moduleProvider = new ModuleProvider();
+        moduleLoader = new ModuleLoader(moduleLocation);
 
         try {
             databaseHandler = Optional.of(type.getHandler().getConstructor(ConnectionInformation.class).newInstance(connectionInformation.orElse(null)));
@@ -76,8 +79,8 @@ public void initialize(HandlerType type, Optional<ConnectionInformation> connect
             if (connected) logger.info("Connected to the database.");
             else logger.log(Level.SEVERE, "Unable to connect to the database.");
         });
-        logger.info("Registering Permissify modules...");
-        moduleProvider.registerModule(ChatModule.class, "permissify");
+        logger.info("Registering modules...");
+        moduleLoader.loadModules(plugin);
     }
 
     public static Optional<PermissifyAPI> get() {
diff --git a/API/src/main/java/me/innectic/permissify/api/module/PermissifyModule.java b/API/src/main/java/me/innectic/permissify/api/module/PermissifyModule.java
@@ -23,6 +23,6 @@ public PermissifyModule(String moduleName) {
         this.moduleName = moduleName;
     }
 
-    public abstract void initialize();
-    public abstract void deinitialize();
+    public abstract void initialize(Object plugin);
+    public abstract void deinitialize(Object plugin);
 }
diff --git a/API/src/main/java/me/innectic/permissify/api/module/annotation/Handles.java b/API/src/main/java/me/innectic/permissify/api/module/annotation/Handles.java
@@ -12,5 +12,6 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface Handles {
-    String value();
+    String event();
+    Service service();
 }
diff --git a/API/src/main/java/me/innectic/permissify/api/module/annotation/Service.java b/API/src/main/java/me/innectic/permissify/api/module/annotation/Service.java
@@ -0,0 +1,9 @@
+package me.innectic.permissify.api.module.annotation;
+
+/**
+ * @author Innectic
+ * @since 9/4/2017
+ */
+public enum Service {
+    SPIGOT, SPONGE
+}
diff --git a/API/src/main/java/me/innectic/permissify/api/module/registry/ModuleLoader.java b/API/src/main/java/me/innectic/permissify/api/module/registry/ModuleLoader.java
@@ -0,0 +1,58 @@
+package me.innectic.permissify.api.module.registry;
+
+import com.google.gson.Gson;
+import lombok.AllArgsConstructor;
+import me.innectic.permissify.api.PermissifyAPI;
+import me.innectic.permissify.api.module.registry.schema.ModuleFile;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Arrays;
+
+/**
+ * @author Innectic
+ * @since 9/4/2017
+ */
+@AllArgsConstructor
+public class ModuleLoader {
+    private final String moduleDirectory;
+
+    /**
+     * Load all modules in the module directory.
+     */
+    public void loadModules(Object plugin) {
+        File moduleFolder = new File(moduleDirectory);
+        if (!moduleFolder.exists()) moduleFolder.mkdir();
+        if (!moduleFolder.isDirectory()) return;
+        File[] potentialModules = moduleFolder.listFiles();
+        if (potentialModules == null) return;
+
+        Gson gson = new Gson();
+        Arrays.stream(potentialModules).forEach(file -> {
+            File jarFile;
+            if (!file.getName().endsWith(".jar")) return;
+
+            String baseName = file.getName().contains(".") ? file.getName().split("\\.")[0] : null;
+            if (baseName == null) return;
+
+            jarFile = new File(moduleDirectory + "/" + baseName + ".jar");
+            try {
+                URLClassLoader child = new URLClassLoader(new URL[]{jarFile.toURL()}, this.getClass().getClassLoader());
+                InputStream pmodStream = child.findResource(baseName + ".pmod").openStream();
+                if (pmodStream == null) return;
+
+                BufferedInputStream inputStream = new BufferedInputStream(pmodStream);
+                InputStreamReader reader = new InputStreamReader(inputStream);
+                ModuleFile moduleFile = gson.fromJson(reader, ModuleFile.class);
+
+                Class loading = Class.forName(moduleFile.getMain(), true, child);
+                if (loading == null) return;
+                PermissifyAPI.get().ifPresent(api ->
+                        api.getModuleProvider().registerModule(loading, moduleFile.getName(), plugin));
+            } catch (ClassNotFoundException | IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+}
diff --git a/API/src/main/java/me/innectic/permissify/api/module/registry/ModuleProvider.java b/API/src/main/java/me/innectic/permissify/api/module/registry/ModuleProvider.java
@@ -20,19 +20,19 @@ public class ModuleProvider {
     @Getter private Map<String, PermissifyModule> modules = new HashMap<>();
     @Getter private Map<String, Module> eventHandlers = new HashMap<>();
 
-    public void registerModule(Class<? extends PermissifyModule> module, String source) {
+    public void registerModule(Class<? extends PermissifyModule> module, String source, Object plugin) {
         try {
             Constructor<? extends PermissifyModule> moduleConstructor = module.getConstructor();
             PermissifyModule constructedModule = moduleConstructor.newInstance();
 
             modules.put(constructedModule.getModuleName(), constructedModule);
 
             // Initialize the module
-            constructedModule.initialize();
+            constructedModule.initialize(plugin);
 
             Arrays.stream(constructedModule.getClass().getMethods()).filter(method -> method.isAnnotationPresent(Handles.class)).forEach(method -> {
                 Handles handleAnnotation = method.getAnnotation(Handles.class);
-                String event = handleAnnotation.value();
+                String event = handleAnnotation.event();
 
                 // Store the handler
                 eventHandlers.put(event, new Module(constructedModule.getModuleName(), method));
@@ -46,8 +46,8 @@ public void registerModule(Class<? extends PermissifyModule> module, String sour
         }
     }
 
-    public void end() {
-        modules.entrySet().stream().map(Map.Entry::getValue).forEach(PermissifyModule::deinitialize);
+    public void end(Object plugin) {
+        modules.entrySet().stream().map(Map.Entry::getValue).forEach(module -> module.deinitialize(plugin));
     }
 
     public Object pushEvent(String event, Object... arguments) {
@@ -63,7 +63,7 @@ public Object pushEvent(String event, Object... arguments) {
     private void reportRegistration(String moduleName, String event) {
         if (moduleName.equals("permissify")) return;
         PermissifyAPI.get().ifPresent(api -> api.getLogger().log(Level.WARNING,
-                String.format("Module %s has registered event %s. Try removing it before reporting any bugs.!", moduleName, event)));
+                String.format("Module %s has registered event %s. Try removing it before reporting any bugs!", moduleName, event)));
     }
 
     @AllArgsConstructor
diff --git a/API/src/main/java/me/innectic/permissify/api/module/registry/schema/ModuleFile.java b/API/src/main/java/me/innectic/permissify/api/module/registry/schema/ModuleFile.java
@@ -0,0 +1,24 @@
+package me.innectic.permissify.api.module.registry.schema;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author Innectic
+ * @since 9/4/2017
+ */
+@AllArgsConstructor
+public class ModuleFile {
+    @Getter private int version;
+    @Getter private String name;
+    @Getter private String main;
+
+    @Override
+    public String toString() {
+        return "ModuleFile [" +
+                "version=" + version +
+                ", name=" + name +
+                ", main=" + main +
+                " ]";
+    }
+}
diff --git a/API/src/main/java/me/innectic/permissify/api/util/ChatModule.java b/API/src/main/java/me/innectic/permissify/api/util/ChatModule.java
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java b/Spigot/src/main/java/me/innectic/permissify/spigot/PermissifyMain.java
@@ -28,11 +28,9 @@
 import lombok.Setter;
 import me.innectic.permissify.spigot.commands.PermissifyCommand;
 import me.innectic.permissify.spigot.commands.permissify.*;
-import me.innectic.permissify.spigot.events.PlayerChat;
 import me.innectic.permissify.spigot.events.PlayerJoin;
 import me.innectic.permissify.api.PermissifyAPI;
 import me.innectic.permissify.api.database.handlers.FullHandler;
-import me.innectic.permissify.spigot.events.PreProcess;
 import me.innectic.permissify.spigot.utils.ConfigVerifier;
 import me.innectic.permissify.spigot.utils.DisplayUtil;
 import org.bukkit.Bukkit;
@@ -77,7 +75,7 @@ public void onEnable() {
         }
         handleChat = getConfig().getBoolean("handleChat");
         try {
-            permissifyAPI.initialize(handler.get().getHandlerType().get(), handler.get().getConnectionInformation(), new DisplayUtil(), getLogger());
+            permissifyAPI.initialize(handler.get().getHandlerType().get(), handler.get().getConnectionInformation(), new DisplayUtil(), getLogger(), getDataFolder().getAbsolutePath() + "/modules", this);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -92,7 +90,7 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        permissifyAPI.getModuleProvider().end();
+        permissifyAPI.getModuleProvider().end(this);
 
         configVerifier = null;
         permissifyAPI = null;
@@ -135,7 +133,5 @@ private void registerListeners() {
         PluginManager pluginManager = Bukkit.getPluginManager();
 
         pluginManager.registerEvents(new PlayerJoin(), this);
-        pluginManager.registerEvents(new PlayerChat(), this);
-        pluginManager.registerEvents(new PreProcess(), this);
     }
 }
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerChat.java b/Spigot/src/main/java/me/innectic/permissify/spigot/events/PlayerChat.java
diff --git a/Spigot/src/main/java/me/innectic/permissify/spigot/events/PreProcess.java b/Spigot/src/main/java/me/innectic/permissify/spigot/events/PreProcess.java

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ public PermissifyModule(String moduleName) {`
`23`	`23`	`this.moduleName = moduleName;`
`24`	`24`	`}`
`25`	`25`
`26`		`- public abstract void initialize();`
`27`		`- public abstract void deinitialize();`
	`26`	`+ public abstract void initialize(Object plugin);`
	`27`	`+ public abstract void deinitialize(Object plugin);`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`@Retention(RetentionPolicy.RUNTIME)`
`13`	`13`	`@Target(ElementType.METHOD)`
`14`	`14`	`public @interface Handles {`
`15`		`- String value();`
	`15`	`+ String event();`
	`16`	`+ Service service();`
`16`	`17`	`}`