feat!: upgrade to lib5 1.0.0-pre.1 and bump all deps incl. rust bridge

Author: redsolver

Dockerfile

@@ -1,4 +1,4 @@
-FROM dart:latest AS builder
+FROM dart:stable AS builder
 
 # Get dependencies
 RUN \

bin/ffi.io.dart

@@ -1,17 +1,15 @@
-import 'dart:async';
 import 'dart:io';
 
 import 'package:lib5/util.dart';
 import 'package:s5_server/crypto/implementation.dart';
+import 'package:s5_server/rust/frb_generated.dart';
 import 'package:tint/tint.dart';
 import 'package:toml/toml.dart';
 
 import 'package:s5_server/constants.dart';
 import 'package:s5_server/node.dart';
 import 'package:s5_server/logger/console.dart';
 
-import 'ffi.io.dart';
-
 void main(List<String> arguments) async {
   final isDocker = Platform.environment['DOCKER'] == 'TRUE';
 
@@ -26,16 +24,12 @@ void main(List<String> arguments) async {
     exit(1);
   }
 
-  final rust = initializeExternalLibrary(
-    isDocker
-        ? '/app/librust.so'
-        : (Platform.isWindows ? './rust.dll' : './librust.so'),
-  );
-  final crypto = RustCryptoImplementation(rust);
+  await RustLib.init();
+  final crypto = RustCryptoImplementation();
 
   final file = File(arguments[0]);
   if (!file.existsSync()) {
-    final seed = crypto.generateRandomBytes(32);
+    final seed = crypto.generateSecureRandomBytes(32);
     file.createSync(recursive: true);
     file.writeAsStringSync(
       (isDocker ? defaultConfigDocker : defaultConfig).replaceFirst(
@@ -58,16 +52,9 @@ void main(List<String> arguments) async {
   final node = S5Node(
     config: config,
     logger: logger,
-    rust: rust,
     crypto: crypto,
   );
-
-  runZonedGuarded(
-    node.start,
-    (e, st) {
-      logger.catched(e, st);
-    },
-  );
+  return node.start();
 }
 
 const defaultConfig =

bin/s5_server.dart

@@ -0,0 +1,6 @@
+rust_root: rust/
+rust_input: crate::api
+dart_output: lib/rust
+c_output: frb_generated.h
+dump_all: true
+local: true

flutter_rust_bridge.yaml

@@ -12,7 +12,7 @@ class Account {
     required this.isRestricted,
     required this.tier,
   });
-  toJson() => {
+  Map toJson() => {
         'id': id,
         'createdAt': createdAt,
         'email': email,

lib/accounts/account.dart

@@ -1,9 +1,11 @@
 // ! S5 node version
-const nodeVersion = '0.14.1';
+const nodeVersion = '1.0.0-pre.1';
 
 // ! default chunk size for hashes
 const defaultChunkSize = 256 * 1024;
 const defaultChunkSizeAsPowerOf2 = 18;
 
 // const magicByteStoredFile = 0x8d;
 
+@Deprecated('use directory identifiers with ed25519 key type instead')
+const cidTypeResolver = 0x25;

lib/constants.dart

@@ -5,18 +5,16 @@ import 'package:cryptography/cryptography.dart';
 import 'package:lib5/lib5.dart';
 import 'package:lib5/util.dart';
 
-import 'package:s5_server/rust/bridge_definitions.dart';
+import 'package:s5_server/rust/api.dart' as rust;
 
 class RustCryptoImplementation extends CryptoImplementation {
-  final Rust rust;
-
-  RustCryptoImplementation(this.rust);
+  RustCryptoImplementation();
 
   final ed25519 = Ed25519();
   final _defaultSecureRandom = Random.secure();
 
   @override
-  Uint8List generateRandomBytes(int length) {
+  Uint8List generateSecureRandomBytes(int length) {
     final bytes = Uint8List(length);
 
     for (var i = 0; i < bytes.length; i++) {
@@ -45,14 +43,14 @@ class RustCryptoImplementation extends CryptoImplementation {
 
   @override
   Future<Uint8List> signEd25519({
-    required KeyPairEd25519 kp,
+    required KeyPairEd25519 keyPair,
     required Uint8List message,
   }) async {
     final signature = await ed25519.sign(
       message,
-      keyPair: SimpleKeyPairData(kp.extractBytes().sublist(0, 32),
+      keyPair: SimpleKeyPairData(keyPair.extractBytes().sublist(0, 32),
           publicKey: SimplePublicKey(
-            kp.extractBytes().sublist(32),
+            keyPair.extractBytes().sublist(32),
             type: KeyPairType.ed25519,
           ),
           type: KeyPairType.ed25519),
@@ -62,7 +60,7 @@ class RustCryptoImplementation extends CryptoImplementation {
 
   @override
   Future<bool> verifyEd25519({
-    required Uint8List pk,
+    required Uint8List publicKey,
     required Uint8List message,
     required Uint8List signature,
   }) async {
@@ -71,7 +69,7 @@ class RustCryptoImplementation extends CryptoImplementation {
       signature: Signature(
         signature,
         publicKey: SimplePublicKey(
-          pk,
+          publicKey,
           type: KeyPairType.ed25519,
         ),
       ),

lib/crypto/implementation.dart

@@ -13,6 +13,7 @@ import 'package:lib5/util.dart';
 import 'package:path/path.dart';
 
 import 'package:s5_server/node.dart';
+import 'package:s5_server/rust/api.dart';
 
 final httpClient = Client();
 
@@ -69,7 +70,7 @@ Stream<List<int>> openRead({
 
     final blake3Hash = await node.crypto.hashBlake3(res.bodyBytes);
 
-    final isValid = areBytesEqual(hash.hashBytes, blake3Hash);
+    final isValid = areBytesEqual(hash.value, blake3Hash);
 
     if (isValid != true) {
       throw 'File integrity check failed (BLAKE3)';
@@ -263,7 +264,8 @@ Stream<List<int>> openRead({
 
               if (endPos < (startByte + chunkSize)) {
                 if ((startByte + chunkSize) > totalSize) {
-                  final end = min(totalEncSize, encStartByte + encChunkSize * 64);
+                  final end =
+                      min(totalEncSize, encStartByte + encChunkSize * 64);
                   rangeHeader = 'bytes=$encStartByte-${end - 1}';
                 } else {
                   rangeHeader =
@@ -288,7 +290,8 @@ Stream<List<int>> openRead({
                     encChunkSize * (downloadUntilChunkExclusive - chunk);
 
                 if ((encStartByte + length) > totalSize) {
-                  final end = min(totalEncSize, encStartByte + encChunkSize * 64);
+                  final end =
+                      min(totalEncSize, encStartByte + encChunkSize * 64);
                   rangeHeader = 'bytes=$encStartByte-${end - 1}';
                 } else {
                   rangeHeader =
@@ -348,12 +351,12 @@ Stream<List<int>> openRead({
                     0, chunkBytes.length - encryptionMetadata.padding);
               }
             } else {
-              final integrityRes = await node.rust.verifyIntegrity(
+              final integrityRes = await verifyIntegrity(
                 chunkBytes: chunkBytes,
-                offset: chunk * chunkSize,
+                offset: BigInt.from(chunk * chunkSize),
                 baoOutboardBytes: baoOutboardBytesCache[
                     storageLocation.location.outboardBytesUrl]!,
-                blake3Hash: hash.hashBytes,
+                blake3Hash: U8Array32(hash.value),
               );
 
               if (integrityRes != 1) {

lib/download/open_read.dart

@@ -5,9 +5,12 @@ import 'dart:typed_data';
 
 import 'package:alfred/alfred.dart';
 import 'package:base_codecs/base_codecs.dart';
+import 'package:filesize/filesize.dart';
 import 'package:http/http.dart';
 import 'package:lib5/constants.dart';
+import 'package:lib5/identifiers.dart';
 import 'package:lib5/lib5.dart';
+import 'package:lib5/fs.dart';
 import 'package:lib5/node.dart';
 import 'package:lib5/util.dart';
 import 'package:mime/mime.dart';
@@ -342,7 +345,7 @@ class HttpAPIServer {
       }).firstWhere((element) => element[0] == 'hash')[1];
 
       final uploadId = base58BitcoinEncode(
-        node.crypto.generateRandomBytes(32),
+        node.crypto.generateSecureRandomBytes(32),
       );
 
       final mhash =
@@ -503,7 +506,7 @@ class HttpAPIServer {
 
       final cid = CID.decode(cidStr);
 
-      if (cid.type == cidTypeMetadataWebApp || cid.type == cidTypeResolver) {
+      if (cid.type == cidTypeMetadataDirectory) {
         final base32cid = cid.toBase32();
         final requestedUri = req.requestedUri;
         await res.redirect(
@@ -596,9 +599,6 @@ class HttpAPIServer {
 
       if (cid.type == cidTypeRaw) {
         throw 'Raw CIDs do not have metadata';
-      } else if (cid.type == cidTypeResolver) {
-        // TODO Support resolver CIDs
-        throw 'This endpoint does not support resolver CIDs yet';
       }
 
       final metadata = await node.downloadMetadata(cid);
@@ -782,7 +782,7 @@ class HttpAPIServer {
       final signature = base64UrlNoPaddingDecode(map['signature']!);
 
       await node.registry.set(
-        SignedRegistryEntry(
+        RegistryEntry(
           pk: pk,
           revision: revision,
           data: bytes,

lib/http_api/http_api.dart

@@ -138,7 +138,7 @@ Future handleChunkedFile(
       res.headers.add('content-length', len.toString());
       res.headers.add(
         'content-range',
-        'bytes ' + item.toContentRange(totalSize),
+        'bytes ${item.toContentRange(totalSize)}',
       );
       await res.addStream(stream);
       completer.complete();