diff --git a/apps/desktop/src/i18n/translations/de.json b/apps/desktop/src/i18n/translations/de.json index 253643f19b9b9..c4fc1eb8d4c43 100644 --- a/apps/desktop/src/i18n/translations/de.json +++ b/apps/desktop/src/i18n/translations/de.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Keine vertrauenswürdige Stelle hat dieses Zertifikat ausgestellt.", "cf346dcfb658d4d3": "Dieses Zertifikat gilt nicht für diese Adresse.", "20665d9b0c7c3e52": "Dieses Zertifikat ist abgelaufen oder noch nicht gültig.", + "e632aac04674913c": "{origin} möchte deine Kamera und dein Mikrofon verwenden", + "379c230d24c9b5c5": "{origin} möchte dein Mikrofon verwenden", + "576ac67fdb145936": "{origin} möchte deine Kamera verwenden", + "d8d5fbd2529b6bd3": "macOS hat T3 Code den Zugriff auf deine Kamera und dein Mikrofon verweigert", + "65dff766a75b43d5": "macOS hat T3 Code den Zugriff auf dein Mikrofon verweigert", + "39e3d7326db9af25": "macOS hat T3 Code den Zugriff auf deine Kamera verweigert", "565970a378986341": "Öffnen", "00ad8aeed0a6c461": "Abbrechen", "2107cc3e7c4ac833": "Diesen {protocol}-Link öffnen?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Blockieren", "709219ff9ff49a4f": "{origin} möchte deinen Standort erfahren", "8fc0b116123fb50b": "{origin} möchte in die Zwischenablage kopierte Texte und Bilder sehen", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Erlaube T3 Code unter Systemeinstellungen › Datenschutz & Sicherheit und starte T3 Code dann neu.", "c0f756221736393f": "Vorschau · {title}", "6994444f4fec4070": "Browservorschau", "49de6209699eb616": "Unbenannter Passkey", "b4a5bb1075d95154": "Passkey auswählen", "1f12213f4d809e89": "Du bist auf dem neuesten Stand!", "c6399b55619e2f67": "T3 Code {version} ist derzeit die neueste verfügbare Version.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Update verfügbar", "d3104b65052b993b": "Eine neue Version von T3 Code ist verfügbar.", "35fff5a1cd1d6473": "T3 Code {version} ist verfügbar.", diff --git a/apps/desktop/src/i18n/translations/en.json b/apps/desktop/src/i18n/translations/en.json index 833aea465a406..7b4314f44cf41 100644 --- a/apps/desktop/src/i18n/translations/en.json +++ b/apps/desktop/src/i18n/translations/en.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "No trusted authority issued this certificate.", "cf346dcfb658d4d3": "This certificate is not for this address.", "20665d9b0c7c3e52": "This certificate has expired or is not valid yet.", + "e632aac04674913c": "{origin} wants to use your camera and microphone", + "379c230d24c9b5c5": "{origin} wants to use your microphone", + "576ac67fdb145936": "{origin} wants to use your camera", + "d8d5fbd2529b6bd3": "macOS blocked T3 Code from using your camera and microphone", + "65dff766a75b43d5": "macOS blocked T3 Code from using your microphone", + "39e3d7326db9af25": "macOS blocked T3 Code from using your camera", "565970a378986341": "Open", "00ad8aeed0a6c461": "Cancel", "2107cc3e7c4ac833": "Open this {protocol} link?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Block", "709219ff9ff49a4f": "{origin} wants to know your location", "8fc0b116123fb50b": "{origin} wants to see text and images copied to the clipboard", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Allow T3 Code in System Settings › Privacy & Security, then restart T3 Code.", "c0f756221736393f": "Preview · {title}", "6994444f4fec4070": "Browser preview", "49de6209699eb616": "Unnamed passkey", "b4a5bb1075d95154": "Choose a passkey", "1f12213f4d809e89": "You're up to date!", "c6399b55619e2f67": "T3 Code {version} is currently the newest version available.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Update available", "d3104b65052b993b": "A new version of T3 Code is available.", "35fff5a1cd1d6473": "T3 Code {version} is available.", diff --git a/apps/desktop/src/i18n/translations/es.json b/apps/desktop/src/i18n/translations/es.json index 4a45d87e968b5..9915aa6198aad 100644 --- a/apps/desktop/src/i18n/translations/es.json +++ b/apps/desktop/src/i18n/translations/es.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Ninguna autoridad de confianza emitió este certificado.", "cf346dcfb658d4d3": "Este certificado no es para esta dirección.", "20665d9b0c7c3e52": "Este certificado ha caducado o aún no es válido.", + "e632aac04674913c": "{origin} quiere usar tu cámara y tu micrófono", + "379c230d24c9b5c5": "{origin} quiere usar tu micrófono", + "576ac67fdb145936": "{origin} quiere usar tu cámara", + "d8d5fbd2529b6bd3": "macOS ha impedido que T3 Code use tu cámara y tu micrófono", + "65dff766a75b43d5": "macOS ha impedido que T3 Code use tu micrófono", + "39e3d7326db9af25": "macOS ha impedido que T3 Code use tu cámara", "565970a378986341": "Abrir", "00ad8aeed0a6c461": "Cancelar", "2107cc3e7c4ac833": "¿Abrir este enlace {protocol}?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Bloquear", "709219ff9ff49a4f": "{origin} quiere conocer tu ubicación", "8fc0b116123fb50b": "{origin} quiere ver el texto y las imágenes copiados al portapapeles", + "b6e5b31255e011c5": "Aceptar", + "fb7c135eaced773b": "Permite T3 Code en Ajustes del Sistema › Privacidad y seguridad y, después, reinicia T3 Code.", "c0f756221736393f": "Vista previa · {title}", "6994444f4fec4070": "Vista previa del navegador", "49de6209699eb616": "Llave de acceso sin nombre", "b4a5bb1075d95154": "Elige una llave de acceso", "1f12213f4d809e89": "¡Estás al día!", "c6399b55619e2f67": "T3 Code {version} es la versión más reciente disponible.", - "b6e5b31255e011c5": "Aceptar", "2ee2077700686fbb": "Actualización disponible", "d3104b65052b993b": "Hay una nueva versión de T3 Code disponible.", "35fff5a1cd1d6473": "T3 Code {version} está disponible.", diff --git a/apps/desktop/src/i18n/translations/fr.json b/apps/desktop/src/i18n/translations/fr.json index 5c31d472f5d70..e521bebf23b16 100644 --- a/apps/desktop/src/i18n/translations/fr.json +++ b/apps/desktop/src/i18n/translations/fr.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Aucune autorité de confiance n’a émis ce certificat.", "cf346dcfb658d4d3": "Ce certificat ne correspond pas à cette adresse.", "20665d9b0c7c3e52": "Ce certificat a expiré ou n’est pas encore valide.", + "e632aac04674913c": "{origin} veut utiliser votre caméra et votre micro", + "379c230d24c9b5c5": "{origin} veut utiliser votre micro", + "576ac67fdb145936": "{origin} veut utiliser votre caméra", + "d8d5fbd2529b6bd3": "macOS a empêché T3 Code d’utiliser votre caméra et votre micro", + "65dff766a75b43d5": "macOS a empêché T3 Code d’utiliser votre micro", + "39e3d7326db9af25": "macOS a empêché T3 Code d’utiliser votre caméra", "565970a378986341": "Ouvrir", "00ad8aeed0a6c461": "Annuler", "2107cc3e7c4ac833": "Ouvrir ce lien {protocol} ?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Bloquer", "709219ff9ff49a4f": "{origin} souhaite connaître votre position", "8fc0b116123fb50b": "{origin} veut voir le texte et les images copiés dans le presse-papiers", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Autorisez T3 Code dans Réglages Système › Confidentialité et sécurité, puis redémarrez T3 Code.", "c0f756221736393f": "Aperçu · {title}", "6994444f4fec4070": "Aperçu du navigateur", "49de6209699eb616": "Clé d’accès sans nom", "b4a5bb1075d95154": "Choisir une clé d’accès", "1f12213f4d809e89": "Vous êtes à jour !", "c6399b55619e2f67": "T3 Code {version} est actuellement la version la plus récente.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Mise à jour disponible", "d3104b65052b993b": "Une nouvelle version de T3 Code est disponible.", "35fff5a1cd1d6473": "T3 Code {version} est disponible.", diff --git a/apps/desktop/src/i18n/translations/ja.json b/apps/desktop/src/i18n/translations/ja.json index 867b271262724..6335126dbdaaa 100644 --- a/apps/desktop/src/i18n/translations/ja.json +++ b/apps/desktop/src/i18n/translations/ja.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "この証明書は信頼された認証局によって発行されていません。", "cf346dcfb658d4d3": "この証明書はこのアドレス用ではありません。", "20665d9b0c7c3e52": "この証明書は期限切れか、まだ有効になっていません。", + "e632aac04674913c": "{origin} がカメラとマイクの使用を求めています", + "379c230d24c9b5c5": "{origin} がマイクの使用を求めています", + "576ac67fdb145936": "{origin} がカメラの使用を求めています", + "d8d5fbd2529b6bd3": "macOS により T3 Code のカメラとマイクの使用がブロックされました", + "65dff766a75b43d5": "macOS により T3 Code のマイクの使用がブロックされました", + "39e3d7326db9af25": "macOS により T3 Code のカメラの使用がブロックされました", "565970a378986341": "開く", "00ad8aeed0a6c461": "キャンセル", "2107cc3e7c4ac833": "この {protocol} リンクを開きますか?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "ブロック", "709219ff9ff49a4f": "{origin} が位置情報へのアクセスを求めています", "8fc0b116123fb50b": "{origin} がクリップボードにコピーされたテキストと画像の表示を求めています", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "システム設定 › プライバシーとセキュリティで T3 Code を許可してから、T3 Code を再起動してください。", "c0f756221736393f": "プレビュー · {title}", "6994444f4fec4070": "ブラウザープレビュー", "49de6209699eb616": "名前のないパスキー", "b4a5bb1075d95154": "パスキーを選択", "1f12213f4d809e89": "最新の状態です", "c6399b55619e2f67": "T3 Code {version} が現在利用できる最新バージョンです。", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "更新があります", "d3104b65052b993b": "T3 Code の新しいバージョンを利用できます。", "35fff5a1cd1d6473": "T3 Code {version} を利用できます。", diff --git a/apps/desktop/src/i18n/translations/ko.json b/apps/desktop/src/i18n/translations/ko.json index 7c15523447278..aa28a8d448d1e 100644 --- a/apps/desktop/src/i18n/translations/ko.json +++ b/apps/desktop/src/i18n/translations/ko.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "신뢰할 수 있는 기관에서 발급한 인증서가 아닙니다.", "cf346dcfb658d4d3": "이 주소용 인증서가 아닙니다.", "20665d9b0c7c3e52": "이 인증서는 만료되었거나 아직 유효하지 않습니다.", + "e632aac04674913c": "{origin}에서 카메라와 마이크를 사용하려고 합니다", + "379c230d24c9b5c5": "{origin}에서 마이크를 사용하려고 합니다", + "576ac67fdb145936": "{origin}에서 카메라를 사용하려고 합니다", + "d8d5fbd2529b6bd3": "macOS가 T3 Code의 카메라 및 마이크 사용을 차단했습니다", + "65dff766a75b43d5": "macOS가 T3 Code의 마이크 사용을 차단했습니다", + "39e3d7326db9af25": "macOS가 T3 Code의 카메라 사용을 차단했습니다", "565970a378986341": "열기", "00ad8aeed0a6c461": "취소", "2107cc3e7c4ac833": "이 {protocol} 링크를 열까요?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "차단", "709219ff9ff49a4f": "{origin}에서 위치 정보에 접근하려고 합니다", "8fc0b116123fb50b": "{origin}에서 클립보드에 복사된 텍스트와 이미지를 보려고 합니다", + "b6e5b31255e011c5": "확인", + "fb7c135eaced773b": "시스템 설정 › 개인정보 보호 및 보안에서 T3 Code를 허용한 다음 T3 Code를 다시 시작하세요.", "c0f756221736393f": "미리 보기 · {title}", "6994444f4fec4070": "브라우저 미리 보기", "49de6209699eb616": "이름 없는 패스키", "b4a5bb1075d95154": "패스키 선택", "1f12213f4d809e89": "최신 버전입니다!", "c6399b55619e2f67": "T3 Code {version}이(가) 현재 사용 가능한 최신 버전입니다.", - "b6e5b31255e011c5": "확인", "2ee2077700686fbb": "업데이트 사용 가능", "d3104b65052b993b": "새 버전의 T3 Code를 사용할 수 있습니다.", "35fff5a1cd1d6473": "T3 Code {version}을(를) 사용할 수 있습니다.", diff --git a/apps/desktop/src/i18n/translations/pt-BR.json b/apps/desktop/src/i18n/translations/pt-BR.json index 4f3460638c22a..d03e7ddbb24f3 100644 --- a/apps/desktop/src/i18n/translations/pt-BR.json +++ b/apps/desktop/src/i18n/translations/pt-BR.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Nenhuma autoridade confiável emitiu este certificado.", "cf346dcfb658d4d3": "Este certificado não é para este endereço.", "20665d9b0c7c3e52": "Este certificado expirou ou ainda não é válido.", + "e632aac04674913c": "{origin} quer usar sua câmera e seu microfone", + "379c230d24c9b5c5": "{origin} quer usar seu microfone", + "576ac67fdb145936": "{origin} quer usar sua câmera", + "d8d5fbd2529b6bd3": "O macOS impediu o T3 Code de usar sua câmera e seu microfone", + "65dff766a75b43d5": "O macOS impediu o T3 Code de usar seu microfone", + "39e3d7326db9af25": "O macOS impediu o T3 Code de usar sua câmera", "565970a378986341": "Abrir", "00ad8aeed0a6c461": "Cancelar", "2107cc3e7c4ac833": "Abrir este link {protocol}?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Bloquear", "709219ff9ff49a4f": "{origin} quer saber sua localização", "8fc0b116123fb50b": "{origin} quer ver textos e imagens copiados para a área de transferência", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Permita o T3 Code em Ajustes do Sistema › Privacidade e Segurança e reinicie o T3 Code.", "c0f756221736393f": "Pré-visualização · {title}", "6994444f4fec4070": "Pré-visualização do navegador", "49de6209699eb616": "Chave de acesso sem nome", "b4a5bb1075d95154": "Escolha uma chave de acesso", "1f12213f4d809e89": "Você está atualizado!", "c6399b55619e2f67": "O T3 Code {version} é a versão mais recente disponível.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Atualização disponível", "d3104b65052b993b": "Há uma nova versão do T3 Code disponível.", "35fff5a1cd1d6473": "O T3 Code {version} está disponível.", diff --git a/apps/desktop/src/i18n/translations/ru.json b/apps/desktop/src/i18n/translations/ru.json index 3e8f2fa9fed06..f6b3560426816 100644 --- a/apps/desktop/src/i18n/translations/ru.json +++ b/apps/desktop/src/i18n/translations/ru.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Этот сертификат выдан недоверенным центром.", "cf346dcfb658d4d3": "Этот сертификат выдан не для этого адреса.", "20665d9b0c7c3e52": "Срок действия этого сертификата истёк или ещё не начался.", + "e632aac04674913c": "{origin} хочет использовать камеру и микрофон", + "379c230d24c9b5c5": "{origin} хочет использовать микрофон", + "576ac67fdb145936": "{origin} хочет использовать камеру", + "d8d5fbd2529b6bd3": "macOS запретила T3 Code использовать камеру и микрофон", + "65dff766a75b43d5": "macOS запретила T3 Code использовать микрофон", + "39e3d7326db9af25": "macOS запретила T3 Code использовать камеру", "565970a378986341": "Открыть", "00ad8aeed0a6c461": "Отмена", "2107cc3e7c4ac833": "Открыть эту ссылку {protocol}?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Блокировать", "709219ff9ff49a4f": "{origin} запрашивает ваше местоположение", "8fc0b116123fb50b": "{origin} хочет видеть текст и изображения, скопированные в буфер обмена", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Разрешите доступ для T3 Code в разделе Системные настройки › Конфиденциальность и безопасность, затем перезапустите T3 Code.", "c0f756221736393f": "Предпросмотр · {title}", "6994444f4fec4070": "Предпросмотр в браузере", "49de6209699eb616": "Безымянный ключ доступа", "b4a5bb1075d95154": "Выберите ключ доступа", "1f12213f4d809e89": "У вас последняя версия!", "c6399b55619e2f67": "T3 Code {version} — новейшая доступная версия.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Доступно обновление", "d3104b65052b993b": "Доступна новая версия T3 Code.", "35fff5a1cd1d6473": "Доступна версия T3 Code {version}.", diff --git a/apps/desktop/src/i18n/translations/sv.json b/apps/desktop/src/i18n/translations/sv.json index e8ac486b64242..75f268f104cf0 100644 --- a/apps/desktop/src/i18n/translations/sv.json +++ b/apps/desktop/src/i18n/translations/sv.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "Ingen betrodd utfärdare utfärdade det här certifikatet.", "cf346dcfb658d4d3": "Det här certifikatet gäller inte den här adressen.", "20665d9b0c7c3e52": "Det här certifikatet har gått ut eller är inte giltigt än.", + "e632aac04674913c": "{origin} vill använda din kamera och mikrofon", + "379c230d24c9b5c5": "{origin} vill använda din mikrofon", + "576ac67fdb145936": "{origin} vill använda din kamera", + "d8d5fbd2529b6bd3": "macOS har blockerat T3 Code från att använda din kamera och mikrofon", + "65dff766a75b43d5": "macOS har blockerat T3 Code från att använda din mikrofon", + "39e3d7326db9af25": "macOS har blockerat T3 Code från att använda din kamera", "565970a378986341": "Öppna", "00ad8aeed0a6c461": "Avbryt", "2107cc3e7c4ac833": "Öppna den här {protocol}-länken?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "Blockera", "709219ff9ff49a4f": "{origin} vill veta var du befinner dig", "8fc0b116123fb50b": "{origin} vill se text och bilder som kopierats till urklipp", + "b6e5b31255e011c5": "OK", + "fb7c135eaced773b": "Tillåt T3 Code i Systeminställningar › Integritet och säkerhet och starta sedan om T3 Code.", "c0f756221736393f": "Förhandsvisning · {title}", "6994444f4fec4070": "Förhandsvisning i webbläsaren", "49de6209699eb616": "Namnlös lösenordsnyckel", "b4a5bb1075d95154": "Välj en lösenordsnyckel", "1f12213f4d809e89": "Du har den senaste versionen!", "c6399b55619e2f67": "T3 Code {version} är den senaste tillgängliga versionen.", - "b6e5b31255e011c5": "OK", "2ee2077700686fbb": "Uppdatering tillgänglig", "d3104b65052b993b": "En ny version av T3 Code är tillgänglig.", "35fff5a1cd1d6473": "T3 Code {version} är tillgänglig.", diff --git a/apps/desktop/src/i18n/translations/zh.json b/apps/desktop/src/i18n/translations/zh.json index ecee6a4ab13ae..f1c78741a9e76 100644 --- a/apps/desktop/src/i18n/translations/zh.json +++ b/apps/desktop/src/i18n/translations/zh.json @@ -34,6 +34,12 @@ "278648c9ff6fb9ce": "此证书并非由受信任的机构签发。", "cf346dcfb658d4d3": "此证书不适用于当前地址。", "20665d9b0c7c3e52": "此证书已过期或尚未生效。", + "e632aac04674913c": "{origin} 想使用你的摄像头和麦克风", + "379c230d24c9b5c5": "{origin} 想使用你的麦克风", + "576ac67fdb145936": "{origin} 想使用你的摄像头", + "d8d5fbd2529b6bd3": "macOS 已阻止 T3 Code 使用你的摄像头和麦克风", + "65dff766a75b43d5": "macOS 已阻止 T3 Code 使用你的麦克风", + "39e3d7326db9af25": "macOS 已阻止 T3 Code 使用你的摄像头", "565970a378986341": "打开", "00ad8aeed0a6c461": "取消", "2107cc3e7c4ac833": "要打开此 {protocol} 链接吗?", @@ -51,13 +57,14 @@ "2ec823ca24387055": "阻止", "709219ff9ff49a4f": "{origin} 想要获取你的位置", "8fc0b116123fb50b": "{origin} 想查看复制到剪贴板的文字和图片", + "b6e5b31255e011c5": "确定", + "fb7c135eaced773b": "请在“系统设置 › 隐私与安全性”中允许 T3 Code,然后重新启动 T3 Code。", "c0f756221736393f": "预览 · {title}", "6994444f4fec4070": "浏览器预览", "49de6209699eb616": "未命名通行密钥", "b4a5bb1075d95154": "选择通行密钥", "1f12213f4d809e89": "已是最新版本!", "c6399b55619e2f67": "T3 Code {version} 已是最新版本。", - "b6e5b31255e011c5": "确定", "2ee2077700686fbb": "有可用更新", "d3104b65052b993b": "T3 Code 有新版本可用。", "35fff5a1cd1d6473": "T3 Code {version} 可用。", diff --git a/apps/desktop/src/preview/BrowserSession.test.ts b/apps/desktop/src/preview/BrowserSession.test.ts index 7d2b3fe0e9fa0..959489c442c5b 100644 --- a/apps/desktop/src/preview/BrowserSession.test.ts +++ b/apps/desktop/src/preview/BrowserSession.test.ts @@ -1,8 +1,10 @@ import { assert, describe, it } from "@effect/vitest"; import * as NodeCrypto from "@effect/platform-node/NodeCrypto"; import * as NodeServices from "@effect/platform-node/NodeServices"; +import * as HostProcess from "@t3tools/shared/HostProcess"; import * as Deferred from "effect/Deferred"; import * as Effect from "effect/Effect"; +import * as Fiber from "effect/Fiber"; import * as FileSystem from "effect/FileSystem"; import * as Layer from "effect/Layer"; import * as NodeEvents from "node:events"; @@ -36,6 +38,11 @@ const { appListeners } = vi.hoisted(() => ({ appListeners: new Map void>(), })); +const { getMediaAccessStatus, askForMediaAccess } = vi.hoisted(() => ({ + getMediaAccessStatus: vi.fn<(device: string) => string>(() => "granted"), + askForMediaAccess: vi.fn<(device: string) => Promise>(() => Promise.resolve(true)), +})); + vi.mock("electron", () => ({ app: { on: (eventName: string, listener: (...args: unknown[]) => void) => { @@ -49,6 +56,7 @@ vi.mock("electron", () => ({ session: { fromPartition, }, + systemPreferences: { getMediaAccessStatus, askForMediaAccess }, })); import * as ElectronApp from "../electron/ElectronApp.ts"; @@ -80,6 +88,18 @@ const layer = BrowserSession.layer.pipe( ), ); +const layerDarwin = BrowserSession.layer.pipe( + Layer.provide( + Layer.mergeAll( + NodeServices.layer, + NodeCrypto.layer, + layerDialog, + ElectronApp.layer, + Layer.succeed(HostProcess.Platform, "darwin"), + ), + ), +); + const selfSignedCertificate = { fingerprint: "sha256/self-signed", subjectName: "localhost", @@ -402,6 +422,276 @@ describe("BrowserSession", () => { }).pipe(Effect.provide(layer)), ); + it.effect("asks once per origin and device before a page uses the camera", () => + Effect.gen(function* () { + const browserSessions = yield* BrowserSession.BrowserSession; + const partition = yield* browserSessions.getPartition("scope-a"); + yield* browserSessions.getSession("scope-a"); + const browserSession = sessions.get(partition); + assert.isDefined(browserSession); + const requestHandler = browserSession.setPermissionRequestHandler.mock.calls[0]?.[0]; + const checkHandler = browserSession.setPermissionCheckHandler.mock.calls[0]?.[0]; + + const requestMedia = (requestingUrl: string, mediaTypes: ReadonlyArray) => + Effect.callback((resume) => { + requestHandler(null, "media", (granted: boolean) => resume(Effect.succeed(granted)), { + requestingUrl, + securityOrigin: requestingUrl, + mediaTypes, + isMainFrame: true, + }); + }); + const checkMedia = (origin: string, mediaType: string): boolean => + checkHandler(null, "media", origin, { mediaType }) as boolean; + + showMessageBox.mockReset(); + showMessageBox.mockReturnValueOnce(0).mockReturnValueOnce(1).mockReturnValueOnce(1); + getMediaAccessStatus.mockReturnValue("granted"); + + assert.isFalse(checkMedia("https://allowed.test", "video")); + assert.isTrue(yield* requestMedia("https://allowed.test/scan", ["video"])); + assert.strictEqual( + showMessageBox.mock.calls[0]?.[0].message, + "https://allowed.test wants to use your camera", + ); + assert.isTrue(yield* requestMedia("https://allowed.test/again", ["video"])); + assert.isTrue(checkMedia("https://allowed.test", "video")); + assert.isFalse(checkMedia("https://allowed.test", "audio")); + assert.strictEqual(showMessageBox.mock.calls.length, 1); + + assert.isFalse(yield* requestMedia("https://blocked.test/", ["video", "audio"])); + assert.isFalse(yield* requestMedia("https://blocked.test/", ["audio"])); + assert.isFalse(checkMedia("https://blocked.test", "video")); + assert.strictEqual(showMessageBox.mock.calls.length, 2); + + assert.isFalse(yield* requestMedia("https://allowed.test/", ["video", "audio"])); + assert.strictEqual( + showMessageBox.mock.calls[2]?.[0].message, + "https://allowed.test wants to use your microphone", + ); + assert.isTrue(yield* requestMedia("https://allowed.test/", ["video"])); + assert.isTrue(checkMedia("https://allowed.test", "video")); + assert.isFalse(yield* requestMedia("https://allowed.test/", [])); + }).pipe(Effect.provide(layer)), + ); + + it.effect("asks macOS for the device after the user allows a page", () => + Effect.gen(function* () { + const browserSessions = yield* BrowserSession.BrowserSession; + const partition = yield* browserSessions.getPartition("scope-a"); + yield* browserSessions.getSession("scope-a"); + const requestHandler = + sessions.get(partition)?.setPermissionRequestHandler.mock.calls[0]?.[0]; + assert.isFunction(requestHandler); + const requestMedia = (requestingUrl: string, mediaTypes: ReadonlyArray) => + Effect.callback((resume) => { + requestHandler(null, "media", (granted: boolean) => resume(Effect.succeed(granted)), { + requestingUrl, + securityOrigin: requestingUrl, + mediaTypes, + isMainFrame: true, + }); + }); + + showMessageBox.mockReset(); + showMessageBox.mockReturnValue(0); + askForMediaAccess.mockReset(); + askForMediaAccess.mockResolvedValue(true); + getMediaAccessStatus.mockReset(); + getMediaAccessStatus.mockReturnValue("not-determined"); + + // A device macOS has not decided yet: ask the OS, which adds T3 Code to Privacy & Security. + assert.isTrue(yield* requestMedia("https://first.test/", ["video"])); + assert.deepStrictEqual(askForMediaAccess.mock.calls, [["camera"]]); + assert.strictEqual(showMessageBox.mock.calls.length, 1); + + // macOS denied one of two devices: the page gets nothing and the user learns where to fix it. + askForMediaAccess.mockReset(); + getMediaAccessStatus.mockImplementation((device) => + device === "camera" ? "not-determined" : "denied", + ); + const recoveryShown = yield* Deferred.make(); + const recoveryAnswer = Promise.withResolvers(); + showMessageBox.mockImplementation((options) => { + if (options.message.startsWith("macOS blocked")) { + Deferred.doneUnsafe(recoveryShown, Effect.void); + return recoveryAnswer.promise; + } + return 0; + }); + assert.isFalse(yield* requestMedia("https://second.test/", ["video", "audio"])); + assert.strictEqual(askForMediaAccess.mock.calls.length, 0); + yield* Deferred.await(recoveryShown); + assert.strictEqual(showMessageBox.mock.calls.length, 3); + assert.strictEqual( + showMessageBox.mock.calls[1]?.[0].message, + "https://second.test wants to use your camera and microphone", + ); + assert.strictEqual( + showMessageBox.mock.calls[2]?.[0].message, + "macOS blocked T3 Code from using your camera and microphone", + ); + assert.isFalse(yield* requestMedia("https://second.test/", ["video", "audio"])); + assert.strictEqual(showMessageBox.mock.calls.length, 3); + recoveryAnswer.resolve(0); + const checkHandler = sessions.get(partition)?.setPermissionCheckHandler.mock.calls[0]?.[0]; + assert.isFalse(checkHandler(null, "media", "https://second.test", { mediaType: "audio" })); + getMediaAccessStatus.mockReturnValue("granted"); + assert.isTrue(checkHandler(null, "media", "https://second.test", { mediaType: "audio" })); + }).pipe(Effect.provide(layerDarwin)), + ); + + it.effect("forgets camera answers when the profile's cookies are cleared", () => + Effect.gen(function* () { + const browserSessions = yield* BrowserSession.BrowserSession; + const partition = yield* browserSessions.getPartition("scope-a"); + yield* browserSessions.getSession("scope-a"); + const browserSession = sessions.get(partition); + assert.isDefined(browserSession); + const requestHandler = browserSession.setPermissionRequestHandler.mock.calls[0]?.[0]; + const checkHandler = browserSession.setPermissionCheckHandler.mock.calls[0]?.[0]; + const requestCamera = () => + Effect.callback((resume) => { + requestHandler(null, "media", (granted: boolean) => resume(Effect.succeed(granted)), { + requestingUrl: "https://page.test/", + mediaTypes: ["video"], + isMainFrame: true, + }); + }); + const checkCamera = (): boolean => + checkHandler(null, "media", "https://page.test", { mediaType: "video" }) as boolean; + + showMessageBox.mockReset(); + showMessageBox.mockReturnValueOnce(1).mockReturnValueOnce(0).mockReturnValueOnce(1); + getMediaAccessStatus.mockReset(); + getMediaAccessStatus.mockReturnValue("granted"); + + assert.isFalse(yield* requestCamera()); + assert.isFalse(yield* requestCamera()); + assert.strictEqual(showMessageBox.mock.calls.length, 1); + + // Clearing lets the user reconsider a block... + yield* browserSessions.clearCookies([partition]); + assert.isTrue(yield* requestCamera()); + assert.isTrue(checkCamera()); + assert.strictEqual(showMessageBox.mock.calls.length, 2); + + // ...and revokes an approval, including one cleared outside clearCookies. + yield* browserSessions.cookiesCleared(browserSession as unknown as Electron.Session); + assert.isFalse(checkCamera()); + assert.isFalse(yield* requestCamera()); + assert.strictEqual(showMessageBox.mock.calls.length, 3); + + yield* browserSessions.clearCookies([partition]); + showMessageBox.mockReturnValue(0); + assert.isTrue(yield* requestCamera()); + yield* browserSessions.getSession("scope-b"); + const otherPartition = yield* browserSessions.getPartition("scope-b"); + const otherRequest = + sessions.get(otherPartition)?.setPermissionRequestHandler.mock.calls[0]?.[0]; + const otherCheck = sessions.get(otherPartition)?.setPermissionCheckHandler.mock.calls[0]?.[0]; + assert.isTrue( + yield* Effect.callback((resume) => { + otherRequest(null, "media", (value: boolean) => resume(Effect.succeed(value)), { + requestingUrl: "https://page.test/", + mediaTypes: ["video"], + isMainFrame: true, + }); + }), + ); + browserSession.clearStorageData.mockRejectedValueOnce(new Error("clear failed")); + const pendingClear = Promise.withResolvers(); + sessions + .get(otherPartition) + ?.clearStorageData.mockImplementationOnce(() => pendingClear.promise); + const cleared = yield* Effect.result(browserSessions.clearCookies()); + assert.strictEqual(cleared._tag, "Failure"); + assert.isFalse(checkCamera()); + assert.isFalse(otherCheck(null, "media", "https://page.test", { mediaType: "video" })); + pendingClear.resolve(); + }).pipe(Effect.provide(layer)), + ); + + it.effect("a reset while a camera prompt is open neither grants nor remembers", () => + Effect.gen(function* () { + const browserSessions = yield* BrowserSession.BrowserSession; + const partition = yield* browserSessions.getPartition("scope-a"); + yield* browserSessions.getSession("scope-a"); + const requestHandler = + sessions.get(partition)?.setPermissionRequestHandler.mock.calls[0]?.[0]; + const checkHandler = sessions.get(partition)?.setPermissionCheckHandler.mock.calls[0]?.[0]; + const guest = Object.assign(new NodeEvents.EventEmitter(), { + hostWebContents: null, + isDestroyed: vi.fn<() => boolean>(() => false), + }); + const requestCamera = () => { + const granted = Deferred.makeUnsafe(); + requestHandler( + guest, + "media", + (value: boolean) => Deferred.doneUnsafe(granted, Effect.succeed(value)), + { requestingUrl: "https://page.test/", mediaTypes: ["video"], isMainFrame: true }, + ); + return Deferred.await(granted); + }; + const checkCamera = (): boolean => + checkHandler(null, "media", "https://page.test", { mediaType: "video" }) as boolean; + + // The user answers Allow only after cookies were cleared. + const asked = yield* Deferred.make(); + const answer = Promise.withResolvers(); + showMessageBox.mockReset(); + showMessageBox.mockImplementationOnce(() => { + Deferred.doneUnsafe(asked, Effect.void); + return answer.promise; + }); + getMediaAccessStatus.mockReset(); + getMediaAccessStatus.mockReturnValue("not-determined"); + askForMediaAccess.mockReset(); + askForMediaAccess.mockResolvedValue(true); + + const pending = yield* Effect.forkChild(requestCamera()); + yield* Deferred.await(asked); + yield* browserSessions.clearCookies([partition]); + answer.resolve(0); + assert.isFalse(yield* Fiber.join(pending)); + assert.isFalse(checkCamera()); + assert.strictEqual(askForMediaAccess.mock.calls.length, 0); + + // The macOS check is still running when cookies are cleared. + const systemAsked = yield* Deferred.make(); + const systemAnswer = Promise.withResolvers(); + showMessageBox.mockReturnValue(0); + askForMediaAccess.mockImplementationOnce(() => { + Deferred.doneUnsafe(systemAsked, Effect.void); + return systemAnswer.promise; + }); + const pendingSystem = yield* Effect.forkChild(requestCamera()); + yield* Deferred.await(systemAsked); + yield* browserSessions.clearCookies([partition]); + systemAnswer.resolve(true); + assert.isFalse(yield* Fiber.join(pendingSystem)); + assert.isFalse(checkCamera()); + + const tabPromptShown = yield* Deferred.make(); + const tabAnswer = Promise.withResolvers(); + showMessageBox.mockImplementationOnce(() => { + Deferred.doneUnsafe(tabPromptShown, Effect.void); + return tabAnswer.promise; + }); + const pendingTab = yield* Effect.forkChild(requestCamera()); + yield* Deferred.await(tabPromptShown); + const promptSignal = showMessageBox.mock.lastCall?.[0].signal; + guest.isDestroyed.mockReturnValue(true); + guest.emit("destroyed"); + assert.isTrue(promptSignal?.aborted); + tabAnswer.resolve(0); + assert.isFalse(yield* Fiber.join(pendingTab)); + assert.isFalse(checkCamera()); + assert.strictEqual(askForMediaAccess.mock.calls.length, 1); + }).pipe(Effect.provide(layerDarwin)), + ); + it.effect("clears a partition whose session has not been opened yet", () => Effect.gen(function* () { const browserSessions = yield* BrowserSession.BrowserSession; diff --git a/apps/desktop/src/preview/BrowserSession.ts b/apps/desktop/src/preview/BrowserSession.ts index d247fcbcd8266..43547b395ea5e 100644 --- a/apps/desktop/src/preview/BrowserSession.ts +++ b/apps/desktop/src/preview/BrowserSession.ts @@ -1,6 +1,6 @@ import * as HostProcess from "@t3tools/shared/HostProcess"; import type { Certificate, Session, WebContents } from "electron"; -import { BrowserWindow, session } from "electron"; +import { BrowserWindow, session, systemPreferences } from "electron"; import { msg } from "gt-i18n"; import * as Context from "effect/Context"; import * as DateTime from "effect/DateTime"; @@ -139,6 +139,54 @@ interface CertificateTrust { revocations: number; } +type MediaDevice = "camera" | "microphone"; + +const mediaDeviceFor = (mediaType: string | undefined): MediaDevice | null => + mediaType === "video" ? "camera" : mediaType === "audio" ? "microphone" : null; + +// Whole sentences per device set, so each language can phrase them its own way. +const mediaRequestMessage = (devices: ReadonlyArray, origin: string): string => + devices.length === 2 + ? m(msg("{origin} wants to use your camera and microphone"), { origin }) + : devices[0] === "microphone" + ? m(msg("{origin} wants to use your microphone"), { origin }) + : m(msg("{origin} wants to use your camera"), { origin }); + +const mediaBlockedMessage = (devices: ReadonlyArray): string => + devices.length === 2 + ? m(msg("macOS blocked T3 Code from using your camera and microphone")) + : devices[0] === "microphone" + ? m(msg("macOS blocked T3 Code from using your microphone")) + : m(msg("macOS blocked T3 Code from using your camera")); + +/** + * macOS gates capture devices per app and lists an app under Privacy & Security + * only after it asks, so ask the OS once the user allowed the page. + */ +const ensureSystemMediaAccess = async ( + platform: NodeJS.Platform, + devices: ReadonlyArray, +): Promise => { + if (platform !== "darwin") return true; + const statuses = devices.map((device) => systemPreferences.getMediaAccessStatus(device)); + if (statuses.some((status) => status !== "granted" && status !== "not-determined")) return false; + const results = await Promise.all( + devices.map((device, index) => + statuses[index] === "granted" + ? true + : systemPreferences.askForMediaAccess(device).catch(() => false), + ), + ); + return results.every(Boolean); +}; + +/** The camera and microphone answers given in one preview Session. */ +interface MediaConsent { + readonly decisions: Map; + /** Bumped by each reset, so an answer to an older prompt cannot restore a decision. */ + resets: number; +} + export class BrowserSessionPartitionDerivationError extends Schema.TaggedError()( "BrowserSessionPartitionDerivationError", { @@ -268,6 +316,7 @@ export const make = Effect.gen(function* BrowserSessionMake() { const runFork = Effect.runForkWith(yield* Effect.context()); // One prompt at a time, so a page cannot stack dialogs by looping a deep link. let permissionPromptOpen = false; + let mediaRecoveryOpen = false; /** Settles with `undefined` when the user gave no answer: another prompt was open or the dialog failed. */ const promptPermission = ( requester: WebContents | null, @@ -278,21 +327,26 @@ export const make = Effect.gen(function* BrowserSessionMake() { }, callback: (answer: boolean | undefined) => void, ): void => { - if (permissionPromptOpen) { + if (permissionPromptOpen || requester?.isDestroyed()) { callback(undefined); return; } permissionPromptOpen = true; + const dismiss = new AbortController(); + const abandon = () => dismiss.abort(); + requester?.once("destroyed", abandon); const settle = (answer: boolean | undefined) => Effect.sync(() => { permissionPromptOpen = false; - callback(answer); + requester?.off("destroyed", abandon); + callback(dismiss.signal.aborted || requester?.isDestroyed() ? undefined : answer); }); runFork( electronDialog .showMessageBox( { type: "question", + signal: dismiss.signal, buttons: [...prompt.buttons], // Default to deny so an Enter typed into the page cannot accept a prompt it raised. defaultId: 1, @@ -574,6 +628,15 @@ export const make = Effect.gen(function* BrowserSessionMake() { } }); + /** Camera and microphone answers by Session; clearing a profile's cookies forgets them too. */ + const mediaConsentBySession = new WeakMap(); + const forgetMediaDecisions = (browserSession: Session): void => { + const consent = mediaConsentBySession.get(browserSession); + if (consent === undefined) return; + consent.resets += 1; + consent.decisions.clear(); + }; + const sessionsRef = yield* SynchronizedRef.make>(new Map()); const getPartition = Effect.fn("BrowserSession.getPartition")(function* ( @@ -651,6 +714,104 @@ export const make = Effect.gen(function* BrowserSessionMake() { }, ); }; + // Camera and microphone ask once per origin and device, like clipboard reads. + const mediaConsent: MediaConsent = { decisions: new Map(), resets: 0 }; + mediaConsentBySession.set(browserSession, mediaConsent); + const mediaDecisions = mediaConsent.decisions; + const mediaKey = (origin: string, device: MediaDevice) => `${device} ${origin}`; + const confirmMedia = ( + requester: WebContents, + rawUrl: string | undefined, + mediaTypes: ReadonlyArray | undefined, + callback: (granted: boolean) => void, + ): void => { + const origin = permissionOrigin(rawUrl); + const devices = [ + ...new Set((mediaTypes ?? []).map(mediaDeviceFor).filter((d) => d !== null)), + ]; + if (origin === null || devices.length === 0) { + callback(false); + return; + } + // A reset while a prompt or the macOS check is pending must not grant or remember. + const resets = mediaConsent.resets; + const isStale = () => + mediaConsent.resets !== resets || requester?.isDestroyed() === true; + const finish = (granted: boolean) => { + if (!granted || isStale()) { + callback(false); + return; + } + void ensureSystemMediaAccess(platform, devices).then( + (systemGranted) => { + if (isStale()) { + callback(false); + return; + } + if (!systemGranted && !mediaRecoveryOpen) { + mediaRecoveryOpen = true; + runFork( + electronDialog + .showMessageBox( + { + type: "info", + buttons: [m(msg("OK"))], + message: mediaBlockedMessage(devices), + detail: m( + msg( + "Allow T3 Code in System Settings › Privacy & Security, then restart T3 Code.", + ), + ), + }, + previewHostWindow(requester), + ) + .pipe( + Effect.ignore, + Effect.ensuring( + Effect.sync(() => { + mediaRecoveryOpen = false; + }), + ), + ), + ); + } + callback(systemGranted); + }, + () => callback(false), + ); + }; + const remembered = devices.map((device) => + mediaDecisions.get(mediaKey(origin, device)), + ); + if (remembered.some((answer) => answer === false)) { + callback(false); + return; + } + if (remembered.every((answer) => answer === true)) { + finish(true); + return; + } + const undecided = devices.filter( + (device) => !mediaDecisions.has(mediaKey(origin, device)), + ); + promptPermission( + requester, + { + buttons: [ + m(msg("Allow", { $context: "button, grants a site permission" })), + m(msg("Block", { $context: "button, denies a site permission" })), + ], + message: mediaRequestMessage(undecided, truncateForPrompt(origin)), + }, + (answer) => { + if (answer !== undefined && !isStale()) { + for (const device of undecided) + mediaDecisions.set(mediaKey(origin, device), answer); + } + finish(answer === true); + }, + ); + }; // Rewriting Electron's native User-Agent makes Turnstile fail integrity checks with error 600010. browserSession.setPermissionRequestHandler( (webContents, permission, callback, details) => { @@ -671,14 +832,40 @@ export const make = Effect.gen(function* BrowserSessionMake() { ); return; } + if (permission === "media") { + confirmMedia( + webContents, + ("securityOrigin" in details ? details.securityOrigin : undefined) ?? + details.requestingUrl, + "mediaTypes" in details ? details.mediaTypes : undefined, + callback, + ); + return; + } callback(ALLOWED_PREVIEW_PERMISSIONS.has(permission)); }, ); - browserSession.setPermissionCheckHandler((_webContents, permission, requestingOrigin) => - permission === "clipboard-read" || permission === "geolocation" - ? permissionDecisions[permission].get(permissionOrigin(requestingOrigin) ?? "") === - true - : ALLOWED_PREVIEW_PERMISSIONS.has(permission), + browserSession.setPermissionCheckHandler( + (_webContents, permission, requestingOrigin, details) => { + if (permission === "clipboard-read" || permission === "geolocation") { + return ( + permissionDecisions[permission].get(permissionOrigin(requestingOrigin) ?? "") === + true + ); + } + if (permission === "media") { + const origin = permissionOrigin(requestingOrigin); + const device = mediaDeviceFor(details?.mediaType); + return ( + origin !== null && + device !== null && + mediaDecisions.get(mediaKey(origin, device)) === true && + (platform !== "darwin" || + systemPreferences.getMediaAccessStatus(device) === "granted") + ); + } + return ALLOWED_PREVIEW_PERMISSIONS.has(permission); + }, ); browserSession.webRequest.onBeforeSendHeaders( { urls: TEAMS_URL_PATTERNS }, @@ -727,8 +914,10 @@ export const make = Effect.gen(function* BrowserSessionMake() { getSession, clearCookies: Effect.fn("BrowserSession.clearCookies")(function* (partitions?) { const sessions = yield* SynchronizedRef.get(sessionsRef); + const selected = selectSessions(sessions, partitions); + for (const [, browserSession] of selected) forgetMediaDecisions(browserSession); yield* Effect.forEach( - selectSessions(sessions, partitions), + selected, ([partition, browserSession]) => Effect.gen(function* () { const cleared = yield* Effect.tryPromise({ @@ -758,7 +947,9 @@ export const make = Effect.gen(function* BrowserSessionMake() { cookiesCleared: Effect.fn("BrowserSession.cookiesCleared")(function* (browserSession) { const sessions = yield* SynchronizedRef.get(sessionsRef); for (const [partition, candidate] of sessions) { - if (candidate === browserSession) yield* revokeCertificates(partition, browserSession); + if (candidate !== browserSession) continue; + forgetMediaDecisions(browserSession); + yield* revokeCertificates(partition, browserSession); } }), clearCache: Effect.fn("BrowserSession.clearCache")(function* (partitions?) {