Add Huawei Hilink API

Cleanup mobile data scripts

config/client_config/info_huawei_hilink.sh

@@ -1,49 +1,75 @@
 #!/bin/bash
-# Infosramtion about HUAWEI hilink (router) modem
-# -----------------------------------------------
+# Information about HUAWEI hilink (router) modem
+# ----------------------------------------------
 # get info about the device and signal
 # parameter: $1 - see opts list below
 #            $2 - host ip address for API calls (optional)
 # returns the value of the parameter, or "none" if not found or empty
 #
+# All device informations are buffered for 5 secs to speed up subsequent calls
+#
 # zbchristian 2020
 
-opts=("device"     "imei" "imsi" "telnumber" "ipaddress"    "mode"     "signal" "rssi" "rsrq" "rsrp" "sinr" "ecio" "operator")
-
-# xml tags to extract information from
-tags=("devicename" "imei" "imsi" "msisdn"    "wanipaddress" "workmode" "rsrq"   "rssi" "rsrq" "rsrp" "sinr" "ecio" "fullname")
-iurl=( 0            0      0      0          0              0          1        1      1      1      1      1      2)
-# api urls
-urls=("api/device/information" "api/device/signal" "api/net/current-plmn") 
+if [ -z "$1" ]; then echo "none"; exit; fi
 
 host="192.168.8.1"
-if [ ! -z $2 ]; then host=$2; fi
 
-avail=`timeout 0.5 ping -c 1 $host | sed -rn 's/.*time=.*/1/p'`
-if [[ -z $avail ]]; then echo "none"; exit; fi
+status="no option given"
+if [ ! -z "$2" ]; then host="$2"; fi
 
-idx=-1
-opt=${opts[0]}
-if [ ! -z $1 ]; then opt=$1; fi
+opt="${1,,}"
+result="none"
+if [ "$opt" = "connected" ]; then
+  source /usr/local/sbin/huawei_hilink_api.sh
+  if ! _initHilinkAPI; then echo "none"; exit; fi
+  result=$(_getMobileDataStatus)
+  _closeHilinkAPI
+else
+  info_file="/tmp/huawei_infos_$host.dat"
+  if [ -f "$info_file" ]; then
+    age=$(( $(date +%s) - $(stat $info_file -c %Y) )) 
+    if [[ $age -gt 5 ]]; then rm -f $info_file; fi
+  fi
 
-for i in "${!opts[@]}"; do
-  if [[ ${opts[$i]} == $opt ]]; then idx=$i; fi
-done
-if [[ $idx == -1 ]];then echo "none"; exit; fi 
+  if [ -f "$info_file" ]; then
+     infos=$(cat $info_file)
+  else
+     source /usr/local/sbin/huawei_hilink_api.sh
+     if ! _initHilinkAPI; then echo "none"; exit; fi
+     infos=$(_getAllInformations)
+    _closeHilinkAPI
+     if [ ! -z "$infos" ]; then echo "$infos" > /tmp/huawei_infos_$host.dat; fi
+  fi
 
-par=${tags[$idx]}
-iu=${iurl[$idx]}
-
-url="http://$host/${urls[$iu]}"
-# echo "Found option $opt at index $idx - tag $par url $url "
-
-
-info=""
-if [ ! -z $url ]; then info=`curl -s $url`; fi
-
-result=`echo $info | sed  -rn 's/.*<'"$par"'>(.*)<\/'"$par"'>.*/\1/pi'`
-
-if [ -z "$result" ]; then result="none"; fi
-
-echo $result
+  case "$opt" in
+    device|devicename)
+      key="devicename"
+      ;;
+    ipaddress|wanipaddress)
+      key="wanipaddress"
+      ;;
+    mode)
+      key="workmode"
+      ;;
+    telnumber)
+      key="msisdn"
+      ;;
+    imei|imsi|rssi|rsrq|rsrp|sinr|ecio)
+      key="$opt"
+      ;;
+    signal)
+      key="rsrq"
+    ;;
+    operator|fullname)
+      key="fullname"
+    ;;
+    *)
+      key=""
+    ;;
+  esac
+  if [ -z "$key" ]; then result="none"; fi
+  result=$(echo "$infos" | sed -rn 's/'$key'=\"([^ \s]*)\"/\1/ip')
+  if [ -z "$result" ]; then result="none"; fi
+fi
+echo -n "$result"