Update the logic to wait for the hardware detection data.
This commit is contained in:
+10
-2
@@ -772,16 +772,24 @@ echo """
|
||||
"""
|
||||
|
||||
launch_gui
|
||||
hierarchy_preparation
|
||||
until [[ -e web/signals/hw_detection_ready ]]; do
|
||||
|
||||
until [[ -e "${LIVE_DATA_FILE}" ]]; do
|
||||
sleep 5
|
||||
done
|
||||
|
||||
LIVE_TARGET_IP="$(yq -r '.live_target.ip' ${LIVE_DATA_FILE})"
|
||||
LIVE_TARGET_PASSWORD="$(yq -r '.live_target.password' ${LIVE_DATA_FILE})"
|
||||
DEVICE_TYPE="$(yq -r '.device.type' ${LIVE_DATA_FILE})"
|
||||
|
||||
hardware_detection
|
||||
|
||||
until [[ -e web/signals/configuration_ready ]]; do
|
||||
sleep 5
|
||||
done
|
||||
until [[ -e web/signals/deployment_ready ]]; do
|
||||
sleep 5
|
||||
done
|
||||
|
||||
hierarchy_preparation
|
||||
|
||||
# --- MAIN LOGIC ---<
|
||||
@@ -33,7 +33,7 @@ class BridgeHandler(http.server.SimpleHTTPRequestHandler):
|
||||
return
|
||||
|
||||
# Restrict static file access to specific directories only
|
||||
if not any(self.path.startswith(prefix) for prefix in ['/pages', '/media']):
|
||||
if not any(self.path.startswith(prefix) for prefix in ['/pages', '/media', '/config']):
|
||||
self.send_error(403, "Access Denied: Resource is restricted.")
|
||||
return
|
||||
|
||||
@@ -48,16 +48,11 @@ class BridgeHandler(http.server.SimpleHTTPRequestHandler):
|
||||
f.write(post_data)
|
||||
self.send_response(200)
|
||||
self.end_headers()
|
||||
# Signal Bash that discovery data is ready and we can proceed to hardware detection
|
||||
os.makedirs(SIGNALS_DIR, exist_ok=True)
|
||||
with open(os.path.join(SIGNALS_DIR, "hw_detection_ready"), "w") as f: f.write("1")
|
||||
with open(os.path.join(SIGNALS_DIR, "configuration_ready"), "w") as f: f.write("1")
|
||||
|
||||
elif self.path == '/deploy':
|
||||
with open(os.path.join(CONFIG_DIR, "numbus.yaml"), "wb") as f:
|
||||
f.write(post_data)
|
||||
self.send_response(200)
|
||||
self.end_headers()
|
||||
with open(os.path.join(SIGNALS_DIR, "deployment_ready"), "w") as f: f.write("1")
|
||||
|
||||
http.server.HTTPServer(('localhost', 8088), BridgeHandler).serve_forever()
|
||||
@@ -26,6 +26,7 @@
|
||||
function numbusPreparation() {
|
||||
return {
|
||||
step: 1,
|
||||
discoveryLoading: false,
|
||||
formData: {
|
||||
1: { language: 'French', country: 'France', timeZone: 'Europe/Paris' },
|
||||
2: { deviceType: '' },
|
||||
@@ -45,6 +46,9 @@
|
||||
this.step++;
|
||||
},
|
||||
async startDiscovery() {
|
||||
if (this.discoveryLoading) return;
|
||||
this.discoveryLoading = true;
|
||||
|
||||
const data = JSON.parse(JSON.stringify(this.formData));
|
||||
console.log("Discovery started with:", data);
|
||||
|
||||
@@ -78,12 +82,29 @@
|
||||
|
||||
if (response.ok) {
|
||||
console.log("Discovery signal sent successfully.");
|
||||
this.pollHardwareResults();
|
||||
} else {
|
||||
console.error("Server returned an error:", response.statusText);
|
||||
this.discoveryLoading = false;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Network error during discovery:", error);
|
||||
this.discoveryLoading = false;
|
||||
}
|
||||
},
|
||||
pollHardwareResults() {
|
||||
// Poll every 2 seconds for the hardware detection results file
|
||||
const interval = setInterval(async () => {
|
||||
try {
|
||||
const response = await fetch('/config/hardware.yaml', { cache: 'no-store' });
|
||||
if (response.ok) {
|
||||
clearInterval(interval);
|
||||
window.location.href = 'configuration.html';
|
||||
}
|
||||
} catch (err) {
|
||||
// Errors are expected until the file is actually created
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -400,9 +421,10 @@
|
||||
@click="startDiscovery()"
|
||||
x-show="step === 4"
|
||||
x-cloak
|
||||
:disabled="!isStepValid()"
|
||||
class="px-10 py-3 text-white font-bold rounded-xl scale-100 transition duration-200 ease-in bg-gradient-to-r from-fuchsia-500 via-fuchsia-600 to-fuchsia-700 hover:scale-105 hover:bg-gradient-to-br shadow-lg shadow-fuchsia-500/30 dark:shadow-lg dark:shadow-fuchsia-800/80 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:scale-100">Start Discovery
|
||||
<svg aria-hidden="true" class="w-4 h-4 text-neutral-tertiary animate-spin fill-brand me-2" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
:disabled="!isStepValid() || discoveryLoading"
|
||||
class="px-10 py-3 text-white font-bold rounded-xl flex items-center gap-3 scale-100 transition duration-200 ease-in bg-gradient-to-r from-fuchsia-500 via-fuchsia-600 to-fuchsia-700 hover:scale-105 hover:bg-gradient-to-br shadow-lg shadow-fuchsia-500/30 dark:shadow-lg dark:shadow-fuchsia-800/80 disabled:opacity-50 disabled:cursor-not-allowed disabled:hover:scale-100">
|
||||
<span x-text="discoveryLoading ? 'Discovering...' : 'Start Discovery'"></span>
|
||||
<svg x-show="discoveryLoading" aria-hidden="true" class="w-5 h-5 text-white animate-spin" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
|
||||
<path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
|
||||
</svg>
|
||||
|
||||
Reference in New Issue
Block a user