Better topic handling and program interuption

Author: nark

.gitignore

@@ -18,6 +18,7 @@ _yardoc/
 doc/
 rdoc/
 .yardoc
+log/*
 
 ## Environment normalisation:
 /.bundle/

bin/rwire

@@ -39,14 +39,41 @@ class Window
     content = getstr
 
     if content.length > 0
-    	message = Wired::Message.new(:name => "wired.chat.send_say", :spec => @client.spec)
-    	message.add_parameter("wired.chat.id", 1)
-    	message.add_parameter("wired.chat.say", content)
-
-      @client.send_message(message)
+    	message = parse_input(content)
+      @client.send_message(message) if message
+      redraw
     end
   end
 
+  def parse_input(string)
+  	message = nil
+
+  	if string[0] == "/"
+  		reststring = string.split(' ')[1..-1].join(' ')
+
+  		if string.start_with? "/help"
+
+
+  		elsif string.start_with? "/me"
+  			message = Wired::Message.new(:name => "wired.chat.send_me", :spec => @client.spec)
+				message.add_parameter("wired.chat.id", 1)
+				message.add_parameter("wired.chat.me", reststring)
+
+  		elsif string.start_with? "/topic"
+  			message = Wired::Message.new(:name => "wired.chat.set_topic", :spec => @client.spec)
+				message.add_parameter("wired.chat.id", 1)
+				message.add_parameter("wired.chat.topic.topic", reststring)
+
+  		end
+  	else
+  		message = Wired::Message.new(:name => "wired.chat.send_say", :spec => @client.spec)
+			message.add_parameter("wired.chat.id", 1)
+			message.add_parameter("wired.chat.say", string)
+  	end
+
+		return message
+  end
+
   def redraw
     draw_text_field
     draw_messages
@@ -112,8 +139,10 @@ class RWire < Thor
 
 
   def connect(hostname, login="guest", password="")
-  	# Set debug level
-		Wired::Log.level = :info
+  	# Logging setup (remove stdout and add rwire.log file)
+  	Wired::Log.remove_appenders Logging.appenders.stdout
+  	Wired::Log.add_appenders Logging.appenders.file('log/rwire.log')
+		Wired::Log.level = :debug
 
 		# Create a Wired Spec object based on "wired.xml" file
 		spec = Wired::Spec.new
@@ -133,7 +162,14 @@ class RWire < Thor
 		# Connect the client to the url
 		exit 0 unless client.connect url, window		
 
-    window.start
+    begin
+      window.start
+    rescue Interrupt
+      client.disconnect
+      warn "\nYou have been disconnected from #{client.server.name}"
+      exit 1
+    end
+
   end
 end
 

lib/wired.rb

@@ -5,6 +5,7 @@
 require_relative 'wired/server'
 require_relative 'wired/socket'
 require_relative 'wired/spec'
+require_relative 'wired/topic'
 require_relative 'wired/user'
 require_relative 'wired/url'
 require_relative 'wired/wired.xml'

lib/wired/client.rb

@@ -11,6 +11,7 @@ class Client
 		attr_accessor	:icon
 		attr_accessor	:socket
 		attr_accessor :server
+		attr_accessor :topic
 
 		attr_accessor	:connected_block
 		attr_accessor	:receive_block
@@ -120,6 +121,8 @@ def handle_message(message)
 					wired_chat_say_or_me message
 				when "wired.chat.me"
 					wired_chat_say_or_me message
+				when "wired.chat.topic"
+					wired_chat_topic message
 			end
 		end
 
@@ -198,6 +201,19 @@ def wired_chat_say_or_me(message)
 
 
 
+		def wired_chat_topic(message)
+			has_topic = (@topic == nil) ? false : true
+
+			@topic = Wired::Topic.new(message) if message
+			now 		= DateTime.now.strftime("%Y/%m/%d %H:%M")
+
+			if has_topic
+				listeners_print "#{now} << #{@topic.nick} changed topic to #{@topic.topic} >>"
+			else
+				listeners_print "Server Topic : #{@topic.topic} by #{@topic.nick}"
+			end
+		end
+
 
 
 
@@ -213,6 +229,17 @@ def listen
 
 
 
+		def ping
+		  Thread.new do
+		    loop do
+		    	send_message Wired::Message.new(:spec => @spec, :name => "wired.send_ping")
+					sleep 30 
+		    end
+		  end
+		end
+
+
+
 		def listening?
 		  @listening == true
 		end

lib/wired/logger.rb

@@ -2,6 +2,6 @@ module Wired
 	require 'logging'
 
 	# @return [Logging] The logger used internally by the library
-	Log 			= Logging.logger(STDOUT)
+	Log 			= Logging.logger['wired']
 	Log.level 		= :debug
 end

lib/wired/socket.rb

@@ -106,6 +106,7 @@ module Cipher
 
 		# @return [Boolean] Compression enabled internally
 		attr_reader :compression_enabled
+		attr_reader :compression_configured
 
 		# @return [Boolean] Encryption enabled internally
 		attr_reader :encryption_enabled
@@ -181,7 +182,7 @@ def connect(handshake = true)
 			end
 
 			# create a new socket for connection
-			@socket  	= Socket::Socket.new(:INET, :STREAM)
+			@socket  		= Socket::Socket.new(:INET, :STREAM)
 			remote_addr = Socket::Socket.pack_sockaddr_in(@port, @hostname)
 
 			@socket.set_encoding("ASCII-8BIT")
@@ -207,6 +208,11 @@ def connect(handshake = true)
 					return false 
 				end
 
+				# configure compression
+				@compression_enabled = true if @compression_configured
+
+				# configure checksum
+
 				# perform the Wired key exange
 				if !connect_key_exange(nil, nil)
 					Wired::Log.error "Handshake failed to #{@hostname}:#{@port}" 
@@ -275,16 +281,16 @@ def read
 
   					if binary.length > 0
 	  					# decompress data
-						if @compression_enabled
-							binary = inflate_data(binary) 
-						end
+							if @compression_enabled
+								binary = inflate_data(binary) 
+							end
 
-						# decrypt data
-						if @encryption_enabled
-							binary = @ssl_cipher.decrypt(binary)
-						end
+							# decrypt data
+							if @encryption_enabled
+								binary = @ssl_cipher.decrypt(binary)
+							end
 
-						# create message with binary data
+							# create message with binary data
 	  					message = Wired::Message.new(:spec => @spec, :binary => binary)
 
   						# internally handle the message (logging, errors, etc.)
@@ -428,15 +434,15 @@ def connect_handshake?
 			# get socket options
 			if(@serialization == Wired::Socket::Serialization::BINARY)
 				if(message.parameter("p7.handshake.compression") == 0)
-					@compression_enabled = true
+					@compression_configured = true
 				end
 
 				if(message.parameter("p7.handshake.encryption") != nil)
 					@cipher = message.parameter("p7.handshake.encryption").to_i
 				end
 			end
 
-			puts "@compression_enabled : #{@compression_enabled}"
+			puts "@compression_configured : #{@compression_configured}"
 
 			if(message.parameter("p7.handshake.compatibility_check") == false)
 				@remote_compatibility_check = false 
@@ -579,8 +585,6 @@ def send_compatibilit_check
 
 
 		def handle_message(message) 
-			return if !message
-
 			Wired::Log.debug "Received Message: " + message.name
 			handle_error message if message.name == "wired.error"
 		end
@@ -590,7 +594,7 @@ def handle_message(message)
 
 	    def handle_error(message)
 	    	Wired::Log.error "Wired Error: " + message.to_s
-			@errors.push message
+				@errors.push message
 	    end
 
 
@@ -630,7 +634,35 @@ def deflate_data(data)
 
 
 		def inflate_data(data)
-		  #return Zlib::Inflate.inflate(data, Zlib::DEFAULT_COMPRESSION)		  
+			puts "inflate_data"
+			puts "compressed_data : "+ data.unpack("H*").to_s
+
+			bytes									= nil
+			c_stream 							= Z_stream.new
+			c_stream.data_type 		= Z_UNKNOWN
+
+			data 									= Bytef.new(data)
+			data_length 					= data.length
+
+			(2..16).step(1) do |multiple|
+				compressed_length 	= data_length * (1 << multiple);
+				compressed_data 		= Bytef.new(0.chr * compressed_length)
+
+				c_stream.next_in  	= data
+		    c_stream.avail_in 	= data.length
+		    c_stream.next_out 	= compressed_data
+		    c_stream.avail_out 	= compressed_length
+
+		    err 		= inflate(c_stream, Z_FINISH)
+		    bytes   = compressed_data.buffer
+		    errend 	= deflateEnd(c_stream)
+
+		    puts "data : "+ bytes.unpack("H*").to_s
+
+		    break if err == Z_STREAM_END and enderr != Z_BUF_ERROR
+			end
+
+		  return bytes
 		end
 
 

lib/wired/topic.rb

@@ -0,0 +1,13 @@
+module Wired
+	class Topic
+		attr_accessor	:topic
+		attr_accessor	:nick
+		attr_accessor	:time
+
+		def initialize(message)
+			@nick 		= message.parameter("wired.user.nick")
+			@topic 		= message.parameter("wired.chat.topic.topic")
+			@time		 	= message.parameter("wired.chat.topic.time")
+		end
+	end
+end