mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
70 lines
2.3 KiB
Swift
70 lines
2.3 KiB
Swift
import Foundation
|
|
import Network
|
|
import BotKit
|
|
|
|
final class NetworkStatusService: @unchecked Sendable {
|
|
func currentStatus(timeoutMs: Int = 1500) async -> HanzoBotNetworkStatusPayload {
|
|
await withCheckedContinuation { cont in
|
|
let monitor = NWPathMonitor()
|
|
let queue = DispatchQueue(label: "ai.hanzo.bot.ios.network-status")
|
|
let state = NetworkStatusState()
|
|
|
|
monitor.pathUpdateHandler = { path in
|
|
guard state.markCompleted() else { return }
|
|
monitor.cancel()
|
|
cont.resume(returning: Self.payload(from: path))
|
|
}
|
|
|
|
monitor.start(queue: queue)
|
|
|
|
queue.asyncAfter(deadline: .now() + .milliseconds(timeoutMs)) {
|
|
guard state.markCompleted() else { return }
|
|
monitor.cancel()
|
|
cont.resume(returning: Self.fallbackPayload())
|
|
}
|
|
}
|
|
}
|
|
|
|
private static func payload(from path: NWPath) -> HanzoBotNetworkStatusPayload {
|
|
let status: HanzoBotNetworkPathStatus = switch path.status {
|
|
case .satisfied: .satisfied
|
|
case .requiresConnection: .requiresConnection
|
|
case .unsatisfied: .unsatisfied
|
|
@unknown default: .unsatisfied
|
|
}
|
|
|
|
var interfaces: [HanzoBotNetworkInterfaceType] = []
|
|
if path.usesInterfaceType(.wifi) { interfaces.append(.wifi) }
|
|
if path.usesInterfaceType(.cellular) { interfaces.append(.cellular) }
|
|
if path.usesInterfaceType(.wiredEthernet) { interfaces.append(.wired) }
|
|
if interfaces.isEmpty { interfaces.append(.other) }
|
|
|
|
return HanzoBotNetworkStatusPayload(
|
|
status: status,
|
|
isExpensive: path.isExpensive,
|
|
isConstrained: path.isConstrained,
|
|
interfaces: interfaces)
|
|
}
|
|
|
|
private static func fallbackPayload() -> HanzoBotNetworkStatusPayload {
|
|
HanzoBotNetworkStatusPayload(
|
|
status: .unsatisfied,
|
|
isExpensive: false,
|
|
isConstrained: false,
|
|
interfaces: [.other])
|
|
}
|
|
}
|
|
|
|
private final class NetworkStatusState: @unchecked Sendable {
|
|
private let lock = NSLock()
|
|
private var completed = false
|
|
|
|
func markCompleted() -> Bool {
|
|
self.lock.lock()
|
|
defer { self.lock.unlock() }
|
|
if self.completed { return false }
|
|
self.completed = true
|
|
return true
|
|
}
|
|
}
|