@voicenter-team/opensips-js 1.0.144 → 1.0.146

package/dist/opensips-js.es.js

@@ -14207,47 +14207,47 @@ var Sh = class Au extends Dg {
    * Terminate the call.
    */
   terminate(t = {}) {
-    console.log("IN TERMINATE"), Y.debug("terminate()");
+    Y.debug("terminate()");
     const n = t.cause || fe.causes.BYE, a = Be.cloneArray(t.extraHeaders), o = t.body;
     let s, r = t.status_code, d = t.reason_phrase;
     if (this._status === Z.STATUS_TERMINATED)
-      throw console.log("IN TERMINATE EXC 1"), new En.InvalidStateError(this._status);
+      throw new En.InvalidStateError(this._status);
     switch (this._status) {
       case Z.STATUS_NULL:
       case Z.STATUS_INVITE_SENT:
       case Z.STATUS_1XX_RECEIVED:
         if (Y.debug("canceling session"), r && (r < 200 || r >= 700))
-          throw console.log("IN TERMINATE EXC 2"), new TypeError(`Invalid status_code: ${r}`);
+          throw new TypeError(`Invalid status_code: ${r}`);
         r && (d = d || fe.REASON_PHRASE[r] || "", s = `SIP ;cause=${r} ;text="${d}"`), this._status === Z.STATUS_NULL || this._status === Z.STATUS_INVITE_SENT ? (this._is_canceled = !0, this._cancel_reason = s) : this._status === Z.STATUS_1XX_RECEIVED && this._request.cancel(s), this._status = Z.STATUS_CANCELED, this._failed("local", null, fe.causes.CANCELED);
         break;
       case Z.STATUS_WAITING_FOR_ANSWER:
       case Z.STATUS_ANSWERED:
-        if (console.log("IN TERMINATE STATUS ANSWERED"), Y.debug("rejecting session"), r = r || 480, r < 300 || r >= 700)
-          throw console.log("IN TERMINATE EXC 3"), new TypeError(`Invalid status_code: ${r}`);
-        console.log("IN TERMINATE EMIT FAILED"), this._request.reply(r, d, a, o), this._failed("local", null, fe.causes.REJECTED);
+        if (Y.debug("rejecting session"), r = r || 480, r < 300 || r >= 700)
+          throw new TypeError(`Invalid status_code: ${r}`);
+        this._request.reply(r, d, a, o), this._failed("local", null, fe.causes.REJECTED);
         break;
       case Z.STATUS_WAITING_FOR_ACK:
       case Z.STATUS_CONFIRMED:
-        if (console.log("IN TERMINATE CONFIRMED"), Y.debug("terminating session"), d = t.reason_phrase || fe.REASON_PHRASE[r] || "", r && (r < 200 || r >= 700))
-          throw console.log("IN TERMINATE EXC 4"), new TypeError(`Invalid status_code: ${r}`);
+        if (Y.debug("terminating session"), d = t.reason_phrase || fe.REASON_PHRASE[r] || "", r && (r < 200 || r >= 700))
+          throw new TypeError(`Invalid status_code: ${r}`);
         if (r && a.push(`Reason: SIP ;cause=${r}; text="${d}"`), this._status === Z.STATUS_WAITING_FOR_ACK && this._direction === "incoming" && this._request.server_transaction.state !== Tf.C.STATUS_TERMINATED) {
           const h = this._dialog;
           this.receiveRequest = ({ method: _ }) => {
             _ === fe.ACK && (this.sendRequest(fe.BYE, {
               extraHeaders: a,
               body: o
-            }), console.log("IN TERMINATE DIALOG TERMINATE"), h.terminate());
+            }), h.terminate());
           }, this._request.server_transaction.on("stateChanged", () => {
             this._request.server_transaction.state === Tf.C.STATUS_TERMINATED && (this.sendRequest(fe.BYE, {
               extraHeaders: a,
               body: o
-            }), console.log("IN TERMINATE DIALOG TERMINATE 2"), h.terminate());
-          }), console.log("IN TERMINATE EMIT ENDED"), this._ended("local", null, n), this._dialog = h, this._ua.newDialog(h);
+            }), h.terminate());
+          }), this._ended("local", null, n), this._dialog = h, this._ua.newDialog(h);
         } else
           this.sendRequest(fe.BYE, {
             extraHeaders: a,
             body: o
-          }), console.log("IN TERMINATE EMIT ENDED 2"), this._ended("local", null, n);
+          }), this._ended("local", null, n);
     }
   }
   sendDTMF(t, n = {}) {
@@ -19554,13 +19554,7 @@ const $T = {
 }, Wi = new Wa("Registrator"), ha = 10;
 class HT {
   constructor(t, n) {
-    this._reg_id = 1, this._ua = t, this._transport = n, this._registrar = t.configuration.registrar_server, this._expires = t.configuration.register_expires, this._call_id = Ts.createRandomToken(22), this._cseq = 0, this._to_uri = t.configuration.uri, this._registrationTimer = null, this._registering = !1, this._registered = !1, this._contact = this._ua.contact.toString();
-    const a = this._contact.indexOf(">");
-    if (a !== -1) {
-      const o = this._contact.slice(0, a) + this._contact.slice(a + 1, this._contact.length);
-      this._contact = o;
-    }
-    this._extra_contact = "", this._extraContactParams = "", this._extra_contact += ";+sip.ice", this._extraHeaders = [], this._sipInstance = `"<urn:uuid:${this._ua.configuration.instance_id}>"`, this._extra_contact += `;reg-id=${this._reg_id}`, this._extra_contact += `;+sip.instance=${this._sipInstance}`;
+    this._reg_id = 1, this._ua = t, this._transport = n, this._registrar = t.configuration.registrar_server, this._expires = t.configuration.register_expires, this._call_id = Ts.createRandomToken(22), this._cseq = 0, this._to_uri = t.configuration.uri, this._registrationTimer = null, this._registering = !1, this._registered = !1, this._contact = this._ua.contact.toString(), this._contact += ";+sip.ice", this._extraHeaders = [], this._extraContactParams = "", this._sipInstance = `"<urn:uuid:${this._ua.configuration.instance_id}>"`, this._contact += `;reg-id=${this._reg_id}`, this._contact += `;+sip.instance=${this._sipInstance}`;
   }
   get registered() {
     return this._registered;
@@ -19576,21 +19570,13 @@ class HT {
         this._extraContactParams += `;${n}`, a && (this._extraContactParams += `=${a}`);
       }
   }
-  setExtraContactUriParams(t) {
-    t instanceof Object || (t = {}), this._extraContactParams = "";
-    for (const n in t)
-      if (Object.prototype.hasOwnProperty.call(t, n)) {
-        const a = t[n];
-        this._extraContactParams += `;${n}`, a && (this._extraContactParams += `=${a}`);
-      }
-  }
   register() {
     if (this._registering) {
       Wi.debug("Register request in progress...");
       return;
     }
     const t = this._extraHeaders.slice();
-    t.push(`Contact: ${this._contact}${this._extraContactParams}>${this._extra_contact};expires=${this._expires}`), t.push(`Expires: ${this._expires}`);
+    t.push(`Contact: ${this._contact};expires=${this._expires}${this._extraContactParams}`), t.push(`Expires: ${this._expires}`);
     const n = new yt.OutgoingRequest(
       L.REGISTER,
       this._registrar,
@@ -19613,7 +19599,7 @@ class HT {
         this._cseq += 1;
       },
       onReceiveResponse: (o) => {
-        if (o.cseq === this._cseq)
+        if (console.log("register onReceiveResponse", o), o.cseq === this._cseq)
           switch (this._registrationTimer !== null && (clearTimeout(this._registrationTimer), this._registrationTimer = null), !0) {
             case /^1[0-9]{2}$/.test(o.status_code):
               break;
@@ -19628,6 +19614,7 @@ class HT {
                 Wi.debug("no Contact header pointing to us, response ignored");
                 break;
               }
+              this._ua.clearKeepAliveInterval(), this._ua.setLastRegisterTimestamp();
               let d = r.getParam("expires");
               !d && o.hasHeader("expires") && (d = o.getHeader("expires")), d || (d = this._expires), d = Number(d), d < ha && (d = ha);
               const h = d > 64 ? d * 1e3 / 2 + Math.floor((d / 2 - 32) * 1e3 * Math.random()) : d * 1e3 - 5e3;
@@ -19656,7 +19643,7 @@ class HT {
     }
     this._registered = !1, this._registrationTimer !== null && (clearTimeout(this._registrationTimer), this._registrationTimer = null);
     const n = this._extraHeaders.slice();
-    t.all ? n.push(`Contact: *${this._extraContactParams}`) : n.push(`Contact: ${this._contact}${this._extraContactParams}>${this._extra_contact};expires=0`), n.push("Expires: 0");
+    t.all ? n.push(`Contact: *${this._extraContactParams}`) : n.push(`Contact: ${this._contact};expires=0${this._extraContactParams}`), n.push("Expires: 0");
     const a = new yt.OutgoingRequest(
       L.REGISTER,
       this._registrar,
@@ -19734,7 +19721,10 @@ class jT extends FT {
       nict: {},
       ist: {},
       ict: {}
-    }, this._janus_sessions = [], this.newStreamPlugins = [], this.processStreamPlugins = [], this._registrator = new HT(this);
+    }, this._janus_sessions = [], this.newStreamPlugins = [], this.processStreamPlugins = [], this.optionsInterval = null, this.lastOptionsTimestamp = null, this.lastRegisterTimestamp = null, this._registrator = new HT(this);
+  }
+  setLastRegisterTimestamp() {
+    this.lastRegisterTimestamp = Date.now();
   }
   call(t, n) {
     return super.call(t, n);
@@ -19867,6 +19857,9 @@ class jT extends FT {
   destroyJanusSession(t) {
     delete this._janus_sessions[t.id];
   }
+  clearKeepAliveInterval() {
+    clearInterval(this.optionsInterval), this.optionsInterval = null;
+  }
   receiveRequest(t) {
     var s, r, d, h;
     const n = t.method;
@@ -19881,7 +19874,10 @@ class jT extends FT {
     if (Gt.checkTransaction(this, t))
       return;
     if (n === De.INVITE ? new Gt.InviteServerTransaction(this, this._transport, t) : n !== De.ACK && n !== De.CANCEL && new Gt.NonInviteServerTransaction(this, this._transport, t), n === De.OPTIONS) {
-      if (this.listeners("newOptions").length === 0) {
+      if (this.lastOptionsTimestamp = Date.now(), this.optionsInterval || (this.emit("initKeepAliveInterval"), this.optionsInterval = setInterval(() => {
+        const g = Date.now();
+        this.lastOptionsTimestamp > g - 35e3 && this.lastRegisterTimestamp + this._configuration.register_expires * 1e3 > g && this.emit("keepAliveInterval");
+      }, 35e3)), this.listeners("newOptions").length === 0) {
         t.reply(200);
         return;
       }
@@ -20043,7 +20039,7 @@ function qT(c) {
   this.emit("connecting", c);
 }
 function VT(c) {
-  this._status !== Vs.STATUS_USER_CLOSED && (this._status = Vs.STATUS_READY, this._error = null, this.emit("connected", c), this._dynConfiguration.register && this._registrator.register());
+  this._status !== Vs.STATUS_USER_CLOSED && (this._status = Vs.STATUS_READY, this._error = null, this.emit("connected", c), this._dynConfiguration.register && (console.log("do register"), this._registrator.register()));
 }
 function BT(c) {
   const t = ["nict", "ict", "nist", "ist"];