tamashii-agent 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ad217e36714e8f5c213ee488dc55547e8ae71b
-  data.tar.gz: 477b38f2a79c46ec5d0f5ea87bac344a3305e2b7
+  metadata.gz: 0ce0f567235e489eae3966f715bcc87bba005ce1
+  data.tar.gz: 4717c3ae733bd52914b4d1de710e5f231c3083ee
 SHA512:
-  metadata.gz: 9d6f54b0f4ef53587091eefc0021c5339bdc0eabce96b6269823d9440ec31c95da3f8ab70ae71060452f507941af8c07815e7bdd596797e1337b1811539c1d65
-  data.tar.gz: 811d6f39e021edafe790d70ed0ac81368ed1aadbbf2d9ff594920931ef69840a3bdf0be81bbba55eb6eb4eaa22638e4e70ac8be5552cb90d8c85c2ff9a588f19
+  metadata.gz: 408c8942b660d449076376cfd794e92417d3b364d81ee568bade4ef3287ae1db6debee661cb4eb7031ee244bec129590b8d6019b0d016f18b1f0b19ea3f312a4
+  data.tar.gz: dccdd1ae3140365b90e695d293d954786916d82714ea570c6457668e4f08c813b3475df771bb3a52230e21c8bf086ea91d87e9a8d4f58d868392fe3c9bb089a3

data/lib/tamashii/agent/connection.rb

@@ -125,8 +125,7 @@ module Tamashii
 
       def start_web_driver
         # TODO: Improve below code
-        socket = Config.use_ssl ? OpenSSL::SSL::SSLSocket.new(self) : self
-        @driver = WebSocket::Driver.client(socket)
+        @driver = WebSocket::Driver.client(self)
         @driver.on :open, proc { |e|
           logger.info "Server opened"
           self.auth_request
@@ -141,6 +140,9 @@ module Tamashii
           pkt = Packet.load(e.data)
           process_packet(pkt) if pkt
         }
+        @driver.on :error, proc { |e|
+          logger.error("#{e.message}")
+        }
         @driver.start
         self.connect
       end
@@ -149,8 +151,9 @@ module Tamashii
         _monitor = @selector.register(@io, :r)
         _monitor.value = proc do
           begin
-            msg = @io.recv_nonblock(65535)
-            if msg.empty?
+            msg = @io.read_nonblock(4096, exception: false)
+            next if msg == :wait_readable
+            if msg.nil?
               # socket closed
               logger.info "No message received from server. Connection reset"
               close_socket_io
@@ -169,7 +172,11 @@ module Tamashii
 
       def try_create_socket
         logger.info "try to open socket..."
-        TCPSocket.new(@host, @port)
+        if Config.use_ssl
+          OpenSSL::SSL::SSLSocket.new(TCPSocket.new(@host, @port)).connect
+        else
+          TCPSocket.new(@host, @port)
+        end
       rescue
         nil
       end

data/lib/tamashii/agent/version.rb

@@ -1,5 +1,5 @@
 module Tamashii
   module Agent
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tamashii-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - 蒼時弦也
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler