Server communication

internal.yml

@@ -0,0 +1,7 @@
+#the installed apps. You can modify them here or through the website
+addOns:
+- name:
+  version:
+  id:
+
+state: "RUNNING"

izou.yml

@@ -0,0 +1,5 @@
+#the token used to identify the izou instance, please visit the website to get the token
+token: eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJJWk9VIiwic2lkIjoiMSIsInJlZnJlc2hJem91Ijp0cnVlfQ.0K2RDPucqoihA0_jY41m4VbfKPHWFH-nFfvEXwklQ2A
+url: localhost:4567
+urlSocket: localhost
+ssl: false

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.intellimate.izou</groupId>
     <artifactId>izou</artifactId>
-    <version>1.15.1</version>
+    <version>1.16.5</version>
     <packaging>jar</packaging>
     <name>Izou</name>
     <description>Izou is a framework used for an addon-based personal assistant</description>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>org.intellimate.izou</groupId>
             <artifactId>pf4j</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.6</version>
             <!-- we are releasing a jar with dependencies, version changes require a new Izou Version -->
         </dependency>
         <dependency>
@@ -112,6 +112,26 @@
             <artifactId>aspectjrt</artifactId>
             <version>1.5.4</version>
         </dependency>
+        <dependency>
+            <groupId>com.sun.jersey</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>1.19.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.0.0-beta-3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java-util</artifactId>
+            <version>3.0.0-beta-3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.esotericsoftware.yamlbeans</groupId>
+            <artifactId>yamlbeans</artifactId>
+            <version>1.09</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -147,6 +167,8 @@
                     <archive>
                         <manifest>
                             <mainClass>org.intellimate.izou.main.Main</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                         </manifest>
                     </archive>
                     <descriptorRefs>

src/main/java/org/intellimate/izou/addon/AddOnFileManager.java

@@ -0,0 +1,123 @@
+package org.intellimate.izou.addon;
+
+import org.intellimate.izou.config.AddOn;
+import org.intellimate.izou.config.Version;
+import org.intellimate.izou.identification.AddOnInformation;
+import org.intellimate.izou.main.Main;
+import org.intellimate.izou.util.IzouModule;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * provides Information about the installed, scheduled etc. AddOns
+ * @author LeanderK
+ * @version 1.0
+ */
+class AddOnFileManager extends IzouModule {
+    final static String REGEX_DELETE_APP = "\\w+-[\\.\\d]+-delete\\.zip";
+    final static String REGEX_DELETE_AND_INSTALL_APP = "\\w+-[\\.\\d]+(-.+)?\\.zip";
+    final static String REGEX_INSTALL_APP = "\\w+-[\\.\\d]+\\.zip";
+
+    AddOnFileManager(Main main) {
+        super(main);
+    }
+
+    /**
+     * returns the List of the installed zip-files
+     * @return a list of the ZipFiles
+     */
+    List<String> getInstalledAppsRawNames() throws IOException {
+        try (Stream<Path> stream = Files.list(getMain().getFileSystemManager().getLibLocation().toPath())){
+            return stream.map(Path::toFile)
+                    .map(File::getName)
+                    .filter(name -> name.matches(REGEX_INSTALL_APP))
+                    .collect(Collectors.toList());
+        }
+    }
+
+    /**
+     * returns all the installed Addons (inclusive the dependencies)
+     * @return a list of installed Addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    List<AddOnInformation> getInstalledWithDependencies() throws IOException {
+        return getInstalledAppsRawNames().stream()
+                .map(fileName -> AddOnFileManager.fileNameToAppExisting(fileName, getMain()))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * returns the apps scheduled to install
+     * @return a list of addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    List<AddOn> getScheduledToInstall() throws IOException {
+        try (Stream<Path> stream = Files.list(getMain().getFileSystemManager().getNewLibLocation().toPath())) {
+            return stream.map(Path::toFile)
+                    .map(File::getName)
+                    .filter(fileName -> fileName.matches(REGEX_INSTALL_APP))
+                    .map(AddOnFileManager::pathToApp)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .collect(Collectors.toList());
+        }
+    }
+
+    /**
+     * returns teh Downloaded apps
+     * @return a list of addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    List<AddOn> getScheduledToDelete() throws IOException {
+        try (Stream<Path> stream = Files.list(getMain().getFileSystemManager().getNewLibLocation().toPath())) {
+            return stream.map(Path::toFile)
+                    .map(File::getName)
+                    .filter(fileName -> fileName.matches(REGEX_DELETE_APP))
+                    .map(AddOnFileManager::pathToApp)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .collect(Collectors.toList());
+        }
+    }
+
+    /**
+     * maps a Path to an {@link AddOnInformation} (if it is already existing)
+     * @param fileName the name of the File
+     * @return an AddOn or null
+     */
+    static Optional<AddOnInformation> fileNameToAppExisting(String fileName, Main main) {
+        String[] split = fileName.split("-");
+        String name = split[0];
+        if (name.isEmpty()) {
+            return Optional.empty();
+        } else {
+            return main.getAddOnInformationManager().getAddOnInformation(name);
+        }
+    }
+
+    /**
+     * maps a Path to an App
+     * @param fileName the name of the File
+     * @return an AddOn or null
+     */
+    static Optional<AddOn> pathToApp(String fileName) {
+        String[] split = fileName.split("-");
+        String name = split[0];
+        Version version;
+        try {
+            version = new Version(split[1]);
+        } catch (IllegalArgumentException e) {
+            return null;
+        }
+        return Optional.of(new AddOn(name, version.toString(), -1));
+    }
+}

src/main/java/org/intellimate/izou/addon/AddOnManager.java

@@ -1,6 +1,9 @@
 package org.intellimate.izou.addon;
 
+import com.sun.jersey.api.client.ClientHandlerException;
 import org.apache.logging.log4j.Level;
+import org.intellimate.izou.config.AddOn;
+import org.intellimate.izou.identification.AddOnInformation;
 import org.intellimate.izou.identification.AddOnInformationManager;
 import org.intellimate.izou.main.Main;
 import org.intellimate.izou.security.SecurityFunctions;
@@ -24,18 +27,21 @@
 import java.security.cert.CertificateException;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
  * Manages all the AddOns.
  */
 //TODO isolate pf4j calls & catch errors accordingly
+//TODO update methods
 public class AddOnManager extends IzouModule implements AddonThreadPoolUser {
     private IdentifiableSet<AddOnModel> addOns = new IdentifiableSet<>();
     private HashMap<AddOnModel, PluginWrapper> pluginWrappers = new HashMap<>();
     private Set<AspectOrAffected> aspectOrAffectedSet = new HashSet<>();
     private List<Runnable> initializedCallback = new ArrayList<>();
-    private AddOnInformationManager addOnInformationManager;
+    private SynchronizationManager synchronizationManager;
+    private final AddOnFileManager addOnFileManager;
 
     /**
      * Creates a new instance of the AddOnManager
@@ -44,13 +50,15 @@ public class AddOnManager extends IzouModule implements AddonThreadPoolUser {
      */
     public AddOnManager(Main main) {
         super(main);
-        addOnInformationManager = main.getAddOnInformationManager();
+        synchronizationManager = new SynchronizationManager(main);
+        addOnFileManager = new AddOnFileManager(main);
     }
 
     /**
     * Retrieves and registers all AddOns.
     */
-    public void retrieveAndRegisterAddOns() {
+    public void retrieveAndRegisterAddOns() throws IOException {
+        synchronizationManager.copyOrDeleteDownloadedApps();
         addOns.addAll(loadAddOns());
         registerAllAddOns(addOns);
         initialized();
@@ -82,8 +90,8 @@ public void addAndRegisterAddOns(List<AddOnModel> addOns) {
      * @param addOns
      */
     public void registerAllAddOns(IdentifiableSet<AddOnModel> addOns) {
-        initAddOns(addOns);
         createAddOnInfos(addOns);
+        initAddOns(addOns);
         List<CompletableFuture<Void>> futures = addOns.stream()
                 .map(addOn -> submit((Runnable) addOn::register))
                 .collect(Collectors.toList());
@@ -98,7 +106,7 @@ public void registerAllAddOns(IdentifiableSet<AddOnModel> addOns) {
      * Checks that addOns have all required properties and creating the addOn information list if they do
      */
     private void createAddOnInfos(IdentifiableSet<AddOnModel> addOns) {
-        addOns.stream().forEach(addOn -> addOnInformationManager.registerAddOn(addOn));
+        addOns.stream().forEach(addOn -> getMain().getAddOnInformationManager().registerAddOn(addOn));
     }
 
     /**
@@ -144,6 +152,22 @@ private List<AddOnModel> loadAddOns() {
         try {
             debug("retrieving addons from the plugins");
             List<AddOnModel> addOns = pluginManager.getExtensions(AddOnModel.class);
+            Collection<AddOnModel> removedDuplicates = addOns.stream()
+                    .filter(addOn -> addOn.getClass().getClassLoader() instanceof IzouPluginClassLoader)
+                    .collect(Collectors.toMap(
+                            addOn -> ((IzouPluginClassLoader) addOn.getClass().getClassLoader()).getPluginDescriptor().getPluginId(),
+                            Function.identity(),
+                            ((addOn, addOnModel2) -> {
+                                debug(String.format(
+                                        "multiple Extensions with the same PluginId %s discovered! %s and %s.",
+                                        ((IzouPluginClassLoader) addOn.getClass().getClassLoader()).getPluginDescriptor().getPluginId(),
+                                        addOn.toString(),
+                                        addOnModel2.toString()));
+                                return addOn;
+                            })
+                    ))
+                    .values();
+            addOns = new ArrayList<>(removedDuplicates);
             debug("retrieved: " + addOns.toString());
             KeyManager keyManager = new KeyManager();
             addOns.stream()
@@ -337,4 +361,57 @@ private KeyStore createKeyStore(String fileName, String password)  {
             return keyStore;
         }
     }
+
+    /**
+     * synchronizes the apps with the server
+     * @return true if something changed
+     * @throws IOException if in the early stages of the synchronization something went wrong with the File-IO
+     * @throws ClientHandlerException if in the early stages of the synchronization something went wrong with the Network-IO
+     */
+    public boolean synchronizeApps() throws IOException, ClientHandlerException{
+        return synchronizationManager.synchronizeApps();
+    }
+
+    /**
+     * returns whether the AddOnManager is currently synchronizing
+     * @return true if synchronizing
+     */
+    public boolean isSynchronizing() {
+        return synchronizationManager.isBusy();
+    }
+
+    /**
+     * returns the List of the installed zip-files
+     * @return a list of the ZipFiles
+     */
+    public List<String> getInstalledAppsRawNames() throws IOException {
+        return addOnFileManager.getInstalledAppsRawNames();
+    }
+
+    /**
+     * returns all the installed Addons (inclusive the dependencies)
+     * @return a list of installed Addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    public List<AddOnInformation> getInstalledWithDependencies() throws IOException {
+        return addOnFileManager.getInstalledWithDependencies();
+    }
+
+    /**
+     * returns the apps scheduled to install
+     * @return a list of addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    public List<AddOn> getScheduledToInstall() throws IOException {
+        return addOnFileManager.getScheduledToInstall();
+    }
+
+    /**
+     * returns teh Downloaded apps
+     * @return a list of addons
+     * @throws IOException if an Exception occurred while trying to access the File-System
+     */
+    public List<AddOn> getScheduledToDelete() throws IOException {
+        return addOnFileManager.getScheduledToDelete();
+    }
 }

src/main/java/org/intellimate/izou/addon/AddOnModel.java

@@ -1,7 +1,11 @@
 package org.intellimate.izou.addon;
 
 import org.intellimate.izou.identification.Identifiable;
+import org.intellimate.izou.server.Request;
+import org.intellimate.izou.server.Response;
 import org.intellimate.izou.system.Context;
+import org.intellimate.server.proto.HttpRequest;
+import org.intellimate.server.proto.HttpResponse;
 import ro.fortsoft.pf4j.AddonAccessible;
 import ro.fortsoft.pf4j.ExtensionPoint;
 import ro.fortsoft.pf4j.PluginWrapper;
@@ -39,4 +43,11 @@ public interface AddOnModel extends ExtensionPoint, Identifiable {
      * @param plugin the plugin
      */
     void setPlugin(PluginWrapper plugin);
+
+    /**
+     * this method handles the HTTP-Requests
+     * @param request the request to process
+     * @return the response
+     */
+    Response handleRequest(Request request);
 }