gt06_server 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65de6007ff4e6820923d218b8b1fa456e9d959c0
-  data.tar.gz: 48924b53a835183b0c498fe10289432bbc26cc3f
+  metadata.gz: 110c18021a1b6683881e02b991700e6d947b1a6c
+  data.tar.gz: e07adca758918fc0799062e5b12dd997bb1cf2df
 SHA512:
-  metadata.gz: 9d8340f677b22d7f87432f0d2722db738745f264a5ce6ecf9ef71749d0107ad7001ba0481a49b15bc8568de137127f423b60908fe73a1aafcf39f634cc67faae
-  data.tar.gz: f0856270a9b4e8a156a85ae6e0e6f38b6ce79483d70bb939dd7f388202a6e3334fdc59880d9a732b17fcc32102063af49ac5f35e242eff558838b009cd514636
+  metadata.gz: 5cb46fe3400afcc1a00448673ee629e65a87b3c2f55a00b9c0cee649e84679a1741d49015e75600229c70c43136b1f64a215fada55a734a4752a7cba71659b45
+  data.tar.gz: 23ce3b787b999c3bc5272b1d8504896c3a79b3bba9d5503c36b0404f866679ee254e317ea27ab419944e9bb6161a523874f406ff3881d4ec3722be7f907d62cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gt06_server (0.1.1)
+    gt06_server (0.1.2)
       bindata (~> 2.3)
       celluloid-io (~> 0.17.3)
       concurrent-ruby (~> 1.0)

data/lib/gt06_server/session.rb

@@ -3,11 +3,12 @@ module Gt06Server
   class Session
     class SessionError < RuntimeError; end
 
-    attr_reader :terminal_id, :io, :info, :logger, :addr
+    attr_reader :terminal_id, :socket, :info, :logger, :addr
 
-    def initialize(io, logger: Logger.new(STDOUT))
-      @io          = io
-      @addr        = io.peeraddr
+    # @param socket [TCPSocket]
+    def initialize(socket, logger: Logger.new(STDOUT))
+      @socket      = socket
+      @addr        = socket.peeraddr
       @terminal_id = ''
       @info        = { received_count: 0, sent_count: 0, last_received_at: Time.now}
       @logger      = logger
@@ -18,10 +19,10 @@ module Gt06Server
     # @yield [Hash] information_content of packet
     # @raise EOF
     def run(&block)
-      handle_head_pack(Protocol.read_pack(@io))
+      handle_head_pack(Protocol.read_pack(@socket))
 
       loop do
-        handle_main_pack(Protocol.read_pack(@io), &block)
+        handle_main_pack(Protocol.read_pack(@socket), &block)
       end
     end
 
@@ -38,7 +39,7 @@ module Gt06Server
 
       @terminal_id = pack.payload.information_content.terminal_id.to_hex
       @info[:received_count] += 1
-      @io.write(Protocol.replay_on(pack).to_binary_s)
+      @socket.write(Protocol.replay_on(pack).to_binary_s)
       @info[:sent_count] += 1
 
       logger.debug "terminal_id: #{@terminal_id} , info #{@info}"
@@ -53,8 +54,8 @@ module Gt06Server
       block.yield(pack.payload)
 
       ack_pack = Protocol.replay_on(pack)
-      if (ack_pack)
-        @io.write(ack_pack.to_binary_s)
+      if ack_pack
+        @socket.write(ack_pack.to_binary_s)
         @info[:sent_count] += 1
       end
     end

data/lib/gt06_server/session_sweeper.rb

@@ -14,16 +14,15 @@ module Gt06Server
 
     def run
       timer = Concurrent::TimerTask.new(execution_interval: @interval) do
-        time_now = Time.now
         @sessions.each_pair do |key, session|
-          if (session.info[:last_received_at] + @timeout) < time_now
-            session.io.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1,0].pack('ii'))
-            session.io.close
-
-            @logger.debug "Session #{session.inspect} has been closed"
-
+          if expired_session?(session)
+            unless session.socket.closed?
+              session.socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, [1, 0].pack('ii'))
+              session.socket.close
+            end
             @info[:killed] += 1
             @sessions.delete(key)
+            @logger.debug "Session #{session.inspect} has been killed"
           end
         end
 
@@ -37,6 +36,13 @@ module Gt06Server
       timer.execute
     end
 
+    private
+
+    def expired_session?(session)
+      (session.info[:last_received_at] + @timeout) < Time.now
+    end
+
+
     class SessionSweeperObserver
       def initialize(logger)
         @logger = logger

data/lib/gt06_server/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Gt06Server
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gt06_server
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - CoolElvis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata