@powersync/web 1.38.7 → 2.0.0

package/lib/worker/client.js

@@ -0,0 +1,77 @@
+export function connectToWorker({ service, databaseIdentifier, customWorker, shared }) {
+    const name = `${shared ? 'shared-' : ''}powersync-${databaseIdentifier}`;
+    let worker;
+    if (customWorker) {
+        worker = shared
+            ? new SharedWorker(customWorker, {
+                /* @vite-ignore */
+                name,
+                type: 'module'
+            })
+            : new Worker(customWorker, {
+                /* @vite-ignore */
+                name,
+                type: 'module'
+            });
+    }
+    else {
+        worker = spawnDefaultPowerSyncWorker(shared, name);
+    }
+    return connectToExistingWorker(worker, service);
+}
+/**
+ * Opens the default PowerSync worker.
+ *
+ * When users depend on the web SDK, we assume they use their own bundler (either vite or webpack). Both recognize the
+ * syntax of worker constructors with a string literal and will rewrite the URL as part of their bundling processes.
+ *
+ * React Native / Metro users can't rely on this on the web, as their app is not a JavaScript module and import.meta.url
+ * is not rewritten by Metro. For those users, we include a pre-bundled worker they can copy into a static assets
+ * directory and load with a custom URI. This also means that defaultWorker cannot work with Metro for React Native Web.
+ * We have a custom rollup plugin and conditional exports that replaces this function with a throwing stub for that
+ * platform. This allows a helpful error message.
+ */
+// Note: When changing this function, also update disableDefaultWorkers in rollup.config.ts.
+function spawnDefaultPowerSyncWorker(shared, name) {
+    return shared
+        ? new SharedWorker(new URL('./worker.js', import.meta.url), {
+            /* @vite-ignore */
+            name,
+            type: 'module'
+        })
+        : new Worker(new URL('./worker.js', import.meta.url), {
+            /* @vite-ignore */
+            name,
+            type: 'module'
+        });
+}
+export function connectToExistingWorker(worker, service) {
+    const isShared = isSharedWorker(worker);
+    if (isShared) {
+        const { port1, port2 } = new MessageChannel();
+        const mainPort = worker.port;
+        mainPort.start();
+        mainPort.postMessage({ port: port1, service }, [port1]);
+        port2.start();
+        return {
+            endpoint: port2,
+            worker,
+            close() {
+                port2.close();
+            }
+        };
+    }
+    else {
+        return {
+            endpoint: worker,
+            worker,
+            close() {
+                worker.terminate();
+            }
+        };
+    }
+}
+export function isSharedWorker(worker) {
+    return 'port' in worker;
+}
+//# sourceMappingURL=client.js.map

package/lib/worker/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/worker/client.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,kBAAkB,EAClB,YAAY,EACZ,MAAM,EACY;IAClB,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,aAAa,kBAAkB,EAAE,CAAC;IACzE,IAAI,MAA6B,CAAC;IAElC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,MAAM;YACb,CAAC,CAAC,IAAI,YAAY,CAAC,YAAY,EAAE;gBAC7B,kBAAkB;gBAClB,IAAI;gBACJ,IAAI,EAAE,QAAQ;aACf,CAAC;YACJ,CAAC,CAAC,IAAI,MAAM,CAAC,YAAY,EAAE;gBACvB,kBAAkB;gBAClB,IAAI;gBACJ,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;IACT,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,2BAA2B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAClD,CAAC;AAED;;;;;;;;;;;GAWG;AACH,4FAA4F;AAC5F,SAAS,2BAA2B,CAAC,MAAe,EAAE,IAAY;IAChE,OAAO,MAAM;QACX,CAAC,CAAC,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACxD,kBAAkB;YAClB,IAAI;YACJ,IAAI,EAAE,QAAQ;SACf,CAAC;QACJ,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAClD,kBAAkB;YAClB,IAAI;YACJ,IAAI,EAAE,QAAQ;SACf,CAAC,CAAC;AACT,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAA6B,EAAE,OAAsB;IAC3F,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,cAAc,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAI,MAAuB,CAAC,IAAI,CAAC;QAC/C,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,QAAQ,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAA0C,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;QAEhG,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,MAAM;YACN,KAAK;gBACH,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC;SACF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO;YACL,QAAQ,EAAE,MAAgB;YAC1B,MAAM;YACN,KAAK;gBACH,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,CAAC;SACF,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAA6B;IAC1D,OAAO,MAAM,IAAI,MAAM,CAAC;AAC1B,CAAC"}

package/lib/worker/db/MultiDatabaseServer.d.ts

@@ -0,0 +1,22 @@
+import { PowerSyncLogger } from '@powersync/common';
+import { ClientConnectionView } from '../../db/adapters/wa-sqlite/DatabaseServer.js';
+import { RawWaSqliteDatabaseOptions } from '../../db/adapters/wa-sqlite/RawSqliteConnection.js';
+export interface ConnectToMultiDatabaseServerOptions {
+    logLevel: number;
+    database: RawWaSqliteDatabaseOptions;
+    lockName: string;
+}
+/**
+ * Shared state to manage multiple database connections hosted by a worker.
+ */
+export declare class MultiDatabaseServer {
+    readonly logger: PowerSyncLogger;
+    private activeDatabases;
+    constructor(logger: PowerSyncLogger);
+    handleConnection({ logLevel, database, lockName }: ConnectToMultiDatabaseServerOptions): Promise<ClientConnectionView>;
+    connectToExisting(name: string, lockName: string): Promise<ClientConnectionView>;
+    openConnectionLocally(logger: PowerSyncLogger, options: RawWaSqliteDatabaseOptions, lockName?: string): Promise<ClientConnectionView>;
+    private databaseOpenAttempt;
+    closeAll(): Promise<void[]>;
+}
+export declare const isSharedWorker: boolean;

package/lib/{src/worker → worker}/db/MultiDatabaseServer.js

@@ -1,8 +1,10 @@
+import { LogLevels } from '@powersync/common';
 import * as Comlink from 'comlink';
 import { DatabaseServer } from '../../db/adapters/wa-sqlite/DatabaseServer.js';
 import { getNavigatorLocks } from '../../shared/navigator.js';
 import { RawSqliteConnection } from '../../db/adapters/wa-sqlite/RawSqliteConnection.js';
 import { ConcurrentSqliteConnection } from '../../db/adapters/wa-sqlite/ConcurrentConnection.js';
+import { WASQLiteVFS } from '../../db/adapters/wa-sqlite/vfs.js';
 const OPEN_DB_LOCK = 'open-wasqlite-db';
 /**
  * Shared state to manage multiple database connections hosted by a worker.
@@ -13,9 +15,14 @@ export class MultiDatabaseServer {
     constructor(logger) {
         this.logger = logger;
     }
-    async handleConnection(options) {
-        this.logger.setLevel(options.logLevel);
-        return Comlink.proxy(await this.openConnectionLocally(options, options.lockName));
+    async handleConnection({ logLevel, database, lockName }) {
+        const logger = {
+            log: (record) => {
+                if (record.level >= logLevel)
+                    this.logger.log(record);
+            }
+        };
+        return Comlink.proxy(await this.openConnectionLocally(logger, database, lockName));
     }
     async connectToExisting(name, lockName) {
         return getNavigatorLocks().request(OPEN_DB_LOCK, async () => {
@@ -26,33 +33,38 @@ export class MultiDatabaseServer {
             return Comlink.proxy(await server.connect(lockName));
         });
     }
-    async openConnectionLocally(options, lockName) {
+    async openConnectionLocally(logger, options, lockName) {
         // Especially on Firefox, we're sometimes seeing "NoModificationAllowedError"s when opening OPFS databases we can
         // work around by retrying.
         const maxAttempts = 3;
         let server;
         for (let count = 0; count < maxAttempts - 1; count++) {
             try {
-                server = await this.databaseOpenAttempt(options);
+                server = await this.databaseOpenAttempt(logger, options);
             }
-            catch (ex) {
-                this.logger.warn(`Attempt ${count + 1} of ${maxAttempts} to open database failed, retrying in 1 second...`, ex);
+            catch (error) {
+                this.logger.log({
+                    level: LogLevels.warn,
+                    message: `Attempt ${count + 1} of ${maxAttempts} to open database failed, retrying in 1 second...`,
+                    error
+                });
                 await new Promise((resolve) => setTimeout(resolve, 1000));
             }
         }
         // Final attempt if we haven't been able to open the server - rethrow errors if we still can't open.
-        server ??= await this.databaseOpenAttempt(options);
+        server ??= await this.databaseOpenAttempt(logger, options);
         return server.connect(lockName);
     }
-    async databaseOpenAttempt(options) {
+    async databaseOpenAttempt(logger, options) {
         return getNavigatorLocks().request(OPEN_DB_LOCK, async () => {
-            const { dbFilename } = options;
-            let server = this.activeDatabases.get(dbFilename);
+            const { filename, readonly, vfs } = options;
+            let server = this.activeDatabases.get(filename);
             if (server == null) {
                 // We don't need navigator locks for shared workers because all queries run in this shared worker exclusively.
                 // For read-only connections, we use a VFS that supports concurrent reads (so a single lock on the connection is
-                // fine).
-                const needsNavigatorLocks = !(isSharedWorker || options.isReadOnly);
+                // fine). In-memory databases either run in a shared worker or aren't shared across tabs at all, so the internal
+                // lock is enough.
+                const needsNavigatorLocks = !(isSharedWorker || readonly || vfs == WASQLiteVFS.InMemoryVfs);
                 const connection = new RawSqliteConnection(options);
                 const withSafeConcurrency = new ConcurrentSqliteConnection(connection, needsNavigatorLocks);
                 // Initializing the RawSqliteConnection will run some pragmas that might write to the database file, so we want
@@ -68,13 +80,13 @@ export class MultiDatabaseServer {
                     throw e;
                 }
                 returnLease();
-                const onClose = () => this.activeDatabases.delete(dbFilename);
+                const onClose = () => this.activeDatabases.delete(filename);
                 server = new DatabaseServer({
                     inner: withSafeConcurrency,
-                    logger: this.logger,
+                    logger,
                     onClose
                 });
-                this.activeDatabases.set(dbFilename, server);
+                this.activeDatabases.set(filename, server);
             }
             return server;
         });

package/lib/worker/db/MultiDatabaseServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MultiDatabaseServer.js","sourceRoot":"","sources":["../../../src/worker/db/MultiDatabaseServer.ts"],"names":[],"mappings":"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"}

package/lib/worker/sync/AbstractSharedSyncClientProvider.d.ts

@@ -0,0 +1,13 @@
+import type { LogRecord, PowerSyncCredentials } from '@powersync/common';
+import { SyncStatusJson } from '@powersync/shared-internals';
+/**
+ * The client side port should provide these methods.
+ */
+export declare abstract class AbstractSharedSyncClientProvider {
+    abstract fetchCredentials(): Promise<PowerSyncCredentials | null>;
+    abstract invalidateCredentials(): void;
+    abstract uploadCrud(): Promise<void>;
+    abstract statusChanged(status: SyncStatusJson): void;
+    abstract getDBWorkerPort(): Promise<MessagePort>;
+    abstract log(record: LogRecord): void;
+}

package/lib/worker/sync/AbstractSharedSyncClientProvider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractSharedSyncClientProvider.js","sourceRoot":"","sources":["../../../src/worker/sync/AbstractSharedSyncClientProvider.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,OAAgB,gCAAgC;CAQrD"}

package/lib/worker/sync/BroadcastLogger.d.ts

@@ -0,0 +1,27 @@
+import { PowerSyncLogger, LogRecord } from '@powersync/common';
+import { type WrappedSyncPort } from './SharedSyncImplementation.js';
+/**
+ * Broadcasts logs to all clients
+ */
+export declare class BroadcastLogger implements PowerSyncLogger {
+    private clients;
+    private readonly inner;
+    private currentLevel;
+    sendBroadcasts: boolean;
+    constructor(prefix: string, clients: WrappedSyncPort[]);
+    log(record: LogRecord): void;
+    /**
+     * Set the global log level.
+     */
+    setLevel(level: number): void;
+    /**
+     * Iterates all clients, catches individual client exceptions
+     * and proceeds to execute for all clients.
+     */
+    protected iterateClients(callback: (client: WrappedSyncPort) => Promise<void>): Promise<void>;
+    /**
+     * Guards against any logging errors.
+     * We don't want a logging exception to cause further issues upstream
+     */
+    protected sanitizeRecord(record: LogRecord): LogRecord;
+}

package/lib/worker/sync/BroadcastLogger.js

@@ -0,0 +1,65 @@
+import { LogLevels, createConsoleLogger } from '@powersync/common';
+/**
+ * Broadcasts logs to all clients
+ */
+export class BroadcastLogger {
+    clients;
+    inner;
+    currentLevel = LogLevels.info;
+    sendBroadcasts = true;
+    constructor(prefix, clients) {
+        this.clients = clients;
+        this.inner = createConsoleLogger({ prefix: prefix });
+    }
+    log(record) {
+        this.inner.log(record);
+        if (this.sendBroadcasts && record.level >= this.currentLevel) {
+            const sanitized = this.sanitizeRecord(record);
+            this.iterateClients((client) => client.clientProvider.log(sanitized));
+        }
+    }
+    /**
+     * Set the global log level.
+     */
+    setLevel(level) {
+        this.inner.minLevel = level;
+        this.currentLevel = level;
+    }
+    /**
+     * Iterates all clients, catches individual client exceptions
+     * and proceeds to execute for all clients.
+     */
+    async iterateClients(callback) {
+        for (const client of this.clients) {
+            try {
+                await callback(client);
+            }
+            catch (ex) {
+                console.error('Caught exception when iterating client', ex);
+            }
+        }
+    }
+    /**
+     * Guards against any logging errors.
+     * We don't want a logging exception to cause further issues upstream
+     */
+    sanitizeRecord(record) {
+        if (!record.error) {
+            return record;
+        }
+        let error;
+        try {
+            // Try and clone here first. If it fails it won't be passable over a MessagePort
+            error = structuredClone(record.error);
+        }
+        catch (ex) {
+            console.error(ex);
+            error = 'Could not serialize log params. Check shared worker logs for more details.';
+        }
+        return {
+            ...record,
+            error
+        };
+    }
+}
+//# sourceMappingURL=BroadcastLogger.js.map

package/lib/worker/sync/BroadcastLogger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"BroadcastLogger.js","sourceRoot":"","sources":["../../../src/worker/sync/BroadcastLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAuB,mBAAmB,EAAa,MAAM,mBAAmB,CAAC;AAGpH;;GAEG;AACH,MAAM,OAAO,eAAe;IAQhB;IAPO,KAAK,CAAwC;IACtD,YAAY,GAAW,SAAS,CAAC,IAAI,CAAC;IAE9C,cAAc,GAAG,IAAI,CAAC;IAEtB,YACE,MAAc,EACN,OAA0B;QAA1B,YAAO,GAAP,OAAO,CAAmB;QAElC,IAAI,CAAC,KAAK,GAAG,mBAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,GAAG,CAAC,MAAiB;QACnB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC9C,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAED;;OAEG;IACH,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,cAAc,CAAC,QAAoD;QACjF,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;YACzB,CAAC;YAAC,OAAO,EAAE,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACO,cAAc,CAAC,MAAiB;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,KAAK,CAAC;QACV,IAAI,CAAC;YACH,gFAAgF;YAChF,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAClB,KAAK,GAAG,4EAA4E,CAAC;QACvF,CAAC;QAED,OAAO;YACL,GAAG,MAAM;YACT,KAAK;SACN,CAAC;IACJ,CAAC;CACF"}

package/lib/{src/worker → worker}/sync/SharedSyncImplementation.d.ts

@@ -1,8 +1,10 @@
-import { BaseObserver, ConnectionManager, DBAdapter, SubscribedStream, SyncStatus, Mutex, type ILogLevel, type ILogger, type PowerSyncConnectionOptions, type StreamingSyncImplementation, type StreamingSyncImplementationListener, type SyncStatusOptions } from '@powersync/common';
+import { BaseObserver, DBAdapter, SyncStatus } from '@powersync/common';
+import { ConnectionManager, SubscribedStream, type StreamingSyncImplementation, type StreamingSyncImplementationListener, Mutex, ResolvedSyncOptions } from '@powersync/shared-internals';
 import * as Comlink from 'comlink';
 import { WebStreamingSyncImplementation, WebStreamingSyncImplementationOptions } from '../../db/sync/WebStreamingSyncImplementation.js';
-import { ResolvedWebSQLOpenOptions } from '../../db/adapters/web-sql-flags.js';
 import { AbstractSharedSyncClientProvider } from './AbstractSharedSyncClientProvider.js';
+import { BroadcastLogger } from './BroadcastLogger.js';
+import { ResolvedWebSQLOpenOptions } from '../../db/adapters/options.js';
 /**
  * @internal
  * Manual message events for shared sync clients
@@ -26,8 +28,9 @@ export type ManualSharedSyncPayload = {
  * @internal
  */
 export type SharedSyncInitOptions = {
-    streamOptions: Omit<WebStreamingSyncImplementationOptions, 'adapter' | 'uploadCrud' | 'remote' | 'subscriptions'>;
+    streamOptions: Omit<WebStreamingSyncImplementationOptions, 'adapter' | 'uploadCrud' | 'remote' | 'subscriptions' | 'logger'>;
     dbParams: ResolvedWebSQLOpenOptions;
+    enableBroadcastLogs: boolean;
 };
 /**
  * @internal
@@ -64,13 +67,12 @@ export declare class SharedSyncImplementation extends BaseObserver<SharedSyncImp
     protected fetchCredentialsController?: RemoteOperationAbortController;
     protected uploadDataController?: RemoteOperationAbortController;
     protected syncParams: SharedSyncInitOptions | null;
-    protected logger: ILogger;
-    protected lastConnectOptions: PowerSyncConnectionOptions | undefined;
+    protected lastConnectOptions: ResolvedSyncOptions | undefined;
     protected portMutex: Mutex;
     private subscriptions;
     protected connectionManager: ConnectionManager;
-    syncStatus: SyncStatus;
-    broadCastLogger: ILogger;
+    private syncStatus?;
+    logger: BroadcastLogger;
     protected readonly database: DBAdapter;
     constructor();
     get isConnected(): boolean;
@@ -83,12 +85,11 @@ export declare class SharedSyncImplementation extends BaseObserver<SharedSyncImp
      * This returns a random port which is not closing.
      */
     protected getRandomWrappedPort(): Promise<WrappedSyncPort | undefined>;
-    waitForStatus(status: SyncStatusOptions): Promise<void>;
     waitUntilStatusMatches(predicate: (status: SyncStatus) => boolean): Promise<void>;
     waitForReady(): Promise<void>;
     private collectActiveSubscriptions;
     updateSubscriptions(port: WrappedSyncPort, subscriptions: SubscribedStream[]): void;
-    setLogLevel(level: ILogLevel): void;
+    setLogLevel(level: number): void;
     /**
      * Configures the DBAdapter connection and a streaming sync client.
      */
@@ -100,7 +101,7 @@ export declare class SharedSyncImplementation extends BaseObserver<SharedSyncImp
      * The connection will simply be reconnected whenever a new tab
      * connects.
      */
-    connect(options?: PowerSyncConnectionOptions): Promise<void>;
+    connect(options: ResolvedSyncOptions, serializedSchema: any): Promise<void>;
     disconnect(): Promise<void>;
     /**
      * Adds a new client tab's message port to the list of connected ports
@@ -126,9 +127,4 @@ export declare class SharedSyncImplementation extends BaseObserver<SharedSyncImp
      */
     private openInternalDB;
     private generateReconnectableDatabase;
-    /**
-     * A method to update the all shared statuses for each
-     * client.
-     */
-    private updateAllStatuses;
 }

package/lib/{src/worker → worker}/sync/SharedSyncImplementation.js

@@ -1,4 +1,5 @@
-import { AbortOperation, BaseObserver, ConnectionManager, DBAdapterDefaultMixin, SqliteBucketStorage, SyncStatus, createLogger, Mutex } from '@powersync/common';
+import { BaseObserver, DBAdapter, LogLevels, SyncStreamConnectionMethod } from '@powersync/common';
+import { AbortOperation, ConnectionManager, SqliteBucketStorage, Mutex } from '@powersync/shared-internals';
 import * as Comlink from 'comlink';
 import { WebRemote } from '../../db/sync/WebRemote.js';
 import { WebStreamingSyncImplementation } from '../../db/sync/WebStreamingSyncImplementation.js';
@@ -35,19 +36,17 @@ export class SharedSyncImplementation extends BaseObserver {
     fetchCredentialsController;
     uploadDataController;
     syncParams;
-    logger;
     lastConnectOptions;
     portMutex;
     subscriptions = [];
     connectionManager;
     syncStatus;
-    broadCastLogger;
+    logger;
     database = this.generateReconnectableDatabase();
     constructor() {
         super();
         this.ports = [];
         this.syncParams = null;
-        this.logger = createLogger('shared-sync');
         this.lastConnectOptions = undefined;
         this.portMutex = new Mutex();
         this.isInitialized = new Promise((resolve) => {
@@ -58,15 +57,16 @@ export class SharedSyncImplementation extends BaseObserver {
                 }
             });
         });
-        this.syncStatus = new SyncStatus({});
-        this.broadCastLogger = new BroadcastLogger(this.ports);
+        this.logger = new BroadcastLogger('shared-sync', this.ports);
         this.connectionManager = new ConnectionManager({
             createSyncImplementation: async () => {
                 await this.waitForReady();
                 const sync = this.generateStreamingImplementation();
                 const onDispose = sync.registerListener({
-                    statusChanged: (status) => {
-                        this.updateAllStatuses(status.toJSON());
+                    statusChanged: (snapshot) => {
+                        this.syncStatus = snapshot;
+                        const json = snapshot.toJSON();
+                        this.ports.forEach((p) => p.clientProvider.statusChanged(json));
                     }
                 });
                 return {
@@ -74,7 +74,8 @@ export class SharedSyncImplementation extends BaseObserver {
                     onDispose
                 };
             },
-            logger: this.logger
+            logger: this.logger,
+            defaultConnectionMethod: SyncStreamConnectionMethod.HTTP
         });
     }
     get isConnected() {
@@ -104,11 +105,6 @@ export class SharedSyncImplementation extends BaseObserver {
             return nonClosingPorts[Math.floor(Math.random() * nonClosingPorts.length)];
         });
     }
-    async waitForStatus(status) {
-        return this.withSyncImplementation(async (sync) => {
-            return sync.waitForStatus(status);
-        });
-    }
     async waitUntilStatusMatches(predicate) {
         return this.withSyncImplementation(async (sync) => {
             return sync.waitUntilStatusMatches(predicate);
@@ -118,7 +114,7 @@ export class SharedSyncImplementation extends BaseObserver {
         return this.isInitialized;
     }
     collectActiveSubscriptions() {
-        this.logger.debug('Collecting active stream subscriptions across tabs');
+        this.logger.log({ level: LogLevels.debug, message: 'Collecting active stream subscriptions across tabs' });
         const active = new Map();
         for (const port of this.ports) {
             for (const stream of port.currentSubscriptions) {
@@ -127,7 +123,10 @@ export class SharedSyncImplementation extends BaseObserver {
             }
         }
         this.subscriptions = [...active.values()];
-        this.logger.debug('Collected stream subscriptions', this.subscriptions);
+        this.logger.log({
+            level: LogLevels.debug,
+            message: `Collected stream subscriptions, ${JSON.stringify(this.subscriptions)}`
+        });
         this.connectionManager.syncStreamImplementation?.updateSubscriptions(this.subscriptions);
     }
     updateSubscriptions(port, subscriptions) {
@@ -136,7 +135,6 @@ export class SharedSyncImplementation extends BaseObserver {
     }
     setLogLevel(level) {
         this.logger.setLevel(level);
-        this.broadCastLogger.setLevel(level);
     }
     /**
      * Configures the DBAdapter connection and a streaming sync client.
@@ -151,14 +149,16 @@ export class SharedSyncImplementation extends BaseObserver {
         }
         // First time setting params
         this.syncParams = params;
-        if (params.streamOptions?.flags?.broadcastLogs) {
-            this.logger = this.broadCastLogger;
-        }
+        this.logger.sendBroadcasts = params.enableBroadcastLogs;
         // Ensure we have a usable database connection, the reconnectable database will connect lazily on first use.
         await this.database.readLock(async () => { });
         self.onerror = (event) => {
             // Share any uncaught events on the broadcast logger
-            this.logger.error('Uncaught exception in PowerSync shared sync worker', event);
+            this.logger.log({
+                level: LogLevels.error,
+                message: 'Uncaught exception in PowerSync shared sync worker',
+                error: event
+            });
         };
         this.iterateListeners((l) => l.initialized?.());
     }
@@ -173,9 +173,9 @@ export class SharedSyncImplementation extends BaseObserver {
      * The connection will simply be reconnected whenever a new tab
      * connects.
      */
-    async connect(options) {
+    async connect(options, serializedSchema) {
         this.lastConnectOptions = options;
-        return this.connectionManager.connect(CONNECTOR_PLACEHOLDER, options ?? {});
+        return this.connectionManager.connect(CONNECTOR_PLACEHOLDER, options ?? {}, serializedSchema);
     }
     async disconnect() {
         return this.connectionManager.disconnect();
@@ -194,7 +194,7 @@ export class SharedSyncImplementation extends BaseObserver {
             };
             this.ports.push(portProvider);
             // Give the newly connected client the latest status
-            const status = this.connectionManager.syncStreamImplementation?.syncStatus;
+            const status = this.syncStatus;
             if (status) {
                 portProvider.clientProvider.statusChanged(status.toJSON());
             }
@@ -214,7 +214,10 @@ export class SharedSyncImplementation extends BaseObserver {
         return await this.portMutex.runExclusive(async () => {
             const index = this.ports.findIndex((p) => p == port);
             if (index < 0) {
-                this.logger.warn(`Could not remove port ${port} since it is not present in active ports.`);
+                this.logger.log({
+                    level: LogLevels.warn,
+                    message: `Could not remove port ${port} since it is not present in active ports.`
+                });
                 return () => { };
             }
             const trackedPort = this.ports[index];
@@ -275,11 +278,14 @@ export class SharedSyncImplementation extends BaseObserver {
                         throw new Error('No client port found to invalidate credentials');
                     }
                     try {
-                        this.logger.log('calling the last port client provider to invalidate credentials');
+                        this.logger.log({
+                            level: LogLevels.info,
+                            message: 'calling the last port client provider to invalidate credentials'
+                        });
                         lastPort.clientProvider.invalidateCredentials();
                     }
-                    catch (ex) {
-                        this.logger.error('error invalidating credentials', ex);
+                    catch (error) {
+                        this.logger.log({ level: LogLevels.error, message: 'error invalidating credentials', error });
                     }
                 },
                 fetchCredentials: async () => {
@@ -295,7 +301,10 @@ export class SharedSyncImplementation extends BaseObserver {
                         };
                         abortController.signal.onabort = reject;
                         try {
-                            this.logger.log('calling the last port client provider for credentials');
+                            this.logger.log({
+                                level: LogLevels.info,
+                                message: 'calling the last port client provider for credentials'
+                            });
                             resolve(await lastPort.clientProvider.fetchCredentials());
                         }
                         catch (ex) {
@@ -404,7 +413,7 @@ export class SharedSyncImplementation extends BaseObserver {
         });
         clearTimeout(timeout);
         client.closeListeners.push(async () => {
-            this.logger.info('Aborting open connection because associated tab closed.');
+            this.logger.log({ level: LogLevels.info, message: 'Aborting open connection because associated tab closed.' });
             handleClosed(db);
             /**
              * Don't await this close operation. It might never resolve if the tab is closed.
@@ -412,14 +421,14 @@ export class SharedSyncImplementation extends BaseObserver {
              * We then call close. The close operation is configured to fire-and-forget, the main promise will reject immediately.
              */
             db.markRemoteClosed();
-            db.close().catch((ex) => this.logger.warn('error closing database connection', ex));
+            db.close().catch((error) => this.logger.log({ level: LogLevels.warn, message: 'error closing database connection', error }));
         });
         return db;
     }
     generateReconnectableDatabase() {
         const syncParams = this.syncParams;
         const sharedSync = this;
-        class ReconnectPool extends BaseObserver {
+        return new (class extends DBAdapter {
             connectionState = null;
             get name() {
                 return syncParams?.dbParams.dbFilename;
@@ -476,17 +485,7 @@ export class SharedSyncImplementation extends BaseObserver {
             async refreshSchema() {
                 // Not used by sync client.
             }
-        }
-        const Adapter = DBAdapterDefaultMixin(ReconnectPool);
-        return new Adapter();
-    }
-    /**
-     * A method to update the all shared statuses for each
-     * client.
-     */
-    updateAllStatuses(status) {
-        this.syncStatus = new SyncStatus(status);
-        this.ports.forEach((p) => p.clientProvider.statusChanged(status));
+        })();
     }
 }
 /**