comunika_gsm 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf966b6250fb4add1fe67c47b7e5f3a19f99121
-  data.tar.gz: 1ed0b6c13643695666b2fda7b927ff02642a2e30
+  metadata.gz: 65001b45352fa61eea2a3d6183a9461ddfdf0443
+  data.tar.gz: 701358d13eba5b83d1a927c28104d7cf39ca598e
 SHA512:
-  metadata.gz: f8e26fa8198c01b1fc8d97f26368ebf2b83a5ac0db257171a424b3f5d553dcbf52e09d37716e620f974bcc9d58b9ab30447ad767698b223e88083c3a64757ac7
-  data.tar.gz: 2cdbaea565bafca2491344bca17e7d3404bcd7851da3c438f9de2e44101ed88c6b692ec4272d4639495a267f21b44c6e530d7f3a9ccafc2b31b042ade8339643
+  metadata.gz: cf88c01c16c6767dc4d3746a772e85a209fd97df80e57f97f1ae85ee710b6156c3d66b4dd129a271786c16cb9fd23a51a2b7c7bbb8b7c9a480f525fc23267267
+  data.tar.gz: 9aa39be18cdc70851330da7da3ba29bced8b291c55d3e9fb9fd98a049d4663c8bdd43c0c8fe7d31772bc610ead71cebb2f6ed5a2eb4f227e47396e38b5935e22

data/lib/comunika_gsm.rb

@@ -4,6 +4,7 @@ require 'execjs'
 
 require "comunika_gsm/version"
 require "comunika_gsm/gsm"
+require "comunika_gsm/gsm2"
 require "comunika_gsm/pdu"
 require "comunika_gsm/modem"
 

data/lib/comunika_gsm/gsm.rb

@@ -1,30 +1,39 @@
 module ComunikaGsm
   class GSM
-    attr_reader :status
+    attr_accessor :status#, :imei, :iccid, :provider, :signal_level
+
     def initialize(params)
       return nil if params.empty?
       begin
         @@port = SerialPort.new("/dev/#{params[:port]}",19200,8,1, SerialPort::NONE)
-        @@port.read_timeout = 1000 ## Set timeout of command
+        @@port.read_timeout = 250 ## Set timeout of command
 
         @@debug = params[:debug]
-        @status = false
 
-        cmd("ATE0\r\n") ## Set echo off
-        return unless cmd("AT\r\n").eql?("OK") ## Test if running AT ok
-        cmd("AT+CMGF=0\r\n") ## Set PDU mode
-        @status = true
-      rescue Errno::ENOENT
-        @status = false
+        res = cmd("ATE0\r\n") ## Set echo off
+        if res.length > 0
+          cmd("AT+CMGF=0\r\n") ## Set PDU mode
+          # @imei = imei
+          # @iccid = iccid
+          # @provider = provider
+          # @signal_level = signal_level
+          @status = true
+        else
+          return @status = false
+        end
+      rescue => ex
+        return @status = false
       end
     end
 
-    def cmd(cmd)
+    def cmd(c)
       begin
-        @@port.write(cmd)
-        normalize(cmd,wait)
+        @@port.write(c)
+        normalize(c,wait)
       rescue => ex
+        puts ex
         @status = false
+        #close
       end
     end
 
@@ -36,7 +45,48 @@ module ComunikaGsm
     end
 
     def close
+      puts "Fechando conexão"
       @@port.close
+      @status = false
+    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=#{pdu[:size]}\r")
+      res = cmd("#{pdu[:pdu]}#{26.chr}")
+
+      sleep 3
+      while res.length == 0
+        res = 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
+
+      {:id => id, :code => code, :status => status}
+    end
+
+    def messages
+      sms = 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: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
     end
 
     def imei
@@ -51,6 +101,10 @@ module ComunikaGsm
       cmd("AT+COPS?\r\n")
     end
 
+    def signal_level
+      cmd("AT+CSQ\r\n")
+    end
+
 
     def normalize(cmd,res)
       case cmd.gsub(/\r\n/,'')
@@ -66,6 +120,8 @@ module ComunikaGsm
         res.scan(/\r\n(\S+)\r\n/)[0].first
       when 'AT+CRSM=176,12258,0,0,10'
         res.scan(/\"(.*?)\"/)[0].first
+      when 'AT+CSQ'
+        res.scan(/\d+/)[0]
       else
         res
       end

data/lib/comunika_gsm/gsm2.rb

@@ -0,0 +1,113 @@
+module ComunikaGsm
+  class GSM2
+    def initialize(options = {})
+      begin
+        @port = SerialPort.new("/dev/#{options[:port]}",19200,8,1, SerialPort::NONE)
+        @port.read_timeout = 500
+        @debug = options[:debug]
+        @status = true
+
+        ##cmd("ATE0\r\n")
+        cmd("ATE0\r\n")
+        #cmd("AT+CMGF=1\r\n")
+        cmd("AT+CMGF=0\r\n")
+
+
+        # Set SMSC number
+        #cmd("AT+CSCA=\"#{SMSC}\"")
+      rescue => ex
+        puts ex.message
+        @status = false
+      end
+    end
+
+    def status
+      @status
+    end
+
+    def set_status(status)
+      @status = status
+    end
+
+    def close
+      @port.close
+    end
+
+    def cmd(cmd)
+      begin
+        @port.flush()
+        @port.write(cmd)
+        normalize(cmd,wait)
+      rescue => ex
+        @status = false
+      end
+    end
+
+    def wait
+      buffer = @port.read
+      puts buffer if @debug
+      buffer
+    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=#{pdu[:size]}\r")
+      res = cmd("#{pdu[:pdu]}#{26.chr}")
+
+      sleep 3
+      while res.length == 0
+        res = 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
+
+      {:id => id, :code => code, :status => status}
+    end
+
+    def messages
+      sms = 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: self, id: m[0], size: m[2], pdu: m[3].chomp).decode }# rescue nil
+    end
+
+    private
+    def normalize(cmd,res)
+      case cmd.gsub(/\r\n/,'')
+      when 'AT'
+        res.scan(/\r\n(\S+)\r\n/)[0].first unless res.empty?
+      when 'AT+COPS?'
+        res.scan(/\"(.*?)\"/)[0].first
+      when 'AT+CNUM'
+        res.scan(/\"(.*?)\"/)
+      when 'AT+CGSN'
+        res.scan(/\r\n(\d+)\r\n/)[0].first
+      when 'AT+CGMI'
+        res.scan(/\r\n(\S+)\r\n/)[0].first
+      when 'AT+CRSM=176,12258,0,0,10'
+        res.scan(/\"(.*?)\"/)[0].first
+      when 'AT+CSQ'
+        res.scan(/\d+/)[0]
+      else
+        res
+      end
+    end
+  end
+end

data/lib/comunika_gsm/js/pdu.js

@@ -1074,362 +1074,3 @@ function cValid(valid) {
 
     return out;
 }
-
-/* Script written by Swen-Peter Ekkebus, edited by Ing. Milan Chudik.
- *
- * Further fixes and functionality by Andrew Alexander:
- * Fix message length issues, handle +xx  & 0xx phone codes, added bit length options,
- * display 8 & 16 bit messages, reformat interface, deal with embedded spaces in hex,
- * allow leading AT command in input, implemented some support for alpanumeric senders...
- *
- * ekkebus[at]cs.utwente.nl
- * Feel free to use it, please don't forget to link to the source ;)
- *
- *
- * www.rednaxela.net - Feel free to use this code as you wish.
- * Version 1.5 r9aja
- *
- * Official BPS develop tool
- *
- * (c) BPS & co, 2003
- */
-
-
-
-
-//Array with "The 7 bit defaultalphabet"
-sevenbitdefault = new Array('@', '£', '$', '¥', 'è', 'é', 'ù', 'ì', 'ò', 'Ç', '\n', 'Ø', 'ø', '\r', 'Å', 'å', '\u0394', '_', '\u03a6', '\u0393', '\u039b', '\u03a9', '\u03a0', '\u03a8', '\u03a3', '\u0398', '\u039e', '€', 'Æ', 'æ', 'ß', 'É', ' ', '!', '"', '#', '¤', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', '¡', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'Ä', 'Ö', 'Ñ', 'Ü', '§', '¿', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'ä', 'ö', 'ñ', 'ü', 'à');
-
-
-
-
-// Variable that stores the information to show the user the calculation of the translation
-var calculation = "";
-
-
-
-
-var maxkeys = 160;
-var alerted = false;
-
-
-
-
-// function te convert a bit string into a integer
-function binToInt(x) //sp
-{
-    var total = 0;
-    var power = parseInt(x.length) - 1;
-
-
-
-
-    for (var i = 0; i < x.length; i++) {
-        if (x.charAt(i) == '1') {
-            total = total + Math.pow(2, power);
-        }
-        power--;
-    }
-    return total;
-}
-
-
-
-
-// function to convert a integer into a bit String
-function intToBin(x, size) //sp
-{
-    var base = 2;
-    var num = parseInt(x);
-    var bin = num.toString(base);
-    for (var i = bin.length; i < size; i++) {
-        bin = "0" + bin;
-    }
-    return bin;
-}
-
-
-
-
-// function to convert a Hexnumber into a 10base number
-function HexToNum(numberS) {
-    var tens = MakeNum(numberS.substring(0, 1));
-
-    var ones = 0;
-    if (numberS.length > 1) // means two characters entered
-        ones = MakeNum(numberS.substring(1, 2));
-    if (ones == 'X') {
-        return "00";
-    }
-    return (tens * 16) + (ones * 1);
-}
-
-
-
-
-// helper function for HexToNum
-function MakeNum(str) {
-    if ((str >= '0') && (str <= '9'))
-        return str;
-    switch (str.toUpperCase()) {
-        case "A":
-            return 10;
-        case "B":
-            return 11;
-        case "C":
-            return 12;
-        case "D":
-            return 13;
-        case "E":
-            return 14;
-        case "F":
-            return 15;
-        default:
-            return 16;
-    }
-    return 16;
-}
-
-
-
-
-//function to convert integer to Hex
-
-
-
-
-function intToHex(i) //sp
-{
-    var sHex = "0123456789ABCDEF";
-    h = "";
-    i = parseInt(i);
-    for (j = 0; j <= 3; j++) {
-        h += sHex.charAt((i >> (j * 8 + 4)) & 0x0F) +
-            sHex.charAt((i >> (j * 8)) & 0x0F);
-    }
-    return h.substring(0, 2);
-}
-
-
-
-
-function ToHex(i) {
-    var sHex = "0123456789ABCDEF";
-    var Out = "";
-
-
-
-
-    Out = sHex.charAt(i & 0xf);
-    i >>= 4;
-    Out = sHex.charAt(i & 0xf) + Out;
-
-
-
-
-    return Out;
-}
-
-function stringToPDU(inpString, phoneNumber, smscNumber, size, mclass, valid, receipt, vFlag) // AJA fixed SMSC processing
-{
-    var bitSize = size;
-
-
-
-
-    var octetFirst = "";
-    var octetSecond = "";
-    var output = "";
-
-
-
-
-    //Make header
-    var SMSC_INFO_LENGTH = 0;
-    var SMSC_LENGTH = 0;
-    var SMSC_NUMBER_FORMAT = "";
-    var SMSC = "";
-    if (smscNumber != 0) {
-        SMSC_NUMBER_FORMAT = "81"; // national
-
-
-
-
-        if (smscNumber.substr(0, 1) == '+') {
-            SMSC_NUMBER_FORMAT = "91"; // international
-            smscNumber = smscNumber.substr(1);
-        } else if (smscNumber.substr(0, 1) != '0') {
-            SMSC_NUMBER_FORMAT = "91"; // international
-        }
-
-
-
-
-        if (smscNumber.length % 2 != 0) {
-            // add trailing F
-            smscNumber += "F";
-        }
-
-        SMSC = semiOctetToString(smscNumber);
-        SMSC_INFO_LENGTH = ((SMSC_NUMBER_FORMAT + "" + SMSC).length) / 2;
-        SMSC_LENGTH = SMSC_INFO_LENGTH;
-
-    }
-    if (SMSC_INFO_LENGTH < 10) {
-        SMSC_INFO_LENGTH = "0" + SMSC_INFO_LENGTH;
-    }
-    var firstOctet; // = "1100";
-
-    if (receipt) {
-        if (vFlag) {
-            firstOctet = "3100"; // 18 is mask for validity period // 10 indicates relative
-        } else {
-            firstOctet = "2100";
-        }
-
-
-
-
-    } else {
-        if (vFlag) {
-            firstOctet = "1100";
-        } else {
-            firstOctet = "0100";
-        }
-    }
-
-    var REIVER_NUMBER_FORMAT = "81"; // national
-    if (phoneNumber.substr(0, 1) == '+') {
-        REIVER_NUMBER_FORMAT = "91"; // international
-        phoneNumber = phoneNumber.substr(1); //,phoneNumber.length-1);
-    } else if (phoneNumber.substr(0, 1) != '0') {
-        REIVER_NUMBER_FORMAT = "91"; // international
-    }
-
-
-
-
-    var REIVER_NUMBER_LENGTH = intToHex(phoneNumber.length);
-
-
-
-
-    if (phoneNumber.length % 2 != 0) {
-        // add trailing F
-        phoneNumber += "F";
-    }
-
-
-
-
-    var REIVER_NUMBER = semiOctetToString(phoneNumber);
-    var PROTO_ID = "00";
-    var DCS = 0;
-    if (mclass != -1) // AJA
-    {
-        DCS = mclass | 0x10;
-    }
-    switch (bitSize) {
-        case 7:
-            break;
-        case 8:
-            DCS = DCS | 4;
-            break;
-        case 16:
-            DCS = DCS | 8;
-            break;
-    }
-    var DATA_ENCODING = intToHex(DCS);
-    //	var DATA_ENCODING = "00"; // Default
-    //	if (bitSize == 8)
-    //	{
-    //		DATA_ENCODING = "04";
-    //	}
-    //	else if (bitSize == 16)
-    //	{
-    //		DATA_ENCODING = "08";
-    //	}
-
-
-
-
-    var VALID_PERIOD = ""; // AA
-    if (vFlag) {
-        VALID_PERIOD = intToHex(valid); // AA
-    }
-    var userDataSize;
-    if (bitSize == 7) {
-        userDataSize = intToHex(inpString.length);
-
-
-
-
-        for (var i = 0; i <= inpString.length; i++) {
-            if (i == inpString.length) {
-                if (octetSecond != "") // AJA Fix overshoot
-                {
-                    output = output + "" + (intToHex(binToInt(octetSecond)));
-                }
-                break;
-            }
-            var current = intToBin(getSevenBit(inpString.charAt(i)), 7);
-
-            var currentOctet;
-            if (i != 0 && i % 8 != 0) {
-                octetFirst = current.substring(7 - (i) % 8);
-                currentOctet = octetFirst + octetSecond; //put octet parts together
-
-                output = output + "" + (intToHex(binToInt(currentOctet)));
-                octetSecond = current.substring(0, 7 - (i) % 8); //set net second octet
-            } else {
-                octetSecond = current.substring(0, 7 - (i) % 8);
-            }
-        }
-    } else if (bitSize == 8) {
-        userDataSize = intToHex(inpString.length);
-
-
-
-
-        var CurrentByte = 0;
-        for (var i = 0; i < inpString.length; i++) {
-            CurrentByte = getEightBit(inpString.charCodeAt(i));
-            output = output + "" + (ToHex(CurrentByte));
-        }
-    } else if (bitSize == 16) {
-        userDataSize = intToHex(inpString.length * 2);
-
-
-
-
-        var myChar = 0;
-        for (var i = 0; i < inpString.length; i++) {
-            myChar = get16Bit(inpString.charCodeAt(i));
-            output = output + "" + (ToHex((myChar & 0xff00) >> 8)) + (ToHex(myChar & 0xff));
-        }
-    }
-    var header = SMSC_INFO_LENGTH + SMSC_NUMBER_FORMAT + SMSC + firstOctet + REIVER_NUMBER_LENGTH + REIVER_NUMBER_FORMAT + REIVER_NUMBER + PROTO_ID + DATA_ENCODING + VALID_PERIOD + userDataSize;
-
-
-
-
-    var PDU = header + output;
-
-
-
-
-    var AT = (PDU.length / 2 - SMSC_LENGTH - 1); // Add /2 for PDU length AJA - I think the SMSC information should also be excluded
-
-
-    //	var bStep=18;
-    //	for(var breakUp=1;breakUp*bStep < PDU.length;breakUp++)
-    //	{
-    //		PDU = PDU.substr(0,breakUp*bStep+breakUp-1) + " " + PDU.substr(breakUp*bStep+breakUp-1);
-    //	}
-
-
-
-
-    //CMGW
-    return AT + "\n" + PDU;
-}