fir-cli 2.0.22 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77e9cba516478be239dcf9a96ee35f2a70d7da8871344a535d8de295ec32c4da
-  data.tar.gz: 19dd18244a059ee6aea0437b0e932d0dc483103fa52b4dfcf6b1f3c554e823bb
+  metadata.gz: 780261ddc58b3e97a74409054acc6873d510c9f56651374f1430f94cb97fd779
+  data.tar.gz: cb715ab080b9d6b87d6d804daae6ea88f91e870081003b555ca639e71a6ce5de
 SHA512:
-  metadata.gz: 8f72df72c72976e596d68a9b6c3b13afca9f5656253d295de2330b46d3fb44a7399894abe34b292ebffbcb408a2da1c6459160de73fd33b20b52af0140a8a1c1
-  data.tar.gz: d7bd5babd00854b4bcca761b283b2228fcc8970b47754436e3c9899ea750111309a449a7191d78893ab9a3c4ee16e8fa5012b57da4b2af9ffca8680a120c549d
+  metadata.gz: a18e89e1da15843183dbe1a14a16ccbfe9a09914e924f2b3b9b73867bb7b813f30d2430df6a1f7471a2a90465e139f545af5586040f18c69d4c5ca6120d897ad
+  data.tar.gz: 6ab8bbc3b9d15fbbcaacdb46a8eeb13a04e33fa00f5e09f68d5217f8736bfa07efbec7c490c7b29425d7c41b2a69a7d36520ae721e52bea2b6440d43138e6f3c

data/Gemfile

@@ -8,3 +8,7 @@ end
 # Specify your gem's dependencies in fir.gemspec
 gemspec
 gem 'codeclimate-test-reporter', group: :test, require: nil
+
+# Fix compatibility with Ruby 3.2.2
+# mime-types 3.2.2 uses _1, _2, _3 as parameter names which are reserved in Ruby 2.7+
+gem 'mime-types', '>= 3.3.0'

data/README.md

@@ -19,6 +19,8 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 - 我们也提供 docker 版本的 fir-cli, 具体使用方式参见 **Docker 运行 fir-cli** 章节
 
 # 最近更新
+- (2.0.24) 修复部分 APK 包含非法 XML 控制字符导致解析失败的问题
+- (2.0.23) 增强上传稳定性
 - (2.0.22) 支持自定义下载文件名称 --user_download_file_name=具体文件名称  注意， 此参数无法与switch_to_qiniu 一起使用
 - (2.0.21) 修正 publish 的结果不返回导致 fastlane-plugin-fir_cli 命令执行结果为nil 的问题
 - (2.0.20) 新增参数 --save_uploaded_info, 可以将上传的结果存入当前目录下的 fir-cli-upload-info.json 文件中, 方便集成其他功能

data/lib/fir/patches/rest_client_fix.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Fix for rest-client 2.1.0 compatibility with Ruby 2.6/2.7
+# The bug: In some cases, @response is a String instead of a response object,
+# causing NoMethodError when calling @response.code in http_code method.
+#
+# See: https://github.com/rest-client/rest-client/issues/...
+module RestClient
+  class Exception
+    def http_code
+      # return integer for compatibility
+      if @response
+        # Handle case where @response is a String (e.g., "401 Unauthorized")
+        # or when @response is a proper response object
+        code = if @response.respond_to?(:code)
+                 @response.code
+               else
+                 @response.to_s[/\d{3}/]
+               end
+        code.to_i
+      else
+        @initial_response_code
+      end
+    end
+  end
+end

data/lib/fir/patches.rb

@@ -9,3 +9,4 @@ require_relative './patches/os_patch'
 require_relative './patches/try'
 require_relative './patches/default_headers'
 require_relative './patches/progress'
+require_relative './patches/rest_client_fix'

data/lib/fir/util/ali_uploader.rb

@@ -70,6 +70,10 @@ module FIR
         t = Time.now
         http = Net::HTTP.new(hostname, 443)
         http.use_ssl = true
+        # 根据环境变量配置SSL证书验证
+        unless ENV['UPLOAD_VERIFY_SSL']
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
         req = Net::HTTP::Put.new(uri.request_uri, headers)
         req.content_length = io.size
         req.body_stream = io

data/lib/fir/util/parser/apk.rb

@@ -1,6 +1,25 @@
 # frozen_string_literal: true
 
 require_relative './common'
+
+# Monkey patch to fix illegal character issues in AXML parsing
+# Some APKs contain control characters in strings that REXML cannot handle
+module Android
+  class AXMLParser
+    alias_method :original_parse_strings, :parse_strings
+
+    def parse_strings
+      original_parse_strings
+      # Remove illegal XML control characters from strings
+      @strings = @strings.map do |str|
+        next str unless str.is_a?(String)
+        # Keep only valid XML characters: #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
+        str.gsub(/[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD]/, '')
+      end
+    end
+  end
+end
+
 module FIR
   module Parser
     class Apk
@@ -18,13 +37,18 @@ module FIR
       end
 
       def basic_info
-        @basic_info ||= {
-          type: 'android',
-          name: fetch_label,
-          identifier: @apk.manifest.package_name,
-          build: @apk.manifest.version_code.to_s,
-          version: @apk.manifest.version_name.to_s
-        }
+        @basic_info ||= begin
+          manifest = @apk.manifest
+          raise 'Failed to parse AndroidManifest.xml. The APK may be corrupted, repacked, or contain unsupported characters.' unless manifest
+
+          {
+            type: 'android',
+            name: fetch_label,
+            identifier: manifest.package_name,
+            build: manifest.version_code.to_s,
+            version: manifest.version_name.to_s
+          }
+        end
         @basic_info.reject! { |_k, v| v.nil? }
         @basic_info
       end

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "2.0.22"
+  VERSION = "2.0.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.0.24
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2026-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -226,6 +226,7 @@ files:
 - lib/fir/patches/native_patch.rb
 - lib/fir/patches/os_patch.rb
 - lib/fir/patches/progress.rb
+- lib/fir/patches/rest_client_fix.rb
 - lib/fir/patches/try.rb
 - lib/fir/util.rb
 - lib/fir/util/ali_uploader.rb
@@ -290,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: fir.im command tool