chore: Clean up cross-compilation support (#355)

Author: dnys1

apps/cli/lib/src/compiler/api/entrypoint_compiler.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 import 'dart:typed_data';
@@ -62,18 +63,20 @@ final class EntrypointCompiler {
   final bool verbose;
   final List<String> enabledExperiments;
 
-  Future<EntrypointResult> _crossCompile({
+  Future<EntrypointResult> _compileExecutable({
     required String entrypointPath,
   }) async {
-    logger.fine('Cross-compiling entrypoint: $entrypointPath');
+    logger.fine('Compiling entrypoint to exe: $entrypointPath');
     final outputPath = p.join(p.dirname(entrypointPath), 'main.exe');
     final command = <String>[
       Sdk.current.dart,
       'compile',
       'exe',
-      '--target-os=linux',
-      '--target-arch=x64',
-      '--experimental-cross-compilation',
+      if (Abi.current() != Abi.linuxX64) ...[
+        '--target-os=linux',
+        '--target-arch=x64',
+        '--experimental-cross-compilation',
+      ],
       '-o',
       outputPath,
       entrypointPath,
@@ -87,18 +90,18 @@ final class EntrypointCompiler {
     );
     final ProcessResult(:exitCode, :stdout as String, :stderr as String) =
         result;
-    logger.fine('Cross-compilation finished with status $exitCode');
+    logger.fine('Exe compilation finished with status $exitCode');
     if (exitCode != 0) {
       throw ProcessException(
         Sdk.current.dart,
         command.sublist(1),
-        'Cross-compilation failed:\n$stdout\n$stderr',
+        'Exe compilation failed:\n$stdout\n$stderr',
         exitCode,
       );
     }
 
     final outputDill = await fileSystem.file(outputPath).readAsBytes();
-    final outputDillDigest = await _computeMd5(outputDill.asUnmodifiableView());
+    final outputDillDigest = await computeMd5(outputDill.asUnmodifiableView());
     return EntrypointResult(
       type: proto.ProjectAsset_Type.DART_EXECUTABLE,
       outputDillPath: outputPath,
@@ -120,8 +123,9 @@ final class EntrypointCompiler {
     }
 
     if (resolvedProject.sdkConfig.targetSdk == SdkType.dart &&
-        Sdk.current.supportsCrossCompilation) {
-      return _crossCompile(
+        (Abi.current() == Abi.linuxX64 ||
+            Sdk.current.supportsCrossCompilation)) {
+      return _compileExecutable(
         entrypointPath: entrypointPath,
       );
     }
@@ -187,7 +191,7 @@ final class EntrypointCompiler {
     logger.finer('Compilation succeeded');
 
     final outputDill = await fileSystem.file(outputPath).readAsBytes();
-    final outputDillDigest = await _computeMd5(outputDill.asUnmodifiableView());
+    final outputDillDigest = await computeMd5(outputDill.asUnmodifiableView());
     return EntrypointResult(
       type: proto.ProjectAsset_Type.DART_KERNEL,
       outputDillPath: outputPath,
@@ -197,6 +201,6 @@ final class EntrypointCompiler {
   }
 }
 
-Future<Digest> _computeMd5(Uint8List data) async {
+Future<Digest> computeMd5(Uint8List data) async {
   return Isolate.run(() => md5.convert(data));
 }

apps/cli/lib/src/frontend/celest_frontend.dart

@@ -33,7 +33,6 @@ import 'package:celest_cli/src/utils/process.dart';
 import 'package:celest_cli/src/utils/recase.dart';
 import 'package:celest_cli/src/utils/run.dart';
 import 'package:celest_cloud/src/proto.dart' as pb;
-import 'package:crypto/crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:mason_logger/mason_logger.dart' show Progress;
 import 'package:stream_transform/stream_transform.dart';
@@ -1015,7 +1014,8 @@ final class CelestFrontend {
     );
     final tarStream = tarFile.openRead();
     final bytes = await collectBytes(tarStream.transform(gzip.encoder));
-    return (bytes, md5.convert(bytes).toString());
+    final digest = await computeMd5(bytes.asUnmodifiableView());
+    return (bytes, digest.toString());
   }
 
   Future<(ast.ResolvedProject, Uri)> _deployProject({
@@ -1035,12 +1035,16 @@ final class CelestFrontend {
             ),
           _ => (Uint8List(0), ''),
         };
+        final gzippedOutput = gzip.encode(output.outputDill) as Uint8List;
+        final gzippedDigest = await computeMd5(
+          gzippedOutput.asUnmodifiableView(),
+        );
         final assets = [
           pb.ProjectAsset(
             type: output.type,
-            filename: '${p.basenameWithoutExtension(output.outputDillPath)}.gz',
-            inline: gzip.encode(output.outputDill),
-            etag: output.outputDillDigest.toString(),
+            filename: '${p.basename(output.outputDillPath)}.gz',
+            inline: gzippedOutput,
+            etag: gzippedDigest.toString(),
           ),
           if (resolvedProject.sdkConfig.targetSdk == ast.SdkType.flutter)
             pb.ProjectAsset(

services/celest_cloud_hub/lib/src/deploy/fly/fly_deployment_engine.dart

@@ -264,7 +264,8 @@ final class FlyDeploymentEngine {
     // Deploy using `flyctl deploy`
     await _withTempDirectory((dir) async {
       if (kernelAsset.etag case final etag?) {
-        if (etag != md5.convert(kernelAsset.inline).toString()) {
+        final computed = md5.convert(kernelAsset.inline).toString();
+        if (etag != computed) {
           throw GrpcError.failedPrecondition('Kernel asset has been modified');
         }
       }
@@ -279,12 +280,14 @@ final class FlyDeploymentEngine {
           kernelAssetFilename.length - '.gz'.length,
         );
       }
+      _logger.fine('Writing kernel asset to disk: $kernelAssetFilename');
       final kernelFile = dir.childFile(kernelAssetFilename);
       await kernelFile.writeAsBytes(kernelAssetData);
 
       if (flutterAssetsBundle case final flutterAssetsBundle?) {
         if (flutterAssetsBundle.etag case final etag?) {
-          if (etag != md5.convert(flutterAssetsBundle.inline).toString()) {
+          final computed = md5.convert(flutterAssetsBundle.inline).toString();
+          if (etag != computed) {
             throw GrpcError.failedPrecondition(
               'Flutter assets bundle has been modified',
             );

services/celest_cloud_hub/lib/src/services/project_environments_service.dart

@@ -449,7 +449,9 @@ final class ProjectEnvironmentsService extends ProjectEnvironmentsServiceBase
     );
 
     final assets = {for (final asset in request.assets) asset.type: asset};
-    final kernelAsset = assets[pb.ProjectAsset_Type.DART_KERNEL];
+    final kernelAsset =
+        assets[pb.ProjectAsset_Type.DART_KERNEL] ??
+        assets[pb.ProjectAsset_Type.DART_EXECUTABLE];
     if (kernelAsset == null) {
       throw GrpcError.invalidArgument('Missing Dart kernel asset');
     }