.github/workflows/test.yml

@@ -1,6 +1,11 @@
 on:
   workflow_dispatch:
   pull_request:
+    paths:
+      - '**/*.sh'
+      - 'Dockerfile'
+      - '.github/workflows/test.yml'
+      - '.github/workflows/check.yml'
 
 name: "Test"
 permissions: {}

Dockerfile

@@ -37,15 +37,13 @@ RUN set -eu && \
         xz-utils \
         iptables \
         iproute2 \
+        apt-utils \
         dnsmasq \
         fakeroot \
-        apt-utils \        
         net-tools \
         e2fsprogs \
         qemu-utils \
-        websocketd \
         iputils-ping \
-        inotify-tools \
         ca-certificates \
         netcat-openbsd \
         qemu-system-x86 && \

src/entry.sh

@@ -1,16 +1,14 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-: "${PLATFORM:="x64"}"
 : "${APP:="Virtual DSM"}"
 : "${SUPPORT:="https://github.com/vdsm/virtual-dsm"}"
 
 cd /run
 
-. start.sh      # Startup hook
+. start.sh      # Placeholder
 . utils.sh      # Load functions
 . reset.sh      # Initialize system
-. server.sh     # Start webserver
 . install.sh    # Run installation
 . disk.sh       # Initialize disks
 . display.sh    # Initialize graphics
@@ -33,7 +31,7 @@ fi
 (( rc != 0 )) && error "$(<"$QEMU_LOG")" && exit 15
 
 terminal
-tail -fn +0 "$QEMU_LOG" --pid=$$ 2>/dev/null &
+tail -fn +0 "$QEMU_LOG" 2>/dev/null &
 cat "$QEMU_TERM" 2>/dev/null & wait $! || :
 
 sleep 1 & wait $!

src/install.sh

@@ -301,4 +301,7 @@ fi
 mv -f "$BOOT" "$STORAGE/$BASE.boot.img"
 rm -rf "$TMP"
 
+html "Booting DSM instance..."
+sleep 1.2
+
 return 0

src/network.sh

@@ -20,7 +20,6 @@ set -Eeuo pipefail
 : "${VM_NET_MASK:="255.255.255.0"}"
 
 : "${PASST:="passt"}"
-: "${PASST_MTU:=""}"
 : "${PASST_OPTS:=""}"
 : "${PASST_DEBUG:=""}"
 
@@ -177,12 +176,44 @@ configureDNS() {
   fi
 
   if [[ "$DNSMASQ_DEBUG" == [Yy1]* ]]; then
-    tail -fn +0 "$log" --pid=$$ &
+    tail -fn +0 "$log" &
   fi
 
   return 0
 }
 
+getUserPorts() {
+
+  local args=""
+  local list=$1
+  local ssh="22"
+  local dsm="5000"
+
+  [ -z "$list" ] && list="$ssh,$dsm" || list+=",$ssh,$dsm"
+
+  list="${list//,/ }"
+  list="${list## }"
+  list="${list%% }"
+
+  for port in $list; do
+    proto="tcp"
+    num="$port"
+
+    if [[ "$port" == */udp ]]; then
+      proto="udp"
+      num="${port%/udp}"
+    elif [[ "$port" == */tcp ]]; then
+      proto="tcp"
+      num="${port%/tcp}"
+    fi
+
+    args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
+  done
+
+  echo "${args%?}"
+  return 0
+}
+
 getHostPorts() {
 
   local list="$1"
@@ -190,52 +221,20 @@ getHostPorts() {
 
   [ -z "$list" ] && list="$MON_PORT" || list+=",$MON_PORT"
 
-  echo "$list"
-  return 0
-}
+  if [[ "${NETWORK,,}" == "passt" ]]; then
 
-getUserPorts() {
+    local DNS_PORT="53"
 
-  local args=""
-  local list=$1
-  list=$(echo "${list// /}" | sed 's/,*$//g')
-
-  local ssh="22"
-  local dsm="5000"
-  [ -z "$list" ] && list="$ssh,$dsm" || list+=",$ssh,$dsm"
-
-  echo "$list"
-  return 0
-}
-
-getSlirp() {
-
-  local args=""
-  local list=""
-
-  list=$(getUserPorts)
-  list="${list//,/ }"
-  list="${list## }"
-  list="${list%% }"
-
-  for port in $list; do
-
-    proto="tcp"
-    num="${port%/tcp}"
-
-    if [[ "$port" == *"/udp" ]]; then
-      proto="udp"
-      num="${port%/udp}"
-    elif [[ "$port" != *"/tcp" ]]; then
-      args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
-      proto="udp"
-      num="${port%/udp}"
+    if [[ "${DNSMASQ_DISABLE:-}" != [Yy1]* ]]; then
+      [ -z "$list" ] && list="$DNS_PORT" || list+=",$DNS_PORT"
     fi
 
-    args+="hostfwd=$proto::$num-$VM_NET_IP:$num,"
-  done
+    [ -z "$list" ] && list="$COM_PORT" || list+=",$COM_PORT"
+    [ -z "$list" ] && list="$CHR_PORT" || list+=",$CHR_PORT"
 
-  echo "${args%?}"
+  fi
+
+  echo "$list"
   return 0
 }
 
@@ -254,18 +253,17 @@ configureSlirp() {
 
   NET_OPTS="-netdev user,id=hostnet0,ipv4=on,host=$gateway,net=${gateway%.*}.0/24,dhcpstart=$ip,${ipv6}hostname=$VM_NET_HOST"
 
-  local forward=""
+  local forward
   forward=$(getUserPorts "${USER_PORTS:-}")
   [ -n "$forward" ] && NET_OPTS+=",$forward"
 
-  if [[ "${DNSMASQ_DISABLE:-}" == [Yy1]* ]]; then
-    echo "$gateway" > /run/shm/qemu.gw
-  else
+  if [[ "${DNSMASQ_DISABLE:-}" != [Yy1]* ]]; then
     cp /etc/resolv.conf /etc/resolv.dnsmasq
-    configureDNS "lo" "$ip" "$VM_NET_MAC" "$VM_NET_HOST" "$VM_NET_MASK" "$gateway" || return 1
     echo -e "nameserver 127.0.0.1\nsearch .\noptions ndots:0" >/etc/resolv.conf
   fi
 
+  configureDNS "lo" "$ip" "$VM_NET_MAC" "$VM_NET_HOST" "$VM_NET_MASK" "$gateway" || return 1
+
   VM_NET_IP="$ip"
   return 0
 }
@@ -296,19 +294,17 @@ configurePasst() {
   PASST_OPTS+=" -a $ip"
   PASST_OPTS+=" -g $gateway"
   PASST_OPTS+=" -n $VM_NET_MASK"
-  [ -n "$PASST_MTU" ] && PASST_OPTS+=" -m $PASST_MTU"
 
-  local forward=""
-  forward=$(getUserPorts "${USER_PORTS:-}")
-  forward="${forward///tcp}"
-  forward="${forward///udp}"
+  exclude=$(getHostPorts "$HOST_PORTS")
 
-  if [ -n "$forward" ]; then
-    forward="%${VM_NET_DEV}/$forward"
-    PASST_OPTS+=" -t $forward"
-    PASST_OPTS+=" -u $forward"
+  if [ -z "$exclude" ]; then
+    exclude="all"
+  else
+    exclude="~${exclude//,/,~}"
   fi
 
+  PASST_OPTS+=" -t $exclude"
+  PASST_OPTS+=" -u $exclude"
   PASST_OPTS+=" -H $VM_NET_HOST"
   PASST_OPTS+=" -M $GATEWAY_MAC"
   PASST_OPTS+=" -P /var/run/passt.pid"
@@ -331,7 +327,7 @@ configurePasst() {
   fi
 
   if [[ "$PASST_DEBUG" == [Yy1]* ]]; then
-    tail -fn +0 "$log" --pid=$$ &
+    tail -fn +0 "$log" &
   else
     if [[ "$DEBUG" == [Yy1]* ]]; then
       [ -f "$log" ] && cat "$log" && echo ""
@@ -506,24 +502,14 @@ closeBridge() {
   return 0
 }
 
-closeWeb() {
+closeNetwork() {
+
+  if [[ "${WEB:-}" != [Nn]* && "$DHCP" == [Yy1]* ]]; then
 
     # Shutdown nginx
     nginx -s stop 2> /dev/null
     fWait "nginx"
 
-  # Shutdown websocket
-  local pid="/var/run/websocketd.pid"
-  [ -s "$pid" ] && pKill "$(<"$pid")"
-  rm -f "$pid"
-
-  return 0
-}
-
-closeNetwork() {
-
-  if [[ "${WEB:-}" != [Nn]* && "$DHCP" == [Yy1]* ]]; then
-    closeWeb
   fi
 
   [[ "$NETWORK" == [Nn]* ]] && return 0
@@ -566,8 +552,8 @@ checkOS() {
   local if="macvlan"
   kernel=$(uname -a)
 
-  [[ "${kernel,,}" == *"darwin"* ]] && os="$ENGINE Desktop for macOS"
-  [[ "${kernel,,}" == *"microsoft"* ]] && os="$ENGINE Desktop for Windows"
+  [[ "${kernel,,}" == *"darwin"* ]] && os="Docker Desktop for macOS"
+  [[ "${kernel,,}" == *"microsoft"* ]] && os="Docker Desktop for Windows"
 
   if [[ "$DHCP" == [Yy1]* ]]; then
     if="macvtap"
@@ -600,17 +586,12 @@ getInfo() {
   fi
 
   GATEWAY=$(ip route list dev "$VM_NET_DEV" | awk ' /^default/ {print $3}' | head -n 1)
-  { IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1); rc=$?; } 2>/dev/null || :
-
-  if (( rc != 0 )); then
-    error "Could not determine container IP address!" && exit 26
-  fi
-
+  IP=$(ip address show dev "$VM_NET_DEV" | grep inet | awk '/inet / { print $2 }' | cut -f1 -d/ | head -n 1)
   IP6=""
+
   # shellcheck disable=SC2143
   if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
-    { IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up); rc=$?; } 2>/dev/null || :
-    (( rc != 0 )) && IP6=""
+    IP6=$(ip -6 addr show dev "$VM_NET_DEV" scope global up)
     [ -n "$IP6" ] && IP6=$(echo "$IP6" | sed -e's/^.*inet6 \([^ ]*\)\/.*$/\1/;t;d' | head -n 1)
   fi
 
@@ -657,6 +638,11 @@ getInfo() {
   [ -z "$MTU" ] && MTU="$mtu"
   [ -z "$MTU" ] && MTU="0"
 
+  if [ "$MTU" -gt "1500" ]; then
+    [[ "$DEBUG" == [Yy1]* ]] && echo "MTU size is too large: $MTU, ignoring..."
+    MTU="0"
+  fi
+
   if [[ "${ADAPTER,,}" != "virtio-net-pci" ]]; then
     if [[ "$MTU" != "0" && "$MTU" != "1500" ]]; then
       warn "MTU size is $MTU, but cannot be set for $ADAPTER adapters!" && MTU="0"
@@ -732,19 +718,22 @@ if [[ "$IP" == "172.17."* ]]; then
   warn "your container IP starts with 172.17.* which will cause conflicts when you install the Container Manager package inside DSM!"
 fi
 
-MSG="Booting DSM instance..."
-html "$MSG"
-
 if [[ "$DHCP" == [Yy1]* ]]; then
 
   # Configure for macvtap interface
   configureDHCP || exit 20
 
+  MSG="Booting DSM instance..."
+  html "$MSG"
+
 else
 
   if [[ "${WEB:-}" != [Nn]* ]]; then
-    sleep 1.2
-    closeWeb
+
+    # Shutdown nginx
+    nginx -s stop 2> /dev/null
+    fWait "nginx"
+
   fi
 
   case "${NETWORK,,}" in
@@ -781,21 +770,16 @@ else
       if ! configureSlirp; then
         error "Failed to configure user-mode networking!"
         exit 24
+      fi
+
+      if [ -z "$USER_PORTS" ]; then
+        info "Notice: slirp networking is active, so when you want to expose ports, you will need to map them using this variable: \"USER_PORTS=5000,5001\"."
       fi ;;
 
     *)
       error "Unrecognized NETWORK value: \"$NETWORK\"" && exit 24 ;;
   esac
 
-  case "${NETWORK,,}" in
-    "passt" | "slirp" )
-
-      if [ -z "$USER_PORTS" ]; then
-        info "Notice: because user-mode networking is active, if you need to expose ports, add them to the \"USER_PORTS\" variable."
-      fi ;;
-
-  esac
-
 fi
 
 NET_OPTS+=" -device $ADAPTER,id=net0,netdev=hostnet0,romfile=,mac=$VM_NET_MAC"

src/proc.sh

@@ -3,6 +3,7 @@ set -Eeuo pipefail
 
 # Docker environment variables
 
+: "${KVM:="Y"}"
 : "${HOST_CPU:=""}"
 : "${CPU_FLAGS:=""}"
 : "${CPU_MODEL:=""}"
@@ -25,7 +26,52 @@ else
   esac
 fi
 
+if [[ "$KVM" == [Nn]* ]]; then
+  warn "KVM acceleration is disabled, this will cause the machine to run about 10 times slower!"
+else
+  if [[ "${ARCH,,}" != "amd64" ]]; then
+    KVM="N"
+    warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for x64 instructions, so the machine will run about 10 times slower."
+  fi
+fi
+
+if [[ "$KVM" != [Nn]* ]]; then
+
+  KVM_ERR=""
+
+  if [ ! -e /dev/kvm ]; then
+    KVM_ERR="(/dev/kvm is missing)"
+  else
+    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
+      KVM_ERR="(/dev/kvm is unwriteable)"
+    else
       flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
+      if ! grep -qw "vmx\|svm" <<< "$flags"; then
+        KVM_ERR="(not enabled in BIOS)"
+      fi
+    fi
+  fi
+
+  if [ -n "$KVM_ERR" ]; then
+    KVM="N"
+    if [[ "$OSTYPE" =~ ^darwin ]]; then
+      warn "you are using macOS which has no KVM support, so the machine will run about 10 times slower."
+    else
+      kernel=$(uname -a)
+      case "${kernel,,}" in
+        *"microsoft"* )
+          error "Please bind '/dev/kvm' as a volume in the optional container settings when using Docker Desktop." ;;
+        *"synology"* )
+          error "Please make sure that Synology VMM (Virtual Machine Manager) is installed and that '/dev/kvm' is binded to this container." ;;
+        *)
+          error "KVM acceleration is not available $KVM_ERR, this will cause the machine to run about 10 times slower."
+          error "See the FAQ for possible causes, or disable acceleration by adding the \"KVM=N\" variable (not recommended)." ;;
+      esac
+      [[ "$DEBUG" != [Yy1]* ]] && exit 88
+    fi
+  fi
+
+fi
 
 if [[ "$KVM" != [Nn]* ]]; then
 

src/progress.sh

@@ -25,7 +25,7 @@ do
   if [ -s "$file" ]; then
     bytes=$(du -sb "$file" | cut -f1)
     if (( bytes > 1000 )); then
-      if [ -z "$total" ] || [[ "$total" == "0" ]] || [ "$bytes" -gt "$total" ]; then
+      if [ -z "$total" ] || [[ "$total" == "0" ]]; then
         size=$(numfmt --to=iec --suffix=B "$bytes" | sed -r 's/([A-Z])/ \1/')
       else
         size="$(echo "$bytes" "$total" | awk '{printf "%.1f", $1 * 100 / $2}')"

src/reset.sh

@@ -9,8 +9,7 @@ trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 
 # Docker environment variables
 
-: "${TZ:=""}"              # System timezone
-: "${KVM:="Y"}"            # KVM acceleration
+: "${TZ:=""}"              # System local timezone
 : "${DEBUG:="N"}"          # Disable debugging mode
 : "${COUNTRY:=""}"         # Country code for mirror
 : "${CONSOLE:="N"}"        # Disable console mode
@@ -142,63 +141,6 @@ if [[ "$RAM_CHECK" != [Nn]* ]] && (( (RAM_WANTED + RAM_SPARE) > RAM_AVAIL )); th
   info "$msg"
 fi
 
-# Check KVM support
-
-if [[ "${PLATFORM,,}" == "x64" ]]; then
-  TARGET="amd64"
-else
-  TARGET="arm64"
-fi
-
-if [[ "$KVM" == [Nn]* ]]; then
-  warn "KVM acceleration is disabled, this will cause the machine to run about 10 times slower!"
-else
-  if [[ "${ARCH,,}" != "$TARGET" ]]; then
-    KVM="N"
-    warn "your CPU architecture is ${ARCH^^} and cannot provide KVM acceleration for ${PLATFORM^^} instructions, so the machine will run about 10 times slower."
-  fi
-fi
-
-if [[ "$KVM" != [Nn]* ]]; then
-
-  KVM_ERR=""
-
-  if [ ! -e /dev/kvm ]; then
-    KVM_ERR="(/dev/kvm is missing)"
-  else
-    if ! sh -c 'echo -n > /dev/kvm' &> /dev/null; then
-      KVM_ERR="(/dev/kvm is unwriteable)"
-    else
-      if [[ "${PLATFORM,,}" == "x64" ]]; then
-        flags=$(sed -ne '/^flags/s/^.*: //p' /proc/cpuinfo)
-        if ! grep -qw "vmx\|svm" <<< "$flags"; then
-          KVM_ERR="(not enabled in BIOS)"
-        fi
-      fi
-    fi
-  fi
-
-  if [ -n "$KVM_ERR" ]; then
-    KVM="N"
-    if [[ "$OSTYPE" =~ ^darwin ]]; then
-      warn "you are using macOS which has no KVM support, so the machine will run about 10 times slower."
-    else
-      kernel=$(uname -a)
-      case "${kernel,,}" in
-        *"microsoft"* )
-          error "Please bind '/dev/kvm' as a volume in the optional container settings when using Docker Desktop." ;;
-        *"synology"* )
-          error "Please make sure that Synology VMM (Virtual Machine Manager) is installed and that '/dev/kvm' is binded to this container." ;;
-        *)
-          error "KVM acceleration is not available $KVM_ERR, this will cause the machine to run about 10 times slower."
-          error "See the FAQ for possible causes, or disable acceleration by adding the \"KVM=N\" variable (not recommended)." ;;
-      esac
-      [[ "$DEBUG" != [Yy1]* ]] && exit 88
-    fi
-  fi
-
-fi
-
 # Cleanup files
 rm -f /run/shm/qemu.*
 rm -f /run/shm/dsm.url
@@ -207,4 +149,92 @@ rm -f /run/shm/dsm.url
 rm -rf /tmp/dsm
 rm -rf "$STORAGE/tmp"
 
+getCountry() {
+  local url=$1
+  local query=$2
+  local rc json result
+
+  { json=$(curl -m 5 -H "Accept: application/json" -sfk "$url"); rc=$?; } || :
+  (( rc != 0 )) && return 0
+
+  { result=$(echo "$json" | jq -r "$query" 2> /dev/null); rc=$?; } || :
+  (( rc != 0 )) && return 0
+
+  [[ ${#result} -ne 2 ]] && return 0
+  [[ "${result^^}" == "XX" ]] && return 0
+
+  COUNTRY="${result^^}"
+
+  return 0
+}
+
+setCountry() {
+
+  [[ "${TZ,,}" == "asia/harbin" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/beijing" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/urumqi" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/kashgar" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/shanghai" ]] && COUNTRY="CN"
+  [[ "${TZ,,}" == "asia/chongqing" ]] && COUNTRY="CN"
+
+  [ -z "$COUNTRY" ] && getCountry "https://api.ipapi.is" ".location.country_code"
+  [ -z "$COUNTRY" ] && getCountry "https://ifconfig.co/json" ".country_iso"
+  [ -z "$COUNTRY" ] && getCountry "https://api.ip2location.io" ".country_code"
+  [ -z "$COUNTRY" ] && getCountry "https://ipinfo.io/json" ".country"
+  [ -z "$COUNTRY" ] && getCountry "https://api.ipquery.io/?format=json" ".location.country_code" 
+  [ -z "$COUNTRY" ] && getCountry "https://api.myip.com" ".cc"
+
+  return 0
+}
+
+addPackage() {
+  local pkg=$1
+  local desc=$2
+
+  if apt-mark showinstall | grep -qx "$pkg"; then
+    return 0
+  fi
+
+  MSG="Installing $desc..."
+  info "$MSG" && html "$MSG"
+
+  [ -z "$COUNTRY" ] && setCountry
+
+  if [[ "${COUNTRY^^}" == "CN" ]]; then
+    sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources
+  fi
+
+  DEBIAN_FRONTEND=noninteractive apt-get -qq update
+  DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends -y install "$pkg" > /dev/null
+
+  return 0
+}
+
+: "${COM_PORT:="2210"}"    # Comm port
+: "${MON_PORT:="7100"}"    # Monitor port
+: "${WEB_PORT:="5000"}"    # Webserver port
+: "${CHR_PORT:="12345"}"   # Character port
+
+cp -r /var/www/* /run/shm
+html "Starting $APP for $ENGINE..."
+
+if [[ "${WEB:-}" != [Nn]* ]]; then
+
+  mkdir -p /etc/nginx/sites-enabled
+  cp /etc/nginx/default.conf /etc/nginx/sites-enabled/web.conf
+
+  sed -i "s/listen 5000 default_server;/listen $WEB_PORT default_server;/g" /etc/nginx/sites-enabled/web.conf
+  
+  # shellcheck disable=SC2143
+  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
+
+    sed -i "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
+
+  fi
+  
+  # Start webserver
+  nginx -e stderr
+
+fi
+
 return 0

src/server.sh

@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-: "${COM_PORT:="2210"}"    # Comm port
-: "${MON_PORT:="7100"}"    # Monitor port
-: "${WEB_PORT:="5000"}"    # Webserver port
-: "${CHR_PORT:="12345"}"   # Character port
-: "${WSD_PORT:="8004"}"    # Websockets port
-
-cp -r /var/www/* /run/shm
-rm -f /var/run/websocketd.pid
-
-html "Starting $APP for $ENGINE..."
-
-if [[ "${WEB:-}" != [Nn]* ]]; then
-
-  mkdir -p /etc/nginx/sites-enabled
-  cp /etc/nginx/default.conf /etc/nginx/sites-enabled/web.conf
-
-  sed -i "s/listen 5000 default_server;/listen $WEB_PORT default_server;/g" /etc/nginx/sites-enabled/web.conf
-  sed -i "s/proxy_pass http:\/\/127.0.0.1:8004\/;/proxy_pass http:\/\/127.0.0.1:$WSD_PORT\/;/g" /etc/nginx/sites-enabled/web.conf
-
-  # shellcheck disable=SC2143
-  if [ -f /proc/net/if_inet6 ] && [ -n "$(ifconfig -a | grep inet6)" ]; then
-
-    sed -i "s/listen $WEB_PORT default_server;/listen [::]:$WEB_PORT default_server ipv6only=off;/g" /etc/nginx/sites-enabled/web.conf
-
-  fi
-
-  # Start webserver
-  nginx -e stderr
-
-  # Start websocket server
-  websocketd --address 127.0.0.1 --port="$WSD_PORT" /run/socket.sh >/var/log/websocketd.log &
-  echo "$!" > /var/run/websocketd.pid
-
-fi
-
-return 0

src/socket.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -Eeuo pipefail
-
-path="/run/shm/msg.html"
-
-if [ -f "$path" ] && [ -s "$path" ]; then
-  echo -n "s: " && cat "$path"
-fi
-
-inotifywait -m "$path" |
-  while read -r fp event fn; do
-    case "${event,,}" in
-      "modify"* ) echo -n "s: " && cat "$path" ;;
-      "delete_self" ) echo "c: vnc" ;;
-    esac    
-  done

src/start.sh

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-# You can override this hook to execute a script before startup!
-
-return 0
+# Override this placeholder file using a Docker bind to execute a script during startup!

src/utils.sh

@@ -159,65 +159,4 @@ hasDisk() {
   return 1
 }
 
-getCountry() {
-  local url=$1
-  local query=$2
-  local rc json result
-
-  { json=$(curl -m 5 -H "Accept: application/json" -sfk "$url"); rc=$?; } || :
-  (( rc != 0 )) && return 0
-
-  { result=$(echo "$json" | jq -r "$query" 2> /dev/null); rc=$?; } || :
-  (( rc != 0 )) && return 0
-
-  [[ ${#result} -ne 2 ]] && return 0
-  [[ "${result^^}" == "XX" ]] && return 0
-
-  COUNTRY="${result^^}"
-
-  return 0
-}
-
-setCountry() {
-
-  [[ "${TZ,,}" == "asia/harbin" ]] && COUNTRY="CN"
-  [[ "${TZ,,}" == "asia/beijing" ]] && COUNTRY="CN"
-  [[ "${TZ,,}" == "asia/urumqi" ]] && COUNTRY="CN"
-  [[ "${TZ,,}" == "asia/kashgar" ]] && COUNTRY="CN"
-  [[ "${TZ,,}" == "asia/shanghai" ]] && COUNTRY="CN"
-  [[ "${TZ,,}" == "asia/chongqing" ]] && COUNTRY="CN"
-
-  [ -z "$COUNTRY" ] && getCountry "https://api.ipapi.is" ".location.country_code"
-  [ -z "$COUNTRY" ] && getCountry "https://ifconfig.co/json" ".country_iso"
-  [ -z "$COUNTRY" ] && getCountry "https://api.ip2location.io" ".country_code"
-  [ -z "$COUNTRY" ] && getCountry "https://ipinfo.io/json" ".country"
-  [ -z "$COUNTRY" ] && getCountry "https://api.ipquery.io/?format=json" ".location.country_code" 
-  [ -z "$COUNTRY" ] && getCountry "https://api.myip.com" ".cc"
-
-  return 0
-}
-
-addPackage() {
-  local pkg=$1
-  local desc=$2
-
-  if apt-mark showinstall | grep -qx "$pkg"; then
-    return 0
-  fi
-
-  MSG="Installing $desc..."
-  info "$MSG" && html "$MSG"
-
-  [ -z "$COUNTRY" ] && setCountry
-
-  if [[ "${COUNTRY^^}" == "CN" ]]; then
-    sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources
-  fi
-
-  DEBIAN_FRONTEND=noninteractive apt-get -qq update
-  DEBIAN_FRONTEND=noninteractive apt-get -qq --no-install-recommends -y install "$pkg" > /dev/null
-
-  return 0
-}
-
 return 0

web/conf/nginx.conf

@@ -27,18 +27,4 @@ server {
       index index.html;
 
     }
-
-    location /status {
-
-      proxy_http_version 1.1;
-
-      proxy_set_header Connection 'upgrade';
-      proxy_set_header Upgrade $http_upgrade;
-
-      proxy_buffering off;
-      proxy_read_timeout 3600s;
-      proxy_send_timeout 3600s;
-
-      proxy_pass http://127.0.0.1:8004/;
-    }    
 }

web/js/script.js

@@ -1,5 +1,4 @@
 var request;
-var booting = false;
 var interval = 1000;
 
 function getInfo() {
@@ -7,6 +6,7 @@ function getInfo() {
     var url = "msg.html";
 
     try {
+
         if (window.XMLHttpRequest) {
             request = new XMLHttpRequest();
         } else {
@@ -18,49 +18,22 @@ function getInfo() {
         request.send();
 
     } catch (e) {
-        setError("Error: " + e.message);
+        var err = "Error: " + e.message;
+        console.log(err);
+        setError(err);
     }
 }
 
-function getURL() {
-
-    var protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-    var path = window.location.pathname.replace(/[^/]*$/, '').replace(/\/$/, '');
-
-    return protocol + "//" + window.location.host + path;
-}
-
-function processMsg(msg) {
-
-    if (msg.toLowerCase().indexOf("href=") !== -1) {
-        var div = document.createElement("div");
-        div.innerHTML = msg;
-        var url = div.querySelector("a").href;
-        setTimeout(() => {
-            window.location.assign(url);
-        }, 3000);
-    }
-
-    setInfo(msg);
-    return true;
-}
-
 function processInfo() {
     try {
-
         if (request.readyState != 4) {
             return true;
         }
 
         var msg = request.responseText;
         if (msg == null || msg.length == 0) {
-
-            if (booting) {
+            setInfo("Booting DSM instance", true);
             schedule();
-                return true;
-            }
-
-            window.location.reload();
             return false;
         }
 
@@ -70,11 +43,20 @@ function processInfo() {
             if (msg.toLowerCase().indexOf("<html>") !== -1) {
                 notFound = true;
             } else {
-                processMsg(msg);
-                if (msg.toLowerCase().indexOf("href=") == -1) {
-                    schedule();
-                }
+                if (msg.toLowerCase().indexOf("href=") !== -1) {
+                    var div = document.createElement("div");
+                    div.innerHTML = msg;
+                    var url = div.querySelector("a").href;
+                    setTimeout(() => {
+                        window.location.assign(url);
+                    }, 3000);
+                    setInfo(msg);
                     return true;
+                } else {
+                    setInfo(msg);
+                    schedule();
+                    return true;
+                }
             }
         }
 
@@ -85,60 +67,44 @@ function processInfo() {
         }
 
         setError("Error: Received statuscode " + request.status);
+        schedule();
         return false;
 
     } catch (e) {
-        setError("Error: " + e.message);
+        var err = "Error: " + e.message;
+        console.log(err);
+        setError(err);
         return false;
     }
 }
 
-function extractContent(s) {
-    var span = document.createElement('span');
-    span.innerHTML = s;
-    return span.textContent || span.innerText;
-};
-
 function setInfo(msg, loading, error) {
-    try {
 
+    try {
         if (msg == null || msg.length == 0) {
             return false;
         }
 
-        if (msg.includes("Booting ")) {
-            booting = true;
-        }
-
-        var el = document.getElementById("info");
-
-        if (el.innerText == msg || el.innerHTML == msg) {
-            return true;
-        }
-
-        var spin = document.getElementById("spinner");
+        var el = document.getElementById("spinner");
 
         error = !!error;
         if (!error) {
-            spin.style.visibility = 'visible';
+            el.style.visibility = 'visible';
         } else {
-            spin.style.visibility = 'hidden';
+            el.style.visibility = 'hidden';
         }
 
-        var p = "<p class=\"loading\">";
         loading = !!loading;
         if (loading) {
-            msg = p + msg + "</p>";
+            msg = "<p class=\"loading\">" + msg + "</p>";
         }
 
-        if (msg.includes(p)) {
-            if (el.innerHTML.includes(p)) {
-                el.getElementsByClassName('loading')[0].textContent = extractContent(msg);
-                return true;
-            }
-        }
+        el = document.getElementById("info");
 
+        if (el.innerHTML != msg) {
             el.innerHTML = msg;
+        }
+
         return true;
 
     } catch (e) {
@@ -148,7 +114,6 @@ function setInfo(msg, loading, error) {
 }
 
 function setError(text) {
-    console.warn(text);
     return setInfo(text, false, true);
 }
 
@@ -158,47 +123,8 @@ function schedule() {
 
 function reload() {
     setTimeout(() => {
-        window.location.reload();
+        document.location.reload();
     }, 3000);
 }
 
-function connect() {
-
-    var wsUrl = getURL() + "/status";
-    var ws = new WebSocket(wsUrl);
-
-    ws.onmessage = function(e) {
-
-        var pos = e.data.indexOf(":");
-        var cmd = e.data.substring(0, pos);
-        var msg = e.data.substring(pos + 2);
-
-        switch (cmd) {
-            case "s":
-                processMsg(msg);
-                break;
-            case "e":
-                setError(msg);
-                break;
-            default:
-                console.warn("Unknown event: " + cmd);
-                break;
-        }
-    };
-
-    ws.onclose = function(e) {
-        setTimeout(function() {
-            connect();
-        }, interval);
-    };
-
-    ws.onerror = function(e) {
-        ws.close();
-        if (!booting) {
-            window.location.reload();
-        }
-    };
-}
-
 schedule();
-connect();