warchat 0.0.1 → 0.0.2

data/lib/warchat/chat/client.rb

@@ -24,7 +24,6 @@ module Warchat
       end
 
       def session_establish response
-        puts 'Session Established'
         on_establish.andand.call(response)
       end
 
@@ -57,7 +56,7 @@ module Warchat
       def chat response
         response.extend(ChatResponse)
         if response.ack?
-          puts("chat ack")
+          
         elsif response.message?
           message = Message.new(response)
           on_message.andand.call(message)
@@ -76,8 +75,6 @@ module Warchat
       end
 
       def keep_alive
-        puts "Sending 'keep-alive'"
-
         request = Warchat::Network::Request("/ah-mail")
         request["r"] = realm
         request["cn"] = name

data/lib/warchat/chat/message.rb

@@ -12,15 +12,17 @@ module Warchat
       CHAT_MSG_TYPE_OFFICER_CHAT = "officer_chat"
       CHAT_MSG_TYPE_WHISPER = "whisper"
 
-      attr_reader :type,:body,:from_type,:character_id,:from
-
+      attr_reader :type,:body,:from_type,:character_id
+      
       def initialize response
         @type = response["messageType"]
         @body = response['body']
         @from = response["from"]
-        @from_type = from["chatIdType"]
-
-        @character_id = from["characterId"]
+        if @from
+          @from_type = from["chatIdType"]
+          @character_id = from["characterId"]
+          @character_name = from['characterName']
+        end
       end
 
       def character_name

data/lib/warchat/network/connection.rb

@@ -38,6 +38,7 @@ module Warchat
           @closed = true
           @socket.close
         end     
+        [@request_thread,@response_thread].each &:join
       end
 
       def is_closed? 

data/lib/warchat/network/session.rb

@@ -51,12 +51,10 @@ module Warchat
 
       def stage_1 response
         proof = @srp.auth1_proof(response["user"], @password[0..15].upcase, response["salt"], response["B"])
-        puts("sending client proof: 0x#{@srp.unpack_int(proof).to_s(16)} length: #{proof.length}")
         send_request(Request.new("/authenticate2",:clientProof=>proof))
       end
 
       def stage_2 response
-        puts("sending client proof2")
         send_request(Request.new("/authenticate2",:clientProof=>Warchat::ByteString.new("\000")))
       end
       
@@ -66,7 +64,6 @@ module Warchat
       end
 
       def connection_receive response
-        puts response.inspect
         m = "stage_#{response['stage']}".to_sym
         if response.ok?
           respond_to? m and send(m,response) or on_receive.andand.call(response)

data/lib/warchat/version.rb

@@ -1,3 +1,3 @@
 module Warchat  
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: warchat
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Zachary Gavin