Some final changes

Author: tt2468

config.ini

@@ -1,7 +1,9 @@
-http_bind_to_address = 127.0.0.1
-http_bind_to_port = 4445
+[http]
+bind_to_address = 127.0.0.1
+bind_to_port = 4445
+authentication_key = # Leave empty if no authentication is required.
 
 [obsws]
 ws_address = 127.0.0.1
 ws_port = 4444
-ws_password = 
+ws_password = # Only necessary if "Enable authentication" is checked in the obs-websocket settings menu.

main.py

@@ -1,29 +1,69 @@
 import asyncio
 import json
 import simpleobsws
-import liteconfig
 import aiohttp
 from aiohttp import web
+from configparser import ConfigParser
 
-cfg = liteconfig.Config("config.ini")
+config = ConfigParser()
+config.read('config.ini')
+httpAddress = config.get('http', 'bind_to_address')
+httpPort = config.getint('http', 'bind_to_port')
+httpAuthKey = config.get('http', 'authentication_key')
+if httpAuthKey == '':
+    print('Starting HTTP server without authentication.')
+    httpAuthKey = None
+else:
+    print('Starting HTTP server with AuthKey set to "{}"'.format(httpAuthKey))
+wsAddress = config.get('obsws', 'ws_address')
+wsPort = config.getint('obsws', 'ws_port')
+wsPassword = config.get('obsws', 'ws_password')
 loop = asyncio.get_event_loop()
-ws = simpleobsws.obsws(host=cfg.obsws.ws_address, port=cfg.obsws.ws_port, password=cfg.obsws.ws_password, loop=loop)
+ws = simpleobsws.obsws(host=wsAddress, port=wsPort, password=wsPassword, loop=loop)
+
+def statusmessage(message):
+    print(str(message) + '...      ', end='', flush=True)
 
 async def handle_emit_request(request):
     """Handler function for all emit-based HTTP requests. Assumes that you know what you are doing because it will never return an error."""
-    requesttype = request.match_info['type']
-    requestdata = await request.json()
-    await ws.emit(requesttype, requestdata)
-    return web.json_response({'status':'ok'})
+    if ('AuthKey' not in request.headers) and httpAuthKey != None:
+        return web.json_response({'status':'error', 'error':'AuthKey header is required.'})
+    if httpAuthKey == None or (request.headers['AuthKey'] == httpAuthKey):
+        requesttype = request.match_info['type']
+        try:
+            requestdata = await request.json()
+        except json.decoder.JSONDecodeError:
+            requestdata = None
+        await ws.emit(requesttype, requestdata)
+        return web.json_response({'status':'ok'})
+    else:
+        return web.json_response({'status':'error', 'error':'Bad AuthKey'})
 
 async def handle_call_request(request):
     """Handler function for all call-based HTTP requests."""
-    pass
+    if ('AuthKey' not in request.headers) and httpAuthKey != None:
+        return web.json_response({'status':'error', 'error':'AuthKey header is required.'})
+    if httpAuthKey == None or (request.headers['AuthKey'] == httpAuthKey):
+        requesttype = request.match_info['type']
+        try:
+            requestdata = await request.json()
+        except json.decoder.JSONDecodeError:
+            if (await request.text()) == '':
+                requestdata = None
+        try:
+            responsedata = await ws.call(requesttype, requestdata)
+        except simpleobsws.MessageTimeout:
+            responsedata = {'status':'error', 'error':'The obs-websocket request timed out.'}
+        return web.json_response(responsedata)
+    else:
+        return web.json_response({'status':'error', 'error':'Bad AuthKey'})
 
 app = web.Application()
-app.add_routes([web.post('/emit/{type}, handle_emit_request), web.post('/call/{type}, handle_call_request)])
+app.add_routes([web.post('/emit/{type}', handle_emit_request), web.post('/call/{type}', handle_call_request)])
+statusmessage('Connecting to obs-websocket')
 loop.run_until_complete(ws.connect())
+print('[Connected.]')
 try:
-    web.run_app(app)
+    web.run_app(app, host=httpAddress, port=httpPort)
 except KeyboardInterrupt:
     print('Shutting down...')