let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mac): encode gateway params with protocol AnyCodable

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-09 19:10:19 +00:00
parent c683ae69af
commit 6ae4c49c1a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/macos/Sources/Clawdis/GatewayChannel.swift
View File

@@ -9,6 +9,9 @@ struct GatewayEvent: Codable {
let seq: Int? let seq: Int?
} }
// Avoid ambiguity with the app's own AnyCodable type.
private typealias ProtoAnyCodable = ClawdisProtocol.AnyCodable
extension Notification.Name { extension Notification.Name {
static let gatewaySnapshot = Notification.Name("clawdis.gateway.snapshot") static let gatewaySnapshot = Notification.Name("clawdis.gateway.snapshot")
static let gatewayEvent = Notification.Name("clawdis.gateway.event") static let gatewayEvent = Notification.Name("clawdis.gateway.event")
@@ -203,14 +206,17 @@ private actor GatewayChannelActor {
} }
let id = UUID().uuidString let id = UUID().uuidString
// Encode request using the generated models to avoid JSONSerialization/ObjC bridging pitfalls. // Encode request using the generated models to avoid JSONSerialization/ObjC bridging pitfalls.
let paramsObject = params?.reduce(into: [String: AnyCodable]()) { dict, entry in let paramsObject: ProtoAnyCodable? = params.map { entries in
dict[entry.key] = entry.value let dict = entries.reduce(into: [String: ProtoAnyCodable]()) { dict, entry in
dict[entry.key] = ProtoAnyCodable(entry.value.value)
}
return ProtoAnyCodable(dict)
} }
let frame = RequestFrame( let frame = RequestFrame(
type: "req", type: "req",
id: id, id: id,
method: method, method: method,
params: paramsObject.map { AnyCodable($0) }) params: paramsObject)
let data = try self.encoder.encode(frame) let data = try self.encoder.encode(frame)
let response = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<GatewayFrame, Error>) in let response = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<GatewayFrame, Error>) in
self.pending[id] = cont self.pending[id] = cont