Opt env variable and add some unittests

Author: MegatronKing

reqable/main.py

@@ -24,6 +24,7 @@ def onRequest(request):
       with open(request + '.cb', 'w', encoding='UTF-8') as callback:
         callback.write(json.dumps({
           'request': result.serialize(),
+          'env': context.env,
           'shared': context.shared,
         }))
 
@@ -36,6 +37,7 @@ def onResponse(response):
       with open(response + '.cb', 'w', encoding='UTF-8') as callback:
         callback.write(json.dumps({
           'response': result.serialize(),
+          'env': context.env,
           'shared': context.shared,
         }))
 

reqable/reqable.py

@@ -14,8 +14,8 @@ def __init__(self, json: dict):
     self._ctime = json['ctime']
     self._sid = json['sid']
     self._stime = json['stime']
+    self._env = json.get('env')
     self.shared = json.get('shared')
-    self.env = json.get('env')
 
   def __str__(self):
     return self.toJson()
@@ -71,6 +71,11 @@ def stime(self) -> int:
   def uid(self) -> str:
     return f"{self.ctime}-{self.cid}-{self.sid}"
 
+  # Environment variables.
+  @property
+  def env(self) -> Dict[str, str]:
+    return self._env
+
   def toJson(self) -> str:
     return json.dumps({
       'url': self._url,
@@ -81,8 +86,8 @@ def toJson(self) -> str:
       'ctime': self._ctime,
       'sid': self._sid,
       'stime': self._stime,
+      'env': self._env,
       'shared': self.shared,
-      'env': self.env,
     })
 
 class CaptureHttpQueries:

test/reqable_context_test.py

@@ -13,6 +13,11 @@ def testContextConstructor(self):
       'ctime': 1686556178335,
       'sid': 7,
       'stime': 1686556256263,
+      'env': {
+        'foo': 'bar',
+        'abc': '123',
+        '$randomEmail': 'random@reqable.com'
+      }
     })
     self.assertEqual(context.url, 'https://reqable.com')
     self.assertEqual(context.scheme, 'https')
@@ -23,6 +28,9 @@ def testContextConstructor(self):
     self.assertEqual(context.sid, 7)
     self.assertEqual(context.stime, 1686556256263)
     self.assertEqual(context.uid, '1686556178335-32-7')
+    self.assertEqual(context.env['foo'], 'bar')
+    self.assertEqual(context.env['abc'], '123')
+    self.assertEqual(context.env['$randomEmail'], 'random@reqable.com')
 
 if __name__ == '__main__':
   unittest.main()