jieshun-parking 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62dbeac0ad063a0b1ccfd6c05f734d9eb029601db476a8902e76f90ccd020b2
-  data.tar.gz: 4a74322b5e1e9736dd085019b5dc7b5757778d3cc0f4a23b047c4799767c2d45
+  metadata.gz: 68926a0aeaf9f28755c8f054a766714f1ebe50919458c8085bc69d09a3b4c150
+  data.tar.gz: 1b625c14754f9dd1b34892d0f552412809d1cf4c67859ee24544f8a6269fcd90
 SHA512:
-  metadata.gz: 9eea2615ad75a03358adb76f297570df9f5ca3ce04f477ce48119c71fea806b7477123ee5d19b937d3e3af35c6ad3fe09252d3e84c802e451d64d4640aae2f24
-  data.tar.gz: aee37bc88b551134697e7c8f5575d21c5f8282d0cc9ffe38ed0f461cdcdee735c3f1863ffe4d19d7490cc97c7a0a54c312a7d31cd5cd4c2322f5d7c6ed7d15d0
+  metadata.gz: 2b27373583050c8574fbfbf209c03e2f8e44b06f4a65bb56e1873f526e1f8f04c64c3fdae520141654a4062b2b80594f73cdae843ca4d5806513c89e679abae2
+  data.tar.gz: 3a1ab8e23b5b34339d65364835cb33872ad3a000156c24e557a85d7bd556dfaa43e87157bda9ff9517b76ca42c6bbc3082db60ba8a5e3e4e509ead55892dcc49

data/lib/jieshun/parking/data_center_client.rb

@@ -1,82 +1,106 @@
 module Jieshun
-  module Parking
-    # 捷顺数据中心 Client, 目前主要用来获取图片, 对应文档为 QX205_数据中心标准推送协议-1.1.6(1)
-    class DataCenterClient
+	module Parking
+		# 捷顺数据中心 Client, 目前主要用来获取图片, 对应文档为 QX205_数据中心标准推送协议-1.1.6(1)
+		class DataCenterClient
+			REDIS_AUTH_KEY = 'jieshun.parking.datacenter.auth.token'
+			REDIS_AUTH_KEY_LOCK = 'jieshun.parking.datacenter.auth.token.lock'
+			MAX_RETRY_COUNT = 3 # 定义refresh_token 最大重试次数
+			def initialize(configuration, http_client = StandardHttpClient.new)
+				@configuration = configuration
+				@http_client = http_client
+				@redis_client = RedisClient.new(@configuration.redis_config)
+			end
 
-      REDIS_AUTH_KEY = 'jieshun.parking.datacenter.auth.token'
+			def get_auth_token
+				@redis_client.redis_get(REDIS_AUTH_KEY)
+			end
 
-      def initialize(configuration, http_client = StandardHttpClient.new)
-        @configuration = configuration
-        @http_client = http_client
-        @redis_client = RedisClient.new(@configuration.redis_config)
-      end
+			def login_if_required
+				auth_token = get_auth_token
+				if Jieshun::Parking.always_login || auth_token.nil? || auth_token.empty?
+					# 使用 Redis 锁来避免并发刷新
+					lock_key = REDIS_AUTH_KEY_LOCK
+					begin
+						# 设置一个5秒过期的锁
+						if @redis_client.redis_set_nx_lock(lock_key, 5)
+							# 重试机制
+							Retry.with_retries(max_tries: MAX_RETRY_COUNT, sleep_seconds: 1) do
+								# 过程中遇到错误重试时， 检查本地token是否存在
+								auth_token = get_auth_token
+								if auth_token
+									yield(auth_token)
+								else
+									refresh_token do |auth_token|
+										yield(auth_token)
+									end
+								end
+							end
+						end
+					rescue StandardError => e
+						Jieshun::Parking.logger.info("Failed to refresh token；error: #{e.message}")
+					ensure
+						# 确保锁最终被释放
+						@redis_client.redis_del(lock_key)
+					end
+				else
+					yield(auth_token)
+				end
+			end
 
-      def get_auth_token
-        @redis_client.redis_get(REDIS_AUTH_KEY)
-      end
+			def refresh_token
+				hash = { pno: @configuration.pno, secret: @configuration.secret }
+				@http_client.post_json("#{@configuration.server_url}/api/login", {}, hash) do |result|
+					auth_token = result.body['tn']
+					expire_time = result.body['timeOut'] - 1000
+					@redis_client.redis_set(REDIS_AUTH_KEY, auth_token, expire_time) # token will be expired after 2 hours
+					yield(auth_token)
+				end
+			end
 
-      def login_if_required
-        auth_token = get_auth_token
-        if Jieshun::Parking.always_login || auth_token.nil? || auth_token.empty?
-          hash = { pno: @configuration.pno, secret: @configuration.secret }
-          @http_client.post_json("#{@configuration.server_url}/api/login", {}, hash) do |result|
-            auth_token = result.body['tn']
-            expire_time = result.body['timeOut'] - 1000
-            @redis_client.redis_set(REDIS_AUTH_KEY, auth_token, expire_time) # token will be expired after 2 hours
-            yield(auth_token)
-          end
-        else
-          yield(auth_token)
-        end
-      end
+			def get_picture_base64(file_path)
+				data_items = []
+				data_items << { filePath: file_path }
+				unify_call("/api/pic/picSearch", data_items.to_json) do |result|
+					image = result.body['dataItems'].first['image']
+					mime_type = detect_mime_type(image)
+					yield({ mime_type_prefix: "data:#{mime_type};base64,", content: image })
+				end
+			end
 
-      def get_picture_base64(file_path)
-        data_items = []
-        data_items << { filePath: file_path }
-        unify_call("/api/pic/picSearch", data_items.to_json) do |result|
-          image = result.body['dataItems'].first['image']
-          mime_type = detect_mime_type(image)
-          yield( { mime_type_prefix: "data:#{mime_type};base64,", content: image } )
-        end
-      end
+			def detect_mime_type(base64_content)
+				return "application/pdf" if content_matches?(base64_content, ['JVBERi0'])
+				return "image/gif" if content_matches?(base64_content, ['R0lGODdh', 'R0lGODlh'])
+				return "image/png" if content_matches?(base64_content, ['iVBORw0KGgo'])
+				return "image/jpg" if content_matches?(base64_content, ['/9j/'])
+				return "image/bmp" if content_matches?(base64_content, ['Qk'])
+				"application/octet-stream"
+			end
 
-      def detect_mime_type(base64_content)
-        return "application/pdf" if content_matches?(base64_content, ['JVBERi0'])
-        return "image/gif" if content_matches?(base64_content, ['R0lGODdh', 'R0lGODlh'])
-        return "image/png" if content_matches?(base64_content, ['iVBORw0KGgo'])
-        return "image/jpg" if content_matches?(base64_content, ['/9j/'])
-        return "image/bmp" if content_matches?(base64_content, ['Qk'])
-        "application/octet-stream"
-      end
+			def content_matches?(base64_content, prefixes)
+				prefixes.any? { |prefix| base64_content.start_with?(prefix) }
+			end
 
-      def content_matches?(base64_content, prefixes)
-        prefixes.any? { |prefix| base64_content.start_with?(prefix) }
-      end
+			def unify_call(api_path, data_items)
+				login_if_required do |auth_token|
+					ts = Time.now.strftime("%Y%m%d%H%M%S%L")
+					sn = generate_signature("#{@configuration.secret}#{ts}#{data_items}")
+					hash = {
+							pno: @configuration.pno,
+							tn: auth_token,
+							ts: ts,
+							sn: sn,
+							dataItems: data_items
+					}
+					@http_client.post_json("#{@configuration.server_url}/#{api_path}", {}, hash) do |result|
+						yield(result)
+					end
+				end
+			end
 
-      def unify_call(api_path, data_items)
-        login_if_required do |auth_token|
-          ts = Time.now.strftime("%Y%m%d%H%M%S%L")
-          sn = generate_signature("#{@configuration.secret}#{ts}#{data_items}")
-          hash = {
-            pno: @configuration.pno,
-            tn: auth_token,
-            ts: ts,
-            sn: sn,
-            dataItems: data_items
-          }
-
-          @http_client.post_json("#{@configuration.server_url}/#{api_path}", { }, hash) do |result|
-            yield(result)
-          end
-
-        end
-      end
-
-      def generate_signature(payload)
-        md5_string = Digest::MD5.hexdigest(payload)
-        md5_string.upcase
-      end
-
-    end
-  end
+			def generate_signature(payload)
+				md5_string = Digest::MD5.hexdigest(payload)
+				md5_string.upcase
+			end
+		end
+	end
 end

data/lib/jieshun/parking/http/standard_http_client.rb

@@ -7,6 +7,9 @@ module Jieshun
       require 'uri'
       require 'json'
 
+      # 设置连接和读取的超时时间（以秒为单位）
+      TIMEOUT = 30 # 例如，30 秒超时
+
       def post_form(server_url, headers, hash)
         post(server_url, 'application/x-www-form-urlencoded', headers, hash) do |result|
           yield(result)
@@ -24,7 +27,7 @@ module Jieshun
         req = Net::HTTP::Post.new(uri)
         headers.each { |k, v| req[k] = v }
         req["Content-Type"] = content_type
-        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
+        Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https', read_timeout: TIMEOUT, open_timeout: TIMEOUT) do |http|
           if Jieshun::Parking.debug_mode && Jieshun::Parking.logger
             Jieshun::Parking.logger.debug("Jieshun Parking Request, url: #{server_url}, body: #{JSON.pretty_generate(hash)}")
           end

data/lib/jieshun/parking/redis/redis_client.rb

@@ -35,6 +35,10 @@ module Jieshun
         redis_client.ttl key
       end
 
+
+      def redis_set_nx_lock(lock_key, expire_time)
+        redis_client.set(lock_key, 1, nx: true, ex: expire_time)
+      end
     end
   end
 end

data/lib/jieshun/parking/version.rb

@@ -2,6 +2,6 @@
 
 module Jieshun
   module Parking
-    VERSION = "0.6.3"
+    VERSION = "0.6.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jieshun-parking
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - LCola
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2024-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 捷顺停车场 API