Skip to content

fix(): prevent iOS startup hang while loading protocol modules #305

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
PeratX wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(): prevent iOS startup hang while loading protocol modules #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 18 additions & 27 deletions ios/App/App/Helpers/JS.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,36 +32,22 @@ class JSAsyncResult: NSObject, Identifiable, WKScriptMessageHandler {
private static let fieldError: String = "error"

public let id: String
private var resultManager: ResultManager
private let listenerRegistry: ListenerRegistry

init(id: String = "\(JSAsyncResult.defaultName)\(Int(Date().timeIntervalSince1970))") {
self.id = id
self.resultManager = .init()
self.listenerRegistry = .init()
}

func createID() async -> String {
let id = await listenerRegistry.createID()
await listenerRegistry.add(forID: id) { [weak self] result in
let selfWeak = self
Task {
await selfWeak?.resultManager.setResult(result, forID: id)
}
}

return id
await listenerRegistry.createID()
}

func awaitResultWithID(_ id: String) async throws -> Any {
return try await withCheckedThrowingContinuation { continuation in
Task {
if let result = await resultManager.result[id] {
await listenerRegistry.add(forID: id) { result in
continuation.resume(with: result)
} else {
await listenerRegistry.add(forID: id) { result in
continuation.resume(with: result)
}
}
}
}
Expand Down Expand Up @@ -91,16 +77,9 @@ class JSAsyncResult: NSObject, Identifiable, WKScriptMessageHandler {
}
}

private actor ResultManager {
private(set) var result: [String: Result<Any, Error>] = [:]

func setResult(_ result: Result<Any, Error>, forID id: String) {
self.result[id] = result
}
}

private actor ListenerRegistry {
private(set) var listeners: [String: [Listener]] = [:]
private var results: [String: Result<Any, Error>] = [:]

func createID() -> String {
let id = UUID().uuidString
Expand All @@ -110,17 +89,29 @@ class JSAsyncResult: NSObject, Identifiable, WKScriptMessageHandler {
}

func add(forID id: String, _ listener: @escaping Listener) {
listeners[id]?.append(listener)
if let result = results.removeValue(forKey: id) {
listener(result)
} else if listeners[id] != nil {
listeners[id]?.append(listener)
} else {
listener(.failure(JSError.unknownResultID(id)))
}
}

func notifyAllWithID(_ id: String, with result: Result<Any, Error>) {
listeners[id]?.forEach { $0(result) }
listeners.removeValue(forKey: id)
guard let listeners = listeners.removeValue(forKey: id) else { return }

if listeners.isEmpty {
results[id] = result
} else {
listeners.forEach { $0(result) }
}
}
}
}

enum JSError: Swift.Error {
case invalidJSON
case fromScript(Any)
case unknownResultID(String)
}
2 changes: 1 addition & 1 deletion src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ export class AppComponent implements AfterViewInit {

if (this.platform.is('hybrid')) {
this.statusBar.setStyle({ style: Style.Dark })
this.statusBar.setBackgroundColor({ color: '#311B58' })
this.splashScreen.hide()

await this.securityUtils.toggleAutomaticAuthentication({ automatic: true })
}

if (this.platform.is('android')) {
this.statusBar.setBackgroundColor({ color: '#311B58' })
await EdgeToEdge.setBackgroundColor({ color: '#311B58' })
}

Expand Down