cleanups

Author: mariusandra

backend/app/api/__init__.py

@@ -1,15 +1,15 @@
 from fastapi import APIRouter
 
-# When using HASSIO_RUN_MODE (Home Assistant ingress with automatic login), we make this distinction:
-# - api_public: exported to the local network via port 8989, no authentication required
-# - api_no_auth: accessible via Home Assistant ingress (on port 8990) without authentication
-# - api_with_auth: accessible via Home Assistant ingress (on port 8990) without authentication
-
-# When not using HASSIO_RUN_MODE (running directly from Docker), we make this distinction:
+# When not using HASSIO_RUN_MODE (running directly from Docker):
 # - api_public: routes that do not require authentication
 # - api_no_auth: routes that do not require authentication
 # - api_with_auth: routes that can only be accessed by authenticated users
 
+# When using HASSIO_RUN_MODE (Home Assistant ingress with automatic login):
+# - api_public: exported to the local network via port 8989, no authentication required
+# - api_no_auth: accessible via Home Assistant ingress (on port 8990) without authentication
+# - api_with_auth: accessible via Home Assistant ingress (on port 8990) without authentication
+
 api_public = APIRouter()
 api_no_auth = APIRouter()
 api_with_auth = APIRouter()

backend/app/api/frames.py

@@ -29,7 +29,6 @@
 from app.config import config
 from app.utils.network import is_safe_host
 from app.redis import get_redis
-from app.config import Config, get_config
 from . import api_with_auth, api_no_auth
 
 
@@ -58,7 +57,7 @@ async def api_frame_get_logs(id: int, db: Session = Depends(get_db)):
 
 
 @api_with_auth.get("/frames/{id:int}/image_link", response_model=FrameImageLinkResponse)
-async def get_image_link(id: int, config: Config = Depends(get_config)):
+async def get_image_link(id: int):
     expire_minutes = 5
     now = datetime.utcnow()
     expire = now + timedelta(minutes=expire_minutes)
@@ -68,13 +67,14 @@ async def get_image_link(id: int, config: Config = Depends(get_config)):
     expires_in = int((expire - now).total_seconds())
 
     return {
-        "url": config.base_path + f"/api/frames/{id}/image?token={token}",
+        "url": config.ingress_path + f"/api/frames/{id}/image?token={token}",
         "expires_in": expires_in
     }
 
 @api_no_auth.get("/frames/{id:int}/image")
 async def api_frame_get_image(id: int, token: str, request: Request, db: Session = Depends(get_db), redis: Redis = Depends(get_redis)):
     if config.HASSIO_RUN_MODE != 'ingress':
+        # All modes except ingress require a token in the url
         try:
             payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
             if payload.get("sub") != f"frame={id}":

backend/app/api/templates.py

@@ -26,7 +26,6 @@
 )
 from app.api.auth import SECRET_KEY, ALGORITHM
 from app.api import api_with_auth, api_no_auth
-from app.config import Config, get_config
 from app.redis import get_redis
 
 
@@ -241,7 +240,7 @@ async def get_template(template_id: str, db: Session = Depends(get_db)):
     return d
 
 @api_with_auth.get("/templates/{template_id}/image_link", response_model=TemplateImageLinkResponse)
-async def get_image_link(template_id: str, config: Config = Depends(get_config)):
+async def get_image_link(template_id: str):
     expire_minutes = 5
     now = datetime.utcnow()
     expire = now + timedelta(minutes=expire_minutes)
@@ -250,13 +249,14 @@ async def get_image_link(template_id: str, config: Config = Depends(get_config))
     expires_in = int((expire - now).total_seconds())
 
     return {
-        "url": config.base_path + f"/api/templates/{template_id}/image?token={token}",
+        "url": config.ingress_path + f"/api/templates/{template_id}/image?token={token}",
         "expires_in": expires_in
     }
 
 @api_no_auth.get("/templates/{template_id}/image")
 async def get_template_image(template_id: str, token: str, request: Request, db: Session = Depends(get_db)):
     if config.HASSIO_RUN_MODE != 'ingress':
+        # All modes except ingress require a token in the url
         try:
             payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
             if payload.get("sub") != f"template={template_id}":

backend/app/api/tests/test_ingress.py

@@ -13,7 +13,6 @@ def clear_env(monkeypatch):
     """
     monkeypatch.delenv("HASSIO_RUN_MODE", raising=False)
     monkeypatch.delenv("HASSIO_TOKEN", raising=False)
-    monkeypatch.delenv("HOSTNAME", raising=False)
     monkeypatch.delenv("SUPERVISOR_TOKEN", raising=False)
 
 def _reload_app_and_config():
@@ -47,7 +46,7 @@ async def test_no_hassio_env(clear_env):
     app, conf = _reload_app_and_config()
     assert conf.HASSIO_TOKEN is None
     assert conf.HASSIO_RUN_MODE is None
-    assert conf.base_path == ""
+    assert conf.ingress_path == ""
 
     client = TestClient(app)
 
@@ -77,7 +76,7 @@ async def test_hassio_run_mode_public(clear_env, monkeypatch):
     app, conf = _reload_app_and_config()
     assert conf.HASSIO_TOKEN == "token"
     assert conf.HASSIO_RUN_MODE == "public"
-    assert conf.base_path == ""
+    assert conf.ingress_path == ""
 
     client = TestClient(app)
 
@@ -104,7 +103,6 @@ async def test_hassio_run_mode_ingress(clear_env, monkeypatch):
     custom_ingress = "/hostname/ingress"
     monkeypatch.setenv("HASSIO_TOKEN", "token")
     monkeypatch.setenv("HASSIO_RUN_MODE", "ingress")
-    monkeypatch.setenv("HOSTNAME", "hostname")
     monkeypatch.setenv("SUPERVISOR_TOKEN", "token")
 
     def mock_requests_get(url, headers):
@@ -118,7 +116,7 @@ def mock_requests_get(url, headers):
 
     assert conf.HASSIO_TOKEN == "token"
     assert conf.HASSIO_RUN_MODE == "ingress"
-    assert conf.base_path == custom_ingress, f"Expected conf.base_path={custom_ingress}, got '{conf.base_path}'"
+    assert conf.ingress_path == custom_ingress, f"Expected conf.ingress_path={custom_ingress}, got '{conf.ingress_path}'"
 
     client = TestClient(app)
 

backend/app/config.py

@@ -30,8 +30,7 @@ class Config:
     HASSIO_RUN_MODE = os.environ.get('HASSIO_RUN_MODE', None)
     HASSIO_TOKEN = os.environ.get('HASSIO_TOKEN', None)
     SUPERVISOR_TOKEN = os.environ.get('SUPERVISOR_TOKEN', None)
-    HOSTNAME = os.environ.get('HOSTNAME', None)
-    base_path = ''
+    ingress_path = ''
 
     def __init__(self):
         # Get Home Assistant Supervisor Ingress URL
@@ -46,8 +45,8 @@ def __init__(self):
                 ingress_url = info.get("data", {}).get("ingress_url")
                 if ingress_url and ingress_url.endswith("/"):
                     ingress_url = ingress_url[:-1]
-                self.base_path = ingress_url
-                print(f"🟢 Fetched HA ingress URL: {self.base_path}")
+                self.ingress_path = ingress_url
+                print(f"🟢 Fetched HA ingress URL: {self.ingress_path}")
             except Exception as e:
                 print(f"🔴 Failed to get HA ingress URL: {e}")
 
@@ -71,7 +70,7 @@ class ProductionConfig(Config):
     def __init__(self):
         super().__init__()
         if self.SECRET_KEY is None:
-            if self.HASSIO_TOKEN is not None:
+            if self.HASSIO_RUN_MODE is not None:
                 self.SECRET_KEY = secrets.token_urlsafe(32)
             else:
                 raise ValueError('SECRET_KEY must be set in production')

backend/app/fastapi.py

@@ -64,8 +64,8 @@ async def lifespan(app: FastAPI):
 
     if config.HASSIO_RUN_MODE:
         frameos_app_config["HASSIO_RUN_MODE"] = config.HASSIO_RUN_MODE
-    if config.base_path:
-        frameos_app_config["base_path"] = config.base_path
+    if config.ingress_path:
+        frameos_app_config["ingress_path"] = config.ingress_path
 
     index_html = index_html.replace('<head>', f'<head><script>window.FRAMEOS_APP_CONFIG={json.dumps(frameos_app_config)}</script>')
 

frontend/src/main.tsx

@@ -3,40 +3,9 @@ import { App } from './scenes/App'
 import './index.css'
 import { resetContext } from 'kea'
 import { subscriptionsPlugin } from 'kea-subscriptions'
-import { routerPlugin } from 'kea-router'
-import { getBasePath } from './utils/getBasePath'
-
-function addIngressPathIfMissing(path: string): string {
-  const ingressPath = getBasePath()
-  if (ingressPath && path.startsWith(ingressPath)) {
-    return path
-  }
-  return `${ingressPath}${path}`
-}
-
-function removeIngressPathIfPressent(path: string): string {
-  const ingressPath = getBasePath()
-  if (ingressPath && path.startsWith(ingressPath)) {
-    return path.slice(ingressPath.length)
-  }
-  return path
-}
 
 resetContext({
-  plugins: [
-    subscriptionsPlugin,
-    routerPlugin({
-      // pathFromRoutesToWindow: (path) => {
-      //   return addIngressPathIfMissing(path)
-      // },
-      // transformPathInActions: (path) => {
-      //   return addIngressPathIfMissing(path)
-      // },
-      // pathFromWindowToRoutes: (path) => {
-      //   return removeIngressPathIfPressent(path)
-      // },
-    }),
-  ],
+  plugins: [subscriptionsPlugin],
 })
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(<App />)

frontend/src/utils/getBasePath.ts

@@ -1,4 +1,4 @@
 export function getBasePath(): string {
-  const basePath = typeof window !== 'undefined' ? (window as any).FRAMEOS_APP_CONFIG?.base_path || '' : ''
+  const basePath = typeof window !== 'undefined' ? (window as any).FRAMEOS_APP_CONFIG?.ingress_path || '' : ''
   return basePath.endsWith('/') ? basePath.slice(0, -1) : basePath
 }

frontend/utils.mjs

@@ -53,7 +53,7 @@ export function copyIndexHtml(
   const scriptCode = `
         window.ESBUILD_LOAD_SCRIPT = async function (file) {
             try {
-                await import((window.FRAMEOS_APP_CONFIG?.base_path || '') + '/static/' + file)
+                await import((window.FRAMEOS_APP_CONFIG?.ingress_path || '') + '/static/' + file)
             } catch (error) {
                 console.error('Error loading chunk: "' + file + '"')
                 console.error(error)
@@ -80,7 +80,7 @@ export function copyIndexHtml(
   const cssLoader = `
         const link = document.createElement("link");
         link.rel = "stylesheet";
-        link.href = (window.FRAMEOS_APP_CONFIG?.base_path || '') + "/static/" + ${JSON.stringify(cssFile)};
+        link.href = (window.FRAMEOS_APP_CONFIG?.ingress_path || '') + "/static/" + ${JSON.stringify(cssFile)};
         document.head.appendChild(link)
     `