gt06_server 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 345c27d03df39a644236872709e1144b5e5b4562
-  data.tar.gz: c8479b8c502021cb75755713f5b7b98c80b8f7e2
+  metadata.gz: cee3e4400c1b60c86ccb4629c86300b646a6a76a
+  data.tar.gz: 7f913c5eda74b44085cc70b631af583e32aa143d
 SHA512:
-  metadata.gz: 2112fc5c4b6417f9e76a320fafc613b0fa5eb70eb474636f565bea3691eac873d2e3064701aecaf2052c60f65253de87893569c59cff2692a3d9a451c221a8aa
-  data.tar.gz: 06893edd463f19ee5bf0217a1e7555fbe5184dc102dcbf7a02dde617bccbf09fb13b943da1d49ad9faa60f81f7747b7607c0725b0e447005194408587a3a8b9c
+  metadata.gz: 6f8b6500efbb1144cea48af2efb24d05a8b7f4f7ee64470bb1cef8024ab27b913f3f91f2bbccbcb75467762c2f28575d8a5fb70e4e91009bc1496f899763835c
+  data.tar.gz: 631680d9ccaad0c0a7846a0dc835e76f16a35d24af6ebb928d7ab4326edc2a8fc92a93639eaf05dada8840a45dca0ce4d451b251c2957cdc7dd9302e4879b4dc

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gt06_server.gemspec
@@ -16,7 +17,4 @@ group :development do
   gem 'pry-byebug'
   gem 'rubocop', require: false
   gem 'reek', require: false
-  gem 'capistrano'
-  gem 'capistrano-rbenv'
-  gem 'capistrano-bundler'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gt06_server (0.1.5)
+    gt06_server (0.1.6)
       bindata (~> 2.3)
       celluloid-io (~> 0.17.3)
       concurrent-ruby (~> 1.0)
@@ -9,8 +9,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    airbrussh (1.0.2)
-      sshkit (>= 1.6.1, != 1.7.0)
     ast (2.3.0)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -18,19 +16,6 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     bindata (2.3.4)
     byebug (9.0.5)
-    capistrano (3.5.0)
-      airbrussh (>= 1.0.0)
-      capistrano-harrow
-      i18n
-      rake (>= 10.0.0)
-      sshkit (>= 1.9.0)
-    capistrano-bundler (1.1.4)
-      capistrano (~> 3.1)
-      sshkit (~> 1.2)
-    capistrano-harrow (0.5.2)
-    capistrano-rbenv (2.0.4)
-      capistrano (~> 3.1)
-      sshkit (~> 1.3)
     celluloid (0.17.3)
       celluloid-essentials
       celluloid-extras
@@ -59,23 +44,19 @@ GEM
     coderay (1.1.1)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
     equalizer (0.0.11)
     ffi (1.9.10-java)
     hitimes (1.2.4)
-    i18n (0.7.0)
     ice_nine (0.11.2)
     json (1.8.3)
     json (1.8.3-java)
     method_source (0.8.2)
     minitest (5.9.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    nio4r (1.2.1)
+    nio4r (2.1.0)
     parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -112,9 +93,6 @@ GEM
     slop (3.6.0)
     spoon (0.0.4)
       ffi
-    sshkit (1.11.1)
-      net-scp (>= 1.1.2)
-      net-ssh (>= 2.8.0)
     thread_safe (0.3.5)
     thread_safe (0.3.5-java)
     timers (4.1.2)
@@ -132,9 +110,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.11)
-  capistrano
-  capistrano-bundler
-  capistrano-rbenv
   codeclimate-test-reporter
   gt06_server!
   minitest
@@ -145,4 +120,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.13.6
+   1.14.3

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright 2017 CoolElvis
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -33,7 +33,7 @@ sleep
 
 ````
 
-The message is a Hash like:  
+Status message:  
 
 ````ruby 
 { 
@@ -60,5 +60,53 @@ The message is a Hash like:
   :serial_number       => 48
 }
 ````
+
+Location message: 
+```ruby
+{
+    :packet_length       => 31,
+    :protocol_number     => 18,
+    :message_type        => :location_data,
+    :information_content =>
+        {
+            :date_time => '2011-08-29 17:46:16 +0400',
+            :gps       =>
+                {
+                    :quantity_satellites =>
+                        {
+                            :length_gps => 12, :satellites => 12
+                        },
+                    :latitude            => 23.111668333333334,
+                    :longitude           => 114.409285,
+                    :speed               => 0,
+                    :course_status       =>
+                        {
+                            :null_1               => 0,
+                            :null_2               => 0,
+                            :gps_positioning_type => 0,
+                            :is_gps_positioning   => 1,
+                            :longitude_bit        => 0,
+                            :latitude_bit         => 1,
+                            :course               => 143
+                        }
+                },
+            :lbs       =>
+                {
+                    :mcc     => 460,
+                    :mnc     => 0,
+                    :lac     => 10365,
+                    :cell_id => 8120
+                }
+        },
+    :serial_number       => 3
+}
+```
+
 The content of 'information_content' depends on 'message_type'
 See lib/gt06_server/messages for details  
+
+###Copyright
+
+Copyright (c) 2016 CoolElvis and contributors.
+
+MIT License. See [LICENSE](LICENSE) for details.

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

data/gt06_server.gemspec

@@ -1,5 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'gt06_server/version'
 
@@ -9,10 +9,10 @@ Gem::Specification.new do |spec|
   spec.authors = ['CoolElvis']
   spec.email   = ['elvisplus2@gmail.com']
 
-  spec.summary                       = 'TCP server for gt06(TK100) gps tracker'
-  spec.description                   = 'TCP server for gt06(TK100) gps tracker'
-  spec.homepage                      = 'https://github.com/CoolElvis/gt06_server'
-  spec.license                       = 'MIT'
+  spec.summary     = 'TCP server for gt06(TK100) gps tracker'
+  spec.description = 'TCP server for gt06(TK100) gps tracker'
+  spec.homepage    = 'https://github.com/CoolElvis/gt06_server'
+  spec.license     = 'MIT'
 
   raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
 

data/lib/gt06_server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'gt06_server/version'
 require_relative 'gt06_server/crc'
 require_relative 'gt06_server/packet'

data/lib/gt06_server/crc.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class CRC16
   def self.calc(data)
     lookup_table = [

data/lib/gt06_server/messages/alarm_packet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class AlarmPacket < BinData::Record

data/lib/gt06_server/messages/date_time_information.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class DateTimeInformation < BinData::Primitive

data/lib/gt06_server/messages/gps_information.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class GpsInformation < BinData::Record
@@ -14,7 +15,7 @@ module Gt06Server
         uint32be :coord
 
         def get
-          coord.to_f / 30_000 / 60
+          (coord.to_f / 30_000 / 60).round(6)
         end
 
         # TODO
@@ -39,5 +40,13 @@ module Gt06Server
         bit10 :course
       end
     end
+
+    def lat
+      latitude_bit ? latitude : (latitude * -1)
+    end
+
+    def lon
+      longitude_bit ? longitude : (longitude * -1)
+    end
   end
 end

data/lib/gt06_server/messages/gps_query_address.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class GpsQueryAddressInformation < BinData::Record

data/lib/gt06_server/messages/lbs_information.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class LbsInformation < BinData::Record

data/lib/gt06_server/messages/location_data.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class LocationData < BinData::Record

data/lib/gt06_server/messages/login_message.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     class LoginMessage < BinData::Record

data/lib/gt06_server/messages/status_information.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Messages
     # 5.3. Alarm Packet (Combined information packet of GPS, LBS and Status)

data/lib/gt06_server/packet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bindata'
 
 require_relative 'messages/date_time_information'

data/lib/gt06_server/protocol.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   module Protocol
     module_function

data/lib/gt06_server/server.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'celluloid/current'
 require 'celluloid/io'
 require 'logger'
@@ -11,41 +12,30 @@ module Gt06Server
     attr_reader :host, :port, :sessions
     finalizer :shutdown
 
-    class RunError < StandardError;
-    end
+    class RunError < StandardError; end
 
     # @param [String] host
     # @param [Integer] port
-    # @param [Logger] logger
+    # @param [Hash] options
     # @yields [Hash] information_content of packet
     def self.run(host, port, options: {}, &block)
-      actor = Celluloid::Actor['Gt06Server']
-
-      if actor&.alive?
+      if Celluloid::Actor['Gt06Server']&.alive?
         raise RunError, 'Attempt to run more than one the Gt06Server'
       end
 
       Gt06Server::Server.supervise(
         as:   'Gt06Server',
-        args: [host, port, block, options: {logger: Logger.new(STDOUT)}.merge(options) ]
+        args: [host, port, block, options: { logger: Logger.new(STDOUT) }.merge(options)]
       )
     end
 
-    def initialize(host, port, handler, options: {} )
-      @logger = options.fetch(:logger, Logger.new(STDOUT))
-      @host   = host
-      @port   = port
-
+    def initialize(host, port, handler, options: {})
+      @logger   = options.fetch(:logger, Logger.new(STDOUT))
+      @host     = host
+      @port     = port
       @sessions = Concurrent::Map.new
 
-      sweeper = SessionSweeper.new(
-          @sessions,
-          options.fetch(:session_timeout, nil),
-          interval: options.fetch(:sweep_interval, nil),
-          logger: @logger
-      )
-      sweeper.run
-
+      sessions_sweeper_run(@sessions, options)
       async.run handler
     end
 
@@ -53,32 +43,39 @@ module Gt06Server
 
     def run(handler)
       @server = TCPServer.new(@host, @port)
-      @logger.info "Gt06Server has been run on host:#{@host} port: #{@port} "
+      @logger.info "Gt06Server has been run on host:#{@host} port: #{@port}"
       loop { async.handle_connection(@server.accept, handler) }
     end
 
+    def sessions_sweeper_run(sessions, options)
+      SessionSweeper.new(
+        sessions,
+        timeout:  options.fetch(:session_timeout, nil),
+        interval: options.fetch(:sweep_interval, nil),
+        logger:   options.fetch(:logger, Logger.new(STDOUT))
+      ).run
+    end
+
     def shutdown
-      @server.close if @server
+      @server&.close
     end
 
     def handle_connection(socket, handler)
-      begin
-        addr = socket.peeraddr
-        @logger.info "Connect #{addr}"
-
-        session = Session.new(socket, logger: @logger)
-        @sessions[session.object_id] = session
-
-        session.run(&handler)
-      rescue EOFError => exception
-        @logger.warn "#{addr}  #{exception.message}"
-      rescue StandardError => exception
-        @logger.error exception.message
-        @logger.error exception.backtrace
-      ensure
-        socket.close if socket
-        @logger.info "Disconnect #{addr}"
-      end
+      addr = socket.peeraddr
+      @logger.info "Connect #{addr}"
+
+      session                      = Session.new(socket, logger: @logger)
+      @sessions[session.object_id] = session
+
+      session.run(&handler)
+    rescue EOFError => exception
+      @logger.warn "#{addr}  #{exception.message}"
+    rescue StandardError => exception
+      @logger.error exception.message
+      @logger.error exception.backtrace
+    ensure
+      socket&.close
+      @logger.info "Disconnect #{addr}"
     end
   end
 end

data/lib/gt06_server/session.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
   class Session
     class SessionError < RuntimeError; end
@@ -6,11 +7,12 @@ module Gt06Server
     attr_reader :terminal_id, :socket, :info, :logger, :addr
 
     # @param socket [TCPSocket]
+    # @param logger [Logger]
     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}
+      @info        = { received_count: 0, sent_count: 0, last_received_at: Time.now }
       @logger      = logger
 
       logger.debug 'New session has been created'
@@ -50,14 +52,14 @@ module Gt06Server
       @info[:received_count] += 1
       @info[:last_received_at] = Time.now
 
-
-      block.yield({terminal_id: @terminal_id}.merge!(pack.payload.snapshot))
+      block.yield({ terminal_id: @terminal_id }.merge!(pack.payload.snapshot))
 
       ack_pack = Protocol.replay_on(pack)
-      if ack_pack
-        @socket.write(ack_pack.to_binary_s)
-        @info[:sent_count] += 1
-      end
+
+      return unless ack_pack
+
+      @socket.write(ack_pack.to_binary_s)
+      @info[:sent_count] += 1
     end
   end
 end

data/lib/gt06_server/session_sweeper.rb

@@ -1,29 +1,36 @@
+# frozen_string_literal: true
+
 require 'concurrent'
+
 module Gt06Server
   class SessionSweeper
-    attr_reader :sessions , :info, :timeout, :interval, :logger
+    attr_reader :sessions, :info, :timeout, :interval, :logger
+
+    DEFAULT_TIMEOUT = 60
+    DEFAULT_INTERVAL = 30
 
     # @param sessions[Array<Session>]
-    def initialize(sessions, timeout = 60, interval: 30, logger: Logger.new(STDOUT))
+    def initialize(sessions, timeout: DEFAULT_TIMEOUT, interval: DEFAULT_INTERVAL, logger: Logger.new(STDOUT))
       @sessions = sessions
-      @timeout  = timeout || 60
-      @interval = interval || 30
-      @info     = {killed: 0, live:0, count:0}
+      @timeout  = timeout
+      @interval = interval
+      @info     = { killed: 0, live: 0, count: 0 }
       @logger   = logger
     end
 
     def run
       timer = Concurrent::TimerTask.new(execution_interval: @interval) do
         @sessions.each_pair do |key, session|
-          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"
+          next unless 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
 
         @info[:live] = @sessions.size
@@ -58,6 +65,5 @@ module Gt06Server
         end
       end
     end
-
   end
 end

data/lib/gt06_server/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gt06Server
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/libcrc16.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'ffi'
 
 module GetCrc16

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gt06_server
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - CoolElvis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -95,9 +95,11 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Note.md
 - README.md
 - Rakefile
+- _config.yml
 - gt06_server.gemspec
 - lib/ext/CMakeLists.txt
 - lib/ext/crc_16.cpp