forked from Blendman974/faceclaw
iOS: fix the audio-packet and window-close crashes, stop retrying the ring
- Rename IosAudioPacketListener.onAudioPacket to onNsDataAudioPacket. The selector collided with FaceclawAudioPacketListener's, Kotlin/Native mangled one of the two depending on export order, and the first glasses audio packet aborted the app with "unrecognized selector". - Closing a window (e.g. Transcribe from its system menu) aborted the app: the menu pop re-renders the window, that frame is queued behind the surface removal, and Kotlin's compositor throws on the unknown surface. The bridge now tracks which surfaces Kotlin holds and drops stale calls inside the queue, submit re-checks the window is still open, and the IosGlassesSession surface wrappers log and drop compositor errors instead of aborting. - Only connect to the R1 ring from the phone in "Direct" mode, as Android does. iOS always tried; the failing connect retried every few seconds and starved the glasses link, so the glasses image lagged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
2bb7b3ea1a
commit
ecb6c7f465
4 files changed
+151
-21
No files matched your search
@@ -0,0 +1,76 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { loader } = require('./helpers/load-typescript.cjs');
|
||||
|
||||
// FaceclawCommunicatorBridge over a fake Kotlin session that, like the real
|
||||
// SurfaceCompositor, rejects calls for surfaces it does not hold.
|
||||
function harness() {
|
||||
const calls = [];
|
||||
const surfaces = new Set();
|
||||
const session = {
|
||||
setRequiredFirmwareRevisionRevision() {}, setListenerListener() {}, setPreviewAnimationListenerListener() {},
|
||||
configureSurfaceIdXYWidthHeightZOrderTransparency(id) { calls.push(['configure', id]); surfaces.add(id); return true; },
|
||||
removeSurfaceId(id) { calls.push(['remove', id]); surfaces.delete(id); },
|
||||
setSurfaceVisibleIdVisible(id) { calls.push(['visible', id]); if (!surfaces.has(id)) throw new Error(`unknown surface ${id}`); return true; },
|
||||
setSurfaceDepthIdDepth(id) { calls.push(['depth', id]); if (!surfaces.has(id)) throw new Error(`unknown surface ${id}`); return true; },
|
||||
submitSurfaceFramePixels8bppSurfaceIdRectXRectYRectWidthRectHeightContentFingerprintPaintMsFrameIdGlyphs(_pixels, id) {
|
||||
calls.push(['frame', id]);
|
||||
if (!surfaces.has(id)) throw new Error(`unknown surface ${id}`);
|
||||
return true;
|
||||
},
|
||||
isSurfaceCurrentSurfaceIdFingerprint: (id, fingerprint) => fingerprint === 'same',
|
||||
};
|
||||
class NSObject { static new() { return new this(); } }
|
||||
const timers = [];
|
||||
const load = loader({
|
||||
NSObject, NativeClass: () => cls => cls, setTimeout: (fn, delay) => { timers.push({ fn, delay }); return timers.length; }, clearTimeout: id => { timers[id - 1].cleared = true; },
|
||||
FaceclawKitIosGlassesSession: { alloc: () => ({ initWithRightAddressLeftAddressRingAddress: () => session }) },
|
||||
FaceclawKitFaceclawBleCommunicatorListener: {}, FaceclawKitIosAncsListener: {}, FaceclawKitIosAudioPacketListener: {},
|
||||
FaceclawKitFaceclawCompassListener: {}, console: { log() {}, warn() {} },
|
||||
}, {
|
||||
'@nativescript/core': { File: {}, knownFolders: {}, path: {} },
|
||||
'../g2/firmware-compat': { REQUIRED_FACECLAW_FIRMWARE_VERSION: 37 },
|
||||
'./kotlin-data': { toData: bytes => bytes, fromData: data => data },
|
||||
'./ios-graphics': { previewPixels() {} },
|
||||
'./ios-bluetooth': { iosBluetooth: {} },
|
||||
});
|
||||
const { FaceclawCommunicatorBridge } = load('app/native/faceclaw-communicator.ios.ts');
|
||||
const bridge = new FaceclawCommunicatorBridge({ right: 'r', left: 'l' });
|
||||
// Run queued native calls (each is one setTimeout(0) hop) until none are left.
|
||||
async function drain() {
|
||||
for (let i = 0; i < 50; i++) {
|
||||
await new Promise(resolve => setImmediate(resolve));
|
||||
const next = timers.find(timer => !timer.ran && !timer.cleared && timer.delay === 0);
|
||||
if (!next) { await new Promise(resolve => setImmediate(resolve)); if (!timers.some(t => !t.ran && !t.cleared && t.delay === 0)) return; continue; }
|
||||
next.ran = true; next.fn();
|
||||
}
|
||||
}
|
||||
return { bridge, calls, drain };
|
||||
}
|
||||
|
||||
const rect = { x: 0, y: 0, width: 2, height: 1 };
|
||||
const options = { x: 0, y: 0, width: 2, height: 1, zOrder: 0, transparency: 'opaque' };
|
||||
|
||||
test('a frame queued behind its surface removal is dropped instead of reaching Kotlin', async () => {
|
||||
const h = harness();
|
||||
const configured = h.bridge.configureSurface('window:transcribe', options); await h.drain(); await configured;
|
||||
// Close-window order: the removal is queued first, the in-flight render's frame lands behind it.
|
||||
const removed = h.bridge.removeSurface('window:transcribe');
|
||||
const frame = h.bridge.submitSurfaceFrame('window:transcribe', new Uint8Array(2), rect, 'f');
|
||||
const visible = h.bridge.setSurfaceVisible('window:transcribe', true);
|
||||
const depth = h.bridge.setSurfaceDepth('window:transcribe', 1);
|
||||
await h.drain();
|
||||
await Promise.all([removed, frame, visible, depth]);
|
||||
assert.deepEqual(h.calls, [['configure', 'window:transcribe'], ['remove', 'window:transcribe']]);
|
||||
});
|
||||
|
||||
test('frames for a live surface still go through, including the idle inline path', async () => {
|
||||
const h = harness();
|
||||
const configured = h.bridge.configureSurface('window:calc', options); await h.drain(); await configured;
|
||||
await h.bridge.submitSurfaceFrame('window:calc', new Uint8Array(2), rect, 'f');
|
||||
assert.deepEqual(h.calls.at(-1), ['frame', 'window:calc']);
|
||||
const reconfigured = h.bridge.configureSurface('window:calc', options);
|
||||
const frame = h.bridge.submitSurfaceFrame('window:calc', new Uint8Array(2), rect, 'g');
|
||||
await h.drain(); await Promise.all([reconfigured, frame]);
|
||||
assert.deepEqual(h.calls.slice(-2), [['configure', 'window:calc'], ['frame', 'window:calc']]);
|
||||
});
|
||||
Reference in new issue
Block a user