Prepare for test on device

camera-ustreamer/Dockerfile

@@ -81,12 +81,14 @@ RUN apk add -U \
     opus \
     speexdsp \
     zlib \
-    caddy
+    caddy \
+    vim \
+    screen
 
 COPY rootfs/ /
 
 WORKDIR /
 
 # # Make files executable
-# # RUN chmod +x /etc/cont-init.d/*.sh
+# RUN chmod +x /etc/cont-init.d/*.sh
-# # RUN chmod +x /etc/services.d/*/*
+# RUN chmod +x /etc/services.d/*/*

camera-ustreamer/build.yaml

@@ -0,0 +1,7 @@
+labels:
+  org.opencontainers.image.title: "Home Assistant Add-on: Camera-ustreamer"
+  org.opencontainers.image.description: "ustreamer addon for Home-Assistant."
+  org.opencontainers.image.source: "https://github.com/fredrikbaberg/ha-3dprinter-addons"
+args:
+  JANUS_GATEWAY_VERSION: "1.1.3"
+  USTREAMER_VERSION: "5.38"

camera-ustreamer/config.yaml

@@ -1,12 +1,12 @@
-name: "Camera-mjpg-streamer"
+name: "Camera-ustreamer"
-version: "2022.7.0"
+version: "2023.3.0-rc0"
-slug: "camera-mjpg-streamer"
+slug: "camera-ustreamer"
-description: "Camera streaming addon for Home Assistant, based on mjpg-streamer."
+description: "Camera streaming addon for Home Assistant, based on ustreamer."
-url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/camera-mjpg-streamer"
+url: "https://github.com/fredrikbaberg/ha-3dprinter-addons/tree/main/camera-ustreamer"
 ingress: true
 ingress_stream: true
 panel_icon: mdi:camera
-panel_title: mjpg-streamer
+panel_title: ustreamer
 arch:
     - armv7
     - amd64
@@ -21,8 +21,8 @@ ports:
     80/tcp: null
 ports_description:
     80/tcp: Web-based interface (Not required for Ingress)
-options:
+# options:
-    mjpg_input: "input_uvc.so -n"
+#     mjpg_input: "input_uvc.so -n"
-schema:
+# schema:
-    mjpg_input: "str"
+#     mjpg_input: "str"
-image: ghcr.io/fredrikbaberg/ha-addon-camera-mjpg-streamer-{arch}
+# image: ghcr.io/fredrikbaberg/ha-addon-camera-ustreamer-{arch}

camera-ustreamer/rootfs/etc/caddy/Caddyfile

@@ -1,12 +1,18 @@
 # Ingress
 :8099 {
-    @blocked not remote_ip 172.30.32.2
+	# @blocked not remote_ip 172.30.32.2
-    respond @blocked "This is only for access through Ingress" 403
+	# respond @blocked "This is only for access through Ingress" 403
-    reverse_proxy 127.0.0.1:8080
+	handle_path /janus/* {
+		reverse_proxy localhost:8188 # Janus API
+	}
+	reverse_proxy 127.0.0.1:8080 # ustreamer
 }
 
 # External access
-:8080 {
+:80 {
-    root * /opt/janus/share/janus/demos
+	root * /opt/janus/share/janus/demos
-    file_server
+	handle_path /janus/* {
+		reverse_proxy localhost:8188 # Janus API
+	}
+	file_server # Janus demo
 }

camera-ustreamer/rootfs/etc/cont-init.d/proxy.sh

@@ -1,22 +1,22 @@
-#!/usr/bin/with-contenv bashio
+# #!/usr/bin/with-contenv bashio
-# ==============================================================================
+# # ==============================================================================
-# Add-on: aiortc
+# # Add-on: aiortc
-# Configures NGINX for use with aiortc
+# # Configures NGINX for use with aiortc
-# ==============================================================================
+# # ==============================================================================
 
-# Generate Ingress configuration
+# # Generate Ingress configuration
-bashio::var.json \
+# bashio::var.json \
-    interface "$(bashio::addon.ip_address)" \
+#     interface "$(bashio::addon.ip_address)" \
-    port "^$(bashio::addon.ingress_port)" \
+#     port "^$(bashio::addon.ingress_port)" \
-    | tempio \
+#     | tempio \
-        -template /etc/nginx/templates/ingress.gtpl \
+#         -template /etc/nginx/templates/ingress.gtpl \
-        -out /etc/nginx/servers/ingress.conf
+#         -out /etc/nginx/servers/ingress.conf
 
-# Generate direct access configuration, if enabled.
+# # Generate direct access configuration, if enabled.
-if bashio::var.has_value "$(bashio::addon.port 80)"; then
+# if bashio::var.has_value "$(bashio::addon.port 80)"; then
-    bashio::var.json \
+#     bashio::var.json \
-        port "^$(bashio::addon.port 80)" \
+#         port "^$(bashio::addon.port 80)" \
-        | tempio \
+#         | tempio \
-            -template /etc/nginx/templates/direct.gtpl \
+#             -template /etc/nginx/templates/direct.gtpl \
-            -out /etc/nginx/servers/direct.conf
+#             -out /etc/nginx/servers/direct.conf
-fi
+# fi

camera-ustreamer/rootfs/etc/services.d/janus/run

@@ -6,4 +6,4 @@
 
 bashio::log.info "Starting janus.."
 
-exec /opt/janus/bin/janus
+exec /opt/janus/bin/janus --configs-folder /opt/janus/etc/janus/ --plugins-folder /opt/janus/lib/janus/plugins/

camera-ustreamer/rootfs/etc/services.d/ustreamer/run

@@ -7,4 +7,4 @@
 bashio::log.info "Starting mjpg-streamer.."
 
 # mjpg_streamer -i "$(bashio::config 'mjpg_input')" -o "output_http.so -w /www_mjpg -p 80"
-exec ustreamer --host=127.0.0.1 --port=80
+exec ustreamer --host=127.0.0.1 --h264-sink demo::ustreamer::h264 --h264-sink-mode 660 --h264-sink-rm