diff --git a/decal.html b/decal.html index 1878f27af..b002804de 100644 --- a/decal.html +++ b/decal.html @@ -649,9 +649,9 @@

Unknown app

document.documentElement.classList.add('dialog') document.body.appendChild(ctrl) document.body.appendChild(trustConfirm) - trustConfirm.setLink(report.key.link) + trustConfirm.setLink(key.link) trustConfirm.trust = async () => { - await this.ipc.trust({ z32: report.key.z32 }) + await this.ipc.trust({ z32: key.z32 }) await this.ipc.restart({ id: this.gid }) } diff --git a/subsystems/sidecar/index.js b/subsystems/sidecar/index.js index d72626bd1..8866640ad 100644 --- a/subsystems/sidecar/index.js +++ b/subsystems/sidecar/index.js @@ -222,7 +222,7 @@ class Sidecar extends ReadyResource { messages (ptn) { const subscriber = this.sidecar.bus.sub({ topic: 'messages', id: this.id, ...(ptn ? { data: ptn } : {}) }) const stream = new streamx.PassThrough({ objectMode: true }) - streamx.pipeline(subscriber, stream) + streamx.pipeline(subscriber, pickData(), stream) return stream } @@ -359,7 +359,7 @@ class Sidecar extends ReadyResource { warming (params, client) { if (!client.userData) return const stream = new streamx.PassThrough({ objectMode: true }) - streamx.pipeline(client.userData.warming, stream) + streamx.pipeline(client.userData.warming, pickData(), stream) return stream } @@ -370,7 +370,8 @@ class Sidecar extends ReadyResource { reports (params, client) { if (!client.userData) return const stream = new streamx.PassThrough({ objectMode: true }) - streamx.pipeline(client.userData.reporter, stream) + streamx.pipeline(client.userData.reporter, pickData(), stream) + return stream } createReport (err, client) { @@ -776,4 +777,12 @@ class Sidecar extends ReadyResource { } } +function pickData () { + return new streamx.Transform({ + transform ({ data }, cb) { + cb(null, data) + } + }) +} + module.exports = Sidecar