feat: Display progress via web (#584)

src/reset.sh

@@ -10,6 +10,10 @@ trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 [ ! -f "/run/entry.sh" ] && error "Script must run inside Docker container!" && exit 11
 [ "$(id -u)" -ne "0" ] && error "Script must be executed with root privileges." && exit 12
 
+echo "❯ Starting $APP for Docker v$(</run/version)..."
+echo "❯ For support visit $SUPPORT"
+echo
+
 # Docker environment variables
 
 : "${TZ:=""}"             # System local timezone
@@ -24,6 +28,12 @@ trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 
 # Helper variables
 
+STORAGE="/storage"
+PAGE="/run/shm/index.html"
+TEMPLATE="/var/www/index.html"
+FOOTER1="$APP for Docker v$(</run/version)"
+FOOTER2="<a href='$SUPPORT'>$SUPPORT</a>"
+
 KERNEL=$(uname -r | cut -b 1)
 MINOR=$(uname -r | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
@@ -31,7 +41,6 @@ VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
 
 # Check folder
 
-STORAGE="/storage"
 if [ ! -d "$STORAGE" ]; then
   error "Storage folder ($STORAGE) not found!" && exit 13
 fi
@@ -45,7 +54,6 @@ if [ ! -d "/run/shm" ]; then
 fi
 
 # Cleanup files
-rm -f /tmp/server.*
 rm -f /run/shm/qemu.*
 rm -f /run/shm/dsm.url
 
@@ -71,7 +79,17 @@ pKill() {
   { kill -15 "$pid" || true; } 2>/dev/null
 
   while isAlive "$pid"; do
-    sleep 0.1
+    sleep 0.2
+  done
+
+  return 0
+}
+
+fWait() {
+  local name=$1
+
+  while pgrep -f -l "$name" >/dev/null; do
+    sleep 0.2
   done
 
   return 0
@@ -81,14 +99,54 @@ fKill() {
   local name=$1
 
   { pkill -f "$name" || true; } 2>/dev/null
-
-  while pgrep -f -l "$name" >/dev/null; do
-    sleep 0.1
-  done
+  fWait "$name"
 
   return 0
 }
 
+escape () {
+    local s
+    s=${1//&/\&amp;}
+    s=${s//</\&lt;}
+    s=${s//>/\&gt;}
+    s=${s//'"'/\&quot;}
+    printf -- %s "$s"
+    return 0
+}
+
+html()
+{
+    local title
+    local body
+    local footer
+
+    title=$(escape "$APP")
+    title="<title>$title</title>"
+    footer=$(escape "$FOOTER1")
+
+    body=$(escape "$1")
+    if [[ "$body" == *"..." ]]; then
+      body="<p class=\"loading\">${body/.../}</p>"
+    fi
+
+    local timeout="4999"
+    [ -n "${2:-}" ] && timeout="$2"
+    local script="<script>setTimeout(() => { document.location.reload(); }, $timeout);</script>"
+    [[ "$timeout" == "0" ]] && script=""
+
+    local HTML
+    HTML=$(<"$TEMPLATE")
+    HTML="${HTML/\[1\]/$title}"
+    HTML="${HTML/\[2\]/$script}"
+    HTML="${HTML/\[3\]/$body}"
+    HTML="${HTML/\[4\]/$footer}"
+    HTML="${HTML/\[5\]/$FOOTER2}"
+
+    echo "$HTML" > "$PAGE"
+
+    return 0
+}
+
 getCountry() {
   local url=$1
   local query=$2
@@ -134,7 +192,8 @@ addPackage() {
     return 0
   fi
 
-  info "Installing $desc..."
+  MSG="Installing $desc..."
+  info "$MSG" && html "$MSG"
 
   [ -z "$COUNTRY" ] && setCountry
 
@@ -148,4 +207,9 @@ addPackage() {
   return 0
 }
 
+# Start webserver
+cp -r /var/www/* /run/shm
+html "Starting $APP for Docker..."
+nginx -e stderr
+
 return 0