Improve FileSystemProvider and fix s3 endpoint url handling

Author: redsolver

lib/store/create.dart

@@ -31,9 +31,13 @@ Map<String, ObjectStore> createStoresFromConfig(
   final stores = <String, ObjectStore>{};
 
   if (s3Config != null) {
+    final String endpointUrl = s3Config['endpointUrl'] ?? s3Config['endpoint'];
+    final uri = Uri.tryParse(endpointUrl);
     stores['s3'] = S3ObjectStore(
       Minio(
-        endPoint: s3Config['endpoint'],
+        useSSL: (uri?.scheme ?? 'https') == 'https',
+        endPoint: uri?.host ?? endpointUrl,
+        port: uri?.port,
         accessKey: s3Config['accessKey'],
         secretKey: s3Config['secretKey'],
       ),
@@ -99,10 +103,16 @@ Map<String, ObjectStore> createStoresFromConfig(
     } */
 
   if (fileSystemConfig != null) {
-    stores['fs'] = FileSystemProviderObjectStore(node, localDirectories: [
-      // TODO Configure directories
-      Directory('/public'),
-    ]);
+    stores['fs'] = FileSystemProviderObjectStore(
+      node,
+      localDirectories: [
+        for (final path in fileSystemConfig['directories']) Directory(path),
+      ],
+      httpPort: fileSystemConfig['httpPort'] ?? 23432,
+      httpBind: fileSystemConfig['httpBind'] ?? '0.0.0.0',
+      externalDownloadUrl:
+          fileSystemConfig['externalDownloadUrl'] ?? 'http://localhost:23432',
+    );
   }
 
   if (siaConfig != null) {

lib/store/fs_provider.dart

@@ -171,12 +171,18 @@ class FileSystemProviderObjectStore extends ObjectStore {
   @override
   final uploadsSupported = false;
 
-  // TODO Make port configurable
-  final httpServerConfig = {
-    'port': 23432,
-  };
-
-  FileSystemProviderObjectStore(this.node, {required this.localDirectories}) {
+  final String externalDownloadUrl;
+
+  final int httpPort;
+  final String httpBind;
+
+  FileSystemProviderObjectStore(
+    this.node, {
+    required this.localDirectories,
+    required this.httpPort,
+    required this.httpBind,
+    required this.externalDownloadUrl,
+  }) {
     final app = Alfred();
 
     app.all('*', cors());
@@ -186,11 +192,13 @@ class FileSystemProviderObjectStore extends ObjectStore {
       if (metadataHashes.containsKey(hash)) {
         res.add(metadataHashes[hash]!);
         res.close();
+      } else if (fileHashes.containsKey(hash)) {
+        return File(fileHashes[hash]!);
       }
     });
     app.listen(
-      httpServerConfig['port']!,
-      httpServerConfig['bind'] ?? '0.0.0.0',
+      httpPort,
+      httpBind,
     );
   }
 
@@ -210,9 +218,9 @@ class FileSystemProviderObjectStore extends ObjectStore {
   Future<StorageLocation> provide(Multihash hash, List<int> types) async {
     return StorageLocation(
       3,
-      // TODO Specify external URL and increase expiry
-      ['http://localhost:23432/hash/${hash.toBase64Url()}'],
-      calculateExpiry(Duration(seconds: 30)),
+      // TODO Increase expiry
+      ['$externalDownloadUrl/hash/${hash.toBase64Url()}'],
+      calculateExpiry(Duration(minutes: 10)),
     );
   }