Merge remote-tracking branch 'origin/modem-internet'

daaru00 · Apr 14, 2018 · 3d7ddb9 · 3d7ddb9
2 parents 36959b8 + f2bd899
commit 3d7ddb9
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 0 deletions.
diff --git a/.env.dist b/.env.dist
@@ -11,6 +11,8 @@ export MSG_MOTION_DEACTIVATED=
 export MSG_BUTTON_CLICKED=
 export MSG_NOT_A_COMMAND=
 export MSG_COMMAND_NOT_FOUND=
+export MSG_ADMIN_DISCONNECTED=
+export MSG_ADMIN_CONNECTED=
 export MSG_WELCOME=
 export MSG_ACK=Ok
 

diff --git a/command.js b/command.js
@@ -41,6 +41,15 @@ module.exports.elaborateCommand = (event, context, callback) => {
               }
             })
             break;
+          case "/modem":
+            iot.getThingShadow("Modem", function(err, data){
+              if(err){
+                callback(err);
+              }else{
+                telegram.sendMessage("Download: "+data.download+"Mb/s \nUpload: "+data.upload+"Mb/s \nIP: "+data.publicIP, callback);
+              }
+            })
+            break;
           case "/buzz":
             iot.publishOnTopic('buzzer-ring', JSON.stringify({
               timeout: 2000

diff --git a/notify.js b/notify.js
@@ -57,3 +57,33 @@ module.exports.motionDectivated = (event, context, callback) => {
   })
 
 };
+
+module.exports.adminConnected = (event, context, callback) => {
+
+  iot.updateThingShadow('Motion', {
+    enable: 0
+  }, function(err, data){
+    if(err){
+      console.error("Error publishing message");
+      callback(err);
+    }else{
+      telegram.sendMessage(process.env.MSG_ADMIN_CONNECTED, callback)
+    }
+  })
+
+};
+
+module.exports.adminDisconnected = (event, context, callback) => {
+
+  iot.updateThingShadow('Motion', {
+    enable: 1
+  }, function(err, data){
+    if(err){
+      console.error("Error publishing message");
+      callback(err);
+    }else{
+      telegram.sendMessage(process.env.MSG_ADMIN_DISCONNECTED, callback)
+    }
+  })
+
+};
diff --git a/serverless.yml b/serverless.yml
@@ -66,6 +66,24 @@ functions:
           sql: "SELECT * FROM 'motion-deactivated'"
           enabled: true
 
+  telegramAdminConnected:
+    handler: notify.adminConnected
+    environment:
+      MSG_ADMIN_CONNECTED: ${env:MSG_ADMIN_CONNECTED}
+    events:
+      - iot:
+          sql: "SELECT * FROM 'modem-admin-connected'"
+          enabled: true
+
+  telegramAdminDisconnected:
+    handler: notify.adminDisconnected
+    environment:
+      MSG_ADMIN_DISCONNECTED: ${env:MSG_ADMIN_DISCONNECTED}
+    events:
+      - iot:
+          sql: "SELECT * FROM 'modem-admin-disconnected'"
+          enabled: true
+
   telegramCommand:
     handler: command.elaborateCommand
     environment: