Remove coap-client binaries (diyhue#887)

SittingDuck52 · Feb 7, 2023 · 1d852e4 · 1d852e4
1 parent fc16d0a
commit 1d852e4
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 151 deletions.
diff --git a/.build/Dockerfile b/.build/Dockerfile
@@ -6,12 +6,6 @@ WORKDIR /opt/hue-emulator
 # Architecture automatically set by docker eg. linux/amd64, linux/arm/v7, linux/arm64
 ARG TARGETPLATFORM
 
-COPY BridgeEmulator .build/select.sh ./
-
-RUN chmod +x ./select.sh && \
-    mkdir out && \
-    ./select.sh
-
 # ============================ Actual image from here ====================
 #FROM debian:stable-slim as prod
 FROM debian@sha256:457715c656bf1b14ae3790853c1a4bde13a7e740c510b9c029d38012be78d8c6 as prod
@@ -23,7 +17,7 @@ COPY requirements.txt ./
 ## Install requirements  
 RUN apt update && apt install --no-install-recommends -y \
     curl unzip python3-minimal python3-pip python3-dev python3-setuptools gcc \
-    openssl nmap psmisc iproute2 bluez bluetooth \
+    openssl nmap psmisc iproute2 bluez bluetooth libcoap2-bin \
     && pip3 install -r requirements.txt --no-cache-dir \
     && apt purge -y python3-pip python3-setuptools python3-dev gcc \
     && apt autoremove -y \
@@ -50,8 +44,6 @@ RUN curl -sL https://github.com/diyhue/diyHueUI/releases/latest/download/DiyHueU
 
 ## Copy correct (compiled) C file from previous image
 COPY ./BridgeEmulator/genCert.sh ./BridgeEmulator/openssl.conf /opt/hue-emulator/
-RUN echo workaround for https://github.com/moby/moby/issues/37965
-COPY --from=binselector /opt/hue-emulator/out /opt/hue-emulator/
 
 ## Change Docker script permissions
 RUN chmod +x /opt/hue-emulator/genCert.sh

diff --git a/.build/archive/aarch64.Dockerfile b/.build/archive/aarch64.Dockerfile
diff --git a/.build/archive/amd64.Dockerfile b/.build/archive/amd64.Dockerfile
diff --git a/.build/archive/arm.Dockerfile b/.build/archive/arm.Dockerfile
diff --git a/.build/select.sh b/.build/select.sh
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -6,7 +6,7 @@ COPY requirements.txt /tmp/pip-tmp/
 ## Install requirements  
 RUN apt update && apt install --no-install-recommends -y \
     python3-minimal python3-pip python3-setuptools \
-    openssl nmap psmisc iproute2 \
+    openssl nmap psmisc iproute2 libcoap2-bin \
     && pip3 --disable-pip-version-check install --no-cache-dir -r /tmp/pip-tmp/requirements.txt \
     && apt purge -y python3-pip python3-setuptools \
     && apt autoremove -y \

diff --git a/.idea/docker/Dockerfile b/.idea/docker/Dockerfile
diff --git a/BridgeEmulator/coap-client-aarch64 b/BridgeEmulator/coap-client-aarch64
diff --git a/BridgeEmulator/coap-client-arm b/BridgeEmulator/coap-client-arm
diff --git a/BridgeEmulator/coap-client-i686 b/BridgeEmulator/coap-client-i686
diff --git a/BridgeEmulator/coap-client-linux b/BridgeEmulator/coap-client-linux
diff --git a/BridgeEmulator/coap-client-x86_64 b/BridgeEmulator/coap-client-x86_64
diff --git a/BridgeEmulator/flaskUI/core/views.py b/BridgeEmulator/flaskUI/core/views.py
@@ -67,7 +67,7 @@ def pairTradfri():
     try:
         data = request.get_json(force=True)
         pprint(data)
-        cmd = ["./coap-client-linux", "-m", "post", "-u", "Client_identity", "-k", data["tradfriCode"], "-e", "{\"9090\":\"" + data["identity"] + "\"}", "coaps://" + data["tradfriGwIp"] + ":5684/15011/9063"]
+        cmd = ["coap-client-gnutls", "-m", "post", "-u", "Client_identity", "-k", data["tradfriCode"], "-e", "{\"9090\":\"" + data["identity"] + "\"}", "coaps://" + data["tradfriGwIp"] + ":5684/15011/9063"]
         registration = json.loads(check_output(cmd).decode('utf-8').rstrip('\n').split("\n")[-1])
         if "9091" in registration:
             bridgeConfig["config"]["tradfri"] = {"psk": registration["9091"], "tradfriGwIp": data["tradfriGwIp"], "identity": data["identity"]}

diff --git a/BridgeEmulator/install.sh b/BridgeEmulator/install.sh
@@ -98,11 +98,11 @@ esac
 echo -e "\033[36m Installing dependencies.\033[0m"
 if type apt &> /dev/null; then
   # Debian-based distro
-  apt-get install -y unzip python3 python3-pip openssl bluez bluetooth
+  apt-get install -y unzip python3 python3-pip openssl bluez bluetooth libcoap2-bin
 elif type pacman &> /dev/null; then
   # Arch linux
   pacman -Syq --noconfirm || exit 1
-  pacman -Sq --noconfirm unzip python3 python-pip gnu-netcat || exit 1
+  pacman -Sq --noconfirm unzip python3 python-pip gnu-netcat libcoap || exit 1
 else
   # Or assume that packages are already installed (possibly with user confirmation)?
   # Or check them?
@@ -156,27 +156,6 @@ mv index.html /opt/hue-emulator/flaskUI/templates/
 cp -r static /opt/hue-emulator/flaskUI/
 rm -r static
 
-# Install correct binaries
-case $arch in
-    x86_64|i686|aarch64)
-        cp coap-client-$arch /opt/hue-emulator/coap-client-linux
-       ;;
-    arm64)
-        cp coap-client-aarch64 /opt/hue-emulator/coap-client-linux
-       ;;
-    armv*)
-        cp coap-client-arm /opt/hue-emulator/coap-client-linux
-       ;;
-    *)
-        echo -e "\033[0;31m-------------------------------------------------------------------------------"
-        echo -e "ERROR: Unsupported architecture $arch!"
-        echo -e "You will need to manually compile the coap-client binary\033[0m"
-        echo -e "Please visit https://diyhue.readthedocs.io/en/latest/AddFuncts/entertainment.html"
-        echo -e "Once installed, open this script and manually run the last 10 lines."
-        exit 1
-esac
-
-chmod +x /opt/hue-emulator/coap-client-linux
 cp hue-emulator.service /lib/systemd/system/
 cd ../../
 rm -rf diyHue.zip diyHue-$branchSelection

diff --git a/BridgeEmulator/lights/protocols/tradfri.py b/BridgeEmulator/lights/protocols/tradfri.py
@@ -52,12 +52,12 @@ def set_light(light, data):
 
     if "5712" not in payload:
         payload["5712"] = 4 #If no transition add one, might also add check to prevent large transitiontimes
-    cmd = ["./coap-client-linux", "-B", "2", "-m", "put", "-u", light.protocol_cfg["identity"], "-k", light.protocol_cfg["psk"], "-e", "{ \"3311\": [" + json.dumps(payload) + "] }", url]
+    cmd = ["coap-client-gnutls", "-B", "2", "-m", "put", "-u", light.protocol_cfg["identity"], "-k", light.protocol_cfg["psk"], "-e", "{ \"3311\": [" + json.dumps(payload) + "] }", url]
     check_output(cmd)
 
 def get_light_state(light):
     state ={}
-    cmd = ["./coap-client-linux", "-B", "5", "-m", "get", "-u", light.protocol_cfg["identity"], "-k", light.protocol_cfg["psk"], "coaps://" + light.protocol_cfg["ip"] + ":5684/15001/" + str(light.protocol_cfg["id"])]
+    cmd = ["coap-client-gnutls", "-B", "5", "-m", "get", "-u", light.protocol_cfg["identity"], "-k", light.protocol_cfg["psk"], "coaps://" + light.protocol_cfg["ip"] + ":5684/15001/" + str(light.protocol_cfg["id"])]
     light_data = json.loads(check_output(cmd).decode('utf-8').rstrip('\n').split("\n")[-1])
     state["on"] = bool(light_data["3311"][0]["5850"])
     state["bri"] = light_data["3311"][0]["5851"]
@@ -77,11 +77,11 @@ def discover(detectedLights, tradfriConfig):
     if "psk" in tradfriConfig:
         logging.debug("tradfri: <discover> invoked!")
         try:
-            cmd = ["./coap-client-linux", "-B", "5", "-m", "get", "-u", tradfriConfig["identity"], "-k", tradfriConfig["psk"], "coaps://" + tradfriConfig["tradfriGwIp"] + ":5684/15001"]
+            cmd = ["coap-client-gnutls", "-B", "5", "-m", "get", "-u", tradfriConfig["identity"], "-k", tradfriConfig["psk"], "coaps://" + tradfriConfig["tradfriGwIp"] + ":5684/15001"]
             tradriDevices = json.loads(check_output(cmd).decode('utf-8').rstrip('\n').split("\n")[-1])
             logging.debug(tradriDevices)
             for device in tradriDevices:
-                cmd = ["./coap-client-linux", "-B", "5", "-m", "get", "-u", tradfriConfig["identity"], "-k", tradfriConfig["psk"], "coaps://" + tradfriConfig["tradfriGwIp"] + ":5684/15001/" + str(device)]
+                cmd = ["coap-client-gnutls", "-B", "5", "-m", "get", "-u", tradfriConfig["identity"], "-k", tradfriConfig["psk"], "coaps://" + tradfriConfig["tradfriGwIp"] + ":5684/15001/" + str(device)]
                 deviceParameters = json.loads(check_output(cmd).decode('utf-8').rstrip('\n').split("\n")[-1])
                 if "3311" in deviceParameters:
                     logging.debug("found tradfi light " + deviceParameters["9001"])

diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ All documentation and instructions can be found over at [diyhue.readthedocs.io](
 
 ## Requirements
 
+- coap-client: i.e. via `apt install libcoap2-bin`
 - Python 3
 - Python modules: ws4py, requests, astral, paho-mqtt [see requirements.txt](./requirements.txt)