More fixes

Author: simolus3

packages/common/src/utils/async.ts

@@ -47,7 +47,9 @@ export function asyncNotifier(): AsyncNotifier {
     },
     waitForNotification(signal: AbortSignal) {
       return new Promise((resolve) => {
-        if (hasPendingNotification) {
+        if (signal.aborted) {
+          resolve();
+        } else if (hasPendingNotification) {
           resolve();
           hasPendingNotification = false;
         } else {
@@ -65,11 +67,7 @@ export function asyncNotifier(): AsyncNotifier {
           }
 
           waitingConsumers.push(complete);
-          if (signal.aborted) {
-            onAbort();
-          } else {
-            signal.addEventListener('abort', onAbort);
-          }
+          signal.addEventListener('abort', onAbort);
         }
       });
     }

packages/common/tests/utils/async.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest';
 import { asyncNotifier } from '../../src/utils/async';
 
-describe('notifyIterator', () => {
+describe('asyncNotifier', () => {
   const neverAbort = new AbortController().signal;
 
   test('waits for event', async () => {

packages/node/tests/sync.test.ts

@@ -549,7 +549,7 @@ function defineSyncTests(bson: boolean) {
     await database.execute('INSERT INTO lists (id, name) values (uuid(), ?)', ['local write']);
 
     syncService.installRequestInterceptor(async (request) => {
-      if (request.url.indexOf('/sync/stream') != -1) {
+      if (request.url.includes('/sync/stream')) {
         throw new Error('Pretend that the service is unavailable');
       }
     });