Installupdate (#53)

Added auto service install and jar file upgrade from the ui

.circleci/config.yml

@@ -54,20 +54,10 @@ workflows:
   version: 2
   release:
     jobs:
-      - build_ui:
+      - build_ui
-          filters:
-            branches:
-              only: 
-                - master
-                - dev
       - build_jar:
           requires:
             - build_ui
-          filters:
-            branches:
-              only:
-                - master
-                - dev
       - deploy:
           requires:
             - build_jar

chameleon-client/src/views/Settings.vue

@@ -11,7 +11,7 @@
                     <component :is="selectedComponent" @update="$emit('save')"/>
                 </div>
             </v-col>
-            <v-col class="colsClass" v-show="selectedTab === 1 || selectedTab === 2">
+            <v-col class="colsClass" v-show="selectedTab === 1">
                 <div class="videoClass">
                     <img :src="streamAddress" alt="Camera Stream">
                 </div>
@@ -34,18 +34,13 @@
         data() {
             return {
                 selectedTab: 0,
+                tabList:[General, Cameras]
             }
         },
         computed: {
             selectedComponent: {
                 get() {
-                    switch (this.selectedTab) {
+                    return this.tabList[this.selectedTab];
-                        case 0:
-                            return "General";
-                        case 1:
-                            return "Cameras";
-                    }
-                    return "";
                 }
             },
             streamAddress: {

chameleon-client/src/views/SettingsViewes/General.vue

@@ -1,5 +1,9 @@
 <template>
     <div>
+        <div style="margin-top: 15px">
+            <span>General Settings:</span>
+            <v-divider color="white"></v-divider>
+        </div>
         <CVnumberinput v-model="settings.teamNumber" name="Team Number"/>
         <CVradio v-model="settings.connectionType" :list="['DHCP','Static']"/>
         <v-divider color="white"/>
@@ -9,6 +13,30 @@
         <v-divider color="white"/>
         <CVinput name="Hostname" v-model="settings.hostname"/>
         <v-btn style="margin-top:10px" small color="#4baf62" @click="sendGeneralSettings">Save General Settings</v-btn>
+        <div style="margin-top: 20px">
+            <span>Install or Update:</span>
+            <v-divider color="white"></v-divider>
+        </div>
+        <div v-if="!isLoading">
+            <v-row dense align="center">
+                <v-col :cols="3">
+                    <span>Choose a newer version: </span>
+                </v-col>
+                <v-col :cols="6">
+                    <v-file-input accept=".jar" dark v-model="file"></v-file-input>
+                </v-col>
+            </v-row>
+            <v-btn small @click="installOrUpdate">{{fileUploadText}}</v-btn>
+        </div>
+        <div v-else style="text-align: center; margin-top: 20px">
+            <v-progress-circular color="white" :indeterminate="true" size="32"
+                                 width="4"></v-progress-circular>
+            <br>
+            <span>Please wait this may take a while</span>
+        </div>
+        <v-snackbar v-model="snack" top :color="snackbar.color">
+            <span>{{snackbar.text}}</span>
+        </v-snackbar>
     </div>
 </template>
 
@@ -25,26 +53,64 @@
             CVinput
         },
         data() {
-            return {}
+            return {
+                file: undefined,
+                snackbar: {
+                    color: "success",
+                    text: ""
+                },
+                snack: false,
+                isLoading: false
+            }
         },
         methods: {
             sendGeneralSettings() {
                 const self = this;
                 this.axios.post("http://" + this.$address + "/api/settings/general", this.settings).then(
                     function (response) {
-                        if (response.status === 200){
+                        if (response.status === 200) {
                             self.$store.state.saveBar = true;
                         }
                     }
                 )
+            },
+            installOrUpdate() {
+                let formData = new FormData();
+                formData.append('file', this.file);
+                if (this.file !== undefined) {
+                    this.isLoading = true;
+                }
+                this.axios.post("http://" + this.$address + "/api/install", formData, {
+                    headers: {
+                        'Content-Type': 'multipart/form-data'
+                    }
+                }).then(() => {
+                    this.snackbar = {
+                        color: "success",
+                        text: "Installation successful"
+                    };
+                    this.isLoading = false;
+                    this.snack = true;
+                }).catch(error => {
+                    this.snackbar = {
+                        color: "error",
+                        text: error.response.data
+                    };
+                    this.isLoading = false;
+                    this.snack = true;
+                })
             }
         },
         computed: {
-            isDisabled() {
+            fileUploadText() {
-                if (this.settings.connectionType === 0) {
+                if (this.file !== undefined) {
-                    return true;
+                    return "Install and update"
+                } else {
+                    return "Install current version"
                 }
-                return false;
+            },
+            isDisabled() {
+                return this.settings.connectionType === 0;
             },
             settings: {
                 get() {

chameleon-server/chameleon-vision.iml

@@ -7,47 +7,32 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/testimages" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-java:2020.2.2" level="project" />
+    <orderEntry type="library" name="Maven: io.javalin:javalin:3.7.0" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxaarch64bionic:2020.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxraspbian:2020.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:linuxx86-64:2020.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:osxx86-64:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cscore:cscore-jni:windowsx86-64:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.cameraserver:cameraserver-java:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-java:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:osxx86-64:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:linuxraspbian:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:linuxx86-64:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:linuxaarch64bionic:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.ntcore:ntcore-jni:windowsx86-64:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: edu.wpi.first.wpiutil:wpiutil-java:2020.2.2" level="project" />
-    <orderEntry type="library" name="Maven: io.javalin:javalin:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.31" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.31" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.31" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.28" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.25.v20191220" level="project" />
     <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.25.v20191220" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.19.v20190610" level="project" />
+    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.25.v20191220" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-nop:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />

chameleon-server/pom.xml

@@ -63,7 +63,7 @@
         <dependency>
             <groupId>io.javalin</groupId>
             <artifactId>javalin</artifactId>
-            <version>3.4.1</version>
+            <version>RELEASE</version>
         </dependency>
 
         <!--org.json from saving and loading data-->

chameleon-server/src/main/java/com/chameleonvision/util/Helpers.java

@@ -1,13 +1,34 @@
 package com.chameleonvision.util;
 
 import edu.wpi.cscore.VideoMode;
+import io.javalin.http.UploadedFile;
 import org.opencv.core.Scalar;
 
 import java.awt.*;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
 public class Helpers {
+    private static final String kServicePath = "/etc/systemd/system/chameleonVision.service";
+    private static final String kServiceString = "[Unit]\n" +
+            "Description=chameleon vision\n" +
+            "\n" +
+            "[Service]\n" +
+            "ExecStart=/usr/bin/java -jar %s \n" +
+            "StandardOutput=file:/var/log/something.out.txt\n" +
+            "StandardError=file:/var/log/something.err.txt\n" +
+            "Type=simple\n" +
+            "WorkingDirectory=/usr/local/bin\n" +
+            "\n" +
+            "[Install]\n" +
+            "WantedBy=multi-user.target\n" +
+            "\n";
+
     private Helpers() {
     }
 
@@ -17,9 +38,19 @@ public class Helpers {
 
     public static HashMap VideoModeToHashMap(VideoMode videoMode) {
         return new HashMap<String, Object>() {{
-                put("width", videoMode.width);
+            put("width", videoMode.width);
-                put("height", videoMode.height);
+            put("height", videoMode.height);
-                put("fps", videoMode.fps);
+            put("fps", videoMode.fps);
-                put("pixelFormat", videoMode.pixelFormat.toString());}};
+            put("pixelFormat", videoMode.pixelFormat.toString());
+        }};
+    }
+
+    public static void setService(Path filePath) throws IOException, InterruptedException {
+        String newService = String.format(kServiceString, filePath.toString());
+        Writer writer = new FileWriter(kServicePath, false);
+        writer.write(newService);
+        writer.close();
+        Process p = Runtime.getRuntime().exec("systemctl enable chameleonVision.service");
+        p.waitFor();
     }
 }

chameleon-server/src/main/java/com/chameleonvision/web/RequestHandler.java

@@ -1,9 +1,13 @@
 package com.chameleonvision.web;
 
 import com.chameleonvision.Exceptions.DuplicatedKeyException;
+import com.chameleonvision.Main;
 import com.chameleonvision.config.ConfigManager;
 import com.chameleonvision.network.NetworkIPMode;
 import com.chameleonvision.networktables.NetworkTablesManager;
+import com.chameleonvision.util.Helpers;
+import com.chameleonvision.util.Platform;
+import com.chameleonvision.util.ProgramDirectoryUtilities;
 import com.chameleonvision.vision.VisionManager;
 import com.chameleonvision.vision.VisionProcess;
 import com.chameleonvision.vision.camera.USBCameraCapture;
@@ -17,13 +21,19 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import edu.wpi.cscore.VideoMode;
 import edu.wpi.first.wpilibj.geometry.Rotation2d;
+import io.javalin.core.util.FileUtil;
 import io.javalin.http.Context;
 import io.javalin.http.Handler;
+import io.javalin.http.UploadedFile;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.math3.ml.neuralnet.Network;
 import org.opencv.core.Point;
 import org.opencv.core.Point3;
 
-import java.io.IOException;
+import java.io.*;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -209,4 +219,31 @@ public class RequestHandler {
             ctx.status(500);
         }
     }
+
+    public static void onInstallOrUpdate(Context ctx) {
+        Platform p = Platform.getCurrentPlatform();
+        try {
+            if (p == Platform.LINUX_RASPBIAN || p == Platform.LINUX_64) {
+                UploadedFile file = ctx.uploadedFile("file");
+                Path filePath;
+                if (file != null) {
+                    filePath = Paths.get(ProgramDirectoryUtilities.getProgramDirectory(), file.getFilename());
+                    File target = new File(filePath.toString());
+                    OutputStream stream = new FileOutputStream(target);
+                    file.getContent().transferTo(stream);
+                    stream.close();
+                } else {
+                    filePath = Paths.get(new File(Main.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getPath()); // quirk to get the current file directory
+                }
+                Helpers.setService(filePath);
+                ctx.status(200);
+            } else {
+                ctx.result("Only Linux Platforms Support this feature");
+                ctx.status(500);
+            }
+        } catch (Exception e) {
+            ctx.result(e.toString());
+            ctx.status(500);
+        }
+    }
 }

chameleon-server/src/main/java/com/chameleonvision/web/Server.java

@@ -35,6 +35,7 @@ public class Server {
         app.post("/api/settings/snapshot", RequestHandler::onSnapshot);
         app.post("/api/settings/endCalibration", RequestHandler::onCalibrationEnding);
         app.post("/api/vision/pnpModel", RequestHandler::onPnpModel);
+        app.post("/api/install", RequestHandler::onInstallOrUpdate);
         app.start(port);
     }
 }

chameleon-server/src/main/java/com/chameleonvision/web/SocketHandler.java

@@ -53,8 +53,8 @@ public class SocketHandler {
 
     @SuppressWarnings("unchecked")
     void onBinaryMessage(WsBinaryMessageContext context) throws Exception {
-        Map<String, Object> deserialized = objectMapper.readValue(ArrayUtils.toPrimitive(context.data()), new TypeReference<>() {
+        Map<String, Object> deserialized = objectMapper.readValue((byte[]) ArrayUtils.toPrimitive(context.data()),
-        });
+                new TypeReference<>(){});
         for (Map.Entry<String, Object> entry : deserialized.entrySet()) {
             try {
                 VisionProcess currentProcess = VisionManager.getCurrentUIVisionProcess();