github/openclaw
1
1
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-02-19 18:39:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): harden share relay routing and delivery guards

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-17 23:47:34 +01:00
parent 442b45e54e
commit b98b113b88
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/ios/ShareExtension/ShareViewController.swift
View File

@@ -203,8 +203,7 @@ final class ShareViewController: UIViewController {
message: "share extension does not support node invoke"))
})
} catch {
let text = error.localizedDescription.lowercased()
let expectsLegacyClientId = text.contains("invalid connect params") && text.contains("/client/id")
let expectsLegacyClientId = self.shouldRetryWithLegacyClientId(error)
guard expectsLegacyClientId else { throw error }
try await gateway.connect(
url: url,
@@ -238,16 +237,20 @@ final class ShareViewController: UIViewController {
var key: String?
}
let deliveryChannel = config.deliveryChannel?.trimmingCharacters(in: .whitespacesAndNewlines)
let deliveryTo = config.deliveryTo?.trimmingCharacters(in: .whitespacesAndNewlines)
let canDeliverToRoute = (deliveryChannel?.isEmpty == false) && (deliveryTo?.isEmpty == false)
let params = AgentRequestPayload(
message: message,
sessionKey: config.sessionKey,
thinking: "low",
deliver: true,
deliver: canDeliverToRoute,
attachments: attachments.isEmpty ? nil : attachments,
receipt: true,
receiptText: "Just received your iOS share + request, working on it.",
to: config.deliveryTo,
channel: config.deliveryChannel,
receipt: canDeliverToRoute,
receiptText: canDeliverToRoute ? "Just received your iOS share + request, working on it." : nil,
to: canDeliverToRoute ? deliveryTo : nil,
channel: canDeliverToRoute ? deliveryChannel : nil,
timeoutSeconds: nil,
key: UUID().uuidString)
let data = try JSONEncoder().encode(params)
@@ -271,6 +274,27 @@ final class ShareViewController: UIViewController {
_ = try await gateway.request(method: "node.event", paramsJSON: nodeEventParams, timeoutSeconds: 25)
}
private func shouldRetryWithLegacyClientId(_ error: Error) -> Bool {
if let gatewayError = error as? GatewayResponseError {
let code = gatewayError.code.lowercased()
let message = gatewayError.message.lowercased()
let pathValue = (gatewayError.details["path"]?.value as? String)?.lowercased() ?? ""
let mentionsClientIdPath =
message.contains("/client/id") || message.contains("client id")
|| pathValue.contains("/client/id")
let isInvalidConnectParams =
(code.contains("invalid") && code.contains("connect"))
|| message.contains("invalid connect params")
if isInvalidConnectParams && mentionsClientIdPath {
return true
}
}
let text = error.localizedDescription.lowercased()
return text.contains("invalid connect params")
&& (text.contains("/client/id") || text.contains("client id"))
}
private func showStatus(_ text: String) {
DispatchQueue.main.async {
let label: UILabel

9
apps/ios/Sources/Model/NodeAppModel.swift
View File

@@ -480,8 +480,8 @@ final class NodeAppModel {
token: relay.token,
password: relay.password,
sessionKey: self.mainSessionKey,
deliveryChannel: relay.deliveryChannel ?? self.shareDeliveryChannel,
deliveryTo: relay.deliveryTo ?? self.shareDeliveryTo))
deliveryChannel: self.shareDeliveryChannel,
deliveryTo: self.shareDeliveryTo))
}
}
@@ -1982,10 +1982,7 @@ extension NodeAppModel {
let exactMatch = sorted.first { row in
row.key == currentKey && normalize(row.lastChannel) != nil && normalize(row.lastTo) != nil
}
let fallback = sorted.first { row in
normalize(row.lastChannel) != nil && normalize(row.lastTo) != nil
}
let selected = exactMatch ?? fallback
let selected = exactMatch
let channel = normalize(selected?.lastChannel)
let to = normalize(selected?.lastTo)