Native sync working

Author: Sebastian Molenda

pubnub/request_handlers/requests_handler.py

@@ -1,6 +1,7 @@
 import logging
 import threading
 import requests
+import httpx
 import json  # noqa # pylint: disable=W0611
 import urllib
 
@@ -30,12 +31,13 @@ class RequestsRequestHandler(BaseRequestHandler):
     ENDPOINT_THREAD_COUNTER: int = 0
 
     def __init__(self, pubnub):
-        self.session = Session()
+        self.session = httpx.Client()
+        # self.session = Session()
 
-        self.session.mount('http://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
-        self.session.mount('https://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
-        self.session.mount('http://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
-        self.session.mount('https://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
+        # self.session.mount('http://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
+        # self.session.mount('https://%s' % pubnub.config.origin, HTTPAdapter(max_retries=1, pool_maxsize=500))
+        # self.session.mount('http://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
+        # self.session.mount('https://%s/v2/subscribe' % pubnub.config.origin, HTTPAdapter(pool_maxsize=500))
 
         self.pubnub = pubnub
 
@@ -154,8 +156,7 @@ def _build_envelope(self, p_options, e_options):
                     exception=e))
 
         if res is not None:
-            url = urllib.parse.urlparse(res.url)
-            query = urllib.parse.parse_qs(url.query)
+            query = urllib.parse.parse_qs(res.url.query)
             uuid = None
             auth_key = None
 
@@ -167,14 +168,14 @@ def _build_envelope(self, p_options, e_options):
 
             response_info = ResponseInfo(
                 status_code=res.status_code,
-                tls_enabled='https' == url.scheme,
-                origin=url.hostname,
+                tls_enabled='https' == res.url.scheme,
+                origin=res.url.host,
                 uuid=uuid,
                 auth_key=auth_key,
                 client_request=res.request
             )
 
-        if not res.ok:
+        if res.status_code not in [200, 204, 307]:
             if res.status_code == 403:
                 status_category = PNStatusCategory.PNAccessDeniedCategory
 
@@ -241,7 +242,7 @@ def _invoke_request(self, p_options, e_options, base_origin):
             "url": url,
             "params": e_options.query_string,
             "timeout": (e_options.connect_timeout, e_options.request_timeout),
-            "allow_redirects": e_options.allow_redirects
+            "follow_redirects": e_options.allow_redirects
         }
 
         if e_options.is_post() or e_options.is_patch():

setup.py

@@ -31,6 +31,7 @@
     install_requires=[
         'pycryptodomex>=3.3',
         'requests>=2.4',
+        'httpx>=0.18',
         'cbor2',
         'aiohttp'
     ],

tests/integrational/native_sync/test_file_upload.py

@@ -1,5 +1,6 @@
 from urllib.parse import parse_qs, urlparse
 import pytest
+import urllib
 
 from Cryptodome.Cipher import AES
 from unittest.mock import patch
@@ -153,7 +154,7 @@ def test_get_file_url_has_auth_key_in_url_and_signature(file_upload_test_data):
         .file_id("random_file_id") \
         .file_name("random_file_name").sync()
 
-    assert "auth=test_auth_key" in file_url_envelope.status.client_request.url
+    assert "auth=test_auth_key" in str(file_url_envelope.status.client_request.url)
 
 
 @pn_vcr.use_cassette(
@@ -220,7 +221,8 @@ def test_publish_file_message_with_overriding_time_token():
         .ttl(222).sync()
 
     assert isinstance(envelope.result, PNPublishFileMessageResult)
-    assert "ptto" in envelope.status.client_request.url
+
+    assert "ptto" in urllib.parse.parse_qs(envelope.status.client_request.url.query.decode())
 
 
 @pn_vcr.use_cassette(

tests/integrational/native_sync/test_publish.py

@@ -1,6 +1,6 @@
 import logging
 import unittest
-from urllib.parse import parse_qs, urlparse
+import urllib
 
 import pubnub
 from pubnub.exceptions import PubNubException
@@ -328,8 +328,8 @@ def test_publish_with_ptto_and_replicate(self):
             .sync()
 
         assert isinstance(env.result, PNPublishResult)
-        assert "ptto" in env.status.client_request.url
-        assert "norep" in env.status.client_request.url
+        assert "ptto" in urllib.parse.parse_qs(env.status.client_request.url.query.decode())
+        assert "norep" in urllib.parse.parse_qs(env.status.client_request.url.query.decode())
 
     @pn_vcr.use_cassette(
         'tests/integrational/fixtures/native_sync/publish/publish_with_single_quote_message.yaml',