@_nazmiforreal/flutter-ota 0.1.12 → 0.1.14

package/dart-src/plugins/postgres/lib/src/postgres_database.dart

@@ -33,7 +33,8 @@ import 'postgres_types.dart';
 DatabasePlugin Function() Function(
   PostgresConfig config, [
   DatabasePluginHooks? hooks,
-]) postgresDatabase = createDatabasePlugin<PostgresConfig>(
+])
+postgresDatabase = createDatabasePlugin<PostgresConfig>(
   name: 'postgresDatabase',
   factory: (config) {
     final client = config.clientFactory != null
@@ -95,18 +96,10 @@ DatabasePlugin Function() Function(
     add('enabled = ?', where.enabled);
   }
   if (where.fingerprintHash != null) {
-    if (where.fingerprintHash == null) {
-      conditions.add('fingerprint_hash IS NULL');
-    } else {
-      add('fingerprint_hash = ?', where.fingerprintHash);
-    }
+    add('fingerprint_hash = ?', where.fingerprintHash);
   }
   if (where.targetAppVersion != null) {
-    if (where.targetAppVersion == null) {
-      conditions.add('target_app_version IS NULL');
-    } else {
-      add('target_app_version = ?', where.targetAppVersion);
-    }
+    add('target_app_version = ?', where.targetAppVersion);
   }
   if (where.targetAppVersionIn != null) {
     add('target_app_version = ANY(?)', where.targetAppVersionIn);
@@ -134,12 +127,10 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
   final PostgresClientLike client;
   final Future<Map<String, List<PostgresBundlePatchRow>>> Function(
     List<String> bundleIds,
-  ) fetchPatchMap;
+  )
+  fetchPatchMap;
 
-  _PostgresDatabasePlugin({
-    required this.client,
-    required this.fetchPatchMap,
-  });
+  _PostgresDatabasePlugin({required this.client, required this.fetchPatchMap});
 
   @override
   bool get supportsCursorPagination => false;
@@ -151,17 +142,16 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
   @override
   Future<Bundle?> getBundleById(String bundleId) async {
     final results = await Future.wait([
-      client.execute(
-        'SELECT * FROM bundles WHERE id = @p0',
-        {'p0': bundleId},
-      ),
+      client.execute('SELECT * FROM bundles WHERE id = @p0', {'p0': bundleId}),
       fetchPatchMap([bundleId]),
     ]);
 
     final data = results[0] as List<Map<String, dynamic>>;
     if (data.isEmpty) return null;
     final row = PostgresBundleRow.fromJson(data.first);
-    final patches = (results[1] as Map<String, List<PostgresBundlePatchRow>>)[bundleId] ?? [];
+    final patches =
+        (results[1] as Map<String, List<PostgresBundlePatchRow>>)[bundleId] ??
+        [];
     return mapRowToBundle(row, patches);
   }
 
@@ -174,9 +164,11 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
     final orderBy =
         options.orderBy ?? const DatabaseBundleQueryOrder(direction: 'desc');
     final offset =
-        options.offset ?? (options.page != null ? (options.page! - 1) * limit : 0);
+        options.offset ??
+        (options.page != null ? (options.page! - 1) * limit : 0);
 
-    if ((where?.targetAppVersionIn != null && where!.targetAppVersionIn!.isEmpty) ||
+    if ((where?.targetAppVersionIn != null &&
+            where!.targetAppVersionIn!.isEmpty) ||
         (where?.id?.ins != null && where!.id!.ins!.isEmpty)) {
       return Paginated(
         data: const [],
@@ -230,18 +222,15 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
   }
 
   @override
-  Future<void> commitBundle({
-    required List<BundleChange> changedSets,
-  }) async {
+  Future<void> commitBundle({required List<BundleChange> changedSets}) async {
     if (changedSets.isEmpty) return;
 
     await client.runTx((tx) async {
       for (final op in changedSets) {
         if (op.operation == BundleChangeOperation.delete) {
-          await tx.execute(
-            'DELETE FROM bundle_patches WHERE bundle_id = @p0',
-            {'p0': op.data.id},
-          );
+          await tx.execute('DELETE FROM bundle_patches WHERE bundle_id = @p0', {
+            'p0': op.data.id,
+          });
           await tx.execute(
             'DELETE FROM bundle_patches WHERE base_bundle_id = @p0',
             {'p0': op.data.id},
@@ -258,8 +247,9 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
           final values = bundleToRowValues(bundle);
           final columns = values.keys.toList();
           final insertCols = columns.join(', ');
-          final placeholders =
-              columns.map((c) => '@${c.replaceAll('.', '_')}').join(', ');
+          final placeholders = columns
+              .map((c) => '@${c.replaceAll('.', '_')}')
+              .join(', ');
           final updateSets = columns
               .where((c) => c != 'id')
               .map((c) => '$c = EXCLUDED.$c')
@@ -270,17 +260,17 @@ class _PostgresDatabasePlugin implements AbstractDatabasePlugin {
             {for (final c in columns) c.replaceAll('.', '_'): values[c]},
           );
 
-          await tx.execute(
-            'DELETE FROM bundle_patches WHERE bundle_id = @p0',
-            {'p0': bundle.id},
-          );
+          await tx.execute('DELETE FROM bundle_patches WHERE bundle_id = @p0', {
+            'p0': bundle.id,
+          });
           final patchRows = bundleToPatchRows(bundle);
           if (patchRows.isNotEmpty) {
             for (final pr in patchRows) {
               final patchCols = pr.keys.toList();
               final patchInsert = patchCols.join(', ');
-              final patchPlaceholders =
-                  patchCols.map((c) => '@${c.replaceAll('.', '_')}').join(', ');
+              final patchPlaceholders = patchCols
+                  .map((c) => '@${c.replaceAll('.', '_')}')
+                  .join(', ');
               await tx.execute(
                 'INSERT INTO bundle_patches ($patchInsert) '
                 'VALUES ($patchPlaceholders) '

package/dart-src/plugins/postgres/lib/src/postgres_get_update_info.dart

@@ -31,13 +31,13 @@ class _UpdateInfoRow {
   });
 
   factory _UpdateInfoRow.fromJson(Map<String, dynamic> row) => _UpdateInfoRow(
-        id: row['id'] as String,
-        shouldForceUpdate: row['should_force_update'] as bool,
-        message: row['message'] as String?,
-        status: row['status'] as String,
-        storageUri: row['storage_uri'] as String?,
-        fileHash: row['file_hash'] as String?,
-      );
+    id: row['id'] as String,
+    shouldForceUpdate: row['should_force_update'] as bool,
+    message: row['message'] as String?,
+    status: row['status'] as String,
+    storageUri: row['storage_uri'] as String?,
+    fileHash: row['file_hash'] as String?,
+  );
 
   final String id;
   final bool shouldForceUpdate;
@@ -48,13 +48,15 @@ class _UpdateInfoRow {
 }
 
 UpdateInfo mapUpdateInfoRow(_UpdateInfoRow row) => UpdateInfo(
-      id: row.id,
-      shouldForceUpdate: row.shouldForceUpdate,
-      message: row.message,
-      status: row.status == 'ROLLBACK' ? UpdateStatus.rollback : UpdateStatus.update,
-      storageUri: row.storageUri,
-      fileHash: row.fileHash,
-    );
+  id: row.id,
+  shouldForceUpdate: row.shouldForceUpdate,
+  message: row.message,
+  status: row.status == 'ROLLBACK'
+      ? UpdateStatus.rollback
+      : UpdateStatus.update,
+  storageUri: row.storageUri,
+  fileHash: row.fileHash,
+);
 
 /// Resolve update info via the Postgres RPCs.
 Future<UpdateInfo?> getUpdateInfo(

package/dart-src/plugins/postgres/lib/src/postgres_storage.dart

@@ -29,7 +29,8 @@ class PostgresStorageConfig {
 
 /// Resolves the storage client for a config (test seam via [PostgresConfig.clientFactory]).
 PostgresClientLike resolvePostgresStorageClient(PostgresStorageConfig config) =>
-    config.db.clientFactory?.call(config.db) ?? PostgresClient.connect(config.db);
+    config.db.clientFactory?.call(config.db) ??
+    PostgresClient.connect(config.db);
 
 String _storageUri(String key, String? servingBaseUrl) {
   if (servingBaseUrl != null && servingBaseUrl.isNotEmpty) {
@@ -52,8 +53,9 @@ String _strip(String storageUri, String? servingBaseUrl) {
     return storageUri.substring('postgres://'.length);
   }
   if (servingBaseUrl != null && storageUri.startsWith(servingBaseUrl)) {
-    final base =
-        servingBaseUrl.endsWith('/') ? servingBaseUrl : '$servingBaseUrl/';
+    final base = servingBaseUrl.endsWith('/')
+        ? servingBaseUrl
+        : '$servingBaseUrl/';
     return storageUri.startsWith(base)
         ? storageUri.substring(base.length)
         : storageUri;
@@ -71,8 +73,7 @@ NodeStorageProfile createPostgresNodeProfile(
   PostgresClientLike client,
   String? basePath,
   String? servingBaseUrl,
-) =>
-    _PostgresNodeProfile(client, basePath, servingBaseUrl);
+) => _PostgresNodeProfile(client, basePath, servingBaseUrl);
 
 class _PostgresNodeProfile implements NodeStorageProfile {
   _PostgresNodeProfile(this._client, this._basePath, this._servingBaseUrl);
@@ -92,11 +93,7 @@ class _PostgresNodeProfile implements NodeStorageProfile {
       'INSERT INTO flutter_ota_kit_storage (key, data, content_type) '
       'VALUES (@key, @data, @ct) '
       'ON CONFLICT (key) DO UPDATE SET data = EXCLUDED.data, content_type = EXCLUDED.content_type',
-      {
-        '@key': fullKey,
-        '@data': bytes,
-        '@ct': _contentType(fullKey),
-      },
+      {'@key': fullKey, '@data': bytes, '@ct': _contentType(fullKey)},
     );
     return {'storageUri': _storageUri(fullKey, _servingBaseUrl)};
   }
@@ -164,8 +161,7 @@ class _PostgresNodeProfile implements NodeStorageProfile {
 RuntimeStorageProfile createPostgresRuntimeProfile(
   PostgresClientLike client,
   String? servingBaseUrl,
-) =>
-    _PostgresRuntimeProfile(client, servingBaseUrl);
+) => _PostgresRuntimeProfile(client, servingBaseUrl);
 
 class _PostgresRuntimeProfile implements RuntimeStorageProfile {
   _PostgresRuntimeProfile(this._client, this._servingBaseUrl);
@@ -175,7 +171,19 @@ class _PostgresRuntimeProfile implements RuntimeStorageProfile {
 
   @override
   Future<Map<String, String>> getDownloadUrl(String storageUri) async {
-    return {'fileUrl': _storageUri(_strip(storageUri, _servingBaseUrl), _servingBaseUrl)};
+    if (_servingBaseUrl == null || _servingBaseUrl.isEmpty) {
+      throw StateError(
+        'Postgres storage requires a servingBaseUrl to expose bytes over HTTP. '
+        'Set `postgres.servingBaseUrl` in your config to a thin proxy that reads '
+        'from the `flutter_ota_kit_storage` table.',
+      );
+    }
+    return {
+      'fileUrl': _storageUri(
+        _strip(storageUri, _servingBaseUrl),
+        _servingBaseUrl,
+      ),
+    };
   }
 
   @override
@@ -198,7 +206,11 @@ StoragePlugin Function(PostgresStorageConfig) postgresStorage =
       factory: (cfg) {
         final client = resolvePostgresStorageClient(cfg);
         return (
-          node: createPostgresNodeProfile(client, cfg.basePath, cfg.servingBaseUrl),
+          node: createPostgresNodeProfile(
+            client,
+            cfg.basePath,
+            cfg.servingBaseUrl,
+          ),
           runtime: createPostgresRuntimeProfile(client, cfg.servingBaseUrl),
         );
       },

package/dart-src/plugins/postgres/lib/src/postgres_types.dart

@@ -1,5 +1,4 @@
-import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart'
-    show Platform;
+import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart' show Platform;
 
 /// Database row for the `bundles` table (snake_case columns).
 ///
@@ -66,24 +65,24 @@ class PostgresBundleRow {
   final List<String>? targetCohorts;
 
   Map<String, dynamic> toJson() => {
-        'id': id,
-        'channel': channel,
-        'enabled': enabled,
-        'should_force_update': shouldForceUpdate,
-        'file_hash': fileHash,
-        'git_commit_hash': gitCommitHash,
-        'message': message,
-        'platform': platform.name,
-        'target_app_version': targetAppVersion,
-        'storage_uri': storageUri,
-        'fingerprint_hash': fingerprintHash,
-        'metadata': metadata ?? const {},
-        'manifest_storage_uri': manifestStorageUri,
-        'manifest_file_hash': manifestFileHash,
-        'asset_base_storage_uri': assetBaseStorageUri,
-        'rollout_cohort_count': rolloutCohortCount,
-        'target_cohorts': targetCohorts,
-      };
+    'id': id,
+    'channel': channel,
+    'enabled': enabled,
+    'should_force_update': shouldForceUpdate,
+    'file_hash': fileHash,
+    'git_commit_hash': gitCommitHash,
+    'message': message,
+    'platform': platform.name,
+    'target_app_version': targetAppVersion,
+    'storage_uri': storageUri,
+    'fingerprint_hash': fingerprintHash,
+    'metadata': metadata ?? const {},
+    'manifest_storage_uri': manifestStorageUri,
+    'manifest_file_hash': manifestFileHash,
+    'asset_base_storage_uri': assetBaseStorageUri,
+    'rollout_cohort_count': rolloutCohortCount,
+    'target_cohorts': targetCohorts,
+  };
 }
 
 /// Database row for the `bundle_patches` table (snake_case columns).
@@ -121,12 +120,12 @@ class PostgresBundlePatchRow {
   final int orderIndex;
 
   Map<String, dynamic> toJson() => {
-        'id': id,
-        'bundle_id': bundleId,
-        'base_bundle_id': baseBundleId,
-        'base_file_hash': baseFileHash,
-        'patch_file_hash': patchFileHash,
-        'patch_storage_uri': patchStorageUri,
-        'order_index': orderIndex,
-      };
+    'id': id,
+    'bundle_id': bundleId,
+    'base_bundle_id': baseBundleId,
+    'base_file_hash': baseFileHash,
+    'patch_file_hash': patchFileHash,
+    'patch_storage_uri': patchStorageUri,
+    'order_index': orderIndex,
+  };
 }

package/dart-src/plugins/postgres/pubspec.yaml

@@ -1,21 +1,26 @@
 name: flutter_ota_kit_postgres
 description: Postgres plugin for flutter_ota_kit — database backend.
-version: 0.1.0
-publish_to: https://pub.dev
-homepage: https://github.com/HYPER12755/flutter_ota_kit
-repository: https://github.com/HYPER12755/flutter_ota_kit
-issue_tracker: https://github.com/HYPER12755/flutter_ota_kit/issues
-documentation: https://github.com/HYPER12755/flutter_ota_kit#readme
+version: 0.1.3
+homepage: https://github.com/HYPER12755/flutter-ota-kit
+repository: https://github.com/HYPER12755/flutter-ota-kit
+issue_tracker: https://github.com/HYPER12755/flutter-ota-kit/issues
+documentation: https://github.com/HYPER12755/flutter-ota-kit#readme
 license: MIT
 
 environment:
-  sdk: ">=3.3.0 <4.0.0"
+  sdk: ">=3.13.2 <4.0.0"
 
 dependencies:
-  flutter_ota_kit_core: ^0.1.0
-  flutter_ota_kit_plugin_core: ^0.0.1
+  flutter_ota_kit_core: ^0.1.2
+  flutter_ota_kit_plugin_core: ^0.0.4
   postgres: ^3.4.0
 
 dev_dependencies:
   test: ^1.25.0
   lints: ^4.0.0
+
+dependency_overrides:
+  flutter_ota_kit_core:
+    path: ../../packages/core
+  flutter_ota_kit_plugin_core:
+    path: ../plugin-core

package/dart-src/plugins/postgres/test/mock_postgres_client.dart

@@ -51,10 +51,7 @@ class MockPostgresClient implements PostgresClientLike {
   @override
   Future<void> close() async {}
 
-  List<Map<String, dynamic>> _handle(
-    String sql,
-    Map<String, dynamic> params,
-  ) {
+  List<Map<String, dynamic>> _handle(String sql, Map<String, dynamic> params) {
     if (sql.contains('get_target_app_version_list')) {
       return _targetAppVersionList(params);
     }
@@ -126,7 +123,8 @@ class MockPostgresClient implements PostgresClientLike {
     var rows = _filterBundles(sql, params);
 
     if (sql.contains('ORDER BY id asc')) {
-      rows = rows.toList()..sort((a, b) => (a['id'] as String).compareTo(b['id'] as String));
+      rows = rows.toList()
+        ..sort((a, b) => (a['id'] as String).compareTo(b['id'] as String));
     } else {
       rows = rows.toList()
         ..sort((a, b) => (b['id'] as String).compareTo(a['id'] as String));
@@ -150,13 +148,18 @@ class MockPostgresClient implements PostgresClientLike {
   }
 
   List<Map<String, dynamic>> _channels() {
-    final channels = store.bundleRows.map((r) => r['channel'] as String).toSet().toList();
+    final channels = store.bundleRows
+        .map((r) => r['channel'] as String)
+        .toSet()
+        .toList();
     return channels.map((c) => {'channel': c}).toList();
   }
 
   List<Map<String, dynamic>> _patchesForIds(Map<String, dynamic> params) {
     final ids = (params['bundle_ids'] as List).cast<String>();
-    return store.bundlePatchRows.where((p) => ids.contains(p['bundle_id'])).toList();
+    return store.bundlePatchRows
+        .where((p) => ids.contains(p['bundle_id']))
+        .toList();
   }
 
   void _upsertBundle(Map<String, dynamic> params) {
@@ -173,7 +176,9 @@ class MockPostgresClient implements PostgresClientLike {
   void _upsertPatch(Map<String, dynamic> params) {
     final row = <String, dynamic>{};
     params.forEach((k, v) => row[k] = v);
-    final existing = store.bundlePatchRows.indexWhere((r) => r['id'] == row['id']);
+    final existing = store.bundlePatchRows.indexWhere(
+      (r) => r['id'] == row['id'],
+    );
     if (existing >= 0) {
       store.bundlePatchRows[existing] = row;
     } else {
@@ -198,14 +203,24 @@ class MockPostgresClient implements PostgresClientLike {
     final existed = store.bundleRows.any((r) => r['id'] == id);
     store.bundleRows.removeWhere((r) => r['id'] == id);
     store.bundlePatchRows.removeWhere((p) => p['bundle_id'] == id);
-    return existed ? [{'id': id}] : [];
+    return existed
+        ? [
+            {'id': id},
+          ]
+        : [];
   }
 
-  List<Map<String, dynamic>> _targetAppVersionList(Map<String, dynamic> params) {
+  List<Map<String, dynamic>> _targetAppVersionList(
+    Map<String, dynamic> params,
+  ) {
     final platform = params['app_platform'];
     final min = params['min_bundle_id'] as String? ?? '';
     final versions = store.bundleRows
-        .where((r) => r['platform'] == platform && (r['id'] as String).compareTo(min) >= 0)
+        .where(
+          (r) =>
+              r['platform'] == platform &&
+              (r['id'] as String).compareTo(min) >= 0,
+        )
         .map((r) => r['target_app_version'])
         .where((v) => v != null)
         .toSet()
@@ -222,44 +237,53 @@ class MockPostgresClient implements PostgresClientLike {
     return matches.isEmpty ? null : matches.first;
   }
 
-  List<Map<String, dynamic>> _updateInfoByAppVersion(Map<String, dynamic> params) {
+  List<Map<String, dynamic>> _updateInfoByAppVersion(
+    Map<String, dynamic> params,
+  ) {
     final platform = params['app_platform'];
     final channel = params['target_channel'];
     final min = params['min_bundle_id'] as String? ?? '';
-    final list = (params['target_app_version_list'] as List?)?.cast<String>() ?? [];
-    final row = _newestMatch((r) =>
-        r['platform'] == platform &&
-        r['enabled'] == true &&
-        r['channel'] == channel &&
-        (r['id'] as String).compareTo(min) >= 0 &&
-        list.contains(r['target_app_version']));
+    final list =
+        (params['target_app_version_list'] as List?)?.cast<String>() ?? [];
+    final row = _newestMatch(
+      (r) =>
+          r['platform'] == platform &&
+          r['enabled'] == true &&
+          r['channel'] == channel &&
+          (r['id'] as String).compareTo(min) >= 0 &&
+          list.contains(r['target_app_version']),
+    );
     if (row == null) return [];
     return [_infoRow(row)];
   }
 
-  List<Map<String, dynamic>> _updateInfoByFingerprint(Map<String, dynamic> params) {
+  List<Map<String, dynamic>> _updateInfoByFingerprint(
+    Map<String, dynamic> params,
+  ) {
     final platform = params['app_platform'];
     final channel = params['target_channel'];
     final min = params['min_bundle_id'] as String? ?? '';
     final fp = params['target_fingerprint_hash'];
-    final row = _newestMatch((r) =>
-        r['platform'] == platform &&
-        r['enabled'] == true &&
-        r['channel'] == channel &&
-        (r['id'] as String).compareTo(min) >= 0 &&
-        r['fingerprint_hash'] == fp);
+    final row = _newestMatch(
+      (r) =>
+          r['platform'] == platform &&
+          r['enabled'] == true &&
+          r['channel'] == channel &&
+          (r['id'] as String).compareTo(min) >= 0 &&
+          r['fingerprint_hash'] == fp,
+    );
     if (row == null) return [];
     return [_infoRow(row)];
   }
 
   Map<String, dynamic> _infoRow(Map<String, dynamic> row) => {
-        'id': row['id'],
-        'should_force_update': row['should_force_update'],
-        'message': row['message'],
-        'status': 'UPDATE',
-        'storage_uri': row['storage_uri'],
-        'file_hash': row['file_hash'],
-      };
+    'id': row['id'],
+    'should_force_update': row['should_force_update'],
+    'message': row['message'],
+    'status': 'UPDATE',
+    'storage_uri': row['storage_uri'],
+    'file_hash': row['file_hash'],
+  };
 }
 
 class _TxClient implements PostgresClientLike {
@@ -271,8 +295,7 @@ class _TxClient implements PostgresClientLike {
   Future<List<Map<String, dynamic>>> execute(
     String sql,
     Map<String, dynamic> parameters,
-  ) =>
-      _parent.execute(sql, parameters);
+  ) => _parent.execute(sql, parameters);
 
   @override
   Future<T> runTx<T>(Future<T> Function(PostgresClientLike tx) fn) =>
@@ -284,10 +307,10 @@ class _TxClient implements PostgresClientLike {
 
 /// Build a [PostgresConfig] wired to [MockPostgresClient].
 PostgresConfig mockPostgresConfig(Store store) => PostgresConfig(
-      host: 'mock',
-      database: 'mock',
-      clientFactory: (_) => MockPostgresClient(store),
-    );
+  host: 'mock',
+  database: 'mock',
+  clientFactory: (_) => MockPostgresClient(store),
+);
 
 /// Create a [DatabasePlugin] backed by the mock store.
 DatabasePlugin newPlugin({Store? store}) {

package/dart-src/plugins/postgres/test/postgres_bundle_mapper_test.dart

@@ -84,10 +84,9 @@ void main() {
 
       final row = bundleToRowValues(bundle);
       final patchRows = bundleToPatchRows(bundle);
-      final back = mapRowToBundle(
-        PostgresBundleRow.fromJson(row),
-        [PostgresBundlePatchRow.fromJson(patchRows.first)],
-      );
+      final back = mapRowToBundle(PostgresBundleRow.fromJson(row), [
+        PostgresBundlePatchRow.fromJson(patchRows.first),
+      ]);
 
       expect(back.id, bundle.id);
       expect(back.fileHash, 'hash-1');