get/update resource: allow to set resource interface

Author: jkralik

pb/get_resource.pb.go

@@ -24,4 +24,5 @@ option go_package = "github.com/plgd-dev/client-application/pb;pb";
 
 message GetResourceRequest {
   resourceaggregate.pb.ResourceId resource_id = 1;
+  string resource_interface = 2;
 }

pb/get_resource.proto

@@ -663,6 +663,12 @@
             "required": true,
             "type": "string",
             "pattern": ".+"
+          },
+          {
+            "name": "resourceInterface",
+            "in": "query",
+            "required": false,
+            "type": "string"
           }
         ],
         "tags": [
@@ -713,6 +719,12 @@
             "schema": {
               "$ref": "#/definitions/grpcgatewaypbContent"
             }
+          },
+          {
+            "name": "resourceInterface",
+            "in": "query",
+            "required": false,
+            "type": "string"
           }
         ],
         "tags": [

pb/service.swagger.json

@@ -26,4 +26,5 @@ option go_package = "github.com/plgd-dev/client-application/pb;pb";
 message UpdateResourceRequest {
     resourceaggregate.pb.ResourceId resource_id = 1;
     grpcgateway.pb.Content content = 2;
+    string resource_interface = 3;
 }

pb/update_resource.pb.go

@@ -43,7 +43,7 @@ func (s *ClientApplicationServer) GetDevice(ctx context.Context, req *pb.GetDevi
 	if len(devLinks) == 0 {
 		return nil, status.Errorf(codes.NotFound, "cannot find device resource %v at device %v", plgdDevice.ResourceType, req.GetDeviceId())
 	}
-	_, err = getResourceAndRefreshCache(ctx, dev, devLinks[0])
+	_, err = getResourceAndRefreshCache(ctx, dev, devLinks[0], "")
 	if err != nil {
 		return nil, err
 	}

pb/update_resource.proto

@@ -22,6 +22,7 @@ import (
 
 	"github.com/plgd-dev/client-application/pb"
 	"github.com/plgd-dev/client-application/pkg/rawcodec"
+	pkgCoap "github.com/plgd-dev/device/v2/pkg/net/coap"
 	"github.com/plgd-dev/device/v2/schema"
 	plgdDevice "github.com/plgd-dev/device/v2/schema/device"
 	"github.com/plgd-dev/go-coap/v3/message"
@@ -32,15 +33,19 @@ import (
 	"google.golang.org/grpc/codes"
 )
 
-func getResourceAndRefreshCache(ctx context.Context, dev *device, link schema.ResourceLink) (*commands.Content, error) {
+func getResourceAndRefreshCache(ctx context.Context, dev *device, link schema.ResourceLink, resourceInterface string) (*commands.Content, error) {
 	var response []byte
-	err := dev.GetResourceWithCodec(ctx, link, rawcodec.GetRawCodec(message.AppOcfCbor), &response)
+	var options []func(message.Options) message.Options
+	if resourceInterface != "" {
+		options = append(options, pkgCoap.WithInterface(resourceInterface))
+	}
+	err := dev.GetResourceWithCodec(ctx, link, rawcodec.GetRawCodec(message.AppOcfCbor), &response, options...)
 	if err != nil {
 		return nil, convErrToGrpcStatus(codes.Unavailable, fmt.Errorf("cannot get resource %v for device %v: %w", link.Href, dev.ID, err)).Err()
 	}
 	content := responseToData(response)
 	// we update device resource body only for device resource
-	if strings.Contains(link.ResourceTypes, plgdDevice.ResourceType) {
+	if strings.Contains(link.ResourceTypes, plgdDevice.ResourceType) && resourceInterface == "" {
 		dev.updateDeviceResourceBody(content)
 	}
 	return content, nil
@@ -70,7 +75,7 @@ func (s *ClientApplicationServer) GetResource(ctx context.Context, req *pb.GetRe
 	if err != nil {
 		return nil, err
 	}
-	content, err := getResourceAndRefreshCache(ctx, dev, link)
+	content, err := getResourceAndRefreshCache(ctx, dev, link, req.GetResourceInterface())
 	if err != nil {
 		return nil, err
 	}

service/grpc/getDevice.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/plgd-dev/client-application/pb"
 	"github.com/plgd-dev/client-application/pkg/rawcodec"
+	pkgCoap "github.com/plgd-dev/device/v2/pkg/net/coap"
 	"github.com/plgd-dev/go-coap/v3/message"
 	grpcgwPb "github.com/plgd-dev/hub/v2/grpc-gateway/pb"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
@@ -63,7 +64,11 @@ func (s *ClientApplicationServer) UpdateResource(ctx context.Context, req *pb.Up
 		return nil, err
 	}
 	var response []byte
-	err = dev.UpdateResourceWithCodec(ctx, link, rawcodec.GetRawCodec(message.AppOcfCbor), updateData, &response)
+	var options []func(message.Options) message.Options
+	if req.GetResourceInterface() != "" {
+		options = append(options, pkgCoap.WithInterface(req.GetResourceInterface()))
+	}
+	err = dev.UpdateResourceWithCodec(ctx, link, rawcodec.GetRawCodec(message.AppOcfCbor), updateData, &response, options...)
 	if err != nil {
 		return nil, convErrToGrpcStatus(codes.Unavailable, fmt.Errorf("cannot update resource %v for device %v: %w", req.GetResourceId().GetHref(), dev.ID, err)).Err()
 	}