mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
zeekay
acaeda400a
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.
97 lines
3.4 KiB
Swift
97 lines
3.4 KiB
Swift
import BotKit
|
|
import SwiftUI
|
|
import VisionKit
|
|
|
|
struct QRScannerView: UIViewControllerRepresentable {
|
|
let onGatewayLink: (GatewayConnectDeepLink) -> Void
|
|
let onError: (String) -> Void
|
|
let onDismiss: () -> Void
|
|
|
|
func makeUIViewController(context: Context) -> UIViewController {
|
|
guard DataScannerViewController.isSupported else {
|
|
context.coordinator.reportError("QR scanning is not supported on this device.")
|
|
return UIViewController()
|
|
}
|
|
guard DataScannerViewController.isAvailable else {
|
|
context.coordinator.reportError("Camera scanning is currently unavailable.")
|
|
return UIViewController()
|
|
}
|
|
let scanner = DataScannerViewController(
|
|
recognizedDataTypes: [.barcode(symbologies: [.qr])],
|
|
isHighlightingEnabled: true)
|
|
scanner.delegate = context.coordinator
|
|
do {
|
|
try scanner.startScanning()
|
|
} catch {
|
|
context.coordinator.reportError("Could not start QR scanner.")
|
|
}
|
|
return scanner
|
|
}
|
|
|
|
func updateUIViewController(_: UIViewController, context _: Context) {}
|
|
|
|
static func dismantleUIViewController(_ uiViewController: UIViewController, coordinator: Coordinator) {
|
|
if let scanner = uiViewController as? DataScannerViewController {
|
|
scanner.stopScanning()
|
|
}
|
|
coordinator.parent.onDismiss()
|
|
}
|
|
|
|
func makeCoordinator() -> Coordinator {
|
|
Coordinator(parent: self)
|
|
}
|
|
|
|
final class Coordinator: NSObject, DataScannerViewControllerDelegate {
|
|
let parent: QRScannerView
|
|
private var handled = false
|
|
private var reportedError = false
|
|
|
|
init(parent: QRScannerView) {
|
|
self.parent = parent
|
|
}
|
|
|
|
func reportError(_ message: String) {
|
|
guard !self.reportedError else { return }
|
|
self.reportedError = true
|
|
Task { @MainActor in
|
|
self.parent.onError(message)
|
|
}
|
|
}
|
|
|
|
func dataScanner(_: DataScannerViewController, didAdd items: [RecognizedItem], allItems _: [RecognizedItem]) {
|
|
guard !self.handled else { return }
|
|
for item in items {
|
|
guard case let .barcode(barcode) = item,
|
|
let payload = barcode.payloadStringValue
|
|
else { continue }
|
|
|
|
// Try setup code format first (base64url JSON from /pair qr).
|
|
if let link = GatewayConnectDeepLink.fromSetupCode(payload) {
|
|
self.handled = true
|
|
self.parent.onGatewayLink(link)
|
|
return
|
|
}
|
|
|
|
// Fall back to deep link URL format (bot://gateway?...).
|
|
if let url = URL(string: payload),
|
|
let route = DeepLinkParser.parse(url),
|
|
case let .gateway(link) = route
|
|
{
|
|
self.handled = true
|
|
self.parent.onGatewayLink(link)
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func dataScanner(_: DataScannerViewController, didRemove _: [RecognizedItem], allItems _: [RecognizedItem]) {}
|
|
|
|
func dataScanner(
|
|
_: DataScannerViewController,
|
|
becameUnavailableWithError _: DataScannerViewController.ScanningUnavailable)
|
|
{
|
|
self.reportError("Camera is not available on this device.")
|
|
}
|
|
}
|
|
}
|