@zyratalk1/zyra-twilio-wrapper 1.2.0 → 1.2.1

package/.eslint.json

@@ -0,0 +1,15 @@
+{
+  "env": {
+    "node": true,
+    "es2021": true
+  },
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "commonjs"
+  },
+  "rules": {
+    "semi": ["error", "always"],
+    "quotes": ["error", "double"]
+  }
+}

package/dist/index.d.mts

@@ -4,6 +4,7 @@ interface Config {
     waitUrl?: string;
     sdkToken: string;
     accessToken?: string;
+    enableAndroidVoiceRegister?: boolean;
     requestTimeoutMs?: number;
     retry?: {
         maxRetries?: number;
@@ -287,14 +288,6 @@ interface NativeModule {
     };
 }
 type SDKEventName = "onReady" | "onCallRinging" | "onCallConnected" | "onParticipantJoined" | "onParticipantLeft" | "onCallEnded" | "onCallStateChanged" | "onAuthStateChanged" | "onMissedCall" | "onError";
-/**
- * Options for {@link ReactNativeVoipSdk.makeCall}.
- * - `parallel`: start a second Twilio `voice.connect` leg while another call is active (independent lifecycle).
- * - Omitted / false: if a call is already active, add a conference participant via `addNewCallee` (existing behavior).
- */
-interface MakeCallOptions {
-    parallel?: boolean;
-}
 
 type EventPayload = Record<string, unknown>;
 type Listener = (payload: EventPayload) => void;
@@ -327,9 +320,6 @@ declare class ReactNativeVoipSdk {
     private readonly configService;
     private initialized;
     protected activeCallId: string | null;
-    /** Tracks every in-flight call leg (parallel or single); kept in sync with native `onCallEnded`. */
-    protected activeCallIds: Set<string>;
-    private unsubscribeOnCallEnded;
     protected internalConferenceName: string;
     constructor(config: Config, nativeModule?: NativeModule);
     on(eventName: SDKEventName | string, listener: (payload: Record<string, unknown>) => void): () => void;
@@ -345,23 +335,14 @@ declare class ReactNativeVoipSdk {
     disconnectParticipant(participantId: string): Promise<void>;
     init(): Promise<void>;
     verifySDKToken(): Promise<boolean>;
-    /**
-     * Start a call or add to a conference.
-     * Use `makeCall(to, { parallel: true })` (or `addCall(to)`) while a call is active to open a second
-     * independent leg; failures on that leg are isolated to its `callId` in `onError` / `onCallEnded`.
-     */
-    makeCall(to: string, options?: MakeCallOptions): Promise<CallResponse<CallSession>>;
-    /** Start a parallel outbound call while another call is active (alias for `makeCall(to, { parallel: true })`). */
-    addCall(to: string): Promise<CallResponse<CallSession>>;
-    /** All active call legs (parallel-aware). */
-    getActiveCallIds(): string[];
+    makeCall(to: string): Promise<CallResponse<CallSession>>;
     acceptCall(callId?: string): Promise<CallResponse<null>>;
     rejectCall(callId: string): Promise<CallResponse<null>>;
     hangup(callId?: string): Promise<CallResponse<null>>;
     hold(callId: string): Promise<CallResponse<null>>;
     resume(callId: string): Promise<CallResponse<null>>;
     merge(callId: string): Promise<CallResponse<CallSession>>;
-    toggleMute(mute: boolean, callId?: string): Promise<CallResponse<null>>;
+    toggleMute(mute: boolean): Promise<CallResponse<null>>;
     makeCallIncoming(to: string, callSid: string): Promise<CallResponse<CallSession>>;
     holdAndAddParticipant(callSid: string, number: string): Promise<CallResponse<unknown>>;
     holdAndAddParticipantIncoming(callSid: string, number: string): Promise<CallResponse<unknown>>;
@@ -380,7 +361,6 @@ declare class ReactNativeVoipSdk {
     isWebhookConfigured(): Promise<CallResponse<WebhookConfigResult>>;
     welcomeMessageConfig(welcomeType: "audio" | "tts", welcomeMessage: string): Promise<CallResponse<WelcomeConfigResult>>;
     destroy(): void;
-    private pickNextActiveCallId;
     private ensureAuthenticated;
 }
 
@@ -404,4 +384,4 @@ declare class ZyraTwilioWrapper extends ReactNativeVoipSdk {
     destroy(): void;
 }
 
-export { type AuthPayload, type CallSession, type ConsumerAuth, type MakeCallOptions, type NativeModule, type Participant, ReactNativeVoipSdk, type SDKConfig, type SDKEventName, ZyraTwilioWrapper as default };
+export { type AuthPayload, type CallSession, type ConsumerAuth, type NativeModule, type Participant, ReactNativeVoipSdk, type SDKConfig, type SDKEventName, ZyraTwilioWrapper as default };

package/dist/index.d.ts

@@ -4,6 +4,7 @@ interface Config {
     waitUrl?: string;
     sdkToken: string;
     accessToken?: string;
+    enableAndroidVoiceRegister?: boolean;
     requestTimeoutMs?: number;
     retry?: {
         maxRetries?: number;
@@ -287,14 +288,6 @@ interface NativeModule {
     };
 }
 type SDKEventName = "onReady" | "onCallRinging" | "onCallConnected" | "onParticipantJoined" | "onParticipantLeft" | "onCallEnded" | "onCallStateChanged" | "onAuthStateChanged" | "onMissedCall" | "onError";
-/**
- * Options for {@link ReactNativeVoipSdk.makeCall}.
- * - `parallel`: start a second Twilio `voice.connect` leg while another call is active (independent lifecycle).
- * - Omitted / false: if a call is already active, add a conference participant via `addNewCallee` (existing behavior).
- */
-interface MakeCallOptions {
-    parallel?: boolean;
-}
 
 type EventPayload = Record<string, unknown>;
 type Listener = (payload: EventPayload) => void;
@@ -327,9 +320,6 @@ declare class ReactNativeVoipSdk {
     private readonly configService;
     private initialized;
     protected activeCallId: string | null;
-    /** Tracks every in-flight call leg (parallel or single); kept in sync with native `onCallEnded`. */
-    protected activeCallIds: Set<string>;
-    private unsubscribeOnCallEnded;
     protected internalConferenceName: string;
     constructor(config: Config, nativeModule?: NativeModule);
     on(eventName: SDKEventName | string, listener: (payload: Record<string, unknown>) => void): () => void;
@@ -345,23 +335,14 @@ declare class ReactNativeVoipSdk {
     disconnectParticipant(participantId: string): Promise<void>;
     init(): Promise<void>;
     verifySDKToken(): Promise<boolean>;
-    /**
-     * Start a call or add to a conference.
-     * Use `makeCall(to, { parallel: true })` (or `addCall(to)`) while a call is active to open a second
-     * independent leg; failures on that leg are isolated to its `callId` in `onError` / `onCallEnded`.
-     */
-    makeCall(to: string, options?: MakeCallOptions): Promise<CallResponse<CallSession>>;
-    /** Start a parallel outbound call while another call is active (alias for `makeCall(to, { parallel: true })`). */
-    addCall(to: string): Promise<CallResponse<CallSession>>;
-    /** All active call legs (parallel-aware). */
-    getActiveCallIds(): string[];
+    makeCall(to: string): Promise<CallResponse<CallSession>>;
     acceptCall(callId?: string): Promise<CallResponse<null>>;
     rejectCall(callId: string): Promise<CallResponse<null>>;
     hangup(callId?: string): Promise<CallResponse<null>>;
     hold(callId: string): Promise<CallResponse<null>>;
     resume(callId: string): Promise<CallResponse<null>>;
     merge(callId: string): Promise<CallResponse<CallSession>>;
-    toggleMute(mute: boolean, callId?: string): Promise<CallResponse<null>>;
+    toggleMute(mute: boolean): Promise<CallResponse<null>>;
     makeCallIncoming(to: string, callSid: string): Promise<CallResponse<CallSession>>;
     holdAndAddParticipant(callSid: string, number: string): Promise<CallResponse<unknown>>;
     holdAndAddParticipantIncoming(callSid: string, number: string): Promise<CallResponse<unknown>>;
@@ -380,7 +361,6 @@ declare class ReactNativeVoipSdk {
     isWebhookConfigured(): Promise<CallResponse<WebhookConfigResult>>;
     welcomeMessageConfig(welcomeType: "audio" | "tts", welcomeMessage: string): Promise<CallResponse<WelcomeConfigResult>>;
     destroy(): void;
-    private pickNextActiveCallId;
     private ensureAuthenticated;
 }
 
@@ -404,4 +384,4 @@ declare class ZyraTwilioWrapper extends ReactNativeVoipSdk {
     destroy(): void;
 }
 
-export { type AuthPayload, type CallSession, type ConsumerAuth, type MakeCallOptions, type NativeModule, type Participant, ReactNativeVoipSdk, type SDKConfig, type SDKEventName, ZyraTwilioWrapper as default };
+export { type AuthPayload, type CallSession, type ConsumerAuth, type NativeModule, type Participant, ReactNativeVoipSdk, type SDKConfig, type SDKEventName, ZyraTwilioWrapper as default };

package/dist/index.js

@@ -209,15 +209,14 @@ var TwilioVoiceAdapter = class {
           error: "Twilio access token missing. Pass accessToken in constructor or authenticate({ accessToken })."
         };
       }
-      const conferenceName = `conf_${this.sdkConfig.consumerId}_${input.callId}`;
       console.log("[VOIP SDK] voice.connect() params", {
         To: input.number,
-        conferenceName
+        conferenceName: this.defaultConferenceName
       });
       const call = await this.voice.connect(token, {
         params: {
           To: input.number,
-          conferenceName
+          conferenceName: this.defaultConferenceName
         }
       });
       const callSid = this.readCallSid(call);
@@ -226,7 +225,7 @@ var TwilioVoiceAdapter = class {
         callSid,
         call,
         direction: "OUTBOUND",
-        conferenceName,
+        conferenceName: this.defaultConferenceName,
         conferenceDetail: null
       };
       this.calls.set(input.callId, tracked);
@@ -268,10 +267,26 @@ var TwilioVoiceAdapter = class {
       };
     }
   }
+  async waitForInvite(callId, timeoutMs = 8e3) {
+    const existing = this.callInvites.get(callId);
+    if (existing) return existing;
+    console.log("[VOIP DEBUG] waitForInvite polling\u2026", { callId, timeoutMs });
+    const start = Date.now();
+    while (Date.now() - start < timeoutMs) {
+      await new Promise((r) => setTimeout(r, 300));
+      const inv = this.callInvites.get(callId);
+      if (inv) {
+        console.log("[VOIP DEBUG] waitForInvite found invite", { callId, elapsed: Date.now() - start });
+        return inv;
+      }
+    }
+    console.warn("[VOIP DEBUG] waitForInvite timed out", { callId });
+    return null;
+  }
   async answerCall(input) {
     console.log("[VOIP DEBUG] call accepted flow start", { callId: input.callId });
     try {
-      const invite = this.callInvites.get(input.callId);
+      const invite = await this.waitForInvite(input.callId);
       if (!invite) {
         return { success: false, error: "Incoming call invite not found" };
       }
@@ -1177,6 +1192,54 @@ async function setRoutingConfig(deps, input) {
   }
 }
 
+// src/twilioConfig.ts
+async function setTwilioVoiceConfig(deps) {
+  try {
+    const res = await deps.axiosInstance.post(
+      `${deps.serverUrl}/voipSdk.setTwilioVoiceConfig`,
+      {},
+      {
+        headers: {
+          Authorization: `Bearer ${deps.sdkToken}`
+        }
+      }
+    );
+    const result = res?.data?.result ?? res?.data;
+    return createSuccessResult(
+      result?.message || "Twilio voice config updated",
+      result
+    );
+  } catch (error) {
+    return createErrorResult(
+      error instanceof Error ? error : "Failed to set Twilio voice config"
+    );
+  }
+}
+async function getVoipProviderConfigStatus(deps) {
+  try {
+    const res = await deps.axiosInstance.post(
+      `${deps.serverUrl}/voipSdk.getVoipProviderConfigStatus`,
+      {},
+      {
+        headers: {
+          Authorization: `Bearer ${deps.sdkToken}`
+        }
+      }
+    );
+    const data = res?.data?.result ?? res?.data;
+    const raw = data?.data?.isConfiguredVoipProvider;
+    const isConfiguredVoipProvider = raw === true || raw === 1 || raw === "1";
+    return createSuccessResult(
+      "VoIP provider config status fetched",
+      { isConfiguredVoipProvider }
+    );
+  } catch (error) {
+    return createErrorResult(
+      error instanceof Error ? error : "Failed to fetch VoIP provider config status"
+    );
+  }
+}
+
 // src/webhook.ts
 function validateWebhookUrl(webhookUrl) {
   const trimmed = (webhookUrl ?? "").trim();
@@ -1348,6 +1411,12 @@ var ConfigService = class {
   async welcomeMessageConfig(welcomeType, welcomeMessage) {
     return welcomeMessageConfig(this.withDeps(), { welcomeType, welcomeMessage });
   }
+  async getVoipProviderConfigStatus() {
+    return getVoipProviderConfigStatus(this.withDeps());
+  }
+  async setTwilioVoiceConfig() {
+    return setTwilioVoiceConfig(this.withDeps());
+  }
   withDeps() {
     return {
       axiosInstance: this.axiosInstance,
@@ -1505,9 +1574,6 @@ var ReactNativeVoipSdk = class {
   constructor(config, nativeModule) {
     this.initialized = false;
     this.activeCallId = null;
-    /** Tracks every in-flight call leg (parallel or single); kept in sync with native `onCallEnded`. */
-    this.activeCallIds = /* @__PURE__ */ new Set();
-    this.unsubscribeOnCallEnded = null;
     logVoipDebug("constructor() invoked", {
       hasServerUrl: Boolean(config.serverUrl),
       hasIdentity: Boolean(config.identity),
@@ -1521,7 +1587,8 @@ var ReactNativeVoipSdk = class {
       identity: config.identity,
       sdkToken: config.sdkToken,
       accessToken: config.accessToken,
-      waitUrl: config.waitUrl
+      waitUrl: config.waitUrl,
+      enableAndroidVoiceRegister: config.enableAndroidVoiceRegister
     };
     this.bridge = new BridgeClient(nativeModule);
     this.retry = new RetryPolicy(config.retry);
@@ -1551,14 +1618,6 @@ var ReactNativeVoipSdk = class {
       sdkToken: this.sdkConfig.sdkToken,
       ensureAuthenticated: this.ensureAuthenticated.bind(this)
     });
-    this.unsubscribeOnCallEnded = this.bridge.on("onCallEnded", (payload) => {
-      const callId = typeof payload.callId === "string" ? payload.callId : null;
-      if (!callId) return;
-      this.activeCallIds.delete(callId);
-      if (this.activeCallId === callId) {
-        this.activeCallId = this.pickNextActiveCallId();
-      }
-    });
   }
   on(eventName, listener) {
     return this.bridge.on(eventName, listener);
@@ -1566,16 +1625,37 @@ var ReactNativeVoipSdk = class {
   async initializeSDK(config) {
     logVoipDebug("initializeSDK() called");
     if (this.initialized) return;
-    const mergedConfig = { ...this.sdkConfig, ...config };
-    const result = await this.bridge.nativeModule.initializeSDK(mergedConfig);
-    if (!result.success) {
-      logVoipDebug("initializeSDK() failed", {
-        error: result.error ?? "Failed to initialize native VOIP SDK"
+    try {
+      const configStatus = await this.configService.getVoipProviderConfigStatus();
+      if (!configStatus.success) {
+        throw new Error("Failed to fetch VoIP provider config status");
+      }
+      const isConfigured = configStatus.data?.isConfiguredVoipProvider;
+      logVoipDebug("VoIP config status checked", { isConfigured });
+      if (!isConfigured) {
+        logVoipDebug("VoIP not configured. Setting Twilio config");
+        const setupRes = await this.configService.setTwilioVoiceConfig();
+        if (!setupRes.success) {
+          throw new Error("Failed to set Twilio Voice Config");
+        }
+        logVoipDebug("VoIP configuration completed");
+      }
+      const mergedConfig = { ...this.sdkConfig, ...config };
+      const result = await this.bridge.nativeModule.initializeSDK(mergedConfig);
+      if (!result.success) {
+        logVoipDebug("initializeSDK() failed", {
+          error: result.error ?? "Failed to initialize native VOIP SDK"
+        });
+        throw new Error(result.error ?? "Failed to initialize native VOIP SDK");
+      }
+      this.initialized = true;
+      logVoipDebug("initializeSDK() success");
+    } catch (error) {
+      logVoipDebug("initializeSDK() config check failure", {
+        message: error instanceof Error ? error.message : String(error)
       });
-      throw new Error(result.error ?? "Failed to initialize native VOIP SDK");
+      throw error;
     }
-    this.initialized = true;
-    logVoipDebug("initializeSDK() success");
   }
   async authenticate(payload) {
     logVoipDebug("authenticate() start", {
@@ -1593,7 +1673,6 @@ var ReactNativeVoipSdk = class {
     logVoipDebug("startCall() invoked", { number });
     this.ensureAuthenticated();
     const session = await this.callEngine.startCall(number);
-    this.activeCallIds.add(session.callId);
     this.activeCallId = session.callId;
     logVoipDebug("startCall() success", { callId: session.callId });
     return session;
@@ -1606,9 +1685,8 @@ var ReactNativeVoipSdk = class {
     logVoipDebug("endCall() invoked", { callId });
     this.ensureAuthenticated();
     await this.callEngine.endCall(callId);
-    this.activeCallIds.delete(callId);
     if (this.activeCallId === callId) {
-      this.activeCallId = this.pickNextActiveCallId();
+      this.activeCallId = null;
     }
     logVoipDebug("endCall() success", { callId });
   }
@@ -1644,17 +1722,8 @@ var ReactNativeVoipSdk = class {
       return false;
     }
   }
-  /**
-   * Start a call or add to a conference.
-   * Use `makeCall(to, { parallel: true })` (or `addCall(to)`) while a call is active to open a second
-   * independent leg; failures on that leg are isolated to its `callId` in `onError` / `onCallEnded`.
-   */
-  async makeCall(to, options) {
-    logVoipDebug("makeCall() start", {
-      to,
-      hasActiveCall: Boolean(this.activeCallId),
-      parallel: Boolean(options?.parallel)
-    });
+  async makeCall(to) {
+    logVoipDebug("makeCall() start", { to, hasActiveCall: Boolean(this.activeCallId) });
     try {
       const destination = to.trim();
       if (!destination) {
@@ -1665,11 +1734,6 @@ var ReactNativeVoipSdk = class {
         logVoipDebug("makeCall() new call started", { callId: data.callId });
         return createSuccessResult("Call started", data);
       }
-      if (options?.parallel) {
-        const data = await this.startCall(destination);
-        logVoipDebug("makeCall() parallel call started", { callId: data.callId });
-        return createSuccessResult("Parallel call started", data);
-      }
       if (!this.bridge.nativeModule.addNewCallee) {
         return createErrorResult("addNewCallee not supported by native module");
       }
@@ -1701,14 +1765,6 @@ var ReactNativeVoipSdk = class {
       return createErrorResult(error instanceof Error ? error : "Failed to start call");
     }
   }
-  /** Start a parallel outbound call while another call is active (alias for `makeCall(to, { parallel: true })`). */
-  async addCall(to) {
-    return this.makeCall(to, { parallel: true });
-  }
-  /** All active call legs (parallel-aware). */
-  getActiveCallIds() {
-    return [...this.activeCallIds];
-  }
   async acceptCall(callId) {
     try {
       const id = callId ?? this.activeCallId;
@@ -1767,10 +1823,10 @@ var ReactNativeVoipSdk = class {
       return createErrorResult(error instanceof Error ? error : "Failed to merge call");
     }
   }
-  async toggleMute(mute, callId) {
-    const id = callId ?? this.activeCallId;
-    logVoipDebug("toggleMute() invoked", { mute, callId: id, hasActiveCall: Boolean(this.activeCallId) });
+  async toggleMute(mute) {
+    logVoipDebug("toggleMute() invoked", { mute, hasActiveCall: Boolean(this.activeCallId) });
     try {
+      const id = this.activeCallId;
       if (!id) return createErrorResult("No active call");
       await this.callEngine.toggleMute(id, mute);
       return createSuccessResult(`Mute ${mute}`, null);
@@ -1969,19 +2025,12 @@ var ReactNativeVoipSdk = class {
   }
   destroy() {
     logVoipDebug("destroy() invoked");
-    this.unsubscribeOnCallEnded?.();
-    this.unsubscribeOnCallEnded = null;
     this.authManager.destroy();
     this.bridge.destroy();
     this.initialized = false;
     this.activeCallId = null;
-    this.activeCallIds.clear();
     logVoipDebug("destroy() completed");
   }
-  pickNextActiveCallId() {
-    if (this.activeCallIds.size === 0) return null;
-    return this.activeCallIds.values().next().value ?? null;
-  }
   ensureAuthenticated() {
     if (this.authManager.getState() !== "AUTHENTICATED") {
       throw new Error("SDK not authenticated.");
@@ -2011,10 +2060,8 @@ var ZyraTwilioWrapper = class extends ReactNativeVoipSdk {
       this.onConnect?.(payload);
     });
     this.on("onCallEnded", () => {
-      if (this.getActiveCallIds().length === 0) {
-        this.activeCallSid = null;
-        this.onDisconnect?.();
-      }
+      this.activeCallSid = null;
+      this.onDisconnect?.();
     });
     this.on("onMissedCall", () => {
       this.activeCallSid = null;