termfront 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6d91fa7b7758b2151fc31bb9f7862dbda3ad311edea638aa9b11ca50a8b9a8d
-  data.tar.gz: 3a8ce081de76ddd04c45949c490ba4b513f42eb94eb39fce37fef292abdbb004
+  metadata.gz: 5396a2b08e03e482e2e5c8015a05399380e9e95ccee69389ca3969d41f3a1061
+  data.tar.gz: 9899861875106c3edb5db94f3b046abe1759168674e8223d5ee73ec7a943e22b
 SHA512:
-  metadata.gz: a79ab596683eea6f8914c17cf88ad000d7a1b33453820526310f25fd43dbabb1f21e6f65f16a390fa92e491d6cd2da86e981c17bc971161316a6d4f7b431c98a
-  data.tar.gz: 556667b34ba430c7af848fca7d31f5937e24d328480a29a3191db88ca4286d579081b0f6e18c34622d87cb9ea401c20e19da6aaf0a6fbc2b892f15fdbb9f7b76
+  metadata.gz: 2637febc2bf4863cf446692a837622353084558ee15c385e5d81081aeb022b791decce8c52f5a2a000e085e828a425bb7e78d815f503b4d54ae9c4104cbb69f7
+  data.tar.gz: ee9d71def5cbb215ff4a83573cfe665acd033ce9c8fc3a99d1a501e74f91f37a7765f57aafedf81cb5887bdb08d0714eb6ebcaba2fd7065736d19b85f73d4445

data/CHANGELOG.md

@@ -6,6 +6,22 @@ The format is based on Keep a Changelog, and this project follows Semantic Versi
 
 ## [Unreleased]
 
+## [0.1.9] - 2026-05-28
+
+### Changed
+
+- Move the TLS handshake off the multiplayer server's accept loop. `OpenSSL::SSL::SSLServer#start_immediately` is now `false`, so `accept` returns as soon as the TCP accept completes and the `SSLSocket#accept` handshake runs inside the per-connection thread under a new `TLS_HANDSHAKE_TIMEOUT` deadline (5 s). Previously every TLS handshake — the RSA private-key operation, the cert-chain bytes, and any network waits — ran serially on the single accept-loop thread, so a synchronized join of N players took roughly N × per-handshake-time before the last one was usable; a stalled mid-handshake client also blocked every other pending connection (head-of-line blocking at the TLS layer). With the handshake hoisted into its own thread, connections only contend on the GVL for the actual CPU work, a slow client only blocks itself, and `configure_client` is applied before the handshake so TCP_NODELAY is in effect for the handshake's own small records
+
+## [0.1.8] - 2026-05-26
+
+### Fixed
+
+- Stop the `AudioManager` BGM and looping-SE threads from spinning at 100 % CPU when the audio player spawns but exits immediately (e.g. no usable audio device, codec missing, or backend not running). The non-looping playback loops now bail out if `spawn_player` returns `nil` or if the previous playback finished in under 500 ms, instead of relentlessly respawning a process that never plays anything. On a tester's CPU-bound host this was over 95 % of the process's CPU budget, making the renderer look heavy when the real culprit was the audio thread
+
+### Changed
+
+- Adapt the in-game render rate to the host's headroom: an `AdaptiveRenderRate` module tracks how often a frame exceeds 85 % of the 60 Hz budget and, after 30 consecutive over-budget frames, downshifts the singleplayer / Wavesfight render rate to 30 Hz; if the host catches back up for 60 consecutive frames it upshifts back to 60 Hz. Capable machines keep running at 60 Hz, while testers on lower-spec CPUs / TDP-throttled laptops fall back to a steady 30 Hz instead of a stuttering 60 Hz, and the rate resets on every new game loop entry so a freshly launched match starts at 60 Hz
+
 ## [0.1.7] - 2026-05-26
 
 ### Changed

data/lib/termfront/adaptive_render_rate.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Termfront
+  module AdaptiveRenderRate
+    OVER_BUDGET_RATIO  = 0.85
+    UNDER_BUDGET_RATIO = 0.5
+    DOWNSHIFT_FRAMES   = 30
+    UPSHIFT_FRAMES     = 60
+
+    @current_dt = Config::RENDER_DT
+    @over_budget_count = 0
+    @under_budget_count = 0
+
+    class << self
+      def current_dt
+        @current_dt
+      end
+
+      def observe(spent)
+        if spent > Config::FRAME_DT * OVER_BUDGET_RATIO
+          @over_budget_count += 1
+          @under_budget_count = 0
+          if @over_budget_count >= DOWNSHIFT_FRAMES && @current_dt < Config::RENDER_DT_LOW
+            @current_dt = Config::RENDER_DT_LOW
+          end
+        elsif spent < Config::FRAME_DT * UNDER_BUDGET_RATIO
+          @under_budget_count += 1
+          @over_budget_count = 0
+          if @under_budget_count >= UPSHIFT_FRAMES && @current_dt > Config::RENDER_DT
+            @current_dt = Config::RENDER_DT
+          end
+        end
+      end
+
+      def reset!
+        @current_dt = Config::RENDER_DT
+        @over_budget_count = 0
+        @under_budget_count = 0
+      end
+    end
+  end
+end

data/lib/termfront/audio_manager.rb

@@ -41,9 +41,13 @@ module Termfront
             loop do
               break if channel_stopped?(:bgm)
 
+              start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
               @bgm_pid = spawn_player(@bgm_player, path, loop_playback: false)
+              break unless @bgm_pid
+
               wait_for_channel(:bgm)
               break if channel_stopped?(:bgm)
+              break if Process.clock_gettime(Process::CLOCK_MONOTONIC) - start < 0.5
             end
           end
         rescue StandardError
@@ -101,9 +105,13 @@ module Termfront
             loop do
               break if channel_stopped?(:loop_se)
 
+              start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
               @loop_se_pid = spawn_player(@loop_se_player, path, loop_playback: false)
+              break unless @loop_se_pid
+
               wait_for_channel(:loop_se)
               break if channel_stopped?(:loop_se)
+              break if Process.clock_gettime(Process::CLOCK_MONOTONIC) - start < 0.5
             end
           end
         rescue StandardError

data/lib/termfront/config.rb

@@ -4,6 +4,7 @@ module Termfront
   module Config
     FRAME_DT      = 1.0 / 60.0
     RENDER_DT     = 1.0 / 60.0
+    RENDER_DT_LOW = 1.0 / 30.0
     MAX_DT        = 1.0 / 20.0
     FOV           = 66.0 * Math::PI / 180.0
     PLAYER_RADIUS = 0.2

data/lib/termfront/game.rb

@@ -130,9 +130,10 @@ module Termfront
     end
 
     def run_game_loop(show_complete_banner: true)
+      AdaptiveRenderRate.reset!
       STDIN.raw do |stdin|
         last_time = clock
-        last_render = last_time - Config::RENDER_DT
+        last_render = last_time - AdaptiveRenderRate.current_dt
 
         loop do
           now = clock
@@ -149,7 +150,7 @@ module Termfront
           end
 
           update(dt)
-          if now - last_render >= Config::RENDER_DT
+          if now - last_render >= AdaptiveRenderRate.current_dt
             @renderer.render(
               player: @player, map: @map,
               enemies: @enemies, projectiles: @projectiles,
@@ -180,9 +181,10 @@ module Termfront
     end
 
     def run_wavesfight_loop
+      AdaptiveRenderRate.reset!
       STDIN.raw do |stdin|
         last_time = clock
-        last_render = last_time - Config::RENDER_DT
+        last_render = last_time - AdaptiveRenderRate.current_dt
 
         loop do
           now = clock
@@ -199,7 +201,7 @@ module Termfront
           end
 
           update(dt)
-          if now - last_render >= Config::RENDER_DT
+          if now - last_render >= AdaptiveRenderRate.current_dt
             @renderer.render(
               player: @player, map: @map,
               enemies: @enemies, projectiles: @projectiles,
@@ -220,7 +222,7 @@ module Termfront
             show_wave_clear
             start_wavesfight_wave
             last_time = clock
-            last_render = clock - Config::RENDER_DT
+            last_render = clock - AdaptiveRenderRate.current_dt
           end
 
           cap_frame(now)
@@ -659,6 +661,7 @@ module Termfront
 
     def cap_frame(frame_start)
       spent = clock - frame_start
+      AdaptiveRenderRate.observe(spent)
       remain = Config::FRAME_DT - spent
       sleep(remain) if remain > 0
     end

data/lib/termfront/network/client.rb

@@ -907,6 +907,7 @@ module Termfront
 
       def cap_frame(frame_start)
         spent = clock - frame_start
+        AdaptiveRenderRate.observe(spent)
         remain = Config::FRAME_DT - spent
         sleep(remain) if remain > 0
       end

data/lib/termfront/network/server.rb

@@ -4,6 +4,7 @@ require "socket"
 require "openssl"
 require "json"
 require "set"
+require "timeout"
 
 module Termfront
   module Network
@@ -11,6 +12,7 @@ module Termfront
       TEAM_SIZES = [1, 2, 4].freeze
       MAX_QUEUE_PER_MODE = 64
       QUEUE_HANDSHAKE_TIMEOUT = 5
+      TLS_HANDSHAKE_TIMEOUT = 5
       MAX_MSG_BYTES = 16 * 1024
       MATCH_MAX_DURATION = 30 * 60
       MATCH_IDLE_TIMEOUT = 5 * 60
@@ -77,28 +79,36 @@ module Termfront
 
         tcp_server = TCPServer.new("0.0.0.0", @port)
         ssl_server = OpenSSL::SSL::SSLServer.new(tcp_server, ctx)
-        ssl_server.start_immediately = true
+        ssl_server.start_immediately = false
 
         puts "Termfront PvP server listening on 0.0.0.0:#{@port}"
 
         loop do
           begin
             client = ssl_server.accept
-            configure_client(client)
-            Thread.new(client) do |c|
-              enqueue_player(c)
-            rescue StandardError => e
-              puts "Connection handler error: #{e.class}"
-              begin
-                c.close
-              rescue StandardError
-                nil
-              end
-            end
-          rescue OpenSSL::SSL::SSLError => e
-            puts "SSL handshake failed: #{e.class}"
           rescue StandardError => e
             puts "Accept error: #{e.class}"
+            next
+          end
+
+          Thread.new(client) do |c|
+            configure_client(c)
+            Timeout.timeout(TLS_HANDSHAKE_TIMEOUT) { c.accept }
+            enqueue_player(c)
+          rescue OpenSSL::SSL::SSLError, Timeout::Error => e
+            puts "SSL handshake failed: #{e.class}"
+            begin
+              c.close
+            rescue StandardError
+              nil
+            end
+          rescue StandardError => e
+            puts "Connection handler error: #{e.class}"
+            begin
+              c.close
+            rescue StandardError
+              nil
+            end
           end
         end
       end

data/lib/termfront/network/wavesfight_client.rb

@@ -406,6 +406,7 @@ module Termfront
 
       def cap_frame(frame_start)
         spent = clock - frame_start
+        AdaptiveRenderRate.observe(spent)
         remain = Config::FRAME_DT - spent
         sleep(remain) if remain > 0
       end

data/lib/termfront/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Termfront
-  VERSION = "0.1.7"
+  VERSION = "0.1.9"
 end

data/lib/termfront.rb

@@ -4,6 +4,7 @@ require "io/console"
 
 require_relative "termfront/version"
 require_relative "termfront/config"
+require_relative "termfront/adaptive_render_rate"
 require_relative "termfront/color"
 require_relative "termfront/map"
 require_relative "termfront/weapon/base"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termfront
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -51,6 +51,7 @@ files:
 - exe/termfront
 - exe/termfront-server
 - lib/termfront.rb
+- lib/termfront/adaptive_render_rate.rb
 - lib/termfront/async_writer.rb
 - lib/termfront/audio_manager.rb
 - lib/termfront/color.rb