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.
101 lines
4.5 KiB
Swift
101 lines
4.5 KiB
Swift
import CoreMotion
|
|
import Foundation
|
|
import BotKit
|
|
|
|
final class MotionService: MotionServicing {
|
|
func activities(params: HanzoBotMotionActivityParams) async throws -> HanzoBotMotionActivityPayload {
|
|
guard CMMotionActivityManager.isActivityAvailable() else {
|
|
throw NSError(domain: "Motion", code: 1, userInfo: [
|
|
NSLocalizedDescriptionKey: "MOTION_UNAVAILABLE: activity not supported on this device",
|
|
])
|
|
}
|
|
let auth = CMMotionActivityManager.authorizationStatus()
|
|
guard auth == .authorized else {
|
|
throw NSError(domain: "Motion", code: 3, userInfo: [
|
|
NSLocalizedDescriptionKey: "MOTION_PERMISSION_REQUIRED: grant Motion & Fitness permission",
|
|
])
|
|
}
|
|
|
|
let (start, end) = Self.resolveRange(startISO: params.startISO, endISO: params.endISO)
|
|
let limit = max(1, min(params.limit ?? 200, 1000))
|
|
|
|
let manager = CMMotionActivityManager()
|
|
let mapped = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<[HanzoBotMotionActivityEntry], Error>) in
|
|
manager.queryActivityStarting(from: start, to: end, to: OperationQueue()) { activity, error in
|
|
if let error {
|
|
cont.resume(throwing: error)
|
|
} else {
|
|
let formatter = ISO8601DateFormatter()
|
|
let sliced = Array((activity ?? []).suffix(limit))
|
|
let entries = sliced.map { entry in
|
|
HanzoBotMotionActivityEntry(
|
|
startISO: formatter.string(from: entry.startDate),
|
|
endISO: formatter.string(from: end),
|
|
confidence: Self.confidenceString(entry.confidence),
|
|
isWalking: entry.walking,
|
|
isRunning: entry.running,
|
|
isCycling: entry.cycling,
|
|
isAutomotive: entry.automotive,
|
|
isStationary: entry.stationary,
|
|
isUnknown: entry.unknown)
|
|
}
|
|
cont.resume(returning: entries)
|
|
}
|
|
}
|
|
}
|
|
|
|
return HanzoBotMotionActivityPayload(activities: mapped)
|
|
}
|
|
|
|
func pedometer(params: HanzoBotPedometerParams) async throws -> HanzoBotPedometerPayload {
|
|
guard CMPedometer.isStepCountingAvailable() else {
|
|
throw NSError(domain: "Motion", code: 2, userInfo: [
|
|
NSLocalizedDescriptionKey: "PEDOMETER_UNAVAILABLE: step counting not supported",
|
|
])
|
|
}
|
|
let auth = CMPedometer.authorizationStatus()
|
|
guard auth == .authorized else {
|
|
throw NSError(domain: "Motion", code: 4, userInfo: [
|
|
NSLocalizedDescriptionKey: "MOTION_PERMISSION_REQUIRED: grant Motion & Fitness permission",
|
|
])
|
|
}
|
|
|
|
let (start, end) = Self.resolveRange(startISO: params.startISO, endISO: params.endISO)
|
|
let pedometer = CMPedometer()
|
|
let payload = try await withCheckedThrowingContinuation { (cont: CheckedContinuation<HanzoBotPedometerPayload, Error>) in
|
|
pedometer.queryPedometerData(from: start, to: end) { data, error in
|
|
if let error {
|
|
cont.resume(throwing: error)
|
|
} else {
|
|
let formatter = ISO8601DateFormatter()
|
|
let payload = HanzoBotPedometerPayload(
|
|
startISO: formatter.string(from: start),
|
|
endISO: formatter.string(from: end),
|
|
steps: data?.numberOfSteps.intValue,
|
|
distanceMeters: data?.distance?.doubleValue,
|
|
floorsAscended: data?.floorsAscended?.intValue,
|
|
floorsDescended: data?.floorsDescended?.intValue)
|
|
cont.resume(returning: payload)
|
|
}
|
|
}
|
|
}
|
|
return payload
|
|
}
|
|
|
|
private static func resolveRange(startISO: String?, endISO: String?) -> (Date, Date) {
|
|
let formatter = ISO8601DateFormatter()
|
|
let start = startISO.flatMap { formatter.date(from: $0) } ?? Calendar.current.startOfDay(for: Date())
|
|
let end = endISO.flatMap { formatter.date(from: $0) } ?? Date()
|
|
return (start, end)
|
|
}
|
|
|
|
private static func confidenceString(_ confidence: CMMotionActivityConfidence) -> String {
|
|
switch confidence {
|
|
case .low: "low"
|
|
case .medium: "medium"
|
|
case .high: "high"
|
|
@unknown default: "unknown"
|
|
}
|
|
}
|
|
}
|