fix reports (#167)

* fix reports * transform sidecar bus data in pipelines * call callback at the end of busTransformer * fix reports tweaks --------- Co-authored-by: rafapaezbas <[email protected]>
holepunchto · May 29, 2024 · e5f8ab8 · e5f8ab8
1 parent bd242e3
commit e5f8ab8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/decal.html b/decal.html
@@ -636,7 +636,7 @@ <h1 id="header">Unknown app</h1>
             this.status = report
             this.gid = Pear.Window.self.id
             loader.hide()
-            const { type, headline, tagline, cta } = this.status
+            const { type, headline, tagline, cta, key } = this.status
             if (type === 'update' && this.status.version?.force) {
               await loader.updating(this.status.version)
               continue
@@ -649,9 +649,9 @@ <h1 id="header">Unknown app</h1>
               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
@@ -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