@dora-cell/sdk 1.0.2 → 3.0.0

package/dist/index.mjs

@@ -23011,7 +23011,6 @@ var ApiTokenAuthProvider = class {
     }
     const baseUrl = apiBaseUrl?.replace(/\/$/, "") || "https://api.cell.usedora.com/api";
     try {
-      console.log("SDK: Verifying keys at:", `${baseUrl}/sdk/v1/auth/session`);
       const authResponse = await fetch(`${baseUrl}/sdk/v1/auth/session`, {
         method: "POST",
         headers: {
@@ -23033,7 +23032,29 @@ var ApiTokenAuthProvider = class {
       if (!this.sessionToken) {
         throw new AuthenticationError("No session token returned after key verification");
       }
-      this.credentials = this.parseCredentials(authData);
+      const origin = typeof window !== "undefined" ? window.location.origin : "";
+      const validateResponse = await fetch(`${baseUrl}/sdk/v1/auth/validate`, {
+        method: "GET",
+        headers: {
+          "Authorization": `Bearer ${this.sessionToken}`,
+          "x-dora-public-key": this.publicKey,
+          "Origin": origin,
+          "Accept": "application/json"
+        }
+      });
+      if (!validateResponse.ok) {
+        throw new AuthenticationError(
+          `Secondary validation failed: ${validateResponse.status}`,
+          { status: validateResponse.status }
+        );
+      }
+      const validateData = await validateResponse.json();
+      console.log(`Dora Cell SDK: Authenticated successfully`);
+      if (validateData.features && !validateData.features.includes("voice")) {
+        console.warn('Dora Cell SDK: App token does not have the "voice" feature enabled.');
+      }
+      const actualResponseData = authData.data && typeof authData.data === "object" ? authData.data : authData;
+      this.credentials = this.parseCredentials(actualResponseData);
       return this.credentials;
     } catch (error) {
       if (error instanceof AuthenticationError) {
@@ -23071,7 +23092,8 @@ var ApiTokenAuthProvider = class {
     if (!sipUri && extensions.length > 0) {
       const ext = extensions[0].extension;
       sipUri = `sip:${ext}@${sipDomain}`;
-      console.log(`SDK: Constructed SIP URI from extension: ${sipUri}`);
+    } else if (!sipUri) {
+      sipUri = "";
     }
     return {
       wsUrl,
@@ -23172,6 +23194,7 @@ var CallSession = class {
     // JsSIP RTCSession
     this._isMuted = false;
     this.remoteStreamValue = null;
+    this.lastKnownSSRCs = /* @__PURE__ */ new Set();
     this.id = this.generateCallId();
     this.session = session;
     this.direction = direction;
@@ -23189,6 +23212,9 @@ var CallSession = class {
       if (code === 180 || code === 183) {
         this.status = "ringing";
         this.events.emit("call:ringing", this);
+        if (this.session.connection) {
+          setTimeout(() => this.reattachFromReceivers(this.session.connection), 200);
+        }
       }
     });
     this.session.on("confirmed", () => {
@@ -23196,28 +23222,79 @@ var CallSession = class {
       this.startTime = Date.now();
       this.startDurationTimer();
       this.events.emit("call:connected", this);
+      if (this.session.connection) {
+        this.reattachFromReceivers(this.session.connection);
+        this.startSSRCWatch(this.session.connection);
+      }
     });
     this.session.on("peerconnection", (evt) => {
-      evt.peerconnection.ontrack = (event) => {
+      const pc = evt.peerconnection;
+      pc.addEventListener("track", (event) => {
+        setTimeout(() => this.reattachFromReceivers(pc), 150);
         if (event.streams && event.streams[0]) {
           this.remoteStreamValue = event.streams[0];
+          this.events.emit("call:stream", this, event.streams[0]);
+        }
+      });
+      pc.oniceconnectionstatechange = () => {
+        if (pc.iceConnectionState === "connected" || pc.iceConnectionState === "completed") {
+          this.reattachFromReceivers(pc);
         }
       };
     });
     this.session.on("ended", (evt) => {
+      console.log(`Dora Cell SDK: Call ended (${evt?.cause || "Normal"})`);
       this.handleCallEnd(evt?.cause);
     });
     this.session.on("failed", (evt) => {
+      console.warn(`Dora Cell SDK: Call failed (${evt?.cause || "Internal Error"})`);
       this.handleCallEnd(evt?.cause || "Call failed");
     });
     this.session.on("rejected", (evt) => {
+      console.warn(`SDK: Call rejected. Cause: ${evt?.cause || "Rejected"}`);
       this.handleCallEnd(evt?.cause || "Call rejected");
     });
   }
+  startSSRCWatch(pc) {
+    this.stopSSRCWatch();
+    this.lastKnownSSRCs.clear();
+    this.ssrcWatchInterval = window.setInterval(async () => {
+      try {
+        if (!pc) return;
+        const stats = await pc.getStats();
+        stats.forEach((report) => {
+          if (report.type === "inbound-rtp" && report.kind === "audio") {
+            const ssrc = report.ssrc;
+            if (ssrc && !this.lastKnownSSRCs.has(ssrc)) {
+              this.lastKnownSSRCs.add(ssrc);
+              setTimeout(() => this.reattachFromReceivers(pc), 200);
+            }
+          }
+        });
+      } catch (e) {
+      }
+    }, 1e3);
+  }
+  stopSSRCWatch() {
+    if (this.ssrcWatchInterval) {
+      clearInterval(this.ssrcWatchInterval);
+      this.ssrcWatchInterval = void 0;
+    }
+  }
+  reattachFromReceivers(pc) {
+    if (!pc) return;
+    const liveAudioTracks = pc.getReceivers().map((r) => r.track).filter((t) => t && t.kind === "audio" && t.readyState === "live");
+    if (liveAudioTracks.length > 0) {
+      const newStream = new MediaStream(liveAudioTracks);
+      this.remoteStreamValue = newStream;
+      this.events.emit("call:stream", this, newStream);
+    }
+  }
   handleCallEnd(reason) {
     this.status = "ended";
     this.endTime = Date.now();
     this.stopDurationTimer();
+    this.stopSSRCWatch();
     this.remoteStreamValue = null;
     this._isMuted = false;
     this.events.emit("call:ended", this, reason);
@@ -23298,6 +23375,7 @@ var CallManager = class {
       const extension = options?.extension || this.getDefaultExtension();
       const sipDomain = this.extractDomain(this.credentials.sipUri);
       const sipTarget = formatPhoneToSIP(targetNumber, sipDomain);
+      console.log(`Dora Cell SDK: Initiating call to ${targetNumber}...`);
       const session = this.ua.call(sipTarget, {
         mediaConstraints: options?.mediaConstraints || { audio: true },
         pcConfig: this.callConfig.pcConfig
@@ -23324,12 +23402,13 @@ var CallManager = class {
    * Answer the pending incoming call.
    * Uses the stored pendingSession from handleIncomingCall.
    */
-  answerCurrentCall() {
+  async answerCurrentCall() {
     const session = this.pendingSession;
     if (!session) {
       throw new CallError("No pending incoming call to answer");
     }
     try {
+      await navigator.mediaDevices.getUserMedia({ audio: true });
       session.answer({
         mediaConstraints: { audio: true },
         pcConfig: this.callConfig.pcConfig
@@ -23374,10 +23453,13 @@ var CallManager = class {
     this.pendingSession = null;
   }
   getDefaultExtension() {
+    if (this.credentials.sipUri) {
+      return this.extractExtension(this.credentials.sipUri);
+    }
     if (this.credentials.extensions && this.credentials.extensions.length > 0) {
       return this.credentials.extensions[0].extension;
     }
-    return this.extractExtension(this.credentials.sipUri);
+    return "unknown";
   }
   extractExtension(sipUri) {
     const match = sipUri.match(/sip:([^@]+)@/);
@@ -23461,6 +23543,7 @@ var DoraCell = class {
     this.connectionStatus = "disconnected";
     this.retryCount = 0;
     this.maxRetries = 3;
+    this.userId = null;
     this.config = {
       autoSelectExtension: true,
       debug: false,
@@ -23485,17 +23568,25 @@ var DoraCell = class {
       );
       if (this.authProvider instanceof ApiTokenAuthProvider) {
         const token = this.authProvider.getSessionToken();
-        if (token) this.apiClient.setSessionToken(token);
+        if (token) {
+          this.apiClient.setSessionToken(token);
+        }
+      }
+      await this.getWallet().catch(() => {
+      });
+      if (!this.credentials?.extensions || this.credentials.extensions.length === 0) {
+        await this.fetchExtensions();
       }
       if (this.config.autoSelectExtension && this.credentials?.extensions && this.credentials.extensions.length > 0) {
         const primary = this.credentials.extensions.find((e) => e.isPrimary) || this.credentials.extensions[0];
-        const domain = this.credentials.sipDomain || "cell.usedora.com";
+        const domain = this.credentials.sipDomain || "64.227.10.164";
         this.credentials.sipUri = `sip:${primary.extension}@${domain}`;
-        console.log(`SDK: Auto-selected extension ${primary.extension}`);
       }
-      await this.initializeUserAgent();
-      this.initializeCallManager();
-      await this.waitForRegistration();
+      if (this.credentials?.sipUri) {
+        await this.initializeUserAgent();
+        this.initializeCallManager();
+        await this.waitForRegistration();
+      }
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
       this.emitError(new ConnectionError(`Initialization failed: ${errorMessage}`));
@@ -23529,6 +23620,16 @@ var DoraCell = class {
     if (!this.credentials) {
       throw new ConnectionError("No credentials available");
     }
+    this.connectionStatus = "connecting";
+    this.emitConnectionStatus();
+    if (this.ua) {
+      try {
+        this.ua.stop();
+      } catch (e) {
+      }
+      this.ua = null;
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
     try {
       const socket = new import_jssip.default.WebSocketInterface(this.credentials.wsUrl);
       const pcConfig = {
@@ -23540,16 +23641,18 @@ var DoraCell = class {
         sockets: [socket],
         register: true,
         display_name: this.getDisplayName(),
-        sessionTimers: false,
+        sessionTimers: true,
+        session_timers_refresh_method: "UPDATE",
         trickleIce: false,
         pcConfig,
         instance_id: this.generateInstanceId()
       };
-      console.log("SDK: Initializing UA with config:", { ...uaConfig, password: "***" });
       this.ua = new import_jssip.default.UA(uaConfig);
       this.setupUserAgentHandlers();
-      console.log("SDK: Starting UA...");
       this.ua.start();
+      if (this.callManager) {
+        this.callManager.setUserAgent(this.ua);
+      }
     } catch (error) {
       throw new ConnectionError(
         `Failed to initialize User Agent: ${error instanceof Error ? error.message : "Unknown error"}`
@@ -23569,6 +23672,7 @@ var DoraCell = class {
     this.ua.on("registered", () => {
       this.connectionStatus = "registered";
       this.retryCount = 0;
+      console.log(`Dora Cell SDK: Connected (${this.getDisplayName()})`);
       this.emitConnectionStatus();
     });
     this.ua.on("registrationFailed", (e) => {
@@ -23583,9 +23687,7 @@ var DoraCell = class {
     });
     this.ua.on("newRTCSession", (e) => {
       const session = e.session;
-      console.log(`SDK: New session detected (${session.direction}):`, session.remote_identity?.uri?.toString());
       if (session.direction === "incoming") {
-        console.log("SDK: Handling incoming call event");
         this.callManager?.handleIncomingCall(session);
       }
     });
@@ -23619,7 +23721,7 @@ var DoraCell = class {
   /**
    * Answer an incoming call
    */
-  answerCall() {
+  async answerCall() {
     const currentCall = this.callManager?.getCurrentCall();
     if (!currentCall) {
       throw new CallError("No incoming call to answer");
@@ -23627,7 +23729,7 @@ var DoraCell = class {
     if (currentCall.direction !== "inbound") {
       throw new CallError("Current call is not an incoming call");
     }
-    this.callManager.answerCurrentCall();
+    await this.callManager.answerCurrentCall();
   }
   /**
    * Hangup the current call
@@ -23655,7 +23757,6 @@ var DoraCell = class {
       return { balance: 0, currency: "NGN" };
     }
     try {
-      console.log("SDK: Fetching wallet balance...");
       const response = await this.apiClient.get("/wallets");
       const wallets = Array.isArray(response) ? response : response.data || [];
       if (wallets.length === 0) {
@@ -23663,11 +23764,11 @@ var DoraCell = class {
         return { balance: 0, currency: "NGN" };
       }
       const primary = wallets[0];
+      this.userId = primary.user_id || null;
       const result = {
-        balance: parseFloat(primary.balance || "0"),
+        balance: parseFloat(primary.balance || primary.amount || "0"),
         currency: primary.currency || "NGN"
       };
-      console.log("SDK: Wallet balance fetched:", result);
       return result;
     } catch (error) {
       console.error("SDK: Failed to fetch wallet:", error);
@@ -23688,14 +23789,14 @@ var DoraCell = class {
       throw new Error("SDK not authenticated. Call initialize() first.");
     }
     try {
-      const response = await this.apiClient.get("/extensions");
+      const path = this.userId ? `/user/${this.userId}/extensions` : "/extensions";
+      const response = await this.apiClient.get(path);
       const extensions = response.data || response.extensions || response;
       if (this.credentials && Array.isArray(extensions)) {
         this.credentials.extensions = extensions;
       }
       return Array.isArray(extensions) ? extensions : [];
     } catch (error) {
-      console.error("SDK: Failed to fetch extensions:", error);
       return this.credentials?.extensions || [];
     }
   }
@@ -23709,11 +23810,11 @@ var DoraCell = class {
    * Update active extension and re-initialize SIP connection
    */
   async setExtension(extension) {
-    console.log(`SDK: Switching to extension ${extension}...`);
     if (this.credentials) {
-      const domain = this.credentials.sipDomain || "cell.usedora.com";
+      const domain = this.credentials.sipDomain || "64.227.10.164";
       this.credentials.sipUri = `sip:${extension}@${domain}`;
       await this.initializeUserAgent();
+      await this.waitForRegistration();
       this.emitConnectionStatus(this.connectionStatus);
     }
   }
@@ -23747,10 +23848,14 @@ var DoraCell = class {
   }
   // Helper methods
   emitConnectionStatus(error) {
-    const extension = this.credentials?.extensions?.[0]?.extension || (this.credentials?.sipUri ? extractNumberFromSipUri(this.credentials.sipUri) : void 0);
+    let activeExt = this.credentials?.sipUri ? extractNumberFromSipUri(this.credentials.sipUri) : void 0;
+    if (!activeExt && this.credentials?.extensions && this.credentials.extensions.length > 0) {
+      const primary = this.credentials.extensions.find((e) => e.isPrimary) || this.credentials.extensions[0];
+      activeExt = primary.extension;
+    }
     const state = {
       status: this.connectionStatus,
-      extension,
+      extension: activeExt,
       error
     };
     this.events.emit("connection:status", state);
@@ -23776,6 +23881,12 @@ var DoraCell = class {
     ];
   }
   getDisplayName() {
+    const currentExt = this.credentials?.sipUri ? extractNumberFromSipUri(this.credentials.sipUri) : null;
+    if (currentExt && this.credentials?.extensions) {
+      const found = this.credentials.extensions.find((e) => e.extension === currentExt);
+      if (found?.displayName) return found.displayName;
+      if (found?.extension) return `Ext ${found.extension}`;
+    }
     if (this.credentials?.extensions?.[0]?.displayName) {
       return this.credentials.extensions[0].displayName;
     }
@@ -23798,7 +23909,7 @@ var DoraCell = class {
         case "staging":
         case "dev":
           return "https://dev.api.cell.usedora.com/api";
-        case "production":
+        default:
           return "https://api.cell.usedora.com/api";
       }
     }