优化RTMP播放器重连和稳定性
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
caleb
@@ -1,6 +1,6 @@
|
||||
// Software License Agreement (BSD License)
|
||||
//
|
||||
// Copyright (c) 2010-2021, Deusty, LLC
|
||||
// Copyright (c) 2010-2026, Deusty, LLC
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use of this software in source and binary forms,
|
||||
@@ -13,71 +13,164 @@
|
||||
// to endorse or promote products derived from this software without specific
|
||||
// prior written permission of Deusty, LLC.
|
||||
|
||||
@_exported import CocoaLumberjack
|
||||
@_exported public import CocoaLumberjack
|
||||
#if SWIFT_PACKAGE
|
||||
import CocoaLumberjackSwiftSupport
|
||||
public import CocoaLumberjackSwiftSupport
|
||||
#endif
|
||||
|
||||
extension DDLogFlag {
|
||||
public static func from(_ logLevel: DDLogLevel) -> DDLogFlag {
|
||||
return DDLogFlag(rawValue: logLevel.rawValue)
|
||||
}
|
||||
|
||||
public init(_ logLevel: DDLogLevel) {
|
||||
self = DDLogFlag(rawValue: logLevel.rawValue)
|
||||
}
|
||||
|
||||
/// Returns the log level, or the lowest equivalent.
|
||||
public func toLogLevel() -> DDLogLevel {
|
||||
if let ourValid = DDLogLevel(rawValue: rawValue) {
|
||||
return ourValid
|
||||
} else {
|
||||
if contains(.verbose) {
|
||||
return .verbose
|
||||
} else if contains(.debug) {
|
||||
return .debug
|
||||
} else if contains(.info) {
|
||||
return .info
|
||||
} else if contains(.warning) {
|
||||
return .warning
|
||||
} else if contains(.error) {
|
||||
return .error
|
||||
} else {
|
||||
return .off
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The log level that can dynamically limit log messages (vs. the static DDDefaultLogLevel). This log level will only be checked, if the message passes the `DDDefaultLogLevel`.
|
||||
public var dynamicLogLevel = DDLogLevel.all
|
||||
|
||||
/// Resets the `dynamicLogLevel` to `.all`.
|
||||
/// - SeeAlso: `dynamicLogLevel`
|
||||
@inlinable
|
||||
public func resetDynamicLogLevel() {
|
||||
dynamicLogLevel = .all
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Please use dynamicLogLevel", renamed: "dynamicLogLevel")
|
||||
public var defaultDebugLevel: DDLogLevel {
|
||||
get {
|
||||
return dynamicLogLevel
|
||||
public func _DDLogMessage(_ messageFormat: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel,
|
||||
flag: DDLogFlag,
|
||||
context: Int,
|
||||
file: StaticString,
|
||||
function: StaticString,
|
||||
line: UInt,
|
||||
tag: Any?,
|
||||
asynchronous: Bool?,
|
||||
ddlog: DDLog) {
|
||||
// The `dynamicLogLevel` will always be checked here (instead of being passed in).
|
||||
// We cannot "mix" it with the `DDDefaultLogLevel`, because otherwise the compiler won't strip strings that are not logged.
|
||||
#if compiler(>=6.2)
|
||||
if unsafe level.rawValue & flag.rawValue != 0 && dynamicLogLevel.rawValue & flag.rawValue != 0 {
|
||||
let logMessage = DDLogMessage(messageFormat(),
|
||||
level: level,
|
||||
flag: flag,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag)
|
||||
unsafe ddlog.log(asynchronous: asynchronous ?? asyncLoggingEnabled, message: logMessage)
|
||||
}
|
||||
set {
|
||||
dynamicLogLevel = newValue
|
||||
#else
|
||||
if level.rawValue & flag.rawValue != 0 && dynamicLogLevel.rawValue & flag.rawValue != 0 {
|
||||
let logMessage = DDLogMessage(messageFormat(),
|
||||
level: level,
|
||||
flag: flag,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag)
|
||||
ddlog.log(asynchronous: asynchronous ?? asyncLoggingEnabled, message: logMessage)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Please use resetDynamicLogLevel", renamed: "resetDynamicLogLevel")
|
||||
public func resetDefaultDebugLevel() {
|
||||
resetDynamicLogLevel()
|
||||
}
|
||||
|
||||
/// If `true`, all logs (except errors) are logged asynchronously by default.
|
||||
public var asyncLoggingEnabled = true
|
||||
|
||||
@inlinable
|
||||
public func DDLogDebug(_ message: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
file: StaticString = #file,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .debug,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@inlinable
|
||||
public func DDLogInfo(_ message: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
file: StaticString = #file,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .info,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@inlinable
|
||||
public func DDLogWarn(_ message: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
file: StaticString = #file,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .warning,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@inlinable
|
||||
public func DDLogVerbose(_ message: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
file: StaticString = #file,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .verbose,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@inlinable
|
||||
public func DDLogError(_ message: @autoclosure () -> DDLogMessageFormat,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
file: StaticString = #file,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .error,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous ?? false,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func _DDLogMessage(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel,
|
||||
flag: DDLogFlag,
|
||||
@@ -86,27 +179,25 @@ public func _DDLogMessage(_ message: @autoclosure () -> Any,
|
||||
function: StaticString,
|
||||
line: UInt,
|
||||
tag: Any?,
|
||||
asynchronous: Bool,
|
||||
asynchronous: Bool?,
|
||||
ddlog: DDLog) {
|
||||
// The `dynamicLogLevel` will always be checked here (instead of being passed in).
|
||||
// We cannot "mix" it with the `DDDefaultLogLevel`, because otherwise the compiler won't strip strings that are not logged.
|
||||
if level.rawValue & flag.rawValue != 0 && dynamicLogLevel.rawValue & flag.rawValue != 0 {
|
||||
// Tell the DDLogMessage constructor to copy the C strings that get passed to it.
|
||||
let logMessage = DDLogMessage(message: String(describing: message()),
|
||||
level: level,
|
||||
flag: flag,
|
||||
context: context,
|
||||
file: String(describing: file),
|
||||
function: String(describing: function),
|
||||
line: line,
|
||||
tag: tag,
|
||||
options: [.copyFile, .copyFunction],
|
||||
timestamp: nil)
|
||||
ddlog.log(asynchronous: asynchronous, message: logMessage)
|
||||
}
|
||||
// This will lead to `messageFormat` and `message` being equal on DDLogMessage,
|
||||
// which is what the legacy initializer of DDLogMessage does as well.
|
||||
_DDLogMessage(.init(_formattedMessage: String(describing: message())),
|
||||
level: level,
|
||||
flag: flag,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: asynchronous,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func DDLogDebug(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
@@ -114,12 +205,23 @@ public func DDLogDebug(_ message: @autoclosure () -> Any,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous async: Bool = asyncLoggingEnabled,
|
||||
asynchronous async: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(), level: level, flag: .debug, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .debug,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: async,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func DDLogInfo(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
@@ -127,12 +229,23 @@ public func DDLogInfo(_ message: @autoclosure () -> Any,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous async: Bool = asyncLoggingEnabled,
|
||||
asynchronous async: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(), level: level, flag: .info, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .info,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: async,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func DDLogWarn(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
@@ -140,12 +253,23 @@ public func DDLogWarn(_ message: @autoclosure () -> Any,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous async: Bool = asyncLoggingEnabled,
|
||||
asynchronous async: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(), level: level, flag: .warning, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .warning,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: async,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func DDLogVerbose(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
@@ -153,12 +277,23 @@ public func DDLogVerbose(_ message: @autoclosure () -> Any,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous async: Bool = asyncLoggingEnabled,
|
||||
asynchronous async: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(), level: level, flag: .verbose, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .verbose,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: async,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
@available(*, deprecated, message: "Use an interpolated DDLogMessageFormat instead")
|
||||
@inlinable
|
||||
@_disfavoredOverload
|
||||
public func DDLogError(_ message: @autoclosure () -> Any,
|
||||
level: DDLogLevel = DDDefaultLogLevel,
|
||||
context: Int = 0,
|
||||
@@ -166,28 +301,16 @@ public func DDLogError(_ message: @autoclosure () -> Any,
|
||||
function: StaticString = #function,
|
||||
line: UInt = #line,
|
||||
tag: Any? = nil,
|
||||
asynchronous async: Bool = false,
|
||||
asynchronous async: Bool? = nil,
|
||||
ddlog: DDLog = .sharedInstance) {
|
||||
_DDLogMessage(message(), level: level, flag: .error, context: context, file: file, function: function, line: line, tag: tag, asynchronous: async, ddlog: ddlog)
|
||||
}
|
||||
|
||||
/// Returns a String of the current filename, without full path or extension.
|
||||
///
|
||||
/// Analogous to the C preprocessor macro `THIS_FILE`.
|
||||
public func currentFileName(_ fileName: StaticString = #file) -> String {
|
||||
var str = String(describing: fileName)
|
||||
if let idx = str.range(of: "/", options: .backwards)?.upperBound {
|
||||
str = String(str[idx...])
|
||||
}
|
||||
if let idx = str.range(of: ".", options: .backwards)?.lowerBound {
|
||||
str = String(str[..<idx])
|
||||
}
|
||||
return str
|
||||
}
|
||||
|
||||
// swiftlint:disable identifier_name
|
||||
// swiftlint doesn't like func names that begin with a capital letter - deprecated
|
||||
@available(*, deprecated, message: "Please use currentFileName", renamed: "currentFileName")
|
||||
public func CurrentFileName(_ fileName: StaticString = #file) -> String {
|
||||
return currentFileName(fileName)
|
||||
_DDLogMessage(message(),
|
||||
level: level,
|
||||
flag: .error,
|
||||
context: context,
|
||||
file: file,
|
||||
function: function,
|
||||
line: line,
|
||||
tag: tag,
|
||||
asynchronous: async ?? false,
|
||||
ddlog: ddlog)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user