fastlane-plugin-pgyer 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 741284528b903fbc1a290128b51cbed6edaa428d734da99514a3e15e353d0534
-  data.tar.gz: 6fe64045b3a0fecb3da47ed3cc8a7d3915736a0e85f47a4bcb5386f9a4a19373
+  metadata.gz: 76598ee4c500e69dc2628a463315f2b45ece7db0bebca38e26b65a9d8f3413cc
+  data.tar.gz: b2df8a60da19d648c964dbd92da17a50edd471a5343867afb6be2c56553dd721
 SHA512:
-  metadata.gz: 94cef84dc0babdac14f62ed7d4ea53a73ff72bf788f463517743c921a427c30c8c6fc82a69ce4fbb5c0f19e922d457dedd5c4e31baed3402323b8960ae3005a7
-  data.tar.gz: 4eeef611fdc5c90845577d22d7f1f541598313a19776c459c032ea483d3c1f4b3a41ef05700facad77f82f5193491693668488c8c7202e9db21d9d2ebc747397
+  metadata.gz: 60302c4a4e3c101df47ed239c8c2a012fe161a3535d70ceb4f9047b94bd1e7f312eb8eb8e5b5f0fe39deae53b43299d312d8dc0c9d87f883911fc1e2379d94e3
+  data.tar.gz: 27415b535fa5f9110ecf86f145aa8499c8290c2abf3bf215175e1a31da517e28f384843e7caaafce192d2fc448d0f1034a6ef6207960b447b07f59890b977883

data/lib/fastlane/plugin/pgyer/actions/pgyer_action.rb

@@ -1,5 +1,6 @@
 require "faraday"
 require "faraday_middleware"
+require "timeout"
 
 module Fastlane
   module Actions
@@ -74,18 +75,9 @@ module Fastlane
           },
         }
 
-        api_host = "https://www.pgyer.com/apiv2/app"
-
-        pgyer_client = Faraday.new(nil, conn_options) do |c|
-          c.request :multipart
-          c.request :url_encoded
-          c.response :json, content_type: /\bjson$/
-          c.adapter :net_http
-        end
-
-        response = pgyer_client.post "#{api_host}/getCOSToken", request_params
-
-        info = response.body
+        # 选择可用的 API 域名
+        use_doh = params[:doh] == true
+        api_host, pgyer_client, info = self.select_available_api_host(conn_options, request_params, use_doh)
 
         if info["code"] != 0
           UI.user_error!("Get token is failed, info: #{info}")
@@ -121,7 +113,16 @@ module Fastlane
           UI.user_error!("PGYER Plugin Upload Error: #{response.body}")
         end
 
-        answer = self.checkPublishStatus(pgyer_client, api_host, api_key, key)
+        # 如果使用 DoH，需要传递 DoH 相关信息
+        doh_info = nil
+        if use_doh && api_host.include?("www.pgyer.com")
+          domain = "www.pgyer.com"
+          ip_address = resolve_domain_via_doh(domain)
+          if ip_address
+            doh_info = { domain: domain, ip_address: ip_address }
+          end
+        end
+        answer = self.checkPublishStatus(pgyer_client, api_host, api_key, key, doh_info)
 
         if params[:save_uploaded_info_json]
           File.open("pgyer-fastlane-uploaded-app-info.json", "w") do |f|
@@ -167,17 +168,6 @@ module Fastlane
                                        conflict_block: proc do |value|
                                          UI.user_error!("You can't use 'apk' and '#{value.key}' options in one run")
                                        end),
-          FastlaneCore::ConfigItem.new(key: :hap,
-                                       env_name: "PGYER_HAP",
-                                       description: "Path to your HAP file",
-                                       optional: true,
-                                       verify_block: proc do |value|
-                                         UI.user_error!("Couldn't find hap file at path '#{value}'") unless File.exist?(value)
-                                       end,
-                                       conflicting_options: [:ipa, :apk],
-                                       conflict_block: proc do |value|
-                                         UI.user_error!("You can't use 'hap' and '#{value.key}' options in one run")
-                                       end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "PGYER_IPA",
                                        description: "Path to your IPA file. Optional if you use the _gym_ or _xcodebuild_ action. For Mac zip the .app. For Android provide path to .apk file",
@@ -192,7 +182,7 @@ module Fastlane
                                        end),
           FastlaneCore::ConfigItem.new(key: :hap,
                                        env_name: "PGYER_HAP",
-                                       description: "Path to your HAP file. Optional if you use the _gym_ or _xcodebuild_ action. For Mac zip the .app. For Android provide path to .apk file",
+                                       description: "Path to your HAP file",
                                        default_value: Actions.lane_context[:HVIGOR_HAP_OUTPUT_PATH],
                                        optional: true,
                                        verify_block: proc do |value|
@@ -259,6 +249,12 @@ module Fastlane
                                        description: "Need to update the specified channel of the download short link, can specify only one channel, string type, such as: ABCD",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :doh,
+                                       env_name: "PGYER_DOH",
+                                       description: "Use DNS over HTTPS (DoH) to resolve domain names, bypassing local DNS. Experimental feature",
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean),
         ]
       end
 
@@ -272,6 +268,193 @@ module Fastlane
 
       private
 
+      def self.select_available_api_host(conn_options, request_params, use_doh = false)
+        # 如果启用 DoH，直接使用 DoH 解析 www.pgyer.com，跳过三个域名测试
+        if use_doh
+          return select_api_host_via_doh(conn_options, request_params)
+        end
+
+        # 尝试多个域名，防止 DNS 劫持
+        api_hosts = [
+          "https://www.pgyer.com/apiv2/app",
+          "https://www.xcxwo.com/apiv2/app",
+          "https://www.pgyerapp.com/apiv2/app",
+        ]
+
+        api_host = nil
+        pgyer_client = nil
+        info = nil
+
+        api_hosts.each_with_index do |host, index|
+          UI.message "尝试使用域名 #{index + 1}/#{api_hosts.length}: #{host}"
+
+          begin
+            # 为域名检测设置 5 秒超时
+            test_conn_options = {
+              request: {
+                timeout: 5,
+                open_timeout: 5,
+              },
+            }
+            test_client = create_faraday_client(test_conn_options, nil)
+            
+            # 使用超时控制，5 秒后如果还没响应就放弃
+            test_response = nil
+            test_info = nil
+            
+            begin
+              Timeout.timeout(5) do
+                test_response = test_client.post "#{host}/getCOSToken", request_params
+                test_info = test_response.body
+              end
+            rescue Timeout::Error
+              UI.message "域名 #{host} 请求超时（5秒），切换到下一个域名"
+              next
+            end
+
+            # 检查响应是否有效：如果返回了有效的 JSON 且包含 code 字段，说明域名解析正常
+            if test_info && test_info.is_a?(Hash) && test_info.key?("code")
+              if test_info["code"] == 0
+                # API 调用成功，使用该域名
+                # 使用原始的超时设置重新创建客户端（用于后续上传）
+                api_host = host
+                pgyer_client = create_faraday_client(conn_options, nil)
+                info = test_info
+                UI.success "成功使用域名: #{host}"
+                break
+              else
+                # API 返回了业务错误，但域名解析正常
+                # 保存第一个可用的域名作为备选，继续尝试其他域名看是否有返回 code == 0 的
+                if api_host.nil?
+                  api_host = host
+                  # 使用原始的超时设置重新创建客户端
+                  pgyer_client = create_faraday_client(conn_options, nil)
+                  info = test_info
+                  UI.message "域名 #{host} 解析正常，但 API 返回错误，保存为备选: #{test_info}"
+                else
+                  UI.message "域名 #{host} 可用，但 API 返回错误: #{test_info}"
+                end
+              end
+            else
+              # 响应格式不正确，可能是 DNS 劫持
+              UI.message "域名 #{host} 返回的响应格式不正确，可能遭遇 DNS 劫持"
+            end
+          rescue => e
+            UI.message "域名 #{host} 测试失败（可能是 DNS 劫持或超时）: #{e.message}"
+            next
+          end
+        end
+
+        if api_host.nil? || pgyer_client.nil? || info.nil?
+          UI.user_error!("所有域名都无法使用，可能都遭遇了 DNS 劫持。尝试的域名: #{api_hosts.join(', ')}")
+        end
+
+        return api_host, pgyer_client, info
+      end
+
+      # DoH 模式：使用 DoH 解析 www.pgyer.com（实验性功能）
+      def self.select_api_host_via_doh(conn_options, request_params)
+        UI.message "启用 DoH 模式，使用 DoH 解析 www.pgyer.com"
+
+        host = "https://www.pgyer.com/apiv2/app"
+        domain = "www.pgyer.com"
+
+        # 通过 DoH 解析域名
+        ip_address = resolve_domain_via_doh(domain)
+
+        if ip_address.nil?
+          UI.user_error!("DoH 解析失败，无法获取 www.pgyer.com 的 IP 地址")
+        end
+
+        UI.message "DoH 解析成功: #{domain} -> #{ip_address}"
+
+        # 使用 IP 地址替换域名，但保留 Host header
+        actual_url = host.gsub(domain, ip_address)
+        host_header = domain
+
+        begin
+          test_client = create_faraday_client(conn_options, host_header)
+
+          # 设置 Host header
+          request_headers = { "Host" => host_header }
+
+          test_response = test_client.post "#{actual_url}/getCOSToken", request_params, request_headers
+          test_info = test_response.body
+
+          if test_info && test_info.is_a?(Hash) && test_info.key?("code")
+            if test_info["code"] == 0
+              UI.success "DoH 模式：成功使用域名 #{host}"
+              return host, test_client, test_info
+            else
+              UI.user_error!("DoH 模式：API 返回错误: #{test_info}")
+            end
+          else
+            UI.user_error!("DoH 模式：返回的响应格式不正确: #{test_info}")
+          end
+        rescue => e
+          UI.user_error!("DoH 模式：请求失败: #{e.message}")
+        end
+      end
+
+      # DoH 相关方法（实验性功能）
+      def self.resolve_domain_via_doh(domain)
+        # 使用阿里云公共 DoH 服务
+        doh_url = "https://dns.alidns.com/resolve"
+
+        begin
+          doh_client = Faraday.new do |c|
+            c.request :url_encoded
+            c.response :json
+            c.adapter :net_http
+          end
+
+          response = doh_client.get(doh_url, { name: domain, type: "A" })
+          result = response.body
+
+          if result && result.is_a?(Hash) && result["Answer"]
+            # 获取第一个 A 记录
+            a_record = result["Answer"].find { |r| r["type"] == 1 }
+            if a_record && a_record["data"]
+              return a_record["data"]
+            end
+          end
+        rescue => e
+          UI.message "DoH 解析出错: #{e.message}"
+        end
+
+        return nil
+      end
+
+      def self.extract_domain_from_url(url)
+        # 从 URL 中提取域名
+        # 例如: https://www.pgyer.com/apiv2/app -> www.pgyer.com
+        uri = URI.parse(url)
+        return uri.host
+      end
+
+      def self.create_faraday_client(conn_options, host_header = nil)
+        # 创建基础的 Faraday 客户端
+        # Host header 将在请求时通过 headers 参数设置
+        # DoH 模式下禁用 SSL 证书验证（因为使用 IP 地址，证书绑定域名）
+        final_options = conn_options.dup
+
+        Faraday.new(nil, final_options) do |c|
+          c.request :multipart
+          c.request :url_encoded
+          c.response :json, content_type: /\bjson$/
+          c.adapter :net_http do |http|
+            if host_header
+              # DoH 模式：使用 IP 地址，禁用 SSL 证书验证
+              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+              UI.message "DoH 模式：已禁用 SSL 证书验证（实验性功能）"
+            else
+              # 普通模式：使用默认 SSL 验证
+              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            end
+          end
+        end
+      end
+
       def self.get_type(params)
         type = params[:ipa].nil? ? "android" : "ios"
 
@@ -282,10 +465,24 @@ module Fastlane
         type
       end
 
-      def self.checkPublishStatus(client, api_host, api_key, buildKey)
-        url ="#{api_host}/buildInfo"
+      def self.checkPublishStatus(client, api_host, api_key, buildKey, doh_info = nil)
+        # URL 保持使用域名（用于显示）
+        url = "#{api_host}/buildInfo"
         UI.message "checkPublishStatus url: #{url}"
-        response = client.post "#{api_host}/buildInfo", { :_api_key => api_key, :buildKey => buildKey }
+
+        # 如果使用 DoH，实际请求时使用 IP 地址，但设置 Host header
+        actual_url = api_host
+        request_headers = {}
+
+        if doh_info && doh_info[:ip_address]
+          # 实际连接使用 IP 地址
+          actual_url = api_host.gsub(doh_info[:domain], doh_info[:ip_address])
+          # 设置 Host header 为原始域名
+          request_headers["Host"] = doh_info[:domain]
+          UI.message "DoH 模式：实际连接使用 IP 地址 #{doh_info[:ip_address]}，Host header: #{doh_info[:domain]}"
+        end
+
+        response = client.post "#{actual_url}/buildInfo", { :_api_key => api_key, :buildKey => buildKey }, request_headers
         info = response.body
         code = info["code"]
         if code == 0
@@ -299,7 +496,7 @@ module Fastlane
           return info["data"]
         elsif code == 1246 || code == 1247
           sleep 3
-          self.checkPublishStatus(client, api_host, api_key, buildKey)
+          self.checkPublishStatus(client, api_host, api_key, buildKey, doh_info)
         else
           UI.user_error!("PGYER Plugin Published Error: #{info} buildKey: #{buildKey}")
         end

data/lib/fastlane/plugin/pgyer/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Pgyer
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-pgyer
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - rexshi
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.9
 specification_version: 4
 summary: distribute app to pgyer beta testing service
 test_files: []