react-jssip-kit 0.7.0 → 0.7.2

package/dist/index.js

@@ -1,6 +1,6 @@
 import JsSIP from 'jssip';
 export { WebSocketInterface } from 'jssip';
-import React, { createContext, useContext, useCallback, useSyncExternalStore, useMemo, useEffect, useRef } from 'react';
+import { createContext, useContext, useCallback, useSyncExternalStore, useMemo, useEffect, useRef } from 'react';
 import { jsx } from 'react/jsx-runtime';
 
 // src/jssip-lib/sip/debugger.ts
@@ -494,7 +494,10 @@ function createSessionHandlers(deps) {
         )
       });
     },
-    confirmed: (e) => emitter.emit("confirmed", e),
+    confirmed: (e) => {
+      emitter.emit("confirmed", e);
+      onSessionConfirmed?.(sessionId);
+    },
     ended: (e) => {
       emitter.emit("ended", e);
       detachSessionHandlers();
@@ -959,14 +962,6 @@ var SipClient = class extends EventTargetEmitter {
     this.attachBeforeUnload();
     this.syncDebugInspector(debug);
   }
-  setMicrophoneProvider(fn) {
-    this.requestMicrophoneStream = fn;
-    if (fn && this.micRecoveryEnabled) {
-      this.sessionManager.getSessions().forEach(({ id }) => {
-        this.enableMicrophoneRecovery(id);
-      });
-    }
-  }
   registerUA() {
     this.userAgent.register();
   }
@@ -978,21 +973,6 @@ var SipClient = class extends EventTargetEmitter {
     this.stateStore.reset();
   }
   call(target, callOptions = {}) {
-    if (!callOptions.mediaStream && this.requestMicrophoneStream) {
-      void this.requestMicrophoneStream().then((stream) => {
-        if (!stream)
-          throw new Error("microphone stream unavailable");
-        this.call(target, { ...callOptions, mediaStream: stream });
-      }).catch((e) => {
-        const err = this.emitError(
-          e,
-          "MICROPHONE_FAILED",
-          "microphone failed"
-        );
-        this.stateStore.batchSet({ error: err.cause });
-      });
-      return;
-    }
     try {
       const opts = this.ensureMediaConstraints(callOptions);
       if (opts.mediaStream)
@@ -1063,9 +1043,6 @@ var SipClient = class extends EventTargetEmitter {
       if (h)
         session.on(ev, h);
     });
-    if (this.requestMicrophoneStream && this.micRecoveryEnabled) {
-      this.enableMicrophoneRecovery(sessionId);
-    }
   }
   detachSessionHandlers(sessionId, session) {
     const handlers = this.sessionHandlers.get(sessionId);
@@ -1159,22 +1136,10 @@ var SipClient = class extends EventTargetEmitter {
   answerSession(sessionId, options = {}) {
     if (!sessionId || !this.sessionExists(sessionId))
       return false;
-    if (!options.mediaStream && this.requestMicrophoneStream) {
-      void this.requestMicrophoneStream().then((stream) => {
-        if (!stream)
-          throw new Error("microphone stream unavailable");
-        this.answerSession(sessionId, { ...options, mediaStream: stream });
-      }).catch((e) => {
-        const err = this.emitError(
-          e,
-          "MICROPHONE_FAILED",
-          "microphone failed"
-        );
-        this.stateStore.batchSet({ error: err.cause });
-      });
-      return true;
-    }
     const opts = this.ensureMediaConstraints(options);
+    if (opts.mediaStream) {
+      this.sessionManager.setSessionMedia(sessionId, opts.mediaStream);
+    }
     return this.sessionManager.answer(sessionId, opts);
   }
   hangupSession(sessionId, options) {
@@ -1237,9 +1202,6 @@ var SipClient = class extends EventTargetEmitter {
     if (!resolved)
       return () => {
       };
-    if (!this.requestMicrophoneStream)
-      return () => {
-      };
     this.disableMicrophoneRecovery(resolved);
     const intervalMs = options.intervalMs ?? this.micRecoveryDefaults.intervalMs;
     const maxRetries = options.maxRetries ?? this.micRecoveryDefaults.maxRetries;
@@ -1262,12 +1224,24 @@ var SipClient = class extends EventTargetEmitter {
       const senderLive = sender?.track?.readyState === "live";
       if (trackLive && senderLive)
         return;
+      this.emitError(
+        {
+          cause: "microphone dropped",
+          trackLive,
+          senderLive
+        },
+        "MICROPHONE_DROPPED",
+        "microphone dropped"
+      );
       retries += 1;
+      if (trackLive && !senderLive && track) {
+        await rtc.replaceAudioTrack(track);
+        return;
+      }
       let nextStream;
       try {
-        if (!this.requestMicrophoneStream)
-          return;
-        nextStream = await this.requestMicrophoneStream();
+        const deviceId = track?.getSettings?.().deviceId ?? sender?.track?.getSettings?.().deviceId;
+        nextStream = await this.requestMicrophoneStreamInternal(deviceId);
       } catch (err) {
         console.warn("[sip] mic recovery failed to get stream", err);
         return;
@@ -1405,6 +1379,23 @@ var SipClient = class extends EventTargetEmitter {
       return void 0;
     }
   }
+  async requestMicrophoneStreamInternal(deviceId) {
+    if (typeof navigator === "undefined" || !navigator.mediaDevices?.getUserMedia) {
+      throw new Error("getUserMedia not available");
+    }
+    const audio = deviceId && deviceId !== "default" ? { deviceId: { exact: deviceId } } : true;
+    try {
+      return await navigator.mediaDevices.getUserMedia({ audio });
+    } catch (err) {
+      const cause = err?.name || "getUserMedia failed";
+      this.emitError(
+        { raw: err, cause },
+        "MICROPHONE_UNAVAILABLE",
+        "microphone unavailable"
+      );
+      throw err;
+    }
+  }
 };
 function createSipClientInstance(options) {
   return new SipClient(options);
@@ -1597,16 +1588,12 @@ function CallPlayer({ sessionId }) {
 function SipProvider({
   client,
   children,
-  sipEventManager,
-  requestMicrophoneStream
+  sipEventManager
 }) {
   const manager = useMemo(
     () => sipEventManager ?? createSipEventManager(client),
     [client, sipEventManager]
   );
-  React.useEffect(() => {
-    client.setMicrophoneProvider(requestMicrophoneStream);
-  }, [client, requestMicrophoneStream]);
   const contextValue = useMemo(() => ({ client, sipEventManager: manager }), [client, manager]);
   return /* @__PURE__ */ jsx(SipContext.Provider, { value: contextValue, children });
 }