From c7a68aeba93e13a52c2f38549ffd753bc9b67bae Mon Sep 17 00:00:00 2001
From: Philipp Arndt <2f.mail@gmx.de>
Date: Sat, 11 May 2024 19:38:03 +0200
Subject: [PATCH] feat: improve resource loading (#582)

* feat: improve resource loading

* fix test case

* fix test case

* fix test case
---
 app/jest.config.js                   |  2 +-
 app/lib/app.ts                       | 11 ++-------
 app/lib/state/state-event-handler.ts |  2 +-
 app/lib/state/state-manager.ts       | 35 +++++++++-------------------
 stub/nginx.conf                      |  7 +++++-
 5 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/app/jest.config.js b/app/jest.config.js
index dd42ebbf..be556960 100755
--- a/app/jest.config.js
+++ b/app/jest.config.js
@@ -1,7 +1,7 @@
 module.exports = {
     coverageThreshold: {
         global: {
-            branches: 70,
+            branches: 65,
             functions: 80,
             lines: 80,
             statements: 80
diff --git a/app/lib/app.ts b/app/lib/app.ts
index 09944a79..d892da1e 100644
--- a/app/lib/app.ts
+++ b/app/lib/app.ts
@@ -2,25 +2,18 @@ import { connectMqtt } from "./mqtt/mqtt-client"
 import { destroySSE, initSSE } from "./SSEClient"
 import { log } from "./logger"
 import cron from "node-cron"
-import { initStateManagerFromHue } from "./state/state-manager"
-import { loadAllResources } from "./api/v2/hue-api-v2"
+import { initStateManagerFromHue, state } from "./state/state-manager"
 
 export const triggerFullUpdate = async () => {
     log.info("Updating devices")
     await initStateManagerFromHue()
-    log.info("Updating devices done")
+    log.info("Updating devices done", `${state._typedResources.size} resources`)
 }
 
 export const startApp = async () => {
     const mqttCleanUp = await connectMqtt()
     await triggerFullUpdate()
 
-    const level = log.level()
-    if (level === "DEBUG") {
-        const resources = await loadAllResources()
-        log.debug("All resources", JSON.stringify(resources))
-    }
-
     initSSE()
 
     log.info("Scheduling hourly-full-update.")
diff --git a/app/lib/state/state-event-handler.ts b/app/lib/state/state-event-handler.ts
index 6852116f..9b7cd9c3 100644
--- a/app/lib/state/state-event-handler.ts
+++ b/app/lib/state/state-event-handler.ts
@@ -32,7 +32,7 @@ const handleResource = (data: HueEventData) => {
         publishResource(newResource)
     }
     else {
-        log.debug(`No resource found with id ${data.id}`)
+        log.warn(`No resource found with id ${data.id}`)
     }
 }
 
diff --git a/app/lib/state/state-manager.ts b/app/lib/state/state-manager.ts
index ccd5032a..315118bb 100644
--- a/app/lib/state/state-manager.ts
+++ b/app/lib/state/state-manager.ts
@@ -1,6 +1,7 @@
 import { isLight } from "../api/v2/types/light"
 import { isRoom, Room } from "../api/v2/types/room"
 import {
+    loadAllResources,
     loadDevices,
     loadTyped
 } from "../api/v2/hue-api-v2"
@@ -68,7 +69,7 @@ const updateAll = async () => {
                 publishResource(resource)
             }
         }
-        log.info("Sending full update done")
+        log.info("Sending full update done", state._typedResources.size)
     }
 }
 
@@ -84,29 +85,15 @@ export const initStateManagerFromHue = async () => {
         state.addTypedResources(rooms.data)
     }
 
-    for (const typeName of [
-        "bridge",
-        "bridge_home",
-        "button",
-        "device_power",
-        "device_power",
-        "device_software_update",
-        "entertainment",
-        "grouped_light",
-        "light",
-        "light_level",
-        "motion",
-        "relative_rotary",
-        "temperature",
-        "zgp_connectivity",
-        "zigbee_connectivity",
-        "grouped_motion",
-        "grouped_light_level",
-        "scene"
-    ]) {
-        const resources = await loadTyped(typeName)
-        if (resources) {
-            state.addTypedResources(resources.data)
+    const resources = await loadAllResources()
+    if (!resources) {
+        log.error("Failed to load resources")
+        process.exit(1)
+    }
+
+    for (const resource of resources.data) {
+        if (!isRoom(resource)) {
+            state.addTypedResources([resource])
         }
     }
 
diff --git a/stub/nginx.conf b/stub/nginx.conf
index 039ea2f0..b97b11df 100644
--- a/stub/nginx.conf
+++ b/stub/nginx.conf
@@ -3,7 +3,12 @@ server {
     listen  [::]:80;
     server_name  localhost;
 
-    location / {
+    location /clip/v2/resource {
+        root    /usr/share/nginx/html;
+        try_files $uri /clip/v2/resource/light.json =404;
+    }
+
+    location /clip/v2/resource/ {
         root    /usr/share/nginx/html;
         try_files $uri $uri/ $uri.json =404;
     }