em-msn 0.1 → 0.2

data/lib/msn/messenger.rb

@@ -2,6 +2,17 @@ class Msn::Messenger
   attr_reader :username
   attr_reader :password
 
+  class << self
+    attr_accessor :logger
+
+    def log_info(message)
+      return unless logger
+
+      logger.info message
+    end
+  end
+
+
   def initialize(username, password)
     @username = username
     @password = password
@@ -52,11 +63,6 @@ class Msn::Messenger
     @notification_server.get_contacts
   end
 
-  def send_contact_command(email, command, list)
-    username, domain = email.split '@', 2
-    @notification_server.send_payload_command_and_wait command, %Q(<ml><d n="#{domain}"><c n="#{username}" t="1" l="#{list}" /></d></ml>)
-  end
-
   def on_ready(&handler)
     @on_ready_handler = handler
   end
@@ -73,6 +79,10 @@ class Msn::Messenger
     @on_message_handler = handler
   end
 
+  def on_message_ack(&handler)
+    @on_message_ack_handler = handler
+  end
+
   def on_contact_request(&handler)
     @on_contact_request = handler
   end
@@ -81,10 +91,23 @@ class Msn::Messenger
     @notification_server.send_message email, text
   end
 
+  def close
+    @notification_server.close_connection
+  end
+
+  def send_contact_command(email, command, list)
+    username, domain = email.split '@', 2
+    @notification_server.send_payload_command_and_wait command, %Q(<ml><d n="#{domain}"><c n="#{username}" t="1" l="#{list}" /></d></ml>)
+  end
+
   def accept_message(message)
     call_handler @on_message_handler, message
   end
 
+  def accept_message_ack(id, status)
+    call_handler @on_message_ack_handler, id, status
+  end
+
   def contact_request(email, display_name)
     call_handler @on_contact_request, email, display_name
   end
@@ -106,13 +129,5 @@ class Msn::Messenger
       Fiber.new { handler.call(*args) }.resume
     end
   end
-
-  def self.debug
-    @debug
-  end
-
-  def self.debug=(debug)
-    @debug = debug
-  end
 end
 

data/lib/msn/nexus.rb

@@ -52,8 +52,8 @@ class Msn::Nexus
 
     # Check invalid login
     fault = xml.xpath("//S:Fault/faultstring")
-    if fault
-      raise Msn::AuthenticationError.new(fault.text)
+    if fault.length > 0
+      raise Msn::AuthenticationError.new(fault.first.text)
     end
 
     rstr = xml.xpath "//wst:RequestSecurityTokenResponse[wsp:AppliesTo/wsa:EndpointReference/wsa:Address='messengerclear.live.com']", Namespaces

data/lib/msn/notification_server.rb

@@ -11,6 +11,9 @@ class Msn::NotificationServer < EventMachine::Connection
     @guid = Guid.new.to_s
     @switchboards = {}
 
+    @message_id = 1
+    @message_ids = {}
+
     on_event 'ADL' do |header, data|
       data = Nokogiri::XML(data)
       domain = data.xpath('//ml/d').first['n']
@@ -26,21 +29,31 @@ class Msn::NotificationServer < EventMachine::Connection
   end
 
   def send_message(email, text)
+    message_id = @message_id
+    @message_id += 1
+
     switchboard = @switchboards[email]
     if switchboard
-      switchboard.send_message text
+      trid = switchboard.send_message text
+      @message_ids[trid] = message_id
     else
       Fiber.new do
         response = xfr "SB"
         switchboard = create_switchboard email, response[3]
         switchboard.on_event 'JOI' do
           switchboard.clear_event 'JOI'
-          switchboard.send_message text
+          trid = switchboard.send_message text
+          @message_ids[trid] = message_id
         end
         switchboard.usr username_guid, response[5]
-        switchboard.cal email
+        cal_response = switchboard.cal email
+        if cal_response[0] == '217'
+          messenger.accept_message_ack message_id, :offline
+        end
       end.resume
     end
+
+    message_id
   end
 
   def username
@@ -137,6 +150,12 @@ class Msn::NotificationServer < EventMachine::Connection
   def create_switchboard(email, host_and_port)
     host, port = host_and_port.split(':')
     switchboard = EM.connect host, port, Msn::Switchboard, messenger
+    switchboard.on_event 'ACK' do |header|
+      notify_ack header[1].to_i, :ack
+    end
+    switchboard.on_event 'NAK' do |header|
+      notify_ack header[1].to_i, :nak
+    end
     switchboard.on_event 'BYE' do |header|
       destroy_switchboard email if header[1] =~ /#{email}/
     end
@@ -148,6 +167,11 @@ class Msn::NotificationServer < EventMachine::Connection
     switchboard.close_connection if switchboard
   end
 
+  def notify_ack(trid, status)
+    id = @message_ids.delete(trid)
+    messenger.accept_message_ack id, status if id
+  end
+
   def unbind
     if @reconnect_host
       reconnect @reconnect_host, @reconnect_port.to_i

data/lib/msn/protocol.rb

@@ -7,7 +7,7 @@ module Msn::Protocol
   end
 
   def receive_line(line)
-    puts "<< #{line}" if Msn::Messenger.debug
+    Msn::Messenger.log_info "<< #{line}"
 
     pieces = line.split(' ')
 
@@ -47,7 +47,7 @@ module Msn::Protocol
   end
 
   def receive_binary_data(data)
-    puts "<<* #{data}" if Msn::Messenger.debug
+    Msn::Messenger.log_info "<<* #{data}"
 
     handle_event @header, data
   end
@@ -91,9 +91,10 @@ module Msn::Protocol
   end
 
   def send_command_internal(text)
-    puts ">> #{text}" if Msn::Messenger.debug
+    Msn::Messenger.log_info ">> #{text}"
     send_data text
     @trid += 1
+    @trid - 1
   end
 
   def on_event(kind, &block)

data/lib/msn/switchboard.rb

@@ -17,7 +17,7 @@ class Msn::Switchboard < EventMachine::Connection
   end
 
   def send_message(text)
-    send_payload_command "MSG", "N", "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nUser-Agent: pidgin/2.10.5devel\r\nX-MMS-IM-Format: FN=Segoe%20UI; EF=; CO=0; PF=0; RL=0\r\n\r\n#{text}"
+    send_payload_command "MSG", "A", "MIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nUser-Agent: pidgin/2.10.5devel\r\nX-MMS-IM-Format: FN=Segoe%20UI; EF=; CO=0; PF=0; RL=0\r\n\r\n#{text}"
   end
 end
 

data/lib/msn/version.rb

@@ -1,3 +1,3 @@
 module Msn
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-msn
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors: