Skip to content

fix: 명령줄 브라우저의 실제 생성 시각으로 숨김 판단 #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmmhmmhm merged 1 commit into from
Oct 26, 2026
Merged

fix: 명령줄 브라우저의 실제 생성 시각으로 숨김 판단 #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions scripts/relay/hide-oliveyoung.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ func readinessAllowsHiding(_ value: [String: Any], launchedAt: TimeInterval, now
return true
}

// CLI로 시작한 Chrome은 NSRunningApplication.launchDate가 없을 수 있습니다.
func processLaunchTime(_ birth: String, timeZone: TimeZone = .current) -> TimeInterval? {
let formatter = DateFormatter()
formatter.locale = Locale(identifier: "en_US_POSIX")
formatter.timeZone = timeZone
formatter.dateFormat = "EEE MMM d HH:mm:ss yyyy"
return formatter.date(from: birth)?.timeIntervalSince1970
}

let base = argument("--state-base", fallback: FileManager.default.homeDirectoryForCurrentUser.appendingPathComponent("Library/Application Support/DaisoRelay"))
let runtime = argument("--runtime", fallback: base.appendingPathComponent("runtime"))
let marker = base.appendingPathComponent("state/browser-owner.json")
Expand All @@ -32,22 +41,21 @@ func safeMarkerPath() -> Bool {
return true
}

func readyForHide(_ app: NSRunningApplication) -> Bool {
func readyForHide(_ launchedAt: TimeInterval) -> Bool {
let status = base.appendingPathComponent("ops-status.json")
guard let launched = app.launchDate,
status.resolvingSymlinksInPath().path == status.path,
guard status.resolvingSymlinksInPath().path == status.path,
let attributes = try? FileManager.default.attributesOfItem(atPath: status.path),
attributes[.type] as? FileAttributeType == .typeRegular,
attributes[.ownerAccountID] as? UInt32 == getuid(),
let mode = attributes[.posixPermissions] as? UInt16, mode & 0o077 == 0,
let size = attributes[.size] as? UInt64, size <= 65536,
let data = try? Data(contentsOf: status),
let value = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return false }
return readinessAllowsHiding(value, launchedAt: launched.timeIntervalSince1970, now: Date().timeIntervalSince1970)
return readinessAllowsHiding(value, launchedAt: launchedAt, now: Date().timeIntervalSince1970)
}

// 소유 마커가 바뀌거나 검증에 실패하면 숨김을 생략한다.
func target() -> NSRunningApplication? {
func target() -> (app: NSRunningApplication, launchedAt: TimeInterval)? {
guard safeMarkerPath(), let attributes = try? FileManager.default.attributesOfItem(atPath: marker.path),
attributes[.type] as? FileAttributeType == .typeRegular,
attributes[.ownerAccountID] as? UInt32 == getuid(),
Expand Down Expand Up @@ -76,18 +84,19 @@ func target() -> NSRunningApplication? {
UInt32(fields[0]) == getuid(), Int(fields[1]) == guardPid,
fields.dropFirst(2).joined(separator: " ") == birth.split(whereSeparator: { $0.isWhitespace }).joined(separator: " "),
safeMarkerPath(), (try? Data(contentsOf: marker)) == data else { return nil }
return app
guard let launchedAt = processLaunchTime(fields.dropFirst(2).joined(separator: " ")) else { return nil }
return (app, launchedAt)
}

// 매초 확인하되 이미 숨겨진 앱에는 추가 UI 요청을 보내지 않는다.
func hideOwnedBrowser() {
guard let app = target(), !app.isHidden, readyForHide(app) else { return }
_ = app.hide()
guard let owned = target(), !owned.app.isHidden, readyForHide(owned.launchedAt) else { return }
_ = owned.app.hide()
}

if CommandLine.arguments.contains("--check") {
if let app = target() {
print("owned=true hidden=\(app.isHidden) pid=\(app.processIdentifier) readyToHide=\(readyForHide(app))")
if let owned = target() {
print("owned=true hidden=\(owned.app.isHidden) pid=\(owned.app.processIdentifier) readyToHide=\(readyForHide(owned.launchedAt))")
} else {
print("owned=false")
exit(1)
Expand Down
9 changes: 9 additions & 0 deletions tests/scripts/hide-readiness.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ it.skipIf(process.platform !== 'darwin')(
);
const output = execFileSync('/usr/bin/swift', [script, data], { encoding: 'utf8' });
expect(output.trim().split('\n')).toEqual(['true', ...Array(9).fill('false')]);
writeFileSync(
script,
'import Foundation\n' +
implementation +
'\nprint(processLaunchTime("Mon Oct 26 00:53:22 2026", timeZone:TimeZone(secondsFromGMT:0)!) == 1792976002)\nprint(processLaunchTime("invalid") == nil)\n',
);
expect(execFileSync('/usr/bin/swift', [script], { encoding: 'utf8' }).trim()).toBe(
'true\ntrue',
);
} finally {
rmSync(directory, { recursive: true, force: true });
}
Expand Down
Loading