Unverified Commit ce0c7959 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Use websocket instead of long polling (#880)

parent 63632433

Dockerfile

+3 −1
Original line number Diff line number Diff line
@@ -28,14 +28,16 @@ RUN set -eu && \ 
        ethtool \

        iptables \

        iproute2 \

        apt-utils \

        dnsmasq \

        xz-utils \

        apt-utils \

        net-tools \

        e2fsprogs \

        qemu-utils \

        websocketd \

        iputils-ping \

        genisoimage \

        inotify-tools \

        netcat-openbsd \

        ca-certificates \

        qemu-system-x86 && \

src/display.sh

+2 −0
Original line number Diff line number Diff line
@@ -70,3 +70,5 @@ fi 


addPackage "xserver-xorg-video-intel" "Intel GPU drivers"

addPackage "qemu-system-modules-opengl" "OpenGL module"



return 0

src/entry.sh

+2 −1
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ set -Eeuo pipefail 


cd /run



. start.sh      # Placeholder

. start.sh      # Startup hook

. utils.sh      # Load functions

. reset.sh      # Initialize system

. server.sh     # Start webserver

. define.sh     # Define images

. install.sh    # Download image

. disk.sh       # Initialize disks

src/install.sh

+2 −0
Original line number Diff line number Diff line
@@ -456,3 +456,5 @@ dst="$STORAGE/${base%.*}.$target_ext" 
base=$(basename "$dst")

detectType "$STORAGE/$base" && return 0

error "Cannot convert file \"${base}\"" && exit 36



return 0

src/network.sh

+8 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ configureDNS() { 
  fi



  if [[ "$DNSMASQ_DEBUG" == [Yy1]* ]]; then

    tail -fn +0 "$log" &

    tail -fn +0 "$log" --pid=$$ &

  fi



  return 0
@@ -229,6 +229,7 @@ getHostPorts() { 


  if [[ "${WEB:-}" != [Nn]* ]]; then

    [ -z "$list" ] && list="$WEB_PORT" || list+=",$WEB_PORT"

    [ -z "$list" ] && list="$WSD_PORT" || list+=",$WSD_PORT"

  fi



  if [[ "${NETWORK,,}" == "passt" ]]; then
@@ -369,7 +370,7 @@ configurePasst() { 
  fi



  if [[ "$PASST_DEBUG" == [Yy1]* ]]; then

    tail -fn +0 "$log" &

    tail -fn +0 "$log" --pid=$$ &

  else

    if [[ "$DEBUG" == [Yy1]* ]]; then

      [ -f "$log" ] && cat "$log" && echo ""
@@ -555,6 +556,11 @@ closeNetwork() { 
    nginx -s stop 2> /dev/null

    fWait "nginx"



     # Shutdown websocket

     local pid="/var/run/websocketd.pid"

     [ -s "$pid" ] && pKill "$(<"$pid")"

     rm -f "$pid"

  

  fi



  [[ "$NETWORK" == [Nn]* ]] && return 0