forked from Blendman974/faceclaw
Merge branch 'main' of https://github.com/jimrandomh/faceclaw
This commit is contained in:
commit
fa241161e4
35 files changed
+3309
-140
No files matched your search
+130
-28
@@ -1,12 +1,13 @@
|
||||
import { Utils } from "@nativescript/core";
|
||||
|
||||
import { classifyAdvertisement, type RawAdvertisement } from "../g2/even-advertisement";
|
||||
|
||||
declare const com: any;
|
||||
|
||||
export type DiscoveredDevice = {
|
||||
address: string;
|
||||
name: string;
|
||||
role: "left" | "right" | "ring";
|
||||
source: "paired" | "scan";
|
||||
export type DiscoveryEvents = {
|
||||
onAdvertisement: (raw: RawAdvertisement) => void;
|
||||
onScanFailed?: (code: number, message: string) => void;
|
||||
onLog?: (line: string) => void;
|
||||
};
|
||||
|
||||
export type DiscoveredAddressSet = {
|
||||
@@ -16,8 +17,16 @@ export type DiscoveredAddressSet = {
|
||||
summary: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* TS wrapper around the native FaceclawDeviceDiscovery. The live scan streams
|
||||
* raw advertisements (see `RawAdvertisement`); protocol decoding happens in
|
||||
* `app/g2/even-advertisement.ts` and pair grouping in
|
||||
* `app/g2/pairing-candidates.ts`.
|
||||
*/
|
||||
export class DeviceDiscoveryBridge {
|
||||
private readonly discovery: any;
|
||||
private listenerProxy: any = null;
|
||||
private events: DiscoveryEvents | null = null;
|
||||
|
||||
constructor() {
|
||||
const context = Utils.android.getApplicationContext();
|
||||
@@ -25,40 +34,133 @@ export class DeviceDiscoveryBridge {
|
||||
this.discovery = new com.faceclaw.app.FaceclawDeviceDiscovery(context);
|
||||
}
|
||||
|
||||
async getBondedCandidates(): Promise<DiscoveredDevice[]> {
|
||||
return parseCandidates(String(this.discovery.getBondedCandidatesJson()));
|
||||
get bluetoothEnabled(): boolean {
|
||||
return !!this.discovery.isBluetoothEnabled();
|
||||
}
|
||||
|
||||
async scanCandidates(timeoutMs = 6000): Promise<DiscoveredDevice[]> {
|
||||
return parseCandidates(String(this.discovery.scanCandidatesJson(timeoutMs)));
|
||||
get scanning(): boolean {
|
||||
return !!this.discovery.isScanning();
|
||||
}
|
||||
|
||||
/** Start (or re-target) the live scan. Returns false when the radio is off. */
|
||||
startScan(events: DiscoveryEvents): boolean {
|
||||
this.events = events;
|
||||
if (!this.listenerProxy) {
|
||||
this.listenerProxy = new com.faceclaw.app.FaceclawDeviceDiscoveryListener({
|
||||
onAdvertisement: (json: string) => {
|
||||
const raw = parseRaw(String(json));
|
||||
if (raw) this.events?.onAdvertisement(raw);
|
||||
},
|
||||
onScanFailed: (code: number, message: string) => this.events?.onScanFailed?.(Number(code), String(message)),
|
||||
onLog: (line: string) => this.events?.onLog?.(String(line)),
|
||||
});
|
||||
this.discovery.setListener(this.listenerProxy);
|
||||
}
|
||||
return !!this.discovery.startScan();
|
||||
}
|
||||
|
||||
stopScan(): void {
|
||||
try {
|
||||
this.discovery.stopScan();
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
|
||||
/** Push bonded Even devices through the listener as `source: "paired"` entries. */
|
||||
emitBondedDevices(): void {
|
||||
if (!this.listenerProxy) return;
|
||||
this.discovery.emitBondedDevices();
|
||||
}
|
||||
|
||||
async getBondedCandidates(): Promise<RawAdvertisement[]> {
|
||||
return parseRawArray(String(this.discovery.getBondedCandidatesJson()));
|
||||
}
|
||||
|
||||
/**
|
||||
* Collect advertisements for `timeoutMs` without blocking the UI thread
|
||||
* (scan callbacks are delivered on the main looper, so a blocking sleep
|
||||
* there would starve them). Latest sample per address wins.
|
||||
*/
|
||||
scanCandidates(timeoutMs = 6000): Promise<RawAdvertisement[]> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const latest = new Map<string, RawAdvertisement>();
|
||||
const started = this.startScan({
|
||||
onAdvertisement: (raw) => latest.set(raw.address, raw),
|
||||
onScanFailed: (code, message) => {
|
||||
this.stopScan();
|
||||
reject(new Error(`Bluetooth scan failed: ${message} (${code})`));
|
||||
},
|
||||
});
|
||||
if (!started) {
|
||||
reject(new Error("Bluetooth is off or BLE scanning is unavailable."));
|
||||
return;
|
||||
}
|
||||
setTimeout(() => {
|
||||
this.stopScan();
|
||||
resolve(Array.from(latest.values()));
|
||||
}, Math.max(500, timeoutMs));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export function buildAddressSet(candidates: DiscoveredDevice[]): DiscoveredAddressSet {
|
||||
const latestForRole = new Map<DiscoveredDevice["role"], DiscoveredDevice>();
|
||||
for (const candidate of candidates) {
|
||||
latestForRole.set(candidate.role, candidate);
|
||||
/**
|
||||
* Pick one address per role from a batch of raw advertisements — the manual
|
||||
* address page's "load" helper. The latest-seen device of each role wins;
|
||||
* the summary names the serial where one was advertised.
|
||||
*/
|
||||
export function buildAddressSet(candidates: RawAdvertisement[]): DiscoveredAddressSet {
|
||||
const classified = candidates.map(classifyAdvertisement).filter((item): item is NonNullable<typeof item> => !!item);
|
||||
const latestForRole = new Map<"left" | "right" | "ring", (typeof classified)[number]>();
|
||||
for (const candidate of classified) {
|
||||
const incumbent = latestForRole.get(candidate.role);
|
||||
if (!incumbent || incumbent.seenAtMs <= candidate.seenAtMs) latestForRole.set(candidate.role, candidate);
|
||||
}
|
||||
const selected = {
|
||||
const lines = classified.map((candidate) => {
|
||||
const extras = [candidate.serial ? `serial ${candidate.serial}` : null, candidate.rssi != null ? `${candidate.rssi} dBm` : null].filter(Boolean);
|
||||
return `${candidate.role}: ${candidate.name} ${candidate.address}${extras.length ? ` (${extras.join(", ")})` : ""}`;
|
||||
});
|
||||
return {
|
||||
left: latestForRole.get("left")?.address ?? "",
|
||||
right: latestForRole.get("right")?.address ?? "",
|
||||
ring: latestForRole.get("ring")?.address ?? "",
|
||||
};
|
||||
const lines = candidates.map((candidate) => `${candidate.role}: ${candidate.name} ${candidate.address}`);
|
||||
return {
|
||||
...selected,
|
||||
summary: lines.length ? lines.join("\n") : "No matching devices found.",
|
||||
};
|
||||
}
|
||||
|
||||
function parseCandidates(json: string): DiscoveredDevice[] {
|
||||
const raw = JSON.parse(json) as Array<Record<string, unknown>>;
|
||||
return raw
|
||||
.map((item) => ({
|
||||
address: String(item.address ?? ""),
|
||||
name: String(item.name ?? ""),
|
||||
role: String(item.role ?? "") as DiscoveredDevice["role"],
|
||||
source: String(item.source ?? "") as DiscoveredDevice["source"],
|
||||
}))
|
||||
.filter((item) => !!item.address && (item.role === "left" || item.role === "right" || item.role === "ring"));
|
||||
function parseRawArray(json: string): RawAdvertisement[] {
|
||||
const items = JSON.parse(json) as unknown[];
|
||||
return items.map((item) => parseRawObject(item)).filter((item): item is RawAdvertisement => !!item);
|
||||
}
|
||||
|
||||
function parseRaw(json: string): RawAdvertisement | null {
|
||||
try {
|
||||
return parseRawObject(JSON.parse(json));
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function parseRawObject(item: unknown): RawAdvertisement | null {
|
||||
if (!item || typeof item !== "object") return null;
|
||||
const record = item as Record<string, unknown>;
|
||||
const address = String(record.address ?? "");
|
||||
if (!address) return null;
|
||||
return {
|
||||
address,
|
||||
name: String(record.name ?? ""),
|
||||
manufacturerData: String(record.manufacturerData ?? ""),
|
||||
rssi: numberOrNull(record.rssi),
|
||||
txPower: numberOrNull(record.txPower),
|
||||
connectable: typeof record.connectable === "boolean" ? record.connectable : null,
|
||||
bonded: record.bonded === true,
|
||||
source: record.source === "paired" ? "paired" : "scan",
|
||||
seenAtMs: numberOrNull(record.seenAtMs) ?? Date.now(),
|
||||
};
|
||||
}
|
||||
|
||||
function numberOrNull(value: unknown): number | null {
|
||||
if (value === null || value === undefined) return null;
|
||||
const n = Number(value);
|
||||
return Number.isFinite(n) ? n : null;
|
||||
}
|
||||
Reference in new issue
Block a user