pixelflut 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9baf1f1bc33ff7224d647d35d142a7688c9bdc98d3c1195fbc247dfa0bd1c68f
-  data.tar.gz: 98056e9d11872f5856de38e2fcfe3677d55a117cf9850e0ff62c0f862a8fdd73
+  metadata.gz: bc5f965ac963380d9f086a9d8fc8ae155fed8eda6e2a2466a57fc5ed9f38773c
+  data.tar.gz: 6350e684e3a17f65e3eb045f9d3ff0a8a988bce93f91460949441cd433194d96
 SHA512:
-  metadata.gz: 5faac48d602c1d8bdc07b1786b5f74732a34c79370f140769ff3dcbc48156d8f433d05c7a62fbc353ca7bee88d697a820dc192c00a694f2f43df9dfe0c606fe7
-  data.tar.gz: e337ed50dfe5e2192f0ee6c16568b8dba2b93a6376ba2e090df8f249a46390e3101797ba7c63f3ebeeeca054453191540a08b27d2c531b107b0338f982961189
+  metadata.gz: 92ea11881a51b23d2ba8cc3e79ce4eca85107c2640917875ab42022169a88fe22a3e5ec4875830e4dcd0a4266e03596f30528f0ee05c8b6fff001103c18a8926
+  data.tar.gz: c9037c48b74adf490248b186a0a29a7b54bc7cdf7f361031336bec2e6b25c96db303700facb64831ebc466b697f5f172132543f174cdc6ede7e9d5d383cfa879

data/TODO.md

@@ -0,0 +1,7 @@
+# Pixelflut
+
+## Todo
+
+- [ ] limit connections to _*one* per IP_
+- [x] allow 10 (pixel-)actions per client
+- [ ] mention the Gosu gem in the README

data/bin/pxf-server

@@ -8,13 +8,30 @@ 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'){ |v| cfg.server.host = v }
-    opts.on('-p', '--port PORT', Integer, 'select port(default: 1234)'){ |v| cfg.server.port = v }
-    opts.on('-k', '--keep-alive', Float, 'set maximum keep-alive time'){ |v| cfg.server.keep_alive_time = v }
-    opts.on('-r', '--read_buffer SIZE', Integer, 'set read buffer size (default: 1024)'){ |v| cfg.server.read_buffer_size = v }
-    opts.on('-w', '--width WIDTH', Integer, 'set canvas width (default: 800)'){ |v| cfg.width = v }
-    opts.on('-h', '--height HEIGHT', Integer, 'set canvas height (default: 600)'){ |v| cfg.height = v }
-    opts.on('-f', '--[no-]fullscreen', 'run in fullscreen mode'){ |v| cfg.fullscreen = v }
+    opts.on('-b', '--bind ADDR', String, 'bind to given address') do |v|
+      cfg.server.host = v
+    end
+    opts.on('-p', '--port PORT', Integer, 'select port(default: 1234)') do |v|
+      cfg.server.port = v
+    end
+    opts.on('-k', '--keep-alive', Float, 'set maximum keep-alive time') do |v|
+      cfg.server.keep_alive_time = v
+    end
+    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
+    end
+    opts.on('-w', '--width WIDTH', Integer, 'set canvas width (default: 800)') do |v|
+      cfg.width = v
+    end
+    opts.on('-h', '--height HEIGHT', Integer, 'set canvas height (default: 600)') do |v|
+      cfg.height = v
+    end
+    opts.on('-f', '--[no-]fullscreen', 'run in fullscreen mode') do |v|
+      cfg.fullscreen = v
+    end
   end
 end
 

data/lib/pixelflut/app.rb

@@ -40,6 +40,7 @@ module Pixelflut
     end
 
     def update
+      # self.caption = @image.changes
       @draw_image = nil unless 0 == @image.changes
     end
 

data/lib/pixelflut/server.rb

@@ -8,10 +8,11 @@ module Pixelflut
       :host,
       :port,
       :keep_alive_time,
-      :read_buffer_size
+      :read_buffer_size,
+      :max_commands_at_once
     ) do
       def self.default
-        new(nil, 1234, 1, 1024)
+        new(nil, 1234, 1, 1024, 10)
       end
     end
 
@@ -20,8 +21,14 @@ module Pixelflut
     def initialize(canvas, config = Configuration.default)
       @canvas, @config = canvas, config
       @socket, @connections = nil, {}
-      @on_end = ->(conn){ @connections.delete(conn) }
-      @size = "SIZE #{canvas.width} #{canvas.height}\n".freeze
+      @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,
+        canvas: canvas,
+        size_result: "SIZE #{canvas.width} #{canvas.height}\n".freeze,
+        on_end: ->(conn){ @connections.delete(conn) }
+      ).freeze
     end
 
     def connection_count
@@ -30,10 +37,9 @@ module Pixelflut
 
     def update
       return create_socket unless @socket
-      now = Time.now.to_f
       incoming = @socket.accept_nonblock(exception: false)
-      create_connection(incoming, now) unless Symbol === incoming
-      @connections.keys.each{ |con| con.update(now) }
+      create_connection(incoming) unless Symbol === incoming
+      @connections.keys.each(&:update)
     end
 
     def run
@@ -44,8 +50,8 @@ module Pixelflut
 
     private
 
-    def create_connection(incoming, now)
-      con = Connection.new(incoming, now, @config, @canvas, @size, @on_end)
+    def create_connection(incoming)
+      con = Connection.new(incoming, @ccfg)
       @connections[con] = con
     end
 
@@ -55,25 +61,37 @@ module Pixelflut
     end
 
     class Connection
-      def initialize(socket, now, config, canvas, size, on_end)
-        @socket, @last_tm, @config, @canvas, @size, @on_end = socket, now, config, canvas, size, on_end
-        # @socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
-        @buffer = ''
+      Configuration = Struct.new(
+        :keep_alive_time,
+        :read_buffer_size,
+        :max_commands_at_once,
+        :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)
+        @last_tm, @buffer = Time.now.to_f, ''
       end
 
       def close(_reason)
         socket, @socket = @socket, nil
         return unless socket
         socket.close
-        @on_end.call(self)
+        @config.on_end.call(self)
+        false
       end
 
-      def update(now)
+      def update
         index = @buffer.index("\n")
-        return process_buffer(index, now) if index
+        return process_loop(index) if index
         read_size = @config.read_buffer_size - @buffer.size
         return close(:buffer_exceeded) if read_size <= 0
         str = @socket.recv_nonblock(read_size, exception: false)
+        now = Time.now.to_f
         return (now - @last_tm > @config.keep_alive_time ? close(:timeout) : nil) if Symbol === str
         return close(:closed_by_peer) if 0 == str.size
         @buffer += str
@@ -82,38 +100,48 @@ module Pixelflut
 
       private
 
-      def next_command(index, now)
+      def next_command(index)
         @buffer = @buffer[index, @buffer.size - index]
-        @last_tm = now
+        @last_tm = Time.now.to_f
+        true
       end
 
-      def command_size(index, now)
-        @socket.sendmsg_nonblock(@size)
-        next_command(index, now)
+      def command_size(index)
+        @socket.sendmsg_nonblock(@config.size_result)
+        next_command(index)
       end
 
-      def command_px(command, index, now)
+      def command_px(command, index)
         _, x, y, color = command.split(' ', 4)
         return close(:color_expected) unless color
-        @canvas[x.to_i, y.to_i] = color
-        next_command(index, now)
+        @config.canvas[x.to_i, y.to_i] = color
+        next_command(index)
       end
 
-      def command_rc(command, index, now)
+      def command_rc(command, index)
         _, x1, y1, x2, y2, color = command.split(' ', 6)
         return close(:color_expected) unless color
-        @canvas.draw_rect(x1.to_i, y1.to_i, x2.to_i, y2.to_i, color)
-        next_command(index, now)
+        @config.canvas.draw_rect(x1.to_i, y1.to_i, x2.to_i, y2.to_i, color)
+        next_command(index)
+      end
+
+      def process_loop(index)
+        command_count = @config.max_commands_at_once
+        while process_buffer(index)
+          index = @buffer.index("\n") or return
+          command_count -= 1
+          break if command_count <= 0
+        end
       end
 
-      def process_buffer(index, now)
+      def process_buffer(index)
         return close(:max_command_size_exceeded) if index > 31 # 'RC 9999 9999 9999 9999 RRGGBBAA'.size
         command = @buffer[0, index]
         index += 1
-        return command_size(index, now) if command == 'SIZE'
+        return command_px(command, index) if command.start_with?('PX ')
+        return command_rc(command, index) if command.start_with?('RC ')
         return close(:quit) if command == 'QUIT'
-        return command_px(command, index, now) if command.start_with?('PX ')
-        return command_rc(command, index, now) if command.start_with?('RC ')
+        return command_size(index) if command == 'SIZE'
         close(:bad_command)
       end
     end

data/lib/pixelflut/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixelflut
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -68,6 +68,7 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - README.md
+- TODO.md
 - bin/pxf
 - bin/pxf-generate
 - bin/pxf-help