easyai 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7511936104d9115b56bf3ec36425dcdffeedc7cf1c600463901242a281b7505
-  data.tar.gz: 3f656f1f9da2e0a5ff242707865f960077f5b4b6937b4d5de1fd6db41df03f4f
+  metadata.gz: 764f51642d04ee3ba299d468f3d09cc6064899605910fdca6568c536de330e0e
+  data.tar.gz: 29d920f541d56356ee766d87f349ee6e2459b9d5a6fdaede676d9457079bf4f7
 SHA512:
-  metadata.gz: 05d9c00dfa0732c8379441e29006722e4a9354b255ca6c1209f87b22b586052333fde54edab402406d19883b34f93a36567cf8dd8df4cd08e6b326dd8490323c
-  data.tar.gz: 9648b22cfbbee85132f78dd034d29ca5340af3051f7465bd95d150de942983148fffe4abf43b691cebe0a5cf5eadc8447e0908235825c2618c80107ff5d21881
+  metadata.gz: 68b0aaec2f2996bf44c808d2e1266f47e4fc624a5194e1a29569b942ca35abfc9cd393baf3b29a5c6263798d591dd5b570d1b289e20da0fc30d05cb419f4ad92
+  data.tar.gz: 816988a6ec0d2414ee5823621febfb7c28fa7607484f85436b8014a3eb0bab31b2d316e6f342f3939f066f7087bd443dcda9eab1d4302e9a9ca20bb4c2202dd6

data/lib/easyai/auth/jpslogin.rb

@@ -164,13 +164,27 @@ module EasyAI
       def start_callback_server
         code = nil
         
+        # 检查并处理端口占用
+        unless ensure_port_available(@server_port)
+          puts "✗ 无法使用端口 #{@server_port}，登录失败"
+          return nil
+        end
+        
         puts "启动本地服务器，监听端口 #{@server_port}..."
         
-        server = WEBrick::HTTPServer.new(
-          Port: @server_port,
-          Logger: WEBrick::Log.new("/dev/null"),
-          AccessLog: []
-        )
+        begin
+          server = WEBrick::HTTPServer.new(
+            Port: @server_port,
+            Logger: WEBrick::Log.new("/dev/null"),
+            AccessLog: []
+          )
+        rescue Errno::EADDRINUSE
+          puts "✗ 端口 #{@server_port} 仍被占用，无法启动服务器"
+          return nil
+        rescue => e
+          puts "✗ 启动服务器失败: #{e.message}"
+          return nil
+        end
 
         # 处理根路径的请求
         server.mount_proc '/' do |req, res|
@@ -379,6 +393,176 @@ module EasyAI
         </html>
         HTML
       end
+
+      # 确保端口可用，处理端口占用问题
+      def ensure_port_available(port)
+        return true unless port_occupied?(port)
+
+        puts "⚠️  端口 #{port} 被占用，正在检查占用进程..."
+        
+        # 获取占用端口的进程信息
+        process_info = get_port_process_info(port)
+        
+        if process_info.nil?
+          puts "✗ 无法获取端口占用信息"
+          return false
+        end
+
+        puts "占用进程信息："
+        puts "  PID: #{process_info[:pid]}"
+        puts "  进程名: #{process_info[:name]}"
+        puts "  命令: #{process_info[:command]}"
+
+        # 检查是否是自己的进程（可能是之前未正常关闭的实例）
+        if process_info[:name].include?('ruby') && process_info[:command].include?('easyai')
+          puts "检测到可能是 EasyAI 之前的遗留进程"
+          if ask_user_kill_process?
+            return kill_process_by_pid(process_info[:pid])
+          end
+        else
+          puts "端口被其他应用程序占用"
+          if ask_user_kill_process?
+            return kill_process_by_pid(process_info[:pid])
+          end
+        end
+
+        return false
+      end
+
+      # 检查端口是否被占用
+      def port_occupied?(port)
+        require 'socket'
+        
+        begin
+          server = TCPServer.new('127.0.0.1', port)
+          server.close
+          false  # 端口未被占用
+        rescue Errno::EADDRINUSE
+          true   # 端口被占用
+        rescue => e
+          puts "⚠️  检查端口时出错: #{e.message}"
+          true   # 出错时假设端口被占用，避免冲突
+        end
+      end
+
+      # 获取占用指定端口的进程信息
+      def get_port_process_info(port)
+        begin
+          # macOS/Linux 使用 lsof 命令
+          if system('which lsof > /dev/null 2>&1')
+            output = `lsof -ti :#{port} 2>/dev/null`.strip
+            return nil if output.empty?
+            
+            pid = output.split("\n").first
+            return nil if pid.nil? || pid.empty?
+            
+            # 获取进程详细信息
+            ps_output = `ps -p #{pid} -o pid,comm,args 2>/dev/null`.lines
+            return nil if ps_output.length < 2
+            
+            process_line = ps_output[1].strip
+            parts = process_line.split(/\s+/, 3)
+            
+            return {
+              pid: parts[0],
+              name: parts[1] || 'unknown',
+              command: parts[2] || 'unknown'
+            }
+          end
+          
+          # Windows 使用 netstat 命令
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+            output = `netstat -ano | findstr :#{port}`.strip
+            return nil if output.empty?
+            
+            lines = output.split("\n")
+            listening_line = lines.find { |line| line.include?('LISTENING') }
+            return nil unless listening_line
+            
+            pid = listening_line.split.last
+            return nil if pid.nil? || pid.empty?
+            
+            # 获取进程名称
+            task_output = `tasklist /FI "PID eq #{pid}" /FO CSV /NH 2>nul`.strip
+            if !task_output.empty?
+              process_name = task_output.split(',').first.gsub('"', '')
+              return {
+                pid: pid,
+                name: process_name,
+                command: process_name
+              }
+            end
+          end
+          
+          return nil
+        rescue => e
+          puts "获取进程信息时出错: #{e.message}"
+          return nil
+        end
+      end
+
+      # 询问用户是否终止占用端口的进程
+      def ask_user_kill_process?
+        puts "\n是否终止占用端口的进程？"
+        puts "  y/yes - 终止进程并继续 (可能影响其他应用)"
+        puts "  n/no  - 取消登录 (默认)"
+        print "> "
+        
+        begin
+          response = STDIN.gets&.chomp&.downcase
+          return ['y', 'yes'].include?(response)
+        rescue Interrupt
+          puts "\n\n用户中断操作"
+          return false
+        rescue => e
+          puts "无法读取用户输入: #{e.message}"
+          return false
+        end
+      end
+
+      # 根据 PID 终止进程
+      def kill_process_by_pid(pid)
+        return false if pid.nil? || pid.empty?
+        
+        begin
+          puts "正在终止进程 #{pid}..."
+          
+          # 跨平台的进程终止命令
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+            # Windows
+            success = system("taskkill /PID #{pid} /F >nul 2>&1")
+          else
+            # macOS/Linux - 先尝试优雅终止，再强制终止
+            success = system("kill -TERM #{pid} 2>/dev/null")
+            sleep(2)
+            # 检查进程是否还存在
+            if system("kill -0 #{pid} 2>/dev/null")
+              puts "优雅终止失败，使用强制终止..."
+              success = system("kill -KILL #{pid} 2>/dev/null")
+            end
+          end
+          
+          if success
+            puts "✓ 进程 #{pid} 已终止"
+            sleep(1) # 等待端口释放
+            
+            # 再次检查端口是否可用
+            unless port_occupied?(@server_port)
+              puts "✓ 端口 #{@server_port} 现在可用"
+              return true
+            else
+              puts "⚠️  端口仍被占用，可能需要等待更长时间"
+              return false
+            end
+          else
+            puts "✗ 终止进程失败，可能需要管理员权限"
+            return false
+          end
+        rescue => e
+          puts "终止进程时出错: #{e.message}"
+          return false
+        end
+      end
     end
   end
 end

data/lib/easyai/command/claude.rb

@@ -62,9 +62,6 @@ module EasyAI
         begin
           # 在非verbose模式下显示简洁的更新提醒
           Base::UpdateNotifier.maybe_show_notification unless @verbose_mode
-          
-          # 美化的启动信息
-          print_header
 
           # 首先尝试从远程下载配置
           remote_config = nil
@@ -128,11 +125,6 @@ module EasyAI
 
       private
 
-      def print_header
-        puts "\n╔#{'═' * 58}╗"
-        puts "║#{'EasyAI Claude CLI 启动器'.center(58)}║"
-        puts "╚#{'═' * 58}╝\n"
-      end
 
       def print_status(icon_text, detail = nil)
         if detail

data/lib/easyai/version.rb

@@ -1,3 +1,3 @@
 module EasyAI
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyai
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Wade