@meshagent/meshagent-tailwind 0.41.4 → 0.41.6

package/dist/esm/meetings/meeting-scope.js

@@ -1,5 +1,12 @@
 import { jsx } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useMemo, useSyncExternalStore } from "react";
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useMemo,
+  useSyncExternalStore
+} from "react";
+import "@meshagent/meshagent-react";
 import {
   ConnectionState,
   Room,
@@ -160,23 +167,35 @@ class MeetingController {
     return this.livekitRoom.state !== ConnectionState.Disconnected;
   }
   get hasParticipantsWithVideo() {
-    const localHasVideo = Array.from(this.livekitRoom.localParticipant.videoTrackPublications.values()).some((publication) => !publication.isMuted);
-    const remoteHasVideo = Array.from(this.livekitRoom.remoteParticipants.values()).some((participant) => Array.from(participant.videoTrackPublications.values()).some((publication) => !publication.isMuted));
+    const localHasVideo = Array.from(
+      this.livekitRoom.localParticipant.videoTrackPublications.values()
+    ).some((publication) => !publication.isMuted);
+    const remoteHasVideo = Array.from(
+      this.livekitRoom.remoteParticipants.values()
+    ).some(
+      (participant) => Array.from(participant.videoTrackPublications.values()).some(
+        (publication) => !publication.isMuted
+      )
+    );
     return localHasVideo || remoteHasVideo;
   }
   subscribe(listener) {
     this.listeners.add(listener);
     return () => this.listeners.delete(listener);
   }
-  async configure({ breakoutRoom } = {}) {
+  async configure({ breakoutRoom = "" } = {}) {
     if (this.livekitRoom.state !== ConnectionState.Disconnected) {
-      throw new Error("You cannot reconfigure while the controller is connected");
+      throw new Error(
+        "You cannot reconfigure while the controller is connected"
+      );
     }
     this._config = null;
     this._configurationError = null;
     this.notify();
     try {
-      this._config = await this.room.livekit.getConnectionInfo({ breakoutRoom });
+      this._config = await this.room.livekit.getConnectionInfo({
+        breakoutRoom
+      });
       this.notify();
     } catch (error) {
       this._configurationError = error;
@@ -199,20 +218,29 @@ class MeetingController {
       cameraAwaitEnableConfirmation: cameraEnabled,
       microphoneAwaitEnableConfirmation: microphoneEnabled
     });
-    const { camera: _camera, microphone: _microphone, ...connectOptions } = options ?? {};
+    const {
+      camera: _camera,
+      microphone: _microphone,
+      ...connectOptions
+    } = options ?? {};
     try {
       await this.livekitRoom.connect(config.url, config.token, connectOptions);
       const localParticipant = this.livekitRoom.localParticipant;
       await Promise.all([
-        cameraEnabled ? localParticipant.setCameraEnabled(true).then(() => this.pendingLocalMedia.setCameraUnavailable(false)).catch((error) => {
+        cameraEnabled ? localParticipant.setCameraEnabled(true, options?.camera?.options).then(() => this.pendingLocalMedia.setCameraUnavailable(false)).catch((error) => {
           this.pendingLocalMedia.setCameraPending(false);
           this.pendingLocalMedia.setCameraUnavailable(true);
           console.warn("unable to enable camera after connecting", error);
         }) : Promise.resolve(this.pendingLocalMedia.setCameraPending(false)),
-        microphoneEnabled ? localParticipant.setMicrophoneEnabled(true).then(() => this.pendingLocalMedia.setMicrophoneUnavailable(false)).catch((error) => {
+        microphoneEnabled ? localParticipant.setMicrophoneEnabled(true, options?.microphone?.options).then(
+          () => this.pendingLocalMedia.setMicrophoneUnavailable(false)
+        ).catch((error) => {
           this.pendingLocalMedia.setMicrophonePending(false);
           this.pendingLocalMedia.setMicrophoneUnavailable(true);
-          console.warn("unable to enable microphone after connecting", error);
+          console.warn(
+            "unable to enable microphone after connecting",
+            error
+          );
         }) : Promise.resolve(this.pendingLocalMedia.setMicrophonePending(false))
       ]);
       this.syncPendingLocalMediaState();
@@ -223,7 +251,24 @@ class MeetingController {
   }
   async disconnect() {
     this.pendingLocalMedia.clear();
-    await this.livekitRoom.disconnect();
+    const localParticipant = this.livekitRoom.localParticipant;
+    const disableResults = await Promise.allSettled([
+      localParticipant.setCameraEnabled(false),
+      localParticipant.setMicrophoneEnabled(false),
+      localParticipant.setScreenShareEnabled(false)
+    ]);
+    for (const result of disableResults) {
+      if (result.status === "rejected") {
+        console.warn("unable to disable local meeting media", result.reason);
+      }
+    }
+    for (const publication of Array.from(
+      localParticipant.trackPublications.values()
+    )) {
+      publication.track?.detach();
+      publication.track?.stop();
+    }
+    await this.livekitRoom.disconnect(true);
   }
   dispose() {
     this.livekitRoom.removeAllListeners();
@@ -251,7 +296,9 @@ function useMeetingController(controller) {
   const contextController = useContext(MeetingControllerContext);
   const resolved = controller ?? contextController;
   if (resolved == null) {
-    throw new Error("useMeetingController must be used within MeetingScope or receive a controller");
+    throw new Error(
+      "useMeetingController must be used within MeetingScope or receive a controller"
+    );
   }
   useSyncExternalStore(
     (listener) => resolved.subscribe(listener),
@@ -266,12 +313,18 @@ function MeetingScope({
   roomOptions,
   children
 }) {
-  const controller = useMemo(() => new MeetingController({ room: client, roomOptions }), [client, roomOptions]);
+  const controller = useMemo(
+    () => new MeetingController({
+      room: client,
+      roomOptions
+    }),
+    [client, roomOptions]
+  );
   useEffect(() => {
-    void controller.configure({ breakoutRoom });
+    controller.configure({ breakoutRoom });
     return () => {
       if (controller.isConnected) {
-        void controller.disconnect().catch((error) => {
+        controller.disconnect().catch((error) => {
           console.warn("unable to disconnect", error);
         });
       }
@@ -281,7 +334,9 @@ function MeetingScope({
   return /* @__PURE__ */ jsx(WakeLocker, { children: /* @__PURE__ */ jsx(MeetingControllerContext.Provider, { value: controller, children: typeof children === "function" ? children(controller) : children }) });
 }
 function firstEnabledVideoPublication(participant) {
-  return Array.from(participant.videoTrackPublications.values()).find(
+  return Array.from(
+    participant.videoTrackPublications.values()
+  ).find(
     (publication) => !publication.isMuted && publication.source === Track.Source.Camera && publication.videoTrack != null
   );
 }

package/dist/esm/meetings/meeting-view.d.ts

@@ -0,0 +1,6 @@
+import type { ReactElement } from "react";
+import { type MeetingController } from "./meeting-scope";
+export declare function MeetingView({ controller: providedController, onCancel }: {
+    controller?: MeetingController;
+    onCancel?: () => void;
+}): ReactElement;