Use SDK version of BytesBuilder (#130)
The `BytesBuilder` class was previously available only through `dart:io`
which prevented it's use in cross platform code. Dart version `2.10.0`
makes this class available from either `dart:io` or `dart:typed_data`.
Delete this copy to reduce the amount of code that needs to be migrated
to null safety.
diff --git a/lib/src/copy/bytes_builder.dart b/lib/src/copy/bytes_builder.dart
deleted file mode 100644
index 4cbd6d7..0000000
--- a/lib/src/copy/bytes_builder.dart
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-// This is a copy of "dart:io"'s BytesBuilder implementation, from
-// sdk/lib/io/bytes_builder.dart. It's copied here to make it available to
-// non-"dart:io" applications (issue 18348).
-//
-// Because it's copied directly, there are no modifications from the original.
-//
-// This is up-to-date as of sdk revision
-// 365f7b5a8b6ef900a5ee23913b7203569b81b175.
-
-import 'dart:typed_data';
-
-/// Builds a list of bytes, allowing bytes and lists of bytes to be added at the
-/// end.
-///
-/// Used to efficiently collect bytes and lists of bytes.
-abstract class BytesBuilder {
- /// Construct a new empty [BytesBuilder].
- ///
- /// If [copy] is true, the data is always copied when added to the list. If
- /// it [copy] is false, the data is only copied if needed. That means that if
- /// the lists are changed after added to the [BytesBuilder], it may effect the
- /// output. Default is `true`.
- factory BytesBuilder({bool copy = true}) {
- if (copy) {
- return _CopyingBytesBuilder();
- } else {
- return _BytesBuilder();
- }
- }
-
- /// Appends [bytes] to the current contents of the builder.
- ///
- /// Each value of [bytes] will be bit-representation truncated to the range
- /// 0 .. 255.
- void add(List<int> bytes);
-
- /// Append [byte] to the current contents of the builder.
- ///
- /// The [byte] will be bit-representation truncated to the range 0 .. 255.
- void addByte(int byte);
-
- /// Returns the contents of `this` and clears `this`.
- ///
- /// The list returned is a view of the internal buffer, limited to the
- /// [length].
- Uint8List takeBytes();
-
- /// Returns a copy of the current contents of the builder.
- ///
- /// Leaves the contents of the builder intact.
- Uint8List toBytes();
-
- /// The number of bytes in the builder.
- int get length;
-
- /// Returns `true` if the buffer is empty.
- bool get isEmpty;
-
- /// Returns `true` if the buffer is not empty.
- bool get isNotEmpty;
-
- /// Clear the contents of the builder.
- void clear();
-}
-
-class _CopyingBytesBuilder implements BytesBuilder {
- // Start with 1024 bytes.
- static const int _INIT_SIZE = 1024;
-
- static final _emptyList = Uint8List(0);
-
- int _length = 0;
- Uint8List _buffer;
-
- _CopyingBytesBuilder([int initialCapacity = 0])
- : _buffer = (initialCapacity <= 0)
- ? _emptyList
- : Uint8List(_pow2roundup(initialCapacity));
-
- @override
- void add(List<int> bytes) {
- var bytesLength = bytes.length;
- if (bytesLength == 0) return;
- var required = _length + bytesLength;
- if (_buffer.length < required) {
- _grow(required);
- }
- assert(_buffer.length >= required);
- if (bytes is Uint8List) {
- _buffer.setRange(_length, required, bytes);
- } else {
- for (var i = 0; i < bytesLength; i++) {
- _buffer[_length + i] = bytes[i];
- }
- }
- _length = required;
- }
-
- @override
- void addByte(int byte) {
- if (_buffer.length == _length) {
- // The grow algorithm always at least doubles.
- // If we added one to _length it would quadruple unnecessarily.
- _grow(_length);
- }
- assert(_buffer.length > _length);
- _buffer[_length] = byte;
- _length++;
- }
-
- void _grow(int required) {
- // We will create a list in the range of 2-4 times larger than
- // required.
- var newSize = required * 2;
- if (newSize < _INIT_SIZE) {
- newSize = _INIT_SIZE;
- } else {
- newSize = _pow2roundup(newSize);
- }
- var newBuffer = Uint8List(newSize);
- newBuffer.setRange(0, _buffer.length, _buffer);
- _buffer = newBuffer;
- }
-
- @override
- Uint8List takeBytes() {
- if (_length == 0) return _emptyList;
- var buffer = Uint8List.view(_buffer.buffer, 0, _length);
- clear();
- return buffer;
- }
-
- @override
- Uint8List toBytes() {
- if (_length == 0) return _emptyList;
- return Uint8List.fromList(Uint8List.view(_buffer.buffer, 0, _length));
- }
-
- @override
- int get length => _length;
-
- @override
- bool get isEmpty => _length == 0;
-
- @override
- bool get isNotEmpty => _length != 0;
-
- @override
- void clear() {
- _length = 0;
- _buffer = _emptyList;
- }
-
- static int _pow2roundup(int x) {
- assert(x > 0);
- --x;
- x |= x >> 1;
- x |= x >> 2;
- x |= x >> 4;
- x |= x >> 8;
- x |= x >> 16;
- return x + 1;
- }
-}
-
-class _BytesBuilder implements BytesBuilder {
- int _length = 0;
- final List<Uint8List> _chunks = [];
-
- @override
- void add(List<int> bytes) {
- Uint8List typedBytes;
- if (bytes is Uint8List) {
- typedBytes = bytes;
- } else {
- typedBytes = Uint8List.fromList(bytes);
- }
- _chunks.add(typedBytes);
- _length += typedBytes.length;
- }
-
- @override
- void addByte(int byte) {
- _chunks.add(Uint8List(1)..[0] = byte);
- _length++;
- }
-
- @override
- Uint8List takeBytes() {
- if (_length == 0) return _CopyingBytesBuilder._emptyList;
- if (_chunks.length == 1) {
- var buffer = _chunks[0];
- clear();
- return buffer;
- }
- var buffer = Uint8List(_length);
- var offset = 0;
- for (var chunk in _chunks) {
- buffer.setRange(offset, offset + chunk.length, chunk);
- offset += chunk.length;
- }
- clear();
- return buffer;
- }
-
- @override
- Uint8List toBytes() {
- if (_length == 0) return _CopyingBytesBuilder._emptyList;
- var buffer = Uint8List(_length);
- var offset = 0;
- for (var chunk in _chunks) {
- buffer.setRange(offset, offset + chunk.length, chunk);
- offset += chunk.length;
- }
- return buffer;
- }
-
- @override
- int get length => _length;
-
- @override
- bool get isEmpty => _length == 0;
-
- @override
- bool get isNotEmpty => _length != 0;
-
- @override
- void clear() {
- _length = 0;
- _chunks.clear();
- }
-}
diff --git a/lib/src/copy/web_socket_impl.dart b/lib/src/copy/web_socket_impl.dart
index b980bec..842f211 100644
--- a/lib/src/copy/web_socket_impl.dart
+++ b/lib/src/copy/web_socket_impl.dart
@@ -20,7 +20,6 @@
import 'dart:typed_data';
import '../exception.dart';
-import 'bytes_builder.dart';
import 'io_sink.dart';
import 'web_socket.dart';
