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.
86 lines
2.5 KiB
Swift
86 lines
2.5 KiB
Swift
import Foundation
|
|
import BotKit
|
|
|
|
@MainActor
|
|
final class GatewayHealthMonitor {
|
|
struct Config: Sendable {
|
|
var intervalSeconds: Double
|
|
var timeoutSeconds: Double
|
|
var maxFailures: Int
|
|
}
|
|
|
|
private let config: Config
|
|
private let sleep: @Sendable (UInt64) async -> Void
|
|
private var task: Task<Void, Never>?
|
|
|
|
init(
|
|
config: Config = Config(intervalSeconds: 15, timeoutSeconds: 5, maxFailures: 3),
|
|
sleep: @escaping @Sendable (UInt64) async -> Void = { nanoseconds in
|
|
try? await Task.sleep(nanoseconds: nanoseconds)
|
|
}
|
|
) {
|
|
self.config = config
|
|
self.sleep = sleep
|
|
}
|
|
|
|
func start(
|
|
check: @escaping @Sendable () async throws -> Bool,
|
|
onFailure: @escaping @Sendable (_ failureCount: Int) async -> Void)
|
|
{
|
|
self.stop()
|
|
let config = self.config
|
|
let sleep = self.sleep
|
|
self.task = Task { @MainActor in
|
|
var failures = 0
|
|
while !Task.isCancelled {
|
|
let ok = await Self.runCheck(check: check, timeoutSeconds: config.timeoutSeconds)
|
|
if ok {
|
|
failures = 0
|
|
} else {
|
|
failures += 1
|
|
if failures >= max(1, config.maxFailures) {
|
|
await onFailure(failures)
|
|
failures = 0
|
|
}
|
|
}
|
|
|
|
if Task.isCancelled { break }
|
|
let interval = max(0.0, config.intervalSeconds)
|
|
let nanos = UInt64(interval * 1_000_000_000)
|
|
if nanos > 0 {
|
|
await sleep(nanos)
|
|
} else {
|
|
await Task.yield()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func stop() {
|
|
self.task?.cancel()
|
|
self.task = nil
|
|
}
|
|
|
|
private static func runCheck(
|
|
check: @escaping @Sendable () async throws -> Bool,
|
|
timeoutSeconds: Double) async -> Bool
|
|
{
|
|
let timeout = max(0.0, timeoutSeconds)
|
|
if timeout == 0 {
|
|
return (try? await check()) ?? false
|
|
}
|
|
do {
|
|
let timeoutError = NSError(
|
|
domain: "GatewayHealthMonitor",
|
|
code: 1,
|
|
userInfo: [NSLocalizedDescriptionKey: "health check timed out"])
|
|
return try await AsyncTimeout.withTimeout(
|
|
seconds: timeout,
|
|
onTimeout: { timeoutError },
|
|
operation: check)
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
}
|