Switch to Uint8Buffer.

Author: rkistner

sqlite3/lib/src/wasm/vfs/dynamic_buffer.dart

@@ -8,7 +8,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
-import 'package:sqlite3/src/wasm/vfs/dynamic_buffer.dart';
+import 'package:typed_data/typed_buffers.dart';
 import 'package:web/web.dart' as web;
 
 import '../../constants.dart';
@@ -534,9 +534,10 @@ final class IndexedDbFileSystem extends BaseVirtualFileSystem {
       final name = entry.key;
       final fileId = entry.value;
 
-      final buffer = DynamicBuffer();
+      final buffer = Uint8Buffer();
       final data = await _asynchronous.readFully(fileId);
-      buffer.add(data);
+      buffer.length = data.length;
+      buffer.setRange(0, data.length, data);
 
       _memory.fileData[name] = buffer;
     }
@@ -647,7 +648,9 @@ class _IndexedDbFile implements VirtualFileSystemFile {
   void xWrite(Uint8List buffer, int fileOffset) {
     vfs._checkClosed();
 
-    final previousContent = vfs._memory.fileData[path] ?? DynamicBuffer();
+    final previousContent = vfs._memory.fileData[path] ?? Uint8Buffer();
+    final previousList =
+        previousContent.buffer.asUint8List(0, previousContent.length);
     memoryFile.xWrite(buffer, fileOffset);
 
     if (!vfs._inMemoryOnlyFiles.contains(path)) {
@@ -656,9 +659,8 @@ class _IndexedDbFile implements VirtualFileSystemFile {
       final copy = Uint8List(buffer.length);
       copy.setAll(0, buffer);
 
-      vfs._submitWork(
-          _WriteFileWorkItem(vfs, path, previousContent.toUint8List())
-            ..writes.add(_OffsetAndBuffer(fileOffset, copy)));
+      vfs._submitWork(_WriteFileWorkItem(vfs, path, previousList)
+        ..writes.add(_OffsetAndBuffer(fileOffset, copy)));
     }
   }
 }

sqlite3/lib/src/wasm/vfs/indexed_db.dart

@@ -2,14 +2,14 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:path/path.dart' as p;
-import 'dynamic_buffer.dart';
+import 'package:typed_data/typed_buffers.dart';
 
 import '../../constants.dart';
 import '../../vfs.dart';
 import 'utils.dart';
 
 final class InMemoryFileSystem extends BaseVirtualFileSystem {
-  final Map<String, DynamicBuffer?> fileData = {};
+  final Map<String, Uint8Buffer?> fileData = {};
 
   InMemoryFileSystem({super.name = 'dart-memory', super.random});
 
@@ -35,7 +35,7 @@ final class InMemoryFileSystem extends BaseVirtualFileSystem {
       final create = flags & SqlFlag.SQLITE_OPEN_CREATE;
 
       if (create != 0) {
-        fileData[pathStr] = DynamicBuffer();
+        fileData[pathStr] = Uint8Buffer();
       } else {
         throw VfsException(SqlError.SQLITE_CANTOPEN);
       }
@@ -70,7 +70,8 @@ class _InMemoryFile extends BaseVfsFile {
     if (file == null || file.length <= offset) return 0;
 
     final available = min(buffer.length, file.length - offset);
-    buffer.setRange(0, available, file.toUint8List(), offset);
+    final list = file.buffer.asUint8List(0, file.length);
+    buffer.setRange(0, available, list, offset);
     return available;
   }
 
@@ -104,10 +105,10 @@ class _InMemoryFile extends BaseVfsFile {
     final file = vfs.fileData[path];
 
     if (file == null) {
-      vfs.fileData[path] = DynamicBuffer();
-      vfs.fileData[path]!.truncate(size);
+      vfs.fileData[path] = Uint8Buffer();
+      vfs.fileData[path]!.length = size;
     } else {
-      file.truncate(size);
+      file.length = size;
     }
   }
 
@@ -121,9 +122,14 @@ class _InMemoryFile extends BaseVfsFile {
     var file = vfs.fileData[path];
 
     if (file == null) {
-      file = DynamicBuffer();
+      file = Uint8Buffer();
       vfs.fileData[path] = file;
     }
-    file.write(buffer, fileOffset);
+
+    var endIndex = fileOffset + buffer.length;
+    if (endIndex > file.length) {
+      file.length = endIndex;
+    }
+    file.setRange(fileOffset, endIndex, buffer);
   }
 }

sqlite3/lib/src/wasm/vfs/memory.dart

@@ -27,6 +27,7 @@ dependencies:
   meta: ^1.3.0
   path: ^1.8.0
   web: ^1.0.0
+  typed_data: ^1.3.2
 
 dev_dependencies:
   analyzer: ^6.4.1