@byteplus/react-native-rtc 1.1.1 → 1.3.2

package/lib/typescript/platforms/turboModule/NativeVertc.d.ts

@@ -0,0 +1,26 @@
+// Copyright © 2022 BytePlusRTC All rights reserved.
+// SPDX-License-Identifier: MIT
+
+import type { TurboModule } from 'react-native';
+export interface Spec extends TurboModule {
+    /**
+     * 异步调用原生方法
+     * @param params 调用参数
+     * @returns 调用结果
+     */
+    callSync(params: string): string;
+    /**
+     * 同步调用原生方法
+     * @param params 调用参数
+     * @param callback 结果回调函数
+     */
+    call(params: string, callback: (res: string) => void): void;
+    newApiEngine(): boolean;
+    addListener: (eventType: string) => void;
+    removeListeners: (count: number) => void;
+}
+/**
+ * 获取NativeBridgeModule实例
+ */
+declare const _default: Spec | null;
+export default _default;

package/lib/typescript/platforms/turboModule/index.d.ts

@@ -0,0 +1,4 @@
+// Copyright © 2022 BytePlusRTC All rights reserved.
+// SPDX-License-Identifier: MIT
+
+export { default as NativeBridge } from './NativeVertc';

package/lib/typescript/proxy.d.ts

@@ -1,7 +1,7 @@
 // Copyright © 2022 BytePlusRTC All rights reserved.
 // SPDX-License-Identifier: MIT
 
-import { RTCRoom, RTCVideo, IAudioEffectPlayer, IMediaPlayer } from './codegen/pack';
+import { RTCRoom, RTCVideo, IAudioEffectPlayer, IMediaPlayer } from './codegen/pack/index';
 import { IEngine, IRoom, I_AudioEffectPlayer, I_MediaPlayer } from './interface';
 export declare const proxyEngine: (engine: RTCVideo | IEngine) => IEngine;
 export declare const proxyRoom: (room: RTCRoom | IRoom) => IRoom;

package/lib/typescript/util.d.ts

@@ -16,3 +16,4 @@ export declare const platformBriefsSync: <T>({ android, ios, }: {
     android: INormalFunction<T>;
     ios: INormalFunction<T>;
 }) => Promise<T>;
+export declare function isNewArch(): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/react-native-rtc",
-  "version": "1.1.1",
+  "version": "1.3.2",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"
@@ -14,6 +14,7 @@
     "ios",
     "*.podspec",
     "lib",
+    "src/platforms/turboModule",
     "!readme",
     "!**/__tests__",
     "!**/__fixtures__",
@@ -29,5 +30,13 @@
   ],
   "author": "vcloud-fe",
   "description": "volcengine sdk for react native",
-  "homepage": "https://www.volcengine.com"
+  "homepage": "https://www.volcengine.com",
+  "codegenConfig": {
+    "name": "VertcSpec",
+    "type": "modules",
+    "jsSrcsDir": "src/platforms/turboModule",
+    "android": {
+      "javaPackageName": "com.volcengine.reactnative.vertc"
+    }
+  }
 }

package/react-native-rtc.podspec

@@ -13,6 +13,14 @@ if File.exist?(project_package_json_path) then
   end
 end
 
+core_list = ['ios/core/*.{h,m,mm,swift}']
+
+if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+  core_list += ['ios/new_arch_core/*.{h,m,mm,swift}']
+else
+  core_list += ['ios/original_arch_core/*.{h,m,mm,swift}']
+end
+
 Pod::Spec.new do |s|
   s.name         = "react-native-rtc"
   s.version      = package["version"]
@@ -40,44 +48,40 @@ Pod::Spec.new do |s|
   s.default_subspec = 'Core'
 
   s.subspec 'Core' do |core|
-    core.source_files = 'ios/core/*.{h,m,mm,swift}'
+    core.source_files = core_list
   end
 
   s.subspec 'Live' do |sub|
-    sub.source_files = [
-      'ios/core/*.{h,m,mm,swift}',
-      'ios/live/*.{h,m,mm,swift}'
-    ]
+    source_files = [ 'ios/live/*.{h,m,mm,swift}' ]
+    source_files += core_list
+    sub.source_files = source_files
   end
 
   s.subspec 'Vod' do |sub|
-    sub.source_files = [
-      'ios/core/*.{h,m,mm,swift}',
-      'ios/vod/*.{h,m,mm,swift}'
-    ]
+    source_files = [ 'ios/vod/*.{h,m,mm,swift}' ]
+    source_files += core_list
+    sub.source_files = source_files
   end
 
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
   if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
+    install_modules_dependencies(s);
   else
-  s.dependency "React-Core"
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig.merge!({
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    })
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
+    if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig.merge!({
+          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      })
+      s.dependency "React-Codegen"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    else
+      # React-Core will be installed by default when using original Arch. (0.71+)
+      s.dependency "React-Core"
+    end
   end
   
   enable_union_live = (ENV['ENABLE_UNION_FOR_RTC_WITH_LIVE'] == 'YES')
@@ -86,12 +90,12 @@ Pod::Spec.new do |s|
   target_vod_version = ENV['UNION_FOR_RTC_WITH_VOD_VERSION']
   target_volc_api_engine_version = ENV['VOLC_API_ENGINE_VERSION_FOR_RTC']
   
-  s.dependency 'VolcApiEngine', target_volc_api_engine_version || '1.6.4'
+  s.dependency 'VolcApiEngine', target_volc_api_engine_version || '1.6.6'
 
   rtc_sdk_name = is_bp ? 'BytePlusRTC' : 'VolcEngineRTC'
 
-  rtc_live_unique_version = is_bp ? '1.46.300.6-alpha1-premium' : '1.46.300.6-alpha1-premium'
-  rtc_default_version = is_bp ? '3.58.1.14800' : '3.58.1.100'
+  rtc_live_unique_version = is_bp ? '1.46.300.7-premium' : '1.46.3.10-premium'
+  rtc_default_version = is_bp ? '3.58.1.52500' : '3.58.1.51400'
 
   vod_player_sr_version = is_bp ? '1.45.300.3-premium' : '1.46.2.8-premium'
 

package/src/platforms/turboModule/NativeVertc.ts

@@ -0,0 +1,33 @@
+
+import {TurboModuleRegistry} from 'react-native';
+import type {TurboModule} from 'react-native';
+
+export interface Spec extends TurboModule {
+  /**
+   * 异步调用原生方法
+   * @param params 调用参数
+   * @returns 调用结果
+   */
+  callSync(params: string): string;
+
+  /**
+   * 同步调用原生方法
+   * @param params 调用参数
+   * @param callback 结果回调函数
+   */
+  call(params: string, callback: (res: string) => void): void;
+
+  newApiEngine(): boolean;
+
+  // 
+  //eventEmitter See: https://github.com/reactwg/react-native-new-architecture/discussions/144
+
+  //Note: The addListener and removeListeners implementations will be provided by React Native.
+  addListener: (eventType: string) => void;
+  removeListeners: (count: number) => void;
+}
+
+/**
+ * 获取NativeBridgeModule实例
+ */
+export default TurboModuleRegistry.get<Spec>('Vertc') as Spec | null;

package/src/platforms/turboModule/index.ts

@@ -0,0 +1 @@
+export {default as NativeBridge} from './NativeVertc';