Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace websocket shutdown with close

Browse source
This commit is contained in:
croneter 2018-02-09 15:10:20 +01:00
parent 96be262f78
commit 90a0c4b545
1 changed files with 60 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
resources/lib/websocket_client.py
View file

@ -17,14 +17,17 @@ import variables as v
############################################################################### ###############################################################################
log = getLogger("PLEX."+__name__) LOG = getLogger("PLEX." + __name__)
############################################################################### ###############################################################################
class WebSocket(Thread): class WebSocket(Thread):
opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY) opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
ws = None
def __init__(self):
self.ws = None
super(WebSocket, self).__init__()
def process(self, opcode, message): def process(self, opcode, message):
raise NotImplementedError raise NotImplementedError
@ -51,7 +54,7 @@ class WebSocket(Thread):
raise NotImplementedError raise NotImplementedError
def run(self): def run(self):
log.info("----===## Starting %s ##===----" % self.__class__.__name__) LOG.info("----===## Starting %s ##===----", self.__class__.__name__)
counter = 0 counter = 0
handshake_counter = 0 handshake_counter = 0
@ -62,15 +65,12 @@ class WebSocket(Thread):
while thread_suspended(): while thread_suspended():
# Set in service.py # Set in service.py
if self.ws is not None: if self.ws is not None:
try: self.ws.close()
self.ws.shutdown()
except:
pass
self.ws = None self.ws = None
if thread_stopped(): if thread_stopped():
# Abort was requested while waiting. We should exit # Abort was requested while waiting. We should exit
log.info("##===---- %s Stopped ----===##" LOG.info("##===---- %s Stopped ----===##",
% self.__class__.__name__) self.__class__.__name__)
return return
sleep(1000) sleep(1000)
try: try:
@ -79,8 +79,8 @@ class WebSocket(Thread):
# No worries if read timed out # No worries if read timed out
pass pass
except websocket.WebSocketConnectionClosedException: except websocket.WebSocketConnectionClosedException:
log.info("%s: connection closed, (re)connecting" LOG.info("%s: connection closed, (re)connecting",
% self.__class__.__name__) self.__class__.__name__)
uri, sslopt = self.getUri() uri, sslopt = self.getUri()
try: try:
# Low timeout - let's us shut this thread down! # Low timeout - let's us shut this thread down!
@ -91,7 +91,7 @@ class WebSocket(Thread):
enable_multithread=True) enable_multithread=True)
except IOError: except IOError:
# Server is probably offline # Server is probably offline
log.info("%s: Error connecting" % self.__class__.__name__) LOG.info("%s: Error connecting", self.__class__.__name__)
self.ws = None self.ws = None
counter += 1 counter += 1
if counter > 3: if counter > 3:
@ -99,59 +99,46 @@ class WebSocket(Thread):
self.IOError_response() self.IOError_response()
sleep(1000) sleep(1000)
except websocket.WebSocketTimeoutException: except websocket.WebSocketTimeoutException:
log.info("%s: Timeout while connecting, trying again" LOG.info("%s: Timeout while connecting, trying again",
% self.__class__.__name__) self.__class__.__name__)
self.ws = None self.ws = None
sleep(1000) sleep(1000)
except websocket.WebSocketException as e: except websocket.WebSocketException as e:
log.info('%s: WebSocketException: %s' LOG.info('%s: WebSocketException: %s',
% (self.__class__.__name__, e)) self.__class__.__name__, e)
if ('Handshake Status 401' in e.args if ('Handshake Status 401' in e.args
or 'Handshake Status 403' in e.args): or 'Handshake Status 403' in e.args):
handshake_counter += 1 handshake_counter += 1
if handshake_counter >= 5: if handshake_counter >= 5:
log.info('%s: Error in handshake detected. ' LOG.info('%s: Error in handshake detected. '
'Stopping now' 'Stopping now', self.__class__.__name__)
% self.__class__.__name__)
break break
self.ws = None self.ws = None
sleep(1000) sleep(1000)
except Exception as e: except Exception as e:
log.error('%s: Unknown exception encountered when ' LOG.error('%s: Unknown exception encountered when '
'connecting: %s' % (self.__class__.__name__, e)) 'connecting: %s', self.__class__.__name__, e)
import traceback import traceback
log.error("%s: Traceback:\n%s" LOG.error("%s: Traceback:\n%s",
% (self.__class__.__name__, self.__class__.__name__, traceback.format_exc())
traceback.format_exc()))
self.ws = None self.ws = None
sleep(1000) sleep(1000)
else: else:
counter = 0 counter = 0
handshake_counter = 0 handshake_counter = 0
except Exception as e: except Exception as e:
log.error("%s: Unknown exception encountered: %s" LOG.error("%s: Unknown exception encountered: %s",
% (self.__class__.__name__, e)) self.__class__.__name__, e)
import traceback import traceback
log.error("%s: Traceback:\n%s" LOG.error("%s: Traceback:\n%s",
% (self.__class__.__name__, self.__class__.__name__, traceback.format_exc())
traceback.format_exc())) if self.ws is not None:
try: self.ws.close()
self.ws.shutdown()
except:
pass
self.ws = None self.ws = None
log.info("##===---- %s Stopped ----===##" % self.__class__.__name__) # Close websocket connection on shutdown
if self.ws is not None:
def stopThread(self): self.ws.close()
""" LOG.info("##===---- %s Stopped ----===##", self.__class__.__name__)
Overwrite this method from thread_methods to close websockets
"""
log.info("Stopping %s thread." % self.__class__.__name__)
self.__threadStopped = True
try:
self.ws.shutdown()
except:
pass
@thread_methods(add_suspends=['SUSPEND_LIBRARY_THREAD']) @thread_methods(add_suspends=['SUSPEND_LIBRARY_THREAD'])
@ -173,8 +160,8 @@ class PMS_Websocket(WebSocket):
sslopt = {} sslopt = {}
if settings('sslverify') == "false": if settings('sslverify') == "false":
sslopt["cert_reqs"] = CERT_NONE sslopt["cert_reqs"] = CERT_NONE
log.debug("%s: Uri: %s, sslopt: %s" LOG.debug("%s: Uri: %s, sslopt: %s",
% (self.__class__.__name__, uri, sslopt)) self.__class__.__name__, uri, sslopt)
return uri, sslopt return uri, sslopt
def process(self, opcode, message): def process(self, opcode, message):
@ -184,38 +171,38 @@ class PMS_Websocket(WebSocket):
try: try:
message = loads(message) message = loads(message)
except ValueError: except ValueError:
log.error('%s: Error decoding message from websocket' LOG.error('%s: Error decoding message from websocket',
% self.__class__.__name__) self.__class__.__name__)
log.error(message) LOG.error(message)
return return
try: try:
message = message['NotificationContainer'] message = message['NotificationContainer']
except KeyError: except KeyError:
log.error('%s: Could not parse PMS message: %s' LOG.error('%s: Could not parse PMS message: %s',
% (self.__class__.__name__, message)) self.__class__.__name__, message)
return return
# Triage # Triage
typus = message.get('type') typus = message.get('type')
if typus is None: if typus is None:
log.error('%s: No message type, dropping message: %s' LOG.error('%s: No message type, dropping message: %s',
% (self.__class__.__name__, message)) self.__class__.__name__, message)
return return
log.debug('%s: Received message from PMS server: %s' LOG.debug('%s: Received message from PMS server: %s',
% (self.__class__.__name__, message)) self.__class__.__name__, message)
# Drop everything we're not interested in # Drop everything we're not interested in
if typus not in ('playing', 'timeline', 'activity'): if typus not in ('playing', 'timeline', 'activity'):
return return
elif typus == 'activity' and state.DB_SCAN is True: elif typus == 'activity' and state.DB_SCAN is True:
# Only add to processing if PKC is NOT doing a lib scan (and thus # Only add to processing if PKC is NOT doing a lib scan (and thus
# possibly causing these reprocessing messages en mass) # possibly causing these reprocessing messages en mass)
log.debug('%s: Dropping message as PKC is currently synching' LOG.debug('%s: Dropping message as PKC is currently synching',
% self.__class__.__name__) self.__class__.__name__)
else: else:
# Put PMS message on queue and let libsync take care of it # Put PMS message on queue and let libsync take care of it
state.WEBSOCKET_QUEUE.put(message) state.WEBSOCKET_QUEUE.put(message)
def IOError_response(self): def IOError_response(self):
log.warn("Repeatedly could not connect to PMS, " LOG.warn("Repeatedly could not connect to PMS, "
"declaring the connection dead") "declaring the connection dead")
window('plex_online', value='false') window('plex_online', value='false')
@ -232,37 +219,37 @@ class Alexa_Websocket(WebSocket):
def getUri(self): def getUri(self):
uri = ('wss://pubsub.plex.tv/sub/websockets/%s/%s?X-Plex-Token=%s' uri = ('wss://pubsub.plex.tv/sub/websockets/%s/%s?X-Plex-Token=%s'
% (state.PLEX_USER_ID, % (state.PLEX_USER_ID,
v.PKC_MACHINE_IDENTIFIER, state.PLEX_TOKEN)) v.PKC_MACHINE_IDENTIFIER,
state.PLEX_TOKEN))
sslopt = {} sslopt = {}
log.debug("%s: Uri: %s, sslopt: %s" LOG.debug("%s: Uri: %s, sslopt: %s",
% (self.__class__.__name__, uri, sslopt)) self.__class__.__name__, uri, sslopt)
return uri, sslopt return uri, sslopt
def process(self, opcode, message): def process(self, opcode, message):
if opcode not in self.opcode_data: if opcode not in self.opcode_data:
return return
log.debug('%s: Received the following message from Alexa:' LOG.debug('%s: Received the following message from Alexa:',
% self.__class__.__name__) self.__class__.__name__)
log.debug('%s: %s' % (self.__class__.__name__, message)) LOG.debug('%s: %s', self.__class__.__name__, message)
try: try:
message = etree.fromstring(message) message = etree.fromstring(message)
except Exception as ex: except Exception as ex:
log.error('%s: Error decoding message from Alexa: %s' LOG.error('%s: Error decoding message from Alexa: %s',
% (self.__class__.__name__, ex)) self.__class__.__name__, ex)
return return
try: try:
if message.attrib['command'] == 'processRemoteControlCommand': if message.attrib['command'] == 'processRemoteControlCommand':
message = message[0] message = message[0]
else: else:
log.error('%s: Unknown Alexa message received' LOG.error('%s: Unknown Alexa message received',
% self.__class__.__name__) self.__class__.__name__)
return return
except: except:
log.error('%s: Could not parse Alexa message' LOG.error('%s: Could not parse Alexa message',
% self.__class__.__name__) self.__class__.__name__)
return return
process_command(message.attrib['path'][1:], process_command(message.attrib['path'][1:], message.attrib)
message.attrib)
def IOError_response(self): def IOError_response(self):
pass pass