[CI] Update GitHub actions

.github/workflows/check.yml

@@ -11,9 +11,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - name: Run pre-commit

.github/workflows/manual_test-pypi.yml

@@ -4,13 +4,13 @@ on:
 jobs:
   build-n-publish:
     name: Build and publish distribution to TestPyPI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with: {fetch-depth: 0}  # deep clone for setuptools-scm
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
-        python-version: '3.x'
+        python-version: '3.11'
     - name: Install pypa/build
       run: |
         python3 -m pip install --upgrade pip
@@ -19,7 +19,7 @@ jobs:
       run: |
         python3 setup.py sdist
     - name: Publish distribution 📦 to Test PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
+        repository-url: https://test.pypi.org/legacy/

.github/workflows/publish_docs.yml

@@ -5,18 +5,18 @@ on:
     types: [published]
 jobs:
   documentation:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Create the documentation and deploy it to GitHub Pages
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: "14.x"
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.11"
       - name: Install build dependencies
         run: |
           python -m pip install --upgrade pip
@@ -30,4 +30,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./docs/.vuepress/dist
-          cname: gateway.theengs.io
+          cname: gateway.theengs.io

.github/workflows/release.yml

@@ -6,11 +6,13 @@ on:
 jobs:
   build-n-publish:
     name: Build and publish distributions to PyPI
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with: {fetch-depth: 0}  # deep clone for setuptools-scm
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
     - name: Install pypa/build
       run: |
         python3 -m pip install --upgrade pip
@@ -19,6 +21,6 @@ jobs:
       run: |
         python3 setup.py sdist
     - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@master
+      uses: pypa/gh-action-pypi-publish@release/v1
       with:
         password: ${{ secrets.PYPI_API_TOKEN }}

TheengsGateway/ble_gateway.py

@@ -379,6 +379,11 @@ def detection_callback(
                                 decrypted_data, data_json, decoded_json
                             )
 
+                            # Keep encrypted properties
+                            cipher = decoded_json["cipher"]
+                            mic = decoded_json["mic"]
+                            ctr = decoded_json["ctr"]
+
                             # Re-decode advertisement, this time unencrypted
                             decoded_json = decodeBLE(json.dumps(data_json))
                             if decoded_json:
@@ -389,6 +394,11 @@ def detection_callback(
                                     data_json["servicedata"],
                                 )
 
+                            # Re-add encrypted properties
+                            decoded_json["cipher"] = cipher
+                            decoded_json["mic"] = mic
+                            decoded_json["ctr"] = ctr
+
                         except KeyError:
                             logger.exception(
                                 "Can't find bindkey for %s.", device.address
@@ -413,6 +423,9 @@ def detection_callback(
                             "cont",
                             "track",
                             "encr",
+                            "cipher",
+                            "mic",
+                            "ctr",
                         ):
                             decoded_json.pop(key, None)