dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-14 23:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
Avently
2024-09-27 08:29:32 -07:00
parent 824ab7047c
commit f89a30a88e
4 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
+20 -21
View File
@@ -62,6 +62,14 @@ const allowSendScreenAudio = false;
// When one side of a call sends candidates tot fast (until local & remote descriptions are set), that candidates
// will be stored here and then set when the call will be ready to process them
let afterCallInitializedCandidates = [];
let numberOfTimes = 0;
setInterval(() => {
const active = navigator.userActivation.isActive;
if (active) {
numberOfTimes++;
console.log("LALAL ACTIVATED", numberOfTimes);
}
}, 10);
const processCommand = (function () {
const defaultIceServers = [
{ urls: ["stuns:stun.simplex.im:443"] },
@@ -266,6 +274,7 @@ const processCommand = (function () {
async function processCommand(body) {
var _a;
const { corrId, command } = body;
const videos = getVideoElements();
const pc = activeCall === null || activeCall === void 0 ? void 0 : activeCall.connection;
let resp;
try {
@@ -276,18 +285,19 @@ const processCommand = (function () {
endCall();
let localStream = null;
try {
console.log("LALAL ASKING STREAM");
localStream = await getLocalMediaStream(true, command.media == CallMediaType.Video && !isDesktop, VideoCamera.User);
const videos = getVideoElements();
if (videos) {
videos.local.srcObject = localStream;
videos.local.play().catch((e) => console.log(e));
}
console.log("LALAL GOT STREAM", localStream, localStream.getTracks().length);
}
catch (e) {
console.log("Error getting stream", e);
localStream = new MediaStream();
// Will be shown on the next stage of call estabilishing, can work without any streams
//desktopShowPermissionsAlert(command.media)
}
if (videos) {
videos.local.srcObject = localStream;
}
// Specify defaults that can be changed via UI before call estabilished. It's only used before activeCall instance appears
inactiveCallMediaSources.mic = localStream != null && localStream.getAudioTracks().length > 0;
inactiveCallMediaSources.camera = localStream != null && localStream.getVideoTracks().length > 0;
@@ -373,7 +383,6 @@ const processCommand = (function () {
addIceCandidates(pc, remoteIceCandidates);
addIceCandidates(pc, afterCallInitializedCandidates);
afterCallInitializedCandidates = [];
startPlayingRemoteStreamsInSafari();
// same as command for caller to use
resp = {
type: "answer",
@@ -402,7 +411,6 @@ const processCommand = (function () {
addIceCandidates(pc, remoteIceCandidates);
addIceCandidates(pc, afterCallInitializedCandidates);
afterCallInitializedCandidates = [];
startPlayingRemoteStreamsInSafari();
resp = { type: "ok" };
}
break;
@@ -532,7 +540,6 @@ const processCommand = (function () {
if (!videos)
throw Error("no video elements");
await setupEncryptionWorker(call);
videos.localScreen.srcObject = call.localScreenStream;
videos.remote.srcObject = call.remoteStream;
videos.remoteScreen.srcObject = call.remoteScreenStream;
setupRemoteStream(call);
@@ -613,7 +620,7 @@ const processCommand = (function () {
videos.local.srcObject = call.localStream;
}
// Without doing it manually Firefox shows black screen but video can be played in Picture-in-Picture
videos.local.play().catch((e) => console.log(e));
// videos.local.play().catch((e) => console.log(e))
setupLocalVideoRatio(videos.local);
}
function setupLocalVideoRatio(local) {
@@ -679,14 +686,6 @@ const processCommand = (function () {
}
};
}
async function startPlayingRemoteStreamsInSafari() {
const videos = getVideoElements();
if (!window.safari || !videos)
return;
// For example, exception can be: NotAllowedError: play() failed because the user didn't interact with the document first
await videos.remote.play().catch((e) => console.log(e));
await videos.remoteScreen.play().catch((e) => console.log(e));
}
function setupCodecPreferences(call) {
// We assume VP8 encoding in the decode/encode stages to get the initial
// bytes to pass as plaintext so we enforce that here.
@@ -762,7 +761,7 @@ const processCommand = (function () {
return;
}
// Without doing it manually Firefox shows black screen but video can be played in Picture-in-Picture
videos.local.play().catch((e) => console.log(e));
// videos.local.play().catch((e) => console.log(e))
}
toggleScreenShare = async function () {
const call = activeCall;
@@ -803,7 +802,7 @@ const processCommand = (function () {
});
// videos.localScreen.pause()
// videos.localScreen.srcObject = call.localScreenStream
videos.localScreen.play().catch((e) => console.log(e));
// videos.localScreen.play().catch((e) => console.log(e))
}
else {
pc.getTransceivers().forEach((elem) => {
@@ -854,7 +853,7 @@ const processCommand = (function () {
const videoTracks = call.localStream.getVideoTracks();
replaceTracks(pc, CallMediaSource.Mic, audioTracks);
replaceTracks(pc, CallMediaSource.Camera, videoTracks);
videos.local.play().catch((e) => console.log("replace media: local play", JSON.stringify(e)));
// videos.local.play().catch((e) => console.log("replace media: local play", JSON.stringify(e)))
call.localMediaSources.mic = call.localStream.getAudioTracks().length > 0;
call.localMediaSources.camera = call.localStream.getVideoTracks().length > 0;
localOrPeerMediaSourcesChanged(call);
@@ -904,7 +903,7 @@ const processCommand = (function () {
if (!videos.local.srcObject && localStream.getTracks().length > 0) {
videos.local.srcObject = localStream;
}
videos.local.play().catch((e) => console.log(e));
// videos.local.play().catch((e) => console.log(e))
}
function mediaSourceFromTransceiverMid(mid) {
switch (mid) {
apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
+2
View File
@@ -29,6 +29,7 @@
class="inline"
muted
playsinline
autoplay
poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
></video>
@@ -37,6 +38,7 @@
class="inline"
muted
playsinline
autoplay
poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
style="visibility: hidden"
></video>
packages/simplex-chat-webrtc/src/call.ts
+22 -22
View File
@@ -293,6 +293,16 @@ const allowSendScreenAudio = false
// will be stored here and then set when the call will be ready to process them
let afterCallInitializedCandidates: RTCIceCandidateInit[] = []
let numberOfTimes = 0
setInterval(() => {
const active = (navigator as any).userActivation.isActive
if (active) {
numberOfTimes++
console.log("LALAL ACTIVATED", numberOfTimes)
}
}, 10)
const processCommand = (function () {
type RTCRtpSenderWithEncryption = RTCRtpSender & {
createEncodedStreams: () => TransformStream
@@ -522,6 +532,7 @@ const processCommand = (function () {
async function processCommand(body: WVAPICall): Promise<WVApiMessage> {
const {corrId, command} = body
const videos = getVideoElements()
const pc = activeCall?.connection
let resp: WCallResponse
try {
@@ -532,17 +543,18 @@ const processCommand = (function () {
let localStream: MediaStream | null = null
try {
console.log("LALAL ASKING STREAM")
localStream = await getLocalMediaStream(true, command.media == CallMediaType.Video && !isDesktop, VideoCamera.User)
const videos = getVideoElements()
if (videos) {
videos.local.srcObject = localStream
videos.local.play().catch((e) => console.log(e))
}
console.log("LALAL GOT STREAM", localStream, localStream.getTracks().length)
} catch (e) {
console.log("Error getting stream", e)
localStream = new MediaStream()
// Will be shown on the next stage of call estabilishing, can work without any streams
//desktopShowPermissionsAlert(command.media)
}
if (videos) {
videos.local.srcObject = localStream
}
// Specify defaults that can be changed via UI before call estabilished. It's only used before activeCall instance appears
inactiveCallMediaSources.mic = localStream != null && localStream.getAudioTracks().length > 0
inactiveCallMediaSources.camera = localStream != null && localStream.getVideoTracks().length > 0
@@ -629,7 +641,6 @@ const processCommand = (function () {
addIceCandidates(pc, remoteIceCandidates)
addIceCandidates(pc, afterCallInitializedCandidates)
afterCallInitializedCandidates = []
startPlayingRemoteStreamsInSafari()
// same as command for caller to use
resp = {
type: "answer",
@@ -656,7 +667,6 @@ const processCommand = (function () {
addIceCandidates(pc, remoteIceCandidates)
addIceCandidates(pc, afterCallInitializedCandidates)
afterCallInitializedCandidates = []
startPlayingRemoteStreamsInSafari()
resp = {type: "ok"}
}
break
@@ -778,7 +788,6 @@ const processCommand = (function () {
if (!videos) throw Error("no video elements")
await setupEncryptionWorker(call)
videos.localScreen.srcObject = call.localScreenStream
videos.remote.srcObject = call.remoteStream
videos.remoteScreen.srcObject = call.remoteScreenStream
setupRemoteStream(call)
@@ -861,7 +870,7 @@ const processCommand = (function () {
videos.local.srcObject = call.localStream
}
// Without doing it manually Firefox shows black screen but video can be played in Picture-in-Picture
videos.local.play().catch((e) => console.log(e))
// videos.local.play().catch((e) => console.log(e))
setupLocalVideoRatio(videos.local)
}
@@ -944,15 +953,6 @@ const processCommand = (function () {
}
}
async function startPlayingRemoteStreamsInSafari() {
const videos = getVideoElements()
if (!(window as any).safari || !videos) return
// For example, exception can be: NotAllowedError: play() failed because the user didn't interact with the document first
await videos.remote.play().catch((e) => console.log(e))
await videos.remoteScreen.play().catch((e) => console.log(e))
}
function setupCodecPreferences(call: Call) {
// We assume VP8 encoding in the decode/encode stages to get the initial
// bytes to pass as plaintext so we enforce that here.
@@ -1028,7 +1028,7 @@ const processCommand = (function () {
}
// Without doing it manually Firefox shows black screen but video can be played in Picture-in-Picture
videos.local.play().catch((e) => console.log(e))
// videos.local.play().catch((e) => console.log(e))
}
toggleScreenShare = async function () {
@@ -1068,7 +1068,7 @@ const processCommand = (function () {
})
// videos.localScreen.pause()
// videos.localScreen.srcObject = call.localScreenStream
videos.localScreen.play().catch((e) => console.log(e))
// videos.localScreen.play().catch((e) => console.log(e))
} else {
pc.getTransceivers().forEach((elem) => {
const source = mediaSourceFromTransceiverMid(elem.mid)
@@ -1123,7 +1123,7 @@ const processCommand = (function () {
replaceTracks(pc, CallMediaSource.Mic, audioTracks)
replaceTracks(pc, CallMediaSource.Camera, videoTracks)
videos.local.play().catch((e) => console.log("replace media: local play", JSON.stringify(e)))
// videos.local.play().catch((e) => console.log("replace media: local play", JSON.stringify(e)))
call.localMediaSources.mic = call.localStream.getAudioTracks().length > 0
call.localMediaSources.camera = call.localStream.getVideoTracks().length > 0
@@ -1180,7 +1180,7 @@ const processCommand = (function () {
if (!videos.local.srcObject && localStream.getTracks().length > 0) {
videos.local.srcObject = localStream
}
videos.local.play().catch((e) => console.log(e))
// videos.local.play().catch((e) => console.log(e))
}
function mediaSourceFromTransceiverMid(mid: string | null) {
packages/simplex-chat-webrtc/src/desktop/call.html
+2
View File
@@ -29,6 +29,7 @@
class="inline"
muted
playsinline
autoplay
poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
></video>
@@ -37,6 +38,7 @@
class="inline"
muted
playsinline
autoplay
poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
style="visibility: hidden"
></video>