@_nazmiforreal/flutter-ota 0.1.11 → 0.1.13

package/dart-src/packages/cli-tools/lib/src/pocketbase/schema_installer.dart

@@ -0,0 +1,237 @@
+/// Installs the flutter_ota_kit PocketBase schema (collections, indexes,
+/// default admin) on a running PB instance.
+///
+/// PocketBase is initialized with:
+///   - `bundles` collection (the OTA bundle metadata)
+///   - `channels` collection (release channels with a current_bundle pointer)
+///   - `audit_log` collection (immutable event log)
+///   - `admins` is left to PB's built-in bootstrapping
+///     (set PB_ADMIN_EMAIL + PB_ADMIN_PASSWORD env vars on first start)
+///
+/// Idempotent: re-running the installer is a no-op when collections exist.
+library;
+
+import 'dart:convert';
+
+import 'package:flutter_ota_kit_pocketbase/flutter_ota_kit_pocketbase.dart';
+import 'package:http/http.dart' as http;
+
+const _kBundlesCollection = r'''
+{
+  "name": "bundles",
+  "type": "base",
+  "listRule": null,
+  "viewRule": null,
+  "createRule": null,
+  "updateRule": null,
+  "deleteRule": null,
+  "fields": [
+    {"name": "channel", "type": "text", "required": true, "options": {"min": 1, "max": 64}},
+    {"name": "enabled", "type": "bool"},
+    {"name": "platform", "type": "text", "required": true, "options": {"min": 1, "max": 16}},
+    {"name": "should_force_update", "type": "bool"},
+    {"name": "file_hash", "type": "text", "required": true},
+    {"name": "storage_uri", "type": "text"},
+    {"name": "rollout_cohort_count", "type": "number", "options": {"min": 0, "max": 1000}},
+    {"name": "message", "type": "text", "options": {"max": 1024}},
+    {"name": "fingerprint_hash", "type": "text", "options": {"max": 128}},
+    {"name": "target_app_version", "type": "text", "options": {"max": 64}},
+    {"name": "git_commit_hash", "type": "text", "options": {"max": 64}},
+    {"name": "manifest_storage_uri", "type": "text", "options": {"max": 512}},
+    {"name": "manifest_file_hash", "type": "text", "options": {"max": 128}},
+    {"name": "asset_base_storage_uri", "type": "text", "options": {"max": 512}},
+    {"name": "target_cohorts", "type": "json"},
+    {"name": "metadata", "type": "json"},
+    {"name": "artifact", "type": "file", "options": {"maxSelect": 1, "maxSize": 0, "mimeTypes": []}}
+  ],
+  "indexes": [
+    "CREATE INDEX idx_bundles_channel ON bundles (channel)",
+    "CREATE INDEX idx_bundles_platform ON bundles (platform)",
+    "CREATE INDEX idx_bundles_enabled ON bundles (enabled)",
+    "CREATE INDEX idx_bundles_created ON bundles (created)"
+  ]
+}
+''';
+
+const _kChannelsCollection = r'''
+{
+  "name": "channels",
+  "type": "base",
+  "listRule": null,
+  "viewRule": null,
+  "createRule": null,
+  "updateRule": null,
+  "deleteRule": null,
+  "fields": [
+    {"name": "name", "type": "text", "required": true, "options": {"min": 1, "max": 64, "pattern": "^[a-zA-Z0-9_-]+$"}},
+    {"name": "current_bundle", "type": "text", "options": {"max": 64}}
+  ],
+  "indexes": [
+    "CREATE UNIQUE INDEX idx_channels_name ON channels (name)"
+  ]
+}
+''';
+
+const _kAuditLogCollection = r'''
+{
+  "name": "audit_log",
+  "type": "base",
+  "listRule": null,
+  "viewRule": null,
+  "createRule": null,
+  "updateRule": null,
+  "deleteRule": null,
+  "fields": [
+    {"name": "user", "type": "text", "options": {"max": 128}},
+    {"name": "action", "type": "text", "required": true, "options": {"min": 1, "max": 64}},
+    {"name": "bundle_id", "type": "text", "options": {"max": 64}},
+    {"name": "channel", "type": "text", "options": {"max": 64}},
+    {"name": "details", "type": "json"}
+  ],
+  "indexes": [
+    "CREATE INDEX idx_audit_action ON audit_log (action)",
+    "CREATE INDEX idx_audit_created ON audit_log (created)"
+  ]
+}
+''';
+
+class _RawAdminClient {
+  _RawAdminClient(this.baseUrl);
+  final String baseUrl;
+  String? _token;
+
+  Future<String> authenticate(String email, String password) async {
+    final res = await http.post(
+      Uri.parse('$baseUrl/api/admins/auth-with-password'),
+      headers: {'content-type': 'application/json'},
+      body: jsonEncode({'identity': email, 'password': password}),
+    );
+    if (res.statusCode != 200) {
+      throw StateError(
+        'PocketBase admin auth failed (HTTP ${res.statusCode}). '
+        'Is PB running and is the admin email/password correct?',
+      );
+    }
+    final body = jsonDecode(res.body) as Map<String, dynamic>;
+    final token = body['token'] as String?;
+    if (token == null || token.isEmpty) {
+      throw StateError('PocketBase returned no admin token.');
+    }
+    _token = token;
+    return token;
+  }
+
+  Future<List<String>> listCollectionNames() async {
+    final res = await http.get(
+      Uri.parse('$baseUrl/api/collections'),
+      headers: {'authorization': _token ?? ''},
+    );
+    if (res.statusCode != 200) {
+      throw StateError(
+        'Failed to list collections (HTTP ${res.statusCode} ${res.body})',
+      );
+    }
+    final body = jsonDecode(res.body) as Map<String, dynamic>;
+    return ((body['items'] as List?) ?? [])
+        .map((c) => (c as Map)['name'] as String? ?? '')
+        .where((n) => n.isNotEmpty)
+        .toList();
+  }
+
+  Future<void> createCollection(String schemaJson) async {
+    final res = await http.post(
+      Uri.parse('$baseUrl/api/collections'),
+      headers: {
+        'authorization': _token ?? '',
+        'content-type': 'application/json',
+      },
+      body: schemaJson,
+    );
+    if (res.statusCode != 200 &&
+        res.statusCode != 201 &&
+        res.statusCode != 400) {
+      throw StateError(
+        'Failed to create collection (HTTP ${res.statusCode} ${res.body})',
+      );
+    }
+    // 400 here usually means the collection already exists; the installer
+    // pre-checks names so this should be a true error.
+  }
+}
+
+class PocketBaseSchemaInstallResult {
+  const PocketBaseSchemaInstallResult({
+    required this.created,
+    required this.skipped,
+  });
+  final List<String> created;
+  final List<String> skipped;
+}
+
+/// Idempotently installs the flutter_ota_kit PocketBase schema.
+class PocketBaseSchemaInstaller {
+  PocketBaseSchemaInstaller({
+    required this.url,
+    required this.adminEmail,
+    required this.adminPassword,
+    http.Client? httpClient,
+    this.bundlesCollection = 'bundles',
+    this.channelsCollection = 'channels',
+    this.auditLogCollection = 'audit_log',
+  });
+
+  final String url;
+  final String adminEmail;
+  final String adminPassword;
+  final String bundlesCollection;
+  final String channelsCollection;
+  final String auditLogCollection;
+
+  Future<PocketBaseSchemaInstallResult> install() async {
+    final client = _RawAdminClient(url);
+    await client.authenticate(adminEmail, adminPassword);
+    final existing = await client.listCollectionNames();
+    final created = <String>[];
+    final skipped = <String>[];
+    for (final spec in _schema()) {
+      if (existing.contains(spec.name)) {
+        skipped.add(spec.name);
+        continue;
+      }
+      await client.createCollection(spec.schema);
+      created.add(spec.name);
+    }
+    return PocketBaseSchemaInstallResult(created: created, skipped: skipped);
+  }
+
+  List<_CollectionSpec> _schema() {
+    // Replace the hard-coded collection names if the user customized them.
+    String rename(String json) {
+      if (bundlesCollection != 'bundles') {
+        json = json.replaceAll('"bundles"', '"$bundlesCollection"');
+      }
+      if (channelsCollection != 'channels') {
+        json = json.replaceAll('"channels"', '"$channelsCollection"');
+      }
+      if (auditLogCollection != 'audit_log') {
+        json = json.replaceAll('"audit_log"', '"$auditLogCollection"');
+      }
+      return json;
+    }
+
+    return [
+      _CollectionSpec(bundlesCollection, rename(_kBundlesCollection)),
+      _CollectionSpec(channelsCollection, rename(_kChannelsCollection)),
+      _CollectionSpec(auditLogCollection, rename(_kAuditLogCollection)),
+    ];
+  }
+}
+
+class _CollectionSpec {
+  const _CollectionSpec(this.name, this.schema);
+  final String name;
+  final String schema;
+}
+
+/// Re-export so callers can use the typed client as well.
+typedef PocketBaseBackend = PocketBaseClient;

package/dart-src/packages/cli-tools/lib/src/runner.dart

@@ -2,6 +2,7 @@ import 'dart:io';
 
 import 'package:args/args.dart';
 import 'package:args/command_runner.dart';
+
 import 'ui/ui.dart';
 import 'verbose.dart';
 
@@ -30,8 +31,10 @@ class FlutterPatcherRunner extends CommandRunner<int> {
       maxName = maxName < n.length ? n.length : maxName;
     }
     final buf = StringBuffer();
-    buf.writeln('  ${cyan('▶')} ${cyan(bold(executableName))} '
-        '${dim('·')} ${bold(description)}');
+    buf.writeln(
+      '  ${cyan('▶')} ${cyan(bold(executableName))} '
+      '${dim('·')} ${bold(description)}',
+    );
     buf.writeln('  ${dim('─' * 60)}');
     buf.writeln('');
     buf.writeln('  ${bold('USAGE')}');
@@ -43,10 +46,14 @@ class FlutterPatcherRunner extends CommandRunner<int> {
       buf.writeln('    ${cyan(n.padRight(maxName))}  ${dim(c.description)}');
     }
     buf.writeln('');
-    buf.writeln('  ${dim('Run "$executableName help <command>" for more about a command.')}');
+    buf.writeln(
+      '  ${dim('Run "$executableName help <command>" for more about a command.')}',
+    );
     buf.writeln('');
     buf.writeln('  ${bold('GLOBAL OPTIONS')}');
-    buf.writeln('    ${cyan('-v, --verbose')}  ${dim('Show full error stack traces.')}');
+    buf.writeln(
+      '    ${cyan('-v, --verbose')}  ${dim('Show full error stack traces.')}',
+    );
     return buf.toString();
   }
 
@@ -72,35 +79,49 @@ abstract class FlutterPatcherCommand extends Command<int> {
   @override
   String get usage {
     final buf = StringBuffer();
-    buf.writeln('  ${cyan('▶')} ${cyan(bold(name))} ${dim('·')} ${bold(description)}');
+    buf.writeln(
+      '  ${cyan('▶')} ${cyan(bold(name))} '
+      '${dim('·')} $description',
+    );
     buf.writeln('  ${dim('─' * 60)}');
     buf.writeln('');
     buf.writeln('  ${bold('USAGE')}');
     buf.writeln('    ${_fullName(this)} [arguments]');
     if (subcommands.isNotEmpty) {
+      buf.writeln('');
+      buf.writeln('  ${bold('COMMANDS')}');
       final names = subcommands.keys.toList()..sort();
       var maxName = 0;
       for (final n in names) {
-        if (n.length > maxName) maxName = n.length;
+        maxName = maxName < n.length ? n.length : maxName;
       }
-      buf.writeln('');
-      buf.writeln('  ${bold('COMMANDS')}');
       for (final n in names) {
         final c = subcommands[n]!;
         buf.writeln('    ${cyan(n.padRight(maxName))}  ${dim(c.description)}');
       }
       buf.writeln('');
-      buf.writeln('  ${dim('Run "${_fullName(this)} <command>" for more about a command.')}');
+      buf.writeln(
+        '  ${dim('Run "${_fullName(this)} <command>" for more about a command.')}',
+      );
     }
     if (argParser.options.isNotEmpty) {
       buf.writeln('');
       buf.writeln('  ${bold('OPTIONS')}');
-      for (final opt in argParser.options.values) {
-        final flags = <String>[];
-        if (opt.abbr != null && opt.abbr!.isNotEmpty) flags.add('-${opt.abbr}');
-        flags.add('--${opt.name}');
-        final flagStr = flags.join(', ');
-        buf.writeln('    ${cyan(flagStr.padRight(22))}  ${dim(opt.help ?? '')}');
+      final optLines = argParser.usage
+          .split('\n')
+          .where((l) => l.trim().isNotEmpty);
+      for (final l in optLines) {
+        final m = RegExp(r'^\s*(-{1,2}[\w-]+)(.*)$').firstMatch(l);
+        if (m != null) {
+          buf.writeln(
+            '    ${cyan(m.group(1)!)}${dim(m.group(2) ?? '')}'.replaceAll(
+              '\n',
+              '\n    ',
+            ),
+          );
+        } else {
+          buf.writeln('    ${dim(l.trim())}');
+        }
       }
     }
     return buf.toString();

package/dart-src/packages/cli-tools/lib/src/sign.dart

@@ -24,7 +24,18 @@ Future<bool> ed25519Verify(
 
 /// The 12-byte DER prefix of an Ed25519 X.509 SubjectPublicKeyInfo.
 const List<int> _ed25519SpkiPrefix = <int>[
-  0x30, 0x2a, 0x30, 0x05, 0x06, 0x03, 0x2b, 0x65, 0x70, 0x03, 0x21, 0x00,
+  0x30,
+  0x2a,
+  0x30,
+  0x05,
+  0x06,
+  0x03,
+  0x2b,
+  0x65,
+  0x70,
+  0x03,
+  0x21,
+  0x00,
 ];
 
 bool _startsWith(List<int> bytes, List<int> prefix) {
@@ -44,10 +55,7 @@ Future<(String, String)> generateEd25519KeyPair() async {
   final keyPair = await Ed25519().newKeyPair();
   final private = await keyPair.extractPrivateKeyBytes();
   final rawPublic = (await keyPair.extractPublicKey()).bytes;
-  final spki = <int>[
-    ..._ed25519SpkiPrefix,
-    ...rawPublic,
-  ];
+  final spki = <int>[..._ed25519SpkiPrefix, ...rawPublic];
   return (base64Encode(private), base64Encode(spki));
 }
 

package/dart-src/packages/cli-tools/lib/src/ui/ui.dart

@@ -21,9 +21,7 @@ const _kCyan = '\x1b[36m';
 const _kGray = '\x1b[90m';
 const _kBold = '\x1b[1m';
 
-const List<String> _frames = [
-  '⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏',
-];
+const List<String> _frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 
 bool get _noColor {
   final v = Platform.environment['NO_COLOR'];
@@ -61,14 +59,17 @@ String kv(String k, String v) {
 
 void banner(String name) {
   _echo('');
-  _echo('  ${cyan('▶')} ${cyan(bold('flutter_ota_kit'))} ${dim('·')} ${bold(name)}');
+  _echo(
+    '  ${cyan('▶')} ${cyan(bold('flutter_ota_kit'))} ${dim('·')} ${bold(name)}',
+  );
   _echo('  ${dim('─' * math.min(_cols - 4, 60))}');
 }
 
 void step(String msg) => _echo('  ${green('✓')} $msg');
 
-void err(String msg) =>
-    _echo('  ${red('✗')} ${red(msg)}');
+void warn(String msg) => _echo('  ${yellow('!')} ${yellow(msg)}');
+
+void err(String msg) => _echo('  ${red('✗')} ${red(msg)}');
 
 /// Run [task] while showing a live spinner; replaces the line with a
 /// `${green('✓')} done` summary when finished (or `✗` on error).
@@ -127,9 +128,7 @@ List<String> _wrap(String text, int inner) {
         line += ' $word';
       } else {
         result.add(line);
-        line = word.length <= inner
-            ? word
-            : _splitLong(word, inner, result);
+        line = word.length <= inner ? word : _splitLong(word, inner, result);
       }
     }
     result.add(line);
@@ -182,8 +181,7 @@ void box(String title, List<String> lines) {
   var dashes = math.max(2, width - 2 - tVisible);
   final left = math.max(1, dashes ~/ 2);
   final right = dashes - left;
-  final top =
-      '╭${'─' * left}$titleText${'─' * right}╮';
+  final top = '╭${'─' * left}$titleText${'─' * right}╮';
   _echo(top);
   for (final l in wrapped) {
     final pad = math.max(0, inner - _dispWidth(l));
@@ -221,8 +219,7 @@ class ProgressBar {
     const barW = 28;
     final pct = total > 0 ? (_current / total).clamp(0.0, 1.0) : 1.0;
     final filled = (barW * pct).round();
-    final bar =
-        '${green('█' * filled)}${gray('·' * (barW - filled))}';
+    final bar = '${green('█' * filled)}${gray('·' * (barW - filled))}';
     _spin = (_spin + 1) % _frames.length;
     final pctStr = '${(pct * 100).round()}%'.padLeft(4);
     stdout.write('\r\x1b[K  ${cyan(_frames[_spin])} $_label  [$bar] $pctStr');

package/dart-src/packages/cli-tools/lib/src/util.dart

@@ -30,7 +30,9 @@ Future<String> zipDirectory(String directory) async {
   }
   final encoder = ZipEncoder();
   final out = encoder.encode(archive);
-  final tmp = File('${Directory.systemTemp.path}/fp_${Random().nextInt(1 << 30)}.zip');
+  final tmp = File(
+    '${Directory.systemTemp.path}/fp_${Random().nextInt(1 << 30)}.zip',
+  );
   await tmp.writeAsBytes(out);
   return tmp.path;
 }