forked from Blendman974/faceclaw
iOS porting: Config pull and push scripts; Terminal works; voice input with Siri works
This commit is contained in:
1 parent
b07ae0b479
commit
319d3dc44b
21 files changed
+339
-9
No files matched your search
@@ -0,0 +1,10 @@
|
||||
const { execFileSync } = require('node:child_process');
|
||||
const { mkdtempSync, rmSync } = require('node:fs');
|
||||
const { tmpdir } = require('node:os');
|
||||
const { join, resolve } = require('node:path');
|
||||
const root = resolve(__dirname, '..'), dir = mkdtempSync(join(tmpdir(), 'faceclaw-config-'));
|
||||
try {
|
||||
execFileSync('xcrun', ['clang', '-fobjc-arc', '-framework', 'Foundation', '-I', 'App_Resources/iOS/src',
|
||||
'tests/native/ios-config-test.m', 'App_Resources/iOS/src/FaceclawConfigPort.m', '-o', join(dir, 'config-test')], { cwd: root, stdio: 'inherit' });
|
||||
execFileSync(join(dir, 'config-test'), [dir], { stdio: 'inherit' });
|
||||
} finally { rmSync(dir, { recursive: true, force: true }); }
|
||||
@@ -0,0 +1,21 @@
|
||||
const test = require('node:test');
|
||||
const { execFileSync } = require('node:child_process');
|
||||
test('iOS config codec preserves Android XML and JSON types and rejects malformed imports', () => {
|
||||
execFileSync('python3', ['-c', `
|
||||
import importlib.util, pathlib, tempfile
|
||||
spec = importlib.util.spec_from_file_location('config', 'scripts/ios_config.py')
|
||||
m = importlib.util.module_from_spec(spec); spec.loader.exec_module(m)
|
||||
values = {'terminal.connections': '[{"url":"g2mirror://test@host"}]', 'flag': True, 'empty': '', 'number': 42, 'ratio': 0.25, 'unicode': 'π & < 🔋\\nnext'}
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
p = pathlib.Path(d) / 'settings'
|
||||
for xml in [False, True]:
|
||||
m.atomic_write(p, m.encode_config(values, xml))
|
||||
assert m.read_config(p) == values
|
||||
assert p.stat().st_mode & 0o777 == 0o600
|
||||
for invalid in [b'{}', b'<map><set name="x"/></map>', b'<map><boolean name="x" value="maybe"/></map>', b'<map><string name="x">a</string><string name="x">b</string></map>', b'{"schema":1,"settings":{"x":null}}', b'{"schema":1,"settings":{"x":NaN}}', b'<map><string name="x">oops']:
|
||||
p.write_bytes(invalid)
|
||||
try: m.read_config(p)
|
||||
except (ValueError, m.ET.ParseError): pass
|
||||
else: raise AssertionError('accepted invalid config')
|
||||
`], { stdio: 'inherit' });
|
||||
});
|
||||
@@ -0,0 +1,10 @@
|
||||
const { execFileSync } = require('node:child_process');
|
||||
const { mkdtempSync, rmSync } = require('node:fs');
|
||||
const { tmpdir } = require('node:os');
|
||||
const { join } = require('node:path');
|
||||
const dir = mkdtempSync(join(tmpdir(), 'faceclaw-transcript-'));
|
||||
try {
|
||||
execFileSync('xcrun', ['clang', '-fobjc-arc', '-framework', 'Foundation', '-I', 'App_Resources/iOS/src',
|
||||
'tests/native/ios-speech-transcript-test.m', 'App_Resources/iOS/src/FaceclawSpeechTranscript.m', '-o', join(dir, 'test')], { stdio: 'inherit' });
|
||||
execFileSync(join(dir, 'test'), [], { stdio: 'inherit' });
|
||||
} finally { rmSync(dir, { recursive: true, force: true }); }
|
||||
@@ -0,0 +1,43 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
const vm = require('node:vm');
|
||||
const ts = require('typescript');
|
||||
function load(file, context) {
|
||||
const sandbox = { exports: {}, ...context };
|
||||
vm.runInNewContext(ts.transpileModule(fs.readFileSync(file, 'utf8'), {
|
||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 } }).outputText, sandbox);
|
||||
return sandbox.exports;
|
||||
}
|
||||
test('iOS Type Into App submits UTF-8 terminal text and delays Enter at the byte boundary without Java', () => {
|
||||
const sent = [];
|
||||
const { G2MirrorClient } = load('app/native/g2mirror-client.ts', {
|
||||
require: () => ({}), global: { isIOS: true }, NSUTF8StringEncoding: 4,
|
||||
NSString: { stringWithString: text => ({
|
||||
lengthOfBytesUsingEncoding: () => Buffer.byteLength(text, 'utf8'),
|
||||
dataUsingEncoding: () => ({ base64EncodedStringWithOptions: () => Buffer.from(text).toString('base64') }),
|
||||
}) },
|
||||
});
|
||||
const client = new G2MirrorClient({});
|
||||
client.ws = { sendText: json => sent.push(JSON.parse(json)) };
|
||||
client.handleMessage(JSON.stringify({ type: 'connect', command: 'test' }));
|
||||
const { VoiceInputLayer } = load('app/ui/shell/voice-input.ts', {
|
||||
require: id => id.includes('voice-control') ? { voiceControlBridge: { stop() {} } }
|
||||
: id.includes('dashboard-settings') ? { anthropicApiKeySetting: { get: () => '' } } : {},
|
||||
global: { isIOS: true },
|
||||
});
|
||||
for (const text of ['hello terminal', 'café π 🔋', 'line one\n第二行', '']) {
|
||||
let closed = false;
|
||||
const layer = new VoiceInputLayer({ actions: { requestRender() {} }, onClosed() {},
|
||||
dismiss() { closed = true; layer.onRemoved(); }, sendTargets: [{ id: 'app', label: 'Type Into App', onSend: value => client.submitInput(value) }] });
|
||||
layer.onTranscript({ text, isFinal: true });
|
||||
const count = sent.length;
|
||||
layer.menuRows()[0].onSelect();
|
||||
assert.equal(closed, true);
|
||||
if (!text) { assert.equal(sent.length, count); continue; }
|
||||
const message = sent.at(-1);
|
||||
assert.equal(message.type, 'input');
|
||||
assert.equal(Buffer.from(message.data, 'base64').toString('utf8'), text + '\r');
|
||||
assert.deepEqual(message.delays, [{ at: Buffer.byteLength(text), ms: 150 }]);
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,35 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "FaceclawConfigPort.h"
|
||||
#include <assert.h>
|
||||
static NSDictionary *send(NSString *dir, NSUserDefaults *defaults, NSString *domain, NSDictionary *request) {
|
||||
NSData *json = [NSJSONSerialization dataWithJSONObject:request options:0 error:nil];
|
||||
assert([json writeToFile:[dir stringByAppendingPathComponent:@"request.json"] atomically:YES]);
|
||||
[FaceclawConfigPort processDirectory:dir defaults:defaults domain:domain];
|
||||
assert(![NSFileManager.defaultManager fileExistsAtPath:[dir stringByAppendingPathComponent:@"request.json"]]);
|
||||
return [NSJSONSerialization JSONObjectWithData:[NSData dataWithContentsOfFile:[dir stringByAppendingPathComponent:@"response.json"]] options:0 error:nil];
|
||||
}
|
||||
int main(int argc, const char **argv) { @autoreleasepool {
|
||||
NSString *dir = [NSString stringWithUTF8String:argv[1]];
|
||||
NSString *domain = [@"com.faceclaw.config-test." stringByAppendingString:NSUUID.UUID.UUIDString];
|
||||
NSUserDefaults *defaults = [[NSUserDefaults alloc] initWithSuiteName:domain];
|
||||
[defaults setPersistentDomain:@{@"keep":@"original", @"enabled":@NO} forName:domain];
|
||||
NSDictionary *input = @{@"terminal.connections":@"[{\"url\":\"g2mirror://test@host\"}]", @"enabled":@YES, @"empty":@"", @"number":@42, @"unicode":@"π & < \n 🔋"};
|
||||
NSDictionary *reply = send(dir, defaults, domain, @{@"id":@"1", @"operation":@"push", @"settings":input});
|
||||
assert([reply[@"ok"] boolValue] && [reply[@"count"] intValue] == 5);
|
||||
assert([[defaults persistentDomainForName:domain][@"keep"] isEqual:@"original"]);
|
||||
NSDictionary *backup = [NSDictionary dictionaryWithContentsOfFile:[dir stringByAppendingPathComponent:@"previous.plist"]];
|
||||
assert([backup[@"keep"] isEqual:@"original"] && ![backup[@"enabled"] boolValue]);
|
||||
reply = send(dir, defaults, domain, @{@"id":@"2", @"operation":@"pull"});
|
||||
assert([reply[@"id"] isEqual:@"2"] && [reply[@"ok"] boolValue]);
|
||||
NSDictionary *output = reply[@"config"][@"settings"];
|
||||
for (NSString *key in input) assert([output[key] isEqual:input[key]]);
|
||||
assert(!output[@"ios.settings.changeToken"]);
|
||||
NSDictionary *before = [defaults persistentDomainForName:domain];
|
||||
reply = send(dir, defaults, domain, @{@"id":@"3", @"operation":@"push", @"settings":@{@"keep":@"changed", @"invalid":@[]}});
|
||||
assert(![reply[@"ok"] boolValue]);
|
||||
assert([[defaults persistentDomainForName:domain] isEqual:before]);
|
||||
reply = send(dir, defaults, domain, @{@"id":@"4", @"operation":@"bad"});
|
||||
assert(![reply[@"ok"] boolValue]);
|
||||
[defaults removePersistentDomainForName:domain]; [defaults synchronize];
|
||||
puts("PASS: native config merges typed values, backs up, exports, consumes requests once and rejects invalid imports atomically");
|
||||
} return 0; }
|
||||
@@ -0,0 +1,28 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "FaceclawSpeechTranscript.h"
|
||||
#include <assert.h>
|
||||
static void check(NSString *actual, NSString *expected) { assert([actual isEqual:expected]); }
|
||||
int main(void) { @autoreleasepool {
|
||||
FaceclawSpeechTranscript *t = [FaceclawSpeechTranscript new];
|
||||
check([t updateText:@"How" start:0 duration:0 settled:NO final:NO], @"How");
|
||||
check([t updateText:@"How are you" start:0 duration:0 settled:NO final:NO], @"How are you");
|
||||
check([t updateText:@"How are you?" start:0.5 duration:1.2 settled:YES final:NO], @"How are you?");
|
||||
check([t updateText:@"How are you?" start:0.5 duration:1.2 settled:YES final:NO], @"How are you?");
|
||||
check([t updateText:@"Fine" start:0 duration:0 settled:NO final:NO], @"How are you? Fine");
|
||||
check([t updateText:@"Fine thanks" start:0 duration:0 settled:NO final:NO], @"How are you? Fine thanks");
|
||||
check([t updateText:@"Fine, thanks." start:3 duration:1 settled:YES final:NO], @"How are you? Fine, thanks.");
|
||||
check([t updateText:@"" start:0 duration:0 settled:YES final:NO], @"How are you? Fine, thanks.");
|
||||
check([t updateText:@"Fine, thanks." start:0 duration:0 settled:YES final:YES], @"How are you? Fine, thanks.");
|
||||
// Identical utterances are real repetition, not duplicate callbacks.
|
||||
check([t updateText:@"Fine, thanks." start:0 duration:0 settled:NO final:NO], @"How are you? Fine, thanks. Fine, thanks.");
|
||||
check([t updateText:@"Fine, thanks." start:5 duration:1 settled:YES final:NO], @"How are you? Fine, thanks. Fine, thanks.");
|
||||
// Some OS/model combinations return cumulative text; retain it once.
|
||||
check([t updateText:@"How are you? Fine, thanks. Fine, thanks." start:0.5 duration:5.5 settled:YES final:NO], @"How are you? Fine, thanks. Fine, thanks.");
|
||||
t = [FaceclawSpeechTranscript new];
|
||||
check([t updateText:@"I scream" start:0.5 duration:1 settled:NO final:NO], @"I scream");
|
||||
check([t updateText:@"Ice cream" start:0.5 duration:1.1 settled:NO final:NO], @"Ice cream");
|
||||
check([t updateText:@"Ice cream is good." start:0.5 duration:2 settled:YES final:NO], @"Ice cream is good.");
|
||||
check([t updateText:@"Next sentence" start:4 duration:1 settled:NO final:NO], @"Ice cream is good. Next sentence");
|
||||
check([t updateText:@"Next sentence." start:4 duration:1 settled:YES final:NO], @"Ice cream is good. Next sentence.");
|
||||
puts("PASS: utterance accumulation, live revisions, repeated words, duplicate/cumulative results and empty final callbacks");
|
||||
} return 0; }
|
||||
@@ -0,0 +1,30 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const { layoutHubHeader } = require('../.test-build/app/apps/terminal/hub-header.js');
|
||||
const font = size => ({ measureText: text => [...text].length * size, getGlyph: () => ({ dwidthX: size }) });
|
||||
test('terminal short status stays inline; exact-fit status does not move the list', () => {
|
||||
const f = font(7), title = 'Terminal', status = 'Connected.';
|
||||
const width = 18 + f.measureText(title) + 16 + f.measureText(status) + 12;
|
||||
const header = layoutHubHeader(f, title, status, width, 18);
|
||||
assert.equal(header.y, 10); assert.equal(header.listTop, 34); assert.deepEqual(header.lines, [status]);
|
||||
assert.equal(layoutHubHeader(f, title, status, width - 1, 18).y, 28);
|
||||
});
|
||||
test('terminal long error wraps in full-width block and moves menu below all lines at each font size', () => {
|
||||
const status = 'Connection failed. The resource could not be loaded because the App Transport Security policy requires the use of a secure connection.';
|
||||
for (const size of [5, 7, 12, 20]) for (const width of [320, 576, 640]) {
|
||||
const f = font(size), step = size * 2;
|
||||
const header = layoutHubHeader(f, 'Terminal - Connections', status, width, step);
|
||||
assert.equal(header.x, 18); assert.equal(header.y, 10 + step);
|
||||
assert.equal(header.lines.join(' '), status);
|
||||
assert.ok(header.lines.every(line => f.measureText(line) <= width - 30));
|
||||
assert.ok(header.listTop >= header.y + header.lines.length * step);
|
||||
assert.equal(header.listTop, 16 + step * (1 + header.lines.length));
|
||||
}
|
||||
});
|
||||
test('terminal explicit newlines and long unbroken messages remain complete', () => {
|
||||
const h = layoutHubHeader(font(7), 'Terminal', 'First\nSecond', 640, 18);
|
||||
assert.equal(h.x, 18); assert.deepEqual(h.lines, ['First', 'Second']);
|
||||
const word = 'x'.repeat(200);
|
||||
const wrapped = layoutHubHeader(font(7), 'Terminal', word, 320, 18);
|
||||
assert.equal(wrapped.lines.join(''), word);
|
||||
});
|
||||
@@ -12,6 +12,7 @@
|
||||
},
|
||||
"include": [
|
||||
"../app/g2/ble-protocol.ts",
|
||||
"../app/apps/terminal/hub-header.ts",
|
||||
"../app/g2/ios-peripheral-identity.ts",
|
||||
"../app/g2/glasses-session.ts",
|
||||
"../app/graphics/surface-compositor.ts",
|
||||
|
||||
Reference in new issue
Block a user