comunika_gsm 0.1.6 → 0.1.7

data/lib/comunika_gsm/modem.rb

@@ -12,88 +12,40 @@ module ComunikaGsm
       @@devices
     end
 
-    def self.clear
-      @@devices.each {|d| d.gsm.close }
-      @@devices = []
-    end
-
     # Initialize devices
     def self.load(params={})
-      self.clear
       threads = []
-      id = 0
-      self.ports.each_with_index do |port,idx|
-        threads << Thread.new{
-          gsm = GSM.new(:port => port, :debug => params[:debug])
+      self.ports.each do |port|
+        threads << Thread.new {
+          gsm = GSM2.new(:port => port, :debug => params[:debug])
           if gsm.status
-            imei = gsm.imei
-            iccid = gsm.iccid
-            provider = gsm.provider
-
-            unless @@devices.find {|d| d.imei == imei}
-              @@devices << Modem.new(id: id += 1 ,:gsm => gsm, :imei => imei, :iccid => iccid, :provider => provider, :port => port)
+            result = gsm.cmd("AT\r\n")
+            if result.to_s.length > 0
+              imei = gsm.cmd("AT+CGSN\r\n")
+              iccid = gsm.cmd("AT+CRSM=176,12258,0,0,10\r\n")
+              provider = gsm.cmd("AT+COPS?\r\n")
+              signal = gsm.cmd("AT+CSQ\r\n")
+              unless @@devices.find {|m| m[:imei] == imei}
+                @@devices << {:port => port,:gsm => gsm, :imei => imei, :iccid => iccid, :provider => provider, :signal => signal}
+              end
+            else
+              gsm.close
             end
-          else
-            g.close
           end
-
-          Thread.current.kill
         }
       end
 
       while threads.count > 0
-        threads.delete_if{|t| !t.alive? }
+        threads.delete_if {|t| !t.alive? }
       end
 
-      @@devices
+      @@devices.collect! {|d| Device.new(d) }#.uniq {|d| d[:imei] }#.find_all{|dev| dev.status == true }.uniq!{|d| d.imei }
     end
 
-    class Modem
-      attr_accessor :id,:port, :imei, :iccid, :provider, :gsm, :total
+    class Device
+      attr_accessor :port, :gsm, :imei, :iccid, :provider, :signal
       def initialize(params)
-        @id = params[:id]; @port = params[:port]; @imei = params[:imei]; @gsm = params[:gsm]; @total = params[:total] || 0
-        @provider = params[:provider]; @iccid = params[:iccid]
-      end
-
-      def send_sms(msg)
-        return {id: nil, status: "ERROR", code: "304"} if msg[:number].length == 0
-        return {id: nil, status: "ERROR", code: "304"} if msg[:number].length < 11
-        return {id: nil, status: "ERROR", code: "503"} if msg[:message].length == 0
-
-        ## GENERATE PDU TO MESSAGE ##
-        pdu = PDU.encode(:number => msg[:number].prepend("+55"), :smsc => msg[:smsc], :message => msg[:message])
-
-        # cmd("AT+CMGS=\"#{options[:number]}\"\r")
-        # res = cmd("#{options[:message][0..160]}#{26.chr}")
-        @gsm.cmd("AT+CMGS=#{pdu.size}\r")
-        res = @gsm.cmd("#{pdu.body}#{26.chr}")
-
-        sleep 3
-        while res.length == 0
-          res = @gsm.wait
-        end
-
-        if res.include?('+CMGS')
-          res = res.scan(/\+(\S+)\: (\d+)\r\n/)
-          status = 'OK'
-          code = "-1"
-          id = res.first[1]
-        elsif res.include?('+CMS')
-          res = res.scan(/\+CMS (\S+)\: (\d+)/).first
-          status = 'ERROR'
-          code = res[1]
-          id = nil
-        end
-        @total += 1
-        {:id => id, :code => code, :status => status}
-      end
-
-      def messages
-        sms = @gsm.cmd("AT+CMGL=4\r\n")
-        msgs = sms.scan(/\+CMGL\:\s*?(\d+),\s*?(\d+),.*?\,s*?(\d+)\r\n(.*)/)
-
-        ## IDS: 0 - ID, 1 -- ,2 - size, 3 - PDU
-        msgs.collect!{ |m| PDU::PDUDecode.new(connection: @gsm, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+        @port = params[:port]; @gsm = params[:gsm]; @iccid = params[:iccid]; @provider = params[:provider]; @signal = params[:signal]
       end
     end
   end

data/lib/comunika_gsm/pdu.rb

@@ -5,105 +5,64 @@ module ComunikaGsm
       return unless params[:message]
       return unless params[:number]
       result = @@pdu_converter.call("stringToPDU",params[:message],params[:number],params[:smsc] || '',params[:ecoding] || 7,params[:sms_class] || 1,params[:valid],params[:deliver] || true,params[:valid_flag] || false)
-      PDU::PDUEncode.new(result)
+      self.parse_json(result)
     end
 
     def self.decode(pdu)
-      @@pdu_converter.call("getPDUMetaInfo", pdu)
+      result = @@pdu_converter.call("getPDUMetaInfo", pdu)
+      self.parse_json(result)
     end
 
-    class PDUEncode
-      attr_reader :size, :body
-      def initialize(pdu)
-        pdu = pdu.split(/\n/)
-        @size = pdu[0]; @body = pdu[1]
-      end
+    def self.parse_json(value)
+      JSON.parse(value, :symbolize_names => true) ## Return hash with name in format symbol
     end
 
     class PDUDecode
-      attr_accessor :id, :size, :pdu, :smsc, :number, :messageref, :status, :mtype,
-                    :tp_pid, :tp_dcs_popis, :mclass, :alphabet, :message, :length, :validity, :connection, :mlenght
-      attr_writer :send_at, :discharge_at
+      attr_accessor :id, :size, :pdu, :smsc, :number, :sms_id, :status,
+                    :tp_pid, :tp_dcs_popis, :message, :length, :validity, :connection, :mlenght
+      attr_writer :sent_at, :receipt_at, :mtype
       def initialize(params)
         @id = params[:id]; @size = params[:size]; @pdu = params[:pdu]; @mtype = params[:mtype]; @smsc = params[:smsc]
-        @number = params[:number]; @messageref = params[:messageref]; @send_at = params[:send_at]; @discharge_at = params[:discharge_at]
-        @status = params[:status]; @tp_pid = params[:tp_pid]; @tp_dcs_popis = params[:tp_dcs_popis]; @mclass = params[:mclass]
-        @alphabet = params[:alphabet]; @message = params[:message]; @length = params[:length]; @validity = params[:validity]
+        @number = params[:number]; @sms_id = params[:sms_id]; @sent_at = params[:sent_at]; @discharge_at = params[:receipt_at]
+        @status = params[:status]; @tp_pid = params[:tp_pid]; @tp_dcs_popis = params[:tp_dcs_popis]; @message = params[:message]
+        @length = params[:mlength]; @validity = params[:validity]; @mtype = params[:mtype]
         @connection = params[:connection]
       end
 
       def decode
-        msg = PDU.decode(self.pdu)
-        msg.downcase.split(/\n/).each do |m|
-          data = m.split(/\::::/)
-          case data[0].strip
-          when 'type'
-            set_mtype(data[1].strip)
-          when 'smsc'
-            @smsc = data[1].strip
-          when 'sender'
-            @number = data[1].strip
-          when 'messageref'
-            @messageref = data[1].strip
-          when 'timestamp'
-            @send_at = data[1].strip
-          when 'timestamp2'
-            @discharge_at = data[1].strip
-          when 'status byte'
-            @status = "0x#{data[1].strip}".to_i(16)
-          when 'tp_pid'
-            @tp_pid = data[1].strip
-          when 'tp_pid'
-            @tp_pid = data[1].strip
-          when 'tp_dcs'
-            @tp_dcs = data[1].strip
-          when 'tp_dcs-popis'
-            @tp_dcs_popis = data[1].strip
-          when 'mclass'
-            @mclass = data[1].strip
-          when 'alphabet'
-            @alphabet = data[1].strip
-          when 'message'
-            @message = data[1].strip
-          when 'length'
-            @length = data[1].strip
-          end
-        end
-        return self
+        PDU.decode(self.pdu).each {|k,v| instance_variable_set("@#{k.to_s}",v)}
+        self
       end
 
-      def send_at
-        return @send_at.nil?
-        Time.parse(@send_at.sub(/(\d+)\D+(\d+)\D+(\d+)/, '\1/\2/20\3')).strftime('%Y/%m/%d %H:%M:%S')
+      def sent_at
+        return @sent_at.nil?
+        Time.parse(@sent_at.sub(/(\d+)\D+(\d+)\D+(\d+)/, '\1/\2/20\3')).strftime('%Y/%m/%d %H:%M:%S')
       end
 
-      def discharge_at
-        return if @discharge_at.nil?
+      def receipt_at
+        return if @receipt_at.nil?
         Time.parse(@discharge_at.sub(/(\d+)\D+(\d+)\D+(\d+)/, '\1/\2/20\3')).strftime('%Y/%m/%d %H:%M:%S')
       end
 
-      def delete
-        @connection.cmd("AT+CMGD=#{@id}\r\n")
+      def mtype
+        case @mtype
+        when 'Receipt requested'
+          'INCOMING'
+        when 'Status Report'
+          'REPORT'
+        when 'Unknown Message'
+          'REPORT'
+        when 'Receive message'
+          'INCOMING'
+        when 'Data Header'
+          'MULTIPART'
+        else
+          'UNKNOWN'
+        end
       end
 
-      private
-      def set_mtype(tp)
-        case tp
-        when 'receive message'
-          @mtype = "INCOMING"
-        when 'status report'
-          @mtype = 'REPORT'
-        when 'unknown message'
-          @mtype = 'UNKNOWN'
-        when 'receipt requested'
-          if @status.nil?
-            @mtype = 'INCOMING'
-          else
-            @mtype = "REPORT"
-          end
-        when 'data header'
-          @mtype = 'MULTIPART'
-        end
+      def delete
+        @connection.cmd("AT+CMGD=#{@id}\r\n")
       end
     end
   end

data/lib/comunika_gsm/version.rb

@@ -1,3 +1,3 @@
 module ComunikaGsm
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comunika_gsm
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jefferson Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,8 +75,10 @@ extra_rdoc_files: []
 files:
 - lib/comunika_gsm.rb
 - lib/comunika_gsm/gsm.rb
+- lib/comunika_gsm/gsm2.rb
 - lib/comunika_gsm/js/pdu.js
 - lib/comunika_gsm/js/pdu.min.js
+- lib/comunika_gsm/js/pdu2.js
 - lib/comunika_gsm/modem.rb
 - lib/comunika_gsm/pdu.rb
 - lib/comunika_gsm/version.rb