Bump to 1.10, pin websocket-client, and add --url parameter

certstream/cli.py

@@ -15,6 +15,7 @@
 parser.add_argument('--full', action='store_true', help='Output all SAN addresses as well')
 parser.add_argument('--disable-colors', action='store_true', help='Disable colors when writing a human readable ')
 parser.add_argument('--verbose', action='store_true', default=False, dest='verbose', help='Display debug logging.')
+parser.add_argument('--url', default="wss://certstream.calidog.io", dest='url', help='Connect to a certstream server.')
 
 def main():
     args = parser.parse_args()
@@ -60,7 +61,7 @@ def _handle_messages(message, context):
 
             sys.stdout.flush()
 
-    certstream.listen_for_events(_handle_messages, skip_heartbeats=True)
+    certstream.listen_for_events(_handle_messages, args.url, skip_heartbeats=True)
 
 if __name__ == "__main__":
     main()

certstream/core.py

@@ -13,16 +13,15 @@ class Context(dict):
     __delattr__ = dict.__delitem__
 
 class CertStreamClient(WebSocketApp):
-    CERTSTREAM_URL = 'wss://certstream.calidog.io'
     _context = Context()
 
-    def __init__(self, message_callback, skip_heartbeats=True, on_open=None, on_error=None):
+    def __init__(self, message_callback, url, skip_heartbeats=True, on_open=None, on_error=None):
         self.message_callback = message_callback
         self.skip_heartbeats = skip_heartbeats
         self.on_open_handler = on_open
         self.on_error_handler = on_error
         super(CertStreamClient, self).__init__(
-            url=self.CERTSTREAM_URL,
+            url=url,
             on_open=self._on_open,
             on_message=self._on_message,
             on_error=self._on_error,
@@ -48,13 +47,13 @@ def _on_error(self, instance, ex):
             self.on_error_handler(instance, ex)
         logging.error("Error connecting to CertStream - {} - Sleeping for a few seconds and trying again...".format(ex))
 
-def listen_for_events(message_callback, skip_heartbeats=True, setup_logger=True, on_open=None, on_error=None, **kwargs):
+def listen_for_events(message_callback, url, skip_heartbeats=True, setup_logger=True, on_open=None, on_error=None, **kwargs):
     if setup_logger:
         logging.basicConfig(format='[%(levelname)s:%(name)s] %(asctime)s - %(message)s', level=logging.INFO)
 
     try:
         while True:
-            c = CertStreamClient(message_callback, skip_heartbeats=skip_heartbeats, on_open=on_open, on_error=on_error)
+            c = CertStreamClient(message_callback, url, skip_heartbeats=skip_heartbeats, on_open=on_open, on_error=on_error)
             c.run_forever(**kwargs)
             time.sleep(5)
     except KeyboardInterrupt:

requirements.txt

@@ -1,2 +1,2 @@
-websocket-client
+websocket-client==0.48.0
 termcolor

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='certstream',
-    version="1.9",
+    version="1.10",
     url='https://github.com/CaliDog/certstream-python/',
     author='Ryan Sears',
     install_requires=dependencies,