Merge branch 'trunk' into wordpresskit-error-refactor

Author: crazytonyli

Podfile

@@ -114,7 +114,7 @@ abstract_target 'Apps' do
   pod 'AppCenter', app_center_version, configurations: app_center_configurations
   pod 'AppCenter/Distribute', app_center_version, configurations: app_center_configurations
 
-  pod 'Starscream', '3.0.6'
+  pod 'Starscream', '~> 4.0'
   pod 'SVProgressHUD', '2.2.5'
   pod 'ZendeskSupportSDK', '5.3.0'
   pod 'AlamofireImage', '3.5.2'

Podfile.lock

@@ -56,7 +56,7 @@ PODS:
     - SentryPrivate (= 8.18.0)
   - SentryPrivate (8.18.0)
   - Sodium (0.9.1)
-  - Starscream (3.0.6)
+  - Starscream (4.0.6)
   - SVProgressHUD (2.2.5)
   - SwiftLint (0.54.0)
   - UIDeviceIdentifier (2.3.0)
@@ -115,7 +115,7 @@ DEPENDENCIES:
   - OCMock (~> 3.4.3)
   - OHHTTPStubs/Swift (~> 9.1.0)
   - Reachability (= 3.2)
-  - Starscream (= 3.0.6)
+  - Starscream (~> 4.0)
   - SVProgressHUD (= 2.2.5)
   - SwiftLint (~> 0.50)
   - WordPress-Editor-iOS (~> 1.19.9)
@@ -216,7 +216,7 @@ SPEC CHECKSUMS:
   Sentry: 8984a4ffb2b9bd2894d74fb36e6f5833865bc18e
   SentryPrivate: 2f0c9ba4c3fc993f70eab6ca95673509561e0085
   Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
-  Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
+  Starscream: fb2c4510bebf908c62bd383bcf05e673720e91fd
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
@@ -236,6 +236,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
   ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced
 
-PODFILE CHECKSUM: e000a2048651eeea961e5c16e130a60d9c7cd1b9
+PODFILE CHECKSUM: 91ca97cb58a7ec8391611ea499d341d47f633cda
 
 COCOAPODS: 1.14.2

RELEASE-NOTES.txt

@@ -1,5 +1,7 @@
 24.3
 -----
+* [***] [internal] Refactored websocket connections to Pinghub. [#22611]
+
 * [**] Multiple pre-publishing sheet fixes and improvements [#22606]
 * [*] Gravatar: Adds informative new view about Gravatar to the profile editing page. [#22615]
 * [**] [internal] Refactored .org REST API calls. [#22612]

WordPress/Classes/Networking/Pinghub.swift

@@ -46,8 +46,8 @@ public class PinghubClient {
 
     /// Initializes the client with an OAuth2 token.
     ///
-    public convenience init(token: String) {
-        let socket = starscreamSocket(url: PinghubClient.endpoint, token: token)
+    public convenience init(token: String, endpoint: URL? = nil) {
+        let socket = starscreamSocket(url: endpoint ?? PinghubClient.endpoint, token: token)
         self.init(socket: socket)
     }
 
@@ -83,14 +83,17 @@ public class PinghubClient {
             guard let client = self else {
                 return
             }
-            let error = error as NSError?
-            let filteredError: NSError? = error.flatMap({ error in
-                // Filter out normal disconnects that we initiated
-                if error.domain == WebSocket.ErrorDomain && error.code == Int(CloseCode.normal.rawValue) {
-                    return nil
-                }
-                return error
-            })
+
+            let filteredError: Error?
+
+            if (error as? WSError)?.code == UInt16(CloseCode.normal.rawValue) {
+                filteredError = nil
+            } else if (error as? ConnectionClosed)?.code == .normalClosure {
+                filteredError = nil
+            } else {
+                filteredError = error
+            }
+
             client.delegate?.pinghubDidDisconnect(client, error: filteredError)
         }
         socket.onData = { [weak self] data in
@@ -218,13 +221,85 @@ internal protocol Socket: AnyObject {
 // MARK: - Starscream
 
 private func starscreamSocket(url: URL, token: String) -> Socket {
-    var request = URLRequest(url: PinghubClient.endpoint)
+    var request = URLRequest(url: url)
     request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
-    return WebSocket(request: request)
+    return StarscreamWebSocket(socket: WebSocket(request: request))
+}
+
+private class StarscreamWebSocket: Socket {
+
+    var onConnect: (() -> Void)?
+    var onDisconnect: ((Error?) -> Void)?
+    var onText: ((String) -> Void)?
+    var onData: ((Data) -> Void)?
+
+    let socket: WebSocket
+
+    init(socket: WebSocket) {
+        self.socket = socket
+
+        socket.onEvent = { [weak self] event in
+            guard let self else { return }
+
+            switch event {
+            case .connected:
+                self.onConnect?()
+            case let .disconnected(_, code):
+                self.onDisconnect?(ConnectionClosed(code: Int(code)))
+            case .peerClosed:
+                // Remote peer has closed the network connection. See `ConnectionState.peerClosed`.
+                self.onDisconnect?(ConnectionClosed(code: .normal))
+            case let .text(text):
+                self.onText?(text)
+            case let .binary(data):
+                self.onData?(data)
+            case let .error(error):
+                self.onDisconnect?(error)
+            case .pong, .ping, .viabilityChanged, .reconnectSuggested, .cancelled:
+                break
+            }
+        }
+    }
+
+    func connect() {
+        socket.connect()
+    }
+
+    func disconnect() {
+        socket.disconnect()
+    }
+
 }
 
-extension WebSocket: Socket {
-    @objc func disconnect() {
-        disconnect(forceTimeout: nil)
+private struct ConnectionClosed: Error {
+    var code: URLSessionWebSocketTask.CloseCode
+
+    init(code: Int) {
+        self.code = .init(rawValue: code) ?? .protocolError
+    }
+
+    init(code: URLSessionWebSocketTask.CloseCode) {
+        self.code = code
+    }
+
+    init(code: Starscream.CloseCode) {
+        switch code {
+        case .normal:
+            self.code = .normalClosure
+        case .goingAway:
+            self.code = .goingAway
+        case .protocolError:
+            self.code = .protocolError
+        case .protocolUnhandledType:
+            self.code = .unsupportedData
+        case .noStatusReceived:
+            self.code = .noStatusReceived
+        case .encoding:
+            self.code = .invalidFramePayloadData
+        case .policyViolated:
+            self.code = .policyViolation
+        case .messageTooBig:
+            self.code = .messageTooBig
+        }
     }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackFeaturesRemovalCoordinator.swift

@@ -238,12 +238,6 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
 
         let coordinator = JetpackDefaultOverlayCoordinator()
         let viewModel = JetpackFullscreenOverlayGeneralViewModel(phase: phase, source: source, blog: blog, coordinator: coordinator)
-        let overlayViewController = JetpackFullscreenOverlayViewController(with: viewModel)
-        let navigationViewController = UINavigationController(rootViewController: overlayViewController)
-        coordinator.navigationController = navigationViewController
-        coordinator.viewModel = viewModel
-        viewModel.onWillDismiss = onWillDismiss
-        viewModel.onDidDismiss = onDidDismiss
         let frequencyTracker = OverlayFrequencyTracker(source: source,
                                                        type: .featuresRemoval,
                                                        frequencyConfig: frequencyConfig,
@@ -253,6 +247,12 @@ class JetpackFeaturesRemovalCoordinator: NSObject {
             onDidDismiss?()
             return
         }
+        let overlayViewController = JetpackFullscreenOverlayViewController(with: viewModel)
+        let navigationViewController = UINavigationController(rootViewController: overlayViewController)
+        coordinator.navigationController = navigationViewController
+        coordinator.viewModel = viewModel
+        viewModel.onWillDismiss = onWillDismiss
+        viewModel.onDidDismiss = onDidDismiss
         presentOverlay(navigationViewController: navigationViewController, in: viewController, fullScreen: fullScreen)
         frequencyTracker.track()
     }

WordPress/Classes/ViewRelated/Post/Prepublishing/PublishButton.swift

@@ -0,0 +1,124 @@
+import SwiftUI
+
+struct PublishButton: View {
+    @ObservedObject var viewModel: PublishButtonViewModel
+
+    var body: some View {
+        ZStack {
+            Button(action: viewModel.onSubmitTapped) {
+                Text(viewModel.title)
+                    .font(.title3.weight(.medium))
+                    .frame(maxWidth: .infinity)
+                    .opacity(isDisabled ? 0 : 1)
+            }
+            .buttonStyle(.borderedProminent)
+            .controlSize(.large)
+            .disabled(isDisabled)
+            .buttonBorderShape(.roundedRectangle(radius: 8))
+
+            switch viewModel.state {
+            case .default:
+                EmptyView()
+            case .loading:
+                ProgressView()
+                    .tint(Color.secondary)
+            case let .uploading(title, progress):
+                HStack(spacing: 10) {
+                    ProgressView()
+                        .tint(Color.secondary)
+
+                    VStack(alignment: .leading) {
+                        Text(title)
+                            .font(.subheadline.weight(.medium))
+                        if let progress {
+                            Text(Strings.progress(progress))
+                                .foregroundStyle(Color.secondary)
+                                .font(.footnote)
+                                .monospacedDigit()
+                        }
+                    }
+                    .lineLimit(1)
+                    .foregroundStyle(Color.primary)
+
+                    Spacer()
+                }
+                .padding(.horizontal)
+            case let .failed(title, details, onRetryTapped):
+                HStack {
+                    Image(systemName: "exclamationmark.triangle.fill")
+                        .foregroundStyle(Color.red)
+                    VStack(alignment: .leading) {
+                        Text(title)
+                            .font(.subheadline.weight(.medium))
+                            .foregroundStyle(.primary)
+                        if let details {
+                            Text(details)
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
+                        }
+                    }
+                    .lineLimit(1)
+
+                    Spacer()
+
+                    if let onRetryTapped {
+                        Button(Strings.retry, action: onRetryTapped)
+                            .font(.subheadline)
+                    }
+                }
+                .padding(.horizontal)
+            }
+        }
+    }
+
+    private var isDisabled: Bool {
+        switch viewModel.state {
+        case .default: false
+        case .loading, .uploading, .failed: true
+        }
+    }
+}
+
+final class PublishButtonViewModel: ObservableObject {
+    let title: String
+    let onSubmitTapped: () -> Void
+    @Published var state: PublishButtonState = .default
+
+    init(title: String, onSubmitTapped: @escaping () -> Void, state: PublishButtonState = .default) {
+        self.title = title
+        self.onSubmitTapped = onSubmitTapped
+        self.state = state
+    }
+}
+
+enum PublishButtonState {
+    case `default`
+    case loading
+    case uploading(title: String, progress: Progress?)
+    case failed(title: String, details: String? = nil, onRetryTapped: (() -> Void)? = nil)
+
+    struct Progress {
+        let completed: Int64
+        let total: Int64
+    }
+}
+
+private enum Strings {
+    static func progress(_ progress: PublishButtonState.Progress) -> String {
+        let format = NSLocalizedString("publishButton.progress", value: "%@ of %@", comment: "Shows the download or upload progress with two parameters: preformatted completed and total bytes")
+        return String(format: format, ByteCountFormatter.string(fromByteCount: progress.completed, countStyle: .file), ByteCountFormatter.string(fromByteCount: progress.total, countStyle: .file))
+    }
+
+    static let retry = NSLocalizedString("publishButton.retry", value: "Retry", comment: "Retry button title")
+}
+
+#Preview {
+    VStack(spacing: 16) {
+        PublishButton(viewModel: .init(title: "Publish", onSubmitTapped: {}, state: .default))
+        PublishButton(viewModel: .init(title: "Publish", onSubmitTapped: {}, state: .loading))
+        PublishButton(viewModel: .init(title: "Publish", onSubmitTapped: {}, state: .uploading(title: "Uploading media...", progress: .init(completed: 100, total: 2000))))
+        PublishButton(viewModel: .init(title: "Publish", onSubmitTapped: {}, state: .failed(title: "Failed to upload media")))
+        PublishButton(viewModel: .init(title: "Publish", onSubmitTapped: {}, state: .failed(title: "Failed to upload media", details: "Not connected to Internet", onRetryTapped: {})))
+    }
+    .padding()
+}

WordPress/Classes/ViewRelated/Reader/ReaderCommentAction.swift

@@ -13,6 +13,7 @@ final class ReaderCommentAction {
         controller.navigateToCommentID = navigateToCommentID as NSNumber?
         controller.promptToAddComment = promptToAddComment
         controller.trackCommentsOpened()
+        controller.hidesBottomBarWhenPushed = true
         origin.navigationController?.pushViewController(controller, animated: true)
     }
 }

WordPress/Classes/ViewRelated/Stats/Shared Views/StatsTotalRow.swift

@@ -233,8 +233,8 @@ private extension StatsTotalRow {
     func applyStyles() {
         backgroundColor = .listForeground
         contentView.backgroundColor = .listForeground
-        Style.configureLabelAsCellValueTitle(itemLabel)
-        Style.configureLabelAsCellValue(itemDetailLabel)
+        Style.configureLabelAsCellRowTitle(itemLabel)
+        Style.configureLabelItemDetail(itemDetailLabel)
         Style.configureLabelAsData(dataLabel)
         Style.configureViewAsSeparator(separatorLine)
         Style.configureViewAsSeparator(topExpandedSeparatorLine)

WordPress/Resources/ar.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-02-12 21:54:07+0000 */
+/* Translation-Revision-Date: 2024-02-14 13:54:08+0000 */
 /* Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5)))); */
 /* Generator: GlotPress/4.0.0-beta.2 */
 /* Language: ar */
@@ -11108,6 +11108,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Title for PHP logs screen. */
 "siteMonitoring.phpLogs" = "سجلات PHP";
 
+/* Title for web server log screen. */
+"siteMonitoring.webServerLogs" = "سجلات خادم الويب";
+
 /* Title for screen to select the privacy options for a blog */
 "siteSettings.privacy.title" = "الخصوصية";
 

WordPress/Resources/de.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-/* Translation-Revision-Date: 2024-02-12 11:54:07+0000 */
+/* Translation-Revision-Date: 2024-02-13 14:31:33+0000 */
 /* Plural-Forms: nplurals=2; plural=n != 1; */
 /* Generator: GlotPress/4.0.0-beta.2 */
 /* Language: de */
@@ -11173,6 +11173,9 @@ Example: given a notice format "Following %@" and empty site name, this will be
 /* Title for PHP logs screen. */
 "siteMonitoring.phpLogs" = "PHP-Protokolle";
 
+/* Title for web server log screen. */
+"siteMonitoring.webServerLogs" = "Webserver-Protokolle";
+
 /* Title for screen to select the privacy options for a blog */
 "siteSettings.privacy.title" = "Datenschutz";