upgrade to github.com/plgd-dev/go-coap/v3

plgd-dev · Aug 4, 2022 · 564ed7d · 564ed7d
1 parent be75542
commit 564ed7d
Show file tree

Hide file tree

Showing 30 changed files with 456 additions and 156 deletions.
diff --git a/client/client.go b/client/client.go
@@ -12,7 +12,7 @@ import (
 	"github.com/plgd-dev/device/client/core"
 	"github.com/plgd-dev/device/client/core/otm"
 	"github.com/plgd-dev/device/pkg/net/coap"
-	"github.com/plgd-dev/go-coap/v2/net/blockwise"
+	"github.com/plgd-dev/go-coap/v3/net/blockwise"
 	kitSync "github.com/plgd-dev/kit/v2/sync"
 )
 

diff --git a/client/core/client.go b/client/core/client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/pion/dtls/v2"
 	pkgError "github.com/plgd-dev/device/pkg/error"
 	"github.com/plgd-dev/device/pkg/net/coap"
-	coapNet "github.com/plgd-dev/go-coap/v2/net"
+	coapNet "github.com/plgd-dev/go-coap/v3/net"
 	"github.com/plgd-dev/kit/v2/log"
 )
 

diff --git a/client/core/deleteResource.go b/client/core/deleteResource.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
 )
 
 func (d *Device) DeleteResource(

diff --git a/client/core/discover.go b/client/core/discover.go
@@ -7,13 +7,15 @@ import (
 	"time"
 
 	"github.com/plgd-dev/device/pkg/net/coap"
-	"github.com/plgd-dev/go-coap/v2/message"
-	"github.com/plgd-dev/go-coap/v2/net"
-	"github.com/plgd-dev/go-coap/v2/net/blockwise"
-	"github.com/plgd-dev/go-coap/v2/udp"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
-	udpMessage "github.com/plgd-dev/go-coap/v2/udp/message"
-	"github.com/plgd-dev/go-coap/v2/udp/message/pool"
+	"github.com/plgd-dev/go-coap/v3/message"
+	udpMessage "github.com/plgd-dev/go-coap/v3/message"
+	"github.com/plgd-dev/go-coap/v3/message/pool"
+	"github.com/plgd-dev/go-coap/v3/net"
+	"github.com/plgd-dev/go-coap/v3/net/blockwise"
+	"github.com/plgd-dev/go-coap/v3/options"
+	"github.com/plgd-dev/go-coap/v3/udp"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
+	coapUdpServer "github.com/plgd-dev/go-coap/v3/udp/server"
 )
 
 // See the section 10.4 on the line 2482 of the Core specification:
@@ -30,7 +32,7 @@ type DiscoveryClient struct {
 	mcastaddr string
 	msgID     uint16
 	l         *net.UDPConn
-	server    *udp.Server
+	server    *coapUdpServer.Server
 	wg        sync.WaitGroup
 	opts      []net.MulticastOption
 }
@@ -40,7 +42,7 @@ func newDiscoveryClient(network, mcastaddr string, msgID uint16, timeout time.Du
 	if err != nil {
 		return nil, err
 	}
-	s := udp.NewServer(udp.WithErrors(errors), udp.WithBlockwise(true, blockwise.SZX1024, timeout), udp.WithMessagePool(pool.New(0, 0)))
+	s := udp.NewServer(options.WithErrors(errors), options.WithBlockwise(true, blockwise.SZX1024, timeout), options.WithMessagePool(pool.New(0, 0)))
 	c := &DiscoveryClient{
 		mcastaddr: mcastaddr,
 		msgID:     msgID,
@@ -60,7 +62,7 @@ func newDiscoveryClient(network, mcastaddr string, msgID uint16, timeout time.Du
 }
 
 func (d *DiscoveryClient) PublishMsgWithContext(req *pool.Message, discoveryHandler DiscoveryHandler) error {
-	req.SetMessageID(d.msgID)
+	req.SetMessageID(int32(d.msgID))
 	req.SetType(udpMessage.NonConfirmable)
 	return d.server.DiscoveryRequest(req, d.mcastaddr, discoveryHandler, d.opts...)
 }
@@ -84,7 +86,7 @@ func DialDiscoveryAddresses(ctx context.Context, cfg DiscoveryConfiguration, err
 	// We need to separate messageIDs for upd4 and udp6, because if any docker container has isolated network
 	// iotivity-lite gets error EINVAL(22) for sendmsg with UDP6 for some interfaces. If it happens, the device is
 	// not discovered and msgid is cached so all other multicast messages from another interfaces are dropped for deduplication.
-	msgIDudp4 := udpMessage.GetMID()
+	msgIDudp4 := uint16(udpMessage.GetMID())
 	msgIDudp6 := msgIDudp4 + ^uint16(0)/2
 
 	for _, address := range cfg.MulticastAddressUDP4 {
@@ -152,11 +154,13 @@ func runDiscovery(
 			for _, o := range options {
 				opts = o(opts)
 			}
-			req, err := client.NewGetRequest(ctx, pool.New(0, 0), href, opts...)
+			req := pool.NewMessage(ctx)
+			token, err := message.GetToken()
 			if err != nil {
 				errors <- MakeInternal(fmt.Errorf("device discovery request creation failed: %w", err))
 				return
 			}
+			req.SetupGet(href, token, opts...)
 
 			err = conn.PublishMsgWithContext(req, handler)
 			if err != nil {

diff --git a/client/core/discoverDeviceCodec.go b/client/core/discoverDeviceCodec.go
@@ -3,10 +3,11 @@ package core
 import (
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	pkgError "github.com/plgd-dev/device/pkg/error"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/go-coap/v2/message"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
+	"github.com/plgd-dev/go-coap/v3/message"
+	"github.com/plgd-dev/go-coap/v3/message/pool"
 )
 
 type DiscoverDeviceCodec struct{}
@@ -24,7 +25,7 @@ type deviceLink struct {
 	Links    schema.ResourceLinks `json:"links"`
 }
 
-func decodeDiscoverDevices(msg *message.Message, resources *schema.ResourceLinks) error {
+func decodeDiscoverDevices(msg *pool.Message, resources *schema.ResourceLinks) error {
 	codec := ocf.VNDOCFCBORCodec{}
 	var devices []deviceLink
 
@@ -49,12 +50,12 @@ func decodeDiscoverDevices(msg *message.Message, resources *schema.ResourceLinks
 
 // Decode validates the content format and
 // propagates the payload to v as *schema.ResourceLinks
-func (c DiscoverDeviceCodec) Decode(msg *message.Message, v interface{}) error {
+func (c DiscoverDeviceCodec) Decode(msg *pool.Message, v interface{}) error {
 	resources, ok := v.(*schema.ResourceLinks)
 	if !ok {
 		return MakeInvalidArgument(fmt.Errorf("invalid type %T", v))
 	}
-	mt, err := msg.Options.ContentFormat()
+	mt, err := msg.Options().ContentFormat()
 	if err != nil {
 		return MakeUnimplemented(fmt.Errorf("content format not found"))
 	}

diff --git a/client/core/discoverDeviceOwnership.go b/client/core/discoverDeviceOwnership.go
@@ -4,13 +4,13 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema/doxm"
-	"github.com/plgd-dev/go-coap/v2/message"
-	"github.com/plgd-dev/go-coap/v2/message/codes"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
-	"github.com/plgd-dev/go-coap/v2/udp/message/pool"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
+	"github.com/plgd-dev/go-coap/v3/message"
+	"github.com/plgd-dev/go-coap/v3/message/codes"
+	"github.com/plgd-dev/go-coap/v3/message/pool"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 )
 
 // DiscoverDeviceOwnershipHandler receives devices ownership info.
@@ -64,19 +64,15 @@ func DiscoverDeviceOwnership(
 
 func handleDiscoverOwnershipResponse(ctx context.Context, handler DiscoverDeviceOwnershipHandler) func(client *client.ClientConn, req *pool.Message) {
 	return func(client *client.ClientConn, r *pool.Message) {
-		req, err := pool.ConvertTo(r)
-		if err != nil {
-			handler.Error(fmt.Errorf("request failed: %w", err))
-		}
-
-		if req.Code != codes.Content {
+		req := r
+		if req.Code() != codes.Content {
 			handler.Error(fmt.Errorf("request failed: %s", ocf.Dump(req)))
 			return
 		}
 
 		var doxm doxm.Doxm
 		var codec ocf.VNDOCFCBORCodec
-		err = codec.Decode(req, &doxm)
+		err := codec.Decode(req, &doxm)
 		if err != nil {
 			handler.Error(fmt.Errorf("decoding %v failed: %w", ocf.DumpHeader(req), err))
 			return

diff --git a/client/core/discoverDevices.go b/client/core/discoverDevices.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
 	"github.com/plgd-dev/device/schema/resources"
-	"github.com/plgd-dev/go-coap/v2/message"
-	"github.com/plgd-dev/go-coap/v2/message/codes"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
-	"github.com/plgd-dev/go-coap/v2/udp/message/pool"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
+	"github.com/plgd-dev/go-coap/v3/message"
+	"github.com/plgd-dev/go-coap/v3/message/codes"
+	"github.com/plgd-dev/go-coap/v3/message/pool"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 	"github.com/plgd-dev/kit/v2/net"
 )
 
@@ -38,19 +38,16 @@ func DiscoverDevices(
 
 func handleResponse(ctx context.Context, handler DiscoverDevicesHandler) func(*client.ClientConn, *pool.Message) {
 	return func(cc *client.ClientConn, r *pool.Message) {
-		req, err := pool.ConvertTo(r)
-		if err != nil {
-			handler.Error(fmt.Errorf("cannot convert message: %w", err))
-		}
-		if req.Code != codes.Content {
+		req := r
+		if req.Code() != codes.Content {
 			handler.Error(fmt.Errorf("request failed: %s", ocf.Dump(req)))
 			return
 		}
 
 		var links schema.ResourceLinks
 		var codec DiscoverDeviceCodec
 
-		err = codec.Decode(req, &links)
+		err := codec.Decode(req, &links)
 		if err != nil {
 			handler.Error(fmt.Errorf("decoding %v failed: %w", ocf.DumpHeader(req), err))
 			return

diff --git a/client/core/getDevice.go b/client/core/getDevice.go
@@ -9,7 +9,7 @@ import (
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
 	"github.com/plgd-dev/device/schema/device"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 )
 
 // GetDeviceByIP gets the device directly via IP address and multicast listen port 5683.

diff --git a/client/core/getDevices.go b/client/core/getDevices.go
@@ -8,7 +8,7 @@ import (
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
 	"github.com/plgd-dev/device/schema/device"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 )
 
 // DeviceHandler conveys device connections and errors during discovery.

diff --git a/client/core/getOwnerships.go b/client/core/getOwnerships.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/plgd-dev/device/schema/doxm"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 )
 
 // OwnershipHandler conveys device ownership and errors during discovery.

diff --git a/client/core/getResource.go b/client/core/getResource.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
 )
 
 // GetResource queries a device for a resource value in CBOR.

diff --git a/client/core/getResourceLinks.go b/client/core/getResourceLinks.go
@@ -7,7 +7,7 @@ import (
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
 	"github.com/plgd-dev/device/schema/resources"
-	"github.com/plgd-dev/go-coap/v2/message"
+	"github.com/plgd-dev/go-coap/v3/message"
 	"github.com/plgd-dev/kit/v2/net"
 )
 

diff --git a/client/core/observeResource.go b/client/core/observeResource.go
@@ -6,9 +6,9 @@ import (
 	"sync"
 
 	"github.com/google/uuid"
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
 	"go.uber.org/atomic"
 )
 

diff --git a/client/core/updateResource.go b/client/core/updateResource.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/kit/v2/codec/ocf"
 )
 
 func (d *Device) UpdateResource(

diff --git a/client/createResource.go b/client/createResource.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/plgd-dev/device/client/core"
+	codecOcf "github.com/plgd-dev/device/pkg/codec/ocf"
 	"github.com/plgd-dev/device/pkg/net/coap"
-	codecOcf "github.com/plgd-dev/kit/v2/codec/ocf"
 )
 
 func (c *Client) CreateResource(

diff --git a/client/deleteResource.go b/client/deleteResource.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/plgd-dev/device/client/core"
-	codecOcf "github.com/plgd-dev/kit/v2/codec/ocf"
+	codecOcf "github.com/plgd-dev/device/pkg/codec/ocf"
 )
 
 func (c *Client) DeleteResource(

diff --git a/client/getDevice.go b/client/getDevice.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/plgd-dev/device/client/core"
 	"github.com/plgd-dev/device/schema"
-	"github.com/plgd-dev/go-coap/v2/message/codes"
-	"github.com/plgd-dev/go-coap/v2/message/status"
+	"github.com/plgd-dev/go-coap/v3/message/codes"
+	"github.com/plgd-dev/go-coap/v3/message/status"
 )
 
 func getLinksRefDevice(ctx context.Context, refDev *RefDevice, disableUDPEndpoints bool) (schema.ResourceLinks, error) {

diff --git a/client/getResource.go b/client/getResource.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/plgd-dev/device/client/core"
-	codecOcf "github.com/plgd-dev/kit/v2/codec/ocf"
+	codecOcf "github.com/plgd-dev/device/pkg/codec/ocf"
 )
 
 func (c *Client) GetResource(

diff --git a/client/observeDevices.go b/client/observeDevices.go
@@ -12,7 +12,7 @@ import (
 	"github.com/plgd-dev/device/pkg/net/coap"
 	"github.com/plgd-dev/device/schema"
 	"github.com/plgd-dev/device/schema/device"
-	"github.com/plgd-dev/go-coap/v2/udp/client"
+	"github.com/plgd-dev/go-coap/v3/udp/client"
 	"go.uber.org/atomic"
 )