jieshun-parking 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e62dbeac0ad063a0b1ccfd6c05f734d9eb029601db476a8902e76f90ccd020b2
-  data.tar.gz: 4a74322b5e1e9736dd085019b5dc7b5757778d3cc0f4a23b047c4799767c2d45
+  metadata.gz: 318dc7eecf5a1390f6027cff4886d4beb60068a4cdfb220d4b280bd95625e8a6
+  data.tar.gz: 484b8893041d1c8ae4bb7b1880dc437dcaaaa0529f02cea311503fb0c12e87b4
 SHA512:
-  metadata.gz: 9eea2615ad75a03358adb76f297570df9f5ca3ce04f477ce48119c71fea806b7477123ee5d19b937d3e3af35c6ad3fe09252d3e84c802e451d64d4640aae2f24
-  data.tar.gz: aee37bc88b551134697e7c8f5575d21c5f8282d0cc9ffe38ed0f461cdcdee735c3f1863ffe4d19d7490cc97c7a0a54c312a7d31cd5cd4c2322f5d7c6ed7d15d0
+  metadata.gz: b6cea4b4d3353a966032dd245e4b2055c5f56f65af528f437f11bd4baab1c60fa4208aec10d64b43db82606ad836d3d8d55bee64a6af8706aff7b9b2db862d5c
+  data.tar.gz: f0dd3715ca33b6639dd3bd2a120ab0686d1f7affd9cd58e01fe01a2a050cac304b442c35480022fdc066b1076ad89e1eb02c2778b191d7bc303f226f1a650793

data/lib/jieshun/parking/data_center_client.rb

@@ -4,7 +4,8 @@ module Jieshun
     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
@@ -15,17 +16,38 @@ module Jieshun
         @redis_client.redis_get(REDIS_AUTH_KEY)
       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)
+          # 使用 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
+                refresh_token do |auth_token|
+                  yield(auth_token)
+                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
+        end
+        yield(auth_token)
+      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

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.4"
   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.4
 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