akita-har_logger 0.2.6 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8020afb47521c9d7d9ca923dca64e2a8f8364ff7207ab80b68cdc09cd0ca39
-  data.tar.gz: aa865b2768013560e4439d9e500df4680276af28f88294113aa1a594545938eb
+  metadata.gz: 26fd1b1b5e2ccf962928f85e6969b50f63766571f40cf442cf5b615bb44559e9
+  data.tar.gz: b6e0ef99924d4b9db81fa0c0981cdc84d41e11930493843c110bc595bdee9447
 SHA512:
-  metadata.gz: 2f6b7d249bcde1e1d4dea4c332bd1527c1176b7a138ae7dc36edf7844d043e07cea25f845783634fac9385216f746b6209b69e0d4a04eb5b17b2693d5aa9156e
-  data.tar.gz: b58e4e46383ab4caa08b0338cf85b2921c049c7d99df79146756fc2520e267600e1139654059c9ce43faf2807097316a9e874e386fc5c00ee7c2e31e65fb0c0b
+  metadata.gz: c4953346d8f0f2169aea261ebab4768e3868cfbd0511c0d276791b06b6c2e5871f5d054b869b2d3fed0c99eb5d3cad7712bf7a9dd15d2698052da5e22ff3d756
+  data.tar.gz: bc46a89f9eeea951a20e34ed9a2bab0c9dee5fd7a8e5ed996d2fe06942d917279345bae0e12c662a0423baff927790dde4c82a99baf834537615deb1d62b796e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    akita-har_logger (0.2.6)
+    akita-har_logger (0.2.10)
 
 GEM
   remote: https://rubygems.org/

data/lib/akita/har_logger.rb

@@ -37,14 +37,27 @@ module Akita
 
       def call(env)
         start_time = Time.now
+
+        # Read the request body here, in case there is non-Rack-compliant
+        # middleware in the stack that closes the request-body stream on us.
+        request_body = env['rack.input'].read
+        env['rack.input'].rewind  # Be kind.
+
         status, headers, body = @app.call(env)
         end_time = Time.now
 
         wait_time_ms = ((end_time.to_f - start_time.to_f) * 1000).round
 
+        # Patch env with our saved request body.
+        saved_input = env['rack.input']
+        env['rack.input'] = StringIO.new request_body
+
         @entry_queue << (HarEntry.new start_time, wait_time_ms, env, status,
                                       headers, body)
 
+        # Be kind and restore the original request-body stream.
+        env['rack.input'] = saved_input
+
         [ status, headers, body ]
       end
     end
@@ -72,6 +85,11 @@ module Akita
       def around(controller)
         start_time = Time.now
 
+        # Read the request body here, in case there is non-Rack-compliant
+        # middleware in the stack that closes the request-body stream on us.
+        request_body = controller.response.request.env['rack.input'].read
+        controller.response.request.env['rack.input'].rewind  # Be kind.
+
         yield
 
         end_time = Time.now
@@ -80,9 +98,16 @@ module Akita
         response = controller.response
         request = response.request
 
+        # Patch env with our saved request body.
+        saved_input = request.env['rack.input']
+        request.env['rack.input'] = StringIO.new request_body
+
         @entry_queue << (HarEntry.new start_time, wait_time_ms, request.env,
                                       response.status, response.headers,
                                       [response.body])
+
+        # Be kind and restore the original request-body stream.
+        request.env['rack.input'] = saved_input
       end
     end
 

data/lib/akita/har_logger/har_utils.rb

@@ -39,7 +39,7 @@ module Akita
         hash.reduce([]) { |accum, (k, v)|
           accum.append({
             name: fixEncoding(k),
-            value: fixEncoding(v),
+            value: fixEncoding(v.to_s),
           })
         }
       end

data/lib/akita/har_logger/http_request.rb

@@ -121,7 +121,8 @@ module Akita
             # Gracefully handle any characters that are invalid in the source
             # encoding and characters that have no UTF-8 representation by
             # replacing with '?'. Log a warning when this happens.
-            source = req.body.string.force_encoding(getPostDataCharSet(env))
+            sourceCharset = getPostDataCharSet(env)
+            source = String.new(req.body.read).force_encoding(sourceCharset)
             utf8EncodingSuccessful = false
             if source.valid_encoding? then
               begin

data/lib/akita/har_logger/http_response.rb

@@ -153,7 +153,7 @@ module Akita
         # for the CRLF on the blank line.
         headers.reduce(status_length + 2) { |accum, (k, v)|
           # Header-Name: header value<CR><LF>
-          accum + k.length + 2 + v.length + 2
+          accum + k.length + 2 + v.to_s.length + 2
         }
       end
 

data/lib/akita/har_logger/version.rb

@@ -2,6 +2,6 @@
 
 module Akita
   module HarLogger
-    VERSION = "0.2.6"
+    VERSION = "0.2.10"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akita-har_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.10
 platform: ruby
 authors:
 - Jed Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec