fastlane-plugin-fastci 0.0.20 → 0.0.40

data/lib/fastlane/plugin/fastci/actions/check_zealot_version_action.rb

@@ -0,0 +1,52 @@
+require 'fastlane/plugin/fastci/helper/fastci_zealot_helper'
+
+module Fastlane
+  module Actions
+    # 查询 iOS 应用已上传版本，是否跳过后续打包由调用方决定。
+    class CheckZealotVersionAction < ZealotVersionCheckAction
+      extend Fastlane::Helper::FastciZealotHelper
+
+      def self.run(params)
+        validate_zealot_connection!(zealot_parameters(params))
+        [
+          SharedValues::ZEALOT_VERSION_EXISTED,
+          SharedValues::ZEAALOT_ERROR_MESSAGE,
+          SharedValues::ZEALOT_LATEST_RELEASE_ID,
+          SharedValues::ZEALOT_LATEST_RELEASE_VERSION,
+          SharedValues::ZEALOT_LATEST_VERSION,
+          SharedValues::ZEALOT_LATEST_RELEASE_URL,
+          SharedValues::ZEALOT_LATEST_INSTALL_URL,
+          SharedValues::ZEALOT_LATEST_QRCODE_URL,
+          SharedValues::ZEALOT_LATEST_CONTEXT
+        ].each { |key| Actions.lane_context.delete(key) }
+
+        response = check_app_version(params)
+        # 上游非终止模式在网络错误时返回 false，不能继续读取 response.status。
+        return nil unless response
+
+        unless [200, 404].include?(response.status) && response.body.is_a?(Hash)
+          show_error("Zealot 版本查询失败（HTTP #{response.status}）", params[:fail_on_error])
+          return nil
+        end
+
+        parse_response(response, params[:fail_on_error])
+      end
+
+      def self.available_options
+        zealot_options(ZealotVersionCheckAction)
+      end
+
+      def self.description
+        '按 Bundle ID 与版本号或 Git commit 查询 Zealot，返回是否已存在'
+      end
+
+      def self.example_code
+        ['check_zealot_version(bundle_id: "com.example.app", release_version: "1.0", build_version: "1")']
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/actions/package_action.rb

@@ -1,6 +1,7 @@
 require 'gym'
 require 'fastlane_core'
 require 'fastlane/action'
+require 'fastlane/plugin/fastci/helper/app_store_resources_helper'
 include Fastlane::Helper
 
 module Fastlane
@@ -17,7 +18,7 @@ module Fastlane
         is_detect_duplicity_code = params[:is_detect_duplicity_code] || false
         is_detect_unused_code = params[:is_detect_unused_code] || false
         is_detect_unused_image = params[:is_detect_unused_image] || false
-        release_notes = params[:release_notes] || ''
+        store_options = store_upload_options(params, export_method)
         configuration = 'Release' if %w[app-store testFlight].include?(export_method)
         is_notice_dingding = params[:is_notice_dingding].nil? ? true : params[:is_notice_dingding]
         # 统一发送钉钉消息匿名函数
@@ -145,14 +146,7 @@ module Fastlane
           notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-打包完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
           send_dingding_notice.call(notiText)
 
-          if CommonHelper.is_validate_string(Environment.connect_key_id) && CommonHelper.is_validate_string(Environment.connect_issuer_id)
-            # 根据 export_method 决定是否为 TestFlight
-            is_test_flight = export_method == 'testFlight'
-
-            other_action.upload_store(
-              release_notes: release_notes,
-              isTestFlight: is_test_flight
-            )
+          if upload_store_if_configured(store_options, version: version, build: build)
             notiText = "🚀🚀🚀🚀🚀🚀\n\n#{scheme}-iOS-上传完成\n\n#{version}_#{build}_#{export_method}\n\n🚀🚀🚀🚀🚀🚀"
             send_dingding_notice.call(notiText)
           end
@@ -182,6 +176,18 @@ module Fastlane
             end
           end
 
+          # 上传 Zealot
+          if CommonHelper.is_validate_string(Environment.zealot_token)
+            zealot_upload_info = other_action.upload_zealot(
+              file: ipa_path,
+              changelog: params[:changelog]
+            )
+            # dSYM 仅在 IPA 上传成功且显式开启时上传。
+            if zealot_upload_info && params[:is_upload_zealot_dsym]
+              other_action.upload_zealot_dsym
+            end
+          end
+
           send_dingding_notice.call(notiText)
         end
 
@@ -255,12 +261,75 @@ module Fastlane
         UI.message('*************| 脚本完成 |*************')
       end
 
+      # 构建前准备商店上传参数，开启资源功能却漏配路径时立即报错。
+      def self.store_upload_options(params, export_method)
+        config_path = AppStoreResourcesHelper.upload_config_path(params, app_store: export_method == 'app-store')
+        options = {
+          release_notes: params[:release_notes] || '',
+          isTestFlight: export_method == 'testFlight',
+          # 显式透传 false，避免下层 Action 从环境变量重新开启本次已关闭的功能。
+          app_store_resources_enabled: !config_path.nil?
+        }
+        options[:app_store_resources_config_path] = config_path if config_path
+        options
+      end
+
+      # 根据凭据或已开启的资源配置判断是否上传，单独存在资源路径不能触发上传。
+      def self.store_upload_configured?(options)
+        has_p8_key = CommonHelper.is_validate_string(Environment.connect_key_id) &&
+          CommonHelper.is_validate_string(Environment.connect_issuer_id)
+        has_api_key_json = CommonHelper.is_validate_string(Environment.app_store_connect_api_key_path)
+        has_p8_key || has_api_key_json || options[:app_store_resources_enabled]
+      end
+
+      # 上传本次产物，并返回是否执行了上传，供主流程决定是否发送完成通知。
+      def self.upload_store_if_configured(options, version:, build:)
+        return false unless store_upload_configured?(options)
+
+        upload_options = options.dup
+        if upload_options[:app_store_resources_enabled]
+          # 使用真实产物信息覆盖资源配置，避免选中 JSON 中残留的旧版本或 Build。
+          upload_options.merge!(
+            app_identifier: Environment.bundleID,
+            app_version: version.to_s,
+            build_number: build.to_s
+          )
+        end
+        other_action.upload_store(upload_options)
+        true
+      end
+
+      private_class_method :store_upload_options, :store_upload_configured?, :upload_store_if_configured
+
       def self.description
         '打包'
       end
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_enabled,
+            env_name: 'APP_STORE_RESOURCES_ENABLED',
+            description: '商店资源总开关，默认关闭，仅 app-store 打包时生效',
+            optional: true,
+            default_value: false,
+            type: Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_config_path,
+            env_name: 'APP_STORE_RESOURCES_CONFIG_PATH',
+            description: 'App Store 资源发布 JSON 路径，开启商店资源总开关后必填',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :is_upload_zealot_dsym,
+            env_name: 'ZEALOT_UPLOAD_DSYM',
+            description: 'IPA 上传 Zealot 成功后继续上传 iOS dSYM',
+            optional: true,
+            default_value: false,
+            type: Boolean
+          ),
           FastlaneCore::ConfigItem.new(
             key: :scheme,
             description: '不采取默认配置，自定义 `scheme` 名称',

data/lib/fastlane/plugin/fastci/actions/sync_zealot_devices_action.rb

@@ -0,0 +1,65 @@
+require 'fastlane/plugin/fastci/helper/fastci_zealot_helper'
+
+module Fastlane
+  module Actions
+    # 手动同步 Apple 开发者账号中的 iOS 设备，不挂入自动打包流程。
+    class SyncZealotDevicesAction < ZealotSyncDevicesAction
+      extend Fastlane::Helper::FastciZealotHelper
+
+      def self.run(params)
+        validate_zealot_connection!(zealot_parameters(params))
+        Actions.lane_context.delete(SharedValues::ZEAALOT_ERROR_MESSAGE)
+        devices = fetch_ios_devices(params)
+        print_table(build_table_data(params, devices), title: 'sync_zealot_devices')
+
+        # 沿用官方的设备上传协议，按实际 HTTP 结果统计，避免失败被计为成功。
+        failed = devices.count { |device| !sync_ios_device(params, device) }
+        result = { total: devices.size, succeeded: devices.size - failed, failed: failed }
+        UI.message("Zealot iOS 设备同步：成功 #{result[:succeeded]}，失败 #{failed}")
+        result
+      end
+
+      def self.fetch_ios_devices(params)
+        require 'spaceship'
+
+        token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path])
+        if token
+          Spaceship::ConnectAPI.token = token
+          return Spaceship::ConnectAPI::Device.all(filter: { platform: 'IOS' })
+        end
+
+        credentials = CredentialsManager::AccountManager.new(user: params[:username])
+        Spaceship.login(credentials.user, credentials.password)
+        Spaceship.select_team
+        Spaceship::Device.all(mac: false)
+      end
+      private_class_method :fetch_ios_devices
+
+      def self.sync_ios_device(params, device)
+        response = sync_deivce(params, device)
+        return true if response.success?
+
+        show_error("Zealot 设备同步失败（HTTP #{response.status}）", params[:fail_on_error])
+      rescue Faraday::ConnectionFailed, Faraday::TimeoutError => error
+        show_error("Zealot 设备同步请求失败：#{error.class}", params[:fail_on_error])
+      end
+      private_class_method :sync_ios_device
+
+      def self.available_options
+        zealot_options(ZealotSyncDevicesAction, excluding: [:platform])
+      end
+
+      def self.description
+        '同步 Apple 开发者账号中的 iOS 设备到 Zealot'
+      end
+
+      def self.example_code
+        ['sync_zealot_devices(api_key_path: "./app_store_connect_api_key.json")']
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/actions/upload_store_action.rb

@@ -1,4 +1,6 @@
 require 'fastlane/action'
+require 'json'
+require 'fastlane/plugin/fastci/helper/app_store_resources_helper'
 include Fastlane::Helper
 
 module Fastlane
@@ -6,62 +8,141 @@ module Fastlane
     # 上传 AppStore
     class UploadStoreAction < Action
       def self.run(params)
+        resource_params, api_key_options = prepare_upload(params)
 
-        release_notes = JSON.parse(params[:release_notes] || "") rescue nil
+        if params[:isTestFlight]
+          upload_testflight(api_key_options)
+        else
+          upload_app_store(resource_params, api_key_options)
+        end
+      end
 
-        other_action.app_store_connect_api_key(
-          key_id: Environment.connect_key_id,
-          issuer_id: Environment.connect_issuer_id,
-          key_filepath: File.expand_path("#{Environment.package_file_folder_name}/AuthKey_#{Environment.connect_key_id}.p8"),
-          duration: 1200, # optional (maximum 1200)
-          in_house: false # optional but may be required if using match/sigh
+      # 上传前统一准备认证和资源，确保配置错误或资源缺失在 IPA 上传前被发现。
+      def self.prepare_upload(params)
+        resource_params = load_store_resources(params)
+        api_key_options = AppStoreResourcesHelper.authentication_options(resource_params || {}, other_action)
+        if resource_params
+          resource_params.merge!(api_key_options)
+          resource_params = AppStoreResourcesHelper.prepare(resource_params)
+        end
+        [resource_params, api_key_options]
+      end
+
+      # 只有显式开启的 App Store 流程读取资源配置，关闭时不解析路径或更新说明。
+      def self.load_store_resources(params)
+        config_path = AppStoreResourcesHelper.upload_config_path(params, app_store: !params[:isTestFlight])
+        return nil unless config_path
+
+        AppStoreResourcesHelper.load_params(
+          app_store_resources_enabled: true,
+          config_path: config_path,
+          app_identifier: params[:app_identifier],
+          app_version: params[:app_version],
+          build_number: params[:build_number],
+          release_notes: parse_release_notes(params[:release_notes])
         )
+      end
 
-        if params[:isTestFlight]
-          UI.message("*************| 开始上传 TestFlight |*************")
-          other_action.upload_to_testflight(
-            skip_waiting_for_build_processing: true
-          )
-        else
-          UI.message("*************| 开始上传 AppStore |*************")
-          
-          # 构建上传参数，只有当 release_notes 有效时才添加
-          upload_options = {
-            skip_metadata: false,
-            skip_screenshots: true,
-            run_precheck_before_submit: false,
-            precheck_include_in_app_purchases: false,
-            force: true,
-            submit_for_review: false,
-            automatic_release: false
-          }
-          
-          # 只有当 release_notes 不为 nil 且不为空时才添加
-          if release_notes && !release_notes.empty?
-            upload_options[:release_notes] = release_notes
-          end
-          
-          other_action.upload_to_app_store(upload_options)
+      # 保留原 JSON 字符串接口；空值或无效 JSON 不覆盖资源文件中的更新说明。
+      def self.parse_release_notes(value)
+        JSON.parse(value || '')
+      rescue JSON::ParserError, TypeError
+        nil
+      end
+
+      # TestFlight 沿用现有上传方式，不执行 App Store 资源流程。
+      def self.upload_testflight(api_key_options)
+        UI.message('*************| 开始上传 TestFlight |*************')
+        other_action.upload_to_testflight({ skip_waiting_for_build_processing: true }.merge(api_key_options))
+      end
+
+      # 先上传 IPA，再处理已校验的资源；返回 IPA 上传结果以兼容已有 lane。
+      def self.upload_app_store(resource_params, api_key_options)
+        UI.message('*************| 开始上传 AppStore |*************')
+        upload_options = app_store_upload_options(resource_params).merge(api_key_options)
+        upload_result = other_action.upload_to_app_store(upload_options)
+        if resource_params
+          # 新版本判断已在 IPA 上传前完成，之后直接使用确认过的资源上传开关。
+          other_action.app_store_resources(resource_params.merge(upload_metadata_on_new_version: false))
         end
+        upload_result
       end
 
+      # IPA 阶段始终关闭资源上传，避免默认目录或 Deliverfile 绕过资源总开关。
+      def self.app_store_upload_options(resource_params)
+        options = {
+          skip_metadata: true,
+          skip_screenshots: true,
+          # deliver 的截图同步分支不受 skip_screenshots 控制，必须一并关闭。
+          sync_screenshots: false,
+          overwrite_screenshots: false,
+          run_precheck_before_submit: false,
+          precheck_include_in_app_purchases: false,
+          force: true,
+          submit_for_review: false,
+          automatic_release: false
+        }
+        if resource_params
+          options[:app_identifier] = resource_params[:app_identifier]
+          options[:app_version] = resource_params[:app_version] if resource_params[:app_version]
+        end
+        options
+      end
+
+      private_class_method :prepare_upload, :load_store_resources, :parse_release_notes,
+                           :upload_testflight, :upload_app_store, :app_store_upload_options
+
       def self.description
         "上传 AppStore"
       end
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_enabled,
+            env_name: 'APP_STORE_RESOURCES_ENABLED',
+            description: '商店资源总开关，默认关闭；关闭时仅上传 IPA，不更新元数据或截图',
+            optional: true,
+            default_value: false,
+            type: Boolean
+          ),
           FastlaneCore::ConfigItem.new(
             key: :release_notes,
             description: "更新文案, 格式为 { \"zh-Hans\": \"修复问题\", \"en-US\": \"bugfix\"} JSON 字符串",
-            optional: false,
+            optional: true,
             type: String
           ),
           FastlaneCore::ConfigItem.new(
             key: :isTestFlight,
             description: "是否为 TestFlight 打包",
-            optional: false,
+            optional: true,
+            default_value: false,
             type: Boolean
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_store_resources_config_path,
+            env_name: 'APP_STORE_RESOURCES_CONFIG_PATH',
+            description: 'App Store 资源发布 JSON 路径，开启商店资源总开关后必填',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_identifier,
+            description: '本次构建的 Bundle ID，覆盖资源配置',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :app_version,
+            description: '本次构建的版本号，覆盖资源配置',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :build_number,
+            description: '本次构建的 Build 号，覆盖资源配置',
+            optional: true,
+            type: String
           )
         ]
       end
@@ -72,4 +153,4 @@ module Fastlane
 
     end
   end
-end
+end

data/lib/fastlane/plugin/fastci/actions/upload_zealot_action.rb

@@ -0,0 +1,58 @@
+require 'fastlane/plugin/fastci/helper/fastci_zealot_helper'
+
+module Fastlane
+  module Actions
+    # iOS IPA 上传：沿用官方传输与结果解析，避免复制 Zealot HTTP 协议。
+    class UploadZealotAction < ZealotAction
+      extend Fastlane::Helper::FastciZealotHelper
+
+      def self.run(params)
+        validate_zealot_connection!(zealot_parameters(params))
+        UI.user_error!('请指定 IPA 文件或先执行 gym/package') if params[:file].to_s.empty?
+
+        # 同一 lane 可多次上传，失败时不能返回上一次上传的地址。
+        output.each { |key, _description| Actions.lane_context.delete(key.to_sym) }
+        super(params)
+        return nil unless Actions.lane_context[SharedValues::ZEALOT_RELEASE_ID]
+
+        {
+          app_id: Actions.lane_context[SharedValues::ZEALOT_APP_ID],
+          release_id: Actions.lane_context[SharedValues::ZEALOT_RELEASE_ID],
+          release_url: Actions.lane_context[SharedValues::ZEALOT_RELEASE_URL],
+          install_url: Actions.lane_context[SharedValues::ZEALOT_INSTALL_URL],
+          qrcode_url: Actions.lane_context[SharedValues::ZEALOT_QRCODE_URL]
+        }
+      end
+
+      def self.available_options
+        options = zealot_options(ZealotAction, excluding: [:file])
+        options << FastlaneCore::ConfigItem.new(
+          key: :file,
+          env_name: 'ZEALOT_FILE',
+          description: 'iOS IPA 路径，默认使用本次 gym 的产物',
+          optional: true,
+          default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
+          type: String,
+          verify_block: proc do |value|
+            unless File.file?(value) && File.extname(value).casecmp('.ipa').zero?
+              UI.user_error!("不是有效的 IPA 文件：#{value}")
+            end
+          end
+        )
+        options
+      end
+
+      def self.description
+        '上传 iOS IPA 到 Zealot，返回应用、版本和下载地址'
+      end
+
+      def self.example_code
+        ['upload_zealot(file: "./App.ipa", changelog: "iOS 更新说明")']
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/fastci/actions/upload_zealot_dsym_action.rb

@@ -0,0 +1,63 @@
+require 'fastlane/plugin/fastci/helper/fastci_zealot_helper'
+
+module Fastlane
+  module Actions
+    # 固定走官方 iOS dSYM 流程，不暴露 Android 或 macOS 参数。
+    class UploadZealotDsymAction < ZealotDebugFileAction
+      extend Fastlane::Helper::FastciZealotHelper
+
+      def self.run(params)
+        values = zealot_parameters(params)
+        validate_zealot_connection!(values)
+        values[:platform] = 'ios'
+        values[:zip_file] ||= Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] unless values[:path]
+        values[:path] ||= Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE] unless values[:zip_file]
+
+        unless values[:zip_file] || values[:path]
+          UI.user_error!('请指定 dSYM zip_file、xcarchive path，或先执行 gym/package')
+        end
+
+        if values[:zip_file] && !File.file?(values[:zip_file])
+          UI.user_error!("dSYM 压缩文件不存在：#{values[:zip_file]}")
+        end
+        if values[:path] && !File.directory?(values[:path])
+          UI.user_error!("Xcode archive 不存在：#{values[:path]}")
+        end
+
+        Actions.lane_context.delete(SharedValues::ZEAALOT_ERROR_MESSAGE)
+        super(FastlaneCore::Configuration.create(ZealotDebugFileAction.available_options, values))
+      end
+
+      # 上游只检查响应中的 error 字段；非成功 HTTP 状态不能计为上传成功。
+      def self.parse_response(response, upload_url, fail_on_error)
+        return unless response
+
+        unless response.success? && response.body.is_a?(Hash)
+          return show_error("Zealot dSYM 上传失败（HTTP #{response.status}）", fail_on_error)
+        end
+
+        super
+      end
+      private_class_method :parse_response
+
+      def self.available_options
+        zealot_options(
+          ZealotDebugFileAction,
+          excluding: [:platform, :android_build_type, :android_flavor]
+        )
+      end
+
+      def self.description
+        '上传 iOS dSYM 到 Zealot，支持 zip_file、xcarchive 或本次 gym 产物'
+      end
+
+      def self.example_code
+        ['upload_zealot_dsym(zip_file: "./App.app.dSYM.zip")']
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end