simplepyble 1.2.1.dev90__tar.gz → 1.2.1.dev105__tar.gz

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/Cargo.toml

@@ -2,7 +2,7 @@
 edition = "2021"
 
 name = "simplersble"
-version = "1.2.1-dev90"
+version = "1.2.1-dev105"
 rust-version = "1.82"
 license = "BUSL-1.1"
 description = "The all-in-one Bluetooth library that makes it easy to add wireless connectivity to your projects."

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplepyble
-Version: 1.2.1.dev90
+Version: 1.2.1.dev105
 Summary: The ultimate fully-fledged cross-platform BLE library, designed for simplicity and ease of use. Free for non-commercial use; commercial use requires a license.
 Home-page: https://github.com/simpleble/simpleble
 Author: Kevin Dewald
@@ -128,26 +128,10 @@ Check out the `async examples`_ for more details.
 License
 =======
 
-Since January 20th 2025, SimpleBLE is now available under the Business Source License 1.1 (BUSL-1.1). Each
-version of SimpleBLE will convert to the GNU General Public License version 3 after four years of its initial release.
-Qualifying non-commercial users may instead continue using and distributing that version under the original
-BUSL-1.1 terms under the Non-Commercial Perpetual Use Grant in ``LICENSE.md``.
-
-The project is free to use for non-commercial purposes, but requires a commercial license for commercial use. We
-also offer FREE commercial licenses for small projects and early-stage companies - reach out to discuss your use case!
-
-**Why purchase a commercial license?**
-
-- Build and deploy unlimited commercial applications
-- Use across your entire development team
-- Zero revenue sharing or royalty payments
-- Choose features that match your needs and budget
-- Priority technical support included
-- Clear terms for integrating into MIT-licensed projects
-
-**Looking for information on pricing and commercial terms of service?** Visit |website-url|_ for more details.
-
-For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the specifics of your situation.
+SimplePyBLE follows the `SimpleBLE license`_, the Business Source License 1.1 (BUSL-1.1). It is free for non-commercial
+use, and commercial use needs a commercial license. We offer free commercial licenses for small projects and early-stage
+companies: |email|_ or |leavemessage|_ to discuss your use case. Commercial licenses carry no royalties or revenue
+sharing; see the `licensing page`_ for terms.
 
 ----
 
@@ -158,15 +142,12 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 .. |email| replace:: email us
 .. _email: mailto:contact@simpleble.org
 
-.. |leavemessage| replace:: leave us a message on our website
+.. |leavemessage| replace:: leave us a message
 .. _leavemessage: https://www.simpleble.org/contact?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
 .. |website| replace:: our website
 .. _website: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
-.. |website-url| replace:: www.simpleble.org
-.. _website-url: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
-
 .. |caos| replace:: **The California Open Source Company**
 .. _caos: https://californiaopensource.com?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
@@ -174,6 +155,10 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 
 .. _SimpleBLE: https://github.com/simpleble/simpleble/
 
+.. _SimpleBLE license: https://github.com/simpleble/simpleble/blob/main/LICENSE.md
+
+.. _licensing page: https://docs.simpleble.org/licensing
+
 .. _official SimpleBLE Bluetooth dongle: https://www.simpleble.org/dongl?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=dongl_launch
 
 .. _code examples: https://github.com/simpleble/simpleble/tree/main/examples/simplepyble

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/README.rst

@@ -16,7 +16,7 @@ SimpleBLE
 |CI Main| |Latest Release| |License|
 
 SimpleBLE is the cross-platform Bluetooth Low Energy stack for Windows, macOS, Linux, iOS, and Android. Use it from
-C++, C, C#, Python, Java, Go, Rust, or JavaScript, with dedicated APIs for Kotlin on Android and Unreal Engine.
+C++, C, C#, Python, Java, Kotlin, Go, Rust, JavaScript, or React Native, with a dedicated API for Unreal Engine.
 
 Why SimpleBLE
 -------------
@@ -61,8 +61,9 @@ and requires a commercial license for commercial use. Each version converts to t
 four years after its initial release. Qualifying non-commercial users may instead continue using and distributing that
 version under the original BUSL-1.1 terms through the Non-Commercial Perpetual Use Grant in ``LICENSE.md``.
 
-Free commercial licenses are available for qualifying small projects and early-stage companies. See |website-url|_ for
-pricing and commercial terms, or |leavemessage|_ to discuss your use case.
+Free commercial licenses are available for qualifying small projects and early-stage companies, and commercial licenses
+carry no royalties or revenue sharing. See |website-url|_ for pricing and commercial terms, or |leavemessage|_ to
+discuss your use case.
 
 ----
 
@@ -104,8 +105,8 @@ pricing and commercial terms, or |leavemessage|_ to discuss your use case.
 .. _Discord: https://discord.gg/N9HqNEcvP3
 .. _Dongl: https://www.simpleble.org/dongl?utm_source=github&utm_medium=referral&utm_campaign=dongl_launch
 .. _SimpleBLE Store: https://simpleble.store?utm_source=github&utm_medium=referral&utm_campaign=simpleble_readme
-.. _SimpleBluez: https://github.com/simpleble/simpleble/tree/main/simplebluez
-.. _SimpleDBus: https://github.com/simpleble/simpleble/tree/main/simpledbus
+.. _SimpleBluez: https://docs.simpleble.org/simplebluez/usage
+.. _SimpleDBus: https://docs.simpleble.org/simpledbus/usage
 .. _security policy: https://github.com/simpleble/simpleble/blob/main/SECURITY.md
 .. _contribute: https://github.com/simpleble/simpleble/blob/main/CONTRIBUTING.md
 .. _Installation: https://docs.simpleble.org/installation

simplepyble-1.2.1.dev105/VERSION

@@ -0,0 +1 @@
+1.2.1-dev105

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/simpleble/src/backends/android/AdapterAndroid.cpp

@@ -21,14 +21,8 @@ AdapterAndroid::AdapterAndroid() {
     _btScanCallback.set_callback_onScanResult([this](Android::ScanResult scan_result) {
         std::string address = scan_result.getDevice().getAddress();
 
-        if (this->peripherals_.count(address) == 0) {
-            // If the incoming peripheral has never been seen before, create and save a reference to it.
-            auto base_peripheral = std::make_shared<PeripheralAndroid>(scan_result.getDevice());
-            this->peripherals_.insert(std::make_pair(address, base_peripheral));
-        }
-
         // Update the received advertising data.
-        auto base_peripheral = this->peripherals_.at(address);
+        auto base_peripheral = this->cached_peripheral(scan_result.getDevice());
         base_peripheral->update_advertising_data(scan_result);
 
         // Convert the base object into an external-facing Peripheral object
@@ -101,12 +95,24 @@ SharedPtrVector<PeripheralBase> AdapterAndroid::get_paired_peripherals() {
 
     auto paired_list = _btAdapter.getBondedDevices();
     for (auto& device : paired_list) {
-        peripherals.push_back(std::make_shared<PeripheralAndroid>(device));
+        // Reuse the wrapper a scan made, so that callbacks set on it keep working.
+        peripherals.push_back(cached_peripheral(device));
     }
 
     return peripherals;
 }
 
+std::shared_ptr<PeripheralAndroid> AdapterAndroid::cached_peripheral(const Android::BluetoothDevice& device) {
+    std::string address = device.getAddress();
+
+    std::scoped_lock lock(peripherals_mutex_);
+    if (peripherals_.count(address) == 0) {
+        // If the peripheral has never been seen before, create and save a reference to it.
+        peripherals_.insert(std::make_pair(address, std::make_shared<PeripheralAndroid>(device)));
+    }
+    return peripherals_.at(address);
+}
+
 std::shared_ptr<Local::PeripheralBase> AdapterAndroid::create_local_peripheral() {
     return std::make_shared<Local::PeripheralAndroid>(_btAdapter);
 }

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/simpleble/src/backends/android/AdapterAndroid.h

@@ -10,6 +10,7 @@
 #include <atomic>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <vector>
 
@@ -60,6 +61,10 @@ class AdapterAndroid : public AdapterBase {
     Android::BluetoothScanner _btScanner = _btAdapter.getBluetoothLeScanner();
     Android::Bridge::ScanCallback _btScanCallback;
 
+    // Returns the wrapper for a device, creating it the first time, so that scans and the paired list share it.
+    std::shared_ptr<PeripheralAndroid> cached_peripheral(const Android::BluetoothDevice& device);
+
+    std::mutex peripherals_mutex_;
     std::map<BluetoothAddress, std::shared_ptr<PeripheralAndroid>> peripherals_;
     std::map<BluetoothAddress, std::shared_ptr<PeripheralAndroid>> seen_peripherals_;
 

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/simplepyble/README.rst

@@ -95,26 +95,10 @@ Check out the `async examples`_ for more details.
 License
 =======
 
-Since January 20th 2025, SimpleBLE is now available under the Business Source License 1.1 (BUSL-1.1). Each
-version of SimpleBLE will convert to the GNU General Public License version 3 after four years of its initial release.
-Qualifying non-commercial users may instead continue using and distributing that version under the original
-BUSL-1.1 terms under the Non-Commercial Perpetual Use Grant in ``LICENSE.md``.
-
-The project is free to use for non-commercial purposes, but requires a commercial license for commercial use. We
-also offer FREE commercial licenses for small projects and early-stage companies - reach out to discuss your use case!
-
-**Why purchase a commercial license?**
-
-- Build and deploy unlimited commercial applications
-- Use across your entire development team
-- Zero revenue sharing or royalty payments
-- Choose features that match your needs and budget
-- Priority technical support included
-- Clear terms for integrating into MIT-licensed projects
-
-**Looking for information on pricing and commercial terms of service?** Visit |website-url|_ for more details.
-
-For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the specifics of your situation.
+SimplePyBLE follows the `SimpleBLE license`_, the Business Source License 1.1 (BUSL-1.1). It is free for non-commercial
+use, and commercial use needs a commercial license. We offer free commercial licenses for small projects and early-stage
+companies: |email|_ or |leavemessage|_ to discuss your use case. Commercial licenses carry no royalties or revenue
+sharing; see the `licensing page`_ for terms.
 
 ----
 
@@ -125,15 +109,12 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 .. |email| replace:: email us
 .. _email: mailto:contact@simpleble.org
 
-.. |leavemessage| replace:: leave us a message on our website
+.. |leavemessage| replace:: leave us a message
 .. _leavemessage: https://www.simpleble.org/contact?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
 .. |website| replace:: our website
 .. _website: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
-.. |website-url| replace:: www.simpleble.org
-.. _website-url: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
-
 .. |caos| replace:: **The California Open Source Company**
 .. _caos: https://californiaopensource.com?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
@@ -141,6 +122,10 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 
 .. _SimpleBLE: https://github.com/simpleble/simpleble/
 
+.. _SimpleBLE license: https://github.com/simpleble/simpleble/blob/main/LICENSE.md
+
+.. _licensing page: https://docs.simpleble.org/licensing
+
 .. _official SimpleBLE Bluetooth dongle: https://www.simpleble.org/dongl?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=dongl_launch
 
 .. _code examples: https://github.com/simpleble/simpleble/tree/main/examples/simplepyble

{simplepyble-1.2.1.dev90 → simplepyble-1.2.1.dev105}/simplepyble/src/simplepyble.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplepyble
-Version: 1.2.1.dev90
+Version: 1.2.1.dev105
 Summary: The ultimate fully-fledged cross-platform BLE library, designed for simplicity and ease of use. Free for non-commercial use; commercial use requires a license.
 Home-page: https://github.com/simpleble/simpleble
 Author: Kevin Dewald
@@ -128,26 +128,10 @@ Check out the `async examples`_ for more details.
 License
 =======
 
-Since January 20th 2025, SimpleBLE is now available under the Business Source License 1.1 (BUSL-1.1). Each
-version of SimpleBLE will convert to the GNU General Public License version 3 after four years of its initial release.
-Qualifying non-commercial users may instead continue using and distributing that version under the original
-BUSL-1.1 terms under the Non-Commercial Perpetual Use Grant in ``LICENSE.md``.
-
-The project is free to use for non-commercial purposes, but requires a commercial license for commercial use. We
-also offer FREE commercial licenses for small projects and early-stage companies - reach out to discuss your use case!
-
-**Why purchase a commercial license?**
-
-- Build and deploy unlimited commercial applications
-- Use across your entire development team
-- Zero revenue sharing or royalty payments
-- Choose features that match your needs and budget
-- Priority technical support included
-- Clear terms for integrating into MIT-licensed projects
-
-**Looking for information on pricing and commercial terms of service?** Visit |website-url|_ for more details.
-
-For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the specifics of your situation.
+SimplePyBLE follows the `SimpleBLE license`_, the Business Source License 1.1 (BUSL-1.1). It is free for non-commercial
+use, and commercial use needs a commercial license. We offer free commercial licenses for small projects and early-stage
+companies: |email|_ or |leavemessage|_ to discuss your use case. Commercial licenses carry no royalties or revenue
+sharing; see the `licensing page`_ for terms.
 
 ----
 
@@ -158,15 +142,12 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 .. |email| replace:: email us
 .. _email: mailto:contact@simpleble.org
 
-.. |leavemessage| replace:: leave us a message on our website
+.. |leavemessage| replace:: leave us a message
 .. _leavemessage: https://www.simpleble.org/contact?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
 .. |website| replace:: our website
 .. _website: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
-.. |website-url| replace:: www.simpleble.org
-.. _website-url: https://simpleble.org?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
-
 .. |caos| replace:: **The California Open Source Company**
 .. _caos: https://californiaopensource.com?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=simplepyble_readme
 
@@ -174,6 +155,10 @@ For further enquiries, please |email|_ or |leavemessage|_ and we can discuss the
 
 .. _SimpleBLE: https://github.com/simpleble/simpleble/
 
+.. _SimpleBLE license: https://github.com/simpleble/simpleble/blob/main/LICENSE.md
+
+.. _licensing page: https://docs.simpleble.org/licensing
+
 .. _official SimpleBLE Bluetooth dongle: https://www.simpleble.org/dongl?utm_source=pypi_simplepyble&utm_medium=referral&utm_campaign=dongl_launch
 
 .. _code examples: https://github.com/simpleble/simpleble/tree/main/examples/simplepyble

simplepyble-1.2.1.dev90/VERSION

@@ -1 +0,0 @@
-1.2.1-dev90