release for 3.24.3

Author: lancexin

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.24.3"
+}

.gitignore

@@ -76,3 +76,6 @@ build/
 !**/ios/**/default.mode2v3
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
+
+# FVM Version Cache
+.fvm/

.metadata

@@ -2,9 +2,8 @@
 
 编译frontend_server.dart.snapshot,让其具有aop的功能
 
-
 # 懒人做法,一步到位
-下载frontend_server.dart.snapshot并覆盖 flutter_macos_stable/bin/cache/artifacts/engine/darwin-x64/frontend_server.dart.snapshot和flutter_macos_stable/bin/cache/dart-sdk/bin/snapshots/frontend_server.dart.snapshot
+下载frontend_server.dart.snapshot并覆盖 ~/fvm/versions/3.24.3/bin/cache/artifacts/engine/darwin-x64frontend_server.dart.snapshot和~/fvm/versions/3.24.3/bin/cache/dart-sdk/bin/snapshots/frontend_server.dart.snapshot
 
 
 # 编译之前
@@ -13,12 +12,17 @@
 这里建议用depot_tools的方式下载,因为直接下载github上的sdk,third_party目录下面不会有你需要的包
 
 2. 将dart-sdk切换到flutter对应的版本,一般情况下flutter对应的dart版本是可以通用的,但是如果flutter有大版本升级,需要切换到对应的版本.
+3. 我是通过 fvm 管理 flutter 版本，如果你不是则需要注意下面命令的路径
 
 
 # 编译方式
-dart --deterministic --snapshot=frontend_server.dart.snapshot --snapshot-kind=kernel bin/starter.dart
 
-dart --deterministic --snapshot=dump_kernel.dart.snapshot --snapshot-kind=kernel bin/dump_kernel.dart
+dart compile aot-snapshot --output=frontend_server_aot_macos.dart.snapshot --target-os macos bin/starter.dart
+dart compile aot-snapshot --output=frontend_server_aot_windows.dart.snapshot --target-os windows bin/starter.dart
+dart compile aot-snapshot --output=frontend_server_aot_linux.dart.snapshot --target-os linux bin/starter.dart
+
+dart compile kernel --output=dump_kernel.dart.snapshot bin/dump_kernel.dart
+
 
 # 测试编译
 1. 生成kernel_snapshot.d,先用普通方法run一下example,在example/.dart_tool/flutter_build下面会有生成编译临时的文件
@@ -27,35 +31,53 @@ dart --deterministic --snapshot=dump_kernel.dart.snapshot --snapshot-kind=kernel
 
 
 ## 编译aot dill
-dart run frontend_server.dart.snapshot --sdk-root /Users/lixin/Documents/flutter_macos_stable/bin/cache/artifacts/engine/common/flutter_patched_sdk/ --target=flutter --aot --tfa --no-print-incremental-dependencies -Dflutter.inspector.structuredErrors=true -DFLUTTER_WEB_AUTO_DETECT=true -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --packages /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/package_config.json --output-dill app.dill --depfile /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/flutter_build/1f083b7beecc20d87dfa8f7e4ca58986/kernel_snapshot.d package:example/main.dart
+.fvm/flutter_sdk/bin/cache/dart-sdk/bin/dartaotruntime frontend_server_aot.dart_macos.snapshot --sdk-root ~/fvm/versions/3.24.3/bin/cache/artifacts/engine/common/flutter_patched_sdk/ --target=flutter --aot --tfa --no-print-incremental-dependencies -Dflutter.inspector.structuredErrors=true -DFLUTTER_WEB_AUTO_DETECT=true -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --packages example/.dart_tool/package_config.json --output-dill app.aot --depfile example/.dart_tool/flutter_build/31a7f421330fdca23d68f3c09767c0a5/kernel_snapshot.d package:example/main.dart
+
+注意：31a7f421330fdca23d68f3c09767c0a5 这个需要修改成你目录下面的缓存路径
 
 ## 编译运行时dill
-dart run frontend_server.dart.snapshot --sdk-root /Users/lixin/Documents/flutter_macos_stable/bin/cache/artifacts/engine/common/flutter_patched_sdk/ --target=flutter --no-print-incremental-dependencies -Dflutter.inspector.structuredErrors=true -DFLUTTER_WEB_AUTO_DETECT=true -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --packages /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/package_config.json --output-dill app.dill --depfile /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/flutter_build/1f083b7beecc20d87dfa8f7e4ca58986/kernel_snapshot.d package:example/main.dart
+.fvm/flutter_sdk/bin/cache/dart-sdk/bin/dartaotruntime  frontend_server_aot.dart_macos.snapshot --sdk-root ~/fvm/versions/3.24.3/bin/cache/artifacts/engine/common/flutter_patched_sdk/ --target=flutter --no-print-incremental-dependencies -Dflutter.inspector.structuredErrors=true -DFLUTTER_WEB_AUTO_DETECT=true -Ddart.vm.profile=false -Ddart.vm.product=false --enable-asserts --track-widget-creation --packages example/.dart_tool/package_config.json --output-dill app.dill --depfile example/.dart_tool/flutter_build/31a7f421330fdca23d68f3c09767c0a5/kernel_snapshot.d package:example/main.dart
+
+注意：31a7f421330fdca23d68f3c09767c0a5 这个需要修改成你目录下面的缓存路径
+
+
+
+.fvm/flutter_sdk/bin/cache/dart-sdk/bin/dartaotruntime  frontend_server_aot.dart_macos.snapshot --sdk-root /Users/lixin/fvm/versions/3.24.3/bin/cache/artifacts/engine/common/flutter_patched_sdk/ --target=flutter --no-print-incremental-dependencies -Ddart.vm.profile=true -Ddart.vm.product=false --delete-tostring-package-uri=dart:ui --delete-tostring-package-uri=package:flutter --track-widget-creation --aot --tfa --target-os macos --packages /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/package_config.json --output-dill program.dill --depfile /Users/lixin/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/flutter_build/6b9ed135a83e69e25931946e49bdcd50/kernel_snapshot_program.d --verbosity=error package:example/main.dart
+
 
 ## 测试aot编译成二进制
-/Users/lixin/Documents/flutter_macos_stable/bin/cache/artifacts/engine/android-arm64-release/darwin-x64/gen_snapshot --deterministic --snapshot_kind=app-aot-elf --elf=app.so --strip app.dill
+~/fvm/versions/3.24.3/bin/cache/artifacts/engine/android-arm64-release/darwin-x64/gen_snapshot --deterministic --snapshot_kind=app-aot-elf --elf=app.so --strip app.dill
 
 ## dill 文件注入成功检测
 dart run dump_kernel.dart.snapshot app.dill injected.out.dill.txt
 
 
+dart run dump_kernel.dart.snapshot  /Users/yourname/Documents/FlutterWorkspace/aspect_frontend_server/example/.dart_tool/flutter_build/31a7f421330fdca23d68f3c09767c0a5/app.dill injected.out.dill.txt
+
+## 测试生成汇编上下文
+.fvm/versions/3.24.3/bin/cache/artifacts/engine/darwin-x64-release/gen_snapshot_x64 --deterministic --snapshot_kind=app-aot-assembly --assembly=/Users/yourname/Documents/FlutterWorkspace/aspect_frontend_server/snapshot_assembly.S /Users/yourname/Documents/FlutterWorkspace/aspect_frontend_server/app.dill
+
+
+
 # 替换flutter中的frontend_server.dart.snapshot
-1.将新编译的frontend_server.dart.snapshot覆盖 flutter_macos_stable/bin/cache/artifacts/engine/darwin-x64/frontend_server.dart.snapshot
+1.将新编译的frontend_server_aot.dart.snapshot覆盖 ~/fvm/versions/3.24.3/bin/cache/dart-sdk/bin/snapshots
 
-2.将新编译的frontend_server.dart.snapshot覆盖 flutter_macos_stable/bin/cache/dart-sdk/bin/snapshots
+2.注意替换系统对应的版本，如果是 macos 则是 frontend_server_aot_macos.dart.snapshot，因为我是 mac 系统，其他系统版本没测试过。
 
 # 测试运行
 cd example && flutter clean && flutter pub get && flutter run
 
 ### 该方法和aspectd的区别
-1. aspectd不支持flutter 2.5.4以上,本项目最高支持到2.10.1,再高没有测过
+1. aspectd不支持flutter 2.5.4以上,本项目最高支持到2.23.3,再高没有测过
 2. aspectd使用前需要对flutter tools的代码进行修改,本项目只需要替换flutter sdk对应的frontend_server.dart.snapshot即可
 3. aspectd的实现原理过于复杂,本项目去掉了Call,Inject等用法保留了Execute用法的同时对注入逻辑进行了简化
 4. aspectd还需要aspect_impl等,本项目可以直接在主程序代码中添加注入代码,也可以用plugin的方式添加
 5. 本项目不需要引入任何第三方包,用pragma注解完成对应插桩
-6. 可以有限制支持hot reload,完全支持hot restart,免去了冷重启的烦恼
+6. 完全支持hot restart,免去了冷重启的烦恼
 7. 为了性能优化inject方法限制必须是static的
-8. 添加对全局所有的catch进行注入
+
+
+
 
 
 

CHANGELOG.md

@@ -1,57 +1,5 @@
-// Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
+import 'package:kernel/src/tool/dump.dart' as dump;
 
-import 'dart:io';
-
-import 'package:kernel/kernel.dart' show Component, writeComponentToText;
-import 'package:kernel/binary/ast_from_binary.dart'
-    show BinaryBuilderWithMetadata;
-
-import 'package:vm/metadata/direct_call.dart' show DirectCallMetadataRepository;
-import 'package:vm/metadata/inferred_type.dart'
-    show InferredTypeMetadataRepository;
-import 'package:vm/metadata/procedure_attributes.dart'
-    show ProcedureAttributesMetadataRepository;
-import 'package:vm/metadata/table_selector.dart'
-    show TableSelectorMetadataRepository;
-import 'package:vm/metadata/unboxing_info.dart'
-    show UnboxingInfoMetadataRepository;
-import 'package:vm/metadata/unreachable.dart'
-    show UnreachableNodeMetadataRepository;
-import 'package:vm/metadata/call_site_attributes.dart'
-    show CallSiteAttributesMetadataRepository;
-import 'package:vm/metadata/loading_units.dart'
-    show LoadingUnitsMetadataRepository;
-
-final String _usage = '''
-Usage: dump_kernel input.dill output.txt
-Dumps kernel binary file with VM-specific metadata.
-''';
-
-main(List<String> arguments) async {
-  if (arguments.length != 2) {
-    print(_usage);
-    exit(1);
-  }
-
-  final input = arguments[0];
-  final output = arguments[1];
-
-  final component = new Component();
-
-  // Register VM-specific metadata.
-  component.addMetadataRepository(new DirectCallMetadataRepository());
-  component.addMetadataRepository(new InferredTypeMetadataRepository());
-  component.addMetadataRepository(new ProcedureAttributesMetadataRepository());
-  component.addMetadataRepository(new TableSelectorMetadataRepository());
-  component.addMetadataRepository(new UnboxingInfoMetadataRepository());
-  component.addMetadataRepository(new UnreachableNodeMetadataRepository());
-  component.addMetadataRepository(new CallSiteAttributesMetadataRepository());
-  component.addMetadataRepository(new LoadingUnitsMetadataRepository());
-
-  final List<int> bytes = new File(input).readAsBytesSync();
-  new BinaryBuilderWithMetadata(bytes).readComponent(component);
-
-  writeComponentToText(component, path: output, showMetadata: true);
+void main(List<String> args) {
+  dump.main(args);
 }

LICENSE

@@ -1,31 +1,34 @@
 import 'dart:io';
 import 'package:args/args.dart';
 import 'package:aspect_frontend_server/aspect_frontend_server.dart';
+import 'package:aspect_frontend_server/proxy/frontend_server_proxy.dart';
 
 import 'package:frontend_server/frontend_server.dart' as frontend;
 import 'package:frontend_server/starter.dart';
 
-import 'package:aspect_frontend_server/proxy/frontend_server_proxy.dart';
-
 Future<void> main(List<String> args) async {
   try {
     ArgResults options = frontend.argParser.parse(args);
-    frontend.FrontendCompiler compiler = FrontendCompilerProxy(stdout,
-        printerFactory: frontend.BinaryPrinterFactory(),
-        //添加注入逻辑
-        transformer: AspectAopTransformer(),
-        unsafePackageSerialization: options['unsafe-package-serialization'],
-        incrementalSerialization: options['incremental-serialization'],
-        useDebuggerModuleNames: options['debugger-module-names'],
-        emitDebugMetadata: options['experimental-emit-debug-metadata'],
-        emitDebugSymbols: options['emit-debug-symbols']);
+    stdout.writeln(
+        "!!!!! this is aspect_frontend_server !!!!!! args is:\n ${args}");
+    frontend.FrontendCompiler compiler = FrontendCompilerProxy(
+      stdout,
+      transformer: AspectAopTransformer(),
+      unsafePackageSerialization: options["unsafe-package-serialization"],
+      incrementalSerialization: options["incremental-serialization"],
+      useDebuggerModuleNames: options['debugger-module-names'],
+      emitDebugMetadata: options['experimental-emit-debug-metadata'],
+      emitDebugSymbols: options['emit-debug-symbols'],
+      canaryFeatures: options['dartdevc-canary'],
+    );
+
     final int exitCode = await starter(args, compiler: compiler);
     if (exitCode != 0) {
       exit(exitCode);
     }
-  } catch (error) {
-    print('ERROR: $error\n');
-    print(frontend.usage);
+  } catch (error, stackTrace) {
+    stdout.writeln('ERROR: $error\n $stackTrace');
+    stdout.writeln(frontend.usage);
     return;
   }
 }