pindo 5.17.4 → 5.18.3

data/lib/pindo/module/appselect.rb

@@ -166,8 +166,8 @@ module Pindo
           puts
           puts "选择的bundle id是: #{menu_choice}"
           puts
-          if menu_choice.eql?("com.heroneverdie101.*")
-            menu_choice = "com.heroneverdie101"
+          if menu_choice.include?("*")
+            menu_choice = menu_choice.gsub(".*", "")
           end
 
           # 保存选择到 GlobalOptionsState
@@ -239,7 +239,7 @@ module Pindo
           puts "选择的Bundle Name是: #{menu_choice}"
           puts
 
-          # 去除通配符后缀（如 com.test.* -> com.test）
+          # 去除通配符后缀（如 com.heroneverdie101.* -> com.heroneverdie101）
           if menu_choice.end_with?(".*")
             menu_choice = menu_choice.sub(/\.\*$/, '')
             puts "去除通配符后的Bundle Name: #{menu_choice}"
@@ -277,7 +277,7 @@ module Pindo
           puts "选择的Bundle Name是: #{menu_choice}"
           puts
 
-          # 去除通配符后缀（如 com.test.* -> com.test）
+          # 去除通配符后缀（如 com.heroneverdie101.* -> com.heroneverdie101）
           if menu_choice.end_with?(".*")
             menu_choice = menu_choice.sub(/\.\*$/, '')
             puts "去除通配符后的Bundle Name: #{menu_choice}"

data/lib/pindo/module/appstore/bundleid_helper.rb

@@ -1,11 +1,69 @@
 require 'spaceship'
 require 'json'
+require 'app_store_dev_api'
 
 module Pindo
   # Bundle ID 管理辅助类
   # 负责在 Apple 开发者中心创建和配置 Bundle ID
   class BundleIdHelper
 
+    # 根据 Bundle ID 生成显示名称
+    # 规则：去掉前两段（如 com.heroneverdie101），剩余部分去掉点号拼接
+    # @param bundle_id [String] Bundle ID 字符串
+    # @return [String] 显示名称
+    #
+    # 示例：
+    #   "com.heroneverdie101.fancyapptest"          => "fancyapptest"
+    #   "com.heroneverdie101.fancyapptest.content"  => "fancyapptestcontent"
+    #   "com.heroneverdie101.fancyapptest.service"  => "fancyapptestservice"
+    #   "com.heroneverdie101.*"                     => "wildcarddevelopmentid"
+    def self.generate_bundleid_name(bundle_id)
+      return "wildcarddevelopmentid" if bundle_id.nil? || bundle_id.include?("*")
+
+      parts = bundle_id.split('.')
+      # 去掉前两段（如 com.heroneverdie101），剩余部分拼接
+      parts[2..].join('')
+    end
+
+    # 通过 App Store Connect API 更新 Bundle ID 名称
+    # @param bundle_id [String] Bundle ID 字符串
+    # @param new_name [String] 新名称
+    def self.update_bundleid_name(bundle_id:, new_name:)
+      bundle_id_obj = Spaceship::ConnectAPI::BundleId.find(bundle_id)
+      return if bundle_id_obj.nil?
+
+      api_key_json = load_api_key_config
+      if api_key_json.nil?
+        puts "未配置 API Key，跳过名称更新"
+        return
+      end
+
+      client = AppStoreDevApi::Client.new(
+        issuer_id: api_key_json["issuer_id"],
+        key_id: api_key_json["key_id"],
+        private_key: api_key_json["private_key"]
+      )
+
+      client.update_bundle_id(id: bundle_id_obj.id, name: new_name)
+    end
+
+    # 加载 API Key 配置
+    # @return [Hash, nil] API Key 配置，包含 issuer_id、key_id、private_key
+    def self.load_api_key_config
+      pindo_dir = File.expand_path("~/.pindo")
+      api_key_file = File.join(pindo_dir, "api_key.json")
+      return nil unless File.exist?(api_key_file)
+
+      api_key_json = JSON.parse(File.read(api_key_file))
+      # 取第一个有效的 API Key 配置
+      api_key_json.each do |_apple_id, config|
+        if config.is_a?(Hash) && config["issuer_id"] && config["key_id"] && config["private_key"]
+          return config
+        end
+      end
+      nil
+    end
+
     # 从配置文件中提取所有必要的信息
     # @param config_json [Hash] 配置 JSON 对象
     # @return [Hash] 提取的配置信息
@@ -106,17 +164,33 @@ module Pindo
       app = Spaceship::Portal.app.find(bundle_id)
       puts
 
+      display_name = generate_bundleid_name(bundle_id)
       if app.nil?
-        puts "Create bundle id #{bundle_id} in apple developer center..."
-        app = Spaceship::Portal.app.create!(bundle_id: bundle_id, name: bundle_id.gsub('.', ''))
+        puts "Create bundle id #{bundle_id} (#{display_name}) in apple developer center..."
+        app = Spaceship::Portal.app.create!(bundle_id: bundle_id, name: display_name)
       else
         puts "Find bundle id #{bundle_id} in apple developer center..."
+        # 更新名称
+        if app.name != display_name
+          puts "Update bundle id name: #{app.name} -> #{display_name}"
+          begin
+            app.update_name!(display_name)
+          rescue => e
+            puts "Portal 更新名称失败: #{e.message}，尝试通过 API Key 更新..."
+            begin
+              update_bundleid_name(bundle_id: bundle_id, new_name: display_name)
+            rescue => e2
+              puts "更新名称失败: #{e2.message}"
+            end
+          end
+        end
       end
 
       bundle_id_obj = Spaceship::ConnectAPI::BundleId.find(bundle_id)
 
-      # 配置 Game Center
-      if !bundle_id_obj.nil?
+      # 配置 Game Center（通配符 App ID 不支持 GAME_CENTER）
+      is_wildcard = bundle_id.include?("*")
+      if !bundle_id_obj.nil? && !is_wildcard
         if !setting_array.nil? && setting_array.to_s.include?("game_center")
           puts "Enable #{bundle_id} game_center on"
           bundle_id_obj.update_capability("GAME_CENTER", enabled: true)
@@ -124,6 +198,8 @@ module Pindo
           puts "Enable #{bundle_id} game_center off"
           bundle_id_obj.update_capability("GAME_CENTER", enabled: false)
         end
+      elsif is_wildcard
+        puts "Skip #{bundle_id} game_center (wildcard App ID not supported)"
       end
 
       return nil if setting_array.nil? || setting_array.length == 0
@@ -146,14 +222,18 @@ module Pindo
         puts "Enable #{bundle_id} siri off"
       end
 
-      # 配置 Sign with Apple
-      if !bundle_id_obj.nil? && setting_array.to_s.include?("apple_signin")
-        puts "Enable #{bundle_id} Sign with Apple on"
-        settings = build_settings_for(settings_key: "APPLE_ID_AUTH_APP_CONSENT", options_key: "PRIMARY_APP_CONSENT")
-        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: true, settings: settings)
-      else
-        puts "Enable #{bundle_id} Sign with Apple off"
-        bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: false)
+      # 配置 Sign with Apple（通配符 App ID 不支持）
+      if !is_wildcard && !bundle_id_obj.nil?
+        if setting_array.to_s.include?("apple_signin")
+          puts "Enable #{bundle_id} Sign with Apple on"
+          settings = build_settings_for(settings_key: "APPLE_ID_AUTH_APP_CONSENT", options_key: "PRIMARY_APP_CONSENT")
+          bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: true, settings: settings)
+        else
+          puts "Enable #{bundle_id} Sign with Apple off"
+          bundle_id_obj.update_capability("APPLE_ID_AUTH", enabled: false)
+        end
+      elsif is_wildcard
+        puts "Skip #{bundle_id} Sign with Apple (wildcard App ID not supported)"
       end
 
       # 配置 App Group
@@ -190,7 +270,7 @@ module Pindo
 
       if app_group.nil?
         puts "Create group_id #{group_id} in apple developer center..."
-        app_group = Spaceship::Portal.app_group.create!(group_id: group_id, name: group_id.gsub('.', ''))
+        app_group = Spaceship::Portal.app_group.create!(group_id: group_id, name: generate_bundleid_name(group_id))
       else
         puts "Group_id #{group_id} is existed in apple developer center !!!"
       end
@@ -209,7 +289,7 @@ module Pindo
 
       if app_icloud.nil?
         puts "Create icloud_id #{icloud_id} in apple developer center..."
-        app_icloud = Spaceship::Portal.cloud_container.create!(identifier: icloud_id, name: icloud_id.gsub('.', ''))
+        app_icloud = Spaceship::Portal.cloud_container.create!(identifier: icloud_id, name: generate_bundleid_name(icloud_id))
       else
         puts "icloud_id #{icloud_id} is existed in apple developer center !!!"
       end
@@ -349,5 +429,115 @@ module Pindo
       end
     end
 
+    # 从 Apple Developer Portal 读取指定 Bundle ID 的 Capability 状态
+    # @param bundle_id [String] Bundle ID 字符串
+    # @return [Hash, nil] capabilities 对象，Bundle ID 不存在时返回 nil
+    def self.fetch_capabilities_from_portal(bundle_id:)
+      return nil if bundle_id.nil? || bundle_id.empty?
+
+      # 通过 Spaceship Portal 查找 Bundle ID
+      app = Spaceship::Portal.app.find(bundle_id)
+      if app.nil?
+        puts "Bundle ID #{bundle_id} 在 Apple Developer Portal 中未找到"
+        return nil
+      end
+
+      # 更新 Bundle ID 名称
+      expected_name = generate_bundleid_name(bundle_id)
+      if app.name != expected_name
+        puts "Update bundle id name: #{app.name} -> #{expected_name}"
+        begin
+          app.update_name!(expected_name)
+        rescue => e
+          puts "Portal 更新名称失败: #{e.message}，尝试通过 API Key 更新..."
+          begin
+            update_bundleid_name(bundle_id: bundle_id, new_name: expected_name)
+          rescue => e2
+            puts "更新名称失败: #{e2.message}"
+          end
+        end
+      end
+
+      capabilities = {}
+
+      # --- Spaceship Portal 侧：读取 features/services ---
+      begin
+        app_details = app.details
+        features = app_details.features
+
+        # Push Notification
+        push_enabled = features["push"] == true || features["push"].to_s == "true"
+        capabilities["push_notification"] = push_enabled
+
+        # App Group
+        app_group_enabled = features["APG3427HIY"] == true || features["appGroup"] == true ||
+                            features["APG3427HIY"].to_s == "true" || features["appGroup"].to_s == "true"
+        if app_group_enabled
+          groups = app_details.associated_groups rescue []
+          if groups && !groups.empty?
+            capabilities["app_group"] = groups.first.group_id
+          else
+            capabilities["app_group"] = true
+          end
+        else
+          capabilities["app_group"] = false
+        end
+
+        # iCloud
+        icloud_enabled = features["cloudKitVersion"] == 2 || features["iCloud"] == true ||
+                         features["cloudKitVersion"].to_i > 0 || features["iCloud"].to_s == "true"
+        if icloud_enabled
+          containers = app_details.associated_cloud_containers rescue []
+          if containers && !containers.empty?
+            capabilities["icloud"] = containers.first.identifier
+          else
+            capabilities["icloud"] = true
+          end
+        else
+          capabilities["icloud"] = false
+        end
+
+        # Siri
+        siri_enabled = features["SI015DKUHP"] == true || features["siriKit"] == true ||
+                       features["SI015DKUHP"].to_s == "true" || features["siriKit"].to_s == "true"
+        capabilities["siri"] = siri_enabled
+
+        # In-App Purchase
+        iap_enabled = features["inAppPurchase"] == true || features["inAppPurchase"].to_s == "true"
+        capabilities["in_app_purchase"] = iap_enabled
+
+      rescue => e
+        puts "读取 Portal features 失败: #{e.message}，尝试通过 ConnectAPI 读取..."
+      end
+
+      # --- ConnectAPI 侧：补充 game_center 和 apple_signin ---
+      begin
+        bundle_id_obj = Spaceship::ConnectAPI::BundleId.find(bundle_id)
+        if bundle_id_obj
+          api_capabilities = bundle_id_obj.get_capabilities
+
+          capabilities["game_center"] = api_capabilities.any? { |c| c.is_type?("GAME_CENTER") } rescue false
+          capabilities["apple_signin"] = api_capabilities.any? { |c| c.is_type?("APPLE_ID_AUTH") } rescue false
+
+          # 如果 Portal 侧读取失败，用 ConnectAPI 补充
+          if !capabilities.key?("push_notification")
+            capabilities["push_notification"] = api_capabilities.any? { |c| c.is_type?("PUSH_NOTIFICATIONS") } rescue false
+          end
+          if !capabilities.key?("in_app_purchase")
+            capabilities["in_app_purchase"] = api_capabilities.any? { |c| c.is_type?("IN_APP_PURCHASE") } rescue false
+          end
+          if !capabilities.key?("siri")
+            capabilities["siri"] = api_capabilities.any? { |c| c.is_type?("SIRIKIT") } rescue false
+          end
+        end
+      rescue => e
+        puts "读取 ConnectAPI capabilities 失败: #{e.message}"
+        capabilities["game_center"] ||= false
+        capabilities["apple_signin"] ||= false
+      end
+
+      capabilities
+    end
+
   end
 end

data/lib/pindo/module/build/build_helper.rb

@@ -191,28 +191,94 @@ module Pindo
           )
         end
 
-        # 加载 JPSBuildConfig.json 并设置项目名称到 GlobalOptionsState
+        # 定位 JPSBuildConfig.json 文件路径
+        # 先找 git root，再判断是否 Unity 项目来确定配置文件位置
+        # @param working_dir [String] 当前工作目录
+        # @return [String] 配置文件绝对路径
+        def determine_jps_config_path(working_dir)
+          # 获取 Git 仓库根目录
+          repo_root_dir = nil
+          if Pindo::GitHandler.is_git_directory?(local_repo_dir: working_dir)
+            repo_root_dir = Pindo::GitHandler.git_root_directory(local_repo_dir: working_dir)
+          end
+          repo_root_dir ||= working_dir
+
+          # 判断工程类型
+          if File.directory?(File.join(repo_root_dir, 'ProjectSettings'))
+            File.join(repo_root_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+          else
+            File.join(repo_root_dir, 'JPSBuildConfig.json')
+          end
+        end
+
+        # 加载 JPSBuildConfig.json，设置全局状态，缺失字段时通过 JPS 请求补全
         # @param project_dir [String] 项目目录
-        # @return [String, nil] 项目名称（如果存在）
-        def load_jps_build_config(project_dir)
-          # 检测工程类型：Unity 工程配置在 ProjectSettings 目录
-          config_file = if unity_project?(project_dir)
-            File.join(project_dir, 'ProjectSettings', 'JPSBuildConfig.json')
+        # @param conf [String, nil] 显式指定的配置文件路径（优先于自动查找）
+        # @return [Hash, nil] JPSBuildConfig 的完整配置，文件不存在时返回 nil
+        def load_jps_build_config(project_dir, conf = nil, **_)
+          config_file = if conf && !conf.to_s.empty?
+            File.expand_path(conf)
           else
-            File.join(project_dir, 'JPSBuildConfig.json')
+            determine_jps_config_path(project_dir)
           end
 
           return nil unless File.exist?(config_file)
 
           begin
             config = JSON.parse(File.read(config_file))
+            state = Pindo::Options::GlobalOptionsState.instance
+
             project_name = config['project_name']
             if project_name && !project_name.empty?
-              # 设置到 GlobalOptionsState
-              Pindo::Options::GlobalOptionsState.instance[:proj] = project_name
+              state[:proj] = project_name
               puts "使用 JPS 配置的项目名称: #{project_name}"
-              return project_name
             end
+
+            # 检查 wildcard_bundle_group_name 和 bundle_group_name（兼容旧字段名）
+            wildcard_bundle_group_name = config['wildcard_bundle_group_name'] || config['wildcardBundleId']
+            bundle_group_name = config['bundle_group_name'] || config['bundleId']
+
+            # 如果缺失，通过 JPS 请求获取并回写
+            if (wildcard_bundle_group_name.nil? || wildcard_bundle_group_name.empty?) ||
+               (bundle_group_name.nil? || bundle_group_name.empty?)
+              project_id = config['project_id']
+              app_info_data = nil
+
+              if project_id && !project_id.to_s.empty?
+                app_info_data = PgyerHelper.share_instace.get_project_detail(project_id: project_id)
+              elsif project_name && !project_name.empty?
+                app_info_data = PgyerHelper.share_instace.find_app_info_with_obj_list(proj_name: project_name)
+              end
+
+              if app_info_data
+                wildcard_bundle_group_name = app_info_data["wildcardBundleId"]
+                bundle_group_name = app_info_data["bundleId"]
+
+                if wildcard_bundle_group_name && !wildcard_bundle_group_name.empty?
+                  config['wildcard_bundle_group_name'] = wildcard_bundle_group_name
+                  config['bundle_group_name'] = bundle_group_name
+                  File.write(config_file, JSON.pretty_generate(config) + "\n")
+                  puts "已从 JPS 获取并保存: wildcard_bundle_group_name=#{wildcard_bundle_group_name}, bundle_group_name=#{bundle_group_name}"
+                end
+              end
+            end
+
+            # 设置全局状态
+            if wildcard_bundle_group_name && !wildcard_bundle_group_name.empty?
+              state[:wildcard_bundle_group_name] = wildcard_bundle_group_name
+              state[:bundle_group_name] = bundle_group_name
+
+              # 通过映射表将 wildcard_bundle_group_name 解析为真实 bundle_id
+              require 'pindo/options/helpers/bundleid_selector'
+              resolved_bundle_id = Pindo::Options::BundleIdSelector.resolve_bundleid_by_group_name(wildcard_bundle_group_name)
+              if resolved_bundle_id && !resolved_bundle_id.empty?
+                state[:bundleid] = resolved_bundle_id       # iOS 使用
+                state[:bundle_name] = resolved_bundle_id    # Android 使用
+                puts "使用 JPSBuildConfig 的 Bundle Name: #{resolved_bundle_id} (#{wildcard_bundle_group_name})"
+              end
+            end
+
+            return config
           rescue => e
             puts "加载 JPSBuildConfig.json 失败: #{e.message}" if ENV['PINDO_VERBOSE'] == '1'
           end

data/lib/pindo/module/build/git_repo_helper.rb

@@ -347,7 +347,7 @@ module Pindo
         # 删除旧 tag（本地和远程）
         if Pindo::GitHandler.remote_tag_exists?(local_repo_dir: project_dir, tag_name: tag_name)
           Funlog.instance.fancyinfo_update("删除远程 Tag: #{tag_name}")
-          Pindo::GitHandler.git!(%W(-C #{project_dir} push origin :refs/tags/#{tag_name}))
+          Pindo::GitHandler.git_remote!(project_dir, %W(-C #{project_dir} push origin :refs/tags/#{tag_name}))
         end
         if Pindo::GitHandler.local_tag_exists?(local_repo_dir: project_dir, tag_name: tag_name)
           Funlog.instance.fancyinfo_update("删除本地 Tag: #{tag_name}")
@@ -361,7 +361,7 @@ module Pindo
         if local_exists && Pindo::GitHandler.is_tag_at_head?(git_root_dir: project_dir, tag_name: tag_name)
           if !remote_exists
             # 本地存在且在 HEAD，但远程不存在，推送到远程
-            Pindo::GitHandler.git!(%W(-C #{project_dir} push origin #{tag_name}))
+            Pindo::GitHandler.git_remote!(project_dir, %W(-C #{project_dir} push origin #{tag_name}))
             Funlog.instance.fancyinfo_success("推送 Tag 到远程: #{tag_name}")
           else
             Funlog.instance.fancyinfo_success("Tag 已存在且在 HEAD: #{tag_name}")
@@ -372,7 +372,7 @@ module Pindo
         # tag 不在 HEAD 上，需要删除后重新创建
         if remote_exists
           Funlog.instance.fancyinfo_update("删除远程 Tag: #{tag_name}")
-          Pindo::GitHandler.git!(%W(-C #{project_dir} push origin :refs/tags/#{tag_name}))
+          Pindo::GitHandler.git_remote!(project_dir, %W(-C #{project_dir} push origin :refs/tags/#{tag_name}))
         end
         if local_exists
           Funlog.instance.fancyinfo_update("删除本地 Tag: #{tag_name}")
@@ -383,7 +383,7 @@ module Pindo
 
       # 创建并推送 tag
       Pindo::GitHandler.git!(%W(-C #{project_dir} tag #{tag_name}))
-      Pindo::GitHandler.git!(%W(-C #{project_dir} push origin #{tag_name}))
+      Pindo::GitHandler.git_remote!(project_dir, %W(-C #{project_dir} push origin #{tag_name}))
       Funlog.instance.fancyinfo_success("创建并推送 Tag: #{tag_name}")
       tag_name
     end

data/lib/pindo/module/cert/mode/base_cert_operator.rb

@@ -1,3 +1,5 @@
+require 'pindo/module/xcode/xcode_build_helper'
+
 module Pindo
   module CertProcess
 
@@ -234,6 +236,8 @@ module Pindo
         project = Xcodeproj::Project.open(proj_fullname)
 
         project.targets.each do |target|
+          # 跳过非 native target（如 PBXAggregateTarget）
+          next unless target.respond_to?(:product_type)
           # 跳过 framework、library 等类型
           if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) ||
              target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) ||
@@ -286,6 +290,8 @@ module Pindo
         target_map = get_target_name_map
 
         project.targets.each do |target|
+          # 跳过非 native target（如 PBXAggregateTarget）
+          next unless target.respond_to?(:product_type)
           # 跳过 framework、library 等类型
           if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:framework]) ||
              target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:dynamic_library]) ||
@@ -346,7 +352,7 @@ module Pindo
           end
 
           # 设置 Bundle ID（跳过通配符）
-          unless provisioning_info["bundle_id"].eql?("com.heroneverdie101.*")
+          unless provisioning_info["bundle_id"].include?("*")
             config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = provisioning_info["bundle_id"]
           end
         end
@@ -401,13 +407,13 @@ module Pindo
 
       # 配置 Info.plist 文件
       def configure_info_plist_file(target, project_dir, icloud_id)
-        info_plist_file = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-        return if info_plist_file.nil? || info_plist_file.empty?
+        raw_path = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+        return if raw_path.nil? || raw_path.empty?
 
-        info_plist_path = File.join(project_dir, info_plist_file)
+        info_plist_path = Pindo::XcodeBuildHelper.resolve_info_plist_path(project_dir, raw_path, target: target)
 
-        unless File.exist?(info_plist_path)
-          raise Informative, "Missing Target #{target.name} Info.plist!!! #{info_plist_path}"
+        unless info_plist_path
+          raise Informative, "Missing Target #{target.name} Info.plist!!! #{raw_path}"
         end
 
         # 标准化 CFBundleIdentifier 为宏变量