Fix: Fix upload / download

pitwch · Aug 15, 2023 · b05f02e · b05f02e
1 parent 1ec1a27
commit b05f02e
Show file tree

Hide file tree

Showing 5 changed files with 196 additions and 174 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release Note
 
+## v0.3.3
+
+- Fix big sized Upload Datei / Download Datei
+- Optimize tests
+- Update deps
+
 ## v0.3.2
 
 - Update deps

diff --git a/_assets/big_image.png b/_assets/big_image.png
diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:async/async.dart';
@@ -185,11 +186,8 @@ class ProffixClient implements BaseProffixClient {
       final logoutUri = buildUriPx(restURL,
           [_options.apiPrefix, _options.version, _options.loginEndpoint]);
 
-      var logoutTask = await _dioClient
-          .delete(
-            logoutUri,
-          )
-          .timeout(Duration(seconds: _options.timeout));
+      var logoutTask = await _dioClient.delete(logoutUri,
+          data: {}).timeout(Duration(seconds: _options.timeout));
 
       // Clear PxSessionId
       _pxSessionID = "";
@@ -441,26 +439,31 @@ class ProffixClient implements BaseProffixClient {
   /// Utility method to directly download a file from PRO/Datei
   @override
   Future<Response> downloadFile({required String dateiNr}) async {
-    String pxsessionid = await getPxSessionId();
-    final downloadUri = _getUriUrl(
-        buildUriPx(restURL, [
-          _options.apiPrefix,
-          _options.version,
-          "PRO/Datei/$dateiNr"
-        ]).toString(),
-        null);
-
     try {
+      String pxsessionid = await getPxSessionId();
+      final downloadUri = _getUriUrl(
+          buildUriPx(restURL,
+              [_options.apiPrefix, _options.version, "PRO/Datei/$dateiNr"]),
+          null);
+
       _dioClient.options.headers["PxSessionId"] = pxsessionid;
 
       return await _dioClient.get(downloadUri,
-          options: Options(responseType: ResponseType.bytes));
+          data: {},
+          options: Options(
+            responseType: ResponseType.bytes,
+          ));
     } catch (e) {
-      if (e is DioException) {
-        throw ProffixException(
-            body: e.response, statusCode: e.response?.statusCode ?? 0);
+      if (e is ProffixException) {
+        rethrow;
+      } else if (e is HttpException) {
+        throw ProffixException(body: e.message, statusCode: 0);
       } else {
-        throw ProffixException(body: e.toString(), statusCode: 0);
+        if (e is List<int>) {
+          throw ProffixException(body: utf8.decode(e), statusCode: 0);
+        } else {
+          throw ProffixException(body: e, statusCode: 0);
+        }
       }
     }
   }
@@ -475,6 +478,8 @@ class ProffixClient implements BaseProffixClient {
 
     _dioClient.options.headers['PxSessionId'] = pxsessionid;
     _dioClient.options.headers["content-type"] = "application/octet-stream";
+    _dioClient.options.contentType = "application/octet-stream";
+    _dioClient.options.headers['Content-Length'] = data.length;
 
     Map<String, dynamic> params = {"filename": fileName};
     try {
@@ -485,6 +490,10 @@ class ProffixClient implements BaseProffixClient {
           fileName != null ? params : null);
 
       var resp = await _dioClient.post(postUri,
+          // onSendProgress: (count, total) => {print(count)},
+          options: Options(
+              receiveTimeout: Duration(minutes: 2),
+              sendTimeout: Duration(minutes: 2)),
           data: Stream.fromIterable(data.map((e) => [e])));
       if (resp.statusCode == null ||
           (resp.statusCode! < 200 && resp.statusCode! > 300)) {
@@ -496,10 +505,9 @@ class ProffixClient implements BaseProffixClient {
         return dateiNr;
       }
     } catch (e) {
-      if (e is DioException) {
+      if (e is ProffixException) {
         //handle DioError here by error type or by error code
-        throw ProffixException(
-            body: e.response, statusCode: e.response?.statusCode ?? 0);
+        rethrow;
       } else {
         throw ProffixException(body: e.toString(), statusCode: 0);
       }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_proffix_rest
 description: A Dart wrapper for Proffix Rest API with automatic login and logout and many useful helper functions
-version: 0.3.2
+version: 0.3.3
 repository: https://github.com/pitwch/dart_proffix_rest
 homepage: https://github.com/pitwch/dart_proffix_rest
 environment:
@@ -10,7 +10,7 @@ dependencies:
   async: ^2.11.0
   crypto: ^3.0.2
   dartz: ^0.10.1
-  dio: ^5.3.0
+  dio: ^5.3.2
   intl: ^0.18.1
 
 dev_dependencies: