Skip to content

fix: Simplify checks for wasm_bindgen availability in initialization #88

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

Merged
ahmtydn merged 1 commit into from
Apr 3, 2026
Merged

fix: Simplify checks for wasm_bindgen availability in initialization #88

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: 22 additions & 23 deletions packages/isar_plus/lib/src/web/web.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ FutureOr<IsarCoreBindings> initializePlatformBindings([String? library]) async {
if (!_scriptLoaded) {
// Check if wasm_bindgen is already available
final wasmBindgenExists = _windowWasmBindgen;
if (wasmBindgenExists == null ||
wasmBindgenExists.isUndefined ||
wasmBindgenExists.isNull) {
if (wasmBindgenExists == null) {
// Not loaded yet, load it dynamically
await _loadWasmBindgenScript(url);
}
Expand All @@ -50,23 +48,26 @@ Future<void> _loadWasmBindgenScript(String wasmUrl) async {
final jsUrl = wasmUrl.replaceAll('.wasm', '.js');

// Create and inject the script tag
final script = web.document.createElement('script') as web.HTMLScriptElement
..src = jsUrl
..type = 'text/javascript'
..onload = (web.Event event) {
// Schedule async work without making the callback async
unawaited(_verifyWasmBindgenLoaded(jsUrl, completer));
}.toJS
..onerror = (web.Event event) {
completer.completeError(
Exception(
'Failed to load isar.js from $jsUrl. '
'Make sure both isar.wasm and isar.js are '
'available at the same location. '
'For local usage, copy both files to your web/ directory.',
),
);
}.toJS;
final script =
web.document.createElement('script') as web.HTMLScriptElement
..src = jsUrl
..type = 'text/javascript'
..onload =
(web.Event event) {
// Schedule async work without making the callback async
unawaited(_verifyWasmBindgenLoaded(jsUrl, completer));
}.toJS
..onerror =
(web.Event event) {
completer.completeError(
Exception(
'Failed to load isar.js from $jsUrl. '
'Make sure both isar.wasm and isar.js are '
'available at the same location. '
'For local usage, copy both files to your web/ directory.',
),
);
}.toJS;

web.document.head!.appendChild(script);

Expand All @@ -85,9 +86,7 @@ Future<void> _verifyWasmBindgenLoaded(
var attempts = 0;
while (attempts < 10) {
final wasmBindgenExists = _windowWasmBindgen;
if (wasmBindgenExists != null &&
!wasmBindgenExists.isUndefined &&
!wasmBindgenExists.isNull) {
if (wasmBindgenExists != null) {
completer.complete();
return;
}
Expand Down
Loading