syndicate-lang
/
syndicate-js
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Actually parse out TXT data, flawed though it must be

This commit is contained in:
Tony Garnock-Jones 2018-12-03 13:03:24 +00:00
parent 2eca7908e6
commit 4f3ce393f4
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/driver-mdns/src/index.js
View File

@ -126,14 +126,29 @@ spawn named 'driver/avahi-browse' {
react {
on retracted S.Readable(stdout) topFacet.stop();
on message S.Line(stdout, $line) {
// We supply a `9` argument to `split` in order to ignore
// fields past the port number, because parsing of TXT
// record data is unreliable given the way avahi-browse
// formats it.
// Parsing of TXT record data (appearing after the port
// number in an '=' record) is unreliable given the way
// avahi-browse formats it.
//
// See https://github.com/lathiat/avahi/pull/206.
//
send BrowserInput(id, line.toString('utf-8').split(/;/, 9));
// However, it's still useful to have, so we do our best!
//
const pieces = line.toString('utf-8').split(/;/);
if (pieces[0] === '=') {
// A resolved address record, which has TXT data.
const normalFields = pieces.slice(0, 9);
const txtFields = pieces.slice(9).join(';'); // it's these that are dodgy
if (txtFields === '') {
normalFields.push([]);
} else {
normalFields.push(txtFields.slice(1,-1).split(/" "/)); // OMG this is vile
}
send BrowserInput(id, normalFields);
} else {
// Something else.
send BrowserInput(id, pieces);
}
}
on message BrowserInput(id, ["+", $interfaceName, $family, $name, $serviceType, $domain]) {
@ -143,11 +158,12 @@ spawn named 'driver/avahi-browse' {
id, ["-", interfaceName, family, name, serviceType, domain]);
on message BrowserInput(
id, ['=', interfaceName, family, name, serviceType, domain,
$hostName, $address, $portStr])
$hostName, $address, $portStr, $txtDataRecords])
{
const port0 = Number(portStr);
const port = Number.isNaN(port0) ? null : port0;
react assert Discovered(svc, hostName, port, [], address, family, interfaceName);
react assert Discovered(
svc, hostName, port, txtDataRecords, address, family, interfaceName);
}
}
}

6
packages/syntax-playground/src/avahipublish.js
View File

@ -18,10 +18,10 @@ spawn named 'test' {
on stop console.log('-', name, hostName, port, txtDataRecords, address, interfaceName);
}
during M.Discovered(M.Service($n, $t), $h, $p, _, $a, "IPv4", $i) {
during M.Discovered(M.Service($n, $t), $h, $p, $d, $a, "IPv4", $i) {
if (t !== '_syndicate._tcp') {
on start console.log('**', t, n, h, p, a, i);
on stop console.log('==', t, n, h, p, a, i);
on start console.log('**', t, n, h, p, d, a, i);
on stop console.log('==', t, n, h, p, d, a, i);
}
}
}