@byteplus/react-native-live-push 1.3.0-rc.5 → 1.3.0-rc.7

package/android/build.gradle

@@ -13,6 +13,41 @@ def isNewArchitectureEnabled() {
   return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
+// Version configuration through environment variables or gradle properties
+def ttsdk_ttlivepush_rtc_version
+def envVersion = System.getenv('TTSDK_TTLIVEPUSH_RTC_VERSION_FOR_LIVE_PUSH')
+if (envVersion) {
+  ttsdk_ttlivepush_rtc_version = envVersion
+} else if (rootProject.hasProperty('TTSDK_TTLIVEPUSH_RTC_VERSION_FOR_LIVE_PUSH')) {
+  ttsdk_ttlivepush_rtc_version = rootProject.property('TTSDK_TTLIVEPUSH_RTC_VERSION_FOR_LIVE_PUSH')
+} else {
+  // Fallback to versions from package.json
+  def packageJson = file("../package.json")
+  def slurper = new groovy.json.JsonSlurper()
+  def parsedJson = slurper.parseText(packageJson.text)
+  def isBp = parsedJson.name.startsWith("@byteplus")
+  
+  if (isBp) {
+    ttsdk_ttlivepush_rtc_version = parsedJson.nativeVersion.byteplus.android
+  } else {
+    ttsdk_ttlivepush_rtc_version = parsedJson.nativeVersion.volc.android
+  }
+}
+
+// VolcApiEngine version configuration
+def volc_api_engine_version
+def volcApiEnvVersion = System.getenv('VOLC_API_ENGINE_VERSION_FOR_LIVE_PUSH')
+if (volcApiEnvVersion) {
+  volc_api_engine_version = volcApiEnvVersion
+} else if (rootProject.hasProperty('VOLC_API_ENGINE_VERSION_FOR_LIVE_PUSH')) {
+  volc_api_engine_version = rootProject.property('VOLC_API_ENGINE_VERSION_FOR_LIVE_PUSH')
+} else {
+  volc_api_engine_version = "1.6.4"  // Default version
+}
+
+println "[LIVE PUSH GRADLE INFO]: Using ttsdk_ttlivepush_rtc version: $ttsdk_ttlivepush_rtc_version"
+println "[LIVE PUSH GRADLE INFO]: Using volc_api_engine version: $volc_api_engine_version"
+
 apply plugin: "com.android.library"
 apply from: "https://ve-vos.volccdn.com/script/vevos-repo-base.gradle"
 
@@ -87,6 +122,6 @@ dependencies {
   // 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:1.6.4"
-    api 'com.bytedanceapi:ttsdk-ttlivepush_rtc:1.46.300.2'
+    implementation "com.volcengine:VolcApiEngine:$volc_api_engine_version"
+    api "com.bytedanceapi:ttsdk-ttlivepush_rtc:$ttsdk_ttlivepush_rtc_version"
 }

package/ios/VeLivePushHelper.m

@@ -42,7 +42,7 @@ static NSMapTable<NSString *, VeLivePusher *> *pusherMap;
 
 + (nullable NSString *)getResourcePath:(NSString *)subPath {
   if (!subPath) {
-    return nil;
+    return NSBundle.mainBundle.bundlePath;
   }
   return [NSBundle.mainBundle pathForResource:subPath ofType:nil];
 }

package/lib/commonjs/index.js

@@ -27091,7 +27091,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'setComposeNodes', function (origin
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = nodes.map(function (path) {
+            var composePaths = nodes
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27106,7 +27108,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'appendComposeNodes', function (ori
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = nodes.map(function (path) {
+            var composePaths = nodes
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27121,7 +27125,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'removeComposeNodes', function (ori
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = resourcePaths.map(function (path) {
+            var composePaths = resourcePaths
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27130,6 +27136,10 @@ extendsClassMethod(VeLiveVideoEffectManager, 'removeComposeNodes', function (ori
 });
 extendsClassMethod(VeLiveVideoEffectManager, 'updateComposerNodeIntensity', function (origin) {
     return function updateComposerNodeIntensity(path, key, intensity) {
+        if (!path) {
+            console.log('path is empty');
+            return;
+        }
         return runImpl(this, function (engine) {
             var fullPath = VeLiveEffectHelper.getBeautyPathByName(path);
             origin(fullPath, key, intensity);
@@ -27142,18 +27152,38 @@ extendsClassMethod(VeLiveVideoEffectManager, 'updateComposerNodeIntensity', func
 extendsClassMethod(VeLiveVideoEffectManager, 'setFilter', function (origin) {
     return function setFilter(path) {
         return runImpl(this, function (engine) {
-            origin(VeLiveEffectHelper.getFilterPathByName(path));
+            if (path) {
+                origin(VeLiveEffectHelper.getFilterPathByName(path));
+            }
+            else {
+                origin('');
+            }
         }, function (engine) {
-            origin(VeLivePushHelper.getResourcePath("FilterResource.bundle/Filter/".concat(path)));
+            if (path) {
+                origin(VeLivePushHelper.getResourcePath("FilterResource.bundle/Filter/".concat(path)));
+            }
+            else {
+                origin('');
+            }
         });
     };
 });
 extendsClassMethod(VeLiveVideoEffectManager, 'setSticker', function (origin) {
     return function setSticker(path) {
         return runImpl(this, function (engine) {
-            origin(VeLiveEffectHelper.getStickerPathByName(path));
+            if (path) {
+                origin(VeLiveEffectHelper.getStickerPathByName(path));
+            }
+            else {
+                origin('');
+            }
         }, function (engine) {
-            origin(VeLivePushHelper.getResourcePath("StickerResource.bundle/stickers/".concat(path)));
+            if (path) {
+                origin(VeLivePushHelper.getResourcePath("StickerResource.bundle/stickers/".concat(path)));
+            }
+            else {
+                origin('');
+            }
         });
     };
 });

package/lib/module/index.js

@@ -27089,7 +27089,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'setComposeNodes', function (origin
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = nodes.map(function (path) {
+            var composePaths = nodes
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27104,7 +27106,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'appendComposeNodes', function (ori
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = nodes.map(function (path) {
+            var composePaths = nodes
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27119,7 +27123,9 @@ extendsClassMethod(VeLiveVideoEffectManager, 'removeComposeNodes', function (ori
             });
             origin(composePaths);
         }, function (engine) {
-            var composePaths = resourcePaths.map(function (path) {
+            var composePaths = resourcePaths
+                .filter(Boolean)
+                .map(function (path) {
                 return VeLivePushHelper.getResourcePath("ComposeMakeup.bundle/ComposeMakeup/".concat(path));
             });
             origin(composePaths);
@@ -27128,6 +27134,10 @@ extendsClassMethod(VeLiveVideoEffectManager, 'removeComposeNodes', function (ori
 });
 extendsClassMethod(VeLiveVideoEffectManager, 'updateComposerNodeIntensity', function (origin) {
     return function updateComposerNodeIntensity(path, key, intensity) {
+        if (!path) {
+            console.log('path is empty');
+            return;
+        }
         return runImpl(this, function (engine) {
             var fullPath = VeLiveEffectHelper.getBeautyPathByName(path);
             origin(fullPath, key, intensity);
@@ -27140,18 +27150,38 @@ extendsClassMethod(VeLiveVideoEffectManager, 'updateComposerNodeIntensity', func
 extendsClassMethod(VeLiveVideoEffectManager, 'setFilter', function (origin) {
     return function setFilter(path) {
         return runImpl(this, function (engine) {
-            origin(VeLiveEffectHelper.getFilterPathByName(path));
+            if (path) {
+                origin(VeLiveEffectHelper.getFilterPathByName(path));
+            }
+            else {
+                origin('');
+            }
         }, function (engine) {
-            origin(VeLivePushHelper.getResourcePath("FilterResource.bundle/Filter/".concat(path)));
+            if (path) {
+                origin(VeLivePushHelper.getResourcePath("FilterResource.bundle/Filter/".concat(path)));
+            }
+            else {
+                origin('');
+            }
         });
     };
 });
 extendsClassMethod(VeLiveVideoEffectManager, 'setSticker', function (origin) {
     return function setSticker(path) {
         return runImpl(this, function (engine) {
-            origin(VeLiveEffectHelper.getStickerPathByName(path));
+            if (path) {
+                origin(VeLiveEffectHelper.getStickerPathByName(path));
+            }
+            else {
+                origin('');
+            }
         }, function (engine) {
-            origin(VeLivePushHelper.getResourcePath("StickerResource.bundle/stickers/".concat(path)));
+            if (path) {
+                origin(VeLivePushHelper.getResourcePath("StickerResource.bundle/stickers/".concat(path)));
+            }
+            else {
+                origin('');
+            }
         });
     };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/react-native-live-push",
-  "version": "1.3.0-rc.5",
+  "version": "1.3.0-rc.7",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
@@ -30,5 +30,15 @@
   "homepage": "https://www.byteplus.com/en",
   "devDependencies": {
     "zx": "^8.1.1"
+  },
+  "nativeVersion": {
+    "volc": {
+      "android": "1.46.3.6",
+      "ios": "1.46.3.9-premium"
+    },
+    "byteplus": {
+      "android": "1.46.300.2",
+      "ios": "1.46.300.6-alpha1-premium"
+    }
   }
 }

package/react-native-velive-push.podspec

@@ -2,6 +2,7 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+is_bp = package['name'].start_with?('@byteplus')
 
 Pod::Spec.new do |s|
   s.name         = "react-native-velive-push"
@@ -50,8 +51,8 @@ Pod::Spec.new do |s|
   end
   
   # Version configuration through environment variables
-  volc_api_engine_version = ENV['VOLC_API_ENGINE_VERSION'] || '1.6.4'
-  ttsdk_framework_version = ENV['TTSDK_FRAMEWORK_VERSION'] || '1.46.300.5-premium'
+  volc_api_engine_version = ENV['VOLC_API_ENGINE_VERSION_FOR_LIVE_PUSH'] || '1.6.4'
+  ttsdk_framework_version = ENV['TTSDK_FRAMEWORK_VERSION_FOR_LIVE_PUSH'] || (is_bp ? package['nativeVersion']['byteplus']['ios'] : package['nativeVersion']['volc']['ios'])
   
   s.dependency 'VolcApiEngine', volc_api_engine_version
   s.dependency 'TTSDKFramework/Core', ttsdk_framework_version