@coventia/softphone 0.4.0 → 0.5.0

package/dist/zadarma/index.cjs

@@ -361,6 +361,19 @@ var ERROR_CATALOGUE = {
     message: "The provider does not support this operation.",
     solution: "Guard the UI on the operation before offering it."
   },
+  // ── Line owner (docs/specs/line-owner.md §5) ────────────────────────────────
+  // What `takeLine()` rejects with — and `call()` from `standby`, which takes the line first. Never
+  // emitted on `SoftphoneEvent.Error`: the promise IS the answer, and nothing about the phone is broken.
+  "line/claim-refused": {
+    fatal: false,
+    message: "The line was not moved here: the user is on a call on the softphone that has it.",
+    solution: "Nothing to fix. The line never moves during a call; take it again once that call has ended. Incoming calls keep ringing where they ring now."
+  },
+  "line/unavailable": {
+    fatal: false,
+    message: "The line could not be taken: nothing decided where it is.",
+    solution: "The presence connection is down, the backend predates the line owner, or it did not answer in time. Retry in a moment; incoming calls keep ringing where they ring now."
+  },
   // ── Provider ────────────────────────────────────────────────────────────────
   "provider/provision-failed": {
     fatal: true,
@@ -416,9 +429,22 @@ var SipCallEngine = class {
   provider;
   factory;
   #state = "stopped";
+  /**
+   * Which `start()`…`stop()` cycle this is — bumped by `stop()`, which ends one. Everything that awaits
+   * and then acts (builds a UA, subscribes to the signal, sets the state) captures it first and gives up
+   * if a stop has happened since. Not bumped by `start()`: that would cancel work begun just before it,
+   * such as a call placed while the softphone is still starting.
+   *
+   * Without it a stopped phone came back to life: a provisioning or a signal connect still in flight
+   * when `stop()` ran finished afterwards and REGISTERed — and since the PBX routes a call to whichever
+   * client registered last, it quietly took calls from the user's other device while its UI said off.
+   */
+  #run = 0;
   #ua = null;
   /** In-flight `#createUA()`. THE concurrency guard — see `#ensureUA`. */
   #uaInFlight = null;
+  /** Calls waiting for the current UA to register (`#callWhenRegistered`), failed by `#teardownUA`. */
+  #awaitingRegistration = /* @__PURE__ */ new Set();
   #domain = "";
   #activeCall = null;
   /**
@@ -501,14 +527,25 @@ var SipCallEngine = class {
     for (const listener of [...this.#errorListeners]) listener(error);
   }
   async start() {
+    const run = this.#run;
     this.#setState("starting");
     if (this.provider.registrationMode === "persistent") {
-      await this.#ensureUA();
+      try {
+        await this.#ensureUA();
+      } catch (cause) {
+        if (run === this.#run) throw cause;
+      }
+      if (run !== this.#run) return;
       this.#setState("online");
     } else {
       const signal = this.provider.incomingSignal;
       if (signal) {
-        await signal.connect();
+        try {
+          await signal.connect();
+        } catch (cause) {
+          if (run === this.#run) throw cause;
+        }
+        if (run !== this.#run) return;
         this.#signalUnsub = signal.onSignal(() => void this.#onIncomingSignal());
         this.#signalConnectionUnsub = signal.onConnectionChange?.(
           (connected) => this.#setState(connected ? "online" : "offline")
@@ -518,6 +555,7 @@ var SipCallEngine = class {
     }
   }
   async stop() {
+    this.#run += 1;
     this.#clearNoInviteTimer();
     this.#signalUnsub?.();
     this.#signalUnsub = null;
@@ -536,11 +574,12 @@ var SipCallEngine = class {
   async #onIncomingSignal() {
     if (this.now() < this.#rejectGuardUntil) return;
     if (this.#activeCall) return;
+    const run = this.#run;
     try {
       await this.#ensureUA();
       this.#armNoInviteTeardown();
     } catch {
-      this.#teardownUA();
+      if (run === this.#run) this.#teardownUA();
     }
   }
   #armNoInviteTeardown() {
@@ -602,12 +641,16 @@ var SipCallEngine = class {
    */
   async #ensureUA() {
     if (this.#ua) return this.#ua;
-    this.#uaInFlight ??= this.#createUA().finally(() => {
-      this.#uaInFlight = null;
-    });
+    if (!this.#uaInFlight) {
+      const inFlight = this.#createUA().finally(() => {
+        if (this.#uaInFlight === inFlight) this.#uaInFlight = null;
+      });
+      this.#uaInFlight = inFlight;
+    }
     return this.#uaInFlight;
   }
   async #createUA() {
+    const run = this.#run;
     const factory = await this.#resolveFactory();
     let credentials;
     try {
@@ -617,17 +660,28 @@ var SipCallEngine = class {
       else this.#reportError("provider/provision-failed", cause);
       throw cause;
     }
+    if (run !== this.#run) throw createError("engine/not-started");
     this.#domain = domainOf(credentials);
     const config = this.#uaConfig(credentials, factory);
     const ua = factory.createUA(config);
-    ua.on("newRTCSession", ({ session, originator }) => this.#onNewSession(session, originator));
+    ua.on("newRTCSession", ({ session, originator }) => {
+      if (ua !== this.#ua) {
+        if (originator === "remote") session.terminate({ status_code: 486, reason_phrase: "Busy Here" });
+        return;
+      }
+      this.#onNewSession(session, originator);
+    });
     ua.on("disconnected", ({ error }) => {
+      if (ua !== this.#ua) return;
       if (!error) return;
       this.#setState("reconnecting");
       this.#reportError("net/transport-failed", error);
     });
-    ua.on("connected", () => this.#setState("online"));
+    ua.on("connected", () => {
+      if (ua === this.#ua) this.#setState("online");
+    });
     ua.on("registrationFailed", (e) => {
+      if (run !== this.#run) return;
       const detail = e;
       this.#reportError("net/registration-failed", {
         cause: detail?.cause,
@@ -635,7 +689,7 @@ var SipCallEngine = class {
         domain: this.#domain,
         hint: "A bare 401 with no auth challenge usually means the registrar is in the wrong datacenter (SPEC \xA73.1)."
       });
-      this.#teardownUA();
+      if (ua === this.#ua) this.#teardownUA();
       void this.#refreshSignal();
     });
     this.#ua = ua;
@@ -662,6 +716,7 @@ var SipCallEngine = class {
   #teardownUA() {
     this.#uaInFlight = null;
     if (!this.#ua) return;
+    for (const fail of [...this.#awaitingRegistration]) fail();
     try {
       this.#ua.terminateSessions({ status_code: 487 });
       this.#ua.stop();
@@ -685,8 +740,27 @@ var SipCallEngine = class {
   #callWhenRegistered(ua, target) {
     const options = { mediaConstraints: buildAudioConstraints(this.#inputDeviceId), pcConfig: PC_CONFIG };
     if (ua.isRegistered()) return Promise.resolve(ua.call(target, options));
-    return new Promise((resolve) => {
-      ua.on("registered", () => resolve(ua.call(target, options)));
+    const run = this.#run;
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const fail = () => {
+        if (settled) return;
+        settled = true;
+        this.#awaitingRegistration.delete(fail);
+        reject(createError(run === this.#run ? "call/failed" : "engine/not-started"));
+      };
+      this.#awaitingRegistration.add(fail);
+      ua.on("registered", () => {
+        if (settled) return;
+        if (ua !== this.#ua) return fail();
+        settled = true;
+        this.#awaitingRegistration.delete(fail);
+        try {
+          resolve(ua.call(target, options));
+        } catch (cause) {
+          reject(cause);
+        }
+      });
     });
   }
   #wrapCall(session) {
@@ -826,6 +900,12 @@ var ZadarmaPushSignal = class {
   #retryTimer;
   #unwatchBackground;
   #closed = false;
+  /**
+   * Bumped by `disconnect()`. An open or a rebuild still awaiting its key when the signal is disconnected
+   * must build nothing afterwards — and `#closed` alone cannot say so once a later `connect()` (stop, then
+   * start again) has reset it: the late socket was built beside the new one, and nothing ever closed it.
+   */
+  #run = 0;
   #listeners = /* @__PURE__ */ new Set();
   #connectionListeners = /* @__PURE__ */ new Set();
   async connect() {
@@ -835,8 +915,9 @@ var ZadarmaPushSignal = class {
     await this.#open();
   }
   async #open() {
+    const run = this.#run;
     const { key, sip, keyExpiresAt } = await this.deps.fetchKey();
-    if (this.#closed) return;
+    if (run !== this.#run) return;
     const socket = this.deps.createPushSocket(buildPushUrl(key, sip));
     this.#socket = socket;
     this.#attach(socket);
@@ -931,9 +1012,10 @@ var ZadarmaPushSignal = class {
       return;
     }
     this.#rebuilding = true;
+    const run = this.#run;
     try {
       const { key, sip, keyExpiresAt } = await this.deps.fetchKey();
-      if (this.#closed) return;
+      if (run !== this.#run) return;
       const swapped = await new Promise((resolve) => {
         const socket = this.deps.createPushSocket(buildPushUrl(key, sip));
         this.#candidate = socket;
@@ -986,6 +1068,7 @@ var ZadarmaPushSignal = class {
   }
   disconnect() {
     this.#closed = true;
+    this.#run += 1;
     this.#stopPings();
     clearTimeout(this.#refreshTimer);
     this.#refreshTimer = void 0;
@@ -1256,10 +1339,24 @@ function makeZadarmaBrowserDeps(config) {
   };
 }
 
+// src/core/api-base.ts
+function normalizeApiBase(url) {
+  const trimmed = url.replace(/\/+$/, "");
+  if (!trimmed.endsWith("/api/v1")) return trimmed;
+  console.warn(
+    "[softphone] apiBase should be Coventia's domain only, without /api/v1. Ignoring the /api/v1 suffix."
+  );
+  return trimmed.slice(0, -"/api/v1".length).replace(/\/+$/, "");
+}
+
 // src/transports/zadarma-engine.ts
 function createZadarmaEngine(config) {
   const provider = new ZadarmaProvider(
-    makeZadarmaBrowserDeps({ ...config, tokenSource: cachedTokenSource(config.tokenSource) })
+    makeZadarmaBrowserDeps({
+      ...config,
+      apiBase: normalizeApiBase(config.apiBase),
+      tokenSource: cachedTokenSource(config.tokenSource)
+    })
   );
   return new SipCallEngine(provider, loadJsSipFactory);
 }