Fix web tests

Author: simolus3

packages/common/src/client/AbstractPowerSyncDatabase.ts

@@ -233,6 +233,7 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
   constructor(options: PowerSyncDatabaseOptions); // Note this is important for extending this class and maintaining API compatibility
   constructor(protected options: PowerSyncDatabaseOptions) {
     super();
+    this.logger = options.logger ?? createPowerSyncLogger();
 
     const { database, schema } = options;
 
@@ -250,8 +251,6 @@ export abstract class AbstractPowerSyncDatabase extends BaseObserver<PowerSyncDB
       throw new Error('The provided `database` option is invalid.');
     }
 
-    this.logger = options.logger ?? createPowerSyncLogger({ prefix: `PowerSyncDatabase[${this._database.name}]` });
-
     this.bucketStorageAdapter = this.generateBucketStorageAdapter();
     this.closed = false;
     this.currentStatus = new SyncStatus({});

packages/web/src/worker/db/MultiDatabaseServer.ts

@@ -22,7 +22,7 @@ export class MultiDatabaseServer {
   async handleConnection(options: WorkerDBOpenerOptions): Promise<ClientConnectionView> {
     const logger: PowerSyncLogger = {
       log: (record) => {
-        if (record.level >= options.logLevel) logger.log(record);
+        if (record.level >= options.logLevel) this.logger.log(record);
       }
     };
 

packages/web/tests/encryption.test.ts

@@ -8,7 +8,7 @@ import {
 import { v4 as uuid } from 'uuid';
 import { describe, expect, it } from 'vitest';
 import { TEST_SCHEMA } from './utils/test-schema.js';
-import { defaultLoggerConfig } from './utils/testDb.js';
+import { defaultLoggerConfig } from './utils/logger.js';
 
 describe('Encryption Tests', { sequential: true }, () => {
   it('IDBBatchAtomicVFS encryption', async () => {

packages/web/tests/main.test.ts

@@ -2,7 +2,8 @@ import { PowerSyncDatabase, WASQLiteOpenFactory, WASQLiteVFS } from '@powersync/
 import { v4 as uuid } from 'uuid';
 import { describe, expect, it } from 'vitest';
 import { TEST_SCHEMA, TestDatabase } from './utils/test-schema.js';
-import { defaultLoggerConfig, generateTestDb } from './utils/testDb.js';
+import { generateTestDb } from './utils/testDb.js';
+import { defaultLoggerConfig } from './utils/logger.js';
 // TODO import tests from a common package
 
 describe(

packages/web/tests/multiple_instances.test.ts

@@ -3,6 +3,7 @@ import {
   createPowerSyncLogger,
   DBAdapterDefaultMixin,
   LogLevels,
+  LogRecord,
   PowerSyncLogger
 } from '@powersync/common';
 import * as Comlink from 'comlink';
@@ -46,10 +47,10 @@ describe('Multiple Instances', { sequential: true }, () => {
     'should broadcast logs from shared sync worker',
     { timeout: 10_000 },
     async ({ context: { openDatabase, mockService } }) => {
-      const logLines: string[] = [];
+      const logLines: LogRecord[] = [];
       const logger: PowerSyncLogger = {
-        log({ message }) {
-          logLines.push(message);
+        log(msg) {
+          logLines.push(msg);
         }
       };
 
@@ -85,16 +86,22 @@ describe('Multiple Instances', { sequential: true }, () => {
 
       // Asserting that powersync_control logs exists verifies that some connection attempt was made.
       await vi.waitFor(
-        () => expect(logLines).toEqual(expect.arrayContaining([expect.stringContaining('powersync_control')])),
+        () =>
+          expect(logLines.map((l) => l.message)).toEqual(
+            expect.arrayContaining([expect.stringContaining('powersync_control')])
+          ),
         {
           timeout: 2000
         }
       );
 
       // The connection should fail with an error
-      await vi.waitFor(() => expect(logLines).toEqual(expect.arrayContaining([expect.any(Error)])), {
-        timeout: 2000
-      });
+      await vi.waitFor(
+        () => expect(logLines.map((l) => l.error)).toEqual(expect.arrayContaining([expect.any(Error)])),
+        {
+          timeout: 2000
+        }
+      );
     }
   );
 

packages/web/tests/open.test.ts

@@ -11,7 +11,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { TEST_SCHEMA } from './utils/test-schema.js';
 import { MultiDatabaseServer } from '../src/worker/db/MultiDatabaseServer.js';
 import { DatabaseClient } from '../src/db/adapters/wa-sqlite/DatabaseClient.js';
-import { defaultLoggerConfig } from './utils/testDb.js';
+import { defaultLoggerConfig } from './utils/logger.js';
 
 const testId = '2290de4f-0488-4e50-abed-f8e8eb1d0b42';
 

packages/web/tests/src/db/write_ahead_log_opfs.test.ts

@@ -1,7 +1,8 @@
 import { expect, test } from 'vitest';
-import { defaultLoggerConfig, generateTestDb } from '../../utils/testDb.js';
+import { generateTestDb } from '../../utils/testDb.js';
 import { WASQLiteOpenFactory, WASQLiteVFS } from '@powersync/web';
 import { TEST_SCHEMA } from '../../utils/test-schema.js';
+import { defaultLoggerConfig } from '../../utils/logger.js';
 
 test('supports concurrent reads', async () => {
   const db = generateTestDb({

packages/web/tests/stream.test.ts

@@ -14,7 +14,7 @@ import { describe, expect, it, onTestFinished, vi } from 'vitest';
 import { TestConnector } from './utils/MockStreamOpenFactory.js';
 import { ConnectedDatabaseUtils, generateConnectedDatabase } from './utils/generateConnectedDatabase.js';
 import { BucketChecksum } from '@powersync/common/internal/sync_protocol';
-import { defaultLoggerConfig } from './utils/testDb.js';
+import { defaultLoggerConfig } from './utils/logger.js';
 
 const UPLOAD_TIMEOUT_MS = 3000;
 

packages/web/tests/triggers.test.ts

@@ -2,7 +2,8 @@ import { DiffTriggerOperation } from '@powersync/common';
 import { WASQLiteOpenFactory, WASQLiteVFS } from '@powersync/web';
 import { describe, expect, it, onTestFinished, vi } from 'vitest';
 import { TEST_SCHEMA } from './utils/test-schema.js';
-import { defaultLoggerConfig, generateTestDb } from './utils/testDb.js';
+import { generateTestDb } from './utils/testDb.js';
+import { defaultLoggerConfig } from './utils/logger.js';
 
 // Shared helper to spin up an iframe that creates a persisted trigger table
 const createTriggerInIframe = () => {

packages/web/tests/uploads.test.ts

@@ -79,7 +79,7 @@ function describeCrudUploadTests(getDatabaseOptions: () => WebPowerSyncDatabaseO
 
       await vi.waitFor(
         () => {
-          expect(logLines).contains(expect.stringContaining(PARTIAL_WARNING));
+          expect(logLines).toEqual(expect.arrayContaining([expect.stringContaining(PARTIAL_WARNING)]));
         },
         {
           timeout: 500,
@@ -143,7 +143,7 @@ function describeCrudUploadTests(getDatabaseOptions: () => WebPowerSyncDatabaseO
         }
       );
 
-      expect(logLines).not.contains(expect.stringContaining(PARTIAL_WARNING));
+      expect(logLines).not.toEqual(expect.arrayContaining([expect.stringContaining(PARTIAL_WARNING)]));
     });
   };
 }