Merge pull request #2450 from krille-chan/krille/replace-native-imaging-with-web-worker

refactor: Remove native imaging and enable web worker

.gitignore

@@ -71,3 +71,4 @@ android/app/google-services.json
 web/pkg/package.json
 web/pkg/vodozemac_bindings_dart_bg.wasm
 web/pkg/vodozemac_bindings_dart.js
+web/native_executor.js*

lib/utils/client_manager.dart

@@ -14,7 +14,6 @@ import 'package:universal_html/html.dart' as html;
 import 'package:fluffychat/config/setting_keys.dart';
 import 'package:fluffychat/l10n/l10n.dart';
 import 'package:fluffychat/utils/custom_http_client.dart';
-import 'package:fluffychat/utils/custom_image_resizer.dart';
 import 'package:fluffychat/utils/init_with_restore.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart';
@@ -95,7 +94,10 @@ abstract class ClientManager {
   }
 
   static NativeImplementations get nativeImplementations => kIsWeb
-      ? const NativeImplementationsDummy()
+      ? NativeImplementationsWebWorker(
+          Uri.parse('native_executor.js'),
+          timeout: const Duration(minutes: 1),
+        )
       : NativeImplementationsIsolate(
           compute,
           vodozemacInit: () => vod.init(wasmPath: './assets/assets/vodozemac/'),
@@ -127,9 +129,6 @@ abstract class ClientManager {
         AuthenticationTypes.sso,
       },
       nativeImplementations: nativeImplementations,
-      customImageResizer: PlatformInfos.isMobile || kIsWeb
-          ? customImageResizer
-          : null,
       defaultNetworkRequestTimeout: const Duration(minutes: 30),
       enableDehydratedDevices: true,
       shareKeysWith:

lib/utils/custom_image_resizer.dart

@@ -1,101 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter/foundation.dart';
-import 'package:flutter/painting.dart';
-
-import 'package:matrix/matrix.dart';
-import 'package:native_imaging/native_imaging.dart' as native;
-
-(int, int) _scaleToBox(int width, int height, {required int boxSize}) {
-  final fit = applyBoxFit(
-    BoxFit.scaleDown,
-    Size(width.toDouble(), height.toDouble()),
-    Size(boxSize.toDouble(), boxSize.toDouble()),
-  ).destination;
-  return (fit.width.round(), fit.height.round());
-}
-
-Future<MatrixImageFileResizedResponse?> customImageResizer(
-  MatrixImageFileResizeArguments arguments,
-) async {
-  await native.init();
-
-  var imageBytes = arguments.bytes;
-  String? blurhash;
-
-  var originalWidth = 0;
-  var originalHeight = 0;
-  var width = 0;
-  var height = 0;
-
-  try {
-    // for the other platforms
-    final dartCodec = await instantiateImageCodec(arguments.bytes);
-    final frameCount = dartCodec.frameCount;
-    final dartFrame = await dartCodec.getNextFrame();
-    final rgbaData = await dartFrame.image.toByteData();
-    if (rgbaData == null) {
-      return null;
-    }
-    final rgba = Uint8List.view(
-      rgbaData.buffer,
-      rgbaData.offsetInBytes,
-      rgbaData.lengthInBytes,
-    );
-
-    width = originalWidth = dartFrame.image.width;
-    height = originalHeight = dartFrame.image.height;
-
-    var nativeImg = native.Image.fromRGBA(width, height, rgba);
-
-    dartFrame.image.dispose();
-    dartCodec.dispose();
-
-    if (arguments.calcBlurhash) {
-      // scale down image for blurhashing to speed it up
-      final (blurW, blurH) = _scaleToBox(width, height, boxSize: 100);
-      final blurhashImg = nativeImg.resample(
-        blurW,
-        blurH,
-        // nearest is unsupported...
-        native.Transform.bilinear,
-      );
-
-      blurhash = blurhashImg.toBlurhash(3, 3);
-
-      blurhashImg.free();
-    }
-
-    if (frameCount > 1) {
-      // Don't scale down animated images, since those would lose frames.
-      nativeImg.free();
-    } else {
-      final max = arguments.maxDimension;
-      if (width > max || height > max) {
-        (width, height) = _scaleToBox(width, height, boxSize: max);
-
-        final scaledImg = nativeImg.resample(
-          width,
-          height,
-          native.Transform.lanczos,
-        );
-        nativeImg.free();
-        nativeImg = scaledImg;
-      }
-
-      imageBytes = await nativeImg.toJpeg(75);
-      nativeImg.free();
-    }
-  } catch (e, s) {
-    Logs().e("Could not generate preview", e, s);
-  }
-
-  return MatrixImageFileResizedResponse(
-    bytes: imageBytes,
-    width: width,
-    height: height,
-    originalWidth: originalWidth,
-    originalHeight: originalHeight,
-    blurhash: blurhash,
-  );
-}

scripts/prepare-web.sh

@@ -11,10 +11,5 @@ rm -f ./assets/vodozemac/vodozemac_bindings_dart*
 mv .vodozemac/dart/web/pkg/vodozemac_bindings_dart* ./assets/vodozemac/
 rm -rf .vodozemac
 
-# Add native imaging:
-cd web/
-curl -L 'https://github.com/famedly/dart_native_imaging/releases/download/v0.2.1/native_imaging.zip' > native_imaging.zip # make sure to sync version with pubspec.yaml
-unzip native_imaging.zip
-mv js/* .
-rmdir js
-rm native_imaging.zip
+flutter pub get
+dart compile js ./web/native_executor.dart -o ./web/native_executor.js -m

web/native_executor.dart

@@ -0,0 +1,3 @@
+import 'package:matrix/matrix.dart';
+
+void main() => startWebWorker();