simbiotes 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2720eb12d4bdc9a8cb2a2bbcdb78b34a49fcdeb3
-  data.tar.gz: 5dff85734e222091de2bfd006ef3271fe8048200
+  metadata.gz: 25d7f73f0452976957638721096273a0a01504f7
+  data.tar.gz: 06be1a0e2e2978be7c5e04784eaa635ea91fd117
 SHA512:
-  metadata.gz: 52dd9eab6182ed8d246c91a42b7c0742500c368b9b1f379d87fc1a82dd06c41b14d4a184ce79457fa6b5aaae8a0dafc3dcc8e6907450e696c995d0dcb74a6e92
-  data.tar.gz: 9e29d0189e81d4be26b5665968e8e15d273553e0443b8cd59fcf6cf42d4d23fe3b0e15d8ec089cc6d80eecf4a07387a26c6e837fbe0e829bf5753317436081b3
+  metadata.gz: 54a083ab5ef9e03e1eff353e44673d407d689c5da7ce7307ab33bff3407886c7e376c350738ddd2ccfd74705df719fafe9e3ab50dbe306e238286266eb6986af
+  data.tar.gz: 15b787082d5daaa6e0c13d0673f7b13953f9b63ac11ee79bcf22d313b4156d514d15a460ebd3f47e541d2c26341e0b706343463d4325aec0ad9bd78d3abf20d7

data/lib/simbiotes/server.rb

@@ -10,12 +10,12 @@ module Simbiotes
   class Server
     def initialize
         @error_msg = nil
+        server_details = Server.lookup
         rgs = SimbiotesSetting.find_by(key: "server")
         rgs_port = SimbiotesSetting.find_by(key: "port")
         if rgs == nil
-          server_details = Server.lookup
           if server_details["status"] == "ok"
-            rgs = server_details["IP"]
+            rgs = server_details["ip"]
             c = SimbiotesSetting.new
             c.key = "server"
             c.value = rgs
@@ -29,8 +29,16 @@ module Simbiotes
             @error_msg = server_details["status_msg"]
           end
         else
-          rgs = rgs.value
-          rgs_port = rgs_port.value
+          if server_details["status"] == "ok"
+            rgs.value = server_details["ip"]
+            rgs.save
+            rgs = rgs.value
+            rgs_port.value = server_details["port"]
+            rgs_port.save
+            rgs_port = rgs_port.value
+          else
+            @error_msg = server_details["status_msg"]
+          end
         end
       if Simbiotes.configuration.tls == true
         socket = TCPSocket.new(rgs, rgs_port)
@@ -53,10 +61,6 @@ module Simbiotes
       else
         server = TCPSocket.open(rgs, rgs_port)
       end
-      if Simbiotes.configuration.handshake == true
-        server.puts('{"action":"connect"}')
-        response = server.gets
-      end
       @server = server
       @localport = Simbiotes.configuration.local_port
       listen_remote
@@ -99,6 +103,9 @@ module Simbiotes
     def listen_local
       begin
         server = TCPServer.open(@localport)
+        if Simbiotes.configuration.handshake == true
+          self.send('{"action":"connect"}')
+        end
         loop do
         	Thread.fork(server.accept) do |client| 
         		s = client.gets
@@ -135,7 +142,7 @@ module Simbiotes
       else
         server = TCPSocket.open(Simbiotes.configuration.server, Simbiotes.configuration.server_port)
       end
-      server.puts('{"action":lookup}')
+      server.puts('{"action":"lookup"}')
       msg = server.gets
       hash = JSON.parse(msg)
       server.close
@@ -222,13 +229,7 @@ module Simbiotes
       return ca_cert
     end
     
-    at_exit do
-      if Simbiotes.configuration.handshake == true
-        string = '{"action":"disconnect"}'
-        if @server != nil
-          @server.puts(string)
-        end
-      end
+    def do_at_exit
     end
     
   end

data/lib/simbiotes/version.rb

@@ -1,3 +1,3 @@
 module Simbiotes
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simbiotes
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails