.build/Dockerfile

@@ -1,22 +1,23 @@
 # This image just moves the correct bins to a specific folder.
 # Can also be used to compile the binaries (for an even better experience)
-FROM busybox as binselector
+FROM busybox AS binselector
 WORKDIR /opt/hue-emulator
 
 # Architecture automatically set by docker eg. linux/amd64, linux/arm/v7, linux/arm64
 ARG TARGETPLATFORM
 
 # ============================ Actual image from here ====================
-FROM debian:stable-slim as prod
+FROM debian:stable-slim AS prod
 WORKDIR /opt/hue-emulator
 ARG TARGETPLATFORM
 
 COPY requirements.txt ./
 
 ## Install requirements
 RUN apt update \
+    && dpkg --configure -a \
     && apt install --no-install-recommends -y \
-        curl unzip python3-minimal python3-pip python3-dev python3-setuptools gcc \
+        curl unzip python3 python3-pip python3-dev python3-setuptools gcc \
         openssl nmap psmisc iproute2 bluez bluetooth libcoap3-bin faketime \
     && pip3 install -r requirements.txt --no-cache-dir --break-system-packages \
     && apt purge -y python3-pip python3-setuptools python3-dev gcc \
@@ -37,10 +38,12 @@ COPY ./BridgeEmulator/githubInstall.sh /opt/hue-emulator/
 
 ## Install the web interface
 RUN curl -sL https://github.com/diyhue/diyHueUI/releases/latest/download/DiyHueUI-release.zip -o diyHueUI.zip \
-    && unzip -qo diyHueUI.zip \
-    && mv index.html flaskUI/templates/ \
-    && cp -r static flaskUI/ \
-    && rm -r static
+    && mkdir diyhueUI \
+    && unzip -qo diyHueUI.zip -d diyhueUI \
+    && rm diyHueUI.zip \
+    && mv diyhueUI/dist/index.html flaskUI/templates/ \
+    && cp -r diyhueUI/dist/assets flaskUI/ \
+    && rm -r diyhueUI
 
 ## Copy correct (compiled) C file from previous image
 COPY ./BridgeEmulator/genCert.sh ./BridgeEmulator/openssl.conf /opt/hue-emulator/

.github/workflows/docker-release.yml

@@ -20,29 +20,38 @@ jobs:
             arch_friendly: armv6
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Create builder instance
+        run: |
+          docker buildx create --name mybuilder --use
+          docker buildx inspect --bootstrap
 
       - name: Enable qemu
         run: |
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
-      - uses: satackey/action-docker-layer-caching@v0.0.8
-        continue-on-error: true
+      - name: Cache Docker layers
+        uses: actions/cache@v4
         with:
-          key: diyhue-cache-ci-${{ matrix.arch }}-{hash}
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ matrix.arch }}-${{ github.ref }}-${{ github.sha }}
           restore-keys: |
-            diyhue-cache-ci-${{ matrix.arch }}-
+            ${{ runner.os }}-buildx-${{ matrix.arch }}-
 
       - name: Build docker image
         run: |
-          docker build -t diyhue/diyhue:ci -f ./.build/Dockerfile --platform=${{ matrix.arch }} --build-arg TARGETPLATFORM=${{ matrix.arch }} .
+          docker buildx build --builder mybuilder --platform=${{ matrix.arch }} --build-arg TARGETPLATFORM=${{ matrix.arch }} --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache -t diyhue/diyhue:ci -f ./.build/Dockerfile --load .
 
       - name: Save tarball
         run: |
           docker save --output output.tar diyhue/diyhue:ci
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ci-${{ matrix.arch_friendly }}-${{ github.run_number }}.tar
           path: output.tar
@@ -60,7 +69,7 @@ jobs:
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
       - name: Download container artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ci-${{ matrix.arch }}-${{ github.run_number }}.tar
 
@@ -112,7 +121,7 @@ jobs:
           fi
 
       - name: Download container artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ci-${{ matrix.arch }}-${{ github.run_number }}.tar
 
@@ -163,7 +172,7 @@ jobs:
           fi
 
       - name: Download container artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ci-${{ matrix.arch }}-${{ github.run_number }}.tar
 
@@ -387,6 +396,6 @@ jobs:
       matrix:
         arch: [amd64, armv7, arm64, armv6]
     steps:
-    - uses: geekyeggo/delete-artifact@v1
+    - uses: geekyeggo/delete-artifact@v5
       with:
         name: ci-${{ matrix.arch }}-${{ github.run_number }}.tar

.gitignore

@@ -18,3 +18,9 @@ Sensors/*
 # Ignore userdata
 BridgeEmulator/export/
 BridgeEmulator/cert.pem
+/config
+*.log
+*.js
+*.css
+*.webp
+BridgeEmulator/flaskUI/templates/index.html

.vscode/launch.json

@@ -4,14 +4,20 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
-        {
-            "name": "Launch diyHue",
-            "type": "python",
-            "request": "launch",
-            "program": "/opt/hue-emulator/HueEmulator3.py",
-            "args" : ["--docker"],
-            "pythonPath": "/usr/bin/python3",
-            "console": "integratedTerminal"
-        }
+      {
+        "name": "Launch diyHue",
+        "type": "debugpy",
+        "request": "launch",
+        "program": "${workspaceFolder}/BridgeEmulator/HueEmulator3.py",
+        "args": [
+          "--docker",
+          "--mac",
+          "xx:xx:xx:xx:xx:xx",
+          "--config_path",
+          "${workspaceFolder}/config",
+          "--debug"
+        ],
+        "console": "integratedTerminal"
+      }
     ]
-}
+  }

BridgeEmulator/HueEmulator3.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 from flask import Flask
-from flask.json import jsonify
 from flask_cors import CORS
 from flask_restful import Api
 from threading import Thread
@@ -13,16 +12,14 @@
 from flaskUI.v2restapi import AuthV1, ClipV2, ClipV2Resource, ClipV2ResourceId
 from flaskUI.espDevices import Switch
 from flaskUI.Credits import Credits
-from flaskUI.error_pages.handlers import error_pages
 from werkzeug.serving import WSGIRequestHandler
 from functions.daylightSensor import daylightSensor
-from pprint import pprint
 
 bridgeConfig = configManager.bridgeConfig.yaml_config
 logging = logManager.logger.get_logger(__name__)
 _ = logManager.logger.get_logger("werkzeug")
 WSGIRequestHandler.protocol_version = "HTTP/1.1"
-app = Flask(__name__, template_folder='flaskUI/templates',static_url_path="/static", static_folder='flaskUI/static')
+app = Flask(__name__, template_folder='flaskUI/templates',static_url_path="/assets", static_folder='flaskUI/assets')
 api = Api(app)
 cors = CORS(app, resources={r"*": {"origins": "*"}})
 

BridgeEmulator/HueObjects/ApiUser.py

@@ -0,0 +1,15 @@
+from datetime import datetime, timezone
+
+class ApiUser():
+    def __init__(self, username, name, client_key, create_date=datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S"), last_use_date=datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S")):
+        self.username = username
+        self.name = name
+        self.client_key = client_key
+        self.create_date = create_date
+        self.last_use_date = last_use_date
+
+    def getV1Api(self):
+        return {"name": self.name, "create date": self.create_date, "last use date": self.last_use_date}
+
+    def save(self):
+        return {"name": self.name, "client_key": self.client_key, "create_date": self.create_date, "last_use_date": self.last_use_date}

BridgeEmulator/HueObjects/BehaviorInstance.py

@@ -0,0 +1,86 @@
+import uuid
+import logManager
+from HueObjects import genV2Uuid, StreamEvent
+from datetime import datetime, timezone
+
+logging = logManager.logger.get_logger(__name__)
+
+class BehaviorInstance():
+    def __init__(self, data):
+        self.id_v2 = data["id"] if "id" in data else genV2Uuid()
+        self.id_v1 = self.id_v2  # used for config save
+        self.name = data["metadata"]["name"] if "name" in data["metadata"] else None
+        self.configuration = data["configuration"]
+        self.enabled = data["enabled"] if "enabled" in data else False
+        self.active = data["active"] if "active" in data else False
+        self.script_id = data["script_id"] if "script_id" in data else ""
+
+        streamMessage = {"creationtime": datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ"),
+                         "data": [self.getV2Api()],
+                         "id": str(uuid.uuid4()),
+                         "type": "add"
+                         }
+        StreamEvent(streamMessage)
+
+    def __del__(self):
+        streamMessage = {"creationtime": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+                         "data": [{"id": self.id_v2, "type": "behavior_instance"}],
+                         "id": str(uuid.uuid4()),
+                         "type": "delete"
+                         }
+        StreamEvent(streamMessage)
+        logging.info(self.name + " behaviour instance was destroyed.")
+
+    def getV2Api(self):
+        result = {"configuration": self.configuration,
+                  "dependees": [],
+                  "enabled": self.enabled,
+                  "id": self.id_v2,
+                  "last_error": "",
+                  "metadata": {
+                      "name": "noname"
+                  },
+                  "script_id": self.script_id,
+                  "status": "running" if self.enabled else "disabled",
+                  "type": "behavior_instance"
+                  }
+
+        if self.name != None:
+            result["metadata"]["name"] = self.name
+
+        for resource in self.configuration["where"]:
+            result["dependees"].append({"level": "critical",
+                                        "target": {
+                                            "rid": resource[list(resource.keys())[0]]["rid"],
+                                            "rtype": resource[list(resource.keys())[0]]["rtype"]
+                                        },
+                                        "type": "ResourceDependee"
+                                        })
+
+        return result
+
+    def update_attr(self, newdata):
+        for key, value in newdata.items():
+            if key == "metadata" and "name" in value:
+                self.name = value["name"]
+                continue
+            updateAttribute = getattr(self, key)
+            if isinstance(updateAttribute, dict):
+                updateAttribute.update(value)
+                setattr(self, key, updateAttribute)
+            else:
+                setattr(self, key, value)
+        streamMessage = {"creationtime": datetime.now().strftime("%Y-%m-%dT%H:%M:%SZ"),
+                         "data": [self.getV2Api()],
+                         "id": str(uuid.uuid4()),
+                         "type": "update"
+                         }
+        StreamEvent(streamMessage)
+
+    def save(self):
+        result = {"id": self.id_v2, "metadata": {"name": self.name}, "configuration": self.configuration, "enabled": self.enabled, "active": self.active,
+                  "script_id": self.script_id}
+        if self.name != None:
+            result["metadata"] = {"name": self.name}
+
+        return result