Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Change Log
==========

2024-06-15 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)

* switched from ed25519 to PyNaCl



2024-06-01 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)

* introduce new group streaming solution
Expand Down
4 changes: 2 additions & 2 deletions bitdust/dht/dht_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
{
'op': 'exist',
},
], # 'archive_folder_path': [{'op': 'exist', }, ],
],
},
'bismuth_identity_request': {
'type': [
Expand Down Expand Up @@ -412,7 +412,7 @@ def set_message_broker(customer_idurl, broker_idurl, position=0, revision=None,
'timestamp': utime.utcnow_to_sec1970(),
'revision': 0 if revision is None else revision,
'customer_idurl': customer_idurl.to_text(),
'broker_idurl': broker_idurl.to_text(), # 'archive_folder_path': archive_folder_path,
'broker_idurl': broker_idurl.to_text(),
'position': position,
},
rules=get_rules('message_broker'),
Expand Down
12 changes: 9 additions & 3 deletions bitdust_forks/websocket/_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,15 @@ def teardown(close_frame=None):
If close_frame is set, we will invoke the on_close handler with the
statusCode and reason from there.
"""
if thread and thread.isAlive():
event.set()
thread.join()
if thread:
isAlive = False
if hasattr(thread, 'isAlive'):
isAlive = thread.isAlive()
elif hasattr(thread, 'is_alive'):
isAlive = thread.is_alive()
if isAlive:
event.set()
thread.join()
self.keep_running = False
if self.sock:
self.sock.close()
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ appdirs==1.4.4
attrs==22.2.0
Automat==22.10.0

# Bismuth
base58==2.1.1
cffi==1.15.1
coincurve==16.0.0
constantly==15.1.0
coverage==6.2
cryptography==39.0.0
ed25519==1.5
hyperlink==21.0.0
idna==3.4
incremental==22.10.0
Expand All @@ -29,6 +27,7 @@ pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.21
pycryptodomex==3.16.0
PyNaCl==1.5
pynacl==1.5.0
pyparsing==3.0.9
PySocks==1.7.1
Expand Down