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

package/ios/VeLivePullImpl.h

@@ -0,0 +1,29 @@
+//
+//  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 VeLivePullImpl : 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;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/VeLivePullImpl.m

@@ -0,0 +1,49 @@
+//
+//  VolcLiveImpl.m
+//  react-native-velive-pull
+//
+//  Created by ByteDance on 2025/9/18.
+//
+
+#import "VeLivePullImpl.h"
+#import "VolcApiEngine/VolcEventObserver.h"
+#import <React/RCTBridgeModule.h>
+
+@interface  VeLivePullImpl()
+
+@end
+
+@implementation VeLivePullImpl
+
+- (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;
+}
+
+- (NSDictionary *)callApiSync:(NSDictionary *)args {
+  [self newApiEngine];
+  return [self.volcApiEngine callApi:args];
+}
+
+//callback 是OC的回调函数，外层需要进一步封装，接收一个NSDictionary类型的参数
+- (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

package/ios/VeLivePullView.h

@@ -9,10 +9,10 @@
 #import <UIKit/UIKit.h>
 #import <React/RCTComponent.h>
 
-#ifndef VeUIView_h
-#define VVeUIView_h
+#ifndef VeLivePullUIView_h
+#define VeLivePullUIView_h
 
-@interface VeUIView : UIView
+@interface VeLivePullUIView : UIView
 
 @property (nonatomic, strong) NSString* viewId;
 

package/ios/VeLivePullView.m

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
 #import "VeLivePullView.h"
 
-@implementation VeUIView
+@implementation VeLivePullUIView
 
 - (instancetype) init {
   self = [super init];
@@ -25,7 +25,7 @@
   
   _viewId = viewId;
   self.hasRegister = TRUE;
-  self.accessibilityLabel = [NSString stringWithFormat:@"VeUIView@%@", viewId];
+  self.accessibilityLabel = [NSString stringWithFormat:@"VeLivePullUIView@%@", viewId];
 
   [self emitLoaded];
 }

package/ios/VeLivePullViewManager.m

@@ -10,19 +10,23 @@
 #import "VolcApiEngine/VolcViewManager.h"
 #import "VeLivePullView.h"
 
-@interface VeUIViewManager : RCTViewManager
+@interface VeLivePullViewManager : RCTViewManager
 
 @end
 
-@implementation VeUIViewManager
+@implementation VeLivePullViewManager
 
-RCT_EXPORT_MODULE(VolcView)
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+RCT_EXPORT_MODULE(VeLivePullView)
 
 // 导出 events
 RCT_EXPORT_VIEW_PROPERTY(onViewLoad, RCTBubblingEventBlock)
 
 // 导出 events
-RCT_CUSTOM_VIEW_PROPERTY(viewId, NSString, VeUIView)
+RCT_CUSTOM_VIEW_PROPERTY(viewId, NSString, VeLivePullUIView)
 {
   if (json == nil) {
     return;
@@ -34,7 +38,7 @@ RCT_CUSTOM_VIEW_PROPERTY(viewId, NSString, VeUIView)
   NSLog(@"[View] register view success viewId=%@", viewId);
 }
 
-RCT_CUSTOM_VIEW_PROPERTY(kind, NSString, VeUIView)
+RCT_CUSTOM_VIEW_PROPERTY(kind, NSString, VeLivePullUIView)
 {
   if (json == nil) {
     return;
@@ -48,11 +52,11 @@ RCT_CUSTOM_VIEW_PROPERTY(kind, NSString, VeUIView)
 //  }
 }
 
-- (VeUIView *)view
+- (VeLivePullUIView *)view
 {
-  VeUIView *view = [[VeUIView alloc] init];
-  view.accessibilityLabel = @"VolcView";
-  NSLog(@"[View] create VolcView success");
+  VeLivePullUIView *view = [[VeLivePullUIView alloc] init];
+  view.accessibilityLabel = @"VeLivePullUIView";
+  NSLog(@"[View] create VeLivePullUIView success");
   return view;
 }
 

package/lib/commonjs/index.js

@@ -2575,6 +2575,7 @@ var MessageProtoImpl = function () {
                 var buf = bufferLike.buffer || bufferLike;
                 return {
                     _type: "base64" /* ARG_TYPE.BASE64 */,
+                    // @ts-ignore
                     _value: buf2base64(buf),
                 };
             };
@@ -2916,6 +2917,77 @@ var ReactNativeBridge = /** @class */ (function () {
     return ReactNativeBridge;
 }());
 
+var ReactNativeTurboBridge = /** @class */ (function () {
+    function ReactNativeTurboBridge(BridgeModule, NativeEventName) {
+        this.BridgeModule = BridgeModule;
+        this.NativeEventName = NativeEventName;
+        this._handlers = {};
+        if (BridgeModule === undefined) {
+            throw new Error("can't find module \"".concat(BridgeModule, "\", please enure install the module correctly"));
+        }
+        // this._nativeEventEmitter = new NativeEventEmitter(BridgeModule);
+        this._nativeEventEmitter = new reactNative.NativeEventEmitter(BridgeModule);
+        this._init();
+    }
+    ReactNativeTurboBridge.prototype._init = function () {
+        var _this = this;
+        this._nativeEventEmitter.addListener(this.NativeEventName, function (ev) {
+            var _a, _b;
+            try {
+                var eventName = ev.event;
+                var eventData = typeof ev.data === 'string' ? JSON.parse(ev.data) : ev.data;
+                (_b = (_a = _this._handlers)[eventName]) === null || _b === void 0 ? void 0 : _b.call(_a, eventData);
+            }
+            catch (err) {
+                console.error('handle native event fail:', err);
+            }
+        });
+    };
+    ReactNativeTurboBridge.prototype.call = function (params) {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            try {
+                var resolved_1 = false;
+                _this.BridgeModule.call(JSON.stringify(params), function (res) {
+                    var val = typeof res === 'string' ? JSON.parse(res) : res;
+                    resolved_1 = true;
+                    resolve(val);
+                });
+                setTimeout(function () {
+                    if (resolved_1) {
+                        return;
+                    }
+                    resolve({
+                        status: RETURN_STATUS.SUCCESS,
+                        msg: 'over timeout and auto success',
+                    });
+                }, 1000 * 60 * 5);
+            }
+            catch (err) {
+                // console.error(`<RNBridge> call native "${handlerName}()" fail`, err);
+                reject(err);
+            }
+        });
+    };
+    ReactNativeTurboBridge.prototype.callSync = function (params) {
+        try {
+            var res = this.BridgeModule.callSync(JSON.stringify(params));
+            return typeof res === 'string' ? JSON.parse(res) : res;
+        }
+        catch (err) {
+            // console.error(`<RNBridge> call native "${handlerName}()" fail`, err);
+            throw err;
+        }
+    };
+    ReactNativeTurboBridge.prototype.registerHandler = function (handlerName, handler) {
+        this._handlers[handlerName] = handler;
+    };
+    ReactNativeTurboBridge.prototype.registerAsyncHandler = function (handlerName, handler) {
+        this._handlers[handlerName] = handler;
+    };
+    return ReactNativeTurboBridge;
+}());
+
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -2962,6 +3034,42 @@ var ReactNativeEnv = /** @class */ (function () {
     return ReactNativeEnv;
 }());
 
+/**
+ * 获取NativeBridgeModule实例
+ */
+var NativeVeLivePull = reactNative.TurboModuleRegistry.get('VeLivePull');
+
+var _isNewArch;
+function isNewArch() {
+    if (_isNewArch !== undefined) {
+        return _isNewArch;
+    }
+    else {
+        try {
+            // Check for Fabric UI Manager
+            var hasFabricUIManager = Boolean(global === null || global === void 0 ? void 0 : global.nativeFabricUIManager);
+            // Check for TurboModule system
+            var hasTurboModule = Boolean(global === null || global === void 0 ? void 0 : global.__turboModuleProxy);
+            _isNewArch = hasFabricUIManager || hasTurboModule;
+        }
+        catch (_a) {
+            _isNewArch = true;
+        }
+    }
+    return _isNewArch;
+}
+
+var isTurboModuleEnabled = isNewArch();
+var VeLivePull = isTurboModuleEnabled
+    ? NativeVeLivePull
+    : reactNative.NativeModules.VeLivePull;
+if (isTurboModuleEnabled) {
+    console.log('[RN Module] TurboModule Enable', NativeVeLivePull);
+}
+else {
+    console.log('[RN Module] NativeModule Enable', reactNative.NativeModules.VeLivePull);
+}
+
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -3107,7 +3215,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var VolcView = reactNative.requireNativeComponent('VolcView');
+var VolcView = reactNative.requireNativeComponent('VeLivePullView');
 var NativeViewComponent = /** @class */ (function (_super) {
     __extends(NativeViewComponent, _super);
     function NativeViewComponent() {
@@ -6748,12 +6856,12 @@ var VeLivePlayerObserver = function () {
     var _classExtraInitializers = [];
     var _classThis;
     var _instanceExtraInitializers = [];
-    var _errorCode_decorators;
-    var _errorCode_initializers = [];
-    var _errorCode_extraInitializers = [];
-    var _errorMsg_decorators;
-    var _errorMsg_initializers = [];
-    var _errorMsg_extraInitializers = [];
+    var _code_decorators;
+    var _code_initializers = [];
+    var _code_extraInitializers = [];
+    var _message_decorators;
+    var _message_initializers = [];
+    var _message_extraInitializers = [];
     var _init_decorators;
     _classThis = /** @class */ (function () {
         function VeLivePlayerError_1() {
@@ -6763,15 +6871,15 @@ var VeLivePlayerObserver = function () {
             /** {en}
              * @brief The error code.
              */
-            this.errorCode = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _errorCode_initializers, void 0));
+            this.code = (__runInitializers(this, _instanceExtraInitializers), __runInitializers(this, _code_initializers, void 0));
             /** {zh}
              * @brief 直播播放错误信息。
              */
             /** {en}
              * @brief The error message.
              */
-            this.errorMsg = (__runInitializers(this, _errorCode_extraInitializers), __runInitializers(this, _errorMsg_initializers, void 0));
-            __runInitializers(this, _errorMsg_extraInitializers);
+            this.message = (__runInitializers(this, _code_extraInitializers), __runInitializers(this, _message_initializers, void 0));
+            __runInitializers(this, _message_extraInitializers);
         }
         VeLivePlayerError_1.prototype.init = function () {
             throw new Error('not implement');
@@ -6781,12 +6889,12 @@ var VeLivePlayerObserver = function () {
     __setFunctionName(_classThis, "VeLivePlayerError");
     (function () {
         var _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
-        _errorCode_decorators = [NativeMember()];
-        _errorMsg_decorators = [NativeMember()];
+        _code_decorators = [NativeMember()];
+        _message_decorators = [NativeMember()];
         _init_decorators = [NativeMethodSync('init')];
         __esDecorate(_classThis, null, _init_decorators, { kind: "method", name: "init", static: false, private: false, access: { has: function (obj) { return "init" in obj; }, get: function (obj) { return obj.init; } }, metadata: _metadata }, null, _instanceExtraInitializers);
-        __esDecorate(null, null, _errorCode_decorators, { kind: "field", name: "errorCode", static: false, private: false, access: { has: function (obj) { return "errorCode" in obj; }, get: function (obj) { return obj.errorCode; }, set: function (obj, value) { obj.errorCode = value; } }, metadata: _metadata }, _errorCode_initializers, _errorCode_extraInitializers);
-        __esDecorate(null, null, _errorMsg_decorators, { kind: "field", name: "errorMsg", static: false, private: false, access: { has: function (obj) { return "errorMsg" in obj; }, get: function (obj) { return obj.errorMsg; }, set: function (obj, value) { obj.errorMsg = value; } }, metadata: _metadata }, _errorMsg_initializers, _errorMsg_extraInitializers);
+        __esDecorate(null, null, _code_decorators, { kind: "field", name: "code", static: false, private: false, access: { has: function (obj) { return "code" in obj; }, get: function (obj) { return obj.code; }, set: function (obj, value) { obj.code = value; } }, metadata: _metadata }, _code_initializers, _code_extraInitializers);
+        __esDecorate(null, null, _message_decorators, { kind: "field", name: "message", static: false, private: false, access: { has: function (obj) { return "message" in obj; }, get: function (obj) { return obj.message; }, set: function (obj, value) { obj.message = value; } }, metadata: _metadata }, _message_initializers, _message_extraInitializers);
         __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
         _classThis = _classDescriptor.value;
         if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
@@ -12374,7 +12482,7 @@ var VeLivePlayerError = function () {
                     return Number(this._instance.mErrorCode);
                 }
                 else if ($os === 'ios') {
-                    return Number(this._instance.errorCode);
+                    return Number(this._instance.code);
                 }
                 else {
                     throw new Error('Not Support Platform ' + $os);
@@ -12398,7 +12506,7 @@ var VeLivePlayerError = function () {
                     return String(this._instance.mErrorMsg);
                 }
                 else if ($os === 'ios') {
-                    return String(this._instance.errorMsg);
+                    return String(this._instance.message);
                 }
                 else {
                     throw new Error('Not Support Platform ' + $os);
@@ -14118,6 +14226,7 @@ function removePlayer(player) {
     playerPool.delete(player);
 }
 
+var defaultHeaders = { 'User-Agent': 'rn' };
 function runImpl(context, androidImpl, iosImpl) {
     if (env.getOS() === 'android') {
         var androidEngine = unpackObject(context);
@@ -14264,7 +14373,8 @@ extendsClassMethod(VeLivePlayer, 'setEnableIgnoreAudioInterruption', function ()
 });
 extendsClassMethod(VeLivePlayer, 'addExtraHttpRequestHeadersByUser', function () {
     return function addExtraHttpRequestHeadersByUser(headers) {
-        var defaultHeaders = { 'User-Agent': 'rn' };
+        // @ts-ignore
+        this._customHeaders = headers || {};
         return runImpl(this, function (engine) {
             engine.addExtraHttpRequestHeadersByUser(__assign(__assign({}, defaultHeaders), headers));
         }, function (engine) {
@@ -14274,11 +14384,13 @@ extendsClassMethod(VeLivePlayer, 'addExtraHttpRequestHeadersByUser', function ()
 });
 extendsClassMethod(VeLivePlayer, 'play', function () {
     return function play() {
+        // @ts-ignore
+        var headers = __assign(__assign({}, defaultHeaders), (this._customHeaders || {}));
         return runImpl(this, function (engine) {
-            engine.addExtraHttpRequestHeadersByUser({});
+            engine.addExtraHttpRequestHeadersByUser(headers);
             engine.play();
         }, function (engine) {
-            engine.addExtraHttpRequestHeadersByUser({});
+            engine.addExtraHttpRequestHeadersByUser(headers);
             engine.play();
         });
     };
@@ -14446,7 +14558,7 @@ function initAndroidEnv(config) {
                         .setLicenseUri(config.LicenseUri.android);
                     androidEnv = builder.build();
                     EnvHelper.init(androidEnv, {
-                        hybrid_ua: "rn|pull|".concat("1.3.1"),
+                        hybrid_ua: "rn|pull|".concat("1.5.0"),
                     });
                     Env.openAppLog(config.openLog);
                     return [2 /*return*/];
@@ -14457,7 +14569,7 @@ function initAndroidEnv(config) {
 function initIOSEnv(config) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
-            VeLivePlayerHelper.startWithConfiguration(__assign(__assign({}, config), { LicenseUri: config.LicenseUri.ios, appLogAid: '500808' , hybrid_ua: "rn|pull|".concat("1.3.1") }));
+            VeLivePlayerHelper.startWithConfiguration(__assign(__assign({}, config), { LicenseUri: config.LicenseUri.ios, appLogAid: '500808' , hybrid_ua: "rn|pull|".concat("1.5.0") }));
             return [2 /*return*/];
         });
     });
@@ -14498,6 +14610,7 @@ function initEnv(config) {
 
 var defaultConfig = {
     enableStatisticsCallback: true,
+    enableLiveDNS: false,
 };
 function initAndroidPlayer(options) {
     return __awaiter(this, void 0, void 0, function () {
@@ -14604,7 +14717,14 @@ function initPlayer(options) {
     });
 }
 
-setupJSBridge(new ReactNativeBridge(reactNative.NativeModules.VolcLiveModule, 'VolcLive:onEvent'));
+if (isTurboModuleEnabled) {
+    console.log('[VeLivePull] TurboModule Enable', VeLivePull);
+    setupJSBridge(new ReactNativeTurboBridge(VeLivePull, 'VeLivePull:onEvent'));
+}
+else {
+    console.log('[VeLivePull] NativeModule Enable', reactNative.NativeModules.VeLivePull);
+    setupJSBridge(new ReactNativeBridge(VeLivePull, 'VeLivePull:onEvent'));
+}
 setupEnv(new ReactNativeEnv());
 
 exports.NativeViewComponent = NativeViewComponent;