cocoapods-anker-ar 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a12a0c8334bae3fa0d0b53a6a5cf0480ca0d0fa2fec3d3b9a0eb324b67534a05
-  data.tar.gz: d8bff5397f7262b366e5ad61b22424defe4d4a74dd36860c3df1014ec7ba8919
+  metadata.gz: 2f7f7de7a7a171b60747089ca8c51d423b9a26bd2d7d50b418683d9e5582928e
+  data.tar.gz: 561d0f5dd9099c3f254dace5c021ce0607ffdb056cff867d84a9f45124492509
 SHA512:
-  metadata.gz: de8a4b20398dff205da4f52e982b5edbc5e5fdd428e3e51c0c1e2b9f18d1e732f6aa8c4633a0e52b82c7e07cee39763f7a0bbd985ae07b9900bb3eb399f8b0f6
-  data.tar.gz: 2a18ff5a74d03cb4c790e70961b581bb82623ffa0cbc56157afae15bb80f7c41814766862a03572d0926cb4d40d02b7abf20dd433a6c0c3b65a8966d8e407eaa
+  metadata.gz: 4c04469d6b95601cf7122eda64453de636571cb12517559985eeecd4331573db13576359b29abddadf3fb9b2cc1cb4aaa3110d0f7791767af0106af2c46fb7e2
+  data.tar.gz: 7304d9ccd6684d48bc1fd38d44a10b6fe7c646573f63e9f217395fa0817f4f7e436fc5ea4601645954e92a8433a89b84042fc556401c0289d6a6bb733ea57879

data/lib/cocoapods_anker_ar.rb

@@ -1,3 +1,3 @@
 module CocoapodsAnkerAr
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

data/lib/cocoapods_plugin.rb

@@ -5,75 +5,171 @@ require 'coding_ar_util'
 module Pod
   module Downloader
     class Http
+      # The upstream implementation of `should_flatten?`, captured lazily.
+      #
+      # It is used as an escape hatch when another plugin (e.g. cocoapods-art)
+      # has captured our definition with `alias_method` and calls back into us:
+      # continuing down the `super` chain in that situation loops forever.
+      #
+      # @return [UnboundMethod, nil]
+      #
+      def self.base_should_flatten?
+        @base_should_flatten ||=
+          begin
+            require 'cocoapods-downloader/http'
+            Pod::Downloader::RemoteFile.instance_method(:should_flatten?)
+          rescue NameError, LoadError
+            nil
+          end
+      end
+
+      # Union with the upstream option list instead of replacing it.
+      #
+      # Other plugins (cocoapods-art adds `:headers`) and newer CocoaPods
+      # releases contribute options here. Replacing the list would make
+      # `Base#initialize` reject their options as unrecognized.
+      #
       def self.options
-        [:type, :flatten, :sha1, :sha256, :indexDownload]
+        upstream = defined?(super) ? (super || []) : []
+        (upstream | [:type, :flatten, :sha1, :sha256, :indexDownload]).freeze
       end
 
-      alias_method :orig_download_file, :download_file
-      alias_method :orig_should_flatten?, :should_flatten?
+      # Use prepend instead of alias_method to safely monkey-patch without
+      # infinite recursion when the plugin is loaded more than once.
+      module AnkerArExtensions
+        CODING_AR_HOST = 'codingcorp-cocoapods.pkg.coding.anker-in.com'.freeze
 
-      def download_file(full_filename)
-        # Check if this is a CODING-AR URL
-        if url.to_s.include?('codingcorp-cocoapods.pkg.coding.anker-in.com')
-          CodingArUtil.download(url, full_filename)
-        else
-          orig_download_file(full_filename)
+        def download_file(full_filename)
+          if url.to_s.include?(CODING_AR_HOST)
+            CodingArUtil.download(url, full_filename)
+          else
+            super
+          end
+        end
+
+        def should_flatten?
+          if options.key?(:indexDownload) && options[:indexDownload] == true
+            true
+          elsif url.to_s.include?(CODING_AR_HOST)
+            # For CODING-AR packages, preserve directory structure to maintain .xcframework layout
+            # Use indexDownload: true in podspec if flattening is needed
+            puts "🔧 [CocoaPods-Anker-AR] Preserving directory structure for CODING-AR package"
+            false
+          elsif @__anker_resolving_should_flatten
+            # Re-entered through a plugin that aliased this method
+            # (cocoapods-art does `alias_method :orig_should_flatten?, ...`).
+            # Delegating again would bounce between the two definitions
+            # forever, so fall back to the downloader's own implementation.
+            base = self.class.base_should_flatten?
+            return base ? base.bind(self).call : false
+          else
+            begin
+              @__anker_resolving_should_flatten = true
+              super
+            ensure
+              @__anker_resolving_should_flatten = false
+            end
+          end
         end
       end
 
-      def should_flatten?
-        if options.key?(:indexDownload) && options[:indexDownload] == true
-          true
-        elsif url.to_s.include?('codingcorp-cocoapods.pkg.coding.anker-in.com')
-          # For CODING-AR packages, preserve directory structure to maintain .xcframework layout
-          # Use indexDownload: true in podspec if flattening is needed
-          puts "🔧 [CocoaPods-Anker-AR] Preserving directory structure for CODING-AR package"
-          false
+      prepend AnkerArExtensions
+    end
+  end
+end
+
+# ---------------------------------------------------------------------------
+# CDN 源传输层兼容开关
+# ---------------------------------------------------------------------------
+#
+# cocoapods-core 的 `Pod::CDNSource` 在构造请求时硬编码了
+# `:http_version => :httpv2_0`（见 cocoapods-core/lib/cocoapods-core/cdn_source.rb
+# 的 `download_typhoeus_impl_async`）。当链路（VPN / MTU / 中间设备 / 服务端
+# h2 实现）对 HTTP/2 支持不完整时，libcurl 会抛出
+#
+#   CDN: <repo> URL couldn't be downloaded: <url> Response: Error in the HTTP2 framing layer
+#
+# 该异常在 CDN 源里是 `raise Informative`，属于致命错误，`pod install` 会中断，
+# 且无法通过 Podfile 或 CocoaPods 配置项规避（上游没有暴露协议开关）。
+#
+# 这里提供两个环境变量作为逃生舱：
+#
+#   COCOAPODS_CDN_HTTP_1_1=1     强制 CDN 请求走 HTTP/1.1（推荐用于排查上述报错）
+#   COCOAPODS_CDN_MAX_CONCURRENCY 交给上游 cocoapods-core 自己读取，无需在此处理
+#
+# 默认不改变任何行为：不设环境变量时协议仍是上游的 :httpv2_0，
+# 避免给其它使用方带来性能回归。
+#
+module Pod
+  class CDNSource
+    module AnkerArHttpVersion
+      # @return [Symbol, nil] 需要强制使用的 libcurl 协议，nil 表示保持上游默认。
+      def self.forced_http_version
+        case ENV['COCOAPODS_CDN_HTTP_1_1'].to_s.strip.downcase
+        when '1', 'true', 'yes', 'on', '1.1', 'http1', 'http/1.1'
+          :httpv1_1
         else
-          orig_should_flatten?
+          nil
         end
       end
+
+      def queue_request(request)
+        forced = AnkerArHttpVersion.forced_http_version
+        if forced
+          # 请求入队前覆写协议；Typhoeus 允许在 run 之前修改 options。
+          begin
+            request.options[:http_version] = forced
+          rescue StandardError
+            # options 结构在未来的 CocoaPods 里可能变化，失败时退回上游行为
+          end
+        end
+        super
+      end
     end
+
+    prepend AnkerArHttpVersion unless ancestors.include?(AnkerArHttpVersion)
   end
 end
 
 module Pod
   class Source
     class Manager
-      alias_method :orig_source_from_path, :source_from_path
-      alias_method :orig_create_source_with_url, :create_source_with_url
-
-      def source_from_path(path)
-        @sources_by_path ||= Hash.new do |hash, key|
-          hash[key] = case
-                      when key.basename.to_s == Pod::TrunkSource::TRUNK_REPO_NAME
-                        TrunkSource.new(key)
-                      when (key + '.url').exist?
-                        CDNSource.new(key)
-                      when (key + '.coding_ar_url').exist?
-                        CodingArSource.new(key)
-                      else
-                        Source.new(key)
-                      end
+      # Use prepend instead of alias_method to safely monkey-patch without
+      # infinite recursion when the plugin is loaded more than once.
+      module AnkerArExtensions
+        def source_from_path(path)
+          # Only intercept repos that carry our marker file. Everything else
+          # is delegated to the rest of the chain so that other plugins
+          # patching `source_from_path` (e.g. cocoapods-art) keep working.
+          #
+          # Our own cache is deliberately kept in a dedicated ivar:
+          # cocoapods-art builds its own Hash under `@sources_by_path`, and
+          # sharing that one would make the two plugins recurse into each other.
+          if (path + '.coding_ar_url').exist?
+            @__anker_sources_by_path ||= {}
+            @__anker_sources_by_path[path] ||= CodingArSource.new(path)
+          else
+            super
+          end
         end
 
-        @sources_by_path[path]
-      end
+        def create_source_with_url(url)
+          require 'coding_ar_util'
 
-      def create_source_with_url(url)
-        require 'coding_ar_util'
-        
-        name = name_for_url(url)
-        if CodingArUtil.coding_ar_service?(url)
-          Command::Repo::AddCodingAr.parse([name, url]).run
-        else
-          orig_create_source_with_url(url)
-        end
+          name = name_for_url(url)
+          if CodingArUtil.coding_ar_service?(url)
+            Command::Repo::AddCodingAr.parse([name, url]).run
+          else
+            super
+          end
 
-        source = source_with_url(url)
-        raise "Unable to create a source with URL #{url}" unless source
-        source
+          source = source_with_url(url)
+          raise "Unable to create a source with URL #{url}" unless source
+          source
+        end
       end
+
+      prepend AnkerArExtensions
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-anker-ar
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Dark Liu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-31 00:00:00.000000000 Z
+date: 2026-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,7 @@ homepage: http://codingcorp.coding.anker-in.com/public/CODING_ANKER/cocoapods-an
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: CODING-AR-backed repo support for Cocoapods
 test_files: []