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

style(swift): fix lint and formatting warnings

Browse Source
This commit is contained in:
Peter Steinberger
2025-12-14 03:48:07 +00:00
parent 3a08e6df9d
commit dde9fddae4
8 changed files with 43 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/ios/Tests/BridgeClientTests.swift
View File

@@ -51,7 +51,7 @@ import Testing
self.listener.cancel()
}
func waitForConnection(timeoutMs: Int = 2_000) async throws -> NWConnection {
func waitForConnection(timeoutMs: Int = 2000) async throws -> NWConnection {
let deadline = Date().addingTimeInterval(Double(timeoutMs) / 1000.0)
while Date() < deadline {
if let connection = self.connection { return connection }
@@ -62,7 +62,7 @@ import Testing
])
}
func receiveLine(timeoutMs: Int = 2_000) async throws -> Data? {
func receiveLine(timeoutMs: Int = 2000) async throws -> Data? {
let connection = try await self.waitForConnection(timeoutMs: timeoutMs)
let deadline = Date().addingTimeInterval(Double(timeoutMs) / 1000.0)
@@ -73,18 +73,22 @@ import Testing
return Data(line)
}
let chunk = try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<Data, Error>) in
connection.receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
if let error {
cont.resume(throwing: error)
return
let chunk = try await withCheckedThrowingContinuation(isolation: nil) { (cont: CheckedContinuation<
Data,
Error,
>) in
connection
.receive(minimumIncompleteLength: 1, maximumLength: 64 * 1024) { data, _, isComplete, error in
if let error {
cont.resume(throwing: error)
return
}
if isComplete {
cont.resume(returning: Data())
return
}
cont.resume(returning: data ?? Data())
}
if isComplete {
cont.resume(returning: Data())
return
}
cont.resume(returning: data ?? Data())
}
}
if chunk.isEmpty { return nil }
@@ -124,7 +128,12 @@ import Testing
let client = BridgeClient()
let token = try await client.pairAndHello(
endpoint: .hostPort(host: NWEndpoint.Host("127.0.0.1"), port: port),
hello: BridgeHello(nodeId: "ios-node", displayName: "iOS", token: "existing-token", platform: "ios", version: "1"),
hello: BridgeHello(
nodeId: "ios-node",
displayName: "iOS",
token: "existing-token",
platform: "ios",
version: "1"),
onStatus: nil)
#expect(token == "existing-token")

7
apps/ios/Tests/DeepLinkParserTests.swift
View File

@@ -32,7 +32,8 @@ import Testing
}
@Test func parseAgentLinkParsesCommonFields() {
let url = URL(string: "clawdis://agent?message=Hello&deliver=1&sessionKey=node-iris&thinking=low&timeoutSeconds=30")!
let url =
URL(string: "clawdis://agent?message=Hello&deliver=1&sessionKey=node-iris&thinking=low&timeoutSeconds=30")!
#expect(
DeepLinkParser.parse(url) == .agent(
.init(
@@ -47,7 +48,9 @@ import Testing
}
@Test func parseAgentLinkParsesTargetRoutingFields() {
let url = URL(string: "clawdis://agent?message=Hello%20World&deliver=1&to=%2B15551234567&channel=whatsapp&key=secret")!
let url =
URL(
string: "clawdis://agent?message=Hello%20World&deliver=1&to=%2B15551234567&channel=whatsapp&key=secret")!
#expect(
DeepLinkParser.parse(url) == .agent(
.init(

1
apps/ios/Tests/IOSBridgeChatTransportTests.swift
View File

@@ -31,4 +31,3 @@ import Testing
} catch {}
}
}

14
apps/ios/Tests/SettingsNetworkingHelpersTests.swift
View File

@@ -7,7 +7,9 @@ import Testing
}
@Test func parseHostPortParsesHostnameAndTrims() {
#expect(SettingsNetworkingHelpers.parseHostPort(from: " example.com:80 \n") == .init(host: "example.com", port: 80))
#expect(SettingsNetworkingHelpers.parseHostPort(from: " example.com:80 \n") == .init(
host: "example.com",
port: 80))
}
@Test func parseHostPortParsesBracketedIPv6() {
@@ -27,15 +29,18 @@ import Testing
}
@Test func httpURLStringFormatsIPv4AndPort() {
#expect(SettingsNetworkingHelpers.httpURLString(host: "127.0.0.1", port: 8080, fallback: "fallback") == "http://127.0.0.1:8080")
#expect(SettingsNetworkingHelpers
.httpURLString(host: "127.0.0.1", port: 8080, fallback: "fallback") == "http://127.0.0.1:8080")
}
@Test func httpURLStringBracketsIPv6() {
#expect(SettingsNetworkingHelpers.httpURLString(host: "2001:db8::1", port: 8080, fallback: "fallback") == "http://[2001:db8::1]:8080")
#expect(SettingsNetworkingHelpers
.httpURLString(host: "2001:db8::1", port: 8080, fallback: "fallback") == "http://[2001:db8::1]:8080")
}
@Test func httpURLStringLeavesAlreadyBracketedIPv6() {
#expect(SettingsNetworkingHelpers.httpURLString(host: "[2001:db8::1]", port: 8080, fallback: "fallback") == "http://[2001:db8::1]:8080")
#expect(SettingsNetworkingHelpers
.httpURLString(host: "[2001:db8::1]", port: 8080, fallback: "fallback") == "http://[2001:db8::1]:8080")
}
@Test func httpURLStringFallsBackWhenMissingHostOrPort() {
@@ -43,4 +48,3 @@ import Testing
#expect(SettingsNetworkingHelpers.httpURLString(host: "example.com", port: nil, fallback: "y") == "http://y")
}
}

2
apps/ios/Tests/SwiftUIRenderSmokeTests.swift
View File

@@ -4,7 +4,7 @@ import UIKit
@testable import Clawdis
@Suite struct SwiftUIRenderSmokeTests {
@MainActor private static func host<V: View>(_ view: V) -> UIWindow {
@MainActor private static func host(_ view: some View) -> UIWindow {
let window = UIWindow(frame: UIScreen.main.bounds)
window.rootViewController = UIHostingController(rootView: view)
window.makeKeyAndVisible()

2
apps/ios/project.yml
View File

@@ -31,6 +31,7 @@ targets:
product: ClawdisChatUI
preBuildScripts:
- name: SwiftFormat (lint)
basedOnDependencyAnalysis: false
script: |
set -euo pipefail
if ! command -v swiftformat >/dev/null 2>&1; then
@@ -41,6 +42,7 @@ targets:
"$SRCROOT/Sources" \
"$SRCROOT/../shared/ClawdisKit/Sources"
- name: SwiftLint
basedOnDependencyAnalysis: false
script: |
set -euo pipefail
if ! command -v swiftlint >/dev/null 2>&1; then

1
apps/macos/Sources/Clawdis/Bridge/BridgeConnectionHandler.swift
View File

@@ -34,6 +34,7 @@ actor BridgeConnectionHandler {
case error(code: String, message: String)
}
// swiftlint:disable:next cyclomatic_complexity
func run(
resolveAuth: @escaping @Sendable (BridgeHello) async -> AuthResult,
handlePair: @escaping @Sendable (BridgePairRequest) async -> PairResult,

4
apps/macos/Sources/Clawdis/Onboarding.swift
View File

@@ -82,11 +82,11 @@ struct OnboardingView: View {
init(
state: AppState = AppStateStore.shared,
permissionMonitor: PermissionMonitor = .shared,
masterDiscovery: MasterDiscoveryModel = MasterDiscoveryModel())
discoveryModel: MasterDiscoveryModel = MasterDiscoveryModel())
{
self._state = ObservedObject(wrappedValue: state)
self._permissionMonitor = ObservedObject(wrappedValue: permissionMonitor)
self._masterDiscovery = StateObject(wrappedValue: masterDiscovery)
self._masterDiscovery = StateObject(wrappedValue: discoveryModel)
}
var body: some View {