Skip to content

Commit 05e0526

Browse files
authored
Merge pull request #231 from powersync-ja/fix/sync-worker-logs
Use database logger for sync protocol
2 parents 52dc8ef + eab1c26 commit 05e0526

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

packages/powersync_core/lib/src/web/sync_controller.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ class SyncWorkerHandle implements StreamingSync {
2929
_channel = WorkerCommunicationChannel(
3030
port: sendToWorker,
3131
errors: EventStreamProviders.errorEvent.forTarget(worker),
32+
logger: database.logger,
3233
requestHandler: (type, payload) async {
3334
switch (type) {
3435
case SyncWorkerMessageType.requestEndpoint:
@@ -84,12 +85,13 @@ class SyncWorkerHandle implements StreamingSync {
8485
Map<String, dynamic>? syncParams}) async {
8586
final worker = SharedWorker(workerUri.toString().toJS);
8687
final handle = SyncWorkerHandle._(
87-
database: database,
88-
connector: connector,
89-
crudThrottleTimeMs: crudThrottleTimeMs,
90-
sendToWorker: worker.port,
91-
worker: worker,
92-
syncParams: syncParams);
88+
database: database,
89+
connector: connector,
90+
crudThrottleTimeMs: crudThrottleTimeMs,
91+
sendToWorker: worker.port,
92+
worker: worker,
93+
syncParams: syncParams,
94+
);
9395

9496
// Make sure that the worker is working, or throw immediately.
9597
await handle._channel.ping();

packages/powersync_core/lib/src/web/sync_worker_protocol.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:async';
22
import 'dart:convert';
33
import 'dart:js_interop';
44

5+
import 'package:logging/logging.dart';
56
import 'package:web/web.dart';
67

78
import '../connector.dart';
@@ -197,8 +198,6 @@ extension type SerializedSyncStatus._(JSObject _) implements JSObject {
197198
}
198199

199200
final class WorkerCommunicationChannel {
200-
static final _logger = autoLogger;
201-
202201
final Map<int, Completer<JSAny?>> _pendingRequests = {};
203202
int _nextRequestId = 0;
204203
bool _hasError = false;
@@ -210,14 +209,16 @@ final class WorkerCommunicationChannel {
210209
requestHandler;
211210
final StreamController<(SyncWorkerMessageType, JSAny)> _events =
212211
StreamController();
212+
final Logger _logger;
213213

214214
Stream<(SyncWorkerMessageType, JSAny)> get events => _events.stream;
215215

216216
WorkerCommunicationChannel({
217217
required this.port,
218218
required this.requestHandler,
219219
Stream<Event>? errors,
220-
}) {
220+
Logger? logger,
221+
}) : _logger = logger ?? autoLogger {
221222
port.start();
222223
_incomingErrors = errors?.listen((event) {
223224
_hasError = true;

0 commit comments

Comments
 (0)