pindo 5.1.1 → 5.1.3

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

@@ -3,6 +3,7 @@ require_relative 'base_helper'
 require_relative 'gradle_helper'
 require_relative 'so_helper'
 require_relative 'apk_helper'
+require 'fileutils'
 
 module Pindo
   class AndroidBuildHelper
@@ -12,12 +13,81 @@ module Pindo
     include ApkHelper
     include Singleton
 
+
+
     class << self
       def share_instance
         instance
       end
     end
 
+    def add_test_scheme(project_dir:nil, scheme_name:nil)
+      puts "正在为Android项目添加自定义scheme: #{scheme_name}"
+      puts "项目路径: #{project_dir}, 当前工作目录: #{Dir.pwd}"
+      
+      # 参数验证
+      return puts "错误: 需要提供scheme名称" if scheme_name.nil?
+      return puts "错误: 需要提供项目路径" if project_dir.nil?
+      return puts "错误: 项目路径不存在: #{project_dir}" unless File.directory?(project_dir)
+
+      scheme_name = scheme_name.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+      # 查找所有可能的模块
+      main_module = get_main_module(project_dir)
+      search_modules = ["app", "unityLibrary"]
+      search_modules << main_module if main_module
+      search_modules = search_modules.compact.uniq
+      
+      puts "搜索的模块: #{search_modules.join(', ')}"
+
+      # 查找所有可能的AndroidManifest.xml文件
+      manifest_candidates = find_manifests(project_dir, search_modules)
+      
+      if manifest_candidates.empty?
+        return puts "错误: 未找到任何AndroidManifest.xml文件"
+      end
+      
+      puts "找到#{manifest_candidates.size}个AndroidManifest.xml文件"
+      
+      # 寻找最佳的AndroidManifest.xml和Activity
+      manifest_path, main_activity, android_prefix = find_best_activity(manifest_candidates)
+      
+      if manifest_path.nil? || main_activity.nil?
+        return puts "错误: 无法找到合适的Activity"
+      end
+      
+      puts "已选择 #{manifest_path} 文件中的 #{main_activity['android:name'] || '主Activity'}"
+      
+      # 检查scheme是否已存在
+      scheme_exists, existing_scheme = check_scheme_exists(main_activity, android_prefix, scheme_name)
+      
+      # 如果scheme已存在，检查是否需要更新格式
+      if scheme_exists
+        activity_name = main_activity["#{android_prefix}:name"] || "主Activity"
+        if existing_scheme != scheme_name
+          # 格式不同，需要更新
+          update_scheme = update_existing_scheme(manifest_path, main_activity, android_prefix, existing_scheme, scheme_name)
+          if update_scheme
+            puts "已将scheme从'#{existing_scheme}'更新为'#{scheme_name}'"
+          else
+            puts "尝试更新scheme格式失败，但scheme已存在: #{existing_scheme}"
+          end
+        else
+          puts "scheme: #{scheme_name}已存在于#{activity_name}"
+        end
+        return
+      end
+      
+      # 尝试添加scheme
+      success = add_scheme_with_dom(manifest_path, main_activity, android_prefix, scheme_name)
+      
+      # 如果DOM操作失败，使用文本替换
+      unless success
+        add_scheme_with_text_replace(manifest_path, scheme_name)
+      end
+      
+      puts "添加scheme操作完成，项目路径: #{project_dir}"
+    end
+
     def auto_build_apk(project_dir, debug = false, ignore_sub = false)
       # 检查 gradle.properties 中是否设置了 Java Home
       gradle_properties_path = File.join(project_dir, "gradle.properties")
@@ -108,5 +178,260 @@ module Pindo
     rescue StandardError => e
       raise Informative, "准备项目失败: #{e.message}"
     end
+
+    # 查找所有可能的AndroidManifest.xml文件
+    def find_manifests(project_dir, modules)
+      manifest_candidates = []
+      
+      # 搜索每个模块中的AndroidManifest.xml
+      modules.each do |mod|
+        mod_path = mod.is_a?(String) && !mod.start_with?(project_dir) ? File.join(project_dir, mod) : mod
+        
+        # 标准位置
+        standard_manifest = File.join(mod_path, "src", "main", "AndroidManifest.xml")
+        manifest_candidates << standard_manifest if File.exist?(standard_manifest)
+        
+        # 根目录
+        root_manifest = File.join(mod_path, "AndroidManifest.xml")
+        manifest_candidates << root_manifest if File.exist?(root_manifest)
+      end
+      
+      # 项目根目录
+      manifest_candidates << File.join(project_dir, "AndroidManifest.xml") if File.exist?(File.join(project_dir, "AndroidManifest.xml"))
+      manifest_candidates << File.join(project_dir, "src/main/AndroidManifest.xml") if File.exist?(File.join(project_dir, "src/main/AndroidManifest.xml"))
+      
+      manifest_candidates.uniq
+    end
+    
+    # 查找最佳的Activity
+    def find_best_activity(manifest_candidates)
+      require 'nokogiri'
+      
+      best_manifest = nil
+      best_activity = nil
+      android_prefix = nil
+      
+      manifest_candidates.each do |manifest_path|
+        begin
+          puts "检查: #{manifest_path}"
+          doc = Nokogiri::XML(File.read(manifest_path))
+          
+          # 处理命名空间
+          android_ns = 'http://schemas.android.com/apk/res/android'
+          prefix = nil
+          
+          doc.root.namespace_definitions.each do |ns|
+            if ns.href == android_ns
+              prefix = ns.prefix
+              break
+            end
+          end
+          
+          prefix ||= 'android'
+          
+          # 构建XPath查询
+          ns_xpath = lambda do |xpath|
+            xpath.gsub(/@android:/, "@#{prefix}:")
+                 .gsub(/\[@android:/, "[@#{prefix}:")
+          end
+          
+          # 查找LAUNCHER Activity
+          launcher_activities = doc.xpath(ns_xpath.call('//activity[intent-filter/category[@android:name="android.intent.category.LAUNCHER"]]'))
+          
+          if !launcher_activities.empty?
+            best_manifest = manifest_path
+            best_activity = launcher_activities.first
+            android_prefix = prefix
+            puts "找到带有LAUNCHER的Activity: #{best_activity['android:name']}"
+            break
+          elsif best_activity.nil?
+            activities = doc.xpath('//activity')
+            if !activities.empty?
+              best_manifest = manifest_path
+              best_activity = activities.first
+              android_prefix = prefix
+              puts "找到Activity(无LAUNCHER): #{best_activity['android:name']}"
+            end
+          end
+        rescue => e
+          puts "解析失败: #{e.message}"
+        end
+      end
+      
+      [best_manifest, best_activity, android_prefix]
+    end
+    
+    # 检查scheme是否已存在
+    def check_scheme_exists(activity, android_prefix, scheme_name)
+      scheme_exists = false
+      existing_scheme = nil
+      
+      # 首先检查完全一致的scheme
+      activity.xpath("intent-filter/data[@#{android_prefix}:scheme='#{scheme_name}']").each do |node|
+        scheme_exists = true
+        existing_scheme = scheme_name
+        break
+      end
+      
+      # 如果没有找到完全一致的，检查可能格式不同的scheme
+      if !scheme_exists
+        # 查找所有scheme属性
+        activity.xpath("intent-filter/data[@#{android_prefix}:scheme]").each do |node|
+          current_scheme = node["#{android_prefix}:scheme"]
+          normalized_current = current_scheme.to_s.downcase.strip.gsub(/[\s\-_]/, '')
+          
+          if normalized_current == scheme_name
+            scheme_exists = true
+            existing_scheme = current_scheme
+            puts "发现格式不同但实质相同的scheme: '#{current_scheme}'"
+            break
+          end
+        end
+      end
+      
+      [scheme_exists, existing_scheme]
+    end
+    
+    # 使用DOM操作添加scheme
+    def add_scheme_with_dom(manifest_path, activity, android_prefix, scheme_name)
+      begin
+        doc = Nokogiri::XML(File.read(manifest_path))
+        
+        # 创建intent-filter
+        intent_filter = doc.create_element('intent-filter')
+        
+        # 添加子元素
+        intent_filter.add_child(create_element(doc, 'action', "#{android_prefix}:name", 'android.intent.action.VIEW'))
+        intent_filter.add_child(create_element(doc, 'category', "#{android_prefix}:name", 'android.intent.category.DEFAULT'))
+        intent_filter.add_child(create_element(doc, 'category', "#{android_prefix}:name", 'android.intent.category.BROWSABLE'))
+        intent_filter.add_child(create_element(doc, 'data', "#{android_prefix}:scheme", scheme_name))
+        
+        # 添加空白和缩进
+        activity.add_child(doc.create_text_node("\n      "))
+        activity.add_child(intent_filter)
+        activity.add_child(doc.create_text_node("\n    "))
+        
+        # 保存修改
+        xml_content = doc.to_xml(indent: 2, encoding: 'UTF-8')
+        
+        # 验证修改是否成功
+        if xml_content.include?("android:scheme=\"#{scheme_name}\"")
+          File.write(manifest_path, xml_content)
+          puts "DOM操作成功添加了scheme: #{scheme_name}"
+          return true
+        end
+        
+        puts "DOM操作未能添加scheme"
+        return false
+      rescue => e
+        puts "DOM操作失败: #{e.message}"
+        return false
+      end
+    end
+    
+    # 创建XML元素并设置属性
+    def create_element(doc, name, attr_name, attr_value)
+      element = doc.create_element(name)
+      element[attr_name] = attr_value
+      element
+    end
+    
+    # 使用文本替换添加scheme
+    def add_scheme_with_text_replace(manifest_path, scheme_name)
+      begin
+        # 读取原始内容
+        xml_content = File.read(manifest_path)
+        
+        # 定义要添加的intent-filter
+        scheme_intent_filter = %Q{
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+        <data android:scheme="#{scheme_name}"/>
+      </intent-filter>}
+        
+        # 在</activity>前添加intent-filter
+        if xml_content.match(/<\/activity>/)
+          modified_xml = xml_content.gsub(/<\/activity>/) do |match|
+            "#{scheme_intent_filter}\n    #{match}"
+          end
+          
+          # 保存修改
+          File.write(manifest_path, modified_xml)
+          puts "文本替换成功添加了scheme: #{scheme_name}"
+          return true
+        else
+          puts "在XML中找不到</activity>标签"
+          return false
+        end
+      rescue => e
+        puts "文本替换失败: #{e.message}"
+        return false
+      end
+    end
+
+    def update_existing_scheme(manifest_path, activity, android_prefix, existing_scheme, scheme_name)
+      begin
+        doc = Nokogiri::XML(File.read(manifest_path))
+        
+        # 查找所有intent-filter
+        intent_filters = doc.xpath("//intent-filter")
+        
+        intent_filters.each do |intent_filter|
+          # 检查intent-filter中的scheme
+          intent_filter.xpath("data[@#{android_prefix}:scheme]").each do |data|
+            current_scheme = data["#{android_prefix}:scheme"]
+            if current_scheme == existing_scheme
+              # 找到intent-filter，更新scheme
+              data["#{android_prefix}:scheme"] = scheme_name
+            end
+          end
+        end
+        
+        # 保存修改
+        xml_content = doc.to_xml(indent: 2, encoding: 'UTF-8')
+        
+        # 验证修改是否成功
+        if xml_content.include?("android:scheme=\"#{scheme_name}\"")
+          File.write(manifest_path, xml_content)
+          puts "DOM操作成功更新了scheme: #{scheme_name}"
+          return true
+        end
+        
+        puts "DOM操作未能更新scheme，尝试文本替换方法"
+        return update_scheme_with_text_replace(manifest_path, existing_scheme, scheme_name)
+      rescue => e
+        puts "DOM操作失败: #{e.message}，尝试文本替换方法"
+        return update_scheme_with_text_replace(manifest_path, existing_scheme, scheme_name)
+      end
+    end
+    
+    # 使用文本替换方法更新scheme
+    def update_scheme_with_text_replace(manifest_path, existing_scheme, scheme_name)
+      begin
+        # 读取原始内容
+        xml_content = File.read(manifest_path)
+        
+        # 使用正则表达式替换scheme值
+        attribute_pattern = /android:scheme=["']#{Regexp.escape(existing_scheme)}["']/
+        
+        if xml_content.match(attribute_pattern)
+          modified_xml = xml_content.gsub(attribute_pattern, "android:scheme=\"#{scheme_name}\"")
+          
+          # 保存修改
+          File.write(manifest_path, modified_xml)
+          puts "文本替换成功更新scheme: #{scheme_name}"
+          return true
+        else
+          puts "在XML中找不到匹配的scheme属性"
+          return false
+        end
+      rescue => e
+        puts "文本替换更新失败: #{e.message}"
+        return false
+      end
+    end
   end
 end
+

data/lib/pindo/module/webserver/brotli_file_handler.rb

@@ -0,0 +1,57 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'  
+require 'fileutils'
+require 'pindo/base/executable'
+require 'webrick'  # 添加WebRick HTTP服务器
+require 'socket'
+
+module Pindo
+  module WebServer
+   
+    # 处理.br扩展名请求的servlet
+    class BrotliFileHandler < WEBrick::HTTPServlet::AbstractServlet
+      def initialize(server, root_dir, debug=false)
+          super(server)
+          @root_dir = root_dir
+          @debug = debug
+      end
+    
+      def do_GET(req, res)
+          # 只处理.br结尾的文件
+          unless req.path.end_with?('.br')
+              res.status = 404
+              return
+          end
+        
+          file_path = File.join(@root_dir, req.path[1..-1])
+        
+          if File.exist?(file_path)
+              # 确定原始文件类型
+              base_name = File.basename(req.path, ".br")
+              ext = File.extname(base_name)
+              
+              content_type = case ext
+                  when ".js" then "application/javascript"
+                  when ".wasm" then "application/wasm"
+                  when ".data" then "application/octet-stream"
+                  when ".json" then "application/json"
+                  else "application/octet-stream"
+              end
+              
+              # 读取文件
+              file_content = File.binread(file_path)
+              
+              # 设置响应
+              res.status = 200
+              res.header["Content-Encoding"] = "br"
+              res.content_type = content_type
+              res.body = file_content
+          else
+              res.status = 404
+          end
+      end
+    end
+
+  end
+end