From 86ff31c03e1e56817c86460e2ec7de8ca4cd8024 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <se23m504@technikum-wien.at>
Date: Tue, 5 Nov 2024 18:53:10 +0100
Subject: [PATCH] Use service IP for the stream endpoints

---
 README.md     | 16 ++++++++--------
 src/.env.dev  |  1 -
 src/app.py    |  4 ++--
 src/config.py |  1 -
 src/db.py     | 18 +++---------------
 5 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 62e2f4b..3cbea47 100644
--- a/README.md
+++ b/README.md
@@ -42,21 +42,21 @@ Instead of hardcoding endpoints and needing to redeploy the app every time you w
 
 Note that by default, the API initializes with predefined endpoints unless `DEFAULT_ENDPOINTS=false` is set in the `.env` file. The default endpoints are:
 
-- `/api/endpoints/1: {"url": "http://$API_HOST:8100/mystream/"}`
-- `/api/endpoints/2: {"url": "http://$API_HOST:8200/mystream/"}`
+- `/api/endpoints/1: {"url": "http://$SERVICE_IP:8100/mystream/"}`
+- `/api/endpoints/2: {"url": "http://$SERVICE_IP:8200/mystream/"}`
 
 ### cURL examples
 
 ```
-curl http://$API_HOST:5000/api/endpoints
-curl http://$API_HOST:5000/api/endpoints/1
-curl -X PUT http://$API_HOST:5000/api/endpoints/1 -H "Content-Type: application/json" -d '{"url": "http://$API_HOST:8500/mystream/"}'
+curl http://$SERVICE_IP:5000/api/endpoints
+curl http://$SERVICE_IP:5000/api/endpoints/1
+curl -X PUT http://$SERVICE_IP:5000/api/endpoints/1 -H "Content-Type: application/json" -d '{"url": "http://$SERVICE_IP:8500/mystream/"}'
 ```
 
 ### Invoke-WebRequest examples
 
 ```
-Invoke-WebRequest -Uri http://$API_HOST:5000/api/endpoints
-Invoke-WebRequest -Uri http://$API_HOST:5000/api/endpoints/1
-Invoke-WebRequest -Uri http://$API_HOST:5000/api/endpoints/1 -Method PUT -Headers @{"Content-Type"="application/json"} -Body '{"url": "http://$API_HOST:8500/mystream/"}'
+Invoke-WebRequest -Uri http://$SERVICE_IP:5000/api/endpoints
+Invoke-WebRequest -Uri http://$SERVICE_IP:5000/api/endpoints/1
+Invoke-WebRequest -Uri http://$SERVICE_IP:5000/api/endpoints/1 -Method PUT -Headers @{"Content-Type"="application/json"} -Body '{"url": "http://$SERVICE_IP:8500/mystream/"}'
 ```
diff --git a/src/.env.dev b/src/.env.dev
index 4130309..48d6ae0 100644
--- a/src/.env.dev
+++ b/src/.env.dev
@@ -1,5 +1,4 @@
 DATABASE=sqlite:///endpoints.db
-API_HOST=room7200.local
 SERVICE_NAME=room7200
 SERVICE_TYPE=_http._tcp.local.
 SERVICE_IP=192.168.137.1
diff --git a/src/app.py b/src/app.py
index 8a47d95..121e1ea 100644
--- a/src/app.py
+++ b/src/app.py
@@ -6,7 +6,7 @@ from flask import Flask, render_template
 from waitress import serve
 
 from api import api
-from config import API_HOST, DATABASE_URI, LOG_LEVEL, SERVICE_IP, SERVICE_PORT
+from config import DATABASE_URI, LOG_LEVEL, SERVICE_IP, SERVICE_PORT
 from db import get_endpoints_from_db, init_db
 from register import register_service, unregister_service
 
@@ -29,7 +29,7 @@ signal.signal(signal.SIGTERM, handle_exit)
 @app.route("/")
 def homepage():
     endpoints = get_endpoints_from_db()
-    return render_template("index.html", endpoints=endpoints, api_host=API_HOST)
+    return render_template("index.html", endpoints=endpoints, api_host=SERVICE_IP)
 
 
 if __name__ == "__main__":
diff --git a/src/config.py b/src/config.py
index 55255d9..47cc2f2 100644
--- a/src/config.py
+++ b/src/config.py
@@ -5,7 +5,6 @@ from dotenv import load_dotenv
 load_dotenv()
 
 DATABASE_URI = os.getenv("DATABASE")
-API_HOST = os.getenv("API_HOST")
 SERVICE_NAME = os.getenv("SERVICE_NAME")
 SERVICE_TYPE = os.getenv("SERVICE_TYPE")
 SERVICE_IP = os.getenv("SERVICE_IP")
diff --git a/src/db.py b/src/db.py
index 7be0e05..8337d25 100644
--- a/src/db.py
+++ b/src/db.py
@@ -2,7 +2,7 @@ import logging
 
 from flask_sqlalchemy import SQLAlchemy
 
-from config import API_HOST, DEFAULT_ENDPOINTS
+from config import DEFAULT_ENDPOINTS, SERVICE_IP
 
 db = SQLAlchemy()
 
@@ -24,8 +24,8 @@ def init_default_endpoints():
     existing_endpoints = {endpoint.id for endpoint in Endpoint.query.all()}
 
     default_endpoints = [
-        Endpoint(id=1, url=f"http://{API_HOST}:8100/mystream/"),
-        Endpoint(id=2, url=f"http://{API_HOST}:8200/mystream/"),
+        Endpoint(id=1, url=f"http://{SERVICE_IP}:8100/mystream/"),
+        Endpoint(id=2, url=f"http://{SERVICE_IP}:8200/mystream/"),
     ]
 
     updated = False
@@ -52,18 +52,6 @@ def add_endpoint_to_db(url):
     return new_endpoint.id
 
 
-# def update_endpoint_in_db(endpoint_id, new_url):
-#     with db.session.begin():
-#         endpoint = Endpoint.query.get(endpoint_id)
-#         if endpoint:
-#             endpoint.url = new_url
-#             db.session.add(endpoint)
-#             return True
-#         else:
-#             db.session.add(Endpoint(id=endpoint_id, url=new_url))
-#             return False
-
-
 def update_endpoint_in_db(endpoint_id, new_url):
     endpoint = Endpoint.query.get(endpoint_id)
     if endpoint: