@_nazmiforreal/flutter-ota 0.1.12 → 0.1.13

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

@@ -8,48 +8,49 @@ import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart'
         UpdateStatus,
         nilUuid;
 import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
-    show
-        DatabaseBundleQueryOptions,
-        DatabaseBundleQueryWhere,
-        Paginated;
+    show DatabaseBundleQueryOptions, DatabaseBundleQueryWhere, Paginated;
 import 'package:test/test.dart';
 
 import 'mock_postgres_client.dart';
 
-Bundle _bundle(String id,
-        {String channel = 'production',
-        String? fingerprintHash}) =>
-    Bundle(
-      id: id,
-      platform: Platform.android,
-      shouldForceUpdate: false,
-      enabled: true,
-      fileHash: 'file-hash-$id',
-      channel: channel,
-      storageUri: 'file:///bundle-$id',
-      targetAppVersion: '1.0.0',
-      message: null,
-      fingerprintHash: fingerprintHash,
-      metadata: null,
-      manifestStorageUri: null,
-      manifestFileHash: null,
-      assetBaseStorageUri: null,
-      patches: const [],
-      patchBaseBundleId: null,
-      patchBaseFileHash: null,
-      patchFileHash: null,
-      patchStorageUri: null,
-      rolloutCohortCount: 1000,
-      targetCohorts: null,
-    );
+Bundle _bundle(
+  String id, {
+  String channel = 'production',
+  String? fingerprintHash,
+}) => Bundle(
+  id: id,
+  platform: Platform.android,
+  shouldForceUpdate: false,
+  enabled: true,
+  fileHash: 'file-hash-$id',
+  channel: channel,
+  storageUri: 'file:///bundle-$id',
+  targetAppVersion: '1.0.0',
+  message: null,
+  fingerprintHash: fingerprintHash,
+  metadata: null,
+  manifestStorageUri: null,
+  manifestFileHash: null,
+  assetBaseStorageUri: null,
+  patches: const [],
+  patchBaseBundleId: null,
+  patchBaseFileHash: null,
+  patchFileHash: null,
+  patchStorageUri: null,
+  rolloutCohortCount: 1000,
+  targetCohorts: null,
+);
 
 void main() {
   group('postgresDatabase', () {
     test('getChannels returns distinct channels', () async {
       final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000002',
-          channel: 'staging'));
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000001'),
+      );
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000002', channel: 'staging'),
+      );
       await plugin.commitBundle();
 
       final channels = await plugin.getChannels();
@@ -59,8 +60,12 @@ void main() {
 
     test('getBundles returns bundles and pagination', () async {
       final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000002'));
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000001'),
+      );
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000002'),
+      );
       await plugin.commitBundle();
 
       final result = await plugin.getBundles(
@@ -73,9 +78,12 @@ void main() {
 
     test('getBundles filters by channel', () async {
       final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000002',
-          channel: 'staging'));
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000001'),
+      );
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000002', channel: 'staging'),
+      );
       await plugin.commitBundle();
 
       final result = await plugin.getBundles(
@@ -88,24 +96,34 @@ void main() {
       expect(result.data.first.channel, 'staging');
     });
 
-    test('getBundleById returns null for missing, bundle for existing',
-        () async {
-      final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
-      await plugin.commitBundle();
-
-      expect(await plugin.getBundleById('does-not-exist'), isNull);
-      final got = await plugin.getBundleById('018f0000-0000-7000-8000-000000000001');
-      expect(got, isNotNull);
-      expect(got!.id, '018f0000-0000-7000-8000-000000000001');
-    });
+    test(
+      'getBundleById returns null for missing, bundle for existing',
+      () async {
+        final plugin = newPlugin();
+        await plugin.appendBundle(
+          _bundle('018f0000-0000-7000-8000-000000000001'),
+        );
+        await plugin.commitBundle();
+
+        expect(await plugin.getBundleById('does-not-exist'), isNull);
+        final got = await plugin.getBundleById(
+          '018f0000-0000-7000-8000-000000000001',
+        );
+        expect(got, isNotNull);
+        expect(got!.id, '018f0000-0000-7000-8000-000000000001');
+      },
+    );
 
     test('commitBundle append -> update -> delete reflects in store', () async {
       final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000001'),
+      );
       await plugin.commitBundle();
 
-      var got = await plugin.getBundleById('018f0000-0000-7000-8000-000000000001');
+      var got = await plugin.getBundleById(
+        '018f0000-0000-7000-8000-000000000001',
+      );
       expect(got!.enabled, true);
 
       await plugin.updateBundle(got.id, {'enabled': false});
@@ -121,30 +139,39 @@ void main() {
       );
     });
 
-    test('getUpdateInfo via RPC returns UpdateInfo for compatible bundle',
-        () async {
-      final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
-      await plugin.commitBundle();
-
-      final info = await plugin.getUpdateInfo(
-        AppVersionGetBundlesArgs(
-          appVersion: '1.0.0',
-          bundleId: nilUuid,
-          channel: 'production',
-          minBundleId: nilUuid,
-          platform: Platform.android,
-        ),
-      );
-      expect(info, isA<UpdateInfo>());
-      expect(info!.status, UpdateStatus.update);
-      expect(info.storageUri, 'file:///bundle-018f0000-0000-7000-8000-000000000001');
-    });
+    test(
+      'getUpdateInfo via RPC returns UpdateInfo for compatible bundle',
+      () async {
+        final plugin = newPlugin();
+        await plugin.appendBundle(
+          _bundle('018f0000-0000-7000-8000-000000000001'),
+        );
+        await plugin.commitBundle();
+
+        final info = await plugin.getUpdateInfo(
+          AppVersionGetBundlesArgs(
+            appVersion: '1.0.0',
+            bundleId: nilUuid,
+            channel: 'production',
+            minBundleId: nilUuid,
+            platform: Platform.android,
+          ),
+        );
+        expect(info, isA<UpdateInfo>());
+        expect(info!.status, UpdateStatus.update);
+        expect(
+          info.storageUri,
+          'file:///bundle-018f0000-0000-7000-8000-000000000001',
+        );
+      },
+    );
 
     test('getUpdateInfo via fingerprint returns matching bundle', () async {
       final plugin = newPlugin();
-      final fpBundle = _bundle('018f0000-0000-7000-8000-000000000001',
-          fingerprintHash: 'fp-abc');
+      final fpBundle = _bundle(
+        '018f0000-0000-7000-8000-000000000001',
+        fingerprintHash: 'fp-abc',
+      );
       await plugin.appendBundle(fpBundle);
       await plugin.commitBundle();
 
@@ -163,7 +190,9 @@ void main() {
 
     test('getUpdateInfo returns null when no compatible bundle', () async {
       final plugin = newPlugin();
-      await plugin.appendBundle(_bundle('018f0000-0000-7000-8000-000000000001'));
+      await plugin.appendBundle(
+        _bundle('018f0000-0000-7000-8000-000000000001'),
+      );
       await plugin.commitBundle();
 
       final info = await plugin.getUpdateInfo(

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

@@ -0,0 +1,60 @@
+import 'package:flutter_ota_kit_postgres/flutter_ota_kit_postgres.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group('Postgres storage runtime', () {
+    test(
+      'getDownloadUrl throws a clear error when no servingBaseUrl is set',
+      () async {
+        final storage = postgresStorage(
+          PostgresStorageConfig(
+            db: PostgresConfig(
+              host: 'mock',
+              database: 'mock',
+              username: 'u',
+              password: 'p',
+            ),
+            // servingBaseUrl intentionally omitted.
+          ),
+        );
+        final node = storage.profiles.node!;
+        // Use a dummy storageUri just to exercise the runtime path.
+        expect(
+          () => storage.profiles.runtime!.getDownloadUrl(
+            'postgres://bundles/abc/zip',
+          ),
+          throwsA(
+            isA<StateError>().having(
+              (e) => e.message,
+              'message',
+              contains('servingBaseUrl'),
+            ),
+          ),
+        );
+        // The node profile must still work because it goes through the DB.
+        expect(node, isNotNull);
+      },
+    );
+
+    test(
+      'getDownloadUrl builds an http url when servingBaseUrl is set',
+      () async {
+        final storage = postgresStorage(
+          PostgresStorageConfig(
+            db: PostgresConfig(
+              host: 'mock',
+              database: 'mock',
+              username: 'u',
+              password: 'p',
+            ),
+            servingBaseUrl: 'https://cdn.example.com',
+          ),
+        );
+        final url = (await storage.profiles.runtime!.getDownloadUrl(
+          'postgres://bundles/abc/zip',
+        ))['fileUrl'];
+        expect(url, 'https://cdn.example.com/bundles/abc/zip');
+      },
+    );
+  });
+}

package/dart-src/plugins/supabase/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.1.2
+
+### Changed
+
+- **De-duplicated the error-to-message helper.** `_getErrorMessage` (supabase_storage,
+  supabase_signed_url_batcher) and `_errorToString` (supabase_edge_function_storage)
+  were byte-identical copies. They now all call one shared `errorMessage(Object?)` in
+  `lib/src/error_message.dart`. No behavior change; the internal names are gone.
+
+## 0.1.1
+
+- fix(supabase): the `migrate` RLS migration now creates the public-read policies
+  (`allow public read bundles`, `allow public read bundle_patches`, `public bundles read`)
+  so the anon-key app can actually fetch bundles. Previously RLS was enabled with zero
+  policies, so every fresh `flutter-ota migrate supabase` produced a DB where clients
+  received no OTA.
+
 ## 0.1.0
 
 - Initial release of `flutter_ota_kit_supabase` as part of the flutter_ota_kit OTA toolkit.

package/dart-src/plugins/supabase/README.md

@@ -1,6 +1,6 @@
 # flutter_ota_kit_supabase
 
-Supabase backend for [flutter_ota_kit](https://github.com/HYPER12755/flutter_ota_kit).
+Supabase backend for [flutter_ota_kit](https://github.com/HYPER12755/flutter-ota-kit).
 Implements the bundle **database** (PostgREST `bundles` table) and **storage**
 (signed URLs) used both by the `flutter-ota` CLI and by the Flutter SDK's
 `FlutterPatcher.configureSupabase(...)`.
@@ -46,7 +46,7 @@ FlutterPatcher.configureSupabase(SupabaseUpdateConfig(
 ));
 ```
 
-See [doc/backends.md](https://github.com/HYPER12755/flutter_ota_kit/blob/main/doc/backends.md).
+See [doc/backends.md](https://github.com/HYPER12755/flutter-ota-kit/blob/main/doc/backends.md).
 
 ## License
 

package/dart-src/plugins/supabase/example/lib/main.dart

@@ -0,0 +1,63 @@
+// flutter_ota_kit_supabase example
+//
+// `flutter_ota_kit_supabase` is a Supabase backend for `flutter_ota_kit`.
+// It provides two factories — `supabaseDatabase` and `supabaseStorage` —
+// that read/write the `bundles` table and patch files in a Supabase
+// Storage bucket.
+//
+// Most apps don't import this package directly; they wire it through
+// `flutter_ota_kit.configureSupabase(...)` in their app boot path. This
+// file shows the low-level config types in case you're writing a custom
+// server, a migration script, or a CLI extension.
+//
+// Run: `dart run example/main.dart`
+
+import 'package:flutter_ota_kit_supabase/flutter_ota_kit_supabase.dart';
+
+void main() {
+  // ── 1. Database config (PostgREST + service-role key). ─────────────
+  // The `supabaseServiceRoleKey` is server-side only — never ship it in
+  // a Flutter app. Use `supabaseAnonKey` + RLS policies instead.
+  const dbConfig = SupabaseServiceRoleConfig(
+    supabaseUrl: 'https://your-project.supabase.co',
+    supabaseServiceRoleKey: 'eyJ...', // server-side only
+  );
+  print('Supabase URL: ${dbConfig.supabaseUrl}');
+
+  // ── 2. Storage config (adds bucket + base path). ──────────────────
+  // The `basePath` is the prefix inside the bucket where bundles live.
+  // The default convention is `bundles/{id}/patch.zip`.
+  const storageConfig = SupabaseStorageConfig(
+    supabaseUrl: 'https://your-project.supabase.co',
+    supabaseServiceRoleKey: 'eyJ...',
+    bucketName: 'flutter-ota-bundles',
+    basePath: 'bundles',
+  );
+  print('Bucket: ${storageConfig.bucketName}');
+  print('Base path: ${storageConfig.basePath}');
+
+  // ── 3. Row-to-Bundle mapping (server-side helper). ────────────────
+  // Use this when reading bundles from PostgREST and passing them to
+  // the SDK's `PatchInfo.fromJson`. The mapper handles both camelCase
+  // and snake_case column names.
+  const row = SupabaseBundleRow(
+    id: '01a059a6-7d3c-4f3e-8a2c-9c2e3a4b5d6e',
+    channel: 'production',
+    enabled: true,
+    shouldForceUpdate: false,
+    fileHash: '7c4a8d09ca3762af61e59520943dc26494f8941b',
+    platform: 'android',
+    storageUri:
+        'supabase-storage://flutter-ota-bundles/'
+        '01a059a6/patch.zip',
+    targetAppVersion: '1.0.0',
+    rolloutCohortCount: 100,
+  );
+  final bundle = mapRowToBundle(row);
+  print('Mapped bundle: ${bundle.id} (${bundle.storageUri})');
+
+  // ── 4. URL parsing helpers. ───────────────────────────────────────
+  final uri = parseSupabaseStorageUri(bundle.storageUri);
+  print('Bucket: ${uri.bucket}');
+  print('Key:    ${uri.key}');
+}

package/dart-src/plugins/supabase/lib/flutter_ota_kit_supabase.dart

@@ -19,3 +19,5 @@ export 'src/supabase_edge_function_database.dart'
     show supabaseEdgeFunctionDatabase, SupabaseEdgeFunctionDatabaseConfig;
 export 'src/supabase_edge_function_storage.dart'
     show supabaseEdgeFunctionStorage, SupabaseEdgeFunctionStorageConfig;
+export 'src/types.dart' show SupabaseBundleRow;
+export 'src/supabase_bundle_mapper.dart' show mapRowToBundle;

package/dart-src/plugins/supabase/lib/src/error_message.dart

@@ -0,0 +1,11 @@
+/// Shared error-to-message helper used across the supabase plugin
+/// (storage, signed-url batcher, edge-function storage). Identical copies used
+/// to live in three files; they now all call this one.
+String errorMessage(Object? error) {
+  if (error is Error) return error.toString();
+  if (error is Exception) return error.toString();
+  if (error is Map && error['message'] is String) {
+    return error['message'] as String;
+  }
+  return error.toString();
+}

package/dart-src/plugins/supabase/lib/src/supabase_bundle_mapper.dart

@@ -1,10 +1,11 @@
 /// Faithful port of hot-updater `plugins/supabase/src/supabaseBundleMapper.ts`.
 library;
 
-import 'dart:convert';
-
 import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart';
 
+import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
+    show buildBundlePatchId, normalizeMetadata;
+
 import 'types.dart';
 
 const String bundleSelectColumns =
@@ -13,34 +14,12 @@ const String bundleSelectColumns =
     'storage_uri, metadata, manifest_storage_uri, manifest_file_hash, '
     'asset_base_storage_uri, rollout_cohort_count, target_cohorts';
 
-/// Normalize metadata from various shapes to a plain map.
-Map<String, Object?>? _normalizeMetadata(Object? value) {
-  if (value == null) return null;
-
-  if (value is String) {
-    try {
-      final parsed = jsonDecode(value);
-      return _normalizeMetadata(parsed);
-    } catch (_) {
-      return null;
-    }
-  }
-
-  if (value is Map) return value.cast<String, Object?>();
-
-  return null;
-}
-
-/// Build the compound primary key for a patch row.
-String _buildBundlePatchId(String bundleId, String baseBundleId) =>
-    '$bundleId:$baseBundleId';
-
 /// Map a Supabase bundle row + optional patch rows to a [Bundle].
 Bundle mapRowToBundle(
   SupabaseBundleRow row, [
   List<SupabaseBundlePatchRow> patchRows = const [],
 ]) {
-  final rawMetadata = _normalizeMetadata(row.metadata);
+  final rawMetadata = normalizeMetadata(row.metadata);
   final patches = patchRows.toList()
     ..sort((a, b) {
       final cmp = a.orderIndex.compareTo(b.orderIndex);
@@ -49,16 +28,17 @@ Bundle mapRowToBundle(
     });
 
   final patchArtifacts = patches
-      .map((p) => BundlePatchArtifact(
-            baseBundleId: p.baseBundleId,
-            baseFileHash: p.baseFileHash,
-            patchFileHash: p.patchFileHash,
-            patchStorageUri: p.patchStorageUri,
-          ))
+      .map(
+        (p) => BundlePatchArtifact(
+          baseBundleId: p.baseBundleId,
+          baseFileHash: p.baseFileHash,
+          patchFileHash: p.patchFileHash,
+          patchStorageUri: p.patchStorageUri,
+        ),
+      )
       .toList();
 
-  final primaryPatch =
-      patchArtifacts.isNotEmpty ? patchArtifacts.first : null;
+  final primaryPatch = patchArtifacts.isNotEmpty ? patchArtifacts.first : null;
 
   return Bundle(
     id: row.id,
@@ -72,8 +52,7 @@ Bundle mapRowToBundle(
     targetAppVersion: row.targetAppVersion,
     fingerprintHash: row.fingerprintHash,
     storageUri: row.storageUri,
-    metadata:
-        rawMetadata != null ? BundleMetadata.fromJson(rawMetadata) : null,
+    metadata: rawMetadata != null ? BundleMetadata.fromJson(rawMetadata) : null,
     manifestStorageUri: row.manifestStorageUri,
     manifestFileHash: row.manifestFileHash,
     assetBaseStorageUri: row.assetBaseStorageUri,
@@ -82,33 +61,31 @@ Bundle mapRowToBundle(
     patchBaseFileHash: primaryPatch?.baseFileHash,
     patchFileHash: primaryPatch?.patchFileHash,
     patchStorageUri: primaryPatch?.patchStorageUri,
-    rolloutCohortCount:
-        row.rolloutCohortCount ?? defaultRolloutCohortCount,
+    rolloutCohortCount: row.rolloutCohortCount ?? defaultRolloutCohortCount,
     targetCohorts: row.targetCohorts,
   );
 }
 
 /// Map a [Bundle] to a Supabase row for upsert.
 SupabaseBundleRow bundleToRow(Bundle bundle) => SupabaseBundleRow(
-      id: bundle.id,
-      channel: bundle.channel,
-      enabled: bundle.enabled,
-      shouldForceUpdate: bundle.shouldForceUpdate,
-      fileHash: bundle.fileHash,
-      gitCommitHash: bundle.gitCommitHash,
-      message: bundle.message,
-      platform: bundle.platform.value,
-      targetAppVersion: bundle.targetAppVersion,
-      fingerprintHash: bundle.fingerprintHash,
-      storageUri: bundle.storageUri,
-      metadata: stripBundleArtifactMetadata(bundle.metadata?.toJson()),
-      manifestStorageUri: getManifestStorageUri(bundle),
-      manifestFileHash: getManifestFileHash(bundle),
-      assetBaseStorageUri: getAssetBaseStorageUri(bundle),
-      rolloutCohortCount:
-          bundle.rolloutCohortCount ?? defaultRolloutCohortCount,
-      targetCohorts: bundle.targetCohorts,
-    );
+  id: bundle.id,
+  channel: bundle.channel,
+  enabled: bundle.enabled,
+  shouldForceUpdate: bundle.shouldForceUpdate,
+  fileHash: bundle.fileHash,
+  gitCommitHash: bundle.gitCommitHash,
+  message: bundle.message,
+  platform: bundle.platform.value,
+  targetAppVersion: bundle.targetAppVersion,
+  fingerprintHash: bundle.fingerprintHash,
+  storageUri: bundle.storageUri,
+  metadata: stripBundleArtifactMetadata(bundle.metadata?.toJson()),
+  manifestStorageUri: getManifestStorageUri(bundle),
+  manifestFileHash: getManifestFileHash(bundle),
+  assetBaseStorageUri: getAssetBaseStorageUri(bundle),
+  rolloutCohortCount: bundle.rolloutCohortCount ?? defaultRolloutCohortCount,
+  targetCohorts: bundle.targetCohorts,
+);
 
 /// Map a [Bundle] to its patch rows for upsert.
 List<SupabaseBundlePatchRow> bundleToPatchRows(Bundle bundle) {
@@ -116,8 +93,7 @@ List<SupabaseBundlePatchRow> bundleToPatchRows(Bundle bundle) {
   return [
     for (var i = 0; i < patchArtifacts.length; i++)
       SupabaseBundlePatchRow(
-        id: _buildBundlePatchId(
-            bundle.id, patchArtifacts[i].baseBundleId),
+        id: buildBundlePatchId(bundle.id, patchArtifacts[i].baseBundleId),
         bundleId: bundle.id,
         baseBundleId: patchArtifacts[i].baseBundleId,
         baseFileHash: patchArtifacts[i].baseFileHash,

package/dart-src/plugins/supabase/lib/src/supabase_client_adapter.dart

@@ -7,18 +7,11 @@ library;
 
 /// Minimal PostgREST query-builder surface used by the database plugin.
 abstract class SupabaseQueryBuilderLike {
-  SupabaseFilterBuilderLike select(
-    String columns, {
-    bool? count,
-    bool? head,
-  });
+  SupabaseFilterBuilderLike select(String columns, {bool? count, bool? head});
 
   SupabaseFilterBuilderLike delete();
 
-  Future<dynamic> upsert(
-    dynamic values, {
-    String? onConflict,
-  });
+  Future<dynamic> upsert(dynamic values, {String? onConflict});
 }
 
 /// Minimal PostgREST filter-builder surface.
@@ -47,10 +40,7 @@ abstract class SupabaseResponseLike {
 
 /// Storage bucket surface used by the storage plugin.
 abstract class SupabaseStorageBucketLike {
-  Future<SupabaseSignedUrlResult> createSignedUrl(
-    String path,
-    int expiresIn,
-  );
+  Future<SupabaseSignedUrlResult> createSignedUrl(String path, int expiresIn);
 
   Future<SupabaseSignedUrlListResult> createSignedUrls(
     List<String> paths,