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

package/android/build.gradle

@@ -1,4 +1,5 @@
 buildscript {
+
   repositories {
     google()
     mavenCentral()
@@ -52,6 +53,7 @@ apply plugin: "com.android.library"
 apply from: "https://ve-vos.volccdn.com/script/vevos-repo-base.gradle"
 
 if (isNewArchitectureEnabled()) {
+  println "[LIVE PULL GRADLE INFO]: newArchitectureEnabled"
   apply plugin: "com.facebook.react"
 }
 
@@ -85,13 +87,26 @@ android {
 
   compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
 
+
   defaultConfig {
     minSdkVersion getExtOrIntegerDefault("minSdkVersion")
     targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-    consumerProguardFiles 'proguard-rules.pro' 
+    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 {
     release {
       minifyEnabled false
@@ -123,6 +138,7 @@ dependencies {
   // noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"
 
+    //TODO 改成开发runtime
     implementation "com.volcengine:VolcApiEngine:$volc_api_engine_version"
-    implementation "com.bytedanceapi:ttsdk-ttlivepull_rtc:$ttsdk_ttlivepull_rtc_version"
+    implementation "com.bytedanceapi:ttsdk-ttlivepull_premium:$ttsdk_ttlivepull_rtc_version"
 }

package/android/gradle.properties

@@ -2,4 +2,4 @@ LivePull_kotlinVersion=1.7.0
 LivePull_minSdkVersion=21
 LivePull_targetSdkVersion=31
 LivePull_compileSdkVersion=31
-LivePull_ndkversion=21.4.7075529
+LivePull_ndkversion=21.4.7075529

package/android/src/main/java/com/volcengine/velive/rn/pull/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/pull/VeLivePullImpl.java

@@ -0,0 +1,66 @@
+package com.volcengine.velive.rn.pull;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.volcengine.VolcApiEngine.IEventReceiver;
+import com.volcengine.VolcApiEngine.VolcApiEngine;
+import com.volcengine.velive.rn.pull.autogen.MethodSignature;
+
+//LivePullProxy 代理 TurboModule 和 NativeModule，消息统一聚合
+public class VeLivePullImpl {
+  
+  private VolcApiEngine apiEngine = null;
+  private ReactApplicationContext moduleContext;
+  private IEventReceiver module;
+
+  public static final String NAME = "VeLivePull";
+  public static final String EVENT_NAME = "VeLivePull:onEvent";
+  VeLivePullImpl(ReactApplicationContext context, IEventReceiver module ) {
+    MethodSignature.init();
+    ClassHelper.init();
+    this.moduleContext = context;
+    this.module = module;
+  }
+  
+  public boolean newApiEngine() {
+    if (apiEngine == null) {
+      apiEngine = new VolcApiEngine(moduleContext, this.module);
+      NativeVariableManager.init(apiEngine.msgClient, moduleContext);
+      return true;
+    }
+    return false;
+  }
+    
+  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) -> {
+              callback.invoke(res.toJsonString());
+            });
+        } catch (Exception e) {
+          e.printStackTrace();
+        }
+      });
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}

package/android/src/main/java/com/volcengine/velive/rn/pull/VeLivePullPackage.java

@@ -0,0 +1,61 @@
+package com.volcengine.velive.rn.pull;
+
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+//准备新老架构统一磨平
+public class VeLivePullPackage extends TurboReactPackage {
+  private boolean isTurboModule = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+    List<ViewManager> viewManagers = new ArrayList<>();
+    viewManagers.add(new VeLivePullViewManager());
+    return viewManagers;
+  }
+  
+  @Nullable
+  @Override
+  public NativeModule getModule(@NonNull String name, @NonNull ReactApplicationContext reactApplicationContext) {
+    if (name.equals(VeLivePullImpl.NAME)) {
+      return new VeLivePullModule(reactApplicationContext);
+    } else {
+      return null;
+    }
+  }
+
+//  @Override
+//  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+//    List<NativeModule> modules = new ArrayList<>();
+//    modules.add(new VeLivePullModule(reactContext));
+//    return modules;
+//  }
+
+  @Override
+  public ReactModuleInfoProvider getReactModuleInfoProvider() {
+    return () -> {
+      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+      moduleInfos.put(
+              VeLivePullImpl.NAME,
+        new ReactModuleInfo(
+                VeLivePullImpl.NAME,
+                VeLivePullImpl.NAME,
+          false,
+          false,true,false,this.isTurboModule
+        )
+      );
+      return moduleInfos;
+    };
+  }
+}

package/android/src/main/java/com/volcengine/velive/rn/pull/{VolcView.java → VeLivePullView.java}

@@ -7,11 +7,13 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 
-public class VolcView extends FrameLayout {
+public class VeLivePullView extends FrameLayout {
   public String viewId;
   public boolean hasRegister = false;
+  
+  private boolean hasLoad = false;
 
-  public VolcView(Context context) { 
+  public VeLivePullView(Context context) { 
     super(context);
     this.setKeepScreenOn(true); 
   }
@@ -19,10 +21,17 @@ public class VolcView extends FrameLayout {
   public void setViewId(String viewId) {
     this.viewId = viewId;
     this.hasRegister = true;
-    this.emitOnLoad();
+  }
+  
+  
+  public void loaded() {
+    this.hasLoad = true;
   }
 
   public void emitOnLoad() {
+    if (this.hasLoad) {
+      return;
+    }
     WritableMap event = Arguments.createMap();
     ReactContext reactContext = (ReactContext)getContext();
     reactContext.getJSModule(RCTEventEmitter.class)

package/android/src/main/java/com/volcengine/velive/rn/pull/{VolcViewManager.java → VeLivePullViewManager.java}

@@ -1,5 +1,6 @@
 package com.volcengine.velive.rn.pull;
 
+import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
 
@@ -15,9 +16,9 @@ import com.volcengine.VolcApiEngine.view.*;
 
 import java.util.Map;
 
-public class VolcViewManager extends SimpleViewManager<VolcView> implements VolcViewManagerInterface<VolcView> {
-  public static final String NAME = "VolcView";
-  
+public class VeLivePullViewManager extends SimpleViewManager<VeLivePullView> implements VolcViewManagerInterface<VeLivePullView> {
+  public static final String NAME = "VeLivePullView";
+
   private ThemedReactContext context;
 
   @NonNull
@@ -28,30 +29,44 @@ public class VolcViewManager extends SimpleViewManager<VolcView> implements Volc
 
   @NonNull
   @Override
-  public VolcView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
+  public VeLivePullView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
     context = themedReactContext;
-    return new VolcView(themedReactContext);
+    return new VeLivePullView(themedReactContext);
   }
-  
+
   @ReactProp(name = "viewId")
-  public void setViewId(VolcView view, String viewId) {
+  public void setViewId(VeLivePullView view, String viewId) {
     view.setViewId(viewId);
     com.volcengine.VolcApiEngine.view.VolcViewManager.putViewById(viewId, view);
   }
 
   @ReactProp(name = "kind")
-  public void setKind(VolcView view, String kind) {
+  public void setKind(VeLivePullView view, String kind) {
     var themedReactContext = this.context;
-    
+
     switch (kind) {
       case "SurfaceView" -> {
         SurfaceView subView = new SurfaceView(themedReactContext.getReactApplicationContext());
+        //增加callback
+        subView.getHolder().addCallback(new SurfaceHolder.Callback() {
+          @Override
+          public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
+            view.emitOnLoad();
+            view.loaded();
+          }
+
+          @Override
+          public void surfaceChanged(@NonNull SurfaceHolder surfaceHolder, int i, int i1, int i2) {}
+
+          @Override
+          public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {}
+        });
         view.addView(subView);
       }
     }
   }
-  
-  public void setVisible(VolcView view, Boolean visible) {
+
+  public void setVisible(VeLivePullView view, Boolean visible) {
     if(visible) {
       view.setVisibility(View.INVISIBLE);
     } else {
@@ -63,9 +78,9 @@ public class VolcViewManager extends SimpleViewManager<VolcView> implements Volc
    * Handle "create" command (called from JS) and call createFragment method
    */
   public void receiveCommand(
-    @NonNull VolcView root,
-    String command,
-    @Nullable ReadableArray args
+          @NonNull VeLivePullView root,
+          String command,
+          @Nullable ReadableArray args
   ) {
     super.receiveCommand(root, command, args);
 
@@ -77,11 +92,11 @@ public class VolcViewManager extends SimpleViewManager<VolcView> implements Volc
 
   public Map getExportedCustomBubblingEventTypeConstants() {
     return MapBuilder.builder().put(
-      "load",
-      MapBuilder.of(
-        "phasedRegistrationNames",
-        MapBuilder.of("bubbled", "onViewLoad")
-      )
+            "load",
+            MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onViewLoad")
+            )
     ).build();
   }
 }

package/android/src/newarch/com/volcengine/velive/rn/pull/VeLivePullModule.java

@@ -0,0 +1,83 @@
+package com.volcengine.velive.rn.pull;
+
+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.volcengine.VolcApiEngine.IEventReceiver;
+
+public class VeLivePullModule extends NativeVeLivePullSpec implements IEventReceiver {
+  private VeLivePullImpl impl;
+  VeLivePullModule(ReactApplicationContext context) {
+    super(context);
+    this.impl = new VeLivePullImpl(context, this);
+  }
+
+  @Override
+  public boolean newApiEngine() {
+    return this.impl.newApiEngine();
+  }
+
+  @Override
+  public String callSync(String params) {
+    String result =  impl.callApiSync(params);
+    return result;
+  }
+
+  @Override
+  public void call(String params, Callback callback) {
+    Callback myCallback = args -> {
+      callback.invoke(args);
+    };
+    impl.callApi(params, myCallback);
+  }
+
+  @Override
+  @NonNull
+  public String getName() {
+    return VeLivePullImpl.NAME;
+  }
+
+  @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(VeLivePullImpl.EVENT_NAME, map);
+  }
+
+
+   private int listenerCount = 0;
+  
+   @Override
+   public void addListener(String eventName) {
+      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
+      }
+    }
+  
+    private void sendEvent(ReactContext reactContext, String eventName,
+                           @Nullable WritableMap params) {
+      reactContext
+        .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        .emit(eventName, params);
+    }
+}

package/android/src/{main/java/com/volcengine/velive/rn/pull/VolcLiveModule.java → oldarch/com/volcengine/velive/rn/pull/VeLivePullModule.java}

@@ -10,73 +10,43 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.ss.videoarch.liveplayer.VeLivePlayerDef;
 import com.volcengine.VolcApiEngine.*;
 import com.volcengine.velive.rn.pull.autogen.MethodSignature;
 
-@ReactModule(name = VolcLiveModule.NAME)
-public class VolcLiveModule
-    extends VolcLiveModuleSpec implements IEventReceiver {
-  public static final String NAME = "VolcLiveModule";
+@ReactModule(name = VeLivePullImpl.NAME)
+public class VeLivePullModule
+    extends VeLivePullModuleSpec implements IEventReceiver {
+  private VeLivePullImpl impl;
 
-  VolcApiEngine apiEngine = null;
-
-  VolcLiveModule(ReactApplicationContext context) {
+  VeLivePullModule(ReactApplicationContext context) {
     super(context);
-    MethodSignature.init();
-    ClassHelper.init();
+//    MethodSignature.init();
+//    ClassHelper.init();
+    this.impl = new VeLivePullImpl(context, this);
   }
 
   @Override
   public String getName() {
-    return NAME;
+    return VeLivePullImpl.NAME;
   }
 
   @ReactMethod(isBlockingSynchronousMethod = true)
   public boolean newApiEngine() {
-    if (apiEngine == null) {
-      apiEngine = new VolcApiEngine(super.context, this);
-      NativeVariableManager.init(apiEngine.msgClient, super.context);
-      return true;
-    }
-
-    return false;
+    return this.impl.newApiEngine();
   }
 
   @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();
-    }
+    String params = arg.getString("params");
+    this.impl.callApi(params, args -> {
+      callback.invoke(args);
+    });
   }
 
   private int listenerCount = 0;
@@ -113,6 +83,6 @@ public class VolcLiveModule
 
     super.context
         .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-        .emit(VolcLiveModuleSpec.EVENT, map);
+        .emit(VeLivePullModuleSpec.EVENT, map);
   }
 }

package/android/src/{main/java/com/volcengine/velive/rn/pull/VolcLiveModuleSpec.java → oldarch/com/volcengine/velive/rn/pull/VeLivePullModuleSpec.java}

@@ -3,15 +3,15 @@ package com.volcengine.velive.rn.pull;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 
-public abstract class VolcLiveModuleSpec extends ReactContextBaseJavaModule {
-  static final String EVENT = "VolcLive:onEvent";
+public abstract class VeLivePullModuleSpec extends ReactContextBaseJavaModule {
+  static final String EVENT = "VeLivePull:onEvent";
   
-  VolcLiveModuleSpec(ReactApplicationContext context) {
+  VeLivePullModuleSpec(ReactApplicationContext context) {
     super(context);
     this.context = context;
   }
   
-  public  ReactApplicationContext context;
+  public ReactApplicationContext context;
 
   public abstract void OnEvent(String eventName, String data);
 }

package/ios/RCTVeLivePull/RCTVeLivePull.h

@@ -0,0 +1,21 @@
+//
+//  RCTVeLivePull.h
+//  react-native-velive-pull
+//
+//  Created by ByteDance on 2025/10/11.
+//
+
+#import <React/RCTBridgeModule.h>
+#import "VolcApiEngine/Engine.h"
+#import "VeLivePullImpl.h"
+#import <React/RCTEventEmitter.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTVeLivePull : RCTEventEmitter <RCTBridgeModule, EventObserver>
+
+@property(nonatomic, strong) VeLivePullImpl* impl;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RCTVeLivePull/RCTVeLivePull.mm

@@ -0,0 +1,119 @@
+//
+//  RCTVeLivePull.m
+//  react-native-velive-pull
+//
+//  Created by ByteDance on 2025/10/11.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <VeLivePullSpec/VeLivePullSpec.h>
+#endif
+
+#import <React/RCTEventEmitter.h>
+#import "VolcApiEngine/VolcEventObserver.h"
+#import "RCTVeLivePull.h"
+#import "VeLivePullImpl.h"
+#define EVENT_NAME @"VeLivePull:onEvent"
+
+#ifdef RCT_NEW_ARCH_ENABLED
+@interface RCTVeLivePull () <NativeVeLivePullSpec>
+
+@end
+#endif 
+
+static RCTVeLivePull *instance = nil;
+
+@implementation RCTVeLivePull  {
+  bool hasListeners;
+}
+
++ (instancetype)shareInstance {
+  return instance;
+}
+
+//@See https://stackoverflow.com/questions/50773748/difference-requiresmainqueuesetup-and-dispatch-get-main-queue
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+- (dispatch_queue_t)methodQueue {
+  return dispatch_get_main_queue();
+}
+
+- (instancetype) init {
+  self = [super init];
+  if (self) {
+    instance = self;
+     self.impl = [[VeLivePullImpl 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(VeLivePull)
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+- (NSNumber *)newApiEngine {
+  return [self.impl newApiEngine];
+}
+
+- (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;
+}
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+ {
+    return std::make_shared<facebook::react::NativeVeLivePullSpecJSI>(params);
+ }
+
+#else
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine) {
+  return [self.impl newApiEngine];
+}
+
+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