OctoPrint-BitBang 0.2.1__tar.gz → 0.2.3__tar.gz

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3/OctoPrint_BitBang.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.1
+Version: 0.2.3
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -55,74 +55,55 @@ This is part of the [BitBang project](https://github.com/richlegrand/bitbang).
 
 ## Installation
 
-### Plugin Manager (recommended, once accepted into the OctoPrint plugin registry)
-
-In OctoPrint: **Settings → Plugin Manager → Get More**, search for **BitBang**, click **Install**.
-
-### Plugin Manager, install from URL
-
-**Settings → Plugin Manager → Get More → "… from URL"**, then paste:
-
-```
-https://github.com/richlegrand/OctoPrint-BitBang/archive/main.zip
-```
-
-Click **Install**, then restart OctoPrint when prompted.
-
-### pip
-
-Inside your OctoPrint venv:
+1. Install from PyPI:
 
 ```bash
 pip install OctoPrint-BitBang
 ```
 
-Restart OctoPrint.
-
-### Did it work?
+Don't install from the GitHub source zip — it omits the bundled proxy binaries, so remote access and video won't work.
 
-After OctoPrint restarts, you should see a **BitBang** button in the navbar and a new **BitBang** entry in Settings. If both are there, you're done -- continue to [Usage](#usage).
+On 32-bit Raspberry Pi OS (`armv7l`, the standard OctoPi image), run these commands first:
 
-If the plugin doesn't show up, or `octoprint.log` contains `BitBang plugin not loaded` or `BitBang video stack unavailable`, see [Installation Notes](#installation-notes) -- usually a pre-3.10 Python image, or (on 32-bit) an `aiortc`/`libvpx` mismatch that needs one extra step.
+```bash
+sudo apt install -y libvpx-dev libopus-dev libsrtp2-dev
+~/oprint/bin/pip install --no-binary aiortc,pylibsrtp --force-reinstall --no-deps aiortc==1.10.1 pylibsrtp==1.0.0
+```
 
-## Usage
+64-bit and x86_64 need nothing further.
 
-1. If you are using a separate program for camera streaming (e.g. camera-streamer, mjpg-streamer, ustreamer) you should stop these processes before running BitBang plugin to avoid camera access contention. See commands below.
+2. Free the camera from OctoPi's default streamer:
 
-Stable octopi stack:
 ```bash
-sudo systemctl stop webcamd
-sudo systemctl stop ffmpeg_hls
-sudo systemctl disable webcamd
-sudo systemctl disable ffmpeg_hls
+sudo systemctl disable --now webcamd ffmpeg_hls camera_streamer
+sudo systemctl restart octoprint
 ```
 
-New camera stack:
-```bash
-sudo systemctl stop camera-streamer
-sudo systemctl disable camera-streamer
-```
+3. Restart OctoPrint (usually with `sudo systemctl restart octoprint`).
+
+4. Point your browser to your OctoPrint server, open the Control tab, and choose **BitBang Camera** from the webcam selector at the top-right. 
 
-2. Point your browser to your local OctoPrint server. Open **Settings → BitBang**.
-3. Choose camera from dropdown.
+5. Open **Settings → BitBang** and choose camera from dropdown.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/camera_select.png)
 
-4. Choose resolution.
+6. Choose resolution.
 
 ![Resolution dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/resolution_select.png)
 
-5. Set a PIN (Optional).
-6. Save and **restart OctoPrint**.
-7. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
+
+7. Save and **restart OctoPrint**.
+
+8. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_select.png)
 
 ![BitBang URL](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_url.png)
 
-
 This URL allows remote access to your printer.
 
+9. Set `Snapshot Webcam` in **Settings → Webcam and Timelapse** to `BitBang Camera` if you want timelapse video/images of your prints. 
+
 ## Configuration
 
 All settings live in **Settings → BitBang**:
@@ -140,7 +121,7 @@ All settings take effect on OctoPrint restart. Full-screen button and brightness
 ## How it works
 
 - The `bitbang-python` package handles WebRTC signaling, identity, and the ASGI interface.
-- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and the JavaScript that injects the `<video>` element into OctoPrint's Control tab.
+- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and a webcam-provider template that renders the H.264 `<video>` in OctoPrint's Control tab.
 - The bitba.ng cloud acts purely as a signaling relay to broker a direct connection. If a direct connection isn't available, bitba.ng will use TURN instead.
 
 ## Privacy
@@ -167,41 +148,27 @@ See the [BitBang project page](https://github.com/richlegrand/bitbang) for the f
 
 ## Installation Notes
 
-If the basic [Installation](#installation) worked, skip this section.
+Skip this if [Installation](#installation) worked.
 
-The video stack depends on `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) and `aiortc`, installed as prebuilt wheels. As of v0.1.7 the plugin pins them (`aiortc<1.11`, and `av<12` on 32-bit ARM) so pip resolves to versions that work on current OctoPi -- **including the 32-bit stable image**:
+The video stack is `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) + `aiortc`, pulled in as wheels, and needs **Python 3.10+** — OctoPi 1.0.x (Bullseye / Python 3.9) has no usable `av` wheel, so upgrade the image to 1.1.0+. On **64-bit** (`aarch64` / `x86_64`) the PyPI wheels bundle their native libraries and work as-is; **32-bit** (`armv7l`) needs the extra step in [Installation](#installation) above, because its [piwheels](https://www.piwheels.org/) wheels link newer system libraries than Bookworm ships.
 
-- **64-bit Linux** (`aarch64`/`x86_64`) -- PyPI ships `av` wheels with FFmpeg bundled; nothing system-level needed.
-- **32-bit Raspberry Pi OS** (`armv7l`) -- [piwheels](https://www.piwheels.org/) ships an `av` wheel built against the **system FFmpeg 5.1**, and the `av<12` pin selects it. Supported, with one possible extra step (see below).
-- **Python 3.10+** is required either way (`av` wheels start at cp310).
+### Pi CSI camera not detected (falls back to USB)
 
-### Quick check
+The Pi CSI camera is driven through [`picamera2`](https://github.com/raspberrypi/picamera2), a **system** package installed via `apt` -- it is not on PyPI. Your OctoPrint venv can only import it if the venv was created with access to system site-packages. If it can't, CSI auto-detect fails and the plugin **silently falls back to a USB webcam** (or no camera) -- the plugin still loads, so the only symptom is the wrong camera.
+
+Check from inside your OctoPrint venv:
 
 ```bash
-uname -m            # aarch64 = 64-bit Pi; armv7l = 32-bit (also supported)
-python --version    # must be 3.10 or newer
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
 ```
 
-### By OctoPi version
-
-| Version | Notes |
-|---|---|
-| **1.1.0** | Bookworm + Python 3.11. The **stable image is 32-bit** (`armv7l`) on every Pi model; 64-bit is nightly-only. v0.1.7 supports both. |
-| **1.0.x** | Bullseye + Python 3.9 -- below the 3.10 minimum. Upgrade to 1.1.0. |
-| **Pre-1.0** | Older base. Upgrade. |
-
-### 32-bit: aiortc / libvpx mismatch
-
-On some 32-bit images the piwheels `aiortc` wheel is built against a newer `libvpx` than the OS ships, so `octoprint.log` shows `BitBang video stack unavailable: libvpx.so.9: cannot open shared object file`. Install the codec dev headers and rebuild aiortc against the system libvpx (in your OctoPrint venv):
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
 
 ```bash
-sudo apt install -y libvpx-dev libopus-dev
-pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
+python3 -m venv --system-site-packages /path/to/oprint
 ```
 
-### Old Python (3.9 or earlier)
-
-`av` wheels start at Python 3.10, so OctoPi 1.0.x (Python 3.9) has no usable wheel -- upgrade the image to 1.1.0.
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
 
 ### Diagnostic mode
 

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/OctoPrint_BitBang.egg-info/SOURCES.txt

@@ -27,4 +27,5 @@ octoprint_bitbang/bin/bitbang-linux-armv7
 octoprint_bitbang/static/favicon.png
 octoprint_bitbang/static/js/bitbang.js
 octoprint_bitbang/templates/bitbang_navbar.jinja2
-octoprint_bitbang/templates/bitbang_settings.jinja2
+octoprint_bitbang/templates/bitbang_settings.jinja2
+octoprint_bitbang/templates/bitbang_webcam.jinja2

{octoprint_bitbang-0.2.1/OctoPrint_BitBang.egg-info → octoprint_bitbang-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.1
+Version: 0.2.3
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -55,74 +55,55 @@ This is part of the [BitBang project](https://github.com/richlegrand/bitbang).
 
 ## Installation
 
-### Plugin Manager (recommended, once accepted into the OctoPrint plugin registry)
-
-In OctoPrint: **Settings → Plugin Manager → Get More**, search for **BitBang**, click **Install**.
-
-### Plugin Manager, install from URL
-
-**Settings → Plugin Manager → Get More → "… from URL"**, then paste:
-
-```
-https://github.com/richlegrand/OctoPrint-BitBang/archive/main.zip
-```
-
-Click **Install**, then restart OctoPrint when prompted.
-
-### pip
-
-Inside your OctoPrint venv:
+1. Install from PyPI:
 
 ```bash
 pip install OctoPrint-BitBang
 ```
 
-Restart OctoPrint.
-
-### Did it work?
+Don't install from the GitHub source zip — it omits the bundled proxy binaries, so remote access and video won't work.
 
-After OctoPrint restarts, you should see a **BitBang** button in the navbar and a new **BitBang** entry in Settings. If both are there, you're done -- continue to [Usage](#usage).
+On 32-bit Raspberry Pi OS (`armv7l`, the standard OctoPi image), run these commands first:
 
-If the plugin doesn't show up, or `octoprint.log` contains `BitBang plugin not loaded` or `BitBang video stack unavailable`, see [Installation Notes](#installation-notes) -- usually a pre-3.10 Python image, or (on 32-bit) an `aiortc`/`libvpx` mismatch that needs one extra step.
+```bash
+sudo apt install -y libvpx-dev libopus-dev libsrtp2-dev
+~/oprint/bin/pip install --no-binary aiortc,pylibsrtp --force-reinstall --no-deps aiortc==1.10.1 pylibsrtp==1.0.0
+```
 
-## Usage
+64-bit and x86_64 need nothing further.
 
-1. If you are using a separate program for camera streaming (e.g. camera-streamer, mjpg-streamer, ustreamer) you should stop these processes before running BitBang plugin to avoid camera access contention. See commands below.
+2. Free the camera from OctoPi's default streamer:
 
-Stable octopi stack:
 ```bash
-sudo systemctl stop webcamd
-sudo systemctl stop ffmpeg_hls
-sudo systemctl disable webcamd
-sudo systemctl disable ffmpeg_hls
+sudo systemctl disable --now webcamd ffmpeg_hls camera_streamer
+sudo systemctl restart octoprint
 ```
 
-New camera stack:
-```bash
-sudo systemctl stop camera-streamer
-sudo systemctl disable camera-streamer
-```
+3. Restart OctoPrint (usually with `sudo systemctl restart octoprint`).
+
+4. Point your browser to your OctoPrint server, open the Control tab, and choose **BitBang Camera** from the webcam selector at the top-right. 
 
-2. Point your browser to your local OctoPrint server. Open **Settings → BitBang**.
-3. Choose camera from dropdown.
+5. Open **Settings → BitBang** and choose camera from dropdown.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/camera_select.png)
 
-4. Choose resolution.
+6. Choose resolution.
 
 ![Resolution dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/resolution_select.png)
 
-5. Set a PIN (Optional).
-6. Save and **restart OctoPrint**.
-7. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
+
+7. Save and **restart OctoPrint**.
+
+8. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_select.png)
 
 ![BitBang URL](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_url.png)
 
-
 This URL allows remote access to your printer.
 
+9. Set `Snapshot Webcam` in **Settings → Webcam and Timelapse** to `BitBang Camera` if you want timelapse video/images of your prints. 
+
 ## Configuration
 
 All settings live in **Settings → BitBang**:
@@ -140,7 +121,7 @@ All settings take effect on OctoPrint restart. Full-screen button and brightness
 ## How it works
 
 - The `bitbang-python` package handles WebRTC signaling, identity, and the ASGI interface.
-- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and the JavaScript that injects the `<video>` element into OctoPrint's Control tab.
+- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and a webcam-provider template that renders the H.264 `<video>` in OctoPrint's Control tab.
 - The bitba.ng cloud acts purely as a signaling relay to broker a direct connection. If a direct connection isn't available, bitba.ng will use TURN instead.
 
 ## Privacy
@@ -167,41 +148,27 @@ See the [BitBang project page](https://github.com/richlegrand/bitbang) for the f
 
 ## Installation Notes
 
-If the basic [Installation](#installation) worked, skip this section.
+Skip this if [Installation](#installation) worked.
 
-The video stack depends on `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) and `aiortc`, installed as prebuilt wheels. As of v0.1.7 the plugin pins them (`aiortc<1.11`, and `av<12` on 32-bit ARM) so pip resolves to versions that work on current OctoPi -- **including the 32-bit stable image**:
+The video stack is `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) + `aiortc`, pulled in as wheels, and needs **Python 3.10+** — OctoPi 1.0.x (Bullseye / Python 3.9) has no usable `av` wheel, so upgrade the image to 1.1.0+. On **64-bit** (`aarch64` / `x86_64`) the PyPI wheels bundle their native libraries and work as-is; **32-bit** (`armv7l`) needs the extra step in [Installation](#installation) above, because its [piwheels](https://www.piwheels.org/) wheels link newer system libraries than Bookworm ships.
 
-- **64-bit Linux** (`aarch64`/`x86_64`) -- PyPI ships `av` wheels with FFmpeg bundled; nothing system-level needed.
-- **32-bit Raspberry Pi OS** (`armv7l`) -- [piwheels](https://www.piwheels.org/) ships an `av` wheel built against the **system FFmpeg 5.1**, and the `av<12` pin selects it. Supported, with one possible extra step (see below).
-- **Python 3.10+** is required either way (`av` wheels start at cp310).
+### Pi CSI camera not detected (falls back to USB)
 
-### Quick check
+The Pi CSI camera is driven through [`picamera2`](https://github.com/raspberrypi/picamera2), a **system** package installed via `apt` -- it is not on PyPI. Your OctoPrint venv can only import it if the venv was created with access to system site-packages. If it can't, CSI auto-detect fails and the plugin **silently falls back to a USB webcam** (or no camera) -- the plugin still loads, so the only symptom is the wrong camera.
+
+Check from inside your OctoPrint venv:
 
 ```bash
-uname -m            # aarch64 = 64-bit Pi; armv7l = 32-bit (also supported)
-python --version    # must be 3.10 or newer
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
 ```
 
-### By OctoPi version
-
-| Version | Notes |
-|---|---|
-| **1.1.0** | Bookworm + Python 3.11. The **stable image is 32-bit** (`armv7l`) on every Pi model; 64-bit is nightly-only. v0.1.7 supports both. |
-| **1.0.x** | Bullseye + Python 3.9 -- below the 3.10 minimum. Upgrade to 1.1.0. |
-| **Pre-1.0** | Older base. Upgrade. |
-
-### 32-bit: aiortc / libvpx mismatch
-
-On some 32-bit images the piwheels `aiortc` wheel is built against a newer `libvpx` than the OS ships, so `octoprint.log` shows `BitBang video stack unavailable: libvpx.so.9: cannot open shared object file`. Install the codec dev headers and rebuild aiortc against the system libvpx (in your OctoPrint venv):
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
 
 ```bash
-sudo apt install -y libvpx-dev libopus-dev
-pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
+python3 -m venv --system-site-packages /path/to/oprint
 ```
 
-### Old Python (3.9 or earlier)
-
-`av` wheels start at Python 3.10, so OctoPi 1.0.x (Python 3.9) has no usable wheel -- upgrade the image to 1.1.0.
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
 
 ### Diagnostic mode
 

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/README.md

@@ -22,74 +22,55 @@ This is part of the [BitBang project](https://github.com/richlegrand/bitbang).
 
 ## Installation
 
-### Plugin Manager (recommended, once accepted into the OctoPrint plugin registry)
-
-In OctoPrint: **Settings → Plugin Manager → Get More**, search for **BitBang**, click **Install**.
-
-### Plugin Manager, install from URL
-
-**Settings → Plugin Manager → Get More → "… from URL"**, then paste:
-
-```
-https://github.com/richlegrand/OctoPrint-BitBang/archive/main.zip
-```
-
-Click **Install**, then restart OctoPrint when prompted.
-
-### pip
-
-Inside your OctoPrint venv:
+1. Install from PyPI:
 
 ```bash
 pip install OctoPrint-BitBang
 ```
 
-Restart OctoPrint.
-
-### Did it work?
+Don't install from the GitHub source zip — it omits the bundled proxy binaries, so remote access and video won't work.
 
-After OctoPrint restarts, you should see a **BitBang** button in the navbar and a new **BitBang** entry in Settings. If both are there, you're done -- continue to [Usage](#usage).
+On 32-bit Raspberry Pi OS (`armv7l`, the standard OctoPi image), run these commands first:
 
-If the plugin doesn't show up, or `octoprint.log` contains `BitBang plugin not loaded` or `BitBang video stack unavailable`, see [Installation Notes](#installation-notes) -- usually a pre-3.10 Python image, or (on 32-bit) an `aiortc`/`libvpx` mismatch that needs one extra step.
+```bash
+sudo apt install -y libvpx-dev libopus-dev libsrtp2-dev
+~/oprint/bin/pip install --no-binary aiortc,pylibsrtp --force-reinstall --no-deps aiortc==1.10.1 pylibsrtp==1.0.0
+```
 
-## Usage
+64-bit and x86_64 need nothing further.
 
-1. If you are using a separate program for camera streaming (e.g. camera-streamer, mjpg-streamer, ustreamer) you should stop these processes before running BitBang plugin to avoid camera access contention. See commands below.
+2. Free the camera from OctoPi's default streamer:
 
-Stable octopi stack:
 ```bash
-sudo systemctl stop webcamd
-sudo systemctl stop ffmpeg_hls
-sudo systemctl disable webcamd
-sudo systemctl disable ffmpeg_hls
+sudo systemctl disable --now webcamd ffmpeg_hls camera_streamer
+sudo systemctl restart octoprint
 ```
 
-New camera stack:
-```bash
-sudo systemctl stop camera-streamer
-sudo systemctl disable camera-streamer
-```
+3. Restart OctoPrint (usually with `sudo systemctl restart octoprint`).
+
+4. Point your browser to your OctoPrint server, open the Control tab, and choose **BitBang Camera** from the webcam selector at the top-right. 
 
-2. Point your browser to your local OctoPrint server. Open **Settings → BitBang**.
-3. Choose camera from dropdown.
+5. Open **Settings → BitBang** and choose camera from dropdown.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/camera_select.png)
 
-4. Choose resolution.
+6. Choose resolution.
 
 ![Resolution dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/resolution_select.png)
 
-5. Set a PIN (Optional).
-6. Save and **restart OctoPrint**.
-7. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
+
+7. Save and **restart OctoPrint**.
+
+8. Refresh the OctoPrint tab in your browser. A button labeled BitBang is available in the menu bar -- click it for the URL.
 
 ![Camera dropdown](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_select.png)
 
 ![BitBang URL](https://raw.githubusercontent.com/richlegrand/OctoPrint-BitBang/refs/heads/main/assets/bitbang_url.png)
 
-
 This URL allows remote access to your printer.
 
+9. Set `Snapshot Webcam` in **Settings → Webcam and Timelapse** to `BitBang Camera` if you want timelapse video/images of your prints. 
+
 ## Configuration
 
 All settings live in **Settings → BitBang**:
@@ -107,7 +88,7 @@ All settings take effect on OctoPrint restart. Full-screen button and brightness
 ## How it works
 
 - The `bitbang-python` package handles WebRTC signaling, identity, and the ASGI interface.
-- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and the JavaScript that injects the `<video>` element into OctoPrint's Control tab.
+- This plugin wraps it with OctoPrint integration: settings UI, `WebcamProviderPlugin` hooks, camera auto-detect, CSRF-safe cookie handling, and a webcam-provider template that renders the H.264 `<video>` in OctoPrint's Control tab.
 - The bitba.ng cloud acts purely as a signaling relay to broker a direct connection. If a direct connection isn't available, bitba.ng will use TURN instead.
 
 ## Privacy
@@ -134,41 +115,27 @@ See the [BitBang project page](https://github.com/richlegrand/bitbang) for the f
 
 ## Installation Notes
 
-If the basic [Installation](#installation) worked, skip this section.
+Skip this if [Installation](#installation) worked.
 
-The video stack depends on `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) and `aiortc`, installed as prebuilt wheels. As of v0.1.7 the plugin pins them (`aiortc<1.11`, and `av<12` on 32-bit ARM) so pip resolves to versions that work on current OctoPi -- **including the 32-bit stable image**:
+The video stack is `av` ([PyAV](https://github.com/PyAV-Org/PyAV)) + `aiortc`, pulled in as wheels, and needs **Python 3.10+** — OctoPi 1.0.x (Bullseye / Python 3.9) has no usable `av` wheel, so upgrade the image to 1.1.0+. On **64-bit** (`aarch64` / `x86_64`) the PyPI wheels bundle their native libraries and work as-is; **32-bit** (`armv7l`) needs the extra step in [Installation](#installation) above, because its [piwheels](https://www.piwheels.org/) wheels link newer system libraries than Bookworm ships.
 
-- **64-bit Linux** (`aarch64`/`x86_64`) -- PyPI ships `av` wheels with FFmpeg bundled; nothing system-level needed.
-- **32-bit Raspberry Pi OS** (`armv7l`) -- [piwheels](https://www.piwheels.org/) ships an `av` wheel built against the **system FFmpeg 5.1**, and the `av<12` pin selects it. Supported, with one possible extra step (see below).
-- **Python 3.10+** is required either way (`av` wheels start at cp310).
+### Pi CSI camera not detected (falls back to USB)
 
-### Quick check
+The Pi CSI camera is driven through [`picamera2`](https://github.com/raspberrypi/picamera2), a **system** package installed via `apt` -- it is not on PyPI. Your OctoPrint venv can only import it if the venv was created with access to system site-packages. If it can't, CSI auto-detect fails and the plugin **silently falls back to a USB webcam** (or no camera) -- the plugin still loads, so the only symptom is the wrong camera.
+
+Check from inside your OctoPrint venv:
 
 ```bash
-uname -m            # aarch64 = 64-bit Pi; armv7l = 32-bit (also supported)
-python --version    # must be 3.10 or newer
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
 ```
 
-### By OctoPi version
-
-| Version | Notes |
-|---|---|
-| **1.1.0** | Bookworm + Python 3.11. The **stable image is 32-bit** (`armv7l`) on every Pi model; 64-bit is nightly-only. v0.1.7 supports both. |
-| **1.0.x** | Bullseye + Python 3.9 -- below the 3.10 minimum. Upgrade to 1.1.0. |
-| **Pre-1.0** | Older base. Upgrade. |
-
-### 32-bit: aiortc / libvpx mismatch
-
-On some 32-bit images the piwheels `aiortc` wheel is built against a newer `libvpx` than the OS ships, so `octoprint.log` shows `BitBang video stack unavailable: libvpx.so.9: cannot open shared object file`. Install the codec dev headers and rebuild aiortc against the system libvpx (in your OctoPrint venv):
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
 
 ```bash
-sudo apt install -y libvpx-dev libopus-dev
-pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
+python3 -m venv --system-site-packages /path/to/oprint
 ```
 
-### Old Python (3.9 or earlier)
-
-`av` wheels start at Python 3.10, so OctoPi 1.0.x (Python 3.9) has no usable wheel -- upgrade the image to 1.1.0.
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
 
 ### Diagnostic mode
 

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/octoprint_bitbang/__init__.py

@@ -5,7 +5,7 @@ No account, no subscription, no port forwarding. One shareable link.
 """
 
 __plugin_name__ = "BitBang"
-__plugin_version__ = "0.2.1"
+__plugin_version__ = "0.2.3"
 __plugin_description__ = "Remote OctoPrint access with live H.264 video via BitBang WebRTC. No account, no port forwarding, one shareable link."
 __plugin_url__ = "https://github.com/richlegrand/OctoPrint-BitBang"
 __plugin_author__ = "Rich LeGrand"

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/octoprint_bitbang/_plugin.py

@@ -233,7 +233,13 @@ class BitBangPlugin(
             return None
         path = os.path.join(os.path.dirname(__file__), "bin", f"bitbang-linux-{arch}")
         if not os.path.exists(path):
-            self._logger.warning(f"[video-bridge] bundled Go binary missing: {path}")
+            self._logger.warning(
+                f"[video-bridge] bundled Go binary missing: {path} -- remote "
+                f"access and video are disabled. The proxy binaries ship only in "
+                f"the PyPI package (and CI release artifacts), not the GitHub "
+                f"source archive. Reinstall with 'pip install -U OctoPrint-BitBang' "
+                f"(or remove + reinstall) to pull it."
+            )
             return None
         try:  # pip/zip don't preserve the exec bit
             os.chmod(path, os.stat(path).st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
@@ -760,6 +766,10 @@ class BitBangPlugin(
         return [
             {"type": "settings", "custom_bindings": False},
             {"type": "navbar", "custom_bindings": False},
+            # Render the live view as a proper webcam provider template so
+            # OctoPrint shows it only when "BitBang Camera" is the selected
+            # webcam -- no DOM-replacing the classic webcam.
+            {"type": "webcam", "name": "BitBang Camera", "template": "bitbang_webcam.jinja2"},
         ]
 
     def get_template_vars(self):

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/octoprint_bitbang/static/js/bitbang.js

@@ -1,11 +1,13 @@
 /*
  * OctoPrint-BitBang - H.264 video for OctoPrint
  *
- * Two modes:
- * - Remote (via BitBang): replaces MJPEG <img> with <video> wired to
- *   BitBang's WebRTC stream (bootstrap.js handles the track)
- * - Local (direct access): creates a WebRTC peer connection to the
- *   plugin's /offer endpoint for H.264 video on the LAN
+ * The live view is rendered by our webcam provider template
+ * (bitbang_webcam.jinja2) as <video id="bitbang-webcam">. This script
+ * decorates that element and wires the stream:
+ * - Remote (via BitBang): bootstrap.js attaches the WebRTC track via the
+ *   data-bitbang-stream attribute.
+ * - Local (direct access): opens a WebRTC peer connection to the plugin's
+ *   /offer endpoint for H.264 video on the LAN.
  */
 (function () {
     var isBitBang = !!window.__bbSessionId;
@@ -16,7 +18,9 @@
 
         var btn = document.createElement("button");
         btn.className = "btn btn-mini";
-        btn.style.cssText = "position:absolute;top:8px;right:8px;z-index:10;opacity:0.6;cursor:pointer;pointer-events:auto";
+        // Lower-left: clear of OctoPrint's webcam switcher (top-right) and our
+        // brightness slider (bottom-right).
+        btn.style.cssText = "position:absolute;bottom:8px;left:8px;z-index:10;opacity:0.6;cursor:pointer;pointer-events:auto";
         btn.innerHTML = '<i class="fas fa-expand"></i>';
         btn.title = "Fullscreen";
         btn.onmouseover = function () { btn.style.opacity = "1"; };
@@ -183,43 +187,21 @@
         video.addEventListener("resize", reflow);
     }
 
-    function replaceWebcam(video) {
+    // Decorate the <video> element OctoPrint renders from our webcam provider
+    // template (bitbang_webcam.jinja2): sizing, fullscreen button, status overlay
+    // and the brightness control. We no longer touch the classic webcam's DOM --
+    // OctoPrint shows our template only when "BitBang Camera" is the selected webcam.
+    function decorateVideo(video) {
+        if (video.dataset.bbDecorated) return;
+        video.dataset.bbDecorated = "1";
+        video.autoplay = true;
+        video.playsInline = true;
+        video.muted = true;
         video.style.backgroundColor = "#000";
         applyVideoSizing(video);
-
-        // OctoPrint 1.11+ Classic Webcam hides its default containers until
-        // a stream URL is configured. Mount into the outer container so
-        // we're visible regardless of the user's webcam settings.
-        var classicContainer = document.getElementById("classicwebcam_container");
-        if (classicContainer) {
-            // Knockout visibility bindings on classicwebcam's built-in
-            // containers keep re-showing them, so use a stylesheet rule
-            // which beats Knockout's inline style.display assignments.
-            if (!document.getElementById("bitbang-hide-classicwebcam")) {
-                var style = document.createElement("style");
-                style.id = "bitbang-hide-classicwebcam";
-                style.textContent =
-                    "#webcam_video_container, #webcam_img_container " +
-                    "{ display: none !important; }" +
-                    "#classicwebcam_container " +
-                    "{ padding: 0 !important; line-height: 0 !important; font-size: 0 !important; }";
-                document.head.appendChild(style);
-            }
-            classicContainer.appendChild(video);
-            addFullscreenButton(video);
-            addStatusOverlay(video);
-            applyCameraConfig(video);
-            return true;
-        }
-
-        // Fallback for other layouts: replace #webcam_image in place.
-        var img = document.getElementById("webcam_image");
-        if (!img) return false;
-        img.parentNode.replaceChild(video, img);
         addFullscreenButton(video);
         addStatusOverlay(video);
         applyCameraConfig(video);
-        return true;
     }
 
     // Intercept download links that use absolute URLs. OctoPrint
@@ -253,12 +235,28 @@
     // Connect video via local offer/answer endpoint. Works on LAN and
     // remotely (fetches TURN servers). Can be called with an existing
     // video element (fallback from remote mode) or creates its own.
-    function connectLocalVideo(video) {
+    function connectLocalVideo(video, attempt) {
+        // On a fresh page load the OctoPrint session's CSRF token may not be
+        // established yet, so the first POST /plugin/bitbang/offer can come back
+        // 400/403. Retry a bounded number of times so the stream comes up on its
+        // own instead of requiring a manual page refresh.
+        attempt = attempt || 0;
+        var MAX_ATTEMPTS = 10;
+        var RETRY_MS = 1500;
+        var pc = null;
+        function retry(why) {
+            if (pc) { try { pc.close(); } catch (e) {} }
+            if (attempt + 1 < MAX_ATTEMPTS) {
+                setTimeout(function () { connectLocalVideo(video, attempt + 1); }, RETRY_MS);
+            } else {
+                console.log("[BitBang] Local video gave up after retries:", why);
+            }
+        }
         fetch("/plugin/bitbang/ice-servers").then(function (r) {
             return r.json();
         }).then(function (iceServers) {
             var config = (iceServers && iceServers.length > 0) ? { iceServers: iceServers } : {};
-            var pc = new RTCPeerConnection(config);
+            pc = new RTCPeerConnection(config);
 
             pc.ontrack = function (event) {
                 if (event.streams && event.streams[0]) {
@@ -283,57 +281,43 @@
                     })
                 });
             }).then(function (response) {
-                return response.json();
-            }).then(function (answer) {
-                if (answer.error) {
-                    console.log("[BitBang] Local video not available:", answer.error);
+                if (!response.ok) {
+                    // 400 (CSRF token not ready yet), 403 (not logged in yet), etc.
+                    retry("offer HTTP " + response.status);
                     return;
                 }
-                return pc.setRemoteDescription(answer);
+                return response.json().then(function (answer) {
+                    if (answer.error) {
+                        console.log("[BitBang] Local video not available:", answer.error);
+                        return;
+                    }
+                    return pc.setRemoteDescription(answer);
+                });
             });
         }).catch(function (err) {
-            console.log("[BitBang] Local video failed:", err);
+            retry(String(err));
         });
     }
 
-    function createVideo(attrs) {
-        var video = document.createElement("video");
-        video.autoplay = true;
-        video.playsInline = true;
-        video.muted = true;
-        for (var k in attrs) video.setAttribute(k, attrs[k]);
-        return video;
-    }
-
-    function whenWebcamReady(callback) {
-        if (document.readyState === "loading") {
-            document.addEventListener("DOMContentLoaded", callback);
-        } else {
-            callback();
-        }
+    // Wait for OctoPrint to render our webcam template's
+    // <video id="bitbang-webcam">, then hand it to the callback once.
+    function whenVideoReady(callback) {
+        var existing = document.getElementById("bitbang-webcam");
+        if (existing) { callback(existing); return; }
         var observer = new MutationObserver(function () {
-            if (document.getElementById("webcam_image") ||
-                document.getElementById("classicwebcam_container")) {
-                callback();
-            }
+            var el = document.getElementById("bitbang-webcam");
+            if (el) { observer.disconnect(); callback(el); }
         });
         observer.observe(document.body, { childList: true, subtree: true });
     }
 
-    if (isBitBang) {
-        // Remote mode: bootstrap.js wires the track via data-bitbang-stream
-        whenWebcamReady(function () {
-            if (document.querySelector("video[data-bitbang-stream]")) return;
-            var video = createVideo({"data-bitbang-stream": "camera"});
-            replaceWebcam(video);
-        });
-    } else {
-        // Local mode: direct WebRTC to the plugin's signaling endpoint
-        whenWebcamReady(function () {
-            if (document.querySelector("video[data-bitbang-local]")) return;
-            var video = createVideo({"data-bitbang-local": "1"});
-            if (!replaceWebcam(video)) return;
+    whenVideoReady(function (video) {
+        decorateVideo(video);
+        // Remote (via BitBang URL): bootstrap.js attaches the WebRTC track
+        // through the data-bitbang-stream attribute already on the element.
+        // Local (direct LAN access): open a peer connection to /offer.
+        if (!isBitBang) {
             connectLocalVideo(video);
-        });
-    }
+        }
+    });
 })();

octoprint_bitbang-0.2.3/octoprint_bitbang/templates/bitbang_webcam.jinja2

@@ -0,0 +1,2 @@
+<video id="bitbang-webcam" data-bitbang-stream="camera" autoplay playsinline muted
+       style="width:100%;height:auto;display:block;background:#000;"></video>

{octoprint_bitbang-0.2.1 → octoprint_bitbang-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OctoPrint-BitBang"
-version = "0.2.1"
+version = "0.2.3"
 description = "Remote OctoPrint access with live H.264 video via BitBang WebRTC"
 readme = "README.md"
 license = "MIT"