OctoPrint-BitBang 0.2.0__tar.gz → 0.2.2__tar.gz

{octoprint_bitbang-0.2.0 → octoprint_bitbang-0.2.2/OctoPrint_BitBang.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.0
+Version: 0.2.2
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -79,6 +79,8 @@ pip install OctoPrint-BitBang
 
 Restart OctoPrint.
 
+> **Pi CSI camera:** `picamera2` (the Pi camera driver) is a system package, so the venv must be created with `python3 -m venv --system-site-packages` to see it. Without that, the CSI camera isn't detected and the plugin falls back to USB. USB webcams aren't affected -- details in [Installation Notes](#installation-notes).
+
 ### Did it 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).
@@ -203,6 +205,24 @@ pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
 
 `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.
 
+### Pi CSI camera not detected (falls back to USB)
+
+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
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
+```
+
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
+
+```bash
+python3 -m venv --system-site-packages /path/to/oprint
+```
+
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
+
 ### Diagnostic mode
 
 If the video stack fails to import for any reason, the plugin still loads -- settings and navbar are visible, and `octoprint.log` shows a clear `BitBang video stack unavailable: <reason>` line. You can see the missing piece in OctoPrint instead of grepping logs.

{octoprint_bitbang-0.2.0 → octoprint_bitbang-0.2.2}/OctoPrint_BitBang.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ octoprint_bitbang/pi_camera_track.py
 octoprint_bitbang/pi_h264_source.py
 octoprint_bitbang/usb_camera_source.py
 octoprint_bitbang/v4l2_h264_source.py
+octoprint_bitbang/bin/bitbang-linux-amd64
 octoprint_bitbang/bin/bitbang-linux-arm64
 octoprint_bitbang/bin/bitbang-linux-armv7
 octoprint_bitbang/static/favicon.png

{octoprint_bitbang-0.2.0/OctoPrint_BitBang.egg-info → octoprint_bitbang-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.0
+Version: 0.2.2
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -79,6 +79,8 @@ pip install OctoPrint-BitBang
 
 Restart OctoPrint.
 
+> **Pi CSI camera:** `picamera2` (the Pi camera driver) is a system package, so the venv must be created with `python3 -m venv --system-site-packages` to see it. Without that, the CSI camera isn't detected and the plugin falls back to USB. USB webcams aren't affected -- details in [Installation Notes](#installation-notes).
+
 ### Did it 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).
@@ -203,6 +205,24 @@ pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
 
 `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.
 
+### Pi CSI camera not detected (falls back to USB)
+
+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
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
+```
+
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
+
+```bash
+python3 -m venv --system-site-packages /path/to/oprint
+```
+
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
+
 ### Diagnostic mode
 
 If the video stack fails to import for any reason, the plugin still loads -- settings and navbar are visible, and `octoprint.log` shows a clear `BitBang video stack unavailable: <reason>` line. You can see the missing piece in OctoPrint instead of grepping logs.

{octoprint_bitbang-0.2.0 → octoprint_bitbang-0.2.2}/README.md

@@ -46,6 +46,8 @@ pip install OctoPrint-BitBang
 
 Restart OctoPrint.
 
+> **Pi CSI camera:** `picamera2` (the Pi camera driver) is a system package, so the venv must be created with `python3 -m venv --system-site-packages` to see it. Without that, the CSI camera isn't detected and the plugin falls back to USB. USB webcams aren't affected -- details in [Installation Notes](#installation-notes).
+
 ### Did it 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).
@@ -170,6 +172,24 @@ pip install --no-binary aiortc --force-reinstall --no-deps "aiortc<1.11"
 
 `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.
 
+### Pi CSI camera not detected (falls back to USB)
+
+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
+python -c "import picamera2"   # ImportError -> the venv cannot see picamera2
+```
+
+If that errors, recreate the venv with system site-packages and reinstall OctoPrint and the plugin into it:
+
+```bash
+python3 -m venv --system-site-packages /path/to/oprint
+```
+
+USB webcams work in a plain venv -- this only affects the Pi CSI camera.
+
 ### Diagnostic mode
 
 If the video stack fails to import for any reason, the plugin still loads -- settings and navbar are visible, and `octoprint.log` shows a clear `BitBang video stack unavailable: <reason>` line. You can see the missing piece in OctoPrint instead of grepping logs.

{octoprint_bitbang-0.2.0 → octoprint_bitbang-0.2.2}/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.0"
+__plugin_version__ = "0.2.2"
 __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.0 → octoprint_bitbang-0.2.2}/octoprint_bitbang/static/js/bitbang.js

@@ -253,12 +253,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,16 +299,21 @@
                     })
                 });
             }).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));
         });
     }
 

{octoprint_bitbang-0.2.0 → octoprint_bitbang-0.2.2}/pyproject.toml

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