Merge branch 'master' into release

onsip · Jul 13, 2020 · ab5eb31 · ab5eb31
2 parents d408104 + 53d3307
commit ab5eb31
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 310 deletions.
diff --git a/demo/demo-2.ts b/demo/demo-2.ts
@@ -57,6 +57,10 @@ const bob = buildUser(
   videoRemoteBob
 );
 
+if (!alice || !bob) {
+  console.error("Something went wrong");
+}
+
 function buildUser(
   webSocketServer: string,
   aor: string,

diff --git a/demo/demo-3.ts b/demo/demo-3.ts
@@ -154,6 +154,10 @@ const bob = buildUser(
   receiveBob
 );
 
+if (!alice || !bob) {
+  console.error("Something went wrong");
+}
+
 function buildUser(
   webSocketServer: string,
   aor: string,

diff --git a/docs/api/sip.js.sessiondescriptionhandler.holdmodifier.md b/docs/api/sip.js.sessiondescriptionhandler.holdmodifier.md
diff --git a/docs/api/sip.js.sessiondescriptionhandler.md b/docs/api/sip.js.sessiondescriptionhandler.md
@@ -19,7 +19,6 @@ export interface SessionDescriptionHandler
 |  [close()](./sip.js.sessiondescriptionhandler.close.md) | Destructor. |
 |  [getDescription(options, modifiers)](./sip.js.sessiondescriptionhandler.getdescription.md) | Gets the local description from the underlying media implementation. |
 |  [hasDescription(contentType)](./sip.js.sessiondescriptionhandler.hasdescription.md) | Returns true if the Session Description Handler can handle the Content-Type described by a SIP message. |
-|  [holdModifier(sessionDescription)](./sip.js.sessiondescriptionhandler.holdmodifier.md) | The modifier that should be used when the session would like to place the call on hold. |
 |  [rollbackDescription()](./sip.js.sessiondescriptionhandler.rollbackdescription.md) | Rolls back the current local/remote offer to the prior stable state. |
 |  [sendDtmf(tones, options)](./sip.js.sessiondescriptionhandler.senddtmf.md) | Send DTMF via RTP (RFC 4733). Returns true if DTMF send is successful, false otherwise. |
 |  [setDescription(sdp, options, modifiers)](./sip.js.sessiondescriptionhandler.setdescription.md) | Sets the remote description to the underlying media implementation. |

diff --git a/docs/session-description-handler/sip.js.sessiondescriptionhandler.holdmodifier.md b/docs/session-description-handler/sip.js.sessiondescriptionhandler.holdmodifier.md
diff --git a/docs/session-description-handler/sip.js.sessiondescriptionhandler.md b/docs/session-description-handler/sip.js.sessiondescriptionhandler.md
@@ -52,7 +52,6 @@ It is expected/intended to be extended by specific WebRTC based applications.
 |  [getLocalMediaStream(options)](./sip.js.sessiondescriptionhandler.getlocalmediastream.md) |  | Get a media stream from the media stream factory and set the local media stream. |
 |  [getLocalSessionDescription()](./sip.js.sessiondescriptionhandler.getlocalsessiondescription.md) |  | Gets the peer connection's local session description. |
 |  [hasDescription(contentType)](./sip.js.sessiondescriptionhandler.hasdescription.md) |  | Returns true if the SessionDescriptionHandler can handle the Content-Type described by a SIP message. |
-|  [holdModifier(sessionDescription)](./sip.js.sessiondescriptionhandler.holdmodifier.md) |  | The modifier that should be used when the session would like to place the call on hold. |
 |  [iceGatheringComplete()](./sip.js.sessiondescriptionhandler.icegatheringcomplete.md) |  | Called when ICE gathering completes and resolves any waiting promise. |
 |  [sendDtmf(tones, options)](./sip.js.sessiondescriptionhandler.senddtmf.md) |  | Send DTMF via RTP (RFC 4733). Returns true if DTMF send is successful, false otherwise. |
 |  [setDescription(sdp, options, modifiers)](./sip.js.sessiondescriptionhandler.setdescription.md) |  | Sets an offer or answer. |

diff --git a/etc/api/sip.js.api.md b/etc/api/sip.js.api.md
@@ -532,7 +532,6 @@ export interface SessionDescriptionHandler {
     close(): void;
     getDescription(options?: SessionDescriptionHandlerOptions, modifiers?: Array<SessionDescriptionHandlerModifier>): Promise<BodyAndContentType>;
     hasDescription(contentType: string): boolean;
-    holdModifier(sessionDescription: RTCSessionDescriptionInit): Promise<RTCSessionDescriptionInit>;
     rollbackDescription?(): Promise<void>;
     sendDtmf(tones: string, options?: unknown): boolean;
     setDescription(sdp: string, options?: SessionDescriptionHandlerOptions, modifiers?: Array<SessionDescriptionHandlerModifier>): Promise<void>;

diff --git a/etc/session-description-handler/sip.js.api.md b/etc/session-description-handler/sip.js.api.md
@@ -47,7 +47,6 @@ export class SessionDescriptionHandler implements SessionDescriptionHandler_2 {
     protected getLocalMediaStream(options?: SessionDescriptionHandlerOptions): Promise<void>;
     protected getLocalSessionDescription(): Promise<RTCSessionDescription>;
     hasDescription(contentType: string): boolean;
-    holdModifier(sessionDescription: RTCSessionDescriptionInit): Promise<RTCSessionDescriptionInit>;
     protected iceGatheringComplete(): void;
     get localMediaStream(): MediaStream;
     protected _localMediaStream: MediaStream;