slococo-uni
/
getendpoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use service IP for the stream endpoints

This commit is contained in:
Santiago Lo Coco 2024-11-05 18:53:10 +01:00
parent a807f899f5
commit 86ff31c03e
5 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -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: 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/1: {"url": "http://$SERVICE_IP:8100/mystream/"}`
- `/api/endpoints/2: {"url": "http://$API_HOST:8200/mystream/"}` - `/api/endpoints/2: {"url": "http://$SERVICE_IP:8200/mystream/"}`
### cURL examples ### cURL examples
``` ```
curl http://$API_HOST:5000/api/endpoints curl http://$SERVICE_IP:5000/api/endpoints
curl http://$API_HOST:5000/api/endpoints/1 curl http://$SERVICE_IP: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 -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 examples
``` ```
Invoke-WebRequest -Uri http://$API_HOST:5000/api/endpoints Invoke-WebRequest -Uri http://$SERVICE_IP:5000/api/endpoints
Invoke-WebRequest -Uri http://$API_HOST:5000/api/endpoints/1 Invoke-WebRequest -Uri http://$SERVICE_IP: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/1 -Method PUT -Headers @{"Content-Type"="application/json"} -Body '{"url": "http://$SERVICE_IP:8500/mystream/"}'
``` ```

1
src/.env.dev
View File

@ -1,5 +1,4 @@
DATABASE=sqlite:///endpoints.db DATABASE=sqlite:///endpoints.db
API_HOST=room7200.local
SERVICE_NAME=room7200 SERVICE_NAME=room7200
SERVICE_TYPE=_http._tcp.local. SERVICE_TYPE=_http._tcp.local.
SERVICE_IP=192.168.137.1 SERVICE_IP=192.168.137.1

4
src/app.py
View File

@ -6,7 +6,7 @@ from flask import Flask, render_template
from waitress import serve from waitress import serve
from api import api 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 db import get_endpoints_from_db, init_db
from register import register_service, unregister_service from register import register_service, unregister_service
@ -29,7 +29,7 @@ signal.signal(signal.SIGTERM, handle_exit)
@app.route("/") @app.route("/")
def homepage(): def homepage():
endpoints = get_endpoints_from_db() 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__": if __name__ == "__main__":

1
src/config.py
View File

@ -5,7 +5,6 @@ from dotenv import load_dotenv
load_dotenv() load_dotenv()
DATABASE_URI = os.getenv("DATABASE") DATABASE_URI = os.getenv("DATABASE")
API_HOST = os.getenv("API_HOST")
SERVICE_NAME = os.getenv("SERVICE_NAME") SERVICE_NAME = os.getenv("SERVICE_NAME")
SERVICE_TYPE = os.getenv("SERVICE_TYPE") SERVICE_TYPE = os.getenv("SERVICE_TYPE")
SERVICE_IP = os.getenv("SERVICE_IP") SERVICE_IP = os.getenv("SERVICE_IP")

18
src/db.py
View File

@ -2,7 +2,7 @@ import logging
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from config import API_HOST, DEFAULT_ENDPOINTS from config import DEFAULT_ENDPOINTS, SERVICE_IP
db = SQLAlchemy() db = SQLAlchemy()
@ -24,8 +24,8 @@ def init_default_endpoints():
existing_endpoints = {endpoint.id for endpoint in Endpoint.query.all()} existing_endpoints = {endpoint.id for endpoint in Endpoint.query.all()}
default_endpoints = [ default_endpoints = [
Endpoint(id=1, url=f"http://{API_HOST}:8100/mystream/"), Endpoint(id=1, url=f"http://{SERVICE_IP}:8100/mystream/"),
Endpoint(id=2, url=f"http://{API_HOST}:8200/mystream/"), Endpoint(id=2, url=f"http://{SERVICE_IP}:8200/mystream/"),
] ]
updated = False updated = False
@ -52,18 +52,6 @@ def add_endpoint_to_db(url):
return new_endpoint.id 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): def update_endpoint_in_db(endpoint_id, new_url):
endpoint = Endpoint.query.get(endpoint_id) endpoint = Endpoint.query.get(endpoint_id)
if endpoint: if endpoint: