@lvce-editor/renderer-process 30.27.0 → 30.29.0

package/dist/rendererProcessMain.js

@@ -9594,7 +9594,7 @@ const queryAudio = (uid, elementLocator) => {
   }
   return remoteAudio;
 };
-const setupLevelMeter = (audioCtx, stream, kind) => {
+const setupLevelMeter = (audioCtx, stream) => {
   const source = audioCtx.createMediaStreamSource(stream);
   const analyser = audioCtx.createAnalyser();
   // TODO make variables confirguable
@@ -9620,7 +9620,9 @@ const startWebRtcAudioStream = async options => {
   }
   let audioCtx;
   let micAnalyzer;
-  let remoteAnalyzer;
+  const remoteAnalyzerInstance = {
+    instance: undefined
+  };
   if (trackAudioData) {
     // @ts-ignore
     audioCtx = new (window.AudioContext || window.webkitAudioContext)();
@@ -9629,7 +9631,7 @@ const startWebRtcAudioStream = async options => {
   pc.ontrack = e => {
     remoteAudio.srcObject = e.streams[0];
     if (trackAudioData && audioCtx) {
-      remoteAnalyzer = setupLevelMeter(audioCtx, e.streams[0]);
+      remoteAnalyzerInstance.instance = setupLevelMeter(audioCtx, e.streams[0]);
     }
   };
   const micStream = await navigator.mediaDevices.getUserMedia({
@@ -9643,16 +9645,27 @@ const startWebRtcAudioStream = async options => {
   dc.addEventListener('message', e => {
     port.postMessage(e.data);
   });
+  port.onmessage = event => {
+    const {
+      data
+    } = event;
+    if (dc.readyState !== 'open') {
+      return;
+    }
+    dc.send(data);
+  };
 
   // 3. Standard WebRTC offer/answer handshake against the Realtime API.
   const offer = await pc.createOffer();
   await pc.setLocalDescription(offer);
   pcs[uid] = {
+    audioCtx,
     connection: pc,
+    dataChannel: dc,
     micAnalyzer,
     micStream,
     port,
-    remoteAnalyzer
+    remoteAnalyzer: remoteAnalyzerInstance
   };
   return offer.sdp;
 };
@@ -9674,6 +9687,8 @@ const setRemoteDescription = async options => {
     type
   });
 };
+
+// TODO this has a race conditon when start/stop is pressed fast
 const stopWebRtcAudioStream = async options => {
   const {
     uid
@@ -9684,16 +9699,30 @@ const stopWebRtcAudioStream = async options => {
   }
   // TODO use disposableMap maybe?
   const {
+    audioCtx,
     connection,
+    dataChannel,
     micStream,
     port
   } = pc;
   delete pcs[uid];
   connection.close();
+  dataChannel.close();
   for (const t of micStream.getTracks()) {
     t.stop();
   }
   port.close();
+  if (audioCtx) {
+    await audioCtx.close();
+  }
+};
+const readMicLevel = analyzer => {
+  let data = new Uint8Array();
+  if (analyzer) {
+    data = new Uint8Array(analyzer.frequencyBinCount);
+    analyzer.getByteTimeDomainData(data);
+  }
+  return data;
 };
 const readMicLevels = options => {
   const {
@@ -9710,16 +9739,8 @@ const readMicLevels = options => {
     micAnalyzer,
     remoteAnalyzer
   } = pc;
-  let micAnalyzerData = new Uint8Array();
-  if (micAnalyzer) {
-    micAnalyzerData = new Uint8Array(micAnalyzer.frequencyBinCount);
-    micAnalyzer.getByteTimeDomainData(micAnalyzerData);
-  }
-  let remoteAnalyzerData = new Uint8Array();
-  if (remoteAnalyzer) {
-    remoteAnalyzerData = new Uint8Array(remoteAnalyzer.frequencyBinCount);
-    remoteAnalyzer.getByteTimeDomainData(remoteAnalyzerData);
-  }
+  const micAnalyzerData = readMicLevel(micAnalyzer);
+  const remoteAnalyzerData = readMicLevel(remoteAnalyzer.instance);
   return {
     micAnalyzerData,
     remoteAnalyzerData

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.27.0",
+  "version": "30.29.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"