Update node modules - QueryNodeStatus() to include prices. Update types. Update subscription module

Author: freQniK

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sentinel_sdk"
-version = "0.0.5"
+version = "0.1.0"
 description = "A Sentinel SDK Written in Python"
 authors = [
     { name = "NAST0R" },
@@ -13,7 +13,7 @@ authors = [
 ]
 readme = "README.md"
 requires-python = ">=3.10"
-keywords = ["sentinel_sdk", "mospy", "sentinel", "cosmos", "protobuf", "sentinel_protobuf"]
+keywords = ["sentinel_sdk", "mospy", "sentinel", "dvpn", "cosmos", "protobuf", "sentinel_protobuf"]
 license = {text = "GPL-3.0 license"}
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -22,7 +22,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
 ]
 dependencies = [
-    "sentinel-protobuf==0.3.3",
+    "sentinel-protobuf==0.4.3",
     "grpcio>=1.51.1",
     "bip-utils==2.9.0",
     "mospy-wallet==0.6.0",

requirements.txt

@@ -1,4 +1,4 @@
-sentinel-protobuf==0.3.3
+sentinel-protobuf==0.4.3
 grpcio>=1.51.1
 bip-utils==2.9.0
-mospy-wallet @ git+https://github.com/Tkd-Alex/mospy.git@development
+mospy-wallet==0.6.0

src/sentinel_sdk/modules/node.py

@@ -37,10 +37,10 @@ def __init__(self, channel: grpc.Channel, node_timeout: int, account, client):
         self._client = client
 
         self.__nodes_status_cache = {}
-
+        
     def QueryParams(self) -> Any:
         return self.__stub.QueryParams(sentinel_node_v3_querier_pb2.QueryParamsRequest()).params
-
+    
     def QueryNode(self, address: str) -> Any:
         r = self.__stub.QueryNode(
             sentinel_node_v3_querier_pb2.QueryNodeRequest(address=address)
@@ -63,22 +63,45 @@ def QueryNumOfNodesWithStatus(self, status: int) -> int:
         return r.pagination.total
 
     def QueryNodeStatus(self, node: node_pb2.Node, is_in_thread: bool = False) -> str:
-        node_endpoint = node.remote_url
+        node_endpoint = "https://" + node.remote_addrs[0]
+        gb_price = ""
+        hr_price = ""
+        if node.gigabyte_prices:
+            for prices in node.gigabyte_prices:
+                gb_price = gb_price + prices.quote_value + prices.denom + ','
+        else:
+            gb_price = "0.0udvpn"
+        if node.hourly_prices:
+            for prices in node.hourly_prices:
+                hr_price = hr_price + prices.quote_value + prices.denom + ','
+        else:
+            hr_price = "0.0udvpn"
+        
+        gb_price = gb_price.rstrip(',')
+        hr_price = hr_price.rstrip(',')
+        print(f"GB Prices: {gb_price}\n Hourly Prices: {hr_price}")
+        print(f"Node Endpoint: {node_endpoint}")
         try:
             contents = urllib.request.urlopen(
-                f"{node_endpoint}/status",
+                f"{node_endpoint}",
                 context=self.__ssl_ctx,
                 timeout=self.node_timeout,
             ).read()
             contents = contents.decode("utf-8")
-        except urllib.error.URLError:
+        except urllib.error.URLError as E:
+            print(str(E))
             contents = '{"success":false,"urllib-error":"URLError encountered"}'
         except TimeoutError:
             contents = '{"success":false,"urllib-error":"Data reading timed out"}'
         except http.client.RemoteDisconnected:
             contents = '{"success":false,"http-error":"Remote endpoint closed connection"}'
         except:
             contents = '{"success":false,"error":"Unrecognizable error encountered"}'
+        contents = json.loads(contents)
+        contents['gigabyte_prices'] = gb_price
+        contents['hourly_prices']   = hr_price
+        contents = json.dumps(contents)
+        
         if is_in_thread:
             self.__nodes_status_cache[node.address] = contents
         else:

src/sentinel_sdk/querier/querier.py

@@ -12,6 +12,7 @@ def QueryAll(
         pagination: PageRequest = None,
         **kwargs,
     ) -> list:
+        
         # ["status", "address", "id"] are the only valid kwargs
         request_arguments = {
             k: kwargs[k] for k in kwargs if k in ["status", "address", "id"]
@@ -34,5 +35,4 @@ def QueryAll(
             # Stop iteration if PageRequest contain a offset value
             if pagination.offset is not None:
                 break
-
         return items

src/sentinel_sdk/types.py

@@ -18,6 +18,7 @@ def __str__(self):
 class NodeType(Enum):
     WIREGUARD = 1
     V2RAY = 2
+    OPENVPN = 3
 
 class RenewalPricePolicy(Enum):
     RENEWAL_PRICE_POLICY_UNSPECIFIED = 0