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.
201 lines
7.0 KiB
Swift
201 lines
7.0 KiB
Swift
import BotKit
|
|
import CoreLocation
|
|
import Foundation
|
|
|
|
@MainActor
|
|
final class LocationService: NSObject, CLLocationManagerDelegate, LocationServiceCommon {
|
|
enum Error: Swift.Error {
|
|
case timeout
|
|
case unavailable
|
|
}
|
|
|
|
private let manager = CLLocationManager()
|
|
private var authContinuation: CheckedContinuation<CLAuthorizationStatus, Never>?
|
|
private var locationContinuation: CheckedContinuation<CLLocation, Swift.Error>?
|
|
private var updatesContinuation: AsyncStream<CLLocation>.Continuation?
|
|
private var isStreaming = false
|
|
private var significantLocationCallback: (@Sendable (CLLocation) -> Void)?
|
|
private var isMonitoringSignificantChanges = false
|
|
|
|
var locationManager: CLLocationManager {
|
|
self.manager
|
|
}
|
|
|
|
var locationRequestContinuation: CheckedContinuation<CLLocation, Swift.Error>? {
|
|
get { self.locationContinuation }
|
|
set { self.locationContinuation = newValue }
|
|
}
|
|
|
|
override init() {
|
|
super.init()
|
|
self.configureLocationManager()
|
|
}
|
|
|
|
func authorizationStatus() -> CLAuthorizationStatus {
|
|
self.manager.authorizationStatus
|
|
}
|
|
|
|
func accuracyAuthorization() -> CLAccuracyAuthorization {
|
|
if #available(iOS 14.0, *) {
|
|
return self.manager.accuracyAuthorization
|
|
}
|
|
return .fullAccuracy
|
|
}
|
|
|
|
func ensureAuthorization(mode: HanzoBotLocationMode) async -> CLAuthorizationStatus {
|
|
guard CLLocationManager.locationServicesEnabled() else { return .denied }
|
|
|
|
let status = self.manager.authorizationStatus
|
|
if status == .notDetermined {
|
|
self.manager.requestWhenInUseAuthorization()
|
|
let updated = await self.awaitAuthorizationChange()
|
|
if mode != .always { return updated }
|
|
}
|
|
|
|
if mode == .always {
|
|
let current = self.manager.authorizationStatus
|
|
if current == .authorizedWhenInUse {
|
|
self.manager.requestAlwaysAuthorization()
|
|
return await self.awaitAuthorizationChange()
|
|
}
|
|
return current
|
|
}
|
|
|
|
return self.manager.authorizationStatus
|
|
}
|
|
|
|
func currentLocation(
|
|
params: HanzoBotLocationGetParams,
|
|
desiredAccuracy: HanzoBotLocationAccuracy,
|
|
maxAgeMs: Int?,
|
|
timeoutMs: Int?) async throws -> CLLocation
|
|
{
|
|
_ = params
|
|
return try await LocationCurrentRequest.resolve(
|
|
manager: self.manager,
|
|
desiredAccuracy: desiredAccuracy,
|
|
maxAgeMs: maxAgeMs,
|
|
timeoutMs: timeoutMs,
|
|
request: { try await self.requestLocationOnce() },
|
|
withTimeout: { timeoutMs, operation in
|
|
try await self.withTimeout(timeoutMs: timeoutMs, operation: operation)
|
|
})
|
|
}
|
|
|
|
private func awaitAuthorizationChange() async -> CLAuthorizationStatus {
|
|
await withCheckedContinuation { cont in
|
|
self.authContinuation = cont
|
|
}
|
|
}
|
|
|
|
private func withTimeout<T: Sendable>(
|
|
timeoutMs: Int,
|
|
operation: @escaping @Sendable () async throws -> T) async throws -> T
|
|
{
|
|
try await AsyncTimeout.withTimeoutMs(timeoutMs: timeoutMs, onTimeout: { Error.timeout }, operation: operation)
|
|
}
|
|
|
|
private static func accuracyValue(_ accuracy: HanzoBotLocationAccuracy) -> CLLocationAccuracy {
|
|
switch accuracy {
|
|
case .coarse:
|
|
kCLLocationAccuracyKilometer
|
|
case .balanced:
|
|
kCLLocationAccuracyHundredMeters
|
|
case .precise:
|
|
kCLLocationAccuracyBest
|
|
}
|
|
}
|
|
|
|
func startLocationUpdates(
|
|
desiredAccuracy: BotLocationAccuracy,
|
|
significantChangesOnly: Bool) -> AsyncStream<CLLocation>
|
|
{
|
|
self.stopLocationUpdates()
|
|
|
|
self.manager.desiredAccuracy = LocationCurrentRequest.accuracyValue(desiredAccuracy)
|
|
self.manager.pausesLocationUpdatesAutomatically = true
|
|
self.manager.allowsBackgroundLocationUpdates = true
|
|
|
|
self.isStreaming = true
|
|
if significantChangesOnly {
|
|
self.manager.startMonitoringSignificantLocationChanges()
|
|
} else {
|
|
self.manager.startUpdatingLocation()
|
|
}
|
|
|
|
return AsyncStream(bufferingPolicy: .bufferingNewest(1)) { continuation in
|
|
self.updatesContinuation = continuation
|
|
continuation.onTermination = { @Sendable _ in
|
|
Task { @MainActor in
|
|
self.stopLocationUpdates()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func stopLocationUpdates() {
|
|
guard self.isStreaming else { return }
|
|
self.isStreaming = false
|
|
self.manager.stopUpdatingLocation()
|
|
self.manager.stopMonitoringSignificantLocationChanges()
|
|
self.updatesContinuation?.finish()
|
|
self.updatesContinuation = nil
|
|
}
|
|
|
|
func startMonitoringSignificantLocationChanges(onUpdate: @escaping @Sendable (CLLocation) -> Void) {
|
|
self.significantLocationCallback = onUpdate
|
|
guard !self.isMonitoringSignificantChanges else { return }
|
|
self.isMonitoringSignificantChanges = true
|
|
self.manager.startMonitoringSignificantLocationChanges()
|
|
}
|
|
|
|
func stopMonitoringSignificantLocationChanges() {
|
|
guard self.isMonitoringSignificantChanges else { return }
|
|
self.isMonitoringSignificantChanges = false
|
|
self.significantLocationCallback = nil
|
|
self.manager.stopMonitoringSignificantLocationChanges()
|
|
}
|
|
|
|
nonisolated func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
|
|
let status = manager.authorizationStatus
|
|
Task { @MainActor in
|
|
if let cont = self.authContinuation {
|
|
self.authContinuation = nil
|
|
cont.resume(returning: status)
|
|
}
|
|
}
|
|
}
|
|
|
|
nonisolated func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
|
|
let locs = locations
|
|
Task { @MainActor in
|
|
// Resolve the one-shot continuation first (if any).
|
|
if let cont = self.locationContinuation {
|
|
self.locationContinuation = nil
|
|
if let latest = locs.last {
|
|
cont.resume(returning: latest)
|
|
} else {
|
|
cont.resume(throwing: Error.unavailable)
|
|
}
|
|
// Don't return — also forward to significant-change callback below
|
|
// so both consumers receive updates when both are active.
|
|
}
|
|
if let callback = self.significantLocationCallback, let latest = locs.last {
|
|
callback(latest)
|
|
}
|
|
if let latest = locs.last, let updates = self.updatesContinuation {
|
|
updates.yield(latest)
|
|
}
|
|
}
|
|
}
|
|
|
|
nonisolated func locationManager(_ manager: CLLocationManager, didFailWithError error: Swift.Error) {
|
|
let err = error
|
|
Task { @MainActor in
|
|
guard let cont = self.locationContinuation else { return }
|
|
self.locationContinuation = nil
|
|
cont.resume(throwing: err)
|
|
}
|
|
}
|
|
}
|