WildDragonLLC/dragonflight
1
0
Fork 0
Code Issues 32 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix(node-agent): proper stdcopy demux for container logs (clean line starts)

Browse source
This commit is contained in:
Zac Gaetano 2026-06-04 05:29:56 +00:00
parent 179a740453
commit 91d0d755a5
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
services/node-agent/index.js
View file

@ -678,17 +678,37 @@ async function handleSidecarStart(body, res) {
} }
} }
async function fetchContainerLogs(containerId) { // Strip Docker's stdcopy multiplexing framing (8-byte header per frame for
// non-TTY containers: [streamType,0,0,0, uint32be length]) and return clean
// UTF-8. The old version just deleted control bytes, which left stray header
// remnants (e.g. the length byte) at line starts.
function _demuxDocker(buf) {
if (!buf || buf.length === 0) return '';
const framed = buf.length >= 8 && buf[0] <= 2 && buf[1] === 0 && buf[2] === 0 && buf[3] === 0;
if (!framed) return buf.toString('utf8');
const out = [];
let off = 0;
while (off + 8 <= buf.length) {
const len = buf.readUInt32BE(off + 4);
off += 8;
if (len <= 0) continue;
out.push(buf.toString('utf8', off, Math.min(off + len, buf.length)));
off += len;
}
return out.join('');
}
async function fetchContainerLogs(containerId, tail = 200) {
return await new Promise((resolve) => { return await new Promise((resolve) => {
const options = { const options = {
socketPath: '/var/run/docker.sock', socketPath: '/var/run/docker.sock',
path: `/v1.43/containers/${containerId}/logs?stdout=1&stderr=1&tail=200`, path: `/v1.43/containers/${containerId}/logs?stdout=1&stderr=1&tail=${tail}&timestamps=1`,
method: 'GET', method: 'GET',
}; };
const req = http.request(options, res => { const req = http.request(options, res => {
const chunks = []; const chunks = [];
res.on('data', c => chunks.push(c)); res.on('data', c => chunks.push(c));
res.on('end', () => resolve(Buffer.concat(chunks).toString('utf8').replace(/[\x00-\x08]/g, ''))); res.on('end', () => resolve(_demuxDocker(Buffer.concat(chunks))));
}); });
req.on('error', () => resolve('(log fetch failed)')); req.on('error', () => resolve('(log fetch failed)'));
req.end(); req.end();