debugbar 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389fcb115afbb56d83be8f40f60985a527c81f8d0df6aa7209720dc2413fd10b
-  data.tar.gz: f002929f37f5821f9b663c450b3ffc487cb3892f8f94ab2b1a720987b0d4514d
+  metadata.gz: 1d27d82c0937dc9a2ca971fd88759a82cfafc559dc8401983b4204b2d09d13f8
+  data.tar.gz: b9a9c4e3e202e6abb49b5ff60656bcf3ca24c918fc6c06fb85f10cb247712268
 SHA512:
-  metadata.gz: '0719ab3ca71da9bc48786a19108b3828e15d70230d2d1022d9d135586cb95043ced489c59bd264cb513cac6dabd9190bc4a7bedbac67ebd533a63668473efa55'
-  data.tar.gz: 6940165a13db4afe19416945c90b98ec7b33686b04163cd1ce99f7c7a575c8084d135d673707ede5b8b6c62615cc66e137484d2ab6b5d7fbab7dac6172eedc1d
+  metadata.gz: 6f8063ca1547cf52310b078ed206fe4b58f96b24366796ef0d20c04e990d332cdfde512da0b40e5a99bb21a3e9e7e51e0ece460eb3a064c9e60004c928529ae9
+  data.tar.gz: 713327fb6e02c53566063b2232ee1aa82770b7784e54b5d852cdde46f5a31a743c9305e2e4a8bdf945267271cbeef3db3991b4a8bb9c688d1c903d5eb8c04d64

data/CHANGELOG.md

@@ -0,0 +1,23 @@
+# Changelog
+
+## v0.2.0 - 2024-02-28
+
+* Introduce polling in case someone cannot use ActiveCable - See [8b262be7](https://github.com/julienbourdeau/debugbar/commit/8b262be7b644c7b587a6c3348bb02076053a344f)
+  * https://debugbar.dev/docs/polling-mode
+* Show more timings information (total time, DB runtime and CPU time) - See [c02531ed](https://github.com/julienbourdeau/debugbar/commit/c02531ed6e9d9c74df11d4d8c30e3fb7bf970852)
+* Move main middleware higher in the chain - See [7ca51c10](https://github.com/julienbourdeau/debugbar/commit/7ca51c10c5999f7ad14a303c92083614551de134)
+* Silence debugbar routes for quieter logs - See [efe491bd](https://github.com/julienbourdeau/debugbar/commit/efe491bde9e0544e5fb891597bb2af47854c1169)
+
+### Breaking changes
+
+The frontend configuration was slightly modified. If you customized the prefix for the debugbar routes or the channelName, you must update your config.
+Prefix is at the root, and channelName is nested under the cable key.
+
+```diff
+- <%= debugbar_javascript channelName: "something_else", cable: {prefix: "custom-prefix"} %>
++ <%= debugbar_javascript prefix: "custom-prefix", cable: {channelName: "something_else"} %>
+```
+
+## v0.1.0 - 2024-02-13
+
+* Initial release 🎉

data/app/controllers/debugbar/polling_controller.rb

@@ -0,0 +1,23 @@
+module Debugbar
+  class PollingController < ApplicationController
+    skip_before_action :verify_authenticity_token, only: [:confirm]
+    before_action :cors_set_access_control_headers
+
+    def poll
+      render json: RequestBuffer.all.map(&:to_h)
+    end
+
+    def confirm
+      RequestBuffer.remove params[:ids]
+      head :ok
+    end
+
+    private
+
+    def cors_set_access_control_headers
+      response.headers['Access-Control-Allow-Origin'] = '*'
+      response.headers['Access-Control-Allow-Headers'] = 'Content-Type'
+      response.headers['Access-Control-Allow-Methods'] = 'POST, GET'
+    end
+  end
+end

data/app/helpers/debugbar/tag_helpers.rb

@@ -1,5 +1,12 @@
 module Debugbar::TagHelpers
   def debugbar_javascript(opt = {})
+    opt = ActiveSupport::HashWithIndifferentAccess.new(opt)
+
+    # See https://github.com/julienbourdeau/debugbar/issues/8
+    if !defined?(ActionCable) && opt[:mode].nil?
+      opt[:mode] = 'poll'
+    end
+
     html = <<-HTML
       <div id="__debugbar"></div>
     HTML

data/{build.sh → build_client.sh}

@@ -3,5 +3,3 @@
 rm -rf client/dist
 (cd client && npm run build)
 cp client/dist/assets/debugbar-*.js public/debugbar.js
-
-gem build debugbar.gemspec

data/build_demo.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+ruby ./build_fixtures.rb
+rm -rf client/dist-demo
+(cd client/ && VITE_DEMO_MODE=true npm run build)
+
+if [ -d "../debugbar.dev/source/assets/debugbar" ]; then
+  echo
+  echo "debugbar.dev found in parent directory"
+  echo " -> Copying assets"
+  rm -f ../debugbar.dev/source/assets/debugbar/*
+  cp ./client/dist-demo/assets/* ../debugbar.dev/source/assets/debugbar/
+fi

data/build_fixtures.rb

@@ -0,0 +1,32 @@
+require 'net/http'
+require 'json'
+
+fixtures_dir = File.expand_path('../fixtures/requests', __FILE__)
+
+puts "Deleting old fixtures in #{fixtures_dir}"
+Dir.glob("#{fixtures_dir}/*").each { |p| File.delete(p) }
+
+Net::HTTP.start('127.0.0.1', 3000) do |http|
+  [
+    '/post-list',
+    '/slow-page',
+    '/random',
+    '/post/240',
+    '/api/jobs?name=refresh&post_id=123',
+    '/api/jobs?name=send_email&post_id=123',
+    '/api/errors?code=500',
+  ].each do |path|
+    puts "Requesting #{path}"
+    http.request Net::HTTP::Get.new(path)
+    sleep 0.5
+  end
+
+  puts "Requesting debugbar data"
+  response = http.request Net::HTTP::Get.new('/_debugbar/poll')
+  data = JSON.parse(response.body)
+  data.each_with_index do |item, idx|
+    name = ("%03d" % (idx +1)) + '-' + item['meta']['controller'] + '-' + item['meta']['action']
+    File.write("#{fixtures_dir}/#{name}.json", JSON.pretty_generate(item))
+  end
+end
+

data/build_gem.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+source build_client.sh
+gem build debugbar.gemspec

data/config/routes.rb

@@ -1,6 +1,9 @@
 Debugbar::Engine.routes.draw do
   mount ActionCable.server => '/cable'
 
-  # TODO: Silence logs for this route if `::Rails.application.config.assets.quiet` is true
+  get 'poll' => "polling#poll"
+  options 'poll/confirm' => "polling#confirm"
+  post 'poll/confirm' => "polling#confirm"
+
   get 'assets/script' => "assets#js"
 end

data/lib/debugbar/buffers/request_buffer.rb

@@ -2,24 +2,9 @@ module Debugbar
   class RequestBuffer
     class << self
       def init(adapter)
-        @enabled = false
         @adapter = adapter
       end
 
-      def enable!
-        @enabled = true
-        send_all
-      end
-
-      def disable!
-        @enabled = false
-      end
-
-      def send_all
-        data = @collection.values.map(&:to_h)
-        ActionCable.server.broadcast("debugbar_channel", data)
-      end
-
       %w(push each all remove clear!).each do |name|
         define_method(name) do |*args, &block|
           ret = @adapter.send(name, *args, &block)

data/lib/debugbar/engine.rb

@@ -1,4 +1,5 @@
 require_relative 'config'
+require_relative 'middlewares/quiet_routes'
 require_relative 'middlewares/track_current_request'
 require_relative '../../app/helpers/debugbar/tag_helpers'
 
@@ -37,7 +38,8 @@ module Debugbar
 
     initializer 'debugbar.inject_middlewares' do |app|
       next unless Debugbar.config.enabled?
-      app.middleware.insert_after ActionDispatch::RequestId, Debugbar::TrackCurrentRequest
+      app.middleware.insert_after ActionDispatch::Executor, Debugbar::TrackCurrentRequest
+      app.middleware.insert_after Sprockets::Rails::QuietAssets, Debugbar::QuietRoutes
     end
 
     initializer 'debugbar.subscribe' do

data/lib/debugbar/middlewares/quiet_routes.rb

@@ -0,0 +1,23 @@
+# This middleware silences the Rails logger for requests to the Debugbar routes.
+# The poll route can be *very* noisy.
+# Rails already does this for the /assets route, see Sprockets::Rails::QuietAssets.
+#
+# @see Sprockets::Rails::QuietAssets
+# @see Rails::Rack::Logger#silence
+#
+module Debugbar
+  class QuietRoutes
+    def initialize(app)
+      @app = app
+      @route_regex = %r(\A/{0,2}#{::Debugbar.config.prefix})
+    end
+
+    def call(env)
+      if env['PATH_INFO'] =~ @route_regex
+        ::Rails.logger.silence { @app.call(env) }
+      else
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/debugbar/middlewares/track_current_request.rb

@@ -9,12 +9,15 @@ module Debugbar
 
       return @app.call(env) if Debugbar::Current.ignore?
 
-      Debugbar::Current.new_request!(env['action_dispatch.request_id'])
+      Debugbar::Current.new_request!(SecureRandom.uuid)
 
       res = @app.call(env)
 
       # TODO: Remove this if statement?
-      if Debugbar::Current.request&.id
+      # We check meta because the frontend doesn't support request without meta yet.
+      # It might happen with ActionController::Live where the following code
+      # will run BEFORE ActionControllerEventSubscriber.process_action is called
+      if Debugbar::Current.request&.meta
         # filename = "#{Time.now.to_i}--#{Debugbar::Current.request.meta.dig(:params, :controller)}_#{Debugbar::Current.request.meta.dig(:params, :action).gsub('/', '_')}.json"
         # File.open(Rails.root.join('_requests', filename), "w") do |f|
         #   f.write(Debugbar::Current.request.to_json)

data/lib/debugbar/subscribers/active_record.rb

@@ -22,26 +22,9 @@ module Debugbar
         sql = payload[:sql]&.gsub(/\/\*.*\*\//, "") # remove comments
 
         binds = nil
-        if payload[:binds]&.any?
-          casted_params = type_casted_binds(payload[:type_casted_binds])
-
-          binds = []
-          payload[:binds].each_with_index do |attr, i|
-            attribute_name = if attr.respond_to?(:name)
-              attr.name
-            elsif attr.respond_to?(:[]) && attr[i].respond_to?(:name)
-              attr[i].name
-            else
-              nil
-            end
-
-            filtered_params = filter(attribute_name, casted_params[i])
-
-            binds << render_bind(attr, filtered_params)
-          end
-          binds = binds.inspect
-          binds.prepend("  ")
-        end
+        # if payload[:binds]&.any?
+        #   TODO: Restore binds when I can figure out how to get something in poayload[:binds]
+        # end
 
         Debugbar::Tracker.add_query({
           id: event.transaction_id,
@@ -60,27 +43,6 @@ module Debugbar
       def query_source_location
         backtrace_cleaner.clean(caller(3))[0]
       end
-
-      private
-
-      def type_casted_binds(casted_binds)
-        casted_binds.respond_to?(:call) ? casted_binds.call : casted_binds
-      end
-
-      def render_bind(attr, value)
-        case attr
-        when ActiveModel::Attribute
-          if attr.type.binary? && attr.value
-            value = "<#{attr.value_for_database.to_s.bytesize} bytes of binary data>"
-          end
-        when Array
-          attr = attr.first
-        else
-          attr = nil
-        end
-
-        [attr&.name, value]
-      end
     end
   end
 end

data/lib/debugbar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Debugbar
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/debugbar.rb

@@ -16,17 +16,25 @@ module Debugbar
 
       SETTERS.each do |m|
         define_method("#{m}=") do |val|
-          if Current.request.nil?
+          return if Debugbar::Current.ignore?
+
+          if Current.request
+            return Current.request.send("#{m}=", val)
+          end
+
+          if Current.request.nil? && ENV["DEBUGBAR_VERBOSE_MODE"] == "true"
             # TODO: Much, much better logging needed
-            puts "The current request is not set yet. Was trying to set #{m}=[#{val.class.name}]."
-          else
-            Current.request.send("#{m}=", val)
+            puts "The current request is not set yet. Was trying to set #{m} = #{val.class.name}."
+            pp val
+            nil
           end
         end
       end
 
       METHODS.each do |m|
         define_method(m) do |*args, &block|
+          return if Debugbar::Current.ignore?
+
           if Current.request
             return Current.request.send(m, *args, &block)
           end