Merge pull request #569 from ethereum-push-notification-service/fix/s…

…pace-leave-end fix(spaces): fix end, leave space methods
push-protocol · Jul 20, 2023 · eab55bb · eab55bb
2 parents 9807c93 + 5a6a520
commit eab55bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/packages/restapi/src/lib/space/leave.ts b/packages/restapi/src/lib/space/leave.ts
@@ -10,7 +10,7 @@ export async function leave(this: Space): Promise<void> {
     // handle the case where a listner is leaving
 
     // disconnect with every incoming peer in the mesh connection
-    this.data.incoming.forEach(({ address }) => {
+    this.data.incoming.slice(1).forEach(({ address }) => {
       this.disconnect({
         peerAddress: address,
         details: {

diff --git a/packages/restapi/src/lib/space/stop.ts b/packages/restapi/src/lib/space/stop.ts
@@ -59,7 +59,7 @@ export async function stop(this: Space): Promise<void> {
       - disconnect with every incoming peer in the mesh connection
       - other peers should also end their connections as we want to destroy the mesh connection
     */
-    this.data.incoming.forEach(({ address }) => {
+    this.data.incoming.slice(1).forEach(({ address }) => {
       this.disconnect({
         peerAddress: address,
         details: {

diff --git a/packages/restapi/src/lib/video/Video.ts b/packages/restapi/src/lib/video/Video.ts
@@ -55,6 +55,7 @@ export const initVideoCallData: VideoCallData = {
     video: null,
     address: '',
   },
+  // TODO: Remove the default element in incoming array
   incoming: [
     {
       stream: null,
@@ -754,6 +755,8 @@ export class Video {
     const { peerAddress, details } = options || {};
 
     try {
+      console.log("DISCONNECT OPTIONS", options);
+
       const incomingIndex = getIncomingIndexFromAddress(
         this.data.incoming,
         peerAddress

diff --git a/packages/uiweb/src/lib/components/space/SpaceWidget/LiveWidgetContent.tsx b/packages/uiweb/src/lib/components/space/SpaceWidget/LiveWidgetContent.tsx
@@ -85,6 +85,7 @@ export const LiveWidgetContent: React.FC<LiveWidgetContentProps> = ({
     spacesObjectRef.current = null;
     setSpaceObjectData?.(PushAPI.space.initSpaceData);
     setSpaceStatusState?.(SpaceStatus.Ended);
+    setIsLoading(false);
   };
 
   const handleLeaveSpace = async () => {
@@ -99,6 +100,7 @@ export const LiveWidgetContent: React.FC<LiveWidgetContentProps> = ({
       spacesObjectRef.current = null;
       setSpaceObjectData?.(PushAPI.space.initSpaceData);
     }
+    setIsLoading(false);
   };
 
   // for listener