Update to latest js-sdk group call branch

Merge pull request #568 from vector-im/dbkr/dont_log_objects
Log ID instead of object
2022-09-08 11:25:21 +01:00 · 2022-09-07 15:55:52 +01:00 · 2022-09-07 11:42:37 +01:00 · 2022-09-06 15:11:45 +01:00 · 2022-09-06 14:00:06 +01:00 · 2022-09-06 13:55:32 +01:00
3 changed files with 12 additions and 35 deletions
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
    "classnames": "^2.3.1",
    "color-hash": "^2.0.1",
    "events": "^3.3.0",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#da5bc358f40e1e9de39d28aea072a9c38e356bda",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#83c848093fe49652aedee71d963dfe07fd6d73f2",
    "matrix-widget-api": "^1.0.0",
    "mermaid": "^8.13.8",
    "normalize.css": "^8.0.1",
--- a/src/room/useLoadGroupCall.ts
+++ b/src/room/useLoadGroupCall.ts
@@ -45,39 +45,15 @@ export const useLoadGroupCall = (
  useEffect(() => {
    setState({ loading: true });

-    const waitForRoom = async (roomId: string): Promise<Room> => {
-      const room = client.getRoom(roomId);
-      if (room) return room;
-      console.log(`Room ${roomId} hasn't arrived yet: waiting`);
-
-      const waitPromise = new Promise<Room>((resolve) => {
-        const onRoomEvent = async (room: Room) => {
-          if (room.roomId === roomId) {
-            client.removeListener(GroupCallEventHandlerEvent.Room, onRoomEvent);
-            resolve(room);
-          }
-        };
-        client.on(GroupCallEventHandlerEvent.Room, onRoomEvent);
-      });
-
-      // race the promise with a timeout so we don't
-      // wait forever for the room
-      const timeoutPromise = new Promise<Room>((_, reject) => {
-        setTimeout(() => {
-          reject(new Error("Timed out trying to join room"));
-        }, 30000);
-      });
-
-      return Promise.race([waitPromise, timeoutPromise]);
-    };
-
    const fetchOrCreateRoom = async (): Promise<Room> => {
      try {
        const room = await client.joinRoom(roomIdOrAlias, { viaServers });
-        logger.info(`Joined ${roomIdOrAlias}, waiting for Room event`);
-        // wait for the room to come down the sync stream, otherwise
-        // client.getRoom() won't return the room.
-        return waitForRoom(room.roomId);
+        logger.info(
+          `Joined ${roomIdOrAlias}, waiting room to be ready for group calls`
+        );
+        await client.waitUntilRoomReadyForGroupCalls(room.roomId);
+        logger.info(`${roomIdOrAlias}, is ready for group calls`);
+        return room;
      } catch (error) {
        if (
          isLocalRoomId(roomIdOrAlias) &&
@@ -92,7 +68,8 @@ export const useLoadGroupCall = (
            createPtt
          );
          // likewise, wait for the room
-          return await waitForRoom(roomId);
+          await client.waitUntilRoomReadyForGroupCalls(roomId);
+          return client.getRoom(roomId);
        } else {
          throw error;
        }
@@ -103,7 +80,7 @@ export const useLoadGroupCall = (
      const room = await fetchOrCreateRoom();
      logger.debug(`Fetched / joined room ${roomIdOrAlias}`);
      const groupCall = client.getGroupCallForRoom(room.roomId);
-      logger.debug("Got group call", groupCall);
+      logger.debug("Got group call", groupCall?.groupCallId);

      if (groupCall) return groupCall;

--- a/yarn.lock
+++ b/yarn.lock
@@ -8390,9 +8390,9 @@ matrix-events-sdk@^0.0.1-beta.7:
  resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
  integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==

-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#da5bc358f40e1e9de39d28aea072a9c38e356bda":
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#83c848093fe49652aedee71d963dfe07fd6d73f2":
  version "19.3.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/da5bc358f40e1e9de39d28aea072a9c38e356bda"
+  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/83c848093fe49652aedee71d963dfe07fd6d73f2"
  dependencies:
    "@babel/runtime" "^7.12.5"
    "@types/sdp-transform" "^2.4.5"
Author	SHA1	Message	Date
David Baker	ca5ce7d468	Update to latest js-sdk group call branch	2022-09-08 11:25:21 +01:00
David Baker	a05f6a64a8	Merge pull request #568 from vector-im/dbkr/dont_log_objects Log ID instead of object	2022-09-07 15:55:52 +01:00
David Baker	70dffe95ff	Handle groupcall being null	2022-09-07 11:42:37 +01:00
David Baker	0360889fd6	Log ID instead of object as otherwise it recurses and logs the entire client + store	2022-09-06 15:11:45 +01:00
David Baker	7304411c5d	Merge pull request #567 from vector-im/dbkr/waitUntilRoomReadyForGroupCalls Use new method to wait until a room is ready for group calls	2022-09-06 14:00:06 +01:00
David Baker	22dd095ea9	Update js-sdk to latest on group-call branch	2022-09-06 13:55:32 +01:00
David Baker	30a270193f	Use js-sdk branch	2022-09-06 12:14:24 +01:00
David Baker	ee1dd2293e	Use new method to wait until a room is ready fopr group calls We were waiting for the group call event handler to process the room, but only if we couldn't get the room from the client - if getRoom returned a room, we just wouldn't wait. This just uses promises rather than an event to wait for the room to be ready. Requires https://github.com/matrix-org/matrix-js-sdk/pull/2641	2022-09-06 11:57:07 +01:00