Merge pull request #451 from appwrite/feat-dart-input-file-improvements

Author: lohanidamodar

composer.lock

@@ -421,18 +421,6 @@ public function getFiles()
                 'template'      => 'dart/lib/src/input_file.dart.twig',
                 'minify'        => false,
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_io.dart',
-                'template'      => 'dart/lib/src/chunked_upload_io.dart.twig',
-                'minify'        => false,
-            ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_stub.dart',
-                'template'      => 'dart/lib/src/chunked_upload_stub.dart.twig',
-                'minify'        => false,
-            ],
         ];
     }
 

src/SDK/Language/Dart.php

@@ -277,18 +277,6 @@ public function getFiles()
                 'template'      => 'flutter/lib/src/input_file.dart.twig',
                 'minify'        => false,
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_io.dart',
-                'template'      => 'flutter/lib/src/chunked_upload_io.dart.twig',
-                'minify'        => false,
-            ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'lib/src/chunked_upload_stub.dart',
-                'template'      => 'flutter/lib/src/chunked_upload_stub.dart.twig',
-                'minify'        => false,
-            ],
         ];
     }
 }

src/SDK/Language/Flutter.php

@@ -9,34 +9,23 @@
         };
 
 {% if 'multipart/form-data' in method.consumes %}
-        dynamic res;
-        if(identical(0, 0.0)) {
+        String idParamName = '';
 {% for parameter in method.parameters.all %}
 {% if parameter.type == 'file' %}
-          params['{{ parameter.name }}'] = {{ parameter.name }}.file;
-{% endif %}
-{% endfor %}
-          res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, headers: headers);
-        } else {
-          String idParamName = '';
-{% for parameter in method.parameters.all %}
-{% if parameter.type == 'file' %}
-          final paramName = '{{ parameter.name }}';
+        final paramName = '{{ parameter.name }}';
 {% endif %}
 {% if parameter.isUploadID %}
-          idParamName = '{{ parameter.name }}';
+        idParamName = '{{ parameter.name }}';
 {% endif %}
 {% endfor %}
-          res = await chunkedUpload(
-            client: client,
+        final res = await client.chunkedUpload(
             path: path,
             params: params,
             paramName: paramName,
             idParamName: idParamName,
             headers: headers,
             onProgress: onProgress,
-          );
-        }
+        );
 
         return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | caseUcfirst}}.fromMap(res.data){% else %} res.data{% endif %};
 {% endif %}

templates/dart/base/requests/file.twig

@@ -2,21 +2,20 @@ library {{ language.params.packageName }};
 
 import 'dart:async';
 import 'dart:typed_data';
-import 'src/chunked_upload_stub.dart'
-    if (dart.library.io) 'src/chunked_upload_io.dart';
+import 'package:http/http.dart' show MultipartFile;
 import 'src/enums.dart';
 import 'src/client.dart';
 import 'src/service.dart';
 import 'src/input_file.dart';
 import 'src/upload_progress.dart';
 import 'models.dart' as models;
+import 'src/exception.dart';
 
 export 'src/response.dart';
 export 'src/client.dart';
 export 'src/exception.dart';
 export 'src/input_file.dart';
 export 'src/upload_progress.dart';
-export 'package:http/http.dart' show MultipartFile;
 
 part 'query.dart';
 {% for service in spec.services %}

templates/dart/lib/package.dart.twig

@@ -3,6 +3,8 @@ import 'client_stub.dart'
     if (dart.library.html) 'client_browser.dart'
     if (dart.library.io) 'client_io.dart';
 import 'response.dart';
+import 'input_file.dart';
+import 'upload_progress.dart';
 
 abstract class Client {
   static const int CHUNK_SIZE = 5*1024*1024;
@@ -29,6 +31,15 @@ abstract class Client {
 
   Client addHeader(String key, String value);
 
+  Future<Response> chunkedUpload({
+    required String path,
+    required Map<String, dynamic> params,
+    required String paramName,
+    required String idParamName,
+    required Map<String, String> headers,
+    Function(UploadProgress)? onProgress,
+  });
+
   Future<Response> call(HttpMethod method, {
     String path = '',
     Map<String, String> headers = const {},

templates/dart/lib/src/chunked_upload_io.dart.twig

@@ -1,10 +1,13 @@
+import 'dart:math';
 import 'package:http/http.dart' as http;
 import 'package:http/browser_client.dart';
 import 'client_mixin.dart';
 import 'enums.dart';
 import 'exception.dart';
 import 'client_base.dart';
 import 'response.dart';
+import 'input_file.dart';
+import 'upload_progress.dart';
 
 ClientBase createClient({
   required String endPoint,
@@ -13,6 +16,7 @@ ClientBase createClient({
     ClientBrowser(endPoint: endPoint, selfSigned: selfSigned);
 
 class ClientBrowser extends ClientBase with ClientMixin {
+  static const int CHUNK_SIZE = 5*1024*1024;
   String _endPoint;
   Map<String, String>? _headers;
   @override
@@ -70,6 +74,73 @@ class ClientBrowser extends ClientBase with ClientMixin {
     return this;
   }
 
+  @override
+  Future<Response> chunkedUpload({
+    required String path,
+    required Map<String, dynamic> params,
+    required String paramName,
+    required String idParamName,
+    required Map<String, String> headers,
+    Function(UploadProgress)? onProgress,
+  }) async {
+    InputFile file = params[paramName];
+    if (file.bytes == null) {
+      throw {{spec.title | caseUcfirst}}Exception("File bytes must be provided for Flutter web");
+    }
+
+    int size = file.bytes!.length;
+
+    late Response res;
+    if (size <= CHUNK_SIZE) {
+      params[paramName] = http.MultipartFile.fromBytes(paramName, file.bytes!, filename: file.filename);
+      return call(
+        HttpMethod.post,
+        path: path,
+        params: params,
+        headers: headers,
+      );
+    }
+
+    var offset = 0;
+    if (idParamName.isNotEmpty && params[idParamName] != 'unique()') {
+      //make a request to check if a file already exists
+      try {
+        res = await call(
+          HttpMethod.get,
+          path: path + '/' + params[idParamName],
+          headers: headers,
+        );
+        final int chunksUploaded = res.data['chunksUploaded'] as int;
+        offset = min(size, chunksUploaded * CHUNK_SIZE);
+      } on {{spec.title | caseUcfirst}}Exception catch (_) {}
+    }
+
+    while (offset < size) {
+      var chunk;
+      final end = min(offset + CHUNK_SIZE-1, size-1);
+      chunk = file.bytes!.getRange(offset, end).toList();
+      params[paramName] =
+          http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
+      headers['content-range'] =
+          'bytes $offset-${min<int>(((offset + CHUNK_SIZE) - 1), size)}/$size';
+      res = await call(HttpMethod.post,
+          path: path, headers: headers, params: params);
+      offset += CHUNK_SIZE;
+      if (offset < size) {
+        headers['x-{{spec.title | caseLower }}-id'] = res.data['\$id'];
+      }
+      final progress = UploadProgress(
+        $id: res.data['\$id'] ?? '',
+        progress: min(offset - 1, size) / size * 100,
+        sizeUploaded: min(offset - 1, size),
+        chunksTotal: res.data['chunksTotal'] ?? 0,
+        chunksUploaded: res.data['chunksUploaded'] ?? 0,
+      );
+      onProgress?.call(progress);
+    }
+    return res;
+  }
+
   @override
   Future<Response> call(
     HttpMethod method, {