change execution

bumper.start/shutdown
- allow envionrment variables (prep for docker)
- move bumper.db to new "data" directory
start_bumper reworked
- use argparse

start_bumper.py

@@ -1,102 +1,33 @@
 #!/usr/bin/env python3
 
-import logging
 import bumper
-import sys, socket
-import time
-import platform
-import os
-
-# os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG
+import argparse
 import asyncio
 
-
-async def main():
-    try:
-        loop = asyncio.get_event_loop()
-    except:
-        loop = asyncio.new_event_loop()
-
-    args = sys.argv
-    listen_host = ""
-
-    if len(args) > 0:
-        if "--debug" in args:
-            logging.basicConfig(
-                level=logging.DEBUG,
-                format="[%(asctime)s] :: %(levelname)s :: %(name)s :: %(module)s :: %(funcName)s :: %(lineno)d :: %(message)s",
-            )
-            loop.set_debug(True)  # Set asyncio loop to debug
-            # logging.getLogger("asyncio").setLevel(logging.DEBUG)  # Show debug asyncio logs (disabled in init, uncomment for debugging asyncio)
-        else:
-            logging.basicConfig(
-                level=logging.INFO,
-                format="[%(asctime)s] :: %(levelname)s :: %(name)s :: %(message)s",
-            )
-
-        if "--listen" in args:
-            listen_host = args[args.index("--listen") + 1]
-
-    if listen_host == "":
-        if platform.system() == "Darwin":  # If a Mac, use 0.0.0.0 for listening
-            listen_host = "0.0.0.0"
-        else:
-            listen_host = socket.gethostbyname(socket.gethostname())
-
-    conf_address_443 = (listen_host, 443)
-    conf_address_8007 = (listen_host, 8007)
-    xmpp_address = (listen_host, 5223)
-    mqtt_address = (listen_host, 8883)
-
-    mqtt_server = bumper.MQTTServer(mqtt_address)
-    mqtt_helperbot = bumper.MQTTHelperBot(mqtt_address)
-    conf_server = bumper.ConfServer(
-        conf_address_443, usessl=True, helperbot=mqtt_helperbot
-    )
-    conf_server_2 = bumper.ConfServer(
-        conf_address_8007, usessl=False, helperbot=mqtt_helperbot
-    )
-    xmpp_server = bumper.XMPPServer(xmpp_address)
-
-    try:
-        # Start web servers
-        conf_server.confserver_app()
-        asyncio.create_task(conf_server.start_server())
-
-        conf_server_2.confserver_app()
-        asyncio.create_task(conf_server_2.start_server())
-
-        # Start MQTT Server
-        asyncio.create_task(mqtt_server.broker_coro())
-
-        # Start MQTT Helperbot
-        asyncio.create_task(mqtt_helperbot.start_helper_bot())
-
-        # Start XMPP Server
-        asyncio.create_task(xmpp_server.start_async_server())
-
-        maintain = asyncio.create_task(maintenance_tasks())
-        await maintain  # Keeps the loop running until this exits
-
-    finally:
-        # Cleanup and close tasks/loop
-        for task in asyncio.Task.all_tasks():
-            task.cancel()
-        loop.close()
-
-
-async def maintenance_tasks():
-    while True:
-        await asyncio.sleep(30)  # Sleep 30 seconds
-        bumper.revoke_expired_tokens()
-
-
 if __name__ == "__main__":
     try:
-        asyncio.run(main())
+        parser = argparse.ArgumentParser()
+        parser.add_argument("--listen", type=str, default=None, help="listen address")
+        parser.add_argument(
+            "--announce", type=str, default=None, help="announce address (for bot)"
+        )
+        parser.add_argument("--debug", action="store_true")
+        args = parser.parse_args()
+
+        if args.debug:
+            bumper.bumper_debug = True
+
+        if args.listen:
+            bumper.bumper_listen = args.listen
+
+        if args.announce:
+            bumper.bumper_announce_ip = args.announce
+
+        asyncio.run(bumper.start())
 
     except KeyboardInterrupt:
         bumper.bumperlog.info("Keyboard Interrupt!")
         pass
+
     finally:
-        bumper.bumperlog.info("Bumper Exiting!")
+        asyncio.run(bumper.shutdown())