akita-har_logger 0.2.7 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2030633ff794a611ceb1fddba8b274e5617765c0644dcdebbe6743515dd0576
-  data.tar.gz: c3b1eb76987d0db9dcf63830a67882cbdfbaceeba937c1a9a20a874ddc4efd42
+  metadata.gz: 95fc4c3e51ec19663e862655884702fdcc42aa567f0ca706f1b2dfda065662e5
+  data.tar.gz: 04c93b6cc55669bec6b303803928d1c28bd44aa770a7f4b88763cb430f7f7d90
 SHA512:
-  metadata.gz: 7b7e2cbf0e7580c044ca178d58af63fc41059318475f033314bf9fbba9ce3546da02808b2c237c6cef6ada40d6b6eebaf905ed2201f943367deea8fc49342d5b
-  data.tar.gz: c8637bc4282a1571b0366e1dbff4948771a7d10913b26c7df595996b4096dcd18e8119448cf3f578c9d33f3acf12034c05d92b62ce1900eff34b4c5adb71fe9f
+  metadata.gz: f76e965199fff57f90f321c3293b6c8447ac1fbfec7d5987ef5bc7e005aa98527d34c33d79f92ff964267b086208d121ad0d25774a19c00f2dbea9455eaf40ab
+  data.tar.gz: 287cc1c7f0eb46932b224764171f26612e406afc2d388ee30d5c238000349161741c14afb9def65af27d2703c5ac1c908763241e07e35f269ae1b064a6b8d922

data/Gemfile.lock

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

data/lib/akita/har_logger.rb

@@ -37,18 +37,41 @@ 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
+
+        # Buffer the response body in case it's not a rewindable stream.
+        body = HarLogger.bufferBody(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
 
+    # Reads the given body into an array and returns the result.
+    def self.bufferBody(body)
+      result = []
+      body.each { |part| result << part }
+      result
+    end
+
     # Logging filter for `ActionController`s.
     # TODO: Some amount of code duplication here. Should refactor.
     class Filter
@@ -72,6 +95,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 +108,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
@@ -163,7 +164,7 @@ module Akita
         # for the CRLF on the blank line.
         getHeaders(env).reduce(line_length + 2) { |accum, entry|
           # Header-Name: header value<CR><LF>
-          accum + entry[:name].length + 2 + entry[:value].to_s.length + 2
+          accum + entry[:name].length + 2 + entry[:value].length + 2
         }
       end
 

data/lib/akita/har_logger/http_response.rb

@@ -159,7 +159,9 @@ module Akita
 
       def getBodySize(body)
         length = 0
-        body.each { |part| length += part.bytesize }
+        # Convert each body part into a string in case we're dealing with
+        # non-Rack-compliant components.
+        body.each { |part| length += part.to_s.bytesize }
         length
       end
     end

data/lib/akita/har_logger/version.rb

@@ -2,6 +2,6 @@
 
 module Akita
   module HarLogger
-    VERSION = "0.2.7"
+    VERSION = "0.2.11"
   end
 end

metadata

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