Fixing app channel for app2

finos · Sep 25, 2024 · 4bee616 · 4bee616
1 parent 8c54dbf
commit 4bee616
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts
@@ -10,9 +10,12 @@ getAgent().then(async fdc3 => {
     const info = await fdc3.getInfo()
     msg.textContent = "FDC3 Loaded: " + JSON.stringify(info);
     log?.appendChild(msg);
-    const channels = await fdc3.getUserChannels()
 
-    fdc3.joinUserChannel(channels[0].id)
+    const cc = await fdc3.getCurrentChannel()
+    if (cc == null) {
+        const channels = await fdc3.getUserChannels()
+        await fdc3.joinUserChannel(channels[0].id)
+    }
 
     fdc3.addContextListener(null, context => {
         const msg = document.createElement("p");

diff --git a/toolbox/fdc3-for-web/fdc3-web-impl/src/handlers/HeartbeatHandler.ts b/toolbox/fdc3-for-web/fdc3-web-impl/src/handlers/HeartbeatHandler.ts
@@ -82,7 +82,7 @@ export class HeartbeatHandler implements MessageHandler {
             const app = sc.getInstanceDetails(from)
             if (app) {
                 sc.setAppState(from, State.Terminated)
-                this
+                this.lastHeartbeats.delete(from)
             }
         }
     }