net-irc 0.0.2 → 0.0.3

data/ChangeLog

@@ -1,18 +1,29 @@
-ChangeLog of http://svn.coderepos.org/share/lang/ruby/net-irc/trunk
+2008-06-14 cho45
+
+	* [bug]:
+		Fixed examples. (twitter, wassr, lingr gateways)
+	* [release]:
+		Released 0.0.3
+
+2008-02-06 cho45
+
+	* [release] @5832:
+		Released 0.0.2
+
 
 2008-02-01 cho45
 
 	* [bug] @5986:
-		Fix to destroy closed stream. 
+		Fixed to destroy closed stream.
 
 2008-01-31 cho45
 
 	* [new] @5939:
-		Add client example. 
+		Added client example.
 
 	* [new] @5929:
-		Update tests.
-		Allow lame prefix in RPL_WELCOME (like freenode) 
+		Updated tests.
+		Made allow lame prefix in RPL_WELCOME (like freenode) 
 
 2008-01-29 cho45
 
@@ -23,5 +34,5 @@ ChangeLog of http://svn.coderepos.org/share/lang/ruby/net-irc/trunk
 		Net::IRC::Server の修正に追従できていなかった
 
 	* [release] @5832:
-		Release 0.0.1
+		Released 0.0.1
 

data/Rakefile

@@ -117,11 +117,6 @@ Rake::ShipitTask.new do |s|
 	s.Step.new {
 		system("svn", "up")
 	}.and {}
-	s.Step.new {
-		raise "changelog-with-hatenastar.rb is not found" unless system("which", "changelog-with-hatenastar.rb")
-	}.and {
-		system("changelog-with-hatenastar.rb > ChangeLog")
-	}
 	s.ChangeVersion "lib/net/irc.rb", "VERSION"
 	s.Commit
 	s.Task :clean, :package

data/examples/lig.rb

@@ -69,6 +69,10 @@ nickname management on client.
 
 Ruby's by cho45
 
+## 備考
+
+このクライアントで 1000speakers への応募はできません。lingr.com から行ってください。
+
 =end
 
 $LOAD_PATH << File.dirname(__FILE__)
@@ -79,6 +83,7 @@ require "rubygems"
 require "lingr"
 require "net/irc"
 require "pit"
+require "mutex_m"
 
 
 class LingrIrcGateway < Net::IRC::Server::Session
@@ -93,11 +98,12 @@ class LingrIrcGateway < Net::IRC::Server::Session
 	def initialize(*args)
 		super
 		@channels = {}
+		@channels.extend(Mutex_m)
 	end
 
 	def on_user(m)
 		super
-		@real, @copts = @real.split(/\s+/)
+		@real, *@copts = @real.split(/\s+/)
 		@copts ||= []
 
 		# Tiarra sends prev nick when reconnects.
@@ -111,11 +117,35 @@ class LingrIrcGateway < Net::IRC::Server::Session
 		@lingr = Lingr::Client.new(@opts.api_key)
 		@lingr.create_session('human')
 		@lingr.login(@real, @pass)
+		@session_observer = Thread.start do
+			loop do
+				begin
+					@log.info "Verifying session..."
+					@log.info "Verifed session => #{@lingr.verify_session.inspect}"
+				rescue Lingr::Client::APIError => e
+					@log.info "Verify session raised APIError<#{e.code}:#{e.message}>. Try to re-create session."
+					@lingr.create_session('human')
+					@lingr.login(@real, @pass)
+				rescue Exception => e
+					@log.info "Error on verify_session: #{e.inspect}"
+				end
+				sleep 9 * 60
+			end
+		end
 		@user_info = @lingr.get_user_info
 
 		prefix = make_ids(@user_info)
 		@user_info["prefix"] = prefix
 		post @prefix, NICK, prefix.nick
+
+	rescue Lingr::Client::APIError => e
+		case e.code
+		when 105
+			post nil, ERR_PASSWDMISMATCH, @nick, "Password incorrect"
+		else
+			log "Error: #{e.code}: #{e.message}"
+		end
+		finish
 	end
 
 	def on_privmsg(m)
@@ -127,7 +157,12 @@ class LingrIrcGateway < Net::IRC::Server::Session
 		end
 	rescue Lingr::Client::APIError => e
 		log "Error: #{e.code}: #{e.message}"
-		log "Coundn't say to #{channel}."
+		log "Coundn't say to #{target}."
+		on_join(Message.new(nil, "JOIN", [target])) if e.code == 102 # invalid session
+	end
+
+	def on_notice(m)
+		on_privmsg(m)
 	end
 
 	def on_whois(m)
@@ -148,7 +183,7 @@ class LingrIrcGateway < Net::IRC::Server::Session
 			real_name   = info["description"].to_s
 			server_info = "Lingr: type:#{info["client_type"]} source:#{info["source"]}"
 			channels    = [info["client_type"] == "human" ? "@#{chan}" : chan]
-			me          = @user_info["nick"]
+			me          = @user_info["prefix"]
 
 			post nil, RPL_WHOISUSER,     me.nick, prefix.nick, prefix.user, prefix.host, "*", real_name
 			post nil, RPL_WHOISSERVER,   me.nick, prefix.nick, prefix.host, server_info
@@ -159,13 +194,18 @@ class LingrIrcGateway < Net::IRC::Server::Session
 		else
 			post nil, ERR_NOSUCHNICK, me.nick, nick, "No such nick/channel"
 		end
+	rescue Exception => e
+		@log.error e.inspect
+		e.backtrace.each do |l|
+			@log.error "\t#{l}"
+		end
 	end
 
 	def on_who(m)
 		channel = m.params[0]
 		return unless channel
 
-		info = @channels[channel.downcase]
+		info = @channels.synchronize { @channels[channel.downcase] }
 		me   = @user_info["prefix"]
 		res  = @lingr.get_room_info(info[:chan_id], nil, info[:password])
 		res["occupants"].each do |o|
@@ -189,10 +229,16 @@ class LingrIrcGateway < Net::IRC::Server::Session
 				res = @lingr.enter_room(channel.sub(/^#/, ""), @nick, password)
 				res["password"] = password
 
-				create_observer(channel, res)
+				@channels.synchronize do
+					create_observer(channel, res)
+				end
 			rescue Lingr::Client::APIError => e
 				log "Error: #{e.code}: #{e.message}"
 				log "Coundn't join to #{channel}."
+				if e.code == 102
+					log "Invalid session... prompt the client to reconnect"
+					finish
+				end
 			rescue Exception => e
 				@log.error e.inspect
 				e.backtrace.each do |l|
@@ -216,6 +262,22 @@ class LingrIrcGateway < Net::IRC::Server::Session
 		else
 			post nil, ERR_NOSUCHCHANNEL, prefix.nick, channel, "No such channel"
 		end
+	rescue Lingr::Client::APIError => e
+		unless e.code == 102
+			log "Error: #{e.code}: #{e.message}"
+			log "Coundn't say to #{target}."
+		end
+	end
+
+	def on_disconnected
+		@channels.each do |k, info|
+			info[:observer].kill
+		end
+		@session_observer.kill rescue nil
+		begin
+			@lingr.destroy_session
+		rescue
+		end
 	end
 
 	private
@@ -223,10 +285,12 @@ class LingrIrcGateway < Net::IRC::Server::Session
 	def create_observer(channel, response)
 		Thread.start(channel, response) do |chan, res|
 			myprefix = @user_info["prefix"]
-			post server_name, TOPIC, chan, "#{res["room"]["url"]} #{res["room"]["description"]}"
+			if @channels[chan.downcase]
+				@channels[chan.downcase][:observer].kill rescue nil
+			end
 			@channels[chan.downcase] = {
 				:ticket   => res["ticket"],
-				:counter  => res["counter"],
+				:counter  => res["room"]["counter"],
 				:o_id     => res["occupant_id"],
 				:chan_id  => res["room"]["id"],
 				:password => res["password"],
@@ -237,6 +301,8 @@ class LingrIrcGateway < Net::IRC::Server::Session
 				:hcounter => 0,
 				:observer => Thread.current,
 			}
+
+			post server_name, TOPIC, chan, "#{res["room"]["url"]} #{res["room"]["description"]}"
 			post myprefix, JOIN, channel
 			post server_name, MODE, channel, "+o", myprefix.nick
 			post nil, RPL_NAMREPLY,   myprefix.nick, "=", chan, @channels[chan.downcase][:users].map{|k,v|
@@ -244,12 +310,11 @@ class LingrIrcGateway < Net::IRC::Server::Session
 			}.join(" ")
 			post nil, RPL_ENDOFNAMES, myprefix.nick, chan, "End of NAMES list"
 
-			first = true
 			info = @channels[chan.downcase]
 			while true
 				begin
+					@log.debug "observe_room<#{info[:counter]}><#{chan}> start <- #{myprefix}"
 					res = @lingr.observe_room info[:ticket], info[:counter]
-					@log.debug "observe_room<#{chan}> returned"
 
 					info[:counter] = res["counter"] if res["counter"]
 
@@ -260,13 +325,9 @@ class LingrIrcGateway < Net::IRC::Server::Session
 
 						case m["type"]
 						when "user"
-							if first
-								post prefix, NOTICE, chan, m["text"]
-							else
-								# Don't send my messages.
-								unless info[:o_id] == o_id
-									post prefix, PRIVMSG, chan, m["text"]
-								end
+							# Don't send my messages.
+							unless info[:o_id] == o_id
+								post prefix, PRIVMSG, chan, m["text"]
 							end
 						when "private"
 							# TODO not sent from lingr?
@@ -330,7 +391,6 @@ class LingrIrcGateway < Net::IRC::Server::Session
 					end
 
 
-					first = false
 				rescue Lingr::Client::APIError => e
 					case e.code
 					when 100
@@ -343,21 +403,29 @@ class LingrIrcGateway < Net::IRC::Server::Session
 						@log.fatal "BUG: API returns invalid response format. JSON is unsupported?"
 						exit 1
 					when 109
-						@log.error "BUG: API returns invalid ticket. Part this channel..."
-						on_part(Message.new("", PART, [chan, res["error"]["message"]]))
+						@log.error "Error: API returns invalid ticket. Rejoin this channel..."
+						on_part(Message.new(nil, PART, [chan, res["error"]["message"]]))
+						on_join(Message.new(nil, JOIN, [chan, info["password"]]))
 					when 114
 						@log.fatal "BUG: API returns no counter parameter."
 						exit 1
 					when 120
-						@log.error "BUG: API returns invalid encoding. But continues."
+						@log.error "Error: API returns invalid encoding. But continues."
 					when 122
-						@log.fatal "BUG: API returns repeated counter"
-						exit 1
+						@log.error "Error: API returns repeated counter. But continues."
+						info[:counter] += 10
+						log "Error: repeated counter. Some message may be ignored..."
 					else
 						# may be socket error?
 						@log.debug "observe failed : #{res.inspect}"
 						log "Error: #{e.code}: #{e.message}"
 					end
+				rescue Timeout::Error
+					# pass
+				rescue JSON::ParserError => e
+					@log.error e
+					info[:counter] += 10
+					log "Error: JSON::ParserError Some message may be ignored..."
 				rescue Exception => e
 					@log.error e.inspect
 					e.backtrace.each do |l|
@@ -403,6 +471,7 @@ if __FILE__ == $0
 		:host  => "localhost",
 		:log   => nil,
 		:debug => false,
+		:foreground => false,
 	}
 
 	OptionParser.new do |parser|
@@ -436,6 +505,11 @@ if __FILE__ == $0
 				opts[:debug] = true
 			end
 
+			on("-f", "--foreground", "run foreground") do |foreground|
+				opts[:log]        = $stdout
+				opts[:foreground] = true
+			end
+
 			parse!(ARGV)
 		end
 	end
@@ -443,14 +517,14 @@ if __FILE__ == $0
 	opts[:logger] = Logger.new(opts[:log], "daily")
 	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
 
-	def daemonize(debug=false)
-		return yield if $DEBUG || debug
+	def daemonize(foreground=false)
+		trap("SIGINT")  { exit! 0 }
+		trap("SIGTERM") { exit! 0 }
+		trap("SIGHUP")  { exit! 0 }
+		return yield if $DEBUG || foreground
 		Process.fork do
 			Process.setsid
 			Dir.chdir "/"
-			trap("SIGINT")  { exit! 0 }
-			trap("SIGTERM") { exit! 0 }
-			trap("SIGHUP")  { exit! 0 }
 			File.open("/dev/null") {|f|
 				STDIN.reopen  f
 				STDOUT.reopen f
@@ -465,7 +539,7 @@ if __FILE__ == $0
 		"api_key" => "API key of Lingr"
 	})["api_key"] unless opts[:api_key]
 
-	daemonize(opts[:debug]) do
+	daemonize(opts[:debug] || opts[:foreground]) do
 		Net::IRC::Server.new(opts[:host], opts[:port], LingrIrcGateway, opts).start
 	end
 

data/examples/lingr.rb

@@ -21,6 +21,7 @@ require "rubygems"
 require "net/http"
 require "json"
 require "uri"
+require "timeout"
 
 module Lingr
 	class Client
@@ -49,7 +50,7 @@ module Lingr
 			@api_key   = api_key
 			@host      = hostname
 			@verbosity = verbosity
-			@timeout   = 120
+			@timeout   = 60
 		end
 
 		# Create a new API session
@@ -243,7 +244,9 @@ module Lingr
 				raise ClientError, "not in a session"
 			end
 
-			response = JSON.parse(self.send(method, url_for(path), parameters.merge({ :format => 'json' })))
+			response = Timeout.timeout(@timeout) {
+				JSON.parse(self.send(method, url_for(path), parameters.merge({ :format => 'json' })))
+			}
 
 			unless success?(response)
 				raise APIError, response["error"]
@@ -262,27 +265,17 @@ module Lingr
 			q = params.inject("?") {|s, p| s << "#{p[0].to_s}=#{URI.encode(p[1].to_s, /./)}&"}.chop
 			path << q if q.length > 0
 
-			begin
-				Net::HTTP.start(uri.host, uri.port) do |http| 
-					http.read_timeout = @timeout
-					req = Net::HTTP::Get.new(path)
-					req.basic_auth(uri.user, uri.password) if uri.user
-					parse_result http.request(req)
-			end
-			rescue Exception
-				warn "exception on HTTP GET: #{$!}"
-				nil
+			Net::HTTP.start(uri.host, uri.port) do |http|
+				http.read_timeout = @timeout
+				req = Net::HTTP::Get.new(path)
+				req.basic_auth(uri.user, uri.password) if uri.user
+				parse_result http.request(req)
 			end
 		end
 
 		def post(url, params)
 			if !params.find {|p| p[1].is_a?(Hash)}
-				begin
-					parse_result Net::HTTP.post_form(URI.parse(url), params)
-				rescue Exception
-					warn "exception on HTTP POST: #{$!}"
-					nil
-				end
+				parse_result Net::HTTP.post_form(URI.parse(url), params)
 			else
 				boundary = 'lingr-api-client' + (0x1000000 + rand(0x1000000).to_s(16))
 
@@ -305,29 +298,29 @@ module Lingr
 				}.join('') + "--#{boundary}--\r\n"
 
 				uri = URI.parse(url)
-				begin
-					Net::HTTP.start(uri.host, uri.port) do |http|
-						http.read_timeout = @timeout
-						parse_result http.post2(uri.path, query, "Content-Type" => "multipart/form-data; boundary=#{boundary}")
-					end
-				rescue Exception
-					warn "exception on multipart POST: #{$!}"
-					nil
+				Net::HTTP.start(uri.host, uri.port) do |http|
+					http.read_timeout = @timeout
+					parse_result http.post2(uri.path, query, "Content-Type" => "multipart/form-data; boundary=#{boundary}")
 				end
 			end
 		end
 
-			def parse_result(result)
-				return nil if !result || result.code != '200' || (!result['Content-Type'] || result['Content-Type'].index('text/javascript') != 0)
-				result.body
-			end
+		def parse_result(result)
+			return nil if !result || result.code != '200' || (!result['Content-Type'] || result['Content-Type'].index('text/javascript') != 0)
+#			puts
+#			puts
+#			puts result.body
+#			puts
+#			puts
+			result.body
+		end
 
-			def success?(response)
-				return false if !response
-				response["status"] and response["status"] == 'ok'
-			end
+		def success?(response)
+			return false if !response
+			response["status"] and response["status"] == 'ok'
+		end
 
 
-			@@PATH_BASE = 'api/'
-		end
+		@@PATH_BASE = 'api/'
+	end
 end