vanken 0.1.0 → 0.3.0

data/lib/vanken/ui/file_operations.rb

@@ -5,11 +5,13 @@ module Vanken
     module FileOperations
       CAPTURE_FILTERS = [{label: "Capture files", patterns: %w[*.pcapng *.pcap]}].freeze
 
+      def capture_filters = CAPTURE_FILTERS.map { |filter| filter.merge(label: t("キャプチャファイル")) }
+
       def open_dialog
         if @backend == :tui
-          path_dialog("ファイルを開く") { |path| open_file(path) }
+          path_dialog(t("ファイルを開く")) { |path| open_file(path) }
         else
-          paths = @window.prompt_for_paths(filters: CAPTURE_FILTERS)
+          paths = @window.prompt_for_paths(filters: capture_filters)
           open_file(paths.first) if paths && !paths.empty?
         end
       rescue StandardError => error
@@ -46,8 +48,8 @@ module Vanken
       def save_dialog(after: nil)
         return unless document
         path = @backend == :tui ? nil : @window.prompt_for_paths(save: true,
-          default_name: "capture.pcapng", filters: CAPTURE_FILTERS)&.first
-        return path_dialog("名前を付けて保存") { |value| save_file(value, after: after) } if @backend == :tui
+          default_name: "capture.pcapng", filters: capture_filters)&.first
+        return path_dialog(t("名前を付けて保存")) { |value| save_file(value, after: after) } if @backend == :tui
         save_file(path, after: after) if path
       rescue StandardError => error
         show_error(error)
@@ -77,28 +79,31 @@ module Vanken
       def reload_file = document&.source == :file && document.path && open_file(document.path)
 
       def request_destructive(&operation)
+        dismiss_dialog
         if @capture.running?
+          @dialog_reopen = -> { request_destructive(&operation) }
           @dialog_kind = :capturing
-          content = Zaniah::Div.new.gap(12).child(Zaniah::UI::Label.new("キャプチャを停止してから操作してください。"))
-            .child(Zaniah::UI::Button.new("停止").on_click do
+          content = Zaniah::Div.new.gap(12).child(Zaniah::UI::Label.new(t("キャプチャを停止してから操作してください。")))
+            .child(Zaniah::UI::Button.new(t("停止")).on_click do
               @capture.stop
               dismiss_dialog
               @app.executor.background { @capture.wait; @app.executor.post { request_destructive(&operation) unless @closing } }
             end)
-          @dialog = Zaniah::UI::Dialog.new(content, title: "キャプチャ中").test_id("vk.capture.confirm")
+          @dialog = Zaniah::UI::Dialog.new(content, title: t("キャプチャ中"), close_label: t("閉じる")).on_close { dismiss_dialog }.test_id("vk.capture.confirm")
           @window.request_frame
           return false
         end
         return operation.call unless document&.dirty?
+        @dialog_reopen = -> { request_destructive(&operation) }
         @pending_destructive = operation
         @dialog_kind = :unsaved
         content = Zaniah::Div.new.flex_col.gap(12)
-          .child(Zaniah::UI::Label.new("このキャプチャはまだ保存されていません。"))
+          .child(Zaniah::UI::Label.new(t("このキャプチャはまだ保存されていません。")))
           .child(Zaniah::Div.new.flex_row.gap(8)
-            .child(Zaniah::UI::Button.new("保存").test_id("vk.unsaved.save").on_click { save_dialog(after: @pending_destructive) })
-            .child(Zaniah::UI::Button.new("破棄", variant: :danger).test_id("vk.unsaved.discard").on_click { discard_changes })
-            .child(Zaniah::UI::Button.new("キャンセル", variant: :secondary).test_id("vk.unsaved.cancel").on_click { dismiss_dialog }))
-        @dialog = Zaniah::UI::Dialog.new(content, title: "キャプチャを保存しますか？", close_on_scrim: false).test_id("vk.unsaved")
+            .child(Zaniah::UI::Button.new(t("保存")).test_id("vk.unsaved.save").on_click { save_dialog(after: @pending_destructive) })
+            .child(Zaniah::UI::Button.new(t("破棄"), variant: :danger).test_id("vk.unsaved.discard").on_click { discard_changes })
+            .child(Zaniah::UI::Button.new(t("キャンセル"), variant: :secondary).test_id("vk.unsaved.cancel").on_click { dismiss_dialog }))
+        @dialog = Zaniah::UI::Dialog.new(content, title: t("キャプチャを保存しますか？"), close_on_scrim: false, close_label: t("閉じる")).on_close { dismiss_dialog }.test_id("vk.unsaved")
         @window.request_frame
         false
       end

data/lib/vanken/ui/filter_operations.rb

@@ -42,7 +42,7 @@ module Vanken
             message = program.warnings.join("\n")
           rescue Core::DisplayFilter::SyntaxError => error
             status = :error
-            message = "#{error.message} (位置 #{error.position + 1})"
+            message = t("%{message} (位置 %{position})", message: error.message, position: error.position + 1)
           end
           @app.executor.post do
             @filter_field.status(status, message: message) if generation == @filter_generation && !@closing
@@ -51,6 +51,7 @@ module Vanken
       end
 
       def apply_filter
+        cancel_packet_search
         doc = document
         return unless doc
         expression = @filter_field.value
@@ -60,7 +61,7 @@ module Vanken
         @packet_source.reset
         @window.request_frame
       rescue Core::DisplayFilter::SyntaxError => error
-        @filter_field.status(:error, message: "#{error.message} (位置 #{error.position + 1})")
+        @filter_field.status(:error, message: t("%{message} (位置 %{position})", message: error.message, position: error.position + 1))
       end
       def initial_filter(text)
         set_filter(text)
@@ -85,25 +86,51 @@ module Vanken
         set_filter(expression)
         apply_filter unless prepare
       end
-      def selection_menu(expression)
-        return Zaniah::Menu.new([]) unless expression
-        %i[filter prepare].each do |kind|
-          %i[selected not and and_not or or_not].each do |mode|
-            name = :"#{kind}_#{mode}"
-            @app.actions.register(:"context_#{name}", title: @app.actions.command(name).title) do
-              filter_from_expression(expression, mode, prepare: kind == :prepare)
+      def selection_menu(expression, number: selected_number)
+        filters = Zaniah::Menu.new([])
+        if expression
+          %i[filter prepare].each do |kind|
+            %i[selected not and and_not or or_not].each do |mode|
+              name = :"#{kind}_#{mode}"
+              @app.actions.register(:"context_#{name}", title: @app.actions.command(name).title) do
+                filter_from_expression(expression, mode, prepare: kind == :prepare)
+              end
             end
           end
+          @app.actions.register(:context_copy_filter, title: t("フィルタとしてコピー")) { copy_text(expression) }
+          ui = self
+          filters = Zaniah::Menu.build do
+            submenu(ui.t("フィルタとして適用")) { %i[selected not and and_not or or_not].each { |mode| item(:"context_filter_#{mode}") } }
+            submenu(ui.t("フィルタを準備")) { %i[selected not and and_not or or_not].each { |mode| item(:"context_prepare_#{mode}") } }
+            item(:context_copy_filter)
+          end
+        end
+        Zaniah::Menu.new(filters.items + packet_context_menu(number).items)
+      end
+
+      def packet_context_menu(number)
+        doc = document
+        return Zaniah::Menu.new([]) unless doc && number.is_a?(Integer) && number.between?(1, doc.count)
+        enabled = ->(*) { document.equal?(doc) }
+        {
+          context_mark_packet: [:marked, :toggle_mark, "マーク", "マークを解除"],
+          context_ignore_packet: [:ignored, :toggle_ignore, "無視", "無視を解除"],
+          context_time_reference: [:time_references, :toggle_time_reference, "時刻基準にする", "時刻基準を解除"]
+        }.each do |action, (state, operation, label, clear_label)|
+          @app.actions.register(action, title: t(doc.public_send(state).include?(number) ? clear_label : label), enabled: enabled) do
+            update_packet_state(operation, number: number) if enabled.call
+          end
+        end
+        stream_enabled = ->(*) { enabled.call && doc.annotations[number][:tcp_stream] >= 0 }
+        @app.actions.register(:context_follow_tcp_stream, title: t("TCP ストリームを追跡"), enabled: stream_enabled) do
+          follow_tcp_stream(doc.annotations[number][:tcp_stream]) if stream_enabled.call
         end
-        @app.actions.register(:context_copy_filter, title: "フィルタとしてコピー") { copy_text(expression) }
         Zaniah::Menu.build do
-          submenu("フィルタとして適用") { %i[selected not and and_not or or_not].each { |mode| item(:"context_filter_#{mode}") } }
-          submenu("フィルタを準備") { %i[selected not and and_not or or_not].each { |mode| item(:"context_prepare_#{mode}") } }
-          item(:context_copy_filter)
+          %i[context_mark_packet context_ignore_packet context_time_reference context_follow_tcp_stream].each { |action| item(action) }
         end
       end
       def bookmark_filter
-        path_dialog("フィルタの名前") do |name|
+        path_dialog(t("フィルタの名前")) do |name|
           @preferences.bookmark(name, @filter_field.value) unless name.empty?
           dismiss_dialog
         end
@@ -113,7 +140,8 @@ module Vanken
         content = Zaniah::Div.new.flex_col.gap(4).children(items.first(60).map do |label, expression|
           Zaniah::UI::Button.new(label, variant: :ghost).on_click { set_filter(expression); apply_filter; dismiss_dialog }
         end)
-        show_dialog(:history, "表示フィルタ", content)
+        content.child(Zaniah::UI::Label.new(t("フィルタ履歴はまだありません。"), tone: :muted)) if items.empty?
+        show_dialog(:history, t("表示フィルタ"), content, reopen: -> { filter_history })
       end
     end
   end

data/lib/vanken/ui/main_view.rb

@@ -1,34 +1,55 @@
 # frozen_string_literal: true
 
+require_relative "../config/columns"
+
 module Vanken
   module UI
     class MainView < Zaniah::UI::Component
-      COLUMNS = [[:no, "No.", 64], [:time, "Time", 128], [:source, "Source", 164],
-        [:destination, "Destination", 164], [:protocol, "Protocol", 90], [:length, "Length", 76], [:info, "Info", 560]].freeze
+      COLUMNS = Config::Columns::BUILTINS
+
+      class ExpertBadge < Zaniah::UI::Badge
+        def initialize(label, variant:, &activate)
+          super(label, variant: variant)
+          @label, @activate = label, activate
+        end
+        def build(cx)
+          super.cursor(:pointer).on_click { @activate.call }
+            .focusable(context: {in_button: true}) { |action| action == :activate && (@activate.call; true) }
+        end
+        def accessibility_node(_cx) = node(:button, label: @label, actions: [:press])
+        def accessibility_action(_node, action) = action == :press && (@activate.call; true)
+      end
 
       def initialize(ui)
         super()
         @ui = ui
-        columns = COLUMNS.map { |key, label, width| {key: key, label: label, width: width, align: %i[no time length].include?(key) ? :end : :start} }
-        saved = ui.preferences.get("layout.columns")
-        unless saved.empty?
-          columns = columns.sort_by { |column| saved.index { |item| item["key"] == column[:key].to_s } || columns.size }.map do |column|
-            value = saved.find { |item| item["key"] == column[:key].to_s }
-            value ? column.merge(width: value["width"], visible: value["visible"]) : column
-          end
+        @filter_container = Zaniah::Div.new.flex_1.focusable(context: {in_display_filter: true}).child(ui.filter_field)
+        @menu_bar = Zaniah::UI::MenuBar.from(ui.app.menu_bar)
+        settings = ui.respond_to?(:column_settings) ? ui.column_settings : Config::Columns.load(directory: ui.preferences.directory, legacy: ui.preferences.get("layout.columns"))
+        columns = settings.table_columns.map do |column|
+          default = COLUMNS.find { |key, *_| key == column[:key] }
+          default && column[:label] == default[1] ? column.merge(label: text(column[:label])) : column
         end
-        table = Zaniah::UI::VirtualTable.new(ui.packet_source, columns: columns, follow_tail: ui.autoscroll?)
+        ui.document.custom_columns = settings.custom if ui.document
+        table = Zaniah::UI::VirtualTable.new(ui.packet_source, columns: columns, follow_tail: ui.autoscroll?, label: text("パケット一覧"))
           .test_id("vk.packet_list").on_select { |index, *_| number = ui.packet_source.row_id(index); ui.select_packet(number) if number.is_a?(Integer) }
           .on_sort { |key, direction, _| ui.document&.sort(key, direction) }
-          .on_columns_change { |items, _| ui.preferences.set("layout.columns", items.map { |item| {"key" => item[:key].to_s, "width" => item[:width], "visible" => item[:visible]} }) }
-        tree = Zaniah::UI::TreeView.new([]).test_id("vk.packet_details").on_select { |node, *_| ui.select_detail(node) }
-          .on_context_menu { |node, _| ui.selection_menu(node.filter) }
+          .on_columns_change do |items, _|
+            if ui.respond_to?(:persist_columns_layout)
+              ui.persist_columns_layout(items)
+            else
+              settings.update_layout(items)
+              settings.save(ui.preferences.directory)
+            end
+          end
+        tree = Zaniah::UI::TreeView.new([], label: text("パケット詳細")).test_id("vk.packet_details").on_select { |node, *_| ui.select_detail(node) }
+          .on_context_menu { |node, _| ui.respond_to?(:field_menu) ? ui.field_menu(node) : ui.selection_menu(node.filter) }
         table.on_row_context_menu do |index, _|
           number = ui.packet_source.row_id(index)
           table.select(index) if number.is_a?(Integer)
-          ui.selection_menu(number.is_a?(Integer) ? "frame.number == #{number}" : nil)
+          ui.selection_menu(number.is_a?(Integer) ? "frame.number == #{number}" : nil, number: number.is_a?(Integer) ? number : nil)
         end
-        hex = Zaniah::UI::HexView.new("".b).test_id("vk.packet_bytes").on_select { |range, _| ui.select_bytes(range) }
+        hex = Zaniah::UI::HexView.new("".b).accessibility_label(text("パケットバイト")).test_id("vk.packet_bytes").on_select { |range, _| ui.select_bytes(range) }
           .on_copy { |range, _| ui.copy_text(ui.selected_bytes.byteslice(range).unpack1("H*").scan(/../).join(" ")) }
         ui.install_panes(table, tree, hex)
         ratios = ui.preferences.get("layout.ratios")
@@ -39,6 +60,7 @@ module Vanken
       end
 
       def build(cx)
+        @previous_buttons, @buttons = @buttons || {}, {}
         ui = @ui
         doc = ui.document
         doc.frame_latency = cx.window.frame_stats.fetch(:frame_ms, 0) / 1000 if doc
@@ -53,7 +75,7 @@ module Vanken
           @heights = heights
         end
         root = Zaniah::Div.new.w_full.h_full.flex_col.bg(cx.theme.colors.background)
-        root.child(Zaniah::UI::MenuBar.from(ui.app.menu_bar)) unless RUBY_PLATFORM.include?("darwin") && ui.native?
+        root.child(@menu_bar) unless RUBY_PLATFORM.include?("darwin") && ui.native?
         toolbar_items = [
           button("開く", "vk.open") { ui.open_dialog },
           button("保存", "vk.save", disabled: !doc) { ui.save_dialog },
@@ -63,13 +85,22 @@ module Vanken
         if doc&.loading? && doc.source == :file
           toolbar_items << button("読み込みを中止", "vk.file.cancel") { doc.cancel }
         end
-        root.child(Zaniah::UI::Toolbar.new(*toolbar_items))
+        root.child(Zaniah::UI::Toolbar.new(*toolbar_items).accessibility_label(text("キャプチャ操作")))
         root.child(Zaniah::Div.new.flex_row.items_center.gap(6).p([4, 8])
-          .child(Zaniah::Div.new.flex_1.focusable(context: {in_display_filter: true}).child(ui.filter_field)).child(button("適用", "vk.filter.apply", disabled: !doc) { ui.apply_filter })
+          .child(@filter_container).child(button("適用", "vk.filter.apply", disabled: !doc) { ui.apply_filter })
           .child(button("クリア", "vk.filter.clear") { ui.clear_filter })
           .child(button("履歴", "vk.filter.history") { ui.filter_history }))
         root.child(doc ? @split.flex_1 : welcome(cx).flex_1)
-        root.child(Zaniah::UI::StatusBar.new(Zaniah::UI::Label.new(ui.status_text, size: :xs)).test_id("vk.status"))
+        status = [Zaniah::UI::Label.new(ui.status_text, size: :xs).flex_1]
+        summary = doc.respond_to?(:expert_summary) ? doc.expert_summary : nil
+        if summary && summary[:count].positive?
+          severity = %w[note note warning error].fetch(summary[:severity])
+          caption = {"note" => "注記", "warning" => "警告", "error" => "エラー"}.fetch(severity)
+          badge = ExpertBadge.new("#{text(caption)}: #{summary[:count]}", variant: {"note" => :neutral, "warning" => :warning, "error" => :danger}.fetch(severity)) { ui.expert_info }
+            .test_id("vk.expert.badge")
+          status << badge
+        end
+        root.child(Zaniah::UI::StatusBar.new(*status).test_id("vk.status"))
         root.child(ui.dialog) if ui.dialog
         root.on_drop(types: ["text/uri-list"]) do |event, _|
           event.content.formats.fetch("text/uri-list", "").each_line do |line|
@@ -90,23 +121,37 @@ module Vanken
 
       private
 
-      def pane(title, body) = Zaniah::Div.new.w_full.h_full.flex_col.child(Zaniah::UI::Label.new(title, size: :xs, tone: :muted).p([4, 8])).child(body)
-      def button(label, id, disabled: false, &block) = Zaniah::UI::Button.new(label, size: :sm, variant: :secondary).disabled(disabled).test_id(id).on_click(&block)
-      def welcome(_cx)
+      def text(value) = @ui.respond_to?(:t) ? @ui.t(value) : value
+      def pane(title, body) = Zaniah::Div.new.w_full.h_full.flex_col.child(Zaniah::UI::Label.new(text(title), size: :xs, tone: :muted).p([4, 8])).child(body)
+      def button(label, id, disabled: false, size: :sm, variant: :secondary, &block)
+        caption = text(label)
+        key = [id, caption, size, variant]
+        @buttons[key] = (@previous_buttons[key] || Zaniah::UI::Button.new(caption, size: size, variant: variant).test_id(id)).disabled(disabled).on_click(&block)
+      end
+      def welcome(cx)
         content = Zaniah::Div.new.flex_col.p(24).gap(12).test_id("vk.welcome")
           .child(Zaniah::UI::Label.new("Vanken", size: :xl))
-          .child(Zaniah::UI::Label.new("パケットキャプチャを開くか、インタフェースを選択してキャプチャを開始します。", tone: :muted, wrap: :word))
-          .child(Zaniah::UI::Button.new("キャプチャファイルを開く").on_click { @ui.open_dialog })
-          .child(Zaniah::UI::Button.new("インタフェースを選択").on_click { @ui.capture_options })
+          .child(Zaniah::UI::Label.new(text("パケットキャプチャを開くか、インタフェースを選択してキャプチャを開始します。"), tone: :muted, wrap: :word))
+          .child(button("キャプチャファイルを開く", "vk.welcome.open", size: :md, variant: :primary) { @ui.open_dialog })
+          .child(button("インタフェースを選択", "vk.welcome.capture", size: :md, variant: :primary) { @ui.capture_options })
         @ui.preferences.recent_files.first(10).each do |path|
-          content.child(Zaniah::UI::Button.new(path, size: :sm, variant: :ghost).on_click { @ui.open_file(path) })
+          content.child(button(path, "vk.recent.#{path}", variant: :ghost) { @ui.open_file(path) })
         end
         (@ui.interface_infos || []).each do |info|
           name = info.fetch(:name)
-          content.child(Zaniah::UI::Button.new("#{name}  #{info[:description]}", size: :sm, variant: :ghost)
-            .on_click { @ui.capture_options(interface: name) })
+          traffic = @ui.respond_to?(:interface_traffic) ? (@ui.interface_traffic || {}) : {}
+          values = (traffic[:history] || {}).fetch(name, [])
+          values = [0] if values.empty?
+          rate = (traffic[:rates] || {}).fetch(name, 0)
+          row = Zaniah::Div.new.flex_row.items_center.gap(8)
+            .child(button("#{name}  #{info[:description]}", "vk.interface.#{name}", variant: :ghost) { @ui.capture_options(interface: name) }.flex_1)
+            .child(Zaniah::UI::Sparkline.new(values, width: 100, height: 24, label: "#{name} #{text('トラフィック')}").test_id("vk.interface.traffic.#{name}"))
+            .child(Zaniah::UI::Label.new("#{rate} B/s", size: :xs, tone: :muted))
+          content.child(row)
         end
-        content
+        @welcome_scroll ||= Zaniah::ScrollView.new
+        @welcome_scroll.children.clear
+        @welcome_scroll.h([cx.window.content_size.height - 132, 120].max).child(content)
       end
     end
   end

data/lib/vanken/ui/navigation_operations.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Vanken
+  module UI
+    module NavigationOperations
+      def mark_packet = update_packet_state(:toggle_mark)
+      def ignore_packet = update_packet_state(:toggle_ignore)
+      def time_reference = update_packet_state(:toggle_time_reference)
+      def mark_all_displayed = update_packet_state(:mark_all_displayed, selected: false)
+      def unmark_all = update_packet_state(:unmark_all, selected: false)
+      def prev_in_conversation = navigate_conversation(-1)
+      def next_in_conversation = navigate_conversation(1)
+
+      def find_packet
+        mode = @search_mode || :filter
+        target = @search_target || :bytes
+        field = Zaniah::UI::TextField.new(@search_query || "", label: t("検索内容")).test_id("vk.search.query")
+        modes = Zaniah::UI::SegmentedControl.new([[t("表示フィルタ"), :filter], [t("16 進"), :hex], [t("文字列"), :string], [t("正規表現"), :regex]], value: mode, label: t("検索形式"))
+          .on_change { |value, *_| mode = value }.test_id("vk.search.mode")
+        targets = Zaniah::UI::Select.new([[t("パケット一覧"), :list], [t("パケット詳細"), :details], [t("パケットバイト"), :bytes]], label: t("検索対象"), value: target)
+          .on_change { |value, *_| target = value }.test_id("vk.search.target")
+        content = Zaniah::Div.new.flex_col.gap(12).child(modes).child(targets).child(field)
+          .child(Zaniah::Div.new.flex_row.gap(8)
+            .child(Zaniah::UI::Button.new(t("次を検索")).test_id("vk.search.next").on_click { search_packets(field.value, mode: mode, target: target) })
+            .child(Zaniah::UI::Button.new(t("前を検索"), variant: :secondary).on_click { search_packets(field.value, mode: mode, target: target, direction: -1) })
+            .child(Zaniah::UI::Button.new(t("キャンセル"), variant: :secondary).on_click { cancel_packet_search; dismiss_dialog }))
+        show_dialog(:search, t("パケット検索"), content, reopen: -> { @search_query, @search_mode, @search_target = field.value, mode, target; find_packet })
+      end
+
+      def search_result_dialog
+        show_dialog(:search_result, t("パケット検索"), Zaniah::UI::Label.new(t("一致するパケットはありません。"), wrap: :word), reopen: -> { search_result_dialog })
+      end
+
+      def find_next = repeat_packet_search(1)
+      def find_prev = repeat_packet_search(-1)
+      def cancel_packet_search
+        @search_generation = (@search_generation || 0) + 1
+        document&.cancel_search
+      end
+
+      def search_packets(query, mode: :filter, target: :bytes, direction: 1)
+        doc = document
+        return unless doc
+        cancel_packet_search
+        generation = @search_generation
+        @search_query, @search_mode, @search_target = query, mode, target
+        doc.search(query, mode: mode, target: target, from: selected_number, direction: direction) do |number, error|
+          @app.executor.post do
+            next unless !@closing && generation == @search_generation && document.equal?(doc)
+            if error
+              show_error(error)
+            elsif number
+              select_found_packet(number)
+            else
+              search_result_dialog
+            end
+          end
+        end
+        dismiss_dialog if @dialog_kind == :search
+      rescue StandardError => error
+        show_error(error)
+      end
+
+      private
+      def repeat_packet_search(direction)
+        @search_query && !@search_query.empty? ? search_packets(@search_query, mode: @search_mode, target: @search_target, direction: direction) : find_packet
+      end
+      def select_found_packet(number)
+        index = document&.displayed_index(number)
+        return unless index
+        @table.select(index)
+        @table.scroll_to(index, align: :center)
+      end
+      def navigate_conversation(direction)
+        number = document&.conversation_neighbor(selected_number, direction)
+        select_found_packet(number) if number
+      end
+      def update_packet_state(operation, selected: true, number: selected_number)
+        return unless document && (!selected || number)
+        selected ? document.public_send(operation, number) : document.public_send(operation)
+        @packet_source.reset
+        @window.request_frame
+      end
+    end
+  end
+end

data/lib/vanken/ui/packet_source.rb

@@ -40,6 +40,14 @@ module Vanken
 
       def count = @count
       def packet_count = @packet_count
+      def invalidate_rows(numbers)
+        @generation += 1
+        @pending, @requests = {}, {}
+        @batch_scheduled = false
+        @refresh_pending = @refresh_again = nil
+        numbers.each { |number| @rows.delete(number) }
+        @ui.window.request_frame
+      end
       def row_id(index)
         return [:pending, index] unless index.is_a?(Integer) && index.between?(0, @count - 1)
         @numbers[index] ||= @document.number_at(index)
@@ -51,7 +59,21 @@ module Vanken
         text = value(index, key)
         return nil if text.nil?
         theme = @ui.app.global(:theme)
-        Zaniah::Text.new(text.to_s, font: @ui.monospace_font, size: theme.typography.size_sm, color: theme.colors.text)
+        colors = row_style(index)
+        Zaniah::Text.new(text.to_s, font: @ui.monospace_font, size: theme.typography.size_sm, color: colors.fetch(:foreground, theme.colors.text))
+      end
+      def row_style(index)
+        number = row_id(index)
+        return {} unless number.is_a?(Integer)
+        if @ui.table.respond_to?(:selection) && @ui.table.selection.include?(number)
+          theme = @ui.app.global(:theme)
+          return {foreground: theme.colors.text, strikethrough: @document.ignored.include?(number)}
+        end
+        if @document.ignored.include?(number)
+          return {foreground: @ui.app.global(:theme).colors.text_muted, strikethrough: true}
+        end
+        return {foreground: Zaniah::Color.parse("#ffffff"), background: Zaniah::Color.parse("#000000")} if @document.marked.include?(number)
+        @rows[number]&.fetch(:style, {}) || {}
       end
       def value(index, key)
         number = row_id(index)
@@ -139,7 +161,17 @@ module Vanken
       def row_values(document, number, index, format, precision, previous = :current)
         row = document.row(number)
         values = row.slice(:source, :destination, :protocol, :length, :info).transform_values(&:to_s)
+        if @ui.respond_to?(:resolve_address)
+          %i[source destination].each do |key|
+            values[key] = @ui.resolve_address(values[key], document: document, number: number)
+          end
+        end
+        values.merge!(row.select { |key, _| key.to_s.start_with?("field:") })
         values[:time] = format_time(document, row, number, index, format, precision, previous)
+        if @ui.respond_to?(:coloring_enabled?) && @ui.coloring_enabled?
+          colors = @ui.coloring_rules.match(document.view(number), theme: @ui.app.global(:theme).name) || {}
+          values[:style] = colors.transform_values { |color| Zaniah::Color.parse(color) }
+        end
         values
       rescue StandardError
         nil

data/lib/vanken/ui/selection.rb

@@ -8,6 +8,10 @@ module Vanken
         return unless doc && number.is_a?(Integer) && number.between?(1, doc.count)
         @selection_generation += 1
         generation = @selection_generation
+        expanded = @pending_tree_expansion ||= @tree.expanded.dup
+        update { |state| state.merge!(number: number, node: nil, details: [], bytes: "".b) }
+        @tree.replace([])
+        @hex.bytes = "".b
         @app.executor.background do
           nodes = doc.details(number)
           bytes = doc.store.read(number).bytes
@@ -15,6 +19,8 @@ module Vanken
             next unless generation == @selection_generation && document.equal?(doc)
             update { |state| state.merge!(number: number, node: nil, details: nodes, bytes: bytes) }
             @tree.replace(nodes)
+            expanded.each { |id| @tree.expand(id) }
+            @pending_tree_expansion = nil
             @hex.bytes = bytes
           end
         rescue StandardError => error
@@ -65,10 +71,10 @@ module Vanken
         @table.scroll_to(document.displayed_count - 1)
       end
       def go_to_packet
-        path_dialog("パケットへ移動") do |value|
+        path_dialog(t("パケットへ移動")) do |value|
           number = Integer(value, 10)
           index = document&.display_numbers&.index(number)
-          raise Vanken::Error, "指定したパケットは表示されていません" unless index
+          raise Vanken::Error, t("指定したパケットは表示されていません") unless index
           @table.select(index)
           @table.scroll_to(index, align: :center)
           dismiss_dialog