Update to v0.17

Author: chrishamm

src/dsf/CHANGELOG.md

@@ -1,3 +1,33 @@
+## v0.17.0 (2025-05-04)
+
+### Feat
+
+- add software encoding for mjpg and jpeg (#105)
+
+## v0.16.3 (2025-03-09)
+
+### Fix
+
+- fix --disable_webrtc to update the module variable correctly (#102)
+
+## v0.16.2 (2025-02-26)
+
+### Fix
+
+- fix crash for picamera2 v0.3.23+ (#100)
+
+## v0.16.1 (2025-02-24)
+
+### Fix
+
+- fix controls_style.css path to relative path in camera_options.py (#98)
+
+## v0.16.0 (2025-02-24)
+
+### Feat
+
+- add WebRTC stream (#84)
+
 ## v0.15.0 (2024-08-14)
 
 ### Feat

src/dsf/Makefile

@@ -18,7 +18,14 @@ all:
 	$(MAKE) help
 
 install: ## Install Spyglass as service
+	@if [ "$$(id -u)" -eq 0 ]; then \
+		echo "Please run without sudo/not as root"; \
+		exit 1; \
+	fi
 	@mkdir -p $(CONF_PATH)
+	@printf "\nInstall virtual environment ...\n"
+	@python -m venv --system-site-packages .venv
+	@. .venv/bin/activate && pip install -r requirements.txt
 	@printf "\nCopying systemd service file ...\n"
 	@sudo cp -f "${PWD}/resources/spyglass.service" $(SYSTEMD)
 	@sudo sed -i "s/%USER%/$(USER)/g" $(SYSTEMD)/spyglass.service

src/dsf/README.md

@@ -13,7 +13,7 @@ mock_use_standalone_module = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.15.0"
+version = "0.17.0"
 tag_format = "v$version"
 version_files = [
     "spyglass/__version__.py",

src/dsf/pyproject.toml

@@ -1 +1,2 @@
-setuptools~=72.1.0
+aiortc~=1.9.0
+setuptools~=75.1.0

src/dsf/requirements.txt

@@ -35,6 +35,15 @@ SNAPSHOT_URL="/snapshot"
 #### NOTE: use format as shown below to stay MJPG-Streamer URL compatible
 ## SNAPSHOT_URL="/?action=snapshot"
 
+#### Use Software JPG Encoding (BOOL)[default: false]
+#USE_SW_JPG_ENCODING="true"
+
+#### WebRTC URL (STRING)[default: /webrtc]
+WEBRTC_URL="/webrtc"
+
+#### Disable WebRTC (BOOL)[default: false]
+#DISABLE_WEBRTC="true"
+
 #### Autofocus behavior (STRING:manual,continuous)[default: continuous]
 AUTO_FOCUS="continuous"
 

src/dsf/resources/spyglass.conf

@@ -93,21 +93,36 @@ run_spyglass() {
         bind_adress="0.0.0.0"
     fi
 
+    if [[ "${USE_SW_JPG_ENCODING:-false}" == "true" ]]; then
+        use_sw_jpg_encoding="--use_sw_jpg_encoding"
+    else
+        use_sw_jpg_encoding=""
+    fi
+
+    if [[ "${DISABLE_WEBRTC:-false}" == "true" ]]; then
+        disable_webrtc="--disable_webrtc"
+    else
+        disable_webrtc=""
+    fi
+
     "${PY_BIN}" "$(dirname "${BASE_SPY_PATH}")/run.py" \
     --camera_num "${CAMERA_NUM:-0}" \
     --bindaddress "${bind_adress}" \
     --port "${HTTP_PORT:-8080}" \
     --resolution "${RESOLUTION:-640x480}" \
     --fps "${FPS:-15}" \
-    --stream_url "${STREAM_URL:-\/stream}" \
-    --snapshot_url "${SNAPSHOT_URL:-\/snapshot}" \
+    --stream_url "${STREAM_URL:-/stream}" \
+    --snapshot_url "${SNAPSHOT_URL:-/snapshot}" \
+    ${use_sw_jpg_encoding} \
+    --webrtc_url "${WEBRTC_URL:-/webrtc}" \
+    ${disable_webrtc} \
     --autofocus "${AUTO_FOCUS:-continuous}" \
     --lensposition "${FOCAL_DIST:-0.0}" \
     --autofocusspeed "${AF_SPEED:-normal}" \
     --orientation_exif "${ORIENTATION_EXIF:-h}" \
     --tuning_filter "${TUNING_FILTER:-}"\
     --tuning_filter_dir "${TUNING_FILTER_DIR:-}" \
-    --controls-string "${CONTROLS:-0=0}" & # 0=0 to prevent error on empty string
+    --controls-string "${CONTROLS:-0=0}" # 0=0 to prevent error on empty string
 }
 
 #### MAIN
@@ -140,13 +155,7 @@ check_py_version
 get_config
 run_spyglass
 
-### Wait for termination request
-pid=$!
-
-onSigTerm() {
-  kill -TERM "$pid" 2>/dev/null
-}
-trap onSigTerm SIGTERM
-
-wait "$pid"
-
+### Loop to keep running
+while true; do
+    sleep 1
+done

src/dsf/scripts/spyglass

@@ -1,6 +1,6 @@
 [metadata]
 name = spyglass
-version = 0.15.0
+version = 0.17.0
 description = A simple mjpeg server for Picamera2
 url = https://github.com/roamingthings/spyglass
 license = GPL-3.0-only

src/dsf/setup.cfg

@@ -1,5 +1,15 @@
 """init py module."""
 import logging
+import importlib.util
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
+
+if importlib.util.find_spec("aiortc"):
+    WEBRTC_ENABLED=True
+else:
+    WEBRTC_ENABLED=False
+
+def set_webrtc_enabled(enabled):
+    global WEBRTC_ENABLED
+    WEBRTC_ENABLED = enabled

src/dsf/spyglass/__init__.py

@@ -1 +1 @@
-__version__ = "0.15.0"
+__version__ = "0.17.0"