@_nazmiforreal/flutter-ota 0.1.14 → 0.1.15

package/bin/flutter-ota.js

@@ -1,85 +1,36 @@
 #!/usr/bin/env node
 'use strict';
 
-// Launcher for the flutter_ota_kit CLI.
-//
-// Resolves a platform+arch-specific prebuilt binary (`flutter-ota-<os>-<arch>`)
-// shipped next to this script, falling back to `dart run` of the bundled Dart
-// source when no prebuilt exists for the current architecture (e.g. a user on
-// arm64 with only an x64 binary present). This keeps the package installable on
-// any platform that has the Dart SDK, without us needing to ship every binary.
-
-const { spawnSync } = require('child_process');
-const fs = require('fs');
+const { execFileSync } = require('child_process');
 const path = require('path');
+const os = require('os');
 
-function platform() {
-  if (process.platform === 'win32') return 'windows';
-  if (process.platform === 'darwin') return 'macos';
-  return 'linux';
-}
-
-function arch() {
-  // Only x64/arm64 matter for Dart AOT; everything else falls back to Dart VM.
-  return process.arch === 'arm64' ? 'arm64' : 'x64';
-}
+const platform = os.platform();
+const arch = os.arch();
 
-const platformName = platform();
-const archName = arch();
-const ext = process.platform === 'win32' ? '.exe' : '';
-const binDir = __dirname;
-const binName = `flutter-ota-${platformName}-${archName}${ext}`;
-const binPath = path.join(binDir, binName);
+const binaryNames = {
+  'linux-x64': 'flutter-ota-linux-x64',
+  'linux-arm64': 'flutter-ota-linux-arm64',
+  'darwin-x64': 'flutter-ota-darwin-x64',
+  'darwin-arm64': 'flutter-ota-darwin-arm64',
+  'win32-x64': 'flutter-ota-win32-x64.exe',
+};
 
-const sourceEntry = path.join(
-  binDir, '..', 'dart-src', 'packages', 'cli-tools', 'bin', 'flutter_ota_kit.dart',
-);
-const cliDir = path.dirname(path.dirname(sourceEntry));
+const key = `${platform}-${arch}`;
+const binName = binaryNames[key];
 
-function chmodIfNeeded(p) {
-  try {
-    const st = fs.statSync(p);
-    // Ensure owner-executable bit is set.
-    if (!(st.mode & 0o100)) fs.chmodSync(p, st.mode | 0o755);
-  } catch (_) {
-    // Non-fatal.
-  }
+if (!binName) {
+  console.error(`flutter-ota: unsupported platform ${platform}-${arch}`);
+  process.exit(1);
 }
 
-function run(bin, args) {
-  const res = spawnSync(bin, args, { stdio: 'inherit', windowsHide: false });
-  process.exit(res.status == null ? 1 : res.status);
-}
+const binPath = path.join(__dirname, binName);
 
-if (fs.existsSync(binPath)) {
-  chmodIfNeeded(binPath);
-  run(binPath, process.argv.slice(2));
-} else if (
-  spawnSync('dart', ['--version'], { stdio: 'ignore' }).status === 0 &&
-  fs.existsSync(sourceEntry)
-) {
-  // Ensure dependencies are resolved before running from source. We only run
-  // `dart pub get` when the package config is missing, so repeated invocations
-  // don't re-resolve dependencies on every command.
-  const configPath = path.join(cliDir, '.dart_tool', 'package_config.json');
-  if (!fs.existsSync(configPath)) {
-    const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
-    if (getRes.status !== 0) {
-      console.error(
-        'flutter-ota: `dart pub get` failed. Install dependencies or build ' +
-          `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
-          `bin/flutter_ota_kit.dart -o ${binPath}`,
-      );
-      process.exit(1);
-    }
+try {
+  execFileSync(binPath, process.argv.slice(2), { stdio: 'inherit' });
+} catch (err) {
+  if (err.status !== undefined) {
+    process.exit(err.status);
   }
-  chmodIfNeeded(binPath);
-  run('dart', [sourceEntry, ...process.argv.slice(2)]);
-} else {
-  console.error(
-    `flutter-ota: no prebuilt binary for ${platformName}-${archName} and ` +
-      'the Dart SDK was not found. Install Dart (https://dart.dev) or use a ' +
-      'platform/arch with a shipped prebuilt binary.',
-  );
-  process.exit(1);
+  throw err;
 }

package/dart-src/packages/cli-tools/.dart_tool/package_config.json

@@ -454,7 +454,5 @@
   ],
   "generator": "pub",
   "generatorVersion": "3.13.2",
-  "flutterRoot": "file:///tmp/opencode/flutter",
-  "flutterVersion": "3.47.2",
   "pubCache": "file:///home/user/.pub-cache"
 }

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

@@ -59,8 +59,8 @@ import 'src/commands/storage.dart';
 Future<int> run(List<String> args) async {
   final runner =
       FlutterPatcherRunner(
-          'flutter_ota_kit',
-          'flutter_ota_kit CLI — OTA code push for Flutter (hot-updater compatible).',
+          'flutter-ota',
+          'flutter-ota CLI — OTA code push for Flutter (hot-updater compatible).',
         )
         ..addCommand(InitCommand())
         ..addCommand(ConfigCommand())

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

@@ -70,7 +70,7 @@ class BuildCommand extends FlutterPatcherCommand {
     }
 
     banner('build');
-    final bar = ProgressBar(1, 'pack');
+    final bar = ProgressBar(1, 'Packing patch.zip');
     final result = await packPatch(
       apkPath: apk,
       version: version,

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

@@ -1,9 +1,26 @@
-import 'package:args/args.dart';
 import 'package:flutter_ota_kit_cli/flutter_ota_kit_cli.dart';
 
 import '../ui/ui.dart';
 
-/// `flutter_ota_kit bundle` — manage bundles entirely from the CLI (no direct
+final _uuidRe = RegExp(
+  r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$',
+  caseSensitive: false,
+);
+
+void _requireUuid(String? id, String command) {
+  if (id == null || id.isEmpty) {
+    throw PackException('Usage: flutter-ota bundle $command --id <id>', 64);
+  }
+  if (!_uuidRe.hasMatch(id)) {
+    throw PackException(
+      'Invalid UUID format: "$id". '
+      'Expected: 8-4-4-4-12 hex digits.',
+      64,
+    );
+  }
+}
+
+/// `flutter-ota bundle` — manage bundles entirely from the CLI (no direct
 /// DB access needed; the CLI talks to the backend through its plugins).
 class BundleCommand extends FlutterPatcherCommand {
   BundleCommand({this.config, this.backendOverride}) {
@@ -66,7 +83,13 @@ class BundleCommand extends FlutterPatcherCommand {
 }
 
 class BundleListCommand extends FlutterPatcherCommand {
-  BundleListCommand({this.config, this.backendOverride});
+  BundleListCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('channel', abbr: 'c', help: 'Filter by channel.');
+    argParser.addOption('platform', abbr: 'p', help: 'Filter by platform.');
+    argParser.addOption('enabled', help: 'Filter by enabled (true/false).');
+    argParser.addOption('limit', abbr: 'l', defaultsTo: '20', help: 'Page size.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -77,14 +100,6 @@ class BundleListCommand extends FlutterPatcherCommand {
   @override
   String get description => 'List bundles.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('channel', abbr: 'c', help: 'Filter by channel.')
-    ..addOption('platform', abbr: 'p', help: 'Filter by platform.')
-    ..addOption('enabled', help: 'Filter by enabled (true/false).')
-    ..addOption('limit', abbr: 'l', defaultsTo: '20', help: 'Page size.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
@@ -93,13 +108,18 @@ class BundleListCommand extends FlutterPatcherCommand {
     final enabled = enabledRaw == null
         ? null
         : (enabledRaw == 'true' || enabledRaw == '1');
+    final limitRaw = argResults!['limit'] as String;
+    final limit = int.tryParse(limitRaw);
+    if (limit == null || limit < 1) {
+      throw PackException('--limit must be a positive integer (got "$limitRaw")', 64);
+    }
     final res = await listBundles(
       backend,
       ListOptions(
         channel: argResults!['channel'] as String?,
         platform: argResults!['platform'] as String?,
         enabled: enabled,
-        limit: int.parse(argResults!['limit'] as String),
+        limit: limit,
       ),
     );
     banner('bundle · list');
@@ -107,30 +127,33 @@ class BundleListCommand extends FlutterPatcherCommand {
       step('(no bundles)');
       return;
     }
-    final lines = <String>[];
+    final rows = <List<String>>[];
     for (var i = 0; i < res.data.length; i++) {
       final b = res.data[i];
-      final target = b.targetAppVersion ?? b.fingerprintHash ?? dim('-');
-      lines
-        ..add(kv('#$i', cyan(b.id)))
-        ..add(kv('channel', b.channel))
-        ..add(kv('enabled', b.enabled ? green('yes') : yellow('no')))
-        ..add(kv('platform', b.platform.value))
-        ..add(kv('force', b.shouldForceUpdate ? green('yes') : yellow('no')))
-        ..add(kv('target', target));
-      if (b.message != null) lines.add(kv('message', b.message!));
-      if (b.metadata?.signature != null) {
-        lines.add(kv('signature', green('✓ signed')));
-      }
-      lines.add('');
+      final enabled = b.enabled ? green('✓') : red('✗');
+      final force = b.shouldForceUpdate ? green('✓') : dim('✗');
+      rows.add([
+        '$i',
+        cyan(b.id),
+        b.channel,
+        b.platform.value,
+        force,
+        enabled,
+      ]);
     }
-    box('${res.data.length} bundles', lines);
-    step('total: ${res.pagination.total}');
+    table(
+      '${res.data.length} bundles (total: ${res.pagination.total})',
+      ['#', 'ID', 'CHANNEL', 'PLAT', 'FORCE', 'ON'],
+      rows,
+    );
   });
 }
 
 class BundleShowCommand extends FlutterPatcherCommand {
-  BundleShowCommand({this.config, this.backendOverride});
+  BundleShowCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -141,21 +164,14 @@ class BundleShowCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Show a single bundle\'s details.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException('Usage: flutter_ota_kit bundle show --id <id>', 64);
-    }
+    _requireUuid(id, 'show');
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · show');
-    final b = await backend.db.getBundleById(id);
+    final b = await backend.db.getBundleById(id!);
     if (b == null) {
       step('(not found)');
       return;
@@ -177,7 +193,15 @@ class BundleShowCommand extends FlutterPatcherCommand {
 }
 
 class BundleDeleteCommand extends FlutterPatcherCommand {
-  BundleDeleteCommand({this.config, this.backendOverride});
+  BundleDeleteCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addFlag(
+      'keep-storage',
+      help: 'Do not delete the storage object.',
+      negatable: false,
+    );
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -188,47 +212,42 @@ class BundleDeleteCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Delete a bundle by id.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.')
-    ..addFlag(
-      'keep-storage',
-      help: 'Do not delete the storage object.',
-      negatable: false,
-    );
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException('Usage: flutter_ota_kit bundle delete --id <id>', 64);
-    }
+    _requireUuid(id, 'delete');
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · delete');
-    final existing = await backend.db.getBundleById(id);
+    final existing = await backend.db.getBundleById(id!);
     if (existing == null) {
       throw StateError('Bundle "$id" not found.');
     }
     final keepStorage = argResults!['keep-storage'] as bool;
+    final steps = Steps('delete');
     await spinner(
       () => deleteBundle(backend, id),
       'Deleting bundle $id',
       done: 'Deleted',
     );
+    steps.success('Deleted bundle $id');
     if (!keepStorage && existing.storageUri.isNotEmpty) {
       await spinner(
         () => backend.storage.delete(existing.storageUri),
         'Removing storage object',
         done: 'Storage removed',
       );
+      steps.success('Removed storage object');
     }
+    steps.summary();
   });
 }
 
 class BundleDisableCommand extends FlutterPatcherCommand {
-  BundleDisableCommand({this.config, this.backendOverride});
+  BundleDisableCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -239,26 +258,16 @@ class BundleDisableCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Disable a bundle (stop serving it).';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException(
-        'Usage: flutter_ota_kit bundle disable --id <id>',
-        64,
-      );
-    }
+    _requireUuid(id, 'disable');
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · disable');
     await spinner(
       () async {
-        await backend.db.updateBundle(id, {'enabled': false});
+        await backend.db.updateBundle(id!, {'enabled': false});
         await backend.db.commitBundle();
       },
       'Disabling bundle $id',
@@ -268,7 +277,10 @@ class BundleDisableCommand extends FlutterPatcherCommand {
 }
 
 class BundleEnableCommand extends FlutterPatcherCommand {
-  BundleEnableCommand({this.config, this.backendOverride});
+  BundleEnableCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -279,23 +291,16 @@ class BundleEnableCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Enable a bundle.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException('Usage: flutter_ota_kit bundle enable --id <id>', 64);
-    }
+    _requireUuid(id, 'enable');
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · enable');
     await spinner(
       () async {
-        await backend.db.updateBundle(id, {'enabled': true});
+        await backend.db.updateBundle(id!, {'enabled': true});
         await backend.db.commitBundle();
       },
       'Enabling bundle $id',
@@ -305,7 +310,14 @@ class BundleEnableCommand extends FlutterPatcherCommand {
 }
 
 class BundleForceCommand extends FlutterPatcherCommand {
-  BundleForceCommand({this.config, this.backendOverride});
+  BundleForceCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addFlag(
+      'off',
+      help: 'Clear the force-update flag instead of setting it.',
+    );
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -316,31 +328,17 @@ class BundleForceCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Force an update onto clients (--off to clear).';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.')
-    ..addFlag(
-      'off',
-      help: 'Clear the force-update flag instead of setting it.',
-    );
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException(
-        'Usage: flutter_ota_kit bundle force --id <id> [--off]',
-        64,
-      );
-    }
+    _requireUuid(id, 'force');
     final off = argResults!['off'] as bool;
     final cfg = effectiveConfig(config ?? loadConfig(), argResults!);
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · force');
     await spinner(
       () async {
-        await backend.db.updateBundle(id, {
+        await backend.db.updateBundle(id!, {
           'shouldForceUpdate': !off,
           if (!off) 'enabled': true,
         });
@@ -353,7 +351,11 @@ class BundleForceCommand extends FlutterPatcherCommand {
 }
 
 class BundlePromoteCommand extends FlutterPatcherCommand {
-  BundlePromoteCommand({this.config, this.backendOverride});
+  BundlePromoteCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('channel', abbr: 'c', help: 'Target channel.');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -364,19 +366,14 @@ class BundlePromoteCommand extends FlutterPatcherCommand {
   @override
   String get description => 'Promote a bundle to a channel.';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.')
-    ..addOption('channel', abbr: 'c', help: 'Target channel.');
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
     final channel = argResults!['channel'] as String?;
-    if (id == null || id.isEmpty || channel == null || channel.isEmpty) {
+    _requireUuid(id, 'promote');
+    if (channel == null || channel.isEmpty) {
       throw PackException(
-        'Usage: flutter_ota_kit bundle promote --id <id> --channel <channel>',
+        'Usage: flutter-ota bundle promote --id <id> --channel <channel>',
         64,
       );
     }
@@ -384,16 +381,23 @@ class BundlePromoteCommand extends FlutterPatcherCommand {
     final backend = requireBackend(cfg, override: backendOverride);
     banner('bundle · promote');
     await spinner(
-      () => promoteBundle(backend, id, channel),
+      () => promoteBundle(backend, id!, channel),
       'Promoting $id to $channel',
       done: 'Promoted',
     );
-    box('promote', [kv('bundle', cyan(id)), kv('channel', channel)]);
+    box('promote', [kv('bundle', cyan(id!)), kv('channel', channel)]);
   });
 }
 
 class BundleUpdateCommand extends FlutterPatcherCommand {
-  BundleUpdateCommand({this.config, this.backendOverride});
+  BundleUpdateCommand({this.config, this.backendOverride}) {
+    argParser.addOption('backend', abbr: 'b', help: 'Backend provider.');
+    argParser.addOption('id', help: 'Bundle id.');
+    argParser.addOption('message', abbr: 'm', help: 'New release message.');
+    argParser.addOption('target-version', help: 'New target app version (e.g. 1.0.0).');
+    argParser.addOption('enabled', help: 'Set enabled (true/false).');
+    argParser.addOption('force', abbr: 'f', help: 'Set force-update (true/false).');
+  }
 
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
@@ -405,26 +409,10 @@ class BundleUpdateCommand extends FlutterPatcherCommand {
   String get description =>
       'Edit a bundle\'s metadata (message / target version / enabled / force).';
 
-  @override
-  ArgParser get argParser => ArgParser()
-    ..addOption('backend', abbr: 'b', help: 'Backend provider.')
-    ..addOption('id', help: 'Bundle id.')
-    ..addOption('message', abbr: 'm', help: 'New release message.')
-    ..addOption('target-version', help: 'New target app version (e.g. 1.0.0).')
-    ..addOption('enabled', help: 'Set enabled (true/false).')
-    ..addOption('force', abbr: 'f', help: 'Set force-update (true/false).');
-
   @override
   Future<int> run() => runGuarded(() async {
     final id = argResults!['id'] as String?;
-    if (id == null || id.isEmpty) {
-      throw PackException(
-        'Usage: flutter-ota bundle update --id <id> '
-        '[--message <m>] [--target-version <v>] [--enabled true|false] '
-        '[--force true|false]',
-        64,
-      );
-    }
+    _requireUuid(id, 'update');
     final patch = <String, Object?>{};
     final message = argResults!['message'] as String?;
     if (message != null) patch['message'] = message;
@@ -446,13 +434,13 @@ class BundleUpdateCommand extends FlutterPatcherCommand {
     banner('bundle · update');
     await spinner(
       () async {
-        await backend.db.updateBundle(id, patch);
+        await backend.db.updateBundle(id!, patch);
         await backend.db.commitBundle();
       },
       'Updating $id',
       done: 'Updated',
     );
-    final b = await backend.db.getBundleById(id);
+    final b = await backend.db.getBundleById(id!);
     if (b != null) {
       box('bundle', [
         kv('id', cyan(b.id)),