gandalf/secubox-openwrt
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cloner): Add build_progress method and fix device list unwrapping

Browse Source 
- Add build_progress RPCD method to track image build status
- Fix handleBuild() to handle RPC expect array unwrapping
- The expect: { devices: [] } unwraps the array, so data IS the array

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
CyberMind-FR 2026-02-12 09:11:13 +01:00
parent e5782c1f9c
commit 481ba074db
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/secubox/luci-app-cloner/htdocs/luci-static/resources/view/cloner/overview.js
View File

@ -324,7 +324,8 @@ return view.extend({
handleBuild: function() {
var self = this;
callListDevices().then(function(data) {
var devices = data.devices || [];
// RPC expect unwraps the array, so data IS the devices array
var devices = data || [];
var select = E('select', { 'id': 'device-select', 'style': 'width:100%;padding:10px;background:var(--kiss-bg2);border:1px solid var(--kiss-line);border-radius:6px;color:var(--kiss-text);font-size:14px;' });
devices.forEach(function(dev) {

47
package/secubox/luci-app-cloner/root/usr/libexec/rpcd/luci.cloner
View File

@ -348,6 +348,51 @@ do_delete_image() {
json_dump
}
do_build_progress() {
local building=0 progress=0 stage="" log_tail=""
json_init
# Check if build is running
if pgrep -f "secubox-cloner build" >/dev/null 2>&1; then
building=1
# Parse log for progress
if [ -f /tmp/cloner-build.log ]; then
log_tail=$(tail -5 /tmp/cloner-build.log 2>/dev/null | tr '\n' ' ' | cut -c1-200)
# Estimate progress from log content
if grep -q "Downloading" /tmp/cloner-build.log 2>/dev/null; then
stage="downloading"
progress=20
elif grep -q "Compiling\|Building" /tmp/cloner-build.log 2>/dev/null; then
stage="building"
progress=50
elif grep -q "Packaging\|Creating" /tmp/cloner-build.log 2>/dev/null; then
stage="packaging"
progress=80
else
stage="initializing"
progress=10
fi
fi
elif [ -f /tmp/cloner-build.log ]; then
# Build finished - check result
if grep -q "Build complete\|Successfully" /tmp/cloner-build.log 2>/dev/null; then
stage="complete"
progress=100
elif grep -q "Error\|Failed\|error:" /tmp/cloner-build.log 2>/dev/null; then
stage="failed"
progress=0
fi
log_tail=$(tail -5 /tmp/cloner-build.log 2>/dev/null | tr '\n' ' ' | cut -c1-200)
fi
json_add_boolean "building" "$building"
json_add_int "progress" "$progress"
json_add_string "stage" "$stage"
json_add_string "log" "$log_tail"
json_dump
}
case "$1" in
list)
echo '{'
@ -356,6 +401,7 @@ case "$1" in
echo '"list_tokens":{},'
echo '"list_clones":{},'
echo '"list_devices":{},'
echo '"build_progress":{},'
echo '"generate_token":{"auto_approve":"Boolean"},'
echo '"build_image":{"device_type":"String"},'
echo '"tftp_start":{},'
@ -371,6 +417,7 @@ case "$1" in
list_tokens) do_list_tokens ;;
list_clones) do_list_clones ;;
list_devices) do_list_devices ;;
build_progress) do_build_progress ;;
generate_token) do_generate_token ;;
build_image) do_build_image ;;
tftp_start) do_tftp_start ;;