Lightpanda: the headless browser designed for AI and automation
finish before resolving promise in WebLock
Muki Kiboigo26a5018d0215
diff --git a/src/browser/tests/weblocks.html b/src/browser/tests/weblocks.htmlindex d360b417e..c8d679e30 100644--- a/src/browser/tests/weblocks.html+++ b/src/browser/tests/weblocks.html@@ -403,6 +403,20 @@}</script>+<script id=lockIsReleasedBeforeRequestPromiseResolves type=module>+{+ const state = await testing.async();+ await navigator.locks.request('release-before-resolve', () => 1);+ const result = await navigator.locks.request('release-before-resolve', { ifAvailable: true }, (lock) => {+ return lock === null ? 'unavailable' : 'acquired';+ });+ state.resolve(result);+ await state.done((v) => {+ testing.expectEqual('acquired', v);+ });+}+</script>+<script id=queryReportsHeldAndPending type=module>{const state = await testing.async();diff --git a/src/browser/webapi/LockManager.zig b/src/browser/webapi/LockManager.zigindex be4ef8aab..3c92a8380 100644--- a/src/browser/webapi/LockManager.zig+++ b/src/browser/webapi/LockManager.zig@@ -81,8 +81,8 @@ pub const LockRequest = struct {defer ls.deinit();const resolver = self.resolver.local(&ls.local);- resolver.resolve("Lock callback result", value.?);self.finish();+ resolver.resolve("Lock callback result", value.?);}fn onRejected(self: *LockRequest, value: ?js.Value) void {@@ -93,8 +93,8 @@ pub const LockRequest = struct {defer ls.deinit();const resolver = self.resolver.local(&ls.local);- resolver.reject("Lock callback result", value.?);self.finish();+ resolver.reject("Lock callback result", value.?);}fn fireCallbackWith(self: *LockRequest, lock: ?Lock) void {@@ -113,8 +113,8 @@ pub const LockRequest = struct {if (self.granted) {if (self.options.signal) |signal| {if (signal._aborted) {- resolver.reject("LockManager.signal.aborted", signal._reason);self.finish();+ resolver.reject("LockManager.signal.aborted", signal._reason);return;}}@@ -131,18 +131,18 @@ pub const LockRequest = struct {self.finish();return;}+ self.finish();if (try_catch.exceptionValue()) |exception| {resolver.reject("Lock callback", exception);} else {resolver.rejectError("Lock callback", .{ .generic_error = @errorName(err) });}- self.finish();return;};if (result.isPromise() == false) {- resolver.resolve("Lock callback result", result);self.finish();+ resolver.resolve("Lock callback result", result);return;}