anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow secure websocket connections.

Browse Source
This commit is contained in:
Tim Van
2016-02-08 01:28:58 +02:00
parent 16756ddb8c
commit 82b7128c04
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/settings.html
View File

@@ -490,7 +490,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<input type="checkbox" class="monitor-settings" id="monitoring_use_websocket" name="monitoring_use_websocket" value="1" ${config['monitoring_use_websocket']}> Use Websocket (requires restart) [experimental] <input type="checkbox" class="monitor-settings" id="monitoring_use_websocket" name="monitoring_use_websocket" value="1" ${config['monitoring_use_websocket']}> Use Websocket (requires restart) [experimental]
</label> </label>
<p class="help-block">Instead of polling the server at regular intervals let the server tell us when something happens.<br /> <p class="help-block">Instead of polling the server at regular intervals let the server tell us when something happens.<br />
This is currently experimental. Encrypted websocket is not currently supported.</p> This is currently experimental.</p>
</div> </div>
<div class="checkbox"> <div class="checkbox">
<label> <label>

11
plexpy/web_socket.py
View File

@@ -37,10 +37,13 @@ def start_thread():
def run(): def run():
from websocket import create_connection from websocket import create_connection
uri = 'ws://%s:%s/:/websockets/notifications' % ( if plexpy.CONFIG.PMS_SSL and plexpy.CONFIG.PMS_URL[:5] == 'https':
plexpy.CONFIG.PMS_IP, uri = plexpy.CONFIG.PMS_URL.replace('https://', 'wss://') + '/:/websockets/notifications'
plexpy.CONFIG.PMS_PORT else:
) uri = 'ws://%s:%s/:/websockets/notifications' % (
plexpy.CONFIG.PMS_IP,
plexpy.CONFIG.PMS_PORT
)
# Set authentication token (if one is available) # Set authentication token (if one is available)
if plexpy.CONFIG.PMS_TOKEN: if plexpy.CONFIG.PMS_TOKEN: