Fix issue with fetching serial number (closes #35)

[ci skip]: Bump docker/build-push-action from 2.6.1 to 2.7.0

.github/workflows/publish.yml

@@ -12,9 +12,9 @@ jobs:
         runs-on: ubuntu-20.04
         steps:
             - name: Checkout code
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v2.3.5
             - name: Bump version
-              uses: remorses/bump-version@js
+              uses: chamini2/bump-version@js
               id: version
               with:
                   version_file: ./VERSION
@@ -22,7 +22,7 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             - name: Checkout code
-              uses: actions/checkout@v2.3.4
+              uses: actions/checkout@v2.3.5
               with:
                   ref: main
             - name: Set up QEMU
@@ -30,14 +30,14 @@ jobs:
               with:
                   platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v1.5.1
+              uses: docker/setup-buildx-action@v1.6.0
             - name: Login to DockerHub
               uses: docker/login-action@v1.10.0
               with:
                   username: ${{ secrets.DOCKER_USERNAME }}
                   password: ${{ secrets.DOCKER_PASSWORD }}
             - name: Build and push
-              uses: docker/build-push-action@v2.6.1
+              uses: docker/build-push-action@v2.7.0
               with:
                   context: .
                   push: true

VERSION

@@ -1 +1 @@
-1.0.7
+1.0.10

requirements.txt

@@ -1,3 +1,3 @@
-amcrest==1.8.0
-paho-mqtt==1.5.1
+amcrest==1.9.3
+paho-mqtt==1.6.1
 python-slugify==5.0.2

src/amcrest2mqtt.py

@@ -73,6 +73,8 @@ def on_mqtt_disconnect(client, userdata, rc):
 def exit_gracefully(rc, skip_mqtt=False):
     global topics, mqtt_client
 
+    log("Exiting app...")
+
     if mqtt_client is not None and mqtt_client.is_connected() and skip_mqtt == False:
         mqtt_publish(topics["status"], "offline", exit_on_error=False)
         mqtt_client.loop_stop(force=True)
@@ -96,6 +98,14 @@ def refresh_storage_sensors():
     except AmcrestError as error:
         log(f"Error fetching storage information {error}", level="WARNING")
 
+def ping_camera():
+    Timer(30, ping_camera).start()
+    response = os.system(f"ping -c1 -W100 {amcrest_host} >/dev/null 2>&1")
+
+    if response != 0:
+        log("Ping unsuccessful", level="ERROR")
+        exit_gracefully(1)
+
 def signal_handler(sig, frame):
     # exit immediately upon receiving a second SIGINT
     global is_exiting
@@ -134,14 +144,23 @@ camera = AmcrestCamera(
 # Fetch camera details
 log("Fetching camera details...")
 
-device_type = camera.device_type.replace("type=", "").strip()
-is_ad110 = device_type == "AD110"
-is_ad410 = device_type == "AD410"
-is_doorbell = is_ad110 or is_ad410
-serial_number = camera.serial_number.strip()
-sw_version = camera.software_information[0].replace("version=", "").strip()
-device_name = camera.machine_name.replace("name=", "").strip()
-device_slug = slugify(device_name, separator="_")
+try:
+    device_type = camera.device_type.replace("type=", "").strip()
+    is_ad110 = device_type == "AD110"
+    is_ad410 = device_type == "AD410"
+    is_doorbell = is_ad110 or is_ad410
+    serial_number = camera.serial_number
+
+    if not isinstance(serial_number, str):
+        log(f"Error fetching serial number", level="ERROR")
+        exit_gracefully(1)
+
+    sw_version = camera.software_information[0].replace("version=", "").strip()
+    device_name = camera.machine_name.replace("name=", "").strip()
+    device_slug = slugify(device_name, separator="_")
+except AmcrestError as error:
+    log(f"Error fetching camera details", level="ERROR")
+    exit_gracefully(1)
 
 log(f"Device type: {device_type}")
 log(f"Serial number: {serial_number}")
@@ -316,10 +335,12 @@ mqtt_publish(topics["config"], {
 if storage_poll_interval > 0:
     refresh_storage_sensors()
 
+ping_camera()
+
 log("Listening for events...")
 
 try:
-    for code, payload in camera.event_actions("All", retries=5):
+    for code, payload in camera.event_actions("All", retries=5, timeout_cmd=(10.00, 3600)):
         if (is_ad110 and code == "ProfileAlarmTransmit") or (code == "VideoMotion" and not is_ad110):
             motion_payload = "on" if payload["action"] == "Start" else "off"
             mqtt_publish(topics["motion"], motion_payload)