OctoPrint-BitBang 0.2.6__tar.gz → 0.2.7__tar.gz

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7/OctoPrint_BitBang.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.6
+Version: 0.2.7
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -24,9 +24,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: bitbang>=0.1.53
-Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: Pillow>=9.0.0
-Requires-Dist: numpy>=1.20.0
 Requires-Dist: aiortc<1.11
 Requires-Dist: av<12; platform_machine == "armv7l"
 Dynamic: license-file

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7}/OctoPrint_BitBang.egg-info/requires.txt

@@ -1,7 +1,4 @@
 bitbang>=0.1.53
-aiohttp>=3.8.0
-Pillow>=9.0.0
-numpy>=1.20.0
 aiortc<1.11
 
 [:platform_machine == "armv7l"]

{octoprint_bitbang-0.2.6/OctoPrint_BitBang.egg-info → octoprint_bitbang-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OctoPrint-BitBang
-Version: 0.2.6
+Version: 0.2.7
 Summary: Remote OctoPrint access with live H.264 video via BitBang WebRTC
 Author-email: Rich LeGrand <rich.m.legrand@gmail.com>
 License-Expression: MIT
@@ -24,9 +24,6 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: bitbang>=0.1.53
-Requires-Dist: aiohttp>=3.8.0
-Requires-Dist: Pillow>=9.0.0
-Requires-Dist: numpy>=1.20.0
 Requires-Dist: aiortc<1.11
 Requires-Dist: av<12; platform_machine == "armv7l"
 Dynamic: license-file

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7}/octoprint_bitbang/__init__.py

@@ -4,8 +4,15 @@ Remote OctoPrint access with live H.264 video via BitBang WebRTC.
 No account, no subscription, no port forwarding. One shareable link.
 """
 
+from importlib.metadata import PackageNotFoundError, version
+
 __plugin_name__ = "BitBang"
-__plugin_version__ = "0.2.6"
+try:
+    # Single source of truth: read the version from the installed package
+    # metadata (declared once in pyproject.toml) rather than duplicating it here.
+    __plugin_version__ = version("OctoPrint-BitBang")
+except PackageNotFoundError:  # running from a source checkout, not pip-installed
+    __plugin_version__ = "0.0.0+unknown"
 __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.6 → octoprint_bitbang-0.2.7}/octoprint_bitbang/_plugin.py

@@ -201,6 +201,9 @@ class BitBangPlugin(
         self._settings.set(["url"], url)
         self._settings.save()
         self._logger.info(f"BitBang remote access: {url}")
+        # Push the URL to the frontend so the navbar reflects it live, instead
+        # of the browser polling the settings API.
+        self._plugin_manager.send_plugin_message(self._identifier, {"url": url})
 
         # Split-transport: a supervised Go proxy (data + HTTP/WS over native-SCTP
         # pion) owns the transport under our shared identity, and our camera
@@ -764,8 +767,8 @@ class BitBangPlugin(
 
     def get_template_configs(self):
         return [
-            {"type": "settings", "custom_bindings": False},
-            {"type": "navbar", "custom_bindings": False},
+            {"type": "settings", "custom_bindings": True},
+            {"type": "navbar", "custom_bindings": True},
             # 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.

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7}/octoprint_bitbang/static/js/bitbang.js

@@ -321,3 +321,81 @@
         }
     });
 })();
+
+/*
+ * Settings + navbar viewmodel.
+ *
+ * The navbar link and the camera/resolution dropdowns used to read plugin
+ * state via raw fetch('/api/settings') + manual DOM. This binds them through
+ * the standard settingsViewModel and Knockout instead: settings come from the
+ * settings observable, camera lists from the plugin's blueprint endpoints, and
+ * the live remote URL arrives via a plugin message (no polling).
+ */
+function BitBangViewModel(parameters) {
+    var self = this;
+    self.settings = parameters[0];
+
+    self.cameras = ko.observableArray([]);
+    self.resolutions = ko.observableArray([]);
+    self.remoteUrl = ko.observable("");
+
+    function bb() { return self.settings.settings.plugins.bitbang; }
+
+    self.loadResolutions = function (device) {
+        return OctoPrint.get(
+            "plugin/bitbang/resolutions?device=" + encodeURIComponent(device || "")
+        ).done(function (resolutions) {
+            self.resolutions(resolutions);
+            // Keep the saved resolution if it's still valid for this device,
+            // otherwise fall back to the first available.
+            if (resolutions.indexOf(bb().camera_resolution()) < 0) {
+                bb().camera_resolution(resolutions[0] || "");
+            }
+        });
+    };
+
+    self.loadCameras = function () {
+        return OctoPrint.get("plugin/bitbang/cameras").done(function (cameras) {
+            // Lead with an explicit auto-detect entry (value "") so the saved
+            // empty setting round-trips cleanly.
+            self.cameras([{ device: "", name: "Auto-detect" }].concat(cameras));
+            self.loadResolutions(bb().camera_device());
+        });
+    };
+
+    self.refreshCameras = function () { self.loadCameras(); };
+
+    self.showUrl = function () {
+        var url = self.remoteUrl();
+        if (url) {
+            window.prompt("BitBang URL (Ctrl+C to copy):", url);
+        } else {
+            alert("BitBang URL not available yet");
+        }
+    };
+
+    // Repopulate the dropdowns each time the settings dialog opens.
+    self.onSettingsShown = function () { self.loadCameras(); };
+
+    self.onStartupComplete = function () {
+        self.remoteUrl(bb().url() || "");
+        // Reload resolutions whenever the selected camera changes.
+        bb().camera_device.subscribe(function (device) {
+            self.loadResolutions(device);
+        });
+    };
+
+    // The plugin pushes the remote URL when BitBang connects, so the navbar
+    // reflects it live.
+    self.onDataUpdaterPluginMessage = function (plugin, data) {
+        if (plugin === "bitbang" && data && data.url !== undefined) {
+            self.remoteUrl(data.url);
+        }
+    };
+}
+
+OCTOPRINT_VIEWMODELS.push({
+    construct: BitBangViewModel,
+    dependencies: ["settingsViewModel"],
+    elements: ["#navbar_plugin_bitbang", "#settings_plugin_bitbang"]
+});

octoprint_bitbang-0.2.7/octoprint_bitbang/templates/bitbang_navbar.jinja2

@@ -0,0 +1,4 @@
+<a href="javascript:void(0)" title="BitBang remote access"
+   data-bind="visible: settings.settings.plugins.bitbang.enabled, click: showUrl">
+    <i class="fas fa-link"></i> <span class="hidden-phone">BitBang</span>
+</a>

octoprint_bitbang-0.2.7/octoprint_bitbang/templates/bitbang_settings.jinja2

@@ -0,0 +1,93 @@
+<div id="settings_bitbang">
+    <h3>BitBang Remote Access</h3>
+
+    <form class="form-horizontal">
+        <div class="control-group">
+            <label class="control-label">Enabled</label>
+            <div class="controls">
+                <input type="checkbox" data-bind="checked: settings.settings.plugins.bitbang.enabled">
+            </div>
+        </div>
+
+        <div class="control-group">
+            <label class="control-label">PIN Protection</label>
+            <div class="controls">
+                <input type="text" class="input-medium"
+                       data-bind="value: settings.settings.plugins.bitbang.pin"
+                       placeholder="Empty to disable">
+                <span class="help-inline">Optional PIN to protect remote access</span>
+            </div>
+        </div>
+
+        <div class="control-group">
+            <label class="control-label">Remote URL</label>
+            <div class="controls">
+                <span data-bind="visible: settings.settings.plugins.bitbang.url()">
+                    <a data-bind="attr: {href: settings.settings.plugins.bitbang.url()}, text: settings.settings.plugins.bitbang.url()"
+                       target="_blank" rel="noopener"></a>
+                </span>
+                <span data-bind="visible: !settings.settings.plugins.bitbang.url()" class="muted">
+                    URL will appear after BitBang connects
+                </span>
+                <span class="help-inline">Share this link for remote access</span>
+            </div>
+        </div>
+
+        <h3>Camera</h3>
+
+        <div class="control-group">
+            <label class="control-label">Camera</label>
+            <div class="controls">
+                <select class="input-xlarge"
+                        data-bind="options: cameras,
+                                   optionsText: function(c) { return c.device ? c.name + ' (' + c.device + ')' : c.name; },
+                                   optionsValue: 'device',
+                                   value: settings.settings.plugins.bitbang.camera_device,
+                                   valueAllowUnset: true"></select>
+                <button class="btn btn-mini" type="button" data-bind="click: refreshCameras" title="Refresh camera list">
+                    <i class="fas fa-sync"></i>
+                </button>
+            </div>
+        </div>
+
+        <div class="control-group">
+            <label class="control-label">Resolution</label>
+            <div class="controls">
+                <select class="input-medium"
+                        data-bind="options: resolutions,
+                                   value: settings.settings.plugins.bitbang.camera_resolution,
+                                   valueAllowUnset: true"></select>
+            </div>
+        </div>
+
+        <div class="control-group">
+            <label class="control-label">Image orientation</label>
+            <div class="controls">
+                <label class="checkbox inline">
+                    <input type="checkbox" data-bind="checked: settings.settings.plugins.bitbang.flip_horizontal">
+                    Flip horizontal
+                </label>
+                <label class="checkbox inline">
+                    <input type="checkbox" data-bind="checked: settings.settings.plugins.bitbang.flip_vertical">
+                    Flip vertical
+                </label>
+            </div>
+        </div>
+
+        <h3>Advanced</h3>
+
+        <div class="control-group">
+            <label class="control-label">Signaling server</label>
+            <div class="controls">
+                <input type="text" class="input-xlarge"
+                       data-bind="value: settings.settings.plugins.bitbang.signaling_server">
+                <span class="help-inline">Default <code>bitba.ng</code>. To use your own <a href="https://github.com/richlegrand/bitbang-server" target="_blank" rel="noopener">bitbang-server</a>, replace with the hostname (e.g. <code>signaling.example.com</code>).</span>
+            </div>
+        </div>
+    </form>
+
+    <div class="alert alert-info" style="margin-top: 16px;">
+        <i class="fas fa-info-circle"></i>
+        <strong>Restart OctoPrint</strong> after changing settings for them to take effect.
+    </div>
+</div>

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OctoPrint-BitBang"
-version = "0.2.6"
+version = "0.2.7"
 description = "Remote OctoPrint access with live H.264 video via BitBang WebRTC"
 readme = "README.md"
 license = "MIT"
@@ -27,9 +27,6 @@ classifiers = [
 ]
 dependencies = [
     "bitbang>=0.1.53",
-    "aiohttp>=3.8.0",
-    "Pillow>=9.0.0",
-    "numpy>=1.20.0",
     # aiortc/av come transitively via bitbang. aiortc<1.11 already caps av<14.
     # 32-bit (armv7l) has NO PyAV wheels at any in-range version, so av builds
     # from source against the system FFmpeg (Bookworm 5.1); av<12 lands it on the

{octoprint_bitbang-0.2.6 → octoprint_bitbang-0.2.7}/setup.py

@@ -1,2 +1,2 @@
 from setuptools import setup
-setup()
+setup(license="MIT")

octoprint_bitbang-0.2.6/octoprint_bitbang/templates/bitbang_navbar.jinja2

@@ -1,29 +0,0 @@
-<a id="bitbang_navbar_link" href="javascript:void(0)" title="BitBang remote access" style="display:none" onclick="
-    fetch('/api/settings')
-        .then(function(r) { return r.json(); })
-        .then(function(data) {
-            var url = data.plugins && data.plugins.bitbang && data.plugins.bitbang.url;
-            if (url) {
-                prompt('BitBang URL (Ctrl+C to copy):', url);
-            } else {
-                alert('BitBang URL not available yet');
-            }
-        })
-        .catch(function() { alert('Could not load settings'); });
-">
-    <i id="bitbang_navbar_icon" class="fas fa-link"></i> <span class="hidden-phone">BitBang</span>
-</a>
-<script>
-(function () {
-    fetch('/api/settings')
-        .then(function (r) { return r.json(); })
-        .then(function (data) {
-            var enabled = data.plugins && data.plugins.bitbang && data.plugins.bitbang.enabled;
-            if (enabled) {
-                var link = document.getElementById('bitbang_navbar_link');
-                if (link) link.style.display = '';
-            }
-        })
-        .catch(function () {});
-})();
-</script>

octoprint_bitbang-0.2.6/octoprint_bitbang/templates/bitbang_settings.jinja2

@@ -1,169 +0,0 @@
-<div id="settings_bitbang">
-    <h3>BitBang Remote Access</h3>
-
-    <form class="form-horizontal">
-        <div class="control-group">
-            <label class="control-label">Enabled</label>
-            <div class="controls">
-                <input type="checkbox" data-bind="checked: settings.plugins.bitbang.enabled">
-            </div>
-        </div>
-
-        <div class="control-group">
-            <label class="control-label">PIN Protection</label>
-            <div class="controls">
-                <input type="text" class="input-medium"
-                       data-bind="value: settings.plugins.bitbang.pin"
-                       placeholder="Empty to disable">
-                <span class="help-inline">Optional PIN to protect remote access</span>
-            </div>
-        </div>
-
-        <div class="control-group">
-            <label class="control-label">Remote URL</label>
-            <div class="controls">
-                <span data-bind="visible: settings.plugins.bitbang.url()">
-                    <a data-bind="attr: {href: settings.plugins.bitbang.url()}, text: settings.plugins.bitbang.url()"
-                       target="_blank" rel="noopener"></a>
-                </span>
-                <span data-bind="visible: !settings.plugins.bitbang.url()" class="muted">
-                    URL will appear after BitBang connects
-                </span>
-                <span class="help-inline">Share this link for remote access</span>
-            </div>
-        </div>
-
-        <h3>Camera</h3>
-
-        <div class="control-group">
-            <label class="control-label">Camera</label>
-            <div class="controls">
-                <select id="bitbang_camera_select" class="input-xlarge"
-                        data-bind="value: settings.plugins.bitbang.camera_device, valueAllowUnset: true">
-                    <option value="">Auto-detect</option>
-                </select>
-                <button class="btn btn-mini" id="bitbang_refresh_cameras" type="button">
-                    <i class="fas fa-sync"></i>
-                </button>
-            </div>
-        </div>
-
-        <div class="control-group">
-            <label class="control-label">Resolution</label>
-            <div class="controls">
-                <select id="bitbang_resolution_select" class="input-medium"
-                        data-bind="value: settings.plugins.bitbang.camera_resolution, valueAllowUnset: true">
-                    <option value="640x480">640x480</option>
-                </select>
-            </div>
-        </div>
-
-        <div class="control-group">
-            <label class="control-label">Image orientation</label>
-            <div class="controls">
-                <label class="checkbox inline">
-                    <input type="checkbox" data-bind="checked: settings.plugins.bitbang.flip_horizontal">
-                    Flip horizontal
-                </label>
-                <label class="checkbox inline">
-                    <input type="checkbox" data-bind="checked: settings.plugins.bitbang.flip_vertical">
-                    Flip vertical
-                </label>
-            </div>
-        </div>
-
-        <h3>Advanced</h3>
-
-        <div class="control-group">
-            <label class="control-label">Signaling server</label>
-            <div class="controls">
-                <input type="text" class="input-xlarge"
-                       data-bind="value: settings.plugins.bitbang.signaling_server">
-                <span class="help-inline">Default <code>bitba.ng</code>. To use your own <a href="https://github.com/richlegrand/bitbang-server" target="_blank" rel="noopener">bitbang-server</a>, replace with the hostname (e.g. <code>signaling.example.com</code>).</span>
-            </div>
-        </div>
-    </form>
-
-    <div class="alert alert-info" style="margin-top: 16px;">
-        <i class="fas fa-info-circle"></i>
-        <strong>Restart OctoPrint</strong> after changing settings for them to take effect.
-    </div>
-</div>
-
-<script>
-(function () {
-    var cameraSelect = document.getElementById("bitbang_camera_select");
-    var resolutionSelect = document.getElementById("bitbang_resolution_select");
-    var refreshBtn = document.getElementById("bitbang_refresh_cameras");
-    if (!cameraSelect || !resolutionSelect) return;
-
-    // Set a <select> and notify Knockout's value binding — it doesn't see
-    // options added via raw DOM, so without the dispatched 'change' the
-    // observable (and thus the saved setting) won't follow the selection.
-    // Suppress the camera change handler during programmatic sets so we don't
-    // reload resolutions twice.
-    function setSelect(sel, value) {
-        var ok = value && Array.prototype.some.call(
-            sel.options, function (o) { return o.value === value; });
-        sel._suppress = true;
-        if (ok) sel.value = value;
-        sel.dispatchEvent(new Event("change"));
-        sel._suppress = false;
-    }
-
-    function loadResolutions(device, wanted) {
-        return fetch("/plugin/bitbang/resolutions?device=" + encodeURIComponent(device || ""))
-            .then(function (r) { return r.json(); })
-            .then(function (resolutions) {
-                resolutionSelect.innerHTML = "";
-                resolutions.forEach(function (res) {
-                    var opt = document.createElement("option");
-                    opt.value = res;
-                    opt.textContent = res;
-                    resolutionSelect.appendChild(opt);
-                });
-                setSelect(resolutionSelect,
-                          resolutions.indexOf(wanted) >= 0 ? wanted : resolutions[0]);
-            })
-            .catch(function () {});
-    }
-
-    function loadCameras(wantedCamera, wantedRes) {
-        return fetch("/plugin/bitbang/cameras")
-            .then(function (r) { return r.json(); })
-            .then(function (cameras) {
-                while (cameraSelect.options.length > 1) cameraSelect.remove(1);
-                cameras.forEach(function (cam) {
-                    var opt = document.createElement("option");
-                    opt.value = cam.device;
-                    opt.textContent = cam.name + " (" + cam.device + ")";
-                    cameraSelect.appendChild(opt);
-                });
-                setSelect(cameraSelect, wantedCamera);
-                return loadResolutions(cameraSelect.value, wantedRes);
-            })
-            .catch(function () {});
-    }
-
-    cameraSelect.addEventListener("change", function () {
-        if (cameraSelect._suppress) return;   // programmatic set — skip reload
-        loadResolutions(cameraSelect.value, resolutionSelect.value);
-    });
-
-    if (refreshBtn) {
-        refreshBtn.addEventListener("click", function () {
-            loadCameras(cameraSelect.value, resolutionSelect.value);
-        });
-    }
-
-    // Populate from the SAVED config — not the (Knockout-clobbered) DOM value —
-    // so the dropdowns reflect what's persisted and a Save round-trips cleanly.
-    fetch("/api/settings")
-        .then(function (r) { return r.json(); })
-        .then(function (s) {
-            var bb = (s.plugins && s.plugins.bitbang) || {};
-            loadCameras(bb.camera_device || "", bb.camera_resolution || "");
-        })
-        .catch(function () { loadCameras("", ""); });
-})();
-</script>