react-jssip-kit 0.4.7 → 0.4.8

package/dist/index.cjs

@@ -485,7 +485,7 @@ function createSessionHandlers(deps) {
   } = deps;
   return {
     progress: (e) => {
-      emitter.emit("progress", { sessionId, data: e });
+      emitter.emit("progress", e);
       state.batchSet({
         sessions: state.getState().sessions.map(
           (s) => s.id === sessionId ? { ...s, status: CallStatus.Ringing } : s
@@ -493,7 +493,7 @@ function createSessionHandlers(deps) {
       });
     },
     accepted: (e) => {
-      emitter.emit("accepted", { sessionId, data: e });
+      emitter.emit("accepted", e);
       state.batchSet({
         sessions: state.getState().sessions.map(
           (s) => s.id === sessionId ? {
@@ -504,9 +504,9 @@ function createSessionHandlers(deps) {
         )
       });
     },
-    confirmed: (e) => emitter.emit("confirmed", { sessionId, data: e }),
+    confirmed: (e) => emitter.emit("confirmed", e),
     ended: (e) => {
-      emitter.emit("ended", { sessionId, data: e });
+      emitter.emit("ended", e);
       detachSessionHandlers();
       rtc.cleanup();
       const nextSessions = state.getState().sessions.filter((s) => s.id !== sessionId);
@@ -515,7 +515,7 @@ function createSessionHandlers(deps) {
       });
     },
     failed: (e) => {
-      emitter.emit("failed", { sessionId, data: e });
+      emitter.emit("failed", e);
       detachSessionHandlers();
       rtc.cleanup();
       const cause = e?.cause || "call failed";
@@ -526,31 +526,31 @@ function createSessionHandlers(deps) {
       });
     },
     muted: () => {
-      emitter.emit("muted", { sessionId, data: void 0 });
+      emitter.emit("muted", void 0);
       upsertSessionState(state, sessionId, { muted: true });
     },
     unmuted: () => {
-      emitter.emit("unmuted", { sessionId, data: void 0 });
+      emitter.emit("unmuted", void 0);
       upsertSessionState(state, sessionId, { muted: false });
     },
     hold: () => {
-      emitter.emit("hold", { sessionId, data: void 0 });
+      emitter.emit("hold", void 0);
       upsertSessionState(state, sessionId, { status: CallStatus.Hold });
     },
     unhold: () => {
-      emitter.emit("unhold", { sessionId, data: void 0 });
+      emitter.emit("unhold", void 0);
       upsertSessionState(state, sessionId, { status: CallStatus.Active });
     },
-    reinvite: (e) => emitter.emit("reinvite", { sessionId, data: e }),
-    update: (e) => emitter.emit("update", { sessionId, data: e }),
-    sdp: (e) => emitter.emit("sdp", { sessionId, data: e }),
-    icecandidate: (e) => emitter.emit("icecandidate", { sessionId, data: e }),
-    refer: (e) => emitter.emit("refer", { sessionId, data: e }),
-    replaces: (e) => emitter.emit("replaces", { sessionId, data: e }),
-    newDTMF: (e) => emitter.emit("newDTMF", { sessionId, data: e }),
-    newInfo: (e) => emitter.emit("newInfo", { sessionId, data: e }),
+    reinvite: (e) => emitter.emit("reinvite", e),
+    update: (e) => emitter.emit("update", e),
+    sdp: (e) => emitter.emit("sdp", e),
+    icecandidate: (e) => emitter.emit("icecandidate", e),
+    refer: (e) => emitter.emit("refer", e),
+    replaces: (e) => emitter.emit("replaces", e),
+    newDTMF: (e) => emitter.emit("newDTMF", e),
+    newInfo: (e) => emitter.emit("newInfo", e),
     getusermediafailed: (e) => {
-      emitter.emit("getusermediafailed", { sessionId, data: e });
+      emitter.emit("getusermediafailed", e);
       detachSessionHandlers();
       rtc.cleanup();
       onSessionFailed("getUserMedia failed", e);
@@ -559,7 +559,7 @@ function createSessionHandlers(deps) {
       });
     },
     "peerconnection:createofferfailed": (e) => {
-      emitter.emit("peerconnection:createofferfailed", { sessionId, data: e });
+      emitter.emit("peerconnection:createofferfailed", e);
       detachSessionHandlers();
       rtc.cleanup();
       onSessionFailed("peer connection createOffer failed", e);
@@ -568,7 +568,7 @@ function createSessionHandlers(deps) {
       });
     },
     "peerconnection:createanswerfailed": (e) => {
-      emitter.emit("peerconnection:createanswerfailed", { sessionId, data: e });
+      emitter.emit("peerconnection:createanswerfailed", e);
       detachSessionHandlers();
       rtc.cleanup();
       onSessionFailed("peer connection createAnswer failed", e);
@@ -577,7 +577,7 @@ function createSessionHandlers(deps) {
       });
     },
     "peerconnection:setlocaldescriptionfailed": (e) => {
-      emitter.emit("peerconnection:setlocaldescriptionfailed", { sessionId, data: e });
+      emitter.emit("peerconnection:setlocaldescriptionfailed", e);
       detachSessionHandlers();
       rtc.cleanup();
       onSessionFailed("peer connection setLocalDescription failed", e);
@@ -586,7 +586,7 @@ function createSessionHandlers(deps) {
       });
     },
     "peerconnection:setremotedescriptionfailed": (e) => {
-      emitter.emit("peerconnection:setremotedescriptionfailed", { sessionId, data: e });
+      emitter.emit("peerconnection:setremotedescriptionfailed", e);
       detachSessionHandlers();
       rtc.cleanup();
       onSessionFailed("peer connection setRemoteDescription failed", e);
@@ -594,7 +594,7 @@ function createSessionHandlers(deps) {
         sessions: state.getState().sessions.filter((s) => s.id !== sessionId)
       });
     },
-    peerconnection: (e) => emitter.emit("peerconnection", { sessionId, data: e })
+    peerconnection: (e) => emitter.emit("peerconnection", e)
   };
 }
 
@@ -850,7 +850,7 @@ var SessionLifecycle = class {
       } catch {
       }
       if (e.originator === "remote") {
-        this.emit("missed", { sessionId, data: e });
+        this.emit("missed", e);
       }
       this.emitError("max session count reached", "MAX_SESSIONS_REACHED", "max session count reached");
       return;
@@ -880,7 +880,7 @@ var SessionLifecycle = class {
       mediaKind: sdpHasVideo ? "video" : "audio",
       remoteVideoEnabled: sdpHasVideo
     });
-    this.emit("newRTCSession", { sessionId, data: e });
+    this.emit("newRTCSession", e);
   }
 };
 
@@ -1290,13 +1290,48 @@ function createSipClientInstance(options) {
   return new SipClient(options);
 }
 function createSipEventManager(client) {
+  const sessionEventNames = /* @__PURE__ */ new Set([
+    "peerconnection",
+    "connecting",
+    "sending",
+    "progress",
+    "accepted",
+    "confirmed",
+    "ended",
+    "failed",
+    "newDTMF",
+    "newInfo",
+    "hold",
+    "unhold",
+    "muted",
+    "unmuted",
+    "reinvite",
+    "update",
+    "refer",
+    "replaces",
+    "sdp",
+    "icecandidate",
+    "getusermediafailed",
+    "peerconnection:createofferfailed",
+    "peerconnection:createanswerfailed",
+    "peerconnection:setlocaldescriptionfailed",
+    "peerconnection:setremotedescriptionfailed"
+  ]);
   return {
     on(event, handler) {
       return client.on(event, handler);
     },
     onSession(sessionId, event, handler) {
+      if (sessionEventNames.has(String(event))) {
+        const session = client.getSession(sessionId);
+        if (session) {
+          session.on(event, handler);
+          return () => session.off(event, handler);
+        }
+      }
       return client.on(event, (payload) => {
-        if (payload && "sessionId" in payload && payload.sessionId === sessionId) {
+        const id = payload?.session?.id ?? payload?.sessionId ?? payload?.data?.session?.id ?? payload?.data?.id;
+        if (id && String(id) === sessionId) {
           handler(payload);
         }
       });
@@ -1316,13 +1351,7 @@ function createSipEventManager(client) {
       Object.keys(handlers).forEach((event) => {
         const handler = handlers[event];
         if (handler) {
-          offs.push(
-            client.on(event, (payload) => {
-              if (payload && "sessionId" in payload && payload.sessionId === sessionId) {
-                handler(payload);
-              }
-            })
-          );
+          offs.push(this.onSession(sessionId, event, handler));
         }
       });
       return () => offs.forEach((off) => off());