Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/sqlite_async/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.14.3 (unreleased)

- Include identifier of mutexes when a navigator lock attempt is aborted.

## 0.14.2

- Support versions `0.8.x` of `package:sqlite3_web`.
Expand Down
3 changes: 2 additions & 1 deletion packages/sqlite_async/lib/src/web/web_mutex.dart
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ class WebMutexImpl implements Mutex {
if (abortTrigger != null) {
abortTrigger.whenComplete(() {
if (!gotLock.isCompleted) {
gotLock.completeError(AbortException('getWebLock'));
gotLock
.completeError(AbortException('getWebLock($resolvedIdentifier)'));
controller.abort('aborted in Dart'.toJS);
}
});
Expand Down
29 changes: 29 additions & 0 deletions packages/sqlite_async/test/web/web_mutex_test.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
@TestOn('browser')
library;

import 'dart:async';

import 'package:sqlite_async/sqlite_async.dart';
import 'package:sqlite_async/src/web/web_mutex.dart';
import 'package:test/test.dart';
import 'package:web/web.dart';

import '../utils/test_utils_impl.dart';

Expand All @@ -28,5 +32,30 @@ void main() {
// It should be correctly ordered as if it was the same mutex
expect(results, equals([1, 2]));
});

test('can abort acquiring navigator locks', () async {
final lockName = window.crypto.randomUUID();
final m1 = WebMutexImpl(identifier: lockName);
final m2 = WebMutexImpl(identifier: lockName);

final hasM1 = Completer();
final releaseM1 = Completer();
m1.lock(() {
hasM1.complete();
return releaseM1.future;
});

await hasM1.future;
expect(
m2.lock(
expectAsync0(() async {}, count: 0),
abortTrigger: Future.delayed(Duration.zero),
),
throwsA(
isA<AbortException>()
.having((e) => e.toString(), 'toString()', contains(lockName)),
),
);
});
});
}