pixelflut 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc5f965ac963380d9f086a9d8fc8ae155fed8eda6e2a2466a57fc5ed9f38773c
-  data.tar.gz: 6350e684e3a17f65e3eb045f9d3ff0a8a988bce93f91460949441cd433194d96
+  metadata.gz: bbd5e580104dccc3e1a1123ccc063dde0ae530d7443129bc044e9b73a9c71293
+  data.tar.gz: 6590f3d4f9491a10aec353701cde1f53a26158ba8c655be0952ea3be0129d500
 SHA512:
-  metadata.gz: 92ea11881a51b23d2ba8cc3e79ce4eca85107c2640917875ab42022169a88fe22a3e5ec4875830e4dcd0a4266e03596f30528f0ee05c8b6fff001103c18a8926
-  data.tar.gz: c9037c48b74adf490248b186a0a29a7b54bc7cdf7f361031336bec2e6b25c96db303700facb64831ebc466b697f5f172132543f174cdc6ede7e9d5d383cfa879
+  metadata.gz: ac78e76fc92be0e1891012cd1d1fe5b0cb5f388f736f75c2a4a193a294ce339cd1763ce2d1dcc055fa997b6feed20a0fba30d57447695cf8512db229fdcd6306
+  data.tar.gz: 20efde215a0528fc028980fa8edc3c8d40a3acff446aeb3f3599ca7cbd69a87dcc1eac135a5d844e2746a58651c011f8f64a38b2c35733029d382d5c832fe8a0

data/TODO.md

@@ -2,6 +2,8 @@
 
 ## Todo
 
-- [ ] limit connections to _*one* per IP_
+- [x] limit connections _per IP_
 - [x] allow 10 (pixel-)actions per client
+- [ ] extend `pxf generate`
+- [ ] add a pre-processor for images
 - [ ] mention the Gosu gem in the README

data/bin/pxf-server

@@ -8,10 +8,10 @@ def options(cfg)
     opts.banner = 'usage: pxf server [options]'
     opts.separator(nil)
     opts.separator('valid options:')
-    opts.on('-b', '--bind ADDR', String, 'bind to given address') do |v|
+    opts.on('-b', '--bind ADDR', String, 'bind address') do |v|
       cfg.server.host = v
     end
-    opts.on('-p', '--port PORT', Integer, 'select port(default: 1234)') do |v|
+    opts.on('-p', '--port PORT', Integer, 'bind port(default: 1234)') do |v|
       cfg.server.port = v
     end
     opts.on('-k', '--keep-alive', Float, 'set maximum keep-alive time') do |v|
@@ -20,8 +20,11 @@ def options(cfg)
     opts.on('-r', '--read_buffer SIZE', Integer, 'set read buffer size (default: 1024)') do |v|
       cfg.server.read_buffer_size = v
     end
-    opts.on('-c', '--commands NUMBER', Integer, 'set number of continious processed commands (default: 10)') do |v|
-      cfg.server.max_commands_at_once = v
+    opts.on('-l', '--peer-limit NUMBER', Integer, 'limit number connections per peer (default: 8)') do |v|
+      cfg.server.peer_limit = v
+    end
+    opts.on('-c', '--command-limit NUMBER', Integer, 'limit of continious processed commands (default: 10)') do |v|
+      cfg.server.command_limit = v
     end
     opts.on('-w', '--width WIDTH', Integer, 'set canvas width (default: 800)') do |v|
       cfg.width = v

data/lib/pixelflut/app.rb

@@ -26,6 +26,7 @@ module Pixelflut
       @image = TextImage.new(width, height)
       @server = Server.new(@image, configuration.server)
       log(self.caption = "Pixelflut@#{configuration.server.host}:#{configuration.server.port}")
+      log(configuration.server)
       reset!
     end
 

data/lib/pixelflut/server.rb

@@ -9,10 +9,19 @@ module Pixelflut
       :port,
       :keep_alive_time,
       :read_buffer_size,
-      :max_commands_at_once
+      :command_limit,
+      :peer_limit
     ) do
       def self.default
-        new(nil, 1234, 1, 1024, 10)
+        new(nil, 1234, 1, 1024, 10, 8)
+      end
+
+      def to_s
+        "bind: #{host}:#{port}"\
+          ", keep-alive-time: #{keep_alive_time}"\
+          ", read-buffer-size: #{read_buffer_size}"\
+          ", command-limit: #{command_limit}"\
+          ", peer-limit: #{peer_limit}"
       end
     end
 
@@ -21,13 +30,14 @@ module Pixelflut
     def initialize(canvas, config = Configuration.default)
       @canvas, @config = canvas, config
       @socket, @connections = nil, {}
+      @peers = Hash.new{ |h, k| h[k] = 0 }
       @ccfg = Connection::Configuration.new(
         keep_alive_time: config.keep_alive_time,
         read_buffer_size: config.read_buffer_size,
-        max_commands_at_once: config.max_commands_at_once,
+        command_limit: config.command_limit,
         canvas: canvas,
         size_result: "SIZE #{canvas.width} #{canvas.height}\n".freeze,
-        on_end: ->(conn){ @connections.delete(conn) }
+        on_end: ->(conn){ @peers[conn.peeraddr] -= 1 if @connections.delete(conn) }
       ).freeze
     end
 
@@ -50,8 +60,12 @@ module Pixelflut
 
     private
 
-    def create_connection(incoming)
-      con = Connection.new(incoming, @ccfg)
+    def create_connection(socket)
+      peeraddr = socket.peeraddr(false)[-1]
+      count = @peers[peeraddr] + 1
+      return socket.close if count > @config.peer_limit
+      @peers[peeraddr] = count
+      con = Connection.new(socket, peeraddr, @ccfg)
       @connections[con] = con
     end
 
@@ -64,16 +78,17 @@ module Pixelflut
       Configuration = Struct.new(
         :keep_alive_time,
         :read_buffer_size,
-        :max_commands_at_once,
+        :command_limit,
         :canvas,
         :size_result,
         :on_end,
         keyword_init: true
       )
 
-      def initialize(socket, config)
-        @socket, @config = socket, config
-        # socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
+      attr_reader :peeraddr
+
+      def initialize(socket, peeraddr, config)
+        @socket, @peeraddr, @config = socket, peeraddr, config
         @last_tm, @buffer = Time.now.to_f, ''
       end
 
@@ -126,7 +141,7 @@ module Pixelflut
       end
 
       def process_loop(index)
-        command_count = @config.max_commands_at_once
+        command_count = @config.command_limit
         while process_buffer(index)
           index = @buffer.index("\n") or return
           command_count -= 1

data/lib/pixelflut/version.rb

@@ -1,3 +1,3 @@
 module Pixelflut
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mike Blumtritt