Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

fix: 阻止直接执行二进制启动重复实例

Bobc6c773cb1806
diff --git a/CodexBar/App/CodexBarApp.swift b/CodexBar/App/CodexBarApp.swift
index 064ae65..9048213 100644
--- a/CodexBar/App/CodexBarApp.swift
+++ b/CodexBar/App/CodexBarApp.swift
@@ -1,11 +1,32 @@
import AppKit
+import Darwin
+import os
import SwiftUI
// 测试时禁用应用入口
#if !CODEXBAR_TESTING
@main
#endif
-/// 应用入口
+nonisolated enum CodexBarMain {
+ static func main() {
+ do {
+ // 在 SwiftUI 创建 AppDelegate 前互斥, 避免重复实例初始化服务
+ guard let descriptor = try JSONFileStorage.acquireLock(
+ in: AppStorage.directoryURL(), name: "app.lock", nonblocking: true
+ ) else { return }
+ defer { JSONFileStorage.releaseLock(descriptor) }
+
+ // 同步进程入口位于主线程, 取得锁后才进入 SwiftUI 生命周期
+ MainActor.assumeIsolated {
+ CodexBarApp.main()
+ }
+ } catch {
+ AppLog.app.error("App 实例锁获取失败")
+ exit(EXIT_FAILURE)
+ }
+ }
+}
+
struct CodexBarApp: App {
@NSApplicationDelegateAdaptor(CodexBarAppDelegate.self) private var appDelegate
diff --git a/CodexBar/Services/Support/JSONFileStorage.swift b/CodexBar/Services/Support/JSONFileStorage.swift
index 2744aff..4306363 100644
--- a/CodexBar/Services/Support/JSONFileStorage.swift
+++ b/CodexBar/Services/Support/JSONFileStorage.swift
@@ -11,7 +11,7 @@ nonisolated enum JSONFileStorage {
static func acquireLock(in directory: URL, name: String = "store.lock", nonblocking: Bool = false) throws -> Int32? {
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
// 原子创建并打开锁文件, 避免替换其他进程已锁定的 inode
- let descriptor = open(directory.appendingPathComponent(name).path, O_RDWR | O_CREAT, 0o600)
+ let descriptor = open(directory.appendingPathComponent(name).path, O_RDWR | O_CREAT | O_CLOEXEC, 0o600)
guard descriptor >= 0 else { throw POSIXError(POSIXErrorCode(rawValue: errno) ?? .EIO) }
guard flock(descriptor, LOCK_EX | (nonblocking ? LOCK_NB : 0)) == 0 else {
let code = errno
diff --git a/Tests/App/History/TokenUsageHistoryTests.swift b/Tests/App/History/TokenUsageHistoryTests.swift
index 86f0776..f87dce3 100644
--- a/Tests/App/History/TokenUsageHistoryTests.swift
+++ b/Tests/App/History/TokenUsageHistoryTests.swift
@@ -37,21 +37,6 @@ struct TokenUsageHistoryTests {
#expect(try second.load() == ["cursor": 3])
}
- @Test func sharedSyncLockExcludesConcurrentWritersWithoutBlockingCacheReads() throws {
- let directory = try TestDirectory()
- defer { try? directory.remove() }
- let first = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))
- let competing = try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true)
- #expect(competing == nil)
- if let competing {
- JSONFileStorage.releaseLock(competing)
- }
- try JSONFileStorage.withLock(in: directory.url) {}
- JSONFileStorage.releaseLock(first)
- let next = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))
- JSONFileStorage.releaseLock(next)
- }
-
@Test func heatmapSeparatesAccountIntensityFromLocalDailyMetrics() throws {
var history = HistorySnapshot.empty
history.tokenUsageByDate = [day: tokenUsage(input: 100)]
diff --git a/Tests/App/Support/JSONFileStorageTests.swift b/Tests/App/Support/JSONFileStorageTests.swift
new file mode 100644
index 0000000..fb5f612
--- /dev/null
+++ b/Tests/App/Support/JSONFileStorageTests.swift
@@ -0,0 +1,60 @@
+import Darwin
+import Foundation
+import Testing
+
+struct JSONFileStorageTests {
+ @Test nonisolated func nonblockingLockRejectsAnotherOwnerAndCanBeReacquired() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+
+ do {
+ let descriptor = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))
+ defer { JSONFileStorage.releaseLock(descriptor) }
+
+ let started = ContinuousClock.now
+ let duplicate = try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true)
+ defer {
+ if let duplicate {
+ JSONFileStorage.releaseLock(duplicate)
+ }
+ }
+ #expect(duplicate == nil)
+ #expect(started.duration(to: .now) < .seconds(1))
+ try JSONFileStorage.withLock(in: directory.url) {}
+ }
+
+ let replacement = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))
+ JSONFileStorage.releaseLock(replacement)
+ }
+
+ @Test nonisolated func lockDoesNotSurviveExec() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let descriptor = try #require(try JSONFileStorage.acquireLock(in: directory.url, nonblocking: true))
+ defer { JSONFileStorage.releaseLock(descriptor) }
+
+ let flags = fcntl(descriptor, F_GETFD)
+ #expect(flags >= 0)
+ #expect(flags & FD_CLOEXEC != 0)
+ }
+
+ @Test nonisolated func independentDirectoriesDoNotBlockEachOther() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+
+ let first = try #require(try JSONFileStorage.acquireLock(in: directory.url.appendingPathComponent("first"), nonblocking: true))
+ defer { JSONFileStorage.releaseLock(first) }
+ let second = try #require(try JSONFileStorage.acquireLock(in: directory.url.appendingPathComponent("second"), nonblocking: true))
+ defer { JSONFileStorage.releaseLock(second) }
+ }
+
+ @Test nonisolated func storageFailureIsDistinctFromLockContention() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let fileURL = try directory.write(Data(), to: "file")
+
+ #expect(throws: (any Error).self) {
+ try JSONFileStorage.acquireLock(in: fileURL, nonblocking: true)
+ }
+ }
+}