@byteplus/react-native-live-push 1.1.2-rc.0 → 1.1.2-rc.2

package/ios/VeLivePushHelper.h

@@ -6,21 +6,18 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "TTSDKFramework/VeLivePusher.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface VeLivePushHelper : NSObject
-
-+ (instancetype)sharedInstance;
+@class VeLivePusher;
 
-- (nullable VeLivePusher *)getVeLivePusherWithKey:(NSString *)key;
+@interface VeLivePushHelper : NSObject
 
-- (void)setVeLivePusher:(VeLivePusher *)pusher forKey:(NSString *)key;
++ (nullable VeLivePusher *)getPusher:(NSString *)key;
 
-- (void)removeVeLivePusher:(NSString *)key;
++ (void)setVeLivePusher:(VeLivePusher *)pusher forKey:(NSString *)key;
 
-- (void)removeAllVeLivePushers;
++ (void)removeVeLivePusher:(NSString *)key;
 
 @end
 

package/ios/VeLivePushHelper.m

@@ -6,57 +6,38 @@
 //
 
 #import "VeLivePushHelper.h"
-#import "TTSDKFramework/VeLivePusher.h"
-
-@interface VeLivePushHelper ()
-
-@property (nonatomic, strong) NSMapTable<NSString *, VeLivePusher *> *pusherMap;
-
-@end
+// 使用TTSDKFramework的VeLivePusher类，但在此不直接导入
+// 在包含此SDK的项目中，VeLivePusher会被正确解析
 
 @implementation VeLivePushHelper
 
-+ (instancetype)sharedInstance {
-    static VeLivePushHelper *instance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        instance = [[self alloc] init];
-    });
-    return instance;
-}
-
-- (instancetype)init {
-    self = [super init];
-    if (self) {
-        _pusherMap = [NSMapTable strongToWeakObjectsMapTable];
-    }
-    return self;
-}
+static NSMapTable<NSString *, VeLivePusher *> *pusherMap;
 
-- (nullable VeLivePusher *)getVeLivePusherWithKey:(NSString *)key {
-    if (!key) {
-        return nil;
-    }
-    return [self.pusherMap objectForKey:key];
++ (void)initialize {
+  if (self == [VeLivePushHelper class]) {
+    pusherMap = [NSMapTable strongToWeakObjectsMapTable];
+  }
 }
 
-- (void)setVeLivePusher:(VeLivePusher *)pusher forKey:(NSString *)key {
-    if (!key || !pusher) {
-        return;
-    }
-    [self.pusherMap setObject:pusher forKey:key];
++ (nullable VeLivePusher *)getPusher:(NSString *)key {
+  if (!key) {
+    return nil;
+  }
+  return [pusherMap objectForKey:key];
 }
 
-- (void)removeVeLivePusher:(NSString *)key {
-    if (!key) {
-        return;
-    }
-    [self.pusherMap removeObjectForKey:key];
++ (void)setVeLivePusher:(VeLivePusher *)pusher forKey:(NSString *)key {
+  if (!key || !pusher) {
+    return;
+  }
+  [pusherMap setObject:pusher forKey:key];
 }
 
-- (void)removeAllVeLivePushers {
-    [self.pusherMap removeAllObjects];
++ (void)removeVeLivePusher:(NSString *)key {
+  if (!key) {
+    return;
+  }
+  [pusherMap removeObjectForKey:key];
 }
 
 @end
-

package/ios/VeLivePushSDK.m

@@ -5,14 +5,13 @@
 //  Created by ByteDance on 2024/4/10.
 //
 
-#import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 
 #import <TTSDKFramework/TTSDKFramework.h>
-#import <TTSDKFramework/TTSDKFramework/VeLiveMediaPlayer.h>
 
-#import "VolcApiEngine/VolcEventObserver.h"
 #import "VeLivePushSDK.h"
+#import "VolcApiEngine/VolcEventObserver.h"
 
 #define EVENT_NAME @"VeLivePush:onEvent"
 
@@ -20,53 +19,54 @@
 
 @end
 
+@interface RCTVeLivePushModule () <VeLiveMediaPlayerListener>
+
+@end
+
 static RCTVeLivePushModule *instance = nil;
 
-@implementation RCTVeLivePushModule
-{
+@implementation RCTVeLivePushModule {
   bool hasListeners;
 }
 
 + (instancetype)shareInstance {
-    return instance;
+  return instance;
 }
 
 + (BOOL)requiresMainQueueSetup {
-    return YES;
+  return YES;
 }
 
 + (void)_unsedForKeepOnly {
-    Protocol *unused = @protocol(VeLivePlayerObserver);
-    NSLog(@"Loaded Protocol: %p", unused);
+  Protocol *unused = @protocol(VeLivePlayerObserver);
+  NSLog(@"Loaded Protocol: %p", unused);
 }
 
 - (dispatch_queue_t)methodQueue {
-    return dispatch_get_main_queue();
+  return dispatch_get_main_queue();
 }
 
 - (instancetype)init {
-    self = [super init];
-    if (self != nil) {
-        self.apiEngine = nil;
-        instance = self;
-    }
-    return instance;
+  self = [super init];
+  if (self != nil) {
+    self.apiEngine = nil;
+    instance = self;
+  }
+  return instance;
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[ EVENT_NAME ];
+  return @[ EVENT_NAME ];
 }
 
-- (void)onEvent:(NSString *)eventName data:(id)eventData
-{
-  NSDictionary * dic = @{ @"event": eventName, @"data": eventData };
+- (void)onEvent:(NSString *)eventName data:(id)eventData {
+  NSDictionary *dic = @{@"event" : eventName, @"data" : eventData};
   [self sendEventWithName:EVENT_NAME body:dic];
 }
 
 RCT_EXPORT_MODULE();
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine)
-{
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine) {
   if (self.apiEngine == nil) {
     self.apiEngine = [[VolcApiEngine alloc] init];
     [self.apiEngine setObserver:self];
@@ -74,36 +74,25 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(newApiEngine)
   return nil;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(destroyApiEngine)
-{
-  // 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(destroyApiEngine) {
+  //
   return nil;
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(callApiSync:(nonnull NSDictionary *) args)
-{
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(callApiSync
+                                       : (nonnull NSDictionary *)args) {
   [self newApiEngine];
   return [instance.apiEngine callApi:args];
 }
 
-RCT_EXPORT_METHOD(callApi:(nonnull NSDictionary *)args callback:(RCTResponseSenderBlock) callback)
-{
+RCT_EXPORT_METHOD(callApi
+                  : (nonnull NSDictionary *)args callback
+                  : (RCTResponseSenderBlock)callback) {
   [self newApiEngine];
   dispatch_async(dispatch_get_main_queue(), ^{
     id _val = [self.apiEngine callApi:args];
-    callback(@[_val]);
+    callback(@[ _val ]);
   });
 }
 
-RCT_EXPORT_METHOD(test)
-{
-    Protocol *p = @protocol(VeLiveMediaPlayerListener);
-    NSString *str = NSStringFromProtocol(p);
-    NSLog(@"protocol name %@", str);
-    
-    Protocol *p2 = @protocol(VeLivePusherObserver);
-    NSString *str2 = NSStringFromProtocol(p2);
-    NSLog(@"protocol name %@", str2);
-}
-
 @end

package/ios/include/react-native-velive-push.modulemap

@@ -0,0 +1,4 @@
+module react_native_velive_push {
+  header "../VeLivePushHelper.h"
+  export *
+}

package/lib/commonjs/index.js

@@ -12694,7 +12694,7 @@ var NativeUIView = function () {
     return UIView;
 })(NativeUIView));
 
-var VeLivePushHelper = function () {
+var VeLivePushHelper$1 = function () {
     var _classDecorators = [NativeClass('com.volcengine.velive.rn.push.VeLivePushHelper')];
     var _classDescriptor;
     var _classExtraInitializers = [];
@@ -12742,6 +12742,54 @@ var VeLivePushHelper = function () {
     return VeLivePushHelper = _classThis;
 }();
 
+var VeLivePushHelper = function () {
+    var _classDecorators = [NativeClass('VeLivePushHelper')];
+    var _classDescriptor;
+    var _classExtraInitializers = [];
+    var _classThis;
+    var _staticExtraInitializers = [];
+    var _static_setVeLivePusher_decorators;
+    var _static_removeVeLivePusher_decorators;
+    var VeLivePushHelper = _classThis = /** @class */ (function () {
+        function VeLivePushHelper_1() {
+        }
+        VeLivePushHelper_1.setPusher = function (viewId, pusher) {
+            VeLivePushHelper.pusherMap.set(pusher, viewId);
+            this.setVeLivePusher(pusher, viewId);
+        };
+        VeLivePushHelper_1.removePusher = function (pusher) {
+            var viewId = VeLivePushHelper.pusherMap.get(pusher);
+            if (viewId) {
+                VeLivePushHelper.pusherMap.delete(pusher);
+                this.removeVeLivePusher(viewId);
+            }
+        };
+        VeLivePushHelper_1.setVeLivePusher = function (pusher, viewId) {
+            throw new Error('');
+        };
+        VeLivePushHelper_1.removeVeLivePusher = function (viewId) {
+            throw new Error('');
+        };
+        return VeLivePushHelper_1;
+    }());
+    __setFunctionName(_classThis, "VeLivePushHelper");
+    (function () {
+        var _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        _static_setVeLivePusher_decorators = [NativeStaticMethodSync('setVeLivePusher:forKey:')];
+        _static_removeVeLivePusher_decorators = [NativeStaticMethodSync('removeVeLivePusher:')];
+        __esDecorate(_classThis, null, _static_setVeLivePusher_decorators, { kind: "method", name: "setVeLivePusher", static: true, private: false, access: { has: function (obj) { return "setVeLivePusher" in obj; }, get: function (obj) { return obj.setVeLivePusher; } }, metadata: _metadata }, null, _staticExtraInitializers);
+        __esDecorate(_classThis, null, _static_removeVeLivePusher_decorators, { kind: "method", name: "removeVeLivePusher", static: true, private: false, access: { has: function (obj) { return "removeVeLivePusher" in obj; }, get: function (obj) { return obj.removeVeLivePusher; } }, metadata: _metadata }, null, _staticExtraInitializers);
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        VeLivePushHelper = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+    })();
+    _classThis.pusherMap = (__runInitializers(_classThis, _staticExtraInitializers), new WeakMap());
+    (function () {
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return VeLivePushHelper = _classThis;
+}();
+
 /** {zh}
  * @detail keytype
  * @brief 推流本地文件录制配置。
@@ -23713,11 +23761,12 @@ extendsClassMethod(VeLivePusher, 'destroy', function (origin) {
         origin();
         return runImpl(this, function (engine) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                VeLivePushHelper.removePusher(engine);
+                VeLivePushHelper$1.removePusher(engine);
                 return [2 /*return*/];
             });
         }); }, function (engine) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
+                VeLivePushHelper.removePusher(engine);
                 return [2 /*return*/];
             });
         }); });
@@ -24535,7 +24584,7 @@ function initAndroidPusher(options) {
                     _d.sent();
                     viewTag = reactNative.findNodeHandle(element);
                     reactNative.UIManager.dispatchViewManagerCommand(viewTag, 'resetSurface', []);
-                    VeLivePushHelper.setPusher(viewId, pusher);
+                    VeLivePushHelper$1.setPusher(viewId, pusher);
                     return [2 /*return*/, packObject(pusher, VeLivePusher)];
             }
         });
@@ -24562,6 +24611,7 @@ function initIOSPusher(options) {
                     return [4 /*yield*/, pusher.setRenderView(uiView)];
                 case 1:
                     _b.sent();
+                    VeLivePushHelper.setPusher(viewId, unpackObject(pusher));
                     return [2 /*return*/, pusher];
             }
         });

package/lib/module/index.js

@@ -12692,7 +12692,7 @@ var NativeUIView = function () {
     return UIView;
 })(NativeUIView));
 
-var VeLivePushHelper = function () {
+var VeLivePushHelper$1 = function () {
     var _classDecorators = [NativeClass('com.volcengine.velive.rn.push.VeLivePushHelper')];
     var _classDescriptor;
     var _classExtraInitializers = [];
@@ -12740,6 +12740,54 @@ var VeLivePushHelper = function () {
     return VeLivePushHelper = _classThis;
 }();
 
+var VeLivePushHelper = function () {
+    var _classDecorators = [NativeClass('VeLivePushHelper')];
+    var _classDescriptor;
+    var _classExtraInitializers = [];
+    var _classThis;
+    var _staticExtraInitializers = [];
+    var _static_setVeLivePusher_decorators;
+    var _static_removeVeLivePusher_decorators;
+    var VeLivePushHelper = _classThis = /** @class */ (function () {
+        function VeLivePushHelper_1() {
+        }
+        VeLivePushHelper_1.setPusher = function (viewId, pusher) {
+            VeLivePushHelper.pusherMap.set(pusher, viewId);
+            this.setVeLivePusher(pusher, viewId);
+        };
+        VeLivePushHelper_1.removePusher = function (pusher) {
+            var viewId = VeLivePushHelper.pusherMap.get(pusher);
+            if (viewId) {
+                VeLivePushHelper.pusherMap.delete(pusher);
+                this.removeVeLivePusher(viewId);
+            }
+        };
+        VeLivePushHelper_1.setVeLivePusher = function (pusher, viewId) {
+            throw new Error('');
+        };
+        VeLivePushHelper_1.removeVeLivePusher = function (viewId) {
+            throw new Error('');
+        };
+        return VeLivePushHelper_1;
+    }());
+    __setFunctionName(_classThis, "VeLivePushHelper");
+    (function () {
+        var _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        _static_setVeLivePusher_decorators = [NativeStaticMethodSync('setVeLivePusher:forKey:')];
+        _static_removeVeLivePusher_decorators = [NativeStaticMethodSync('removeVeLivePusher:')];
+        __esDecorate(_classThis, null, _static_setVeLivePusher_decorators, { kind: "method", name: "setVeLivePusher", static: true, private: false, access: { has: function (obj) { return "setVeLivePusher" in obj; }, get: function (obj) { return obj.setVeLivePusher; } }, metadata: _metadata }, null, _staticExtraInitializers);
+        __esDecorate(_classThis, null, _static_removeVeLivePusher_decorators, { kind: "method", name: "removeVeLivePusher", static: true, private: false, access: { has: function (obj) { return "removeVeLivePusher" in obj; }, get: function (obj) { return obj.removeVeLivePusher; } }, metadata: _metadata }, null, _staticExtraInitializers);
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        VeLivePushHelper = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+    })();
+    _classThis.pusherMap = (__runInitializers(_classThis, _staticExtraInitializers), new WeakMap());
+    (function () {
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return VeLivePushHelper = _classThis;
+}();
+
 /** {zh}
  * @detail keytype
  * @brief 推流本地文件录制配置。
@@ -23711,11 +23759,12 @@ extendsClassMethod(VeLivePusher, 'destroy', function (origin) {
         origin();
         return runImpl(this, function (engine) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                VeLivePushHelper.removePusher(engine);
+                VeLivePushHelper$1.removePusher(engine);
                 return [2 /*return*/];
             });
         }); }, function (engine) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
+                VeLivePushHelper.removePusher(engine);
                 return [2 /*return*/];
             });
         }); });
@@ -24533,7 +24582,7 @@ function initAndroidPusher(options) {
                     _d.sent();
                     viewTag = findNodeHandle(element);
                     UIManager.dispatchViewManagerCommand(viewTag, 'resetSurface', []);
-                    VeLivePushHelper.setPusher(viewId, pusher);
+                    VeLivePushHelper$1.setPusher(viewId, pusher);
                     return [2 /*return*/, packObject(pusher, VeLivePusher)];
             }
         });
@@ -24560,6 +24609,7 @@ function initIOSPusher(options) {
                     return [4 /*yield*/, pusher.setRenderView(uiView)];
                 case 1:
                     _b.sent();
+                    VeLivePushHelper.setPusher(viewId, unpackObject(pusher));
                     return [2 /*return*/, pusher];
             }
         });

package/lib/typescript/platforms/ios/helper.d.ts

@@ -0,0 +1,8 @@
+import type { VeLivePusher } from '../../codegen/ios';
+export declare class VeLivePushHelper {
+    static pusherMap: WeakMap<VeLivePusher, string>;
+    static setPusher(viewId: string, pusher: VeLivePusher): void;
+    static removePusher(pusher: VeLivePusher): void;
+    static setVeLivePusher(pusher: VeLivePusher, viewId: string): void;
+    static removeVeLivePusher(viewId: string): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byteplus/react-native-live-push",
-  "version": "1.1.2-rc.0",
+  "version": "1.1.2-rc.2",
   "peerDependencies": {
     "react": "*",
     "react-native": "*"

package/react-native-velive-push.podspec

@@ -16,27 +16,37 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm}"
 
+  s.static_framework = true
+  s.preserve_paths = ['ios/include/react-native-velive-push.modulemap']
+  
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'SWIFT_INCLUDE_PATHS' => '$(PODS_TARGET_SRCROOT)/ios/include',
+    'MODULEMAP_FILE' => '$(PODS_TARGET_SRCROOT)/ios/include/react-native-velive-push.modulemap',
+    'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES'
+  }
+
   # 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)
   else
-  s.dependency "React-Core"
+    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    = {
-        "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
+    # 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    = {
+          "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
   end
   
   s.dependency 'VolcApiEngine', '1.2.3'