Update README.md

.gitignore

@@ -1,4 +1,4 @@
 target
 out
-.idea/workspace.xml
+.idea
 compile

.idea/artifacts/RediSkript_jar.xml

@@ -1,6 +1,6 @@
 <component name="ArtifactManager">
   <artifact type="jar" build-on-make="true" name="RediSkript:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/RediSkript_jar</output-path>
+    <output-path>$PROJECT_DIR$/../../Govindo/testserver/plugins</output-path>
     <root id="archive" name="RediSkript.jar">
       <element id="module-output" name="RediSkript" />
       <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/cryptomator/siv-mode/1.4.0/siv-mode-1.4.0.jar" path-in-jar="/" />

README.md

@@ -1,14 +1,11 @@
-**To-do List**
-1. Fix memory leak of /reloadredis (Not yet known how to fix it, it can be easily noticed by changing IP addresses and using NetworkInterceptor plugin, it'll show connections still being done to old IP address, aswell as the new one, even if it doesn't use old IP address for anything.)
-
-
 RediSkript allows you to communicate between your servers with use of Redis, it's very fast and easy to use.
 
 You can transfer any data in the form of text between your servers, you can program it to execute a set of instructions on the server depending on the redis message, etc. This can be used for making scripts that sync data between all servers and much more!
 
 
 It is originally developed by the team of Govindas Limework developers and is now maintained only by Govindas.
-Example:
+
+Redis Message:
 ```
 on redis message:
   if redis channel is "world":
@@ -20,8 +17,26 @@ command /sendredis <text> <text>:
     send redis message arg 1 to channel arg 2
     send redis message "hello world!" to channel "world"
 ```
+Managing variables:
+```
+set variables "test::1", "test::2", "test::3" in channel "global" to 100
+#then use this in any server that listens to "global" redis channel and was online when the above line was executed:
+send "%{test::*}%" #outputs 100, 100 and 100
 
-and that's all there is to this addon! You only need to have matching configuration in every server for communication and a Redis server to connect to. I recommend using VPS for hosting redis server, I personally use VPS from humbleservers.com.
+delete variables "test::*" in channel "global"
+
+set variable "test::%uuid of player%" in channel "playerdata" to tool of player
+#then you can in any server that is listening to "playerdata" channel and was online when the above line was executed:
+give {test::%uuid of player%} to player
+```
+Syntax:
+```
+variable[s] %strings% in [redis] [channel] %string%
+```
+
+There is only one command: /reloadredis it fully reloads the configuration, you can reload IP, password, channels and everything else.
+
+You only need to have matching configuration in every server for communication and a Redis server to connect to. I recommend using VPS for hosting redis server, I personally use VPS from humbleservers.com.
 
 Configuration:
 ```

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>net.limework.rediskript</groupId>
     <artifactId>RediSkript</artifactId>
-    <version>1.2.5</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
 	
     <build>

src/main/java/net/limework/rediskript/RediSkript.java

@@ -1,15 +1,13 @@
 package net.limework.rediskript;
+
 import net.limework.rediskript.commands.CommandReloadRedis;
-import net.limework.rediskript.skript.SkriptHook;
 import net.limework.rediskript.managers.RedisManager;
-import org.bukkit.Bukkit;
+import net.limework.rediskript.skript.SkriptHook;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.concurrent.TimeUnit;
-
 public class RediSkript extends JavaPlugin {
 
     //Redis manager

src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java

@@ -18,7 +18,7 @@ public class CommandReloadRedis implements CommandExecutor {
         if (sender instanceof Player) {
             //not using bungee TextComponent because it is not present in 1.8.8
             sender.sendMessage((ChatColor.translateAlternateColorCodes('&'
-                    , "&2[&aRediSkript&a] &cThis command can only be executed in console.")));
+                    , "&2[&aRediSkript&2] &cThis command can only be executed in console.")));
             return true;
         }
         plugin.getRm().reload();

src/main/java/net/limework/rediskript/managers/RedisManager.java

@@ -1,29 +1,33 @@
 package net.limework.rediskript.managers;
 
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.variables.Variables;
 import net.limework.rediskript.RediSkript;
-import net.limework.rediskript.events.RedisMessageEvent;
 import net.limework.rediskript.data.Encryption;
+import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.Configuration;
 import org.cryptomator.siv.UnauthenticCiphertextException;
+import org.json.JSONArray;
 import org.json.JSONObject;
 import redis.clients.jedis.BinaryJedis;
 import redis.clients.jedis.BinaryJedisPubSub;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 
 import javax.crypto.IllegalBlockSizeException;
 import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class RedisManager extends BinaryJedisPubSub implements Runnable {
 
-    private final ExecutorService RedisReconnector;
+    private ExecutorService RedisReconnector;
     private RediSkript plugin;
 
     private JedisPool jedisPool;
@@ -71,7 +75,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
 
     @Override
     public void run() {
-        while (!isShuttingDown.get()) {
+        while (!isShuttingDown.get() && plugin.isEnabled()) {
             try {
                 plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&cConnecting to redis..."));
                 if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
@@ -98,6 +102,9 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
 
 
             } catch (Exception e) {
+                if (isShuttingDown.get() || !plugin.isEnabled()) {
+                    return;
+                }
                 plugin.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&cConnection to redis has failed! &cReconnecting..."));
                 if (this.subscribeJedis != null) {
                     this.subscribeJedis.close();
@@ -128,16 +135,62 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
                 //encryption is disabled, so let's just get the string
                 receivedMessage = new String(message, StandardCharsets.UTF_8);
             }
-
             if (receivedMessage != null) {
                 JSONObject j = new JSONObject(receivedMessage);
-                //System.out.println("Message got from channel: "+channel +" and the Message: " +json.toString());
+                if (j.get("Type").equals("Skript")) {
-                RedisMessageEvent event = new RedisMessageEvent(channelString, j.getString("Message"), j.getLong("Date"));
+                    JSONArray messages = j.getJSONArray("Messages");
-
+                    RedisMessageEvent event;
+                    for (int i = 0; i < messages.length(); i++) {
+                        event = new RedisMessageEvent(channelString, messages.get(i).toString(), j.getLong("Date"));
                         //if plugin is disabling, don't call events anymore
-
                         if (plugin.isEnabled()) {
-                    Bukkit.getScheduler().runTask(plugin, () -> plugin.getServer().getPluginManager().callEvent(event));
+                            RedisMessageEvent finalEvent = event;
+                            Bukkit.getScheduler().runTask(plugin, () -> plugin.getServer().getPluginManager().callEvent(finalEvent));
+                        }
+                    }
+                } else if (j.get("Type").equals("SkriptVariables")) {
+
+                    //Transfer variables between servers
+
+                    JSONArray variableNames = j.getJSONArray("Names");
+                    Object inputValue;
+                    String changeValue = null;
+                    JSONArray variableValues = null;
+                    if (!j.isNull("Values")) {
+                        variableValues = j.getJSONArray("Values");
+                    }
+                    for (int i = 0; i < variableNames.length(); i++) {
+
+                        if (j.isNull("Values")) {
+                            //only check for SET here, because null has to be ignored in all other cases
+
+                            if (j.getString("Operation").equals("SET")) {
+                                Variables.setVariable(variableNames.get(i).toString(), null, null, false);
+                            }
+
+                        } else {
+                            if (!variableValues.isNull(i)) {
+                                changeValue = variableValues.get(i).toString();
+                            }
+                            String[] inputs = changeValue.split("\\^", 2);
+                            inputValue = Classes.deserialize(inputs[0], Base64.getDecoder().decode(inputs[1]));
+                            switch (j.getString("Operation")) {
+                                case "ADD":
+                                    //I will add this once someone tells me how to remove from Skript variable
+                                    //because using SET operation has issues with inconvertible types (Double and Long)
+                                    //variable = (Variable) Variables.getVariable(variableNames.get(i).toString(), null, false);
+                                    // variable.change(null, (Object[]) inputValue, Changer.ChangeMode.REMOVE);
+                                case "REMOVE":
+                                    //I will add this once someone tells me how to remove from Skript variable
+                                    //because using SET operation has issues with inconvertible types (Double and Long)
+                                    //variable = (Variable) Variables.getVariable(variableNames.get(i).toString(), null, false);
+                                   // variable.change(null, (Object[]) inputValue, Changer.ChangeMode.REMOVE);
+                                    break;
+                                case "SET":
+                                    Variables.setVariable(variableNames.get(i).toString(), inputValue, null, false);
+                            }
+                        }
+                    }
                 }
             }
         } catch (Exception e) {
@@ -147,13 +200,56 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
         }
 
     }
+    public void sendMessage(String[] message, String channel) {
+        JSONObject json = new JSONObject();
+        json.put("Messages", new JSONArray(message));
+        json.put("Type", "Skript");
+        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
+        finishSendMessage(json, channel);
+    }
+    public void sendVariables(String[] variableNames, String[] variableValues, String channel, String operation) {
+        JSONObject json = new JSONObject();
+        json.put("Names", new JSONArray(variableNames));
+        if (variableValues != null) {
+            json.put("Values", new JSONArray(variableValues));
+        }
+
+        json.put("Type", "SkriptVariables");
+        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
+        json.put("Operation", operation);
+        finishSendMessage(json, channel);
+    }
+
+    public void finishSendMessage(JSONObject json, String channel) {
+        try {
+            byte[] message;
+            if (this.getEncryption().isEncryptionEnabled()) {
+                message = this.getEncryption().encrypt(json.toString());
+            } else {
+                message = json.toString().getBytes(StandardCharsets.UTF_8);
+            }
+            //execute sending of redis message on the main thread if plugin is disabling
+            //so it can still process the sending
+
+            //sending a redis message blocks main thread if there's no more connections available
+            //so to avoid issues, it's best to do it always on separate thread
+            if (plugin.isEnabled()) {
+                this.getRedisService().execute(() -> {
+                    BinaryJedis j = this.getJedisPool().getResource();
+                    j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                    j.close();
+                });
+            } else {
+                BinaryJedis j = this.getJedisPool().getResource();
+                j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                j.close();
+            }
+        } catch (JedisConnectionException exception) {
+            exception.printStackTrace();
+        }
+    }
 
     public void shutdown() {
-        try {
-            this.RedisService.awaitTermination(1, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
         this.isShuttingDown.set(true);
         if (this.subscribeJedis != null) {
             this.unsubscribe();
@@ -161,8 +257,11 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
             this.subscribeJedis.getClient().close();
             this.jedisPool.getResource().close();
         }
+        isShuttingDown.set(true);
         this.RedisReconnector.shutdown();
         this.RedisService.shutdown();
+        this.RedisService = null;
+        this.RedisReconnector = null;
 
     }
     public void reload() {

src/main/java/net/limework/rediskript/skript/SkriptHook.java

@@ -6,12 +6,10 @@ import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Getter;
+import ch.njol.skript.util.Timespan;
 import net.limework.rediskript.RediSkript;
 import net.limework.rediskript.events.RedisMessageEvent;
-import net.limework.rediskript.skript.elements.EvtRedis;
+import net.limework.rediskript.skript.elements.*;
-import net.limework.rediskript.skript.elements.ExprChannel;
-import net.limework.rediskript.skript.elements.ExprMessage;
-import net.limework.rediskript.skript.elements.ExprMessageDate;
 
 import java.io.IOException;
 
@@ -21,6 +19,8 @@ public class SkriptHook {
         try {
             addon.loadClasses("net.limework.rediskript.skript", "elements");
             Skript.registerEvent("redis message", EvtRedis.class, RedisMessageEvent.class, "redis message");
+            Skript.registerExpression(ExprVariableInChannel.class, Object.class, ExpressionType.PROPERTY, "variable[s] %strings% in [redis] [channel] %string%");
+
             Skript.registerExpression(ExprChannel.class, String.class, ExpressionType.SIMPLE, "redis channel");
             EventValues.registerEventValue(RedisMessageEvent.class, String.class, new Getter<String, RedisMessageEvent>() {
                 @Override

src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java

@@ -6,19 +6,13 @@ import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
 import net.limework.rediskript.RediSkript;
-import net.limework.rediskript.managers.RedisManager;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.Event;
-import org.json.JSONObject;
-import redis.clients.jedis.BinaryJedis;
-import redis.clients.jedis.exceptions.JedisConnectionException;
-
-import java.nio.charset.StandardCharsets;
 
 public class EffSendMessage extends Effect {
     static {
-        Skript.registerEffect(EffSendMessage.class, "send redis message %string% to [channel] %string%");
+        Skript.registerEffect(EffSendMessage.class, "send redis message[s] %strings% to [channel] %string%");
     }
 
 
@@ -31,10 +25,9 @@ public class EffSendMessage extends Effect {
 
         RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
 
-        String message = this.message.getSingle(event);
+        String[] message = this.message.getAll(event);
         String channel = this.channel.getSingle(event);
-
+        if (message[0] == null) {
-        if (message == null) {
             Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cRedis message was empty. Please check your code."));
             return;
         }
@@ -42,40 +35,7 @@ public class EffSendMessage extends Effect {
             Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cChannel was empty. Please check your code."));
             return;
         }
-        assert plugin != null;
+        plugin.getRm().sendMessage(message, channel);
-        JSONObject json = new JSONObject();
-        json.put("Message", message);
-        json.put("Type", "Skript");
-        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
-        byte[] msg;
-        RedisManager manager = plugin.getRm();
-        if (manager.getEncryption().isEncryptionEnabled()) {
-            msg = manager.getEncryption().encrypt(json.toString());
-        } else {
-            msg = json.toString().getBytes(StandardCharsets.UTF_8);
-        }
-        try {
-
-            //execute sending of redis message on the main thread if plugin is disabling
-            //so it can still process the sending
-
-            //sending a redis message blocks main thread if there's no more connections available
-            //so to avoid issues, it's best to do it always on separate thread
-            if (plugin.isEnabled()) {
-                manager.getRedisService().execute(() -> {
-                    BinaryJedis j = manager.getJedisPool().getResource();
-                    j.publish(channel.getBytes(StandardCharsets.UTF_8), msg);
-                    j.close();
-                });
-            } else {
-                BinaryJedis j = manager.getJedisPool().getResource();
-                j.publish(channel.getBytes(StandardCharsets.UTF_8), msg);
-                j.close();
-            }
-        } catch (JedisConnectionException exception) {
-            exception.printStackTrace();
-        }
-
     }
 
     @Override

src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java

@@ -0,0 +1,88 @@
+package net.limework.rediskript.skript.elements;
+
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.variables.SerializedVariable;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import net.limework.rediskript.RediSkript;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+
+import java.util.Base64;
+
+public class ExprVariableInChannel extends SimpleExpression<Object> {
+    private Expression<String> name;
+    private Expression<String> channel;
+    @Override
+    public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
+       //if (expressions[0] instanceof Variable) {
+       //    Variable<?> variable = (Variable<?>) expressions[0];
+       //    System.out.println(variable.getName().toString());
+       //    String var = variable.getName().toString();
+       //    var = var.substring(1, var.length() - 1);
+
+       //}
+        name = (Expression<String>) expressions[0];
+        channel = (Expression<String>) expressions[1];
+        return true;
+
+    }
+
+    @Override
+    protected Object[] get(Event event) {
+        return null;
+    }
+
+    @Override
+    public boolean isSingle() {
+        return true;
+    }
+
+    @Override
+    public Class<? extends Object> getReturnType() {
+        return Object.class;
+    }
+
+    @Override
+    public String toString(Event event, boolean b) {
+        return "variable in redis channel";
+    }
+    @Override
+    public void change(Event e, Object[] changer, Changer.ChangeMode mode) {
+        RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
+        switch (mode) {
+            case ADD:
+            case SET:
+            case REMOVE:
+                SerializedVariable.Value serialized;
+                String encoded;
+                String[] values = new String[changer.length+1];
+                for( int i = 0; i < changer.length; i++) {
+                    if (changer[i] != null) {
+                        serialized = Classes.serialize(changer[i]);
+                        encoded = Base64.getEncoder().encodeToString(serialized.data);
+                        encoded = serialized.type + "^" + encoded;
+                        values[i] = encoded;
+                    }
+                }
+                String operation = mode.toString();
+                plugin.getRm().sendVariables(name.getAll(e), values, channel.getSingle(e), operation);
+                break;
+            case DELETE:
+                plugin.getRm().sendVariables(name.getAll(e), null, channel.getSingle(e), "SET");
+                break;
+        }
+    }
+    @Override
+    public Class<?>[] acceptChange(Changer.ChangeMode mode) {
+        //if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.SET || mode == Changer.ChangeMode.ADD || mode == Changer.ChangeMode.REMOVE)
+        if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.SET)
+            return CollectionUtils.array(Object.class);
+
+        return null;
+    }
+}