diff --git a/App_Resources/iOS/src/FaceclawCrypto.h b/App_Resources/iOS/src/FaceclawCrypto.h index 1ae03b25..c0eb02ba 100644 --- a/App_Resources/iOS/src/FaceclawCrypto.h +++ b/App_Resources/iOS/src/FaceclawCrypto.h @@ -1,4 +1,5 @@ #import @interface FaceclawCrypto : NSObject + (NSString *)hmacSha256:(NSString *)secret message:(NSString *)message; ++ (NSString *)sha256:(NSData *)data; @end diff --git a/App_Resources/iOS/src/FaceclawCrypto.m b/App_Resources/iOS/src/FaceclawCrypto.m index fe6b9362..6814fb3c 100644 --- a/App_Resources/iOS/src/FaceclawCrypto.m +++ b/App_Resources/iOS/src/FaceclawCrypto.m @@ -9,4 +9,11 @@ CCHmac(kCCHmacAlgSHA256, key.bytes, key.length, data.bytes, data.length, digest); return [[NSData dataWithBytes:digest length:sizeof(digest)] base64EncodedStringWithOptions:0]; } ++ (NSString *)sha256:(NSData *)data { + unsigned char digest[CC_SHA256_DIGEST_LENGTH]; + CC_SHA256(data.bytes, (CC_LONG)data.length, digest); + NSMutableString *hex = [NSMutableString stringWithCapacity:64]; + for (NSUInteger i = 0; i < sizeof(digest); i++) [hex appendFormat:@"%02x", digest[i]]; + return hex; +} @end diff --git a/app/app.ios.css b/app/app.ios.css index 71b27f3c..318a0809 100644 --- a/app/app.ios.css +++ b/app/app.ios.css @@ -1,3 +1,150 @@ +@import '@nativescript/theme/css/core.css'; + +.pairing-instructions { + color: #555555; + font-size: 14; +} + +.pairing-status { + font-size: 14; + margin-left: 8; +} + +.pairing-section { + font-size: 16; + font-weight: bold; + margin-bottom: 4; +} + +.pairing-empty { + color: #777777; + font-size: 14; + padding: 8 0; +} + +.pairing-row { + background-color: #f4f4f4; + border-color: #dddddd; + border-width: 1; + border-radius: 10; + padding: 10; + margin-bottom: 8; +} + +.pairing-row-selected { + background-color: #e6f0ff; + border-color: #3b6fd6; +} + +.pairing-row-incomplete { + background-color: #fafafa; + border-color: #e6e6e6; +} + +.pairing-art { + vertical-align: center; +} + +.pairing-title { + font-size: 16; + font-weight: bold; + color: #222222; +} + +.pairing-badge { + font-size: 11; + font-weight: bold; + color: #2a5bc4; + background-color: #dbe6fb; + border-radius: 9; + padding: 1 7; +} + +.pairing-variant { + font-size: 13; + font-weight: bold; + color: #333333; +} + +.pairing-proximity { + font-size: 12; + color: #666666; +} + +.pairing-proximity-immediate { + color: #2a5bc4; + font-weight: bold; +} + +.pairing-serial { + font-size: 12; + color: #666666; + font-family: monospace; +} + +.pairing-arms { + font-size: 12; + color: #444444; +} + +.pairing-warning { + font-size: 12; + color: #a33a1f; + margin-top: 4; +} + +.pairing-swatch-label { + font-size: 11; + color: #555555; +} + +.pairing-chevron { + font-size: 22; + color: #444444; + margin-left: 6; +} + +.pairing-selection { + background-color: #eef4ff; + border-radius: 10; + padding: 10; +} + +Button.pairing-link { + background-color: transparent; + color: #2a5bc4; + font-size: 14; + border-width: 0; +} + +/* + * Permissions screen (phone-ui/permissions-page). Cards reuse the pairing-row + * / pairing-title / pairing-badge look above; these add the explanation body + * and the already-granted checkmark. + */ +.permissions-description { + font-size: 13; + color: #555555; + margin-top: 2; +} + +.permissions-check { + font-size: 24; + color: #2e7d32; + margin-left: 10; +} + +/* Continue with required permissions still missing: looks disabled but stays + * tappable (the tap raises an are-you-sure prompt instead of being ignored). */ +Button.permissions-primary-dimmed { + opacity: 0.45; +} + + +.body-text { font-size: 18; } +.h1 { font-size: 28; font-weight: bold; } +.footer-link { color: #285c45; padding: 4 8; text-decoration: underline; } + Page { background-color: #f5f5f2; color: #202820; @@ -7,6 +154,8 @@ Button { background-color: #285c45; color: #ffffff; border-radius: 12; - padding: 16; - font-size: 17; + padding: 12 8; + margin-left: 4; + margin-right: 4; + font-size: 15; } diff --git a/app/bootstrap.ios.ts b/app/bootstrap.ios.ts index 599004a1..6897e8dc 100644 --- a/app/bootstrap.ios.ts +++ b/app/bootstrap.ios.ts @@ -1,4 +1,4 @@ -import { Application } from '@nativescript/core' +import { Application, Frame } from '@nativescript/core' import { runKotlinBridgeSmokeTest } from './native/kotlin-bridge' declare const FaceclawConfigPort: any declare const __DEV__: boolean; @@ -7,6 +7,10 @@ if (__DEV__) runKotlinBridgeSmokeTest() // Apply transferred preferences before settings getters or app workers load. FaceclawConfigPort.processPendingRequest() -const { createMainPage } = require('./phone-ui/main-page.ios') as typeof import('./phone-ui/main-page.ios') - -Application.run({ create: createMainPage }) +require('./phone-ui/onboarding-register.ios') +const { hasCompletedOnboarding } = require('./phone-ui/onboarding-state') as typeof import('./phone-ui/onboarding-state') +Application.run({ create: () => { + const frame = new Frame() + frame.navigate({ moduleName: hasCompletedOnboarding() ? 'phone-ui/main-page' : 'phone-ui/onboarding-page' }) + return frame +} }) diff --git a/app/g2/firmware-builder.ts b/app/g2/firmware-builder.ts index cd728af0..bf3eb4c3 100644 --- a/app/g2/firmware-builder.ts +++ b/app/g2/firmware-builder.ts @@ -23,7 +23,7 @@ import { fetchWithUserAgent } from "../util/http"; import { bytesToHex, hexToBytes as hexToBytesLenient } from "../util/hex-util"; import { EvenHubFont } from "../graphics/evenhub-font"; -declare const com: any; +import { firmwareSha256, writeFirmwareFile } from "../native/firmware-files"; // The CDN names firmware files by MD5. This must be the image whose SHA-256 is // CFW_PATCH_SET.baseSha256 — keep it in sync with FW_URL in g2flash/build_cfw.sh @@ -281,12 +281,12 @@ function tightBuffer(bytes: Uint8Array): ArrayBuffer { return bytes.slice().buffer; } -/** SHA-256 hex digest of an ArrayBuffer, via Android's MessageDigest. */ +/** SHA-256 hex digest using the platform's native crypto implementation. */ function sha256Hex(buffer: ArrayBuffer): string { - return String(com.faceclaw.app.FaceclawFirmwareUtil.sha256Hex(buffer)); + return firmwareSha256(buffer); } -/** Write an ArrayBuffer's bytes to `path`, via a native FileChannel write. */ +/** Persist the verified image using the platform's native file API. */ function writeFile(path: string, buffer: ArrayBuffer): void { - com.faceclaw.app.FaceclawFirmwareUtil.writeFile(path, buffer); + writeFirmwareFile(path, buffer); } diff --git a/app/g2/firmware-ota.ts b/app/g2/firmware-ota.ts new file mode 100644 index 00000000..78cc4701 --- /dev/null +++ b/app/g2/firmware-ota.ts @@ -0,0 +1,91 @@ +/** Stock EVENOTA validation and transfer, matching Android's flasher/g2flash.py. */ +import { StockConnection, OTA_WRITE, OTA_NOTIFY } from './stock-connection' +import { concat } from './ble-protocol' +import type { FlashProgress } from './firmware-types' + +export type FirmwareSegment = { offset: number; size: number; name: string } +const CRC_TABLE = Array.from({ length: 256 }, (_, b) => { + let c = b << 24 + for (let i = 0; i < 8; i++) c = c & 0x80000000 ? (c << 1) ^ 0x1edc6f41 : c << 1 + return c >>> 0 +}) +export function firmwareCrc(data: Uint8Array): number { + let crc = 0 + for (const byte of data) crc = (crc << 8) ^ CRC_TABLE[((crc >>> 24) ^ byte) & 255] + return crc >>> 0 +} +export function validateFirmware(image: Uint8Array): FirmwareSegment[] { + const u32 = (offset: number) => { + if (offset < 0 || offset + 4 > image.length) throw new Error('Firmware header is truncated.') + return new DataView(image.buffer, image.byteOffset, image.byteLength).getUint32(offset, true) + } + if (image.length < 0x40) throw new Error('File is too small to be a firmware image.') + const count = u32(8) + if (count < 5 || count > 6 || 0x40 + count * 16 > image.length) throw new Error('Expected 5–6 firmware components.') + const segments: FirmwareSegment[] = [] + for (let i = 0; i < count; i++) { + const toc = 0x40 + i * 16, offset = u32(toc + 4) + if (offset < 0x40 + count * 16 || offset + 128 > image.length) throw new Error('Firmware component header is out of bounds.') + const size = u32(offset + 8), end = offset + 128 + size + if (!size || end > image.length) throw new Error('Firmware component payload is truncated.') + if (segments.some(s => offset < s.offset + 128 + s.size && s.offset < end)) throw new Error('Firmware components overlap.') + const nameBytes = image.subarray(offset + 48, offset + 128) + const name = String.fromCharCode(...nameBytes.subarray(0, nameBytes.indexOf(0) < 0 ? 80 : nameBytes.indexOf(0))) + const crc = firmwareCrc(image.subarray(offset + 128, end)) + if (crc !== u32(toc + 12) || crc !== u32(offset + 12)) throw new Error(`Component ${name} CRC32C is stale (image not checksum-fixed).`) + segments.push({ offset, size, name }) + } + const mains = segments.filter(s => s.name === 'ota/s200_firmware_ota.bin') + if (mains.length !== 1) throw new Error('Required main firmware component is missing or duplicated.') + const main = mains[0], payload = main.offset + 128 + if (main.size < 32 || u32(payload + 0x14) !== 0x00438000 || (u32(payload) & 0xffffff) !== main.size) + throw new Error('Main-app preamble load address or length is invalid.') + if (0x00438000 + main.size - 32 > 0x007f0000) throw new Error('Main-app exceeds the safe MRAM ceiling — refusing to flash.') + return segments +} + +export async function flashLensImage(link: StockConnection, role: string, image: Uint8Array, segments: FirmwareSegment[], + progress: (value: FlashProgress) => void, log: (line: string) => void, + delay: (ms: number) => Promise): Promise { + let sequence = 0 + const ctrl = async (op: number, payload = new Uint8Array(), data?: Uint8Array): Promise => { + sequence = (sequence + 1) & 255 + const message = await link.exchange(role, 0xc0, concat(new Uint8Array([op]), payload), + message => message.command === op, data ? 4000 : 8000, OTA_WRITE, OTA_NOTIFY, 0, sequence, data) + return message.payload[1] + } + const accepted = (status: number) => [0, 8, 9].includes(status) + const begin = await ctrl(0) + if (!accepted(begin)) throw new Error(`OTA BEGIN rejected (status ${begin}).`) + const total = segments.reduce((sum, segment) => sum + segment.size, 0) + let before = 0 + for (const [index, segment] of segments.entries()) { + let verified = false, failure: unknown + for (let attempt = 0; attempt < 3; attempt++) { + link.check() + if (attempt) { log(`${segment.name}: re-flash attempt ${attempt + 1}/3`); await delay(1500) } + try { + const status = await ctrl(1, image.slice(segment.offset, segment.offset + 128)) + if (status !== 0) throw new Error(`FILE_CHECK rejected (status ${status}).`) + const blocks = Math.ceil(segment.size / 4096) + for (let block = 0; block < blocks; block++) { + const start = segment.offset + 128 + block * 4096 + const data = image.slice(start, Math.min(start + 4096, segment.offset + 128 + segment.size)) + let ok = false + for (let retry = 0; retry < 3; retry++) { + if (await ctrl(2, new Uint8Array(), data) === 0) { ok = true; break } + } + if (!ok) throw new Error(`Block ${block + 1} rejected three times.`) + if (block % 20 === 0 || block === blocks - 1) + progress({ lens: role, componentIndex: index + 1, componentCount: segments.length, blockIndex: block + 1, + blockCount: blocks, bytesSent: before + Math.min((block + 1) * 4096, segment.size), bytesTotal: total }) + } + const end = await ctrl(3) + if (!accepted(end)) throw new Error(`END verification failed (status ${end}).`) + log(`${role} ${segment.name}: END verify OK (status ${end})`); verified = true; break + } catch (error) { link.check(); failure = error } + } + if (!verified) throw new Error(`Component ${segment.name} failed after 3 attempts: ${failure}`) + before += segment.size + } +} diff --git a/app/g2/firmware-types.ts b/app/g2/firmware-types.ts new file mode 100644 index 00000000..e3503894 --- /dev/null +++ b/app/g2/firmware-types.ts @@ -0,0 +1,13 @@ +export type FlashState = "validating" | "connecting" | "flashing" | "rebooting" | "done" | "error"; + +export type FlashProgress = { + lens: string; + componentIndex: number; + componentCount: number; + blockIndex: number; + blockCount: number; + /** Bytes flashed so far across the whole lens image — the size-weighted progress signal. */ + bytesSent: number; + bytesTotal: number; +}; + diff --git a/app/g2/flash-prompt-protocol.ts b/app/g2/flash-prompt-protocol.ts new file mode 100644 index 00000000..d4e166e4 --- /dev/null +++ b/app/g2/flash-prompt-protocol.ts @@ -0,0 +1,18 @@ +import { bytes, concat, integer, readBytes, readInteger, readString, type ProtocolMessage } from './ble-protocol' +const text = (field: number, value: string) => bytes(field, new Uint8Array(Array.from(value, ch => ch.charCodeAt(0)))) +export function createFlashPrompt(magic: number, warning: string): Uint8Array { + const geometry = (y: number, height: number, id: number, name: string) => concat( + integer(1, 0), integer(2, y), integer(3, 280), integer(4, height), integer(9, id), text(10, name)) + const list = concat(geometry(150, 120, 2, 'flashmenu'), bytes(11, concat(integer(1, 2), integer(3, 1), text(4, 'No, cancel'), text(4, 'Yes, flash'))), integer(12, 1)) + const label = concat(geometry(0, 130, 1, 'flashwarn'), text(12, warning)) + return concat(integer(1, 0), integer(2, magic), bytes(3, concat(integer(1, 2), bytes(2, list), bytes(3, label), integer(5, 10000)))) +} +export function flashPromptSelection(message: ProtocolMessage): boolean | null { + if (message.sid !== 0xe0 || ![1, 6].includes(message.flag)) return null + const event = readBytes(message.payload, 13), list = event && readBytes(event, 1) + if (!list || readString(list, 2) !== 'flashmenu' || readInteger(list, 5, 0) !== 0) return null + const index = readInteger(list, 4, -1), name = readString(list, 3).toLowerCase() + if (index === 1 || name.startsWith('yes')) return true + if (index === 0 || name.startsWith('no')) return false + return null +} diff --git a/app/g2/glasses-session.ts b/app/g2/glasses-session.ts index e7502923..eb01f411 100644 --- a/app/g2/glasses-session.ts +++ b/app/g2/glasses-session.ts @@ -130,7 +130,7 @@ export class GlassesSession { this.applySettings(settings) const firmware = { leftVersion: this.state.leftVersion, rightVersion: this.state.rightVersion, extension: this.state.capabilities } if (!hasCompatibleFirmware(firmware)) - throw new Error((firmwareIncompatibilityMessage(firmware) || `The glasses must report Faceclaw firmware revision ${REQUIRED_FACECLAW_FIRMWARE_VERSION} or newer.`) + ' Flashing remains available on Android.') + throw new Error((firmwareIncompatibilityMessage(firmware) || `The glasses must report Faceclaw firmware revision ${REQUIRED_FACECLAW_FIRMWARE_VERSION} or newer.`) + ' Use Devices → Check firmware to install it.') this.update('connecting', 'Starting glasses display…') await this.request('right', protocol.SID.launch, () => protocol.prelude(), 'App launch', 3500, 0x20, 156) await this.lease(true) diff --git a/app/g2/stock-connection.ts b/app/g2/stock-connection.ts new file mode 100644 index 00000000..edce1b4f --- /dev/null +++ b/app/g2/stock-connection.ts @@ -0,0 +1,152 @@ +import * as p from './ble-protocol' +import type { SessionTransport, SessionAddresses, TransportEvent } from './glasses-session' +import { hexToBytes } from '../util/hex-util' + +declare function setTimeout(callback: () => void, ms: number): number +declare function clearTimeout(id: number): void + +export const OTA_WRITE = '00002760-08c2-11e1-9073-0e8ac72e0001' +export const OTA_NOTIFY = '00002760-08c2-11e1-9073-0e8ac72e0002' +export class StockTimeout extends Error {} +type Waiter = { role: string; characteristic: string; match: (message: p.ProtocolMessage) => boolean; + resolve: (message: p.ProtocolMessage) => void; reject: (error: Error) => void; timer: ReturnType | null } + +/** Exclusive, short-lived stock-protocol connection for onboarding/OTA. No display pump. */ +export class StockConnection { + ids: Record = {} + private limits: Record = {} + private receiver = new p.MessageReceiver() + private waiters = new Set() + private listeners = new Set<(role: string, message: p.ProtocolMessage) => void>() + private lost = new Set() + private writes = new Map>() + private closed = false + private magic = 0x60 + private sequence = 0 + private off: () => void + constructor(private transport: SessionTransport, private log: (line: string) => void = () => {}) { + this.off = transport.onEvent(event => this.receive(event)) + } + check(): void { if (this.closed) throw new Error('Cancelled.') } + isConnected(role: string): boolean { return !this.closed && !!this.limits[role] && !this.lost.has(role) } + async resolve(addresses: SessionAddresses): Promise { + this.ids = await this.transport.resolveDevices(addresses); this.check() + } + async connect(role: string, ota = false): Promise { + this.check(); this.lost.delete(role) + const id = this.ids[role] + if (!id) throw new Error(`No ${role} lens configured.`) + const details = await this.transport.connect(id) + if (this.closed) { this.transport.disconnect(id); this.check() } + this.limits[role] = details.maxWrite + for (const characteristic of [p.G2_WRITE, p.G2_NOTIFY, ...(ota ? [OTA_WRITE, OTA_NOTIFY] : [])]) + if (!details.characteristics.includes(characteristic)) throw new Error(`${role} lens is missing ${ota ? 'firmware update' : 'G2'} characteristics.`) + await this.transport.subscribe(id, p.G2_NOTIFY); this.check() + if (ota) { await this.transport.subscribe(id, OTA_NOTIFY); this.check() } + } + nextMagic(): number { this.magic = this.magic >= 0x7f ? 0x60 : this.magic + 1; return this.magic } + async authenticate(role: string): Promise { + for (let attempt = 0; attempt < 2; attempt++) { + const magic = this.nextMagic() + try { + await this.exchange(role, p.SID.auth, p.authentication(magic), + message => p.authenticationSucceeded(message, magic), 30_000, p.G2_WRITE, p.G2_NOTIFY, 0) + this.log(`Security authentication complete: ${role} lens`); return + } catch (error) { this.check(); if (!(error instanceof StockTimeout) || attempt === 1) throw error } + } + } + request(role: string, sid: number, build: (magic: number) => Uint8Array, timeout = 3500, fixedMagic?: number): Promise { + const magic = fixedMagic ?? this.nextMagic() + return this.exchange(role, sid, build(magic), message => message.sid === sid && message.magic === magic && ![1, 6].includes(message.flag), timeout) + } + write(role: string, sid: number, payload: Uint8Array, characteristic = p.G2_WRITE, flag = 0x20, sequence = ++this.sequence): Promise { + // Keep a fragmented control message together when the prompt heartbeat + // overlaps a settings request or shutdown. + const pending = (this.writes.get(role) ?? Promise.resolve()).catch(() => {}).then(async () => { + this.check() + for (const frame of p.frameMessage(payload, sid, flag, sequence, this.limits[role])) { + this.check() + if (this.lost.has(role)) throw new Error(`Lost connection to the ${role} lens.`) + await this.transport.write(this.ids[role], characteristic, frame) + } + this.check() + if (this.lost.has(role)) throw new Error(`Lost connection to the ${role} lens.`) + }) + this.writes.set(role, pending) + return pending + } + exchange(role: string, sid: number, payload: Uint8Array, match: Waiter['match'], timeout: number, + write = p.G2_WRITE, notify = p.G2_NOTIFY, flag = 0x20, sequence?: number, data?: Uint8Array): Promise { + this.check() + return new Promise((resolve, reject) => { + let written = false, reply: p.ProtocolMessage | null = null + const waiter: Waiter = { role, characteristic: notify, match, + resolve: message => { reply = message; if (written) resolve(message) }, reject, + timer: null } + this.waiters.add(waiter) + void (async () => { + await this.write(role, sid, payload, write, flag, sequence) + if (data) await this.write(role, 0xc1, data, write, flag, sequence) + this.check() + if (!reply && !this.waiters.has(waiter)) return + written = true + if (reply) resolve(reply) + else waiter.timer = setTimeout(() => { + this.waiters.delete(waiter) + reject(new StockTimeout(`No response from the ${role} lens (0x${sid.toString(16)}).`)) + }, timeout) + })().catch(error => { this.waiters.delete(waiter); if (waiter.timer !== null) clearTimeout(waiter.timer); reject(error) }) + }) + } + + onMessage(listener: (role: string, message: p.ProtocolMessage) => void): () => void { + this.listeners.add(listener); return () => this.listeners.delete(listener) + } + private receive(event: TransportEvent): void { + if (this.closed) return + const role = Object.keys(this.ids).find(role => this.ids[role] === event.identifier) + if (!role) return + if (event.kind === 'disconnected') { + this.lost.add(role) + for (const waiter of [...this.waiters]) if (waiter.role === role) { + this.waiters.delete(waiter); if (waiter.timer !== null) clearTimeout(waiter.timer); waiter.reject(new Error(`Lost connection to the ${role} lens.`)) + } + return + } + if (event.kind !== 'notification' || !event.data || ![p.G2_NOTIFY, OTA_NOTIFY].includes(event.characteristic!)) return + try { + const data = hexToBytes(event.data) + const messages = event.characteristic === OTA_NOTIFY ? decodeOtaAcks(data) : this.receiver.receive(event.identifier!, data) + for (const message of messages) { + for (const waiter of [...this.waiters]) if (waiter.role === role && waiter.characteristic === event.characteristic && waiter.match(message)) { + this.waiters.delete(waiter); if (waiter.timer !== null) clearTimeout(waiter.timer); waiter.resolve(message) + } + if (event.characteristic === p.G2_NOTIFY) for (const listener of this.listeners) listener(role, message) + } + } catch (error) { this.log(`Ignored malformed onboarding notification: ${error}`) } + } + disconnect(role: string): void { this.lost.add(role); if (this.ids[role]) this.transport.disconnect(this.ids[role]); this.receiver.clear() } + close(): void { + if (this.closed) return + this.closed = true; this.off(); this.transport.stopScan() + for (const waiter of this.waiters) { if (waiter.timer !== null) clearTimeout(waiter.timer); waiter.reject(new Error('Cancelled.')) } + this.waiters.clear(); this.listeners.clear() + for (const role of Object.keys(this.ids)) this.disconnect(role) + } +} + +/** OTA ACKs are raw opcode/status bytes, not protobuf; validate the aa21 CRC envelope. */ +export function decodeOtaAcks(data: Uint8Array): p.ProtocolMessage[] { + const messages: p.ProtocolMessage[] = [] + for (let offset = 0; offset + 8 <= data.length;) { + const n = data[offset + 3], end = offset + 8 + n + if (end > data.length) break + if (data[offset] === 0xaa && [0x12, 0x21].includes(data[offset + 1]) && data[offset + 4] === 1 && data[offset + 5] === 1 && n >= 4) { + const payload = data.slice(offset + 8, end - 2) + if (p.crc16(payload) === (data[end - 2] | data[end - 1] << 8)) + messages.push({ sid: data[offset + 6], flag: data[offset + 7], payload, command: payload[0], magic: -1 }) + } + offset = end + } + return messages +} diff --git a/app/native/ble-permissions.ios.ts b/app/native/ble-permissions.ios.ts new file mode 100644 index 00000000..233c368a --- /dev/null +++ b/app/native/ble-permissions.ios.ts @@ -0,0 +1,2 @@ +import { iosBluetooth } from './ios-bluetooth' +export async function ensureBlePermissions(): Promise { await iosBluetooth().ensureReady() } diff --git a/app/native/ble-permissions.ts b/app/native/ble-permissions.ts new file mode 100644 index 00000000..14a4b9ad --- /dev/null +++ b/app/native/ble-permissions.ts @@ -0,0 +1 @@ +export { ensureBlePermissions } from '../g2/android-permissions' diff --git a/app/native/device-discovery-common.ts b/app/native/device-discovery-common.ts new file mode 100644 index 00000000..6a5c4f37 --- /dev/null +++ b/app/native/device-discovery-common.ts @@ -0,0 +1,52 @@ +import { type RawAdvertisement } from "../g2/even-advertisement"; +import { DiscoveryAggregator } from "../g2/pairing-candidates"; +import type { DiscoveredAddressSet } from "./device-discovery"; + +/** + * Pick one address per role from a batch of raw advertisements — the manual + * address page's "load" helper and the flash flow's address resolution. + * + * Runs the batch through the same `DiscoveryAggregator` the pairing page + * uses, so left/right come from ONE serial-joined pair (the closest complete + * one) rather than from whichever arm of whatever pair advertised last — + * "latest per role" silently welded together arms of two different pairs. + * When no arm carries a serial at all (a bonded-device listing has no + * manufacturer data), there is nothing to join on and the latest arm per side + * is used as before. + */ +export function buildAddressSet(candidates: RawAdvertisement[]): DiscoveredAddressSet { + const aggregator = new DiscoveryAggregator(); + for (const raw of candidates) aggregator.ingest(raw); + const classified = aggregator.advertisements(); + const pairs = aggregator.pairs(); + + let left = ""; + let right = ""; + const completePair = pairs.find((pair) => pair.completeness === "complete"); + if (completePair) { + left = completePair.left!.address; + right = completePair.right!.address; + } else if (classified.every((candidate) => !candidate.serial)) { + for (const role of ["left", "right"] as const) { + const latest = classified + .filter((candidate) => candidate.role === role) + .sort((a, b) => b.seenAtMs - a.seenAtMs)[0]; + if (role === "left") left = latest?.address ?? ""; + else right = latest?.address ?? ""; + } + } + // Arms with serials but no complete pair: leave the addresses empty. The + // summary below names what was heard; guessing would defeat the serial join. + + 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, + right, + ring: aggregator.rings()[0]?.advertisement.address ?? "", + summary: lines.length ? lines.join("\n") : "No matching devices found.", + }; +} + diff --git a/app/native/device-discovery.ios.ts b/app/native/device-discovery.ios.ts new file mode 100644 index 00000000..519cf51d --- /dev/null +++ b/app/native/device-discovery.ios.ts @@ -0,0 +1,52 @@ +import { iosBluetooth } from './ios-bluetooth' +import type { DiscoveryEvents } from './device-discovery' +import type { RawAdvertisement } from '../g2/even-advertisement' +export { buildAddressSet } from './device-discovery-common' + +export class DeviceDiscoveryBridge { + private ble = iosBluetooth() + private off: (() => void) | null = null + private generation = 0 + private cancelCollection: (() => void) | null = null + get bluetoothEnabled(): boolean { return this.ble.state === 5 } + get scanning(): boolean { return !!this.off && this.ble.scanning } + startScan(events: DiscoveryEvents): boolean { + this.stopScan() + const generation = this.generation + if (!this.bluetoothEnabled) return false + this.off = this.ble.onEvent(event => { + if (event.kind === 'device' && 'device' in event) events.onAdvertisement(event.device) + if (event.kind === 'state' && event.state !== 5) events.onScanFailed?.(event.state ?? 0, 'Bluetooth is unavailable. Turn it on, then tap Scan.') + }) + void this.ble.startScan(24 * 60 * 60 * 1000).catch(error => { + if (generation === this.generation) events.onScanFailed?.(-1, String(error.message ?? error)) + }) + return true + } + stopScan(): void { + ++this.generation; this.cancelCollection?.() + if (this.off) { this.off(); this.off = null; this.ble.stopScan() } + } + // CoreBluetooth does not expose the phone's bond list. Fresh advertisements + // supply both identity and the UUID mapping that iOS needs for connections. + emitBondedDevices(): void {} + async getBondedCandidates(): Promise { return [...this.ble.devices.values()] } + async scanCandidates(timeoutMs = 6000): Promise { + const generation = this.generation + await this.ble.ensureReady() + if (generation !== this.generation) throw new Error('Bluetooth scan cancelled.') + return new Promise((resolve, reject) => { + const samples: RawAdvertisement[] = [] + const finish = (error?: Error) => { + clearTimeout(timer); this.cancelCollection = null; this.stopScan() + if (error) reject(error); else resolve(samples) + } + const timer = setTimeout(() => finish(), timeoutMs) + if (!this.startScan({ onAdvertisement: sample => samples.push(sample), + onScanFailed: (_code, message) => finish(new Error(message)) })) { + finish(new Error('Bluetooth is unavailable.')); return + } + this.cancelCollection = () => { this.cancelCollection = null; clearTimeout(timer); reject(new Error('Bluetooth scan cancelled.')) } + }) + } +} diff --git a/app/native/device-discovery.ts b/app/native/device-discovery.ts index e35c13c0..08e3b131 100644 --- a/app/native/device-discovery.ts +++ b/app/native/device-discovery.ts @@ -1,7 +1,7 @@ import { Utils } from "@nativescript/core"; import { type RawAdvertisement } from "../g2/even-advertisement"; -import { DiscoveryAggregator } from "../g2/pairing-candidates"; +export { buildAddressSet } from "./device-discovery-common"; declare const com: any; @@ -108,53 +108,6 @@ export class DeviceDiscoveryBridge { } } -/** - * Pick one address per role from a batch of raw advertisements — the manual - * address page's "load" helper and the flash flow's address resolution. - * - * Runs the batch through the same `DiscoveryAggregator` the pairing page - * uses, so left/right come from ONE serial-joined pair (the closest complete - * one) rather than from whichever arm of whatever pair advertised last — - * "latest per role" silently welded together arms of two different pairs. - * When no arm carries a serial at all (a bonded-device listing has no - * manufacturer data), there is nothing to join on and the latest arm per side - * is used as before. - */ -export function buildAddressSet(candidates: RawAdvertisement[]): DiscoveredAddressSet { - const aggregator = new DiscoveryAggregator(); - for (const raw of candidates) aggregator.ingest(raw); - const classified = aggregator.advertisements(); - const pairs = aggregator.pairs(); - - let left = ""; - let right = ""; - const completePair = pairs.find((pair) => pair.completeness === "complete"); - if (completePair) { - left = completePair.left!.address; - right = completePair.right!.address; - } else if (classified.every((candidate) => !candidate.serial)) { - for (const role of ["left", "right"] as const) { - const latest = classified - .filter((candidate) => candidate.role === role) - .sort((a, b) => b.seenAtMs - a.seenAtMs)[0]; - if (role === "left") left = latest?.address ?? ""; - else right = latest?.address ?? ""; - } - } - // Arms with serials but no complete pair: leave the addresses empty. The - // summary below names what was heard; guessing would defeat the serial join. - - 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, - right, - ring: aggregator.rings()[0]?.advertisement.address ?? "", - summary: lines.length ? lines.join("\n") : "No matching devices found.", - }; -} function parseRawArray(json: string): RawAdvertisement[] { const items = JSON.parse(json) as unknown[]; diff --git a/app/native/device-info-probe.ios.ts b/app/native/device-info-probe.ios.ts new file mode 100644 index 00000000..ac82157c --- /dev/null +++ b/app/native/device-info-probe.ios.ts @@ -0,0 +1,68 @@ +import { StockConnection, StockTimeout } from '../g2/stock-connection' +import * as p from '../g2/ble-protocol' +import { iosBluetooth } from './ios-bluetooth' +import type { DeviceInfo, DeviceInfoState } from './device-info-probe' +export type { DeviceInfo, DeviceInfoState } from './device-info-probe' + +export class DeviceInfoProbe { + private logs = new Set<(line: string) => void>() + private states = new Set<(state: DeviceInfoState, detail: string) => void>() + private link = new StockConnection(iosBluetooth(), line => { for (const fn of this.logs) fn(line) }) + constructor(private right: string, private left = '') {} + onLog(fn: (line: string) => void): () => void { this.logs.add(fn); return () => this.logs.delete(fn) } + onStateChange(fn: (state: DeviceInfoState, detail: string) => void): () => void { this.states.add(fn); return () => this.states.delete(fn) } + async run(): Promise { + const snapshots = new Map() + const parse = (message: p.ProtocolMessage): DeviceInfo => { + const values = p.readBytes(message.payload, 4) + return { leftVersion: values ? p.readString(values, 5) : '', rightVersion: values ? p.readString(values, 6) : '', extension: p.readString(message.payload, 100) } + } + const hasVersion = (info: DeviceInfo) => !!(info.leftVersion || info.rightVersion || info.extension) + // Some stock builds push settings using their own magic instead of the + // query's magic. Keep a valid snapshot as the Android probe does. + this.link.onMessage((role, message) => { + if (message.sid === p.SID.settings) { const info = parse(message); if (hasVersion(info)) snapshots.set(role, info) } + }) + try { + await this.link.resolve({ right: this.right, left: this.left, ring: '' }) + for (const role of ['right', ...(this.left ? ['left'] : [])]) { + await this.bringUp(role) + } + let lastError: unknown + for (const role of ['right', ...(this.left ? ['left'] : [])]) { + for (const fn of this.states) fn('querying', role) + try { + if (!this.link.isConnected(role)) await this.bringUp(role) + await this.link.request(role, p.SID.launch, p.prelude, 3500, 156) + for (let attempt = 0; attempt < 2; attempt++) { + try { + const message = await this.link.request(role, p.SID.settings, p.settingsQuery) + const info = parse(message) + if (hasVersion(info)) return info + } catch (error) { this.link.check(); lastError = error } + if (snapshots.has(role)) return snapshots.get(role)! + } + } catch (error) { this.link.check(); lastError = error } + } + throw lastError ?? new Error("Connected, but couldn't read a firmware version.") + } finally { this.close() } + } + private async bringUp(role: string): Promise { + for (let attempt = 0; ; attempt++) { + try { + for (const fn of this.states) fn('connecting', role) + await this.link.connect(role) + for (const fn of this.states) fn('authenticating', role) + // Version reads remain available on older stock builds without an auth ACK. + try { await this.link.authenticate(role) } catch (error) { if (!(error instanceof StockTimeout)) throw error } + return + } catch (error) { + this.link.check(); this.link.disconnect(role) + if (attempt === 2) throw error + await new Promise(resolve => setTimeout(resolve, 1500)); this.link.check() + } + } + } + cancel(): void { this.link.close() } + close(): void { this.link.close() } +} diff --git a/app/native/firmware-files.ios.ts b/app/native/firmware-files.ios.ts new file mode 100644 index 00000000..4dd8f2e5 --- /dev/null +++ b/app/native/firmware-files.ios.ts @@ -0,0 +1,11 @@ +import { toData, fromData } from './kotlin-data' +declare const FaceclawCrypto: any +export function firmwareSha256(buffer: ArrayBuffer): string { return String(FaceclawCrypto.sha256(toData(new Uint8Array(buffer)))) } +export function writeFirmwareFile(path: string, buffer: ArrayBuffer): void { + if (!toData(new Uint8Array(buffer)).writeToFileAtomically(path, true)) throw new Error('Could not save the verified firmware image.') +} +export function readFirmwareFile(path: string): Uint8Array { + const data = NSData.dataWithContentsOfFile(path) + if (!data) throw new Error('Could not read the prepared firmware image.') + return fromData(data) +} diff --git a/app/native/firmware-files.ts b/app/native/firmware-files.ts new file mode 100644 index 00000000..59236354 --- /dev/null +++ b/app/native/firmware-files.ts @@ -0,0 +1,3 @@ +declare const com: any +export function firmwareSha256(buffer: ArrayBuffer): string { return String(com.faceclaw.app.FaceclawFirmwareUtil.sha256Hex(buffer)) } +export function writeFirmwareFile(path: string, buffer: ArrayBuffer): void { com.faceclaw.app.FaceclawFirmwareUtil.writeFile(path, buffer) } diff --git a/app/native/firmware-flasher.ios.ts b/app/native/firmware-flasher.ios.ts new file mode 100644 index 00000000..bcbf8613 --- /dev/null +++ b/app/native/firmware-flasher.ios.ts @@ -0,0 +1,83 @@ +import { Application } from '@nativescript/core' +import { StockConnection } from '../g2/stock-connection' +import { flashLensImage, validateFirmware } from '../g2/firmware-ota' +import { CFW_PATCH_SET } from '../g2/firmware/cfw-patches' +import { firmwareSha256, readFirmwareFile } from './firmware-files.ios' +import { iosBluetooth } from './ios-bluetooth' +import type { FlashState, FlashProgress } from './firmware-flasher' +export type { FlashState, FlashProgress } from './firmware-flasher' + +export class FirmwareFlasher { + private logs = new Set<(line: string) => void>() + private states = new Set<(state: FlashState, detail: string) => void>() + private progresses = new Set<(value: FlashProgress) => void>() + private completes = new Set<(success: boolean, detail: string) => void>() + private link = new StockConnection(iosBluetooth(), line => this.log(line)) + private started = false + private cancelled = false + private sleeps = new Set<() => void>() + private foregroundError = '' + constructor(private addresses: { right: string; left: string }, private path: string) {} + onLog(fn: (line: string) => void): () => void { this.logs.add(fn); return () => this.logs.delete(fn) } + onStateChange(fn: (state: FlashState, detail: string) => void): () => void { this.states.add(fn); return () => this.states.delete(fn) } + onProgress(fn: (value: FlashProgress) => void): () => void { this.progresses.add(fn); return () => this.progresses.delete(fn) } + onComplete(fn: (success: boolean, detail: string) => void): () => void { this.completes.add(fn); return () => this.completes.delete(fn) } + private log(line: string): void { for (const fn of this.logs) fn(line) } + private state(state: FlashState, detail = ''): void { for (const fn of this.states) fn(state, detail) } + start(): void { if (!this.started) { this.started = true; void this.run() } } + private readonly backgrounded = () => { + this.foregroundError = 'Flashing was interrupted because Faceclaw left the foreground. Keep both lenses charged, return to Faceclaw, and retry both lenses.' + this.cancel() + } + private async run(): Promise { + const previousIdle = UIApplication.sharedApplication.idleTimerDisabled + UIApplication.sharedApplication.idleTimerDisabled = true + Application.on(Application.suspendEvent, this.backgrounded) + let success = false, detail = '' + try { + this.link.check() + if (UIApplication.sharedApplication.applicationState !== UIApplicationState.Active) throw new Error('Keep Faceclaw open on the iPhone while flashing.') + this.state('validating') + const image = readFirmwareFile(this.path) + const hash = firmwareSha256(image.buffer) + if (![CFW_PATCH_SET.outputSha256, CFW_PATCH_SET.baseSha256].includes(hash)) throw new Error('Prepared firmware failed SHA-256 verification. Prepare the firmware again before flashing.') + const segments = validateFirmware(image) + await this.link.resolve({ ...this.addresses, ring: '' }) + for (const role of ['left', 'right']) { + if (role === 'right') { + this.state('rebooting', 'Left lens done. Both lenses reboot briefly; reconnecting for the right lens.') + await this.delay(5000) + } + this.state('connecting', role) + const deadline = Date.now() + (role === 'left' ? 30_000 : 120_000) + for (;;) { + try { await this.link.connect(role, true); await this.link.authenticate(role); break } + catch (error) { this.link.check(); this.link.disconnect(role); if (Date.now() >= deadline) throw error; await this.delay(2500) } + } + await this.delay(2500) + this.state('flashing', role) + await flashLensImage(this.link, role, image, segments, value => { for (const fn of this.progresses) fn(value) }, line => this.log(line), ms => this.delay(ms)) + this.link.disconnect(role) + } + success = true; detail = 'Both lenses flashed. Your glasses are rebooting.' + } catch (error) { + detail = this.foregroundError || (this.cancelled ? 'Cancelled. Retry with both lenses powered on to complete installation.' : String((error as Error).message ?? error)) + } finally { + Application.off(Application.suspendEvent, this.backgrounded) + UIApplication.sharedApplication.idleTimerDisabled = previousIdle + this.link.close() + } + this.state(success ? 'done' : 'error', detail) + for (const fn of this.completes) fn(success, detail) + } + private delay(ms: number): Promise { + this.link.check() + return new Promise((resolve, reject) => { + const cancel = () => { clearTimeout(timer); this.sleeps.delete(cancel); reject(new Error('Cancelled.')) } + const timer = setTimeout(() => { this.sleeps.delete(cancel); resolve() }, ms) + this.sleeps.add(cancel) + }) + } + cancel(): void { this.cancelled = true; this.link.close(); for (const cancel of [...this.sleeps]) cancel() } + close(): void { this.cancel() } +} diff --git a/app/native/firmware-flasher.ts b/app/native/firmware-flasher.ts index cd75d0b7..ed9ac5f9 100644 --- a/app/native/firmware-flasher.ts +++ b/app/native/firmware-flasher.ts @@ -2,18 +2,8 @@ import { Utils } from "@nativescript/core"; declare const com: any; -export type FlashState = "validating" | "connecting" | "flashing" | "rebooting" | "done" | "error"; - -export type FlashProgress = { - lens: string; - componentIndex: number; - componentCount: number; - blockIndex: number; - blockCount: number; - /** Bytes flashed so far across the whole lens image — the size-weighted progress signal. */ - bytesSent: number; - bytesTotal: number; -}; +import type { FlashState, FlashProgress } from "../g2/firmware-types"; +export type { FlashState, FlashProgress } from "../g2/firmware-types"; /** * TS wrapper around the native FaceclawFirmwareFlasher — streams a verified diff --git a/app/native/flash-prompt-communicator.ios.ts b/app/native/flash-prompt-communicator.ios.ts new file mode 100644 index 00000000..bea0933f --- /dev/null +++ b/app/native/flash-prompt-communicator.ios.ts @@ -0,0 +1,88 @@ +import { StockConnection } from '../g2/stock-connection' +import { createFlashPrompt, flashPromptSelection } from '../g2/flash-prompt-protocol' +import * as p from '../g2/ble-protocol' +import { iosBluetooth } from './ios-bluetooth' +import type { FlashPromptBattery, FlashPromptState } from './flash-prompt-communicator' +export type { FlashPromptBattery, FlashPromptState } from './flash-prompt-communicator' + +export class FlashPromptCommunicator { + private logs = new Set<(line: string) => void>() + private states = new Set<(state: FlashPromptState, detail: string) => void>() + private results = new Set<(approved: boolean) => void>() + private batteries = new Set<(battery: FlashPromptBattery) => void>() + private link = new StockConnection(iosBluetooth(), line => { for (const fn of this.logs) fn(line) }) + private closed = false + private started = false + private heartbeat: ReturnType | null = null + private stopSelection: (() => void) | null = null + constructor(private addresses: { right: string; left: string }, private warning: string, private options?: { skipPrompt?: boolean }) {} + onLog(fn: (line: string) => void): () => void { this.logs.add(fn); return () => this.logs.delete(fn) } + onStateChange(fn: (state: FlashPromptState, detail: string) => void): () => void { this.states.add(fn); return () => this.states.delete(fn) } + onResult(fn: (approved: boolean) => void): () => void { this.results.add(fn); return () => this.results.delete(fn) } + onBattery(fn: (battery: FlashPromptBattery) => void): () => void { this.batteries.add(fn); return () => this.batteries.delete(fn) } + private state(state: FlashPromptState, detail = ''): void { for (const fn of this.states) fn(state, detail) } + start(): void { if (!this.started) { this.started = true; void this.run() } } + private async run(): Promise { + try { + this.state('connecting') + await this.link.resolve({ ...this.addresses, ring: '' }) + // Complete pairing for one peripheral before starting the other. + for (const role of ['right', 'left']) { + await this.link.connect(role) + if (role === 'right') this.state('connected') + await this.link.authenticate(role) + } + await this.link.request('right', p.SID.launch, p.prelude, 3500, 156) + if (!this.options?.skipPrompt) { + // Listen before creating the page: an immediate tap may precede its ACK. + const selection = this.selection() + // Attach a rejection handler immediately, even while create-page is pending. + void selection.catch(() => {}) + for (let attempt = 0; ; attempt++) { + try { await this.link.request('right', p.SID.hub, magic => createFlashPrompt(magic, this.warning)); break } + catch (error) { this.link.check(); if (attempt) throw error } + } + this.state('prompting') + this.heartbeat = setInterval(() => { + void this.link.write('right', p.SID.hub, p.heartbeat(this.link.nextMagic())).catch(error => { + if (!this.closed) this.state('error', String(error.message ?? error)) + this.close() + }) + }, 4000) + const approved = await selection + this.stopHeartbeat() + // Stock shutdown returns the glasses to their normal UI before OTA. + await this.link.write('right', p.SID.hub, p.concat(p.integer(1, 9), p.integer(2, this.link.nextMagic()), p.bytes(11, p.integer(1, 0)))) + if (!approved) { for (const fn of this.results) fn(false); return } + } + this.state('battery') + const battery: FlashPromptBattery = { right: null, left: null } + for (const role of ['right', 'left'] as const) { + for (let attempt = 0; attempt < 2; attempt++) { + try { + const message = await this.link.request(role, p.SID.settings, p.settingsQuery) + const values = p.readBytes(message.payload, 4), value = values ? p.readInteger(values, 12, -1) : -1 + if (value >= 0 && value <= 100) { battery[role] = value; break } + } catch (error) { this.link.check() } + } + } + for (const fn of this.batteries) fn(battery) + for (const fn of this.results) fn(true) + } catch (error) { if (!this.closed) this.state('error', String((error as Error).message ?? error)) } + finally { this.close() } + } + private selection(): Promise { + return new Promise((resolve, reject) => { + const cleanup = () => { clearTimeout(timer); off(); this.stopSelection = null } + const off = this.link.onMessage((role, message) => { + const result = role === 'right' ? flashPromptSelection(message) : null + if (result !== null) { cleanup(); resolve(result) } + }) + const timer = setTimeout(() => { cleanup(); reject(new Error('No response from the glasses.')) }, 120_000) + this.stopSelection = () => { cleanup(); reject(new Error('Cancelled.')) } + }) + } + private stopHeartbeat(): void { if (this.heartbeat) clearInterval(this.heartbeat); this.heartbeat = null } + cancel(): void { this.close() } + close(): void { this.closed = true; this.stopHeartbeat(); this.stopSelection?.(); this.link.close() } +} diff --git a/app/phone-ui/config-page-shared.ts b/app/phone-ui/config-page-shared.ts new file mode 100644 index 00000000..301d0039 --- /dev/null +++ b/app/phone-ui/config-page-shared.ts @@ -0,0 +1,13 @@ +import { NavigatedData, Page } from "@nativescript/core"; + +import { ConfigViewModel } from "./config-view-model"; + +export function navigatingTo(args: NavigatedData): void { + const page = args.object as Page; + // Preserve the model across back-navigation (returning from the firmware + // check page) so the onboarding "Continue" flow isn't lost. + if (!page.bindingContext) { + const context = (args.context as { onboarding?: boolean } | undefined) ?? undefined; + page.bindingContext = new ConfigViewModel({ onboarding: context?.onboarding ?? false }); + } +} diff --git a/app/phone-ui/config-page.ios.ts b/app/phone-ui/config-page.ios.ts index 7099ccbf..b242bfe6 100644 --- a/app/phone-ui/config-page.ios.ts +++ b/app/phone-ui/config-page.ios.ts @@ -1,68 +1 @@ -import { Button, Color, GridLayout, Label, Page, ScrollView, StackLayout, TextField } from '@nativescript/core' -import { loadDeviceAddresses, normalizeMacAddress, saveDeviceAddresses } from '../g2/device-addresses' -import { deviceAddressError, type IosDevice } from '../g2/ios-peripheral-identity' -import { iosBluetooth } from '../native/ios-bluetooth' - -export function createConfigureDevicesPage(): Page { - const page = new Page(); page.actionBarHidden = true - const root = new GridLayout(); root.rows = 'auto,*,auto'; root.padding = 16; page.content = root - const title = new Label(); title.text = 'Configure devices'; title.fontSize = 24; title.fontWeight = 'bold'; root.addChild(title) - const scroll = new ScrollView(); GridLayout.setRow(scroll, 1); root.addChild(scroll) - const form = new StackLayout(); scroll.content = form - const text = (value: string, size = 15) => { - const label = new Label(); label.text = value; label.fontSize = size; label.textWrap = true; label.marginTop = 12; form.addChild(label); return label - } - text('Enter the G2 arm MAC addresses and optional R1 ring address. Scan once so this iPhone can find the matching devices. Saving does not connect.') - const stored = loadDeviceAddresses() - const fields = {} as Record<'left' | 'right' | 'ring', TextField> - for (const role of ['right', 'left', 'ring'] as const) { - text(role === 'ring' ? 'R1 ring MAC (optional)' : `${role === 'left' ? 'Left' : 'Right'} arm MAC`) - const field = new TextField(); field.text = stored[role]; field.hint = 'AA:BB:CC:DD:EE:FF' - field.autocorrect = false; field.autocapitalizationType = 'allcharacters'; field.fontSize = 18 - field.padding = 10; field.backgroundColor = new Color('#ffffff'); field.accessibilityLabel = `${role} MAC address` - field.accessibilityIdentifier = `device-address-${role}`; form.addChild(field); fields[role] = field - } - const status = text('Addresses are saved only when you tap Save.'); status.color = new Color('#285c45') - const button = (label: string, action: () => void) => { - const view = new Button(); view.text = label; view.fontSize = 15; view.marginTop = 12; view.on('tap', action); return view - } - let off: (() => void) | null = null - let closed = false - const found = new StackLayout() - const rows = new Map() - const showDevice = (device: IosDevice) => { - if (device.connectable === false) return - let row = rows.get(device.address) - if (!row) { - row = button('', () => { fields[device.role].text = device.address; status.text = `${device.role} address selected. Tap Save to keep it.` }) - row.textWrap = true; row.fontSize = 13; rows.set(device.address, row); found.addChild(row) - } - row.text = `${device.role === 'ring' ? 'Ring' : device.role === 'left' ? 'Left arm' : 'Right arm'} · ${device.address}\n${device.serial || device.name} · ${device.rssi ?? '?'} dBm` - } - const scan = button('Scan for devices', () => { - for (const field of Object.values(fields)) field.dismissSoftInput() - const ble = iosBluetooth() - off?.(); off = ble.onEvent(event => { - if (closed) return - if (event.kind === 'device' && 'device' in event) showDevice(event.device) - if (event.kind === 'scan-stopped') { scan.isEnabled = true; status.text = rows.size ? 'Tap a device to fill its address, then Save.' : 'No matching devices found. Wake the glasses and disconnect other apps, then scan again.' } - }) - rows.clear(); found.removeChildren(); scan.isEnabled = false; status.text = 'Scanning… Allow Bluetooth if iOS asks.' - void ble.startScan().catch(error => { if (!closed) { status.text = String(error.message ?? error); scan.isEnabled = true } }) - }) - form.addChild(scan); form.addChild(found) - const footer = new GridLayout(); footer.columns = '*,*'; GridLayout.setRow(footer, 2); root.addChild(footer) - const close = () => { closed = true; off?.(); off = null; iosBluetooth().stopScan(); page.closeModal() } - const back = button('Back', close); footer.addChild(back) - const save = button('Save', () => { - const addresses = { right: normalizeMacAddress(fields.right.text), left: normalizeMacAddress(fields.left.text), ring: normalizeMacAddress(fields.ring.text) } - const error = deviceAddressError(addresses) - if (error) { status.text = error; return } - saveDeviceAddresses(addresses) - for (const role of ['left', 'right', 'ring'] as const) { fields[role].text = addresses[role]; fields[role].dismissSoftInput() } - status.text = 'Saved device addresses. Return to the main screen and choose Connect.' - }) - GridLayout.setColumn(save, 1); footer.addChild(save) - page.on('unloaded', () => { closed = true; off?.(); off = null; iosBluetooth().stopScan() }) - return page -} +export { navigatingTo } from "./config-page-shared"; diff --git a/app/phone-ui/config-page.ts b/app/phone-ui/config-page.ts index 301d0039..b242bfe6 100644 --- a/app/phone-ui/config-page.ts +++ b/app/phone-ui/config-page.ts @@ -1,13 +1 @@ -import { NavigatedData, Page } from "@nativescript/core"; - -import { ConfigViewModel } from "./config-view-model"; - -export function navigatingTo(args: NavigatedData): void { - const page = args.object as Page; - // Preserve the model across back-navigation (returning from the firmware - // check page) so the onboarding "Continue" flow isn't lost. - if (!page.bindingContext) { - const context = (args.context as { onboarding?: boolean } | undefined) ?? undefined; - page.bindingContext = new ConfigViewModel({ onboarding: context?.onboarding ?? false }); - } -} +export { navigatingTo } from "./config-page-shared"; diff --git a/app/phone-ui/config-page.xml b/app/phone-ui/config-page.xml index cffe6f9e..d1b7288d 100644 --- a/app/phone-ui/config-page.xml +++ b/app/phone-ui/config-page.xml @@ -16,21 +16,21 @@ -