Merge pull request #1 from netguru/develop

release 0.0.2

Author: pbochenski

bitrise.yml

@@ -0,0 +1,35 @@
+---
+format_version: '7'
+default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
+project_type: other
+trigger_map:
+  - push_branch: "master"
+    workflow: release
+workflows:
+  release:
+    steps:
+      - activate-ssh-key@4.0.3:
+          run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
+      - git-clone@4.0.14: {}
+      - cache-pull@2.0.1: {}
+      - gradle-runner@1.8.5:
+          inputs:
+            - apk_file_include_filter: "*smarthome-*.zip"
+            - gradle_task: distZip
+      - script@1.1.5:
+          inputs:
+            - is_debug: 'no'
+            - content: |+
+                #!/usr/bin/env bash
+                version=`grep  "version \'\d*\.\d*\.\d*\'" build.gradle | cut -d" " -f2`
+                envman add --key CURRENT_VERSION --value $version
+      - cache-push@2.1.1: {}
+      - deploy-to-bitrise-io@1.3.19:
+          inputs:
+            - notify_user_groups: none
+          is_always_run: false
+app:
+  envs:
+    - opts:
+        is_expand: false
+      GRADLEW_PATH: "./gradlew"

build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'application'
 apply plugin: 'com.moowork.node'
 
 group 'smarthome'
-version '0.0.1'
+version '0.0.2'
 mainClassName = "io.ktor.server.netty.EngineMain"
 
 sourceSets {
@@ -41,6 +41,7 @@ dependencies {
     compile "ch.qos.logback:logback-classic:$logback_version"
     compile "io.ktor:ktor-server-core:$ktor_version"
     compile "io.ktor:ktor-gson:$ktor_version"
+    compile "io.ktor:ktor-websockets:$ktor_version"
     compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0"
     compile 'com.jayway.jsonpath:json-path:2.4.0'
     compile 'io.github.microutils:kotlin-logging:1.6.24'

frontend/src/components/SensorEditCard.vue

@@ -80,15 +80,41 @@
                       ></v-select>
                     </v-flex>
 
-                    <v-layout row>
-                      <v-flex>
+                    <v-flex v-if="selected.returnType === 'BOOLEAN'">
+                        <v-layout row>
+                            <v-text-field
+                                v-model="selected.boolOn"
+                                label="On state label"
+                                :disabled="selected.action=='REMOVE'"
+                                @input="characteristicChanged()"
+                            />
+                            <v-text-field
+                                v-model="selected.boolOff"
+                                label="Off state label"
+                                :disabled="selected.action=='REMOVE'"
+                                @input="characteristicChanged()"
+                            />
+                        </v-layout>
+                    </v-flex>
+                    <v-flex>
                         <v-checkbox
                           v-model="selected.writable"
                           :disabled="selected.action=='REMOVE'"
-                          @change="characteristicChanged()"
+                          @change="writableClicked()"
                           label="Writable"
                         ></v-checkbox>
-                      </v-flex>
+                    </v-flex>
+
+                    <v-flex v-if="selected.writable">
+                        <v-text-field
+                                v-model="selected.cmdTopic"
+                                label="Write command topic"
+                                :disabled="selected.action=='REMOVE'"
+                                @input="characteristicChanged()"
+                            />
+                    </v-flex>
+                    <v-layout row>
+
                       <v-flex v-if="selected.icon">
                         Icon:
                         <v-img
@@ -168,7 +194,7 @@ export default {
     title: String,
     deleteButton: Boolean,
     sensor: Object,
-    createNew: Boolean
+    createNew: Boolean,
   },
 
   watch: {
@@ -178,7 +204,7 @@ export default {
       if (!this.mSensor.transforms) {
         this.$set(this.mSensor, "transforms", []);
       }
-    }
+    },
   },
   data() {
     return {
@@ -207,7 +233,7 @@ export default {
         "switch",
         "wallswitch",
         "washingmachine",
-        "window"
+        "window",
       ],
 
       intIcons: [
@@ -221,22 +247,22 @@ export default {
         "light",
         "qualityofservice",
         "rollershutter",
-        "sewerage"
-      ]
+        "sewerage",
+      ],
     };
   },
   mounted() {
     if (!this.mSensor.transforms) {
       this.$set(this.mSensor, "transforms", []);
     }
-    for (let transform of this.mSensor.transforms) {
+    for (const transform of this.mSensor.transforms) {
       this.$set(transform, "action", "");
     }
   },
   methods: {
     onSelect(transform) {
       this.selected = transform;
-      this.selectedBackup = clonedeep(transform)
+      this.selectedBackup = clonedeep(transform);
     },
     saveClicked() {
       this.inProgress = true;
@@ -253,11 +279,11 @@ export default {
           JSON.stringify(this.mSensor),
           {
             headers: {
-              "Content-Type": "application/json"
-            }
-          }
+              "Content-Type": "application/json",
+            },
+          },
         )
-        .then(response => {
+        .then((response) => {
           this.inProgress = false;
           if (response.status === 201) {
             this.$emit("refresh");
@@ -271,17 +297,17 @@ export default {
           JSON.stringify(this.mSensor),
           {
             headers: {
-              "Content-Type": "application/json"
-            }
-          }
+              "Content-Type": "application/json",
+            },
+          },
         )
-        .then(response => {
+        .then((response) => {
           this.inProgress = false;
           if (response.status === 200) {
             this.$emit("refresh");
           }
         })
-        .catch(error => {
+        .catch((error) => {
           this.inProgress = false;
           this.error = `${error.response.status} - ${
             error.response.statusText
@@ -292,7 +318,7 @@ export default {
       this.inProgress = true;
       axios
         .delete(`${process.env.VUE_APP_URL}/remove_sensor/${this.mSensor.id}`)
-        .then(response => {
+        .then((response) => {
           this.inProgress = false;
           if (response.status === 200) {
             this.$emit("refresh");
@@ -305,7 +331,7 @@ export default {
       if (this.selected.action === "ADD") {
         this.mSensor.transforms.splice(index, 1);
       } else {
-        this.selected.action =  "REMOVE";
+        this.selected.action = "REMOVE";
       }
     },
     cancelUpdateClicked() {
@@ -322,6 +348,12 @@ export default {
         this.selected.action = "UPDATE";
       }
     },
+    writableClicked(){
+        if(this.selected.writable === false){
+            this.selected.cmdTopic = null;
+        }
+        this.characteristicChanged();
+    },
     getBooleanIcon(name) {
       return `icons/booleanIcons/${name}-true.png`;
     },
@@ -342,8 +374,8 @@ export default {
       this.selected.icon = icon;
       this.chooseIcon = false;
       this.characteristicChanged();
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

frontend/src/components/TransformView.vue

@@ -58,50 +58,52 @@ export default {
       return typeof item !== "undefined";
     },
     clicked() {
-      switch (this.transform.returnType) {
-        case "BOOLEAN": {
-          console.log("BOOLEAN");
-          let value = this.transform.event.data;
-          if (this.notUndef(value)) {
-            if (value.toLowerCase() === "true") {
-              value = "false";
+      if(this.transform.writable){
+        switch (this.transform.returnType) {
+            case "BOOLEAN": {
+            console.log("BOOLEAN");
+            let value = this.transform.event.data;
+            if (this.notUndef(value)) {
+                if (value.toLowerCase() === "true") {
+                value = "false";
+                } else {
+                value = "true";
+                }
             } else {
-              value = "true";
+                value = "false";
+            }
+            const field = this.transform.transform.split(".").slice(-1)[0];
+            const event = {
+                sensorId: this.transform.sensorId,
+                transformId: this.transform.id,
+                data: value,
+            };
+            axios.put(`${process.env.VUE_APP_URL}/add_event`, JSON.stringify(event),
+                {
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                })
+                .then((response) => {
+                    setTimeout(() => {
+                        this.$emit("refresh");
+                    }, 1500);
+                });
+            break;
+            }
+            case "INT": {
+            console.log("INT");
+            this.$emit("showDialog", this.transform);
+            break;
+            }
+            case "FLOAT": {
+            console.log("FLOAT");
+            break;
+            }
+            case "STRING": {
+            console.log("STRING");
+            break;
             }
-          } else {
-            value = "false";
-          }
-          const field = this.transform.transform.split(".").slice(-1)[0];
-          const event = {
-            sensorId: this.transform.sensorId,
-            transformId: this.transform.id,
-            data: value,
-          };
-          axios.put(`${process.env.VUE_APP_URL}/add_event`, JSON.stringify(event),
-            {
-              headers: {
-                "Content-Type": "application/json",
-              },
-            })
-            .then((response) => {
-              setTimeout(() => {
-                this.$emit("refresh");
-              }, 3000);
-            });
-          break;
-        }
-        case "INT": {
-          console.log("INT");
-          this.$emit("showDialog", this.transform);
-          break;
-        }
-        case "FLOAT": {
-          console.log("FLOAT");
-          break;
-        }
-        case "STRING": {
-          console.log("STRING");
-          break;
         }
       }
     },

frontend/src/views/Dashboard.vue

@@ -13,7 +13,6 @@
                   <TransformView
                     :transform="transform"
                     :icon="typeof transform.icon  !== 'undefined'"
-                    v-on:refresh="fetchData()"
                     v-on:showDialog="showDialog($event)"
                   />
                 </v-flex>
@@ -53,14 +52,15 @@ export default {
       timer: "",
       intDialogShow: false,
       dialogTransform: null,
+      socket: null,
     };
   },
   created() {
-    this.timer = setInterval(this.fetchData, 1000 * 30);
+    this.connect();
     this.fetchData();
   },
   destroyed() {
-    clearInterval(this.timer);
+    this.disconnect();
   },
   methods: {
     fetchData() {
@@ -89,6 +89,19 @@ export default {
           this.error = err.toString();
         });
     },
+    connect() {
+      this.socket = new WebSocket("ws://localhost:8080/ws");
+      this.socket.onopen = () => {
+        this.socket.onmessage = ({data}) => {
+          if(data === "REFRESH"){
+            this.fetchData()
+          }
+        };
+      };
+    },
+    disconnect() {
+      this.socket.close();
+    },
     showDialog(dialogType) {
       this.dialogTransform = dialogType;
       this.intDialogShow = true;

gradle.properties

@@ -1,4 +1,4 @@
 ktor_version=1.1.1
 kotlin.code.style=official
-kotlin_version=1.3.21
+kotlin_version=1.3.31
 logback_version=1.2.1