Merge pull request #294 from mauricelam/wasm-cryptography

Make cryptography a valid dependency for emscripten targets
Fix typo
2023-09-25 19:29:09 -07:00 · 2023-09-25 18:08:52 -07:00 · 2023-09-22 16:43:40 -07:00 · 2023-09-22 16:43:40 -07:00 · 2023-09-22 11:41:24 -07:00 · 2023-09-22 11:41:04 -07:00
4 changed files with 12 additions and 3 deletions
--- a/bumble/device.py
+++ b/bumble/device.py
@@ -2758,7 +2758,9 @@ class Device(CompositeEventEmitter):
            self.abort_on(
                'flush',
                self.start_advertising(
-                    advertising_type=self.advertising_type, auto_restart=True
+                    advertising_type=self.advertising_type,
+                    own_address_type=self.advertising_own_address_type,
+                    auto_restart=True,
                ),
            )

--- a/bumble/pandora/security.py
+++ b/bumble/pandora/security.py
@@ -233,7 +233,11 @@ class SecurityService(SecurityServicer):
                sc=config.pairing_sc_enable,
                mitm=config.pairing_mitm_enable,
                bonding=config.pairing_bonding_enable,
-                identity_address_type=config.identity_address_type,
+                identity_address_type=(
+                    PairingConfig.AddressType.PUBLIC
+                    if connection.self_address.is_public
+                    else config.identity_address_type
+                ),
                delegate=PairingDelegate(
                    connection,
                    self,
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,6 +36,10 @@ install_requires =
    bt-test-interfaces >= 0.0.2; platform_system!='Emscripten'
    click == 8.1.3; platform_system!='Emscripten'
    cryptography == 39; platform_system!='Emscripten'
+    # Pyodide bundles a version of cryptography that is built for wasm, which may not match the
+    # versions available on PyPI. Relax the version requirement since it's better than being
+    # completely unable to import the package in case of version mismatch.
+    cryptography >= 39.0; platform_system=='Emscripten'
    grpcio == 1.57.0; platform_system!='Emscripten'
    humanize >= 4.6.0; platform_system!='Emscripten'
    libusb1 >= 2.0.1; platform_system!='Emscripten'
--- a/web/bumble.js
+++ b/web/bumble.js
@@ -74,7 +74,6 @@ export async function loadBumble(pyodide, bumblePackage) {
    await pyodide.loadPackage("micropip");
    await pyodide.runPythonAsync(`
        import micropip
-        await micropip.install("cryptography")
        await micropip.install("${bumblePackage}")
        package_list = micropip.list()
        print(package_list)
Author	SHA1	Message	Date
Gilles Boccon-Gibod	c12dee4e76	Merge pull request #294 from mauricelam/wasm-cryptography Make cryptography a valid dependency for emscripten targets	2023-09-25 19:29:09 -07:00
Maurice Lam	772c188674	Fix typo	2023-09-25 18:08:52 -07:00
Maurice Lam	7c1a3bb8f9	Separate version specifier for cryptography in Emscripten builds	2023-09-22 16:43:40 -07:00
Maurice Lam	8c3c0b1e13	Make cryptography a valid dependency for emscripten targets Since only the special cryptography package bundled with pyodide can be used, relax the version requirement to anything that's version 39.*. Fix #284	2023-09-22 16:43:40 -07:00
Gilles Boccon-Gibod	4c29a16271	Merge pull request #297 from google/gbg/websocket-full-url ws-client: make implementation match the doc	2023-09-22 11:41:24 -07:00
Gilles Boccon-Gibod	762d3e92de	Merge pull request #300 from google/gbg/issue-299 use correct own_address_type when restarting advertising	2023-09-22 11:41:04 -07:00
uael	2f97531d78	pandora: use public identity address for public addresses	2023-09-22 20:08:34 +02:00
Gilles Boccon-Gibod	f6c7cae661	use correct own_address_type when restarting advertising	2023-09-22 10:33:36 -07:00