5247b42 · parseable-macos

ParseableViewer/App/AppState.swift+5

compare with master

unifiedsplit

@@ -113,6 +113,11 @@ final class AppState {

113 if activeConnection?.id != connection.id {

114 selectedStream = nil

115 streamLoadError = nil

116+ // Reset the sidebar search filter and tab too: a stale filter would

117+ // silently hide the new server's streams, and a stream-specific tab

118+ // would have no valid selection behind it.

119+ streamSearchText = ""

120+ currentTab = .query

116 }

121 }

117

122

118 do {

123 do {

ParseableViewer/Models/JSONValue.swift+5−1

@@ -272,7 +272,11 @@ enum JSONValue: Codable, Hashable, Sendable, Comparable {

272 case (.null, .null): return true

273 case (.bool(let a), .bool(let b)): return a == b

274 case (.int(let a), .int(let b)): return a == b

275+ // NaN must compare equal to itself here: `<` (via doubleLessThan) orders

276+ // two NaNs as equivalent, and Comparable requires order-equivalent values

277+ // to be ==. Raw `a == b` (NaN != NaN) would break reflexivity, so e.g.

278+ // `.array([.double(.nan)])` would not equal itself.

275− case (.double(let a), .double(let b)): return a == b

279+ case (.double(let a), .double(let b)): return a == b || (a.isNaN && b.isNaN)

276 case (.int(let a), .double(let b)): return Self.intEqualsDouble(a, b)

280 case (.int(let a), .double(let b)): return Self.intEqualsDouble(a, b)

277 case (.double(let a), .int(let b)): return Self.intEqualsDouble(b, a)

281 case (.double(let a), .int(let b)): return Self.intEqualsDouble(b, a)

278 case (.string(let a), .string(let b)): return a == b

282 case (.string(let a), .string(let b)): return a == b

ParseableViewer/Services/ParseableClient.swift+19−3

@@ -322,13 +322,29 @@ final class ParseableClient: Sendable {

322 // a 405, or a 200 carrying a differently-shaped body (a DecodingError,

323 // which is not a ParseableError and would otherwise escape this method).

324 let encoded = try Self.encodePathComponent(stream)

325+

326+ func legacyAlerts() async throws -> AlertConfig {

327+ let data = try await performRequest(method: "GET", path: "/api/v1/logstream/\(encoded)/alert")

328+ return try Self.jsonDecoder.decode(AlertConfig.self, from: data)

329+ }

330+

325 do {

331 do {

326 let data = try await performRequest(method: "GET", path: "/api/v1/alerts")

332 let data = try await performRequest(method: "GET", path: "/api/v1/alerts")

327− return try Self.jsonDecoder.decode(AlertConfig.self, from: data)

333+ let config = try Self.jsonDecoder.decode(AlertConfig.self, from: data)

334+ // AlertConfig decodes leniently (every field via try?), so a 200 with

335+ // an unexpected body yields an empty, non-throwing config rather than

336+ // a DecodingError. Treat an empty result as "new endpoint unsupported"

337+ // and fall through to the legacy per-stream endpoint instead of

338+ // silently reporting no alerts.

339+ if config.alerts?.isEmpty ?? true {

340+ if let legacy = try? await legacyAlerts(), !(legacy.alerts?.isEmpty ?? true) {

341+ return legacy

342+ }

343+ }

344+ return config

328 } catch let newEndpointError {

345 } catch let newEndpointError {

329 do {

346 do {

330− let data = try await performRequest(method: "GET", path: "/api/v1/logstream/\(encoded)/alert")

347+ return try await legacyAlerts()

331− return try Self.jsonDecoder.decode(AlertConfig.self, from: data)

332 } catch {

348 } catch {

333 // Legacy also failed — surface the original (more informative) error.

349 // Legacy also failed — surface the original (more informative) error.

334 throw newEndpointError

350 throw newEndpointError

ParseableViewer/ViewModels/LiveTailViewModel.swift+18−2

@@ -28,6 +28,12 @@ final class LiveTailViewModel {

28 nonisolated(unsafe) private var timer: Timer?

29 private var lastTimestamp: Date?

30 private var seenFingerprints: Set<String> = []

31+ /// Upper bound on the dedup fingerprint set. Kept well above `maxEntries` so

32+ /// fingerprints of recently-evicted entries survive long enough to suppress

33+ /// duplicates that reappear inside the next poll's look-back window, while

34+ /// still bounding memory. Only when this is exceeded do we fall back to the

35+ /// retained-entry fingerprints.

36+ private var maxSeenFingerprints: Int { maxEntries * 4 }

31 private var allKnownKeys: Set<String> = []

37 private var allKnownKeys: Set<String> = []

32 private var consecutiveErrors = 0

38 private var consecutiveErrors = 0

33 private static let maxConsecutiveErrors = 5

39 private static let maxConsecutiveErrors = 5

@@ -372,8 +378,18 @@ final class LiveTailViewModel {

372 entries.sort { $0.timestamp < $1.timestamp }

378 entries.sort { $0.timestamp < $1.timestamp }

373 entries = Array(entries.suffix(maxEntries))

379 entries = Array(entries.suffix(maxEntries))

374

380

375− // Rebuild fingerprint set from stored values (no re-hashing)

381+ // Do NOT rebuild the fingerprint set from the retained

382+ // entries: an evicted record can still fall inside the next

383+ // poll's look-back window, and dropping its fingerprint here

384+ // would let it pass the dedup check and be re-appended as a

385+ // duplicate. Keep the full seen-set so dedup stays correct;

386+ // it is bounded below to avoid unbounded growth.

387+ if seenFingerprints.count > maxSeenFingerprints {

388+ // Retain the fingerprints of everything still buffered

389+ // (those are the ones that matter for dedup) and discard

390+ // the older surplus.

376− seenFingerprints = Set(entries.map { $0.fingerprint })

391+ seenFingerprints = Set(entries.map { $0.fingerprint })

392+ }

377 }

393 }

378

394

379 // Only scan new records for new keys

395 // Only scan new records for new keys

ParseableViewer/ViewModels/QueryViewModel.swift+11

@@ -525,6 +525,17 @@ final class QueryViewModel {

525 }

526

527 func clearResults() {

528+ // Cancel any in-flight work first. Without this, a query still running

529+ // when the user switches streams or disconnects would pass its post-await

530+ // cancellation check (it was never cancelled) and write its results +

531+ // persist a column config for the *old* stream after this reset.

532+ queryTask?.cancel()

533+ queryTask = nil

534+ searchTextTask?.cancel()

535+ searchTextTask = nil

536+ filterTask?.cancel()

537+ filterTask = nil

538+

528 results = []

539 results = []

529 columns = []

540 columns = []

530 columnOrder = []

541 columnOrder = []

ParseableViewer/Views/ConnectionSheet.swift+4

@@ -135,6 +135,10 @@ struct ConnectionSheet: View {

135 username = connection.username

136 password = connection.password

137 }

138+ // Validate the pre-filled URL on open. onChange(of:url) doesn't fire

139+ // for the initial assignment above, so without this an invalid stored

140+ // URL would show no error and pass the Save guard.

141+ urlValidationError = Self.validateURL(url)

138 }

142 }

139 }

143 }

140

144

ParseableViewer/Views/LiveTailView.swift+18−12

@@ -3,7 +3,10 @@ import SwiftUI

3struct LiveTailView: View {

4 @Environment(AppState.self) private var appState

5 @State private var viewModel = LiveTailViewModel()

6+ /// Selection is tracked by entry id, not by record value: live-tail rows

7+ /// frequently share identical content (repeated log lines), so comparing by

8+ /// record value would select/toggle every matching row at once.

6− @State private var selectedRecord: LogRecord?

9+ @State private var selectedEntryID: UUID?

7 @State private var autoScroll = true

10 @State private var autoScroll = true

8 @State private var pulseOpacity: Double = 1.0

11 @State private var pulseOpacity: Double = 1.0

9 @State private var showColumnPopover = false

12 @State private var showColumnPopover = false

@@ -112,7 +115,7 @@ struct LiveTailView: View {

112

115

113 Button {

116 Button {

114 viewModel.clear()

117 viewModel.clear()

115− selectedRecord = nil

118+ selectedEntryID = nil

116 sortColumn = nil

119 sortColumn = nil

117 columnWidths = [:]

120 columnWidths = [:]

118 cachedSorted = []

121 cachedSorted = []

@@ -250,8 +253,9 @@ struct LiveTailView: View {

250 .frame(minWidth: 400)

253 .frame(minWidth: 400)

251

254

252 // Detail pane

255 // Detail pane

253− if let record = selectedRecord {

256+ if let id = selectedEntryID,

257+ let entry = cachedSorted.first(where: { $0.id == id }) {

254− LogDetailView(record: record)

258+ LogDetailView(record: entry.record)

255 .frame(minWidth: 280, idealWidth: 320)

259 .frame(minWidth: 280, idealWidth: 320)

256 }

260 }

257 }

261 }

@@ -263,7 +267,7 @@ struct LiveTailView: View {

263 viewModel.stop()

267 viewModel.stop()

264 }

268 }

265 viewModel.clear()

269 viewModel.clear()

266− selectedRecord = nil

270+ selectedEntryID = nil

267 sortColumn = nil

271 sortColumn = nil

268 columnWidths = [:]

272 columnWidths = [:]

269 cachedSorted = []

273 cachedSorted = []

@@ -337,7 +341,7 @@ struct LiveTailView: View {

337 record: entry.record,

341 record: entry.record,

338 columns: viewModel.visibleColumns,

342 columns: viewModel.visibleColumns,

339 columnWidths: columnWidths,

343 columnWidths: columnWidths,

340− isSelected: selectedRecord == entry.record,

344+ isSelected: selectedEntryID == entry.id,

341 isAlternate: index % 2 == 1,

345 isAlternate: index % 2 == 1,

342 severity: severityByID[entry.id] ?? .unknown,

346 severity: severityByID[entry.id] ?? .unknown,

343 severityColumns: severityColumnSet,

347 severityColumns: severityColumnSet,

@@ -347,10 +351,10 @@ struct LiveTailView: View {

347 }

351 }

348 )

352 )

349 .onTapGesture {

353 .onTapGesture {

350− if selectedRecord == entry.record {

354+ if selectedEntryID == entry.id {

351− selectedRecord = nil

355+ selectedEntryID = nil

352 } else {

356 } else {

353− selectedRecord = entry.record

357+ selectedEntryID = entry.id

354 }

358 }

355 }

359 }

356 }

360 }

@@ -381,9 +385,11 @@ struct LiveTailView: View {

381 rebuildSortedEntries()

385 rebuildSortedEntries()

382 }

386 }

383 // Scroll when the rendered list (`cachedSorted`) changes, targeting

387 // Scroll when the rendered list (`cachedSorted`) changes, targeting

384− // its last element. Keying off `entries.count` could fire before the

388+ // its last element. Key off the last element's id rather than the

385− // rebuild, scrolling to an id not yet present (a silent no-op).

389+ // count: once the buffer is pinned at `maxEntries`, the count stops

390+ // changing while new rows keep arriving, so a count-based trigger

391+ // would silently stall auto-scroll.

386− .onChange(of: cachedSorted.count) { _, _ in

392+ .onChange(of: cachedSorted.last?.id) { _, _ in

387 guard autoScroll, sortColumn == nil else { return }

393 guard autoScroll, sortColumn == nil else { return }

388 if let target = cachedSorted.last {

394 if let target = cachedSorted.last {

389 proxy.scrollTo(target.id, anchor: .bottom)

395 proxy.scrollTo(target.id, anchor: .bottom)

ParseableViewer/Views/LogTableView.swift+19−2

@@ -139,12 +139,19 @@ func parseOTelSeverityNumber(_ num: Int) -> SeverityLevel {

139

140/// Extracts the severity level from a log record by checking only known severity columns.

141func extractSeverity(from record: LogRecord, severityColumns: Set<String>) -> SeverityLevel {

142+ // Iterate in a deterministic (sorted) order so that, when a record carries

143+ // more than one severity-like column with conflicting values, the "winning"

144+ // column is stable across runs rather than dependent on Set iteration order.

142− for col in severityColumns {

145+ for col in severityColumns.sorted() {

143 guard let value = record[col] else { continue }

146 guard let value = record[col] else { continue }

144 let str: String

147 let str: String

145 switch value {

148 switch value {

146 case .string(let s): str = s

149 case .string(let s): str = s

147 case .int(let i): str = String(i)

150 case .int(let i): str = String(i)

151+ // Numeric severities (e.g. OTel severity_number) sometimes decode as a

152+ // double; stringify the integral value so they still parse.

153+ case .double(let d) where d == d.rounded() && abs(d) < 1e15:

154+ str = String(format: "%.0f", d)

148 default: continue

155 default: continue

149 }

156 }

150 // OpenTelemetry severity columns use a 1–24 scale that collides with

157 // OpenTelemetry severity columns use a 1–24 scale that collides with

@@ -297,6 +304,13 @@ struct LogTableView: View {

297 // their natural order.

304 // their natural order.

298 if let sortColumn, !newColumns.contains(sortColumn) {

305 if let sortColumn, !newColumns.contains(sortColumn) {

299 self.sortColumn = nil

306 self.sortColumn = nil

307+ // The sortColumn change triggers its own rebuild below.

308+ } else {

309+ // Columns changed without dropping the sort column (e.g.

310+ // hiding/showing a severity column via the Column Manager).

311+ // Rebuild so the severity column set — and therefore row

312+ // tinting — reflects the new columns.

313+ debouncedRebuildSort()

300 }

314 }

301 }

315 }

302 .onChange(of: sortColumn) { _, _ in debouncedRebuildSort() }

316 .onChange(of: sortColumn) { _, _ in debouncedRebuildSort() }

@@ -674,7 +688,10 @@ struct LogRowView: View {

674 .foregroundStyle(colorForValue(column: column, value: value))

688 .foregroundStyle(colorForValue(column: column, value: value))

675 .contextMenu {

689 .contextMenu {

676 Button("Copy Value") {

690 Button("Copy Value") {

691+ // Use exportString, not displayString: the latter

692+ // renders nested arrays/objects as placeholders like

693+ // "[3 items]", so copying would lose the real data.

677− let text = value?.displayString ?? ""

694+ let text = value?.exportString ?? ""

678 NSPasteboard.general.clearContents()

695 NSPasteboard.general.clearContents()

679 _ = NSPasteboard.general.setString(text, forType: .string)

696 _ = NSPasteboard.general.setString(text, forType: .string)

680 }

697 }

ParseableViewer/Views/SQLEditorView.swift+7

@@ -147,6 +147,13 @@ struct SQLEditorView: NSViewRepresentable {

147 // MARK: - Completions

148

149 private func updateCompletions(for textView: NSTextView) {

150+ // Capture the text view that the popup is being presented for. The

151+ // popup's accept handler (e.g. a double-click in the borderless popup

152+ // window) doesn't necessarily route through the begin-editing /

153+ // selection-change delegate callbacks first, so relying on those

154+ // alone to record the target can drop an accepted completion.

155+ lastTextView = textView

156+

150 let cursorPosition = textView.selectedRange().location

157 let cursorPosition = textView.selectedRange().location

151 let result = SQLCompletionProvider.completions(

158 let result = SQLCompletionProvider.completions(

152 for: textView.string,

159 for: textView.string,

ParseableViewer/Views/SidebarView.swift+4

@@ -280,6 +280,10 @@ struct FilterRow: View {

280

281 var body: some View {

282 Button {

283+ // Don't navigate to a stream that no longer exists: it would drive

284+ // detail views to query a deleted stream (surfacing 404s) and leave

285+ // the sidebar selection pointing at no row.

286+ guard streamExists else { return }

283 appState.selectedStream = filter.streamName

287 appState.selectedStream = filter.streamName

284 if let sql = filter.query.filterQuery {

288 if let sql = filter.query.filterQuery {

285 appState.pendingFilterSQL = sql

289 appState.pendingFilterSQL = sql