screenshare POC.

.docker/base/Dockerfile

@@ -1,7 +1,7 @@
 #
 # STAGE 1: SERVER
 #
-FROM golang:1.20-bullseye as server
+FROM golang:1.19-bullseye as server
 WORKDIR /src
 
 #
@@ -27,7 +27,7 @@ RUN set -eux; apt-get update; \
 #
 # build server
 COPY server/ .
-RUN ./build
+RUN go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
 
 #
 # STAGE 2: CLIENT
@@ -79,9 +79,7 @@ RUN set -eux; \
         # Japanese fonts
         fonts-takao-mincho \
         # Chinese fonts
-        fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
+        fonts-wqy-zenhei; \
-        # Korean fonts
-        fonts-wqy-microhei; \
     #
     # create a non-root user
     groupadd --gid $USER_GID $USERNAME; \
@@ -90,18 +88,19 @@ RUN set -eux; \
     adduser $USERNAME video; \
     adduser $USERNAME pulse; \
     #
+    # setup pulseaudio
+    mkdir -p /home/$USERNAME/.config/pulse/; \
+    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
+    #
     # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
     mkdir /tmp/.X11-unix; \
     chmod 1777 /tmp/.X11-unix; \
     chown $USERNAME /tmp/.X11-unix/; \
     #
     # make directories for neko
-    mkdir -p /etc/neko /var/www /var/log/neko \
+    mkdir -p /etc/neko /var/www /var/log/neko; \
-        /tmp/runtime-$USERNAME \
-        /home/$USERNAME/.config/pulse  \
-        /home/$USERNAME/.local/share/xorg; \
     chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
+    chown $USERNAME /var/log/neko/; \
     chown -R $USERNAME:$USERNAME /home/$USERNAME; \
     #
     # clean up
@@ -119,8 +118,6 @@ COPY .docker/base/xorg.conf /etc/neko/xorg.conf
 # set default envs
 ENV USER=$USERNAME
 ENV DISPLAY=:99.0
-ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
-ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
 ENV NEKO_PASSWORD=neko
 ENV NEKO_PASSWORD_ADMIN=admin
 ENV NEKO_BIND=:8080

.docker/base/Dockerfile.arm

@@ -1,7 +1,7 @@
 #
 # STAGE 1: SERVER
 #
-FROM golang:1.20-bullseye as server
+FROM golang:1.19-bullseye as server
 WORKDIR /src
 
 #
@@ -27,32 +27,29 @@ RUN set -eux; apt-get update; \
 #
 # build server
 COPY server/ .
-RUN ./build
+RUN go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
 
 #
 # STAGE 2: CLIENT
 #
+FROM node:18-bullseye-slim as client
+
+# install dependencies
+RUN set -eux; apt-get update; \
+    apt-get install -y --no-install-recommends python2 build-essential
+
+WORKDIR /src
+
 #
-# Because client builds fail in Github Actions, therefor we build it outside of Docker.
+# install dependencies
-#
+COPY client/package*.json ./
-# FROM node:18-bullseye-slim as client
+RUN npm install
-# 
+
-# # install dependencies
-# RUN set -eux; apt-get update; \
-#     apt-get install -y --no-install-recommends python2 build-essential
-# 
-# WORKDIR /src
-# 
-# #
-# # install dependencies
-# COPY client/package*.json ./
-# RUN npm install
-# 
-# #
-# # build client
-# COPY client/ .
-# RUN npm run build
 #
+# build client
+COPY client/ .
+RUN npm run build
+
 #
 # STAGE 3: RUNTIME
 #
@@ -88,9 +85,7 @@ RUN set -eux; \
         # Japanese fonts
         fonts-takao-mincho \
         # Chinese fonts
-        fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
+        fonts-wqy-zenhei; \
-        # Korean fonts
-        fonts-wqy-microhei; \
     #
     # create a non-root user
     groupadd --gid $USER_GID $USERNAME; \
@@ -99,18 +94,19 @@ RUN set -eux; \
     adduser $USERNAME video; \
     adduser $USERNAME pulse; \
     #
+    # setup pulseaudio
+    mkdir -p /home/$USERNAME/.config/pulse/; \
+    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
+    #
     # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
     mkdir /tmp/.X11-unix; \
     chmod 1777 /tmp/.X11-unix; \
     chown $USERNAME /tmp/.X11-unix/; \
     #
     # make directories for neko
-    mkdir -p /etc/neko /var/www /var/log/neko \
+    mkdir -p /etc/neko /var/www /var/log/neko; \
-        /tmp/runtime-$USERNAME \
-        /home/$USERNAME/.config/pulse  \
-        /home/$USERNAME/.local/share/xorg; \
     chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
+    chown $USERNAME /var/log/neko/; \
     chown -R $USERNAME:$USERNAME /home/$USERNAME; \
     #
     # clean up
@@ -128,8 +124,6 @@ COPY .docker/base/xorg.conf /etc/neko/xorg.conf
 # set default envs
 ENV USER=$USERNAME
 ENV DISPLAY=:99.0
-ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
-ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
 ENV NEKO_PASSWORD=neko
 ENV NEKO_PASSWORD_ADMIN=admin
 ENV NEKO_BIND=:8080
@@ -137,8 +131,7 @@ ENV NEKO_BIND=:8080
 #
 # copy static files from previous stages
 COPY --from=server /src/bin/neko /usr/bin/neko
-# COPY --from=client /src/dist/ /var/www
+COPY --from=client /src/dist/ /var/www
-COPY client/dist/ /var/www
 
 HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
     CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1

.docker/base/Dockerfile.intel

@@ -1,7 +1,7 @@
 #
 # STAGE 1: SERVER
 #
-FROM golang:1.20-bullseye as server
+FROM golang:1.19-bullseye as server
 WORKDIR /src
 
 #
@@ -27,7 +27,7 @@ RUN set -eux; apt-get update; \
 #
 # build server
 COPY server/ .
-RUN ./build
+RUN go get -v -t -d . && go build -o bin/neko cmd/neko/main.go
 
 #
 # STAGE 2: CLIENT
@@ -88,9 +88,7 @@ RUN set -eux; \
         # Japanese fonts
         fonts-takao-mincho \
         # Chinese fonts
-        fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
+        fonts-wqy-zenhei; \
-        # Korean fonts
-        fonts-wqy-microhei; \
     #
     # create a non-root user
     groupadd --gid $USER_GID $USERNAME; \
@@ -99,18 +97,19 @@ RUN set -eux; \
     adduser $USERNAME video; \
     adduser $USERNAME pulse; \
     #
+    # setup pulseaudio
+    mkdir -p /home/$USERNAME/.config/pulse/; \
+    echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \
+    #
     # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
     mkdir /tmp/.X11-unix; \
     chmod 1777 /tmp/.X11-unix; \
     chown $USERNAME /tmp/.X11-unix/; \
     #
     # make directories for neko
-    mkdir -p /etc/neko /var/www /var/log/neko \
+    mkdir -p /etc/neko /var/www /var/log/neko; \
-        /tmp/runtime-$USERNAME \
-        /home/$USERNAME/.config/pulse  \
-        /home/$USERNAME/.local/share/xorg; \
     chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
+    chown $USERNAME /var/log/neko/; \
     chown -R $USERNAME:$USERNAME /home/$USERNAME; \
     #
     # clean up
@@ -129,12 +128,9 @@ COPY .docker/base/intel/add-render-group.sh /usr/bin/add-render-group.sh
 # set default envs
 ENV USER=$USERNAME
 ENV DISPLAY=:99.0
-ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
-ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
 ENV NEKO_PASSWORD=neko
 ENV NEKO_PASSWORD_ADMIN=admin
 ENV NEKO_BIND=:8080
-ENV NEKO_HWENC=VAAPI
 ENV RENDER_GID=
 
 #

.docker/base/Dockerfile.nvidia

@@ -1,294 +0,0 @@
-ARG UBUNTU_RELEASE=20.04
-ARG CUDA_VERSION=11.4.3
-ARG VIRTUALGL_VERSION=3.1
-ARG GSTREAMER_VERSION=1.20
-
-#
-# STAGE 0: Build gstreamer with nvidia plugins.
-#
-FROM ubuntu:${UBUNTU_RELEASE} AS gstreamer
-ARG GSTREAMER_VERSION
-
-#
-# install dependencies
-ENV DEBIAN_FRONTEND=noninteractive
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        # Install essentials
-        curl build-essential ca-certificates git \
-        # Install pip and ninja
-        python3-pip python-gi-dev ninja-build \
-        # Install build deps
-        autopoint autoconf automake autotools-dev libtool gettext bison flex gtk-doc-tools \
-        # Install libraries
-        librtmp-dev \
-        libvo-aacenc-dev \
-        libtool-bin \
-        libgtk2.0-dev \
-        libgl1-mesa-dev \
-        libopus-dev \
-        libpulse-dev \
-        libssl-dev \
-        libx264-dev \
-        libvpx-dev; \
-    # Install meson
-    pip3 install meson; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# build gstreamer
-RUN set -eux; \
-    git clone --depth 1 --branch $GSTREAMER_VERSION https://gitlab.freedesktop.org/gstreamer/gstreamer.git /gstreamer/src; \
-    cd /gstreamer/src; \
-    mkdir -p /opt/gstreamer; \
-    meson --prefix /opt/gstreamer \
-        -Dgpl=enabled \
-        -Dugly=enabled \
-        -Dgst-plugins-ugly:x264=enabled \
-        build; \
-    ninja -C build; \
-    meson install -C build;
-
-#
-# STAGE 1: SERVER
-#
-FROM golang:1.20-bullseye as server
-WORKDIR /src
-
-#
-# install dependencies
-RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends git cmake make libx11-dev libxrandr-dev libxtst-dev \
-    libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly; \
-    #
-    # install libclipboard
-    set -eux; \
-    cd /tmp; \
-    git clone --depth=1 https://github.com/jtanx/libclipboard; \
-    cd libclipboard; \
-    cmake .; \
-    make -j4; \
-    make install; \
-    rm -rf /tmp/libclipboard; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# build server
-COPY server/ .
-RUN ./build
-
-#
-# STAGE 2: CLIENT
-#
-FROM node:18-bullseye-slim as client
-WORKDIR /src
-
-#
-# install dependencies
-COPY client/package*.json ./
-RUN npm install
-
-#
-# build client
-COPY client/ .
-RUN npm run build
-
-#
-# STAGE 3: RUNTIME
-#
-FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu${UBUNTU_RELEASE} as runtime
-
-ARG UBUNTU_RELEASE
-ARG VIRTUALGL_VERSION
-
-# Make all NVIDIA GPUs visible by default
-ENV NVIDIA_VISIBLE_DEVICES all
-# All NVIDIA driver capabilities should preferably be used, check `NVIDIA_DRIVER_CAPABILITIES` inside the container if things do not work
-ENV NVIDIA_DRIVER_CAPABILITIES all
-
-#
-# set vgl-display to headless 3d gpu card/// correct values are egl[n] or /dev/dri/card0:if this is passed into container
-ENV VGL_DISPLAY egl
-
-#
-# avoid warnings by switching to noninteractive
-ENV DEBIAN_FRONTEND=noninteractive
-
-#
-# set custom user
-ARG USERNAME=neko
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-RUN set -eux; \
-    dpkg --add-architecture i386; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        # opengl base: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/base/Dockerfile
-        libxau6 libxau6:i386 \
-        libxdmcp6 libxdmcp6:i386 \
-        libxcb1 libxcb1:i386 \
-        libxext6 libxext6:i386 \
-        libx11-6 libx11-6:i386 \
-        # opengl runtime: https://gitlab.com/nvidia/container-images/opengl/-/blob/ubuntu20.04/glvnd/runtime/Dockerfile
-        libglvnd0 libglvnd0:i386 \
-        libgl1 libgl1:i386 \
-        libglx0 libglx0:i386 \
-        libegl1 libegl1:i386 \
-        libgles2 libgles2:i386 \
-        # hardware accleration utilities
-        libglu1 libglu1:i386 \
-        libvulkan-dev libvulkan-dev:i386 \
-        mesa-utils mesa-utils-extra \
-        mesa-va-drivers mesa-vulkan-drivers \
-        vainfo vdpauinfo; \
-    #
-    # install vulkan-utils or vulkan-tools depending on ubuntu release
-    if [ "${UBUNTU_RELEASE}" = "18.04" ]; then \
-        apt-get install -y --no-install-recommends vulkan-utils; \
-    else \
-        apt-get install -y --no-install-recommends vulkan-tools; \
-    fi; \
-    #
-    # create symlink for libnvrtc.so (needed for cudaconvert)
-    find /usr/local/cuda/lib64/ -maxdepth 1 -type l -name "*libnvrtc.so.*" -exec sh -c 'ln -sf {} /usr/local/cuda/lib64/libnvrtc.so' \;; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# add cuda to ld path, for gstreamer cuda plugins
-ENV LD_LIBRARY_PATH="/usr/lib/x86_64-linux-gnu:/usr/lib/i386-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}:/usr/local/cuda/lib:/usr/local/cuda/lib64"
-
-RUN set -eux; \
-    apt-get update; \
-    #
-    # install dependencies
-    apt-get install -y --no-install-recommends wget ca-certificates supervisor; \
-    apt-get install -y --no-install-recommends pulseaudio dbus-x11 xserver-xorg-video-dummy; \
-    apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx6 libx264-155 libvo-aacenc0 librtmp1; \
-    apt-get install -y --no-install-recommends libgtk-3-bin software-properties-common cabextract aptitude vim curl; \
-    #
-    # install fonts
-    apt-get install -y --no-install-recommends \
-        # Google emojis
-        fonts-noto-color-emoji \
-        # Japanese fonts
-        fonts-takao-mincho \
-        # Chinese fonts
-        fonts-wqy-zenhei xfonts-intl-chinese xfonts-wqy \
-        # Korean fonts
-        fonts-wqy-microhei; \
-    #
-    # create a non-root user
-    groupadd --gid $USER_GID $USERNAME; \
-    useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \
-    adduser $USERNAME audio; \
-    adduser $USERNAME video; \
-    adduser $USERNAME pulse; \
-    #
-    # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476
-    mkdir /tmp/.X11-unix; \
-    chmod 1777 /tmp/.X11-unix; \
-    chown $USERNAME /tmp/.X11-unix/; \
-    #
-    # make directories for neko
-    mkdir -p /etc/neko /var/www /var/log/neko \
-        /tmp/runtime-$USERNAME \
-        /home/$USERNAME/.config/pulse  \
-        /home/$USERNAME/.local/share/xorg; \
-    chmod 1777 /var/log/neko; \
-    chown $USERNAME /var/log/neko/ /tmp/runtime-$USERNAME; \
-    chown -R $USERNAME:$USERNAME /home/$USERNAME; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# configure EGL and Vulkan manually
-RUN VULKAN_API_VERSION=$(dpkg -s libvulkan1 | grep -oP 'Version: [0-9|\.]+' | grep -oP '[0-9]+(\.[0-9]+)(\.[0-9]+)') && \
-    # Configure EGL manually
-    mkdir -p /usr/share/glvnd/egl_vendor.d/ && \
-    echo "{\n\
-    \"file_format_version\" : \"1.0.0\",\n\
-    \"ICD\": {\n\
-        \"library_path\": \"libEGL_nvidia.so.0\"\n\
-    }\n\
-}" > /usr/share/glvnd/egl_vendor.d/10_nvidia.json && \
-    # Configure Vulkan manually
-    mkdir -p /etc/vulkan/icd.d/ && \
-    echo "{\n\
-    \"file_format_version\" : \"1.0.0\",\n\
-    \"ICD\": {\n\
-        \"library_path\": \"libGLX_nvidia.so.0\",\n\
-        \"api_version\" : \"${VULKAN_API_VERSION}\"\n\
-    }\n\
-}" > /etc/vulkan/icd.d/nvidia_icd.json
-
-#
-# install VirtualGL and make libraries available for preload
-RUN set -eux; \
-    apt-get update; \
-    wget "https://sourceforge.net/projects/virtualgl/files/virtualgl_${VIRTUALGL_VERSION}_amd64.deb"; \
-    wget "https://sourceforge.net/projects/virtualgl/files/virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \
-    apt-get install -y --no-install-recommends ./virtualgl_${VIRTUALGL_VERSION}_amd64.deb ./virtualgl32_${VIRTUALGL_VERSION}_amd64.deb; \
-    rm -f "virtualgl_${VIRTUALGL_VERSION}_amd64.deb" "virtualgl32_${VIRTUALGL_VERSION}_amd64.deb"; \
-    chmod u+s /usr/lib/libvglfaker.so; \
-    chmod u+s /usr/lib/libdlfaker.so; \
-    chmod u+s /usr/lib32/libvglfaker.so; \
-    chmod u+s /usr/lib32/libdlfaker.so; \
-    chmod u+s /usr/lib/i386-linux-gnu/libvglfaker.so; \
-    chmod u+s /usr/lib/i386-linux-gnu/libdlfaker.so; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*;
-
-#
-# copy config files
-COPY .docker/base/dbus /usr/bin/dbus
-COPY .docker/base/default.pa /etc/pulse/default.pa
-COPY .docker/base/supervisord.conf /etc/neko/supervisord.conf
-COPY .docker/base/xorg.conf /etc/neko/xorg.conf
-COPY .docker/base/nvidia/entrypoint.sh /bin/entrypoint.sh
-
-#
-# set default envs
-ENV USER=$USERNAME
-ENV DISPLAY=:99.0
-ENV PULSE_SERVER=unix:/tmp/pulseaudio.socket
-ENV XDG_RUNTIME_DIR=/tmp/runtime-$USERNAME
-ENV NEKO_PASSWORD=neko
-ENV NEKO_PASSWORD_ADMIN=admin
-ENV NEKO_BIND=:8080
-
-#
-# set gstreamer envs
-ENV PATH="/opt/gstreamer/bin:${PATH}"
-ENV LD_LIBRARY_PATH="/opt/gstreamer/lib/x86_64-linux-gnu${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
-ENV PKG_CONFIG_PATH="/opt/gstreamer/lib/x86_64-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}"
-
-#
-# copy gstreamer from previous stage
-COPY --from=gstreamer /opt/gstreamer /opt/gstreamer
-
-#
-# copy static files from previous stages
-COPY --from=server /src/bin/neko /usr/bin/neko
-COPY --from=client /src/dist/ /var/www
-
-HEALTHCHECK --interval=10s --timeout=5s --retries=8 \
-    CMD wget -O - http://localhost:${NEKO_BIND#*:}/health || exit 1
-
-#
-# run neko
-CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"]

.docker/base/default.pa

@@ -1,8 +1,5 @@
 #!/usr/bin/pulseaudio -nF
 
-### Create virtual output device sink
-load-module module-null-sink sink_name=audio_output sink_properties=device.description="Virtual\ Audio\ Output"
-
 # Allow pulse audio to be accessed via TCP (from localhost only), to allow other users to access the virtual devices
 load-module module-native-protocol-unix socket=/tmp/pulseaudio.socket auth-anonymous=1
 

.docker/base/nvidia/entrypoint.sh

@@ -1,12 +0,0 @@
-#!/bin/bash -e
-
-# Add VirtualGL directories to path
-export PATH="${PATH}:/opt/VirtualGL/bin"
-
-# Use VirtualGL to run wine with OpenGL if the GPU is available, otherwise use barebone wine
-if [ -n "$(nvidia-smi --query-gpu=uuid --format=csv | sed -n 2p)" ]; then
-    exec vglrun "$@"
-else
-    echo "No GPU detected"
-    exec "$@"
-fi

.docker/base/supervisord.conf

@@ -54,14 +54,3 @@ stdout_logfile=/var/log/neko/neko.log
 stdout_logfile_maxbytes=100MB
 stdout_logfile_backups=10
 redirect_stderr=true
-
-[unix_http_server]
-file=/var/run/supervisor.sock
-chmod=0700
-chown=root:root
-
-[supervisorctl]
-serverurl=unix:///var/run/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

.docker/brave/Dockerfile.nvidia

@@ -1,23 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
-FROM $BASE_IMAGE
-
-RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends apt-transport-https curl openbox; \
-    #
-    # install brave browser
-    curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg; \
-    echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main" \
-        | tee /etc/apt/sources.list.d/brave-browser-release.list; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends brave-browser; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.nvidia.conf /etc/neko/supervisord/brave.conf
-COPY --chown=neko preferences.json /home/neko/.config/brave/Default/Preferences
-COPY policies.json /etc/brave/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/brave/supervisord.conf

@@ -1,17 +1,6 @@
 [program:brave]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/brave-browser
+command=/usr/bin/brave-browser --window-position=0,0 --display=%(ENV_DISPLAY)s --user-data-dir=/home/neko/.config/brave --no-first-run --start-maximized --bwsi --force-dark-mode --disable-file-system --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/brave
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --disable-gpu
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
 stopsignal=INT
 autorestart=true
 priority=800

.docker/brave/supervisord.nvidia.conf

@@ -1,36 +0,0 @@
-[program:brave]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/bin/entrypoint.sh /usr/bin/brave-browser
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/brave
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --enable-features=Vulkan,UseSkiaRenderer,VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization
-  --ignore-gpu-blocklist
-  --disable-seccomp-filter-sandbox
-  --use-gl=egl
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
-stopsignal=INT
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/brave.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:openbox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/openbox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/build

@@ -92,21 +92,6 @@ build_intel() {
   fi
 }
 
-build_nvidia() {
-  if [ "$1" = "base" ]
-  then
-    # build nvidia base
-    docker build -t "${BUILD_IMAGE}:nvidia-base" -f base/Dockerfile.nvidia "${BASE}"
-  elif [ -f "$1/Dockerfile.nvidia" ]
-  then
-    # build dedicated nvidia image
-    docker build -t "${BUILD_IMAGE}:nvidia-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:nvidia-base" -f "$1/Dockerfile.nvidia" "$1/"
-  else
-    # try to build nvidia image with common Dockerfile
-    docker build -t "${BUILD_IMAGE}:nvidia-$1" --build-arg="BASE_IMAGE=${BUILD_IMAGE}:nvidia-base" -f "$1/Dockerfile" "$1/"
-  fi
-}
-
 case $1 in
   client) build_client;;
   server) build_server;;
@@ -117,9 +102,6 @@ case $1 in
   # build intel- images
   intel-*) build_intel "${1#intel-}";;
 
-  # build nvidia- images
-  nvidia-*) build_nvidia "${1#nvidia-}";;
-
   # build images
   *) build "$1";;
 esac

.docker/chromium/Dockerfile

@@ -10,7 +10,7 @@ RUN set -eux; \
     #
     # install widevine module
     CHROMIUM_DIR="/usr/lib/chromium"; \
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
+    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \
     wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
     mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \
     unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \

.docker/chromium/Dockerfile.nvidia

@@ -1,37 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:base
-FROM $BASE_IMAGE
-
-#
-# install neko chromium
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends software-properties-common; \
-    # chromium-browser from default repo needs snap to be installed
-    # and nvidia base is ubuntu not debian
-    add-apt-repository ppa:system76/pop; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends unzip chromium openbox; \
-    #
-    # install widevine module
-    CHROMIUM_DIR="/usr/lib/chromium"; \
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
-    wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
-    mkdir -p "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64"; \
-    unzip -p /tmp/widevine.zip LICENSE.txt > "${CHROMIUM_DIR}/WidevineCdm/LICENSE"; \
-    unzip -p /tmp/widevine.zip manifest.json > "${CHROMIUM_DIR}/WidevineCdm/manifest.json"; \
-    unzip -p /tmp/widevine.zip libwidevinecdm.so > "${CHROMIUM_DIR}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"; \
-    find "${CHROMIUM_DIR}/WidevineCdm" -type d -exec chmod 0755 '{}' \;; \
-    find "${CHROMIUM_DIR}/WidevineCdm" -type f -exec chmod 0644 '{}' \;; \
-    rm /tmp/widevine.zip; \
-    #
-    # clean up
-    apt-get --purge autoremove -y unzip; \
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.nvidia.conf /etc/neko/supervisord/chromium.conf
-COPY --chown=neko preferences.json /home/neko/.config/chromium/Default/Preferences
-COPY policies.json /etc/chromium/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/chromium/supervisord.conf

@@ -1,17 +1,6 @@
 [program:chromium]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/chromium
+command=/usr/bin/chromium --window-position=0,0 --display=%(ENV_DISPLAY)s --user-data-dir=/home/neko/.config/chromium --no-first-run --start-maximized --bwsi --force-dark-mode --disable-file-system --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/chromium
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --disable-gpu
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
 stopsignal=INT
 autorestart=true
 priority=800

.docker/chromium/supervisord.nvidia.conf

@@ -1,36 +0,0 @@
-[program:chromium]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/bin/entrypoint.sh /usr/bin/chromium
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/chromium
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --enable-features=Vulkan,UseSkiaRenderer,VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization
-  --ignore-gpu-blocklist
-  --disable-seccomp-filter-sandbox
-  --use-gl=egl
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
-stopsignal=INT
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/chromium.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:openbox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/openbox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/firefox/Dockerfile.nvidia

@@ -1,35 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:base
-FROM $BASE_IMAGE
-
-ARG SRC_URL="https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US"
-
-#
-# install firefox
-RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends openbox \
-    xz-utils bzip2 libgtk-3-0 libdbus-glib-1-2; \
-    #
-    # fetch latest release
-    wget -O /tmp/firefox-setup.tar.bz2 "${SRC_URL}"; \
-    mkdir /usr/lib/firefox; \
-    tar -xjf /tmp/firefox-setup.tar.bz2 -C /usr/lib; \
-    rm -f /tmp/firefox-setup.tar.bz2; \
-    ln -s /usr/lib/firefox/firefox /usr/bin/firefox; \
-    #
-    # create a profile directory
-    mkdir -p /home/neko/.mozilla/firefox/profile.default/extensions; \
-    chown -R neko:neko /home/neko/.mozilla/firefox/profile.default; \
-    #
-    # clean up
-    apt-get --purge autoremove -y xz-utils bzip2; \
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.nvidia.conf /etc/neko/supervisord/firefox.conf
-COPY neko.js /usr/lib/firefox/mozilla.cfg
-COPY autoconfig.js /usr/lib/firefox/defaults/pref/autoconfig.js
-COPY policies.json /usr/lib/firefox/distribution/policies.json
-COPY --chown=neko profiles.ini /home/neko/.mozilla/firefox/profiles.ini
-COPY openbox.xml /etc/neko/openbox.xml

.docker/firefox/supervisord.nvidia.conf

@@ -1,28 +0,0 @@
-[program:firefox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/bin/entrypoint.sh /usr/bin/firefox
-  --no-remote
-  -P default
-  --display=%(ENV_DISPLAY)s
-  -setDefaultBrowser
-  -width 1280
-  -height 720
-stopsignal=INT
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/firefox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:openbox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/openbox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/google-chrome/Dockerfile.nvidia

@@ -1,23 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:nvidia-base
-FROM $BASE_IMAGE
-
-# latest working version with EGL: 111.0.5563.146, revert when resolved
-# 112.0.5615.49 fails: https://github.com/VirtualGL/virtualgl/issues/229
-ARG SRC_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_111.0.5563.146-1_amd64.deb"
-
-#
-# install google chrome
-RUN set -eux; apt-get update; \
-    wget -O /tmp/google-chrome.deb "${SRC_URL}"; \
-    apt-get install -y --no-install-recommends openbox /tmp/google-chrome.deb; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.nvidia.conf /etc/neko/supervisord/google-chrome.conf
-COPY --chown=neko preferences.json /home/neko/.config/google-chrome/Default/Preferences
-COPY policies.json /etc/opt/chrome/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/google-chrome/supervisord.conf

@@ -1,17 +1,6 @@
 [program:google-chrome]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/google-chrome
+command=/usr/bin/google-chrome --window-position=0,0 --display=%(ENV_DISPLAY)s --user-data-dir=/home/neko/.config/google-chrome --no-first-run --start-maximized --bwsi --force-dark-mode --disable-file-system --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/google-chrome
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --disable-gpu
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
 stopsignal=INT
 autorestart=true
 priority=800

.docker/google-chrome/supervisord.nvidia.conf

@@ -1,36 +0,0 @@
-[program:google-chrome]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/bin/entrypoint.sh /usr/bin/google-chrome
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/chromium
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --enable-features=Vulkan,UseSkiaRenderer,VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization
-  --ignore-gpu-blocklist
-  --disable-seccomp-filter-sandbox
-  --use-gl=egl
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
-stopsignal=INT
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/google-chrome.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:openbox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/openbox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/kde/Dockerfile

@@ -1,26 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:base
-FROM $BASE_IMAGE
-
-#
-# install kde
-RUN set -eux; apt-get update; \
-    apt-get install -y --no-install-recommends kde-full kwin-x11 sudo; \
-    #
-    # add user to sudoers
-    usermod -aG sudo neko; \
-    echo "neko:neko" | chpasswd; \
-    echo "%sudo ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
-    # clean up
-    apt remove xserver-xorg-legacy -y; \
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# disable autolock
-RUN kwriteconfig5 --file /home/neko/.config/kscreenlockerrc --group Daemon --key Autolock false; \
-    chown neko:neko /home/neko/.config/kscreenlockerrc
-
-#
-# copy configuation files
-COPY supervisord.conf /etc/neko/supervisord/kde.conf
-

.docker/kde/supervisord.conf

@@ -1,23 +0,0 @@
-[program:kde]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/startplasma-x11
-stopsignal=INT
-autorestart=true
-priority=500
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/kde.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:kwin]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/kwin_x11
-stopsignal=INT
-autorestart=true
-priority=500
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/kwin.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/microsoft-edge/Dockerfile

@@ -8,7 +8,7 @@ ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edg
 RUN set -eux; apt-get update; \
     #
     # fetch latest release
-    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \
+    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | tail -1)"; \
     wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \
     apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \
     #

.docker/microsoft-edge/Dockerfile.nvidia

@@ -1,24 +0,0 @@
-ARG BASE_IMAGE=m1k1o/neko:base
-FROM $BASE_IMAGE
-
-ARG API_URL="https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/"
-
-#
-# install microsoft edge
-RUN set -eux; apt-get update; \
-    #
-    # fetch latest release
-    SRC_URL="${API_URL}$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"]*\).*/\1/p' | sort --version-sort | tail -1)"; \
-    wget -O /tmp/microsoft-edge.deb "${SRC_URL}"; \
-    apt-get install -y --no-install-recommends openbox /tmp/microsoft-edge.deb; \
-    #
-    # clean up
-    apt-get clean -y; \
-    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
-
-#
-# copy configuation files
-COPY supervisord.nvidia.conf /etc/neko/supervisord/microsoft-edge.conf
-COPY --chown=neko preferences.json /home/neko/.config/microsoft-edge/Default/Preferences
-COPY policies.json /etc/opt/edge/policies/managed/policies.json
-COPY openbox.xml /etc/neko/openbox.xml

.docker/microsoft-edge/supervisord.conf

@@ -1,17 +1,6 @@
 [program:microsoft-edge]
 environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/microsoft-edge
+command=/usr/bin/microsoft-edge --window-position=0,0 --display=%(ENV_DISPLAY)s --user-data-dir=/home/neko/.config/microsoft-edge --no-first-run --start-maximized --bwsi --force-dark-mode --disable-file-system --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/microsoft-edge
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --disable-gpu
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
 stopsignal=INT
 autorestart=true
 priority=800

.docker/microsoft-edge/supervisord.nvidia.conf

@@ -1,36 +0,0 @@
-[program:microsoft-edge]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/bin/entrypoint.sh /usr/bin/microsoft-edge
-  --window-position=0,0
-  --display=%(ENV_DISPLAY)s
-  --user-data-dir=/home/neko/.config/microsoft-edge
-  --no-first-run
-  --start-maximized
-  --bwsi
-  --force-dark-mode
-  --disable-file-system
-  --enable-features=Vulkan,UseSkiaRenderer,VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization
-  --ignore-gpu-blocklist
-  --disable-seccomp-filter-sandbox
-  --use-gl=egl
-  --disable-software-rasterizer
-  --disable-dev-shm-usage
-stopsignal=INT
-autorestart=true
-priority=800
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/microsoft-edge.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true
-
-[program:openbox]
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-command=/usr/bin/openbox --config-file /etc/neko/openbox.xml
-autorestart=true
-priority=300
-user=%(ENV_USER)s
-stdout_logfile=/var/log/neko/openbox.log
-stdout_logfile_maxbytes=100MB
-stdout_logfile_backups=10
-redirect_stderr=true

.docker/opera/Dockerfile

@@ -9,7 +9,7 @@ ARG LIBFFMPEG_API_URL="https://api.github.com/repos/nwjs-ffmpeg-prebuilt/nwjs-ff
 RUN set -eux; apt-get update; \
     #
     # fetch latest release
-    VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | sort --version-sort | tail -1)"; \
+    VERSION="$(wget -O - "${API_URL}" 2>/dev/null | sed -n 's/.*href="\([^"/]*\).*/\1/p' | tail -1)"; \
     wget -O /tmp/opera.deb "${API_URL}${VERSION}/linux/opera-stable_${VERSION}_amd64.deb"; \
     apt-get install -y --no-install-recommends openbox jq unzip /tmp/opera.deb; \
     #

.docker/rebuild-server

@@ -17,9 +17,5 @@ fi
 
 docker run --rm -it \
   -v "${PWD}/../server:/src" \
-  -e GIT_COMMIT=`git rev-parse --short HEAD` \
+  --entrypoint="go" \
-  -e GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD` \
+  neko_dev_server build -o "bin/neko" "cmd/neko/main.go"
-  -e GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"` \
-  --entrypoint="bash" \
-  --workdir="/src" \
-  neko_dev_server ./build

.docker/serve-client

@@ -16,7 +16,7 @@ if [ ! -d "${PWD}/../client/node_modules" ] || [ "$1" == "-i" ]; then
     -v "${PWD}/../client:/app" \
     --workdir="/app" \
     --entrypoint="npm" \
-    node:18-bullseye-slim install
+    node:14-buster-slim install
 fi
 
 docker run --rm -it \
@@ -25,5 +25,5 @@ docker run --rm -it \
   -e "VUE_APP_SERVER_PORT=${SERVER_PORT}" \
   --workdir="/app" \
   --entrypoint="npm" \
-  node:18-bullseye-slim run serve
+  node:14-buster-slim run serve
   

.docker/start-server

@@ -17,22 +17,8 @@ if [ ! -f "${BINARY_PATH}" ] || [ "$1" == "-r" ]; then
   ./rebuild-server
 fi
 
-# if image starts with nvidia- add --gpus all
-if [[ "${SERVER_TAG}" == "nvidia-"* ]]; then
-  GPU_FLAG="--gpus all"
-  echo "Nvidia GPU acceleration enabled"
-fi
-
-# if image starts with intel- add --device /dev/dri
-if [[ "${SERVER_TAG}" == "intel-"* ]]; then
-  GPU_FLAG="--device /dev/dri"
-  echo "Intel GPU acceleration enabled"
-fi
-
-# use --gpus all to enable GPU acceleration
 docker run --rm -it \
   --name "neko_dev" \
-  $GPU_FLAG \
   -p "${SERVER_PORT}:8080" \
   -p "${SERVER_EPR}:${SERVER_EPR}/udp" \
   -e "NEKO_SCREEN=1920x1080@60" \

.docker/ungoogled-chromium/Dockerfile

@@ -21,7 +21,7 @@ RUN set -eux; apt-get update; \
     chmod 4755 /usr/lib/chromium/chrome-sandbox; \
     #
     # install widevine module
-    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | sort --version-sort | tail -n 1); \
+    WIDEVINE_VERSION=$(wget --quiet -O - https://dl.google.com/widevine-cdm/versions.txt | tail -n 1); \
     wget -O /tmp/widevine.zip "https://dl.google.com/widevine-cdm/${WIDEVINE_VERSION}-linux-x64.zip"; \
     unzip -p /tmp/widevine.zip libwidevinecdm.so > /usr/lib/chromium/libwidevinecdm.so; \
     chmod 644 /usr/lib/chromium/libwidevinecdm.so; \

.github/workflows/dockerhub.yml

@@ -50,7 +50,7 @@ jobs:
       # Will build all images even if some fail.
       fail-fast: false
       matrix:
-        tags: [ firefox, chromium, google-chrome, ungoogled-chromium, microsoft-edge, brave, vivaldi, opera, tor-browser, remmina, vlc, xfce, kde ]
+        tags: [ firefox, chromium, google-chrome, ungoogled-chromium, microsoft-edge, brave, vivaldi, opera, tor-browser, remmina, vlc, xfce ]
     env:
       DOCKER_TAG: ${{ matrix.tags }}
     steps:

.github/workflows/ghcr-amd.yml

@@ -81,7 +81,6 @@ jobs:
           - tag: remmina
           - tag: vlc
           - tag: xfce
-          - tag: kde
     env:
       TAG_NAME: ${{ matrix.tag }}
     steps:

.github/workflows/ghcr-arm.yml

@@ -13,51 +13,16 @@ env:
   PLATFORMS: linux/arm64,linux/arm/v7
 
 jobs:
-  build-client:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
-      -
-        name: Build client
-        run: |
-          cd client
-          npm install
-          npm run build
-      - 
-        name: Upload client dist
-        uses: actions/upload-artifact@v3
-        with:
-          name: client-dist
-          path: client/dist
-
   build-base:
     runs-on: ubuntu-latest
     #
     # do not run on forks
     #
     if: github.repository_owner == 'm1k1o'
-    needs: [ build-client ]
     steps:
       -
         name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Download client dist
-        uses: actions/download-artifact@v3
-        with:
-          name: client-dist
-          path: client/dist
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/ghcr-intel.yml

@@ -81,7 +81,6 @@ jobs:
           - tag: remmina
           - tag: vlc
           - tag: xfce
-          - tag: kde
     env:
       TAG_NAME: ${{ matrix.tag }}
       DOCKERFILE: ${{ matrix.dockerfile }}

.github/workflows/ghcr-nvidia.yml

@@ -1,124 +0,0 @@
-name: "nvidia gpu supported images"
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: m1k1o/neko
-  TAG_PREFIX: nvidia-
-  BASE_DOCKERFILE: Dockerfile.nvidia
-  PLATFORMS: linux/amd64
-
-jobs:
-  build-base:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: .docker/base/${{ env.BASE_DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
-  build:
-    runs-on: ubuntu-latest
-    #
-    # do not run on forks
-    #
-    if: github.repository_owner == 'm1k1o'
-    needs: [ build-base ]
-    strategy:
-      # Will build all images even if some fail.
-      matrix:
-        include:
-          - tag: firefox
-            dockerfile: Dockerfile.nvidia
-          - tag: brave
-            dockerfile: Dockerfile.nvidia
-          - tag: chromium
-            dockerfile: Dockerfile.nvidia
-          - tag: google-chrome
-            dockerfile: Dockerfile.nvidia
-          - tag: microsoft-edge
-            dockerfile: Dockerfile.nvidia
-    env:
-      TAG_NAME: ${{ matrix.tag }}
-      DOCKERFILE: ${{ matrix.dockerfile }}
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - 
-        name: Extract metadata (tags, labels) for Docker
-        uses: docker/metadata-action@v3
-        id: meta
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}${{ env.TAG_NAME }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha,format=long
-      - 
-        name: Log in to the Container registry
-        uses: docker/login-action@v1
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_ACCESS_TOKEN }}
-      - 
-        name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .docker/${{ env.TAG_NAME }}
-          file: .docker/${{ env.TAG_NAME }}/${{ env.DOCKERFILE }}
-          platforms: ${{ env.PLATFORMS }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            BASE_IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.TAG_PREFIX }}base:sha-${{ github.sha }}

LICENSE

@@ -186,9 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C) 2020 Nurdism <nurdism.io@gmail.com>
+   Copyright 2020 Nurdism <nurdism.io@gmail.com>, 2020-2021 m1k1o
-   Copyright (C) 2020-2023 m1k1o
-   All Rights Reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -40,13 +40,13 @@ Neko is also a great tool for **hosting watch parties** and interactive presenta
 
 This app uses WebRTC to stream a desktop inside of a docker container, original author made this because [rabb.it](https://en.wikipedia.org/wiki/Rabb.it) went under and his internet could not handle streaming and discord kept crashing when his friend attempted to. He just wanted to watch anime with his friends ლ(ಠ益ಠლ) so he started digging throughout the internet and found a few *kinda* clones, but none of them had the virtual browser, then he found [Turtus](https://github.com/Khauri/Turtus) and he was able to figure out the rest.
 
-Then I found [this](https://github.com/nurdism/neko) project and started to dig into it. I really liked the idea of having collaborative browser browsing together with multiple people, so I created a fork. Initially, I wanted to merge my changes to the upstream repository, but the original author did not have time for this project anymore and it got eventually archived.
+Then I found [this](https://github.com/nurdism/neko) project and started to dig into it. I really liked the idea of having collaborative browser browsing together with mutliple people, so I created a fork. Initially, I wanted to merge my changes to the upstream repository, but the original author did not have time for this project anymore and it got eventually archived.
 
 ## Use-cases and comparison
 
 Neko started as a virtual browser that is streamed using WebRTC to multiple users.
 - It is **not only limited to a browser**; it can run anything that runs on linux (e.g. VLC). Browser only happens to be the most popular and widely used use-case.
-- In fact, it is not limited to a single program either; you can install a full desktop environment (e.g. XFCE, KDE).
+- In fact, it is not limited to a single program either; you can install a full desktop environment (e.g. XFCE).
 - Speaking of limits, it does not need to run in a container; you could install neko on your host, connect to your X server and control your whole VM.
 - Theoretically it is not limited to only X server, anything that can be controlled and scraped periodically for images could be used instead.
   - Like implementing RDP or VNC protocol, where neko would only act as WebRTC relay server. This is currently only future.
@@ -99,7 +99,6 @@ Compared to clientless remote desktop gateway (e.g. [Apache Guacamole](https://g
   <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/remmina.png" title="m1k1o/neko:remmina" width="60" height="auto"/>
   <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/vlc.svg" title="m1k1o/neko:vlc" width="60" height="auto"/>
   <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/xfce.svg" title="m1k1o/neko:xfce" width="60" height="auto"/>
-  <img src="https://raw.githubusercontent.com/m1k1o/neko/master/docs/_media/icons/kde.svg" title="m1k1o/neko:kde" width="60" height="auto"/>
 
   ... others in <a href="https://github.com/m1k1o/neko-apps">m1k1o/neko-apps</a>
 </div>

client/src/app.vue

@@ -1,22 +1,17 @@
 <template>
-  <div id="neko" :class="[!videoOnly && side ? 'expanded' : '']">
+  <div id="neko" :class="[side ? 'expanded' : '']">
     <template v-if="!$client.supported">
       <neko-unsupported />
     </template>
     <template v-else>
       <main class="neko-main">
-        <div v-if="!videoOnly" class="header-container">
+        <div v-if="!hideControls" class="header-container">
           <neko-header />
         </div>
         <div class="video-container">
-          <neko-video
+          <neko-video ref="video" :hideControls="hideControls" @control-attempt="controlAttempt" />
-            ref="video"
-            :hideControls="hideControls"
-            :extraControls="isEmbedMode"
-            @control-attempt="controlAttempt"
-          />
         </div>
-        <div v-if="!videoOnly" class="room-container">
+        <div v-if="!hideControls" class="room-container">
           <neko-members />
           <div class="room-menu">
             <div class="settings">
@@ -31,11 +26,11 @@
           </div>
         </div>
       </main>
-      <neko-side v-if="!videoOnly && side" />
+      <neko-side v-if="!hideControls && side" />
       <neko-connect v-if="!connected" />
       <neko-about v-if="about" />
       <notifications
-        v-if="!videoOnly"
+        v-if="!hideControls"
         group="neko"
         position="top left"
         style="top: 50px; pointer-events: none"
@@ -181,32 +176,8 @@
 
     shakeKbd = false
 
-    get volume() {
-      const numberParam = parseFloat(new URL(location.href).searchParams.get('volume') || '1.0')
-      return Math.max(0.0, Math.min(!isNaN(numberParam) ? numberParam * 100 : 100, 100))
-    }
-
-    get isCastMode() {
-      return !!new URL(location.href).searchParams.get('cast')
-    }
-
-    get isEmbedMode() {
-      return !!new URL(location.href).searchParams.get('embed')
-    }
-
     get hideControls() {
-      return this.isCastMode
+      return !!new URL(location.href).searchParams.get('cast')
-    }
-
-    get videoOnly() {
-      return this.isCastMode || this.isEmbedMode
-    }
-
-    @Watch('volume', { immediate: true })
-    onVolume(volume: number) {
-      if (new URL(location.href).searchParams.has('volume')) {
-        this.$accessor.video.setVolume(volume)
-      }
     }
 
     @Watch('hideControls', { immediate: true })

client/src/components/header.vue

@@ -5,6 +5,14 @@
       <span><b>n</b>.eko</span>
     </a>
     <ul class="menu">
+      <li>
+        <button class="btn" @click="startShareScreen" v-if="!mediaStream">
+          START SCREEN SHARE
+        </button>
+        <button class="btn" @click="stopShareScreen" v-else>
+          STOP SCREEN SHARE
+        </button>
+      </li>
       <li>
         <i
           :class="[{ disabled: !admin }, { locked: isLocked('control') }, 'fas', 'fa-mouse']"
@@ -207,5 +215,31 @@
 
       return this.$t(`locks.${resource}.` + (this.isLocked(resource) ? `locked` : `unlocked`))
     }
+
+    //
+    // Screen Share
+    //
+    mediaStream: MediaStream | null = null
+    mediaRtcpSender: RTCRtpSender | null = null
+    async startShareScreen() {
+      // get media stream from user's browser
+      this.mediaStream = await navigator.mediaDevices
+        .getDisplayMedia({
+          video: true,
+          audio: false,
+        })
+      const mediaTrack = this.mediaStream.getVideoTracks()[0];
+      this.mediaRtcpSender = this.$client.addTrack(mediaTrack, this.mediaStream)
+    }
+    async stopShareScreen() {
+      if (this.mediaStream) {
+        this.mediaStream.getTracks().forEach(track => track.stop())
+        this.mediaStream = null
+      }
+      if (this.mediaRtcpSender) {
+        this.$client.removeTrack(this.mediaRtcpSender)
+        this.mediaRtcpSender = null
+      }
+    }
   }
 </script>

client/src/components/menu.vue

@@ -76,20 +76,5 @@
     about() {
       this.$accessor.client.toggleAbout()
     }
-
-    mounted() {
-      const default_lang = new URL(location.href).searchParams.get('lang')
-      if (default_lang && this.langs.includes(default_lang)) {
-        this.$i18n.locale = default_lang
-      }
-      const show_side = new URL(location.href).searchParams.get('show_side')
-      if (show_side !== null) {
-        this.$accessor.client.setSide(show_side === '1')
-      }
-      const mute_chat = new URL(location.href).searchParams.get('mute_chat')
-      if (mute_chat !== null) {
-        this.$accessor.settings.setSound(mute_chat !== '1')
-      }
-    }
   }
 </script>

client/src/components/video.vue

@@ -21,14 +21,11 @@
           @mouseup.stop.prevent="onMouseUp"
           @mouseenter.stop.prevent="onMouseEnter"
           @mouseleave.stop.prevent="onMouseLeave"
-          @touchmove.stop.prevent="onTouchHandler"
-          @touchstart.stop.prevent="onTouchHandler"
-          @touchend.stop.prevent="onTouchHandler"
         />
-        <div v-if="!playing && playable" class="player-overlay" @click.stop.prevent="playAndUnmute">
+        <div v-if="!playing && playable" class="player-overlay" @click.stop.prevent="toggle">
           <i class="fas fa-play-circle" />
         </div>
-        <div v-else-if="mutedOverlay && muted" class="player-overlay" @click.stop.prevent="unmute">
+        <div v-if="mutedOverlay && muted" class="player-overlay" @click.stop.prevent="unmute">
           <i class="fas fa-volume-up" />
         </div>
         <div ref="aspect" class="player-aspect" />
@@ -36,7 +33,7 @@
       <ul v-if="!fullscreen && !hideControls" class="video-menu top">
         <li><i @click.stop.prevent="requestFullscreen" class="fas fa-expand"></i></li>
         <li v-if="admin"><i @click.stop.prevent="openResolution" class="fas fa-desktop"></i></li>
-        <li v-if="!implicitHosting" :class="extraControls || 'extra-control'">
+        <li class="request-control">
           <i
             :class="[hosted && !hosting ? 'disabled' : '', !hosted && !hosting ? 'faded' : '', 'fas', 'fa-keyboard']"
             @click.stop.prevent="toggleControl"
@@ -109,12 +106,12 @@
             }
           }
 
-          /* usually extra controls are only shown on mobile */
+          &.request-control {
-          &.extra-control {
             display: none;
           }
+
           @media (max-width: 768px) {
-            &.extra-control {
+            &.request-control {
               display: inline-block;
             }
           }
@@ -226,15 +223,13 @@
     @Ref('resolution') readonly _resolution!: Resolution
     @Ref('clipboard') readonly _clipboard!: Clipboard
 
-    // all controls are hidden (e.g. for cast mode)
     @Prop(Boolean) readonly hideControls!: boolean
-    // extra controls are shown (e.g. for embed mode)
-    @Prop(Boolean) readonly extraControls!: boolean
 
     private keyboard = GuacamoleKeyboard()
     private observer = new ResizeObserver(this.onResize.bind(this))
     private focused = false
     private fullscreen = false
+    private startsMuted = true
     private mutedOverlay = true
 
     get admin() {
@@ -366,6 +361,7 @@
     onMutedChanged(muted: boolean) {
       if (this._video && this._video.muted != muted) {
         this._video.muted = muted
+        this.startsMuted = muted
 
         if (!muted) {
           this.mutedOverlay = false
@@ -388,29 +384,9 @@
     }
 
     @Watch('playing')
-    async onPlayingChanged(playing: boolean) {
+    onPlayingChanged(playing: boolean) {
       if (this._video && this._video.paused && playing) {
-        // if autoplay is disabled, play() will throw an error
+        this.play()
-        // and we need to properly save the state otherwise we
-        // would be thinking we're playing when we're not
-        try {
-          await this._video.play()
-        } catch (err: any) {
-          if (!this._video.muted) {
-            // video.play() can fail if audio is set due restrictive
-            // browsers autoplay policy -> retry with muted audio
-            try {
-              this.$accessor.video.setMuted(true)
-              this._video.muted = true
-              await this._video.play()
-            } catch (err: any) {
-              // if it still fails, we're not playing anything
-              this.$accessor.video.pause()
-            }
-          } else {
-            this.$accessor.video.pause()
-          }
-        }
       }
 
       if (this._video && !this._video.paused && !playing) {
@@ -448,6 +424,11 @@
       this._video.addEventListener('canplaythrough', () => {
         this.$accessor.video.setPlayable(true)
         if (this.autoplay) {
+          // start as muted due to restrictive browsers autoplay policy
+          if (this.startsMuted && (!document.hasFocus() || !this.$accessor.active)) {
+            this.$accessor.video.setMuted(true)
+          }
+
           this.$nextTick(() => {
             this.$accessor.video.play()
           })
@@ -579,11 +560,6 @@
       }
     }
 
-    playAndUnmute() {
-      this.$accessor.video.play()
-      this.$accessor.video.setMuted(false)
-    }
-
     unmute() {
       this.$accessor.video.setMuted(false)
     }
@@ -691,35 +667,6 @@
       }
     }
 
-    onTouchHandler(e: TouchEvent) {
-      let first = e.changedTouches[0]
-      let type = ''
-      switch (e.type) {
-        case 'touchstart':
-          type = 'mousedown'
-          break
-        case 'touchmove':
-          type = 'mousemove'
-          break
-        case 'touchend':
-          type = 'mouseup'
-          break
-        default:
-          return
-      }
-
-      const simulatedEvent = new MouseEvent(type, {
-        bubbles: true,
-        cancelable: true,
-        view: window,
-        screenX: first.screenX,
-        screenY: first.screenY,
-        clientX: first.clientX,
-        clientY: first.clientY,
-      })
-      first.target.dispatchEvent(simulatedEvent)
-    }
-
     onMouseDown(e: MouseEvent) {
       if (!this.hosting) {
         this.$emit('control-attempt', e)

client/src/neko/base.ts

@@ -203,12 +203,11 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
       return
     }
 
+    this._peer = new RTCPeerConnection()
     if (lite !== true) {
       this._peer = new RTCPeerConnection({
         iceServers: servers,
       })
-    } else {
-      this._peer = new RTCPeerConnection()
     }
 
     this._peer.onconnectionstatechange = () => {
@@ -252,28 +251,11 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
 
     this._peer.ontrack = this.onTrack.bind(this)
 
-    this._peer.onicecandidate = (event: RTCPeerConnectionIceEvent) => {
-      if (!event.candidate) {
-        this.emit('debug', `sent all local ICE candidates`)
-        return
-      }
-
-      const init = event.candidate.toJSON()
-      this.emit('debug', `sending local ICE candidate`, init)
-
-      this._ws!.send(
-        JSON.stringify({
-          event: EVENT.SIGNAL.CANDIDATE,
-          data: JSON.stringify(init),
-        }),
-      )
-    }
-
     this._peer.onnegotiationneeded = async () => {
       this.emit('warn', `negotiation is needed`)
 
       const d = await this._peer!.createOffer()
-      await this._peer!.setLocalDescription(d)
+      this._peer!.setLocalDescription(d)
 
       this._ws!.send(
         JSON.stringify({
@@ -295,10 +277,10 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
       return
     }
 
-    await this._peer.setRemoteDescription({ type: 'offer', sdp })
+    this._peer.setRemoteDescription({ type: 'offer', sdp })
 
     for (const candidate of this._candidates) {
-      await this._peer.addIceCandidate(candidate)
+      this._peer.addIceCandidate(candidate)
     }
     this._candidates = []
 
@@ -328,7 +310,23 @@ export abstract class BaseClient extends EventEmitter<BaseEvents> {
       return
     }
 
-    await this._peer.setRemoteDescription({ type: 'answer', sdp })
+    this._peer.setRemoteDescription({ type: 'answer', sdp })
+  }
+
+  public addTrack(track: MediaStreamTrack, ...streams: MediaStream[]): RTCRtpSender {
+    if (!this._peer) {
+      throw new Error('peer not connected')
+    }
+
+    return this._peer.addTrack(track, ...streams)
+  }
+
+  public removeTrack(sender: RTCRtpSender) {
+    if (!this._peer) {
+      throw new Error('peer not connected')
+    }
+
+    this._peer.removeTrack(sender)
   }
 
   private async onMessage(e: MessageEvent) {

client/src/plugins/i18n.ts

@@ -6,6 +6,5 @@ Vue.use(VueI18n)
 
 export const i18n = new VueI18n({
   locale: 'en',
-  fallbackLocale: 'en',
   messages,
 })

client/src/store/client.ts

@@ -27,10 +27,6 @@ export const mutations = mutationTree(state, {
     state.side = !state.side
     set('side', state.side)
   },
-  setSide(state, side: boolean) {
-    state.side = side
-    set('side', side)
-  },
 })
 
 export const actions = actionTree({ state, getters, mutations }, {})

docs/README.md

@@ -21,9 +21,9 @@ Neko is also a great tool for **hosting watch parties** and interactive presenta
 
 ## About
 
-This app uses WebRTC to stream a desktop inside a docker container, original author made this because [rabb.it](https://en.wikipedia.org/wiki/Rabb.it) went under, and his internet could not handle streaming and discord kept crashing when his friend attempted to. He just wanted to watch anime with his friends ლ(ಠ益ಠლ) so he started digging throughout the internet and found a few *kinda* clones, but none of them had the virtual browser, then he found [Turtus](https://github.com/Khauri/Turtus), and he was able to figure out the rest.
+This app uses WebRTC to stream a desktop inside of a docker container, original author made this because [rabb.it](https://en.wikipedia.org/wiki/Rabb.it) went under and his internet could not handle streaming and discord kept crashing when his friend attempted to. He just wanted to watch anime with his friends ლ(ಠ益ಠლ) so he started digging throughout the internet and found a few *kinda* clones, but none of them had the virtual browser, then he found [Turtus](https://github.com/Khauri/Turtus) and he was able to figure out the rest.
 
-Then I found [this](https://github.com/nurdism/neko) project and started to dig into it. I really liked the idea of having collaborative browser browsing together with multiple people, so I created a fork. Initially, I wanted to merge my changes to the upstream repository, but the original author did not have time for this project anymore, and it got eventually archived.
+Then I found [this](https://github.com/nurdism/neko) project and started to dig into it. I really liked the idea of having collaborative browser browsing together with mutliple people, so I created a fork. Initially, I wanted to merge my changes to the upstream repository, but the original author did not have time for this project anymore and it got eventually archived.
 
 ### Features
 
@@ -41,4 +41,4 @@ Then I found [this](https://github.com/nurdism/neko) project and started to dig
 
 I like cats 🐱 (`Neko` is the Japanese word for cat), I'm a weeb/nerd.
 
-***But why the cat butt?*** Because cats are *assholes*, but you love them anyway.
+***But why the cat butt?*** Because cats are *assholes*, but you love them anyways.

docs/_media/icons/kde.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128" viewBox="0 0 33.8667 33.8667" width="128" xmlns="http://www.w3.org/2000/svg">
- <metadata/>
- <g transform="translate(0 -263.13)">
-  <path d="m0 263.13h33.87v33.87h-33.87z" fill="#1d99f3"/>
-  <path d="m18.8061 267.477-4.30242.41187v17.7156l4.25685-.64088v-7.55326l5.72205 8.37759 4.48586-1.41935-5.85934-8.05685 5.90521-7.59912-4.57729-1.05245-5.67649 7.59883zm-9.75254 4.31712c-.04858.005-.09551.0265-.13199.0632l-1.68863 1.68833c-.071.0712-.08437.18161-.03203.26782l1.97702 3.25614c-.35065.5895-.63169 1.22509-.83255 1.89559l-3.6295.75494c-.10098.0209-.17374.11039-.17374.21402v2.38772c0 .10098.06909.18844.16639.21196l3.52278.86107c.18786.77655.47897 1.51268.86372 2.18928l-2.03906 3.10944c-.05689.0869-.045.20138.0285.27458l1.68804 1.68834c.071.0708.18183.0847.26841.0326l3.19528-1.94057c.62765.36219 1.30454.64721 2.01995.8405l.74553 3.58451c.02098.10157.11076.17375.21373.17375h2.38802c.10039 0 .188-.0685.21196-.16699l.87812-3.59186c.73745-.19902 1.43492-.49565 2.07786-.8743l3.14883 2.06463c.08658.057.20109.0456.27458-.0279l1.68863-1.68834c.07143-.0714.08422-.18182.03174-.26781l-1.14947-1.89442-.37189.11759c-.05421.0171-.11333-.003-.14522-.0503 0 0-.73319-1.07332-1.68011-2.45915-1.13197 2.21544-3.43502 3.73297-6.09453 3.73297-3.77847 0-6.84183-3.06343-6.84183-6.84212 0-2.77974 1.65799-5.17032 4.03813-6.24122v-1.76506c-.43318.15154-.85196.33425-1.24972.55092-.00029-.00027-.00058-.001-.0017-.002l-3.22292-2.11384c-.04341-.0284-.09371-.0397-.14229-.0347z" fill="#fcfcfc" stroke-width=".265"/>
- </g>
-</svg>

docs/_sidebar.md

@@ -6,7 +6,6 @@
   * [Reverse Proxy](/getting-started/reverse-proxy)
   * [Configuration](/getting-started/configuration)
   * [Troubleshooting](/getting-started/troubleshooting)
-  * [Frequently Asked Questions](/getting-started/faq)
 * [Mobile Support](/mobile-support)
 * [Contributing](/contributing)
   * [Non Goals](/non-goals)

docs/changelog.md

@@ -2,51 +2,18 @@
 
 ## master branch
 
-### New Features
-- Added nvidia support for firefox.
-- Added `?lang=<lang>` parameter to the URL, which will set the language of the interface (by @mbattista).
-- Added `?show_side=1` and `?mute_chat=1` parameter to the URL, for chat mute and show side (by @mbattista).
-
-### Bugs
-- Fix incorrect version sorting for chromium, microsoft-edge, opera and ungoogledchromium.
-- Fix buffer overflow in Gstreamer log function [#382](https://github.com/m1k1o/neko/pull/382) (by @@tt2468).
-
-### Misc
-- Added RTMP broadcast support to nvidia docker image [#274](https://github.com/m1k1o/neko/issues/274).
-- Ensured that paths are writable by neko user [#277](https://github.com/m1k1o/neko/issues/277).
-- Git commit and tag are now included in the build when creating a docker image.
-- Remove any temporary files associated with a Form after file upload, that would be otherwise never removed.
-- Add check for volume parameter in URL before setting volume (by @FapFapDragon).
-- Add glib main loop to capture manager [#383](https://github.com/m1k1o/neko/pull/383) (by @tt2468).
-
-## [n.eko v2.8.0](https://github.com/m1k1o/neko/releases/tag/v2.8.0)
-
 ### New Features
 - Added AV1 tag, metadata and pipeline. Unfortunately does not work yet, since the encoding is way too slow (by @mbattista).
-- Added `m1k1o/neko:kde` tag as an alternative to `m1k1o/neko:xfce`.
-- New VirtualGL version 3.1 was released, adding support for Chromium browsers to use Nvidia GPU acceleration!
-- Added `?embed=1` parameter to the URL, which will hide the sidebar and the top bar, so that it can be embedded in other websites.
-- Added `?volume=<0-1>` parameter to the URL, which will set the inital volume of the player (by @urbanekpj).
-- Touch events are now supported on mobile devices (by @urbanekpj).
-- Added NVENC support, hardware h264 encoding for Nvidia GPUs!
-- Fixed an issue where `nvh264enc` did not send SPS and PPS NAL units (by @mbattista).
 
 ### Bugs
 - Fixed TCP mux occasional freeze by adding write buffer to it.
 - Fixed stereo problem in chromium-based browsers, where it was only as mono by adding `stereo=1` to opus SDP to clients answer.
 - Fixed keysym mapping for unknown keycodes, which was causing some key combinations to not work on some keyboards.
 - Fixed a bug where `max_fps=0` would lead to an invalid pipeline.
-- Fixed client side webrtc ICE gathering, so that neko can be used without exposed ports, only with STUN and TURN servers.
-- Fixed play state synchronization, when autoplay is disabled.
 
 ### Misc
 - Updated to go 1.19 and Node 18, removed go-events as dependency (by @mbattista).
 - Added adaptive framerate which now streams in the framerate you selected from the dropdown.
-- Improved chinese and korean characters support.
-- Disabled autolock for kde, so that it does not lock the screen when you are not using it.
-- Refactored autoplay, so that it will start playing audio, if it's allowed by the browser (by @urbanekpj).
-- Renamed pulseaudio sink from `auto_null` to `audio_output`, because it was ignored by KDE.
-- Pulseaudio is now configured using environment variables, so that users can mount `/home/neko` without losing audio configuration.
 
 ## [n.eko v2.7](https://github.com/m1k1o/neko/releases/tag/v2.7)
 

docs/contributing.md

@@ -10,7 +10,7 @@
 
 ## Server build dependencies
 
-If you want to compile Golang code locally, you must install additional dependencies in order for it to compile.
+If you want to compile goalng code locally, you must install additional dependencies in order for it to compile.
 
 ```shell
 apt-get install -y --no-install-recommends libx11-dev libxrandr-dev libxtst-dev libgstreamer1.0-dev

docs/getting-started/README.md

@@ -12,7 +12,6 @@
   <img src="../_media/icons/remmina.png" title="m1k1o/neko:remmina" width="60" height="auto"/>
   <img src="../_media/icons/vlc.svg" title="m1k1o/neko:vlc" width="60" height="auto"/>
   <img src="../_media/icons/xfce.svg" title="m1k1o/neko:xfce" width="60" height="auto"/>
-  <img src="../_media/icons/kde.svg" title="m1k1o/neko:kde" width="60" height="auto"/>
 </div>
 
 Use the following docker images from [Docker Hub](https://hub.docker.com/r/m1k1o/neko) for x86_64:
@@ -29,7 +28,7 @@ Use the following docker images from [Docker Hub](https://hub.docker.com/r/m1k1o
   - Pass env var `REMMINA_URL=<proto>://[<username>[:<password>]@]server[:port]` (proto being `vnc`, `rdp` or `spice`).
   - Or create your custom configuration with remmina locally (it's saved in `~/.local/share/remmina/path_to_profile.remmina`) and bind-mount it, then pass env var `REMMINA_PROFILE=<path_to_profile.remmina>`.
 - `m1k1o/neko:vlc` - for VLC Video player (needs volume mounted to `/media` with local video files, or setting `VLC_MEDIA=/media` path).
-- `m1k1o/neko:xfce` or `m1k1o/neko:kde` - for a shared desktop / installing shared software.
+- `m1k1o/neko:xfce` - for a shared desktop / installing shared software.
 - `m1k1o/neko:base` - for custom base.
 
 Dockerhub images are built using GitHub actions on every push and on weekly basis to keep all browsers up-to-date.
@@ -48,9 +47,8 @@ All images are also available on [GitHub Container Registry](https://github.com/
 - `ghcr.io/m1k1o/neko/remmina:latest`
 - `ghcr.io/m1k1o/neko/vlc:latest`
 - `ghcr.io/m1k1o/neko/xfce:latest`
-- `ghcr.io/m1k1o/neko/kde:latest`
 
-For ARM-based images (like Raspberry Pi - with GPU hardware acceleration, Oracle Cloud ARM tier). Currently, not all images are available for ARM, because not all applications are available for ARM. Please note, that `m1k1o/neko:arm-*` images from dockerhub are currently not maintained and they can contain outdated software. Please use images below:
+For ARM-based images (like Raspberry Pi - with GPU hardware acceleration, Oracle Cloud ARM tier). Currently not all images are available for ARM, because not all applications are available for ARM.
 
 - `ghcr.io/m1k1o/neko/arm-firefox:latest`
 - `ghcr.io/m1k1o/neko/arm-chromium:latest`
@@ -72,63 +70,13 @@ For images with VAAPI GPU hardware acceleration using intel drivers use:
 - `ghcr.io/m1k1o/neko/intel-remmina:latest`
 - `ghcr.io/m1k1o/neko/intel-vlc:latest`
 - `ghcr.io/m1k1o/neko/intel-xfce:latest`
-- `ghcr.io/m1k1o/neko/intel-kde:latest`
-
-For images with Nvidia GPU hardware acceleration using EGL (see example below) use (please note, there is a known issue with EGL and Chromium-based browsers, see [here](https://github.com/m1k1o/neko/issues/279)):
-
-- `ghcr.io/m1k1o/neko/nvidia-firefox:latest`
-- `ghcr.io/m1k1o/neko/nvidia-chromium:latest`
-- `ghcr.io/m1k1o/neko/nvidia-google-chrome:latest`
-- `ghcr.io/m1k1o/neko/nvidia-microsoft-edge:latest`
-- `ghcr.io/m1k1o/neko/nvidia-brave:latest`
 
 GHCR images are built using GitHub actions for every tag.
 
 ### Networking:
 - If you want to use n.eko in **external** network, you can omit `NEKO_NAT1TO1`. It will automatically get your Public IP.
 - If you want to use n.eko in **internal** network, set `NEKO_NAT1TO1` to your local IP address (e.g. `NEKO_NAT1TO1: 192.168.1.20`)-
-
+- Currently, it is not supported to supply multiple NAT addresses (see https://github.com/m1k1o/neko/issues/47).
-Currently, it is not supported to supply multiple NAT addresses directly to neko  (see https://github.com/m1k1o/neko/issues/47).
-
-But it can be acheived by deploying own turn server alongside neko that is accessible from your LAN:
-
-```yaml
-version: "3.4"
-services:
-  neko:
-    image: "m1k1o/neko:firefox"
-    restart: "unless-stopped"
-    shm_size: "2gb"
-    ports:
-      - "8080:8080"
-      - "52000-52100:52000-52100/udp"
-    environment:
-      NEKO_SCREEN: 1920x1080@30
-      NEKO_PASSWORD: neko
-      NEKO_PASSWORD_ADMIN: admin
-      NEKO_EPR: 52000-52100
-      NEKO_ICESERVERS: '[{ "urls": [ "turn:192.168.1.60:3478" ], "username":"neko", "credential":"neko" }, { "urls": [ "stun:stun.nextcloud.com:3478" ] }]'
-  coturn:
-    image: 'coturn/coturn:latest'
-    network_mode: "host"
-    command: |
-      -n
-      --realm=localhost
-      --fingerprint
-      --listening-ip=0.0.0.0
-      --external-ip=192.168.1.60
-      --listening-port=3478
-      --min-port=49160
-      --max-port=49200
-      --log-file=stdout
-      --user=neko:neko
-      --lt-cred-mech
-```
-
-- Replace `192.168.1.60` with your LAN IP address, and allow ports `49160-49200/udp` and `3478/tcp` in your LAN.
-- Make sure you don't use `NEKO_ICELITE: true` because ICE LITE does not support TURN servers.
-
-This setup adds local turn server to neko. It won't be reachable by your remote clients and your own IP won't be reachable from your lan. So it effectively just adds local candidate and allows connections from LAN.
 
 ### Why so many ports?
 - WebRTC needs UDP ports in order to transfer Audio/Video towards user and Mouse/Keyboard events to the server in real time.
@@ -173,17 +121,6 @@ services:
   - UDP is generally better for latency. But some networks block UDP so it is good to have TCP available as fallback.
 - Still, using `NEKO_ICELITE=true` is recommended.
 
-### Using turn servers instead of port forwarding
-
-- If you don't want to use port forwarding, you can use turn servers.
-- But you need to have your own turn server (e.g. [cotrun](https://github.com/coturn/coturn)) or have access to one.
-- They are generally not free, because they require a lot of bandwidth.
-- Please make sure that you correctly escape your turn server credentials in the environment variable or use aphostrophes.
-
-```yaml
-NEKO_ICESERVERS: '[{"urls": ["turn:<MY-COTURN-SERVER>:443?transport=udp", "turn:<MY-COTURN-SERVER>:443?transport=tcp", "turns:<MY-COTURN-SERVER>:443?transport=udp", "turns:<MY-COTURN-SERVER>:443?transport=tcp"], "credential": "<MY-COTURN-CREDENTIAL"}, {"urls": ["stun:stun.nextcloud.com:443"]}]'
-```
-
 ### Want to customize and install own add-ons, set custom bookmarks?
 - You would need to modify the existing policy file and mount it to your container.
 - For Firefox, copy [this](https://github.com/m1k1o/neko/blob/master/.docker/firefox/policies.json) file, modify and mount it as: ` -v '${PWD}/policies.json:/usr/lib/firefox/distribution/policies.json'`
@@ -191,7 +128,7 @@ NEKO_ICESERVERS: '[{"urls": ["turn:<MY-COTURN-SERVER>:443?transport=udp", "turn:
 - For others, see where existing `policies.json` is placed in their `Dockerfile`.
 
 #### Allow file uploading & downloading
-- From security perspective, browser is not enabled to access local file data.
+- From security perespective, browser is not enabled to access local file data.
 - If you want to enable this, you need to modify following policies:
 ```json
   "DownloadRestrictions": 0,
@@ -208,76 +145,13 @@ NEKO_ICESERVERS: '[{"urls": ["turn:<MY-COTURN-SERVER>:443?transport=udp", "turn:
 - For other chromium based browsers, see in `supervisord.conf` folder that is specified in `--user-data-dir`.
 
 #### Allow persistent data in policies
-- From security perspective, browser is set up to forget all cookies and browsing history when its closed.
+- From security perespective, browser is set up to forget all cookies and brwosing history when its closed.
 - If you want to enable this, you need to modify following policies:
 ```json
   "DefaultCookiesSetting": 1,
   "RestoreOnStartup": 1,
 ```
 
-### Nvidia GPU acceleration
-
-You need to have [NVIDIA Container Toolkit](https://github.com/NVIDIA/nvidia-container-toolkit) installed, start the container with `--gpus all` flag and use images built for nvidia (see above).
-
-```bash
-docker run -d --gpus all \
-  -p 8080:8080 \
-  -p 56000-56100:56000-56100/udp \
-  -e NEKO_SCREEN=1920x1080@30 \
-  -e NEKO_PASSWORD=neko \
-  -e NEKO_PASSWORD_ADMIN=admin \
-  -e NEKO_EPR=56000-56100 \
-  -e NEKO_NAT1TO1=192.168.1.10 \
-  -e NEKO_ICELITE=1 \
-  -e NEKO_VIDEO_CODEC=h264 \
-  -e NEKO_HWENC=nvenc \
-  --shm-size=2gb \
-  --cap-add=SYS_ADMIN \
-  --name neko \
-  ghcr.io/m1k1o/neko/nvidia-google-chrome:latest
-```
-
-If you want to use docker-compose, you can use this example:
-
-```yaml
-version: "3.4"
-services:
-  neko:
-    image: "ghcr.io/m1k1o/neko/nvidia-google-chrome:latest"
-    restart: "unless-stopped"
-    shm_size: "2gb"
-    ports:
-      - "8080:8080"
-      - "56000-56100:56000-56100/udp"
-    cap_add:
-      - SYS_ADMIN
-    environment:
-      NEKO_SCREEN: '1920x1080@30'
-      NEKO_PASSWORD: neko
-      NEKO_PASSWORD_ADMIN: admin
-      NEKO_EPR: 56000-56100
-      NEKO_NAT1TO1: 192.168.1.10
-      NEKO_VIDEO_CODEC: h264
-      NEKO_HWENC: nvenc
-    deploy:
-      resources:
-        reservations:
-          devices:
-            - driver: nvidia
-              count: 1
-              capabilities: [gpu]
-```
-
-- You can verify that GPU is available inside the container by running `docker exec -it neko nvidia-smi` command.
-- You can verify that GPU is used for encoding by searching for `nvh264enc` in `docker logs neko` output.
-- If you don'ŧ specify `NEKO_HWENC: nvenc` environment variable, CPU encoding will be used but GPU will still be available for browser rendering.
-
-Broadcast pipeline is not hardware accelerated by default. You can use this pipeline created by [@evilalmus](https://github.com/m1k1o/neko/issues/276#issuecomment-1498362533).
-
-```yaml
-NEKO_BROADCAST_PIPELINE: "flvmux name=mux ! rtmpsink location={url} pulsesrc device={device} ! audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. ximagesrc display-name={display} show-pointer=false use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! video/x-raw,format=NV12 ! nvh264enc name=encoder preset=low-latency-hq gop-size=25 spatial-aq=true temporal-aq=true bitrate=2800 vbv-buffer-size=2800 rc-mode=6 ! h264parse config-interval=-1 ! video/x-h264,stream-format=byte-stream,profile=high ! h264parse ! mux."
-```
-
 ### Want to use VPN for your n.eko browsing?
 - Check this out: https://github.com/m1k1o/neko-vpn
 
@@ -295,11 +169,6 @@ NEKO_BROADCAST_PIPELINE: "flvmux name=mux ! rtmpsink location={url} pulsesrc dev
   - Adding `?pwd=<password>` will prefill password.
   - Adding `?usr=<display-name>` will prefill username.
   - Adding `?cast=1` will hide all control and show only video.
-  - Adding `?embed=1` will hide most additional components and show only video.
-  - Adding `?volume=<0-1>` will set volume to given value.
-  - Adding `?lang=<language>` will set language to given value.
-  - Adding `?show_side=1` will show the sidebar on startup.
-  - Adding `?mute_chat=1` will mute the chat on startup.
   - e.g. `http(s)://<URL:Port>/?pwd=neko&usr=guest&cast=1`
 
 ### Screen size

docs/getting-started/configuration.md

@@ -25,7 +25,7 @@ nat1to1: <ip>
   - Control protection means, users can gain control only if at least one admin is in the room.
   - e.g. `false`
 #### `NEKO_IMPLICIT_CONTROL`:
-  - If enabled members can gain control implicitly, they don't need to request control.
+  - If enabled members can gain control implicitly, they don't needd to request control.
   - e.g. `false`
 #### `NEKO_LOCKS`:
   - Resources, that will be locked when starting, separated by whitespace.
@@ -79,14 +79,13 @@ nat1to1: <ip>
     - `gstreamer1.0-plugins-good`
     - `gstreamer1.0-plugins-bad`
     - `gstreamer1.0-plugins-ugly`
-  - e.g. `ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! video/x-raw,format=NV12 ! x264enc threads=4 bitrate=3500 key-int-max=60 vbv-buf-capacity=4000 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline`
+  - e.g. `ximagesrc display-name=%s show-pointer=true use-damage=false ! video/x-raw,framerate=30/1 ! videoconvert ! queue ! video/x-raw,format=NV12 ! x264enc threads=4 bitrate=3500 key-int-max=60 vbv-buf-capacity=4000 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream`
 #### `NEKO_MAX_FPS`:
   - The resulting stream frames per seconds should be capped *(0 for uncapped)*.
   - e.g. `0`
 #### `NEKO_HWENC`:
-  - none *(default CPU encoding)*
+  - Use hardware accelerated encoding, for now supported only `VAAPI`.
-  - vaapi
+  - e.g. `VAAPI`
-  - nvenc
 
 ### Audio
 
@@ -94,7 +93,7 @@ nat1to1: <ip>
   - opus *(default encoder)*
   - g722
   - pcmu
-  - pcma
+  - pcma 
 #### `NEKO_AUDIO_BITRATE`:
   - Bitrate of the audio stream in kb/s.
   - e.g. `196`
@@ -137,7 +136,7 @@ nat1to1: <ip>
   - Enable file transfer feature.
   - e.g. `true`
 #### `NEKO_FILE_TRANSFER_PATH`:
-  - Path where files will be transferred between the host and users. By default, this is
+  - Path where files will be transferred between the host and users. By default this is
   `/home/neko/Downloads`. If the path doesn't exist, it will be created.
   - e.g. `/home/neko/Desktop`
 
@@ -168,7 +167,7 @@ Flags:
       --cert string                 path to the SSL cert used to secure the neko server
       --control_protection          control protection means, users can gain control only if at least one admin is in the room
       --cors strings                list of allowed origins for CORS (default [*])
-      --device string               audio device to capture (default "audio_output.monitor")
+      --device string               audio device to capture (default "auto_null.monitor")
       --display string              XDisplay to capture (default ":99.0")
       --epr string                  limits the pool of ephemeral ports that ICE UDP connections can allocate from (default "59000-59100")
       --file_transfer_enabled       enable file transfer feature (default false)

docs/getting-started/examples.md

@@ -72,8 +72,7 @@ services:
 version: "3.4"
 services:
   neko:
-    # see docs for more variants
+    image: "m1k1o/neko:arm-chromium"
-    image: "ghcr.io/m1k1o/neko/arm-chromium:latest"
     restart: "unless-stopped"
     # increase on rpi's with more then 1gb ram.
     shm_size: "520mb"
@@ -96,9 +95,9 @@ services:
           ! videoconvert
           ! queue
           ! video/x-raw,framerate=30/1,format=NV12
-          ! v4l2h264enc extra-controls="controls,h264_profile=1,video_bitrate=1250000;"
+          ! v4l2h264enc extra-controls="controls,h264_profile=0,video_bitrate=1250000;"
           ! h264parse config-interval=3
-          ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline
+          ! video/x-h264,profile=baseline,stream-format=byte-stream
       NEKO_VIDEO_CODEC: h264
 ```
 

docs/getting-started/faq.md

@@ -1,57 +0,0 @@
-# Frequently Asked Questions
-
-## How to enable debug mode?
-
-To see verbose information from n.eko server, you can enable debug mode using `NEKO_DEBUG`.
-
-```diff
-version: "3.4"
-services:
-  neko:
-    image: "m1k1o/neko:firefox"
-    restart: "unless-stopped"
-    shm_size: "2gb"
-    ports:
-      - "8080:8080"
-      - "52000-52100:52000-52100/udp"
-    environment:
-     NEKO_SCREEN: 1920x1080@30
-     NEKO_PASSWORD: neko
-     NEKO_PASSWORD_ADMIN: admin
-     NEKO_EPR: 52000-52100
-     NEKO_ICELITE: 1
-+     NEKO_DEBUG: 1
-```
-
-Ensure, that you have enabled debug mode in javascript console too, in order to see verbose information from client.
-
-## Chinese input method is not working
-
-There exists an extension for Chrome that allows you to use Chinese input method. You can install it from [here](https://chrome.google.com/webstore/detail/mclkkofklkfljcocdinagocijmpgbhab). Alternatively, you can use Google Input Tools from [here](https://www.google.com/inputtools/chrome/).
-
-## Only black screen is displayed but remote cursor is moving for Chromium-based browsers (Chrome, Edge, etc.)
-
-Check if you did not forget to add cap_add to your docker-compose file.
-
-```yaml
-    cap_add:
-      - SYS_ADMIN
-```
-
-## How can I embed the Neko desktop into web page without login prompt coming up for viewers?
-
-You can use the following URL to embed the Neko desktop into a web page without login prompt coming up for viewers:
-
-```
-http://<your-neko-server-ip>:8080/?usr=neko&pwd=neko
-```
-
-https://stackoverflow.com/questions/15276929/how-to-make-a-video-fullscreen-when-it-is-placed-inside-an-iframe
-
-Your iframe needs an attribute: `allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true"` or more modern `allow="fullscreen *"`. For the second you can remove the star if your iframe has the same origin or replace it with your iframe origin.
-
-## Can I use neko without docker?
-
-It is strongly recommended to use Neko with Docker, as it is the easiest way to run it. But you should be able to install Neko "natively" on your host system. Neko is based on Debian and uses Xorg and Pulseaudio. You would just need to follow steps that are in Dockerfile, install all dependencies on your host system and then just run it.
-
-However, it is recommend to start with existing system that has GUI with desktop manager, is based on Xorg and uses Pulseaudio (e.g. Ubuntu Desktop 22.04). For that matter you only need to install gstreamer dependencies, configure pulseaudio properly and run neko binary (you don't need to build it from scratch, you can copy it from docker image).

docs/getting-started/reverse-proxy.md

@@ -42,9 +42,9 @@ server {
 
 After successfully installing and running neko, you might want to get rid of the port in the url, use DNS instead of IP address and also having SSL.
 This will remove the port from the URL and also enables HTTPS.
-To do this, you have to get running Apache server. Now you can go into the `/etc/apache2/sites-available` folder and create new config file for example `neko.conf`
+To do this, you have to get running apache server. Now you can go into the `/etc/apache2/sites-available` folder and create new config file for example `neko.conf`
-After creating new config file, you can use this example config and paste it in. Some things may vary on your machine so read through and modify if needed.
+After creating new config file, you can use this example config and paste it in. Some thing might vary on your machine so read through and modify if needed.
-Bear in mind that your neko server doesn't have to run on the same computer as Apache. They just have to be on the same network, and then you replace localhost with correct internal IP.
+Bear in mind that your neko server doesn't have to run on the same computer as apache. They just have to be on the same network and then you replace localhost with correct internal IP.
 
 ```xml
 <VirtualHost *:80>

docs/getting-started/troubleshooting.md

@@ -1,6 +1,6 @@
 # Troubleshooting
 
-Neko UI loads, but you don't see the screen, and it gives you `connection timeout` or `disconnected` error?
+Neko UI loads but you don't see the screen and it gives you `connection timeout` or `disconnected` error?
 
 ## Test your client
 
@@ -42,7 +42,7 @@ services:
 
 Ensure, that your ports are reachable through your external IP.
 
-To validate UDP connection the simplest way, run this on your server:
+To validate UDP connection the simpliest way, run this on your server:
 
 ```shell
 nc -ul 52101
@@ -61,7 +61,7 @@ If it does not work for you, then most likely your port forwarding is not workin
 
 ### Check if your external IP was determined correctly
 
-One of the first logs, when the server starts, writes down your external IP that will be sent to your clients to connect to.
+One of the first logs, when the server starts, writes down your external IP that will be sent to your clients to conenct to.
 
 ```shell
 docker-compose logs neko | grep nat_ips
@@ -73,7 +73,7 @@ You should see this:
 11:11AM INF webrtc starting ephemeral_port_range=52000-52100 ice_lite=true ice_servers="[{URLs:[stun:stun.l.google.com:19302] Username: Credential:<nil> CredentialType:password}]" module=webrtc nat_ips=<your-IP>
 ```
 
-If your IP is not correct, you can specify own IP resolver using `NEKO_IPFETCH`. It needs to return IP address that will be used.
+If your IP is not correct, you can specify own IP resover using `NEKO_IPFETCH`. It needs to return IP address that will be used.
 
 ```diff
 version: "3.4"
@@ -94,7 +94,7 @@ services:
 +     NEKO_IPFETCH: https://ifconfig.co/ip
 ```
 
-Or you can specify your IP address manually using `NEKO_NAT1TO1`: (It's read as NAT 1 to 1, so it's capital letter 'O', not zero '0', in NAT1`TO`1)
+Or you can specify your IP address manually using `NEKO_NAT1TO1`:
 
 ```diff
 version: "3.4"
@@ -119,17 +119,16 @@ If you want to use n.eko only locally, you must put here your local IP address,
 
 ### Neko works externally, but not locally
 
-You are probably missing NAT Loopback (NAT Hairpinning) setting on your router.
+You are probabbly missing NAT Loopback (NAT Hairpinning) setting on your router.
 
 Example for pfsense with truecharts docker container:
 - First, port forward the relevant ports 8080 and 52000-52100/udp for the container.
 - Then turn on `Pure NAT` pfsense (under system > advanced > firewall and nat).
   - Make sure to check the two boxes so it works.
-- Make sure `NEKO_NAT1TO1` is blank and `NEKO_IPFETCH` address is working correctly (if unset default value is chosen).
+- Make sure `NEKO_NAT1TO1` is blank and `NEKO_IPFETCH` address is working correclty (if unset default value is chosen).
 - Test externally to confirm it works.
 - Internally you have to access it using `<your-public-ip>:port`
 
-If your router does not support NAT Loopback (NAT Hairpinning), you can use turn servers to overcome this issue. See [more details here](https://neko.m1k1o.net/#/getting-started/?id=networking) on how to setup local coturn instance.
 
 ### Neko works locally, but not externally
 
@@ -202,7 +201,7 @@ Check if your TCP port is exposed correctly and your reverse proxy is correctly
 Getting black screen with a cursor, but no browser.
 ```
 
-Most likely you forgot to add `-cap-add=SYS_ADMIN` when using chromium-based browsers.
+Most likely you forgot to add `-cap-add=SYS_ADMIN` when using chromium-based brwosers.
 
 ### Unrelated server errors
 
@@ -211,17 +210,3 @@ Most likely you forgot to add `-cap-add=SYS_ADMIN` when using chromium-based bro
 ```
 
 This error originates from browser, that it could not connect to dbus. This does not affect us and can be ignored.
-
-### Broadcast pipeline not working with some ingest servers
-
-See [related issue](https://github.com/m1k1o/neko/issues/276).
-
-```
-Could not connect to RTMP stream "'rtmp://<ingest-url>/live/<stream-key-removed> live=1'" for writing
-```
-
-Some ingest servers require `live=1` parameter in the URL (e.g. nginx-rtmp-module). Some do not and do not accept aphostrophes (e.g. owncast). You can try to change the pipeline to:
-
-```yaml
-NEKO_BROADCAST_PIPELINE: "flvmux name=mux ! rtmpsink location={url} pulsesrc device={device} ! audio/x-raw,channels=2 ! audioconvert ! voaacenc ! mux. ximagesrc display-name={display} show-pointer=false use-damage=false ! video/x-raw,framerate=28/1 ! videoconvert ! queue ! x264enc bframes=0 key-int-max=0 byte-stream=true tune=zerolatency speed-preset=veryfast ! mux."
-```

server/build

@@ -1,35 +1,10 @@
 #!/bin/bash
 
-#
+set -ex
-# aborting if any command returns a non-zero value
-set -e
 
 BUILD_TIME=`date -u +'%Y-%m-%dT%H:%M:%SZ'`
+GIT_COMMIT=`git rev-parse --short HEAD`
+GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
+GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"`
 
-#
+go build -o bin/neko -ldflags "-s -X 'm1k1o/neko.buildDate=${BUILD_TIME}' -X 'm1k1o/neko.gitCommit=${GIT_DIRTY}${GIT_COMMIT}' -X 'm1k1o/neko.gitBranch=${GIT_BRANCH}'" -i cmd/neko/main.go
-# set git build variables if git exists
-if git status > /dev/null 2>&1 && [ -z $GIT_COMMIT ] && [ -z $GIT_BRANCH ] && [ -z $GIT_TAG ];
-then
-    GIT_COMMIT=`git rev-parse --short HEAD`
-    GIT_BRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
-    GIT_TAG=`git tag --points-at $GIT_COMMIT | head -n 1`
-    GIT_DIRTY=`git diff-index --quiet HEAD -- || echo "✗-"`
-    GIT_COMMIT="${GIT_DIRTY}${GIT_COMMIT}"
-fi
-
-#
-# load dependencies
-go get -v -t -d .
-
-#
-# build server
-go build \
-    -o bin/neko \
-    -ldflags "
-        -s -w
-        -X 'm1k1o/neko.buildDate=${BUILD_TIME}'
-        -X 'm1k1o/neko.gitCommit=${GIT_COMMIT}'
-        -X 'm1k1o/neko.gitBranch=${GIT_BRANCH}'
-        -X 'm1k1o/neko.gitTag=${GIT_TAG}'
-    " \
-    cmd/neko/main.go;

server/go.mod

@@ -1,27 +1,27 @@
 module m1k1o/neko
 
-go 1.20
+go 1.19
 
 require (
 	github.com/fsnotify/fsnotify v1.6.0
-	github.com/go-chi/chi/v5 v5.0.10
+	github.com/go-chi/chi v4.1.2+incompatible
 	github.com/go-chi/cors v1.2.1
 	github.com/gorilla/websocket v1.5.0
-	github.com/pion/ice/v2 v2.3.0
+	github.com/pion/ice/v2 v2.2.13
 	github.com/pion/interceptor v0.1.12
 	github.com/pion/logging v0.2.2
 	github.com/pion/rtp v1.7.13 // indirect
-	github.com/pion/srtp/v2 v2.0.12 // indirect
+	github.com/pion/srtp/v2 v2.0.11 // indirect
-	github.com/pion/webrtc/v3 v3.1.55
+	github.com/pion/webrtc/v3 v3.1.50
 	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.29.0
+	github.com/rs/zerolog v1.28.0
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.6.1
 	github.com/spf13/viper v1.15.0
-	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )
 
@@ -36,17 +36,17 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pion/datachannel v1.5.5 // indirect
-	github.com/pion/dtls/v2 v2.2.6 // indirect
+	github.com/pion/dtls/v2 v2.1.5 // indirect
-	github.com/pion/mdns v0.0.7 // indirect
+	github.com/pion/mdns v0.0.5 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.10 // indirect
 	github.com/pion/sctp v1.8.6 // indirect
 	github.com/pion/sdp/v3 v3.0.6 // indirect
-	github.com/pion/stun v0.4.0 // indirect
+	github.com/pion/stun v0.3.5 // indirect
-	github.com/pion/transport/v2 v2.0.2 // indirect
+	github.com/pion/transport v0.14.1 // indirect
-	github.com/pion/turn/v2 v2.1.0 // indirect
+	github.com/pion/turn/v2 v2.0.9 // indirect
-	github.com/pion/udp/v2 v2.0.1 // indirect
+	github.com/pion/udp v0.1.2 // indirect
-	github.com/spf13/afero v1.9.4 // indirect
+	github.com/spf13/afero v1.9.3 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect

server/go.sum

@@ -63,8 +63,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -180,19 +180,21 @@ github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvI
 github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8=
 github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0=
-github.com/pion/dtls/v2 v2.2.4/go.mod h1:WGKfxqhrddne4Kg3p11FUMJrynkOY4lb25zHNO49wuw=
+github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
-github.com/pion/dtls/v2 v2.2.6 h1:yXMxKr0Skd+Ub6A8UqXTRLSywskx93ooMRHsQUtd+Z4=
+github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
-github.com/pion/dtls/v2 v2.2.6/go.mod h1:t8fWJCIquY5rlQZwA2yWxUS1+OCrAdXrhVKXB5oD/wY=
+github.com/pion/ice/v2 v2.2.12/go.mod h1:z2KXVFyRkmjetRlaVRgjO9U3ShKwzhlUylvxKfHfd5A=
-github.com/pion/ice/v2 v2.3.0 h1:G+ysriabk1p9wbySDpdsnlD+6ZspLlDLagRduRfzJPk=
+github.com/pion/ice/v2 v2.2.13 h1:NvLtzwcyob6wXgFqLmVQbGB3s9zzWmOegNMKYig5l9M=
-github.com/pion/ice/v2 v2.3.0/go.mod h1:+xO/cXVnnVUr6D2ZJcCT5g9LngucUkkTvfnTMqUxKRM=
+github.com/pion/ice/v2 v2.2.13/go.mod h1:eFO4/1zCI+a3OFVt7l7kP+5jWCuZo8FwU2UwEa3+164=
+github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
 github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
 github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
-github.com/pion/mdns v0.0.7 h1:P0UB4Sr6xDWEox0kTVxF0LmQihtCbSAdW0H2nEgkA3U=
+github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw=
-github.com/pion/mdns v0.0.7/go.mod h1:4iP2UbeFhLI/vWju/bw6ZfwjJzk0z8DNValjGxR/dD8=
+github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g=
 github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
+github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
 github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
 github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
 github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
@@ -202,23 +204,24 @@ github.com/pion/sctp v1.8.6 h1:CUex11Vkt9YS++VhLf8b55O3VqKrWL6W3SDwX4jAqsI=
 github.com/pion/sctp v1.8.6/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0=
 github.com/pion/sdp/v3 v3.0.6 h1:WuDLhtuFUUVpTfus9ILC4HRyHsW6TdugjEX/QY9OiUw=
 github.com/pion/sdp/v3 v3.0.6/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw=
-github.com/pion/srtp/v2 v2.0.12 h1:WrmiVCubGMOAObBU1vwWjG0H3VSyQHawKeer2PVA5rY=
+github.com/pion/srtp/v2 v2.0.10/go.mod h1:XEeSWaK9PfuMs7zxXyiN252AHPbH12NX5q/CFDWtUuA=
-github.com/pion/srtp/v2 v2.0.12/go.mod h1:C3Ep44hlOo2qEYaq4ddsmK5dL63eLehXFbHaZ9F5V9Y=
+github.com/pion/srtp/v2 v2.0.11 h1:6cEEgT1oCLWgE+BynbfaSMAxtsqU0M096x9dNH6olY0=
-github.com/pion/stun v0.4.0 h1:vgRrbBE2htWHy7l3Zsxckk7rkjnjOsSM7PHZnBwo8rk=
+github.com/pion/srtp/v2 v2.0.11/go.mod h1:vzHprzbuVoYJ9NfaRMycnFrkHcLSaLVuBZDOtFQNZjY=
-github.com/pion/stun v0.4.0/go.mod h1:QPsh1/SbXASntw3zkkrIk3ZJVKz4saBY2G7S10P3wCw=
+github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg=
+github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA=
+github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q=
+github.com/pion/transport v0.13.0/go.mod h1:yxm9uXpK9bpBBWkITk13cLo1y5/ur5VQpG22ny6EP7g=
+github.com/pion/transport v0.13.1/go.mod h1:EBxbqzyv+ZrmDb82XswEE0BjfQFtuw1Nu6sjnjWCsGg=
 github.com/pion/transport v0.14.1 h1:XSM6olwW+o8J4SCmOBb/BpwZypkHeyM0PGFCxNQBr40=
 github.com/pion/transport v0.14.1/go.mod h1:4tGmbk00NeYA3rUa9+n+dzCCoKkcy3YlYb99Jn2fNnI=
-github.com/pion/transport/v2 v2.0.0/go.mod h1:HS2MEBJTwD+1ZI2eSXSvHJx/HnzQqRy2/LXxt6eVMHc=
+github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
-github.com/pion/transport/v2 v2.0.1/go.mod h1:93OYg91+mrGxKW+Jrgzmqr80kgXqD7J0yybOrdr7w0Y=
+github.com/pion/turn/v2 v2.0.9 h1:jcDPw0Vfd5I4iTc7s0Upfc2aMnyu2lgJ9vV0SUrNC1o=
-github.com/pion/transport/v2 v2.0.2 h1:St+8o+1PEzPT51O9bv+tH/KYYLMNR5Vwm5Z3Qkjsywg=
+github.com/pion/turn/v2 v2.0.9/go.mod h1:DQlwUwx7hL8Xya6TTAabbd9DdKXTNR96Xf5g5Qqso/M=
-github.com/pion/transport/v2 v2.0.2/go.mod h1:vrz6bUbFr/cjdwbnxq8OdDDzHf7JJfGsIRkxfpZoTA0=
+github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
-github.com/pion/turn/v2 v2.1.0 h1:5wGHSgGhJhP/RpabkUb/T9PdsAjkGLS6toYz5HNzoSI=
+github.com/pion/udp v0.1.2 h1:Bl1ifOcoVYg9gnk1+9yyTX8XgAUORiDvM7UqBb3skhg=
-github.com/pion/turn/v2 v2.1.0/go.mod h1:yrT5XbXSGX1VFSF31A3c1kCNB5bBZgk/uu5LET162qs=
+github.com/pion/udp v0.1.2/go.mod h1:CuqU2J4MmF3sjqKfk1SaIhuNXdum5PJRqd2LHuLMQSk=
-github.com/pion/udp v0.1.4/go.mod h1:G8LDo56HsFwC24LIcnT4YIDU5qcB6NepqqjP0keL2us=
+github.com/pion/webrtc/v3 v3.1.50 h1:wLMo1+re4WMZ9Kun9qcGcY+XoHkE3i0CXrrc0sjhVCk=
-github.com/pion/udp/v2 v2.0.1 h1:xP0z6WNux1zWEjhC7onRA3EwwSliXqu1ElUZAQhUP54=
+github.com/pion/webrtc/v3 v3.1.50/go.mod h1:y9n09weIXB+sjb9mi0GBBewNxo4TKUQm5qdtT5v3/X4=
-github.com/pion/udp/v2 v2.0.1/go.mod h1:B7uvTMP00lzWdyMr/1PVZXtV3wpPIxBRd4Wl6AksXn8=
-github.com/pion/webrtc/v3 v3.1.55 h1:jQt98hZ8DUi/l/s/rtogthBdsKKvKekFgZCX9hMEqRo=
-github.com/pion/webrtc/v3 v3.1.55/go.mod h1:M1gU5mnvvo4e1nnLvF23esYz0nZAFOtbU/wq44MSfbc=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -230,12 +233,12 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w=
+github.com/rs/zerolog v1.28.0 h1:MirSo27VyNi7RJYP3078AA1+Cyzd2GB66qy3aUHvsWY=
-github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
+github.com/rs/zerolog v1.28.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
-github.com/spf13/afero v1.9.4 h1:Sd43wM1IWz/s1aVXdOBkjJvuP8UdyqioeE4AmM0QsBs=
+github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk=
-github.com/spf13/afero v1.9.4/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
+github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y=
 github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
 github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
@@ -252,6 +255,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -278,9 +282,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -345,16 +350,22 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -417,20 +428,23 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -440,9 +454,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

server/internal/capture/gst/gst.c

@@ -3,8 +3,8 @@
 static void gstreamer_pipeline_log(GstPipelineCtx *ctx, char* level, const char* format, ...) {
   va_list argptr;
   va_start(argptr, format);
-  char buffer[4096];
+  char buffer[100];
-  vsnprintf(buffer, sizeof(buffer), format, argptr);
+  vsprintf(buffer, format, argptr);
   va_end(argptr);
   goPipelineLog(level, buffer, ctx->pipelineId);
 }

server/internal/capture/gst/gst.go

@@ -31,29 +31,12 @@ var pSerial int32
 var pipelines = make(map[int]*Pipeline)
 var pipelinesLock sync.Mutex
 var registry *C.GstRegistry
-var gMainLoop *C.GMainLoop
 
 func init() {
 	C.gst_init(nil, nil)
 	registry = C.gst_registry_get()
 }
 
-func RunMainLoop() {
-	if gMainLoop != nil {
-		return
-	}
-	gMainLoop = C.g_main_loop_new(nil, C.int(0))
-	C.g_main_loop_run(gMainLoop)
-}
-
-func QuitMainLoop() {
-	if gMainLoop == nil {
-		return
-	}
-	C.g_main_loop_quit(gMainLoop)
-	gMainLoop = nil
-}
-
 func CreatePipeline(pipelineStr string) (*Pipeline, error) {
 	id := atomic.AddInt32(&pSerial, 1)
 

server/internal/capture/manager.go

@@ -2,13 +2,14 @@ package capture
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"m1k1o/neko/internal/capture/gst"
 	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
+	"m1k1o/neko/internal/types/codec"
 )
 
 type CaptureManagerCtx struct {
@@ -19,6 +20,9 @@ type CaptureManagerCtx struct {
 	broadcast *BroacastManagerCtx
 	audio     *StreamSinkManagerCtx
 	video     *StreamSinkManagerCtx
+
+	// source-sinks
+	screenshare *StreamSrcSinkManagerCtx
 }
 
 func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCtx {
@@ -44,6 +48,15 @@ func New(desktop types.DesktopManager, config *config.Capture) *CaptureManagerCt
 			}
 			return NewVideoPipeline(config.VideoCodec, config.Display, config.VideoPipeline, fps, config.VideoBitrate, config.VideoHWEnc)
 		}, "video"),
+
+		// source-sinks
+		screenshare: streamSrcSinkNew(config.ScreenshareEnabled, map[string]string{
+			codec.VP8().Name: "appsrc format=time is-live=true do-timestamp=true name=appsrc " +
+				fmt.Sprintf("! application/x-rtp, payload=%d, encoding-name=VP8-DRAFT-IETF-01 ", codec.VP8().PayloadType) +
+				"! rtpvp8depay " +
+				"! appsink name=appsink",
+			// TODO: Add support for more codecs.
+		}, "webcam"),
 	}
 }
 
@@ -54,7 +67,6 @@ func (manager *CaptureManagerCtx) Start() {
 		}
 	}
 
-	go gst.RunMainLoop()
 	go func() {
 		for {
 			before, ok := <-manager.desktop.GetScreenSizeChangeChannel()
@@ -97,13 +109,12 @@ func (manager *CaptureManagerCtx) Start() {
 func (manager *CaptureManagerCtx) Shutdown() error {
 	manager.logger.Info().Msgf("shutdown")
 
+	manager.screenshare.shutdown()
 	manager.broadcast.shutdown()
 
 	manager.audio.shutdown()
 	manager.video.shutdown()
 
-	gst.QuitMainLoop()
-
 	return nil
 }
 
@@ -118,3 +129,7 @@ func (manager *CaptureManagerCtx) Audio() types.StreamSinkManager {
 func (manager *CaptureManagerCtx) Video() types.StreamSinkManager {
 	return manager.video
 }
+
+func (manager *CaptureManagerCtx) Screenshare() types.StreamSrcSinkManager {
+	return manager.screenshare
+}

server/internal/capture/pipelines.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"m1k1o/neko/internal/capture/gst"
-	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types/codec"
 )
 
@@ -53,7 +52,7 @@ func NewBroadcastPipeline(device string, display string, pipelineSrc string, url
 	return pipelineStr, nil
 }
 
-func NewVideoPipeline(rtpCodec codec.RTPCodec, display string, pipelineSrc string, fps int16, bitrate uint, hwenc config.HwEnc) (string, error) {
+func NewVideoPipeline(rtpCodec codec.RTPCodec, display string, pipelineSrc string, fps int16, bitrate uint, hwenc string) (string, error) {
 	pipelineStr := " ! appsink name=appsinkvideo"
 
 	// if using custom pipeline
@@ -69,7 +68,7 @@ func NewVideoPipeline(rtpCodec codec.RTPCodec, display string, pipelineSrc strin
 
 	switch rtpCodec.Name {
 	case codec.VP8().Name:
-		if hwenc == config.HwEncVAAPI {
+		if hwenc == "VAAPI" {
 			if err := gst.CheckPlugins([]string{"ximagesrc", "vaapi"}); err != nil {
 				return "", err
 			}
@@ -139,40 +138,35 @@ func NewVideoPipeline(rtpCodec codec.RTPCodec, display string, pipelineSrc strin
 			return "", err
 		}
 
-		vbvbuf := uint(1000)
+		if hwenc == "VAAPI" {
-		if bitrate > 1000 {
-			vbvbuf = bitrate
-		}
-
-		if hwenc == config.HwEncVAAPI {
 			if err := gst.CheckPlugins([]string{"vaapi"}); err != nil {
 				return "", err
 			}
 
-			pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=NV12 ! vaapih264enc rate-control=vbr bitrate=%d keyframe-period=180 quality-level=7 ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline"+pipelineStr, display, fps, bitrate)
+			pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=NV12 ! vaapih264enc rate-control=vbr bitrate=%d keyframe-period=180 quality-level=7 ! video/x-h264,stream-format=byte-stream"+pipelineStr, display, fps, bitrate)
-		} else if hwenc == config.HwEncNVENC {
-			if err := gst.CheckPlugins([]string{"nvcodec"}); err != nil {
-				return "", err
-			}
 
-			pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=NV12 ! nvh264enc name=encoder preset=2 gop-size=25 spatial-aq=true temporal-aq=true bitrate=%d vbv-buffer-size=%d rc-mode=6 ! h264parse config-interval=-1 ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline"+pipelineStr, display, fps, bitrate, vbvbuf)
 		} else {
 			// https://gstreamer.freedesktop.org/documentation/openh264/openh264enc.html?gi-language=c#openh264enc
 			// gstreamer1.0-plugins-bad
 			// openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000
 			if err := gst.CheckPlugins([]string{"openh264"}); err == nil {
-				pipelineStr = fmt.Sprintf(videoSrc+"openh264enc multi-thread=4 complexity=high bitrate=%d max-bitrate=%d ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline"+pipelineStr, display, fps, bitrate*1000, (bitrate+1024)*1000)
+				pipelineStr = fmt.Sprintf(videoSrc+"openh264enc multi-thread=4 complexity=high bitrate=%d max-bitrate=%d ! video/x-h264,stream-format=byte-stream"+pipelineStr, display, fps, bitrate*1000, (bitrate+1024)*1000)
 				break
 			}
 
 			// https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c
 			// gstreamer1.0-plugins-ugly
-			// video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline
+			// video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream
 			if err := gst.CheckPlugins([]string{"x264"}); err != nil {
 				return "", err
 			}
 
-			pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=NV12 ! x264enc threads=4 bitrate=%d key-int-max=60 vbv-buf-capacity=%d byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream,profile=constrained-baseline"+pipelineStr, display, fps, bitrate, vbvbuf)
+			vbvbuf := uint(1000)
+			if bitrate > 1000 {
+				vbvbuf = bitrate
+			}
+
+			pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=NV12 ! x264enc threads=4 bitrate=%d key-int-max=60 vbv-buf-capacity=%d byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"+pipelineStr, display, fps, bitrate, vbvbuf)
 		}
 	default:
 		return "", fmt.Errorf("unknown codec %s", rtpCodec.Name)

server/internal/capture/streamsrcsink.go

@@ -0,0 +1,137 @@
+package capture
+
+import (
+	"errors"
+	"sync"
+
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+
+	"m1k1o/neko/internal/capture/gst"
+	"m1k1o/neko/internal/types"
+	"m1k1o/neko/internal/types/codec"
+)
+
+type StreamSrcSinkManagerCtx struct {
+	logger        zerolog.Logger
+	sampleChannel chan types.Sample
+
+	enabled       bool
+	codecPipeline map[string]string // codec -> pipeline
+
+	codec       codec.RTPCodec
+	pipeline    *gst.Pipeline
+	pipelineMu  sync.Mutex
+	pipelineStr string
+}
+
+func streamSrcSinkNew(enabled bool, codecPipeline map[string]string, video_id string) *StreamSrcSinkManagerCtx {
+	logger := log.With().
+		Str("module", "capture").
+		Str("submodule", "stream-src-sink").
+		Str("video_id", video_id).Logger()
+
+	return &StreamSrcSinkManagerCtx{
+		logger:        logger,
+		enabled:       enabled,
+		codecPipeline: codecPipeline,
+		sampleChannel: make(chan types.Sample),
+	}
+}
+
+func (manager *StreamSrcSinkManagerCtx) shutdown() {
+	manager.logger.Info().Msgf("shutdown")
+
+	manager.Stop()
+}
+
+func (manager *StreamSrcSinkManagerCtx) Codec() codec.RTPCodec {
+	manager.pipelineMu.Lock()
+	defer manager.pipelineMu.Unlock()
+
+	return manager.codec
+}
+
+func (manager *StreamSrcSinkManagerCtx) Start(codec codec.RTPCodec) error {
+	manager.pipelineMu.Lock()
+	defer manager.pipelineMu.Unlock()
+
+	if manager.pipeline != nil {
+		return types.ErrCapturePipelineAlreadyExists
+	}
+
+	if !manager.enabled {
+		return errors.New("stream-src-sink not enabled")
+	}
+
+	found := false
+	for codecName, pipeline := range manager.codecPipeline {
+		if codecName == codec.Name {
+			manager.pipelineStr = pipeline
+			manager.codec = codec
+			found = true
+			break
+		}
+	}
+
+	if !found {
+		return errors.New("no pipeline found for a codec")
+	}
+
+	var err error
+
+	manager.logger.Info().
+		Str("codec", manager.codec.Name).
+		Str("src", manager.pipelineStr).
+		Msgf("creating pipeline")
+
+	manager.pipeline, err = gst.CreatePipeline(manager.pipelineStr)
+	if err != nil {
+		return err
+	}
+
+	manager.pipeline.AttachAppsrc("appsrc")
+	manager.pipeline.AttachAppsink("appsink", manager.sampleChannel)
+	manager.pipeline.Play()
+
+	return nil
+}
+
+func (manager *StreamSrcSinkManagerCtx) Stop() {
+	manager.pipelineMu.Lock()
+	defer manager.pipelineMu.Unlock()
+
+	if manager.pipeline == nil {
+		return
+	}
+
+	manager.pipeline.Destroy()
+	manager.pipeline = nil
+
+	manager.logger.Info().
+		Str("codec", manager.codec.Name).
+		Str("src", manager.pipelineStr).
+		Msgf("destroying pipeline")
+}
+
+func (manager *StreamSrcSinkManagerCtx) Push(bytes []byte) {
+	manager.pipelineMu.Lock()
+	defer manager.pipelineMu.Unlock()
+
+	if manager.pipeline == nil {
+		return
+	}
+
+	manager.pipeline.Push(bytes)
+}
+
+func (manager *StreamSrcSinkManagerCtx) Started() bool {
+	manager.pipelineMu.Lock()
+	defer manager.pipelineMu.Unlock()
+
+	return manager.pipeline != nil
+}
+
+func (manager *StreamSrcSinkManagerCtx) GetSampleChannel() chan types.Sample {
+	return manager.sampleChannel
+}

server/internal/config/capture.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"m1k1o/neko/internal/types/codec"
-	"strings"
 
 	"github.com/pion/webrtc/v3"
 	"github.com/rs/zerolog/log"
@@ -10,21 +9,13 @@ import (
 	"github.com/spf13/viper"
 )
 
-type HwEnc int
-
-const (
-	HwEncNone HwEnc = iota
-	HwEncVAAPI
-	HwEncNVENC
-)
-
 type Capture struct {
 	// video
 	Display       string
 	VideoCodec    codec.RTPCodec
-	VideoHWEnc    HwEnc // TODO: Pipeline builder.
+	VideoHWEnc    string // TODO: Pipeline builder.
-	VideoBitrate  uint  // TODO: Pipeline builder.
+	VideoBitrate  uint   // TODO: Pipeline builder.
-	VideoMaxFPS   int16 // TODO: Pipeline builder.
+	VideoMaxFPS   int16  // TODO: Pipeline builder.
 	VideoPipeline string
 
 	// audio
@@ -36,6 +27,9 @@ type Capture struct {
 	// broadcast
 	BroadcastPipeline string
 	BroadcastUrl      string
+
+	// screenshare
+	ScreenshareEnabled bool
 }
 
 func (Capture) Init(cmd *cobra.Command) error {
@@ -101,7 +95,7 @@ func (Capture) Init(cmd *cobra.Command) error {
 	// audio
 	//
 
-	cmd.PersistentFlags().String("device", "audio_output.monitor", "audio device to capture")
+	cmd.PersistentFlags().String("device", "auto_null.monitor", "audio device to capture")
 	if err := viper.BindPFlag("device", cmd.PersistentFlags().Lookup("device")); err != nil {
 		return err
 	}
@@ -160,6 +154,15 @@ func (Capture) Init(cmd *cobra.Command) error {
 		return err
 	}
 
+	//
+	// screenshare
+	//
+
+	cmd.PersistentFlags().Bool("screenshare.enabled", true, "enable screenshare")
+	if err := viper.BindPFlag("screenshare.enabled", cmd.PersistentFlags().Lookup("screenshare.enabled")); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -193,19 +196,11 @@ func (s *Capture) Set() {
 		log.Warn().Msg("you are using deprecated config setting 'NEKO_AV1=true', use 'NEKO_VIDEO_CODEC=av1' instead")
 	}
 
-	videoHWEnc := strings.ToLower(viper.GetString("hwenc"))
+	videoHWEnc := ""
-	switch videoHWEnc {
+	if viper.GetString("hwenc") == "VAAPI" {
-	case "":
+		videoHWEnc = "VAAPI"
-		fallthrough
-	case "none":
-		s.VideoHWEnc = HwEncNone
-	case "vaapi":
-		s.VideoHWEnc = HwEncVAAPI
-	case "nvenc":
-		s.VideoHWEnc = HwEncNVENC
-	default:
-		log.Warn().Str("hwenc", videoHWEnc).Msgf("unknown video hw encoder, using CPU")
 	}
+	s.VideoHWEnc = videoHWEnc
 
 	s.VideoBitrate = viper.GetUint("video_bitrate")
 	s.VideoMaxFPS = int16(viper.GetInt("max_fps"))
@@ -247,4 +242,10 @@ func (s *Capture) Set() {
 
 	s.BroadcastPipeline = viper.GetString("broadcast_pipeline")
 	s.BroadcastUrl = viper.GetString("broadcast_url")
+
+	//
+	// screenshare
+	//
+
+	s.ScreenshareEnabled = viper.GetBool("screenshare.enabled")
 }

server/internal/config/server.go

@@ -14,7 +14,6 @@ type Server struct {
 	Cert       string
 	Key        string
 	Bind       string
-	Proxy      bool
 	Static     string
 	PathPrefix string
 	CORS       []string
@@ -36,11 +35,6 @@ func (Server) Init(cmd *cobra.Command) error {
 		return err
 	}
 
-	cmd.PersistentFlags().Bool("proxy", false, "enable reverse proxy mode")
-	if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil {
-		return err
-	}
-
 	cmd.PersistentFlags().String("static", "./www", "path to neko client files to serve")
 	if err := viper.BindPFlag("static", cmd.PersistentFlags().Lookup("static")); err != nil {
 		return err
@@ -63,7 +57,6 @@ func (s *Server) Set() {
 	s.Cert = viper.GetString("cert")
 	s.Key = viper.GetString("key")
 	s.Bind = viper.GetString("bind")
-	s.Proxy = viper.GetBool("proxy")
 	s.Static = viper.GetString("static")
 	s.PathPrefix = path.Join("/", path.Clean(viper.GetString("path_prefix")))
 

server/internal/config/websocket.go

@@ -10,6 +10,7 @@ import (
 type WebSocket struct {
 	Password      string
 	AdminPassword string
+	Proxy         bool
 	Locks         []string
 
 	ControlProtection bool
@@ -29,6 +30,11 @@ func (WebSocket) Init(cmd *cobra.Command) error {
 		return err
 	}
 
+	cmd.PersistentFlags().Bool("proxy", false, "enable reverse proxy mode")
+	if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil {
+		return err
+	}
+
 	cmd.PersistentFlags().StringSlice("locks", []string{}, "resources, that will be locked when starting (control, login)")
 	if err := viper.BindPFlag("locks", cmd.PersistentFlags().Lookup("locks")); err != nil {
 		return err
@@ -57,6 +63,7 @@ func (WebSocket) Init(cmd *cobra.Command) error {
 func (s *WebSocket) Set() {
 	s.Password = viper.GetString("password")
 	s.AdminPassword = viper.GetString("password_admin")
+	s.Proxy = viper.GetBool("proxy")
 	s.Locks = viper.GetStringSlice("locks")
 
 	s.ControlProtection = viper.GetBool("control_protection")

server/internal/http/http.go

@@ -11,8 +11,8 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi"
-	"github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/cors"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -35,9 +35,6 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
 
 	router := chi.NewRouter()
 	router.Use(middleware.RequestID) // Create a request ID for each request
-	if conf.Proxy {
-		router.Use(middleware.RealIP)
-	}
 	router.Use(middleware.RequestLogger(&logformatter{logger}))
 	router.Use(middleware.Recoverer) // Recover from panics without crashing server
 	router.Use(middleware.Compress(5, "application/octet-stream"))
@@ -166,13 +163,7 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
 				return
 			}
 
-			err = r.ParseMultipartForm(32 << 20)
+			r.ParseMultipartForm(32 << 20)
-			if err != nil || r.MultipartForm == nil {
-				logger.Warn().Err(err).Msg("failed to parse multipart form")
-				http.Error(w, "error parsing form", http.StatusBadRequest)
-				return
-			}
-
 			for _, formheader := range r.MultipartForm.File["files"] {
 				filePath := webSocketHandler.FileTransferPath(formheader.Filename)
 
@@ -193,11 +184,6 @@ func New(conf *config.Server, webSocketHandler types.WebSocketHandler, desktop t
 
 				io.Copy(f, formfile)
 			}
-
-			err = r.MultipartForm.RemoveAll()
-			if err != nil {
-				logger.Warn().Err(err).Msg("failed to remove multipart form")
-			}
 		})
 	}
 

server/internal/http/logger.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/go-chi/chi/v5/middleware"
+	"github.com/go-chi/chi/middleware"
 	"github.com/rs/zerolog"
 )
 

server/internal/session/session.go

@@ -131,17 +131,6 @@ func (session *Session) SignalLocalAnswer(sdp string) error {
 	})
 }
 
-func (session *Session) SignalLocalCandidate(data string) error {
-	if session.socket == nil {
-		return nil
-	}
-	session.logger.Info().Msg("signal update - LocalCandidate")
-	return session.socket.Send(&message.SignalCandidate{
-		Event: event.SIGNAL_CANDIDATE,
-		Data:  data,
-	})
-}
-
 func (session *Session) SignalRemoteOffer(sdp string) error {
 	if session.peer == nil {
 		return nil
@@ -165,12 +154,14 @@ func (session *Session) SignalRemoteAnswer(sdp string) error {
 	return session.peer.SetAnswer(sdp)
 }
 
-func (session *Session) SignalRemoteCandidate(data string) error {
+func (session *Session) SignalCandidate(data string) error {
 	if session.socket == nil {
 		return nil
 	}
-	session.logger.Info().Msg("signal update - RemoteCandidate")
+	return session.socket.Send(&message.SignalCandidate{
-	return session.peer.SetCandidate(data)
+		Event: event.SIGNAL_CANDIDATE,
+		Data:  data,
+	})
 }
 
 func (session *Session) destroy() error {

server/internal/types/capture.go

@@ -28,6 +28,17 @@ type StreamSinkManager interface {
 	GetSampleChannel() chan Sample
 }
 
+type StreamSrcSinkManager interface {
+	Codec() codec.RTPCodec
+
+	Start(codec codec.RTPCodec) error
+	Stop()
+
+	Push(bytes []byte)
+	Started() bool
+	GetSampleChannel() chan Sample
+}
+
 type CaptureManager interface {
 	Start()
 	Shutdown() error
@@ -35,4 +46,5 @@ type CaptureManager interface {
 	Broadcast() BroadcastManager
 	Audio() StreamSinkManager
 	Video() StreamSinkManager
+	Screenshare() StreamSrcSinkManager
 }

server/internal/types/session.go

@@ -40,10 +40,9 @@ type Session interface {
 	Send(v interface{}) error
 	SignalLocalOffer(sdp string) error
 	SignalLocalAnswer(sdp string) error
-	SignalLocalCandidate(data string) error
 	SignalRemoteOffer(sdp string) error
 	SignalRemoteAnswer(sdp string) error
-	SignalRemoteCandidate(data string) error
+	SignalCandidate(data string) error
 }
 
 type SessionManager interface {

server/internal/types/webrtc.go

@@ -21,7 +21,6 @@ type Peer interface {
 	CreateAnswer() (string, error)
 	SetOffer(sdp string) error
 	SetAnswer(sdp string) error
-	SetCandidate(candidateString string) error
 	WriteData(v interface{}) error
 	Destroy() error
 }

server/internal/utils/ip.go

@@ -2,7 +2,7 @@ package utils
 
 import (
 	"bytes"
-	"io"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"time"
@@ -31,10 +31,21 @@ func GetIP(serverUrl string) (string, error) {
 	}
 	defer rsp.Body.Close()
 
-	buf, err := io.ReadAll(rsp.Body)
+	buf, err := ioutil.ReadAll(rsp.Body)
 	if err != nil {
 		return "", err
 	}
 
 	return string(bytes.TrimSpace(buf)), nil
 }
+
+func GetHttpRequestIP(r *http.Request, proxy bool) string {
+	IPAddress := r.Header.Get("X-Real-Ip")
+	if IPAddress == "" {
+		IPAddress = r.Header.Get("X-Forwarded-For")
+	}
+	if IPAddress == "" || !proxy {
+		IPAddress = r.RemoteAddr
+	}
+	return IPAddress
+}

server/internal/webrtc/peer.go

@@ -1,7 +1,6 @@
 package webrtc
 
 import (
-	"encoding/json"
 	"sync"
 
 	"github.com/pion/webrtc/v3"
@@ -50,16 +49,6 @@ func (peer *Peer) SetAnswer(sdp string) error {
 	return peer.connection.SetRemoteDescription(webrtc.SessionDescription{SDP: sdp, Type: webrtc.SDPTypeAnswer})
 }
 
-func (peer *Peer) SetCandidate(candidateString string) error {
-	var candidate webrtc.ICECandidateInit
-	err := json.Unmarshal([]byte(candidateString), &candidate)
-	if err != nil {
-		return err
-	}
-
-	return peer.connection.AddICECandidate(candidate)
-}
-
 func (peer *Peer) WriteData(v interface{}) error {
 	peer.mu.Lock()
 	defer peer.mu.Unlock()

server/internal/webrtc/webrtc.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/pion/ice/v2"
 	"github.com/pion/interceptor"
+	"github.com/pion/rtcp"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/pkg/media"
 	"github.com/rs/zerolog"
@@ -18,6 +19,7 @@ import (
 
 	"m1k1o/neko/internal/config"
 	"m1k1o/neko/internal/types"
+	"m1k1o/neko/internal/types/codec"
 	"m1k1o/neko/internal/webrtc/pionlog"
 )
 
@@ -40,6 +42,8 @@ type WebRTCManager struct {
 	desktop    types.DesktopManager
 	config     *config.WebRTC
 	api        *webrtc.API
+
+	screenshareStop *func()
 }
 
 func (manager *WebRTCManager) Start() {
@@ -82,7 +86,19 @@ func (manager *WebRTCManager) Start() {
 
 	go func() {
 		for {
-			sample, ok := <-manager.capture.Video().GetSampleChannel()
+			var sample types.Sample
+			var ok bool
+
+			select {
+			case sample, ok = <-manager.capture.Video().GetSampleChannel():
+				// if screenshare is active, we need to drop all video samples
+				// ideally we would stop the video capture meanwhile.
+				if manager.capture.Screenshare().Started() {
+					continue
+				}
+			case sample, ok = <-manager.capture.Screenshare().GetSampleChannel():
+			}
+
 			if !ok {
 				manager.logger.Debug().Msg("video capture channel is closed")
 				continue
@@ -123,6 +139,7 @@ func (manager *WebRTCManager) initAPI() error {
 		LoggerFactory: logger,
 	}
 
+	_ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax)
 	settings.SetNAT1To1IPs(manager.config.NAT1To1IPs, webrtc.ICECandidateTypeHost)
 	settings.SetICETimeouts(6*time.Second, 6*time.Second, 3*time.Second)
 	settings.SetSRTPReplayProtectionWindow(512)
@@ -167,15 +184,12 @@ func (manager *WebRTCManager) initAPI() error {
 
 		networkType = append(networkType, webrtc.NetworkTypeUDP4)
 		manager.logger.Info().Int("port", manager.config.UDPMUX).Msg("using UDP MUX")
-	} else if manager.config.EphemeralMax != 0 {
-		_ = settings.SetEphemeralUDPPortRange(manager.config.EphemeralMin, manager.config.EphemeralMax)
-		networkType = append(networkType,
-			webrtc.NetworkTypeUDP4,
-			webrtc.NetworkTypeUDP6,
-		)
 	}
 
-	settings.SetNetworkTypes(networkType)
+	// Enable support for TCP and UDP ICE candidates
+	if len(networkType) > 0 {
+		settings.SetNetworkTypes(networkType)
+	}
 
 	// Create MediaEngine with selected codecs
 	engine := webrtc.MediaEngine{}
@@ -301,12 +315,90 @@ func (manager *WebRTCManager) CreatePeer(id string, session types.Session) (type
 			return
 		}
 
-		if err := session.SignalLocalCandidate(string(candidateString)); err != nil {
+		if err := session.SignalCandidate(string(candidateString)); err != nil {
 			manager.logger.Warn().Err(err).Msg("sending SignalCandidate failed")
 			return
 		}
 	})
 
+	connection.OnTrack(func(track *webrtc.TrackRemote, receiver *webrtc.RTPReceiver) {
+		logger := manager.logger.With().
+			Str("kind", track.Kind().String()).
+			Str("mime", track.Codec().RTPCodecCapability.MimeType).
+			Logger()
+
+		logger.Info().Msgf("received new remote track")
+
+		// parse codec from remote track
+		codec, ok := codec.ParseRTC(track.Codec())
+		if !ok {
+			logger.Warn().Msg("remote track with unknown codec")
+			receiver.Stop()
+			return
+		}
+
+		var srcSinkManager types.StreamSrcSinkManager
+
+		stopped := false
+		stopFn := func() {
+			if stopped {
+				return
+			}
+
+			stopped = true
+			receiver.Stop()
+			srcSinkManager.Stop()
+			logger.Info().Msg("remote track stopped")
+		}
+
+		logger.Info().Msgf("found codec %s", codec.Name)
+
+		if track.Kind() == webrtc.RTPCodecTypeVideo {
+			// video -> webcam
+			srcSinkManager = manager.capture.Screenshare()
+			defer stopFn()
+
+			if manager.screenshareStop != nil {
+				(*manager.screenshareStop)()
+			}
+			manager.screenshareStop = &stopFn
+		} else {
+			logger.Warn().Msg("expected only video tracks")
+			receiver.Stop()
+			return
+		}
+
+		logger.Info().Msg("starting srcSinkManager")
+		err := srcSinkManager.Start(codec)
+		if err != nil {
+			logger.Err(err).Msg("failed to start pipeline")
+			return
+		}
+
+		ticker := time.NewTicker(3 * time.Second)
+		defer ticker.Stop()
+
+		go func() {
+			for range ticker.C {
+				err := connection.WriteRTCP([]rtcp.Packet{&rtcp.PictureLossIndication{MediaSSRC: uint32(track.SSRC())}})
+				if err != nil {
+					logger.Err(err).Msg("remote track rtcp send err")
+				}
+			}
+		}()
+
+		buf := make([]byte, 1400)
+		for {
+			i, _, err := track.Read(buf)
+			if err != nil {
+				logger.Warn().Err(err).Msg("failed read from remote track")
+				break
+			}
+
+			srcSinkManager.Push(buf[:i])
+		}
+	})
+
 	if err := session.SetPeer(peer); err != nil {
 		return nil, err
 	}

server/internal/websocket/handler/handler.go

@@ -87,12 +87,6 @@ func (h *MessageHandler) Message(id string, raw []byte) error {
 			utils.Unmarshal(payload, raw, func() error {
 				return h.signalRemoteAnswer(id, session, payload)
 			}), "%s failed", header.Event)
-	case event.SIGNAL_CANDIDATE:
-		payload := &message.SignalCandidate{}
-		return errors.Wrapf(
-			utils.Unmarshal(payload, raw, func() error {
-				return h.signalRemoteCandidate(id, session, payload)
-			}), "%s failed", header.Event)
 
 	// Control Events
 	case event.CONTROL_RELEASE:

server/internal/websocket/handler/signal.go

@@ -45,7 +45,3 @@ func (h *MessageHandler) signalRemoteAnswer(id string, session types.Session, pa
 
 	return nil
 }
-
-func (h *MessageHandler) signalRemoteCandidate(id string, session types.Session, payload *message.SignalCandidate) error {
-	return session.SignalRemoteCandidate(payload.Data)
-}

server/internal/websocket/websocket.go

@@ -290,7 +290,7 @@ func (ws *WebSocketHandler) Upgrade(w http.ResponseWriter, r *http.Request) erro
 	socket := &WebSocket{
 		id:         id,
 		ws:         ws,
-		address:    r.RemoteAddr,
+		address:    utils.GetHttpRequestIP(r, ws.conf.Proxy),
 		connection: connection,
 	}
 

server/neko.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"os/signal"
 	"runtime"
-	"strings"
 
 	"m1k1o/neko/internal/capture"
 	"m1k1o/neko/internal/config"
@@ -26,7 +25,7 @@ const Header = `&34
   /  |/ / _ \/ //_/ __ \   )  ( ')
  / /|  /  __/ ,< / /_/ /  (  /  )
 /_/ |_/\___/_/|_|\____/    \(__)|
-&1&37  nurdism/m1k1o &33%s %s&0
+&1&37 nurdism/m1k1o &33%s v%s&0
 `
 
 var (
@@ -36,8 +35,13 @@ var (
 	gitCommit = "dev"
 	//
 	gitBranch = "dev"
-	//
+
-	gitTag = "dev"
+	// Major version when you make incompatible API changes,
+	major = "2"
+	// Minor version when you add functionality in a backwards-compatible manner, and
+	minor = "7"
+	// Patch version when you make backwards-compatible bug fixes.
+	patch = "0"
 )
 
 var Service *Neko
@@ -45,9 +49,11 @@ var Service *Neko
 func init() {
 	Service = &Neko{
 		Version: &Version{
+			Major:     major,
+			Minor:     minor,
+			Patch:     patch,
 			GitCommit: gitCommit,
 			GitBranch: gitBranch,
-			GitTag:    gitTag,
 			BuildDate: buildDate,
 			GoVersion: runtime.Version(),
 			Compiler:  runtime.Compiler,
@@ -63,9 +69,11 @@ func init() {
 }
 
 type Version struct {
+	Major     string
+	Minor     string
+	Patch     string
 	GitCommit string
 	GitBranch string
-	GitTag    string
 	BuildDate string
 	GoVersion string
 	Compiler  string
@@ -73,25 +81,20 @@ type Version struct {
 }
 
 func (i *Version) String() string {
-	version := i.GitTag
+	return fmt.Sprintf("%s.%s.%s %s", i.Major, i.Minor, i.Patch, i.GitCommit)
-	if version == "" || version == "dev" {
-		version = i.GitBranch
-	}
-
-	return fmt.Sprintf("%s@%s", version, i.GitCommit)
 }
 
 func (i *Version) Details() string {
-	return "\n" + strings.Join([]string{
+	return fmt.Sprintf(
-		fmt.Sprintf("Version %s", i.String()),
+		"%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+		fmt.Sprintf("Version %s.%s.%s", i.Major, i.Minor, i.Patch),
 		fmt.Sprintf("GitCommit %s", i.GitCommit),
 		fmt.Sprintf("GitBranch %s", i.GitBranch),
-		fmt.Sprintf("GitTag %s", i.GitTag),
 		fmt.Sprintf("BuildDate %s", i.BuildDate),
 		fmt.Sprintf("GoVersion %s", i.GoVersion),
 		fmt.Sprintf("Compiler %s", i.Compiler),
 		fmt.Sprintf("Platform %s", i.Platform),
-	}, "\n") + "\n"
+	)
 }
 
 type Neko struct {