Revert "Integrate new GBK changes"

This reverts commit ff1bee1.

Author: kean

WordPress/Classes/Services/BlockEditorCache.swift

@@ -0,0 +1,50 @@
+import Foundation
+import CryptoKit
+import WordPressShared
+import WordPressData
+
+final actor BlockEditorCache {
+    static let shared = BlockEditorCache()
+
+    private let rootURL: URL
+    private let blockSettingsURL: URL
+
+    private init() {
+        rootURL = URL.cachesDirectory
+            .appendingPathComponent("GutenbergKit", isDirectory: true)
+        blockSettingsURL = rootURL
+            .appendingPathComponent("BlockSettings", isDirectory: true)
+    }
+
+    // MARK: - Block Settings
+    func saveBlockSettings(_ settings: Data, for blogID: String) throws {
+        try FileManager.default.createDirectory(at: blockSettingsURL, withIntermediateDirectories: true)
+
+        let fileURL = makeBlockSettingsURL(for: blogID)
+        try settings.write(to: fileURL)
+    }
+
+    func getBlockSettings(for blogID: String) throws -> Data? {
+        let fileURL = makeBlockSettingsURL(for: blogID)
+
+        guard FileManager.default.fileExists(atPath: fileURL.path) else {
+            return nil
+        }
+
+        return try Data(contentsOf: fileURL)
+    }
+
+    func deleteBlockSettings(for blogID: String) throws {
+        let fileURL = makeBlockSettingsURL(for: blogID)
+        try FileManager.default.removeItem(at: fileURL)
+    }
+
+    func makeBlockSettingsURL(for blogID: String) -> URL {
+        return blockSettingsURL.appendingPathComponent("\(blogID).json")
+    }
+
+    // MARK: - Misc
+    func deleteAll() throws {
+        try FileManager.default.removeItem(at: rootURL)
+    }
+}

WordPress/Classes/Services/RawBlockEditorSettingsService.swift

@@ -0,0 +1,58 @@
+import Foundation
+import WordPressData
+import WordPressKit
+import WordPressShared
+
+final class RawBlockEditorSettingsService {
+
+    private let blogID: String
+    private var refreshTask: Task<Data, Error>?
+    private let dotOrgRestAPI: WordPressOrgRestApi
+    private var prefetchTask: Task<Void, Never>?
+
+    @MainActor
+    init(blog: Blog) {
+        self.dotOrgRestAPI = WordPressOrgRestApi(blog: blog)!
+        self.blogID = blog.locallyUniqueId
+    }
+
+    private func fetchSettingsFromAPI() async throws -> Data {
+        let response: WordPressAPIResult<Data, WordPressOrgRestApiError> = await dotOrgRestAPI.get(
+            path: "/wp-block-editor/v1/settings"
+        )
+
+        let data = try response.get() // Unwrap the result type
+        try await BlockEditorCache.shared.saveBlockSettings(data, for: blogID)
+
+        return data
+    }
+
+    /// Returns cached settings if available. If not, fetches the settings from
+    /// the network.
+    func getSettings(allowingCachedResponse: Bool = true) async throws -> Data {
+        // Return cached settings if available
+        if allowingCachedResponse, let cachedSettings = try await BlockEditorCache.shared.getBlockSettings(for: blogID) {
+            return cachedSettings
+        }
+        return try await fetchSettingsFromAPI()
+    }
+
+    func getSettingsString(allowingCachedResponse: Bool = true) async throws -> String {
+        let data = try await getSettings(allowingCachedResponse: allowingCachedResponse)
+        guard let string = String(data: data, encoding: .utf8) else {
+            throw CocoaError(.fileReadCorruptFile)
+        }
+        return string
+    }
+
+    func prefetchSettings() {
+        guard self.prefetchTask == nil else { return }
+        self.prefetchTask = Task {
+            do {
+                _ = try await fetchSettingsFromAPI()
+            } catch {
+                debugPrint("Failed to prefetch block editor settings: \(error)")
+            }
+        }
+    }
+}

WordPress/Classes/Utility/AccountHelper.swift

@@ -111,6 +111,9 @@ import WordPressData
         // This is best-effort for now – eventually all of this should be async
         Task {
             do {
+                // Delete all cached block editor settings
+                try await BlockEditorCache.shared.deleteAll()
+
                 // Delete everything in the disk cache
                 try await DiskCache().removeAll()
             } catch {

WordPress/Classes/Utility/Editor/EditorConfiguration+Blog.swift

@@ -61,9 +61,7 @@ extension EditorConfiguration {
                 }
 
                 editorAssetsEndpoint.appendPathComponent("editor-assets")
-                builder = builder.setEditorAssetsEndpoint(editorAssetsEndpoint.appending(queryItems: [
-                    URLQueryItem(name: "exclude", value: "core,gutenberg")
-                ]))
+                builder = builder.setEditorAssetsEndpoint(editorAssetsEndpoint)
             }
         }
 

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -357,6 +357,8 @@ final class MySiteViewController: UIViewController, UIScrollViewDelegate, NoSite
 
         let configuration = EditorConfiguration(blog: blog)
         GutenbergKit.EditorViewController.warmup(configuration: configuration)
+
+        RawBlockEditorSettingsService(blog: blog).prefetchSettings()
     }
 
     // MARK: - Main Blog

WordPress/Classes/ViewRelated/Comments/Controllers/Editor/CommentGutenbergEditorViewController.swift

@@ -89,7 +89,7 @@ extension CommentGutenbergEditorViewController: GutenbergKit.EditorViewControlle
         // Do nothing
     }
 
-    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) {
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) {
         // Do nothing
     }
 

WordPress/Classes/ViewRelated/NewGutenberg/NewGutenbergViewController.swift

@@ -53,6 +53,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     }
 
     struct EditorDependencies {
+        let settings: String?
         let didLoadCookies: Bool
     }
 
@@ -99,6 +100,14 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
 
     let navigationBarManager: PostEditorNavigationBarManager
 
+    // MARK: - Private variables
+
+    // TODO: reimplemet
+//    internal private(set) var contentInfo: ContentInfo?
+    lazy var editorSettingsService: BlockEditorSettingsService? = {
+        BlockEditorSettingsService(blog: post.blog, coreDataStack: ContextManager.shared)
+    }()
+
     // MARK: - GutenbergKit
 
     private var editorViewController: GutenbergKit.EditorViewController
@@ -138,6 +147,8 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     func setHTML(_ html: String) {}
     func getHTML() -> String { post.content ?? "" }
 
+    private let blockEditorSettingsService: RawBlockEditorSettingsService
+
     // MARK: - Initializers
     required convenience init(
         post: AbstractPost,
@@ -179,6 +190,8 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
             mediaPicker: MediaPickerController(blog: post.blog)
         )
 
+        self.blockEditorSettingsService = RawBlockEditorSettingsService(blog: post.blog)
+
         super.init(nibName: nil, bundle: nil)
 
         self.editorViewController.delegate = self
@@ -256,7 +269,7 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
                     case .loadingDependencies: preconditionFailure("Dependencies should not still be loading")
                     case .loadingCancelled: preconditionFailure("Dependency loading should not be cancelled")
                     case .dependencyError(let error): self.showEditorError(error)
-                    case .dependenciesReady(let dependencies): try await self.startEditor()
+                    case .dependenciesReady(let dependencies): try await self.startEditor(settings: dependencies.settings)
                     case .started: preconditionFailure("The editor should not already be started")
                 }
             } catch {
@@ -372,18 +385,23 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
         }
 
         self.editorState = .loadingDependencies(Task {
-            let dependencies = await fetchEditorDependencies()
-            self.editorState = .dependenciesReady(dependencies)
+            do {
+                let dependencies = try await fetchEditorDependencies()
+                self.editorState = .dependenciesReady(dependencies)
+            } catch {
+                self.editorState = .dependencyError(error)
+            }
         })
     }
 
     @MainActor
-    func startEditor() async throws {
+    func startEditor(settings: String?) async throws {
         guard case .dependenciesReady = self.editorState else {
             preconditionFailure("`startEditor` should only be called when the editor is in the `.dependenciesReady` state.")
         }
 
         let updatedConfiguration = self.editorViewController.configuration.toBuilder()
+            .apply(settings) { $0.setEditorSettings($1) }
             .setTitle(post.postTitle ?? "")
             .setContent(post.content ?? "")
             .setNativeInserterEnabled(FeatureFlag.nativeBlockInserter.enabled)
@@ -463,11 +481,18 @@ class NewGutenbergViewController: UIViewController, PostEditor, PublishingEditor
     }
 
     // MARK: - Editor Setup
+    private func fetchEditorDependencies() async throws -> EditorDependencies {
+        let settings: String?
+        do {
+            settings = try await blockEditorSettingsService.getSettingsString(allowingCachedResponse: true)
+        } catch {
+            DDLogError("Failed to fetch editor settings: \(error)")
+            settings = nil
+        }
 
-    // TODO: refactor
-    private func fetchEditorDependencies() async -> EditorDependencies {
         let loaded = await loadAuthenticationCookiesAsync()
-        return EditorDependencies(didLoadCookies: loaded)
+
+        return EditorDependencies(settings: settings, didLoadCookies: loaded)
     }
 
     private func loadAuthenticationCookiesAsync() async -> Bool {
@@ -548,7 +573,7 @@ extension NewGutenbergViewController: GutenbergKit.EditorViewControllerDelegate
         }
     }
 
-    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.EditorLogLevel) {
+    func editor(_ viewController: GutenbergKit.EditorViewController, didLogMessage message: String, level: GutenbergKit.LogLevel) {
         // Do nothing
     }