Merge pull request #1 from d-markey/main

Support Web platforms.

Author: mgenware

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.0
+
+- Add support for Web patforms + corresponding tests.
+
 ## 3.0.0
 
 - Add `skip` method.

README.md

@@ -50,4 +50,4 @@ abstract class RandomAccessSource {
 Implementations:
 
 - `BytesRASource` for `Uint8List`.
-- `FileRASource` for `RandomAccessFile`.
+- `FileRASource` for `RandomAccessFile` (`dart:io`) and `Blob` (`package:web`).

dart_test.yaml

@@ -0,0 +1,7 @@
+platforms:
+  - vm
+  - chrome
+
+compilers:
+  - dart2js
+  - dart2wasm

lib/src/bytes_ra_source.dart

@@ -12,34 +12,22 @@ class BytesRASource extends RandomAccessSource {
   }
 
   @override
-  Future<int> length() async {
-    return bytes.length;
-  }
+  Future<int> length() async => bytes.length;
 
   @override
-  Future<int> readByte() async {
-    return _syncSource.readByte();
-  }
+  Future<int> readByte() async => _syncSource.readByte();
 
   @override
-  Future<Uint8List> read(int count) async {
-    return _syncSource.read(count);
-  }
+  Future<Uint8List> read(int count) async => _syncSource.read(count);
 
   @override
-  Future<int> position() async {
-    return _syncSource.position();
-  }
+  Future<int> position() async => _syncSource.position();
 
   @override
-  Future<void> seek(int position) async {
-    _syncSource.seek(position);
-  }
+  Future<void> seek(int position) async => _syncSource.seek(position);
 
   @override
-  Future<Uint8List> readToEnd() async {
-    return _syncSource.readToEnd();
-  }
+  Future<Uint8List> readToEnd() async => _syncSource.readToEnd();
 
   @override
   Future<void> close() async {}

lib/src/file_ra_source.dart

@@ -1,50 +1,13 @@
-import 'dart:io';
-import 'dart:typed_data';
-
 import '../random_access_source.dart';
+import 'file_ra_source_stub.dart'
+    if (dart.library.io) 'file_ra_source_vm.dart'
+    if (dart.library.js_interop) 'file_ra_source_web.dart' as impl;
 
-class FileRASource extends RandomAccessSource {
-  final RandomAccessFile _file;
-
-  FileRASource(this._file);
-
-  static Future<FileRASource> open(String path) async {
-    final file = await File(path).open();
-    return FileRASource(file);
-  }
-
-  @override
-  Future<int> length() async {
-    return _file.length();
-  }
-
-  @override
-  Future<int> readByte() async {
-    return _file.readByte();
-  }
-
-  @override
-  Future<Uint8List> read(int count) async {
-    return _file.read(count);
-  }
-
-  @override
-  Future<int> position() async {
-    return _file.position();
-  }
-
-  @override
-  Future<void> seek(int position) async {
-    await _file.setPosition(position);
-  }
+typedef PlatformFile = impl.PlatformFile;
 
-  @override
-  Future<Uint8List> readToEnd() async {
-    return _file.read(await _file.length());
-  }
+abstract class FileRASource extends RandomAccessSource {
+  static Future<FileRASource> open(String path) => impl.FileRASource.open(path);
 
-  @override
-  Future<void> close() async {
-    await _file.close();
-  }
+  static Future<FileRASource> load(PlatformFile file) =>
+      impl.FileRASource.load(file);
 }

lib/src/file_ra_source_stub.dart

@@ -0,0 +1,41 @@
+import 'dart:typed_data';
+
+import 'file_ra_source.dart' as base;
+
+typedef PlatformFile = Object;
+
+abstract class FileRASource extends base.FileRASource {
+  static Future<FileRASource> open(String path) =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  static Future<FileRASource> load(PlatformFile file) =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<int> length() =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<int> readByte() =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<Uint8List> read(int count) =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<int> position() =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<void> seek(int position) =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<Uint8List> readToEnd() =>
+      throw UnsupportedError('Not supported on this platform.');
+
+  @override
+  Future<void> close() =>
+      throw UnsupportedError('Not supported on this platform.');
+}

lib/src/file_ra_source_vm.dart

@@ -0,0 +1,39 @@
+import 'dart:io' as io;
+import 'dart:typed_data';
+
+import 'file_ra_source.dart' as base;
+
+typedef PlatformFile = io.File;
+
+class FileRASource extends base.FileRASource {
+  final io.RandomAccessFile _file;
+
+  FileRASource._(this._file);
+
+  static Future<FileRASource> open(String path) async =>
+      FileRASource._(await io.File(path).open());
+
+  static Future<FileRASource> load(PlatformFile file) async =>
+      FileRASource._(await file.open());
+
+  @override
+  Future<int> length() => _file.length();
+
+  @override
+  Future<int> readByte() => _file.readByte();
+
+  @override
+  Future<Uint8List> read(int count) => _file.read(count);
+
+  @override
+  Future<int> position() => _file.position();
+
+  @override
+  Future<void> seek(int position) => _file.setPosition(position);
+
+  @override
+  Future<Uint8List> readToEnd() async => _file.read(await _file.length());
+
+  @override
+  Future<void> close() => _file.close();
+}

lib/src/file_ra_source_web.dart

@@ -0,0 +1,50 @@
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:web/web.dart' as web;
+
+import 'bytes_ra_source.dart';
+import 'file_ra_source.dart' as base;
+
+typedef PlatformFile = web.Blob;
+
+@JS('fetch')
+external JSPromise<web.Response> _fetch(JSAny url);
+
+class FileRASource extends base.FileRASource {
+  final BytesRASource _bytes;
+
+  FileRASource._(this._bytes);
+
+  static Future<base.FileRASource> open(String path) async {
+    final res = await _fetch(path.toJS).toDart;
+    final bytes = (await res.bytes().toDart).toDart;
+    return FileRASource._(BytesRASource(bytes));
+  }
+
+  static Future<FileRASource> load(PlatformFile file) async {
+    final bytes = (await file.arrayBuffer().toDart).toDart.asUint8List();
+    return FileRASource._(BytesRASource(bytes));
+  }
+
+  @override
+  Future<int> length() => _bytes.length();
+
+  @override
+  Future<int> readByte() => _bytes.readByte();
+
+  @override
+  Future<Uint8List> read(int count) => _bytes.read(count);
+
+  @override
+  Future<int> position() => _bytes.position();
+
+  @override
+  Future<void> seek(int position) => _bytes.seek(position);
+
+  @override
+  Future<Uint8List> readToEnd() => _bytes.readToEnd();
+
+  @override
+  Future<void> close() => _bytes.close();
+}

pubspec.yaml

@@ -1,11 +1,14 @@
 name: random_access_source
 description: A shared interface for common random access data.
-version: 3.0.0
+version: 3.1.0
 repository: https://github.com/flutter-cavalry/random_access_source
 
 environment:
   sdk: ^3.4.4
 
+dependencies:
+  web: ^1.1.1
+
 dev_dependencies:
   mgenware_dart_lints: ^8.0.0
   test: ^1.24.0