Update handling of environment variables

nunorc · nunorc · commit 35a719ffd064 · 2024-05-30T16:50:25.000+02:00
diff --git a/.env.local b/.env.local
@@ -1,8 +1,9 @@
-SO_API=/api
+SO_API=http://localhost:8000
 SO_MQTT=localhost
-SO_MQTT_PORT=8080
+SO_MQTT_PORT=8083
 SO_MQTT_PATH=/mqtt
 SO_MCS_USERNAME=sim
 SO_MCS_PASSWORD=ops
 SO_MCS_ADMIN_PASSWORD=admin
 SO_MCS_SIMPLE=0
+SO_CONTROL_TCP=tcp://localhost:5555
diff --git a/README.md b/README.md
@@ -45,6 +45,9 @@ A Python (version 3.11 recommended) needs to be available, the list of required
 
 Once an MQTT is running and reachable and all the requirements installed, run:
 
+    # setup environment variables (required for all scripts and npm)
+    sim-ops$ . scripts/export.env.dev.sh .env.local
+
     sim-ops$ cd sim-ops-lib
 
     # run master script
@@ -57,6 +60,7 @@ Once an MQTT is running and reachable and all the requirements installed, run:
     
     # run mcs
     sim-ops-mcs$ npm run dev
+    # mcs is available from http://localhost:5173
 
 Running Python lib tests:
 
diff --git a/scripts/export-env.sh b/scripts/export-env.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# export variables
+export $(grep -v '^#' $1 | xargs)
+
+# export variables for vite env
+export $(grep -v '^#' $1 | sed -r 's/SO_/VITE_SO_/g' | xargs)
diff --git a/sim-ops-lib/so/api.py b/sim-ops-lib/so/api.py
@@ -49,7 +49,7 @@ def _admin_status(admin_pw: str):
     if _valid_auth(admin_pw):
         return _control({ 'system': 'admin', 'control': 'status', 'value': 'null' })
     else:
-        raise HTTPException(status_code=405, detail='Requires admin auth:'+MCS_ADMIN_PW)
+        raise HTTPException(status_code=405, detail='Requires admin auth:')
 
 @app.post('/admin', status_code=200)
 async def _admin(admin_pw: str, request: Request):
@@ -59,13 +59,12 @@ async def _admin(admin_pw: str, request: Request):
     else:
         raise HTTPException(status_code=405, detail='Requires admin auth.')
 
-@app.post('/control', status_code=200)
-async def _ground_stations_control(admin_pw: str, request: Request):
-    if _valid_auth(admin_pw):
-        body = await request.json()
-        return _control(body)
-    else:
-        raise HTTPException(status_code=405, detail='Requires admin auth.')
+@app.post('/control')
+async def _ground_stations_control(request: Request):
+    body = await request.json()
+    result = _control(body)
+
+    return result
 
 @app.get('/admin/hist')
 def _control_hist():
diff --git a/sim-ops-lib/so/mqtt.py b/sim-ops-lib/so/mqtt.py
@@ -1,12 +1,15 @@
 
-import json
+import os, json
 import paho.mqtt.client as mqtt
 
+SO_MQTT = os.getenv('SO_MQTT', 'so-mqtt')
+if not SO_MQTT:
+    SO_MQTT = 'so-mqtt'
+
 class MQTT:
-    def __init__(self) -> None:
+    def __init__(self, host=SO_MQTT, port=1883) -> None:
         self.client = mqtt.Client()
-        self.client.connect(host='so-mqtt', port=1883)
+        self.client.connect(host=host, port=port)
         
     def publish(self, topic, data):
-        print('publis', 'topic', topic)
         return self.client.publish(topic, json.dumps(data))
diff --git a/sim-ops-mcs/src/utils/env.js b/sim-ops-mcs/src/utils/env.js
@@ -1,5 +1,9 @@
 
 export default function getEnv(name, default_) {
+  const _name = `VITE_${name}`
+  if (_name in import.meta.env)
+    return import.meta.env?.[_name]
+
   return (window?.configs?.[name] ||  default_)
 }
 
diff --git a/sim-ops-mcs/src/views/Admin.vue b/sim-ops-mcs/src/views/Admin.vue
@@ -62,7 +62,6 @@ export default {
 	methods: {
 		handleAuth() {
 			this.admin_pw = document.getElementById("password").value;
-			console.log('handleAtuh:'+this.admin_pw)
 			this.adminStatus();
 		},
 		resetAuth() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`
`2`	`2`	`export default function getEnv(name, default_) {`
	`3`	+ const _name = `VITE_${name}`
	`4`	`+ if (_name in import.meta.env)`
	`5`	`+ return import.meta.env?.[_name]`
	`6`	`+`
`3`	`7`	`return (window?.configs?.[name] \|\| default_)`
`4`	`8`	`}`
`5`	`9`