Skip to content

Commit

Permalink
Use device labels rather than IDs in widget API
Browse files Browse the repository at this point in the history
device IDs are different for each origin, so won't match up when passed
in & out of widgets. Use the label instead.

For element-hq/element-web#23331
  • Loading branch information
dbkr committed Sep 27, 2022
1 parent 47f7e0e commit 4a5b698
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 2 deletions.
23 changes: 23 additions & 0 deletions src/media-utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
Copyright 2022 Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

export async function findDeviceByName(
deviceName: string
): Promise<string | undefined> {
const devices = await navigator.mediaDevices.enumerateDevices();
const deviceInfo = devices.find((d) => d.label === deviceName);
return deviceInfo?.deviceId;
}
28 changes: 26 additions & 2 deletions src/room/GroupCallView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import React, { useCallback, useEffect, useState } from "react";
import { useHistory } from "react-router-dom";
import { GroupCall, GroupCallState } from "matrix-js-sdk/src/webrtc/groupCall";
import { MatrixClient } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger";

import type { IWidgetApiRequest } from "matrix-widget-api";
import { widget, ElementWidgetActions, JoinCallData } from "../widget";
Expand All @@ -31,6 +32,7 @@ import { useRoomAvatar } from "./useRoomAvatar";
import { useSentryGroupCallHandler } from "./useSentryGroupCallHandler";
import { useLocationNavigation } from "../useLocationNavigation";
import { useMediaHandler } from "../settings/useMediaHandler";
import { findDeviceByName } from "../media-utils";

declare global {
interface Window {
Expand Down Expand Up @@ -96,8 +98,30 @@ export function GroupCallView({
const onJoin = async (ev: CustomEvent<IWidgetApiRequest>) => {
const { audioInput, videoInput } = ev.detail
.data as unknown as JoinCallData;
if (audioInput !== null) setAudioInput(audioInput);
if (videoInput !== null) setVideoInput(videoInput);

if (audioInput !== null) {
const deviceId = await findDeviceByName(audioInput);
if (!deviceId) {
logger.warn("Unknown audio input: " + audioInput);
} else {
logger.debug(
`Found audio input ID ${deviceId} for name ${audioInput}`
);
setAudioInput(deviceId);
}
}

if (videoInput !== null) {
const deviceId = await findDeviceByName(videoInput);
if (!deviceId) {
logger.warn("Unknown video input: " + videoInput);
} else {
logger.debug(
`Found video input ID ${deviceId} for name ${videoInput}`
);
setVideoInput(deviceId);
}
}
await Promise.all([
groupCall.setMicrophoneMuted(audioInput === null),
groupCall.setLocalVideoMuted(videoInput === null),
Expand Down

0 comments on commit 4a5b698

Please sign in to comment.