Merge pull request #45 from K9i-0/feature/debug-port-configuration

K9i-0 · web-flow · commit 46937960b134 · 2025-07-02T12:05:40.000+09:00
feat: デバッグ時のポート競合を解決する環境変数サポートを追加
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -50,6 +50,39 @@ open Package.swift
 # Clean up processes if needed
 killall ClaudeCodeMonitor 2>/dev/null || true
 ps aux | grep -E "node.*server" | grep -v grep | awk '{print $2}' | xargs kill 2>/dev/null || true
+
+# Debug with different port (to avoid conflict with release version)
+cd server && PORT=3457 npm start  # Start server on port 3457
+CLAUDE_MONITOR_PORT=3457 swift run  # Run app using port 3457
+```
+
+## Debugging with Port Configuration
+
+To avoid port conflicts between the DMG-distributed app and debug builds:
+
+### Using Environment Variables
+
+Both the server and application support custom port configuration via environment variables:
+
+- Server: `PORT` environment variable (defaults to 3456)
+- Application: `CLAUDE_MONITOR_PORT` environment variable (defaults to 3456)
+
+### Debug Setup in Xcode
+
+1. Open the project in Xcode: `open Package.swift`
+2. Edit the scheme (Product → Scheme → Edit Scheme...)
+3. In the "Run" section, go to "Arguments" tab
+4. Add environment variable: `CLAUDE_MONITOR_PORT` = `3457`
+
+### Command Line Debug
+
+```bash
+# Terminal 1: Start server on custom port
+cd server
+PORT=3457 npm start
+
+# Terminal 2: Run app with custom port
+CLAUDE_MONITOR_PORT=3457 swift run
 ```
 
 ## Architecture
diff --git a/Config/Debug.xcconfig b/Config/Debug.xcconfig
@@ -0,0 +1,3 @@
+// Debug configuration
+PRODUCT_BUNDLE_IDENTIFIER = com.k9i.ClaudeCodeMonitor.debug
+PRODUCT_NAME = ClaudeCodeMonitor-Debug
diff --git a/Config/Release.xcconfig b/Config/Release.xcconfig
@@ -0,0 +1,3 @@
+// Release configuration
+PRODUCT_BUNDLE_IDENTIFIER = com.k9i.ClaudeCodeMonitor
+PRODUCT_NAME = ClaudeCodeMonitor
diff --git a/DEBUG_GUIDE.md b/DEBUG_GUIDE.md
@@ -51,7 +51,16 @@ npm start
 ```
 **解決策**: エラーメッセージに基づいて対処
 
-### 5. 追加のデバッグ情報
+### 5. デバッグビルドでポートを変更
+
+リリース版と同時に実行するには：
+
+1. Xcodeでスキームを編集: Product → Scheme → Edit Scheme...
+2. Run → Arguments → Environment Variables
+3. 追加: `CLAUDE_MONITOR_PORT` = `3457`
+4. サーバーも別ポートで起動: `cd server && PORT=3457 npm start`
+
+### 6. 追加のデバッグ情報
 
 環境変数を確認するには、AppDelegate.swiftに以下を追加：
 
diff --git a/Info.plist b/Info.plist
@@ -3,11 +3,11 @@
 <plist version="1.0">
 <dict>
     <key>CFBundleIdentifier</key>
-    <string>com.k9i.claude-code-monitor</string>
+    <string>com.k9i.ClaudeCodeMonitor</string>
     <key>CFBundleName</key>
-    <string>Claude Code Monitor</string>
+    <string>ClaudeCodeMonitor</string>
     <key>CFBundleDisplayName</key>
-    <string>Claude Code Monitor</string>
+    <string>ClaudeCodeMonitor</string>
     <key>CFBundleExecutable</key>
     <string>ClaudeCodeMonitor</string>
     <key>CFBundleVersion</key>
diff --git a/README.ja.md b/README.ja.md
@@ -89,6 +89,15 @@ Xcodeで:
 - **ビルド**: Product > Build（⌘B）
 - **実行**: Product > Run（⌘R）
 
+##### 異なるポートでデバッグ実行
+
+リリース版と同時に実行するには：
+
+1. スキームを編集: Product → Scheme → Edit Scheme...
+2. Run → Arguments → Environment Variables へ移動
+3. 追加: `CLAUDE_MONITOR_PORT` = `3457`
+4. サーバーも別ポートで起動: `cd server && PORT=3457 npm start`
+
 #### 方法2: コマンドラインでビルド
 
 ```bash
diff --git a/README.md b/README.md
@@ -93,6 +93,15 @@ In Xcode:
 - **Build**: Product > Build (⌘B)
 - **Run**: Product > Run (⌘R)
 
+##### Debug with Different Port
+
+To run debug builds alongside the release version:
+
+1. Edit scheme: Product → Scheme → Edit Scheme...
+2. Go to Run → Arguments → Environment Variables
+3. Add: `CLAUDE_MONITOR_PORT` = `3457`
+4. Start server on different port: `cd server && PORT=3457 npm start`
+
 #### Method 2: Command Line Build
 
 ```bash
diff --git a/Sources/ClaudeUsageMonitor/AppDelegate.swift b/Sources/ClaudeUsageMonitor/AppDelegate.swift
@@ -11,6 +11,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var dataAccessManager: ClaudeDataAccessManager!
 
     func applicationDidFinishLaunching(_ notification: Notification) {
+        // Debug builds use different settings to avoid conflicts with release version
+        #if DEBUG
+        // This will be reflected in menu bar and other UI elements
+        print("Running in DEBUG mode")
+        #endif
+        
         // Initialize data access manager
         dataAccessManager = ClaudeDataAccessManager()
 
@@ -143,7 +149,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             }
 
             // パーセンテージのみ表示（HIGに準拠した簡潔な表示）
+            #if DEBUG
+            button.title = String(format: "%.0f%% [D]", percentage)
+            #else
             button.title = String(format: "%.0f%%", percentage)
+            #endif
             button.attributedTitle = NSAttributedString(
                 string: button.title,
                 attributes: [
diff --git a/Sources/ClaudeUsageMonitor/BundleConfiguration.swift b/Sources/ClaudeUsageMonitor/BundleConfiguration.swift
@@ -0,0 +1,19 @@
+import Foundation
+
+enum BundleConfiguration {
+    static var bundleIdentifier: String {
+        #if DEBUG
+        return "com.k9i.ClaudeCodeMonitor.debug"
+        #else
+        return "com.k9i.ClaudeCodeMonitor"
+        #endif
+    }
+    
+    static var appName: String {
+        #if DEBUG
+        return "ClaudeCodeMonitor-Debug"
+        #else
+        return "ClaudeCodeMonitor"
+        #endif
+    }
+}
diff --git a/Sources/ClaudeUsageMonitor/ClaudeDataAccessManager.swift b/Sources/ClaudeUsageMonitor/ClaudeDataAccessManager.swift
@@ -15,7 +15,7 @@ class ClaudeDataAccessManager: ObservableObject {
     /// Check if we have existing access via saved path or auto-detect
     func checkExistingAccess() {
         // First try to load saved path
-        if let savedPath = UserDefaults.standard.string(forKey: "claudeDataPath") {
+        if let savedPath = UserDefaultsManager.shared.string(forKey: "claudeDataPath") {
             print("[ClaudeDataAccess] Found saved path: \(savedPath)")
             // Verify the path still exists and has projects subdirectory
             let url = URL(fileURLWithPath: savedPath)
@@ -29,7 +29,7 @@ class ClaudeDataAccessManager: ObservableObject {
             } else {
                 print("[ClaudeDataAccess] Saved path no longer valid")
                 // Clear invalid path
-                UserDefaults.standard.removeObject(forKey: "claudeDataPath")
+                UserDefaultsManager.shared.removeObject(forKey: "claudeDataPath")
             }
         }
 
@@ -42,7 +42,7 @@ class ClaudeDataAccessManager: ObservableObject {
             claudePath = defaultClaudePath.path
             hasAccess = true
             // Save the auto-detected path
-            UserDefaults.standard.set(defaultClaudePath.path, forKey: "claudeDataPath")
+            UserDefaultsManager.shared.set(defaultClaudePath.path, forKey: "claudeDataPath")
             print("[ClaudeDataAccess] Auto-detected Claude data at: \(defaultClaudePath.path)")
         } else {
             print("[ClaudeDataAccess] Claude data not found at default location: \(defaultClaudePath.path)")
@@ -128,8 +128,8 @@ class ClaudeDataAccessManager: ObservableObject {
         hasAccess = true
 
         // Save the resolved path to UserDefaults
-        UserDefaults.standard.set(resolvedURL.path, forKey: "claudeDataPath")
-        UserDefaults.standard.synchronize()
+        UserDefaultsManager.shared.set(resolvedURL.path, forKey: "claudeDataPath")
+        UserDefaultsManager.shared.synchronize()
 
         print("[ClaudeDataAccess] Successfully saved path: \(resolvedURL.path)")
         print("[ClaudeDataAccess] hasAccess is now: \(hasAccess)")
diff --git a/Sources/ClaudeUsageMonitor/Models/LanguageSettings.swift b/Sources/ClaudeUsageMonitor/Models/LanguageSettings.swift
@@ -45,24 +45,24 @@ class LanguageSettings: ObservableObject {
 
     @Published var currentLanguage: AppLanguage {
         didSet {
-            UserDefaults.standard.set(currentLanguage.rawValue, forKey: "AppLanguage")
+            UserDefaultsManager.shared.set(currentLanguage.rawValue, forKey: "AppLanguage")
             applyLanguage()
         }
     }
 
     private init() {
-        let savedLanguage = UserDefaults.standard.string(forKey: "AppLanguage") ?? AppLanguage.system.rawValue
+        let savedLanguage = UserDefaultsManager.shared.string(forKey: "AppLanguage") ?? AppLanguage.system.rawValue
         self.currentLanguage = AppLanguage(rawValue: savedLanguage) ?? .system
         applyLanguage()
     }
 
     private func applyLanguage() {
         if let languageCode = currentLanguage.languageCode {
-            UserDefaults.standard.set([languageCode], forKey: "AppleLanguages")
+            UserDefaultsManager.shared.set([languageCode], forKey: "AppleLanguages")
         } else {
-            UserDefaults.standard.removeObject(forKey: "AppleLanguages")
+            UserDefaultsManager.shared.removeObject(forKey: "AppleLanguages")
         }
-        UserDefaults.standard.synchronize()
+        UserDefaultsManager.shared.synchronize()
     }
 
     func effectiveLanguageCode() -> String {
diff --git a/Sources/ClaudeUsageMonitor/NotificationManager.swift b/Sources/ClaudeUsageMonitor/NotificationManager.swift
@@ -7,7 +7,7 @@ class NotificationManager: NSObject {
     static let shared = NotificationManager()
 
     private var hasNotified90Percent: Bool = false
-    private let userDefaults = UserDefaults.standard
+    private let userDefaults = UserDefaultsManager.shared
     private let notificationEnabledKey = "ClaudeUsageMonitor.notificationsEnabled"
     private var currentSessionId: String?
 
diff --git a/Sources/ClaudeUsageMonitor/ServerManager.swift b/Sources/ClaudeUsageMonitor/ServerManager.swift
@@ -5,12 +5,21 @@ class ServerManager: ObservableObject {
     static let shared = ServerManager()
 
     private var serverProcess: Process?
-    private let serverPort = 3_456
+    private let serverPort: Int
     @Published var isServerRunning = false
     var claudePath: String?
     private var serverMonitorTask: Task<Void, Never>?
 
-    private init() {}
+    private init() {
+        // 環境変数CLAUDE_MONITOR_PORTからポート番号を取得、デフォルトは3456
+        if let portString = ProcessInfo.processInfo.environment["CLAUDE_MONITOR_PORT"],
+           let port = Int(portString) {
+            self.serverPort = port
+        } else {
+            self.serverPort = 3_456
+        }
+        print("[ServerManager] Using port: \(serverPort)")
+    }
 
     func checkAndStartServer() async -> Bool {
         // Check if server is already running
diff --git a/Sources/ClaudeUsageMonitor/UsageMonitor.swift b/Sources/ClaudeUsageMonitor/UsageMonitor.swift
@@ -9,9 +9,10 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
 
     private var timer: Timer?
     private let updateInterval = Constants.Timing.refreshInterval
-    private let userDefaults = UserDefaults.standard
+    private let userDefaults = UserDefaultsManager.shared
     private let detectedPlanKey = "ClaudeUsageMonitor.detectedPlan"
     private let userPlanKey = "ClaudeUsageMonitor.userSelectedPlan"
+    private let serverPort: Int
     private lazy var notificationManager: NotificationManager? = {
         // バンドル環境でのみ通知マネージャーを初期化
         guard Bundle.main.bundleIdentifier != nil else {
@@ -28,6 +29,21 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
     }
 
     init() {
+        // 環境変数CLAUDE_MONITOR_PORTからポート番号を取得、デフォルトは3456
+        if let portString = ProcessInfo.processInfo.environment["CLAUDE_MONITOR_PORT"],
+           let port = Int(portString) {
+            self.serverPort = port
+        } else {
+            self.serverPort = 3456
+        }
+        print("[UsageMonitor] Using port: \(serverPort)")
+        
+        // デバッグ情報を出力
+        #if DEBUG
+        print("[DEBUG] userPlanKey: \(userPlanKey) = \(String(describing: userDefaults.string(forKey: userPlanKey)))")
+        print("[DEBUG] detectedPlanKey: \(detectedPlanKey) = \(String(describing: userDefaults.string(forKey: detectedPlanKey)))")
+        #endif
+        
         // ユーザーが手動選択したプランを優先的に読み込む
         if let userPlan = userDefaults.string(forKey: userPlanKey) {
             usageData.detectedPlanType = userPlan
@@ -36,6 +52,8 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
             // 自動検出されたプランを読み込む（後方互換性）
             usageData.detectedPlanType = savedPlan
             print("Loaded auto-detected plan: \(savedPlan)")
+        } else {
+            print("No saved plan found, will auto-detect")
         }
         startMonitoring()
     }
@@ -70,7 +88,7 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
 
         do {
             // Try local server first
-            if let url = URL(string: "http://127.0.0.1:3456/usage") {
+            if let url = URL(string: "http://127.0.0.1:\(serverPort)/usage") {
                 var request = URLRequest(url: url)
                 request.timeoutInterval = 5.0 // 5 second timeout
 
@@ -178,7 +196,7 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
 
         do {
             // Try local server first for session data
-            if let url = URL(string: "http://127.0.0.1:3456/blocks/active") {
+            if let url = URL(string: "http://127.0.0.1:\(serverPort)/blocks/active") {
                 print("[DEBUG] Attempting server connection to \(url)")
 
                 var request = URLRequest(url: url)
@@ -317,6 +335,7 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
         if usageData.detectedPlanType != plan {
             usageData.detectedPlanType = plan
             userDefaults.set(plan, forKey: detectedPlanKey)
+            userDefaults.synchronize()
             print("Updated detected plan to: \(plan)")
         }
     }
@@ -326,6 +345,7 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
         userDefaults.set(plan, forKey: userPlanKey)
         // 自動検出のキーを削除
         userDefaults.removeObject(forKey: detectedPlanKey)
+        userDefaults.synchronize()
         print("User selected plan: \(plan)")
 
         // UIを即座に更新するために、変更を通知
diff --git a/Sources/ClaudeUsageMonitor/UserDefaultsManager.swift b/Sources/ClaudeUsageMonitor/UserDefaultsManager.swift
@@ -0,0 +1,27 @@
+import Foundation
+
+/// Manages UserDefaults with different suites for Debug/Release builds
+enum UserDefaultsManager {
+    private static let suiteName: String = {
+        #if DEBUG
+        return "com.k9i.ClaudeCodeMonitor.debug"
+        #else
+        return "com.k9i.ClaudeCodeMonitor"
+        #endif
+    }()
+    
+    private static let releaseSuiteName = "com.k9i.ClaudeCodeMonitor"
+    
+    static var shared: UserDefaults {
+        return UserDefaults(suiteName: suiteName) ?? UserDefaults.standard
+    }
+    
+    /// Read-only access to release settings for migration
+    static var releaseDefaults: UserDefaults? {
+        #if DEBUG
+        return UserDefaults(suiteName: releaseSuiteName)
+        #else
+        return nil
+        #endif
+    }
+}
diff --git a/Sources/ClaudeUsageMonitor/Utilities.swift b/Sources/ClaudeUsageMonitor/Utilities.swift
@@ -273,7 +273,7 @@ struct Constants {
         static let longAnimationDuration: Double = 0.5
         static let serverRestartDelay: TimeInterval = 2.0
         static let serverHealthCheckInterval: TimeInterval = 30.0
-        static let serverStartupRetryDelay: TimeInterval = 1.0
+        static let serverStartupRetryDelay: TimeInterval = 2.0
         static let dataAccessWaitTime: TimeInterval = 2.0
     }
 
diff --git a/Tests/ClaudeUsageMonitorTests/LanguageSettingsTests.swift b/Tests/ClaudeUsageMonitorTests/LanguageSettingsTests.swift
diff --git a/Tests/ClaudeUsageMonitorTests/NotificationManagerTests.swift b/Tests/ClaudeUsageMonitorTests/NotificationManagerTests.swift
diff --git a/Tests/ClaudeUsageMonitorTests/UsageMonitorTests.swift b/Tests/ClaudeUsageMonitorTests/UsageMonitorTests.swift
diff --git a/scripts/set-debug-bundle-id.sh b/scripts/set-debug-bundle-id.sh
diff --git a/server/server.js b/server/server.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Debug configuration`
	`2`	`+PRODUCT_BUNDLE_IDENTIFIER = com.k9i.ClaudeCodeMonitor.debug`
	`3`	`+PRODUCT_NAME = ClaudeCodeMonitor-Debug`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Release configuration`
	`2`	`+PRODUCT_BUNDLE_IDENTIFIER = com.k9i.ClaudeCodeMonitor`
	`3`	`+PRODUCT_NAME = ClaudeCodeMonitor`