@voipsdk/react-native-voipcloud 1.0.0 → 1.0.2

package/android/src/main/java/com/voipcloud/sdk/rn/internal/ManagedCall.java

@@ -22,23 +22,31 @@ import com.voipcloud.sdk.pjsua_call_media_status;
 /** Call subclass forwarding state callbacks to JS. */
 public final class ManagedCall extends Call {
     private final ReactContext ctx;
+    private final ManagedCallRegistry registry;
     /** Local snapshot of the PJSUA call id — Call.getId() can throw post-disconnect. */
     private final int cachedId;
     /** Mute is tracked at the bridge level — PJSIP does not own this state. */
     private volatile boolean isMuted = false;
+    private Endpoint endpoint;
 
-    public ManagedCall(ReactContext ctx, Account acc) {
+    public ManagedCall(ReactContext ctx, Account acc, ManagedCallRegistry registry) {
         super(acc);
         this.ctx = ctx;
+        this.registry = registry;
         this.cachedId = -1;
     }
 
-    public ManagedCall(ReactContext ctx, Account acc, int callId) {
+    public ManagedCall(ReactContext ctx, Account acc, int callId, ManagedCallRegistry registry) {
         super(acc, callId);
         this.ctx = ctx;
+        this.registry = registry;
         this.cachedId = callId;
     }
 
+    public void bindEndpoint(Endpoint ep) {
+        this.endpoint = ep;
+    }
+
     public int callId() {
         try { return getId(); } catch (Exception e) { return cachedId; }
     }
@@ -54,6 +62,7 @@ public final class ManagedCall extends Call {
      * tracked so unhold-then-emit reflects the user's intent.
      */
     public void setMuted(Endpoint endpoint, boolean muted) throws Exception {
+        this.endpoint = endpoint;
         AudDevManager adm = endpoint.audDevManager();
         AudioMedia mic = adm.getCaptureDevMedia();
         CallInfo info = getInfo();
@@ -74,6 +83,43 @@ public final class ManagedCall extends Call {
         emitMediaState();
     }
 
+    /**
+     * Re-wire capture ↔ call ↔ playback (e.g. after hold/unhold or speaker change).
+     */
+    public void reconnectAudioMedia() {
+        connectAudioMedia();
+        emitMediaState();
+    }
+
+    /**
+     * Wire capture ↔ call ↔ playback whenever media becomes active.
+     * Required for two-way audio — PJSIP does not auto-bridge on Android.
+     */
+    private void connectAudioMedia() {
+        if (endpoint == null) return;
+        try {
+            AudDevManager adm = endpoint.audDevManager();
+            AudioMedia mic = adm.getCaptureDevMedia();
+            AudioMedia speaker = adm.getPlaybackDevMedia();
+            CallInfo info = getInfo();
+            for (int i = 0; i < info.getMedia().size(); i++) {
+                CallMediaInfo mi = info.getMedia().get(i);
+                if (mi.getType() != pjmedia_type.PJMEDIA_TYPE_AUDIO) continue;
+                AudioMedia leg = getAudioMedia(i);
+                int status = mi.getStatus();
+                if (status == pjsua_call_media_status.PJSUA_CALL_MEDIA_ACTIVE) {
+                    if (!isMuted) {
+                        mic.startTransmit(leg);
+                    }
+                    leg.startTransmit(speaker);
+                } else {
+                    try { mic.stopTransmit(leg); } catch (Exception ignored) {}
+                    try { leg.stopTransmit(speaker); } catch (Exception ignored) {}
+                }
+            }
+        } catch (Exception ignored) {}
+    }
+
     @Override
     public void onCallState(OnCallStateParam prm) {
         CallInfo info;
@@ -86,6 +132,7 @@ public final class ManagedCall extends Call {
             p.putInt("code", 0);
             p.putString("reason", "");
             Events.emit(ctx, Events.CALL_STATE, p);
+            if (cachedId >= 0) registry.remove(cachedId);
             return;
         }
         WritableMap p = Arguments.createMap();
@@ -93,11 +140,20 @@ public final class ManagedCall extends Call {
         p.putString("state", invStateName(info.getState()));
         p.putInt("code", info.getLastStatusCode());
         p.putString("reason", info.getLastReason());
+        // SIP Call-ID header — lets JS attach the dialog id to outgoing
+        // calls too (makeCall only returns the recycled PJSUA slot).
+        try { p.putString("sipCallId", info.getCallIdString()); } catch (Exception ignored) {}
         Events.emit(ctx, Events.CALL_STATE, p);
+        int state = info.getState();
+        if (state == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED
+                || state == pjsip_inv_state.PJSIP_INV_STATE_NULL) {
+            registry.remove(callId());
+        }
     }
 
     @Override
     public void onCallMediaState(OnCallMediaStateParam prm) {
+        connectAudioMedia();
         emitMediaState();
     }
 

package/android/src/main/java/com/voipcloud/sdk/rn/internal/ManagedCallRegistry.java

@@ -23,4 +23,8 @@ public final class ManagedCallRegistry {
     }
 
     public void clear() { calls.clear(); }
+
+    public java.util.Collection<ManagedCall> snapshot() {
+        return calls.values();
+    }
 }

package/ios/VoipCloud.mm

@@ -1,40 +1,226 @@
-// @voipsdk/react-native-voipcloud — iOS placeholder.
+// @voipsdk/react-native-voipcloud — iOS React Native bridge.
 //
-// The Android build of the SDK is complete (libvoipcloud.so + JNI
-// bridge). iOS bindings need an xcframework build of PJSIP, which
-// requires Xcode on macOS. Until then, every JS call from iOS rejects
-// with NOT_IMPLEMENTED so consumer apps notice early.
+// Thin RCTEventEmitter over VoipCloudEngine (PJSUA2 wrapper). Full feature
+// parity with the Android SDK: 14 Promise methods + 11 events, same names,
+// payloads and VC_* error codes.
 //
-// Native module name must match VoipCloudModule.getName() on Android
-// and NATIVE_MODULE_NAME in src/nativeModule.ts.
+// Native module name must match VoipCloudModule.getName() on Android and
+// NATIVE_MODULE_NAME in src/nativeModule.ts.
 
 #import <React/RCTBridgeModule.h>
+#import <React/RCTEventEmitter.h>
+#import "VoipCloudEngine.h"
 
-@interface VoipsdkReactNativeVoipcloud : NSObject <RCTBridgeModule>
+@interface VoipsdkReactNativeVoipcloud : RCTEventEmitter <RCTBridgeModule, VoipCloudEngineDelegate>
 @end
 
-@implementation VoipsdkReactNativeVoipcloud
+@implementation VoipsdkReactNativeVoipcloud {
+    BOOL _hasListeners;
+}
 
 RCT_EXPORT_MODULE();
 
-#define VC_STUB(name, ...) \
-  RCT_EXPORT_METHOD(name:(__VA_ARGS__) \
-                    resolver:(RCTPromiseResolveBlock)resolve \
-                    rejecter:(RCTPromiseRejectBlock)reject) \
-  { reject(@"VC_NOT_IMPLEMENTED", @"@voipsdk/react-native-voipcloud iOS bindings not yet shipped.", nil); }
-
-VC_STUB(init_, NSDictionary *config)        // renamed because of init clash
-VC_STUB(shutdown)
-VC_STUB(register, NSDictionary *cfg)
-VC_STUB(unregister, NSInteger accountId)
-VC_STUB(makeCall, NSInteger accountId uri:(NSString *)uri)
-VC_STUB(answer, NSInteger callId)
-VC_STUB(hangup, NSInteger callId)
-VC_STUB(hold, NSInteger callId)
-VC_STUB(unhold, NSInteger callId)
-VC_STUB(mute, NSInteger callId on:(BOOL)on)
-VC_STUB(sendDtmf, NSInteger callId digits:(NSString *)digits)
-VC_STUB(transferCall, NSInteger callId destinationUri:(NSString *)destinationUri)
-VC_STUB(hangupAllCalls)
+- (instancetype)init {
+    if ((self = [super init])) {
+        VoipCloudEngine.shared.delegate = self;
+    }
+    return self;
+}
+
+// PJSUA2 must be entered from the same thread that ran libInit/libStart. Pin
+// every exported method to the main queue so the endpoint is created and driven
+// on one consistent thread (mirrors how the native demo app calls the engine).
+- (dispatch_queue_t)methodQueue { return dispatch_get_main_queue(); }
++ (BOOL)requiresMainQueueSetup { return YES; }
+
+#pragma mark - RCTEventEmitter
+
+- (NSArray<NSString *> *)supportedEvents {
+    return @[
+        @"registrationState", @"incomingCall", @"callState", @"callMediaState",
+        @"callHold", @"callUnhold", @"callMute", @"callDtmfSent", @"callTransfer",
+        @"callTransferStatus", @"incomingDtmf",
+    ];
+}
+
+- (void)startObserving { _hasListeners = YES; }
+- (void)stopObserving  { _hasListeners = NO; }
+
+- (void)emit:(NSString *)name body:(NSDictionary *)body {
+    if (_hasListeners) [self sendEventWithName:name body:body];
+}
+
+// VoipCloudEngineDelegate — engine already hops to the main thread.
+- (void)voipEngineEmitEvent:(NSString *)name body:(NSDictionary *)body {
+    [self emit:name body:body];
+}
+
+#pragma mark - Lifecycle
+
+RCT_REMAP_METHOD(init,
+                 doInit:(NSDictionary *)config
+                 resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared startWithConfig:config error:&err]) resolve(nil);
+    else reject(@"VC_INIT", err.localizedDescription ?: @"Failed to start VoipCloud endpoint", err);
+}
+
+RCT_EXPORT_METHOD(shutdown:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    [VoipCloudEngine.shared stop];
+    resolve(nil);
+}
+
+#pragma mark - Accounts
+
+// `register` is a C++ keyword — remap so the exported selector avoids it while
+// the JS method name stays `register`.
+RCT_REMAP_METHOD(register,
+                 registerAccount:(NSDictionary *)cfg
+                 resolver:(RCTPromiseResolveBlock)resolve
+                 rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    int accountId = [VoipCloudEngine.shared registerAccountWithConfig:cfg error:&err];
+    if (accountId < 0) reject(@"VC_REGISTER", err.localizedDescription ?: @"Failed to register SIP account", err);
+    else resolve(@(accountId));
+}
+
+RCT_EXPORT_METHOD(unregister:(NSInteger)accountId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared unregisterAccount:(int)accountId error:&err]) resolve(nil);
+    else reject(@"VC_UNREGISTER", err.localizedDescription ?: @"Failed to unregister account", err);
+}
+
+#pragma mark - Calls
+
+RCT_EXPORT_METHOD(makeCall:(NSInteger)accountId
+                  uri:(NSString *)uri
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    if (uri.length == 0 || [uri stringByTrimmingCharactersInSet:
+            NSCharacterSet.whitespaceAndNewlineCharacterSet].length == 0) {
+        reject(@"VC_INVALID_ARGUMENT", @"destinationUri must not be empty", nil);
+        return;
+    }
+    NSString *trimmed = [uri stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
+    NSError *err = nil;
+    int callId = [VoipCloudEngine.shared makeCallFromAccount:(int)accountId toUri:trimmed error:&err];
+    if (callId < 0) reject(@"VC_MAKE_CALL", err.localizedDescription ?: @"Failed to place call", err);
+    else resolve(@(callId));
+}
+
+RCT_EXPORT_METHOD(answer:(NSInteger)callId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared answerCall:(int)callId error:&err]) resolve(nil);
+    else reject(@"VC_ANSWER", err.localizedDescription ?: @"Failed to answer call", err);
+}
+
+RCT_EXPORT_METHOD(hangup:(NSInteger)callId
+                  mode:(NSString *)mode
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared hangupCall:(int)callId mode:mode error:&err]) resolve(nil);
+    else reject(@"VC_HANGUP", err.localizedDescription ?: @"Failed to hang up call", err);
+}
+
+RCT_EXPORT_METHOD(hangupAllCalls:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared hangupAllCallsWithError:&err]) resolve(nil);
+    else reject(@"VC_HANGUP_ALL", err.localizedDescription ?: @"Failed to hang up all calls", err);
+}
+
+#pragma mark - Call features
+
+RCT_EXPORT_METHOD(hold:(NSInteger)callId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared holdCall:(int)callId error:&err]) {
+        [self emit:@"callHold" body:@{ @"callId": @(callId) }];
+        resolve(nil);
+    } else reject(@"VC_HOLD", err.localizedDescription ?: @"Failed to hold call", err);
+}
+
+RCT_EXPORT_METHOD(unhold:(NSInteger)callId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared unholdCall:(int)callId error:&err]) {
+        [self emit:@"callUnhold" body:@{ @"callId": @(callId) }];
+        resolve(nil);
+    } else reject(@"VC_UNHOLD", err.localizedDescription ?: @"Failed to resume call", err);
+}
+
+RCT_EXPORT_METHOD(mute:(NSInteger)callId
+                  on:(BOOL)on
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared muteCall:(int)callId on:on error:&err]) {
+        [self emit:@"callMute" body:@{ @"callId": @(callId), @"isMuted": @(on) }];
+        resolve(nil);
+    } else reject(@"VC_MUTE", err.localizedDescription ?: @"Failed to change mute state", err);
+}
+
+RCT_EXPORT_METHOD(sendDtmf:(NSInteger)callId
+                  digits:(NSString *)digits
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    if (digits.length == 0) {
+        reject(@"VC_INVALID_ARGUMENT", @"digits must not be empty", nil);
+        return;
+    }
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared sendDtmf:(int)callId digits:digits error:&err]) {
+        [self emit:@"callDtmfSent" body:@{ @"callId": @(callId), @"digits": digits }];
+        resolve(nil);
+    } else reject(@"VC_DTMF", err.localizedDescription ?: @"Failed to send DTMF", err);
+}
+
+RCT_EXPORT_METHOD(transferCall:(NSInteger)callId
+                  destinationUri:(NSString *)destinationUri
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSString *trimmed = [destinationUri stringByTrimmingCharactersInSet:
+                         NSCharacterSet.whitespaceAndNewlineCharacterSet];
+    if (trimmed.length == 0) {
+        reject(@"VC_INVALID_ARGUMENT", @"destinationUri must not be empty", nil);
+        return;
+    }
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared transferCall:(int)callId toUri:trimmed error:&err]) {
+        [self emit:@"callTransfer" body:@{ @"callId": @(callId), @"destinationUri": trimmed }];
+        resolve(nil);
+    } else reject(@"VC_TRANSFER", err.localizedDescription ?: @"Failed to transfer call", err);
+}
+
+RCT_EXPORT_METHOD(reconnectCallAudio:(NSInteger)callId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError *err = nil;
+    if ([VoipCloudEngine.shared reconnectCallAudio:(int)callId error:&err]) resolve(nil);
+    else reject(@"VC_AUDIO", err.localizedDescription ?: @"Failed to reconnect call audio", err);
+}
 
 @end

package/ios/VoipCloud.xcframework/Info.plist

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libVoipCloud.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libVoipCloud.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>libVoipCloud.a</string>
+			<key>HeadersPath</key>
+			<string>Headers</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libVoipCloud.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>