[Enhancement]Migrate sdk signaling core infra onto stream core swift

DemoApp/Sources/Models/TokenResponse.swift

@@ -3,9 +3,8 @@
 //
 
 import Foundation
-import StreamVideo
 
-struct TokenResponse: Codable, ReflectiveStringConvertible {
+struct TokenResponse: Codable {
     let userId: String
     let token: String
     let apiKey: String

Package.swift

@@ -23,26 +23,35 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-protobuf.git", exact: "1.30.0"),
-        .package(url: "https://github.com/GetStream/stream-video-swift-webrtc.git", exact: "145.8.0")
+        .package(url: "https://github.com/GetStream/stream-video-swift-webrtc.git", exact: "145.8.0"),
+        .package(url: "https://github.com/GetStream/stream-core-swift.git", branch: "develop")
     ],
     targets: [
         .target(
             name: "StreamVideo",
             dependencies: [
                 .product(name: "SwiftProtobuf", package: "swift-protobuf"),
-                .product(name: "StreamWebRTC", package: "stream-video-swift-webrtc")
+                .product(name: "StreamWebRTC", package: "stream-video-swift-webrtc"),
+                .product(name: "StreamCore", package: "stream-core-swift")
             ]
         ),
         .target(
             name: "StreamVideoSwiftUI",
-            dependencies: ["StreamVideo"],
+            dependencies: [
+                "StreamVideo",
+                .product(name: "StreamCore", package: "stream-core-swift")
+            ],
             resources: [
                 .process("Resources")
             ]
         ),
         .target(
             name: "StreamVideoUIKit",
-            dependencies: ["StreamVideo", "StreamVideoSwiftUI"]
+            dependencies: [
+                "StreamVideo",
+                "StreamVideoSwiftUI",
+                .product(name: "StreamCore", package: "stream-core-swift")
+            ]
         )
     ]
 )

Scripts/generate.sh

@@ -22,5 +22,21 @@ rm -rf "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/"*
   go run . openapi generate-client --language swift --spec "$SOURCE_PATH/releases/v2/video-openapi-clientside.yaml" --output "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/"
 )
 
+# Shared OpenAPI types are provided by StreamCore.
+rm -f \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/APIHelper.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/CodableHelper.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Extensions.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/JSONDataEncoding.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/OpenISO8601DateFormatter.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/APIError.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/ConnectUserDetailsRequest.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/CreateDeviceRequest.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/Device.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/ListDevicesResponse.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/ModelResponse.swift" \
+  "$PROJECT_ROOT/Sources/StreamVideo/OpenApi/generated/Models/WSAuthMessageRequest.swift"
+
 # format the generated code
 swiftformat Sources/StreamVideo/OpenApi/generated

Scripts/generateCode.sh

@@ -38,6 +38,22 @@ cp ${OPENAPI_GENERATED_CODE_ROOT}/tmp/OpenAPIClient/Classes/OpenAPIs/*.swift ${O
 cp ${OPENAPI_GENERATED_CODE_ROOT}/tmp/OpenAPIClient/Classes/OpenAPIs/APIs/DefaultAPI.swift ${OPENAPI_GENERATED_CODE_ROOT}/APIs/
 mv ${OPENAPI_GENERATED_CODE_ROOT}/tmp/OpenAPIClient/Classes/OpenAPIs/Models ${OPENAPI_GENERATED_CODE_ROOT}
 
+# Shared OpenAPI types are provided by StreamCore.
+rm -f \
+    "${OPENAPI_GENERATED_CODE_ROOT}/APIHelper.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/CodableHelper.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Extensions.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/JSONDataEncoding.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/OpenISO8601DateFormatter.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/APIError.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/ConnectUserDetailsRequest.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/CreateDeviceRequest.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/Device.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/ListDevicesResponse.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/ModelResponse.swift" \
+    "${OPENAPI_GENERATED_CODE_ROOT}/Models/WSAuthMessageRequest.swift"
+
 # delete the tmp path
 rm -rf "${OPENAPI_GENERATED_CODE_ROOT}/tmp"
 

Sources/StreamVideo/Call.swift

@@ -5,6 +5,7 @@
 import AVFoundation
 import Combine
 import Foundation
+import StreamCore
 import StreamWebRTC
 
 /// Observable object that provides info about the call state, as well as methods for updating it.

Sources/StreamVideo/CallKit/CallKitService.swift

@@ -6,6 +6,7 @@ import AVFoundation
 import CallKit
 import Combine
 import Foundation
+import StreamCore
 import StreamWebRTC
 
 /// Manages CallKit integration for VoIP calls.

Sources/StreamVideo/CallState.swift

@@ -4,6 +4,7 @@
 
 import Combine
 import Foundation
+import StreamCore
 
 @MainActor
 public class CallState: ObservableObject {

Sources/StreamVideo/CallStateMachine/Stages/Call+Stage.swift

@@ -4,6 +4,7 @@
 
 import Combine
 import Foundation
+import StreamCore
 
 extension Call.StateMachine {
     /// Represents a stage in the call state machine.

Sources/StreamVideo/Errors/Errors.swift

@@ -3,122 +3,11 @@
 //
 
 import Foundation
+import StreamCore
 
-extension Stream_Video_Sfu_Models_Error: Error, ReflectiveStringConvertible {}
-
-/// A Client error.
-public class ClientError: Error, CustomStringConvertible, @unchecked Sendable {
-    public struct Location: Equatable, Sendable, CustomStringConvertible {
-        public let file: String
-        public let line: Int
-        public var description: String { "{ file:\(file), line:\(line) }" }
-    }
-
-    /// The file and line number which emitted the error.
-    public let location: Location?
-
-    private let message: String?
-
-    /// An underlying error.
-    public let underlyingError: Error?
-
-    public let apiError: APIError?
-
-    var errorDescription: String? {
-        if let apiError {
-            return apiError.message
-        } else {
-            return underlyingError.map(String.init(describing:))
-        }
-    }
-
-    /// Retrieve the localized description for this error.
-    public var localizedDescription: String { message ?? errorDescription ?? "" }
-
-    public var description: String {
-        var result = "ClientError {"
-        result += " location:\(location)"
-        if let message {
-            result += " message:\(message)"
-        }
-        if let apiError {
-            result += ", apiError:\(apiError)"
-        }
-        if let underlyingError {
-            result += ", underlyingError:\(underlyingError)"
-        }
-        if let errorDescription {
-            result += ", errorDescription:\(errorDescription)"
-        }
-        result += " }"
-        return result
-    }
-
-    /// A client error based on an external general error.
-    /// - Parameters:
-    ///   - error: an external error.
-    ///   - file: a file name source of an error.
-    ///   - line: a line source of an error.
-    public init(with error: Error? = nil, _ file: StaticString = #fileID, _ line: UInt = #line) {
-        underlyingError = error
-        message = error?.localizedDescription ?? nil
-        location = .init(file: "\(file)", line: Int(line))
-        if let aErr = error as? APIError {
-            apiError = aErr
-        } else {
-            apiError = nil
-        }
-    }
-
-    /// An error based on a message.
-    /// - Parameters:
-    ///   - message: an error message.
-    ///   - file: a file name source of an error.
-    ///   - line: a line source of an error.
-    public init(_ message: String, _ file: StaticString = #fileID, _ line: UInt = #line) {
-        self.message = message
-        location = .init(file: "\(file)", line: Int(line))
-        underlyingError = nil
-        apiError = nil
-    }
-}
-
-extension ClientError {
-    /// An unexpected error.
-    public final class Unexpected: ClientError, @unchecked Sendable {}
-
-    /// An unknown error.
-    public final class Unknown: ClientError, @unchecked Sendable {}
-
-    /// Networking error.
-    public final class NetworkError: ClientError, @unchecked Sendable {}
-
-    /// Represents a network-related error indicating that the network is unavailable.
-    public final class NetworkNotAvailable: ClientError, @unchecked Sendable {}
-
-    /// Permissions error.
-    public final class MissingPermissions: ClientError, @unchecked Sendable {}
-
-    /// Invalid url error.
-    public final class InvalidURL: ClientError, @unchecked Sendable {}
-}
-
-// This should probably live only in the test target since it's not "true" equatable
-extension ClientError: Equatable {
-    public static func == (lhs: ClientError, rhs: ClientError) -> Bool {
-        type(of: lhs) == type(of: rhs)
-            && String(describing: lhs.underlyingError) == String(describing: rhs.underlyingError)
-            && String(describing: lhs.localizedDescription) == String(describing: rhs.localizedDescription)
-    }
-}
-
-extension ClientError {
-    /// Returns `true` if underlaying error is `ErrorPayload` with code is inside invalid token codes range.
-    var isInvalidTokenError: Bool {
-        (underlyingError as? ErrorPayload)?.isInvalidTokenError == true
-            || apiError?.isTokenExpiredError == true
-    }
-}
+extension Stream_Video_Sfu_Models_Error:
+    Error,
+    ReflectiveStringConvertible {}
 
 extension Error {
     var isRateLimitError: Bool {
@@ -158,5 +47,3 @@ extension ClosedRange where Bound == Int {
 struct APIErrorContainer: Codable {
     let error: APIError
 }
-
-extension APIError: Error {}

Sources/StreamVideo/HTTPClient/HTTPUtils.swift

@@ -3,6 +3,7 @@
 //
 
 import Foundation
+import StreamCore
 
 extension URLRequest {
     var queryItems: [URLQueryItem] {