easyai 1.2.0 → 1.3.0

data/lib/easyai/auth/authclaude.rb

@@ -6,20 +6,29 @@ require 'fileutils'
 module EasyAI
   module Auth
     class AuthClaude
+      # 常量定义
+      SERVICE_NAME = "Claude Code-credentials"
+      TOKEN_KEY = "CLAUDE_CODE_OAUTH_TOKEN"
+      ALT_TOKEN_KEY = "ANTHROPIC_AUTH_TOKEN"
+      CLAUDE_JSON_PATH = File.expand_path("~/.claude.json")
+
       def self.configure(config, user_name = nil)
         return false unless config
-        
+
+        # 第一步：清理系统环境，确保干净的运行环境
+        clean_system_environment
+
         # 检查认证配置优先级
-        is_macos = RUBY_PLATFORM.include?('darwin')
-        keychain_exists = is_macos && config["key_chain"] && config["key_chain"]["claudeAiOauth"] && config["key_chain"]["service_name"]
-        env_token_exists = config["env"] && config["env"]["CLAUDE_CODE_OAUTH_TOKEN"]
+        keychain_exists = macos? && config["key_chain"] && config["key_chain"]["claudeAiOauth"] && config["key_chain"]["service_name"]
+        # 检查两种可能的令牌键
+        env_token_exists = config["env"] && (config["env"][TOKEN_KEY] || config["env"][ALT_TOKEN_KEY])
         
         # 如果使用 Keychain，需要将令牌从 Keychain 读取到配置中
         if keychain_exists
           token_from_keychain = get_token_from_keychain(config["key_chain"]["service_name"])
           if token_from_keychain
             config["env"] ||= {}
-            config["env"]["CLAUDE_CODE_OAUTH_TOKEN"] = token_from_keychain
+            config["env"][TOKEN_KEY] = token_from_keychain
           end
         end
         
@@ -29,15 +38,28 @@ module EasyAI
           clean_env_variables
         elsif env_token_exists
           verify_token_config(config)
-          clean_keychain if is_macos
+          clean_keychain if macos?
         else
-          token = prompt_for_token
-          return false if token.nil? || token.empty?
-          
+          # 先检查环境变量中是否已有令牌
+          token = check_env_tokens
+
+          if token.nil? || token.empty?
+            # 环境变量中没有，才提示用户输入
+            token = prompt_for_token
+            return false if token.nil? || token.empty?
+          else
+            log_verbose("  ✓ 使用环境变量中的令牌")
+          end
+
           # 将令牌添加到配置中进行处理
+          # 如果配置中已经有 ANTHROPIC_AUTH_TOKEN，使用该键；否则使用 CLAUDE_CODE_OAUTH_TOKEN
           config["env"] ||= {}
-          config["env"]["CLAUDE_CODE_OAUTH_TOKEN"] = token
-          
+          if config["env"][ALT_TOKEN_KEY]
+            config["env"][ALT_TOKEN_KEY] = token
+          else
+            config["env"][TOKEN_KEY] = token
+          end
+
           verify_token_config(config)
           clean_keychain
         end
@@ -50,18 +72,103 @@ module EasyAI
         
         true
       end
-      
+
       private
-      
+
+      # 辅助方法
+      def self.macos?
+        RUBY_PLATFORM.include?('darwin')
+      end
+
+      def self.current_user
+        @current_user ||= Etc.getlogin || ENV['USER'] || ENV['LOGNAME']
+      end
+
+      def self.log_verbose(message)
+        puts message if ENV['EASYAI_DEBUG'] || ENV['EASYAI_VERBOSE']
+      end
+
+      def self.log_debug(message)
+        puts message if ENV['EASYAI_DEBUG']
+      end
+
+      # 通用的 shell 文件处理方法
+      def self.process_shell_files(operation_name)
+        shell_files = get_shell_files
+
+        shell_files.each do |shell_file|
+          next unless File.exist?(shell_file)
+
+          begin
+            content = File.read(shell_file)
+            lines = content.split("\n", -1)
+            lines.pop if lines.last == ""
+
+            original_count = lines.length
+            lines = yield(lines, shell_file)
+            removed_count = original_count - lines.length
+
+            if removed_count > 0
+              File.write(shell_file, lines.join("\n") + "\n")
+              log_verbose("  ✓ 已从 #{File.basename(shell_file)} 中清理 #{removed_count} 行#{operation_name}")
+            end
+          rescue => e
+            log_debug("  ⚠ 处理 #{shell_file} 失败: #{e.message}")
+          end
+        end
+      end
+
+      def self.clean_system_environment
+        log_verbose("🧹 清理系统环境...")
+
+        # 1. 清理 ~/.claude.json 中的 oauthAccount
+        clean_claude_json_oauth
+
+        # 2. 清理 Keychain（仅 macOS）
+        clean_keychain if macos?
+
+        # 3. 清理环境变量中的 token
+        clean_env_variables
+
+        # 4. 清理环境变量中的代理设置
+        clean_proxy_variables
+
+        log_verbose("  ✓ 系统环境清理完成")
+      end
+
+      def self.clean_claude_json_oauth
+        return unless File.exist?(CLAUDE_JSON_PATH)
+
+        begin
+          content = File.read(CLAUDE_JSON_PATH)
+          config = JSON.parse(content)
+
+          # 删除 oauthAccount 字段
+          if config.delete("oauthAccount")
+            # 写回文件
+            File.write(CLAUDE_JSON_PATH, JSON.pretty_generate(config))
+            log_verbose("  ✓ 已清理 ~/.claude.json 中的 oauthAccount")
+          end
+        rescue JSON::ParserError => e
+          log_debug("  ⚠ 解析 ~/.claude.json 失败: #{e.message}")
+        rescue => e
+          log_debug("  ⚠ 清理 ~/.claude.json 失败: #{e.message}")
+        end
+      end
+
+      def self.clean_proxy_variables
+        process_shell_files("代理配置") do |lines, shell_file|
+          remove_all_proxy_config(lines, shell_file)
+        end
+      end
+
       def self.get_token_from_keychain(service_name)
-        return nil unless RUBY_PLATFORM.include?('darwin')
-        
-        account_name = Etc.getlogin || ENV['USER'] || ENV['LOGNAME']
-        
+        return nil unless macos?
+
         cmd = [
           "security",
           "find-generic-password",
-          "-a", account_name,
+          "-a", current_user,
           "-s", service_name,
           "-w"
         ]
@@ -86,32 +193,30 @@ module EasyAI
         credentials = {
           "claudeAiOauth" => config["key_chain"]["claudeAiOauth"]
         }
-        
+
         service_name = config["key_chain"]["service_name"]
-        account_name = Etc.getlogin || ENV['USER'] || ENV['LOGNAME']
-        label = service_name
         password = credentials.to_json
-        
+
         cmd = [
           "security",
           "add-generic-password",
-          "-a", account_name,
+          "-a", current_user,
           "-s", service_name,
-          "-l", label,
+          "-l", service_name,
           "-w", password,
           "-U",
           "-T", ""
         ]
-        
+
         system(*cmd)
-        
+
         if $?.success?
-          verify_keychain_entry(account_name, service_name)
+          verify_keychain_entry(current_user, service_name)
         else
           puts "✗ 保存凭证到 Keychain 失败"
           return false
         end
-        
+
         true
       end
       
@@ -129,9 +234,10 @@ module EasyAI
       end
       
       def self.verify_token_config(config)
-        token = config["env"]["CLAUDE_CODE_OAUTH_TOKEN"]
+        # 检查两种可能的令牌键
+        token = config["env"][TOKEN_KEY] || config["env"][ALT_TOKEN_KEY]
         return false unless token
-        
+
         # 只验证令牌存在且不为空，不写入任何配置文件
         if token && !token.strip.empty?
           # 清理任何现有的环境配置文件中的令牌定义
@@ -144,27 +250,25 @@ module EasyAI
       end
       
       def self.update_claude_json(config)
-        user_claude_file = File.expand_path("~/.claude.json")
-        
         begin
           # 读取现有文件或创建空哈希
-          if File.exist?(user_claude_file)
-            user_config = JSON.parse(File.read(user_claude_file))
+          if File.exist?(CLAUDE_JSON_PATH)
+            user_config = JSON.parse(File.read(CLAUDE_JSON_PATH))
           else
             user_config = {}
           end
-          
+
           # 合并 claude_json 内容，过滤掉代理相关字段
           claude_config = config["claude_json"].dup
           claude_config.delete("claude_proxy")
           claude_config.delete("HTTP_PROXY")
           claude_config.delete("HTTPS_PROXY")
-          
+
           user_config.merge!(claude_config)
-          
+
           # 写回文件
-          File.write(user_claude_file, JSON.pretty_generate(user_config))
-          
+          File.write(CLAUDE_JSON_PATH, JSON.pretty_generate(user_config))
+
         rescue JSON::ParserError => e
           puts "✗ 解析现有 ~/.claude.json 失败: #{e.message}"
           false
@@ -191,7 +295,7 @@ module EasyAI
             lines.pop if lines.last == ""
             
             # 移除所有现有的代理相关配置
-            lines = remove_proxy_config(lines, shell_file)
+            lines = remove_all_proxy_config(lines, shell_file)
             
             # 只添加代理别名/函数，不直接设置环境变量
             lines = add_proxy_aliases(lines, shell_file, http_proxy, https_proxy)
@@ -208,10 +312,17 @@ module EasyAI
         puts "✅ 代理别名已配置 | claude_proxy / unclaude_proxy"
       end
       
+      # 检查环境变量中的令牌
+      def self.check_env_tokens
+        # 优先使用 CLAUDE_CODE_OAUTH_TOKEN，其次是 ANTHROPIC_AUTH_TOKEN
+        token = ENV[TOKEN_KEY] || ENV[ALT_TOKEN_KEY]
+        token&.strip&.empty? ? nil : token
+      end
+
       def self.prompt_for_token
         puts "请输入您的 CLAUDE_CODE_OAUTH_TOKEN："
         print "> "
-        
+
         begin
           # 简化输入处理，直接使用 STDIN
           STDIN.gets&.chomp
@@ -223,49 +334,28 @@ module EasyAI
       end
       
       def self.clean_env_variables
-        shell_files = get_shell_files
-        
-        shell_files.each do |shell_file|
-          next unless File.exist?(shell_file)
-          
-          begin
-            content = File.read(shell_file)
-            lines = content.split("\n", -1)
-            lines.pop if lines.last == ""
-            
-            patterns = get_token_patterns(shell_file)
-            original_count = lines.length
-            lines.reject! { |line| patterns.any? { |pattern| line.match(pattern) } }
-            removed_count = original_count - lines.length
-            
-            if removed_count > 0
-              File.write(shell_file, lines.join("\n") + "\n")
-            end
-          rescue => e
-            puts "  ✗ 清理 #{shell_file} 失败: #{e.message}"
-          end
+        process_shell_files("令牌配置") do |lines, shell_file|
+          patterns = get_token_patterns(shell_file)
+          lines.reject { |line| patterns.any? { |pattern| line.match(pattern) } }
         end
       end
       
       def self.clean_keychain
-        is_macos = RUBY_PLATFORM.include?('darwin')
-        
-        if is_macos
-          service_name = "Claude Code-credentials"
-          account_name = Etc.getlogin || ENV['USER'] || ENV['LOGNAME']
-          
-          cmd = [
-            "security",
-            "delete-generic-password",
-            "-a", account_name,
-            "-s", service_name
-          ]
-          
-          stdout, stderr, status = Open3.capture3(*cmd)
-          
-          unless status.success? || stderr.include?("could not be found")
-            puts "  警告: 清理 Keychain 失败: #{stderr}"
-          end
+        return unless macos?
+
+        cmd = [
+          "security",
+          "delete-generic-password",
+          "-a", current_user,
+          "-s", SERVICE_NAME
+        ]
+
+        stdout, stderr, status = Open3.capture3(*cmd)
+
+        if status.success?
+          log_verbose("  ✓ 已清理 Keychain 中的 Claude Code 凭证")
+        elsif !stderr.include?("could not be found")
+          log_debug("  ⚠ 清理 Keychain 失败: #{stderr}")
         end
       end
       
@@ -273,77 +363,95 @@ module EasyAI
         shell_files = []
         current_shell = ENV['SHELL']&.split('/')&.last || 'bash'
         
-        case current_shell
-        when 'zsh'
-          shell_files << File.expand_path("~/.zshrc")
-        when 'bash'
-          bash_profile = File.expand_path("~/.bash_profile")
-          bashrc = File.expand_path("~/.bashrc")
-          shell_files << (File.exist?(bash_profile) ? bash_profile : bashrc)
-        when 'fish'
-          fish_config = File.expand_path("~/.config/fish/config.fish")
-          shell_files << fish_config
-          
-          # 确保 fish 配置目录存在
-          fish_dir = File.dirname(fish_config)
-          unless File.exist?(fish_dir)
-            FileUtils.mkdir_p(fish_dir)
-            puts "  创建目录: #{fish_dir}"
+        if Gem.win_platform?
+          # Windows 平台配置
+          powershell_profile = File.expand_path("~/Documents/WindowsPowerShell/Microsoft.PowerShell_profile.ps1")
+          powershell_core_profile = File.expand_path("~/Documents/PowerShell/Microsoft.PowerShell_profile.ps1")
+
+          # 检查哪个 PowerShell 配置文件存在或需要创建
+          if File.exist?(File.dirname(powershell_core_profile))
+            shell_files << powershell_core_profile
+          elsif File.exist?(File.dirname(powershell_profile))
+            shell_files << powershell_profile
+          else
+            # 默认使用 PowerShell Core 配置
+            ps_dir = File.dirname(powershell_core_profile)
+            FileUtils.mkdir_p(ps_dir) unless File.exist?(ps_dir)
+            shell_files << powershell_core_profile
           end
         else
-          shell_files << File.expand_path("~/.profile")
+          # Unix/Linux/macOS 平台配置
+          case current_shell
+          when 'zsh'
+            shell_files << File.expand_path("~/.zshrc")
+          when 'bash'
+            bash_profile = File.expand_path("~/.bash_profile")
+            bashrc = File.expand_path("~/.bashrc")
+            shell_files << (File.exist?(bash_profile) ? bash_profile : bashrc)
+          when 'fish'
+            fish_config = File.expand_path("~/.config/fish/config.fish")
+            shell_files << fish_config
+
+            # 确保 fish 配置目录存在
+            fish_dir = File.dirname(fish_config)
+            unless File.exist?(fish_dir)
+              FileUtils.mkdir_p(fish_dir)
+              puts "  创建目录: #{fish_dir}"
+            end
+          else
+            shell_files << File.expand_path("~/.profile")
+          end
+
+          # 总是添加 ~/.profile 作为备份
+          profile_file = File.expand_path("~/.profile")
+          shell_files << profile_file unless shell_files.include?(profile_file)
         end
         
-        # 总是添加 ~/.profile 作为备份
-        profile_file = File.expand_path("~/.profile")
-        shell_files << profile_file unless shell_files.include?(profile_file)
-        
         shell_files
       end
       
       def self.get_token_patterns(shell_file)
-        key = "CLAUDE_CODE_OAUTH_TOKEN"
-        
         if shell_file.include?("config.fish")
           [
-            /^set\s+-gx\s+#{Regexp.escape(key)}\s/,
-            /^set\s+-x\s+#{Regexp.escape(key)}\s/,
-            /^#set\s+-gx\s+#{Regexp.escape(key)}\s/
+            /^set\s+-gx\s+#{Regexp.escape(TOKEN_KEY)}\s/,
+            /^set\s+-x\s+#{Regexp.escape(TOKEN_KEY)}\s/,
+            /^#set\s+-gx\s+#{Regexp.escape(TOKEN_KEY)}\s/
           ]
         else
           [
-            /^export\s+#{Regexp.escape(key)}=/,
-            /^#{Regexp.escape(key)}=/,
-            /^#export\s+#{Regexp.escape(key)}=/
+            /^export\s+#{Regexp.escape(TOKEN_KEY)}=/,
+            /^#{Regexp.escape(TOKEN_KEY)}=/,
+            /^#export\s+#{Regexp.escape(TOKEN_KEY)}=/
           ]
         end
       end
-      
+
       def self.get_export_line(shell_file, token)
-        key = "CLAUDE_CODE_OAUTH_TOKEN"
-        
         if shell_file.include?("config.fish")
-          "set -gx #{key} \"#{token}\""
+          "set -gx #{TOKEN_KEY} \"#{token}\""
         else
-          "export #{key}=\"#{token}\""
+          "export #{TOKEN_KEY}=\"#{token}\""
         end
       end
       
-      def self.remove_proxy_config(lines, shell_file)
+      def self.remove_all_proxy_config(lines, shell_file)
+        # 更全面的代理配置清理，包括所有可能的代理设置
         if shell_file.include?("config.fish")
-          # Fish shell 代理配置清理 - 移除直接的环境变量设置和代理相关的别名/函数
+          # Fish shell 代理配置清理
           lines.reject! { |line|
-            line.match(/^set\s+-[gx]+\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)\s/) ||
-            line.match(/^export\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=/) ||
-            line.match(/^alias\s+claude_proxy=/) ||
-            line.match(/^alias\s+unclaude_proxy=/) ||
-            line.match(/^function\s+(claude_proxy|unclaude_proxy)/)
+            # 清理环境变量设置
+            line.match(/^set\s+-[gx]+\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy|ALL_PROXY|all_proxy|NO_PROXY|no_proxy)\s/) ||
+            line.match(/^export\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy|ALL_PROXY|all_proxy|NO_PROXY|no_proxy)=/) ||
+            # 清理别名
+            line.match(/^alias\s+(claude_proxy|unclaude_proxy|proxy|unproxy)=/) ||
+            # 清理函数
+            line.match(/^function\s+(claude_proxy|unclaude_proxy|proxy|unproxy)/)
           }
-          
+
           # 移除函数块
           in_function = false
-          lines.select do |line|
-            if line.match(/^function\s+(claude_proxy|unclaude_proxy)/)
+          lines = lines.select do |line|
+            if line.match(/^function\s+(claude_proxy|unclaude_proxy|proxy|unproxy)/)
               in_function = true
               false
             elsif in_function && line.strip == "end"
@@ -356,19 +464,25 @@ module EasyAI
             end
           end
         else
-          # Bash/zsh 代理配置清理 - 移除直接的环境变量设置和代理相关的别名/函数
+          # Bash/zsh 代理配置清理
           lines.reject! { |line|
-            line.match(/^export\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=/) ||
-            line.match(/^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy)=/) ||
-            line.match(/^alias\s+(claude_proxy|unclaude_proxy)=/) ||
-            line.match(/^(claude_proxy|unclaude_proxy)\(\)/)
+            # 清理环境变量设置
+            line.match(/^export\s+(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy|ALL_PROXY|all_proxy|NO_PROXY|no_proxy)=/) ||
+            line.match(/^(HTTP_PROXY|HTTPS_PROXY|http_proxy|https_proxy|ALL_PROXY|all_proxy|NO_PROXY|no_proxy)=/) ||
+            # 清理别名
+            line.match(/^alias\s+(claude_proxy|unclaude_proxy|proxy|unproxy)=/) ||
+            # 清理函数
+            line.match(/^(claude_proxy|unclaude_proxy|proxy|unproxy)\(\)/) ||
+            # 清理函数定义的另一种格式
+            line.match(/^function\s+(claude_proxy|unclaude_proxy|proxy|unproxy)/)
           }
-          
+
           # 移除函数块
           in_function = false
           function_depth = 0
-          lines.select do |line|
-            if line.match(/^(claude_proxy|unclaude_proxy)\(\)/)
+          lines = lines.select do |line|
+            if line.match(/^(claude_proxy|unclaude_proxy|proxy|unproxy)\(\)/) ||
+               line.match(/^function\s+(claude_proxy|unclaude_proxy|proxy|unproxy)/)
               in_function = true
               function_depth = 0
               false
@@ -376,16 +490,27 @@ module EasyAI
               function_depth += 1 if line.include?("{")
               if line.include?("}")
                 function_depth -= 1
-                in_function = false if function_depth <= 0
+                if function_depth <= 0
+                  in_function = false
+                  false
+                else
+                  false
+                end
+              else
+                false
               end
-              false
             else
               true
             end
           end
         end
+
+        lines
       end
-      
+
+      # remove_proxy_config 方法已被 remove_all_proxy_config 替代
+      # remove_all_proxy_config 提供更全面的清理功能，包括 ALL_PROXY 和 NO_PROXY
+
       def self.add_proxy_aliases(lines, shell_file, http_proxy, https_proxy)
         if shell_file.include?("config.fish")
           # Fish shell - 只添加函数，不直接设置环境变量

data/lib/easyai/auth/jpsloginhelper.rb

@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby
+
+require 'jpsclient'
+require 'fileutils'
+require 'json'
+require_relative '../config/easyai_config'
+
+module EasyAI
+  module Auth
+    class JPSLoginHelper
+      attr_reader :username
+
+      def initialize(options = {})
+        @verbose = options[:verbose] || false
+
+        # 如果传入了配置文件路径，直接使用
+        if options[:config_file]
+          @config_file_path = options[:config_file]
+        else
+          # 通过 EasyAIConfig 获取 jpsclient 配置文件路径
+          # 首先确保配置仓库已初始化
+          EasyAIConfig.initialize(verbose: @verbose)
+
+          # 获取 jpsclient 配置文件路径（会自动解密到临时目录）
+          @config_file_path = EasyAIConfig.get_config_path('jps_client_config', verbose: @verbose)
+        end
+
+        @client = nil
+        @username = nil
+      end
+
+      # 主登录入口 - 兼容原 JPSLogin 接口
+      def login
+        begin
+          # 检查配置文件路径
+          if @config_file_path.nil?
+            puts "✗ 未找到 jpsclient 配置文件"
+            puts "  请确保配置仓库已下载并解密"
+            return false
+          end
+
+          # 检查配置文件是否存在
+          unless File.exist?(@config_file_path)
+            puts "✗ 配置文件不存在: #{@config_file_path}"
+            puts "  请先从配置仓库下载并解密配置文件"
+            return false
+          end
+
+          @client ||= JPSClient::Client.new(config_file: @config_file_path)
+
+          # 执行登录
+          result = @client.do_login(force_login: false)
+
+          if result == :user_cancelled
+            return :user_cancelled
+          end
+
+          if result
+            # 登录成功，获取用户名
+            @username = get_username_from_client
+            return true
+          end
+
+          return false
+        rescue => e
+          puts "✗ JPS 登录失败: #{e.message}" if @verbose
+          return false
+        end
+      end
+
+      # 获取用户名 - 兼容原 JPSLogin 接口
+      def get_username
+        return @username if @username
+
+        # 如果客户端存在且已登录，尝试获取用户名
+        if @client
+          @username = get_username_from_client
+        end
+
+        @username
+      end
+
+      private
+
+      # 从客户端获取用户名
+      def get_username_from_client
+        if @client && @client.token
+          # 从 token 中获取用户名
+          token_info = @client.token
+          if token_info.is_a?(Hash) && token_info['username']
+            return token_info['username']
+          end
+        end
+        nil
+      end
+    end
+  end
+end