tamashii-agent 0.1.10 → 0.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/tamashii/agent/connection.rb +12 -5
- data/lib/tamashii/agent/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0ce0f567235e489eae3966f715bcc87bba005ce1
|
|
4
|
+
data.tar.gz: 4717c3ae733bd52914b4d1de710e5f231c3083ee
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 408c8942b660d449076376cfd794e92417d3b364d81ee568bade4ef3287ae1db6debee661cb4eb7031ee244bec129590b8d6019b0d016f18b1f0b19ea3f312a4
|
|
7
|
+
data.tar.gz: dccdd1ae3140365b90e695d293d954786916d82714ea570c6457668e4f08c813b3475df771bb3a52230e21c8bf086ea91d87e9a8d4f58d868392fe3c9bb089a3
|
|
@@ -125,8 +125,7 @@ module Tamashii
|
|
|
125
125
|
|
|
126
126
|
def start_web_driver
|
|
127
127
|
# TODO: Improve below code
|
|
128
|
-
|
|
129
|
-
@driver = WebSocket::Driver.client(socket)
|
|
128
|
+
@driver = WebSocket::Driver.client(self)
|
|
130
129
|
@driver.on :open, proc { |e|
|
|
131
130
|
logger.info "Server opened"
|
|
132
131
|
self.auth_request
|
|
@@ -141,6 +140,9 @@ module Tamashii
|
|
|
141
140
|
pkt = Packet.load(e.data)
|
|
142
141
|
process_packet(pkt) if pkt
|
|
143
142
|
}
|
|
143
|
+
@driver.on :error, proc { |e|
|
|
144
|
+
logger.error("#{e.message}")
|
|
145
|
+
}
|
|
144
146
|
@driver.start
|
|
145
147
|
self.connect
|
|
146
148
|
end
|
|
@@ -149,8 +151,9 @@ module Tamashii
|
|
|
149
151
|
_monitor = @selector.register(@io, :r)
|
|
150
152
|
_monitor.value = proc do
|
|
151
153
|
begin
|
|
152
|
-
msg = @io.
|
|
153
|
-
if msg
|
|
154
|
+
msg = @io.read_nonblock(4096, exception: false)
|
|
155
|
+
next if msg == :wait_readable
|
|
156
|
+
if msg.nil?
|
|
154
157
|
# socket closed
|
|
155
158
|
logger.info "No message received from server. Connection reset"
|
|
156
159
|
close_socket_io
|
|
@@ -169,7 +172,11 @@ module Tamashii
|
|
|
169
172
|
|
|
170
173
|
def try_create_socket
|
|
171
174
|
logger.info "try to open socket..."
|
|
172
|
-
|
|
175
|
+
if Config.use_ssl
|
|
176
|
+
OpenSSL::SSL::SSLSocket.new(TCPSocket.new(@host, @port)).connect
|
|
177
|
+
else
|
|
178
|
+
TCPSocket.new(@host, @port)
|
|
179
|
+
end
|
|
173
180
|
rescue
|
|
174
181
|
nil
|
|
175
182
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tamashii-agent
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- 蒼時弦也
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: exe
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2017-04-
|
|
13
|
+
date: 2017-04-26 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: bundler
|