Merge pull request #34 from K9i-0/feature/bundled-node-server

K9i-0 · web-flow · commit 2ed51a161f66 · 2025-06-28T18:06:36.000+09:00
feat: バンドル内Node.jsでサーバーを自動起動
diff --git a/Sources/ClaudeUsageMonitor/AppDelegate.swift b/Sources/ClaudeUsageMonitor/AppDelegate.swift
@@ -10,6 +10,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
     private var usageMonitor: UsageMonitor!
     
     func applicationDidFinishLaunching(_ notification: Notification) {
+        // Start the local server first
+        ServerManager.shared.checkAndStartServer()
+        
         usageMonitor = UsageMonitor()
         
         // 通知機能は初回リリースでは無効化
diff --git a/Sources/ClaudeUsageMonitor/ServerManager.swift b/Sources/ClaudeUsageMonitor/ServerManager.swift
@@ -45,33 +45,53 @@ class ServerManager: ObservableObject {
     private func startServer() {
         print("[ServerManager] Attempting to start server")
         
-        // Find the server directory
-        let appPath = Bundle.main.bundlePath
-        let serverPath = (appPath as NSString).deletingLastPathComponent
-            .appending("/server")
+        // First, try to find server in the app bundle (production)
+        var serverPath: String?
+        if let bundledServerPath = Bundle.main.path(forResource: "server", ofType: nil) {
+            serverPath = bundledServerPath
+            print("[ServerManager] Using bundled server at: \(bundledServerPath)")
+        } else {
+            // Fallback to development location
+            let appPath = Bundle.main.bundlePath
+            let devServerPath = (appPath as NSString).deletingLastPathComponent
+                .appending("/server")
+            if FileManager.default.fileExists(atPath: devServerPath) {
+                serverPath = devServerPath
+                print("[ServerManager] Using development server at: \(devServerPath)")
+            }
+        }
         
         // Check if server directory exists
-        guard FileManager.default.fileExists(atPath: serverPath) else {
-            print("[ServerManager] Server directory not found at: \(serverPath)")
+        guard let validServerPath = serverPath else {
+            print("[ServerManager] Server directory not found")
             return
         }
         
         // Create process to start server
         let process = Process()
         
-        // Find node/npm
-        let nodePaths = [
-            "/Users/\(NSUserName())/.local/share/mise/shims/node",
-            "/opt/homebrew/bin/node",
-            "/usr/local/bin/node"
-        ]
-        
+        // Find Node.js
         var nodePath: String?
-        for path in nodePaths {
-            let expandedPath = (path as NSString).expandingTildeInPath
-            if FileManager.default.fileExists(atPath: expandedPath) {
-                nodePath = expandedPath
-                break
+        
+        // First, try to use bundled Node.js (production)
+        if let bundledNodePath = Bundle.main.path(forResource: "node/node", ofType: nil) {
+            nodePath = bundledNodePath
+            print("[ServerManager] Using bundled Node.js at: \(bundledNodePath)")
+        } else {
+            // Fallback to system Node.js (development)
+            let systemNodePaths = [
+                "/Users/\(NSUserName())/.local/share/mise/shims/node",
+                "/opt/homebrew/bin/node",
+                "/usr/local/bin/node"
+            ]
+            
+            for path in systemNodePaths {
+                let expandedPath = (path as NSString).expandingTildeInPath
+                if FileManager.default.fileExists(atPath: expandedPath) {
+                    nodePath = expandedPath
+                    print("[ServerManager] Using system Node.js at: \(expandedPath)")
+                    break
+                }
             }
         }
         
@@ -81,8 +101,9 @@ class ServerManager: ObservableObject {
         }
         
         process.executableURL = URL(fileURLWithPath: node)
-        process.arguments = ["server.js"]
-        process.currentDirectoryURL = URL(fileURLWithPath: serverPath)
+        // Use server-fixed.js as specified in package.json
+        process.arguments = ["server-fixed.js"]
+        process.currentDirectoryURL = URL(fileURLWithPath: validServerPath)
         
         // Set up environment
         var environment = ProcessInfo.processInfo.environment
diff --git a/Sources/ClaudeUsageMonitor/UsageMonitor.swift b/Sources/ClaudeUsageMonitor/UsageMonitor.swift
@@ -134,87 +134,6 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
             return
         }
         
-        // App Sandbox prevents direct command execution
-        // The following code only works when App Sandbox is disabled
-        guard ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] == nil else {
-            print("[DEBUG] App Sandbox is enabled - cannot execute external commands")
-            return
-        }
-        
-        // Fallback to npx command (only when App Sandbox is disabled)
-        print("[DEBUG] App Sandbox is disabled - falling back to npx command")
-        do {
-            let process = Process()
-            
-            // Try to use the same npx detection as in fetchSessionData
-            let npxSearchPaths = [
-                "/Users/\(NSUserName())/.local/share/mise/shims/npx",
-                "/opt/homebrew/bin/npx",
-                "/usr/local/bin/npx"
-            ]
-            
-            var foundNpx = false
-            for path in npxSearchPaths {
-                let expandedPath = (path as NSString).expandingTildeInPath
-                if FileManager.default.fileExists(atPath: expandedPath) {
-                    process.executableURL = URL(fileURLWithPath: expandedPath)
-                    process.arguments = ["ccusage@latest", "--json"]
-                    foundNpx = true
-                    print("[DEBUG] Using npx at: \(expandedPath)")
-                    break
-                }
-            }
-            
-            if !foundNpx {
-                // Use shell with extended PATH
-                process.executableURL = URL(fileURLWithPath: "/bin/zsh")
-                process.arguments = ["-l", "-c", 
-                    "export PATH=\"$HOME/.local/share/mise/shims:/opt/homebrew/bin:/usr/local/bin:$PATH\" && npx ccusage@latest --json"]
-                print("[DEBUG] Using shell with extended PATH for daily data")
-            }
-            
-            let pipe = Pipe()
-            let errorPipe = Pipe()
-            process.standardOutput = pipe
-            process.standardError = errorPipe
-            
-            try process.run()
-            process.waitUntilExit()
-            
-            // Check for errors
-            let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
-            if !errorData.isEmpty {
-                let errorString = String(data: errorData, encoding: .utf8) ?? "Unknown error"
-                print("ccusage error: \(errorString)")
-            }
-            
-            let data = pipe.fileHandleForReading.readDataToEndOfFile()
-            if !data.isEmpty {
-                let response = try JSONDecoder().decode(CcusageResponse.self, from: data)
-                // Get today's date in YYYY-MM-DD format
-                let formatter = DateFormatter()
-                formatter.dateFormat = "yyyy-MM-dd"
-                let today = formatter.string(from: Date())
-                
-                // Find today's usage from the array
-                if let todayData = response.daily.first(where: { $0.date == today }) {
-                    usageData.todayUsage = todayData
-                    print("[DEBUG] Today's totalTokens: \(todayData.totalTokens) (billable: \(todayData.inputTokens + todayData.outputTokens))")
-                } else {
-                    // If no data for today, create empty data
-                    usageData.todayUsage = nil
-                }
-                
-                // Store monthly total
-                usageData.monthlyTotal = response.totals
-                print("[DEBUG] Monthly totalTokens: \(response.totals.totalTokens) (billable: \(response.totals.inputTokens + response.totals.outputTokens))")
-                usageData.lastUpdated = Date()
-            }
-        } catch {
-            self.error = ClaudeMonitorError.unknownError("Failed to fetch usage data: \(error.localizedDescription)")
-            print("Error details: \(error)")
-        }
-        
         isLoading = false
     }
     
@@ -297,132 +216,6 @@ class UsageMonitor: ObservableObject, UsageMonitoring {
             print("[DEBUG] Server connection failed: \(error.localizedDescription)")
             self.error = ClaudeMonitorError.networkError(L10n.Error.serverNotRunning)
         }
-        
-        // App Sandbox prevents direct command execution
-        guard ProcessInfo.processInfo.environment["APP_SANDBOX_CONTAINER_ID"] == nil else {
-            print("[DEBUG] App Sandbox is enabled - cannot execute external commands")
-            return
-        }
-        
-        // Fallback: Try multiple methods to run ccusage (only when App Sandbox is disabled)
-        print("[DEBUG] App Sandbox is disabled - falling back to direct ccusage execution")
-        
-        // Method 1: Try to find npx in common locations
-        let npxSearchPaths = [
-            "/Users/\(NSUserName())/.local/share/mise/shims/npx",
-            "/opt/homebrew/bin/npx",
-            "/usr/local/bin/npx",
-            "/Users/\(NSUserName())/.nvm/default/bin/npx",
-            "/Users/\(NSUserName())/.volta/bin/npx"
-        ]
-        
-        var npxPath: String? = nil
-        for path in npxSearchPaths {
-            let expandedPath = (path as NSString).expandingTildeInPath
-            if FileManager.default.fileExists(atPath: expandedPath) {
-                npxPath = expandedPath
-                print("[DEBUG] Found npx at: \(expandedPath)")
-                break
-            }
-        }
-        
-        // Method 2: Use which command to find npx
-        if npxPath == nil {
-            let whichProcess = Process()
-            whichProcess.executableURL = URL(fileURLWithPath: "/usr/bin/which")
-            whichProcess.arguments = ["npx"]
-            let whichPipe = Pipe()
-            whichProcess.standardOutput = whichPipe
-            whichProcess.standardError = Pipe()
-            
-            do {
-                try whichProcess.run()
-                whichProcess.waitUntilExit()
-                
-                let data = whichPipe.fileHandleForReading.readDataToEndOfFile()
-                if let output = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines),
-                   !output.isEmpty {
-                    npxPath = output
-                    print("[DEBUG] Found npx via which: \(output)")
-                }
-            } catch {
-                print("[DEBUG] which command failed: \(error)")
-            }
-        }
-        
-        // Method 3: Try with full shell initialization
-        do {
-            let process = Process()
-            
-            if let npxPath = npxPath {
-                // Use found npx directly
-                process.executableURL = URL(fileURLWithPath: npxPath)
-                process.arguments = ["ccusage", "blocks", "--active", "--json"]
-                print("[DEBUG] Using direct npx: \(npxPath)")
-            } else {
-                // Last resort: use shell with full environment
-                process.executableURL = URL(fileURLWithPath: "/bin/zsh")
-                process.arguments = ["-l", "-c", 
-                    "export PATH=\"$HOME/.local/share/mise/shims:$HOME/.volta/bin:/opt/homebrew/bin:/usr/local/bin:$PATH\" && npx ccusage blocks --active --json"]
-                print("[DEBUG] Using shell with extended PATH")
-            }
-            
-            let pipe = Pipe()
-            let errorPipe = Pipe()
-            process.standardOutput = pipe
-            process.standardError = errorPipe
-            
-            try process.run()
-            process.waitUntilExit()
-            
-            // Check for errors
-            let errorData = errorPipe.fileHandleForReading.readDataToEndOfFile()
-            if !errorData.isEmpty {
-                let errorString = String(data: errorData, encoding: .utf8) ?? "Unknown error"
-                print("[DEBUG] ccusage stderr: \(errorString)")
-            }
-            
-            let data = pipe.fileHandleForReading.readDataToEndOfFile()
-            if !data.isEmpty {
-                if let jsonString = String(data: data, encoding: .utf8) {
-                    print("[DEBUG] ccusage output length: \(jsonString.count) characters")
-                }
-                
-                let blocksResponse = try JSONDecoder().decode(BlocksResponse.self, from: data)
-                
-                // 過去のセッションから最大トークン使用量を検出
-                var maxTokens = 0
-                for block in blocksResponse.blocks {
-                    if !block.isGap && block.totalTokens > maxTokens {
-                        maxTokens = block.totalTokens
-                    }
-                }
-                usageData.historicalMaxTokens = maxTokens
-                
-                // プランタイプを自動判定して保存
-                if maxTokens > UsageData.max5SessionTokenLimit {
-                    updateDetectedPlan("Max20")
-                } else if maxTokens > UsageData.proSessionTokenLimit {
-                    updateDetectedPlan("Max5")
-                } else {
-                    if usageData.detectedPlanType == nil {
-                        updateDetectedPlan("Pro")
-                    }
-                }
-                
-                if let activeBlock = blocksResponse.blocks.first(where: { $0.isActive }) {
-                    usageData.activeSession = activeBlock
-                    print("[DEBUG] Session data loaded via fallback")
-                    print("[DEBUG] Historical max tokens: \(maxTokens)")
-                    print("[DEBUG] Detected plan: \(usageData.detectedPlan)")
-                }
-            } else {
-                print("[DEBUG] No data from ccusage command")
-            }
-        } catch {
-            print("[DEBUG] All fallback methods failed: \(error)")
-            print("[DEBUG] Error details: \(error.localizedDescription)")
-        }
     }
     
     func formatTokens(_ tokens: Int) -> String {
diff --git a/node.entitlements b/node.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+</dict>
+</plist>
diff --git a/scripts/create-app-bundle.sh b/scripts/create-app-bundle.sh
