iodine 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75cc90d10afaecdc798bdf39ec5d4a1063431faf
-  data.tar.gz: da27288f1c90ac8604c07c8f3d2ffb796c09e453
+  metadata.gz: cbb450cc38cab2612710d70cff54bc0bea8685b0
+  data.tar.gz: 5165d905229eb83143eb0c2fde06a91b8223069d
 SHA512:
-  metadata.gz: ce19f80d81def9ad8784648625007cca05a9513d6498dbff030b10a28a43e96ab7c3a54553c275393c2803b9bc5e47b47307ac03b2c1a7fc127646d396eeb017
-  data.tar.gz: 145b4f0cb2aeec486af8a09d3cf0d91819a7e97449a3bbb8a5a56e7324a2e9c4977a1a8119c52ac780a7b34b338ee8d3e934dd5a48bc0d0da757588b80e1a99a
+  metadata.gz: fa8b08cd218f03436b2a82ec5adf5df579108393b51dc5cf199ab11328e55717575102aa7c048d54aaffa2ad2a4f7ba2ed0a2e561630328c783b3fc4e041b704
+  data.tar.gz: c1d9d2a99ca9132a82ddb28df1747fdc2f532b033f344373406b466d99eda0055c753deca2bc9e2802d99416abbc00bd6a3c1caa0532e5ed02d0554682743a26

data/README.md

@@ -95,10 +95,10 @@ Using Iodine and leveraging Ruby's Object Oriented approach, is super fun to wri
 # require the 'iodine/http' module if you want to use Iodine's Http server.
 require 'iodine/http'
 # returning a string will automatically append it to the response.
-Iodine::Http.on_http = { |request, response| "Hello World!" }
+Iodine::Http.on_http { |request, response| "Hello World!" }
 ```
 
-Iodine's Http server includes experimental support for Http/2 right out of the box as well as a Websocket server.
+Iodine's Http server includes comes right out of the box with Websocket support as well as an experimental support for Http/2 (it's just a start, no `push` support just yet, but you can try it out).
 
 Here's a quick chatroom server (use [www.websocket.org](http://www.websocket.org/echo.html) to check it out):
 
@@ -176,6 +176,61 @@ exit
 
 In this mode, Iodine will continue running until it receives a kill signal (i.e. `^C`). Once the kill signal had been received, Iodine will start shutting down, allowing up to ~20-25 seconds to complete any pending tasks (timeout).
 
+## Server Usage: IP address & port, SSL/TLS and other command line options
+
+Iodine automatically respects certain command line options that make it easier to use the same script over and over again with different results and making writing a `Procfile` (or similar setup files) a breeze.
+
+Let `./script.rb` be an Iodine ruby script, may an easy one such as our Hello World:
+
+```ruby
+#!/usr/bin/env ruby
+
+# script.rb
+require 'iodine/http'
+
+Iodine::Http.on_http do |request, response|
+  response << "Hello World!"
+end
+
+```
+
+Here are different command line options that Iodine recognizes automatically when running our script:
+
+| purpose                                         | flag   | example                                  |
+--------------------------------------------------|:------:|------------------------------------------|
+|  Set the server's port.                         | `-p`   | `ruby ./script.rb -p 4000`               |
+|  Limit the server's binding to a specific IP.   | `-ip`  | `ruby ./script.rb -p 4000 -ip 127.0.0.1` |
+|  Use SSL/TLS on a specific port.                | `ssl`  | `ruby ./script.rb -p 3030 ssl`           |
+|  Try out the experimental Http2 extention.      | `http2`|  `ruby ./script.rb -p 3030 ssl http2`    |
+
+## Server Usage: Running more than one server
+
+On some machines, Iodine will allow you to run more than a single server, by forking the main process while still running the script. This is more of a hack to be used in development environments, since runnig multiple instances of the script is the prefered way to use Iodine in production.
+
+i.e.:
+
+```ruby
+require 'iodine/http'
+
+# We'll use a simple hello world with a slight "tweek" for this example.
+Iodine::Http.on_http do |request, response|
+  response << "Hello World!"
+  response << " We're on SSL/TLS!" if request.ssl?
+end
+
+Iodine.ssl = false
+
+Process.fork do
+   Iodine.ssl = true
+   Iodine.port = 3030
+   # # we can also change network behavior, so we could have used:
+   # Iodine::Http.on_http { "Hello World! We're on SSL/TLS! - no `if` required ;-)" } 
+end if Process.respond_to? :fork
+
+# if using irb
+exit
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -184,7 +239,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/iodine.
+Bug reports and pull requests are welcome on GitHub at https://github.com/boazsegev/iodine.
 
 
 ## License

data/{manual tests/core_http_test → bin/core_http_test}

@@ -12,8 +12,6 @@ require 'stringio'
 # ab -n 10000 -c 200 -k http://localhost:3000/
 # ~/ruby/wrk/wrk -c400 -d10 -t12 http://localhost:3000/
 
-
-
 class MiniServer < Iodine::Protocol
 	def on_open
 		@headers = {}

data/{manual tests/hello_world → bin/hello_world}

@@ -40,14 +40,20 @@ end
 
 Iodine::Http.on_websocket WSChatServer
 
+Iodine::Http.http2 = true
+
 Process.fork do
 
-	Iodine.ssl = true
+  Iodine.ssl = true
 	Iodine.port = 3030
 	Iodine.protocol.on_http do |req, res|
 		res.session[:count] ||= 0
 		res.session[:count] += 1
-		res << "Visits: #{res.session[:count]}\n\nRequest object:\n\n#{req.to_s}"
+    res['content-type'] = 'text/plain'
+    res.cookies['testing'] = !res.cookies['testing']
+    res << "Visits: #{res.session[:count]}\n\nRequest object:\n\n#{req.to_s}"
+    # puts "Setting :testing cookie was #{ res.cookies[:testing] }, setting to: #{res.cookies[:testing] = !res.cookies[:testing]}"
+    # puts "Setting 'testing' cookie was #{ res.cookies['testing'] }, setting to: #{res.cookies['testing'] = !res.cookies['testing']}"
 	end
 
 end

data/lib/iodine/http.rb

@@ -33,6 +33,7 @@ module Iodine
 	#
 	#       require 'iodine/http'
 	#       Iodine::Http.on_http { |request, response| 'Hello World!' }
+	#       exit # only if running from irb
 	#
 	# To start a Websocket server, require `iodine/http` (which isn't required by default), create a Websocket handling Class and set up
 	# your Websocket callback. i.e.:
@@ -97,6 +98,15 @@ module Iodine
 			@session_token
 		end
 
+		# Sets whether Iodine will allow connections to the experiemntal Http2 protocol. Defaults to false unless the `http2` command line flag is present.
+		def self.http2= allow
+			@http2 = allow && true
+		end
+		# Returns true if Iodine will require that new connection be encrypted.
+		def self.http2
+			@http2
+		end
+
 		# Creates a websocket client within a new task (non-blocking).
 		# 
 		# Make sure to setup all the callbacks (as needed) prior to starting the connection. See {::Iodine::Http::WebsocketClient.connect}
@@ -126,6 +136,8 @@ module Iodine
 			::Iodine.run { ::Iodine::Http::WebsocketClient.connect url, options, &block }
 		end
 
+		@http2 = (ARGV.index('http2') && true)
+
 		@websocket_app = @http_app = NOT_IMPLEMENTED = Proc.new { |i,o| false }
 		@session_token = "#{File.basename($0, '.*')}_uuid"
 	end
@@ -133,7 +145,7 @@ module Iodine
 	@queue.tap do |q|
 		arr =[];
 		arr << q.pop until q.empty?;
-		run { Iodine.ssl_protocols = { 'h2' => Iodine::Http::Http2, 'http/1.1' => Iodine::Http } if @ssl && @ssl_protocols.empty? }
+		run { Iodine.ssl_protocols = { 'h2' => Iodine::Http::Http2, 'http/1.1' => Iodine::Http } if @ssl && @ssl_protocols.empty? && ::Iodine::Http.http2 }
 		run do
 			if Iodine.protocol == ::Iodine::Http && ::Iodine::Http.on_http == ::Iodine::Http::NOT_IMPLEMENTED && ::Iodine::Http.on_websocket == ::Iodine::Http::NOT_IMPLEMENTED
 				::Iodine.protocol = :http_not_initialized

data/lib/iodine/http/hpack.rb

@@ -15,7 +15,7 @@ module Iodine
 					def [] index
 						raise "HPACK Error - invalid header index: 0" if index == 0
 						return STATIC_LIST[index] if index < STATIC_LENGTH
-						raise "HPACK Error - invalid header index: #{index}" if @list.count <= (index - STATIC_LENGTH)
+						raise "HPACK Error - invalid header index: #{index}" if index >= ( @list.count + STATIC_LENGTH )
 						@list[index - STATIC_LENGTH]
 					end
 					alias :get_index :[]
@@ -72,9 +72,9 @@ module Iodine
 					results
 				end
 				def encode headers = {}
-					buffer = ''
+					buffer = ''.force_encoding(::Encoding::ASCII_8BIT)
 					headers.each {|k, v| buffer << encode_field( (k.is_a?(String) ? k : ":#{k.to_s}".freeze) ,v) if v}
-					buffer
+					buffer.force_encoding(::Encoding::ASCII_8BIT)
 				end
 				def resize max
 					@decoding_list.resize max
@@ -121,25 +121,35 @@ module Iodine
 					if value.is_a?(Array)
 						return (value.map {|v| encode_field name, v} .join)
 					end
+					raise "Http/2 headers must be LOWERCASE Strings!" if name[0] =~ /[A-Z]/n
+					value = value.to_s
 					if name == 'set-cookie'
-						buffer = ''
-						buffer << pack_number( 55, 16, 4)
+						buffer = ''.force_encoding ::Encoding::ASCII_8BIT
+						buffer << pack_number( 55, 1, 4)
 						buffer << pack_string(value)
 						return buffer
 					end
 					index = @encoding_list.find(name, value)
 					return pack_number( index, 1, 1) if index
 					index = @encoding_list.find_name name
-					@encoding_list.insert name, value
-					buffer = ''
+					buffer = ''.force_encoding(::Encoding::ASCII_8BIT)
 					if index
-						buffer << pack_number( index, 64, 2)
+						buffer << pack_number( index, 1, 2)
 					else
-						buffer << pack_number( 0, 64, 2)
-						buffer << pack_string(name.to_s)
+						raise "Http/2 headers whould be Strings! or allowed Psedo-Header Symbol Only!" if name[0] == ':'
+						buffer << pack_number( 0, 1, 2)
+						buffer << pack_string(name)
 					end
 					buffer << pack_string(value)
+					@encoding_list.insert name, value
 					buffer
+				rescue
+					puts "HPACK failure data dump:"
+					puts "buffer: #{buffer} - #{buffer.encoding}"
+					puts "value: #{value} - #{value.encoding}"
+					puts "packed #{pack_string(value)} - #{pack_string(value)}"
+					puts "packed #{pack_string(value)} - #{pack_string(value)}"
+					raise
 				end
 				def extract_number data, prefix, prefix_length
 					mask = 255 >> prefix_length
@@ -152,13 +162,11 @@ module Iodine
 						count += 1
 					end
 					prefix + mask
-				# rescue e =>
-				# 	raise "HPACK Error - number input invalid"
 				end
 				def pack_number number, prefix, prefix_length
 					n_length = 8-prefix_length
 					if (number + 1 ).bit_length <= n_length
-						return ((prefix << n_length) | number).chr
+						return ((prefix << n_length) | number).chr.force_encoding(::Encoding::ASCII_8BIT)
 					end
 					prefix = [(prefix << n_length) | (2**n_length - 1)]
 					number -= 2**n_length - 1
@@ -167,11 +175,11 @@ module Iodine
 						number = number >> 7
 						break if number == 0
 					end
-					(prefix << (prefix.pop & 127)).pack('C*'.freeze)
+					(prefix << (prefix.pop & 127)).pack('C*'.freeze).force_encoding(::Encoding::ASCII_8BIT)
 				end
 				def pack_string string, deflate = true
-					string = deflate(string) if deflate
-					(pack_number(string.bytesize, (deflate ? 1 : 0), 1) + string).force_encoding ::Encoding::ASCII_8BIT
+					string = deflate ? deflate(string) : string.dup.force_encoding(::Encoding::ASCII_8BIT)
+					(pack_number(string.bytesize, (deflate ? 1 : 0), 1) + string ).force_encoding ::Encoding::ASCII_8BIT
 				end
 				def extract_string data
 					byte = data.getbyte
@@ -201,19 +209,21 @@ module Iodine
 					str
 				end
 				def deflate data
-					str = ''
-					buffer = ''
+					str = ''.force_encoding ::Encoding::ASCII_8BIT
+					buffer = ''.force_encoding ::Encoding::ASCII_8BIT
 					data.bytes.each do |i|
 						buffer << HUFFMAN.key(i)
-						if (buffer % 8) == 0
-							str << [buffer].pack('b*')
+						if (buffer.bytesize % 8) == 0
+							str << [buffer].pack('B*'.freeze)
 							buffer.clear
 						end
 					end
-					(8-(buffer.bytesize % 8)).times { buffer << '1'}
-					str << [buffer].pack('b*')
-					buffer.clear
-					str
+					unless buffer.empty?
+						(8-(buffer.bytesize % 8)).times { buffer << '1'} if (buffer.bytesize % 8)
+						str << [buffer].pack('B*'.freeze)
+						buffer.clear
+					end
+					str.force_encoding ::Encoding::ASCII_8BIT
 				end
 				STATIC_LIST = [ nil,
 					[":authority"],

data/lib/iodine/http/http1.rb

@@ -8,7 +8,7 @@ module Iodine
 		end
 		def on_message data
 				return if @refuse_requests
-				@http2_pri_review ||= ( ::Iodine::Http::Http2.pre_handshake(self, data) && (return true) ) || true
+				@http2_pri_review ||= ( ::Iodine::Http.http2 && ::Iodine::Http::Http2.pre_handshake(self, data) && (return true) ) || true
 
 				data = ::StringIO.new data
 				until data.eof?
@@ -70,7 +70,7 @@ module Iodine
 							request[:body_complete] = true
 						end
 					end
-					(@request = ::Iodine::Http::Request.new(self)) && ( ::Iodine::Http::Http2.handshake(request, self, data) || dispatch(request, data) ) if request.delete :body_complete
+					(@request = ::Iodine::Http::Request.new(self)) && ( (::Iodine::Http.http2 && ::Iodine::Http::Http2.handshake(request, self, data)) || dispatch(request, data) ) if request.delete :body_complete
 				end
 		end
 
@@ -160,21 +160,6 @@ module Iodine
 
 		def send_headers response
 			return false if response.headers.frozen?
-			# remove old flash cookies
-			response.cookies.keys.each do |k|
-				if k.to_s.start_with? 'magic_flash_'.freeze
-					response.set_cookie k, nil
-					flash.delete k
-				end
-			end
-			#set new flash cookies
-			response.flash.each do |k,v|
-				response.set_cookie "magic_flash_#{k.to_s}", v
-			end
-			response.raw_cookies.freeze
-			# response.cookies.set_response nil
-			response.flash.freeze
-
 			request = response.request
 			headers = response.headers
 
@@ -187,7 +172,7 @@ module Iodine
 			# unless @headers['connection'] || (@request[:version].to_f <= 1 && (@request['connection'].nil? || !@request['connection'].match(/^k/i))) || (@request['connection'] && @request['connection'].match(/^c/i))
 			headers.each {|k,v| out << "#{k.to_s}: #{v}\r\n"}
 			out << "Cache-Control: max-age=0, no-cache\r\n".freeze unless headers['cache-control'.freeze]
-			response.raw_cookies.each {|k,v| out << "Set-Cookie: #{k.to_s}=#{v.to_s}\r\n"}
+			response.extract_cookies.each {|cookie| out << "Set-Cookie: #{cookie}\r\n"}
 			out << "\r\n"
 
 			response.bytes_written += (write(out) || 0)

data/lib/iodine/http/http2.rb

@@ -4,14 +4,19 @@ module Iodine
 			def initialize io, original_request = nil
 				super(io)
 				return unless original_request
-				original_request[:stream_id] = 1
+				::Iodine.warn "Http/2: upgrade handshake settings not implemented. upgrade request:\n#{original_request}"
+				@last_stream = original_request[:stream_id] = 1
 				original_request[:io] = self
-				process_request original_request
+				# deal with the request['http2-settings'] - NO ACK
+				# HTTP2-Settings: <base64url encoding of HTTP/2 SETTINGS payload>
+
+				# dispatch the original request
+				::Iodine.run original_request, &(::Iodine::Http::Http2.dispatch)
 			end
 			def on_open
-				# do stuff, i.e. related to the header:
-				# HTTP2-Settings: <base64url encoding of HTTP/2 SETTINGS payload>
-				::Iodine.warn "HTTP/2 requested - support is still experimental."
+				# not fully fanctional.
+				::Iodine.warn "Http/2 requested - support is still experimental."
+
 				# update the timeout to 15 seconds (ping will be sent whenever timeout is reached).
 				set_timeout 15
 
@@ -22,6 +27,7 @@ module Iodine
 				@header_buffer = ''
 				@header_end_stream = false
 				@header_sid = nil
+				@frame_locker = Mutex.new
 
 				# frame parser starting posotion
 				@frame = {}
@@ -55,26 +61,17 @@ module Iodine
 			end
 
 			def send_response response
-				return false if response.headers.frozen?
-				
 				request = response.request
-				headers = response.headers
+				return false unless send_headers response, request
+				return nil if request.head?
 				body = response.extract_body
-				headers[:status] = response.status.to_s
-				emit_payload @hpack.encode(headers), request[:sid], 1, (request.head? ? 1 : 0)
-				headers.freeze
 				return (log_finished(response) && body.clear) if request.head?
-				(response.bytes_written += emit_payload(body, request[:sid], 0, 1) ) && (body.frozen? || body.clear) if body
+				(response.bytes_written += emit_payload(body.to_s, request[:sid], 0, 1) ) && (body.frozen? || body.clear) if body
 				log_finished response
 			end
 			def stream_response response, finish = false
 				request = response.request
-				headers = response.headers
-				unless response.headers.frozen? # send headers
-					headers[:status] = response.status.to_s
-					emit_payload @hpack.encode(headers), request[:sid], 1, (request.head? ? 1 : 0)
-					headers.freeze
-				end
+				send_headers response, request
 				return nil if request.head?
 				body = response.extract_body
 				# puts "should stream #{body}"
@@ -83,7 +80,7 @@ module Iodine
 			end
 
 			def ping
-				emit_frame "pniodine", 0, 6
+				@frame_locker.synchronize { emit_frame "pniodine", 0, 6 }
 			end
 
 			def push request
@@ -97,7 +94,7 @@ module Iodine
 
 			def go_away error_code
 				return false if @io.closed?
-				emit_frame [@last_stream, error_code].pack('N*'), 0, 7
+				@frame_locker.synchronize { emit_frame [@last_stream, error_code].pack('N*'), 0, 7 }
 				close
 				# Iodine.info "HTTP/2 connection closed with code #{error_code}"
 			end
@@ -134,12 +131,22 @@ module Iodine
 				Iodine.log("#{request[:client_ip]} [#{t_n.utc}] #{request[:method]} #{request[:original_path]} #{request[:scheme]}\/2 #{response.status} #{response.bytes_written.to_s} #{((t_n - request[:time_recieved])*1000).round(2)}ms\n").clear
 			end
 
+			def send_headers response, request
+				headers = response.headers
+				return false if headers.frozen?
+				# headers[:status] = response.status.to_s
+				headers['set-cookie'] = response.extract_cookies
+				headers.freeze
+				emit_payload (@hpack.encode(status: response.status.to_s) + @hpack.encode(headers)), request[:sid], 1, (request.head? ? 1 : 0)
+				return true
+			end
+
 			# Sends an HTTP frame with the requested payload
 			#
 			# @return [true, false] returns true if the frame was sent and false if the frame couldn't be sent (i.e. payload too big, connection closed etc').
 			def emit_frame payload, sid = 0, type = 0, flags = 0
 				# puts "Sent: #{[payload.bytesize, type, flags, sid, payload].pack('N C C N a*'.freeze)[1..-1].inspect}"
-				@io.write( [payload.bytesize, type, flags, sid, payload].pack('N C C N a*'.freeze)[1..-1] )
+				@io.write( [payload.bytesize, type, flags, sid, payload].pack('N C C N a*'.freeze)[1..-1] ) #.tap {|s| next if type !=1 ;puts "Frame: #{s.class.name} - #{s.encoding}"; puts s.inspect } )
 			end
 
 			# Sends an HTTP frame group with the requested payload. This means the group will not be interrupted and will be sent as one unit.
@@ -148,17 +155,19 @@ module Iodine
 			def emit_payload payload, sid = 0, type = 0, flags = 0
 				max_frame_size = @settings[SETTINGS_MAX_FRAME_SIZE]
 				max_frame_size = 131_072 if max_frame_size > 131_072
-				return emit_frame(payload, sid, type, ( type == 0x1 ? (flags | 0x4) : flags ) ) if payload.bytesize <= max_frame_size
+				return @frame_locker.synchronize { emit_frame(payload, sid, type, ( (type == 0x1 || type == 0x5) ? (flags | 0x4) : flags ) ) } if payload.bytesize <= max_frame_size
 				sent = 0
 				payload = StringIO.new payload
-				if type == 0x1
-					sent += emit_frame(payload.read(max_frame_size), sid, 0x1, flags & 254)
-					sent += emit_frame(payload.read(max_frame_size), sid, 0x9, 0) while payload.size - payload.pos > max_frame_size
-					sent += emit_frame(payload.read(max_frame_size), sid, 0x9, (0x4 | (flags & 0x1)) )
+				if type == 0x1 || type == 0x5
+					@frame_locker.synchronize do
+						sent += emit_frame(payload.read(max_frame_size), sid, 0x1, flags & 254)
+						sent += emit_frame(payload.read(max_frame_size), sid, 0x9, 0) while payload.size - payload.pos > max_frame_size
+						sent += emit_frame(payload.read(max_frame_size), sid, 0x9, (0x4 | (flags & 0x1)) )
+					end
 					return sent
 				end
-				sent += emit_frame(payload.read(max_frame_size), sid, type, (flags & 254)) while payload.size - payload.pos > max_frame_size
-				sent += emit_frame(payload.read(max_frame_size), sid, type, flags)
+				sent += @frame_locker.synchronize { emit_frame(payload.read(max_frame_size), sid, type, (flags & 254)) } while payload.size - payload.pos > max_frame_size
+				sent += @frame_locker.synchronize { emit_frame(payload.read(max_frame_size), sid, type, flags) }
 			end
 
 			def parse_preface data
@@ -230,8 +239,8 @@ module Iodine
 					process_ping frame
 				when 7 # GOAWAY
 					go_away NO_ERROR
+					Iodine.error "Http2 Disconnection with error (#{frame[:flags].to_s}): #{frame[:body].strip}" unless frame[:flags] == 0 && frame[:body] == ''
 				when 8 # WINDOW_UPDATE
-				when 9 # 
 				else # Error, frame not recognized
 				end
 
@@ -294,7 +303,9 @@ module Iodine
 				@header_buffer.clear
 				@header_end_stream = false
 				@header_sid = nil
-
+			rescue => e
+				connection_error 5
+				Iodine.warn e
 			end
 			def process_data frame
 				if frame[:flags][3] == 1 # padded
@@ -340,10 +351,10 @@ module Iodine
 				return connection_error PROTOCOL_ERROR unless frame[:sid] == 0 && (frame[:body].bytesize % 6) == 0
 				settings = StringIO.new frame[:body]
 				until settings.eof?
-					key = settings.read(2).unpack('n')[0]
-					value = settings.read(4).unpack('N')[0]
+					key = settings.read(2).unpack('n'.freeze)[0]
+					value = settings.read(4).unpack('N'.freeze)[0]
 					Iodine.info "HTTP/2 set #{key}=>#{value} for SID #{frame[:sid]}"
-					case frame[:body][0..1].unpack('n')[0]
+					case frame[:body][0..1].unpack('n'.freeze)[0]
 					when SETTINGS_HEADER_TABLE_SIZE
 						return connection_error ENHANCE_YOUR_CALM if value > 4096
 						@hpack.resize(value)
@@ -441,7 +452,6 @@ module Iodine
 						response = ::Iodine::Http::Response.new request
 						response[:Allow] = 'GET,HEAD,POST,PUT,DELETE,OPTIONS'.freeze
 						response['access-control-allow-origin'.freeze] = '*'
-						response['content-length'.freeze] = 0
 						response.finish
 						return false
 					end
@@ -456,7 +466,8 @@ module Iodine
 						response.finish
 					rescue => e
 						::Iodine.error e
-						::Iodine::Http::Response.new(request, 500, {}).finish
+						# request[:io].emit_frame [INTERNAL_ERROR].pack('N'.freeze), request[:sid], 3
+						::Iodine::Http::Response.new(request, 500, {}, ::Iodine::Http::Response::STATUS_CODES[500]).finish
 					end
 				end
 			end

data/lib/iodine/http/rack_support.rb

@@ -46,6 +46,8 @@ module Iodine
 				env['HTTP_VERSION'.freeze] = "HTTP/#{request[:version].to_s}"
 				env['QUERY_STRING'.freeze] ||= ''
 				env['rack.errors'.freeze] = StringIO.new('')
+				# should unchain cookies from Array to String
+				env['HTTP_COOKIE'] = env['HTTP_COOKIE'].join '; ' if env['HTTP_COOKIE'].is_a?(Array)
 				env
 			end
 

data/lib/iodine/http/request.rb

@@ -28,7 +28,16 @@ module Iodine
 					elsif self.has_key?( key.to_s.to_sym)
 						key = key.to_s.to_sym
 					end
-					@response.set_cookie key, (val ? val.to_s.dup : nil)
+					@response.set_cookie key, (val.nil? ? nil : val.to_s.dup)
+					super
+				end
+				# overrides th [] method to allow Symbols and Strings to mix and match
+				def [] key
+					if key.is_a?(Symbol) && self.has_key?( key.to_s)
+						key = key.to_s
+					elsif self.has_key?( key.to_s.to_sym)
+						key = key.to_s.to_sym
+					end
 					super
 				end
 			end
@@ -118,7 +127,6 @@ module Iodine
 				self[:session]
 			end
 
-
 			# method recognition
 
 			HTTP_GET = 'GET'.freeze

data/lib/iodine/http/response.rb

@@ -203,9 +203,12 @@ module Iodine
 				raise 'Cannot set cookies after the headers had been sent.' if headers_sent?
 				name = name.to_s
 				raise 'Illegal cookie name' if name =~ COOKIE_NAME_REGEXP
-				params[:expires] = (Time.now - 315360000) unless value
-				value ||= 'deleted'.freeze
-				params[:expires] ||= (Time.now + 315360000) unless params[:max_age]
+				if value.nil?
+					params[:expires] = (Time.now - 315360000)
+					value = 'deleted'.freeze					
+				else
+					params[:expires] ||= (Time.now + 315360000) unless params[:max_age]
+				end
 				params[:path] ||= '/'.freeze
 				value = Iodine::Http::Request.encode_url(value)
 				if params[:max_age]
@@ -328,6 +331,29 @@ module Iodine
 				end
 			end
 
+			# This will return an array of cookie settings to be appended to `set-cookie` headers.
+			def extract_cookies
+				unless @cookies.frozen?
+					# remove old flash cookies
+					@request.cookies.keys.each do |k|
+						if k.to_s.start_with? 'magic_flash_'.freeze
+							set_cookie k, nil
+							flash.delete k
+						end
+					end
+					#set new flash cookies
+					@flash.each do |k,v|
+						set_cookie "magic_flash_#{k.to_s}", v
+					end
+					@cookies.freeze
+					# response.cookies.set_response nil
+					@flash.freeze
+				end
+				[].tap do |arr|
+					@cookies.each {|k, v| arr << "#{k.to_s}=#{v.to_s}"}
+				end
+			end
+
 			protected
 
 			# Sets the http streaming flag and sends the responses headers, so that the response could be handled asynchronously.

data/lib/iodine/http/websockets.rb

@@ -10,7 +10,6 @@ module Iodine
 			end
 			# continue to initialize the websocket protocol.
 			def on_open
-				set_timeout 45
 				@parser = {body: '', stage: 0, step: 0, mask_key: [], len_bytes: []}
 				set_timeout = self.class.default_timeout
 				@handler.on_open if @handler.respond_to? :on_open

data/lib/iodine/protocol.rb

@@ -58,7 +58,7 @@ module Iodine
 		## functionality and helpers
 
 
-		# returns true id the protocol is using an encrypted connection (the IO is an OpenSSL::SSL::SSLSocket).
+		# returns true if the protocol is using an encrypted connection (the IO is an OpenSSL::SSL::SSLSocket).
 		def ssl?
 			@io.is_a?(OpenSSL::SSL::SSLSocket) # io.npn_protocol
 		end
@@ -109,7 +109,7 @@ module Iodine
 			@id ||= @io.to_io.object_id.to_s(16)
 		end
 
-		# returns an [Enumerable](http://ruby-doc.org/core-2.2.3/Enumerable.html) with all the active connections.
+		# @return [Enumerable] returns an Enumerable with all the active connections (instances of THIS Protocol or it's children).
 		#
 		# if a block is passed, than this method exceutes the block.
 		def self.each

data/lib/iodine/settings.rb

@@ -23,14 +23,22 @@ module Iodine
 		@spawn_count = count
 	end
 
-	# Sets the server port. Defaults to the runtime `-p` argument, or the ENV['PORT'] or 3000 (in this order).
+	# Sets Iodine's server port. Defaults to the command line `-p` argument, or the ENV['PORT'] or 3000 (in this order).
 	def port= port
 		@port = port
 	end
-	# Sets the IP binding address. Defaults to the runtime `-ip` argument, or the ENV['IP'] or 0.0.0.0 (in this order).
+	# Gets Iodine's server port. Defaults to the command line `-p` argument, or the ENV['PORT'] or 3000 (in this order).
+	def port
+		@port
+	end
+	# Sets the IP binding address. Defaults to the command line `-ip` argument, or the ENV['IP'] or 0.0.0.0 (in this order).
 	def bind= address
 		@bind = address
 	end
+	# Gets the IP binding address. Defaults to the command line `-ip` argument, or the ENV['IP'] or 0.0.0.0 (in this order).
+	def bind
+		@bind
+	end
 
 	# Sets the Protocol the Iodine Server will use. Should be a child of {Iodine::Protocol}. Defaults to nil (no server).
 	#
@@ -45,6 +53,7 @@ module Iodine
 	end
 
 	# Sets the SSL flag, so that Iodine will require that new connection be encrypted.
+	# Defaults to false unless the `ssl` command line flag is present.
 	def ssl= required
 		@ssl = required && true
 	end

data/lib/iodine/version.rb

@@ -1,3 +1,3 @@
 module Iodine
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iodine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,10 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/core_http_test
+- bin/echo
+- bin/em playground
+- bin/hello_world
 - bin/setup
 - iodine.gemspec
 - lib/iodine.rb
@@ -89,10 +93,6 @@ files:
 - lib/iodine/timers.rb
 - lib/iodine/version.rb
 - lib/rack/handler/iodine.rb
-- manual tests/core_http_test
-- manual tests/echo
-- manual tests/em playground
-- manual tests/hello_world
 homepage: https://github.com/boazsegev/iodine
 licenses:
 - MIT