pwn 0.5.735 → 0.5.736

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f7823f226f8196c1c33bda916bb5ffde0d6ca22b0c47b3d7b5518ca85e9a8b
-  data.tar.gz: f069d75fa0a0e678aff23e9255cdd5ea13e4b3821a93fa6a1a0fd86e5648171c
+  metadata.gz: f20a2bcbd4611945405ce166826e978eabfe051ee9b1d5bc51ab07f9dde2e5d2
+  data.tar.gz: 894c5e39df14c75ce020427d0ea9294550b17dee242c728aaa1067fadfd1d683
 SHA512:
-  metadata.gz: 4795ce1673e60efc6919b72aa25cd0d1058a740234fdccb55efb104708d9940a32ca77d0f600195662dd543d5d20403435313d7c3746266d01fc761b3af8e4ae
-  data.tar.gz: 1fb653643bcd942b89a7e220009a5b05714950382f1598581bd859e8c2f8c9f64c5c60e37570a02d2c6d4e31831a8978dead7793766c529a48373fe6acd5b31b
+  metadata.gz: c512159a8249c30b3ae191d3e4d159d8f30da33b48dbc99fdb2d6e753c4811444f5db70492b8ca712a7dd26396818365c0940d225d9c9011247109a7cfd3a47f
+  data.tar.gz: 0a9bff32912c36b10baca436caf72a18f132f9f9e4779df8f823b0aa66f785e3c905473762b85953916dbc20b51bfcae1989697ed6a57282f2d9da1d114761de

data/lib/pwn/plugins/repl/mesh.rb

@@ -88,9 +88,10 @@ module PWN
               PWN.const_set(:MeshColors, [20, 23, 21])
               PWN.const_set(:MeshLastColor, 20)
 
-              mesh_tx_rows = 5
-              mesh_header_rows = 5
-              body_height = [Curses.lines - mesh_tx_rows - mesh_header_rows, 4].max
+              layout = PWN::Plugins::REPL.send(:mesh_layout, lines: Curses.lines, cols: Curses.cols)
+              mesh_tx_rows = layout[:tx]
+              mesh_header_rows = layout[:header]
+              body_height = layout[:body]
               rx_header_win = Curses::Window.new(mesh_header_rows, Curses.cols, 0, 0)
               rx_header_win.scrollok(false)
               rx_header_win.nodelay = true
@@ -111,14 +112,18 @@ module PWN
               frame.addstr(' CONVERSATION ')
               frame.refresh
               PWN.const_set(:MeshRxFrameWin, frame)
-              rx_body_win = Curses::Window.new(body_height - 2, Curses.cols - 4, body_start_row + 1, 2)
+              rx_body_win = Curses::Window.new(
+                [body_height - 2, 1].max,
+                [Curses.cols - 4, 1].max,
+                body_start_row + (body_height > 2 ? 1 : 0),
+                Curses.cols > 4 ? 2 : 0
+              )
               rx_body_win.scrollok(true)
               rx_body_win.nodelay = true
               rx_body_win.refresh
               PWN.const_set(:MeshRxBodyWin, rx_body_win)
 
-              tx_height = mesh_header_rows + body_height
-              tx_win = Curses::Window.new(mesh_tx_rows, Curses.cols, tx_height, 0)
+              tx_win = Curses::Window.new(mesh_tx_rows, Curses.cols, layout[:tx_top], 0)
               tx_win.scrollok(false)
               tx_win.nodelay = true
               PWN::Plugins::REPL.send(:mesh_box!, win: tx_win)
@@ -165,6 +170,41 @@ module PWN
             t == :auto ? PWN_MESH_TRANSPORTS.first : t
           end
 
+          # Row counts for header, CONVERSATION, and COMPOSE so the TUI fits the terminal.
+          def mesh_layout(opts = {})
+            lines = opts[:lines]
+            cols = opts[:cols]
+            lines = lines.nil? ? Curses.lines : Integer(lines)
+            cols = cols.nil? ? Curses.cols : Integer(cols)
+            lines = 1 if lines < 1
+            cols = 1 if cols < 1
+            header = 5
+            tx = 5
+            min_header = 3
+            min_tx = 3
+            min_body = 3
+            body = lines - header - tx
+            while body < min_body && header > min_header
+              header -= 1
+              body = lines - header - tx
+            end
+            while body < min_body && tx > min_tx
+              tx -= 1
+              body = lines - header - tx
+            end
+            body = [body, 1].max
+            overflow = header + body + tx - lines
+            body -= overflow if overflow.positive? && body > 1
+            body = 1 if body < 1
+            {
+              header: header,
+              body: body,
+              tx: tx,
+              cols: cols,
+              tx_top: header + body
+            }
+          end
+
           # Explicit Unicode avoids ACS falling back to ASCII on some terminals.
           def mesh_box!(opts = {})
             win = opts[:win]
@@ -1808,7 +1848,7 @@ module PWN
             false
           end
 
-          private :mesh_transport, :mesh_bound_transport, :mesh_box!, :mesh_mqtt_region, :mesh_mqtt_topic, :mesh_active_psks, :mesh_device_channel_meta, :mesh_device_channels
+          private :mesh_transport, :mesh_bound_transport, :mesh_layout, :mesh_box!, :mesh_mqtt_region, :mesh_mqtt_topic, :mesh_active_psks, :mesh_device_channel_meta, :mesh_device_channels
           private :mesh_radio_channel, :mesh_radio_index_for_name, :mesh_channel_name_for_index, :mesh_unassigned_slot_map, :mesh_psk_b64, :mesh_psk_same?, :mesh_env_channel_name_for_psk, :mesh_whitelist_name_for_index, :mesh_channel_name_from_topic, :mesh_link_label
           private :mesh_connect_one, :mesh_connect, :mesh_mqtt_tls?, :mesh_subscribe, :mesh_text_payload_max, :mesh_payload_fits?, :mesh_text_chunks, :mesh_tx_row_ready?, :mesh_wait_tx_slot, :mesh_send_text, :mesh_disconnect, :mesh_compose_send, :mesh_channel_names, :mesh_env_hash
           private :mesh_submit, :mesh_console_loop, :mesh_drain_events, :mesh_draw_input, :mesh_wrap_text, :mesh_ui_puts, :mesh_menu_root, :mesh_list_devices

data/lib/pwn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PWN
-  VERSION = '0.5.735'
+  VERSION = '0.5.736'
 end

data/spec/lib/pwn/plugins/repl_mesh_layout_spec.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe PWN::Plugins::REPL, 'mesh terminal layout' do
+  it 'keeps a 5-row header and 5-row compose on a 24-line terminal' do
+    layout = described_class.send(:mesh_layout, lines: 24, cols: 80)
+    expect(layout[:header]).to eq(5)
+    expect(layout[:tx]).to eq(5)
+    expect(layout[:body]).to eq(14)
+    expect(layout[:tx_top]).to eq(19)
+  end
+
+  it 'shrinks conversation so header, conversation and compose fit a 12-line terminal' do
+    layout = described_class.send(:mesh_layout, lines: 12, cols: 40)
+    expect(layout[:header] + layout[:body] + layout[:tx]).to eq(12)
+    expect(layout[:tx_top] + layout[:tx]).to eq(12)
+    expect(layout[:header]).to be >= 3
+    expect(layout[:tx]).to be >= 3
+    expect(layout[:body]).to be >= 3
+  end
+
+  it 'keeps compose on-screen on a 10-line terminal by shrinking conversation first' do
+    layout = described_class.send(:mesh_layout, lines: 10, cols: 40)
+    expect(layout[:header] + layout[:body] + layout[:tx]).to eq(10)
+    expect(layout[:tx_top]).to be < 10
+    expect(layout[:tx_top] + layout[:tx]).to eq(10)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwn
 version: !ruby/object:Gem::Version
-  version: 0.5.735
+  version: 0.5.736
 platform: ruby
 authors:
 - 0day Inc.
@@ -6915,6 +6915,7 @@ files:
 - spec/lib/pwn/plugins/repl_mesh_console_spec.rb
 - spec/lib/pwn/plugins/repl_mesh_dispatch_spec.rb
 - spec/lib/pwn/plugins/repl_mesh_dm_spec.rb
+- spec/lib/pwn/plugins/repl_mesh_layout_spec.rb
 - spec/lib/pwn/plugins/repl_mesh_rx_paint_spec.rb
 - spec/lib/pwn/plugins/repl_pwn_vault_spec.rb
 - spec/lib/pwn/plugins/repl_spec.rb