lnbits-exts/nostrclient
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #12 from lnbits/test/tear_down_ws

Browse source 
Test/tear down ws
This commit is contained in:
calle 2023-04-18 18:56:12 +02:00 • committed by GitHub
commit 9cd757e81d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
nostr/relay.py
View file

@ -35,7 +35,7 @@ class Relay:
self.reconnect: bool = True self.reconnect: bool = True
self.shutdown: bool = False self.shutdown: bool = False
self.error_counter: int = 0 self.error_counter: int = 0
self.error_threshold: int = 0 self.error_threshold: int = 100
self.num_received_events: int = 0 self.num_received_events: int = 0
self.num_sent_events: int = 0 self.num_sent_events: int = 0
self.num_subscriptions: int = 0 self.num_subscriptions: int = 0
@ -43,8 +43,10 @@ class Relay:
self.proxy: dict = {} self.proxy: dict = {}
self.lock = Lock() self.lock = Lock()
self.queue = Queue() self.queue = Queue()
def connect(self, ssl_options: dict = None, proxy: dict = None):
self.ws = WebSocketApp( self.ws = WebSocketApp(
url, self.url,
on_open=self._on_open, on_open=self._on_open,
on_message=self._on_message, on_message=self._on_message,
on_error=self._on_error, on_error=self._on_error,
@ -52,8 +54,6 @@ class Relay:
on_ping=self._on_ping, on_ping=self._on_ping,
on_pong=self._on_pong, on_pong=self._on_pong,
) )
def connect(self, ssl_options: dict = None, proxy: dict = None):
self.ssl_options = ssl_options self.ssl_options = ssl_options
self.proxy = proxy self.proxy = proxy
if not self.connected: if not self.connected:
@ -76,7 +76,7 @@ class Relay:
pass pass
self.connected = False self.connected = False
if self.reconnect: if self.reconnect:
time.sleep(1) time.sleep(self.error_counter**2)
self.connect(self.ssl_options, self.proxy) self.connect(self.ssl_options, self.proxy)
@property @property
@ -129,6 +129,10 @@ class Relay:
def _on_close(self, class_obj, status_code, message): def _on_close(self, class_obj, status_code, message):
self.connected = False self.connected = False
if self.error_threshold and self.error_counter > self.error_threshold:
pass
else:
self.check_reconnect()
pass pass
def _on_message(self, class_obj, message: str): def _on_message(self, class_obj, message: str):
@ -139,10 +143,6 @@ class Relay:
def _on_error(self, class_obj, error): def _on_error(self, class_obj, error):
self.connected = False self.connected = False
self.error_counter += 1 self.error_counter += 1
if self.error_threshold and self.error_counter > self.error_threshold:
pass
else:
self.check_reconnect()
def _on_ping(self, class_obj, message): def _on_ping(self, class_obj, message):
return return