Skip to content

Change WordPressAPI and WordPressApiCache from actor to class #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
crazytonyli wants to merge 5 commits into
base: trunk
Choose a base branch
from
Open

Change WordPressAPI and WordPressApiCache from actor to class #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03b65dd
Change WordPressAPI and WordPressApiCache from actor to class
crazytonyli Dec 4, 2025
2d12162
Revert apiDelegate to private
crazytonyli Dec 4, 2025
bc972f7
Remove an unneeded `await`
crazytonyli Dec 8, 2025
5c5e9b1
Remove another unneeded await
crazytonyli Dec 8, 2025
263ecf2
Add sleep to make unit test pass
crazytonyli Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions native/swift/Sources/wordpress-api-cache/WordPressApiCache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Foundation
import WordPressAPIInternal

public actor WordPressApiCache {
public final class WordPressApiCache: Sendable {

private let cache: WpApiCache
public let cache: WpApiCache
private let delegate: any DatabaseDelegate

public struct Notifications {
Expand All @@ -24,12 +24,12 @@ public actor WordPressApiCache {
}

/// Creates a new in-memory cache
public init(delegate: DatabaseDelegate = ApiCacheDelegate()) throws {
public convenience init(delegate: DatabaseDelegate = ApiCacheDelegate()) throws {
try self.init(path: ":memory:", delegate: delegate)
}

/// Creates a new cache at the specified file system URL
public init(url: URL, delegate: DatabaseDelegate = ApiCacheDelegate()) throws {
public convenience init(url: URL, delegate: DatabaseDelegate = ApiCacheDelegate()) throws {
try self.init(path: url.absoluteString, delegate: delegate)
}

Expand All @@ -39,7 +39,7 @@ public actor WordPressApiCache {
self.delegate = delegate
}

public func performMigrations() async throws -> Int {
public func performMigrations() throws -> Int {
return Int(try self.cache.performMigrations())
}

Expand Down
12 changes: 6 additions & 6 deletions native/swift/Sources/wordpress-api/WordPressAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import FoundationNetworking
import Combine
#endif

public actor WordPressAPI {
public final class WordPressAPI: Sendable {

enum Errors: Error {
case unableToParseResponse
Expand All @@ -20,7 +20,7 @@ public actor WordPressAPI {
private let apiClientDelegate: WpApiClientDelegate
package let requestBuilder: UniffiWpApiClient

public init(
public convenience init(
urlSession: URLSession,
apiRootUrl: ParsedUrl,
authentication: WpAuthentication,
Expand All @@ -36,7 +36,7 @@ public actor WordPressAPI {
)
}

public init(
public convenience init(
urlSession: URLSession,
apiRootUrl: ParsedUrl,
authenticationProvider: WpAuthenticationProvider,
Expand All @@ -52,7 +52,7 @@ public actor WordPressAPI {
)
}

public init(
public convenience init(
urlSession: URLSession,
apiUrlResolver: ApiUrlResolver,
authenticationProvider: WpAuthenticationProvider,
Expand All @@ -68,7 +68,7 @@ public actor WordPressAPI {
)
}

public init(
public convenience init(
urlSession: URLSession,
siteUrl: String,
apiRootUrl: ParsedUrl,
Expand All @@ -93,7 +93,7 @@ public actor WordPressAPI {
)
}

public init(
public convenience init(
urlSession: URLSession,
details: AutoDiscoveryAttemptSuccess,
username: String,
Expand Down
11 changes: 7 additions & 4 deletions native/swift/Tests/wordpress-api-cache/WordPressApiCacheTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ actor Test {
}

@Test func testMigrationsWork() async throws {
let migrationsPerformed = try await self.cache.performMigrations()
let migrationsPerformed = try self.cache.performMigrations()
#expect(migrationsPerformed == 6)
}

Expand All @@ -26,11 +26,14 @@ actor Test {
}
}

await self.cache.startListeningForUpdates()
let migrationCount = try await self.cache.performMigrations()
// Wait for the observer Task to start running.
try await Task.sleep(nanoseconds: 100 * NSEC_PER_MSEC)

self.cache.startListeningForUpdates()
let migrationCount = try self.cache.performMigrations()

// Wait for NotificationCenter to finish delivery
try await Task.sleep(nanoseconds: 10 * NSEC_PER_MSEC)
try await Task.sleep(nanoseconds: 100 * NSEC_PER_MSEC)

#expect(migrationCount == self.changeCount)
handle.cancel()
Expand Down