meshchat 0.6.11 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6704e3fae4b8087d79dba4722e38249a252adb43
-  data.tar.gz: b617601966357d43e37cec0bdb84f6c3c22ecfde
+  metadata.gz: a669862d8119b09c7bfbf437c476aba8974bb349
+  data.tar.gz: 13d7944d37b968bc43c6fc57332b1e0296a62e36
 SHA512:
-  metadata.gz: 965d1330b0860323aefb6739e0834493a7878dd298c1ca46bf5a5df173a7834216d03507d916b7d6e855bdaac81b984ed729d6b168d605fd74ca8f880fb40401
-  data.tar.gz: fbb391de6550c6eb3a7bdf736739137b03398f1cb4767354ad79ed76803c4ad699a5e6735d8eaf53960ba51bd29271d05acaf61f0abd8486706429544f354254
+  metadata.gz: eb9df8e25b985e6d92b7e9fd70f053e770960ec29994dd104de7ba02fd84d0b97e93c4ad0c16d37510d8d5f09aa4fe5c7cb810f81c057dd367b8e11255e85619
+  data.tar.gz: 914be292200fe5b1309702fb36d5cca2e9eb3990b7895d5d498524ad565ae7ddbae1ab12ce1f4a072bbeeadbdd6d61223e55599c028d89c87e4ff13c98a4c8e7

data/lib/meshchat/cli.rb

@@ -11,6 +11,7 @@ require 'meshchat/command/whisper'
 require 'meshchat/command/exit'
 require 'meshchat/command/listen'
 require 'meshchat/command/stop_listening'
+require 'meshchat/command/send_disconnect'
 require 'meshchat/command/help'
 require 'meshchat/command/bind'
 require 'meshchat/command/online'
@@ -43,7 +44,8 @@ module MeshChat
       MeshChat::Command::Base::ONLINE => MeshChat::Command::Online,
       MeshChat::Command::Base::OFFLINE => MeshChat::Command::Offline,
       MeshChat::Command::Base::HELP => MeshChat::Command::Help,
-      MeshChat::Command::Base::BIND => MeshChat::Command::Bind
+      MeshChat::Command::Base::BIND => MeshChat::Command::Bind,
+      MeshChat::Command::Base::SEND_DISCONNECT => MeshChat::Command::SendDisconnect
     }
 
 
@@ -168,8 +170,14 @@ module MeshChat
       # close_server
       Display.info 'saving config...'
       Settings.save
+      Display.info 'notifying of disconnection...'
+      send_disconnect
       Display.alert "\n\nGoodbye.  \n\nThank you for using #{MeshChat.name}"
       exit
     end
+
+    def send_disconnect
+      MeshChat::Command::SendDisconnect.new('/senddisconnect')
+    end
   end
 end

data/lib/meshchat/command/base.rb

@@ -31,6 +31,7 @@ module MeshChat
       OFFLINE = 'offline'
       HELP = 'help'
       BIND = 'bind'
+      SEND_DISCONNECT = 'senddisconnect'
 
       def handle
         klass = CLI::COMMAND_MAP[command]

data/lib/meshchat/command/bind.rb

@@ -25,15 +25,18 @@ module MeshChat
           Display.alert 'Invalid selection'
           handle # repeat
         end
-
-
       end
 
       def ip_addresses
         local =  Socket.getifaddrs.map { |i| i.addr.ip_address if i.addr.ipv4? }.compact
         # get public
-        remote_ip = open('http://whatismyip.akamai.com').read
-        local << remote_ip
+        begin
+          remote_ip = open('http://whatismyip.akamai.com').read
+          local << remote_ip
+        rescue => e
+          Display.fatal e.message
+          Display.alert 'public ip lookup failed'
+        end
         local
       end
     end

data/lib/meshchat/command/send_disconnect.rb

@@ -0,0 +1,15 @@
+module MeshChat
+  class Command
+    class SendDisconnect < Command::Base
+      def self.description
+        'sends a disconnect message to all users'
+      end
+
+      def handle
+        Node.all.each do |n|
+          Net::Client.send(node: n, message: Message::Disconnect.new)
+        end
+      end
+    end
+  end
+end

data/lib/meshchat/config/settings.rb

@@ -8,7 +8,7 @@ module MeshChat
         'port' => '2008',
         'ip' => 'localhost',
         'uid' => '1',
-        'publicKey' => 'replace this'
+        'publickey' => 'replace this'
       }
 
       class << self
@@ -33,7 +33,7 @@ module MeshChat
           'alias' => self['alias'],
           'location' => location,
           'uid' => self['uid'],
-          'publicKey' => public_key
+          'publickey' => public_key
         }
       end
 
@@ -54,11 +54,11 @@ module MeshChat
       end
 
       def public_key
-        self['publicKey']
+        self['publickey']
       end
 
       def private_key
-        self['privatKey']
+        self['privatkey']
       end
 
       # generates 32 bytes
@@ -69,14 +69,14 @@ module MeshChat
 
       def generate_keys
         @key_pair = OpenSSL::PKey::RSA.new(2048)
-        self['publicKey'] = @key_pair.public_key.to_pem
-        self['privateKey'] = @key_pair.to_pem
+        self['publickey'] = @key_pair.public_key.to_pem
+        self['privatekey'] = @key_pair.to_pem
         Display.success 'new keys generated'
       end
 
       def key_pair
         if !@key_pair && keys_exist?
-          @key_pair = OpenSSL::PKey::RSA.new(self['privateKey'] + self['publicKey'])
+          @key_pair = OpenSSL::PKey::RSA.new(self['privatekey'] + self['publickey'])
         end
         @key_pair
       end

data/lib/meshchat/message.rb

@@ -2,7 +2,7 @@ require 'meshchat/message/base'
 require 'meshchat/message/chat'
 require 'meshchat/message/ping'
 require 'meshchat/message/ping_reply'
-require 'meshchat/message/disconnection'
+require 'meshchat/message/disconnect'
 require 'meshchat/message/whisper'
 require 'meshchat/message/relay'
 require 'meshchat/message/node_list'
@@ -16,7 +16,7 @@ module MeshChat
     PING_REPLY = 'pingreply'
     WHISPER = 'whisper'
     RELAY = 'relay'
-    DISCONNECTION = 'disconnection'
+    DISCONNECT = 'disconnect'
 
     NODE_LIST = 'nodelist'
     NODE_LIST_HASH = 'nodelisthash'
@@ -25,7 +25,7 @@ module MeshChat
     TYPES = {
       CHAT => Chat,
       WHISPER => Whisper,
-      DISCONNECTION => Disconnection,
+      DISCONNECT => Disconnect,
       PING => Ping,
       PING_REPLY => PingReply,
       NODE_LIST => NodeList,

data/lib/meshchat/message/base.rb

@@ -62,6 +62,10 @@ module MeshChat
         MeshChat.version
       end
 
+      def sender
+        payload['sender']
+      end
+
       # shows the message
       # should be used locally, before *sending* a message
       def display

data/lib/meshchat/message/{disconnection.rb → disconnect.rb}

@@ -1,6 +1,6 @@
 module MeshChat
   module Message
-    class Disconnection < Base
+    class Disconnect < Base
       def display
         location = payload['sender']['location']
         name = payload['sender']['alias']

data/lib/meshchat/message/node_list.rb

@@ -16,12 +16,12 @@ module MeshChat
         received_list = message
         we_only_have, they_only_have = Node.diff(received_list)
 
+        Display.debug('node_list#respond: me: ' + we_only_have.to_s)
+        Display.debug('node_list#respond: they: ' + they_only_have.to_s)
+
         if they_only_have.present?
           they_only_have.each do |n|
-            # be sure that we don't add ourselves
-            unless n['uid'] == Settings['uid']
-              Node.from_json(n).save!
-            end
+            Node.from_json(n).save!
           end
         end
 
@@ -30,6 +30,7 @@ module MeshChat
 
         node = Node.find_by_location(location)
         if we_only_have.present?
+          Display.debug 'we have nodes that they do not'
 
           # give the sender our list
           MeshChat::Net::Client.send(
@@ -47,6 +48,8 @@ module MeshChat
             )
           end
         else
+          Display.debug 'node lists are in sync'
+
           # lists are in sync, confirm with hash
           MeshChat::Net::Client.send(
             node: node,

data/lib/meshchat/models/entry.rb

@@ -46,7 +46,7 @@ module MeshChat
             alias_name: json['alias'],
             location: json['location'],
             uid: json['uid'],
-            public_key: json['publicKey']
+            public_key: json['publickey']
           )
         end
 
@@ -92,7 +92,7 @@ module MeshChat
           'alias' => alias_name,
           'location' => location,
           'uid' => uid,
-          'publicKey' => public_key
+          'publickey' => public_key
         }
       end
 

data/lib/meshchat/net/client.rb

@@ -13,10 +13,19 @@ module MeshChat
         # verify node is valid
         node = self.node_for(location: location, uid: uid, node: node)
 
+        if Settings['uid'] == node.uid
+          Display.debug 'avoiding sending to self'
+          return
+        end
+
         Thread.new(node, message) do |node, message|
           begin
             payload = Client.payload_for(node, message)
 
+            Display.debug('SENDING: ' + message.type)
+            Display.debug('SENDING: ' + message.sender.to_s)
+            Display.debug('SENDING: ' + message.message.to_s)
+
             # TODO: this is horrible, come up with something better / abstract it
             begin
               Curl::Easy.http_post(node.location, payload.to_json) do |c|

data/lib/meshchat/net/listener/request.rb

@@ -23,7 +23,7 @@ module MeshChat
         def try_decrypt(input)
           begin
             decoded = Base64.decode64(input)
-            input = Cipher.decrypt(decoded, Settings[:privateKey])
+            input = Cipher.decrypt(decoded, Settings[:privatekey])
           rescue => e
             Display.debug e.message
             Display.debug e.backtrace.join("\n")

data/lib/meshchat/net/listener/request_processor.rb

@@ -9,6 +9,11 @@ module MeshChat
           request = Request.new(raw)
           message = request.message
 
+          # TODO: wrap in debug if check
+          Display.debug('RECEIVING: ' + message.type)
+          Display.debug('RECEIVING: ' + message.sender.to_s)
+          Display.debug('RECEIVING: ' + message.message.to_s)
+
           # handle the message
           Display.present_message message
 

data/lib/meshchat/net/listener/server.rb

@@ -77,6 +77,7 @@ module MeshChat
 
         def status_of(s)
           status s
+          Display.debug('SERVER: ' + s)
           body ''
         end
 

data/lib/meshchat/version.rb

@@ -1,3 +1,3 @@
 module MeshChat
-  VERSION = '0.6.11'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meshchat
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.7.0
 platform: ruby
 authors:
 - L. Preston Sego III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -204,6 +204,7 @@ files:
 - lib/meshchat/command/online.rb
 - lib/meshchat/command/ping.rb
 - lib/meshchat/command/ping_all.rb
+- lib/meshchat/command/send_disconnect.rb
 - lib/meshchat/command/server.rb
 - lib/meshchat/command/share.rb
 - lib/meshchat/command/stop_listening.rb
@@ -221,7 +222,7 @@ files:
 - lib/meshchat/message.rb
 - lib/meshchat/message/base.rb
 - lib/meshchat/message/chat.rb
-- lib/meshchat/message/disconnection.rb
+- lib/meshchat/message/disconnect.rb
 - lib/meshchat/message/node_list.rb
 - lib/meshchat/message/node_list_diff.rb
 - lib/meshchat/message/node_list_hash.rb
@@ -261,5 +262,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: MeshChat-0.6.11
+summary: MeshChat-0.7.0
 test_files: []