Browse Source

bin/deg: use rpc.py for RPC connections

dasman 2 years ago
parent
commit
851ad0bfe2
2 changed files with 8 additions and 6 deletions
  1. 2 0
      bin/deg/deg2
  2. 6 6
      bin/deg/src/rpc.py

+ 2 - 0
bin/deg/deg2

@@ -193,8 +193,10 @@ class App(object):
         #     await self.update_data(self.config)
         #     await self.update_data(self.config)
         if key == 'enter':
         if key == 'enter':
             self.current_view = self.frame2
             self.current_view = self.frame2
+            self.loop.widget = self.frame2
         if key == 'b':
         if key == 'b':
             self.current_view = self.frame1
             self.current_view = self.frame1
+            self.loop.widget = self.frame1
 
 
     def show_details(self, event):
     def show_details(self, event):
         self.view_two.set_event(event)
         self.view_two.set_event(event)

+ 6 - 6
bin/deg/src/rpc.py

@@ -17,15 +17,12 @@
 
 
 import json
 import json
 import random
 import random
-import logging
 import asyncio
 import asyncio
 
 
-
 class JsonRpc:
 class JsonRpc:
 
 
-    async def start(self, host, port):
-        logging.info(f"trying to connect to {host}:{port}")
-        reader, writer = await asyncio.open_connection(host, port)
+    async def start(self, server, port):
+        reader, writer = await asyncio.open_connection(server, port, limit=1024 * 128)
         self.reader = reader
         self.reader = reader
         self.writer = writer
         self.writer = writer
 
 
@@ -35,6 +32,7 @@ class JsonRpc:
 
 
     async def _make_request(self, method, params):
     async def _make_request(self, method, params):
         ident = random.randint(0, 2**16)
         ident = random.randint(0, 2**16)
+        #print(ident)
         request = {
         request = {
             "jsonrpc": "2.0",
             "jsonrpc": "2.0",
             "method": method,
             "method": method,
@@ -45,9 +43,11 @@ class JsonRpc:
         message = json.dumps(request) + "\n"
         message = json.dumps(request) + "\n"
         self.writer.write(message.encode())
         self.writer.write(message.encode())
         await self.writer.drain()
         await self.writer.drain()
+
         data = await self.reader.readline()
         data = await self.reader.readline()
         message = data.decode().strip()
         message = data.decode().strip()
         response = json.loads(message)
         response = json.loads(message)
+        #print(response)
         return response
         return response
 
 
     async def _subscribe(self, method, params):
     async def _subscribe(self, method, params):
@@ -62,7 +62,7 @@ class JsonRpc:
         message = json.dumps(request) + "\n"
         message = json.dumps(request) + "\n"
         self.writer.write(message.encode())
         self.writer.write(message.encode())
         await self.writer.drain()
         await self.writer.drain()
-        logging.debug("Subscribed")
+        #print("Subscribed")
 
 
     async def ping(self):
     async def ping(self):
         return await self._make_request("ping", [])
         return await self._make_request("ping", [])