Adding new uuid handling

Author: cjmang

src/main/java/dev/koifysh/archipelago/Client.java

@@ -1,5 +1,6 @@
 package dev.koifysh.archipelago;
 
+import com.google.gson.JsonObject;
 import dev.koifysh.archipelago.events.RetrievedEvent;
 import dev.koifysh.archipelago.flags.ItemsHandling;
 import dev.koifysh.archipelago.network.server.ConnectUpdatePacket;
@@ -17,36 +18,48 @@
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public abstract class Client {
 
     private final static Logger LOGGER = Logger.getLogger(Client.class.getName());
 
-    private static String OS = System.getProperty("os.name").toLowerCase();
+    private static final String OS = System.getProperty("os.name").toLowerCase();
+
+    private static final Path cachePath;
+    private static final Path datapackageCachePath;
 
-    private static final Path windowsDataPackageCache;
-    
-    private static final Path otherDataPackageCache;
-    
     static
     {
         String appData = System.getenv("LOCALAPPDATA");
         String winHome = System.getenv("USERPROFILE");
         String userHome = System.getProperty("user.home");
 
-        if(appData  == null || appData.isEmpty()) {
-            windowsDataPackageCache = Paths.get(winHome, "appdata","local","Archipelago","cache","datapackage");
-        } else {
-            windowsDataPackageCache = Paths.get(appData, "Archipelago", "cache", "datapackage");
+        if(OS.startsWith("windows"))
+        {
+            if(appData  == null || appData.isEmpty()) {
+                cachePath = Paths.get(winHome, "appdata", "local", "Archipelago", "Cache");
+            } else {
+                cachePath = Paths.get(appData, "Archipelago", "Cache");
+            }
         }
-        
-        otherDataPackageCache =  Paths.get(userHome, ".cache", "Archipelago", "datapackage");
+        else
+        {
+            cachePath = Paths.get(userHome, ".cache", "Archipelago");
+        }
+        datapackageCachePath = cachePath.resolve("datapackage");
+
     }
 
+    private static String uuid = null;
+
     private static Path dataPackageLocation;
 
     protected Map<String,String> versions;
@@ -61,11 +74,9 @@ public abstract class Client {
 
     private String password;
 
-    private final String UUID;
-
     private RoomInfoPacket roomInfo;
 
-    private DataPackage dataPackage;
+    private final DataPackage dataPackage;
 
     public static Client client;
 
@@ -85,19 +96,8 @@ public abstract class Client {
     private int itemsHandlingFlags = 0b000;
 
     public Client() {
-        //Determine what platform we are on
-        if(OS.startsWith("windows")){
-            dataPackageLocation = windowsDataPackageCache;
-        } else{
-            dataPackageLocation = otherDataPackageCache;
-        }
-
-        if(dataPackage == null){
-            dataPackage = new DataPackage();
-        }
-
-        UUID = dataPackage.getUUID();
-
+        dataPackageLocation = datapackageCachePath;
+        dataPackage = new DataPackage();
         eventManager = new EventManager();
         locationManager = new LocationManager(this);
         itemManager = new ItemManager(this);
@@ -159,6 +159,57 @@ public void removeTag(String tag) {
     }
 
 
+    /**
+     * Gets the UUID of clients on this machine
+     * @return UUID of the client, this should theoretically never change.
+     */
+    public static String getUUID() {
+        if(uuid == null)
+        {
+            synchronized (DataPackage.class)
+            {
+                if(uuid != null) {
+                    return uuid;
+                }
+                String tmp = null;
+                File common = cachePath.resolve("common.json").toFile();
+                JsonObject data = new JsonObject();
+                if(common.exists())
+                {
+                    try(BufferedReader reader = Files.newBufferedReader(common.toPath(), StandardCharsets.UTF_8))
+                    {
+                        data = gson.fromJson(reader, JsonObject.class);
+                    }
+                    catch(IOException ex)
+                    {
+                        LOGGER.log(Level.WARNING,"Failed to load common uuid", ex);
+                        // We probably will fail to write
+                        return uuid = UUID.randomUUID().toString();
+                    }
+                }
+
+                tmp = data.get("uuid").getAsString();
+                if(tmp != null)
+                {
+                    return uuid = tmp;
+                }
+
+                tmp = UUID.randomUUID().toString();
+                data.addProperty("uuid", uuid);
+                try(BufferedWriter writer = Files.newBufferedWriter(common.toPath(),StandardCharsets.UTF_8))
+                {
+                    writer.write(gson.toJson(data));
+                }
+                catch(IOException ex)
+                {
+                    LOGGER.log(Level.WARNING,"Failed to save common uuid", ex);
+                }
+                return uuid = tmp;
+            }
+        }
+        return uuid;
+    }
+
     protected void loadDataPackage() {
         synchronized (Client.class){
             File directoryPath = dataPackageLocation.toFile();
@@ -475,14 +526,6 @@ public void reconnect() {
         webSocket.reconnect();
     }
 
-    /**
-     * Gets the UUID of this client.
-     * @return UUID of the client, this should theoretically never change.
-     */
-    public String getUUID() {
-        return UUID;
-    }
-
     /**
      * gets the alias of this slot.
      * @return Alias of the slot connected to.

src/main/java/dev/koifysh/archipelago/WebSocket.java

@@ -98,7 +98,7 @@ public void onMessage(String message) {
                         connectPacket.version = Client.protocolVersion;
                         connectPacket.name = client.getMyName();
                         connectPacket.password = (client.getPassword() == null) ? "" : client.getPassword();
-                        connectPacket.uuid = client.getUUID();
+                        connectPacket.uuid = Client.getUUID();
                         connectPacket.game = client.getGame();
                         connectPacket.tags = client.getTags();
                         connectPacket.itemsHandling = client.getItemsHandlingFlags();
@@ -154,7 +154,6 @@ public void onMessage(String message) {
                     case DataPackage:
                         JsonElement data = packet.getAsJsonObject().get("data");
                         DataPackage dataPackage = gson.fromJson(data, DataPackage.class);
-                        dataPackage.uuid = client.getUUID();
                         client.updateDataPackage(dataPackage);
                         client.saveDataPackage();
                         break;

src/main/java/dev/koifysh/archipelago/parts/DataPackage.java

@@ -3,6 +3,7 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+import javax.xml.crypto.Data;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +15,6 @@ public class DataPackage implements Serializable {
     @SerializedName("games")
     HashMap<String, Game> games = new HashMap<>();
 
-    public String uuid = UUID.randomUUID().toString();
 
     public String getItem(long itemID, String game) {
         if (!games.containsKey(game))
@@ -51,9 +51,6 @@ public Game getGame(String game) {
     }
 
 
-    public String getUUID() {
-        return uuid;
-    }
 
     public void update(DataPackage newData) {
         games.putAll(newData.getGames());