@_nazmiforreal/flutter-ota 0.1.4 → 0.1.5

package/bin/flutter-patcher.js

@@ -34,29 +34,46 @@ const binPath = path.join(binDir, binName);
 const sourceEntry = path.join(
   binDir, '..', 'dart-src', 'packages', 'cli-tools', 'bin', 'flutter_patcher.dart',
 );
+const cliDir = path.dirname(path.dirname(sourceEntry));
 
-function run(bin, args, cwd) {
-  const res = spawnSync(bin, args, { stdio: 'inherit', windowsHide: false, cwd });
+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.
+  }
+}
+
+function run(bin, args) {
+  const res = spawnSync(bin, args, { stdio: 'inherit', windowsHide: false });
   process.exit(res.status == null ? 1 : res.status);
 }
 
 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.
-  const cliDir = path.dirname(path.dirname(sourceEntry));
-  const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
-  if (getRes.status !== 0) {
-    console.error(
-      'flutter-patcher: `dart pub get` failed. Install dependencies or build ' +
-        `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
-        `bin/flutter_patcher.dart -o ${binPath}`,
-    );
-    process.exit(1);
+  // 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-patcher: `dart pub get` failed. Install dependencies or build ' +
+          `a prebuilt manually:\n  cd ${cliDir} && dart compile exe ` +
+          `bin/flutter_patcher.dart -o ${binPath}`,
+      );
+      process.exit(1);
+    }
   }
+  chmodIfNeeded(binPath);
   run('dart', [sourceEntry, ...process.argv.slice(2)]);
 } else {
   console.error(

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

@@ -31,6 +31,7 @@ export 'src/commands/console.dart';
 
 import 'src/commands/build.dart';
 import 'src/commands/bundle.dart';
+import 'src/runner.dart';
 import 'src/commands/channel.dart';
 import 'src/commands/config_command.dart';
 import 'src/commands/console.dart';
@@ -44,7 +45,7 @@ import 'src/commands/rollback.dart';
 
 /// Entry point: build the command runner and dispatch [args].
 Future<int> run(List<String> args) async {
-  final runner = CommandRunner<int>(
+  final runner = FlutterPatcherRunner(
     'flutter_patcher',
     'flutter_patcher CLI — OTA code push for Flutter (hot-updater compatible).',
   )

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

@@ -5,6 +5,8 @@ import 'config.dart';
 import 'pack.dart';
 import 'ui/ui.dart';
 
+export 'runner.dart';
+
 /// Run [body], mapping errors to a non-zero exit code with a clean message.
 Future<int> runGuarded(Future<void> Function() body) async {
   try {

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

@@ -1,4 +1,3 @@
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
@@ -8,7 +7,7 @@ import '../ui/ui.dart';
 ///
 /// Includes every ABI found in the APK so a single bundle installs on all
 /// device architectures.
-class BuildCommand extends Command<int> {
+class BuildCommand extends FlutterPatcherCommand {
   BuildCommand() {
     argParser
       ..addOption(

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

@@ -1,11 +1,10 @@
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher bundle` — manage bundles.
-class BundleCommand extends Command<int> {
+class BundleCommand extends FlutterPatcherCommand {
   BundleCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -28,7 +27,7 @@ class BundleCommand extends Command<int> {
       });
 }
 
-class BundleListCommand extends Command<int> {
+class BundleListCommand extends FlutterPatcherCommand {
   BundleListCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -94,7 +93,7 @@ class BundleListCommand extends Command<int> {
       });
 }
 
-class BundleDeleteCommand extends Command<int> {
+class BundleDeleteCommand extends FlutterPatcherCommand {
   BundleDeleteCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -128,7 +127,7 @@ class BundleDeleteCommand extends Command<int> {
       });
 }
 
-class BundlePromoteCommand extends Command<int> {
+class BundlePromoteCommand extends FlutterPatcherCommand {
   BundlePromoteCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,11 +1,10 @@
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher channel` — manage channels.
-class ChannelCommand extends Command<int> {
+class ChannelCommand extends FlutterPatcherCommand {
   final FlutterPatcherConfig? config;
   final Backend? backendOverride;
 
@@ -32,7 +31,7 @@ class ChannelCommand extends Command<int> {
       });
 }
 
-class ChannelListCommand extends Command<int> {
+class ChannelListCommand extends FlutterPatcherCommand {
   ChannelListCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -62,7 +61,7 @@ class ChannelListCommand extends Command<int> {
       });
 }
 
-class ChannelGetCommand extends Command<int> {
+class ChannelGetCommand extends FlutterPatcherCommand {
   ChannelGetCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;
@@ -103,7 +102,7 @@ class ChannelGetCommand extends Command<int> {
       });
 }
 
-class ChannelSetCommand extends Command<int> {
+class ChannelSetCommand extends FlutterPatcherCommand {
   ChannelSetCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -2,13 +2,12 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../cli_base.dart';
 import '../config.dart';
 
 /// `flutter_patcher config` — get/set/list config values.
-class ConfigCommand extends Command<int> {
+class ConfigCommand extends FlutterPatcherCommand {
   ConfigCommand() {
     addSubcommand(ConfigGetCommand());
     addSubcommand(ConfigSetCommand());
@@ -45,7 +44,7 @@ void _saveProjectJson(Map<String, dynamic> json) {
   );
 }
 
-class ConfigGetCommand extends Command<int> {
+class ConfigGetCommand extends FlutterPatcherCommand {
   @override
   String get name => 'get';
 
@@ -72,7 +71,7 @@ class ConfigGetCommand extends Command<int> {
       });
 }
 
-class ConfigSetCommand extends Command<int> {
+class ConfigSetCommand extends FlutterPatcherCommand {
   @override
   String get name => 'set';
 
@@ -98,7 +97,7 @@ class ConfigSetCommand extends Command<int> {
       });
 }
 
-class ConfigListCommand extends Command<int> {
+class ConfigListCommand extends FlutterPatcherCommand {
   @override
   String get name => 'list';
 

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

@@ -1,14 +1,13 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 import 'package:path/path.dart' as p;
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher console` — open the web console.
-class ConsoleCommand extends Command<int> {
+class ConsoleCommand extends FlutterPatcherCommand {
   @override
   String get name => 'console';
 

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

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -11,7 +10,7 @@ import '../ui/ui.dart';
 import '../util.dart';
 
 /// `flutter_patcher deploy` — zip + upload + register a new bundle.
-class DeployCommand extends Command<int> {
+class DeployCommand extends FlutterPatcherCommand {
   DeployCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,13 +1,12 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher doctor` — environment + backend connectivity check.
-class DoctorCommand extends Command<int> {
+class DoctorCommand extends FlutterPatcherCommand {
   DoctorCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,13 +1,12 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../cli_base.dart';
 import '../util.dart';
 
 /// `flutter_patcher fingerprint` — compute a build-time fingerprint hash.
-class FingerprintCommand extends Command<int> {
+class FingerprintCommand extends FlutterPatcherCommand {
   @override
   String get name => 'fingerprint';
 

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

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 
 import '../ui/ui.dart';
@@ -13,7 +12,7 @@ import '../ui/ui.dart';
 /// corresponding environment variable so CI runs can be non-interactive. The
 /// result is saved as `.flutter_patcher.json` (cwd) or the global config when
 /// `--global` is passed.
-class InitCommand extends Command<int> {
+class InitCommand extends FlutterPatcherCommand {
   InitCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 
 import '../backend.dart';
 import '../cli_base.dart';
@@ -10,7 +9,7 @@ import '../sign.dart';
 import '../ui/ui.dart';
 
 /// `flutter_patcher keys` — generate an Ed25519 keypair for bundle signing.
-class KeysCommand extends Command<int> {
+class KeysCommand extends FlutterPatcherCommand {
   KeysCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 import 'package:path/path.dart' as p;
 import 'package:postgres/postgres.dart';
@@ -9,7 +8,7 @@ import 'package:postgres/postgres.dart';
 import '../ui/ui.dart';
 
 /// `flutter_patcher migrate` — run backend SQL migrations.
-class MigrateCommand extends Command<int> {
+class MigrateCommand extends FlutterPatcherCommand {
   @override
   String get name => 'migrate';
 

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

@@ -1,12 +1,11 @@
 import 'package:args/args.dart';
-import 'package:args/command_runner.dart';
 import 'package:flutter_patcher_cli/flutter_patcher_cli.dart';
 import 'package:flutter_patcher_core/flutter_patcher_core.dart';
 
 import '../ui/ui.dart';
 
 /// `flutter_patcher rollback` — roll a channel back to a previous bundle.
-class RollbackCommand extends Command<int> {
+class RollbackCommand extends FlutterPatcherCommand {
   RollbackCommand({this.config, this.backendOverride});
 
   final FlutterPatcherConfig? config;

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

@@ -0,0 +1,72 @@
+import 'dart:io';
+
+import 'package:args/command_runner.dart';
+import 'ui/ui.dart';
+
+/// Custom [CommandRunner] that renders a clean, colorized top-level help.
+class FlutterPatcherRunner extends CommandRunner<int> {
+  FlutterPatcherRunner(String name, String description)
+      : super(name, description);
+
+  @override
+  String get usage {
+    final names = commands.keys.toList()..sort();
+    var maxName = 0;
+    for (final n in names) maxName = maxName < n.length ? n.length : maxName;
+    final buf = StringBuffer();
+    buf.writeln('  ${cyan('▶')} ${cyan(bold(executableName))} '
+        '${dim('·')} ${bold(description)}');
+    buf.writeln('  ${dim('─' * 60)}');
+    buf.writeln('');
+    buf.writeln('  ${bold('USAGE')}');
+    buf.writeln('    $executableName <command> [arguments]');
+    buf.writeln('');
+    buf.writeln('  ${bold('COMMANDS')}');
+    for (final n in names) {
+      final c = commands[n]!;
+      buf.writeln('    ${cyan(n.padRight(maxName))}  ${dim(c.description)}');
+    }
+    buf.writeln('');
+    buf.writeln('  ${dim('Run "$executableName help <command>" for more about a command.')}');
+    return buf.toString();
+  }
+
+  @override
+  void printUsage([String? usage]) {
+    stdout.writeln(usage ?? this.usage);
+  }
+}
+
+String _fullName(Command<int> command) {
+  final parts = <String>[command.name];
+  var p = command.parent;
+  while (p != null) {
+    parts.insert(0, p.name);
+    p = p.parent;
+  }
+  return parts.join(' ');
+}
+
+/// Base class for flutter_patcher commands; renders a clean, colorized
+/// per-command help (used by `flutter_patcher <cmd> --help`).
+abstract class FlutterPatcherCommand extends Command<int> {
+  @override
+  String get usage {
+    final buf = StringBuffer();
+    buf.writeln('  ${cyan(bold(name))} ${dim('·')} ${description}');
+    buf.writeln('');
+    buf.writeln('  ${bold('USAGE')}');
+    buf.writeln('    ${_fullName(this)} [arguments]');
+    if (argParser.options.isNotEmpty) {
+      buf.writeln('');
+      buf.writeln('  ${bold('OPTIONS')}');
+      buf.writeln('  ${argParser.usage.replaceAll('\n', '\n  ')}');
+    }
+    return buf.toString();
+  }
+
+  @override
+  void printUsage([String? usage]) {
+    stdout.writeln(usage ?? this.usage);
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@_nazmiforreal/flutter-ota",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Command-line interface for flutter_patcher — an OTA code-push tool for Flutter, hot-updater compatible.",
   "bin": {
     "flutter-patcher": "./bin/flutter-patcher.js"

package/scripts/postinstall.js

@@ -34,7 +34,17 @@ const binDir = path.join(pkgDir, 'bin');
 const target = path.join(binDir, `flutter-patcher-${platformName}-${archName}${ext}`);
 const cliDir = path.join(pkgDir, 'dart-src', 'packages', 'cli-tools');
 
+function chmod(pathname) {
+  try {
+    const st = fs.statSync(pathname);
+    if (!(st.mode & 0o100)) fs.chmodSync(pathname, st.mode | 0o755);
+  } catch (_) {
+    /* non-fatal */
+  }
+}
+
 if (fs.existsSync(target)) {
+  chmod(target);
   console.log(`flutter-patcher: prebuilt binary present (${platformName}-${archName}), skipping build.`);
   process.exit(0);
 }
@@ -57,7 +67,7 @@ if (!fs.existsSync(path.join(cliDir, 'pubspec.yaml'))) {
 console.log('flutter-patcher: resolving Dart dependencies (dart pub get)...');
 const getRes = spawnSync('dart', ['pub', 'get'], { stdio: 'inherit', cwd: cliDir });
 if (getRes.status !== 0) {
-  console.warn(
+  console.error(
     'flutter-patcher: `dart pub get` failed (check your network / Dart version). ' +
       `To build manually:\n  cd ${cliDir} && dart compile exe bin/flutter_patcher.dart ` +
       `-o ${target}`,
@@ -65,17 +75,18 @@ if (getRes.status !== 0) {
   process.exit(0);
 }
 
-console.log('flutter-patcher: building native binary with `dart compile exe`...');
+console.log(`flutter-patcher: building native binary (${platformName}-${archName})...`);
 const res = spawnSync(
   'dart',
   ['compile', 'exe', 'bin/flutter_patcher.dart', '-o', target],
   { stdio: 'inherit', cwd: cliDir },
 );
 if (res.status !== 0) {
-  console.warn(
+  console.error(
     'flutter-patcher: build failed. To build manually:\n  cd ' +
       `${cliDir} && dart compile exe bin/flutter_patcher.dart -o ${target}`,
   );
   process.exit(0);
 }
+chmod(target);
 console.log(`flutter-patcher: built ${target}`);