* Fixed duplicate plugin events

master
Kevin Froman 2019-04-25 00:38:15 -05:00
parent 71aadb7767
commit 47ee28f74f
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
9 changed files with 24 additions and 11 deletions

View File

@ -105,3 +105,11 @@ v0
These are constant endpoints available on direct connection servers. Plugin endpoints for direct connections are not documented here. These are constant endpoints available on direct connection servers. Plugin endpoints for direct connections are not documented here.
* /ping
- Methods: GET
- Returns 200 with 'pong!'
* /close
- Methods: GET
- Kills the direct connection server, destroying the onion address.
- Returns 200 with 'goodbye'

View File

@ -1,4 +1,4 @@
# Onionr Block Spec v1.0.0 # Onionr Block Spec v1.1.0
# Block Description # Block Description
@ -60,4 +60,4 @@ Pow is a field for placing the nonce found to make a block meet a target proof o
## encryptType ## encryptType
encryptType is a field to specify the mode of encryption for a block. The values supported by Onionr are 'asym' and 'sym'. encryptType is a field to specify the mode of encryption for a block. The values supported by Onionr are 'asym' and 'sym'.

View File

@ -104,7 +104,10 @@ def show_peers(o_inst):
if not type(peers) is None: if not type(peers) is None:
if peers not in ('', 'failure', None): if peers not in ('', 'failure', None):
if peers != False: if peers != False:
print(peers) if peers == 'none':
print('No current outgoing connections.')
else:
print(peers)
else: else:
print('Daemon probably not running. Unable to list connected peers.') print('Daemon probably not running. Unable to list connected peers.')
break break

View File

@ -67,6 +67,7 @@ def call(plugin, event_name, data = None, pluginapi = None):
return True return True
except Exception as e: except Exception as e:
logger.error(str(e))
return False return False
else: else:
return True return True

View File

@ -17,9 +17,8 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import os, re, importlib
import os, re, importlib, config, logger import onionrevents as events, config, logger
import onionrevents as events
# set data dir # set data dir
dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/')) dataDir = os.environ.get('ONIONR_HOME', os.environ.get('DATA_DIR', 'data/'))
@ -71,7 +70,7 @@ def enable(name, onionr = None, start_event = True):
events.call(get_plugin(name), 'enable', onionr) events.call(get_plugin(name), 'enable', onionr)
except ImportError: # Was getting import error on Gitlab CI test "data" except ImportError: # Was getting import error on Gitlab CI test "data"
# NOTE: If you are experiencing issues with plugins not being enabled, it might be this resulting from an error in the module # NOTE: If you are experiencing issues with plugins not being enabled, it might be this resulting from an error in the module
# can happen inconsistenly (especially between versions) # can happen inconsistently (especially between versions)
return False return False
else: else:
enabled_plugins.append(name) enabled_plugins.append(name)
@ -170,6 +169,7 @@ def import_module_from_file(full_path_to_module):
module_dir, module_file = os.path.split(full_path_to_module) module_dir, module_file = os.path.split(full_path_to_module)
module_name, module_ext = os.path.splitext(module_file) module_name, module_ext = os.path.splitext(module_file)
module_name = module_dir # Module name must be unique otherwise it will get written in other imports
# Get module "spec" from filename # Get module "spec" from filename
spec = importlib.util.spec_from_file_location(module_name,full_path_to_module) spec = importlib.util.spec_from_file_location(module_name,full_path_to_module)
@ -187,7 +187,7 @@ def get_plugin(name):
if str(name).lower() in _instances: if str(name).lower() in _instances:
return _instances[str(name).lower()] return _instances[str(name).lower()]
else: else:
_instances[str(name).lower()] = import_module_from_file(get_plugins_folder(name, False) + 'main.py') _instances[str(name).lower()] = import_module_from_file(get_plugins_folder(str(name).lower(), False) + 'main.py')
return get_plugin(name) return get_plugin(name)
def get_plugins(): def get_plugins():
@ -233,6 +233,7 @@ def get_plugins_folder(name = None, absolute = True):
path = _pluginsfolder path = _pluginsfolder
else: else:
# only allow alphanumeric characters # only allow alphanumeric characters
#path = _pluginsfolder + str(name.lower())
path = _pluginsfolder + re.sub('[^0-9a-zA-Z_]+', '', str(name).lower()) path = _pluginsfolder + re.sub('[^0-9a-zA-Z_]+', '', str(name).lower())
if absolute is True: if absolute is True:

View File

@ -51,7 +51,7 @@ class ConnectionServer:
def get_ping(): def get_ping():
return "pong!" return "pong!"
@service_app.route('/shutdown') @service_app.route('/close')
def shutdown_server(): def shutdown_server():
core_inst.onionrInst.communicatorInst.service_greenlets.remove(http_server) core_inst.onionrInst.communicatorInst.service_greenlets.remove(http_server)
http_server.stop() http_server.stop()

View File

@ -24,6 +24,7 @@ from onionrblockapi import Block
import onionrexceptions, onionrusers import onionrexceptions, onionrusers
import locale import locale
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
plugin_name = 'encrypt'
class PlainEncryption: class PlainEncryption:
def __init__(self, api): def __init__(self, api):

View File

@ -307,7 +307,6 @@ def on_insertblock(api, data={}):
meta = json.loads(data['meta']) meta = json.loads(data['meta'])
sentboxTools.addToSent(data['hash'], data['peer'], data['content'], meta['subject']) sentboxTools.addToSent(data['hash'], data['peer'], data['content'], meta['subject'])
def on_init(api, data = None): def on_init(api, data = None):
''' '''
This event is called after Onionr is initialized, but before the command This event is called after Onionr is initialized, but before the command

View File

@ -4,4 +4,4 @@
<p>Onionr is a decentralized peer-to-peer data storage system.</p> <p>Onionr is a decentralized peer-to-peer data storage system.</p>
<p>To learn more about Onionr, see the website at <a href="https://onionr.voidnet.tech/">https://Onionr.VoidNet.tech/</a></p> <p>To learn more about Onionr, see the website at <a href="https://onionr.net/">https://Onionr.net/</a></p>