@byteplus/react-native-live-push 1.4.0-rc.0 → 1.5.1-rc.0

package/android/build.gradle

@@ -52,6 +52,7 @@ apply plugin: "com.android.library"
 apply from: "https://ve-vos.volccdn.com/script/vevos-repo-base.gradle"
 
 if (isNewArchitectureEnabled()) {
+  println "[LIVE PUSH GRADLE INFO]: newArchitectureEnabled"
   apply plugin: "com.facebook.react"
 }
 
@@ -90,6 +91,17 @@ android {
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
     consumerProguardFiles 'proguard-rules.pro' 
+    buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+  }
+
+  sourceSets {
+      main {
+          if (isNewArchitectureEnabled()) {
+              java.srcDirs += ['src/newarch']
+          } else {
+              java.srcDirs += ['src/oldarch']
+          }
+      }
   }
 
   buildTypes {
@@ -121,7 +133,7 @@ dependencies {
   // For < 0.71, this will be from the local maven repo
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"
-    implementation "com.volcengine:VolcApiEngine:$volc_api_engine_version"
-    api "com.bytedanceapi:ttsdk-ttlivepush_rtc:$ttsdk_ttlivepush_rtc_version"
+  implementation "com.facebook.react:react-native:+"
+  implementation "com.volcengine:VolcApiEngine:$volc_api_engine_version"
+  api "com.bytedanceapi:ttsdk-ttlivepush:$ttsdk_ttlivepush_rtc_version"
 }

package/android/src/main/java/com/volcengine/velive/rn/push/EnvHelper.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 
 public class EnvHelper{
     public static void init(@NonNull Config config, HashMap<String, Object> logHeaders) {
-        Env.init(config);
+        Env.start(config);
         LoggerHelper.setHeaderInfo(logHeaders); 
     }
 }

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushImpl.java

@@ -0,0 +1,73 @@
+package com.volcengine.velive.rn.push;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.volcengine.VolcApiEngine.IEventReceiver;
+import com.volcengine.VolcApiEngine.VolcApiEngine;
+
+public class VeLivePushImpl {
+  private VolcApiEngine apiEngine = null;
+  private ReactApplicationContext moduleContext;
+  private IEventReceiver module;
+  
+  public static final String  NAME = "VeLivePush";
+  public static final String EVENT_NAME = "VeLivePush:onEvent";
+
+  VeLivePushImpl(ReactApplicationContext context, IEventReceiver module) {
+    VeLiveEffectHelper.context = context;
+    this.moduleContext = context;
+    this.module = module;
+  }
+
+
+  public boolean newApiEngine() {
+    if (apiEngine == null) {
+      apiEngine = new VolcApiEngine(moduleContext, this.module);
+      NativeVariableManager.init(apiEngine, moduleContext);
+      return true;
+    }
+    return false;
+  }
+  
+  public boolean destoryApiEngine() {
+    if (apiEngine != null) {
+      apiEngine.msgClient.proto.dispose();
+      apiEngine = null;
+    }
+    return true;
+  }
+
+  public String callApiSync(String params)  {
+    try {
+      newApiEngine();
+      return this.apiEngine.callApi(params);
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw new RuntimeException(e);
+    }
+  }
+
+  public void callApi(String params, Callback callback) {
+    try {
+      newApiEngine();
+      // 获取主线程处理器
+      android.os.Handler mainHandler =
+        new android.os.Handler(android.os.Looper.getMainLooper());
+
+      // 在主线程上执行 API 调用
+      mainHandler.post(() -> {
+        try {
+          this.apiEngine.callApi(
+            params, (res) -> {
+              System.out.println("call result: " + res);
+              callback.invoke(res.toJsonString());
+            });
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+      });
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushPackage.java

@@ -1,30 +1,55 @@
 package com.volcengine.velive.rn.push;
 
-import com.facebook.react.ReactPackage;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.uimanager.ViewManager;
 import com.volcengine.velive.rn.push.mixer.MixerViewManager;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
-public class VeLivePushPackage implements ReactPackage {
+//TODO: 后期磨平为一层
+public class VeLivePushPackage extends TurboReactPackage {
+  private boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
   @Override
-  public List<ViewManager>
-  createViewManagers(ReactApplicationContext reactContext) {
+  public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
     List<ViewManager> viewManagers = new ArrayList<>();
     viewManagers.add(new VeLivePushViewManager());
     viewManagers.add(new MixerViewManager());
     return viewManagers;
   }
-
+  
+  @Nullable
   @Override
-  public List<NativeModule>
-  createNativeModules(ReactApplicationContext reactContext) {
-    List<NativeModule> modules = new ArrayList<>();
-
-    modules.add(new VeLivePushModule(reactContext));
+  public NativeModule getModule(@NonNull String name, @NonNull ReactApplicationContext reactApplicationContext) {
+    if (name.equals(VeLivePushImpl.NAME)) {
+      return new VeLivePushModule(reactApplicationContext);
+    } else {
+      return null;
+    }
+  }
 
-    return modules;
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+      moduleInfos.put(
+        VeLivePushImpl.NAME,
+        new ReactModuleInfo(
+          VeLivePushImpl.NAME,
+          VeLivePushImpl.NAME,
+          false,
+          false,true,false,isTurboModule
+        )
+      );
+      return moduleInfos;
+    };
   }
 }

package/android/src/main/java/com/volcengine/velive/rn/push/VeLivePushView.java

@@ -57,6 +57,7 @@ public class VeLivePushView extends FrameLayout {
       });
       this.addView(surfaceView);
       break;
+      
     case "TextureView":
       TextureView textureView =
           new TextureView(themedReactContext.getReactApplicationContext());

package/android/src/main/java/com/volcengine/velive/rn/push/mixer/TextureMgr.java

@@ -52,7 +52,7 @@ public class TextureMgr {
                     Bitmap bmp = null;
                     Bitmap rotatedBmp = null;
                     try {
-                        android.content.Context context = Env.getApplicationContext();
+                        android.content.Context context = Env.getConfig().getApplicationContext();
                         if (context == null) {
                             // If context is null, skip processing and return
                             return;

package/android/src/newarch/com/volcengine/velive/rn/push/VeLivePushModule.java

@@ -0,0 +1,92 @@
+package com.volcengine.velive.rn.push;
+
+import static com.volcengine.VolcApiEngine.runtime.Util.JsonAbleClass;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.ss.avframework.live.statistics.VeLivePusherStatisticsExt;
+import com.volcengine.VolcApiEngine.IEventReceiver;
+
+public class VeLivePushModule extends NativeVeLivePushSpec implements IEventReceiver {
+  private VeLivePushImpl impl;
+  VeLivePushModule(ReactApplicationContext context) {
+    super(context);
+    this.impl = new VeLivePushImpl(context, this);
+  }
+
+  static  {
+    JsonAbleClass.add(VeLivePusherStatisticsExt.class);
+  }
+
+  @Override
+  public boolean destroyApiEngine() {
+    return this.impl.destoryApiEngine();
+  }
+
+  @Override
+  public boolean newApiEngine() {
+    return this.impl.newApiEngine();
+  }
+
+  @Override
+  public String callSync(String params) {
+    return this.impl.callApiSync(params);
+  }
+
+  @Override
+  public void call(String params, Callback callback) {
+    Callback myCallback = args -> {
+      callback.invoke(args);
+    };
+    impl.callApi(params, myCallback);
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return VeLivePushImpl.NAME;
+  }
+
+  private int listenerCount = 0;
+
+  @Override
+  public void addListener(String eventType) {
+    if (listenerCount == 0) {
+        // Set up any upstream listeners or background tasks as necessary
+      }
+  
+      listenerCount += 1;
+  }
+
+  @Override
+  public void removeListeners(double count) {
+    listenerCount -= count;
+    if (listenerCount == 0) {
+      // Remove upstream listeners, stop unnecessary background tasks
+    }
+  }
+
+  @Override
+  public void OnEvent(String event, String data) {
+    final WritableMap map = Arguments.createMap();
+    map.putString("event", event);
+    map.putString("data", data);
+
+    super.getReactApplicationContext()
+            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+            .emit(VeLivePushImpl.EVENT_NAME, map);
+  }
+
+  private void sendEvent(ReactContext reactContext, String eventName,
+                           @Nullable WritableMap params) {
+      reactContext
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit(eventName, params);
+    }
+}

package/android/src/{main/java → oldarch}/com/volcengine/velive/rn/push/VeLivePushModule.java

@@ -25,6 +25,7 @@ import com.volcengine.VolcApiEngine.*;
 import com.volcengine.VolcApiEngine.view.*;
 import com.volcengine.velive.rn.push.VeLiveEffectHelper;
 
+
 import java.util.WeakHashMap;
 
 public class VeLivePushModule extends VeLivePushModuleSpec implements IEventReceiver {
@@ -32,77 +33,40 @@ public class VeLivePushModule extends VeLivePushModuleSpec implements IEventRece
     JsonAbleClass.add(VeLivePusherStatisticsExt.class);
   }
   
-  VolcApiEngine apiEngine = null;
-  private WeakHashMap<String, VeLivePusher> mPusherMap = new WeakHashMap<>();
+  private VeLivePushImpl impl;
   
-
   VeLivePushModule(ReactApplicationContext context) {
     super(context);
-    VeLiveEffectHelper.context = context;
+    this.impl = new VeLivePushImpl(context, this);
   }
   
   @Override
   public String getName() {
-    return "VeLivePushModule";
+    return VeLivePushImpl.NAME;
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   public boolean newApiEngine() {
-    if (apiEngine == null) {
-      apiEngine = new VolcApiEngine(getReactApplicationContext(), this);
-
-      NativeVariableManager.init(apiEngine, super.context);
-      ClassHelper.init();
-      return true;
-    }
-
-    return false;
+    return this.impl.newApiEngine();
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   public boolean destroyApiEngine() {
-    if (apiEngine != null) {
-       apiEngine.msgClient.proto.dispose(); 
-       apiEngine = null;
-    }
-    return true;
+    return this.impl.destoryApiEngine();
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   public String callApiSync(ReadableMap arg)  {
-    try {
-      newApiEngine();
-      String params = arg.getString("params");
-      return this.apiEngine.callApi(params);
-    } catch (Exception e) {
-      e.printStackTrace();
-      throw new RuntimeException(e);
-    }
+    String params = arg.getString("params");
+    return this.impl.callApiSync(params);
   }
 
   @ReactMethod(isBlockingSynchronousMethod = false)
   public void callApi(ReadableMap arg, Callback callback)  {
-    try {
-      newApiEngine();
-      String params = arg.getString("params");
-
-      // 获取主线程处理器
-      android.os.Handler mainHandler =
-          new android.os.Handler(android.os.Looper.getMainLooper());
-
-      // 在主线程上执行 API 调用
-      mainHandler.post(() -> {
-        try {
-          this.apiEngine.callApi(
-              params, (res) -> { callback.invoke(res.toJsonString()); });
-        } catch (Exception e) {
-          e.printStackTrace();
-        }
-      });
-    } catch (Exception e) {
-      e.printStackTrace();
-      throw new RuntimeException(e);
-    }
+    String params = arg.getString("params");
+    this.impl.callApi(params, args -> {
+      callback.invoke(args);
+    });
   }
 
   private int listenerCount = 0;

package/ios/RCTVeLivePush/RCTVeLivePush.h

@@ -0,0 +1,22 @@
+//
+//  RCTVeLivePush.h
+//  DoubleConversion
+//
+//  Created by ByteDance on 2025/9/18.
+//
+#import <React/RCTBridgeModule.h>
+#import "VolcApiEngine/Engine.h"
+#import <React/RCTEventEmitter.h>
+#import "VeLivePushImpl.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTVeLivePush : RCTEventEmitter <RCTBridgeModule, EventObserver>
+
+@property(nonatomic, strong) VeLivePushImpl* impl;
+
+@end
+
+NS_ASSUME_NONNULL_END
+

package/ios/RCTVeLivePush/RCTVeLivePush.mm

@@ -0,0 +1,141 @@
+//
+//  RCTVeLivePush.m
+//  DoubleConversion
+//
+//  Created by ByteDance on 2025/9/18.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <VeLivePushSpec/VeLivePushSpec.h>
+#endif
+
+#import <TTSDKFramework/TTSDKFramework.h>
+#import <React/RCTEventEmitter.h>
+#import "VolcApiEngine/VolcEventObserver.h"
+#import "RCTVeLivePush.h"
+#import "VeLivePushImpl.h"
+#define EVENT_NAME @"VeLivePush:onEvent"
+
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+@interface RCTVeLivePush () <NativeVeLivePushSpec>
+
+@end
+#endif 
+@interface RCTVeLivePush () <VeLiveMediaPlayerListener>
+
+@end
+
+
+
+static RCTVeLivePush *instance = nil;
+
+
+@implementation RCTVeLivePush  {
+  bool hasListeners;
+}
+
++ (instancetype)shareInstance {
+  return instance;
+}
+
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+- (dispatch_queue_t)methodQueue {
+  return dispatch_get_main_queue();
+}
+
+- (instancetype) init {
+  self = [super init];
+  if (self) {
+    instance = self;
+    // 使用局部强引用临时持有对象，避免立即释放
+    self.impl = [[VeLivePushImpl alloc] initWithModule: instance];
+  }
+  return self;
+}
+
+- (NSArray<NSString *> *)supportedEvents {
+  return @[ EVENT_NAME ];
+}
+
+- (void)onEvent:(NSString *)eventName data:(id)eventData {
+  NSDictionary *dic = @{@"event" : eventName, @"data" : eventData};
+  [self sendEventWithName:EVENT_NAME body:dic];
+}
+
+//export api
+
+RCT_EXPORT_MODULE(VeLivePush)
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)call:(NSString *)params 
+    callback: (RCTResponseSenderBlock)callback {
+  NSDictionary * args = @{@"params": params};
+  [self.impl callApi:args callback:^(id _Nonnull res) {
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:res options:0 error:nil];
+    NSString* jsonResult = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    callback(@[jsonResult]);
+  }];
+}
+
+- (NSString *)callSync: (NSString *) params {
+  NSDictionary* args = @{@"params": params};  
+  NSDictionary* result = [self.impl callApiSync: args];
+  //result序列化 - 将NSDictionary转换为JSON字符串
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:result options:0 error:nil];
+  NSString* jsonResult = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+  return jsonResult;
+}
+
+- (NSNumber *)destroyApiEngine {
+  return nil;
+}
+
+- (NSNumber *)newApiEngine {
+  return [self.impl newApiEngine];
+}
+
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+ {
+    return std::make_shared<facebook::react::NativeVeLivePushSpecJSI>(params);
+ }
+
+#else
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine) {
+  return [self.impl newApiEngine];
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(destroyApiEngine) {
+  return [self.impl destoryApiEngine];
+}
+
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(callApiSync
+                                       : (nonnull NSDictionary *)args) {
+  
+  NSDictionary* result = [self.impl callApiSync: args];
+  //result序列化 - 将NSDictionary转换为JSON字符串
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:result options:0 error:nil];
+  NSString* jsonResult = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+  return jsonResult;
+}
+
+RCT_EXPORT_METHOD(callApi
+                  : (nonnull NSDictionary *)args callback
+                  : (RCTResponseSenderBlock)callback) {
+  
+  [self.impl callApi:args callback:^(id _Nonnull res) {
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:res options:0 error:nil];
+    NSString* jsonResult = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    callback(@[jsonResult]);
+  }];
+}
+
+#endif
+
+@end

package/ios/VeLivePushImpl.h

@@ -0,0 +1,38 @@
+//
+//  VeLivePushImpl.h
+//  Pods
+//
+//  Created by ByteDance on 2025/9/18.
+//
+
+//
+//  VolcLiveImpl.h
+//  react-native-velive-pull
+//
+//  Created by ByteDance on 2025/9/18.
+//
+
+#import <Foundation/Foundation.h>
+#import "VolcApiEngine/Engine.h"
+#import "VolcApiEngine/VolcEventObserver.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface VeLivePushImpl : NSObject
+
+@property(nonatomic, strong) VolcApiEngine *volcApiEngine;
+@property(nonatomic, weak) NSObject<EventObserver>* module;
+
+- (NSDictionary *) callApiSync: (nonnull NSDictionary*) args;
+
+- (void)callApi: (nonnull NSDictionary*) args
+       callback: (void (^)(id))callback;
+
+- (instancetype) initWithModule:(NSObject<EventObserver> *)module;
+
+- (id)newApiEngine;
+
+- (id)destoryApiEngine;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/VeLivePushImpl.m

@@ -0,0 +1,51 @@
+//
+//  VeLivePushImpl.m
+//  Pods
+//
+//  Created by ByteDance on 2025/9/18.
+//
+
+#import "VeLivePushImpl.h"
+#import "VolcApiEngine/VolcEventObserver.h"
+#import <React/RCTBridgeModule.h>
+
+@interface VeLivePushImpl()
+
+@end
+
+@implementation VeLivePushImpl
+
+- (instancetype) initWithModule:(NSObject<EventObserver> *)module {
+  self = [super init];
+  if (self) {
+    self.module = module;
+  }
+  return self;
+}
+
+- (id)newApiEngine {
+  if (self.volcApiEngine == nil) {
+    self.volcApiEngine = [[VolcApiEngine alloc] init];
+    [self.volcApiEngine setObserver:self.module];
+  }
+  return nil;
+}
+
+- (id)destoryApiEngine {
+  return nil;
+}
+
+- (NSDictionary *)callApiSync:(NSDictionary *)args {
+  [self newApiEngine];
+  return [self.volcApiEngine callApi:args];
+}
+
+- (void)callApi:(NSDictionary *)args callback:(void (^)(id))callback {
+  [self newApiEngine];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    id _val = [self.volcApiEngine callApi:args];
+    callback(_val);
+  });
+}
+
+@end