Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor!: rework CoapCode and CoapMessageType as enhanced enums #114

Merged
merged 4 commits into from
Aug 6, 2022
Merged

refactor!: rework CoapCode and CoapMessageType as enhanced enums #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81d9738
refactor!: rework CoapCode and CoapMessageType as enums
JKRhb Jul 16, 2022
9b12fd5
feat: add missing response codes
JKRhb Jul 16, 2022
f931455
feat: add missing method codes
JKRhb Jul 16, 2022
ac161f6
feat: add signaling codes (RFC 8323)
JKRhb Jul 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions lib/src/coap_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import 'coap_block_option.dart';
import 'coap_code.dart';
import 'coap_config.dart';
import 'coap_constants.dart';
import 'coap_empty_message.dart';
import 'coap_link_format.dart';
import 'coap_media_type.dart';
import 'coap_message.dart';
Expand Down Expand Up @@ -130,18 +131,17 @@ class CoapClient {
Future<CoapResponse> get(
final String path, {
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newGet();
final request = CoapRequest.newGet(confirmable: confirmable);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand All @@ -155,18 +155,18 @@ class CoapClient {
required final String payload,
final CoapMediaType format = CoapMediaType.textPlain,
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newPost()..setPayloadMedia(payload, format);
final request = CoapRequest.newPost(confirmable: confirmable)
..setPayloadMedia(payload, format);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand All @@ -180,18 +180,18 @@ class CoapClient {
required final Uint8Buffer payload,
final CoapMediaType format = CoapMediaType.textPlain,
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newPost()..setPayloadMediaRaw(payload, format);
final request = CoapRequest.newPost(confirmable: confirmable)
..setPayloadMediaRaw(payload, format);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand All @@ -205,20 +205,20 @@ class CoapClient {
required final String payload,
final CoapMediaType format = CoapMediaType.textPlain,
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<Uint8Buffer>? etags,
final MatchEtags matchEtags = MatchEtags.onMatch,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newPut()..setPayloadMedia(payload, format);
final request = CoapRequest.newPut(confirmable: confirmable)
..setPayloadMedia(payload, format);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand All @@ -236,18 +236,18 @@ class CoapClient {
final MatchEtags matchEtags = MatchEtags.onMatch,
final List<Uint8Buffer>? etags,
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newPut()..setPayloadMediaRaw(payload, format);
final request = CoapRequest.newPut(confirmable: confirmable)
..setPayloadMediaRaw(payload, format);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand All @@ -261,18 +261,17 @@ class CoapClient {
Future<CoapResponse> delete(
final String path, {
final CoapMediaType accept = CoapMediaType.textPlain,
final int type = CoapMessageType.con,
final bool confirmable = true,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation = false,
final int maxRetransmit = 0,
final CoapMulticastResponseHandler? onMulticastResponse,
}) {
final request = CoapRequest.newDelete();
final request = CoapRequest.newDelete(confirmable: confirmable);
_build(
request,
path,
accept,
type,
options,
earlyBlock2Negotiation,
maxRetransmit,
Expand Down Expand Up @@ -365,10 +364,10 @@ class CoapClient {
/// Cancels a request
void cancel(final CoapRequest request) {
request.isCancelled = true;
final response = CoapResponse(CoapCode.empty)
final response = CoapEmptyMessage(CoapMessageType.rst)
..id = request.id
..token = request.token;
_eventBus.fire(CoapRespondEvent(response));
_eventBus.fire(CoapCancelledEvent(response));
}

/// Cancel all ongoing requests
Expand All @@ -380,7 +379,6 @@ class CoapClient {
final CoapRequest request,
final String path,
final CoapMediaType accept,
final int type,
final List<CoapOption>? options,
final bool earlyBlock2Negotiation,
final int maxRetransmit, {
Expand All @@ -390,7 +388,6 @@ class CoapClient {
request
..uriPath = path
..accept = accept
..type = type
..maxRetransmit = maxRetransmit;
if (options != null) {
request.addOptions(options);
Expand Down
Loading