Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Minio Dart
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
images
Minio Dart
Commits
73848784
Commit
73848784
authored
3 years ago
by
xuty
Browse files
Options
Downloads
Patches
Plain Diff
Fix response body encoding #14
parent
06026ea8
Branches
Branches containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/src/minio_client.dart
+39
-2
39 additions, 2 deletions
lib/src/minio_client.dart
lib/src/minio_errors.dart
+3
-2
3 additions, 2 deletions
lib/src/minio_errors.dart
lib/src/minio_helpers.dart
+4
-3
4 additions, 3 deletions
lib/src/minio_helpers.dart
with
46 additions
and
7 deletions
lib/src/minio_client.dart
+
39
−
2
View file @
73848784
import
'dart:convert'
;
import
'dart:typed_data'
;
import
'package:http/http.dart'
;
import
'package:minio/minio.dart'
;
...
...
@@ -43,6 +44,42 @@ class MinioRequest extends BaseRequest {
}
}
/// An HTTP response where the entire response body is known in advance.
class
MinioResponse
extends
BaseResponse
{
/// The bytes comprising the body of this response.
final
Uint8List
bodyBytes
;
/// Body of s3 response is always encoded as UTF-8.
String
get
body
=
>
utf8
.
decode
(
bodyBytes
);
/// Create a new HTTP response with a byte array body.
MinioResponse
.
bytes
(
this
.
bodyBytes
,
int
statusCode
,
{
BaseRequest
?
request
,
Map
<
String
,
String
>
headers
=
const
{},
bool
isRedirect
=
false
,
bool
persistentConnection
=
true
,
String
?
reasonPhrase
,
})
:
super
(
statusCode
,
contentLength:
bodyBytes
.
length
,
request:
request
,
headers:
headers
,
isRedirect:
isRedirect
,
persistentConnection:
persistentConnection
,
reasonPhrase:
reasonPhrase
);
static
Future
<
MinioResponse
>
fromStream
(
StreamedResponse
response
)
async
{
final
body
=
await
response
.
stream
.
toBytes
();
return
MinioResponse
.
bytes
(
body
,
response
.
statusCode
,
request:
response
.
request
,
headers:
response
.
headers
,
isRedirect:
response
.
isRedirect
,
persistentConnection:
response
.
persistentConnection
,
reasonPhrase:
response
.
reasonPhrase
);
}
}
class
MinioClient
{
MinioClient
(
this
.
minio
)
{
anonymous
=
minio
.
accessKey
.
isEmpty
&&
minio
.
secretKey
.
isEmpty
;
...
...
@@ -93,7 +130,7 @@ class MinioClient {
return
response
;
}
Future
<
Response
>
request
({
Future
<
Minio
Response
>
request
({
required
String
method
,
String
?
bucket
,
String
?
object
,
...
...
@@ -114,7 +151,7 @@ class MinioClient {
headers:
headers
,
);
final
response
=
await
Response
.
fromStream
(
stream
);
final
response
=
await
Minio
Response
.
fromStream
(
stream
);
logResponse
(
response
);
return
response
;
...
...
This diff is collapsed.
Click to expand it.
lib/src/minio_errors.dart
+
3
−
2
View file @
73848784
import
'package:http/http.dart'
;
import
'package:minio/models.dart'
;
import
'package:minio/src/minio_client.dart'
;
import
'package:minio/src/minio_helpers.dart'
;
class
MinioError
{
...
...
@@ -88,5 +88,6 @@ class MinioS3Error extends MinioError {
MinioS3Error
(
String
?
message
,
[
this
.
error
,
this
.
response
])
:
super
(
message
);
Error
?
error
;
Response
?
response
;
MinioResponse
?
response
;
}
This diff is collapsed.
Click to expand it.
lib/src/minio_helpers.dart
+
4
−
3
View file @
73848784
import
'package:convert/convert.dart'
;
import
'package:http/http.dart'
;
import
'package:mime/mime.dart'
show
lookupMimeType
;
import
'package:minio/src/minio_client.dart'
;
import
'package:minio/src/minio_errors.dart'
;
import
'package:minio/src/minio_models_generated.dart'
;
import
'package:xml/xml.dart'
as
xml
;
...
...
@@ -199,20 +200,20 @@ Future<void> validateStreamed(
int
?
expect
,
})
async
{
if
(
streamedResponse
.
statusCode
>
=
400
)
{
final
response
=
await
Response
.
fromStream
(
streamedResponse
);
final
response
=
await
Minio
Response
.
fromStream
(
streamedResponse
);
final
body
=
xml
.
XmlDocument
.
parse
(
response
.
body
);
final
error
=
Error
.
fromXml
(
body
.
rootElement
);
throw
MinioS3Error
(
error
.
message
,
error
,
response
);
}
if
(
expect
!=
null
&&
streamedResponse
.
statusCode
!=
expect
)
{
final
response
=
await
Response
.
fromStream
(
streamedResponse
);
final
response
=
await
Minio
Response
.
fromStream
(
streamedResponse
);
throw
MinioS3Error
(
'
$expect
expected, got
${streamedResponse.statusCode}
'
,
null
,
response
);
}
}
void
validate
(
Response
response
,
{
int
?
expect
})
{
void
validate
(
Minio
Response
response
,
{
int
?
expect
})
{
if
(
response
.
statusCode
>
=
400
)
{
var
error
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment