imperituroard 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9c5a08701e31d0a87ce664a92db4cc736dd56a
-  data.tar.gz: 1f5b19a4aaf12b01b0ef9f30026541f5f63e05d1
+  metadata.gz: 629626efbfcfa0108c2b1646a42d25856e6f3135
+  data.tar.gz: 8a3a7f5357873aa432d9058a2a54d933e6177c7d
 SHA512:
-  metadata.gz: 821eec2e26448ded59f48f9a5a9564e6253fd95d302038a4f375218d0ff4215e79302adf8b5a4904aaa2b48051f37cae86657258b01f27baadf1734cf8e1d83c
-  data.tar.gz: 6284ef90f6d634930e5a87d6dc6fc590c4a924ba2df7168023bf82ae9c7cdab42f44a8854db3731ed8462aa1b6ea935f39f824f4a4366782c6bf2086ff01fc5a
+  metadata.gz: 61e4e034d6b705161bc67e7c270406cbb62a0306ca18c17a619b04b6cf78af4bd802c0f59517e5856101ec75be031be38086872e68893de159412ef241aaaf53
+  data.tar.gz: 87151a1bbfa092b6d77fef7279cf114446dba7540ca949b897cad0a8f77270afe3833d7d49678f7e46476fb144be849a805d2bc493c2c625b3a185630f1e96ad

data/imperituroard.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ipaddr", "1.2.2"
   spec.add_dependency "simpleidn", "0.1.1"
   spec.add_dependency "net-scp", "3.0.0"
-
   spec.add_dependency "rails", "5.0.7.2"
 
+
 end

data/lib/imperituroard.rb

@@ -25,6 +25,7 @@ require 'imperituroard/projects/dns'
 require 'imperituroard/platforms/cps/qps_connector'
 require 'imperituroard/platforms/public/telegram'
 require 'imperituroard/projects/ukaz60'
+require 'imperituroard/projects/mhub/gms'
 
 require 'json'
 require 'ipaddr'
@@ -345,6 +346,26 @@ class Mhub_2
 end
 
 
+#2020.09.02 function for some procedure for get message status
+class GmsFunctions_2
+
+  attr_accessor :gms_func
+
+  def initialize(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+    @gms_func = Gmsgms_2.new(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+  end
+
+  def get_t_status_external(external_id)
+    gms_func.get_t_status_external_2(external_id)
+  end
+
+  def get_r_status_external(external_id)
+    gms_func.get_r_status_external_2(external_id)
+  end
+
+end
+
+
 class CpsFunctions_2
 
   attr_accessor :qps_connector

data/lib/imperituroard/projects/iot.rb

@@ -1427,6 +1427,6 @@ class IotFunctions_2
     p "yyyyy"
 
     #fff = HuaIot.new("134.17.93.4", "443", "/Users/imperituroard/Desktop/cert.crt", "/Users/imperituroard/Desktop/key.pem")
-    p hua_aceanconnect_connector.querying_device_id("Jy5KpoBUOScZEcrO2bRZhzfaIOUa", "VFFWTOb9k3_cQhzrGsRWT4HE8Z0a", "123456789876543")
+    p hua_aceanconnect_connector.querying_device_id("Jy5KpoBUOScZEcrO2bRZhzfaIOUa", "VFFWTOb9k3_cQhzrGsRWT4HE8Z0a", "123412341284999")
   end
 end

data/lib/imperituroard/projects/iot/hua_oceanconnect_adapter.rb

@@ -82,6 +82,7 @@ class HuaIot
       request.content_type = 'application/x-www-form-urlencoded'
       request.body = URI.encode_www_form(data)
       res = https.request(request)
+      p "get_token"
       p res.code
       p res.message
       p res.body.to_s
@@ -293,30 +294,30 @@ class HuaIot
 
   #2.2.44 Querying the Device ID
   def querying_device_id(app_id, secret, node_id)
-    token = get_token(app_id, secret)[:body]["accessToken"]
-    p token
-    path = "/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&appId=Jy5KpoBUOScZEcrO2bRZhzfaIOUa"
-    p path
-    p path
-    url_string = "https://" + platformip + ":" + platformport + path
-    p url_string
-    uri = URI.parse url_string
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
-    https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    request = Net::HTTP::Get.new(uri.path)
-    request.content_type = 'application/json'
-    request['Authorization'] = 'Bearer ' + token
-    request['app_key'] = app_id
-    #request['node-id'] = node_id
-    bbb =  {"nodeId": node_id, "appId": "Jy5KpoBUOScZEcrO2bRZhzfaIOUa"}.to_json
-    request.body = bbb
-    res = https.request(request)
-    p res.body.to_s
-    p res.code
-    {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
+    get_token_data = get_token(app_id, secret)
+    if get_token_data[:code]=="200"
+      token = get_token_data[:body]["accessToken"]
+      uri1 = URI("https://134.17.93.4:8743/iocm/app/dm/v1.1.0/queryDeviceIdByNodeId?nodeId=" + node_id + "&" + app_id)
+      https = Net::HTTP.new(uri1.host, uri1.port)
+      https.use_ssl = true
+      https.cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
+      https.key = OpenSSL::PKey::RSA.new(File.read(key_file))
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      request = Net::HTTP::Get.new(uri1)
+      request.content_type = 'application/json'
+      request['app_key'] = app_id
+      request['Authorization'] = 'Bearer ' + token
+      #request.set_form_data( params )
+      #request['node-id'] = node_id
+      bbb =  {"nodeId": node_id, "appId": "Jy5KpoBUOScZEcrO2bRZhzfaIOUa"}.to_json
+      #request.body = bbb
+      res = https.request(request)
+      #p res.body.to_s
+      #p res.code
+      {:code => res.code, :message => res.message, :body => valid_json?(res.body.to_s)}
+    else
+      {:code => "500", :message => "Something wrong", :body => {}}
+    end
   end
 
   #2.2.14 Querying Device Activation Status

data/lib/imperituroard/projects/mhub.rb

@@ -146,11 +146,12 @@ class MhubFunctions_2
     output_params
   end
 
-
   def test2
     hh = Infobip_1.new
     hh.test
   end
 
 
-end
+end
+
+

data/lib/imperituroard/projects/mhub/gms.rb

@@ -0,0 +1,96 @@
+require 'imperituroard/projects/mhub/subs/evrotorg/gms_connector'
+
+
+class Gmsgms_2
+
+  attr_accessor :gms_t_login, :gms_t_password, :gms_r_login, :gms_r_password, :gms_t_connector, :gms_r_connector
+
+
+  def initialize(gms_t_login, gms_t_password, gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+    @gms_t_login = gms_t_login
+    @gms_t_password = gms_t_password
+    @gms_r_login = gms_r_login
+    @gms_r_password = gms_r_password
+
+    @gms_t_connector = Gms_2.new(gms_t_login, gms_t_password, telegram_api_url, telegram_chat_id)
+    @gms_r_connector = Gms_2.new(gms_r_login, gms_r_password, telegram_api_url, telegram_chat_id)
+
+    @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+
+  end
+
+  def gms_parsing(gms_answer)
+    output = {}
+
+    status_dic = {
+        12033 => "Sent to Viber",
+        36013 => "Viber internal failure",
+        36023 => "Viber invalid service id",
+        36033 => "Viber invalid data",
+        36043 => "Viber blocked message type",
+        36053 => "Viber bad message type",
+        36063 => "Viber bad parameters",
+        36073 => "Viber timeout",
+        36083 => "Viber user blocked",
+        36093 => "Viber not viber user",
+        36103 => "Viber no suitable device",
+        36113 => "Viber unauthorized ip",
+        36123 => "Viber already sent",
+        36133 => "Viber not permitted",
+        36143 => "Viber billing failure",
+        36153 => "Viber word in black list",
+        36163 => "Viber internal process error",
+        36173 => "Viber wrong or missing Label",
+        36183 => "Viber invalid TTL value",
+        23033 => "Viber delivered",
+        35015 => "Viber expired",
+        24013 => "Viber delivered(seen)",
+        28013 => "Viber delivered(overdue)",
+        -1 => "in progress"
+    }
+
+    if gms_answer[:code] == 200
+      dt1 = gms_answer[:body][:res_body]["reports"][0]
+      hyber_status = dt1["hyber_status"]
+      output = {:code => 200, :result => "Processed", :body => {"status_code": hyber_status, "status": status_dic[hyber_status], "phone_number": dt1["phone_number"], "message_id": dt1["extra_id"]}}
+    elsif gms_answer[:code] == 404
+      output = {:code => 404, :result => "Not found", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": gms_answer[:body][:request_message][:external_id]}}
+    else
+      output = {:code => gms_answer[:code], :result => gms_answer[:result], :body => {"status_code": "", "status": "", "phone_number": "", "message_id": gms_answer[:body][:request_message][:external_id]}}
+    end
+    output
+  end
+
+
+  def get_t_status_external_2(external_id)
+    output = {}
+    begin
+      ans = gms_t_connector.get_advanced_by_external(external_id)
+      parsed = gms_parsing(ans)
+      output = {:gms_answer => ans, :parsed_answer => parsed}
+    rescue
+      pars = {:code => "505", :result => "Failed", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": ""}}
+      output = {:gms_answer => ans, :parsed_answer => pars}
+    end
+    output
+  end
+
+
+  def get_r_status_external_2(external_id)
+    output = {}
+    begin
+      ans = gms_r_connector.get_advanced_by_external(external_id)
+      parsed = gms_parsing(ans)
+      output = {:gms_answer => ans, :parsed_answer => parsed}
+    rescue
+      pars = {:code => "505", :result => "Failed", :body => {"status_code": "", "status": "", "phone_number": "", "message_id": ""}}
+      output = {:gms_answer => ans, :parsed_answer => pars}
+    end
+    output
+  end
+
+end
+
+
+

data/lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb

@@ -0,0 +1,69 @@
+require 'net/https'
+
+require 'json'
+
+require 'uri'
+require 'net/http'
+require 'rubygems'
+require 'nokogiri'
+require 'rails'
+
+require 'imperituroard/projects/iot/internal_functions'
+
+
+class Gms_2
+
+  attr_accessor :gms_login, :gms_password, :telegram_connector, :internal_func
+
+  def initialize(gms_login, gms_password, telegram_api_url, telegram_chat_id)
+    @gms_login = gms_login
+    @gms_password = gms_password
+    @internal_func = InternalFunc.new
+    @telegram_connector = Telegram_2.new(telegram_api_url, telegram_chat_id)
+  end
+
+  def get_advanced_by_external(external_id)
+
+    input_params = {:external_id => external_id}
+    output_params = {}
+    thr1_get_advanced_by_external = Thread.new do
+      begin
+        uri = URI("https://dr-v2.hyber.im/2160/api/dr/external/" + external_id + "/advanced")
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        req = Net::HTTP::Get.new(uri.path, initheader = {:"Content-Type" => 'application/json'})
+        req.basic_auth gms_login, gms_password
+        req["Content-Type"] = "application/json"
+        res = https.request(req)
+
+        p res.code
+        p res.body
+        if res.code == "200"
+          output_params = {:code => 200,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => JSON.parse(res.body.to_s)}}
+        else
+          output_params = {:code => res.code.to_i,
+                           :result => "Gms_2.get_advanced_by_external: Request processed",
+                           :body => {:request_message => input_params,
+                                     :res_code => res.code,
+                                     :res_body => res.body.to_s}}
+        end
+      rescue
+        output_params = {:code => 500, :result => "Gms_2.get_advanced_by_external: Something wrong", :body => {:request_message => input_params}}
+      end
+    end
+    thr1_get_advanced_by_external.join
+
+    internal_func.printer_texter({:input => input_params, :output => output_params, :procedure => "Gms_2.get_advanced_by_external"}, "debug")
+    output_params
+
+  end
+
+
+
+
+end

data/lib/imperituroard/version.rb

@@ -1,4 +1,4 @@
 module Imperituroard
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imperituroard
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,10 +222,12 @@ files:
 - lib/imperituroard/projects/iot/internal_functions.rb
 - lib/imperituroard/projects/iot/mongoconnector.rb
 - lib/imperituroard/projects/mhub.rb
+- lib/imperituroard/projects/mhub/gms.rb
 - lib/imperituroard/projects/mhub/infobip.rb
 - lib/imperituroard/projects/mhub/sk.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_platform.rb
 - lib/imperituroard/projects/mhub/subs/dabrab/dabrab_proced.rb
+- lib/imperituroard/projects/mhub/subs/evrotorg/gms_connector.rb
 - lib/imperituroard/projects/ukaz60.rb
 - lib/imperituroard/projects/ukaz60/belgim.rb
 - lib/imperituroard/projects/ukaz60/dns.rb
@@ -245,7 +247,7 @@ metadata:
   homepage_uri: https://rubygems.org/
   source_code_uri: https://github.com/imperituroard/imperituroard
   changelog_uri: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,9 +262,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14
-signing_key: 
+signing_key:
 specification_version: 4
 summary: imperituroard gem
 test_files: []