Updating to newer JSON protocol (#10)

Author: denismakogon

fdk/json/request.py

@@ -47,6 +47,9 @@ def readline(stream):
         elif c == "}" and ret:
             line += c
             s = line.replace('\n"\n,', '",').replace("\n}", "}")
+            # due to weird padding we omit last 4 bytes: \n}\n\n
+            stream.read(4)
+            s += "}"
             print("Before JSON parsing: {}".format(s),
                   file=sys.stderr, flush=True)
             return ujson.loads(s)

fdk/tests/data.py

@@ -44,14 +44,22 @@
 \r\n{"media_url": "http://localhost:8080/img.png"}
 """
 
-json_request_with_data = ('{"body":"{\\"a\\":\\"a\\"}\n"\n'
-                          ',"headers":{"Content-Type":["application/json"],'
-                          '"Host":["localhost:8080"],'
-                          '"User-Agent":["curl/7.51.0"]}'
-                          '\n}')
-
-json_request_without_data = ('{"body":""\n'
-                             ',"headers":{"Content-Type":["application/json"],'
-                             '"Host":["localhost:8080"],'
-                             '"User-Agent":["curl/7.51.0"]}'
-                             '\n}')
+json_request_with_data = (
+    '{\n"call_id":"some_id"\n,'
+    '"content_type":"application/json"\n'
+    ',"body":"{\\"a\\":\\"a\\"}\n"\n'
+    ',"protocol":{"type":"json"\n'
+    ',"request_url":"/v1/apps?something=something&etc=etc"\n'
+    ',"headers":{"Content-Type":["application/json"],'
+    '"Host":["localhost:8080"],"User-Agent":["curl/7.51.0"]}\n'
+    '\n}\n\n')
+
+json_request_without_data = (
+    '{\n"call_id":"some_id"\n,'
+    '"content_type":"application/json"\n'
+    ',"body":""\n'
+    ',"protocol":{"type":"json"\n'
+    ',"request_url":"/v1/apps?something=something&etc=etc"\n'
+    ',"headers":{"Content-Type":["application/json"],'
+    '"Host":["localhost:8080"],"User-Agent":["curl/7.51.0"]}\n'
+    '\n}\n\n')