release 3.3.10

Author: lancexin

README.md

@@ -4,22 +4,21 @@
 
 
 # 懒人做法,一步到位
-下载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并覆盖 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
 
 
 # 编译之前
 1. 下载最新的dart-sdk,具体下载方法可以查看 https://github.com/dart-lang/sdk/wiki/Building 
 
 这里建议用depot_tools的方式下载,因为直接下载github上的sdk,third_party目录下面不会有你需要的包
+
 2. 将dart-sdk切换到flutter对应的版本,一般情况下flutter对应的dart版本是可以通用的,但是如果flutter有大版本升级,需要切换到对应的版本.
 
 
 # 编译方式
 dart --deterministic --no-sound-null-safety --snapshot=frontend_server.dart.snapshot --snapshot-kind=kernel bin/starter.dart
 
-dart --deterministic --no-sound-null-safety --snapshot=dump_kernel.dart.snapshot --snapshot-kind=kernel lib/dump_kernel.dart
+dart --deterministic --no-sound-null-safety --snapshot=dump_kernel.dart.snapshot --snapshot-kind=kernel bin/dump_kernel.dart
 
 # 测试编译
 1. 生成kernel_snapshot.d,先用普通方法run一下example,在example/.dart_tool/flutter_build下面会有生成编译临时的文件
@@ -34,7 +33,7 @@ dart run frontend_server.dart.snapshot --sdk-root /Users/lixin/Documents/flutter
 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
 
 ## 测试aot编译成二进制
-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
+/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
 
 ## dill 文件注入成功检测
 dart run dump_kernel.dart.snapshot app.dill injected.out.dill.txt
@@ -46,10 +45,7 @@ dart run dump_kernel.dart.snapshot app.dill injected.out.dill.txt
 2.将新编译的frontend_server.dart.snapshot覆盖 flutter_macos_stable/bin/cache/dart-sdk/bin/snapshots
 
 # 测试运行
-cd example
-flutter clean
-flutter pub get
-flutter run
+cd example && flutter clean && flutter pub get && flutter run
 
 ### 该方法和aspectd的区别
 1. aspectd不支持flutter 2.5.4以上,本项目最高支持到2.10.1,再高没有测过
@@ -61,8 +57,6 @@ flutter run
 7. 为了性能优化inject方法限制必须是static的
 8. 添加对全局所有的catch进行注入
 
-### 为什么用pragma注解,而不是自定义注解?
-本项目是在aot优化后再对字节码进行修改,aot优化后只有白名单中的注解才能被识别到,pragma是在白名单中的注解.
 
 
 

bin/starter.dart

@@ -2,10 +2,10 @@
 
 import 'dart:io';
 import 'package:args/args.dart';
-import 'package:dydart/aspect_frontend_server.dart';
+import 'package:aspect_frontend_server/aspect_frontend_server.dart';
 
 import 'package:frontend_server/frontend_server.dart' as frontend;
-import 'package:dydart/proxy/frontend_server_proxy.dart';
+import 'package:aspect_frontend_server/proxy/frontend_server_proxy.dart';
 
 Future<void> main(List<String> args) async {
   try {

dump_kernel.dart.snapshot

@@ -69,17 +69,18 @@ class AopUtils {
     }
     if (node is FunctionType) {
       return FunctionType(
-          deepCopyASTNodes(node.positionalParameters),
-          deepCopyASTNode(node.returnType, isReturnType: true),
-          Nullability.legacy,
-          namedParameters: deepCopyASTNodes(node.namedParameters),
-          typeParameters: deepCopyASTNodes(node.typeParameters),
-          requiredParameterCount: node.requiredParameterCount,
-          typedefType: deepCopyASTNode(node.typedefType,
-              ignoreGenerics: ignoreGenerics));
+        deepCopyASTNodes(node.positionalParameters),
+        deepCopyASTNode(node.returnType, isReturnType: true),
+        node.declaredNullability,
+        namedParameters: deepCopyASTNodes(node.namedParameters),
+        typeParameters: deepCopyASTNodes(node.typeParameters),
+        requiredParameterCount: node.requiredParameterCount,
+        // typedefType: deepCopyASTNode(node.typedefType,
+        //     ignoreGenerics: ignoreGenerics)
+      );
     }
     if (node is TypedefType) {
-      return TypedefType(node.typedefNode, Nullability.legacy,
+      return TypedefType(node.typedefNode, node.declaredNullability,
           deepCopyASTNodes(node.typeArguments, ignoreGeneric: ignoreGenerics));
     }
     if (node is InterfaceType) {