@_nazmiforreal/flutter-ota 0.1.11 → 0.1.13

package/dart-src/plugins/cloudflare/lib/src/d1_bundle_mapper.dart

@@ -1,16 +1,25 @@
 import 'dart:convert' show jsonDecode;
 
 import 'package:flutter_ota_kit_core/flutter_ota_kit_core.dart'
-    show Bundle, BundleMetadata, BundlePatchArtifact, Platform, getBundlePatches;
+    show
+        Bundle,
+        BundleMetadata,
+        BundlePatchArtifact,
+        Platform,
+        getBundlePatches;
+
+import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
+    show buildBundlePatchId, normalizeMetadata;
+// Re-export the shared `buildBundlePatchId` so the cloudflare package's public
+// API still exposes it; `parseMetadata` remains a backward-compatible alias of
+// the shared `normalizeMetadata`.
+export 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
+    show buildBundlePatchId;
 
 /// Default rollout cohort count — full rollout in the Dart port's per-mille
 /// scale (matches core's `defaultRolloutCohortCount` = `numericCohortSize`).
 const int defaultRolloutCohortCount = 1000;
 
-/// Compound patch id `${bundleId}:${baseBundleId}` (matches D1 schema).
-String buildBundlePatchId(String bundleId, String baseBundleId) =>
-    '$bundleId:$baseBundleId';
-
 /// Parse `target_cohorts` which is stored as a JSON string (or already a list).
 List<String>? parseTargetCohorts(dynamic value) {
   if (value == null) return null;
@@ -36,21 +45,8 @@ List<String>? parseTargetCohorts(dynamic value) {
   return null;
 }
 
-/// Parse `metadata` which may be a JSON string or an already-decoded object.
-Map<String, Object?>? parseMetadata(dynamic value) {
-  if (value == null) return null;
-  if (value is String) {
-    try {
-      return parseMetadata(jsonDecode(value));
-    } catch (_) {
-      return null;
-    }
-  }
-  if (value is Map) {
-    return value.cast<String, Object?>();
-  }
-  return null;
-}
+/// Backward-compatible alias for [normalizeMetadata].
+Map<String, Object?>? parseMetadata(dynamic value) => normalizeMetadata(value);
 
 /// Convert a [Bundle] into the rows inserted into `bundle_patches`.
 List<Map<String, dynamic>> bundleToPatchRows(Bundle bundle) =>
@@ -72,18 +68,19 @@ Bundle transformRowToBundle(
   Map<String, dynamic> row, [
   List<Map<String, dynamic>> patchRows = const [],
 ]) {
-  final rawMetadata = parseMetadata(row['metadata']);
+  final rawMetadata = normalizeMetadata(row['metadata']);
   final metadata = rawMetadata == null
       ? null
       : BundleMetadata.fromJson(rawMetadata.cast<String, dynamic>());
-  final patches = patchRows
-      .toList()
+  final patches = patchRows.toList()
     ..sort(
       (left, right) =>
-          (left['order_index'] as num? ?? 0)
-              .compareTo(right['order_index'] as num? ?? 0) +
-          (left['base_bundle_id'] as String? ?? '')
-              .compareTo(right['base_bundle_id'] as String? ?? ''),
+          (left['order_index'] as num? ?? 0).compareTo(
+            right['order_index'] as num? ?? 0,
+          ) +
+          (left['base_bundle_id'] as String? ?? '').compareTo(
+            right['base_bundle_id'] as String? ?? '',
+          ),
     );
 
   final bundlePatches = patches.map((patch) {

package/dart-src/plugins/cloudflare/lib/src/d1_database_plugin.dart

@@ -24,10 +24,7 @@ import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
         ResolveUpdateInfoFromBundlesOptions;
 
 import 'd1_bundle_mapper.dart'
-    show
-        bundleToPatchRows,
-        defaultRolloutCohortCount,
-        transformRowToBundle;
+    show bundleToPatchRows, defaultRolloutCohortCount, transformRowToBundle;
 import 'd1_build_where.dart' show buildWhereClause;
 import 'd1_client.dart' show D1ClientLike;
 
@@ -77,8 +74,9 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
     DatabaseBundleQueryOrder? orderBy,
   ) async {
     final where = buildWhereClause(conditions);
-    final orderBySql =
-        orderBy?.direction == 'asc' ? 'ORDER BY id ASC' : 'ORDER BY id DESC';
+    final orderBySql = orderBy?.direction == 'asc'
+        ? 'ORDER BY id ASC'
+        : 'ORDER BY id DESC';
 
     final rows = await _client.query(
       'SELECT * FROM bundles ${where.sql} $orderBySql LIMIT ? OFFSET ?',
@@ -89,7 +87,9 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
       rows.map((row) => row['id'] as String).toList(),
     );
     return rows
-        .map((row) => transformRowToBundle(row, patchMap[row['id']] ?? const []))
+        .map(
+          (row) => transformRowToBundle(row, patchMap[row['id']] ?? const []),
+        )
         .toList();
   }
 
@@ -105,7 +105,9 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
       rows.map((row) => row['id'] as String).toList(),
     );
     return rows
-        .map((row) => transformRowToBundle(row, patchMap[row['id']] ?? const []))
+        .map(
+          (row) => transformRowToBundle(row, patchMap[row['id']] ?? const []),
+        )
         .toList();
   }
 
@@ -121,9 +123,7 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
       'GROUP BY target_app_version',
       [channel, platform, minBundleId],
     );
-    return rows
-        .map((row) => row['target_app_version'] as String)
-        .toList();
+    return rows.map((row) => row['target_app_version'] as String).toList();
   }
 
   @override
@@ -197,7 +197,8 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
   ) async {
     final where = options.where ?? const DatabaseBundleQueryWhere();
     final limit = options.limit;
-    final offset = options.offset ??
+    final offset =
+        options.offset ??
         (options.page != null ? (options.page! - 1) * limit : 0);
 
     final totalCount = await _getTotalCount(where);
@@ -232,25 +233,19 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
   Future<void> onUnmount() async {}
 
   @override
-  Future<void> commitBundle({
-    required List<BundleChange> changedSets,
-  }) async {
+  Future<void> commitBundle({required List<BundleChange> changedSets}) async {
     if (changedSets.isEmpty) return;
 
     for (final op in changedSets) {
       if (op.operation == BundleChangeOperation.delete) {
-        await _client.query(
-          'DELETE FROM bundle_patches WHERE bundle_id = ?',
-          [op.data.id],
-        );
+        await _client.query('DELETE FROM bundle_patches WHERE bundle_id = ?', [
+          op.data.id,
+        ]);
         await _client.query(
           'DELETE FROM bundle_patches WHERE base_bundle_id = ?',
           [op.data.id],
         );
-        await _client.query(
-          'DELETE FROM bundles WHERE id = ?',
-          [op.data.id],
-        );
+        await _client.query('DELETE FROM bundles WHERE id = ?', [op.data.id]);
       } else {
         final bundle = op.data;
         await _client.query(
@@ -272,9 +267,7 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
             bundle.targetAppVersion,
             bundle.storageUri,
             bundle.fingerprintHash,
-            jsonEncode(
-              bundle.metadata?.toJson() ?? <String, dynamic>{},
-            ),
+            jsonEncode(bundle.metadata?.toJson() ?? <String, dynamic>{}),
             bundle.manifestStorageUri,
             bundle.manifestFileHash,
             bundle.assetBaseStorageUri,
@@ -285,10 +278,9 @@ class D1DatabasePlugin implements AbstractDatabasePlugin {
           ],
         );
 
-        await _client.query(
-          'DELETE FROM bundle_patches WHERE bundle_id = ?',
-          [bundle.id],
-        );
+        await _client.query('DELETE FROM bundle_patches WHERE bundle_id = ?', [
+          bundle.id,
+        ]);
 
         final patchRows = bundleToPatchRows(bundle);
         for (final patchRow in patchRows) {

package/dart-src/plugins/cloudflare/lib/src/r2_config.dart

@@ -35,7 +35,7 @@ class R2S3StorageConfig {
   /// R2 region (defaults to "auto").
   final String region;
 
-  /// Override endpoint (defaults to `https://<accountId>.r2.cloudflarestorage.com`).
+  /// Override endpoint (defaults to `https://{accountId}.r2.cloudflarestorage.com`).
   final String? endpoint;
 
   /// Optional factory used to inject an [R2S3ClientLike] in tests.

package/dart-src/plugins/cloudflare/lib/src/r2_s3_client.dart

@@ -44,7 +44,8 @@ class R2S3Client implements R2S3ClientLike {
   static const String _service = 'r2';
 
   Uri _objectUri(String key) {
-    final host = config.endpoint ??
+    final host =
+        config.endpoint ??
         'https://${config.accountId}.r2.cloudflarestorage.com';
     return Uri.parse('$host/${config.bucketName}/$key');
   }
@@ -56,11 +57,7 @@ class R2S3Client implements R2S3ClientLike {
   }
 
   @override
-  Future<void> putObject(
-    String key,
-    List<int> body,
-    String contentType,
-  ) async {
+  Future<void> putObject(String key, List<int> body, String contentType) async {
     final uri = _objectUri(key);
     final response = await _send(
       'PUT',
@@ -77,7 +74,8 @@ class R2S3Client implements R2S3ClientLike {
   @override
   Future<bool> headObject(String key) async {
     final uri = _objectUri(key);
-    final request = Request('HEAD', uri)..headers.addAll(_authHeaders('HEAD', uri, null));
+    final request = Request('HEAD', uri)
+      ..headers.addAll(_authHeaders('HEAD', uri, null));
     final response = await _http.send(request);
     if (response.statusCode == 404) return false;
     if (response.statusCode < 200 || response.statusCode >= 300) {
@@ -114,21 +112,18 @@ class R2S3Client implements R2S3ClientLike {
       'X-Amz-Expires': '$expiresIn',
       'X-Amz-SignedHeaders': 'host',
     };
-    final canonicalQuery = params.entries
-        .map((e) => '${_uriEncode(e.key)}=${_uriEncode(e.value)}')
-        .toList()
-      ..sort();
+    final canonicalQuery =
+        params.entries
+            .map((e) => '${_uriEncode(e.key)}=${_uriEncode(e.value)}')
+            .toList()
+          ..sort();
     final queryString = canonicalQuery.join('&');
 
     const payloadHash = 'UNSIGNED-PAYLOAD';
     final canonicalHeaders = 'host:${uri.host}\n';
     final canonicalRequest =
         'GET\n${uri.path}\n$queryString\n$canonicalHeaders\nhost\n$payloadHash';
-    final stringToSign = _stringToSign(
-      amzDate,
-      scope,
-      canonicalRequest,
-    );
+    final stringToSign = _stringToSign(amzDate, scope, canonicalRequest);
     final signingKey = _signingKey(dateStamp, config.region);
     final signature = _toHex(_hmac(signingKey, stringToSign));
     return '${uri.scheme}://${uri.host}${uri.path}?$queryString'
@@ -158,23 +153,21 @@ class R2S3Client implements R2S3ClientLike {
 
   // --- signing helpers -------------------------------------------------------
 
-  Map<String, String> _authHeaders(
-    String method,
-    Uri uri,
-    List<int>? body,
-  ) {
+  Map<String, String> _authHeaders(String method, Uri uri, List<int>? body) {
     final now = DateTime.now().toUtc();
     final amzDate = _amzDate(now);
     final dateStamp = amzDate.substring(0, 8);
     final scope = '$dateStamp/${config.region}/$_service/aws4_request';
     final payloadHash = body == null ? _hashHex(const []) : _hashHex(body);
 
-    final canonicalHeaders = 'host:${uri.host}\n'
+    final canonicalHeaders =
+        'host:${uri.host}\n'
         'x-amz-content-sha256:$payloadHash\n'
         'x-amz-date:$amzDate\n';
     const signedHeaders = 'host;x-amz-content-sha256;x-amz-date';
 
-    final canonicalRequest = '$method\n${uri.path}\n'
+    final canonicalRequest =
+        '$method\n${uri.path}\n'
         '\n$canonicalHeaders$signedHeaders\n$payloadHash';
     final stringToSign = _stringToSign(amzDate, scope, canonicalRequest);
     final signingKey = _signingKey(dateStamp, config.region);
@@ -205,7 +198,10 @@ class R2S3Client implements R2S3ClientLike {
 
   List<StorageObject> _parseListObjects(String xml) {
     final objects = <StorageObject>[];
-    final contents = _allMatches(xml, RegExp(r'<Contents>([\s\S]*?)</Contents>'));
+    final contents = _allMatches(
+      xml,
+      RegExp(r'<Contents>([\s\S]*?)</Contents>'),
+    );
     for (final block in contents) {
       final key = _tag(block, 'Key');
       final size = int.tryParse(_tag(block, 'Size') ?? '');
@@ -262,11 +258,7 @@ class R2S3Client implements R2S3ClientLike {
     return m?.group(1);
   }
 
-  static void _assertStatus(
-    Response response,
-    List<int> ok,
-    String operation,
-  ) {
+  static void _assertStatus(Response response, List<int> ok, String operation) {
     if (!ok.contains(response.statusCode)) {
       throw Exception(
         'R2 $operation failed (${response.statusCode}): ${response.body}',

package/dart-src/plugins/cloudflare/lib/src/r2_storage.dart

@@ -14,10 +14,10 @@ import 'r2_storage_profile.dart'
 /// ported here.
 final StoragePlugin Function(R2S3StorageConfig config) r2Storage =
     createUniversalStoragePlugin<R2S3StorageConfig>(
-  name: 'r2Storage',
-  supportedProtocol: 'r2',
-  factory: (config) => (
-    node: createS3StorageProfile(config),
-    runtime: createS3RuntimeStorageProfile(config),
-  ),
-);
+      name: 'r2Storage',
+      supportedProtocol: 'r2',
+      factory: (config) => (
+        node: createS3StorageProfile(config),
+        runtime: createS3RuntimeStorageProfile(config),
+      ),
+    );

package/dart-src/plugins/cloudflare/lib/src/r2_storage_profile.dart

@@ -6,20 +6,13 @@ import 'package:flutter_ota_kit_plugin_core/flutter_ota_kit_plugin_core.dart'
         RuntimeStorageProfile,
         StorageObject,
         createStorageKeyBuilder,
+        ensureExpectedBucket,
         getContentType,
         parseStorageUri;
 
 import 'r2_config.dart' show R2S3StorageConfig, resolveR2Client;
 import 'r2_s3_client.dart' show R2S3ClientLike, readFileBytes, writeFileBytes;
 
-void _ensureExpectedBucket(String bucket, String bucketName) {
-  if (bucket != bucketName) {
-    throw ArgumentError(
-      'Bucket name mismatch: expected "$bucketName", but found "$bucket".',
-    );
-  }
-}
-
 /// Build the node (deploy/CLI) storage profile for R2 S3.
 NodeStorageProfile createS3StorageProfile(R2S3StorageConfig config) {
   final R2S3ClientLike client = resolveR2Client(config);
@@ -55,21 +48,21 @@ class _R2NodeProfile implements NodeStorageProfile {
   @override
   Future<bool> exists(String storageUri) async {
     final parsed = parseStorageUri(storageUri, 'r2');
-    _ensureExpectedBucket(parsed.bucket, _config.bucketName);
+    ensureExpectedBucket(parsed.bucket, _config.bucketName);
     return _client.headObject(parsed.key);
   }
 
   @override
   Future<void> delete(String storageUri) async {
     final parsed = parseStorageUri(storageUri, 'r2');
-    _ensureExpectedBucket(parsed.bucket, _config.bucketName);
+    ensureExpectedBucket(parsed.bucket, _config.bucketName);
     await _client.deleteObject(parsed.key);
   }
 
   @override
   Future<void> downloadFile(String storageUri, String filePath) async {
     final parsed = parseStorageUri(storageUri, 'r2');
-    _ensureExpectedBucket(parsed.bucket, _config.bucketName);
+    ensureExpectedBucket(parsed.bucket, _config.bucketName);
     final bytes = await _client.getObjectAsBytes(parsed.key);
     await writeFileBytes(filePath, bytes);
   }
@@ -79,8 +72,7 @@ class _R2NodeProfile implements NodeStorageProfile {
       _client.listObjects(prefix);
 
   @override
-  Future<void> deleteObjects(List<String> keys) =>
-      _client.deleteObjects(keys);
+  Future<void> deleteObjects(List<String> keys) => _client.deleteObjects(keys);
 }
 
 class _R2RuntimeProfile implements RuntimeStorageProfile {
@@ -92,7 +84,7 @@ class _R2RuntimeProfile implements RuntimeStorageProfile {
   @override
   Future<Map<String, String>> getDownloadUrl(String storageUri) async {
     final parsed = parseStorageUri(storageUri, 'r2');
-    _ensureExpectedBucket(parsed.bucket, _config.bucketName);
+    ensureExpectedBucket(parsed.bucket, _config.bucketName);
     final fileUrl = await _client.getSignedUrl(parsed.key);
     return {'fileUrl': fileUrl};
   }
@@ -100,7 +92,7 @@ class _R2RuntimeProfile implements RuntimeStorageProfile {
   @override
   Future<String?> readText(String storageUri) async {
     final parsed = parseStorageUri(storageUri, 'r2');
-    _ensureExpectedBucket(parsed.bucket, _config.bucketName);
+    ensureExpectedBucket(parsed.bucket, _config.bucketName);
     try {
       return await _client.getObjectAsString(parsed.key);
     } catch (_) {

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

@@ -1,19 +1,18 @@
 name: flutter_ota_kit_cloudflare
 description: Cloudflare D1 + R2 storage plugins for flutter_ota_kit (faithful port of hot-updater plugins/cloudflare).
-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.2
+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.1
+  flutter_ota_kit_plugin_core: ^0.0.3
   crypto: ^3.0.0
   http: ^1.2.0
   path: ^1.9.0
@@ -21,3 +20,9 @@ dependencies:
 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/cloudflare/test/cloudflare_worker_database_test.dart

@@ -21,20 +21,19 @@ Bundle _makeBundle({
   String? targetAppVersion,
   String? message,
   List<BundlePatchArtifact>? patches,
-}) =>
-    Bundle(
-      id: id,
-      channel: channel,
-      enabled: enabled,
-      shouldForceUpdate: false,
-      fileHash: 'h-$id',
-      platform: Platform.android,
-      targetAppVersion: targetAppVersion,
-      storageUri: 's3://$id',
-      fingerprintHash: fingerprintHash,
-      message: message,
-      patches: patches,
-    );
+}) => Bundle(
+  id: id,
+  channel: channel,
+  enabled: enabled,
+  shouldForceUpdate: false,
+  fileHash: 'h-$id',
+  platform: Platform.android,
+  targetAppVersion: targetAppVersion,
+  storageUri: 's3://$id',
+  fingerprintHash: fingerprintHash,
+  message: message,
+  patches: patches,
+);
 
 void main() {
   group('cloudflare d1WorkerDatabase', () {
@@ -57,19 +56,20 @@ void main() {
       expect(channels, containsAll(['production', 'staging']));
     });
 
-    test('getBundleById returns null for missing, bundle for existing',
-        () async {
-      await plugin.appendBundle(_makeBundle(id: 'b1'));
-      await plugin.commitBundle();
+    test(
+      'getBundleById returns null for missing, bundle for existing',
+      () async {
+        await plugin.appendBundle(_makeBundle(id: 'b1'));
+        await plugin.commitBundle();
 
-      expect(await plugin.getBundleById('missing'), isNull);
-      final got = await plugin.getBundleById('b1');
-      expect(got, isNotNull);
-      expect(got!.id, 'b1');
-    });
+        expect(await plugin.getBundleById('missing'), isNull);
+        final got = await plugin.getBundleById('b1');
+        expect(got, isNotNull);
+        expect(got!.id, 'b1');
+      },
+    );
 
-    test('commitBundle append -> update -> delete reflects in store',
-        () async {
+    test('commitBundle append -> update -> delete reflects in store', () async {
       await plugin.appendBundle(_makeBundle(id: 'b1', message: 'original'));
       await plugin.commitBundle();
       expect((await plugin.getBundleById('b1'))!.message, 'original');
@@ -85,24 +85,28 @@ void main() {
       expect(await plugin.getBundleById('b1'), isNull);
     });
 
-    test('getUpdateInfo (appVersion) returns UpdateInfo for compatible bundle',
-        () async {
-      await plugin.appendBundle(_makeBundle(id: 'b1', targetAppVersion: '1.0.0'));
-      await plugin.commitBundle();
+    test(
+      'getUpdateInfo (appVersion) returns UpdateInfo for compatible bundle',
+      () async {
+        await plugin.appendBundle(
+          _makeBundle(id: 'b1', targetAppVersion: '1.0.0'),
+        );
+        await plugin.commitBundle();
 
-      final info = await plugin.getUpdateInfo(
-        AppVersionGetBundlesArgs(
-          platform: Platform.android,
-          bundleId: nilUuid,
-          appVersion: '1.0.0',
-          channel: 'production',
-          minBundleId: nilUuid,
-        ),
-      );
-      expect(info, isNotNull);
-      expect(info!.id, 'b1');
-      expect(info.status, UpdateStatus.update);
-    });
+        final info = await plugin.getUpdateInfo(
+          AppVersionGetBundlesArgs(
+            platform: Platform.android,
+            bundleId: nilUuid,
+            appVersion: '1.0.0',
+            channel: 'production',
+            minBundleId: nilUuid,
+          ),
+        );
+        expect(info, isNotNull);
+        expect(info!.id, 'b1');
+        expect(info.status, UpdateStatus.update);
+      },
+    );
 
     test('getUpdateInfo (fingerprint) returns matching bundle', () async {
       await plugin.appendBundle(_makeBundle(id: 'fp', fingerprintHash: 'fp1'));