Fix various memory leaks, see #925

CodeDoctorDE · CodeDoctorDE · commit 2534ffe09884 · 2025-10-09T19:48:18.000+02:00
diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -45,10 +45,10 @@ packages:
     dependency: transitive
     description:
       name: bloc
-      sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189"
+      sha256: e18b8e7825e9921d67a6d256dba0b6015ece8a577eb0a411845c46a352994d78
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
+    version: "9.0.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -61,10 +61,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b"
+      sha256: dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.2"
   build_config:
     dependency: transitive
     description:
@@ -85,10 +85,10 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b"
+      sha256: "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.8.0"
+    version: "2.9.0"
   built_collection:
     dependency: transitive
     description:
@@ -607,10 +607,10 @@ packages:
     dependency: transitive
     description:
       name: watcher
-      sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c"
+      sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.3"
+    version: "1.1.4"
   web:
     dependency: transitive
     description:
diff --git a/app/lib/bloc/document_bloc.dart b/app/lib/bloc/document_bloc.dart
@@ -55,23 +55,29 @@ Future<(NoteData, List<PadElement>)> importAssetsAsync(
   void Function(String source)? onInvalidate,
   Map<String, String>? alreadyImported,
   Map<String, Uint8List>? assets,
-}) {
+}) async {
   ReceivePort? port;
-  if (onInvalidate != null) {
-    port = ReceivePort();
-    port.listen((message) {
-      if (message is String) {
-        onInvalidate(message);
-      }
-    });
+  StreamSubscription? subscription;
+  try {
+    if (onInvalidate != null) {
+      port = ReceivePort();
+      subscription = port.listen((message) {
+        if (message is String) {
+          onInvalidate(message);
+        }
+      });
+    }
+    return await compute(_importAssetsSync, (
+      data,
+      elements,
+      onInvalidate: port?.sendPort,
+      alreadyImported: alreadyImported,
+      assets: assets,
+    ));
+  } finally {
+    await subscription?.cancel();
+    port?.close();
   }
-  return compute(_importAssetsSync, (
-    data,
-    elements,
-    onInvalidate: port?.sendPort,
-    alreadyImported: alreadyImported,
-    assets: assets,
-  ));
 }
 
 class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
diff --git a/app/lib/cubits/current_index.dart b/app/lib/cubits/current_index.dart
@@ -1007,7 +1007,12 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
     ).paint(canvas, size);
 
     final picture = recorder.endRecording();
-    final newImage = await picture.toImage(imageWidth, imageHeight);
+    ui.Image newImage;
+    try {
+      newImage = await picture.toImage(imageWidth, imageHeight);
+    } finally {
+      picture.dispose();
+    }
 
     var belowLayerImage = cameraViewport.belowLayerImage;
     var aboveLayerImage = cameraViewport.aboveLayerImage;
@@ -1062,12 +1067,19 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
         renderBaked: false,
       ).paint(aboveLayerCanvas, size);
 
-      final result = await Future.wait([
-        belowLayerRecorder.endRecording().toImage(imageWidth, imageHeight),
-        aboveLayerRecorder.endRecording().toImage(imageWidth, imageHeight),
-      ]);
-      belowLayerImage = result[0];
-      aboveLayerImage = result[1];
+      final belowPicture = belowLayerRecorder.endRecording();
+      final abovePicture = aboveLayerRecorder.endRecording();
+      try {
+        final result = await Future.wait([
+          belowPicture.toImage(imageWidth, imageHeight),
+          abovePicture.toImage(imageWidth, imageHeight),
+        ]);
+        belowLayerImage = result[0];
+        aboveLayerImage = result[1];
+      } finally {
+        belowPicture.dispose();
+        abovePicture.dispose();
+      }
     }
 
     final newlyUnbaked =
@@ -1133,8 +1145,16 @@ class CurrentIndexCubit extends Cubit<CurrentIndex> {
     );
     painter.paint(canvas, Size(realWidth.toDouble(), realHeight.toDouble()));
     final picture = recorder.endRecording();
-    final image = await picture.toImage(realWidth, realHeight);
-    return await image.toByteData(format: ui.ImageByteFormat.png);
+    ui.Image? image;
+    ByteData? bytes;
+    try {
+      image = await picture.toImage(realWidth, realHeight);
+      bytes = await image.toByteData(format: ui.ImageByteFormat.png);
+    } finally {
+      image?.dispose();
+      picture.dispose();
+    }
+    return bytes;
   }
 
   XmlDocument renderSVG(
diff --git a/app/lib/dialogs/background/dialog.dart b/app/lib/dialogs/background/dialog.dart
@@ -58,6 +58,12 @@ class _BackgroundDialogState extends State<BackgroundDialog>
     });
   }
 
+  @override
+  void dispose() {
+    _tabController.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final loc = AppLocalizations.of(context);
diff --git a/app/lib/dialogs/background/general.dart b/app/lib/dialogs/background/general.dart
@@ -46,18 +46,22 @@ class _GeneralBackgroundPropertiesView extends StatelessWidget {
                 if (result == null) return;
                 final dataPath = Uri.dataFromBytes(result).toString();
                 final codec = await ui.instantiateImageCodec(result);
-                final frame = await codec.getNextFrame();
-                final image = frame.image;
-                final width = image.width.toDouble(),
-                    height = image.height.toDouble();
-                image.dispose();
-                onChanged(
-                  ImageBackground(
-                    source: dataPath,
-                    width: width,
-                    height: height,
-                  ),
-                );
+                try {
+                  final frame = await codec.getNextFrame();
+                  final image = frame.image;
+                  final width = image.width.toDouble(),
+                      height = image.height.toDouble();
+                  image.dispose();
+                  onChanged(
+                    ImageBackground(
+                      source: dataPath,
+                      width: width,
+                      height: height,
+                    ),
+                  );
+                } finally {
+                  codec.dispose();
+                }
               },
             ),
             BoxTile(
@@ -76,13 +80,21 @@ class _GeneralBackgroundPropertiesView extends StatelessWidget {
                   SvgStringLoader(contentString),
                   null,
                 );
-                final size = info.size;
-                var height = size.height, width = size.width;
-                if (!height.isFinite) height = 0;
-                if (!width.isFinite) width = 0;
-                onChanged(
-                  SvgBackground(source: dataPath, width: width, height: height),
-                );
+                try {
+                  final size = info.size;
+                  var height = size.height, width = size.width;
+                  if (!height.isFinite) height = 0;
+                  if (!width.isFinite) width = 0;
+                  onChanged(
+                    SvgBackground(
+                      source: dataPath,
+                      width: width,
+                      height: height,
+                    ),
+                  );
+                } finally {
+                  info.picture.dispose();
+                }
               },
             ),
           ],
diff --git a/app/lib/dialogs/file_system/create.dart b/app/lib/dialogs/file_system/create.dart
@@ -28,8 +28,8 @@ class _FileSystemAssetCreateDialogState
 
   @override
   void dispose() {
-    super.dispose();
     _nameController.dispose();
+    super.dispose();
   }
 
   @override
diff --git a/app/lib/dialogs/file_system/move.dart b/app/lib/dialogs/file_system/move.dart
@@ -37,8 +37,8 @@ class _FileSystemAssetMoveDialogState extends State<FileSystemAssetMoveDialog> {
 
   @override
   void dispose() {
-    super.dispose();
     _nameController.dispose();
+    super.dispose();
   }
 
   bool isSingleFile() => widget.assets.length == 1;
diff --git a/app/lib/dialogs/import/add.dart b/app/lib/dialogs/import/add.dart
@@ -27,9 +27,9 @@ class _AddDialogState extends State<AddDialog> {
 
   @override
   void dispose() {
-    super.dispose();
     _searchController.dispose();
     _filterScrollController.dispose();
+    super.dispose();
   }
 
   @override
@@ -370,8 +370,8 @@ class _ToolsListViewState extends State<_ToolsListView> {
 
   @override
   void dispose() {
-    super.dispose();
     _scrollController.dispose();
+    super.dispose();
   }
 
   @override
diff --git a/app/lib/dialogs/packs/asset.dart b/app/lib/dialogs/packs/asset.dart
@@ -169,13 +169,19 @@ Future<void> addToPack(
       ),
     ),
   );
-  final transformed = renderers
-      .map(
-        (e) =>
-            e.transform(position: -rect.center, relative: true)?.element ??
-            e.element,
-      )
-      .toList();
+  final transformed = <PadElement>[];
+  for (final renderer in renderers) {
+    final transformedRenderer = renderer.transform(
+      position: -rect.center,
+      relative: true,
+    );
+    final activeRenderer = transformedRenderer ?? renderer;
+    transformed.add(activeRenderer.element);
+    transformedRenderer?.dispose();
+    if (!identical(transformedRenderer, renderer)) {
+      renderer.dispose();
+    }
+  }
   pack = pack.setComponent(
     result.key,
     ButterflyComponent(elements: transformed, thumbnail: thumbnail),
diff --git a/app/lib/models/defaults.dart b/app/lib/models/defaults.dart
@@ -28,6 +28,8 @@ class DocumentDefaults {
       size.height.toInt(),
     );
     final bytes = await image.toByteData(format: ui.ImageByteFormat.png);
+    image.dispose();
+    picture.dispose();
     return bytes!.buffer.asUint8List();
   }
 
diff --git a/app/lib/services/asset.dart b/app/lib/services/asset.dart
@@ -19,10 +19,14 @@ class AssetService {
     var data = element_helper.getDataFromSource(document, path);
     if (data == null) return null;
     final codec = await ui.instantiateImageCodec(data);
-    final frameInfo = await codec.getNextFrame();
-    final image = frameInfo.image;
-    _images[path] = image;
-    return image.clone();
+    try {
+      final frameInfo = await codec.getNextFrame();
+      final image = frameInfo.image;
+      _images[path] = image;
+      return image.clone();
+    } finally {
+      codec.dispose();
+    }
   }
 
   void dispose() {
diff --git a/app/lib/views/home/start.dart b/app/lib/views/home/start.dart
@@ -17,26 +17,25 @@ class _QuickstartHomeView extends StatefulWidget {
 
 class _QuickstartHomeViewState extends State<_QuickstartHomeView> {
   final ScrollController _scrollController = ScrollController();
-  late final TemplateFileSystem _templateSystem;
+  late TemplateFileSystem _templateSystem;
   Future<List<NoteData>>? _templatesFuture;
 
   @override
   void initState() {
+    super.initState();
     _templateSystem = context.read<ButterflyFileSystem>().buildTemplateSystem(
       widget.remote,
     );
-    WidgetsBinding.instance.addPostFrameCallback(
-      (_) => setState(() {
-        _templatesFuture = _fetchTemplates();
-      }),
-    );
-    super.initState();
+    _templatesFuture = _fetchTemplates();
   }
 
   @override
   void didUpdateWidget(covariant _QuickstartHomeView oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.remote != widget.remote) {
+      _templateSystem = context.read<ButterflyFileSystem>().buildTemplateSystem(
+        widget.remote,
+      );
       setState(() {
         _templatesFuture = _fetchTemplates();
       });
diff --git a/app/lib/views/main.dart b/app/lib/views/main.dart
@@ -315,11 +315,13 @@ class _ProjectPageState extends State<ProjectPage> {
 
   @override
   void dispose() {
-    super.dispose();
     widget.embedding?.handler?.unregister();
     _closeSubscription.dispose();
     _bloc?.dispose();
+    _transformCubit?.close();
+    _currentIndexCubit?.close();
     _searchController.dispose();
+    super.dispose();
   }
 
   @override
diff --git a/app/lib/views/navigator/areas.dart b/app/lib/views/navigator/areas.dart
@@ -31,8 +31,8 @@ class _AreasViewState extends State<AreasView> {
 
   @override
   void dispose() {
-    super.dispose();
     _searchController.dispose();
+    super.dispose();
   }
 
   @override
diff --git a/app/lib/views/navigator/waypoints.dart b/app/lib/views/navigator/waypoints.dart
diff --git a/app/lib/views/zoom.dart b/app/lib/views/zoom.dart
diff --git a/app/pubspec.lock b/app/pubspec.lock
diff --git a/docs/package.json b/docs/package.json
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/152.txt b/metadata/en-US/changelogs/152.txt

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ class _FileSystemAssetCreateDialogState`
`28`	`28`
`29`	`29`	`@override`
`30`	`30`	`void dispose() {`
`31`		`- super.dispose();`
`32`	`31`	`_nameController.dispose();`
	`32`	`+ super.dispose();`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`@override`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ class _FileSystemAssetMoveDialogState extends State<FileSystemAssetMoveDialog> {`
`37`	`37`
`38`	`38`	`@override`
`39`	`39`	`void dispose() {`
`40`		`- super.dispose();`
`41`	`40`	`_nameController.dispose();`
	`41`	`+ super.dispose();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`bool isSingleFile() => widget.assets.length == 1;`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ class DocumentDefaults {`
`28`	`28`	`size.height.toInt(),`
`29`	`29`	`);`
`30`	`30`	`final bytes = await image.toByteData(format: ui.ImageByteFormat.png);`
	`31`	`+ image.dispose();`
	`32`	`+ picture.dispose();`
`31`	`33`	`return bytes!.buffer.asUint8List();`
`32`	`34`	`}`
`33`	`35`