fixup! feat: add experimental CoAP server implementation

shamblett · Oct 30, 2022 · dba7547 · dba7547
1 parent 63b200e
commit dba7547
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/example/coap_server.dart b/example/coap_server.dart
@@ -25,7 +25,9 @@ FutureOr<void> main() async {
         request,
         CoapCode.content,
         CoapMessageType.ack,
-      )..id = request.id;
+      )
+        ..id = request.id
+        ..payloadString = 'Hello World!';
       print('Sending response: $response\n');
       server
         ..sendResponse(response, request.source!, request.uriPort)

diff --git a/lib/src/coap_server.dart b/lib/src/coap_server.dart
@@ -15,6 +15,8 @@ import 'package:typed_data/typed_data.dart';
 
 import '../config/coap_config_default.dart';
 import 'coap_config.dart';
+import 'coap_empty_message.dart';
+import 'coap_message.dart';
 import 'coap_request.dart';
 import 'coap_response.dart';
 import 'stack/layer_stack.dart';
@@ -111,16 +113,16 @@ class _CoapUdpServer extends CoapServer {
         return;
       }
       final data = Uint8Buffer()..addAll(datagram.data);
-      final decoder = _config.spec.newMessageDecoder(data);
-      if (decoder.isRequest) {
-        final request = decoder.decodeRequest();
-        if (request == null) {
+      final message = CoapMessage.fromUdpPayload(data);
+      if (message is CoapRequest && !message.hasFormatError) {
+        if (message.hasUnknownCriticalOption) {
+          _rejectMessage(message, datagram.address, datagram.port);
           return;
         }
-        request
+        message
           ..source = datagram.address
           ..uriPort = datagram.port;
-        streamController.sink.add(request);
+        streamController.sink.add(message);
       }
     });
   }
@@ -155,9 +157,15 @@ class _CoapUdpServer extends CoapServer {
     final InternetAddress address,
     final int port,
   ) {
-    final encoder = _config.spec.newMessageEncoder();
-    final bytes = encoder.encodeResponse(response);
-    final buffer = Uint8List.fromList(bytes.toList(growable: false));
-    _socket.send(buffer, address, port);
+    _socket.send(response.toUdpPayload().toList(), address, port);
+  }
+
+  void _rejectMessage(
+    final CoapMessage message,
+    final InternetAddress address,
+    final int port,
+  ) {
+    final resetMessage = CoapEmptyMessage.newRST(message);
+    _socket.send(resetMessage.toUdpPayload().toList(), address, port);
   }
 }