mrpastewart/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved shelf warnings

Browse source
This commit is contained in:
thomashii@dukefirehawk.com 2022-08-29 21:32:12 +08:00
parent 308d6df606
commit 1708c1f870
6 changed files with 10 additions and 11 deletions

2
packages/shelf/CHANGELOG.md
View file

@ -1,6 +1,6 @@
# Change Log # Change Log
## 7.0.0 ## 7.0.0-beta.1
* Require Dart >= 2.17 * Require Dart >= 2.17

9
packages/shelf/lib/src/shelf_request.dart
View file

@ -6,8 +6,8 @@ import 'package:angel3_mock_request/angel3_mock_request.dart';
import 'package:shelf/shelf.dart' as shelf; import 'package:shelf/shelf.dart' as shelf;
class ShelfRequestContext extends RequestContext { class ShelfRequestContext extends RequestContext {
@override final Angel angelApp;
final Angel app;
@override @override
final Container container; final Container container;
@override @override
@ -20,7 +20,8 @@ class ShelfRequestContext extends RequestContext {
@override @override
final MockHttpHeaders headers = MockHttpHeaders(); final MockHttpHeaders headers = MockHttpHeaders();
ShelfRequestContext(this.app, this.container, this.rawRequest, this.path) { ShelfRequestContext(
this.angelApp, this.container, this.rawRequest, this.path) {
rawRequest.headers.forEach(headers.add); rawRequest.headers.forEach(headers.add);
} }
@ -53,7 +54,7 @@ class ShelfRequestContext extends RequestContext {
@override @override
String get method { String get method {
if (!app.allowMethodOverrides) { if (!angelApp.allowMethodOverrides) {
return originalMethod; return originalMethod;
} else { } else {
return headers.value('x-http-method-override')?.toUpperCase() ?? return headers.value('x-http-method-override')?.toUpperCase() ??

5
packages/shelf/lib/src/shelf_response.dart
View file

@ -6,8 +6,7 @@ import 'package:shelf/shelf.dart' as shelf;
import 'shelf_request.dart'; import 'shelf_request.dart';
class ShelfResponseContext extends ResponseContext<ShelfResponseContext> { class ShelfResponseContext extends ResponseContext<ShelfResponseContext> {
@override final Angel angelApp;
final Angel app;
final StreamController<List<int>> _ctrl = StreamController(); final StreamController<List<int>> _ctrl = StreamController();
bool _isOpen = true; bool _isOpen = true;
@ -15,7 +14,7 @@ class ShelfResponseContext extends ResponseContext<ShelfResponseContext> {
final bool _wasClosedByHandler = false; final bool _wasClosedByHandler = false;
bool _handlersAreDone = false; bool _handlersAreDone = false;
ShelfResponseContext(this.app); ShelfResponseContext(this.angelApp);
ShelfRequestContext? _correspondingRequest; ShelfRequestContext? _correspondingRequest;

1
packages/shelf/pubspec.yaml
View file

@ -3,7 +3,6 @@ version: 7.0.0-beta.1
description: Shelf interop with Angel3. Use this to wrap existing server code. description: Shelf interop with Angel3. Use this to wrap existing server code.
homepage: https://angel3-framework.web.app/ homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel/tree/master/packages/shelf repository: https://github.com/dukefirehawk/angel/tree/master/packages/shelf
publish_to: none
environment: environment:
sdk: '>=2.17.0 <3.0.0' sdk: '>=2.17.0 <3.0.0'
dependencies: dependencies:

2
packages/shelf/test/embed_shelf_test.dart
View file

@ -89,7 +89,7 @@ void main() {
print('Response: $body'); print('Response: $body');
expect(json.decode(body), {'error': 'crime'}); expect(json.decode(body), {'error': 'crime'});
} on HttpException catch (e, st) { } on HttpException catch (e, st) {
print('HTTP Exception: ' + e.message); print('HTTP Exception: ${e.message}');
print(st); print(st);
rethrow; rethrow;
} }

2
packages/sync/pubspec.yaml
View file

@ -1,5 +1,5 @@
name: angel3_sync name: angel3_sync
version: 6.0.0 version: 7.0.0
description: Easily synchronize and scale WebSockets using belatuk_pub_sub in Angel3. description: Easily synchronize and scale WebSockets using belatuk_pub_sub in Angel3.
homepage: https://angel3-framework.web.app/ homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/sync repository: https://github.com/dukefirehawk/angel/tree/angel3/packages/sync