dbwatcher 1.1.1 → 1.1.2

data/lib/dbwatcher/storage/system_info_storage.rb

@@ -0,0 +1,242 @@
+# frozen_string_literal: true
+
+require_relative "../services/system_info/system_info_collector"
+require_relative "../logging"
+
+module Dbwatcher
+  module Storage
+    # System information storage class
+    #
+    # Handles storage, caching, and retrieval of system information data.
+    # Provides intelligent caching with configurable TTL and refresh capabilities.
+    #
+    # @example
+    #   storage = SystemInfoStorage.new
+    #   info = storage.cached_info
+    #   storage.refresh_info
+    #
+    # This class is necessarily complex due to the comprehensive system information
+    # storage and retrieval functionality it provides.
+    # rubocop:disable Metrics/ClassLength
+    class SystemInfoStorage < BaseStorage
+      include Dbwatcher::Logging
+      # Initialize system info storage
+      def initialize
+        super
+        @info_file = File.join(storage_path, "system_info.json")
+      end
+
+      # Save system information to storage
+      #
+      # @param info [Hash] system information data
+      # @return [Boolean] true if successful
+      def save_info(info)
+        # Convert all keys to strings before saving to ensure consistent format
+        info_with_string_keys = convert_keys_to_strings(info)
+        safe_write_json(@info_file, info_with_string_keys)
+      end
+
+      # Load system information from storage
+      #
+      # @return [Hash] system information data or empty hash
+      def load_info
+        # Override the base class default to return {} instead of []
+        safe_operation("read JSON from #{@info_file}", {}) do
+          result = file_manager.read_json(@info_file)
+          result = {} if result.is_a?(Array) && result.empty?
+          # Convert string keys back to symbols for consistent access in the app
+          convert_keys_to_symbols(result)
+        end
+      end
+
+      # Refresh system information by collecting new data
+      #
+      # @return [Hash] refreshed system information
+      def refresh_info
+        log_info "Refreshing system information"
+
+        info = Services::SystemInfo::SystemInfoCollector.call
+        save_info(info)
+
+        log_info "System information refreshed successfully"
+        # Return the info with symbol keys for consistent access
+        convert_keys_to_symbols(info)
+      rescue StandardError => e
+        log_error "Failed to refresh system information: #{e.message}"
+
+        # Return cached info if available, otherwise empty hash with error
+        cached_info = load_info
+        cached_info.empty? ? { error: e.message } : cached_info
+      end
+
+      # Get cached system information with TTL support
+      #
+      # @param max_age [Integer] maximum age in seconds (default: from config)
+      # @return [Hash] cached or refreshed system information
+      def cached_info(max_age: nil)
+        max_age ||= Dbwatcher.configuration.system_info_cache_duration
+
+        info = load_info
+
+        # If no cached info exists, collect new data
+        return refresh_info if info.empty?
+
+        # Check if cached info is expired
+        if info_expired?(info, max_age)
+          log_info "System information cache expired, refreshing"
+          return refresh_info
+        end
+
+        log_info "Using cached system information"
+        info
+      rescue StandardError => e
+        log_error "Failed to get cached system information: #{e.message}"
+        { error: e.message }
+      end
+
+      # Check if system information is available
+      #
+      # @return [Boolean] true if system information exists
+      def info_available?
+        !load_info.empty?
+      rescue StandardError => e
+        log_error "Failed to check info availability: #{e.message}"
+        false
+      end
+
+      # Get system information age in seconds
+      #
+      # @return [Integer, nil] age in seconds or nil if not available
+      def info_age
+        info = load_info
+        return nil if info.empty? || !info[:collected_at]
+
+        collected_at = info[:collected_at]
+        current_time - Time.parse(collected_at)
+      rescue StandardError => e
+        log_error "Failed to get info age: #{e.message}"
+        nil
+      end
+
+      # Clear cached system information
+      #
+      # @return [Boolean] true if successful
+      def clear_cache
+        log_info "Clearing system information cache"
+        safe_delete_file(@info_file)
+      end
+
+      # Get system information summary for dashboard
+      #
+      # @return [Hash] summary information
+      # rubocop:disable Metrics/MethodLength
+      def summary
+        info = cached_info
+        return {} if info.empty? || info[:error]
+
+        {
+          hostname: dig_with_indifferent_access(info, :machine, :hostname),
+          os: dig_with_indifferent_access(info, :machine, :os, :name),
+          ruby_version: dig_with_indifferent_access(info, :runtime, :ruby_version),
+          rails_version: dig_with_indifferent_access(info, :runtime, :rails_version),
+          database_adapter: dig_with_indifferent_access(info, :database, :adapter, :name),
+          memory_usage: dig_with_indifferent_access(info, :machine, :memory, :usage_percent),
+          cpu_load: dig_with_indifferent_access(info, :machine, :load_average, "1min") ||
+            dig_with_indifferent_access(info, :machine, :cpu, :load_average, "1min") ||
+            dig_with_indifferent_access(info, :machine, :load, :one_minute),
+          active_connections: dig_with_indifferent_access(info, :database, :active_connections) ||
+            dig_with_indifferent_access(info, :database, :connection_pool, :connections),
+          collected_at: info[:collected_at],
+          collection_duration: info[:collection_duration]
+        }
+      rescue StandardError => e
+        log_error "Failed to get system info summary: #{e.message}"
+        {}
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      private
+
+      # Check if system information is expired
+      #
+      # @param info [Hash] system information data
+      # @param max_age [Integer] maximum age in seconds
+      # @return [Boolean] true if expired
+      def info_expired?(info, max_age)
+        collected_at = info[:collected_at]
+        return true unless collected_at
+
+        (current_time - Time.parse(collected_at)) > max_age
+      rescue StandardError => e
+        log_error "Failed to check info expiration: #{e.message}"
+        true # Assume expired on error
+      end
+
+      # Get current time, using Rails method if available
+      #
+      # @return [Time] current time
+      def current_time
+        defined?(Time.current) ? Time.current : Time.now
+      end
+
+      # Convert all hash keys to strings recursively
+      #
+      # @param hash [Hash] hash to convert
+      # @return [Hash] hash with string keys
+      def convert_keys_to_strings(hash)
+        return hash unless hash.is_a?(Hash)
+
+        hash.each_with_object({}) do |(key, value), result|
+          string_key = key.to_s
+          result[string_key] = if value.is_a?(Hash)
+                                 convert_keys_to_strings(value)
+                               elsif value.is_a?(Array)
+                                 value.map { |v| v.is_a?(Hash) ? convert_keys_to_strings(v) : v }
+                               else
+                                 value
+                               end
+        end
+      end
+
+      # Convert all hash keys to symbols recursively
+      #
+      # @param hash [Hash] hash to convert
+      # @return [Hash] hash with symbol keys
+      def convert_keys_to_symbols(hash)
+        return hash unless hash.is_a?(Hash)
+
+        hash.each_with_object({}) do |(key, value), result|
+          symbol_key = key.to_s.to_sym
+          result[symbol_key] = if value.is_a?(Hash)
+                                 convert_keys_to_symbols(value)
+                               elsif value.is_a?(Array)
+                                 value.map { |v| v.is_a?(Hash) ? convert_keys_to_symbols(v) : v }
+                               else
+                                 value
+                               end
+        end
+      end
+
+      # Safe access to nested hash values with indifferent access
+      #
+      # @param hash [Hash] hash to access
+      # @param keys [Array] keys to access
+      # @return [Object, nil] value or nil if not found
+      def dig_with_indifferent_access(hash, *keys)
+        return nil unless hash.is_a?(Hash)
+
+        current = hash
+        keys.each do |key|
+          key_sym = key.to_s.to_sym
+          key_str = key.to_s
+          return nil unless current.is_a?(Hash)
+
+          current = current[key_sym] || current[key_str]
+          return nil if current.nil?
+        end
+        current
+      end
+    end
+    # rubocop:enable Metrics/ClassLength
+  end
+end

data/lib/dbwatcher/storage.rb

@@ -9,6 +9,7 @@ require_relative "storage/session_storage"
 require_relative "storage/query_storage"
 require_relative "storage/table_storage"
 require_relative "storage/session_query"
+require_relative "storage/system_info_storage"
 require_relative "storage/api/base_api"
 require_relative "storage/api/query_api"
 require_relative "storage/api/table_api"
@@ -68,6 +69,16 @@ module Dbwatcher
         @tables ||= Api::TableAPI.new(table_storage)
       end
 
+      # Provides access to system information operations
+      #
+      # @return [SystemInfoStorage] system info storage instance
+      # @example
+      #   Dbwatcher::Storage.system_info.cached_info
+      #   Dbwatcher::Storage.system_info.refresh_info
+      def system_info
+        @system_info ||= SystemInfoStorage.new
+      end
+
       # Resets all cached storage instances (primarily for testing)
       #
       # This method clears all memoized storage instances, forcing them
@@ -80,6 +91,7 @@ module Dbwatcher
         @session_storage = nil
         @query_storage = nil
         @table_storage = nil
+        @system_info = nil
         @sessions = nil
         @queries = nil
         @tables = nil

data/lib/dbwatcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dbwatcher
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/dbwatcher.rb

@@ -13,12 +13,12 @@ require_relative "dbwatcher/logging"
 
 # Storage layer
 require_relative "dbwatcher/storage"
+require_relative "dbwatcher/middleware"
 
 # Tracking and SQL monitoring
 require_relative "dbwatcher/tracker"
 require_relative "dbwatcher/sql_logger"
 require_relative "dbwatcher/model_extension"
-require_relative "dbwatcher/middleware"
 
 # Base services
 require_relative "dbwatcher/services/base_service"
@@ -28,6 +28,12 @@ require_relative "dbwatcher/services/table_statistics_collector"
 require_relative "dbwatcher/services/dashboard_data_aggregator"
 require_relative "dbwatcher/services/query_filter_processor"
 
+# System info services
+require_relative "dbwatcher/services/system_info/machine_info_collector"
+require_relative "dbwatcher/services/system_info/database_info_collector"
+require_relative "dbwatcher/services/system_info/runtime_info_collector"
+require_relative "dbwatcher/services/system_info/system_info_collector"
+
 # General analyzers
 require_relative "dbwatcher/services/analyzers/session_data_processor"
 require_relative "dbwatcher/services/analyzers/table_summary_builder"
@@ -75,16 +81,24 @@ require_relative "dbwatcher/services/api/diagram_data_service"
 # Rails engine
 require_relative "dbwatcher/engine" if defined?(Rails)
 
+# DBWatcher module
 module Dbwatcher
   class Error < StandardError; end
 
   class << self
     attr_writer :configuration
 
+    # Get configuration
+    #
+    # @return [Configuration] configuration
     def configuration
       @configuration ||= Configuration.new
     end
 
+    # Configure DBWatcher
+    #
+    # @yield [configuration] configuration
+    # @return [Configuration] configuration
     def configure
       yield(configuration)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dbwatcher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Huy Nguyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-08 00:00:00.000000000 Z
+date: 2025-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -169,6 +169,7 @@ files:
 - app/assets/javascripts/dbwatcher/auto_init.js
 - app/assets/javascripts/dbwatcher/components/base.js
 - app/assets/javascripts/dbwatcher/components/changes_table_hybrid.js
+- app/assets/javascripts/dbwatcher/components/dashboard.js
 - app/assets/javascripts/dbwatcher/components/diagrams.js
 - app/assets/javascripts/dbwatcher/components/summary.js
 - app/assets/javascripts/dbwatcher/core/alpine_store.js
@@ -188,37 +189,36 @@ files:
 - app/assets/stylesheets/dbwatcher/components/_diagrams.scss
 - app/assets/stylesheets/dbwatcher/components/_forms.scss
 - app/assets/stylesheets/dbwatcher/components/_navigation.scss
+- app/assets/stylesheets/dbwatcher/components/_tabulator.scss
 - app/assets/stylesheets/dbwatcher/core/_base.scss
 - app/assets/stylesheets/dbwatcher/core/_variables.scss
+- app/assets/stylesheets/dbwatcher/vendor/_tabulator_overrides.scss
 - app/assets/stylesheets/dbwatcher/vendor/tabulator.min.css
 - app/controllers/dbwatcher/api/v1/sessions_controller.rb
+- app/controllers/dbwatcher/api/v1/system_info_controller.rb
 - app/controllers/dbwatcher/base_controller.rb
+- app/controllers/dbwatcher/dashboard/system_info_controller.rb
 - app/controllers/dbwatcher/dashboard_controller.rb
 - app/controllers/dbwatcher/queries_controller.rb
 - app/controllers/dbwatcher/sessions_controller.rb
 - app/controllers/dbwatcher/tables_controller.rb
 - app/helpers/dbwatcher/application_helper.rb
-- app/helpers/dbwatcher/component_helper.rb
 - app/helpers/dbwatcher/diagram_helper.rb
 - app/helpers/dbwatcher/formatting_helper.rb
 - app/helpers/dbwatcher/session_helper.rb
+- app/views/dbwatcher/dashboard/_layout.html.erb
+- app/views/dbwatcher/dashboard/_overview.html.erb
+- app/views/dbwatcher/dashboard/_system_info.html.erb
+- app/views/dbwatcher/dashboard/_system_info_content.html.erb
 - app/views/dbwatcher/dashboard/index.html.erb
 - app/views/dbwatcher/queries/index.html.erb
-- app/views/dbwatcher/sessions/_changes_tab.html.erb
-- app/views/dbwatcher/sessions/_diagrams_tab.html.erb
+- app/views/dbwatcher/sessions/_changes.html.erb
+- app/views/dbwatcher/sessions/_diagrams.html.erb
+- app/views/dbwatcher/sessions/_layout.html.erb
 - app/views/dbwatcher/sessions/_session_header.html.erb
-- app/views/dbwatcher/sessions/_summary_tab.html.erb
-- app/views/dbwatcher/sessions/_tab_navigation.html.erb
-- app/views/dbwatcher/sessions/changes.html.erb
-- app/views/dbwatcher/sessions/components/changes/_filters.html.erb
-- app/views/dbwatcher/sessions/components/changes/_table_list.html.erb
-- app/views/dbwatcher/sessions/diagrams.html.erb
+- app/views/dbwatcher/sessions/_summary.html.erb
 - app/views/dbwatcher/sessions/index.html.erb
-- app/views/dbwatcher/sessions/shared/_layout.html.erb
-- app/views/dbwatcher/sessions/shared/_navigation.html.erb
-- app/views/dbwatcher/sessions/shared/_session_header.html.erb
 - app/views/dbwatcher/sessions/show.html.erb
-- app/views/dbwatcher/sessions/summary.html.erb
 - app/views/dbwatcher/shared/_badge.html.erb
 - app/views/dbwatcher/shared/_data_table.html.erb
 - app/views/dbwatcher/shared/_header.html.erb
@@ -276,6 +276,10 @@ files:
 - lib/dbwatcher/services/mermaid_syntax/sanitizer.rb
 - lib/dbwatcher/services/mermaid_syntax_builder.rb
 - lib/dbwatcher/services/query_filter_processor.rb
+- lib/dbwatcher/services/system_info/database_info_collector.rb
+- lib/dbwatcher/services/system_info/machine_info_collector.rb
+- lib/dbwatcher/services/system_info/runtime_info_collector.rb
+- lib/dbwatcher/services/system_info/system_info_collector.rb
 - lib/dbwatcher/services/table_statistics_collector.rb
 - lib/dbwatcher/sql_logger.rb
 - lib/dbwatcher/storage.rb
@@ -300,6 +304,7 @@ files:
 - lib/dbwatcher/storage/session_operations.rb
 - lib/dbwatcher/storage/session_query.rb
 - lib/dbwatcher/storage/session_storage.rb
+- lib/dbwatcher/storage/system_info_storage.rb
 - lib/dbwatcher/storage/table_storage.rb
 - lib/dbwatcher/tracker.rb
 - lib/dbwatcher/version.rb

data/app/helpers/dbwatcher/component_helper.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Dbwatcher
-  module ComponentHelper
-    # Removed as part of API-first migration (Story 6.8)
-    # All data is now loaded directly from API endpoints
-
-    # Removed as part of API-first migration (Story 6.8)
-    # All data is now loaded directly from API endpoints
-
-    # Removed as part of API-first migration (Story 6.8)
-    # All data is now loaded directly from API endpoints
-
-    # Generate data attributes for component binding
-    def dbwatcher_component(component_name, config)
-      {
-        "data-dbwatcher" => component_name,
-        "data-config" => config.to_json
-      }
-    end
-
-    # Helper to render a DBWatcher component
-    def render_dbwatcher_component(component_name, config, html_options = {})
-      content_tag :div, dbwatcher_component(component_name, config).merge(html_options) do
-        yield if block_given?
-      end
-    end
-  end
-end