From 6feb22b7e9bd7b40637de8704bab20d9bcbcc0d4 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 22 Aug 2023 10:06:20 +0200 Subject: [PATCH 01/36] Initial extension testing. --- lib/src/open_factory.dart | 55 ++++++++------------------------------- 1 file changed, 11 insertions(+), 44 deletions(-) diff --git a/lib/src/open_factory.dart b/lib/src/open_factory.dart index ba6e58d4..18a34d3d 100644 --- a/lib/src/open_factory.dart +++ b/lib/src/open_factory.dart @@ -1,13 +1,12 @@ import 'dart:async'; -import 'dart:convert'; import 'dart:io'; import 'dart:isolate'; +import 'dart:ffi' as ffi; +import 'package:powersync/sqlite3.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'package:sqlite_async/sqlite_async.dart'; -import 'uuid.dart'; - /// Advanced: Define custom setup for each SQLite connection. @Deprecated('Use SqliteOpenFactory instead') class SqliteConnectionSetup { @@ -39,53 +38,21 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { sqlite.Database open(SqliteOpenOptions options) { // ignore: deprecated_member_use_from_same_package _sqliteSetup?.setup(); + + enableExtension(); + final db = super.open(options); setupFunctions(db); return db; } - void setupFunctions(sqlite.Database db) { - db.createFunction( - functionName: 'uuid', - argumentCount: const sqlite.AllowedArgumentCount(0), - function: (args) => uuid.v4(), - ); - db.createFunction( - // Postgres compatibility - functionName: 'gen_random_uuid', - argumentCount: const sqlite.AllowedArgumentCount(0), - function: (args) => uuid.v4(), - ); - - db.createFunction( - functionName: 'powersync_diff', - argumentCount: const sqlite.AllowedArgumentCount(2), - deterministic: true, - directOnly: false, - function: (args) { - final oldData = jsonDecode(args[0] as String) as Map; - final newData = jsonDecode(args[1] as String) as Map; - - Map result = {}; - - for (final newEntry in newData.entries) { - final oldValue = oldData[newEntry.key]; - final newValue = newEntry.value; - - if (newValue != oldValue) { - result[newEntry.key] = newValue; - } - } - - for (final key in oldData.keys) { - if (!newData.containsKey(key)) { - result[key] = null; - } - } - - return jsonEncode(result); - }); + void enableExtension() { + var powersync_lib = ffi.DynamicLibrary.open('libpowersync.so'); + sqlite.sqlite3.ensureExtensionLoaded( + SqliteExtension.inLibrary(powersync_lib, 'sqlite3_powersync_init')); + } + void setupFunctions(sqlite.Database db) { db.createFunction( functionName: 'powersync_sleep', argumentCount: const sqlite.AllowedArgumentCount(1), From 6d20fae6b0e5aa7f79cfef4350bd338dcb6d2e8b Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 23 Aug 2023 13:30:53 +0200 Subject: [PATCH 02/36] Replace schema logic with rust extension. --- lib/src/migrations.dart | 67 -------- lib/src/open_factory.dart | 4 +- lib/src/powersync_database.dart | 3 +- lib/src/schema.dart | 33 ++-- lib/src/schema_logic.dart | 279 +------------------------------- 5 files changed, 25 insertions(+), 361 deletions(-) delete mode 100644 lib/src/migrations.dart diff --git a/lib/src/migrations.dart b/lib/src/migrations.dart deleted file mode 100644 index a6f7e7a6..00000000 --- a/lib/src/migrations.dart +++ /dev/null @@ -1,67 +0,0 @@ -import 'package:sqlite_async/sqlite_async.dart'; - -final migrations = SqliteMigrations(migrationTable: 'ps_migration') - ..add(SqliteMigration(1, (tx) async { - await tx.computeWithDatabase((db) async { - db.execute(''' - DROP TABLE IF EXISTS crud; - DROP TABLE IF EXISTS oplog; - DROP TABLE IF EXISTS buckets; - DROP TABLE IF EXISTS objects_untyped; - DROP TABLE IF EXISTS ps_oplog; - DROP TABLE IF EXISTS ps_buckets; - DROP TABLE IF EXISTS ps_untyped; - DROP TABLE IF EXISTS ps_migrations; - '''); - - final existingTableRows = db.select( - "SELECT name FROM sqlite_master WHERE type='table' AND name GLOB 'objects__*'"); - - for (var row in existingTableRows) { - db.execute('DROP TABLE ${row['name']}'); - } - - db.execute(''' - CREATE TABLE ps_oplog( - bucket TEXT NOT NULL, - op_id INTEGER NOT NULL, - op INTEGER NOT NULL, - row_type TEXT, - row_id TEXT, - key TEXT, - data TEXT, - hash INTEGER NOT NULL, - superseded INTEGER NOT NULL); - - CREATE INDEX ps_oplog_by_row ON ps_oplog (row_type, row_id) WHERE superseded = 0; - CREATE INDEX ps_oplog_by_opid ON ps_oplog (bucket, op_id); - CREATE INDEX ps_oplog_by_key ON ps_oplog (bucket, key) WHERE superseded = 0; - - CREATE TABLE ps_buckets( - name TEXT PRIMARY KEY, - last_applied_op INTEGER NOT NULL DEFAULT 0, - last_op INTEGER NOT NULL DEFAULT 0, - target_op INTEGER NOT NULL DEFAULT 0, - add_checksum INTEGER NOT NULL DEFAULT 0, - pending_delete INTEGER NOT NULL DEFAULT 0 - ); - - CREATE TABLE ps_untyped(type TEXT NOT NULL, id TEXT NOT NULL, data TEXT, PRIMARY KEY (type, id)); - - CREATE TABLE IF NOT EXISTS ps_crud (id INTEGER PRIMARY KEY AUTOINCREMENT, data TEXT); - '''); - }); - })) - ..add(SqliteMigration(2, (tx) async { - await tx.computeWithDatabase((db) async { - db.execute(''' -CREATE TABLE ps_tx(id INTEGER PRIMARY KEY NOT NULL, current_tx INTEGER, next_tx INTEGER); -INSERT INTO ps_tx(id, current_tx, next_tx) VALUES(1, NULL, 1); - -ALTER TABLE ps_crud ADD COLUMN tx_id INTEGER; - '''); - }); - }, - downMigration: SqliteDownMigration(toVersion: 1) - ..add('DROP TABLE ps_tx') - ..add('ALTER TABLE ps_crud DROP COLUMN tx_id'))); diff --git a/lib/src/open_factory.dart b/lib/src/open_factory.dart index 18a34d3d..8f1edf66 100644 --- a/lib/src/open_factory.dart +++ b/lib/src/open_factory.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:isolate'; -import 'dart:ffi' as ffi; +import 'dart:ffi'; import 'package:powersync/sqlite3.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; @@ -47,7 +47,7 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { } void enableExtension() { - var powersync_lib = ffi.DynamicLibrary.open('libpowersync.so'); + var powersync_lib = DynamicLibrary.open('libpowersync.so'); sqlite.sqlite3.ensureExtensionLoaded( SqliteExtension.inLibrary(powersync_lib, 'sqlite3_powersync_init')); } diff --git a/lib/src/powersync_database.dart b/lib/src/powersync_database.dart index 449fe2da..815ab872 100644 --- a/lib/src/powersync_database.dart +++ b/lib/src/powersync_database.dart @@ -12,7 +12,6 @@ import 'crud.dart'; import 'database_utils.dart'; import 'isolate_completer.dart'; import 'log.dart'; -import 'migrations.dart'; import 'open_factory.dart'; import 'powersync_update_notification.dart'; import 'schema.dart'; @@ -122,7 +121,7 @@ class PowerSyncDatabase with SqliteQueries implements SqliteConnection { Future _init() async { statusStream = _statusStreamController.stream; await database.initialize(); - await migrations.migrate(database); + await database.execute('SELECT powersync_init()'); await updateSchemaInIsolate(database, schema); } diff --git a/lib/src/schema.dart b/lib/src/schema.dart index 1ef1e269..656bf1ff 100644 --- a/lib/src/schema.dart +++ b/lib/src/schema.dart @@ -9,6 +9,8 @@ class Schema { final List tables; const Schema(this.tables); + + Map toJson() => {'tables': tables}; } /// A single table in the schema. @@ -70,6 +72,14 @@ class Table { bool get validName { return !invalidSqliteCharacters.hasMatch(name); } + + Map toJson() => { + 'name': name, + 'local_only': localOnly, + 'insert_only': insertOnly, + 'columns': columns, + 'indexes': indexes.map((e) => e.toJson(this)).toList(growable: false) + }; } class Index { @@ -95,13 +105,10 @@ class Index { return "${table.internalName}__$name"; } - /// Internal use only. - /// - /// Returns a SQL statement that creates this index. - String toSqlDefinition(Table table) { - var fields = columns.map((column) => column.toSql(table)).join(', '); - return 'CREATE INDEX "${fullName(table)}" ON "${table.internalName}"($fields)'; - } + Map toJson(Table table) => { + 'name': name, + 'columns': columns.map((c) => c.toJson(table)).toList(growable: false) + }; } /// Describes an indexed column. @@ -116,14 +123,10 @@ class IndexedColumn { const IndexedColumn.ascending(this.column) : ascending = true; const IndexedColumn.descending(this.column) : ascending = false; - String toSql(Table table) { - final fullColumn = table[column]; // errors if not found + Map toJson(Table table) { + final t = table[column].type; - if (ascending) { - return mapColumn(fullColumn); - } else { - return "${mapColumn(fullColumn)} DESC"; - } + return {'name': column, 'ascending': ascending, 'type': t.sqlite}; } } @@ -151,6 +154,8 @@ class Column { /// Create a REAL column. const Column.real(this.name) : type = ColumnType.real; + + Map toJson() => {'name': name, 'type': type.sqlite}; } /// Type of column. diff --git a/lib/src/schema_logic.dart b/lib/src/schema_logic.dart index 96d38f5e..77e2e5f4 100644 --- a/lib/src/schema_logic.dart +++ b/lib/src/schema_logic.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'package:sqlite_async/sqlite_async.dart'; @@ -7,203 +9,9 @@ const String maxOpId = '9223372036854775807'; final invalidSqliteCharacters = RegExp(r'''["'%,\.#\s\[\]]'''); -/// Since view names don't have a static prefix, mark views as auto-generated by adding a comment. -final _autoGenerated = '-- powersync-auto-generated'; - -String createViewStatement(Table table) { - final columnNames = - table.columns.map((column) => quoteIdentifier(column.name)).join(', '); - - if (table.insertOnly) { - final nulls = table.columns.map((column) => 'NULL').join(', '); - return 'CREATE VIEW ${quoteIdentifier(table.name)}("id", $columnNames) AS SELECT NULL, $nulls WHERE 0 $_autoGenerated'; - } - final select = table.columns.map(mapColumn).join(', '); - return 'CREATE VIEW ${quoteIdentifier(table.name)}("id", $columnNames) AS SELECT "id", $select FROM ${quoteIdentifier(table.internalName)} $_autoGenerated'; -} - -String mapColumn(Column column) { - return "CAST(json_extract(data, ${quoteJsonPath(column.name)}) as ${column.type.sqlite})"; -} - -List createViewTriggerStatements(Table table) { - if (table.localOnly) { - return createViewTriggerStatementsLocal(table); - } else if (table.insertOnly) { - return createViewTriggerStatementsInsert(table); - } - final type = table.name; - final internalNameE = quoteIdentifier(table.internalName); - - final jsonFragment = table.columns - .map((column) => - "${quoteString(column.name)}, NEW.${quoteIdentifier(column.name)}") - .join(', '); - final jsonFragmentOld = table.columns - .map((column) => - "${quoteString(column.name)}, OLD.${quoteIdentifier(column.name)}") - .join(', '); - // Names in alphabetical order - return [ - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_delete_$type')} -INSTEAD OF DELETE ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - DELETE FROM $internalNameE WHERE id = OLD.id; - INSERT INTO ps_crud(tx_id, data) SELECT current_tx, json_object('op', 'DELETE', 'type', ${quoteString(type)}, 'id', OLD.id) FROM ps_tx WHERE id = 1; -END""", - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_insert_$type')} -INSTEAD OF INSERT ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - SELECT CASE - WHEN (NEW.id IS NULL) - THEN RAISE (FAIL, 'id is required') - END; - INSERT INTO $internalNameE(id, data) - SELECT NEW.id, json_object($jsonFragment); - INSERT INTO ps_crud(tx_id, data) SELECT current_tx, json_object('op', 'PUT', 'type', ${quoteString(type)}, 'id', NEW.id, 'data', json(powersync_diff('{}', json_object($jsonFragment)))) FROM ps_tx WHERE id = 1; - INSERT INTO ps_oplog(bucket, op_id, op, row_type, row_id, hash, superseded) - SELECT '\$local', - 1, - 'REMOVE', - ${quoteString(type)}, - NEW.id, - 0, - 0; - INSERT OR REPLACE INTO ps_buckets(name, pending_delete, last_op, target_op) VALUES('\$local', 1, 0, $maxOpId); -END""", - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_update_$type')} -INSTEAD OF UPDATE ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - SELECT CASE - WHEN (OLD.id != NEW.id) - THEN RAISE (FAIL, 'Cannot update id') - END; - UPDATE $internalNameE - SET data = json_object($jsonFragment) - WHERE id = NEW.id; - INSERT INTO ps_crud(tx_id, data) SELECT current_tx, json_object('op', 'PATCH', 'type', ${quoteString(type)}, 'id', NEW.id, 'data', json(powersync_diff(json_object($jsonFragmentOld), json_object($jsonFragment)))) FROM ps_tx WHERE id = 1; - INSERT INTO ps_oplog(bucket, op_id, op, row_type, row_id, hash, superseded) - SELECT '\$local', - 1, - 'REMOVE', - ${quoteString(type)}, - NEW.id, - 0, - 0; - INSERT OR REPLACE INTO ps_buckets(name, pending_delete, last_op, target_op) VALUES('\$local', 1, 0, $maxOpId); -END""" - ]; -} - -List createViewTriggerStatementsLocal(Table table) { - final type = table.name; - final internalNameE = quoteIdentifier(table.internalName); - - final jsonFragment = table.columns - .map((column) => - "${quoteString(column.name)}, NEW.${quoteIdentifier(column.name)}") - .join(', '); - // Names in alphabetical order - return [ - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_delete_$type')} -INSTEAD OF DELETE ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - DELETE FROM $internalNameE WHERE id = OLD.id; -END""", - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_insert_$type')} -INSTEAD OF INSERT ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - INSERT INTO $internalNameE(id, data) - SELECT NEW.id, json_object($jsonFragment); -END""", - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_update_$type')} -INSTEAD OF UPDATE ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - SELECT CASE - WHEN (OLD.id != NEW.id) - THEN RAISE (FAIL, 'Cannot update id') - END; - UPDATE $internalNameE - SET data = json_object($jsonFragment) - WHERE id = NEW.id; -END""" - ]; -} - -List createViewTriggerStatementsInsert(Table table) { - final type = table.name; - - final jsonFragment = table.columns - .map((column) => - "${quoteString(column.name)}, NEW.${quoteIdentifier(column.name)}") - .join(', '); - return [ - """ -CREATE TRIGGER ${quoteIdentifier('ps_view_insert_$type')} -INSTEAD OF INSERT ON ${quoteIdentifier(type)} -FOR EACH ROW -BEGIN - INSERT INTO ps_crud(tx_id, data) SELECT current_tx, json_object('op', 'PUT', 'type', ${quoteString(type)}, 'id', NEW.id, 'data', json(powersync_diff('{}', json_object($jsonFragment)))) FROM ps_tx WHERE id = 1; -END""" - ]; -} - /// Sync the schema to the local database. -/// -/// Must be wrapped in a transaction. void updateSchema(sqlite.Database db, Schema schema) { - _createTablesAndIndexes(db, schema); - - final existingViewRows = db.select( - "SELECT name FROM sqlite_master WHERE type='view' AND sql GLOB '*$_autoGenerated'"); - - Set toRemove = {for (var row in existingViewRows) row['name']}; - - for (var table in schema.tables) { - assert(table.validName, "Invalid characters in table name: ${table.name}"); - - toRemove.remove(table.name); - - var createViewOp = createViewStatement(table); - var triggers = createViewTriggerStatements(table); - var existingRows = db.select( - "SELECT sql FROM sqlite_master WHERE (type = 'view' AND name = ?) OR (type = 'trigger' AND tbl_name = ?) ORDER BY type DESC, name ASC", - [table.name, table.name]); - if (existingRows.isNotEmpty) { - final dbSql = existingRows.map((row) => row['sql']).join('\n\n'); - final generatedSql = - [createViewOp, for (var trigger in triggers) trigger].join('\n\n'); - if (dbSql == generatedSql) { - // No change - keep it. - continue; - } else { - // View and/or triggers changed - delete and re-create. - db.execute('DROP VIEW ${quoteIdentifier(table.name)}'); - } - } else { - // New - create - } - db.execute(createViewOp); - for (final op in triggers) { - db.execute(op); - } - } - - for (var name in toRemove) { - db.execute('DROP VIEW ${quoteIdentifier(name)}'); - } + db.execute('SELECT powersync_replace_schema(?)', [jsonEncode(schema)]); } Future updateSchemaInIsolate( @@ -213,87 +21,6 @@ Future updateSchemaInIsolate( }); } -/// Sync the schema to the local database. -/// -/// Does not create triggers or temporary views. -/// -/// Must be wrapped in a transaction. -void _createTablesAndIndexes(sqlite.Database db, Schema schema) { - // Make sure to refresh tables in the same transaction as updating them - final existingTableRows = db.select( - "SELECT name FROM sqlite_master WHERE type='table' AND name GLOB 'ps_data_*'"); - final existingIndexRows = db.select( - "SELECT name, sql FROM sqlite_master WHERE type='index' AND name GLOB 'ps_data_*'"); - - final Set remainingTables = {}; - final Map remainingIndexes = {}; - for (final row in existingTableRows) { - remainingTables.add(row['name'] as String); - } - for (final row in existingIndexRows) { - remainingIndexes[row['name'] as String] = row['sql'] as String; - } - - for (final table in schema.tables) { - if (table.insertOnly) { - // Does not have a physical table - continue; - } - final tableName = table.internalName; - final exists = remainingTables.contains(tableName); - remainingTables.remove(tableName); - if (exists) { - continue; - } - - db.execute("""CREATE TABLE ${quoteIdentifier(tableName)} - ( - id TEXT PRIMARY KEY NOT NULL, - data TEXT - )"""); - - if (!table.localOnly) { - db.execute("""INSERT INTO ${quoteIdentifier(tableName)}(id, data) - SELECT id, data - FROM ps_untyped - WHERE type = ?""", [table.name]); - db.execute("""DELETE - FROM ps_untyped - WHERE type = ?""", [table.name]); - } - - for (final index in table.indexes) { - final fullName = index.fullName(table); - final sql = index.toSqlDefinition(table); - if (remainingIndexes.containsKey(fullName)) { - final existingSql = remainingIndexes[fullName]; - if (existingSql == sql) { - continue; - } else { - db.execute('DROP INDEX ${quoteIdentifier(fullName)}'); - } - } - db.execute(sql); - } - } - - for (final indexName in remainingIndexes.keys) { - db.execute('DROP INDEX ${quoteIdentifier(indexName)}'); - } - - for (final tableName in remainingTables) { - final typeMatch = RegExp("^ps_data__(.+)\$").firstMatch(tableName); - if (typeMatch != null) { - // Not local-only - final type = typeMatch[1]; - db.execute( - 'INSERT INTO ps_untyped(type, id, data) SELECT ?, id, data FROM ${quoteIdentifier(tableName)}', - [type]); - } - db.execute('DROP TABLE ${quoteIdentifier(tableName)}'); - } -} - String? friendlyTableName(String table) { final re = RegExp(r"^ps_data__(.+)$"); final re2 = RegExp(r"^ps_data_local__(.+)$"); From 1343b48eb2938e72f52c4695ea5c26fc815d6e3c Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 23 Aug 2023 16:39:11 +0200 Subject: [PATCH 03/36] Use extension for saving operations. --- lib/src/bucket_storage.dart | 187 +++++++++--------------------------- 1 file changed, 45 insertions(+), 142 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index bc69a7cb..52f24aa9 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -58,153 +58,19 @@ class BucketStorage { await writeTransaction((db) { for (var b in batch.buckets) { - var bucket = b.bucket; - var data = b.data; - - count += data.length; - final isFinal = !b.hasMore; - _updateBucket(db, bucket, data, isFinal); + count += b.data.length; + _updateBucket2( + db, + jsonEncode({ + 'buckets': [b] + })); } }); _compactCounter += count; } - void _updateBucket(sqlite.Database db, String bucket, List data, - bool finalBucketUpdate) { - if (data.isEmpty) { - return; - } - - String? lastOp; - String? firstOp; - BigInt? targetOp; - - List> inserts = []; - Map> lastInsert = {}; - List allEntries = []; - - List clearOps = []; - - for (final op in data) { - lastOp = op.opId; - firstOp ??= op.opId; - - final Map insert = { - 'op_id': op.opId, - 'op': op.op!.value, - 'bucket': bucket, - 'key': op.key, - 'row_type': op.rowType, - 'row_id': op.rowId, - 'data': op.data, - 'checksum': op.checksum, - 'superseded': 0 - }; - - if (op.op == OpType.move) { - insert['superseded'] = 1; - } - - if (op.op == OpType.put || - op.op == OpType.remove || - op.op == OpType.move) { - inserts.add(insert); - } - - if (op.op == OpType.put || op.op == OpType.remove) { - final key = op.key; - final prev = lastInsert[key]; - if (prev != null) { - prev['superseded'] = 1; - } - lastInsert[key] = insert; - allEntries.add(key); - } else if (op.op == OpType.move) { - final target = op.parsedData?['target'] as String?; - if (target != null) { - final l = BigInt.parse(target, radix: 10); - if (targetOp == null || l < targetOp) { - targetOp = l; - } - } - } else if (op.op == OpType.clear) { - // Any remaining PUT operations should get an implicit REMOVE. - clearOps.add(SqliteOp( - "UPDATE ps_oplog SET op=${OpType.remove.value}, data=NULL, hash=0 WHERE (op=${OpType.put.value} OR op=${OpType.remove.value}) AND bucket=? AND op_id <= ?", - [bucket, op.opId])); - // And we need to re-apply all of those. - // We also replace the checksum with the checksum of the CLEAR op. - clearOps.add(SqliteOp( - "UPDATE ps_buckets SET last_applied_op = 0, add_checksum = ? WHERE name = ?", - [op.checksum, bucket])); - } - } - - // Mark old ops as superseded - db.execute(""" - UPDATE ps_oplog AS oplog - SET superseded = 1, - op = ${OpType.move.value}, - data = NULL - WHERE oplog.superseded = 0 - AND unlikely(oplog.bucket = ?) - AND oplog.key IN (SELECT json_each.value FROM json_each(?)) - """, [bucket, jsonEncode(allEntries)]); - - var stmt = db.prepare( - 'INSERT INTO ps_oplog(op_id, op, bucket, key, row_type, row_id, data, hash, superseded) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)'); - try { - for (var insert in inserts) { - stmt.execute([ - insert['op_id'], - insert['op'], - insert['bucket'], - insert['key'], - insert['row_type'], - insert['row_id'], - insert['data'], - insert['checksum'], - insert['superseded'] - ]); - } - } finally { - stmt.dispose(); - } - - db.execute("INSERT OR IGNORE INTO ps_buckets(name) VALUES(?)", [bucket]); - - if (lastOp != null) { - db.execute( - "UPDATE ps_buckets SET last_op = ? WHERE name = ?", [lastOp, bucket]); - } - if (targetOp != null) { - db.execute( - "UPDATE ps_buckets AS buckets SET target_op = MAX(?, buckets.target_op) WHERE name = ?", - [targetOp.toString(), bucket]); - } - - for (final op in clearOps) { - db.execute(op.sql, op.args); - } - - // Compact superseded ops immediately, but only _after_ clearing - if (firstOp != null && lastOp != null) { - db.execute("""UPDATE ps_buckets AS buckets - SET add_checksum = add_checksum + (SELECT IFNULL(SUM(hash), 0) - FROM ps_oplog AS oplog - WHERE superseded = 1 - AND oplog.bucket = ? - AND oplog.op_id >= ? - AND oplog.op_id <= ?) - WHERE buckets.name = ?""", [bucket, firstOp, lastOp, bucket]); - - db.execute("""DELETE - FROM ps_oplog - WHERE superseded = 1 - AND bucket = ? - AND op_id >= ? - AND op_id <= ?""", [bucket, firstOp, lastOp]); - } + void _updateBucket2(sqlite.Database db, String json) { + db.execute('INSERT INTO powersync_operations(data) VALUES(?)', [json]); } Future removeBuckets(List buckets) async { @@ -746,6 +612,16 @@ class SyncBucketData { nextAfter = json['next_after'], data = (json['data'] as List).map((e) => OplogEntry.fromJson(e)).toList(); + + Map toJson() { + return { + 'bucket': bucket, + 'has_more': hasMore, + 'after': after, + 'next_after': nextAfter, + 'data': data + }; + } } class OplogEntry { @@ -793,6 +669,18 @@ class OplogEntry { String get key { return "$rowType/$rowId/$subkey"; } + + Map toJson() { + return { + 'op_id': opId, + 'op': op?.toJson(), + 'object_type': rowType, + 'object_id': rowId, + 'checksum': checksum, + 'subkey': subkey, + 'data': data + }; + } } class SqliteOp { @@ -864,6 +752,21 @@ enum OpType { return null; } } + + String toJson() { + switch (this) { + case clear: + return 'CLEAR'; + case move: + return 'MOVE'; + case put: + return 'PUT'; + case remove: + return 'REMOVE'; + default: + return ''; + } + } } /// Get a table name for a specific type. The table may or may not exist. From eb45c7576b5def975aab9464a054051eee7de770 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 24 Aug 2023 13:15:33 +0200 Subject: [PATCH 04/36] Auto tx_id. --- lib/src/database_utils.dart | 22 ----- lib/src/powersync_database.dart | 26 ------ test/crud_test.dart | 12 +-- test/schema_test.dart | 140 ++++++++++++++++++++++++++++++++ 4 files changed, 146 insertions(+), 54 deletions(-) create mode 100644 test/schema_test.dart diff --git a/lib/src/database_utils.dart b/lib/src/database_utils.dart index 95d9098b..c3c4e6a7 100644 --- a/lib/src/database_utils.dart +++ b/lib/src/database_utils.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'package:sqlite_async/sqlite3.dart' as sqlite; -import 'package:sqlite_async/sqlite_async.dart'; Future asyncDirectTransaction(sqlite.Database db, FutureOr Function(sqlite.Database db) callback) async { @@ -35,24 +34,3 @@ Future asyncDirectTransaction(sqlite.Database db, } throw AssertionError('Should not reach this'); } - -Future internalTrackedWriteTransaction(SqliteWriteContext ctx, - Future Function(SqliteWriteContext tx) callback) async { - try { - await ctx.execute('BEGIN IMMEDIATE'); - await ctx.execute( - 'UPDATE ps_tx SET current_tx = next_tx, next_tx = next_tx + 1 WHERE id = 1'); - final result = await callback(ctx); - await ctx.execute('UPDATE ps_tx SET current_tx = NULL WHERE id = 1'); - await ctx.execute('COMMIT'); - return result; - } catch (e) { - try { - await ctx.execute('ROLLBACK'); - } catch (e) { - // In rare cases, a ROLLBACK may fail. - // Safe to ignore. - } - rethrow; - } -} diff --git a/lib/src/powersync_database.dart b/lib/src/powersync_database.dart index 815ab872..575ba069 100644 --- a/lib/src/powersync_database.dart +++ b/lib/src/powersync_database.dart @@ -439,32 +439,6 @@ class PowerSyncDatabase with SqliteQueries implements SqliteConnection { return database.writeLock(callback, debugContext: debugContext, lockTimeout: lockTimeout); } - - @override - Future writeTransaction( - Future Function(SqliteWriteContext tx) callback, - {Duration? lockTimeout, - String? debugContext}) async { - return writeLock((ctx) async { - return await internalTrackedWriteTransaction(ctx, callback); - }, - lockTimeout: lockTimeout, - debugContext: debugContext ?? 'writeTransaction()'); - } - - @override - Future execute(String sql, - [List parameters = const []]) async { - return writeLock((ctx) async { - try { - await ctx.execute( - 'UPDATE ps_tx SET current_tx = next_tx, next_tx = next_tx + 1 WHERE id = 1'); - return await ctx.execute(sql, parameters); - } finally { - await ctx.execute('UPDATE ps_tx SET current_tx = NULL WHERE id = 1'); - } - }, debugContext: 'execute()'); - } } class _PowerSyncDatabaseIsolateArgs { diff --git a/test/crud_test.dart b/test/crud_test.dart index 4ce504f9..c58e2d1e 100644 --- a/test/crud_test.dart +++ b/test/crud_test.dart @@ -97,11 +97,11 @@ void main() { ])); var tx = (await powersync.getNextCrudTransaction())!; - expect(tx.transactionId, equals(3)); + expect(tx.transactionId, equals(2)); expect( tx.crud, equals([ - CrudEntry(2, UpdateType.patch, 'assets', testId, 3, + CrudEntry(2, UpdateType.patch, 'assets', testId, 2, {"description": "test2"}) ])); }); @@ -121,9 +121,9 @@ void main() { ])); var tx = (await powersync.getNextCrudTransaction())!; - expect(tx.transactionId, equals(3)); + expect(tx.transactionId, equals(2)); expect(tx.crud, - equals([CrudEntry(2, UpdateType.delete, 'assets', testId, 3, null)])); + equals([CrudEntry(2, UpdateType.delete, 'assets', testId, 2, null)])); }); test('UPSERT not supported', () async { @@ -163,11 +163,11 @@ void main() { expect(await powersync.getAll('SELECT * FROM logs'), equals([])); var tx = (await powersync.getNextCrudTransaction())!; - expect(tx.transactionId, equals(2)); + expect(tx.transactionId, equals(1)); expect( tx.crud, equals([ - CrudEntry(1, UpdateType.put, 'logs', testId, 2, + CrudEntry(1, UpdateType.put, 'logs', testId, 1, {"level": "INFO", "content": "test log"}) ])); }); diff --git a/test/schema_test.dart b/test/schema_test.dart new file mode 100644 index 00000000..91cb8de2 --- /dev/null +++ b/test/schema_test.dart @@ -0,0 +1,140 @@ +import 'dart:convert'; + +import 'package:powersync/powersync.dart'; +import 'package:test/test.dart'; + +import 'util.dart'; + +const testId = "2290de4f-0488-4e50-abed-f8e8eb1d0b42"; +final schema = Schema([ + Table('assets', [ + Column.text('created_at'), + Column.text('make'), + Column.text('model'), + Column.text('serial_number'), + Column.integer('quantity'), + Column.text('user_id'), + Column.real('weight'), + Column.text('description'), + ], indexes: [ + Index('makemodel', [IndexedColumn('make'), IndexedColumn('model')]) + ]), + Table('customers', [Column.text('name'), Column.text('email')]), + Table.insertOnly('logs', [Column.text('level'), Column.text('content')]), + Table.localOnly('credentials', [Column.text('key'), Column.text('value')]), +]); + +void main() { + setupLogger(); + + group('Schema Tests', () { + late String path; + + setUp(() async { + path = dbPath(); + await cleanDb(path: path); + }); + + test('Schema versioning', () async { + // Test that powersync_replace_schema() is a no-op when the schema is not + // modified. + + final powersync = await setupPowerSync(path: path, schema: schema); + + final versionBefore = await powersync.get('PRAGMA schema_version'); + await powersync.execute('SELECT powersync_replace_schema(?)', [schema]); + final versionAfter = await powersync.get('PRAGMA schema_version'); + + // No change + expect(versionAfter['schema_version'], + equals(versionBefore['schema_version'])); + + final schema2 = Schema([ + Table('assets', [ + Column.text('created_at'), + Column.text('make'), + Column.text('model'), + Column.text('serial_number'), + Column.integer('quantity'), + Column.text('user_id'), + Column.real('weights'), + Column.text('description'), + ], indexes: [ + Index('makemodel', [IndexedColumn('make'), IndexedColumn('model')]) + ]), + Table('customers', [Column.text('name'), Column.text('email')]), + Table.insertOnly( + 'logs', [Column.text('level'), Column.text('content')]), + Table.localOnly( + 'credentials', [Column.text('key'), Column.text('value')]), + ]); + await powersync.execute('SELECT powersync_replace_schema(?)', [schema2]); + + final versionAfter2 = await powersync.get('PRAGMA schema_version'); + + // Updated + expect(versionAfter2['schema_version'], + greaterThan(versionAfter['schema_version'])); + + final schema3 = Schema([ + Table('assets', [ + Column.text('created_at'), + Column.text('make'), + Column.text('model'), + Column.text('serial_number'), + Column.integer('quantity'), + Column.text('user_id'), + Column.real('weights'), + Column.text('description'), + ], indexes: [ + Index('makemodel', + [IndexedColumn('make'), IndexedColumn.descending('model')]) + ]), + Table('customers', [Column.text('name'), Column.text('email')]), + Table.insertOnly( + 'logs', [Column.text('level'), Column.text('content')]), + Table.localOnly( + 'credentials', [Column.text('key'), Column.text('value')]), + ]); + await powersync.execute('SELECT powersync_replace_schema(?)', [schema3]); + + final versionAfter3 = await powersync.get('PRAGMA schema_version'); + + // Updated again (index) + expect(versionAfter3['schema_version'], + greaterThan(versionAfter2['schema_version'])); + }); + + test('Indexing', () async { + final powersync = await setupPowerSync(path: path, schema: schema); + + final results = await powersync.execute( + 'EXPLAIN QUERY PLAN SELECT * FROM assets WHERE make = ?', ['test']); + + expect(results[0]['detail'], + contains('USING INDEX ps_data__assets__makemodel')); + + // Now drop the index + final schema2 = Schema([ + Table('assets', [ + Column.text('created_at'), + Column.text('make'), + Column.text('model'), + Column.text('serial_number'), + Column.integer('quantity'), + Column.text('user_id'), + Column.real('weight'), + Column.text('description'), + ], indexes: []), + ]); + await powersync.execute('SELECT powersync_replace_schema(?)', [schema2]); + + // Execute instead of getAll so that we don't get a cached query plan + // from a different connection + final results2 = await powersync.execute( + 'EXPLAIN QUERY PLAN SELECT * FROM assets WHERE make = ?', ['test']); + + expect(results2[0]['detail'], contains('SCAN')); + }); + }); +} From cc6d08d6cb71e1ef8628af46e2cc61a60b168e0a Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 24 Aug 2023 16:24:32 +0200 Subject: [PATCH 05/36] Use sync_local op. --- lib/src/bucket_storage.dart | 147 +++--------------------------------- 1 file changed, 11 insertions(+), 136 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index 52f24aa9..1c0c6f3f 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -70,7 +70,8 @@ class BucketStorage { } void _updateBucket2(sqlite.Database db, String json) { - db.execute('INSERT INTO powersync_operations(data) VALUES(?)', [json]); + db.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', + ['save', json]); } Future removeBuckets(List buckets) async { @@ -143,147 +144,21 @@ class BucketStorage { return SyncLocalDatabaseResult(ready: true); } - Future updateObjectsFromBuckets(Checkpoint checkpoint) async { + Future updateObjectsFromBuckets(Checkpoint _checkpoint) async { return writeTransaction((db) { - if (!_canUpdateLocal(db)) { + db.execute("INSERT INTO powersync_operations(op, data) VALUES(?, ?)", + ['sync_local', '']); + final rs = db.select('SELECT last_insert_rowid() as result'); + final result = rs[0]['result']; + if (result == 1) { + return true; + } else { + // can_update_local(db) == false return false; } - - // Updated objects - // TODO: Reduce memory usage - // Some options here: - // 1. Create a VIEW objects_updates, which contains triggers to update individual tables. - // This works well for individual tables, but difficult to have a catch all for untyped data, - // and performance degrades when we have hundreds of object types. - // 2. Similar, but use a TEMP TABLE instead. We can then query those from JS, and populate the tables from JS. - // 3. Skip the temp table, and query the data directly. Sorting and limiting becomes tricky. - // 3a. LIMIT on the first oplog step. This prevents us from using JOIN after this. - // 3b. LIMIT after the second oplog query - - // QUERY PLAN - // |--SCAN buckets - // |--SEARCH b USING INDEX ps_oplog_by_opid (bucket=? AND op_id>?) - // |--SEARCH r USING INDEX ps_oplog_by_row (row_type=? AND row_id=?) - // `--USE TEMP B-TREE FOR GROUP BY - // language=DbSqlite - var stmt = db.prepare( - """-- 3. Group the objects from different buckets together into a single one (ops). - SELECT r.row_type as type, - r.row_id as id, - r.data as data, - json_group_array(r.bucket) FILTER (WHERE r.op=${OpType.put.value}) as buckets, - /* max() affects which row is used for 'data' */ - max(r.op_id) FILTER (WHERE r.op=${OpType.put.value}) as op_id - -- 1. Filter oplog by the ops added but not applied yet (oplog b). - FROM ps_buckets AS buckets - CROSS JOIN ps_oplog AS b ON b.bucket = buckets.name - AND (b.op_id > buckets.last_applied_op) - -- 2. Find *all* current ops over different buckets for those objects (oplog r). - INNER JOIN ps_oplog AS r - ON r.row_type = b.row_type - AND r.row_id = b.row_id - WHERE r.superseded = 0 - AND b.superseded = 0 - -- Group for (3) - GROUP BY r.row_type, r.row_id - """); - try { - // TODO: Perhaps we don't need batching for this? - var cursor = stmt.selectCursor([]); - List rows = []; - while (cursor.moveNext()) { - var row = cursor.current; - rows.add(row); - - if (rows.length >= 10000) { - saveOps(db, rows); - rows = []; - } - } - if (rows.isNotEmpty) { - saveOps(db, rows); - } - } finally { - stmt.dispose(); - } - - db.execute("""UPDATE ps_buckets - SET last_applied_op = last_op - WHERE last_applied_op != last_op"""); - - log.fine('Updated local database'); - return true; }); } - // { type: string; id: string; data: string; buckets: string; op_id: string }[] - void saveOps(sqlite.Database db, List rows) { - Map> byType = {}; - for (final row in rows) { - byType.putIfAbsent(row['type'], () => []).add(row); - } - - for (final entry in byType.entries) { - final type = entry.key; - final typeRows = entry.value; - final table = _getTypeTableName(type); - - // Note that "PUT" and "DELETE" are split, and not applied in row order. - // So we only do either PUT or DELETE for each individual object, not both. - final Set removeIds = {}; - List puts = []; - for (final row in typeRows) { - if (row['buckets'] == '[]') { - removeIds.add(row['id']); - } else { - puts.add(row); - removeIds.remove(row['id']); - } - } - - puts = puts.where((update) => !removeIds.contains(update['id'])).toList(); - - if (tableNames.contains(table)) { - db.execute("""REPLACE INTO "$table"(id, data) - SELECT json_extract(json_each.value, '\$.id'), - json_extract(json_each.value, '\$.data') - FROM json_each(?)""", [jsonEncode(puts)]); - - db.execute("""DELETE - FROM "$table" - WHERE id IN (SELECT json_each.value FROM json_each(?))""", [ - jsonEncode([...removeIds]) - ]); - } else { - db.execute(r"""REPLACE INTO ps_untyped(type, id, data) - SELECT ?, - json_extract(json_each.value, '$.id'), - json_extract(json_each.value, '$.data') - FROM json_each(?)""", [type, jsonEncode(puts)]); - - db.execute("""DELETE FROM ps_untyped - WHERE type = ? - AND id IN (SELECT json_each.value FROM json_each(?))""", - [type, jsonEncode(removeIds.toList())]); - } - } - } - - bool _canUpdateLocal(sqlite.Database db) { - final invalidBuckets = db.select( - "SELECT name, target_op, last_op, last_applied_op FROM ps_buckets WHERE target_op > last_op AND (name = '\$local' OR pending_delete = 0)"); - if (invalidBuckets.isNotEmpty) { - log.fine('Cannot update local database: $invalidBuckets'); - return false; - } - // This is specifically relevant for when data is added to crud before another batch is completed. - final rows = db.select('SELECT 1 FROM ps_crud LIMIT 1'); - if (rows.isNotEmpty) { - return false; - } - return true; - } - SyncLocalDatabaseResult validateChecksums(Checkpoint checkpoint) { final rows = select("""WITH bucket_list(bucket, lower_op_id) AS ( From 1ebb56ced1e6e87a02727c7b8b9b710519112a81 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Sun, 27 Aug 2023 14:40:52 +0200 Subject: [PATCH 06/36] Validate checksums using extension. --- lib/src/bucket_storage.dart | 108 +++--------------------------------- lib/src/sync_types.dart | 10 ++++ test/crud_test.dart | 4 +- 3 files changed, 19 insertions(+), 103 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index 1c0c6f3f..3162fe4e 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -21,7 +21,6 @@ class BucketStorage { bool _pendingBucketDeletes = false; Set tableNames = {}; int _compactCounter = compactOperationInterval; - ChecksumCache? _checksumCache; BucketStorage(sqlite.Database db, {required this.mutex}) : _internalDb = db { _init(); @@ -40,9 +39,7 @@ class BucketStorage { return _internalDb.select(query, parameters); } - void startSession() { - _checksumCache = null; - } + void startSession() {} List getBucketStates() { final rows = select( @@ -160,107 +157,16 @@ class BucketStorage { } SyncLocalDatabaseResult validateChecksums(Checkpoint checkpoint) { - final rows = select("""WITH - bucket_list(bucket, lower_op_id) AS ( - SELECT - json_extract(json_each.value, '\$.bucket') as bucket, - json_extract(json_each.value, '\$.last_op_id') as lower_op_id - FROM json_each(?) - ) - SELECT - buckets.name as bucket, - buckets.add_checksum as add_checksum, - IFNULL(SUM(oplog.hash), 0) as oplog_checksum, - COUNT(oplog.op_id) as count, - CAST(MAX(oplog.op_id) as TEXT) as last_op_id, - CAST(buckets.last_applied_op as TEXT) as last_applied_op - FROM bucket_list - LEFT OUTER JOIN ps_buckets AS buckets ON - buckets.name = bucket_list.bucket - LEFT OUTER JOIN ps_oplog AS oplog ON - bucket_list.bucket = oplog.bucket AND - oplog.op_id <= ? AND oplog.op_id > bucket_list.lower_op_id - GROUP BY bucket_list.bucket""", [ - jsonEncode(checkpoint.checksums - .map((checksum) => { - 'bucket': checksum.bucket, - 'last_op_id': - _checksumCache?.checksums[checksum.bucket]?.lastOpId ?? '0' - }) - .toList()), - checkpoint.lastOpId - ]); - - Map byBucket = {}; - if (_checksumCache != null) { - final checksums = _checksumCache!.checksums; - for (var row in rows) { - final String? bucket = row['bucket']; - if (bucket == null) { - continue; - } - if (BigInt.parse(row['last_applied_op']) > - BigInt.parse(_checksumCache!.lastOpId)) { - throw AssertionError( - "assertion failed: ${row['last_applied_op']} > ${_checksumCache!.lastOpId}"); - } - int checksum; - String? lastOpId = row['last_op_id']; - if (checksums.containsKey(bucket)) { - // All rows may have been filtered out, in which case we use the previous one - lastOpId ??= checksums[bucket]!.lastOpId; - checksum = - (checksums[bucket]!.checksum + row['oplog_checksum'] as int) - .toSigned(32); - } else { - checksum = (row['add_checksum'] + row['oplog_checksum']).toSigned(32); - } - byBucket[bucket] = BucketChecksum( - bucket: bucket, - checksum: checksum, - count: row['count'], - lastOpId: lastOpId); - } - } else { - for (final row in rows) { - final String? bucket = row['bucket']; - if (bucket == null) { - continue; - } - final int c1 = row['add_checksum']; - final int c2 = row['oplog_checksum']; - - final checksum = (c1 + c2).toSigned(32); - - byBucket[bucket] = BucketChecksum( - bucket: bucket, - checksum: checksum, - count: row['count'], - lastOpId: row['last_op_id']); - } - } - - List failedChecksums = []; - for (final checksum in checkpoint.checksums) { - final local = byBucket[checksum.bucket] ?? - BucketChecksum(bucket: checksum.bucket, checksum: 0, count: 0); - // Note: Count is informational only. - if (local.checksum != checksum.checksum) { - log.warning( - 'Checksum mismatch for ${checksum.bucket}: local ${local.checksum} != remote ${checksum.checksum}'); - failedChecksums.add(checksum.bucket); - } - } - if (failedChecksums.isEmpty) { - // FIXME: Checksum cache disabled since it's broken when add_checksum is modified - // _checksumCache = ChecksumCache(checkpoint.lastOpId, byBucket); + final rs = select("SELECT powersync_validate_checkpoint(?) as result", + [jsonEncode(checkpoint)]); + final result = jsonDecode(rs[0]['result']); + if (result['valid']) { return SyncLocalDatabaseResult(ready: true); } else { - _checksumCache = null; return SyncLocalDatabaseResult( - ready: false, checkpointValid: false, - checkpointFailures: failedChecksums); + ready: false, + checkpointFailures: result['failed_buckets'].cast()); } } diff --git a/lib/src/sync_types.dart b/lib/src/sync_types.dart index a9591909..9dda592a 100644 --- a/lib/src/sync_types.dart +++ b/lib/src/sync_types.dart @@ -14,6 +14,16 @@ class Checkpoint { checksums = (json['buckets'] as List) .map((b) => BucketChecksum.fromJson(b)) .toList(); + + Map toJson() { + return { + 'last_op_id': lastOpId, + 'write_checkpoint': writeCheckpoint, + 'buckets': checksums + .map((c) => {'bucket': c.bucket, 'checksum': c.checksum}) + .toList(growable: false) + }; + } } class BucketChecksum { diff --git a/test/crud_test.dart b/test/crud_test.dart index c58e2d1e..ebec5d81 100644 --- a/test/crud_test.dart +++ b/test/crud_test.dart @@ -156,7 +156,7 @@ void main() { equals([ { 'data': - '{"op":"PUT","type":"logs","id":"$testId","data":{"level":"INFO","content":"test log"}}' + '{"op":"PUT","type":"logs","id":"$testId","data":{"content":"test log","level":"INFO"}}' } ])); @@ -232,7 +232,7 @@ void main() { equals([ { 'data': - '{"op":"PATCH","type":"assets","id":"$testId","data":{"quantity":${bigNumber + 1},"description":"updated"}}' + '{"op":"PATCH","type":"assets","id":"$testId","data":{"description":"updated","quantity":${bigNumber + 1}}}' } ])); }); From 49d14516afed3d88e030b1113b0dd78bd80a842e Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Sun, 27 Aug 2023 14:54:37 +0200 Subject: [PATCH 07/36] clear_remove_ops --- lib/src/bucket_storage.dart | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index 3162fe4e..0234e9e3 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -221,30 +221,10 @@ class BucketStorage { return; } - final rows = select( - 'SELECT name, cast(last_applied_op as TEXT) as last_applied_op, cast(last_op as TEXT) as last_op FROM ps_buckets WHERE pending_delete = 0'); - for (var row in rows) { - await writeTransaction((db) { - // Note: The row values here may be different from when queried. That should not be an issue. - - db.execute("""UPDATE ps_buckets AS buckets - SET add_checksum = add_checksum + (SELECT IFNULL(SUM(hash), 0) - FROM ps_oplog AS oplog - WHERE (superseded = 1 OR op != ${OpType.put.value}) - AND oplog.bucket = ? - AND oplog.op_id <= ?) - WHERE buckets.name = ?""", - [row['name'], row['last_applied_op'], row['name']]); - db.execute( - """DELETE - FROM ps_oplog - WHERE (superseded = 1 OR op != ${OpType.put.value}) - AND bucket = ? - AND op_id <= ?""", - // Must use the same values as above - [row['name'], row['last_applied_op']]); - }); - } + await writeTransaction((db) { + db.execute('INSERT INTO powersync_operations(op, data) VALUES (?, ?)', + ['clear_remove_ops', '']); + }); _compactCounter = 0; } From 8e138b5e9e11f636df176b5ab9ee2fb353414480 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Sun, 27 Aug 2023 14:57:55 +0200 Subject: [PATCH 08/36] delete_pending_buckets --- lib/src/bucket_storage.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index 0234e9e3..c6a6bb14 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -207,10 +207,8 @@ class BucketStorage { if (_pendingBucketDeletes) { // Executed once after start-up, and again when there are pending deletes. await writeTransaction((db) { - db.execute( - 'DELETE FROM ps_oplog WHERE bucket IN (SELECT name FROM ps_buckets WHERE pending_delete = 1 AND last_applied_op = last_op AND last_op >= target_op)'); - db.execute( - 'DELETE FROM ps_buckets WHERE pending_delete = 1 AND last_applied_op = last_op AND last_op >= target_op'); + db.execute('INSERT INTO powersync_operations(op, data) VALUES (?, ?)', + ['delete_pending_buckets', '']); }); _pendingBucketDeletes = false; } From bb4281c110c438ee445e91478c039e451475c924 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Sun, 27 Aug 2023 15:07:43 +0200 Subject: [PATCH 09/36] delete_bucket --- lib/src/bucket_storage.dart | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index c6a6bb14..ed94950e 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -78,19 +78,9 @@ class BucketStorage { } Future deleteBucket(String bucket) async { - final newName = "\$delete_${bucket}_${uuid.v4()}"; - await writeTransaction((db) { - db.execute( - "UPDATE ps_oplog SET op=${OpType.remove.value}, data=NULL WHERE op=${OpType.put.value} AND superseded=0 AND bucket=?", - [bucket]); - // Rename bucket - db.execute( - "UPDATE ps_oplog SET bucket=? WHERE bucket=?", [newName, bucket]); - db.execute("DELETE FROM ps_buckets WHERE name = ?", [bucket]); - db.execute( - "INSERT INTO ps_buckets(name, pending_delete, last_op) SELECT ?, 1, IFNULL(MAX(op_id), 0) FROM ps_oplog WHERE bucket = ?", - [newName, newName]); + db.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', + ['delete_bucket', bucket]); }); _pendingBucketDeletes = true; From 507ee38300eae79930855153445639f6dd834ae4 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Mon, 4 Sep 2023 14:53:31 +0200 Subject: [PATCH 10/36] Fix deadlock on closing of connection. --- lib/src/powersync_database.dart | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/src/powersync_database.dart b/lib/src/powersync_database.dart index 575ba069..c27bf51f 100644 --- a/lib/src/powersync_database.dart +++ b/lib/src/powersync_database.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:isolate'; import 'package:logging/logging.dart'; +import 'package:sqlite_async/mutex.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'package:sqlite_async/sqlite_async.dart'; @@ -9,7 +10,6 @@ import 'abort_controller.dart'; import 'bucket_storage.dart'; import 'connector.dart'; import 'crud.dart'; -import 'database_utils.dart'; import 'isolate_completer.dart'; import 'log.dart'; import 'open_factory.dart'; @@ -457,13 +457,19 @@ Future _powerSyncDatabaseIsolate( final upstreamDbClient = args.dbRef.upstreamPort.open(); sqlite.Database? db; - rPort.listen((message) { + final mutex = args.dbRef.mutex.open(); + + rPort.listen((message) async { if (message is List) { String action = message[0]; if (action == 'update') { updateController.add('update'); } else if (action == 'close') { + // This prevents any further transactions being opened, which would + // eventually terminate the sync loop. + await mutex.close(); db?.dispose(); + db = null; updateController.close(); upstreamDbClient.close(); Isolate.current.kill(); @@ -501,11 +507,10 @@ Future _powerSyncDatabaseIsolate( } runZonedGuarded(() async { - final mutex = args.dbRef.mutex.open(); db = await args.dbRef.openFactory .open(SqliteOpenOptions(primaryConnection: false, readOnly: false)); - final storage = BucketStorage(db!, mutex: mutex); + final storage = BucketStorage(db!, mutex: mutex!); final sync = StreamingSyncImplementation( adapter: storage, credentialsCallback: loadCredentials, @@ -542,6 +547,8 @@ Future _powerSyncDatabaseIsolate( // This should be rare - any uncaught error is a bug. And in most cases, // it should occur after the database is already open. db?.dispose(); + db = null; + mutex.close(); throw error; }); } From 15ebc61fc92d49b06849c89a92ea5b31eaf33bfd Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 3 Oct 2023 17:04:52 +0200 Subject: [PATCH 11/36] WIP. --- lib/src/bucket_storage.dart | 31 ++++----------- lib/src/stream_utils.dart | 7 ++++ lib/src/streaming_sync.dart | 75 +++++++++++++++++++++---------------- 3 files changed, 57 insertions(+), 56 deletions(-) diff --git a/lib/src/bucket_storage.dart b/lib/src/bucket_storage.dart index ed94950e..3b3283f0 100644 --- a/lib/src/bucket_storage.dart +++ b/lib/src/bucket_storage.dart @@ -7,10 +7,8 @@ import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'crud.dart'; import 'database_utils.dart'; -import 'log.dart'; import 'schema_logic.dart'; import 'sync_types.dart'; -import 'uuid.dart'; const compactOperationInterval = 1000; @@ -19,20 +17,13 @@ class BucketStorage { final Mutex mutex; bool _hasCompletedSync = false; bool _pendingBucketDeletes = false; - Set tableNames = {}; int _compactCounter = compactOperationInterval; BucketStorage(sqlite.Database db, {required this.mutex}) : _internalDb = db { _init(); } - _init() { - final existingTableRows = select( - "SELECT name FROM sqlite_master WHERE type='table' AND name GLOB 'ps_data_*'"); - for (final row in existingTableRows) { - tableNames.add(row['name'] as String); - } - } + _init() {} // Use only for read statements sqlite.ResultSet select(String query, [List parameters = const []]) { @@ -50,6 +41,13 @@ class BucketStorage { ]; } + Future streamOp(String op) async { + await writeTransaction((db) { + db.execute('INSERT INTO powersync_operations(op, data) VALUES(?, ?)', + ['stream', op]); + }); + } + Future saveSyncData(SyncDataBatch batch) async { var count = 0; @@ -517,16 +515,3 @@ enum OpType { } } } - -/// Get a table name for a specific type. The table may or may not exist. -/// -/// The table name must always be enclosed in "quotes" when using inside a SQL query. -/// -/// @param type -String _getTypeTableName(String type) { - // Test for invalid characters rather than escaping. - if (invalidSqliteCharacters.hasMatch(type)) { - throw AssertionError("Invalid characters in type name: $type"); - } - return "ps_data__$type"; -} diff --git a/lib/src/stream_utils.dart b/lib/src/stream_utils.dart index 3ead1be9..4b7ab741 100644 --- a/lib/src/stream_utils.dart +++ b/lib/src/stream_utils.dart @@ -64,6 +64,13 @@ Stream ndjson(ByteStream input) { return jsonInput; } +/// Given a raw ByteStream, parse each line as JSON. +Stream newlines(ByteStream input) { + final textInput = input.transform(convert.utf8.decoder); + final lineInput = textInput.transform(const convert.LineSplitter()); + return lineInput; +} + void pauseAll(List subscriptions) { for (var sub in subscriptions) { sub.pause(); diff --git a/lib/src/streaming_sync.dart b/lib/src/streaming_sync.dart index 03ff0c79..7437867a 100644 --- a/lib/src/streaming_sync.dart +++ b/lib/src/streaming_sync.dart @@ -27,7 +27,8 @@ class StreamingSyncImplementation { StreamController.broadcast(); late final Stream statusStream; - final StreamController _localPingController = StreamController.broadcast(); + final StreamController _localPingController = + StreamController.broadcast(); final Duration retryDelay; @@ -161,9 +162,45 @@ class StreamingSyncImplementation { Future? credentialsInvalidation; bool haveInvalidated = false; - await for (var line in merged) { + await for (var rawLine in merged) { + if (haveInvalidated) { + // Stop this connection, so that a new one will be started + break; + } + + if (rawLine == null) { + // Local ping + if (targetCheckpoint == appliedCheckpoint) { + lastSyncedAt = DateTime.now(); + _statusStreamController + .add(SyncStatus(connected: true, lastSyncedAt: lastSyncedAt)); + } else if (validatedCheckpoint == targetCheckpoint) { + final result = await adapter.syncLocalDatabase(targetCheckpoint!); + if (!result.checkpointValid) { + // This means checksums failed. Start again with a new checkpoint. + // TODO: better back-off + // await new Promise((resolve) => setTimeout(resolve, 50)); + return false; + } else if (!result.ready) { + // Checksums valid, but need more data for a consistent checkpoint. + // Continue waiting. + } else { + appliedCheckpoint = targetCheckpoint; + lastSyncedAt = DateTime.now(); + _statusStreamController + .add(SyncStatus(connected: true, lastSyncedAt: lastSyncedAt)); + } + } + continue; + } + _statusStreamController .add(SyncStatus(connected: true, lastSyncedAt: lastSyncedAt)); + + await adapter.streamOp(rawLine); + final json = convert.jsonDecode(rawLine); + final line = parseStreamingSyncLine(json); + if (line is Checkpoint) { targetCheckpoint = line; final Set bucketsToDelete = {...bucketSet}; @@ -174,7 +211,6 @@ class StreamingSyncImplementation { } bucketSet = newBuckets; await adapter.removeBuckets([...bucketsToDelete]); - adapter.setTargetCheckpoint(targetCheckpoint); } else if (line is StreamingSyncCheckpointComplete) { final result = await adapter.syncLocalDatabase(targetCheckpoint!); if (!result.checkpointValid) { @@ -242,39 +278,12 @@ class StreamingSyncImplementation { }); } } - } else { - if (targetCheckpoint == appliedCheckpoint) { - lastSyncedAt = DateTime.now(); - _statusStreamController - .add(SyncStatus(connected: true, lastSyncedAt: lastSyncedAt)); - } else if (validatedCheckpoint == targetCheckpoint) { - final result = await adapter.syncLocalDatabase(targetCheckpoint!); - if (!result.checkpointValid) { - // This means checksums failed. Start again with a new checkpoint. - // TODO: better back-off - // await new Promise((resolve) => setTimeout(resolve, 50)); - return false; - } else if (!result.ready) { - // Checksums valid, but need more data for a consistent checkpoint. - // Continue waiting. - } else { - appliedCheckpoint = targetCheckpoint; - lastSyncedAt = DateTime.now(); - _statusStreamController - .add(SyncStatus(connected: true, lastSyncedAt: lastSyncedAt)); - } - } - } - - if (haveInvalidated) { - // Stop this connection, so that a new one will be started - break; } } return true; } - Stream streamingSyncRequest(StreamingSyncRequest data) async* { + Stream streamingSyncRequest(StreamingSyncRequest data) async* { final credentials = await credentialsCallback(); if (credentials == null) { throw AssertionError('Not logged in'); @@ -299,8 +308,8 @@ class StreamingSyncImplementation { } // Note: The response stream is automatically closed when this loop errors - await for (var line in ndjson(res.stream)) { - yield parseStreamingSyncLine(line as Map); + await for (var line in newlines(res.stream)) { + yield line; } } } From 07fe0673bf5ee9dc62240b840ecd7ba69f5d56bb Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 4 Jan 2024 14:19:08 +0200 Subject: [PATCH 12/36] Update/fix tests. --- .../powersync/test/bucket_storage_test.dart | 20 +++++++++------- .../powersync/test/offline_online_test.dart | 23 +++++++++++++++---- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/packages/powersync/test/bucket_storage_test.dart b/packages/powersync/test/bucket_storage_test.dart index aad21265..1b3cc159 100644 --- a/packages/powersync/test/bucket_storage_test.dart +++ b/packages/powersync/test/bucket_storage_test.dart @@ -675,7 +675,7 @@ void main() { ])); }); - test('should revert a failing update', () async { + test('should revert a failing insert', () async { await bucketStorage.saveSyncData(SyncDataBatch([ SyncBucketData( bucket: 'bucket1', @@ -688,7 +688,7 @@ void main() { writeCheckpoint: '3', checksums: [BucketChecksum(bucket: 'bucket1', checksum: 6)])); - // Local save + // Local insert, later rejected by server db.execute('INSERT INTO assets(id, description) VALUES(?, ?)', ['O3', 'inserted']); final batch = bucketStorage.getCrudBatch(); @@ -725,7 +725,7 @@ void main() { writeCheckpoint: '3', checksums: [BucketChecksum(bucket: 'bucket1', checksum: 6)])); - // Local save + // Local delete, later rejected by server db.execute('DELETE FROM assets WHERE id = ?', ['O2']); expect(db.select('SELECT description FROM assets WHERE id = \'O2\''), @@ -750,7 +750,7 @@ void main() { ])); }); - test('should revert a failing insert', () async { + test('should revert a failing update', () async { await bucketStorage.saveSyncData(SyncDataBatch([ SyncBucketData( bucket: 'bucket1', @@ -763,11 +763,15 @@ void main() { writeCheckpoint: '3', checksums: [BucketChecksum(bucket: 'bucket1', checksum: 6)])); - // Local save - db.execute('DELETE FROM assets WHERE id = ?', ['O2']); + // Local update, later rejected by server + db.execute( + 'UPDATE assets SET description = ? WHERE id = ?', ['updated', 'O2']); - expect(db.select('SELECT description FROM assets WHERE id = \'O2\''), - equals([])); + expect( + db.select('SELECT description FROM assets WHERE id = \'O2\''), + equals([ + {'description': 'updated'} + ])); // Simulate a permissions error when uploading - data should be preserved. final batch = bucketStorage.getCrudBatch(); await batch!.complete(); diff --git a/packages/powersync/test/offline_online_test.dart b/packages/powersync/test/offline_online_test.dart index af497a5b..653ac12c 100644 --- a/packages/powersync/test/offline_online_test.dart +++ b/packages/powersync/test/offline_online_test.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:powersync/powersync.dart'; import 'package:test/test.dart'; @@ -113,16 +115,27 @@ void main() { await tx.execute('DELETE FROM local_assets'); }); + final crud = (await db.getAll('SELECT data FROM ps_crud ORDER BY id')) + .map((d) => jsonDecode(d['data'])) + .toList(); expect( - await db.getAll('SELECT data FROM ps_crud ORDER BY id'), + crud, equals([ { - 'data': - '{"op":"PUT","type":"customers","id":"$customerId","data":{"name":"test customer","email":"test@example.org"}}' + "op": "PUT", + "type": "customers", + "id": customerId, + "data": {"email": "test@example.org", "name": "test customer"} }, { - 'data': - '{"op":"PUT","type":"assets","id":"$assetId","data":{"user_id":"$userId","customer_id":"$customerId","description":"test."}}' + "op": "PUT", + "type": "assets", + "id": assetId, + "data": { + "user_id": userId, + "customer_id": customerId, + "description": "test." + } } ])); }); From b02c9cbd986d712f7701f1f75cb75045fcdea19f Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 4 Jan 2024 14:19:24 +0200 Subject: [PATCH 13/36] Add view name override. --- packages/powersync/lib/src/schema.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/powersync/lib/src/schema.dart b/packages/powersync/lib/src/schema.dart index ef28c59f..566186ae 100644 --- a/packages/powersync/lib/src/schema.dart +++ b/packages/powersync/lib/src/schema.dart @@ -135,6 +135,7 @@ class Table { Map toJson() => { 'name': name, + 'view_name': _viewNameOverride, 'local_only': localOnly, 'insert_only': insertOnly, 'columns': columns, From 5c914892002332bf1b653daeb6ca02944c84e80d Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 4 Jan 2024 14:42:03 +0200 Subject: [PATCH 14/36] Retry opening database if locked. --- packages/powersync/lib/src/open_factory.dart | 32 +++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index 6ecd3a19..da822b70 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:isolate'; import 'dart:ffi'; +import 'dart:math'; import 'package:powersync/sqlite3.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; @@ -41,12 +42,41 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { enableExtension(); - final db = super.open(options); + final db = _retriedOpen(options); db.execute('PRAGMA recursive_triggers = TRUE'); setupFunctions(db); return db; } + /// When opening the powersync connection and the standard write connection + /// at the same time, one could fail with this error: + /// + /// SqliteException(5): while opening the database, automatic extension loading failed: , database is locked (code 5) + /// + /// It happens before we have a chance to set the busy timeout, so we just + /// retry opening the database. + /// + /// Usually a delay of 1-2ms is sufficient for the next try to succeed, but + /// we increase the retry delay up to 16ms per retry, and a maximum of 500ms + /// in total. + sqlite.Database _retriedOpen(SqliteOpenOptions options) { + final stopwatch = Stopwatch()..start(); + var retryDelay = 2; + while (stopwatch.elapsedMilliseconds < 500) { + try { + return super.open(options); + } catch (e) { + if (e is sqlite.SqliteException && e.resultCode == 5) { + sleep(Duration(milliseconds: retryDelay)); + retryDelay = min(retryDelay * 2, 16); + continue; + } + rethrow; + } + } + throw AssertionError('Cannot reach this point'); + } + void enableExtension() { var powersync_lib = DynamicLibrary.open('libpowersync.so'); sqlite.sqlite3.ensureExtensionLoaded( From 123ebaecd8b3fda54c2703e376ac80bb1fe211e4 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Thu, 4 Jan 2024 14:57:36 +0200 Subject: [PATCH 15/36] Fix lint issues. --- packages/powersync/lib/src/bucket_storage.dart | 2 +- packages/powersync/lib/src/open_factory.dart | 4 ++-- packages/powersync/lib/src/powersync_database.dart | 3 +-- packages/powersync/test/schema_test.dart | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/powersync/lib/src/bucket_storage.dart b/packages/powersync/lib/src/bucket_storage.dart index 3b3283f0..b2618f8e 100644 --- a/packages/powersync/lib/src/bucket_storage.dart +++ b/packages/powersync/lib/src/bucket_storage.dart @@ -129,7 +129,7 @@ class BucketStorage { return SyncLocalDatabaseResult(ready: true); } - Future updateObjectsFromBuckets(Checkpoint _checkpoint) async { + Future updateObjectsFromBuckets(Checkpoint checkpoint) async { return writeTransaction((db) { db.execute("INSERT INTO powersync_operations(op, data) VALUES(?, ?)", ['sync_local', '']); diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index da822b70..5f0af163 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -78,9 +78,9 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { } void enableExtension() { - var powersync_lib = DynamicLibrary.open('libpowersync.so'); + var powersyncLib = DynamicLibrary.open('libpowersync.so'); sqlite.sqlite3.ensureExtensionLoaded( - SqliteExtension.inLibrary(powersync_lib, 'sqlite3_powersync_init')); + SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init')); } void setupFunctions(sqlite.Database db) { diff --git a/packages/powersync/lib/src/powersync_database.dart b/packages/powersync/lib/src/powersync_database.dart index 2f3bd0cd..b42c12ce 100644 --- a/packages/powersync/lib/src/powersync_database.dart +++ b/packages/powersync/lib/src/powersync_database.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'dart:isolate'; import 'package:logging/logging.dart'; -import 'package:sqlite_async/mutex.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'package:sqlite_async/sqlite_async.dart'; @@ -540,7 +539,7 @@ Future _powerSyncDatabaseIsolate( db = await args.dbRef.openFactory .open(SqliteOpenOptions(primaryConnection: false, readOnly: false)); - final storage = BucketStorage(db!, mutex: mutex!); + final storage = BucketStorage(db!, mutex: mutex); final sync = StreamingSyncImplementation( adapter: storage, credentialsCallback: loadCredentials, diff --git a/packages/powersync/test/schema_test.dart b/packages/powersync/test/schema_test.dart index 91cb8de2..dcc58d4f 100644 --- a/packages/powersync/test/schema_test.dart +++ b/packages/powersync/test/schema_test.dart @@ -1,5 +1,3 @@ -import 'dart:convert'; - import 'package:powersync/powersync.dart'; import 'package:test/test.dart'; From 127756a09e47b70c35dceb75fa180849424635c5 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Wed, 31 Jan 2024 12:58:35 +0200 Subject: [PATCH 16/36] Use higher-level `updateSchema` in tests; test viewName alias. --- packages/powersync/test/schema_test.dart | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/powersync/test/schema_test.dart b/packages/powersync/test/schema_test.dart index dcc58d4f..613808ce 100644 --- a/packages/powersync/test/schema_test.dart +++ b/packages/powersync/test/schema_test.dart @@ -20,11 +20,10 @@ final schema = Schema([ Table('customers', [Column.text('name'), Column.text('email')]), Table.insertOnly('logs', [Column.text('level'), Column.text('content')]), Table.localOnly('credentials', [Column.text('key'), Column.text('value')]), + Table('aliased', [Column.text('name')], viewName: 'test1') ]); void main() { - setupLogger(); - group('Schema Tests', () { late String path; @@ -40,7 +39,7 @@ void main() { final powersync = await setupPowerSync(path: path, schema: schema); final versionBefore = await powersync.get('PRAGMA schema_version'); - await powersync.execute('SELECT powersync_replace_schema(?)', [schema]); + await powersync.updateSchema(schema); final versionAfter = await powersync.get('PRAGMA schema_version'); // No change @@ -65,8 +64,10 @@ void main() { 'logs', [Column.text('level'), Column.text('content')]), Table.localOnly( 'credentials', [Column.text('key'), Column.text('value')]), + Table('aliased', [Column.text('name')], viewName: 'test1') ]); - await powersync.execute('SELECT powersync_replace_schema(?)', [schema2]); + + await powersync.updateSchema(schema2); final versionAfter2 = await powersync.get('PRAGMA schema_version'); @@ -93,8 +94,10 @@ void main() { 'logs', [Column.text('level'), Column.text('content')]), Table.localOnly( 'credentials', [Column.text('key'), Column.text('value')]), + Table('aliased', [Column.text('name')], viewName: 'test1') ]); - await powersync.execute('SELECT powersync_replace_schema(?)', [schema3]); + + await powersync.updateSchema(schema3); final versionAfter3 = await powersync.get('PRAGMA schema_version'); @@ -125,7 +128,7 @@ void main() { Column.text('description'), ], indexes: []), ]); - await powersync.execute('SELECT powersync_replace_schema(?)', [schema2]); + await powersync.updateSchema(schema2); // Execute instead of getAll so that we don't get a cached query plan // from a different connection From fd6f2e87fbacc14985652ff36e4c3492580efef1 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 22 May 2024 15:16:42 +0200 Subject: [PATCH 17/36] Load extension for android and iOS --- packages/powersync/lib/src/open_factory.dart | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index 9d408d7d..6c787dde 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -78,7 +78,9 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { } void enableExtension() { - var powersyncLib = DynamicLibrary.open('libpowersync.so'); + var powersyncLib = Platform.isIOS + ? DynamicLibrary.process() + : DynamicLibrary.open('libpowersync.so'); sqlite.sqlite3.ensureExtensionLoaded( SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init')); } From b450ac3f10e6e084eb749ba83a51fd021eb7f8b1 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 23 May 2024 15:24:57 +0200 Subject: [PATCH 18/36] Load extension for iOS, MacOS and Android --- .../linux/flutter/generated_plugins.cmake | 1 + demos/supabase-anonymous-auth/pubspec.lock | 14 +++-- .../windows/flutter/generated_plugins.cmake | 1 + .../linux/flutter/generated_plugins.cmake | 1 + .../supabase-edge-function-auth/pubspec.lock | 14 +++-- .../windows/flutter/generated_plugins.cmake | 1 + .../linux/flutter/generated_plugins.cmake | 1 + demos/supabase-simple-chat/pubspec.lock | 14 +++-- .../windows/flutter/generated_plugins.cmake | 1 + .../android/app/build.gradle | 2 +- demos/supabase-todolist/ios/Podfile.lock | 32 ++++++---- demos/supabase-todolist/lib/powersync.dart | 6 ++ .../linux/flutter/generated_plugins.cmake | 1 + demos/supabase-todolist/macos/Podfile.lock | 42 +++++++------ .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- demos/supabase-todolist/pubspec.lock | 23 +++++--- demos/supabase-todolist/pubspec.yaml | 6 +- .../windows/flutter/generated_plugins.cmake | 1 + packages/powersync/lib/src/open_factory.dart | 59 ++++++++++++++++++- packages/powersync/pubspec.yaml | 2 + .../powersync_attachments_helper/pubspec.yaml | 3 +- 22 files changed, 170 insertions(+), 59 deletions(-) diff --git a/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake b/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake index c34d0786..4fe81f05 100644 --- a/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock index 95259aac..40e5a8ac 100644 --- a/demos/supabase-anonymous-auth/pubspec.lock +++ b/demos/supabase-anonymous-auth/pubspec.lock @@ -323,11 +323,17 @@ packages: powersync: dependency: "direct main" description: - name: powersync - sha256: e8afeb4ab1bae62e7f18937380ca5f23c52556490548123c598a596a52c59de4 - url: "https://pub.dev" - source: hosted + path: "../../packages/powersync" + relative: true + source: path version: "1.3.1" + powersync_flutter_libs: + dependency: transitive + description: + path: "../../../powersync_flutter_libs" + relative: true + source: path + version: "0.0.1" realtime_client: dependency: transitive description: diff --git a/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake b/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake index 7fe63857..76d60ae3 100644 --- a/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake b/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake index c34d0786..4fe81f05 100644 --- a/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock index 95259aac..40e5a8ac 100644 --- a/demos/supabase-edge-function-auth/pubspec.lock +++ b/demos/supabase-edge-function-auth/pubspec.lock @@ -323,11 +323,17 @@ packages: powersync: dependency: "direct main" description: - name: powersync - sha256: e8afeb4ab1bae62e7f18937380ca5f23c52556490548123c598a596a52c59de4 - url: "https://pub.dev" - source: hosted + path: "../../packages/powersync" + relative: true + source: path version: "1.3.1" + powersync_flutter_libs: + dependency: transitive + description: + path: "../../../powersync_flutter_libs" + relative: true + source: path + version: "0.0.1" realtime_client: dependency: transitive description: diff --git a/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake b/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake index 7fe63857..76d60ae3 100644 --- a/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake b/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake index c34d0786..4fe81f05 100644 --- a/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock index fbf3b479..d894c6e4 100644 --- a/demos/supabase-simple-chat/pubspec.lock +++ b/demos/supabase-simple-chat/pubspec.lock @@ -355,11 +355,17 @@ packages: powersync: dependency: "direct main" description: - name: powersync - sha256: e8afeb4ab1bae62e7f18937380ca5f23c52556490548123c598a596a52c59de4 - url: "https://pub.dev" - source: hosted + path: "../../packages/powersync" + relative: true + source: path version: "1.3.1" + powersync_flutter_libs: + dependency: transitive + description: + path: "../../../powersync_flutter_libs" + relative: true + source: path + version: "0.0.1" realtime_client: dependency: transitive description: diff --git a/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake b/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake index 7fe63857..76d60ae3 100644 --- a/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-todolist/android/app/build.gradle b/demos/supabase-todolist/android/app/build.gradle index b0ab28b2..9daa778b 100644 --- a/demos/supabase-todolist/android/app/build.gradle +++ b/demos/supabase-todolist/android/app/build.gradle @@ -46,7 +46,7 @@ android { applicationId "co.powersync.demotodolist" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdkVersion 21 + minSdkVersion 24 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/demos/supabase-todolist/ios/Podfile.lock b/demos/supabase-todolist/ios/Podfile.lock index 56f60723..25fb05d1 100644 --- a/demos/supabase-todolist/ios/Podfile.lock +++ b/demos/supabase-todolist/ios/Podfile.lock @@ -7,21 +7,25 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS + - powersync-sqlite-core (0.1.6) + - powersync_flutter_libs (0.0.1): + - Flutter + - powersync-sqlite-core (~> 0.1.6) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sqlite3 (3.45.1): - - sqlite3/common (= 3.45.1) - - sqlite3/common (3.45.1) - - sqlite3/fts5 (3.45.1): + - "sqlite3 (3.45.3+1)": + - "sqlite3/common (= 3.45.3+1)" + - "sqlite3/common (3.45.3+1)" + - "sqlite3/fts5 (3.45.3+1)": - sqlite3/common - - sqlite3/perf-threadsafe (3.45.1): + - "sqlite3/perf-threadsafe (3.45.3+1)": - sqlite3/common - - sqlite3/rtree (3.45.1): + - "sqlite3/rtree (3.45.3+1)": - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - - sqlite3 (~> 3.45.1) + - "sqlite3 (~> 3.45.3+1)" - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -33,12 +37,14 @@ DEPENDENCIES: - camera_avfoundation (from `.symlinks/plugins/camera_avfoundation/ios`) - Flutter (from `Flutter`) - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + - powersync_flutter_libs (from `.symlinks/plugins/powersync_flutter_libs/ios`) - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: + - powersync-sqlite-core - sqlite3 EXTERNAL SOURCES: @@ -50,6 +56,8 @@ EXTERNAL SOURCES: :path: Flutter path_provider_foundation: :path: ".symlinks/plugins/path_provider_foundation/darwin" + powersync_flutter_libs: + :path: ".symlinks/plugins/powersync_flutter_libs/ios" shared_preferences_foundation: :path: ".symlinks/plugins/shared_preferences_foundation/darwin" sqlite3_flutter_libs: @@ -58,14 +66,16 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: - app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875 + app_links: e70ca16b4b0f88253b3b3660200d4a10b4ea9795 camera_avfoundation: 759172d1a77ae7be0de08fc104cfb79738b8a59e Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd + powersync_flutter_libs: 5d6b132a398de442c0853a8b14bfbb62cd4ff5a1 shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - sqlite3: 73b7fc691fdc43277614250e04d183740cb15078 - sqlite3_flutter_libs: af0e8fe9bce48abddd1ffdbbf839db0302d72d80 - url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812 + sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a + sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b + url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 PODFILE CHECKSUM: f7b3cb7384a2d5da4b22b090e1f632de7f377987 diff --git a/demos/supabase-todolist/lib/powersync.dart b/demos/supabase-todolist/lib/powersync.dart index aaf952b4..1118bc50 100644 --- a/demos/supabase-todolist/lib/powersync.dart +++ b/demos/supabase-todolist/lib/powersync.dart @@ -155,6 +155,12 @@ Future openDatabase() async { schema: schema, path: await getDatabasePath(), logger: attachedLogger); await db.initialize(); + var res = await db.get('select powersync_rs_version()'); + print(res); + + res = await db.get('select gen_random_uuid()'); + print("UUID: ${res}"); + await loadSupabase(); SupabaseConnector? currentConnector; diff --git a/demos/supabase-todolist/linux/flutter/generated_plugins.cmake b/demos/supabase-todolist/linux/flutter/generated_plugins.cmake index c34d0786..4fe81f05 100644 --- a/demos/supabase-todolist/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-todolist/linux/flutter/generated_plugins.cmake @@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-todolist/macos/Podfile.lock b/demos/supabase-todolist/macos/Podfile.lock index f54327c0..817c60ef 100644 --- a/demos/supabase-todolist/macos/Podfile.lock +++ b/demos/supabase-todolist/macos/Podfile.lock @@ -5,23 +5,25 @@ PODS: - path_provider_foundation (0.0.1): - Flutter - FlutterMacOS + - powersync-sqlite-core (0.1.6) + - powersync_flutter_libs (0.0.1): + - FlutterMacOS + - powersync-sqlite-core (~> 0.1.6) - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - sign_in_with_apple (0.0.1): - - FlutterMacOS - - sqlite3 (3.43.1): - - sqlite3/common (= 3.43.1) - - sqlite3/common (3.43.1) - - sqlite3/fts5 (3.43.1): + - "sqlite3 (3.45.3+1)": + - "sqlite3/common (= 3.45.3+1)" + - "sqlite3/common (3.45.3+1)" + - "sqlite3/fts5 (3.45.3+1)": - sqlite3/common - - sqlite3/perf-threadsafe (3.43.1): + - "sqlite3/perf-threadsafe (3.45.3+1)": - sqlite3/common - - sqlite3/rtree (3.43.1): + - "sqlite3/rtree (3.45.3+1)": - sqlite3/common - sqlite3_flutter_libs (0.0.1): - FlutterMacOS - - sqlite3 (~> 3.43.1) + - "sqlite3 (~> 3.45.3+1)" - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -32,13 +34,14 @@ DEPENDENCIES: - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) + - powersync_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/powersync_flutter_libs/macos`) - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`) - - sign_in_with_apple (from `Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos`) - sqlite3_flutter_libs (from `Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) SPEC REPOS: trunk: + - powersync-sqlite-core - sqlite3 EXTERNAL SOURCES: @@ -48,25 +51,26 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral path_provider_foundation: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin + powersync_flutter_libs: + :path: Flutter/ephemeral/.symlinks/plugins/powersync_flutter_libs/macos shared_preferences_foundation: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin - sign_in_with_apple: - :path: Flutter/ephemeral/.symlinks/plugins/sign_in_with_apple/macos sqlite3_flutter_libs: :path: Flutter/ephemeral/.symlinks/plugins/sqlite3_flutter_libs/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos SPEC CHECKSUMS: - app_links: 4481ed4d71f384b0c3ae5016f4633aa73d32ff67 + app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 - path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 - shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126 - sign_in_with_apple: a9e97e744e8edc36aefc2723111f652102a7a727 - sqlite3: e0a0623a33a20a47cb5921552aebc6e9e437dc91 - sqlite3_flutter_libs: a91655e4a75a499364f693041aa1c6d1b36b66d0 + path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c + powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd + powersync_flutter_libs: 1eb1c6790a72afe08e68d4cc489d71ab61da32ee + shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 + sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a + sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 -COCOAPODS: 1.12.1 +COCOAPODS: 1.15.2 diff --git a/demos/supabase-todolist/macos/Runner.xcodeproj/project.pbxproj b/demos/supabase-todolist/macos/Runner.xcodeproj/project.pbxproj index 46a2dce9..fe47ba76 100644 --- a/demos/supabase-todolist/macos/Runner.xcodeproj/project.pbxproj +++ b/demos/supabase-todolist/macos/Runner.xcodeproj/project.pbxproj @@ -259,7 +259,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1430; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { diff --git a/demos/supabase-todolist/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/demos/supabase-todolist/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index cc0e03af..2c526589 100644 --- a/demos/supabase-todolist/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/demos/supabase-todolist/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ 'IsarNotReadyError'; + + @override + final String message; +} diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index 120005c9..bb4e2b92 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -12,6 +12,8 @@ dependencies: sqlite_async: ^0.6.1 sqlite3_flutter_libs: ^0.5.15 + powersync_flutter_libs: + path: ../../../powersync_flutter_libs http: ^1.1.0 uuid: ^4.2.0 async: ^2.10.0 diff --git a/packages/powersync_attachments_helper/pubspec.yaml b/packages/powersync_attachments_helper/pubspec.yaml index 76f8c86d..a1954bb6 100644 --- a/packages/powersync_attachments_helper/pubspec.yaml +++ b/packages/powersync_attachments_helper/pubspec.yaml @@ -10,7 +10,8 @@ dependencies: flutter: sdk: flutter - powersync: ^1.2.2 + powersync: + path: ../powersync logging: ^1.2.0 sqlite_async: ^0.6.1 path_provider: ^2.0.13 From b3e6e223f8cfc40ab40c87d6338178cd0f868267 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Mon, 27 May 2024 11:01:13 +0200 Subject: [PATCH 19/36] Include powersync_flutter_libs --- packages/powersync/pubspec.yaml | 2 +- packages/powersync_flutter_libs/.gitignore | 34 +++ packages/powersync_flutter_libs/.metadata | 42 +++ packages/powersync_flutter_libs/CHANGELOG.md | 3 + packages/powersync_flutter_libs/LICENSE | 1 + packages/powersync_flutter_libs/README.md | 91 +++++++ .../analysis_options.yaml | 4 + .../powersync_flutter_libs/android/.gitignore | 9 + .../android/build.gradle | 69 +++++ .../android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 61608 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + .../powersync_flutter_libs/android/gradlew | 244 ++++++++++++++++++ .../android/gradlew.bat | 92 +++++++ .../android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + packages/powersync_flutter_libs/ffigen.yaml | 19 ++ .../ios/Classes/powersync_flutter_libs.c | 3 + .../ios/powersync_flutter_libs.podspec | 30 +++ .../lib/powersync_flutter_libs.dart | 131 ++++++++++ ...rsync_flutter_libs_bindings_generated.dart | 70 +++++ .../linux/CMakeLists.txt | 52 ++++ .../powersync_flutter_libs_plugin.h | 27 ++ .../linux/powersync_flutter_libs_plugin.cc | 79 ++++++ .../macos/Classes/powersync_flutter_libs.c | 3 + .../macos/powersync_flutter_libs.podspec | 29 +++ packages/powersync_flutter_libs/pubspec.yaml | 81 ++++++ .../powersync_flutter_libs/src/CMakeLists.txt | 17 ++ .../src/powersync_flutter_libs.c | 23 ++ .../src/powersync_flutter_libs.h | 30 +++ .../powersync_flutter_libs/windows/.gitignore | 17 ++ .../windows/CMakeLists.txt | 23 ++ 31 files changed, 1234 insertions(+), 1 deletion(-) create mode 100644 packages/powersync_flutter_libs/.gitignore create mode 100644 packages/powersync_flutter_libs/.metadata create mode 100644 packages/powersync_flutter_libs/CHANGELOG.md create mode 100644 packages/powersync_flutter_libs/LICENSE create mode 100644 packages/powersync_flutter_libs/README.md create mode 100644 packages/powersync_flutter_libs/analysis_options.yaml create mode 100644 packages/powersync_flutter_libs/android/.gitignore create mode 100644 packages/powersync_flutter_libs/android/build.gradle create mode 100644 packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.jar create mode 100644 packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.properties create mode 100755 packages/powersync_flutter_libs/android/gradlew create mode 100644 packages/powersync_flutter_libs/android/gradlew.bat create mode 100644 packages/powersync_flutter_libs/android/settings.gradle create mode 100644 packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml create mode 100644 packages/powersync_flutter_libs/ffigen.yaml create mode 100644 packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c create mode 100644 packages/powersync_flutter_libs/ios/powersync_flutter_libs.podspec create mode 100644 packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart create mode 100644 packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart create mode 100644 packages/powersync_flutter_libs/linux/CMakeLists.txt create mode 100644 packages/powersync_flutter_libs/linux/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h create mode 100644 packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc create mode 100644 packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c create mode 100644 packages/powersync_flutter_libs/macos/powersync_flutter_libs.podspec create mode 100644 packages/powersync_flutter_libs/pubspec.yaml create mode 100644 packages/powersync_flutter_libs/src/CMakeLists.txt create mode 100644 packages/powersync_flutter_libs/src/powersync_flutter_libs.c create mode 100644 packages/powersync_flutter_libs/src/powersync_flutter_libs.h create mode 100644 packages/powersync_flutter_libs/windows/.gitignore create mode 100644 packages/powersync_flutter_libs/windows/CMakeLists.txt diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index bb4e2b92..be968376 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: sqlite_async: ^0.6.1 sqlite3_flutter_libs: ^0.5.15 powersync_flutter_libs: - path: ../../../powersync_flutter_libs + path: ../powersync_flutter_libs http: ^1.1.0 uuid: ^4.2.0 async: ^2.10.0 diff --git a/packages/powersync_flutter_libs/.gitignore b/packages/powersync_flutter_libs/.gitignore new file mode 100644 index 00000000..1593a1f1 --- /dev/null +++ b/packages/powersync_flutter_libs/.gitignore @@ -0,0 +1,34 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock. +/pubspec.lock +**/doc/api/ +.dart_tool/ +build/ + +*.so +*.a +*.dylib +*.dll diff --git a/packages/powersync_flutter_libs/.metadata b/packages/powersync_flutter_libs/.metadata new file mode 100644 index 00000000..6a7dbab7 --- /dev/null +++ b/packages/powersync_flutter_libs/.metadata @@ -0,0 +1,42 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "54e66469a933b60ddf175f858f82eaeb97e48c8d" + channel: "stable" + +project_type: plugin_ffi + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: android + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: ios + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: linux + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: macos + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + - platform: windows + create_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + base_revision: 54e66469a933b60ddf175f858f82eaeb97e48c8d + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/packages/powersync_flutter_libs/CHANGELOG.md b/packages/powersync_flutter_libs/CHANGELOG.md new file mode 100644 index 00000000..41cc7d81 --- /dev/null +++ b/packages/powersync_flutter_libs/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/packages/powersync_flutter_libs/LICENSE b/packages/powersync_flutter_libs/LICENSE new file mode 100644 index 00000000..ba75c69f --- /dev/null +++ b/packages/powersync_flutter_libs/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/packages/powersync_flutter_libs/README.md b/packages/powersync_flutter_libs/README.md new file mode 100644 index 00000000..a86c9b14 --- /dev/null +++ b/packages/powersync_flutter_libs/README.md @@ -0,0 +1,91 @@ +# powersync_flutter_libs + +### Flutter binaries for [Powersync](https://pub.dev/packages/powersync) please go there for documentation. + +## Getting Started + +This project is a starting point for a Flutter +[FFI plugin](https://docs.flutter.dev/development/platform-integration/c-interop), +a specialized package that includes native code directly invoked with Dart FFI. + +## Project structure + +This template uses the following structure: + +- `src`: Contains the native source code, and a CmakeFile.txt file for building + that source code into a dynamic library. + +- `lib`: Contains the Dart code that defines the API of the plugin, and which + calls into the native code using `dart:ffi`. + +- platform folders (`android`, `ios`, `windows`, etc.): Contains the build files + for building and bundling the native code library with the platform application. + +## Building and bundling native code + +The `pubspec.yaml` specifies FFI plugins as follows: + +```yaml +plugin: + platforms: + some_platform: + ffiPlugin: true +``` + +This configuration invokes the native build for the various target platforms +and bundles the binaries in Flutter applications using these FFI plugins. + +This can be combined with dartPluginClass, such as when FFI is used for the +implementation of one platform in a federated plugin: + +```yaml +plugin: + implements: some_other_plugin + platforms: + some_platform: + dartPluginClass: SomeClass + ffiPlugin: true +``` + +A plugin can have both FFI and method channels: + +```yaml +plugin: + platforms: + some_platform: + pluginClass: SomeName + ffiPlugin: true +``` + +The native build systems that are invoked by FFI (and method channel) plugins are: + +- For Android: Gradle, which invokes the Android NDK for native builds. + - See the documentation in android/build.gradle. +- For iOS and MacOS: Xcode, via CocoaPods. + - See the documentation in ios/powersync_flutter_libs.podspec. + - See the documentation in macos/powersync_flutter_libs.podspec. +- For Linux and Windows: CMake. + - See the documentation in linux/CMakeLists.txt. + - See the documentation in windows/CMakeLists.txt. + +## Binding to native code + +To use the native code, bindings in Dart are needed. +To avoid writing these by hand, they are generated from the header file +(`src/powersync_flutter_libs.h`) by `package:ffigen`. +Regenerate the bindings by running `flutter pub run ffigen --config ffigen.yaml`. + +## Invoking native code + +Very short-running native functions can be directly invoked from any isolate. +For example, see `sum` in `lib/powersync_flutter_libs.dart`. + +Longer-running functions should be invoked on a helper isolate to avoid +dropping frames in Flutter applications. +For example, see `sumAsync` in `lib/powersync_flutter_libs.dart`. + +## Flutter help + +For help getting started with Flutter, view our +[online documentation](https://flutter.dev/docs), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/packages/powersync_flutter_libs/analysis_options.yaml b/packages/powersync_flutter_libs/analysis_options.yaml new file mode 100644 index 00000000..a5744c1c --- /dev/null +++ b/packages/powersync_flutter_libs/analysis_options.yaml @@ -0,0 +1,4 @@ +include: package:flutter_lints/flutter.yaml + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/packages/powersync_flutter_libs/android/.gitignore b/packages/powersync_flutter_libs/android/.gitignore new file mode 100644 index 00000000..161bdcda --- /dev/null +++ b/packages/powersync_flutter_libs/android/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.cxx diff --git a/packages/powersync_flutter_libs/android/build.gradle b/packages/powersync_flutter_libs/android/build.gradle new file mode 100644 index 00000000..3c340837 --- /dev/null +++ b/packages/powersync_flutter_libs/android/build.gradle @@ -0,0 +1,69 @@ +// The Android Gradle Plugin builds the native code with the Android NDK. + +group 'com.example.powersync_flutter_libs' +version '1.0' + +buildscript { + repositories { + google() + mavenCentral() + } + + dependencies { + // The Android Gradle Plugin knows how to build native code with the NDK. + classpath 'com.android.tools.build:gradle:7.3.0' + } +} + +rootProject.allprojects { + repositories { + google() + mavenCentral() + } +} + +apply plugin: 'com.android.library' + +android { + if (project.android.hasProperty("namespace")) { + namespace 'com.example.powersync_flutter_libs' + } + + // Bumping the plugin compileSdk version requires all clients of this plugin + // to bump the version in their app. + compileSdk 34 + + // Use the NDK version + // declared in /android/app/build.gradle file of the Flutter project. + // Replace it with a version number if this plugin requires a specfic NDK version. + // (e.g. ndkVersion "23.1.7779620") + ndkVersion android.ndkVersion + + // Invoke the shared CMake build with the Android Gradle Plugin. + externalNativeBuild { + cmake { + path "../src/CMakeLists.txt" + + // The default CMake version for the Android Gradle Plugin is 3.10.2. + // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake + // + // The Flutter tooling requires that developers have CMake 3.10 or later + // installed. You should not increase this version, as doing so will cause + // the plugin to fail to compile for some customers of the plugin. + // version "3.10.2" + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion 19 + } +} + +dependencies { + implementation 'co.powersync:powersync-sqlite-core:0.1.6' +} diff --git a/packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.jar b/packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..ccebba7710deaf9f98673a68957ea02138b60d0a GIT binary patch literal 61608 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 literal 0 HcmV?d00001 diff --git a/packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.properties b/packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..42defcc9 --- /dev/null +++ b/packages/powersync_flutter_libs/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/packages/powersync_flutter_libs/android/gradlew b/packages/powersync_flutter_libs/android/gradlew new file mode 100755 index 00000000..79a61d42 --- /dev/null +++ b/packages/powersync_flutter_libs/android/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/packages/powersync_flutter_libs/android/gradlew.bat b/packages/powersync_flutter_libs/android/gradlew.bat new file mode 100644 index 00000000..6689b85b --- /dev/null +++ b/packages/powersync_flutter_libs/android/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/packages/powersync_flutter_libs/android/settings.gradle b/packages/powersync_flutter_libs/android/settings.gradle new file mode 100644 index 00000000..03a8b88d --- /dev/null +++ b/packages/powersync_flutter_libs/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'powersync_flutter_libs' diff --git a/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..7ae05260 --- /dev/null +++ b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/packages/powersync_flutter_libs/ffigen.yaml b/packages/powersync_flutter_libs/ffigen.yaml new file mode 100644 index 00000000..882f8ed5 --- /dev/null +++ b/packages/powersync_flutter_libs/ffigen.yaml @@ -0,0 +1,19 @@ +# Run with `flutter pub run ffigen --config ffigen.yaml`. +name: PowersyncFlutterLibsBindings +description: | + Bindings for `src/powersync_flutter_libs.h`. + + Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`. +output: 'lib/powersync_flutter_libs_bindings_generated.dart' +headers: + entry-points: + - 'src/powersync_flutter_libs.h' + include-directives: + - 'src/powersync_flutter_libs.h' +preamble: | + // ignore_for_file: always_specify_types + // ignore_for_file: camel_case_types + // ignore_for_file: non_constant_identifier_names +comments: + style: any + length: full diff --git a/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c b/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c new file mode 100644 index 00000000..5f36bb4a --- /dev/null +++ b/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c @@ -0,0 +1,3 @@ +// Relative import to be able to reuse the C sources. +// See the comment in ../{projectName}}.podspec for more information. +#include "../../src/powersync_flutter_libs.c" diff --git a/packages/powersync_flutter_libs/ios/powersync_flutter_libs.podspec b/packages/powersync_flutter_libs/ios/powersync_flutter_libs.podspec new file mode 100644 index 00000000..b7e2abe2 --- /dev/null +++ b/packages/powersync_flutter_libs/ios/powersync_flutter_libs.podspec @@ -0,0 +1,30 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. +# Run `pod lib lint powersync_flutter_libs.podspec` to validate before publishing. +# +Pod::Spec.new do |s| + s.name = 'powersync_flutter_libs' + s.version = '0.0.1' + s.summary = 'A new Flutter FFI plugin project.' + s.description = <<-DESC +A new Flutter FFI plugin project. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + + # This will ensure the source files in Classes/ are included in the native + # builds of apps using this FFI plugin. Podspec does not support relative + # paths, so Classes contains a forwarder C file that relatively imports + # `../src/*` so that the C sources can be shared among all target platforms. + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.dependency 'Flutter' + s.platform = :ios, '11.0' + + s.dependency "powersync-sqlite-core", "~> 0.1.6" + + # Flutter.framework does not contain a i386 slice. + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } + s.swift_version = '5.0' +end diff --git a/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart b/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart new file mode 100644 index 00000000..4eb2bcb2 --- /dev/null +++ b/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart @@ -0,0 +1,131 @@ + +import 'dart:async'; +import 'dart:ffi'; +import 'dart:io'; +import 'dart:isolate'; + +import 'powersync_flutter_libs_bindings_generated.dart'; + +/// A very short-lived native function. +/// +/// For very short-lived functions, it is fine to call them on the main isolate. +/// They will block the Dart execution while running the native function, so +/// only do this for native functions which are guaranteed to be short-lived. +int sum(int a, int b) => _bindings.sum(a, b); + +/// A longer lived native function, which occupies the thread calling it. +/// +/// Do not call these kind of native functions in the main isolate. They will +/// block Dart execution. This will cause dropped frames in Flutter applications. +/// Instead, call these native functions on a separate isolate. +/// +/// Modify this to suit your own use case. Example use cases: +/// +/// 1. Reuse a single isolate for various different kinds of requests. +/// 2. Use multiple helper isolates for parallel execution. +Future sumAsync(int a, int b) async { + final SendPort helperIsolateSendPort = await _helperIsolateSendPort; + final int requestId = _nextSumRequestId++; + final _SumRequest request = _SumRequest(requestId, a, b); + final Completer completer = Completer(); + _sumRequests[requestId] = completer; + helperIsolateSendPort.send(request); + return completer.future; +} + +const String _libName = 'powersync_flutter_libs'; + +/// The dynamic library in which the symbols for [PowersyncFlutterLibsBindings] can be found. +final DynamicLibrary _dylib = () { + if (Platform.isMacOS || Platform.isIOS) { + return DynamicLibrary.open('$_libName.framework/$_libName'); + } + if (Platform.isAndroid || Platform.isLinux) { + return DynamicLibrary.open('lib$_libName.so'); + } + if (Platform.isWindows) { + return DynamicLibrary.open('$_libName.dll'); + } + throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}'); +}(); + +/// The bindings to the native functions in [_dylib]. +final PowersyncFlutterLibsBindings _bindings = PowersyncFlutterLibsBindings(_dylib); + + +/// A request to compute `sum`. +/// +/// Typically sent from one isolate to another. +class _SumRequest { + final int id; + final int a; + final int b; + + const _SumRequest(this.id, this.a, this.b); +} + +/// A response with the result of `sum`. +/// +/// Typically sent from one isolate to another. +class _SumResponse { + final int id; + final int result; + + const _SumResponse(this.id, this.result); +} + +/// Counter to identify [_SumRequest]s and [_SumResponse]s. +int _nextSumRequestId = 0; + +/// Mapping from [_SumRequest] `id`s to the completers corresponding to the correct future of the pending request. +final Map> _sumRequests = >{}; + +/// The SendPort belonging to the helper isolate. +Future _helperIsolateSendPort = () async { + // The helper isolate is going to send us back a SendPort, which we want to + // wait for. + final Completer completer = Completer(); + + // Receive port on the main isolate to receive messages from the helper. + // We receive two types of messages: + // 1. A port to send messages on. + // 2. Responses to requests we sent. + final ReceivePort receivePort = ReceivePort() + ..listen((dynamic data) { + if (data is SendPort) { + // The helper isolate sent us the port on which we can sent it requests. + completer.complete(data); + return; + } + if (data is _SumResponse) { + // The helper isolate sent us a response to a request we sent. + final Completer completer = _sumRequests[data.id]!; + _sumRequests.remove(data.id); + completer.complete(data.result); + return; + } + throw UnsupportedError('Unsupported message type: ${data.runtimeType}'); + }); + + // Start the helper isolate. + await Isolate.spawn((SendPort sendPort) async { + final ReceivePort helperReceivePort = ReceivePort() + ..listen((dynamic data) { + // On the helper isolate listen to requests and respond to them. + if (data is _SumRequest) { + final int result = _bindings.sum_long_running(data.a, data.b); + final _SumResponse response = _SumResponse(data.id, result); + sendPort.send(response); + return; + } + throw UnsupportedError('Unsupported message type: ${data.runtimeType}'); + }); + + // Send the port to the main isolate on which we can receive requests. + sendPort.send(helperReceivePort.sendPort); + }, receivePort.sendPort); + + // Wait until the helper isolate has sent us back the SendPort on which we + // can start sending requests. + return completer.future; +}(); diff --git a/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart b/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart new file mode 100644 index 00000000..2399eec9 --- /dev/null +++ b/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart @@ -0,0 +1,70 @@ +// ignore_for_file: always_specify_types +// ignore_for_file: camel_case_types +// ignore_for_file: non_constant_identifier_names + +// AUTO GENERATED FILE, DO NOT EDIT. +// +// Generated by `package:ffigen`. +// ignore_for_file: type=lint +import 'dart:ffi' as ffi; + +/// Bindings for `src/powersync_flutter_libs.h`. +/// +/// Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`. +/// +class PowersyncFlutterLibsBindings { + /// Holds the symbol lookup function. + final ffi.Pointer Function(String symbolName) + _lookup; + + /// The symbols are looked up in [dynamicLibrary]. + PowersyncFlutterLibsBindings(ffi.DynamicLibrary dynamicLibrary) + : _lookup = dynamicLibrary.lookup; + + /// The symbols are looked up with [lookup]. + PowersyncFlutterLibsBindings.fromLookup( + ffi.Pointer Function(String symbolName) + lookup) + : _lookup = lookup; + + /// A very short-lived native function. + /// + /// For very short-lived functions, it is fine to call them on the main isolate. + /// They will block the Dart execution while running the native function, so + /// only do this for native functions which are guaranteed to be short-lived. + int sum( + int a, + int b, + ) { + return _sum( + a, + b, + ); + } + + late final _sumPtr = + _lookup>( + 'sum'); + late final _sum = _sumPtr.asFunction(); + + /// A longer lived native function, which occupies the thread calling it. + /// + /// Do not call these kind of native functions in the main isolate. They will + /// block Dart execution. This will cause dropped frames in Flutter applications. + /// Instead, call these native functions on a separate isolate. + int sum_long_running( + int a, + int b, + ) { + return _sum_long_running( + a, + b, + ); + } + + late final _sum_long_runningPtr = + _lookup>( + 'sum_long_running'); + late final _sum_long_running = + _sum_long_runningPtr.asFunction(); +} diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt new file mode 100644 index 00000000..150c5236 --- /dev/null +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -0,0 +1,52 @@ +# The Flutter tooling requires that developers have CMake 3.10 or later +# installed. You should not increase this version, as doing so will cause +# the plugin to fail to compile for some customers of the plugin. +cmake_minimum_required(VERSION 3.10) + +# Project-level configuration. +set(PROJECT_NAME "powersync_flutter_libs") +project(${PROJECT_NAME} LANGUAGES CXX) + +# This value is used when generating builds using this plugin, so it must +# not be changed. +set(PLUGIN_NAME "powersync_flutter_libs_plugin") + +# Define the plugin library target. Its name must not be changed (see comment +# on PLUGIN_NAME above). +# +# Any new source files that you add to the plugin should be added here. +add_library(${PLUGIN_NAME} SHARED + "powersync_flutter_libs_plugin.cc" +) + +# Apply a standard set of build settings that are configured in the +# application-level CMakeLists.txt. This can be removed for plugins that want +# full control over build settings. +apply_standard_settings(${PLUGIN_NAME}) + +# Symbols are hidden by default to reduce the chance of accidental conflicts +# between plugins. This should not be removed; any symbols that should be +# exported should be explicitly exported with the FLUTTER_PLUGIN_EXPORT macro. +set_target_properties(${PLUGIN_NAME} PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) + +# Source include directories and library dependencies. Add any plugin-specific +# dependencies here. +target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) +target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK) + +# Invoke the build for native code shared with the other target platforms. +# This can be changed to accommodate different builds. +# add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared") + +# List of absolute paths to libraries that should be bundled with the plugin. +# This list could contain prebuilt libraries, or libraries created by an +# external build triggered from this build file. +set(powersync_flutter_libs_bundled_libraries + # Defined in ../src/CMakeLists.txt. + # This can be changed to accommodate different builds. + "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so" + PARENT_SCOPE +) diff --git a/packages/powersync_flutter_libs/linux/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h b/packages/powersync_flutter_libs/linux/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h new file mode 100644 index 00000000..ea8591af --- /dev/null +++ b/packages/powersync_flutter_libs/linux/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h @@ -0,0 +1,27 @@ +#ifndef FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ +#define FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ + +#include + +G_BEGIN_DECLS + +#ifdef FLUTTER_PLUGIN_IMPL +#define FLUTTER_PLUGIN_EXPORT __attribute__((visibility("default"))) +#else +#define FLUTTER_PLUGIN_EXPORT +#endif + +typedef struct _PowersyncFlutterLibsPlugin PoweryncFlutterLibsPlugin; +typedef struct +{ + GObjectClass parent_class; +} PoweryncFlutterLibsPluginClass; + +FLUTTER_PLUGIN_EXPORT GType powersync_flutter_libs_plugin_get_type(); + +FLUTTER_PLUGIN_EXPORT void powersync_flutter_libs_plugin_register_with_registrar( + FlPluginRegistrar *registrar); + +G_END_DECLS + +#endif // FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ diff --git a/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc b/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc new file mode 100644 index 00000000..8a61beac --- /dev/null +++ b/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc @@ -0,0 +1,79 @@ +#include "include/powersync_flutter_libs/powersync_flutter_libs_plugin.h" + +#include +#include +#include + +#include + +#define POWERSYNC_FLUTTER_LIBS_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), powersync_flutter_libs_plugin_get_type(), \ + PowersyncFlutterLibsPlugin)) + +struct _PowersyncFlutterLibsPlugin +{ + GObject parent_instance; +}; + +G_DEFINE_TYPE(PowersyncFlutterLibsPlugin, powersync_flutter_libs_plugin, g_object_get_type()) + +// Called when a method call is received from Flutter. +static void powersync_flutter_libs_plugin_handle_method_call( + PowersyncFlutterLibsPlugin *self, + FlMethodCall *method_call) +{ + g_autoptr(FlMethodResponse) response = nullptr; + + const gchar *method = fl_method_call_get_name(method_call); + + if (strcmp(method, "getPlatformVersion") == 0) + { + struct utsname uname_data = {}; + uname(&uname_data); + g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version); + g_autoptr(FlValue) result = fl_value_new_string(version); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); + } + else + { + response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); + } + + fl_method_call_respond(method_call, response, nullptr); +} + +static void powersync_flutter_libs_plugin_dispose(GObject *object) +{ + G_OBJECT_CLASS(powersync_flutter_libs_plugin_parent_class)->dispose(object); +} + +static void powersync_flutter_libs_plugin_class_init(PowersyncFlutterLibsPluginClass *klass) +{ + G_OBJECT_CLASS(klass)->dispose = powersync_flutter_libs_plugin_dispose; +} + +static void powersync_flutter_libs_plugin_init(PowersyncFlutterLibsPlugin *self) {} + +static void method_call_cb(FlMethodChannel *channel, FlMethodCall *method_call, + gpointer user_data) +{ + PowersyncFlutterLibsPlugin *plugin = POWERSYNC_FLUTTER_LIBS_PLUGIN(user_data); + powersync_flutter_libs_plugin_handle_method_call(plugin, method_call); +} + +void powersync_flutter_libs_plugin_register_with_registrar(FlPluginRegistrar *registrar) +{ + PowersyncFlutterLibsPlugin *plugin = POWERSYNC_FLUTTER_LIBS_PLUGIN( + g_object_new(powersync_flutter_libs_plugin_get_type(), nullptr)); + + g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); + g_autoptr(FlMethodChannel) channel = + fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar), + "powersync_flutter_libs", + FL_METHOD_CODEC(codec)); + fl_method_channel_set_method_call_handler(channel, method_call_cb, + g_object_ref(plugin), + g_object_unref); + + g_object_unref(plugin); +} diff --git a/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c b/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c new file mode 100644 index 00000000..5f36bb4a --- /dev/null +++ b/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c @@ -0,0 +1,3 @@ +// Relative import to be able to reuse the C sources. +// See the comment in ../{projectName}}.podspec for more information. +#include "../../src/powersync_flutter_libs.c" diff --git a/packages/powersync_flutter_libs/macos/powersync_flutter_libs.podspec b/packages/powersync_flutter_libs/macos/powersync_flutter_libs.podspec new file mode 100644 index 00000000..463fb759 --- /dev/null +++ b/packages/powersync_flutter_libs/macos/powersync_flutter_libs.podspec @@ -0,0 +1,29 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html. +# Run `pod lib lint powersync_flutter_libs.podspec` to validate before publishing. +# +Pod::Spec.new do |s| + s.name = 'powersync_flutter_libs' + s.version = '0.0.1' + s.summary = 'A new Flutter FFI plugin project.' + s.description = <<-DESC +A new Flutter FFI plugin project. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + + # This will ensure the source files in Classes/ are included in the native + # builds of apps using this FFI plugin. Podspec does not support relative + # paths, so Classes contains a forwarder C file that relatively imports + # `../src/*` so that the C sources can be shared among all target platforms. + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.dependency 'FlutterMacOS' + + s.dependency "powersync-sqlite-core", "~> 0.1.6" + + s.platform = :osx, '10.11' + s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } + s.swift_version = '5.0' +end diff --git a/packages/powersync_flutter_libs/pubspec.yaml b/packages/powersync_flutter_libs/pubspec.yaml new file mode 100644 index 00000000..90ffb820 --- /dev/null +++ b/packages/powersync_flutter_libs/pubspec.yaml @@ -0,0 +1,81 @@ +name: powersync_flutter_libs +description: "A new Flutter FFI plugin project." +version: 0.0.1 +homepage: + +environment: + sdk: ^3.2.3 + flutter: ">=3.3.0" + +dependencies: + flutter: + sdk: flutter + plugin_platform_interface: ^2.0.2 + +dev_dependencies: + ffi: ^2.1.0 + ffigen: ^9.0.1 + flutter_test: + sdk: flutter + flutter_lints: ^3.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +# The following section is specific to Flutter packages. +flutter: + # This section identifies this Flutter project as a plugin project. + # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.) + # which should be registered in the plugin registry. This is required for + # using method channels. + # The Android 'package' specifies package in which the registered class is. + # This is required for using method channels on Android. + # The 'ffiPlugin' specifies that native code should be built and bundled. + # This is required for using `dart:ffi`. + # All these are used by the tooling to maintain consistency when + # adding or updating assets for this project. + # + # Please refer to README.md for a detailed explanation. + plugin: + platforms: + android: + ffiPlugin: true + ios: + ffiPlugin: true + linux: + ffiPlugin: true + macos: + ffiPlugin: true + windows: + ffiPlugin: true + + # To add assets to your plugin package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.dev/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # To add custom fonts to your plugin package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.dev/custom-fonts/#from-packages diff --git a/packages/powersync_flutter_libs/src/CMakeLists.txt b/packages/powersync_flutter_libs/src/CMakeLists.txt new file mode 100644 index 00000000..6b641189 --- /dev/null +++ b/packages/powersync_flutter_libs/src/CMakeLists.txt @@ -0,0 +1,17 @@ +# The Flutter tooling requires that developers have CMake 3.10 or later +# installed. You should not increase this version, as doing so will cause +# the plugin to fail to compile for some customers of the plugin. +cmake_minimum_required(VERSION 3.10) + +project(powersync_flutter_libs_library VERSION 0.0.1 LANGUAGES C) + +add_library(powersync_flutter_libs SHARED + "powersync_flutter_libs.c" +) + +set_target_properties(powersync_flutter_libs PROPERTIES + PUBLIC_HEADER powersync_flutter_libs.h + OUTPUT_NAME "powersync_flutter_libs" +) + +target_compile_definitions(powersync_flutter_libs PUBLIC DART_SHARED_LIB) diff --git a/packages/powersync_flutter_libs/src/powersync_flutter_libs.c b/packages/powersync_flutter_libs/src/powersync_flutter_libs.c new file mode 100644 index 00000000..9399dee0 --- /dev/null +++ b/packages/powersync_flutter_libs/src/powersync_flutter_libs.c @@ -0,0 +1,23 @@ +#include "powersync_flutter_libs.h" + +// A very short-lived native function. +// +// For very short-lived functions, it is fine to call them on the main isolate. +// They will block the Dart execution while running the native function, so +// only do this for native functions which are guaranteed to be short-lived. +FFI_PLUGIN_EXPORT intptr_t sum(intptr_t a, intptr_t b) { return a + b; } + +// A longer-lived native function, which occupies the thread calling it. +// +// Do not call these kind of native functions in the main isolate. They will +// block Dart execution. This will cause dropped frames in Flutter applications. +// Instead, call these native functions on a separate isolate. +FFI_PLUGIN_EXPORT intptr_t sum_long_running(intptr_t a, intptr_t b) { + // Simulate work. +#if _WIN32 + Sleep(5000); +#else + usleep(5000 * 1000); +#endif + return a + b; +} diff --git a/packages/powersync_flutter_libs/src/powersync_flutter_libs.h b/packages/powersync_flutter_libs/src/powersync_flutter_libs.h new file mode 100644 index 00000000..084c6422 --- /dev/null +++ b/packages/powersync_flutter_libs/src/powersync_flutter_libs.h @@ -0,0 +1,30 @@ +#include +#include +#include + +#if _WIN32 +#include +#else +#include +#include +#endif + +#if _WIN32 +#define FFI_PLUGIN_EXPORT __declspec(dllexport) +#else +#define FFI_PLUGIN_EXPORT +#endif + +// A very short-lived native function. +// +// For very short-lived functions, it is fine to call them on the main isolate. +// They will block the Dart execution while running the native function, so +// only do this for native functions which are guaranteed to be short-lived. +FFI_PLUGIN_EXPORT intptr_t sum(intptr_t a, intptr_t b); + +// A longer lived native function, which occupies the thread calling it. +// +// Do not call these kind of native functions in the main isolate. They will +// block Dart execution. This will cause dropped frames in Flutter applications. +// Instead, call these native functions on a separate isolate. +FFI_PLUGIN_EXPORT intptr_t sum_long_running(intptr_t a, intptr_t b); diff --git a/packages/powersync_flutter_libs/windows/.gitignore b/packages/powersync_flutter_libs/windows/.gitignore new file mode 100644 index 00000000..b3eb2be1 --- /dev/null +++ b/packages/powersync_flutter_libs/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt new file mode 100644 index 00000000..0d91d0d9 --- /dev/null +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -0,0 +1,23 @@ +# The Flutter tooling requires that developers have a version of Visual Studio +# installed that includes CMake 3.14 or later. You should not increase this +# version, as doing so will cause the plugin to fail to compile for some +# customers of the plugin. +cmake_minimum_required(VERSION 3.14) + +# Project-level configuration. +set(PROJECT_NAME "powersync_flutter_libs") +project(${PROJECT_NAME} LANGUAGES CXX) + +# Invoke the build for native code shared with the other target platforms. +# This can be changed to accommodate different builds. +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared") + +# List of absolute paths to libraries that should be bundled with the plugin. +# This list could contain prebuilt libraries, or libraries created by an +# external build triggered from this build file. +set(powersync_flutter_libs_bundled_libraries + # Defined in ../src/CMakeLists.txt. + # This can be changed to accommodate different builds. + $ + PARENT_SCOPE +) From 588842b2145ad1afa72c59387645a4d168936de2 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Mon, 27 May 2024 15:14:18 +0200 Subject: [PATCH 20/36] Rename android package --- .../flutter/generated_plugin_registrant.cc | 4 ++++ .../linux/flutter/generated_plugins.cmake | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 ++ demos/supabase-todolist/pubspec.lock | 2 +- .../flutter/generated_plugin_registrant.cc | 3 +++ .../windows/flutter/generated_plugins.cmake | 2 +- .../android/build.gradle | 4 ++-- .../android/src/main/AndroidManifest.xml | 2 +- .../PowersyncFlutterLibsPlugin.java | 13 +++++++++++++ packages/powersync_flutter_libs/ffigen.yaml | 19 ------------------- packages/powersync_flutter_libs/pubspec.yaml | 14 ++++++-------- .../windows/CMakeLists.txt | 1 + 12 files changed, 35 insertions(+), 33 deletions(-) create mode 100644 packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java delete mode 100644 packages/powersync_flutter_libs/ffigen.yaml diff --git a/demos/supabase-todolist/linux/flutter/generated_plugin_registrant.cc b/demos/supabase-todolist/linux/flutter/generated_plugin_registrant.cc index fc949e03..1bef6a30 100644 --- a/demos/supabase-todolist/linux/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-todolist/linux/flutter/generated_plugin_registrant.cc @@ -7,6 +7,7 @@ #include "generated_plugin_registrant.h" #include +#include #include #include @@ -14,6 +15,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) gtk_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); gtk_plugin_register_with_registrar(gtk_registrar); + g_autoptr(FlPluginRegistrar) powersync_flutter_libs_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "PowersyncFlutterLibsPlugin"); + powersync_flutter_libs_plugin_register_with_registrar(powersync_flutter_libs_registrar); g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin"); sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar); diff --git a/demos/supabase-todolist/linux/flutter/generated_plugins.cmake b/demos/supabase-todolist/linux/flutter/generated_plugins.cmake index 4fe81f05..ed77a1a0 100644 --- a/demos/supabase-todolist/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-todolist/linux/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST gtk + powersync_flutter_libs sqlite3_flutter_libs url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-todolist/macos/Flutter/GeneratedPluginRegistrant.swift b/demos/supabase-todolist/macos/Flutter/GeneratedPluginRegistrant.swift index 7cd103ea..0c6fd7ff 100644 --- a/demos/supabase-todolist/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/demos/supabase-todolist/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,6 +7,7 @@ import Foundation import app_links import path_provider_foundation +import powersync_flutter_libs import shared_preferences_foundation import sqlite3_flutter_libs import url_launcher_macos @@ -14,6 +15,7 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PowersyncFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "PowersyncFlutterLibsPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock index 68e8a64f..04208bb1 100644 --- a/demos/supabase-todolist/pubspec.lock +++ b/demos/supabase-todolist/pubspec.lock @@ -417,7 +417,7 @@ packages: powersync_flutter_libs: dependency: transitive description: - path: "../../../powersync_flutter_libs" + path: "../../packages/powersync_flutter_libs" relative: true source: path version: "0.0.1" diff --git a/demos/supabase-todolist/windows/flutter/generated_plugin_registrant.cc b/demos/supabase-todolist/windows/flutter/generated_plugin_registrant.cc index 0aed3732..691e6fc2 100644 --- a/demos/supabase-todolist/windows/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-todolist/windows/flutter/generated_plugin_registrant.cc @@ -7,12 +7,15 @@ #include "generated_plugin_registrant.h" #include +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { AppLinksPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AppLinksPluginCApi")); + PowersyncFlutterLibsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PowersyncFlutterLibsPlugin")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/demos/supabase-todolist/windows/flutter/generated_plugins.cmake b/demos/supabase-todolist/windows/flutter/generated_plugins.cmake index 76d60ae3..0d5e9159 100644 --- a/demos/supabase-todolist/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-todolist/windows/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links + powersync_flutter_libs sqlite3_flutter_libs url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/packages/powersync_flutter_libs/android/build.gradle b/packages/powersync_flutter_libs/android/build.gradle index 3c340837..2b039c5d 100644 --- a/packages/powersync_flutter_libs/android/build.gradle +++ b/packages/powersync_flutter_libs/android/build.gradle @@ -1,6 +1,6 @@ // The Android Gradle Plugin builds the native code with the Android NDK. -group 'com.example.powersync_flutter_libs' +group 'co.powersync.powersync_flutter_libs' version '1.0' buildscript { @@ -26,7 +26,7 @@ apply plugin: 'com.android.library' android { if (project.android.hasProperty("namespace")) { - namespace 'com.example.powersync_flutter_libs' + namespace 'co.powersync.powersync_flutter_libs' } // Bumping the plugin compileSdk version requires all clients of this plugin diff --git a/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml index 7ae05260..f0e85575 100644 --- a/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml +++ b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="co.powersync.powersync_flutter_libs"> diff --git a/packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java b/packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java new file mode 100644 index 00000000..b079b2d6 --- /dev/null +++ b/packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java @@ -0,0 +1,13 @@ +package co.powersync.powersync_flutter_libs; + +import androidx.annotation.NonNull; + +import io.flutter.embedding.engine.plugins.FlutterPlugin; + +public class PowersyncFlutterLibsPlugin implements FlutterPlugin { + @Override + public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBinding) { } + + @Override + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { } +} diff --git a/packages/powersync_flutter_libs/ffigen.yaml b/packages/powersync_flutter_libs/ffigen.yaml deleted file mode 100644 index 882f8ed5..00000000 --- a/packages/powersync_flutter_libs/ffigen.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Run with `flutter pub run ffigen --config ffigen.yaml`. -name: PowersyncFlutterLibsBindings -description: | - Bindings for `src/powersync_flutter_libs.h`. - - Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`. -output: 'lib/powersync_flutter_libs_bindings_generated.dart' -headers: - entry-points: - - 'src/powersync_flutter_libs.h' - include-directives: - - 'src/powersync_flutter_libs.h' -preamble: | - // ignore_for_file: always_specify_types - // ignore_for_file: camel_case_types - // ignore_for_file: non_constant_identifier_names -comments: - style: any - length: full diff --git a/packages/powersync_flutter_libs/pubspec.yaml b/packages/powersync_flutter_libs/pubspec.yaml index 90ffb820..595acfa6 100644 --- a/packages/powersync_flutter_libs/pubspec.yaml +++ b/packages/powersync_flutter_libs/pubspec.yaml @@ -10,11 +10,8 @@ environment: dependencies: flutter: sdk: flutter - plugin_platform_interface: ^2.0.2 dev_dependencies: - ffi: ^2.1.0 - ffigen: ^9.0.1 flutter_test: sdk: flutter flutter_lints: ^3.0.0 @@ -39,15 +36,16 @@ flutter: plugin: platforms: android: - ffiPlugin: true + package: co.powersync.powersync_flutter_libs + pluginClass: PowersyncFlutterLibsPlugin ios: - ffiPlugin: true + pluginClass: PowersyncFlutterLibsPlugin linux: - ffiPlugin: true + pluginClass: PowersyncFlutterLibsPlugin macos: - ffiPlugin: true + pluginClass: PowersyncFlutterLibsPlugin windows: - ffiPlugin: true + pluginClass: PowersyncFlutterLibsPlugin # To add assets to your plugin package, add an assets section, like this: # assets: diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 0d91d0d9..146c7034 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -19,5 +19,6 @@ set(powersync_flutter_libs_bundled_libraries # Defined in ../src/CMakeLists.txt. # This can be changed to accommodate different builds. $ + "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll" PARENT_SCOPE ) From 3d352a443fe23454afad8d3de9e95e4009118eea Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Sun, 2 Jun 2024 23:36:22 +0200 Subject: [PATCH 21/36] Update windows and linux extension scripts --- .../linux/CMakeLists.txt | 21 ----- .../linux/powersync_flutter_libs_plugin.cc | 78 +------------------ .../windows/CMakeLists.txt | 28 ++++--- .../powersync_flutter_libs_plugin.h | 23 ++++++ .../windows/powersync_flutter_libs.cpp | 6 ++ 5 files changed, 50 insertions(+), 106 deletions(-) create mode 100644 packages/powersync_flutter_libs/windows/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h create mode 100644 packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt index 150c5236..c5430ebc 100644 --- a/packages/powersync_flutter_libs/linux/CMakeLists.txt +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -1,6 +1,3 @@ -# The Flutter tooling requires that developers have CMake 3.10 or later -# installed. You should not increase this version, as doing so will cause -# the plugin to fail to compile for some customers of the plugin. cmake_minimum_required(VERSION 3.10) # Project-level configuration. @@ -19,34 +16,16 @@ add_library(${PLUGIN_NAME} SHARED "powersync_flutter_libs_plugin.cc" ) -# Apply a standard set of build settings that are configured in the -# application-level CMakeLists.txt. This can be removed for plugins that want -# full control over build settings. -apply_standard_settings(${PLUGIN_NAME}) - -# Symbols are hidden by default to reduce the chance of accidental conflicts -# between plugins. This should not be removed; any symbols that should be -# exported should be explicitly exported with the FLUTTER_PLUGIN_EXPORT macro. set_target_properties(${PLUGIN_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden) target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) - -# Source include directories and library dependencies. Add any plugin-specific -# dependencies here. target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) -target_link_libraries(${PLUGIN_NAME} PRIVATE PkgConfig::GTK) - -# Invoke the build for native code shared with the other target platforms. -# This can be changed to accommodate different builds. -# add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared") # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. set(powersync_flutter_libs_bundled_libraries - # Defined in ../src/CMakeLists.txt. - # This can be changed to accommodate different builds. "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so" PARENT_SCOPE ) diff --git a/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc b/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc index 8a61beac..74bede91 100644 --- a/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc +++ b/packages/powersync_flutter_libs/linux/powersync_flutter_libs_plugin.cc @@ -1,79 +1,7 @@ #include "include/powersync_flutter_libs/powersync_flutter_libs_plugin.h" #include -#include -#include -#include - -#define POWERSYNC_FLUTTER_LIBS_PLUGIN(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), powersync_flutter_libs_plugin_get_type(), \ - PowersyncFlutterLibsPlugin)) - -struct _PowersyncFlutterLibsPlugin -{ - GObject parent_instance; -}; - -G_DEFINE_TYPE(PowersyncFlutterLibsPlugin, powersync_flutter_libs_plugin, g_object_get_type()) - -// Called when a method call is received from Flutter. -static void powersync_flutter_libs_plugin_handle_method_call( - PowersyncFlutterLibsPlugin *self, - FlMethodCall *method_call) -{ - g_autoptr(FlMethodResponse) response = nullptr; - - const gchar *method = fl_method_call_get_name(method_call); - - if (strcmp(method, "getPlatformVersion") == 0) - { - struct utsname uname_data = {}; - uname(&uname_data); - g_autofree gchar *version = g_strdup_printf("Linux %s", uname_data.version); - g_autoptr(FlValue) result = fl_value_new_string(version); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(result)); - } - else - { - response = FL_METHOD_RESPONSE(fl_method_not_implemented_response_new()); - } - - fl_method_call_respond(method_call, response, nullptr); -} - -static void powersync_flutter_libs_plugin_dispose(GObject *object) -{ - G_OBJECT_CLASS(powersync_flutter_libs_plugin_parent_class)->dispose(object); -} - -static void powersync_flutter_libs_plugin_class_init(PowersyncFlutterLibsPluginClass *klass) -{ - G_OBJECT_CLASS(klass)->dispose = powersync_flutter_libs_plugin_dispose; -} - -static void powersync_flutter_libs_plugin_init(PowersyncFlutterLibsPlugin *self) {} - -static void method_call_cb(FlMethodChannel *channel, FlMethodCall *method_call, - gpointer user_data) -{ - PowersyncFlutterLibsPlugin *plugin = POWERSYNC_FLUTTER_LIBS_PLUGIN(user_data); - powersync_flutter_libs_plugin_handle_method_call(plugin, method_call); -} - -void powersync_flutter_libs_plugin_register_with_registrar(FlPluginRegistrar *registrar) -{ - PowersyncFlutterLibsPlugin *plugin = POWERSYNC_FLUTTER_LIBS_PLUGIN( - g_object_new(powersync_flutter_libs_plugin_get_type(), nullptr)); - - g_autoptr(FlStandardMethodCodec) codec = fl_standard_method_codec_new(); - g_autoptr(FlMethodChannel) channel = - fl_method_channel_new(fl_plugin_registrar_get_messenger(registrar), - "powersync_flutter_libs", - FL_METHOD_CODEC(codec)); - fl_method_channel_set_method_call_handler(channel, method_call_cb, - g_object_ref(plugin), - g_object_unref); - - g_object_unref(plugin); -} +void powersync_flutter_libs_plugin_register_with_registrar(FlPluginRegistrar *registrar) { + +} \ No newline at end of file diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 146c7034..8f4f7beb 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -1,24 +1,32 @@ -# The Flutter tooling requires that developers have a version of Visual Studio -# installed that includes CMake 3.14 or later. You should not increase this -# version, as doing so will cause the plugin to fail to compile for some -# customers of the plugin. cmake_minimum_required(VERSION 3.14) # Project-level configuration. set(PROJECT_NAME "powersync_flutter_libs") project(${PROJECT_NAME} LANGUAGES CXX) -# Invoke the build for native code shared with the other target platforms. -# This can be changed to accommodate different builds. -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../src" "${CMAKE_CURRENT_BINARY_DIR}/shared") +# This value is used when generating builds using this plugin, so it must +# not be changed. +set(PLUGIN_NAME "powersync_flutter_libs_plugin") + +# Define the plugin library target. Its name must not be changed (see comment +# on PLUGIN_NAME above). +# +# Any new source files that you add to the plugin should be added here. +add_library(${PLUGIN_NAME} SHARED + "powersync_flutter_libs_plugin.cpp" +) + +apply_standard_settings(${PLUGIN_NAME}) +set_target_properties(${PLUGIN_NAME} PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) +target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") +target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin) # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. set(powersync_flutter_libs_bundled_libraries - # Defined in ../src/CMakeLists.txt. - # This can be changed to accommodate different builds. - $ "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll" PARENT_SCOPE ) diff --git a/packages/powersync_flutter_libs/windows/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h b/packages/powersync_flutter_libs/windows/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h new file mode 100644 index 00000000..5029e52d --- /dev/null +++ b/packages/powersync_flutter_libs/windows/include/powersync_flutter_libs/powersync_flutter_libs_plugin.h @@ -0,0 +1,23 @@ +#ifndef FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ +#define FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ + +#include + +#ifdef FLUTTER_PLUGIN_IMPL +#define FLUTTER_PLUGIN_EXPORT __declspec(dllexport) +#else +#define FLUTTER_PLUGIN_EXPORT __declspec(dllimport) +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + +FLUTTER_PLUGIN_EXPORT void PowersyncFlutterLibsPluginRegisterWithRegistrar( + FlutterDesktopPluginRegistrarRef registrar); + +#if defined(__cplusplus) +} // extern "C" +#endif + +#endif // FLUTTER_PLUGIN_POWERSYNC_FLUTTER_LIBS_PLUGIN_H_ \ No newline at end of file diff --git a/packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp b/packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp new file mode 100644 index 00000000..6506de36 --- /dev/null +++ b/packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp @@ -0,0 +1,6 @@ +#include "include/powersync_flutter_libs/powersync_flutter_libs_plugin.h" + +void PowersyncFlutterLibsPluginRegisterWithRegistrar( + FlutterDesktopPluginRegistrarRef registrar) { + +} \ No newline at end of file From 1393881f82432426ce5d65ef90c3c1ae2e999800 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 11:29:01 +0200 Subject: [PATCH 22/36] Download binary in cmake --- packages/powersync/pubspec.yaml | 2 +- .../linux/CMakeLists.txt | 34 +++++++++++++++++-- .../windows/CMakeLists.txt | 32 ++++++++++++++++- 3 files changed, 64 insertions(+), 4 deletions(-) diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index be968376..0202a9d4 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: sdk: flutter sqlite_async: ^0.6.1 - sqlite3_flutter_libs: ^0.5.15 + sqlite3_flutter_libs: ^0.5.23 powersync_flutter_libs: path: ../powersync_flutter_libs http: ^1.1.0 diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt index c5430ebc..31e0891e 100644 --- a/packages/powersync_flutter_libs/linux/CMakeLists.txt +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.14) # Project-level configuration. set(PROJECT_NAME "powersync_flutter_libs") @@ -22,10 +22,40 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) +# ---------------------------------------------------------------------- +# Download and add powersync prebuilt library. + +set(POWERSYNC_VERSION 0.1.6) + +set(POWERSYNC_ARCH ${CMAKE_SYSTEM_PROCESSOR}) +if (${POWERSYNC_ARCH} MATCHES "x86_64") + set(POWERSYNC_ARCH x64) +elseif (${POWERSYNC_ARCH} MATCHES "^arm64" OR ${POWERSYNC_ARCH} MATCHES "^armv8") + set(POWERSYNC_ARCH aarch64) +endif () + +set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so") + +include(FetchContent) +FetchContent_Declare( + powersync-download + URL https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/libpowersync_${POWERSYNC_ARCH}.so +) + +if(NOT EXISTS ${POWERSYNC_FILE_PATH}) + FetchContent_GetProperties(powersync-download) + if(NOT powersync-download_POPULATED) + FetchContent_Populate(powersync-download) + file(COPY ${powersync-download_SOURCE_DIR}/libpowersync_${POWERSYNC_ARCH}.so DESTINATION ${POWERSYNC_FILE_PATH}) + endif() +endif() + +# ---------------------------------------------------------------------- + # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. set(powersync_flutter_libs_bundled_libraries - "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so" + "${POWERSYNC_FILE_PATH}" PARENT_SCOPE ) diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 8f4f7beb..0310da04 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -23,10 +23,40 @@ target_compile_definitions(${PLUGIN_NAME} PRIVATE FLUTTER_PLUGIN_IMPL) target_include_directories(${PLUGIN_NAME} INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include") target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin) +# ---------------------------------------------------------------------- +# Download and add powersync prebuilt library. + +set(POWERSYNC_VERSION 0.1.6) + +set(POWERSYNC_ARCH ${CMAKE_SYSTEM_PROCESSOR}) +if (${POWERSYNC_ARCH} MATCHES "x86_64") + set(POWERSYNC_ARCH x64) +elseif (${POWERSYNC_ARCH} MATCHES "^arm64" OR ${POWERSYNC_ARCH} MATCHES "^armv8") + set(POWERSYNC_ARCH aarch64) +endif () + +set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll") + +include(FetchContent) +FetchContent_Declare( + powersync-download + URL https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/powersync_${POWERSYNC_ARCH}.dll +) + +if(NOT EXISTS ${POWERSYNC_FILE_PATH}) + FetchContent_GetProperties(powersync-download) + if(NOT powersync-download_POPULATED) + FetchContent_Populate(powersync-download) + file(COPY ${powersync-download_SOURCE_DIR}/libpowersync_${POWERSYNC_ARCH}.so DESTINATION ${POWERSYNC_FILE_PATH}) + endif() +endif() + +# ---------------------------------------------------------------------- + # List of absolute paths to libraries that should be bundled with the plugin. # This list could contain prebuilt libraries, or libraries created by an # external build triggered from this build file. set(powersync_flutter_libs_bundled_libraries - "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll" + "${POWERSYNC_FILE_PATH}" PARENT_SCOPE ) From 580d56ed70623cebb0107d123330de718607dfd0 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 11:33:41 +0200 Subject: [PATCH 23/36] Fix arch in cmake --- packages/powersync_flutter_libs/linux/CMakeLists.txt | 2 +- packages/powersync_flutter_libs/windows/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt index 31e0891e..36a71234 100644 --- a/packages/powersync_flutter_libs/linux/CMakeLists.txt +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE flutter) set(POWERSYNC_VERSION 0.1.6) set(POWERSYNC_ARCH ${CMAKE_SYSTEM_PROCESSOR}) -if (${POWERSYNC_ARCH} MATCHES "x86_64") +if (${POWERSYNC_ARCH} MATCHES "x86_64" OR ${POWERSYNC_ARCH} MATCHES "AMD64") set(POWERSYNC_ARCH x64) elseif (${POWERSYNC_ARCH} MATCHES "^arm64" OR ${POWERSYNC_ARCH} MATCHES "^armv8") set(POWERSYNC_ARCH aarch64) diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 0310da04..14a8f800 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE flutter flutter_wrapper_plugin) set(POWERSYNC_VERSION 0.1.6) set(POWERSYNC_ARCH ${CMAKE_SYSTEM_PROCESSOR}) -if (${POWERSYNC_ARCH} MATCHES "x86_64") +if (${POWERSYNC_ARCH} MATCHES "x86_64" OR ${POWERSYNC_ARCH} MATCHES "AMD64") set(POWERSYNC_ARCH x64) elseif (${POWERSYNC_ARCH} MATCHES "^arm64" OR ${POWERSYNC_ARCH} MATCHES "^armv8") set(POWERSYNC_ARCH aarch64) From d662e12c08936c75cdc9034fef7d27995e2fcc5d Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 11:41:41 +0200 Subject: [PATCH 24/36] Fix binary download --- .../powersync_flutter_libs/linux/CMakeLists.txt | 16 +++++----------- .../windows/CMakeLists.txt | 16 +++++----------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt index 36a71234..a6e23d3f 100644 --- a/packages/powersync_flutter_libs/linux/CMakeLists.txt +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -36,18 +36,12 @@ endif () set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so") -include(FetchContent) -FetchContent_Declare( - powersync-download - URL https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/libpowersync_${POWERSYNC_ARCH}.so -) - if(NOT EXISTS ${POWERSYNC_FILE_PATH}) - FetchContent_GetProperties(powersync-download) - if(NOT powersync-download_POPULATED) - FetchContent_Populate(powersync-download) - file(COPY ${powersync-download_SOURCE_DIR}/libpowersync_${POWERSYNC_ARCH}.so DESTINATION ${POWERSYNC_FILE_PATH}) - endif() + file(DOWNLOAD + "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/libpowersync_${POWERSYNC_ARCH}.so" + ${POWERSYNC_FILE_PATH} + SHOW_PROGRESS + ) endif() # ---------------------------------------------------------------------- diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 14a8f800..5400f5e2 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -37,18 +37,12 @@ endif () set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll") -include(FetchContent) -FetchContent_Declare( - powersync-download - URL https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/powersync_${POWERSYNC_ARCH}.dll -) - if(NOT EXISTS ${POWERSYNC_FILE_PATH}) - FetchContent_GetProperties(powersync-download) - if(NOT powersync-download_POPULATED) - FetchContent_Populate(powersync-download) - file(COPY ${powersync-download_SOURCE_DIR}/libpowersync_${POWERSYNC_ARCH}.so DESTINATION ${POWERSYNC_FILE_PATH}) - endif() + file(DOWNLOAD + "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/powersync_${POWERSYNC_ARCH}.dll" + ${POWERSYNC_FILE_PATH} + SHOW_PROGRESS + ) endif() # ---------------------------------------------------------------------- From c53ec2178a5add6e6f2468e6a83277be8494f5a5 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 13:30:56 +0200 Subject: [PATCH 25/36] Load extension on windows --- packages/powersync/lib/src/exceptions.dart | 7 ++++ packages/powersync/lib/src/open_factory.dart | 40 ++++--------------- ....cpp => powersync_flutter_libs_plugin.cpp} | 0 3 files changed, 15 insertions(+), 32 deletions(-) rename packages/powersync_flutter_libs/windows/{powersync_flutter_libs.cpp => powersync_flutter_libs_plugin.cpp} (100%) diff --git a/packages/powersync/lib/src/exceptions.dart b/packages/powersync/lib/src/exceptions.dart index ecbe39d7..d340dd60 100644 --- a/packages/powersync/lib/src/exceptions.dart +++ b/packages/powersync/lib/src/exceptions.dart @@ -88,3 +88,10 @@ String? _stringOrFirst(Object? details) { return null; } } + +class PowersyncNotReadyException implements Exception { + /// @nodoc + PowersyncNotReadyException(this.message); + + final String message; +} diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index 1ae2a35a..cfd6987c 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -5,6 +5,7 @@ import 'dart:ffi'; import 'dart:math'; import 'package:powersync/sqlite3.dart'; +import 'package:powersync/src/exceptions.dart'; import 'package:sqlite_async/sqlite3.dart' as sqlite; import 'package:sqlite_async/sqlite_async.dart'; @@ -80,7 +81,7 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { void enableExtension() { var powersyncLib = Platform.isIOS || Platform.isMacOS ? DynamicLibrary.process() - : DynamicLibrary.open("libpowersync.so"); + : DynamicLibrary.open(Abi.current().localName); sqlite.sqlite3.ensureExtensionLoaded( SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init')); } @@ -112,51 +113,26 @@ extension on Abi { case Abi.androidArm: case Abi.androidArm64: case Abi.androidX64: - return 'libisar.so'; + return 'libpowersync.so'; case Abi.macosArm64: case Abi.macosX64: - return 'libisar.dylib'; + return 'libpowersync.dylib'; case Abi.linuxX64: - return 'libisar.so'; + return 'libpowersync.so'; case Abi.windowsArm64: case Abi.windowsX64: - return 'isar.dll'; + return 'powersync.dll'; case Abi.androidIA32: - throw PowersyncNotReadyError( + throw PowersyncNotReadyException( 'Unsupported processor architecture. X86 Android emulators are not ' 'supported. Please use an x86_64 emulator instead. All physical ' 'Android devices are supported including 32bit ARM.', ); default: - throw PowersyncNotReadyError( + throw PowersyncNotReadyException( 'Unsupported processor architecture "${Abi.current()}". ' 'Please open an issue on GitHub to request it.', ); } } } - -/// Superclass of all powersync errors. -sealed class PowersyncError extends Error { - /// Name of the error. - String get name; - - /// Error message. - String get message; - - @override - String toString() { - return '$name: $message'; - } -} - -class PowersyncNotReadyError extends PowersyncError { - /// @nodoc - PowersyncNotReadyError(this.message); - - @override - String get name => 'IsarNotReadyError'; - - @override - final String message; -} diff --git a/packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp b/packages/powersync_flutter_libs/windows/powersync_flutter_libs_plugin.cpp similarity index 100% rename from packages/powersync_flutter_libs/windows/powersync_flutter_libs.cpp rename to packages/powersync_flutter_libs/windows/powersync_flutter_libs_plugin.cpp From 4175bdcc290c5f9a9e566ed3cb23cb0928a9f976 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 14:04:16 +0200 Subject: [PATCH 26/36] Clean up readme and changelog --- packages/powersync_flutter_libs/CHANGELOG.md | 2 +- packages/powersync_flutter_libs/LICENSE | 177 ++++++++++++++++++- packages/powersync_flutter_libs/NOTICE | 1 + packages/powersync_flutter_libs/README.md | 88 --------- packages/powersync_flutter_libs/pubspec.yaml | 48 +---- 5 files changed, 181 insertions(+), 135 deletions(-) create mode 100644 packages/powersync_flutter_libs/NOTICE diff --git a/packages/powersync_flutter_libs/CHANGELOG.md b/packages/powersync_flutter_libs/CHANGELOG.md index 41cc7d81..3ee162ea 100644 --- a/packages/powersync_flutter_libs/CHANGELOG.md +++ b/packages/powersync_flutter_libs/CHANGELOG.md @@ -1,3 +1,3 @@ ## 0.0.1 -* TODO: Describe initial release. +- Load the powersync extension binaries on Android, iOS, macOS, Windows and Linux diff --git a/packages/powersync_flutter_libs/LICENSE b/packages/powersync_flutter_libs/LICENSE index ba75c69f..8318dc07 100644 --- a/packages/powersync_flutter_libs/LICENSE +++ b/packages/powersync_flutter_libs/LICENSE @@ -1 +1,176 @@ -TODO: Add your license here. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS diff --git a/packages/powersync_flutter_libs/NOTICE b/packages/powersync_flutter_libs/NOTICE new file mode 100644 index 00000000..04b7c9ff --- /dev/null +++ b/packages/powersync_flutter_libs/NOTICE @@ -0,0 +1 @@ +Copyright 2023 Journey Mobile, Inc. diff --git a/packages/powersync_flutter_libs/README.md b/packages/powersync_flutter_libs/README.md index a86c9b14..28656953 100644 --- a/packages/powersync_flutter_libs/README.md +++ b/packages/powersync_flutter_libs/README.md @@ -1,91 +1,3 @@ # powersync_flutter_libs ### Flutter binaries for [Powersync](https://pub.dev/packages/powersync) please go there for documentation. - -## Getting Started - -This project is a starting point for a Flutter -[FFI plugin](https://docs.flutter.dev/development/platform-integration/c-interop), -a specialized package that includes native code directly invoked with Dart FFI. - -## Project structure - -This template uses the following structure: - -- `src`: Contains the native source code, and a CmakeFile.txt file for building - that source code into a dynamic library. - -- `lib`: Contains the Dart code that defines the API of the plugin, and which - calls into the native code using `dart:ffi`. - -- platform folders (`android`, `ios`, `windows`, etc.): Contains the build files - for building and bundling the native code library with the platform application. - -## Building and bundling native code - -The `pubspec.yaml` specifies FFI plugins as follows: - -```yaml -plugin: - platforms: - some_platform: - ffiPlugin: true -``` - -This configuration invokes the native build for the various target platforms -and bundles the binaries in Flutter applications using these FFI plugins. - -This can be combined with dartPluginClass, such as when FFI is used for the -implementation of one platform in a federated plugin: - -```yaml -plugin: - implements: some_other_plugin - platforms: - some_platform: - dartPluginClass: SomeClass - ffiPlugin: true -``` - -A plugin can have both FFI and method channels: - -```yaml -plugin: - platforms: - some_platform: - pluginClass: SomeName - ffiPlugin: true -``` - -The native build systems that are invoked by FFI (and method channel) plugins are: - -- For Android: Gradle, which invokes the Android NDK for native builds. - - See the documentation in android/build.gradle. -- For iOS and MacOS: Xcode, via CocoaPods. - - See the documentation in ios/powersync_flutter_libs.podspec. - - See the documentation in macos/powersync_flutter_libs.podspec. -- For Linux and Windows: CMake. - - See the documentation in linux/CMakeLists.txt. - - See the documentation in windows/CMakeLists.txt. - -## Binding to native code - -To use the native code, bindings in Dart are needed. -To avoid writing these by hand, they are generated from the header file -(`src/powersync_flutter_libs.h`) by `package:ffigen`. -Regenerate the bindings by running `flutter pub run ffigen --config ffigen.yaml`. - -## Invoking native code - -Very short-running native functions can be directly invoked from any isolate. -For example, see `sum` in `lib/powersync_flutter_libs.dart`. - -Longer-running functions should be invoked on a helper isolate to avoid -dropping frames in Flutter applications. -For example, see `sumAsync` in `lib/powersync_flutter_libs.dart`. - -## Flutter help - -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/packages/powersync_flutter_libs/pubspec.yaml b/packages/powersync_flutter_libs/pubspec.yaml index 595acfa6..8bcdc740 100644 --- a/packages/powersync_flutter_libs/pubspec.yaml +++ b/packages/powersync_flutter_libs/pubspec.yaml @@ -1,7 +1,8 @@ name: powersync_flutter_libs -description: "A new Flutter FFI plugin project." +description: PowerSync core binaries for the PowerSync Flutter SDK. Needs to be included for Flutter apps. version: 0.0.1 -homepage: +repository: https://github.com/powersync-ja/powersync.dart +homepage: https://www.powersync.com/ environment: sdk: ^3.2.3 @@ -21,18 +22,6 @@ dev_dependencies: # The following section is specific to Flutter packages. flutter: - # This section identifies this Flutter project as a plugin project. - # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.) - # which should be registered in the plugin registry. This is required for - # using method channels. - # The Android 'package' specifies package in which the registered class is. - # This is required for using method channels on Android. - # The 'ffiPlugin' specifies that native code should be built and bundled. - # This is required for using `dart:ffi`. - # All these are used by the tooling to maintain consistency when - # adding or updating assets for this project. - # - # Please refer to README.md for a detailed explanation. plugin: platforms: android: @@ -46,34 +35,3 @@ flutter: pluginClass: PowersyncFlutterLibsPlugin windows: pluginClass: PowersyncFlutterLibsPlugin - - # To add assets to your plugin package, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # - # For details regarding assets in packages, see - # https://flutter.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware - - # To add custom fonts to your plugin package, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts in packages, see - # https://flutter.dev/custom-fonts/#from-packages From 6268fa950d2bf73c1ecd3e42642c925e920f44e8 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Tue, 4 Jun 2024 15:42:42 +0200 Subject: [PATCH 27/36] Remove test code --- demos/supabase-todolist/lib/powersync.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/demos/supabase-todolist/lib/powersync.dart b/demos/supabase-todolist/lib/powersync.dart index 1118bc50..aaf952b4 100644 --- a/demos/supabase-todolist/lib/powersync.dart +++ b/demos/supabase-todolist/lib/powersync.dart @@ -155,12 +155,6 @@ Future openDatabase() async { schema: schema, path: await getDatabasePath(), logger: attachedLogger); await db.initialize(); - var res = await db.get('select powersync_rs_version()'); - print(res); - - res = await db.get('select gen_random_uuid()'); - print("UUID: ${res}"); - await loadSupabase(); SupabaseConnector? currentConnector; From be3348dc2cbeb98b6ed2c6816f8aaf265ee4dc97 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 11:55:14 +0200 Subject: [PATCH 28/36] Update Abi check for current platform --- packages/powersync/lib/src/open_factory.dart | 11 +++++--- packages/powersync/test/util.dart | 29 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index cfd6987c..1600c4a9 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -81,7 +81,12 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { void enableExtension() { var powersyncLib = Platform.isIOS || Platform.isMacOS ? DynamicLibrary.process() - : DynamicLibrary.open(Abi.current().localName); + : DynamicLibrary.open(getLibraryForPlatform()); + if (Platform.environment.containsKey('FLUTTER_TEST')) { + powersyncLib = Platform.isMacOS + ? DynamicLibrary.process() + : DynamicLibrary.open('./libpowersync.so'); + } sqlite.sqlite3.ensureExtensionLoaded( SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init')); } @@ -105,10 +110,8 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { }, ); } -} -extension on Abi { - String get localName { + String getLibraryForPlatform({String? path}) { switch (Abi.current()) { case Abi.androidArm: case Abi.androidArm64: diff --git a/packages/powersync/test/util.dart b/packages/powersync/test/util.dart index 2b96f563..cbe5c941 100644 --- a/packages/powersync/test/util.dart +++ b/packages/powersync/test/util.dart @@ -37,6 +37,35 @@ class TestOpenFactory extends PowerSyncOpenFactory { }); return super.open(options); } + + @override + String getLibraryForPlatform({String? path}) { + switch (Abi.current()) { + case Abi.androidArm: + case Abi.androidArm64: + case Abi.androidX64: + return './libpowersync.so'; + case Abi.macosArm64: + case Abi.macosX64: + return './libpowersync.dylib'; + case Abi.linuxX64: + return './libpowersync.so'; + case Abi.windowsArm64: + case Abi.windowsX64: + return './powersync.dll'; + case Abi.androidIA32: + throw PowersyncNotReadyException( + 'Unsupported processor architecture. X86 Android emulators are not ' + 'supported. Please use an x86_64 emulator instead. All physical ' + 'Android devices are supported including 32bit ARM.', + ); + default: + throw PowersyncNotReadyException( + 'Unsupported processor architecture "${Abi.current()}". ' + 'Please open an issue on GitHub to request it.', + ); + } + } } Future setupPowerSync( From 2a2253774867bdfdd9c77650cb3c1f434c752ab3 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 12:53:18 +0200 Subject: [PATCH 29/36] Clean up unused files --- .../flutter/generated_plugin_registrant.cc | 4 + .../linux/flutter/generated_plugins.cmake | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + demos/supabase-anonymous-auth/pubspec.lock | 8 +- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 2 +- .../flutter/generated_plugin_registrant.cc | 4 + .../linux/flutter/generated_plugins.cmake | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + .../supabase-edge-function-auth/pubspec.lock | 8 +- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 2 +- .../flutter/generated_plugin_registrant.cc | 4 + .../linux/flutter/generated_plugins.cmake | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 + demos/supabase-simple-chat/pubspec.lock | 8 +- .../flutter/generated_plugin_registrant.cc | 3 + .../windows/flutter/generated_plugins.cmake | 2 +- demos/supabase-todolist/ios/Podfile.lock | 18 +-- demos/supabase-todolist/macos/Podfile.lock | 18 +-- demos/supabase-todolist/pubspec.lock | 6 +- demos/supabase-todolist/pubspec.yaml | 7 +- packages/powersync/lib/src/open_factory.dart | 5 - packages/powersync/pubspec.yaml | 3 +- packages/powersync_flutter_libs/README.md | 4 +- .../android/build.gradle | 21 +-- .../android/src/main/AndroidManifest.xml | 2 +- .../PowersyncFlutterLibsPlugin.java | 2 +- .../ios/Classes/PowersyncFlutterLibsPlugin.h | 4 + .../ios/Classes/PowersyncFlutterLibsPlugin.m | 7 + .../ios/Classes/powersync_flutter_libs.c | 3 - .../lib/powersync_flutter_libs.dart | 132 +----------------- ...rsync_flutter_libs_bindings_generated.dart | 70 ---------- .../Classes/PowersyncFlutterLibsPlugin.h | 4 + .../Classes/PowersyncFlutterLibsPlugin.m | 7 + .../macos/Classes/powersync_flutter_libs.c | 3 - packages/powersync_flutter_libs/pubspec.yaml | 6 +- .../powersync_flutter_libs/src/CMakeLists.txt | 17 --- .../src/powersync_flutter_libs.c | 23 --- .../src/powersync_flutter_libs.h | 30 ---- 40 files changed, 101 insertions(+), 354 deletions(-) rename packages/powersync_flutter_libs/android/src/main/java/{co => com}/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java (88%) create mode 100644 packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.h create mode 100644 packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.m delete mode 100644 packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c delete mode 100644 packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart create mode 100644 packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.h create mode 100644 packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.m delete mode 100644 packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c delete mode 100644 packages/powersync_flutter_libs/src/CMakeLists.txt delete mode 100644 packages/powersync_flutter_libs/src/powersync_flutter_libs.c delete mode 100644 packages/powersync_flutter_libs/src/powersync_flutter_libs.h diff --git a/demos/supabase-anonymous-auth/linux/flutter/generated_plugin_registrant.cc b/demos/supabase-anonymous-auth/linux/flutter/generated_plugin_registrant.cc index fc949e03..1bef6a30 100644 --- a/demos/supabase-anonymous-auth/linux/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-anonymous-auth/linux/flutter/generated_plugin_registrant.cc @@ -7,6 +7,7 @@ #include "generated_plugin_registrant.h" #include +#include #include #include @@ -14,6 +15,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) gtk_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); gtk_plugin_register_with_registrar(gtk_registrar); + g_autoptr(FlPluginRegistrar) powersync_flutter_libs_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "PowersyncFlutterLibsPlugin"); + powersync_flutter_libs_plugin_register_with_registrar(powersync_flutter_libs_registrar); g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin"); sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar); diff --git a/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake b/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake index 4fe81f05..ed77a1a0 100644 --- a/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-anonymous-auth/linux/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST gtk + powersync_flutter_libs sqlite3_flutter_libs url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-anonymous-auth/macos/Flutter/GeneratedPluginRegistrant.swift b/demos/supabase-anonymous-auth/macos/Flutter/GeneratedPluginRegistrant.swift index 7cd103ea..0c6fd7ff 100644 --- a/demos/supabase-anonymous-auth/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/demos/supabase-anonymous-auth/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,6 +7,7 @@ import Foundation import app_links import path_provider_foundation +import powersync_flutter_libs import shared_preferences_foundation import sqlite3_flutter_libs import url_launcher_macos @@ -14,6 +15,7 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PowersyncFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "PowersyncFlutterLibsPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock index 40e5a8ac..41e734f5 100644 --- a/demos/supabase-anonymous-auth/pubspec.lock +++ b/demos/supabase-anonymous-auth/pubspec.lock @@ -328,9 +328,9 @@ packages: source: path version: "1.3.1" powersync_flutter_libs: - dependency: transitive + dependency: "direct overridden" description: - path: "../../../powersync_flutter_libs" + path: "../../packages/powersync_flutter_libs" relative: true source: path version: "0.0.1" @@ -447,10 +447,10 @@ packages: dependency: transitive description: name: sqlite3_flutter_libs - sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060 + sha256: "9f89a7e7dc36eac2035808427eba1c3fbd79e59c3a22093d8dace6d36b1fe89e" url: "https://pub.dev" source: hosted - version: "0.5.20" + version: "0.5.23" sqlite_async: dependency: "direct main" description: diff --git a/demos/supabase-anonymous-auth/windows/flutter/generated_plugin_registrant.cc b/demos/supabase-anonymous-auth/windows/flutter/generated_plugin_registrant.cc index 0aed3732..691e6fc2 100644 --- a/demos/supabase-anonymous-auth/windows/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-anonymous-auth/windows/flutter/generated_plugin_registrant.cc @@ -7,12 +7,15 @@ #include "generated_plugin_registrant.h" #include +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { AppLinksPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AppLinksPluginCApi")); + PowersyncFlutterLibsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PowersyncFlutterLibsPlugin")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake b/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake index 76d60ae3..0d5e9159 100644 --- a/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-anonymous-auth/windows/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links + powersync_flutter_libs sqlite3_flutter_libs url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-edge-function-auth/linux/flutter/generated_plugin_registrant.cc b/demos/supabase-edge-function-auth/linux/flutter/generated_plugin_registrant.cc index fc949e03..1bef6a30 100644 --- a/demos/supabase-edge-function-auth/linux/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-edge-function-auth/linux/flutter/generated_plugin_registrant.cc @@ -7,6 +7,7 @@ #include "generated_plugin_registrant.h" #include +#include #include #include @@ -14,6 +15,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) gtk_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); gtk_plugin_register_with_registrar(gtk_registrar); + g_autoptr(FlPluginRegistrar) powersync_flutter_libs_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "PowersyncFlutterLibsPlugin"); + powersync_flutter_libs_plugin_register_with_registrar(powersync_flutter_libs_registrar); g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin"); sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar); diff --git a/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake b/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake index 4fe81f05..ed77a1a0 100644 --- a/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-edge-function-auth/linux/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST gtk + powersync_flutter_libs sqlite3_flutter_libs url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-edge-function-auth/macos/Flutter/GeneratedPluginRegistrant.swift b/demos/supabase-edge-function-auth/macos/Flutter/GeneratedPluginRegistrant.swift index 7cd103ea..0c6fd7ff 100644 --- a/demos/supabase-edge-function-auth/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/demos/supabase-edge-function-auth/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,6 +7,7 @@ import Foundation import app_links import path_provider_foundation +import powersync_flutter_libs import shared_preferences_foundation import sqlite3_flutter_libs import url_launcher_macos @@ -14,6 +15,7 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PowersyncFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "PowersyncFlutterLibsPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock index 40e5a8ac..41e734f5 100644 --- a/demos/supabase-edge-function-auth/pubspec.lock +++ b/demos/supabase-edge-function-auth/pubspec.lock @@ -328,9 +328,9 @@ packages: source: path version: "1.3.1" powersync_flutter_libs: - dependency: transitive + dependency: "direct overridden" description: - path: "../../../powersync_flutter_libs" + path: "../../packages/powersync_flutter_libs" relative: true source: path version: "0.0.1" @@ -447,10 +447,10 @@ packages: dependency: transitive description: name: sqlite3_flutter_libs - sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060 + sha256: "9f89a7e7dc36eac2035808427eba1c3fbd79e59c3a22093d8dace6d36b1fe89e" url: "https://pub.dev" source: hosted - version: "0.5.20" + version: "0.5.23" sqlite_async: dependency: "direct main" description: diff --git a/demos/supabase-edge-function-auth/windows/flutter/generated_plugin_registrant.cc b/demos/supabase-edge-function-auth/windows/flutter/generated_plugin_registrant.cc index 0aed3732..691e6fc2 100644 --- a/demos/supabase-edge-function-auth/windows/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-edge-function-auth/windows/flutter/generated_plugin_registrant.cc @@ -7,12 +7,15 @@ #include "generated_plugin_registrant.h" #include +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { AppLinksPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AppLinksPluginCApi")); + PowersyncFlutterLibsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PowersyncFlutterLibsPlugin")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake b/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake index 76d60ae3..0d5e9159 100644 --- a/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-edge-function-auth/windows/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links + powersync_flutter_libs sqlite3_flutter_libs url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-simple-chat/linux/flutter/generated_plugin_registrant.cc b/demos/supabase-simple-chat/linux/flutter/generated_plugin_registrant.cc index fc949e03..1bef6a30 100644 --- a/demos/supabase-simple-chat/linux/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-simple-chat/linux/flutter/generated_plugin_registrant.cc @@ -7,6 +7,7 @@ #include "generated_plugin_registrant.h" #include +#include #include #include @@ -14,6 +15,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) gtk_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin"); gtk_plugin_register_with_registrar(gtk_registrar); + g_autoptr(FlPluginRegistrar) powersync_flutter_libs_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "PowersyncFlutterLibsPlugin"); + powersync_flutter_libs_plugin_register_with_registrar(powersync_flutter_libs_registrar); g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin"); sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar); diff --git a/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake b/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake index 4fe81f05..ed77a1a0 100644 --- a/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake +++ b/demos/supabase-simple-chat/linux/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST gtk + powersync_flutter_libs sqlite3_flutter_libs url_launcher_linux ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-simple-chat/macos/Flutter/GeneratedPluginRegistrant.swift b/demos/supabase-simple-chat/macos/Flutter/GeneratedPluginRegistrant.swift index c49b609b..cc3251a8 100644 --- a/demos/supabase-simple-chat/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/demos/supabase-simple-chat/macos/Flutter/GeneratedPluginRegistrant.swift @@ -7,6 +7,7 @@ import Foundation import app_links import path_provider_foundation +import powersync_flutter_libs import shared_preferences_foundation import sign_in_with_apple import sqlite3_flutter_libs @@ -15,6 +16,7 @@ import url_launcher_macos func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) + PowersyncFlutterLibsPlugin.register(with: registry.registrar(forPlugin: "PowersyncFlutterLibsPlugin")) SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin")) SignInWithApplePlugin.register(with: registry.registrar(forPlugin: "SignInWithApplePlugin")) Sqlite3FlutterLibsPlugin.register(with: registry.registrar(forPlugin: "Sqlite3FlutterLibsPlugin")) diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock index d894c6e4..dc6bc74a 100644 --- a/demos/supabase-simple-chat/pubspec.lock +++ b/demos/supabase-simple-chat/pubspec.lock @@ -360,9 +360,9 @@ packages: source: path version: "1.3.1" powersync_flutter_libs: - dependency: transitive + dependency: "direct overridden" description: - path: "../../../powersync_flutter_libs" + path: "../../packages/powersync_flutter_libs" relative: true source: path version: "0.0.1" @@ -503,10 +503,10 @@ packages: dependency: transitive description: name: sqlite3_flutter_libs - sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060 + sha256: "9f89a7e7dc36eac2035808427eba1c3fbd79e59c3a22093d8dace6d36b1fe89e" url: "https://pub.dev" source: hosted - version: "0.5.20" + version: "0.5.23" sqlite_async: dependency: transitive description: diff --git a/demos/supabase-simple-chat/windows/flutter/generated_plugin_registrant.cc b/demos/supabase-simple-chat/windows/flutter/generated_plugin_registrant.cc index 0aed3732..691e6fc2 100644 --- a/demos/supabase-simple-chat/windows/flutter/generated_plugin_registrant.cc +++ b/demos/supabase-simple-chat/windows/flutter/generated_plugin_registrant.cc @@ -7,12 +7,15 @@ #include "generated_plugin_registrant.h" #include +#include #include #include void RegisterPlugins(flutter::PluginRegistry* registry) { AppLinksPluginCApiRegisterWithRegistrar( registry->GetRegistrarForPlugin("AppLinksPluginCApi")); + PowersyncFlutterLibsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("PowersyncFlutterLibsPlugin")); Sqlite3FlutterLibsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake b/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake index 76d60ae3..0d5e9159 100644 --- a/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake +++ b/demos/supabase-simple-chat/windows/flutter/generated_plugins.cmake @@ -4,12 +4,12 @@ list(APPEND FLUTTER_PLUGIN_LIST app_links + powersync_flutter_libs sqlite3_flutter_libs url_launcher_windows ) list(APPEND FLUTTER_FFI_PLUGIN_LIST - powersync_flutter_libs ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/demos/supabase-todolist/ios/Podfile.lock b/demos/supabase-todolist/ios/Podfile.lock index 25fb05d1..8c8a7b19 100644 --- a/demos/supabase-todolist/ios/Podfile.lock +++ b/demos/supabase-todolist/ios/Podfile.lock @@ -14,18 +14,18 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - "sqlite3 (3.45.3+1)": - - "sqlite3/common (= 3.45.3+1)" - - "sqlite3/common (3.45.3+1)" - - "sqlite3/fts5 (3.45.3+1)": + - sqlite3 (3.46.0): + - sqlite3/common (= 3.46.0) + - sqlite3/common (3.46.0) + - sqlite3/fts5 (3.46.0): - sqlite3/common - - "sqlite3/perf-threadsafe (3.45.3+1)": + - sqlite3/perf-threadsafe (3.46.0): - sqlite3/common - - "sqlite3/rtree (3.45.3+1)": + - sqlite3/rtree (3.46.0): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - Flutter - - "sqlite3 (~> 3.45.3+1)" + - sqlite3 (~> 3.46.0) - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -73,8 +73,8 @@ SPEC CHECKSUMS: powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd powersync_flutter_libs: 5d6b132a398de442c0853a8b14bfbb62cd4ff5a1 shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a - sqlite3_flutter_libs: 9bfe005308998aeca155330bbc2ea6dddf834a3b + sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d + sqlite3_flutter_libs: 0d611efdf6d1c9297d5ab03dab21b75aeebdae31 url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586 PODFILE CHECKSUM: f7b3cb7384a2d5da4b22b090e1f632de7f377987 diff --git a/demos/supabase-todolist/macos/Podfile.lock b/demos/supabase-todolist/macos/Podfile.lock index 817c60ef..55e41f1b 100644 --- a/demos/supabase-todolist/macos/Podfile.lock +++ b/demos/supabase-todolist/macos/Podfile.lock @@ -12,18 +12,18 @@ PODS: - shared_preferences_foundation (0.0.1): - Flutter - FlutterMacOS - - "sqlite3 (3.45.3+1)": - - "sqlite3/common (= 3.45.3+1)" - - "sqlite3/common (3.45.3+1)" - - "sqlite3/fts5 (3.45.3+1)": + - sqlite3 (3.46.0): + - sqlite3/common (= 3.46.0) + - sqlite3/common (3.46.0) + - sqlite3/fts5 (3.46.0): - sqlite3/common - - "sqlite3/perf-threadsafe (3.45.3+1)": + - sqlite3/perf-threadsafe (3.46.0): - sqlite3/common - - "sqlite3/rtree (3.45.3+1)": + - sqlite3/rtree (3.46.0): - sqlite3/common - sqlite3_flutter_libs (0.0.1): - FlutterMacOS - - "sqlite3 (~> 3.45.3+1)" + - sqlite3 (~> 3.46.0) - sqlite3/fts5 - sqlite3/perf-threadsafe - sqlite3/rtree @@ -67,8 +67,8 @@ SPEC CHECKSUMS: powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd powersync_flutter_libs: 1eb1c6790a72afe08e68d4cc489d71ab61da32ee shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695 - sqlite3: 02d1f07eaaa01f80a1c16b4b31dfcbb3345ee01a - sqlite3_flutter_libs: 8d204ef443cf0d5c1c8b058044eab53f3943a9c5 + sqlite3: 154b084339ede06960a5b3c8160066adc9176b7d + sqlite3_flutter_libs: 1be4459672f8168ded2d8667599b8e3ca5e72b83 url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95 PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367 diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock index 04208bb1..ae898801 100644 --- a/demos/supabase-todolist/pubspec.lock +++ b/demos/supabase-todolist/pubspec.lock @@ -415,7 +415,7 @@ packages: source: path version: "0.4.1" powersync_flutter_libs: - dependency: transitive + dependency: "direct overridden" description: path: "../../packages/powersync_flutter_libs" relative: true @@ -534,10 +534,10 @@ packages: dependency: transitive description: name: sqlite3_flutter_libs - sha256: fb2a106a2ea6042fe57de2c47074cc31539a941819c91e105b864744605da3f5 + sha256: "9f89a7e7dc36eac2035808427eba1c3fbd79e59c3a22093d8dace6d36b1fe89e" url: "https://pub.dev" source: hosted - version: "0.5.21" + version: "0.5.23" sqlite_async: dependency: "direct main" description: diff --git a/demos/supabase-todolist/pubspec.yaml b/demos/supabase-todolist/pubspec.yaml index 7f1c95d7..1fb80452 100644 --- a/demos/supabase-todolist/pubspec.yaml +++ b/demos/supabase-todolist/pubspec.yaml @@ -10,11 +10,8 @@ environment: dependencies: flutter: sdk: flutter - powersync_attachments_helper: - path: ../../packages/powersync_attachments_helper - - powersync: - path: ../../packages/powersync + powersync_attachments_helper: ^0.1.4 + powersync: ^1.2.0 path_provider: ^2.1.1 supabase_flutter: ^2.0.1 path: ^1.8.3 diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index 1600c4a9..62f644ce 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -82,11 +82,6 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { var powersyncLib = Platform.isIOS || Platform.isMacOS ? DynamicLibrary.process() : DynamicLibrary.open(getLibraryForPlatform()); - if (Platform.environment.containsKey('FLUTTER_TEST')) { - powersyncLib = Platform.isMacOS - ? DynamicLibrary.process() - : DynamicLibrary.open('./libpowersync.so'); - } sqlite.sqlite3.ensureExtensionLoaded( SqliteExtension.inLibrary(powersyncLib, 'sqlite3_powersync_init')); } diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index 0202a9d4..d46816c7 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -12,8 +12,7 @@ dependencies: sqlite_async: ^0.6.1 sqlite3_flutter_libs: ^0.5.23 - powersync_flutter_libs: - path: ../powersync_flutter_libs + powersync_flutter_libs: ^0.0.1 http: ^1.1.0 uuid: ^4.2.0 async: ^2.10.0 diff --git a/packages/powersync_flutter_libs/README.md b/packages/powersync_flutter_libs/README.md index 28656953..19eba4ac 100644 --- a/packages/powersync_flutter_libs/README.md +++ b/packages/powersync_flutter_libs/README.md @@ -1,3 +1,5 @@ # powersync_flutter_libs -### Flutter binaries for [Powersync](https://pub.dev/packages/powersync) please go there for documentation. +### Flutter binaries for [PowerSync](https://pub.dev/packages/powersync) please go there for documentation. + +#### The core PowerSync binaries are built and released in [powersync-sqlite-core](https://github.com/powersync-ja/powersync-sqlite-core). diff --git a/packages/powersync_flutter_libs/android/build.gradle b/packages/powersync_flutter_libs/android/build.gradle index 2b039c5d..0d77be07 100644 --- a/packages/powersync_flutter_libs/android/build.gradle +++ b/packages/powersync_flutter_libs/android/build.gradle @@ -1,6 +1,6 @@ // The Android Gradle Plugin builds the native code with the Android NDK. -group 'co.powersync.powersync_flutter_libs' +group 'com.powersync.powersync_flutter_libs' version '1.0' buildscript { @@ -26,12 +26,12 @@ apply plugin: 'com.android.library' android { if (project.android.hasProperty("namespace")) { - namespace 'co.powersync.powersync_flutter_libs' + namespace 'com.powersync.powersync_flutter_libs' } // Bumping the plugin compileSdk version requires all clients of this plugin // to bump the version in their app. - compileSdk 34 + compileSdk 32 // Use the NDK version // declared in /android/app/build.gradle file of the Flutter project. @@ -39,21 +39,6 @@ android { // (e.g. ndkVersion "23.1.7779620") ndkVersion android.ndkVersion - // Invoke the shared CMake build with the Android Gradle Plugin. - externalNativeBuild { - cmake { - path "../src/CMakeLists.txt" - - // The default CMake version for the Android Gradle Plugin is 3.10.2. - // https://developer.android.com/studio/projects/install-ndk#vanilla_cmake - // - // The Flutter tooling requires that developers have CMake 3.10 or later - // installed. You should not increase this version, as doing so will cause - // the plugin to fail to compile for some customers of the plugin. - // version "3.10.2" - } - } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml index f0e85575..804782c4 100644 --- a/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml +++ b/packages/powersync_flutter_libs/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ + package="com.powersync.powersync_flutter_libs"> diff --git a/packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java b/packages/powersync_flutter_libs/android/src/main/java/com/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java similarity index 88% rename from packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java rename to packages/powersync_flutter_libs/android/src/main/java/com/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java index b079b2d6..54d7d425 100644 --- a/packages/powersync_flutter_libs/android/src/main/java/co/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java +++ b/packages/powersync_flutter_libs/android/src/main/java/com/powersync/powersync_flutter_libs/PowersyncFlutterLibsPlugin.java @@ -1,4 +1,4 @@ -package co.powersync.powersync_flutter_libs; +package com.powersync.powersync_flutter_libs; import androidx.annotation.NonNull; diff --git a/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.h b/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.h new file mode 100644 index 00000000..0ddfb7f7 --- /dev/null +++ b/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.h @@ -0,0 +1,4 @@ +#import + +@interface PowersyncFlutterLibsPlugin : NSObject +@end diff --git a/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.m b/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.m new file mode 100644 index 00000000..74d2e35c --- /dev/null +++ b/packages/powersync_flutter_libs/ios/Classes/PowersyncFlutterLibsPlugin.m @@ -0,0 +1,7 @@ +#import "PowersyncFlutterLibsPlugin.h" + +@implementation PowersyncFlutterLibsPlugin ++ (void)registerWithRegistrar:(NSObject*)registrar { + +} +@end diff --git a/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c b/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c deleted file mode 100644 index 5f36bb4a..00000000 --- a/packages/powersync_flutter_libs/ios/Classes/powersync_flutter_libs.c +++ /dev/null @@ -1,3 +0,0 @@ -// Relative import to be able to reuse the C sources. -// See the comment in ../{projectName}}.podspec for more information. -#include "../../src/powersync_flutter_libs.c" diff --git a/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart b/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart index 4eb2bcb2..61dab5a0 100644 --- a/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart +++ b/packages/powersync_flutter_libs/lib/powersync_flutter_libs.dart @@ -1,131 +1 @@ - -import 'dart:async'; -import 'dart:ffi'; -import 'dart:io'; -import 'dart:isolate'; - -import 'powersync_flutter_libs_bindings_generated.dart'; - -/// A very short-lived native function. -/// -/// For very short-lived functions, it is fine to call them on the main isolate. -/// They will block the Dart execution while running the native function, so -/// only do this for native functions which are guaranteed to be short-lived. -int sum(int a, int b) => _bindings.sum(a, b); - -/// A longer lived native function, which occupies the thread calling it. -/// -/// Do not call these kind of native functions in the main isolate. They will -/// block Dart execution. This will cause dropped frames in Flutter applications. -/// Instead, call these native functions on a separate isolate. -/// -/// Modify this to suit your own use case. Example use cases: -/// -/// 1. Reuse a single isolate for various different kinds of requests. -/// 2. Use multiple helper isolates for parallel execution. -Future sumAsync(int a, int b) async { - final SendPort helperIsolateSendPort = await _helperIsolateSendPort; - final int requestId = _nextSumRequestId++; - final _SumRequest request = _SumRequest(requestId, a, b); - final Completer completer = Completer(); - _sumRequests[requestId] = completer; - helperIsolateSendPort.send(request); - return completer.future; -} - -const String _libName = 'powersync_flutter_libs'; - -/// The dynamic library in which the symbols for [PowersyncFlutterLibsBindings] can be found. -final DynamicLibrary _dylib = () { - if (Platform.isMacOS || Platform.isIOS) { - return DynamicLibrary.open('$_libName.framework/$_libName'); - } - if (Platform.isAndroid || Platform.isLinux) { - return DynamicLibrary.open('lib$_libName.so'); - } - if (Platform.isWindows) { - return DynamicLibrary.open('$_libName.dll'); - } - throw UnsupportedError('Unknown platform: ${Platform.operatingSystem}'); -}(); - -/// The bindings to the native functions in [_dylib]. -final PowersyncFlutterLibsBindings _bindings = PowersyncFlutterLibsBindings(_dylib); - - -/// A request to compute `sum`. -/// -/// Typically sent from one isolate to another. -class _SumRequest { - final int id; - final int a; - final int b; - - const _SumRequest(this.id, this.a, this.b); -} - -/// A response with the result of `sum`. -/// -/// Typically sent from one isolate to another. -class _SumResponse { - final int id; - final int result; - - const _SumResponse(this.id, this.result); -} - -/// Counter to identify [_SumRequest]s and [_SumResponse]s. -int _nextSumRequestId = 0; - -/// Mapping from [_SumRequest] `id`s to the completers corresponding to the correct future of the pending request. -final Map> _sumRequests = >{}; - -/// The SendPort belonging to the helper isolate. -Future _helperIsolateSendPort = () async { - // The helper isolate is going to send us back a SendPort, which we want to - // wait for. - final Completer completer = Completer(); - - // Receive port on the main isolate to receive messages from the helper. - // We receive two types of messages: - // 1. A port to send messages on. - // 2. Responses to requests we sent. - final ReceivePort receivePort = ReceivePort() - ..listen((dynamic data) { - if (data is SendPort) { - // The helper isolate sent us the port on which we can sent it requests. - completer.complete(data); - return; - } - if (data is _SumResponse) { - // The helper isolate sent us a response to a request we sent. - final Completer completer = _sumRequests[data.id]!; - _sumRequests.remove(data.id); - completer.complete(data.result); - return; - } - throw UnsupportedError('Unsupported message type: ${data.runtimeType}'); - }); - - // Start the helper isolate. - await Isolate.spawn((SendPort sendPort) async { - final ReceivePort helperReceivePort = ReceivePort() - ..listen((dynamic data) { - // On the helper isolate listen to requests and respond to them. - if (data is _SumRequest) { - final int result = _bindings.sum_long_running(data.a, data.b); - final _SumResponse response = _SumResponse(data.id, result); - sendPort.send(response); - return; - } - throw UnsupportedError('Unsupported message type: ${data.runtimeType}'); - }); - - // Send the port to the main isolate on which we can receive requests. - sendPort.send(helperReceivePort.sendPort); - }, receivePort.sendPort); - - // Wait until the helper isolate has sent us back the SendPort on which we - // can start sending requests. - return completer.future; -}(); +library powersync_flutter_libs; diff --git a/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart b/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart deleted file mode 100644 index 2399eec9..00000000 --- a/packages/powersync_flutter_libs/lib/powersync_flutter_libs_bindings_generated.dart +++ /dev/null @@ -1,70 +0,0 @@ -// ignore_for_file: always_specify_types -// ignore_for_file: camel_case_types -// ignore_for_file: non_constant_identifier_names - -// AUTO GENERATED FILE, DO NOT EDIT. -// -// Generated by `package:ffigen`. -// ignore_for_file: type=lint -import 'dart:ffi' as ffi; - -/// Bindings for `src/powersync_flutter_libs.h`. -/// -/// Regenerate bindings with `flutter pub run ffigen --config ffigen.yaml`. -/// -class PowersyncFlutterLibsBindings { - /// Holds the symbol lookup function. - final ffi.Pointer Function(String symbolName) - _lookup; - - /// The symbols are looked up in [dynamicLibrary]. - PowersyncFlutterLibsBindings(ffi.DynamicLibrary dynamicLibrary) - : _lookup = dynamicLibrary.lookup; - - /// The symbols are looked up with [lookup]. - PowersyncFlutterLibsBindings.fromLookup( - ffi.Pointer Function(String symbolName) - lookup) - : _lookup = lookup; - - /// A very short-lived native function. - /// - /// For very short-lived functions, it is fine to call them on the main isolate. - /// They will block the Dart execution while running the native function, so - /// only do this for native functions which are guaranteed to be short-lived. - int sum( - int a, - int b, - ) { - return _sum( - a, - b, - ); - } - - late final _sumPtr = - _lookup>( - 'sum'); - late final _sum = _sumPtr.asFunction(); - - /// A longer lived native function, which occupies the thread calling it. - /// - /// Do not call these kind of native functions in the main isolate. They will - /// block Dart execution. This will cause dropped frames in Flutter applications. - /// Instead, call these native functions on a separate isolate. - int sum_long_running( - int a, - int b, - ) { - return _sum_long_running( - a, - b, - ); - } - - late final _sum_long_runningPtr = - _lookup>( - 'sum_long_running'); - late final _sum_long_running = - _sum_long_runningPtr.asFunction(); -} diff --git a/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.h b/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.h new file mode 100644 index 00000000..9725b1d6 --- /dev/null +++ b/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.h @@ -0,0 +1,4 @@ +#import + +@interface PowersyncFlutterLibsPlugin : NSObject +@end diff --git a/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.m b/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.m new file mode 100644 index 00000000..74d2e35c --- /dev/null +++ b/packages/powersync_flutter_libs/macos/Classes/PowersyncFlutterLibsPlugin.m @@ -0,0 +1,7 @@ +#import "PowersyncFlutterLibsPlugin.h" + +@implementation PowersyncFlutterLibsPlugin ++ (void)registerWithRegistrar:(NSObject*)registrar { + +} +@end diff --git a/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c b/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c deleted file mode 100644 index 5f36bb4a..00000000 --- a/packages/powersync_flutter_libs/macos/Classes/powersync_flutter_libs.c +++ /dev/null @@ -1,3 +0,0 @@ -// Relative import to be able to reuse the C sources. -// See the comment in ../{projectName}}.podspec for more information. -#include "../../src/powersync_flutter_libs.c" diff --git a/packages/powersync_flutter_libs/pubspec.yaml b/packages/powersync_flutter_libs/pubspec.yaml index 8bcdc740..b521e6b3 100644 --- a/packages/powersync_flutter_libs/pubspec.yaml +++ b/packages/powersync_flutter_libs/pubspec.yaml @@ -17,15 +17,11 @@ dev_dependencies: sdk: flutter flutter_lints: ^3.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. flutter: plugin: platforms: android: - package: co.powersync.powersync_flutter_libs + package: com.powersync.powersync_flutter_libs pluginClass: PowersyncFlutterLibsPlugin ios: pluginClass: PowersyncFlutterLibsPlugin diff --git a/packages/powersync_flutter_libs/src/CMakeLists.txt b/packages/powersync_flutter_libs/src/CMakeLists.txt deleted file mode 100644 index 6b641189..00000000 --- a/packages/powersync_flutter_libs/src/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# The Flutter tooling requires that developers have CMake 3.10 or later -# installed. You should not increase this version, as doing so will cause -# the plugin to fail to compile for some customers of the plugin. -cmake_minimum_required(VERSION 3.10) - -project(powersync_flutter_libs_library VERSION 0.0.1 LANGUAGES C) - -add_library(powersync_flutter_libs SHARED - "powersync_flutter_libs.c" -) - -set_target_properties(powersync_flutter_libs PROPERTIES - PUBLIC_HEADER powersync_flutter_libs.h - OUTPUT_NAME "powersync_flutter_libs" -) - -target_compile_definitions(powersync_flutter_libs PUBLIC DART_SHARED_LIB) diff --git a/packages/powersync_flutter_libs/src/powersync_flutter_libs.c b/packages/powersync_flutter_libs/src/powersync_flutter_libs.c deleted file mode 100644 index 9399dee0..00000000 --- a/packages/powersync_flutter_libs/src/powersync_flutter_libs.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "powersync_flutter_libs.h" - -// A very short-lived native function. -// -// For very short-lived functions, it is fine to call them on the main isolate. -// They will block the Dart execution while running the native function, so -// only do this for native functions which are guaranteed to be short-lived. -FFI_PLUGIN_EXPORT intptr_t sum(intptr_t a, intptr_t b) { return a + b; } - -// A longer-lived native function, which occupies the thread calling it. -// -// Do not call these kind of native functions in the main isolate. They will -// block Dart execution. This will cause dropped frames in Flutter applications. -// Instead, call these native functions on a separate isolate. -FFI_PLUGIN_EXPORT intptr_t sum_long_running(intptr_t a, intptr_t b) { - // Simulate work. -#if _WIN32 - Sleep(5000); -#else - usleep(5000 * 1000); -#endif - return a + b; -} diff --git a/packages/powersync_flutter_libs/src/powersync_flutter_libs.h b/packages/powersync_flutter_libs/src/powersync_flutter_libs.h deleted file mode 100644 index 084c6422..00000000 --- a/packages/powersync_flutter_libs/src/powersync_flutter_libs.h +++ /dev/null @@ -1,30 +0,0 @@ -#include -#include -#include - -#if _WIN32 -#include -#else -#include -#include -#endif - -#if _WIN32 -#define FFI_PLUGIN_EXPORT __declspec(dllexport) -#else -#define FFI_PLUGIN_EXPORT -#endif - -// A very short-lived native function. -// -// For very short-lived functions, it is fine to call them on the main isolate. -// They will block the Dart execution while running the native function, so -// only do this for native functions which are guaranteed to be short-lived. -FFI_PLUGIN_EXPORT intptr_t sum(intptr_t a, intptr_t b); - -// A longer lived native function, which occupies the thread calling it. -// -// Do not call these kind of native functions in the main isolate. They will -// block Dart execution. This will cause dropped frames in Flutter applications. -// Instead, call these native functions on a separate isolate. -FFI_PLUGIN_EXPORT intptr_t sum_long_running(intptr_t a, intptr_t b); From 8111db7406c71d6ed4966948b99efcf999bf31f9 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 14:22:35 +0200 Subject: [PATCH 30/36] Update path dependencies --- packages/powersync_attachments_helper/pubspec.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/powersync_attachments_helper/pubspec.yaml b/packages/powersync_attachments_helper/pubspec.yaml index a1954bb6..76f8c86d 100644 --- a/packages/powersync_attachments_helper/pubspec.yaml +++ b/packages/powersync_attachments_helper/pubspec.yaml @@ -10,8 +10,7 @@ dependencies: flutter: sdk: flutter - powersync: - path: ../powersync + powersync: ^1.2.2 logging: ^1.2.0 sqlite_async: ^0.6.1 path_provider: ^2.0.13 From 43ca9cd6647be1448026814226e4fd09bf27a380 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 15:04:46 +0200 Subject: [PATCH 31/36] Test downloading powersync binary for tests --- .github/workflows/packages.yml | 10 ++++++++++ packages/powersync/lib/src/open_factory.dart | 2 ++ packages/powersync/test/util.dart | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index b7cd7fc7..1dae94cb 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -48,5 +48,15 @@ jobs: run: flutter pub global activate melos - name: Install dependencies run: melos bootstrap + - name: Download powersync binary + uses: dsaltares/fetch-gh-release-asset@master + with: + repo: 'powersync-ja/powersync-sqlite-core' + version: 'tags/v0.1.16' + file: 'libpowersync_x64.so' + target: 'libs/libpowersync.so' + token: ${{ secrets.GITHUB_TOKEN }} + - name: Copy powersync binary + run: cp libs/libpowersync.so packages/powersync/libpowersync.so - name: Run tests run: melos test diff --git a/packages/powersync/lib/src/open_factory.dart b/packages/powersync/lib/src/open_factory.dart index 62f644ce..a9165e50 100644 --- a/packages/powersync/lib/src/open_factory.dart +++ b/packages/powersync/lib/src/open_factory.dart @@ -106,6 +106,8 @@ class PowerSyncOpenFactory extends DefaultSqliteOpenFactory { ); } + /// Returns the library name for the current platform. + /// [path] is optional and is used when the library is not in the default location. String getLibraryForPlatform({String? path}) { switch (Abi.current()) { case Abi.androidArm: diff --git a/packages/powersync/test/util.dart b/packages/powersync/test/util.dart index cbe5c941..ff16b6e6 100644 --- a/packages/powersync/test/util.dart +++ b/packages/powersync/test/util.dart @@ -39,20 +39,20 @@ class TestOpenFactory extends PowerSyncOpenFactory { } @override - String getLibraryForPlatform({String? path}) { + String getLibraryForPlatform({String? path = "."}) { switch (Abi.current()) { case Abi.androidArm: case Abi.androidArm64: case Abi.androidX64: - return './libpowersync.so'; + return '$path/libpowersync.so'; case Abi.macosArm64: case Abi.macosX64: - return './libpowersync.dylib'; + return '$path/libpowersync.dylib'; case Abi.linuxX64: - return './libpowersync.so'; + return '$path/libpowersync.so'; case Abi.windowsArm64: case Abi.windowsX64: - return './powersync.dll'; + return '$path/powersync.dll'; case Abi.androidIA32: throw PowersyncNotReadyException( 'Unsupported processor architecture. X86 Android emulators are not ' From f89e51bd2126ef0bb30006ee8338aaa4bf66be14 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 15:17:33 +0200 Subject: [PATCH 32/36] Fix download for linux binary --- .github/workflows/packages.yml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index 1dae94cb..6526b23f 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -1,8 +1,8 @@ name: Packages check concurrency: - group: packages-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + group: packages-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true on: push: @@ -17,8 +17,8 @@ jobs: - name: Install Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.x' - channel: 'stable' + flutter-version: "3.x" + channel: "stable" - name: Install Melos run: flutter pub global activate melos @@ -42,21 +42,16 @@ jobs: - name: Install Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.x' - channel: 'stable' + flutter-version: "3.x" + channel: "stable" - name: Install melos run: flutter pub global activate melos - name: Install dependencies run: melos bootstrap - name: Download powersync binary - uses: dsaltares/fetch-gh-release-asset@master - with: - repo: 'powersync-ja/powersync-sqlite-core' - version: 'tags/v0.1.16' - file: 'libpowersync_x64.so' - target: 'libs/libpowersync.so' - token: ${{ secrets.GITHUB_TOKEN }} - - name: Copy powersync binary - run: cp libs/libpowersync.so packages/powersync/libpowersync.so + run: | + github="https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v0.1.6" + + curl "${github}/libpowersync_x64.so" -o packages/powersync/libpowersync.so --create-dirs -L -f - name: Run tests run: melos test From 9d513399f558e8d8b95362d7764ba0fb7a28afd4 Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 15:20:34 +0200 Subject: [PATCH 33/36] Add binary download for demos workflow --- .github/workflows/demos.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/demos.yml b/.github/workflows/demos.yml index 829e0908..f5c41cf0 100644 --- a/.github/workflows/demos.yml +++ b/.github/workflows/demos.yml @@ -1,8 +1,8 @@ name: Demos checks concurrency: - group: demos-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true + group: demos-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true on: push: @@ -17,8 +17,8 @@ jobs: - name: Install Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.x' - channel: 'stable' + flutter-version: "3.x" + channel: "stable" - name: Install Melos run: flutter pub global activate melos @@ -38,11 +38,16 @@ jobs: - name: Install Flutter uses: subosito/flutter-action@v2 with: - flutter-version: '3.x' - channel: 'stable' + flutter-version: "3.x" + channel: "stable" - name: Install melos run: flutter pub global activate melos - name: Install dependencies run: melos bootstrap + - name: Download powersync binary + run: | + github="https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v0.1.6" + + curl "${github}/libpowersync_x64.so" -o packages/powersync/libpowersync.so --create-dirs -L -f - name: Run tests run: melos test From 7813689e9c289ee4afeb73a9bbca6fc426ac161a Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Wed, 5 Jun 2024 15:53:44 +0200 Subject: [PATCH 34/36] Download latest binaries --- packages/powersync_flutter_libs/linux/CMakeLists.txt | 11 ++++------- .../powersync_flutter_libs/windows/CMakeLists.txt | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/powersync_flutter_libs/linux/CMakeLists.txt b/packages/powersync_flutter_libs/linux/CMakeLists.txt index a6e23d3f..b499b5ee 100644 --- a/packages/powersync_flutter_libs/linux/CMakeLists.txt +++ b/packages/powersync_flutter_libs/linux/CMakeLists.txt @@ -36,13 +36,10 @@ endif () set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libpowersync.so") -if(NOT EXISTS ${POWERSYNC_FILE_PATH}) - file(DOWNLOAD - "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/libpowersync_${POWERSYNC_ARCH}.so" - ${POWERSYNC_FILE_PATH} - SHOW_PROGRESS - ) -endif() +file(DOWNLOAD + "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/libpowersync_${POWERSYNC_ARCH}.so" + ${POWERSYNC_FILE_PATH} +) # ---------------------------------------------------------------------- diff --git a/packages/powersync_flutter_libs/windows/CMakeLists.txt b/packages/powersync_flutter_libs/windows/CMakeLists.txt index 5400f5e2..e8e1fad6 100644 --- a/packages/powersync_flutter_libs/windows/CMakeLists.txt +++ b/packages/powersync_flutter_libs/windows/CMakeLists.txt @@ -37,13 +37,10 @@ endif () set(POWERSYNC_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/powersync.dll") -if(NOT EXISTS ${POWERSYNC_FILE_PATH}) - file(DOWNLOAD - "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/powersync_${POWERSYNC_ARCH}.dll" - ${POWERSYNC_FILE_PATH} - SHOW_PROGRESS - ) -endif() +file(DOWNLOAD + "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v${POWERSYNC_VERSION}/powersync_${POWERSYNC_ARCH}.dll" + ${POWERSYNC_FILE_PATH} +) # ---------------------------------------------------------------------- From 1469c009d02d5c7b914bf4be8cdf3304e0bd96fc Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 6 Jun 2024 11:16:28 +0200 Subject: [PATCH 35/36] Bump version of powersync --- demos/supabase-anonymous-auth/pubspec.lock | 2 +- demos/supabase-edge-function-auth/pubspec.lock | 2 +- demos/supabase-simple-chat/pubspec.lock | 2 +- demos/supabase-todolist/pubspec.lock | 2 +- packages/powersync/CHANGELOG.md | 4 ++++ packages/powersync/pubspec.yaml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock index 41e734f5..3ab9f31f 100644 --- a/demos/supabase-anonymous-auth/pubspec.lock +++ b/demos/supabase-anonymous-auth/pubspec.lock @@ -326,7 +326,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.1" + version: "1.3.2" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock index 41e734f5..3ab9f31f 100644 --- a/demos/supabase-edge-function-auth/pubspec.lock +++ b/demos/supabase-edge-function-auth/pubspec.lock @@ -326,7 +326,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.1" + version: "1.3.2" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock index dc6bc74a..f7fdce77 100644 --- a/demos/supabase-simple-chat/pubspec.lock +++ b/demos/supabase-simple-chat/pubspec.lock @@ -358,7 +358,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.1" + version: "1.3.2" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock index ae898801..548f197d 100644 --- a/demos/supabase-todolist/pubspec.lock +++ b/demos/supabase-todolist/pubspec.lock @@ -406,7 +406,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.1" + version: "1.3.2" powersync_attachments_helper: dependency: "direct main" description: diff --git a/packages/powersync/CHANGELOG.md b/packages/powersync/CHANGELOG.md index 2a36213d..e0cde496 100644 --- a/packages/powersync/CHANGELOG.md +++ b/packages/powersync/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.2 + +- Introduces the use of the powersync-sqlite-core loadable extension. + ## 1.3.1 - Fix "Checksum mismatch" issue when calling `PowerSyncDatabase.connect` multiple times. diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index d46816c7..a6edda5d 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -1,5 +1,5 @@ name: powersync -version: 1.3.1 +version: 1.3.2 homepage: https://powersync.com repository: https://github.com/powersync-ja/powersync.dart description: PowerSync Flutter SDK - keep PostgreSQL databases in sync with on-device SQLite databases. From c9ec617cbf1c6b84340726a331bd22be1d09953b Mon Sep 17 00:00:00 2001 From: Mugi Khan Date: Thu, 6 Jun 2024 11:51:41 +0200 Subject: [PATCH 36/36] Bump minor version --- demos/supabase-anonymous-auth/pubspec.lock | 2 +- demos/supabase-edge-function-auth/pubspec.lock | 2 +- demos/supabase-simple-chat/pubspec.lock | 2 +- demos/supabase-todolist/pubspec.lock | 2 +- packages/powersync/CHANGELOG.md | 5 +++-- packages/powersync/pubspec.yaml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/demos/supabase-anonymous-auth/pubspec.lock b/demos/supabase-anonymous-auth/pubspec.lock index 3ab9f31f..f0634da0 100644 --- a/demos/supabase-anonymous-auth/pubspec.lock +++ b/demos/supabase-anonymous-auth/pubspec.lock @@ -326,7 +326,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.2" + version: "1.4.0" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-edge-function-auth/pubspec.lock b/demos/supabase-edge-function-auth/pubspec.lock index 3ab9f31f..f0634da0 100644 --- a/demos/supabase-edge-function-auth/pubspec.lock +++ b/demos/supabase-edge-function-auth/pubspec.lock @@ -326,7 +326,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.2" + version: "1.4.0" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-simple-chat/pubspec.lock b/demos/supabase-simple-chat/pubspec.lock index f7fdce77..1fd789f7 100644 --- a/demos/supabase-simple-chat/pubspec.lock +++ b/demos/supabase-simple-chat/pubspec.lock @@ -358,7 +358,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.2" + version: "1.4.0" powersync_flutter_libs: dependency: "direct overridden" description: diff --git a/demos/supabase-todolist/pubspec.lock b/demos/supabase-todolist/pubspec.lock index 548f197d..71771ef6 100644 --- a/demos/supabase-todolist/pubspec.lock +++ b/demos/supabase-todolist/pubspec.lock @@ -406,7 +406,7 @@ packages: path: "../../packages/powersync" relative: true source: path - version: "1.3.2" + version: "1.4.0" powersync_attachments_helper: dependency: "direct main" description: diff --git a/packages/powersync/CHANGELOG.md b/packages/powersync/CHANGELOG.md index e0cde496..2f81326f 100644 --- a/packages/powersync/CHANGELOG.md +++ b/packages/powersync/CHANGELOG.md @@ -1,6 +1,7 @@ -## 1.3.2 +## 1.4.0 -- Introduces the use of the powersync-sqlite-core loadable extension. +- Introduces the use of the `powersync-sqlite-core` native extension. +- Added a new package dependency on `powersync_flutter_libs` for loading the extension. ## 1.3.1 diff --git a/packages/powersync/pubspec.yaml b/packages/powersync/pubspec.yaml index a6edda5d..d61f1518 100644 --- a/packages/powersync/pubspec.yaml +++ b/packages/powersync/pubspec.yaml @@ -1,5 +1,5 @@ name: powersync -version: 1.3.2 +version: 1.4.0 homepage: https://powersync.com repository: https://github.com/powersync-ja/powersync.dart description: PowerSync Flutter SDK - keep PostgreSQL databases in sync with on-device SQLite databases.