LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-29 08:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix json-rpc interface (when not using CLI)

Browse source
This commit is contained in:
SomberNight 2020-06-09 17:45:04 +02:00
parent 30f5be26ac
commit 50f705ee46
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
electrum/daemon.py
View file

@ -29,16 +29,16 @@ import time
import traceback import traceback
import sys import sys
import threading import threading
from typing import Dict, Optional, Tuple, Iterable from typing import Dict, Optional, Tuple, Iterable, Callable, Union, Sequence, Mapping
from base64 import b64decode, b64encode from base64 import b64decode, b64encode
from collections import defaultdict from collections import defaultdict
import concurrent import concurrent
from concurrent import futures from concurrent import futures
import json
import aiohttp import aiohttp
from aiohttp import web, client_exceptions from aiohttp import web, client_exceptions
from aiorpcx import TaskGroup from aiorpcx import TaskGroup
import json
from . import util from . import util
from .network import Network from .network import Network
@ -151,6 +151,11 @@ class AuthenticatedServer(Logger):
self.rpc_user = rpc_user self.rpc_user = rpc_user
self.rpc_password = rpc_password self.rpc_password = rpc_password
self.auth_lock = asyncio.Lock() self.auth_lock = asyncio.Lock()
self._methods = {} # type: Dict[str, Callable]
def register_method(self, f):
assert f.__name__ not in self._methods, f"name collision for {f.__name__}"
self._methods[f.__name__] = f
async def authenticate(self, headers): async def authenticate(self, headers):
if self.rpc_password == '': if self.rpc_password == '':
@ -184,15 +189,21 @@ class AuthenticatedServer(Logger):
request = json.loads(request) request = json.loads(request)
method = request['method'] method = request['method']
_id = request['id'] _id = request['id']
params = request.get('params', []) params = request.get('params', []) # type: Union[Sequence, Mapping]
f = getattr(self, method) if method not in self._methods:
assert f in self.methods raise Exception(f"attempting to use unregistered method: {method}")
except: f = self._methods[method]
except Exception as e:
self.logger.exception("invalid request")
return web.Response(text='Invalid Request', status=500) return web.Response(text='Invalid Request', status=500)
response = {'id':_id} response = {'id': _id}
try: try:
response['result'] = await f(*params) if isinstance(params, dict):
response['result'] = await f(**params)
else:
response['result'] = await f(*params)
except BaseException as e: except BaseException as e:
self.logger.exception("internal error while executing RPC")
response['error'] = str(e) response['error'] = str(e)
return web.json_response(response) return web.json_response(response)
@ -209,13 +220,12 @@ class CommandsServer(AuthenticatedServer):
self.port = self.config.get('rpcport', 0) self.port = self.config.get('rpcport', 0)
self.app = web.Application() self.app = web.Application()
self.app.router.add_post("/", self.handle) self.app.router.add_post("/", self.handle)
self.methods = set() self.register_method(self.ping)
self.methods.add(self.ping) self.register_method(self.gui)
self.methods.add(self.gui)
self.cmd_runner = Commands(config=self.config, network=self.daemon.network, daemon=self.daemon) self.cmd_runner = Commands(config=self.config, network=self.daemon.network, daemon=self.daemon)
for cmdname in known_commands: for cmdname in known_commands:
self.methods.add(getattr(self.cmd_runner, cmdname)) self.register_method(getattr(self.cmd_runner, cmdname))
self.methods.add(self.run_cmdline) self.register_method(self.run_cmdline)
async def run(self): async def run(self):
self.runner = web.AppRunner(self.app) self.runner = web.AppRunner(self.app)
@ -277,9 +287,8 @@ class WatchTowerServer(AuthenticatedServer):
self.lnwatcher = network.local_watchtower self.lnwatcher = network.local_watchtower
self.app = web.Application() self.app = web.Application()
self.app.router.add_post("/", self.handle) self.app.router.add_post("/", self.handle)
self.methods = set() self.register_method(self.get_ctn)
self.methods.add(self.get_ctn) self.register_method(self.add_sweep_tx)
self.methods.add(self.add_sweep_tx)
async def run(self): async def run(self):
self.runner = web.AppRunner(self.app) self.runner = web.AppRunner(self.app)