Remove console.logs

Author: kamil-stasiak

assets/package-lock.json

@@ -13,16 +13,13 @@ import EmptyVideoWorker from "./emptyVideoWorker.ts?worker";
 
 export type LocalPeerContext = {
   video: UseCameraResult<TrackMetadata>;
-  // audio: UseMicrophoneResult<TrackMetadata>;
-  // screenShare: UseScreenShareResult<TrackMetadata>;
-  // camera: MembraneStreaming;
   init: () => void;
   blur: boolean;
   setBlur: (status: boolean, restart: boolean) => void;
   setDevice: (cameraId: string | null, microphoneId: string | null, blur: boolean) => void;
   toggleCamera: (value: boolean) => void,
   toggleMicrophone: (value: boolean) => void,
-  restartMicrophone: () => void;
+  restartDevices: () => void;
 };
 
 const LocalPeerMediaContext = React.createContext<LocalPeerContext | undefined>(undefined);
@@ -79,7 +76,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
   const blurRef = useRef<boolean>(false);
 
   const [stream, setStream] = useState<MediaStream | null>(null);
-  // obecnie nadawany stram - może to być ciemność, może to być blur, może to być kamerka
   const streamRef = useRef<MediaStream | null>(null);
   const metadataActiveRef = useRef<boolean>(true);
 
@@ -92,40 +88,22 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
   const offscreenCanvasRef = useRef<OffscreenCanvas | null>(null);
   const remoteTrackIdRef = useRef<string | null>(null);
 
-  // if user start or stop camera during it's decision is reflected in this variables
   const cameraIntentionRef = useRef<boolean>(true);
   const microphoneIntentionRef = useRef<boolean>(true);
   const lastCameraIdRef = useRef<null | string>(null);
 
-  // useEffect(() => {
-  //   const a = setInterval(() => {
-  //     console.log({ lastCameraIdRef: lastCameraIdRef.current, cameraIntention: cameraIntentionRef.current });
-  //   }, 3000);
-  //
-  //   return () => {
-  //     clearInterval(a);
-  //   };
-  // }, []);
-
   const broadcastedStreamRef = useRef<MediaStream | null>(null);
 
   const changeMediaStream = useCallback(async (stream: MediaStream | null, track: MediaStreamTrack | null, blur: boolean, metadataActive: boolean) => {
-    console.log({ stream, track, blur, metadataActive });
     metadataActiveRef.current = metadataActive;
 
     if (processor.current && !blur) {
-      console.log("Destroying processor");
       processor.current.destroy();
       processor.current = null;
     }
 
     if (blur && stream) {
-      console.log({ name: "Handle blur", blur, stream });
-      if (processor.current && streamRef.current?.id === stream.id) {
-        console.log("Ignoring blur");
-      } else {
-        console.log("Disabling old processor and creating new one");
-
+      if (!(processor.current && streamRef.current?.id === stream.id)) {
         processor?.current?.destroy();
         processor.current = null;
         processor.current = new BlurProcessor(stream);
@@ -136,9 +114,7 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
         streamRef.current = processor.current?.stream || null;
         trackRef.current = processor.current?.track || null;
       }
-
     } else {
-      console.log("Set stream and track");
       setStream(stream || null);
       setTrack(track || null);
 
@@ -148,7 +124,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
 
     if (client.getSnapshot().status === "joined") {
       if (!remoteTrackIdRef.current && streamRef.current && trackRef.current) {
-        console.log("Adding track");
         const mediaStream = new MediaStream();
         mediaStream.addTrack(trackRef.current);
 
@@ -163,8 +138,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
           selectBandwidthLimit("camera", simulcastEnabled)
         );
       } else if (remoteTrackIdRef.current && trackRef.current) {
-        console.log("Replacing track");
-
         // todo add setter as an alternative to setting whole object
         broadcastedStreamRef.current?.removeTrack(broadcastedStreamRef.current?.getVideoTracks()[0]);
         broadcastedStreamRef.current?.addTrack(trackRef.current);
@@ -173,15 +146,9 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
         const newMetadata: TrackMetadata = { active: metadataActive, type: "camera" };
 
         await client.replaceTrack(remoteTrackIdRef.current, trackRef.current, newMetadata);
-        // todo ...
-        // await client.updateTrackMetadata(remoteTrackIdRef.current, newMetadata);
       } else if (remoteTrackIdRef.current && !stream) {
-        console.log("Removing track");
-
         await client.removeTrack(remoteTrackIdRef.current);
         remoteTrackIdRef.current = null;
-      } else {
-        console.log("Skipping track");
       }
     }
   }, [setStream, setTrack]);
@@ -198,7 +165,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
 
       const snapshot = client.getSnapshot();
 
-      console.log({ name: "managerInitialized", event });
       const cameraId = snapshot?.media?.video?.media?.deviceInfo?.deviceId || null;
 
       if (cameraId) {
@@ -236,68 +202,30 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
       const stream = snapshot.devices.camera.stream;
       const track = snapshot.devices.camera.track;
 
-      console.log({
-        name: "joinedHandler - method start",
-        cameraIntentionRef: cameraIntentionRef.current,
-        lastCameraIdRef: lastCameraIdRef.current
-      });
-
       if (cameraIntentionRef.current && !remoteTrackIdRef.current && stream && track) {
-        console.log("First visit");
-
         await changeMediaStream(stream, track, blurRef.current, metadataActiveRef.current);
       } else if (cameraIntentionRef.current && lastCameraIdRef.current) {
-        console.log("Rejoin");
-        console.log("joinedHandler - start device if user wants it");
         await snapshot.deviceManager.start({ videoDeviceId: lastCameraIdRef.current });
-      } else {
-        console.log("joinedHandler - skipped");
       }
 
       const microphoneTrack = snapshot.devices.microphone.track;
 
       if (microphoneIntentionRef.current && !microphoneTrack) {
-        console.log("Restarting microphone");
         await snapshot.deviceManager.start({ audioDeviceId: true });
       }
-
-      // if (stream && track) {
-      //   // naiwnie zakłądam zę jest tylko kamera a nie czarne ekran lub rozmycie
-      //   const cameraId = snapshot?.media?.video?.media?.deviceInfo?.deviceId || null;
-      //   console.log({ name: "setting camera id - joinedHandler", cameraId, stream, track });
-      //
-      //   lastCameraIdRef.current = cameraId;
-      //
-      //   await changeMediaStream(stream, track, blurRef.current, !!snapshot.media?.video?.media?.stream);
-      // } else if (cameraIntentionRef.current && lastCameraIdRef.current) {
-      //   // todo:
-      //   //  we need another method that starts the last stopped one
-      //   console.log("Jest intencja uruchomionej kamery");
-      //   await snapshot.deviceManager.start({ videoDeviceId: lastCameraIdRef.current });
-      // }
     };
 
     const deviceReady: ClientEvents<PeerMetadata, TrackMetadata>["deviceReady"] = async (event, client) => {
       const snapshot = client.getSnapshot();
 
-      console.log({ name: "Device ready", event });
-
       const cameraId = snapshot.media?.video?.media?.deviceInfo?.deviceId;
       if (event.trackType === "video" && event.mediaDeviceType === "userMedia" && cameraId) {
-        // todo remove? what about autost
-        // cameraIntentionRef.current = true;
-
-        console.log({ name: "setting camera id - device ready", cameraId });
         lastCameraIdRef.current = cameraId;
-        // if (event.trackType === "audio") {
-        //   // microphoneIntentionRef.current = true;
-        // }
 
         const stream = snapshot?.media?.video?.media?.stream;
         const track = snapshot?.media?.video?.media?.track;
 
         if (snapshot.status === "joined" && event.trackType === "video" && stream && track) {
-          // why is there remoteTrackIdRef.current?
           workerRef.current?.postMessage({ action: "stop" }, []); // todo what is the second parameter
           await changeMediaStream(stream, track, blurRef.current, track.enabled);
         }
@@ -307,44 +235,30 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
     const devicesReady: ClientEvents<PeerMetadata, TrackMetadata>["devicesReady"] = async (event, client) => {
       const snapshot = client.getSnapshot();
 
-      console.log({ name: "devicesReady", event });
       const cameraId = snapshot?.media?.video?.media?.deviceInfo?.deviceId || null;
 
       if (cameraId) {
         lastCameraIdRef.current = cameraId;
       }
 
       if (event.video.restarted && event.video?.media?.stream) {
-        console.log({ name: "devicesReady -> changeMediaStream", cameraId });
         lastCameraIdRef.current = cameraId;
 
         await changeMediaStream(event.video?.media?.stream || null, event.video?.media?.track || null, blurRef.current, true);
       }
     };
 
     const deviceStopped: ClientEvents<PeerMetadata, TrackMetadata>["deviceStopped"] = async (event, client) => {
-      console.log({ name: "device stopped", event });
-
       const snapshot = client.getSnapshot();
 
-      if (event.trackType === "video" && event.mediaDeviceType === "userMedia") {
-        // todo to nie jest prawda, intencja na stop jest wtedy gdy użytkownik to wciśnie
-        // cameraIntentionRef.current = false;
-      }
-      if (event.trackType === "audio" && event.mediaDeviceType === "userMedia") {
-        // microphoneIntentionRef.current = false;
-      }
-
       if (snapshot.status !== "joined" && event.trackType === "video" && event.mediaDeviceType === "userMedia") {
-        // w poczeklani trzeba wynullować tracki
         setStream(null);
         setTrack(null);
 
         streamRef.current = null;
         trackRef.current = null;
       }
       if (snapshot.status === "joined" && event.trackType === "video" && event.mediaDeviceType === "userMedia" && trackRef.current && remoteTrackIdRef.current) {
-        // jeżeli jesteśmy połączeni to trzeba podmienić na blackscreen
         if (!workerRef.current) {
           workerRef.current = new EmptyVideoWorker();
           const canvasElement = document.createElement("canvas");
@@ -383,66 +297,31 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
       }
     };
 
-    const localTrackMetadataChanged: ClientEvents<PeerMetadata, TrackMetadata>["localTrackMetadataChanged"] = async (event, client) => {
-      const snapshot = client.getSnapshot();
-
-      console.log({ name: "localTrackMetadataChanged", event, client, snapshot });
-    };
-
-    const disconnectRequested: ClientEvents<PeerMetadata, TrackMetadata>["disconnectRequested"] = async (event, client) => {
-      const snapshot = client.getSnapshot();
-
-      console.log({ name: "disconnectRequested", event, client, snapshot });
-    };
-
-    const authSuccess: ClientEvents<PeerMetadata, TrackMetadata>["authSuccess"] = async (client) => {
-      console.log({ name: "authSuccess", client });
-    };
-
-    const socketOpen: ClientEvents<PeerMetadata, TrackMetadata>["socketOpen"] = async (client) => {
-      console.log({ name: "socketOpen", client });
-    };
-
     const disconnected: ClientEvents<PeerMetadata, TrackMetadata>["disconnected"] = async (client) => {
       const snapshot = client.getSnapshot();
 
-      console.log({ name: "disconnected", client, snapshot });
       remoteTrackIdRef.current = null;
 
       if (snapshot.devices.microphone.stream) snapshot.devices.microphone.stop();
       if (snapshot.devices.camera.stream) snapshot.devices.camera.stop();
       if (snapshot.devices.screenShare.stream) snapshot.devices.screenShare.stop();
     };
 
-    const devicesStarted: ClientEvents<PeerMetadata, TrackMetadata>["devicesStarted"] = async (event, client) => {
-      console.log({ name: "devicesStarted", event, client });
-    };
-
 
     client.on("joined", joinedHandler);
-    client.on("localTrackMetadataChanged", localTrackMetadataChanged);
     client.on("managerInitialized", managerInitialized);
     client.on("deviceReady", deviceReady);
     client.on("devicesReady", devicesReady);
     client.on("deviceStopped", deviceStopped);
-    client.on("disconnectRequested", disconnectRequested);
-    client.on("socketOpen", socketOpen);
-    client.on("authSuccess", authSuccess);
     client.on("disconnected", disconnected);
-    client.on("devicesStarted", devicesStarted);
 
     return () => {
       client.removeListener("joined", joinedHandler);
-      client.removeListener("localTrackMetadataChanged", localTrackMetadataChanged);
       client.removeListener("managerInitialized", managerInitialized);
       client.removeListener("deviceReady", deviceReady);
       client.removeListener("devicesReady", devicesReady);
       client.removeListener("deviceStopped", deviceStopped);
-      client.removeListener("disconnectRequested", disconnectRequested);
-      client.removeListener("socketOpen", socketOpen);
-      client.removeListener("authSuccess", authSuccess);
       client.removeListener("disconnected", disconnected);
-      client.removeListener("devicesStarted", devicesStarted);
 
     };
   }, [simulcast.status]);
@@ -475,10 +354,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
     mediaStatus: video.mediaStatus
   }), [stream, track]);
 
-  useEffect(() => {
-    console.log({ newVideo, stream, track });
-  }, [newVideo, stream, track]);
-
   const microphone = useMicrophone();
 
   const setDevice = useCallback(async (cameraId: string | null, microphoneId: string | null, blur: boolean) => {
@@ -504,7 +379,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
   }, [video]);
 
   const toggleCamera = useCallback((value: boolean) => {
-    console.log({ name: "Toggle camera", value });
     cameraIntentionRef.current = value;
 
     if (value) {
@@ -516,7 +390,6 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
   }, []);
 
   const toggleMicrophone = useCallback((value: boolean) => {
-    console.log({ name: "Toggle microphone", value });
     microphoneIntentionRef.current = value;
     if (value) {
       microphone.start();
@@ -525,15 +398,13 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
     }
   }, []);
 
-  const restartMicrophone = useCallback(() => {
+  const restartDevices = useCallback(() => {
     const micStatus = client.getSnapshot().media?.audio?.mediaStatus;
     if (managerInitializedRef.current && microphoneIntentionRef.current && micStatus === "OK") {
-      console.log("Restarting mic!");
       toggleMicrophone(true);
     }
     const camStatus = client.getSnapshot().media?.video?.mediaStatus;
     if (managerInitializedRef.current && cameraIntentionRef.current && camStatus === "OK") {
-      console.log("Restarting camStatus!");
       toggleCamera(true);
     }
   }, [toggleMicrophone, toggleCamera]);
@@ -548,7 +419,7 @@ export const LocalPeerMediaProvider = ({ children }: Props) => {
         setDevice,
         toggleCamera,
         toggleMicrophone,
-        restartMicrophone
+        restartDevices
       }}
     >
       {children}

assets/src/features/devices/LocalPeerMediaContext.tsx

@@ -44,7 +44,6 @@ export const MediaSettingsModal: React.FC = () => {
       cancelClassName="!text-additional-red-100"
       onConfirm={() => {
         setDevice(videoInput, audioInput, blurInput);
-        console.log({ blurInput, videoInput, audioInput });
         setOpen(false);
       }}
       onCancel={handleClose}

assets/src/features/devices/MediaSettingsModal.tsx

@@ -18,23 +18,12 @@ type HomePageVideoTileProps = {
 
 const HomePageVideoTile: FC<HomePageVideoTileProps> = ({ displayName }) => {
   const microphone = useMicrophone();
-  // todo add loading to device manager
-  // const video = useCamera();
-  const { video, toggleCamera, toggleMicrophone, restartMicrophone } = useLocalPeer();
+  const { video, toggleCamera, toggleMicrophone, restartDevices } = useLocalPeer();
   const initials = computeInitials(displayName);
   const { setOpen } = useModal();
 
   useEffect(() => {
-    console.log({ video });
-    // restartMicrophone();
-  }, [video]);
-
-  useEffect(() => {
-    // if (microphone.mediaStatus === "Requesting") {
-    //   console.warn("Replacing!");
-    // }
-    // console.log({ mediaStatus: microphone.mediaStatus });
-    restartMicrophone();
+    restartDevices();
   }, []);
 
   return (