webhookにalarm_video/alarm_pictureの送信を追加

Author: mnakada

atomcam_configs/overlay_rootfs/scripts/rm.sh

@@ -17,6 +17,7 @@ STORAGE_CIFS=$(awk -F "=" '/STORAGE_CIFS *=/ {print $2}' $HACK_INI)
 STORAGE_CIFSSERVER=$(awk -F "=" '/STORAGE_CIFSSERVER *=/ {gsub(/\/$/, "", $2); print $2}' $HACK_INI)
 STORAGE_CIFSUSER=$(awk -F "=" '/STORAGE_CIFSUSER *=/ {print $2}' $HACK_INI)
 STORAGE_CIFSPASSWD=$(awk -F "=" '/STORAGE_CIFSPASSWD *=/ {print $2}' $HACK_INI)
+WEBHOOK=$(awk -F "=" '/WEBHOOK *=/ {print $2}' $HACK_INI)
 WEBHOOK_URL=$(awk -F "=" '/WEBHOOK_URL *=/ {print $2}' $HACK_INI)
 WEBHOOK_ALERM_PICT=$(awk -F "=" '/WEBHOOK_ALERM_PICT *=/ {print $2}' $HACK_INI)
 WEBHOOK_ALERM_VIDEO=$(awk -F "=" '/WEBHOOK_ALERM_VIDEO *=/ {print $2}' $HACK_INI)
@@ -78,10 +79,10 @@ fi
 
 if [ "$WEBHOOK" = "on" ] && [ "$WEBHOOK_URL" != "" ]; then
   if [ "$WEBHOOK_ALERM_PICT" = "on" ] && [ "$FILE" = "/tmp/alarm.jpg" ]; then
-     LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "image=@$FILE;type=image/jpeg" $WEBHOOK_URL
+     LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "image=@$FILE" -F"type=image/jpeg" $WEBHOOK_URL
   fi
   if [ "$WEBHOOK_ALERM_VIDEO" = "on" ] && [ "$FILE" = "/tmp/alarm_record.mp4" ]; then
-     LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "video=@$FILE;type=video/mp4" $WEBHOOK_URL
+     LD_LIBRARY_PATH=/tmp/system/lib:/usr/lib /tmp/system/lib/ld.so.1 /tmp/system/bin/curl -X POST -F "video=@$FILE" -F "type=video/mp4" $WEBHOOK_URL
   fi
 fi
 

atomcam_configs/overlay_rootfs/scripts/webhook.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 HACK_INI=/media/mmc/hack.ini
-tail -F /tmp/log/atom.log | awk '
+tail -F /tmp/log/atom.log | TZ=JST-9 awk '
 BEGIN {
   FS = "=";
   while(getline < HACK_INI) {
@@ -37,6 +37,12 @@ BEGIN {
 /time_lapse_stop_job/ {
   if(ENV["WEBHOOK_TIMELAPSE_FINISH"] == "on") Post("timelapseFinish");
 }
+/__NTP Set SysTime To/ {
+  gsub(/^.*__NTP Set SysTime To /, "");
+  gsub(/__.*$/, "000");
+  print strftime("Reboot Time : %Y/%m/%d %H:%M:%S") >> "/media/mmc/atomhack.log";
+  fflush("/media/mmc/atomhack.log");
+}
 
 function Post(event, data) {
   if(data == "") {

atomcam_configs/web/source/vue/Setting.vue

@@ -229,6 +229,20 @@
         </ElCol>
       </ElRow>
 
+      <ElRow v-if="config.WEBHOOK === 'on'">
+        <ElCol :offset="2" :span="7">
+          <ElTooltip :tabindex="-1" placement="top" content="Alarm発生時に録画ファイルを転送します" effect="light" :open-delay="500">
+            <h4>動体検知録画転送</h4>
+          </ElTooltip>
+        </ElCol>
+        <ElCol :span="4">
+          <ElSwitch v-model="config.WEBHOOK_ALERM_VIDEO" active-value="on" inactive-value="off" />
+        </ElCol>
+        <ElCol v-if="config.WEBHOOK_ALERM_VIDEO === 'on'" :span="4">
+          mime: video/mp4
+        </ElCol>
+      </ElRow>
+
       <ElRow v-if="config.WEBHOOK === 'on'">
         <ElCol :offset="2" :span="7">
           <ElTooltip :tabindex="-1" placement="top" content="Alarm発生時に静止画保存を通知します" effect="light" :open-delay="500">
@@ -243,6 +257,20 @@
         </ElCol>
       </ElRow>
 
+      <ElRow v-if="config.WEBHOOK === 'on'">
+        <ElCol :offset="2" :span="7">
+          <ElTooltip :tabindex="-1" placement="top" content="Alarm発生時に静止画ファイルを転送します" effect="light" :open-delay="500">
+            <h4>動体検知静止画転送</h4>
+          </ElTooltip>
+        </ElCol>
+        <ElCol :span="4">
+          <ElSwitch v-model="config.WEBHOOK_ALERM_PICT" active-value="on" inactive-value="off" />
+        </ElCol>
+        <ElCol v-if="config.WEBHOOK_ALERM_PICT === 'on'" :span="4">
+          mime: image/jpeg
+        </ElCol>
+      </ElRow>
+
       <ElRow v-if="config.WEBHOOK === 'on'">
         <ElCol :offset="2" :span="7">
           <ElTooltip :tabindex="-1" placement="top" content="録画保存を通知します" effect="light" :open-delay="500">
@@ -404,7 +432,9 @@
           WEBHOOK_ALARM_EVENT: 'off',
           WEBHOOK_ALARM_INFO: 'off',
           WEBHOOK_ALARM_VIDEO_FINISH: 'off',
+          WEBHOOK_ALERM_VIDEO: 'off',
           WEBHOOK_ALARM_PICT_FINISH: 'off',
+          WEBHOOK_ALERM_PICT: 'off',
           WEBHOOK_RECORD_EVENT: 'off',
           WEBHOOK_TIMELAPSE_EVENT: 'off',
           WEBHOOK_TIMELAPSE_FINISH: 'off',
@@ -590,8 +620,6 @@
         }
       },
       async Exec(cmd) {
-        // eslint-disable-next-line no-console
-        console.log('Exec ', cmd);
         await axios.post('./cgi-bin/exec.cgi', { exec: `${cmd}` }).catch(err => {
           // eslint-disable-next-line no-console
           console.log(err);