tcat 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d08abb934b373088d1c95b04871fa30e9feb3a380b3e9fbed9011b659cb5da4a
-  data.tar.gz: ab23c8913af3b3ec2c0687f9715a0f7e983e3349183cd42c66e0d040208acd90
+  metadata.gz: ad6c2ffd128652a809518fd30dc48b80cfaa4b67fed9316ac718b750aab81119
+  data.tar.gz: 10e9ecda054bee5aded67ccedace1fb173c65fc6ecd8ce72b84b55bf2f2c2230
 SHA512:
-  metadata.gz: 26e31aeaa06a46d31d7bea49fd46999bd446d47d29e73011a3262627a0658f0344123085b4f67000dde3f4aeb14611019d10463215f672413ed64b74717561a1
-  data.tar.gz: d6634d7f3ecfb4a14795d55e6a7ae42d38002d52382fa89620461edd5a35b858dec1526db2ea24d1689aa78e22aa942f196cd13632cd45688da4ab3e6f2f3152
+  metadata.gz: cb8df071bac9d109f97ab45e2a7981ce48ddcdebfad1384ff874cb4e314bfbd1a0b166bd9fe6ffd10dc68aacda986b80a802506a3d5d17398780fa05a76a4b73
+  data.tar.gz: b5bcf421668bfe8d684042a65ff8b4f263ae419fb2d777a59feaf634b5859aa9a03cfcaa462d489aa2a619e397a44be7efd816feb4848c3cbe0ad8c1a1e7547e

data/README.md

@@ -58,6 +58,7 @@ status = query.status_code
 # :in_transit  - In transit
 # :returned    - Return completed
 # :held        - Held at post office
+# :rescheduled - Delivery time rescheduled
 # :forwarding  - Being forwarded
 # :investigation - Under investigation
 # :rejected    - Delivery rejected
@@ -92,6 +93,7 @@ end
 - `:in_transit` - In transit
 - `:returned` - Return completed
 - `:held` - Package is being held at post office
+- `:rescheduled` - Delivery time rescheduled
 - `:forwarding` - Package is being forwarded
 - `:investigation` - Package is under investigation (e.g., address change, rejection)
 - `:rejected` - Delivery was rejected
@@ -128,6 +130,26 @@ This gem is available as open source under the terms of the [MIT License](https:
 
 ## Changelog
 
+### 0.2.1
+
+- Updated base64 gem dependency to ~> 0.3
+- Code formatting improvements
+
+### 0.2.0
+
+- Fixed SSL certificate verification issues with T-Cat API
+- Added session initialization to obtain cookies before queries
+- Added cookie management for maintaining session state
+- Added new status code mappings: `:rescheduled` (另約時間) and `:held` (暫置營業所)
+- Removed Rails.logger dependency for better standalone gem compatibility
+- Added base64 gem dependency for Ruby 3.4+ compatibility
+- Updated HTTP headers to match latest BlackCat iOS app (version 3)
+- Improved error handling with better debug output
+
+### 0.1.9
+
+- Updated User-Agent and API version
+
 ### 0.1.7
 
 - Improved method naming, removed get_ prefix
@@ -143,7 +165,7 @@ This gem is available as open source under the terms of the [MIT License](https:
 - Improved error handling
 - Added test coverage
 
-### 0.1.5 (2024-01-11)
+### 0.1.5
 
 - Refactored HTTP request handling with new HttpClient class
 - Refactored encryption logic with new EncryptionService class

data/lib/tcat/http_client.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
 require 'net/http'
+require 'openssl'
 
 module Tcat
   class HttpClient
     DEFAULT_HEADERS = {
-      'User-Agent' => 'BlackCat/2.49.1 (iPhone; iOS 18.4.1; Scale/3.00)',
-      'Accept-Language' => 'zh-Hant-TW;q=1, en-TW;q=0.9',
-      'Cookie' => 'citrix_ns_id=AAE7go4rZDusCRcEAAAAADuVBLGLdqo1FolMO02r_jOEnjNmr4u9sIYwtllmmfsOOw==KJArZA==AQJLxyeLYOXPo3Uzfh_rWrr_NcU=; ASP.NET_SessionId=p4v1z4nijrynbortgf4iqml4'
+      'User-Agent' => 'BlackCat/3 (iPhone; iOS 26.2; Scale/3.00)',
+      'Accept-Language' => 'en-TW;q=1, zh-Hant-TW;q=0.9',
+      'Accept' => '*/*',
+      'Accept-Encoding' => 'gzip, deflate, br',
+      'Connection' => 'keep-alive'
     }.freeze
 
     API_ENDPOINT = 'https://www.t-cat.com.tw/iPhone/TCatApp.aspx'
@@ -15,8 +18,11 @@ module Tcat
 
     class RequestError < StandardError; end
 
+    attr_reader :cookies
+
     def initialize(timeout: 30)
       @timeout = timeout
+      @cookies = {}
     end
 
     def post(params)
@@ -25,9 +31,13 @@ module Tcat
 
       request = Net::HTTP::Post.new(uri)
       DEFAULT_HEADERS.each { |key, value| request[key] = value }
+      request['Content-Type'] = 'application/x-www-form-urlencoded; charset=utf-8'
+      request['Cookie'] = build_cookie_header if @cookies.any?
       request.body = URI.encode_www_form(params)
 
-      handle_response(http.request(request))
+      response = http.request(request)
+      extract_cookies(response)
+      handle_response(response)
     rescue Net::ReadTimeout, Net::OpenTimeout => e
       raise RequestError, "Request timeout: #{e.message}"
     rescue SocketError, Net::HTTPError => e
@@ -36,11 +46,29 @@ module Tcat
       raise RequestError, "Unexpected error: #{e.message}"
     end
 
+    def initialize_session(secret)
+      params = {
+        f: 18,
+        secret: secret,
+        SVC: 'TCATAPP'
+      }
+      post(params)
+    end
+
     private
 
     def setup_http_client(uri)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+      # Setup certificate store without CRL checking
+      # This verifies the certificate chain but skips CRL validation
+      store = OpenSSL::X509::Store.new
+      store.set_default_paths
+      # Explicitly do not set V_FLAG_CRL_CHECK or V_FLAG_CRL_CHECK_ALL
+      http.cert_store = store
+
       http.read_timeout = @timeout
       http.open_timeout = @timeout
       http
@@ -56,5 +84,20 @@ module Tcat
         raise RequestError, "HTTP #{response.code}: #{response.message}"
       end
     end
+
+    def extract_cookies(response)
+      return unless response['Set-Cookie']
+
+      response.get_fields('Set-Cookie').each do |cookie_string|
+        cookie_string.split(';').first.split(',').each do |pair|
+          name, value = pair.strip.split('=', 2)
+          @cookies[name] = value if name && value
+        end
+      end
+    end
+
+    def build_cookie_header
+      @cookies.map { |name, value| "#{name}=#{value}" }.join('; ')
+    end
   end
 end

data/lib/tcat/query.rb

@@ -19,6 +19,9 @@ module Tcat
       @tracking_number = tracking_number
       @http_client = HttpClient.new
       @encryption_service = EncryptionService.new(@secret_key)
+
+      # Initialize session to get cookies
+      initialize_session
     end
 
     # Get current delivery status code
@@ -41,7 +44,7 @@ module Tcat
         extract_delivery_history(result)
       end
     rescue StandardError => e
-      Rails.logger.error("Error getting delivery history: #{e.message}")
+      warn "Error getting delivery history: #{e.message}" if $DEBUG
       []
     end
 
@@ -60,6 +63,18 @@ module Tcat
       raise ArgumentError, 'SECRET_KEY must be configured' if @secret_key.nil? || @secret_key.empty?
     end
 
+    def initialize_session
+      secret = generate_secret
+      @http_client.initialize_session(secret)
+      warn "Session initialized, cookies: #{@http_client.cookies.inspect}" if $DEBUG
+    rescue HttpClient::RequestError => e
+      warn "Failed to initialize session: #{e.message}"
+      warn e.backtrace.first(5).join("\n") if $DEBUG
+    rescue StandardError => e
+      warn "Unexpected error during session initialization: #{e.class} - #{e.message}"
+      warn e.backtrace.first(5).join("\n") if $DEBUG
+    end
+
     def data
       {
         ConsignmentNo: @tracking_number,
@@ -99,7 +114,7 @@ module Tcat
         
         parse_status_message(delivery_statuses.uniq)
       rescue StandardError => e
-        Rails.logger.error("Error parsing T-Cat response: #{e.message}")
+        warn "Error parsing T-Cat response: #{e.message}" if $DEBUG
         :error
       end
     end
@@ -115,7 +130,7 @@ module Tcat
         []
       end.compact.sort_by(&:time).reverse
     rescue StandardError => e
-      Rails.logger.error("Error parsing delivery history: #{e.message}")
+      warn "Error parsing delivery history: #{e.message}" if $DEBUG
       []
     end
 
@@ -165,6 +180,8 @@ module Tcat
       '轉運中' => :in_transit,
       '退貨完成' => :returned,
       '暫置營業所保管中' => :held,
+      '暫置營業所' => :held,
+      '另約時間' => :rescheduled,
       '轉寄配送中' => :forwarding,
       '搬家(調查處理中)' => :investigation,
       '拒收(調查處理中)' => :investigation,

data/lib/tcat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tcat
-  VERSION = '0.1.9'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tcat
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - Zac
@@ -9,6 +9,20 @@ bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ox
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A Ruby gem for tracking packages using the Tcat system.
 test_files: []