Merge pull request #99 from CloudNetService/development

Merge development into master branch

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
     }
     stage('Version') {
       steps {
-        sh 'mvn versions:set -DnewVersion=2.1.14.2'
+        sh 'mvn versions:set -DnewVersion=2.1.14.3'
       }
     }
     stage('Compile') {

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/BukkitBootstrap.java

@@ -105,7 +105,7 @@ private void checkRegistryAccess()
         {
             Class.forName("net.md_5.bungee.api.chat.BaseComponent");
             Class.forName("de.dytanic.cloudnet.bridge.internal.chat.DocumentRegistry").getMethod("fire").invoke(null);
-        } catch (Exception ex)
+        } catch (Exception ignored)
         {
         }
     }

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/CloudProxy.java

@@ -374,7 +374,14 @@ public void onServerRemove(ServerInfo serverInfo)
             if (serverInfo == null) return;
 
             ProxyServer.getInstance().getPluginManager().callEvent(new ProxiedServerRemoveEvent(serverInfo));
-            ProxyServer.getInstance().getServers().remove(serverInfo.getServiceId().getServerId());
+
+            try
+            {
+                ProxyServer.getInstance().getServers().remove(serverInfo.getServiceId().getServerId());
+            } catch (Throwable ignored)
+            {
+            }
+
             cachedServers.remove(serverInfo.getServiceId().getServerId());
 
             if (serverInfo.getServiceId().getGroup().equalsIgnoreCase(getProxyGroup().getProxyConfig().getDynamicFallback().getDefaultFallback()))

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/listener/bukkit/BukkitListener.java

@@ -7,7 +7,7 @@
 import de.dytanic.cloudnet.api.CloudAPI;
 import de.dytanic.cloudnet.bridge.CloudServer;
 import de.dytanic.cloudnet.bridge.event.bukkit.BukkitSubChannelMessageEvent;
-import de.dytanic.cloudnet.bridge.internal.util.CloudPermissble;
+import de.dytanic.cloudnet.bridge.internal.util.CloudPermissible;
 import de.dytanic.cloudnet.bridge.internal.util.ReflectionUtil;
 import de.dytanic.cloudnet.lib.player.CloudPlayer;
 import de.dytanic.cloudnet.lib.player.permission.GroupEntityData;
@@ -97,8 +97,8 @@ public void handleFirst(PlayerLoginEvent event)
                     else field = Class.forName("net.glowstone.entity.GlowHumanEntity").getDeclaredField("permissions");
 
                     field.setAccessible(true);
-                    final CloudPermissble cloudPermissble = new CloudPermissble(event.getPlayer());
-                    field.set(event.getPlayer(), cloudPermissble);
+                    final CloudPermissible cloudPermissible = new CloudPermissible(event.getPlayer());
+                    field.set(event.getPlayer(), cloudPermissible);
                 } catch (Exception ex)
                 {
                     ex.printStackTrace();

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/serverselectors/SignSelector.java

@@ -799,7 +799,7 @@ public void onServerAdd(ServerInfo serverInfo)
                             changeBlock(location, signLayout.getBlockId(), signLayout.getSubId());
                         } else
                         {
-                            sign.setServerInfo(null);
+                            newSign.setServerInfo(null);
                             SignLayout signLayout = getSearchingLayout(((ThreadImpl) worker).animationTick);
                             String[] layout = updateOfflineAndMaintenance(signLayout.getSignLayout().clone(), sign);
                             for (Player all : Bukkit.getOnlinePlayers())
@@ -971,4 +971,4 @@ public void run()
                 }
         }
     }
-}
+}

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissble.java → cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java

@@ -20,11 +20,11 @@
 /**
  * Created by Tareko on 18.08.2017.
  */
-public class CloudPermissble extends PermissibleBase {
+public class CloudPermissible extends PermissibleBase {
 
     private UUID uniqueId;
 
-    public CloudPermissble(Player player)
+    public CloudPermissible(Player player)
     {
         super(player);
         this.uniqueId = player.getUniqueId();

cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/CloudFlareService.java

@@ -12,11 +12,12 @@
 import de.dytanic.cloudnet.cloudflare.util.DNSType;
 import de.dytanic.cloudnet.cloudflare.util.DefaultDNSRecord;
 import de.dytanic.cloudnet.cloudflare.util.SRVRecord;
+import de.dytanic.cloudnet.lib.MultiValue;
 import de.dytanic.cloudnet.lib.NetworkUtils;
-import de.dytanic.cloudnet.lib.database.Database;
 import de.dytanic.cloudnet.lib.server.ProxyGroup;
 import de.dytanic.cloudnet.lib.server.ProxyProcessMeta;
 import de.dytanic.cloudnet.lib.service.SimpledWrapperInfo;
+import de.dytanic.cloudnet.lib.utility.Acceptable;
 import de.dytanic.cloudnet.lib.utility.CollectionWrapper;
 import de.dytanic.cloudnet.lib.utility.document.Document;
 import lombok.Getter;
@@ -42,9 +43,9 @@ public class CloudFlareService {
     private Collection<CloudFlareConfig> cloudFlareConfigs;
 
     // WrapperId DNSRecord
-    private final Map<String, PostResponse>
-            ipARecords = NetworkUtils.newConcurrentHashMap(),
-            bungeeSRVRecords = NetworkUtils.newConcurrentHashMap();
+    private final Map<String, MultiValue<PostResponse, String>> ipARecords = NetworkUtils.newConcurrentHashMap();
+
+    private final Map<String, MultiValue<PostResponse, String>> bungeeSRVRecords = NetworkUtils.newConcurrentHashMap();
 
     /**
      * Constructs a new CloudFlare Service module with a given configuration.
@@ -61,12 +62,8 @@ public CloudFlareService(Collection<CloudFlareConfig> cloudFlareConfigs)
     @Deprecated
     public boolean bootstrap(Map<String, SimpledWrapperInfo> wrapperInfoMap, Map<String, ProxyGroup> groups, CloudFlareDatabase cloudFlareDatabase)
     {
-        for (PostResponse id : cloudFlareDatabase.getAndRemove().values())
-            this.deleteRecord(id);
-
-        for (String key : cloudFlareDatabase.getAll())
-            if (!key.equalsIgnoreCase(Database.UNIQUE_NAME_KEY) && !wrapperInfoMap.containsKey(key))
-                deleteRecord(cloudFlareDatabase.getResponse(key));
+        for (MultiValue<PostResponse, String> id : cloudFlareDatabase.getAndRemove().values())
+            this.deleteRecord(id.getFirst());
 
         for (CloudFlareConfig cloudFlareConfig : this.cloudFlareConfigs)
             if (cloudFlareConfig.isEnabled())
@@ -75,15 +72,15 @@ public boolean bootstrap(Map<String, SimpledWrapperInfo> wrapperInfoMap, Map<Str
                     ProxyGroup proxyGroup = groups.get(cloudFlareProxyGroup.getName());
                     for (String wrapper : proxyGroup.getWrapper())
                     {
-                        if (!cloudFlareDatabase.contains(wrapper))
+                        if (!cloudFlareDatabase.contains(cloudFlareConfig, wrapper))
                         {
                             String host = wrapperInfoMap.get(wrapper).getHostName();
                             DNSRecord dnsRecord = new DefaultDNSRecord(DNSType.A, wrapper + "." + cloudFlareConfig.getDomainName(), host, new Document().obj());
                             if (!ipARecords.containsKey(wrapper))
                             {
                                 PostResponse postResponse = this.createRecord(cloudFlareConfig, dnsRecord);
-                                ipARecords.put(wrapper, postResponse);
-                                cloudFlareDatabase.putPostResponse(wrapper, postResponse);
+                                ipARecords.put(postResponse.getId(), new MultiValue<>(postResponse, wrapper));
+                                cloudFlareDatabase.putPostResponse(new MultiValue<>(postResponse, wrapper));
                                 NetworkUtils.sleepUninterruptedly(400);
                             }
                         }
@@ -94,16 +91,22 @@ public boolean bootstrap(Map<String, SimpledWrapperInfo> wrapperInfoMap, Map<Str
 
     public boolean shutdown(CloudFlareDatabase cloudFlareDatabase)
     {
-        for (PostResponse postResponse : this.bungeeSRVRecords.values())
+        for (MultiValue<PostResponse, String> postResponse : this.bungeeSRVRecords.values())
         {
-            this.deleteRecord(postResponse);
-            NetworkUtils.sleepUninterruptedly(450);
+            try
+            {
+                this.deleteRecord(postResponse.getFirst());
+                NetworkUtils.sleepUninterruptedly(500);
+            } catch (Exception ex)
+            {
+                ex.printStackTrace();
+            }
         }
 
-        for (PostResponse id : cloudFlareDatabase.getAndRemove().values())
+        for (MultiValue<PostResponse, String> id : cloudFlareDatabase.getAndRemove().values())
         {
-            this.deleteRecord(id);
-            NetworkUtils.sleepUninterruptedly(450);
+            this.deleteRecord(id.getFirst());
+            NetworkUtils.sleepUninterruptedly(500);
         }
         return true;
     }
@@ -163,9 +166,9 @@ public void addProxy(ProxyProcessMeta proxyServer, CloudFlareDatabase cloudFlare
                                 proxyServer.getServiceId().getWrapperId() + "." + cloudFlareConfig.getDomainName()
                         );
                     }
-                    PostResponse postResponse1 = this.createRecord(cloudFlareConfig, srvRecord);
-                    cloudFlareDatabase.add(postResponse1);
-                    this.bungeeSRVRecords.put(proxyServer.getServiceId().getServerId(), postResponse1);
+                    PostResponse postResponse = this.createRecord(cloudFlareConfig, srvRecord);
+                    cloudFlareDatabase.add(postResponse);
+                    this.bungeeSRVRecords.put(postResponse.getId(), new MultiValue<>(postResponse, proxyServer.getServiceId().getServerId()));
                 }
             }
     }
@@ -178,13 +181,36 @@ public void addProxy(ProxyProcessMeta proxyServer, CloudFlareDatabase cloudFlare
      */
     public void removeProxy(ProxyProcessMeta proxyServer, CloudFlareDatabase cloudFlareDatabase)
     {
-        if (!bungeeSRVRecords.containsKey(proxyServer.getServiceId().getServerId())) return;
+        //if (!bungeeSRVRecords.containsKey(proxyServer.getServiceId().getServerId())) return;
 
-        PostResponse postResponse = bungeeSRVRecords.get(proxyServer.getServiceId().getServerId());
-        if (postResponse != null)
+        while (true)
         {
-            cloudFlareDatabase.remove(postResponse.getId());
-            deleteRecord(postResponse);
+            Collection<MultiValue<PostResponse, String>> postResponses = CollectionWrapper.filterMany(bungeeSRVRecords.values(), new Acceptable<MultiValue<PostResponse, String>>() {
+                @Override
+                public boolean isAccepted(MultiValue<PostResponse, String> postResponseStringMultiValue)
+                {
+                    return postResponseStringMultiValue.getSecond().equalsIgnoreCase(proxyServer.getServiceId().getServerId());
+                }
+            });
+
+            //MultiValue<PostResponse, String> postResponse = bungeeSRVRecords.get(proxyServer.getServiceId().getServerId());
+            /*
+            if (postResponse != null)
+            {
+                cloudFlareDatabase.remove(postResponse.getFirst().getId());
+                deleteRecord(postResponse.getFirst());
+            } else break;
+            */
+
+            for (MultiValue<PostResponse, String> postResponse : postResponses)
+                if (postResponse != null)
+                {
+                    bungeeSRVRecords.remove(postResponse.getSecond());
+                    cloudFlareDatabase.remove(postResponse.getFirst().getId());
+                    deleteRecord(postResponse.getFirst());
+
+                    NetworkUtils.sleepUninterruptedly(500);
+                }
         }
     }
 
@@ -209,6 +235,7 @@ public PostResponse createRecord(CloudFlareConfig cloudFlareConfig, DNSRecord dn
             httpPost.setRequestProperty("Content-Type", "application/json");
             httpPost.setDoOutput(true);
             httpPost.connect();
+
             try (DataOutputStream dataOutputStream = new DataOutputStream(httpPost.getOutputStream()))
             {
                 dataOutputStream.writeBytes(values);
@@ -231,6 +258,7 @@ public PostResponse createRecord(CloudFlareConfig cloudFlareConfig, DNSRecord dn
         {
             e.printStackTrace();
         }
+
         return null;
     }
 
@@ -245,12 +273,14 @@ public void deleteRecord(PostResponse postResponse)
         try
         {
             HttpURLConnection delete = (HttpURLConnection) new URL(PREFIX_URL + "zones/" + postResponse.getCloudFlareConfig().getZoneId() + "/dns_records/" + postResponse.getId()).openConnection();
+
             delete.setRequestMethod("DELETE");
             delete.setRequestProperty("X-Auth-Email", postResponse.getCloudFlareConfig().getEmail());
             delete.setRequestProperty("X-Auth-Key", postResponse.getCloudFlareConfig().getToken());
             delete.setRequestProperty("Accept", "application/json");
             delete.setRequestProperty("Content-Type", "application/json");
             delete.connect();
+
             try (InputStream inputStream = delete.getInputStream())
             {
                 JsonObject jsonObject = toJsonInput(inputStream);
@@ -259,6 +289,7 @@ public void deleteRecord(PostResponse postResponse)
                     System.out.println(prefix + " DNSRecord [" + postResponse.getId() + "] was removed");
                 }
             }
+
             delete.disconnect();
         } catch (Exception ex)
         {

cloudnet-cord/cloudnet-cloudflare/src/main/java/de/dytanic/cloudnet/cloudflare/database/CloudFlareDatabase.java

@@ -5,8 +5,10 @@
 package de.dytanic.cloudnet.cloudflare.database;
 
 import com.google.gson.reflect.TypeToken;
+import de.dytanic.cloudnet.cloudflare.CloudFlareConfig;
 import de.dytanic.cloudnet.cloudflare.PostResponse;
 import de.dytanic.cloudnet.database.DatabaseUsable;
+import de.dytanic.cloudnet.lib.MultiValue;
 import de.dytanic.cloudnet.lib.database.Database;
 import de.dytanic.cloudnet.lib.database.DatabaseDocument;
 import de.dytanic.cloudnet.lib.utility.MapWrapper;
@@ -42,17 +44,44 @@ public Collection<String> getAll()
         return collection;
     }
 
-    public void putPostResponse(String wrapper, PostResponse postResponse)
+    public void putPostResponse(MultiValue<PostResponse, String> postResponse)
     {
         Document document = database.getDocument(CLOUDFLARE_CACHE);
-        document.append(wrapper, postResponse);
+        document.append(postResponse.getFirst().getId(), postResponse);
         database.insert(document);
     }
 
-    public boolean contains(String wrapper)
+    public boolean contains(CloudFlareConfig cloudFlareConfig, String wrapper)
     {
         Document document = database.getDocument(CLOUDFLARE_CACHE);
-        return document.contains(wrapper);
+
+        /*
+        Map<String, MultiValue<PostResponse, String>> responses = document.getObject("requests", new TypeToken<Map<String, MultiValue<PostResponse, String>>>() {
+        }.getType());
+        */
+
+        /*
+        return CollectionWrapper.filter(responses.values(), new Acceptable<MultiValue<PostResponse, String>>() {
+            @Override
+            public boolean isAccepted(MultiValue<PostResponse, String> value)
+            {
+                return value.getSecond().equalsIgnoreCase(wrapper) && value.getFirst().getCloudFlareConfig().getDomainName().equalsIgnoreCase(cloudFlareConfig.getDomainName());
+            }
+        }) != null;
+        */
+
+        for (String key : document.keys())
+            if (!key.equalsIgnoreCase(Database.UNIQUE_NAME_KEY))
+            {
+                MultiValue<PostResponse, String> value = document.getObject(key, new TypeToken<MultiValue<PostResponse, String>>() {
+                }.getType());
+
+                if (value != null && value.getSecond().equalsIgnoreCase(wrapper) && value.getFirst().getCloudFlareConfig().getDomainName().equalsIgnoreCase(cloudFlareConfig.getDomainName()))
+                    return true;
+            }
+
+        return false;
+        //return document.contains(wrapper);
     }
 
     public void remove(String wrapper)
@@ -102,18 +131,17 @@ public void remove(PostResponse postResponse)
         database.insert(document);
     }
 
-    public Map<String, PostResponse> getAndRemove()
+    public Map<String, MultiValue<PostResponse, String>> getAndRemove()
     {
         Document document = database.getDocument(CLOUDFLARE_CACHE_REQ);
         if (document.contains("requests"))
         {
-            Map<String, PostResponse> responses = document.getObject("requests", new TypeToken<Map<String, PostResponse>>() {
+            Map<String, MultiValue<PostResponse, String>> responses = document.getObject("requests", new TypeToken<Map<String, MultiValue<PostResponse, String>>>() {
             }.getType());
-            document.append("requests", new HashMap<>(0));
+            document.append("requests", Collections.EMPTY_MAP);
             database.insert(document);
             return responses;
         }
         return Collections.EMPTY_MAP;
     }
-
-}
+}

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/command/CommandShutdown.java

@@ -79,7 +79,7 @@ public void run(ProxyServer obj)
                     sender.sendMessage("Group doesn't exist");
                     return;
                 }
-                if (args[0].equalsIgnoreCase("server"))
+                if (args[0].equalsIgnoreCase("server") || args[0].equalsIgnoreCase("-s"))
                 {
                     MinecraftServer proxyServer = CloudNet.getInstance().getServer(args[1]);
                     if (proxyServer != null)
@@ -99,7 +99,7 @@ public void run(ProxyServer obj)
                     }
                     return;
                 }
-                if (args[0].equalsIgnoreCase("proxy"))
+                if (args[0].equalsIgnoreCase("proxy") || args[0].equalsIgnoreCase("-p"))
                 {
                     ProxyServer proxyServer = CloudNet.getInstance().getProxy(args[1]);
                     if (proxyServer != null)

cloudnet-core/src/main/resources/modules/modules.properties

@@ -1,8 +1,8 @@
 #
 # Copyright (c) Tarek Hosni El Alaoui 2017
 #
-CloudNet-Service-PermissionModule=1.0.0.1
-CloudNet-Service-MobModule=1.0.0.1
-CloudNet-Service-SignsModule=1.0.0.1
-CloudNet-Service-CloudFlareModule=1.0.0.1
-CloudNet-Service-NotifyServiceModule=1.0.0.1
+CloudNet-Service-PermissionModule=1.0.0.2
+CloudNet-Service-MobModule=1.0.0.2
+CloudNet-Service-SignsModule=1.0.0.2
+CloudNet-Service-CloudFlareModule=1.0.0.2
+CloudNet-Service-NotifyServiceModule=1.0.0.2