@defcomm/meetingsdk 0.2.4 → 0.2.5

package/dist/index.js

@@ -385,9 +385,6 @@ var SFUClient = class {
     this.localStream = null;
     this.screenStream = null;
     this.videoSender = null;
-    this.audioMuted = false;
-    this.videoMuted = false;
-    this.activeRecording = null;
     this.audioSender = null;
     this.screenSender = null;
     this.audioTransceiver = null;
@@ -408,7 +405,7 @@ var SFUClient = class {
     this.joiningWithResume = false;
     this.reconnectTimer = null;
     this.reconnectAttempt = 0;
-    this.maxReconnectAttempts = 6;
+    this.maxReconnectAttempts = 8;
     this.reconnectBaseMs = 750;
     this.joinWaiter = null;
     this.transportRecoveryInProgress = false;
@@ -431,8 +428,7 @@ var SFUClient = class {
     this.trackToSource = /* @__PURE__ */ new Map();
     this.localTrackIds = /* @__PURE__ */ new Map();
     this.subscriberStatsTimer = null;
-    this.roomSyncTimer = null;
-    this.roomSyncInFlight = false;
+    this.lastRecordingId = null;
     this.heartbeatTimer = null;
     this.apiBase = options.apiBase || "https://api.example.com/api";
     this.wsBase = options.wsBase || "wss://api.example.com/ws";
@@ -445,6 +441,8 @@ var SFUClient = class {
     });
     this.onParticipantPresence = options.onParticipantPresence || (() => {
     });
+    this.onParticipantMediaState = options.onParticipantMediaState || (() => {
+    });
     this.onTrackPublished = options.onTrackPublished || (() => {
     });
     this.onTrackUnpublished = options.onTrackUnpublished || (() => {
@@ -471,14 +469,10 @@ var SFUClient = class {
     });
     this.onTrackStateChanged = options.onTrackStateChanged || (() => {
     });
-    this.onParticipantMediaState = options.onParticipantMediaState || (() => {
-    });
     this.onRecordingStarted = options.onRecordingStarted || (() => {
     });
     this.onRecordingStopped = options.onRecordingStopped || (() => {
     });
-    this.onRoomState = options.onRoomState || (() => {
-    });
     this.onError = options.onError || console.error;
     this.autoSubscribe = options.autoSubscribe !== false;
   }
@@ -500,29 +494,6 @@ var SFUClient = class {
       this.heartbeatTimer = null;
     }
   }
-  startRoomStateSync() {
-    this.stopRoomStateSync();
-    this.roomSyncTimer = setInterval(() => {
-      if (this.state !== "connected") return;
-      void this.syncRoomState();
-    }, 5e3);
-  }
-  stopRoomStateSync() {
-    if (this.roomSyncTimer) {
-      clearInterval(this.roomSyncTimer);
-      this.roomSyncTimer = null;
-    }
-    this.roomSyncInFlight = false;
-  }
-  async syncRoomState() {
-    if (this.roomSyncInFlight || !this.isSocketOpen()) return;
-    this.roomSyncInFlight = true;
-    try {
-      this.send({ type: "sync_room_state" });
-    } finally {
-      this.roomSyncInFlight = false;
-    }
-  }
   createId() {
     return typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : `id_${Math.random().toString(36).slice(2)}_${Date.now()}`;
   }
@@ -620,13 +591,11 @@ var SFUClient = class {
       this.resumeToken = null;
     }
     this.room = nextRoom;
-    this.audioMuted = Boolean(options.audioMuted);
-    this.videoMuted = Boolean(options.videoMuted);
     this.joinOptions = {
       displayName: options.displayName,
       avatarUrl: options.avatarUrl,
-      audioMuted: this.audioMuted,
-      videoMuted: this.videoMuted
+      audioMuted: options.audioMuted,
+      videoMuted: options.videoMuted
     };
     if (options.participantId) this.participantId = options.participantId;
     if (!this.resumeToken) {
@@ -696,8 +665,8 @@ var SFUClient = class {
         resume_token: this.resumeToken,
         display_name: options.displayName,
         avatar_url: options.avatarUrl,
-        audio_muted: this.audioMuted,
-        video_muted: this.videoMuted
+        audio_muted: options.audioMuted ?? this.joinOptions.audioMuted ?? false,
+        video_muted: options.videoMuted ?? this.joinOptions.videoMuted ?? false
       };
       if (this.pendingJoinRequestId) {
         this.send({
@@ -738,20 +707,8 @@ var SFUClient = class {
   scheduleReconnect() {
     if (this.reconnectTimer || this.intentionalClose) return;
     if (this.reconnectAttempt >= this.maxReconnectAttempts) {
-      const error = new Error("SFU reconnect attempts exhausted");
-      console.error("[SFU] Reconnect attempts exhausted; leaving meeting", error);
-      this.intentionalClose = true;
-      this.stopHeartbeat();
-      this.stopRoomStateSync();
-      this.cleanupAll();
       this.setState("disconnected");
-      this.onError({
-        code: "RECONNECT_TIMEOUT",
-        message: error.message,
-        recoverable: false
-      });
-      this.onDisconnected();
-      this.failJoin(error);
+      this.failJoin(new Error("SFU reconnect attempts exhausted"));
       return;
     }
     this.reconnectAttempt += 1;
@@ -824,8 +781,8 @@ var SFUClient = class {
               resume_token: this.resumeToken,
               display_name: this.joinOptions.displayName,
               avatar_url: this.joinOptions.avatarUrl,
-              audio_muted: this.audioMuted,
-              video_muted: this.videoMuted
+              audio_muted: this.joinOptions.audioMuted ?? false,
+              video_muted: this.joinOptions.videoMuted ?? false
             }
           });
         }
@@ -900,8 +857,22 @@ var SFUClient = class {
         if (!track?.track_id) break;
         this.rememberTrack(track);
         if (track.participant_id === this.currentParticipantId) {
-          if (track.source === "audio") this.localTrackIds.set("audio", track.track_id);
-          if (track.source === "camera") this.localTrackIds.set("camera", track.track_id);
+          if (track.source === "audio") {
+            this.localTrackIds.set("audio", track.track_id);
+            const muted = !(this.localStream?.getAudioTracks()[0]?.enabled ?? true);
+            this.send({
+              type: "track_state",
+              payload: { track_id: track.track_id, muted }
+            });
+          }
+          if (track.source === "camera") {
+            this.localTrackIds.set("camera", track.track_id);
+            const muted = !(this.localStream?.getVideoTracks()[0]?.enabled ?? true);
+            this.send({
+              type: "track_state",
+              payload: { track_id: track.track_id, muted }
+            });
+          }
           if (track.source === "screen")
             this.localTrackIds.set("screen", track.track_id);
           break;
@@ -930,27 +901,6 @@ var SFUClient = class {
         this.onTrackUnpublished(track);
         break;
       }
-      case "participant_media_state": {
-        const participantId = payload.participant_id;
-        if (!participantId) break;
-        const participant = this.participants.get(participantId);
-        if (participant) {
-          participant.audio_muted = Boolean(payload.audio_muted);
-          participant.video_muted = Boolean(payload.video_muted);
-          this.participants.set(participantId, participant);
-        }
-        for (const track of this.trackMetadata.values()) {
-          if (track.participant_id !== participantId) continue;
-          if (track.source === "audio") track.muted = Boolean(payload.audio_muted);
-          if (track.source === "camera") track.muted = Boolean(payload.video_muted);
-        }
-        this.onParticipantMediaState(
-          participantId,
-          Boolean(payload.audio_muted),
-          Boolean(payload.video_muted)
-        );
-        break;
-      }
       case "track_state_changed": {
         const trackId = payload.track_id || payload.track?.track_id;
         if (!trackId) break;
@@ -972,20 +922,16 @@ var SFUClient = class {
       case "subscription_updated": {
         break;
       }
-      case "room_state": {
-        await this.applyRoomState(payload);
-        break;
-      }
       case "recording_started": {
-        this.activeRecording = {
+        this.lastRecordingId = payload.recording_id || this.lastRecordingId;
+        this.onRecordingStarted({
           recording_id: payload.recording_id,
           started_at: payload.started_at
-        };
-        this.onRecordingStarted(this.activeRecording);
+        });
         break;
       }
       case "recording_stopped": {
-        this.activeRecording = null;
+        this.lastRecordingId = null;
         this.onRecordingStopped({
           recording_id: payload.recording_id,
           stopped_at: payload.stopped_at
@@ -1021,6 +967,29 @@ var SFUClient = class {
         this.onScreenShareStopped(participantId, trackId);
         break;
       }
+      case "room_state": {
+        await this.reconcileRoomState(payload);
+        break;
+      }
+      case "participant_media_state": {
+        const participantId = payload.participant_id;
+        if (participantId) {
+          const current = this.participants.get(participantId);
+          if (current) {
+            this.participants.set(participantId, {
+              ...current,
+              audio_muted: Boolean(payload.audio_muted),
+              video_muted: Boolean(payload.video_muted)
+            });
+          }
+        }
+        this.onParticipantMediaState?.(
+          participantId,
+          Boolean(payload.audio_muted),
+          Boolean(payload.video_muted)
+        );
+        break;
+      }
       case "error": {
         const message2 = payload.message || "SFU signaling error";
         if (this.state === "reconnecting" && message2.includes("participant session is stale")) {
@@ -1043,66 +1012,89 @@ var SFUClient = class {
         console.debug("[SFU] Ignoring unknown server message", message);
     }
   }
-  async applyRoomState(payload) {
-    const authoritative = /* @__PURE__ */ new Map();
-    for (const participant of payload?.participants || []) {
-      if (participant?.participant_id) authoritative.set(participant.participant_id, participant);
+  async reconcileRoomState(payload) {
+    const nextParticipants = /* @__PURE__ */ new Map();
+    for (const participant of payload.participants || []) {
+      if (participant?.participant_id) {
+        nextParticipants.set(participant.participant_id, participant);
+      }
     }
-    for (const id of [...this.participants.keys()]) {
-      if (!authoritative.has(id) && id !== this.currentParticipantId) {
-        this.participants.delete(id);
-        this.removeRemoteParticipant(id);
-        this.onParticipantLeft(id);
+    for (const participantId of this.participants.keys()) {
+      if (participantId !== this.currentParticipantId && !nextParticipants.has(participantId)) {
+        this.participants.delete(participantId);
+        this.onParticipantLeft(participantId);
       }
     }
-    for (const [id, participant] of authoritative) {
-      if (id === this.currentParticipantId) continue;
-      const previous = this.participants.get(id);
-      this.participants.set(id, {
-        ...previous,
-        ...participant,
-        audio_muted: Boolean(participant.audio_muted),
-        video_muted: Boolean(participant.video_muted)
-      });
-      if (!previous) this.onParticipantJoined(participant);
-      if (participant.presence) this.onParticipantPresence(id, String(participant.presence));
+    for (const participant of nextParticipants.values()) {
+      if (participant.participant_id === this.currentParticipantId) continue;
+      const previous = this.participants.get(participant.participant_id);
+      const wasScreenSharing = Boolean(previous?.screen_sharing);
+      const isScreenSharing = Boolean(participant.screen_sharing);
+      this.participants.set(participant.participant_id, participant);
+      if (!previous) {
+        this.onParticipantJoined(participant);
+      }
+      if (participant.presence) {
+        this.onParticipantPresence(
+          participant.participant_id,
+          String(participant.presence).toLowerCase()
+        );
+      }
+      this.onParticipantMediaState(
+        participant.participant_id,
+        Boolean(participant.audio_muted),
+        Boolean(participant.video_muted)
+      );
+      if (!wasScreenSharing && isScreenSharing) {
+        this.onScreenShareStarted(participant.participant_id, void 0);
+      } else if (wasScreenSharing && !isScreenSharing) {
+        this.onScreenShareStopped(
+          participant.participant_id,
+          participant.screen_track_id || void 0
+        );
+      }
     }
     const nextTracks = /* @__PURE__ */ new Map();
-    for (const track of payload?.tracks || []) {
-      if (!track?.track_id) continue;
-      nextTracks.set(track.track_id, track);
-      this.rememberTrack(track);
-    }
-    for (const id of [...this.trackMetadata.keys()]) {
-      if (!nextTracks.has(id)) {
-        this.trackMetadata.delete(id);
-        this.subscribedTracks.delete(id);
-        this.trackToParticipant.delete(id);
-        this.trackToSource.delete(id);
-      }
-    }
-    if (payload?.recording) {
-      const current = {
-        recording_id: payload.recording.recording_id,
-        started_at: payload.recording.started_at
-      };
-      if (!this.activeRecording || this.activeRecording.recording_id !== current.recording_id) {
-        this.activeRecording = current;
-        this.onRecordingStarted(current);
+    for (const track of payload.tracks || []) {
+      if (track?.track_id) {
+        nextTracks.set(track.track_id, track);
+        this.rememberTrack(track);
+      }
+    }
+    for (const [trackId, oldTrack] of [...this.trackMetadata.entries()]) {
+      if (!nextTracks.has(trackId)) {
+        this.trackMetadata.delete(trackId);
+        this.trackToParticipant.delete(trackId);
+        this.trackToSource.delete(trackId);
+        this.subscribedTracks.delete(trackId);
+        if (oldTrack.participant_id !== this.currentParticipantId) {
+          this.onTrackUnpublished(oldTrack);
+        }
       }
-    } else if (this.activeRecording) {
-      const previous = this.activeRecording;
-      this.activeRecording = null;
-      this.onRecordingStopped({
-        recording_id: previous.recording_id,
-        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
-      });
     }
     if (this.autoSubscribe) {
-      const missing = [...nextTracks.values()].filter((t) => t.participant_id !== this.currentParticipantId && !this.subscribedTracks.has(t.track_id)).map((t) => t.track_id);
+      const missing = [...nextTracks.values()].filter(
+        (track) => track.participant_id !== this.currentParticipantId && !this.subscribedTracks.has(track.track_id)
+      ).map((track) => track.track_id);
       if (missing.length) await this.subscribeMultiple(missing);
     }
-    this.onRoomState(payload);
+    const nextRecordingId = payload.recording?.recording_id || null;
+    if (payload.recording) {
+      if (this.lastRecordingId !== nextRecordingId) {
+        this.lastRecordingId = nextRecordingId;
+        this.onRecordingStarted({
+          recording_id: payload.recording.recording_id,
+          started_at: payload.recording.started_at
+        });
+      }
+    } else if (this.lastRecordingId) {
+      const recordingId = this.lastRecordingId;
+      this.lastRecordingId = null;
+      this.onRecordingStopped({
+        recording_id: recordingId,
+        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
+      });
+    }
   }
   rememberTrack(track) {
     this.trackMetadata.set(track.track_id, track);
@@ -1133,23 +1125,8 @@ var SFUClient = class {
     for (const track of payload.tracks || []) {
       if (track?.track_id) this.rememberTrack(track);
     }
-    if (payload.recording) {
-      this.activeRecording = {
-        recording_id: payload.recording.recording_id,
-        started_at: payload.recording.started_at
-      };
-      this.onRecordingStarted(this.activeRecording);
-    } else if (this.activeRecording) {
-      const previous = this.activeRecording;
-      this.activeRecording = null;
-      this.onRecordingStopped({
-        recording_id: previous.recording_id,
-        stopped_at: (/* @__PURE__ */ new Date()).toISOString()
-      });
-    }
     await this.initializePeerConnections();
     this.setState("connected");
-    this.startRoomStateSync();
     this.onConnected(payload, resumed);
     for (const participant of this.participants.values()) {
       if (participant.participant_id !== this.currentParticipantId) {
@@ -1605,31 +1582,25 @@ var SFUClient = class {
     this.localStream?.getAudioTracks().forEach((track) => {
       track.enabled = !muted;
     });
-    const trackId = this.localTrackIds.get("audio");
-    if (trackId) {
-      this.send({
-        type: "track_state",
-        payload: {
-          track_id: trackId,
-          muted
-        }
-      });
-    }
+    this.send({
+      type: "set_media_state",
+      payload: {
+        audio_muted: muted,
+        video_muted: !(this.localStream?.getVideoTracks()[0]?.enabled ?? true)
+      }
+    });
   }
   muteVideo(muted) {
     this.localStream?.getVideoTracks().forEach((track) => {
       track.enabled = !muted;
     });
-    const trackId = this.localTrackIds.get("camera");
-    if (trackId) {
-      this.send({
-        type: "track_state",
-        payload: {
-          track_id: trackId,
-          muted
-        }
-      });
-    }
+    this.send({
+      type: "set_media_state",
+      payload: {
+        audio_muted: !(this.localStream?.getAudioTracks()[0]?.enabled ?? true),
+        video_muted: muted
+      }
+    });
   }
   async startRecording() {
     if (!this.send({ type: "start_recording" })) {
@@ -1704,7 +1675,6 @@ var SFUClient = class {
   }
   async leave() {
     this.stopHeartbeat();
-    this.stopRoomStateSync();
     this.intentionalClose = true;
     this.setState("leaving");
     if (this.reconnectTimer) {
@@ -2072,13 +2042,9 @@ var VideoSDKCore = class {
         );
         return;
       }
-      if (state === "disconnected" || state === "idle") {
-        this.sfuClient = null;
-      } else {
-        throw new Error(
-          `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
-        );
-      }
+      throw new Error(
+        `SFU client already exists in state "${state}". Disconnect explicitly before creating another connection.`
+      );
     }
     const client = new SFUClient({
       apiBase: this.apiBase,
@@ -2093,50 +2059,12 @@ var VideoSDKCore = class {
         console.log(`[SFU] ${resumed ? "Resumed" : "Joined"} room`, payload);
         this.state.updateLocalParticipant({
           id: this.myId,
-          name: this.participantName
-        });
-      },
-      onRoomState: (roomState) => {
-        for (const participant of roomState?.participants || []) {
-          const pid = participant?.participant_id;
-          if (!pid || pid === this.myId) continue;
-          const current = this.state.getParticipant(pid);
-          if (!current) continue;
-          this.state.updateParticipantMedia(pid, {
-            stream: current.media?.stream ?? null,
-            micEnabled: !Boolean(participant.audio_muted),
-            camEnabled: !Boolean(participant.video_muted),
-            isScreenSharing: Boolean(participant.screen_sharing)
-          });
-        }
-        const presenters = /* @__PURE__ */ new Set();
-        for (const participant of roomState?.participants || []) {
-          const pid = participant?.participant_id;
-          if (!pid || pid === this.myId) continue;
-          const current = this.state.getParticipant(pid);
-          if (!current) continue;
-          if (participant.screen_sharing) {
-            presenters.add(pid);
-            this.state.updateParticipantMedia(pid, {
-              isScreenSharing: true,
-              screenStream: current.media?.screenStream ?? null
-            });
-          } else if (current.media?.isScreenSharing) {
-            const screen = this.remoteScreenStreams.get(pid);
-            screen?.getTracks().forEach((track) => track.stop());
-            this.remoteScreenStreams.delete(pid);
-            this.state.updateParticipantMedia(pid, {
-              isScreenSharing: false,
-              screenStream: null,
-              screenTrack: void 0
-            });
+          name: this.participantName,
+          media: {
+            micEnabled: this.localStream?.getAudioTracks()[0]?.enabled ?? true,
+            camEnabled: this.localStream?.getVideoTracks()[0]?.enabled ?? true
           }
-        }
-        const presenter = [...presenters][0] ?? null;
-        if (this.state.presenterId !== presenter) {
-          this.state.setPresenterId(presenter);
-        }
-        this.events.onRoomUpdate?.(roomState);
+        });
       },
       onDisconnected: () => {
         console.log("[SFU] Signaling WebSocket disconnected; reconnecting");
@@ -2204,22 +2132,44 @@ var VideoSDKCore = class {
           return;
         }
         const pname = participant.user_metadata?.name || participant.display_name || "Participant";
-        this.state.addParticipant({
+        const participantMedia = participant.media || {};
+        const participantState = {
           id: pid,
           name: pname,
-          connectionState: "connected",
+          connectionState: participant.presence === "reconnecting" ? "reconnecting" : "connected",
           media: {
             micEnabled: !Boolean(participant.audio_muted),
             camEnabled: !Boolean(participant.video_muted),
-            isScreenSharing: false,
+            isScreenSharing: Boolean(participant.screen_sharing),
+            screenStream: participantMedia.screenStream ?? null,
             stream: null
           }
-        });
+        };
+        if (!this.state.addParticipant(participantState)) {
+          this.state.updateParticipantMedia(pid, participantState.media);
+        }
         this.events.onUserJoined?.({
           id: pid,
           name: pname
         });
       },
+      onParticipantMediaState: (participantId, audioMuted, videoMuted) => {
+        if (participantId === this.myId) {
+          this.state.updateLocalParticipant({
+            media: {
+              micEnabled: !audioMuted,
+              camEnabled: !videoMuted
+            }
+          });
+          return;
+        }
+        this.state.updateParticipantMedia(participantId, {
+          micEnabled: !audioMuted,
+          camEnabled: !videoMuted
+        });
+        this.events.onMuteStateChanged?.(participantId, "audio", audioMuted);
+        this.events.onMuteStateChanged?.(participantId, "video", videoMuted);
+      },
       onParticipantPresence: (participantId, presence) => {
         if (participantId === this.myId) {
           return;
@@ -2283,18 +2233,6 @@ var VideoSDKCore = class {
           camEnabled: track.kind === "video" ? false : current.media?.camEnabled ?? true
         });
       },
-      onParticipantMediaState: (participantId, audioMuted, videoMuted) => {
-        if (participantId === this.myId) return;
-        const current = this.state.getParticipant(participantId);
-        if (!current) return;
-        this.state.updateParticipantMedia(participantId, {
-          stream: current.media?.stream ?? null,
-          micEnabled: !audioMuted,
-          camEnabled: !videoMuted
-        });
-        this.events.onMuteStateChanged?.(participantId, "audio", audioMuted);
-        this.events.onMuteStateChanged?.(participantId, "video", videoMuted);
-      },
       onTrackStateChanged: (track) => {
         const pid = track.participant_id;
         if (!pid || pid === this.myId) {
@@ -2396,8 +2334,8 @@ var VideoSDKCore = class {
     await client.getToken(roomId, {
       displayName: name,
       participantId: this.myId,
-      audioMuted: this.state.localParticipant?.media?.micEnabled,
-      videoMuted: this.state.localParticipant?.media?.camEnabled
+      audioMuted: !this.localStream?.getAudioTracks()[0]?.enabled,
+      videoMuted: !this.localStream?.getVideoTracks()[0]?.enabled
     });
   }
   // SFU STATE
@@ -2561,6 +2499,7 @@ var VideoSDKCore = class {
           screenTrack: this.screenStream.getVideoTracks()[0]
         }
       });
+      this.state.setPresenterId(this.myId);
       return this.screenStream;
     } catch (err) {
       this.emitError(
@@ -2582,6 +2521,9 @@ var VideoSDKCore = class {
     this.screenStream.getTracks().forEach((track) => track.stop());
     this.screenStream = null;
     this.isScreenSharing = false;
+    if (this.state.presenterId === this.myId) {
+      this.state.setPresenterId(null);
+    }
     this.state.updateLocalParticipant({
       media: {
         isScreenSharing: false,
@@ -2711,7 +2653,6 @@ var MeetingProvider = ({
     /* @__PURE__ */ new Set()
   );
   const meetingLeftListeners = (0, import_react2.useRef)(/* @__PURE__ */ new Set());
-  const roomUpdateListeners = (0, import_react2.useRef)(/* @__PURE__ */ new Set());
   const trackStateListeners = (0, import_react2.useRef)(/* @__PURE__ */ new Set());
   const recordingStartedListeners = (0, import_react2.useRef)(/* @__PURE__ */ new Set());
   const recordingStoppedListeners = (0, import_react2.useRef)(/* @__PURE__ */ new Set());
@@ -2736,9 +2677,6 @@ var MeetingProvider = ({
         onMeetingLeft: () => {
           meetingLeftListeners.current.forEach((fn) => fn());
         },
-        onRoomUpdate: (data) => {
-          roomUpdateListeners.current.forEach((fn) => fn(data));
-        },
         onTrackStateChanged: (track) => {
           trackStateListeners.current.forEach((fn) => fn(track));
         },
@@ -2837,10 +2775,6 @@ var MeetingProvider = ({
           meetingLeftListeners.current.delete(cb);
         };
       },
-      onRoomUpdate: (cb) => {
-        roomUpdateListeners.current.add(cb);
-        return () => roomUpdateListeners.current.delete(cb);
-      },
       onTrackStateChanged: (cb) => {
         trackStateListeners.current.add(cb);
         return () => trackStateListeners.current.delete(cb);