Fix subscription and binding handling

api/device.go

@@ -59,6 +59,9 @@ type DeviceLocalInterface interface {
 	// Get a FeatureLocalInterface implementation for a given feature address
 	FeatureByAddress(address *model.FeatureAddressType) FeatureLocalInterface
 
+	// Clean all entity specific caches
+	CleanRemoteEntityCaches(remoteAddress *model.EntityAddressType)
+
 	// Process incoming SPINE datagram
 	ProcessCmd(datagram model.DatagramType, remoteDevice DeviceRemoteInterface) error
 

api/feature.go

@@ -64,8 +64,12 @@ type FeatureLocalInterface interface {
 	// Overwrite the default 1 minute timeout for write approvals
 	SetWriteApprovalTimeout(duration time.Duration)
 
-	// Clean all device specific caches
-	CleanCaches(ski string)
+	// Clean all write approval caches for a remote device ski
+	CleanWriteApprovalCaches(ski string)
+	// Clean all remote device specific caches
+	CleanRemoteDeviceCaches(remoteAddress *model.DeviceAddressType)
+	// Clean all remote entity specific caches
+	CleanRemoteEntityCaches(remoteAddress *model.EntityAddressType)
 
 	// return all functions
 	Functions() []model.FunctionType

spine/device_local.go

@@ -158,7 +158,8 @@ func (r *DeviceLocal) RemoveRemoteDeviceConnection(ski string) {
 }
 
 func (r *DeviceLocal) RemoveRemoteDevice(ski string) {
-	if r.RemoteDeviceForSki(ski) == nil {
+	remoteDevice := r.RemoteDeviceForSki(ski)
+	if remoteDevice == nil {
 		return
 	}
 
@@ -177,10 +178,14 @@ func (r *DeviceLocal) RemoveRemoteDevice(ski string) {
 		_ = Events.unsubscribe(api.EventHandlerLevelCore, r)
 	}
 
+	remoteDeviceAddress := &model.DeviceAddressType{
+		Device: remoteDevice.Address(),
+	}
 	// remove all data caches for this device
 	for _, entity := range r.entities {
 		for _, feature := range entity.Features() {
-			feature.CleanCaches(ski)
+			feature.CleanWriteApprovalCaches(ski)
+			feature.CleanRemoteDeviceCaches(remoteDeviceAddress)
 		}
 	}
 }
@@ -287,6 +292,14 @@ func (r *DeviceLocal) FeatureByAddress(address *model.FeatureAddressType) api.Fe
 	return nil
 }
 
+func (r *DeviceLocal) CleanRemoteEntityCaches(remoteAddress *model.EntityAddressType) {
+	for _, entity := range r.entities {
+		for _, feature := range entity.Features() {
+			feature.CleanRemoteEntityCaches(remoteAddress)
+		}
+	}
+}
+
 func (r *DeviceLocal) ProcessCmd(datagram model.DatagramType, remoteDevice api.DeviceRemoteInterface) error {
 	destAddr := datagram.Header.AddressDestination
 	localFeature := r.FeatureByAddress(destAddr)