diff --git a/.github/workflows/camera-mjpg-streamer.yml b/.github/workflows/camera-mjpg-streamer.yml new file mode 100644 index 0000000..3c53bc0 --- /dev/null +++ b/.github/workflows/camera-mjpg-streamer.yml @@ -0,0 +1,54 @@ +name: camera-mjpg-streamer manual build + +on: + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + name: Build ${{ matrix.arch }} ${{ matrix.addon }} add-on + strategy: + matrix: + addon: ["camera-mjpg-streamer"] + arch: ["aarch64", "amd64", "armhf", "armv7", "i386"] + steps: + - name: Check out the repository + uses: actions/checkout@v3 + + - name: Get information + id: info + uses: home-assistant/actions/helpers/info@master + with: + path: "./${{ matrix.addon }}" + + - name: Check if add-on should be built + id: check + run: | + if [[ "${{ steps.info.outputs.architectures }}" =~ ${{ matrix.arch }} ]]; then + echo "::set-output name=build_arch::true"; + echo "::set-output name=image::$(echo ${{ steps.info.outputs.image }} | cut -d'/' -f3)"; + else + echo "${{ matrix.arch }} is not a valid arch for ${{ matrix.addon }}, skipping build"; + echo "::set-output name=build_arch::false"; + fi + + - name: Login to GitHub Container Registry + if: env.BUILD_ARGS != '--test' + uses: docker/login-action@v2.0.0 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build ${{ matrix.addon }} add-on + if: steps.check.outputs.build_arch == 'true' + uses: home-assistant/builder@2022.03.1 + with: + args: | + ${{ env.BUILD_ARGS }} \ + --${{ matrix.arch }} \ + --target /data/${{ matrix.addon }} \ + --image "${{ steps.check.outputs.image }}" \ + --docker-hub "ghcr.io/${{ github.repository_owner }}" \ + --addon \ + --docker-hub-check diff --git a/camera-mjpg-streamer/DOCS.md b/camera-mjpg-streamer/DOCS.md new file mode 100644 index 0000000..3733bca --- /dev/null +++ b/camera-mjpg-streamer/DOCS.md @@ -0,0 +1,21 @@ +# Documentation + +## Configuration + +- `mjpg_input`: Specify input arguments for mjpg_streamer. + +## How to use + +Set input arguments through `mjpg_input` configuration option, start the add-on. +The camera stream and snapshot can be accessed by e.g. [MJPEG IP Camera](https://www.home-assistant.io/integrations/mjpeg/) from url `http:///?action=stream` or `http:///?action=snapshot`. + +For testing you can set `mjpg_input` to: +> input_file.so -f /www_mjpg -e + +## Versions + +Some notes regarding the software and versions. +Not all software is installed for all images. + +- mjpg-streamer + - Compiled from [https://github.com/jacksonliam/mjpg-streamer](https://github.com/jacksonliam/mjpg-streamer). diff --git a/camera-mjpg-streamer/Dockerfile b/camera-mjpg-streamer/Dockerfile new file mode 100644 index 0000000..249a123 --- /dev/null +++ b/camera-mjpg-streamer/Dockerfile @@ -0,0 +1,19 @@ +ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base" + +FROM ${BUILD_FROM} AS final + +ENV LANG C.UTF-8 + +RUN echo "Install base requirements." \ + && apk add --no-cache --virtual .necessary-mjpeg-streamer libjpeg nginx libgphoto2 \ + && echo "Install mjpg-streamer." \ + && apk add --no-cache --virtual .build-dependencies-mjpgstreamer make cmake build-base linux-headers libjpeg-turbo-dev libgphoto2-dev \ + && wget -qO- https://github.com/jacksonliam/mjpg-streamer/archive/master.tar.gz | tar xz -C /tmp \ + && cd /tmp/mjpg-streamer-master/mjpg-streamer-experimental/ \ + && make --silent \ + && make install --silent \ + && mv www/ /www_mjpg \ + && rm -rf /tmp/mjpg-streamer-master \ + && apk del --no-cache .build-dependencies-mjpgstreamer +COPY rootfs/ / +WORKDIR / diff --git a/camera-mjpg-streamer/README.md b/camera-mjpg-streamer/README.md new file mode 100644 index 0000000..9594514 --- /dev/null +++ b/camera-mjpg-streamer/README.md @@ -0,0 +1,3 @@ +# mjpg-streamer + +Provides camera stream through `mjpg-streamer`, to be used by e.g. OctoPrint addon. diff --git a/camera-mjpg-streamer/config.yaml b/camera-mjpg-streamer/config.yaml new file mode 100644 index 0000000..d900050 --- /dev/null +++ b/camera-mjpg-streamer/config.yaml @@ -0,0 +1,27 @@ +name: "mjpg-streamer" +version: "2022.7.001" +slug: "camera-mjpg-streamer" +description: "Camera streaming addon for Home Assistant, based on mjpg-streamer." +url: "https://github.com/fredrikbaberg/3dprinter-addons/tree/main/camera-mjpg-streamer" +ingress: true +ingress_stream: true +panel_icon: mdi:camera +panel_title: mjpg-streamer +arch: + - armv7 + - amd64 + - armhf + - aarch64 + - i386 +init: false +video: true +usb: true +ports: + 8000/tcp: null +ports_description: + 8000/tcp: Web-based interface (Not required for Ingress) +options: + mjpg_input: "input_uvc.so -n" +schema: + mjpg_input: "str" +image: ghcr.io/fredrikbaberg/addon-camera-mjpg-streamer-{arch} diff --git a/camera-mjpg-streamer/rootfs/etc/cont-init.d/nginx.sh b/camera-mjpg-streamer/rootfs/etc/cont-init.d/nginx.sh new file mode 100644 index 0000000..c84e750 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/cont-init.d/nginx.sh @@ -0,0 +1,22 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: aiortc +# Configures NGINX for use with aiortc +# ============================================================================== + +# Generate Ingress configuration +bashio::var.json \ + interface "$(bashio::addon.ip_address)" \ + port "^$(bashio::addon.ingress_port)" \ + | tempio \ + -template /etc/nginx/templates/ingress.gtpl \ + -out /etc/nginx/servers/ingress.conf + +# Generate direct access configuration, if enabled. +if bashio::var.has_value "$(bashio::addon.port 80)"; then + bashio::var.json \ + port "^$(bashio::addon.port 80)" \ + | tempio \ + -template /etc/nginx/templates/direct.gtpl \ + -out /etc/nginx/servers/direct.conf +fi diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/includes/mime.types b/camera-mjpg-streamer/rootfs/etc/nginx/includes/mime.types new file mode 100644 index 0000000..c230212 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/includes/mime.types @@ -0,0 +1,96 @@ +types { + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; + + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; + + image/png png; + image/svg+xml svg svgz; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/webp webp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + + font/woff woff; + font/woff2 woff2; + + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.oasis.opendocument.graphics odg; + application/vnd.oasis.opendocument.presentation odp; + application/vnd.oasis.opendocument.spreadsheet ods; + application/vnd.oasis.opendocument.text odt; + application/vnd.openxmlformats-officedocument.presentationml.presentation + pptx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet + xlsx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document + docx; + application/vnd.wap.wmlc wmlc; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; + + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; + + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; + + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; +} \ No newline at end of file diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/includes/proxy_params.conf b/camera-mjpg-streamer/rootfs/etc/nginx/includes/proxy_params.conf new file mode 100644 index 0000000..1990d49 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/includes/proxy_params.conf @@ -0,0 +1,15 @@ +proxy_http_version 1.1; +proxy_ignore_client_abort off; +proxy_read_timeout 86400s; +proxy_redirect off; +proxy_send_timeout 86400s; +proxy_max_temp_file_size 0; + +proxy_set_header Accept-Encoding ""; +proxy_set_header Connection $connection_upgrade; +proxy_set_header Host $http_host; +proxy_set_header Upgrade $http_upgrade; +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Forwarded-Proto $scheme; +proxy_set_header X-NginX-Proxy true; +proxy_set_header X-Real-IP $remote_addr; diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/includes/server_params.conf b/camera-mjpg-streamer/rootfs/etc/nginx/includes/server_params.conf new file mode 100644 index 0000000..09c0654 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/includes/server_params.conf @@ -0,0 +1,6 @@ +root /dev/null; +server_name $hostname; + +add_header X-Content-Type-Options nosniff; +add_header X-XSS-Protection "1; mode=block"; +add_header X-Robots-Tag none; diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/includes/ssl_params.conf b/camera-mjpg-streamer/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 0000000..e6789cb --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,8 @@ +ssl_protocols TLSv1.2 TLSv1.3; +ssl_prefer_server_ciphers off; +ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; +ssl_session_timeout 10m; +ssl_session_cache shared:SSL:10m; +ssl_session_tickets off; +ssl_stapling on; +ssl_stapling_verify on; diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/includes/upstream.conf b/camera-mjpg-streamer/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 0000000..6dc04d8 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,3 @@ +upstream backend { + server 127.0.0.1:80; +} diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/nginx.conf b/camera-mjpg-streamer/rootfs/etc/nginx/nginx.conf new file mode 100644 index 0000000..11e15c7 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,44 @@ +# Run nginx in foreground. +daemon off; + +# This is run inside Docker. +user root; + +# Pid storage location. +pid /var/run/nginx.pid; + +# Set number of worker processes. +worker_processes 1; + +# Enables the use of JIT for regular expressions to speed-up their processing. +pcre_jit on; + +# Write error log to the add-on log. +error_log /proc/1/fd/1 error; + +# Max num of simultaneous connections by a worker process. +events { + worker_connections 512; +} + +http { + include /etc/nginx/includes/mime.types; + + access_log off; + client_max_body_size 4G; + default_type application/octet-stream; + gzip on; + keepalive_timeout 65; + sendfile on; + server_tokens off; + tcp_nodelay on; + tcp_nopush on; + + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } + + include /etc/nginx/includes/upstream.conf; + include /etc/nginx/servers/*.conf; +} diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/servers/.gitkeep b/camera-mjpg-streamer/rootfs/etc/nginx/servers/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/templates/direct.gtpl b/camera-mjpg-streamer/rootfs/etc/nginx/templates/direct.gtpl new file mode 100644 index 0000000..2fd0020 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/templates/direct.gtpl @@ -0,0 +1,10 @@ +server { + listen {{ .port }} default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + location / { + proxy_pass http://backend; + } +} diff --git a/camera-mjpg-streamer/rootfs/etc/nginx/templates/ingress.gtpl b/camera-mjpg-streamer/rootfs/etc/nginx/templates/ingress.gtpl new file mode 100644 index 0000000..e216772 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/nginx/templates/ingress.gtpl @@ -0,0 +1,13 @@ +server { + listen {{ .interface }}:{{ .port }} default_server; + + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + + location / { + allow 172.30.32.2; + deny all; + + proxy_pass http://backend; + } +} diff --git a/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/finish b/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/finish new file mode 100644 index 0000000..1ecc5e9 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/finish @@ -0,0 +1,9 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Add-on: mjpg-streamer +# Take down the S6 supervision tree when mjpg-streamer fails +# ============================================================================== +if -n { s6-test $# -ne 0 } +if -n { s6-test ${1} -eq 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/run b/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/run new file mode 100644 index 0000000..52f5786 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/run @@ -0,0 +1,9 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: mjpg-streamer +# Runs mjpg-streamer +# ============================================================================== + +bashio::log.info "Starting mjpg-streamer.." + +mjpg_streamer -i "$(bashio::config 'mjpg_input')" -o "output_http.so -w /www_mjpg -p 80" diff --git a/camera-mjpg-streamer/rootfs/etc/services.d/nginx/finish b/camera-mjpg-streamer/rootfs/etc/services.d/nginx/finish new file mode 100644 index 0000000..382feb6 --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,9 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Add-on: mjpg-streamer +# Take down the S6 supervision tree when Nginx fails +# ============================================================================== +if -n { s6-test $# -ne 0 } +if -n { s6-test ${1} -eq 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/camera-mjpg-streamer/rootfs/etc/services.d/nginx/run b/camera-mjpg-streamer/rootfs/etc/services.d/nginx/run new file mode 100644 index 0000000..559f4da --- /dev/null +++ b/camera-mjpg-streamer/rootfs/etc/services.d/nginx/run @@ -0,0 +1,11 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Add-on: mjpg-streamer +# Runs the Nginx daemon +# ============================================================================== + +# Wait for aiortc web server to be available +bashio::net.wait_for 80 + +bashio::log.info "Starting NGinx..." +exec nginx \ No newline at end of file