POC: Move package:web access to separate package

.gitignore

@@ -14,7 +14,6 @@ build/
 .cxx/
 .vscode/
 
-
 .test_coverage.dart
 dart/coverage/*
 logging/coverage/*
@@ -25,6 +24,7 @@ sqflite/coverage/*
 drift/coverage/*
 hive/coverage/*
 isar/coverage/*
+web/coverage/*
 
 pubspec.lock
 Podfile.lock

dart/lib/sentry.dart

@@ -54,3 +54,5 @@ export 'src/sentry_span_operations.dart';
 export 'src/utils.dart';
 // spotlight debugging
 export 'src/spotlight.dart';
+// Window wrappers
+export 'src/web/window.dart';

dart/lib/src/event_processor/enricher/enricher_event_processor.dart

@@ -1,7 +1,8 @@
 import '../../event_processor.dart';
 import '../../sentry_options.dart';
 import 'io_enricher_event_processor.dart'
-    if (dart.library.html) 'web_enricher_event_processor.dart';
+  if (dart.library.html) 'web_enricher_event_processor.dart'
+  if (dart.library.js_interop) 'web_enricher_event_processor.dart';
 
 abstract class EnricherEventProcessor implements EventProcessor {
   factory EnricherEventProcessor(SentryOptions options) =>

dart/lib/src/event_processor/enricher/web_enricher_event_processor.dart

@@ -1,11 +1,13 @@
-import 'dart:html' as html show window, Window;
-
 import '../../../sentry.dart';
 import 'enricher_event_processor.dart';
 
+import '../../web/noop_window.dart'
+  if (dart.library.html) '../../web/http_window.dart'
+  if (dart.library.js_interop) '../../web/web_window.dart';
+
 EnricherEventProcessor enricherEventProcessor(SentryOptions options) {
   return WebEnricherEventProcessor(
-    html.window,
+    createWindow(options),
     options,
   );
 }
@@ -16,7 +18,7 @@ class WebEnricherEventProcessor implements EnricherEventProcessor {
     this._options,
   );
 
-  final html.Window _window;
+  final Window _window;
 
   final SentryOptions _options;
 
@@ -60,11 +62,11 @@ class WebEnricherEventProcessor implements EnricherEventProcessor {
       memorySize: device?.memorySize ?? _getMemorySize(),
       orientation: device?.orientation ?? _getScreenOrientation(),
       screenHeightPixels: device?.screenHeightPixels ??
-          _window.screen?.available.height.toInt(),
+          _window.screen.availableHeight,
       screenWidthPixels:
-          device?.screenWidthPixels ?? _window.screen?.available.width.toInt(),
+          device?.screenWidthPixels ?? _window.screen.availableWidth,
       screenDensity:
-          device?.screenDensity ?? _window.devicePixelRatio.toDouble(),
+          device?.screenDensity ?? _window.devicePixelRatio,
     );
   }
 
@@ -77,14 +79,11 @@ class WebEnricherEventProcessor implements EnricherEventProcessor {
 
   SentryOrientation? _getScreenOrientation() {
     // https://developer.mozilla.org/en-US/docs/Web/API/ScreenOrientation
-    final screenOrientation = _window.screen?.orientation;
-    if (screenOrientation != null) {
-      if (screenOrientation.type?.startsWith('portrait') ?? false) {
-        return SentryOrientation.portrait;
-      }
-      if (screenOrientation.type?.startsWith('landscape') ?? false) {
-        return SentryOrientation.landscape;
-      }
+    final screenOrientation = _window.screen.orientation;
+    if (screenOrientation == ScreenOrientation.portrait) {
+      return SentryOrientation.portrait;
+    } else if (screenOrientation == ScreenOrientation.landscape) {
+      return SentryOrientation.landscape;
     }
     return null;
   }

dart/lib/src/sentry.dart

@@ -45,13 +45,14 @@ class Sentry {
   }) async {
     final sentryOptions = options ?? SentryOptions();
 
-    await _initDefaultValues(sentryOptions);
+    _setEnvironmentVariables(sentryOptions);
 
     try {
       final config = optionsConfiguration(sentryOptions);
       if (config is Future) {
         await config;
       }
+      await _initDefaultValues(sentryOptions);
     } catch (exception, stackTrace) {
       sentryOptions.logger(
         SentryLevel.error,
@@ -73,7 +74,6 @@ class Sentry {
   }
 
   static Future<void> _initDefaultValues(SentryOptions options) async {
-    _setEnvironmentVariables(options);
 
     // Throws when running on the browser
     if (!options.platformChecker.isWeb) {

dart/lib/src/sentry_options.dart

@@ -443,6 +443,8 @@ class SentryOptions {
   /// ```
   Spotlight spotlight = Spotlight(enabled: false);
 
+  Window? Function() window = () { return null; };
+
   SentryOptions({this.dsn, PlatformChecker? checker}) {
     if (checker != null) {
       platformChecker = checker;

dart/lib/src/web/http_window.dart

@@ -0,0 +1,70 @@
+import 'dart:html' as html show window, Window;
+
+import '../sentry_options.dart';
+import 'window.dart';
+
+Window createWindow(SentryOptions options) {
+  return HttpWindow(html.window);
+}
+
+class HttpWindow implements Window {
+  HttpWindow(this._window);
+
+  final html.Window _window;
+
+  @override
+  WindowScreen get screen => HttpWindowScreen(_window);
+
+  @override
+  WindowNavigator get navigator => HttpWindowNavigator(_window);
+
+  @override
+  WindowLocation get location => HttpWindowLocation(_window);
+
+  @override
+  double get devicePixelRatio => _window.devicePixelRatio.toDouble();
+}
+
+class HttpWindowScreen implements WindowScreen {
+  HttpWindowScreen(this._window);
+
+  final html.Window _window;
+
+  @override
+  int get availableHeight => _window.screen?.available.height.toInt() ?? 0;
+
+  @override
+  int get availableWidth => _window.screen?.available.width.toInt() ?? 0;
+
+  @override
+  ScreenOrientation? get orientation =>
+      _window.screen?.orientation?.type == "portrait"
+          ? ScreenOrientation.portrait
+          : _window.screen?.orientation?.type == "landscape"
+          ? ScreenOrientation.landscape
+          : null;
+}
+
+class HttpWindowNavigator implements WindowNavigator  {
+  HttpWindowNavigator(this._window);
+
+  final html.Window _window;
+
+  @override
+  String get userAgent => _window.navigator.userAgent;
+
+  @override
+  bool? get onLine => _window.navigator.onLine;
+
+  @override
+  double? get deviceMemory => _window.navigator.deviceMemory?.toDouble();
+}
+
+class HttpWindowLocation implements WindowLocation {
+  HttpWindowLocation(this._window);
+
+  final html.Window _window;
+
+  @override
+  String? get pathname => _window.location.pathname;
+}

dart/lib/src/web/noop_window.dart

@@ -0,0 +1,55 @@
+
+import '../sentry_options.dart';
+import 'window.dart';
+
+Window createWindow(SentryOptions options) {
+  return NoopWindow();
+}
+
+class NoopWindow implements Window {
+
+  @override
+  WindowScreen get screen => NoopWindowScreen();
+
+  @override
+  WindowNavigator get navigator => NoopWindowNavigator();
+
+  @override
+  WindowLocation get location => NoopWindowLocation();
+
+  @override
+  double get devicePixelRatio => 1.0;
+}
+
+class NoopWindowScreen implements WindowScreen {
+  NoopWindowScreen();
+
+  @override
+  int get availableHeight => 0;
+
+  @override
+  int get availableWidth => 0;
+
+  @override
+  ScreenOrientation? get orientation => null;
+}
+
+class NoopWindowNavigator implements WindowNavigator {
+  NoopWindowNavigator();
+
+  @override
+  String get userAgent => "--";
+
+  @override
+  bool? get onLine => null;
+
+  @override
+  double? get deviceMemory => null;
+}
+
+class NoopWindowLocation implements WindowLocation {
+  NoopWindowLocation();
+
+  @override
+  String? get pathname => null;
+}

dart/lib/src/web/web_window.dart

@@ -0,0 +1,8 @@
+import '../sentry_options.dart';
+import 'noop_window.dart';
+import 'window.dart';
+
+// Get window from options or noop
+Window createWindow(SentryOptions options) {
+  return options.window() ?? NoopWindow();
+}

dart/lib/src/web/window.dart

@@ -0,0 +1,36 @@
+abstract class Window {
+
+  WindowScreen get screen;
+  WindowNavigator get navigator;
+  WindowLocation get location;
+
+  double get devicePixelRatio;
+}
+
+abstract class WindowScreen {
+  WindowScreen();
+
+  int get availableHeight;
+  int get availableWidth;
+
+  ScreenOrientation? get orientation;
+}
+
+abstract class WindowNavigator {
+  WindowNavigator();
+
+  String get userAgent;
+
+  bool? get onLine;
+
+  double? get deviceMemory;
+}
+
+abstract class WindowLocation {
+  String? get pathname;
+}
+
+enum ScreenOrientation {
+  portrait,
+  landscape,
+}

flutter/example/lib/auto_close_screen.dart

@@ -1,6 +1,6 @@
-import 'package:dio/dio.dart';
+// import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
-import 'package:sentry_dio/sentry_dio.dart';
+// import 'package:sentry_dio/sentry_dio.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'main.dart';
@@ -25,13 +25,13 @@ class AutoCloseScreenState extends State<AutoCloseScreen> {
   }
 
   Future<void> _doComplexOperationThenClose() async {
-    final dio = Dio();
-    dio.addSentry();
-    try {
-      await dio.get<String>(exampleUrl);
-    } catch (exception, stackTrace) {
-      await Sentry.captureException(exception, stackTrace: stackTrace);
-    }
+    // final dio = Dio();
+    // dio.addSentry();
+    // try {
+    //   await dio.get<String>(exampleUrl);
+    // } catch (exception, stackTrace) {
+    //   await Sentry.captureException(exception, stackTrace: stackTrace);
+    // }
     SentryFlutter.reportFullyDisplayed();
     // ignore: use_build_context_synchronously
     Navigator.of(context).pop();

flutter/example/lib/drift/connection/native.dart

@@ -1,7 +1,7 @@
-import 'package:drift/backends.dart';
-import 'package:drift/drift.dart';
-import 'package:drift/native.dart';
-
-QueryExecutor inMemoryExecutor() {
-  return NativeDatabase.memory();
-}
+// import 'package:drift/backends.dart';
+// import 'package:drift/drift.dart';
+// import 'package:drift/native.dart';
+//
+// QueryExecutor inMemoryExecutor() {
+//   return NativeDatabase.memory();
+// }

flutter/example/lib/drift/connection/unsupported.dart

@@ -1,17 +1,17 @@
-import 'package:drift/drift.dart';
-
-Never _unsupported() {
-  throw UnsupportedError(
-      'No suitable database implementation was found on this platform.');
-}
-
-// Depending on the platform the app is compiled to, the following stubs will
-// be replaced with the methods in native.dart or web.dart
-
-QueryExecutor inMemoryExecutor() {
-  return _unsupported();
-}
-
-Future<void> validateDatabaseSchema(GeneratedDatabase database) async {
-  _unsupported();
-}
+// import 'package:drift/drift.dart';
+//
+// Never _unsupported() {
+//   throw UnsupportedError(
+//       'No suitable database implementation was found on this platform.');
+// }
+//
+// // Depending on the platform the app is compiled to, the following stubs will
+// // be replaced with the methods in native.dart or web.dart
+//
+// QueryExecutor inMemoryExecutor() {
+//   return _unsupported();
+// }
+//
+// Future<void> validateDatabaseSchema(GeneratedDatabase database) async {
+//   _unsupported();
+// }