Use Plex API to check remote access down

data/interfaces/default/settings.html

@@ -405,9 +405,9 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="monitor_remote_access" name="monitor_remote_access" value="1" ${config['monitor_remote_access']}> Monitor Plex Remote Access
+                                <input type="checkbox" class="monitor-settings" id="monitor_remote_access" name="monitor_remote_access" value="1" ${config['monitor_remote_access']}> Monitor Plex Remote Access
                             </label>
-                            <p class="help-block">Enable to have PlexPy check if remote access to the Plex Media Server goes down. (Must have remote access set up in Plex.)</p>
+                            <p class="help-block">Enable to have PlexPy check if remote access to the Plex Media Server goes down. Your server needs to have remote access enabled.</p>
                         </div>
 
                         <div class="padded-header">

plexpy/activity_pinger.py

@@ -18,7 +18,6 @@ from plexpy import logger, pmsconnect, plextv, notification_handler, database, h
 import threading
 import plexpy
 import time
-import urllib2
 
 monitor_lock = threading.Lock()
 ext_ping_count = 0
@@ -226,37 +225,37 @@ def check_server_response():
 
     with monitor_lock:
         pms_connect = pmsconnect.PmsConnect()
-        internal_response = pms_connect.get_server_response()
+        server_response = pms_connect.get_server_response()
-        global int_ping_count
 
-        if not internal_response:
+        global int_ping_count
+        global ext_ping_count
+        
+        # Check for internal server response
+        if not server_response:
             int_ping_count += 1
             logger.warn(u"PlexPy Monitor :: Unable to get an internal response from the server, ping attempt %s." \
                         % str(int_ping_count))
+        # Reset internal ping counter
         else:
             int_ping_count = 0
 
-        if plexpy.CONFIG.MONITOR_REMOTE_ACCESS:
+        # Check for remote access
-            plex_tv = plextv.PlexTV()
+        if server_response and plexpy.CONFIG.MONITOR_REMOTE_ACCESS:
-            external_response = plex_tv.get_server_response()
-            global ext_ping_count
         
-            if not external_response:
+            mapping_state = server_response['mapping_state']
-                ext_ping_count += 1
+            mapping_error = server_response['mapping_error']
-                logger.warn(u"PlexPy Monitor :: Plex remote access port mapping failed, ping attempt %s." \
-                            % str(ext_ping_count))
-            else:
-                host = external_response[0]['host']
-                port = external_response[0]['port']
 
-                try:
+            # Check if the port is mapped
-                    http_response = urllib2.urlopen('http://' + host + ':' + port)
+            if not mapping_state == 'mapped':
-                except urllib2.HTTPError, e:
-                    ext_ping_count = 0
-                except urllib2.URLError, e:
                 ext_ping_count += 1
-                    logger.warn(u"PlexPy Monitor :: Unable to get an external response from the server, ping attempt %s." \
+                logger.warn(u"PlexPy Monitor :: Plex remote access port not mapped, ping attempt %s." \
                             % str(ext_ping_count))
+            # Check if the port is open
+            elif mapping_error == 'unreachable':
+                ext_ping_count += 1
+                logger.warn(u"PlexPy Monitor :: Plex remote access port mapped, but mapping failed, ping attempt %s." \
+                            % str(ext_ping_count))
+            # Reset external ping counter
             else:
                 ext_ping_count = 0
 

plexpy/plextv.py

@@ -463,22 +463,3 @@ class PlexTV(object):
                 break
 
         return server_times
-
-    def get_server_response(self):
-        response = self.get_plextv_server_list(output_format='xml')
-
-        server_url = []
-
-        try:
-            xml_head = response.getElementsByTagName('Server')
-        except:
-            return False
-
-        for a in xml_head:
-            if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER:
-                server_url.append({"host": helpers.get_xml_attr(a, 'host'),
-                                   "port": helpers.get_xml_attr(a, 'port')
-                                   })
-            break
-
-        return server_url

plexpy/pmsconnect.py

@@ -270,6 +270,22 @@ class PmsConnect(object):
 
         return request
 
+    """
+    Return account details.
+
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
+    def get_account(self, output_format=''):
+        uri = '/myplex/account'
+        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
+                                                    request_type='GET',
+                                                    output_format=output_format)
+
+        return request
+
     """
     Return processed and validated list of recently added items.
 
@@ -1650,15 +1666,22 @@ class PmsConnect(object):
 
         return key_list
 
-    """
-    Check for a server response.
-
-    Output: bool
-    """
     def get_server_response(self):
-        response = self.get_server_list()
+        account_data = self.get_account(output_format='xml')
         
-        if not response:
+        try:
-            return False
+            xml_head = account_data.getElementsByTagName('MyPlex')
-        else:
+        except:
-            return True
+            logger.warn("Unable to parse XML for get_server_response.")
+            return None
+        
+        server_response = {}
+
+        for a in xml_head:
+            server_response = {'mapping_state': helpers.get_xml_attr(a, 'mappingState'),
+                               'mapping_error': helpers.get_xml_attr(a, 'mappingError'),
+                               'public_address': helpers.get_xml_attr(a, 'publicAddress'),
+                               'public_port': helpers.get_xml_attr(a, 'publicPort')
+                               }
+        
+        return server_response