react-jssip-kit 0.1.1 → 0.2.0

package/README.md

@@ -8,7 +8,7 @@ React provider and hooks that wrap [JsSIP](https://jssip.net/) so you can manage
 npm install react-jssip-kit jssip
 ```
 
-Peer deps: `react@^18` and `react-dom@^18`.
+Peer deps: `react >=18 <20` and `react-dom >=18 <20`.
 
 ## Quick start
 
@@ -32,7 +32,7 @@ client.connect("sip:alice@example.com", "supersecret", {
 
 function CallControls() {
   const { sessions, sipStatus } = useSipState();
-  const { call, hangup, mute, unmute } = useSipActions();
+  const { call, hangup, toggleMute } = useSipActions();
   const active = sessions[0];
 
   return (
@@ -40,8 +40,7 @@ function CallControls() {
       <div>Status: {sipStatus}</div>
       <button onClick={() => call("sip:bob@example.com")}>Call Bob</button>
       <button onClick={() => hangup(active?.id)}>Hang up</button>
-      <button onClick={() => mute(active?.id)}>Mute</button>
-      <button onClick={() => unmute(active?.id)}>Unmute</button>
+      <button onClick={() => toggleMute(active?.id)}>Toggle mute</button>
     </div>
   );
 }

package/dist/index.cjs

@@ -324,6 +324,44 @@ function createUAHandlers(deps) {
   };
 }
 
+// src/jssip-lib/sip/sessionState.ts
+function holdOtherSessions(state, sessionId, holdFn) {
+  const current = state.getState();
+  current.sessions.forEach((s) => {
+    if (s.id === sessionId)
+      return;
+    if (s.status === CallStatus.Active) {
+      holdFn(s.id);
+    }
+  });
+}
+function upsertSessionState(state, sessionId, partial) {
+  const current = state.getState();
+  const existing = current.sessions.find((s) => s.id === sessionId);
+  const base = existing ?? {
+    id: sessionId,
+    status: CallStatus.Idle,
+    direction: CallDirection.None,
+    from: null,
+    to: null,
+    muted: false,
+    acceptedAt: null,
+    mediaKind: "audio",
+    remoteVideoEnabled: false
+  };
+  const nextSession = { ...base, ...partial };
+  const sessions = existing ? current.sessions.map((s) => s.id === sessionId ? nextSession : s) : [...current.sessions, nextSession];
+  state.setState({ sessions });
+}
+function removeSessionState(state, sessionId) {
+  const current = state.getState();
+  const sessions = current.sessions.filter((s) => s.id !== sessionId);
+  state.setState({
+    sessions,
+    error: null
+  });
+}
+
 // src/jssip-lib/sip/handlers/sessionHandlers.ts
 function createSessionHandlers(deps) {
   const {
@@ -378,35 +416,19 @@ function createSessionHandlers(deps) {
     },
     muted: () => {
       emitter.emit("muted", { sessionId, data: void 0 });
-      state.batchSet({
-        sessions: state.getState().sessions.map(
-          (s) => s.id === sessionId ? { ...s, muted: true } : s
-        )
-      });
+      upsertSessionState(state, sessionId, { muted: true });
     },
     unmuted: () => {
       emitter.emit("unmuted", { sessionId, data: void 0 });
-      state.batchSet({
-        sessions: state.getState().sessions.map(
-          (s) => s.id === sessionId ? { ...s, muted: false } : s
-        )
-      });
+      upsertSessionState(state, sessionId, { muted: false });
     },
     hold: () => {
       emitter.emit("hold", { sessionId, data: void 0 });
-      state.batchSet({
-        sessions: state.getState().sessions.map(
-          (s) => s.id === sessionId ? { ...s, status: CallStatus.Hold } : s
-        )
-      });
+      upsertSessionState(state, sessionId, { status: CallStatus.Hold });
     },
     unhold: () => {
       emitter.emit("unhold", { sessionId, data: void 0 });
-      state.batchSet({
-        sessions: state.getState().sessions.map(
-          (s) => s.id === sessionId ? { ...s, status: CallStatus.Active } : s
-        )
-      });
+      upsertSessionState(state, sessionId, { status: CallStatus.Active });
     },
     reinvite: (e) => emitter.emit("reinvite", { sessionId, data: e }),
     update: (e) => emitter.emit("update", { sessionId, data: e }),
@@ -554,11 +576,6 @@ var WebRTCSessionController = class {
       old.stop();
     return true;
   }
-  async startScreenShare(getDisplayMedia) {
-    const display = await getDisplayMedia();
-    const screen = display.getVideoTracks()[0];
-    return screen ? this.switchCamera(screen) : false;
-  }
 };
 
 // src/jssip-lib/sip/sessionManager.ts
@@ -706,45 +723,6 @@ var SessionManager = class {
   }
 };
 
-// src/jssip-lib/sip/sessionState.ts
-function holdOtherSessions(state, sessionId, holdFn, updateSession) {
-  const current = state.getState();
-  current.sessions.forEach((s) => {
-    if (s.id === sessionId)
-      return;
-    if (s.status === CallStatus.Active) {
-      holdFn(s.id);
-      updateSession(s.id, { status: CallStatus.Hold });
-    }
-  });
-}
-function upsertSessionState(state, sessionId, partial) {
-  const current = state.getState();
-  const existing = current.sessions.find((s) => s.id === sessionId);
-  const base = existing ?? {
-    id: sessionId,
-    status: CallStatus.Idle,
-    direction: CallDirection.None,
-    from: null,
-    to: null,
-    muted: false,
-    acceptedAt: null,
-    mediaKind: "audio",
-    remoteVideoEnabled: false
-  };
-  const nextSession = { ...base, ...partial };
-  const sessions = existing ? current.sessions.map((s) => s.id === sessionId ? nextSession : s) : [...current.sessions, nextSession];
-  state.setState({ sessions });
-}
-function removeSessionState(state, sessionId) {
-  const current = state.getState();
-  const sessions = current.sessions.filter((s) => s.id !== sessionId);
-  state.setState({
-    sessions,
-    error: null
-  });
-}
-
 // src/jssip-lib/sip/sessionLifecycle.ts
 var SessionLifecycle = class {
   constructor(deps) {
@@ -784,8 +762,7 @@ var SessionLifecycle = class {
       (id) => {
         const otherRtc = this.sessionManager.getRtc(id);
         otherRtc?.hold();
-      },
-      (id, partial) => upsertSessionState(this.state, id, partial)
+      }
     );
     const sdpHasVideo = e.request?.body && e.request.body.toString().includes("m=video") || session?.connection?.getReceivers?.()?.some((r) => r.track?.kind === "video");
     upsertSessionState(this.state, sessionId, {
@@ -855,10 +832,11 @@ var SipClient = class extends EventTargetEmitter {
   }
   call(target, callOptions = {}) {
     try {
-      if (callOptions.mediaStream)
-        this.sessionManager.enqueueOutgoingMedia(callOptions.mediaStream);
+      const opts = this.ensureMediaConstraints(callOptions);
+      if (opts.mediaStream)
+        this.sessionManager.enqueueOutgoingMedia(opts.mediaStream);
       const ua = this.userAgent.getUA();
-      ua?.call(target, callOptions);
+      ua?.call(target, opts);
     } catch (e) {
       const err = this.emitError(e, "CALL_FAILED", "call failed");
       this.cleanupAllSessions();
@@ -868,22 +846,22 @@ var SipClient = class extends EventTargetEmitter {
     }
   }
   answer(options = {}) {
-    return this.answerSession(void 0, options);
+    const sessionId = this.resolveSessionId();
+    if (!sessionId)
+      return false;
+    return this.answerSession(sessionId, options);
   }
   hangup(options) {
-    return this.hangupSession(void 0, options);
-  }
-  mute() {
-    return this.muteSession();
-  }
-  unmute() {
-    return this.unmuteSession();
+    const sessionId = this.resolveSessionId();
+    if (!sessionId)
+      return false;
+    return this.hangupSession(sessionId, options);
   }
-  hold() {
-    return this.holdSession();
+  toggleMute() {
+    return this.toggleMuteSession();
   }
-  unhold() {
-    return this.unholdSession();
+  toggleHold() {
+    return this.toggleHoldSession();
   }
   sendDTMF(tones, options) {
     const sessionId = this.resolveSessionId();
@@ -1001,72 +979,48 @@ var SipClient = class extends EventTargetEmitter {
     const active = sessions.find((s) => s.status === CallStatus.Active);
     return active?.id ?? sessions[0]?.id ?? null;
   }
-  answerSession(sessionIdOrOptions, options) {
-    const sessionId = typeof sessionIdOrOptions === "string" ? sessionIdOrOptions : this.resolveSessionId();
-    const opts = typeof sessionIdOrOptions === "string" ? options ?? {} : sessionIdOrOptions ?? {};
+  ensureMediaConstraints(opts) {
+    if (opts.mediaStream || opts.mediaConstraints)
+      return opts;
+    return { ...opts, mediaConstraints: { audio: true, video: false } };
+  }
+  answerSession(sessionId, options = {}) {
     if (!sessionId)
       return false;
-    holdOtherSessions(
-      this.stateStore,
-      sessionId,
-      (id) => {
-        const rtc = this.sessionManager.getRtc(id);
-        rtc?.hold();
-      },
-      (id, partial) => upsertSessionState(this.stateStore, id, partial)
-    );
+    const opts = this.ensureMediaConstraints(options);
     return this.sessionManager.answer(sessionId, opts);
   }
-  hangupSession(sessionIdOrOptions, options) {
-    const sessionId = typeof sessionIdOrOptions === "string" ? sessionIdOrOptions : this.resolveSessionId();
-    const opts = typeof sessionIdOrOptions === "string" ? options : sessionIdOrOptions;
+  hangupSession(sessionId, options) {
     if (!sessionId)
       return false;
-    return this.sessionManager.hangup(sessionId, opts);
+    return this.sessionManager.hangup(sessionId, options);
   }
-  muteSession(sessionId) {
+  toggleMuteSession(sessionId) {
     const resolved = this.resolveSessionId(sessionId);
     if (!resolved)
       return false;
     const sessionState = this.stateStore.getState().sessions.find((s) => s.id === resolved);
-    if (sessionState?.muted)
+    const muted = sessionState?.muted ?? false;
+    if (muted) {
+      this.sessionManager.unmute(resolved);
       return true;
+    }
     this.sessionManager.mute(resolved);
-    upsertSessionState(this.stateStore, resolved, { muted: true });
     return true;
   }
-  unmuteSession(sessionId) {
+  toggleHoldSession(sessionId) {
     const resolved = this.resolveSessionId(sessionId);
     if (!resolved)
       return false;
     const sessionState = this.stateStore.getState().sessions.find((s) => s.id === resolved);
-    if (!sessionState?.muted)
+    const isOnHold = sessionState?.status === CallStatus.Hold;
+    if (isOnHold) {
+      this.sessionManager.unhold(resolved);
       return true;
-    this.sessionManager.unmute(resolved);
-    upsertSessionState(this.stateStore, resolved, { muted: false });
-    return true;
-  }
-  holdSession(sessionId) {
-    const resolved = this.resolveSessionId(sessionId);
-    if (!resolved)
-      return false;
-    const sessionState = this.stateStore.getState().sessions.find((s) => s.id === resolved);
+    }
     if (sessionState?.status === CallStatus.Active) {
       this.sessionManager.hold(resolved);
-      upsertSessionState(this.stateStore, resolved, { status: CallStatus.Hold });
-    }
-    return true;
-  }
-  unholdSession(sessionId) {
-    const resolved = this.resolveSessionId(sessionId);
-    if (!resolved)
-      return false;
-    const sessionState = this.stateStore.getState().sessions.find((s) => s.id === resolved);
-    if (sessionState?.status === CallStatus.Hold) {
-      this.sessionManager.unhold(resolved);
-      upsertSessionState(this.stateStore, resolved, {
-        status: CallStatus.Active
-      });
+      return true;
     }
     return true;
   }
@@ -1195,10 +1149,8 @@ function useSipActions() {
       call: (...args) => client.call(...args),
       answer: (...args) => client.answerSession(...args),
       hangup: (...args) => client.hangupSession(...args),
-      mute: (...args) => client.muteSession(...args),
-      unmute: (...args) => client.unmuteSession(...args),
-      hold: (...args) => client.holdSession(...args),
-      unhold: (...args) => client.unholdSession(...args),
+      toggleMute: (...args) => client.toggleMuteSession(...args),
+      toggleHold: (...args) => client.toggleHoldSession(...args),
       sendDTMF: (...args) => client.sendDTMFSession(...args),
       transfer: (...args) => client.transferSession(...args),
       attendedTransfer: (...args) => client.attendedTransferSession(...args),