From 6f887552768f8b6aaf746b43307a920d6c833871 Mon Sep 17 00:00:00 2001
From: shakemid <k-cima@kendama.asia>
Date: Sun, 24 Mar 2024 19:30:59 +0900
Subject: [PATCH 1/2] fix switchbotmeter_multi for handling HTTP errors

---
 plugins/sensors/switchbotmeter_multi | 53 +++++++++++++++++-----------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/plugins/sensors/switchbotmeter_multi b/plugins/sensors/switchbotmeter_multi
index 33d9395c..559bbbcf 100755
--- a/plugins/sensors/switchbotmeter_multi
+++ b/plugins/sensors/switchbotmeter_multi
@@ -75,7 +75,7 @@ graph_args --base 1000
 EOF
     for deviceid in ${deviceids}
     do
-        echo ${deviceid}.label ${deviceid}
+        echo "${deviceid}.label" "${deviceid}"
     done
 
     cat <<EOF
@@ -88,7 +88,7 @@ graph_args --base 1000 --lower-limit 0 --upper-limit 100
 EOF
     for deviceid in ${deviceids}
     do
-        echo ${deviceid}.label ${deviceid}
+        echo "${deviceid}.label" "${deviceid}"
     done
 
     cat <<EOF
@@ -101,7 +101,7 @@ graph_args --base 1000 --lower-limit 0 --upper-limit 100
 EOF
     for deviceid in ${deviceids}
     do
-        echo ${deviceid}.label ${deviceid}
+        echo "${deviceid}.label" "${deviceid}"
     done
 }
 
@@ -110,17 +110,17 @@ fetch() {
 
     for deviceid in ${deviceids}
     do
-        declare $( do_fetch ${deviceid} )
+        local $( do_fetch "${deviceid}" )
     done
 
     for func in temperature humidity battery
     do
-        echo multigraph ${pluginname}_${func}
+        echo multigraph "${pluginname}_${func}"
 
         for deviceid in ${deviceids}
         do
            val=${func}_${deviceid}
-           echo ${deviceid}.value ${!val}
+           echo "${deviceid}.value" "${!val}"
         done
     done
 }
@@ -139,39 +139,50 @@ do_fetch() {
             time_modified=0
         fi
 
-        if [ $(( time_now - time_modified )) -le "${interval}" ]; then
+        if [ $(( time_now - time_modified )) -lt "${interval}" ]; then
             # read from cache
             cat "${MUNIN_STATEFILE}_${deviceid}"
         else
             # update cache
-            fetch_api ${deviceid} | tee "${MUNIN_STATEFILE}_${deviceid}"
+            fetch_api "${deviceid}" | tee "${MUNIN_STATEFILE}_${deviceid}"
         fi
     else
-        fetch_api ${deviceid}
+        fetch_api "${deviceid}"
     fi
 }
 
 fetch_api() {
-    local deviceid temperature humidity battery t sign nonce response statusCode
+    local deviceid temperature humidity battery t sign nonce http_response http_status api_response api_status
     deviceid=$1
 
-    t=$( date +'%s000' )
+    t=$( date +'%s%3N' )
     nonce=$( openssl rand -base64 32 ) 
-    sign=$( echo -n ${token}${t}${nonce} | openssl dgst -sha256 -hmac ${secret} -binary | base64 )
+    sign=$( echo -n "${token}${t}${nonce}" | openssl dgst -sha256 -hmac "${secret}" -binary | openssl base64 )
 
-    response=$( curl -s -H "Content-Type:application/json;charset=utf8" -H "Authorization:${token}" -H "t:${t}" -H "nonce:${nonce}" -H "sign:${sign}" "https://api.switch-bot.com/v1.1/devices/${deviceid}/status" )
+    http_response=$( curl -s --fail --retry 3 \
+        -w '\n%{http_code}\n' \
+        -H "Content-Type:application/json;charset=utf8" \
+        -H "Authorization:${token}" -H "t:${t}" -H "nonce:${nonce}" -H "sign:${sign}" \
+        "https://api.switch-bot.com/v1.1/devices/${deviceid}/status" )
 
-    statusCode=$( echo "${response}" | jq '.statusCode' )
-    if [ "${statusCode}" -ne 100 ]; then
-        echo Error with statusCode = "${statusCode}" 1>&2
-        exit 1
+    http_status=$( echo "${http_response}" | tail -n 1 )
+    if [ "${http_status}" != "200" ]; then
+        echo Error with HTTP status = "${http_status}" 1>&2
+        return 1
     fi
 
-    temperature=$( echo "${response}" | jq '.body.temperature' )
-    humidity=$( echo "${response}" | jq '.body.humidity' )
-    battery=$( echo "${response}" | jq '.body.battery' )
+    api_response=$( echo "${http_response}" | sed '$d' )
+    api_status=$( echo "${api_response}" | jq '.statusCode' )
+    if [ "${api_status}" != "100" ]; then
+        echo Error with API status = "${api_status}" 1>&2
+        return 1
+    fi
 
-    echo temperature_${deviceid}=${temperature} humidity_${deviceid}=${humidity} battery_${deviceid}=${battery}
+    temperature=$( echo "${api_response}" | jq '.body.temperature' )
+    humidity=$( echo "${api_response}" | jq '.body.humidity' )
+    battery=$( echo "${api_response}" | jq '.body.battery' )
+
+    echo "temperature_${deviceid}=${temperature}" "humidity_${deviceid}=${humidity}" "battery_${deviceid}=${battery}"
 }
 
 # Main

From 8e49ddc2e7a4baad37a710a33204883bf6c30d64 Mon Sep 17 00:00:00 2001
From: shakemid <k-cima@kendama.asia>
Date: Mon, 25 Mar 2024 16:48:44 +0900
Subject: [PATCH 2/2] fix to fetch data from api in parallel

---
 plugins/sensors/switchbotmeter_multi | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/plugins/sensors/switchbotmeter_multi b/plugins/sensors/switchbotmeter_multi
index 559bbbcf..42c8cecc 100755
--- a/plugins/sensors/switchbotmeter_multi
+++ b/plugins/sensors/switchbotmeter_multi
@@ -106,11 +106,17 @@ EOF
 }
 
 fetch() {
-    local deviceid func val
+    local deviceid func ref
 
     for deviceid in ${deviceids}
     do
-        local $( do_fetch "${deviceid}" )
+        do_fetch "${deviceid}" &
+    done
+    wait
+
+    for deviceid in ${deviceids}
+    do
+        local padding=1 $( cat "${MUNIN_STATEFILE}_${deviceid}" )
     done
 
     for func in temperature humidity battery
@@ -119,8 +125,8 @@ fetch() {
 
         for deviceid in ${deviceids}
         do
-           val=${func}_${deviceid}
-           echo "${deviceid}.value" "${!val}"
+           ref=${func}_${deviceid}
+           echo "${deviceid}.value" "${!ref:-U}"
         done
     done
 }
@@ -140,15 +146,12 @@ do_fetch() {
         fi
 
         if [ $(( time_now - time_modified )) -lt "${interval}" ]; then
-            # read from cache
-            cat "${MUNIN_STATEFILE}_${deviceid}"
-        else
-            # update cache
-            fetch_api "${deviceid}" | tee "${MUNIN_STATEFILE}_${deviceid}"
+            # do nothing
+            return
         fi
-    else
-        fetch_api "${deviceid}"
     fi
+
+    fetch_api "${deviceid}" > "${MUNIN_STATEFILE}_${deviceid}"
 }
 
 fetch_api() {
@@ -156,7 +159,7 @@ fetch_api() {
     deviceid=$1
 
     t=$( date +'%s%3N' )
-    nonce=$( openssl rand -base64 32 ) 
+    nonce=$( openssl rand -base64 32 )
     sign=$( echo -n "${token}${t}${nonce}" | openssl dgst -sha256 -hmac "${secret}" -binary | openssl base64 )
 
     http_response=$( curl -s --fail --retry 3 \