@_nazmiforreal/flutter-ota 0.1.20 → 0.1.22

package/dart-src/packages/cli-tools/lib/src/commands/doctor.dart

@@ -1,5 +1,8 @@
+import 'dart:convert';
 import 'dart:io';
 
+import 'package:http/http.dart' as http;
+
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
 
 import '../ui/ui.dart';
@@ -7,7 +10,14 @@ import '../ui/ui.dart';
 /// `flutter-ota doctor` — environment + backend connectivity check.
 class DoctorCommand extends FlutterPatcherCommand {
   DoctorCommand({this.config, this.backendOverride}) {
-    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    final detected = config?.provider ?? loadConfig()?.provider;
+    argParser.addOption(
+      'backend',
+      abbr: 'b',
+      help: detected != null
+          ? 'Backend provider [detected: $detected].'
+          : 'Backend provider.',
+    );
   }
 
   final FlutterPatcherConfig? config;
@@ -41,10 +51,8 @@ class DoctorCommand extends FlutterPatcherCommand {
     steps.success('Channel ${cfg.channel}');
     steps.success('Platform ${cfg.platform}');
 
-    // PocketBase-specific: show binary + health endpoint status.
-    if (cfg.provider == 'pocketbase') {
-      await _checkPocketBase(cfg, steps);
-    }
+    // Backend-specific pre-flight checks.
+    await _checkProvider(cfg, steps);
 
     try {
       final backend = requireBackend(cfg, override: backendOverride);
@@ -55,19 +63,120 @@ class DoctorCommand extends FlutterPatcherCommand {
       final time = ms >= 1000
           ? '${(ms / 1000).toStringAsFixed(1)}s'
           : '${ms}ms';
-      steps.success(
-        'Backend reachable — ${channels.join(', ')} in $time',
-      );
+      steps.success('Backend reachable — ${channels.join(', ')} in $time');
     } catch (e) {
       steps.fail('Backend unreachable — $e');
     }
     steps.summary();
   });
 
-  Future<void> _checkPocketBase(
-    FlutterPatcherConfig cfg,
-    Steps steps,
-  ) async {
+  Future<void> _checkProvider(FlutterPatcherConfig cfg, Steps steps) async {
+    switch (cfg.provider) {
+      case 'supabase':
+        await _checkSupabase(cfg, steps);
+      case 'postgres':
+        await _checkPostgres(cfg, steps);
+      case 'cloudflare':
+        await _checkCloudflare(cfg, steps);
+      case 'aws':
+        await _checkAws(cfg, steps);
+      case 'pocketbase':
+        await _checkPocketBase(cfg, steps);
+      default:
+        steps.fail('Unknown provider: ${cfg.provider}');
+    }
+  }
+
+  Future<void> _checkSupabase(FlutterPatcherConfig cfg, Steps steps) async {
+    final url = cfg.supabase.url;
+    if (url == null || url.isEmpty) {
+      steps.fail('SUPABASE_URL not set');
+      return;
+    }
+    try {
+      final res = await http
+          .get(Uri.parse('$url/rest/v1/'))
+          .timeout(const Duration(seconds: 5));
+      if (res.statusCode < 400) {
+        steps.success('Supabase reachable ($url)');
+      } else {
+        steps.fail('Supabase returned ${res.statusCode}');
+      }
+    } catch (e) {
+      steps.fail('Supabase unreachable — $e');
+    }
+  }
+
+  Future<void> _checkPostgres(FlutterPatcherConfig cfg, Steps steps) async {
+    final host = cfg.postgres.host;
+    if (host == null || host.isEmpty) {
+      steps.fail('POSTGRES_HOST not set');
+      return;
+    }
+    final port = int.tryParse(cfg.postgres.port ?? '5432') ?? 5432;
+    try {
+      final socket = await Socket.connect(
+        host,
+        port,
+      ).timeout(const Duration(seconds: 5));
+      await socket.close();
+      steps.success('Postgres reachable ($host:$port)');
+    } catch (e) {
+      steps.fail('Postgres unreachable — $e');
+    }
+  }
+
+  Future<void> _checkCloudflare(FlutterPatcherConfig cfg, Steps steps) async {
+    final accountId = cfg.cloudflare.accountId;
+    final apiToken = cfg.cloudflare.apiToken;
+    if (accountId == null || accountId.isEmpty) {
+      steps.fail('CLOUDFLARE_ACCOUNT_ID not set');
+      return;
+    }
+    if (apiToken == null || apiToken.isEmpty) {
+      steps.fail('CLOUDFLARE_API_TOKEN not set');
+      return;
+    }
+    try {
+      final res = await http
+          .get(
+            Uri.parse(
+              'https://api.cloudflare.com/client/v4/accounts/$accountId',
+            ),
+            headers: {
+              'Authorization': 'Bearer $apiToken',
+              'Content-Type': 'application/json',
+            },
+          )
+          .timeout(const Duration(seconds: 5));
+      final body = jsonDecode(res.body) as Map<String, dynamic>;
+      if (body['success'] == true) {
+        steps.success('Cloudflare account reachable');
+      } else {
+        final errors = body['errors'] as List? ?? [];
+        final msg = errors.isNotEmpty ? errors.first['message'] : res.body;
+        steps.fail('Cloudflare API error: $msg');
+      }
+    } catch (e) {
+      steps.fail('Cloudflare unreachable — $e');
+    }
+  }
+
+  Future<void> _checkAws(FlutterPatcherConfig cfg, Steps steps) async {
+    final bucket = cfg.aws.bucket;
+    if (bucket == null || bucket.isEmpty) {
+      steps.fail('AWS_BUCKET not set');
+      return;
+    }
+    final region = cfg.aws.region;
+    if (region == null || region.isEmpty) {
+      steps.fail('AWS_REGION not set');
+      return;
+    }
+    steps.success('AWS S3 bucket "$bucket" in $region');
+  }
+
+  Future<void> _checkPocketBase(FlutterPatcherConfig cfg, Steps steps) async {
     final paths = PocketBaseInstallPaths.resolve();
     final installed = await paths.binaryPath.exists();
     if (installed) {
@@ -79,8 +188,8 @@ class DoctorCommand extends FlutterPatcherCommand {
     }
     final url = cfg.pocketbase.url;
     if (url != null && url.isNotEmpty) {
+      final client = PocketBaseClient(url);
       try {
-        final client = PocketBaseClient(url);
         final ok = await client.health();
         if (ok) {
           steps.success('PocketBase reachable');
@@ -89,6 +198,8 @@ class DoctorCommand extends FlutterPatcherCommand {
         }
       } catch (e) {
         steps.fail('PocketBase unreachable — $e');
+      } finally {
+        client.close();
       }
     }
   }

package/dart-src/packages/cli-tools/lib/src/commands/fingerprint.dart

@@ -25,6 +25,7 @@ class FingerprintCommand extends FlutterPatcherCommand {
     banner(name);
     final source = argResults!['source'] as String;
     final hash = generateFingerprint(source);
-    box('fingerprint', [kv('source', source), kv('hash', hash)]);
+    step('source ${dim(source)}');
+    step('hash   ${cyan(hash)}');
   });
 }

package/dart-src/packages/cli-tools/lib/src/commands/init.dart

@@ -31,7 +31,11 @@ class InitCommand extends FlutterPatcherCommand {
       defaultsTo: 'production',
       help: 'Default channel.',
     );
-    argParser.addOption('platform', defaultsTo: 'android', help: 'Default platform.');
+    argParser.addOption(
+      'platform',
+      defaultsTo: 'android',
+      help: 'Default platform.',
+    );
     argParser.addOption(
       'source',
       abbr: 's',
@@ -42,7 +46,11 @@ class InitCommand extends FlutterPatcherCommand {
       'global',
       help: 'Write to the global ~/.flutter_ota_kit config (no scaffolding).',
     );
-    argParser.addFlag('force', abbr: 'f', help: 'Overwrite an existing config.');
+    argParser.addFlag(
+      'force',
+      abbr: 'f',
+      help: 'Overwrite an existing config.',
+    );
   }
 
   final FlutterPatcherConfig? config;
@@ -226,10 +234,7 @@ class InitCommand extends FlutterPatcherCommand {
               'Supabase service role key',
               env['SUPABASE_SERVICE_ROLE_KEY'],
             ),
-            anonKey: _p(
-              'Supabase publishable key',
-              env['SUPABASE_PUBLISHABLE_KEY'],
-            ),
+            anonKey: _p('Supabase anon key', env['SUPABASE_ANON_KEY']),
             bucket: _p('Storage bucket', env['SUPABASE_BUCKET'] ?? 'bundles'),
             basePath: _p('Storage base path', env['SUPABASE_BASE_PATH']),
             managementKey: _p(
@@ -248,8 +253,10 @@ class InitCommand extends FlutterPatcherCommand {
     step('Wrote ${file.path}');
 
     if (global) {
-      warn('Secrets are stored in plaintext under ~/.flutter_ota_kit. '
-          'Restrict permissions and use a secrets manager in production.');
+      warn(
+        'Secrets are stored in plaintext under ~/.flutter_ota_kit. '
+        'Restrict permissions and use a secrets manager in production.',
+      );
       return;
     }
 
@@ -259,21 +266,33 @@ class InitCommand extends FlutterPatcherCommand {
     stdout.writeln();
     stdout.writeln('  ${cyan('Next steps:')}');
     step('1. ${dim('flutter pub get')}');
-    step('2. In lib/main.dart call ${green('await setupFlutterOta();')} '
-        'right after WidgetsFlutterBinding.ensureInitialized() (before runApp). '
-        'A `.env` scaffold was written — put secrets there, then build with '
-        '`--dart-define-from-file=.env` (environment overrides config).');
+    step(
+      '2. In lib/main.dart call ${green('await setupFlutterOta();')} '
+      'right after WidgetsFlutterBinding.ensureInitialized() (before runApp). '
+      'A `.env` scaffold was written — put secrets there, then build with '
+      '`--dart-define-from-file=.env` (environment overrides config).',
+    );
     if (provider == 'supabase') {
-      step('3. Provision the backend once: ${dim('flutter-ota migrate supabase')}');
+      step(
+        '3. Provision the backend once: ${dim('flutter-ota migrate supabase')}',
+      );
     } else if (provider == 'postgres') {
       step('3. Provision the backend: ${dim('flutter-ota migrate postgres')}');
+    } else if (provider == 'cloudflare') {
+      step(
+        '3. Provision the backend: ${dim('flutter-ota migrate cloudflare')}',
+      );
+    } else if (provider == 'aws') {
+      step('3. Provision the backend: ${dim('flutter-ota migrate aws')}');
     } else if (provider == 'pocketbase') {
-      step('3. Install PocketBase + provision the schema: '
-          '${dim('flutter-ota pocketbase install')} then '
-          '${dim('flutter-ota pocketbase serve')}.');
+      step(
+        '3. Provision the backend: ${dim('flutter-ota migrate pocketbase')}',
+      );
     }
-    step('4. Build a patch: ${dim('flutter-ota build --name 1.0.1')} '
-        'then ${dim('flutter-ota deploy')}');
+    step(
+      '4. Build a patch: ${dim('flutter-ota build --version 1.0.1')} '
+      'then ${dim('flutter-ota deploy')}',
+    );
   });
 
   /// Generate the integration files (pubspec dep, manifest permission, setup dart
@@ -304,7 +323,9 @@ class InitCommand extends FlutterPatcherCommand {
     final marker = '\ndependencies:';
     final idx = content.indexOf(marker);
     if (idx == -1) {
-      warn('Could not find a `dependencies:` block; add `flutter_ota_kit` manually.');
+      warn(
+        'Could not find a `dependencies:` block; add `flutter_ota_kit` manually.',
+      );
       return;
     }
     final insertAt = idx + marker.length;
@@ -326,7 +347,9 @@ class InitCommand extends FlutterPatcherCommand {
     }
     final match = RegExp(r'<manifest[^>]*>').firstMatch(content);
     if (match == null) {
-      warn('Could not locate <manifest> tag; add INTERNET permission manually.');
+      warn(
+        'Could not locate <manifest> tag; add INTERNET permission manually.',
+      );
       return;
     }
     final insertAt = match.end;
@@ -420,7 +443,7 @@ class InitCommand extends FlutterPatcherCommand {
       default:
         final c = cfg.supabase;
         entries['SUPABASE_URL'] = c.url ?? '';
-        entries['SUPABASE_PUBLISHABLE_KEY'] = c.anonKey ?? '';
+        entries['SUPABASE_ANON_KEY'] = c.anonKey ?? '';
         entries['SUPABASE_BUCKET'] = c.bucket ?? 'bundles';
         entries['CHANNEL'] = cfg.channel;
         entries['APP_VERSION'] = '';
@@ -462,7 +485,14 @@ class InitCommand extends FlutterPatcherCommand {
     step('Added .env to .gitignore');
   }
 
-  String _q(String? s) => s == null ? "''" : "'${s.replaceAll("'", "\\'")}'";
+  String _q(String? s) {
+    if (s == null) return "''";
+    final escaped = s
+        .replaceAll('\\', '\\\\')
+        .replaceAll('\$', '\\\$')
+        .replaceAll("'", "\\'");
+    return "'$escaped'";
+  }
 
   /// Build the body of `lib/flutter_ota_kit_setup.dart` for the selected backend.
   ///
@@ -489,7 +519,7 @@ class InitCommand extends FlutterPatcherCommand {
     password: const String.fromEnvironment('POSTGRES_PASSWORD', defaultValue: ''),
     servingBaseUrl: const String.fromEnvironment('POSTGRES_SERVING_BASE_URL', defaultValue: ${_q(c.servingBaseUrl ?? '')}),
     channel: const String.fromEnvironment('CHANNEL', defaultValue: $channel),
-    platform: Platform.android,
+    platform: Platform.${cfg.platform},
     updateStrategy: UpdateStrategy.appVersion,
     appVersion: $appVersionExpr,
   ));''';
@@ -506,7 +536,7 @@ class InitCommand extends FlutterPatcherCommand {
     secretAccessKey: const String.fromEnvironment('R2_SECRET_ACCESS_KEY', defaultValue: ''),
     basePath: const String.fromEnvironment('R2_BASE_PATH', defaultValue: ${_q(c.r2BasePath ?? '')}),
     channel: const String.fromEnvironment('CHANNEL', defaultValue: $channel),
-    platform: Platform.android,
+    platform: Platform.${cfg.platform},
     updateStrategy: UpdateStrategy.appVersion,
     appVersion: $appVersionExpr,
   ));''';
@@ -522,7 +552,7 @@ class InitCommand extends FlutterPatcherCommand {
     basePath: const String.fromEnvironment('AWS_BASE_PATH', defaultValue: ${_q(c.basePath ?? '')}),
     endpoint: const String.fromEnvironment('AWS_ENDPOINT', defaultValue: ${_q(c.endpoint ?? '')}),
     channel: const String.fromEnvironment('CHANNEL', defaultValue: $channel),
-    platform: Platform.android,
+    platform: Platform.${cfg.platform},
     updateStrategy: UpdateStrategy.appVersion,
     appVersion: $appVersionExpr,
   ));''';
@@ -537,7 +567,7 @@ class InitCommand extends FlutterPatcherCommand {
     bundlesCollection: const String.fromEnvironment('POCKETBASE_BUNDLES_COLLECTION', defaultValue: ${_q(c.bundlesCollection)}),
     bundlesBucket: const String.fromEnvironment('POCKETBASE_BUCKET', defaultValue: ${_q(c.bundlesBucket)}),
     channel: const String.fromEnvironment('CHANNEL', defaultValue: $channel),
-    platform: Platform.android,
+    platform: Platform.${cfg.platform},
     updateStrategy: UpdateStrategy.appVersion,
     appVersion: $appVersionExpr,
   ));''';
@@ -548,10 +578,10 @@ class InitCommand extends FlutterPatcherCommand {
             '''
   FlutterPatcher.configureSupabase(SupabaseUpdateConfig(
      supabaseUrl: const String.fromEnvironment('SUPABASE_URL', defaultValue: ${_q(c.url ?? '')}),
-     anonKey: const String.fromEnvironment('SUPABASE_PUBLISHABLE_KEY', defaultValue: ''),
+     anonKey: const String.fromEnvironment('SUPABASE_ANON_KEY', defaultValue: ''),
      bucket: const String.fromEnvironment('SUPABASE_BUCKET', defaultValue: ${_q(c.bucket ?? 'bundles')}),
     channel: const String.fromEnvironment('CHANNEL', defaultValue: $channel),
-    platform: Platform.android,
+    platform: Platform.${cfg.platform},
     updateStrategy: UpdateStrategy.appVersion,
     appVersion: $appVersionExpr,
     sdkVersion: const String.fromEnvironment('SDK_VERSION', defaultValue: '1.0.0'),

package/dart-src/packages/cli-tools/lib/src/commands/keys.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';
 
 import '../cli_base.dart';
 import '../config.dart';
@@ -8,7 +9,10 @@ import '../ui/ui.dart';
 /// `flutter_ota_kit keys` — generate an Ed25519 keypair for bundle signing.
 class KeysCommand extends FlutterPatcherCommand {
   KeysCommand() {
-    argParser.addFlag('save', help: 'Persist the public key into the project config.');
+    argParser.addFlag(
+      'save',
+      help: 'Persist the public key into the project config.',
+    );
   }
 
   @override
@@ -38,11 +42,10 @@ class KeysCommand extends FlutterPatcherCommand {
       final file = configCandidates().first;
       final json =
           file.existsSync() && file.readAsStringSync().trim().isNotEmpty
-              ? (jsonDecode(file.readAsStringSync()) as Map<String, dynamic>)
-              : <String, dynamic>{};
+          ? (jsonDecode(file.readAsStringSync()) as Map<String, dynamic>)
+          : <String, dynamic>{};
       writePath(json, 'publicKey', publicB64);
-      await steps.run<void>('Saving public key to ${file.path}',
-          () async {
+      await steps.run<void>('Saving public key to ${file.path}', () async {
         _save(json);
       });
     }
@@ -53,5 +56,8 @@ class KeysCommand extends FlutterPatcherCommand {
     final file = configCandidates().first;
     file.parent.createSync(recursive: true);
     file.writeAsStringSync(const JsonEncoder.withIndent('  ').convert(json));
+    if (!Platform.isWindows) {
+      Process.runSync('chmod', ['600', file.path]);
+    }
   }
 }