Merge branch 'main' into sync-progress

Author: simolus3

CHANGELOG.md

@@ -3,6 +3,74 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2025-04-24
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`powersync_core` - `v1.2.4`](#powersync_core---v124)
+ - [`powersync_attachments_helper` - `v0.6.18+6`](#powersync_attachments_helper---v06186)
+ - [`powersync_sqlcipher` - `v0.1.5+4`](#powersync_sqlcipher---v0154)
+ - [`powersync` - `v1.12.4`](#powersync---v1124)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `powersync_attachments_helper` - `v0.6.18+6`
+ - `powersync_sqlcipher` - `v0.1.5+4`
+ - `powersync` - `v1.12.4`
+
+---
+
+#### `powersync_core` - `v1.2.4`
+
+ - Fix deadlock when `connect()` is called immediately after opening a database.
+
+
+## 2025-04-22
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`powersync_core` - `v1.2.3`](#powersync_core---v123)
+ - [`powersync_attachments_helper` - `v0.6.18+5`](#powersync_attachments_helper---v06185)
+ - [`powersync_sqlcipher` - `v0.1.5+3`](#powersync_sqlcipher---v0153)
+ - [`powersync` - `v1.12.3`](#powersync---v1123)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `powersync_attachments_helper` - `v0.6.18+5`
+ - `powersync_sqlcipher` - `v0.1.5+3`
+ - `powersync` - `v1.12.3`
+
+---
+
+#### `powersync_core` - `v1.2.3`
+
+ - Introduce locks to avoid duplicate sync streams when multiple instances of the same database are opened.
+ - Refactor connect / disconnect internally.
+ - Warn when multiple instances of the same database are opened.
+ - Fix race condition causing data not to be applied while an upload is in progress.
+ - Web: Fix token invalidation logic when a sync worker is used.
+
+
 ## 2025-03-11
 
 ### Changes

README.md

@@ -6,19 +6,19 @@ _[PowerSync](https://www.powersync.com) is a sync engine for building local-firs
 
 # PowerSync SDK for Dart and Flutter
 
-| package                                                                                                                          | build                                                                                                                                                                                               | pub                                                                                                                                    | likes                                                                                                                                            | popularity                                                                                                                                                 | pub points                                                                                                                                             |
-| -------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| [powersync](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync)                                       | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/packages.yml/badge.svg?branch=master)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync.svg)](https://pub.dev/packages/powersync)                                       | [![likes](https://img.shields.io/pub/likes/powersync?logo=dart)](https://pub.dev/packages/powersync/score)                                       | [![popularity](https://img.shields.io/pub/popularity/powersync?logo=dart)](https://pub.dev/packages/powersync/score)                                       | [![pub points](https://img.shields.io/pub/points/powersync?logo=dart)](https://pub.dev/packages/powersync/score)                                       |
-| [powersync_core](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_core)                             | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/packages.yml/badge.svg?branch=master)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_core.svg)](https://pub.dev/packages/powersync_core)                             | [![likes](https://img.shields.io/pub/likes/powersync_core?logo=dart)](https://pub.dev/packages/powersync_core/score)                             | [![popularity](https://img.shields.io/pub/popularity/powersync_core?logo=dart)](https://pub.dev/packages/powersync_core/score)                             | [![pub points](https://img.shields.io/pub/points/powersync_core?logo=dart)](https://pub.dev/packages/powersync_core/score)                             |
-| [powersync_sqlcipher](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_sqlcipher)                   | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/packages.yml/badge.svg?branch=master)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_sqlcipher.svg)](https://pub.dev/packages/powersync_sqlcipher)                   | [![likes](https://img.shields.io/pub/likes/powersync_sqlcipher?logo=dart)](https://pub.dev/packages/powersync_sqlcipher/score)                   | [![popularity](https://img.shields.io/pub/popularity/powersync_sqlcipher?logo=dart)](https://pub.dev/packages/powersync_sqlcipher/score)                   | [![pub points](https://img.shields.io/pub/points/powersync_sqlcipher?logo=dart)](https://pub.dev/packages/powersync_sqlcipher/score)                   |
-| [powersync_attachments_helper](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_attachments_helper) | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/packages.yml/badge.svg?branch=master)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_attachments_helper.svg)](https://pub.dev/packages/powersync_attachments_helper) | [![likes](https://img.shields.io/pub/likes/powersync_attachments_helper?logo=dart)](https://pub.dev/packages/powersync_attachments_helper/score) | [![popularity](https://img.shields.io/pub/popularity/powersync_attachments_helper?logo=dart)](https://pub.dev/packages/powersync_attachments_helper/score) | [![pub points](https://img.shields.io/pub/points/powersync_attachments_helper?logo=dart)](https://pub.dev/packages/powersync_attachments_helper/score) |
-| [powersync_flutter_libs](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_flutter_libs)             | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/packages.yml/badge.svg?branch=master)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_flutter_libs.svg)](https://pub.dev/packages/powersync_flutter_libs)             | [![likes](https://img.shields.io/pub/likes/powersync_flutter_libs?logo=dart)](https://pub.dev/packages/powersync_flutter_libs/score)             | [![popularity](https://img.shields.io/pub/popularity/powersync_flutter_libs?logo=dart)](https://pub.dev/packages/powersync_flutter_libs/score)             | [![pub points](https://img.shields.io/pub/points/powersync_flutter_libs?logo=dart)](https://pub.dev/packages/powersync_flutter_libs/score)             |
+| package                                                                                                                        | build                                                                                                                                                                                          | pub                                                                                                                                    | likes                                                                                                                                            | pub points                                                                                                                                             |
+|--------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [powersync](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync)                                       | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync.svg)](https://pub.dev/packages/powersync)                                       | [![likes](https://img.shields.io/pub/likes/powersync?logo=dart)](https://pub.dev/packages/powersync/score)                                       | [![pub points](https://img.shields.io/pub/points/powersync?logo=dart)](https://pub.dev/packages/powersync/score)                                       |
+| [powersync_core](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_core)                             | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_core.svg)](https://pub.dev/packages/powersync_core)                             | [![likes](https://img.shields.io/pub/likes/powersync_core?logo=dart)](https://pub.dev/packages/powersync_core/score)                             | [![pub points](https://img.shields.io/pub/points/powersync_core?logo=dart)](https://pub.dev/packages/powersync_core/score)                             |
+| [powersync_sqlcipher](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_sqlcipher)                   | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_sqlcipher.svg)](https://pub.dev/packages/powersync_sqlcipher)                   | [![likes](https://img.shields.io/pub/likes/powersync_sqlcipher?logo=dart)](https://pub.dev/packages/powersync_sqlcipher/score)                   | [![pub points](https://img.shields.io/pub/points/powersync_sqlcipher?logo=dart)](https://pub.dev/packages/powersync_sqlcipher/score)                   |
+| [powersync_attachments_helper](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_attachments_helper) | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_attachments_helper.svg)](https://pub.dev/packages/powersync_attachments_helper) | [![likes](https://img.shields.io/pub/likes/powersync_attachments_helper?logo=dart)](https://pub.dev/packages/powersync_attachments_helper/score) | [![pub points](https://img.shields.io/pub/points/powersync_attachments_helper?logo=dart)](https://pub.dev/packages/powersync_attachments_helper/score) |
+| [powersync_flutter_libs](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_flutter_libs)             | [![build](https://github.com/powersync-ja/powersync.dart/actions/workflows/check.yml/badge.svg?branch=main)](https://github.com/powersync-ja/powersync.dart/actions?query=workflow%3Apackages) | [![pub package](https://img.shields.io/pub/v/powersync_flutter_libs.svg)](https://pub.dev/packages/powersync_flutter_libs)             | [![likes](https://img.shields.io/pub/likes/powersync_flutter_libs?logo=dart)](https://pub.dev/packages/powersync_flutter_libs/score)             | [![pub points](https://img.shields.io/pub/points/powersync_flutter_libs?logo=dart)](https://pub.dev/packages/powersync_flutter_libs/score)             |
 
 #### Usage
 
 This monorepo uses [melos](https://melos.invertase.dev/) to handle command and package management.
 
-For detailed usage, check out the inner [powersync](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync), [powersync_core](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_core), [powersync_sqlcipher](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_sqlcipher) and [attachments helper](https://github.com/powersync-ja/powersync.dart/tree/master/packages/powersync_attachments_helper) packages.
+For detailed usage, check out the inner [powersync](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync), [powersync_core](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_core), [powersync_sqlcipher](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_sqlcipher) and [attachments helper](https://github.com/powersync-ja/powersync.dart/tree/main/packages/powersync_attachments_helper) packages.
 
 To configure the monorepo for development run `melos prepare` after cloning
 

demos/benchmarks/pubspec.yaml

@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  powersync: ^1.12.2
+  powersync: ^1.12.4
   path_provider: ^2.1.1
   path: ^1.8.3
   logging: ^1.2.0

demos/django-todolist/lib/main.dart

@@ -41,7 +41,7 @@ const listsPage = ListsPage();
 const homePage = listsPage;
 
 const sqlConsolePage = Scaffold(
-    appBar: StatusAppBar(title: 'SQL Console'),
+    appBar: StatusAppBar(title: Text('SQL Console')),
     body: QueryWidget(defaultQuery: defaultQuery));
 
 const loginPage = LoginPage();
@@ -76,7 +76,7 @@ class MyHomePage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: StatusAppBar(title: title),
+      appBar: StatusAppBar(title: Text(title)),
       body: Center(child: content),
       floatingActionButton: floatingActionButton,
       drawer: Drawer(

demos/django-todolist/lib/widgets/status_app_bar.dart

@@ -1,62 +1,42 @@
-import 'dart:async';
-
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:powersync/powersync.dart';
 import 'package:powersync_django_todolist_demo/widgets/fts_search_delegate.dart';
 import '../powersync.dart';
 
-class StatusAppBar extends StatefulWidget implements PreferredSizeWidget {
-  const StatusAppBar({super.key, required this.title});
-
-  final String title;
+class StatusAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Widget title;
 
-  @override
-  State<StatusAppBar> createState() => _StatusAppBarState();
+  const StatusAppBar({super.key, required this.title});
 
   @override
   Size get preferredSize => const Size.fromHeight(kToolbarHeight);
-}
-
-class _StatusAppBarState extends State<StatusAppBar> {
-  late SyncStatus _connectionState;
-  StreamSubscription<SyncStatus>? _syncStatusSubscription;
-
-  @override
-  void initState() {
-    super.initState();
-    _connectionState = db.currentStatus;
-    _syncStatusSubscription = db.statusStream.listen((event) {
-      setState(() {
-        _connectionState = db.currentStatus;
-      });
-    });
-  }
-
-  @override
-  void dispose() {
-    super.dispose();
-    _syncStatusSubscription?.cancel();
-  }
 
   @override
   Widget build(BuildContext context) {
-    final statusIcon = _getStatusIcon(_connectionState);
+    return StreamBuilder(
+      stream: db.statusStream,
+      initialData: db.currentStatus,
+      builder: (context, snapshot) {
+        final status = snapshot.data!;
+        final statusIcon = _getStatusIcon(status);
 
-    return AppBar(
-      title: Text(widget.title),
-      actions: <Widget>[
-        IconButton(
-          onPressed: () {
-            showSearch(context: context, delegate: FtsSearchDelegate());
-          },
-          icon: const Icon(Icons.search),
-        ),
-        statusIcon,
-        // Make some space for the "Debug" banner, so that the status
-        // icon isn't hidden
-        if (kDebugMode) _makeIcon('Debug mode', Icons.developer_mode),
-      ],
+        return AppBar(
+          title: title,
+          actions: <Widget>[
+            IconButton(
+              onPressed: () {
+                showSearch(context: context, delegate: FtsSearchDelegate());
+              },
+              icon: const Icon(Icons.search),
+            ),
+            statusIcon,
+            // Make some space for the "Debug" banner, so that the status
+            // icon isn't hidden
+            if (kDebugMode) _makeIcon('Debug mode', Icons.developer_mode),
+          ],
+        );
+      },
     );
   }
 }