k3cloud-sdk 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb22e56d62809750b9a0184ca7c85f3d0b54cad33808cae01dea08f387e950d4
-  data.tar.gz: 8811b5a8226229361ba16038253540509c37a43ccebd193a973b4ce59670201b
+  metadata.gz: 9c129198e6a505d9b23108206100c842f1b0f94c0af6e23d7861653959ad45aa
+  data.tar.gz: dba6a6547c17d7e80fbf0aacee553a4c9f96f9c81c69d26867a52732ffdad93b
 SHA512:
-  metadata.gz: 1ad03ae0ad58d2d5b11ab541f46f1786d76d2567d1e4ab24ab27fe991ac5031fa50a291ca620aeeafba5df934276d98c4dc82bae5e57f717d5ddf800f3329c76
-  data.tar.gz: 2b66ed76217f6984789149e893e35328163feed7e0be687ff99accf0cc802c22463791d0267957de4ffa9b14f0a2632bab4ada8be08b520f5f42223628727a3a
+  metadata.gz: 53fd09b1ea66c3c07c282fbc61ba19b98a34976e91786bd92f3e9f692f69e782ce3d7680011db3191575a11a5746a87b5d173027768217f92fbd86dfeca89d13
+  data.tar.gz: d3878ab3f399a20c9d915feb73f0cd0b0c2b23148924b71640a9239a4f77cd29b3988549397be8cbc7b3152b2de97429d791bf6f3efa4638fc62c3698c91e876

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.0
 
 Style/StringLiterals:
   Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    k3cloud-sdk (0.4.2)
+    k3cloud-sdk (0.4.4)
 
 GEM
   remote: https://rubygems.org/
@@ -24,6 +24,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   k3cloud-sdk!
@@ -31,4 +32,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.4.19
+   2.4.14

data/k3cloud.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email = ["zevinto@163.com"]
 
   spec.summary = "Ruby Gem for K3cloud API."
-  spec.description = "Ruby Gem for K3Cloud that uses cryptographic signature technology to avoid plaintext transmission of keys and enables automatic login."
+  spec.description = "Ruby Gem for K3cloud OpenApi that uses cryptographic signature technology to avoid plaintext transmission of keys and enables automatic login."
   spec.homepage = "https://github.com/zevinto/k3cloud-sdk"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.0.0"
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
       (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
     end
   end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = "bin"
+  spec.executables = spec.files.grep(%r{\Abin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem

data/lib/k3cloud/errors/k3cloud_error.rb

@@ -2,27 +2,30 @@
 
 require "json"
 
-class K3cloudError < StandardError
-  attr_accessor :message, :inner_ex_wrapper, :inner_exception
+module K3cloud
+  class K3cloudError < StandardError
+    attr_accessor :message, :inner_ex_wrapper, :inner_exception
 
-  def initialize
-    @message = nil
-    @inner_ex_wrapper = nil
-    @inner_exception = nil
-    super
-  end
+    def initialize
+      @message = nil
+      @inner_ex_wrapper = nil
+      @inner_exception = nil
+      super
+    end
 
-  def self.parse(json)
-    index = json.index("{")
-    json = json[index..-1] if index >= 0
+    def self.parse(json)
+      index = json.index("{")
+      json = json[index..-1] if index >= 0
 
-    parsed_json = JSON.parse(json)
-    kd_error = K3cloudError.new
-    kd_error.message = parsed_json["Message"]
-    kd_error.inner_ex_wrapper = K3cloudError.parse(parsed_json["InnerExWrapper"].to_json)
-    kd_error.inner_exception = K3cloudError.parse(parsed_json["InnerException"].to_json)
-    kd_error
-  rescue StandardError => e
-    nil
+      parsed_json = JSON.parse(json)
+      kd_error = K3cloudError.new
+      kd_error.message = parsed_json["Message"]
+      kd_error.inner_ex_wrapper = K3cloudError.parse(parsed_json["InnerExWrapper"].to_json)
+      kd_error.inner_exception = K3cloudError.parse(parsed_json["InnerException"].to_json)
+      kd_error
+    rescue StandardError => e
+      K3cloud.logger.error("k3cloud Failed to parse exception message: #{e.message}")
+      nil
+    end
   end
 end

data/lib/k3cloud/errors/response_error.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module K3cloud
+  class ResponseError < StandardError; end
+end

data/lib/k3cloud/http.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "k3cloud/errors/response_error"
 require "net/http"
 require "net/https"
 require "uri"
@@ -13,26 +14,42 @@ module K3cloud
       @url = url
       @header = header
       @body = body
-      @connect_timeout = connect_timeout || 120
-      @request_timeout = request_timeout || 120
+      @connect_timeout = connect_timeout || 2
+      @request_timeout = request_timeout || 2
     end
 
     def post
       uri = URI(@url)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = (uri.scheme == "https")
-      http.open_timeout = @connect_timeout * 1000
-      http.read_timeout = @request_timeout * 1000
+      http.open_timeout = @connect_timeout * 60
+      http.read_timeout = @request_timeout * 60
       request = Net::HTTP::Post.new(uri)
       request.initialize_http_header(@header)
       request["Content-Type"] = "application/json"
       request["User-Agent"] = "Kingdee/Ruby WebApi SDK"
       request.body = @body.to_json
-      response = http.request(request)
-      if response.code.to_i != 200 && response.code.to_i != 206
-        raise StandardError, "status: #{response.code}, desc: #{response.body}"
+      max_retries = 5 # 最大重试次数
+      retry_count = 0
+      sleep_interval = 5 # 重试间隔时间，单位秒
+
+      begin
+        response = http.request(request)
+        if response.code.to_i != 200 && response.code.to_i != 206
+          raise K3cloud::ResponseError, "status: #{response.code}, desc: #{response.body}"
+        end
+        response.body
+      rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout => e
+        K3cloud.logger.error("Request timed out: #{e.message}")
+        if retry_count < max_retries
+          retry_count += 1
+          K3cloud.logger.info("Request timed out. Retrying #{retry_count}/#{max_retries} in #{sleep_interval} seconds...")
+          sleep(sleep_interval)
+          retry
+        else
+          raise K3cloud::ResponseError, "Request failed after #{max_retries} retries: #{e.message}, backtrace: #{e.backtrace}"
+        end
       end
-      response.body
     end
   end
 end

data/lib/k3cloud/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module K3cloud
-  VERSION = "0.4.2"
+  VERSION = "0.4.4"
 end

data/lib/k3cloud/web_api_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "k3cloud/errors/k3cloud_error"
+require "k3cloud/errors/response_error"
 require "k3cloud/utils/md5_utils"
 require "k3cloud/utils/base64_utils"
 require "k3cloud/utils/const_define"
@@ -19,20 +20,16 @@ module K3cloud
       result = execute_json(service_name, parameters)
       if result.start_with?("response_error:")
         error = K3cloudError.parse(result)
-        if error.nil?
-          raise StandardError, result
-        else
-          message = error.inner_ex_wrapper.nil? ? error.message : "#{error.message} --> #{error.inner_ex_wrapper&.message}"
-          raise StandardError, message
-        end
+        raise K3cloud::ResponseError, result if error.nil?
+
+        message = error.inner_ex_wrapper.nil? ? error.message : "#{error.message} --> #{error.inner_ex_wrapper&.message}"
+        raise K3cloud::ResponseError, message
+
       else
         begin
-          json = JSON.parse(result)
-          raise StandardError, json if result.include?(',"IsSuccess":false,')
-
-          json
-        rescue StandardError => e
-          raise StandardError, "JSON parse error, response: [#{result}]", e
+          JSON.parse(result)
+        rescue JSON::ParserError
+          raise K3cloud::ResponseError, "JSON parse error, response: [#{result}]"
         end
       end
     end
@@ -41,11 +38,11 @@ module K3cloud
 
     def execute_json(service_name, parameters)
       url = @config.server_url
-      if url.nil? || url.empty?
-        url = "https://api.kingdee.com/galaxyapi/"
-      else
-        url = url.to_s.strip.chomp("/")
-      end
+      url = if url.nil? || url.empty?
+              "https://api.kingdee.com/galaxyapi/"
+            else
+              url.to_s.strip.chomp("/")
+            end
       url = "#{url}/#{service_name}.common.kdsvc"
       K3cloud.logger.info("request_url: #{url}")
 

data/lib/k3cloud-sdk.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
 require "k3cloud"
-

metadata

@@ -1,20 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: k3cloud-sdk
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - zevinto
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies: []
-description: Ruby Gem for K3Cloud that uses cryptographic signature technology to
-  avoid plaintext transmission of keys and enables automatic login.
+description: Ruby Gem for K3cloud OpenApi that uses cryptographic signature technology
+  to avoid plaintext transmission of keys and enables automatic login.
 email:
 - zevinto@163.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -34,6 +36,7 @@ files:
 - lib/k3cloud.rb
 - lib/k3cloud/configuration.rb
 - lib/k3cloud/errors/k3cloud_error.rb
+- lib/k3cloud/errors/response_error.rb
 - lib/k3cloud/http.rb
 - lib/k3cloud/k3cloud_api.rb
 - lib/k3cloud/utils/base64_utils.rb