update and clean up lbrynetservice.py
This commit is contained in:
Jack Robison
parent
9c1985bab3
commit
f844812b70
1 changed files with 26 additions and 138 deletions
|
|
@ -1,162 +1,50 @@
|
|||
import sys
|
||||
from twisted.internet import asyncioreactor
|
||||
if 'twisted.internet.reactor' not in sys.modules:
|
||||
asyncioreactor.install()
|
||||
else:
|
||||
from twisted.internet import reactor
|
||||
if not isinstance(reactor, asyncioreactor.AsyncioSelectorReactor) and getattr(sys, 'frozen', False):
|
||||
# pyinstaller hooks install the default reactor before
|
||||
# any of our code runs, see kivy for similar problem:
|
||||
# https://github.com/kivy/kivy/issues/4182
|
||||
del sys.modules['twisted.internet.reactor']
|
||||
asyncioreactor.install()
|
||||
from twisted.internet import reactor
|
||||
|
||||
import keyring.backend
|
||||
import platform
|
||||
import ssl
|
||||
import keyring
|
||||
from keyring.backend import KeyringBackend
|
||||
from jnius import autoclass
|
||||
from lbrynet.extras.cli import start_daemon
|
||||
from lbrynet.extras.daemon.Components import DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT
|
||||
from lbrynet.extras.daemon.Components import REFLECTOR_COMPONENT
|
||||
|
||||
# Fixes / patches / overrides
|
||||
# platform.platform() in libc_ver: IOError: [Errno 21] Is a directory
|
||||
lbrynet_utils = autoclass('io.lbry.browser.Utils')
|
||||
|
||||
lbrynet_android_utils = autoclass('io.lbry.browser.Utils')
|
||||
service = autoclass('io.lbry.browser.LbrynetService').serviceInstance
|
||||
platform.platform = lambda: 'Android %s (API %s)' % (lbrynet_utils.getAndroidRelease(), lbrynet_utils.getAndroidSdk())
|
||||
|
||||
import lbrynet.androidhelpers
|
||||
lbrynet.androidhelpers.paths.android_files_dir = lambda: lbrynet_utils.getFilesDir(service.getApplicationContext())
|
||||
lbrynet.androidhelpers.paths.android_internal_storage_dir = lambda: lbrynet_utils.getInternalStorageDir(service.getApplicationContext())
|
||||
lbrynet.androidhelpers.paths.android_external_storage_dir = lambda: lbrynet_utils.getExternalStorageDir(service.getApplicationContext())
|
||||
lbrynet.androidhelpers.paths.android_app_internal_storage_dir = lambda: lbrynet_utils.getAppInternalStorageDir(service.getApplicationContext())
|
||||
lbrynet.androidhelpers.paths.android_app_external_storage_dir = lambda: lbrynet_utils.getAppExternalStorageDir(service.getApplicationContext())
|
||||
|
||||
# RPC authentication secret
|
||||
# Retrieve the Anroid keystore
|
||||
ks = lbrynet_utils.initKeyStore(service.getApplicationContext());
|
||||
|
||||
'''
|
||||
import lbrynet.daemon.auth
|
||||
from lbrynet.daemon.auth.util import APIKey, API_KEY_NAME
|
||||
|
||||
def load_api_keys(path):
|
||||
key_name = API_KEY_NAME
|
||||
context = service.getApplicationContext();
|
||||
secret = lbrynet_utils.loadApiSecret(context, ks)
|
||||
# TODO: For testing. Normally, this should not be displayed.
|
||||
log.info('Loaded API Secret: %s', secret);
|
||||
return { key_name: APIKey(secret, key_name, None) }
|
||||
|
||||
def save_api_keys(keys, path):
|
||||
key_name = API_KEY_NAME
|
||||
if key_name in keys:
|
||||
secret = keys[key_name].secret
|
||||
# TODO: For testing. Normally, this should not be displayed.
|
||||
log.info('Saving API Secret: %s', secret)
|
||||
context = service.getApplicationContext()
|
||||
lbrynet_utils.saveApiSecret(secret, context, ks)
|
||||
|
||||
def initialize_api_key_file(key_path):
|
||||
context = service.getApplicationContext()
|
||||
secret = lbrynet_utils.loadApiSecret(context, ks)
|
||||
if secret is None:
|
||||
keys = {}
|
||||
new_api_key = APIKey.new(name=API_KEY_NAME)
|
||||
keys.update({new_api_key.name: new_api_key})
|
||||
save_api_keys(keys, key_path)
|
||||
|
||||
lbrynet.daemon.auth.util.load_api_keys = load_api_keys
|
||||
lbrynet.daemon.auth.util.save_api_keys = save_api_keys
|
||||
lbrynet.daemon.auth.util.initialize_api_key_file = initialize_api_key_file
|
||||
'''
|
||||
|
||||
# Keyring backend
|
||||
class LbryAndroidKeyring(keyring.backend.KeyringBackend):
|
||||
class LbryAndroidKeyring(KeyringBackend):
|
||||
priority = 1
|
||||
|
||||
def __init__(self):
|
||||
self._keystore = lbrynet_android_utils.initKeyStore(service.getApplicationContext())
|
||||
|
||||
def set_password(self, servicename, username, password):
|
||||
context = service.getApplicationContext()
|
||||
lbrynet_utils.setPassword(servicename, username, password, context, ks)
|
||||
lbrynet_android_utils.setPassword(servicename, username, password, context, self._keystore)
|
||||
|
||||
def get_password(self, servicename, username):
|
||||
context = service.getApplicationContext()
|
||||
return lbrynet_utils.getPassword(servicename, username, context, ks)
|
||||
return lbrynet_android_utils.getPassword(servicename, username, context, self._keystore)
|
||||
|
||||
def delete_password(self, servicename, username):
|
||||
context = service.getApplicationContext()
|
||||
lbrynet_utils.deletePassword(servicename, username, context, ks)
|
||||
lbrynet_android_utils.deletePassword(servicename, username, context, self._keystore)
|
||||
|
||||
# set the keyring backend
|
||||
keyring.set_keyring(LbryAndroidKeyring())
|
||||
|
||||
import logging.handlers
|
||||
from twisted.internet import reactor
|
||||
|
||||
from lbrynet import utils, conf, log_support
|
||||
from lbrynet.extras import system_info
|
||||
from lbrynet.extras.daemon.Components import \
|
||||
DHT_COMPONENT, \
|
||||
HASH_ANNOUNCER_COMPONENT, \
|
||||
PEER_PROTOCOL_SERVER_COMPONENT, \
|
||||
REFLECTOR_COMPONENT
|
||||
from lbrynet.extras.daemon import analytics
|
||||
from lbrynet.extras.daemon.Daemon import Daemon
|
||||
|
||||
# https certificate verification
|
||||
# TODO: this is bad. Need to find a way to properly verify https requests
|
||||
def https_context():
|
||||
#urllib2
|
||||
try:
|
||||
_create_unverified_https_context = ssl._create_unverified_context
|
||||
except AttributeError:
|
||||
# Legacy Python that doesn't verify HTTPS certificates by default
|
||||
pass
|
||||
else:
|
||||
# Handle target environment that doesn't support HTTPS verification
|
||||
ssl._create_default_https_context = _create_unverified_https_context
|
||||
|
||||
'''
|
||||
# requests
|
||||
from functools import partial
|
||||
class partialmethod(partial):
|
||||
def __get__(self, instance, owner):
|
||||
if instance is None:
|
||||
return self
|
||||
|
||||
return partial(self.func, instance, *(self.args or ()), **(self.keywords or {}))
|
||||
|
||||
default_request = requests.Session.request
|
||||
requests.Session.request = partialmethod(default_request, verify=False)
|
||||
'''
|
||||
|
||||
# LBRY Daemon
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
def test_internet_connection():
|
||||
return utils.check_connection()
|
||||
|
||||
def start():
|
||||
# lbry daemon
|
||||
https_context()
|
||||
conf.initialize_settings()
|
||||
keyring.set_keyring(LbryAndroidKeyring())
|
||||
|
||||
lbrynet_log = conf.settings.get_log_filename()
|
||||
log_support.configure_logging(lbrynet_log, True, [])
|
||||
private_storage_dir = lbrynet_android_utils.getAppInternalStorageDir(service.getApplicationContext())
|
||||
data_dir = f'{private_storage_dir}/lbrynet'
|
||||
wallet_dir = f'{private_storage_dir}/lbryum'
|
||||
download_dir = f'{lbrynet_android_utils.getAppExternalStorageDir(service.getApplicationContext())()}/Download'
|
||||
|
||||
# TODO: specify components, initialise auth
|
||||
conf.settings.update({
|
||||
'components_to_skip': [DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT, REFLECTOR_COMPONENT],
|
||||
'use_upnp': False
|
||||
})
|
||||
|
||||
log.info('Final Settings: %s', conf.settings.get_current_settings_dict())
|
||||
log.info("Starting lbrynet-daemon")
|
||||
|
||||
if test_internet_connection():
|
||||
daemon = Daemon()
|
||||
daemon.start_listening()
|
||||
reactor.run()
|
||||
else:
|
||||
log.info("Not connected to the Internet. Unable to start.")
|
||||
return start_daemon(settings={
|
||||
'components_to_skip': [DHT_COMPONENT, HASH_ANNOUNCER_COMPONENT, PEER_PROTOCOL_SERVER_COMPONENT,
|
||||
REFLECTOR_COMPONENT],
|
||||
'use_upnp': False,
|
||||
# 'use_https': False,
|
||||
# 'use_auth_http': True
|
||||
}, data_dir=data_dir, wallet_dir=wallet_dir, download_dir=download_dir)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue