|
|
@ -59,19 +59,19 @@ import org.thingsboard.server.gen.transport.TransportProtos; |
|
|
import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto; |
|
|
import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto; |
|
|
import org.thingsboard.server.queue.util.TbLwM2mTransportComponent; |
|
|
import org.thingsboard.server.queue.util.TbLwM2mTransportComponent; |
|
|
import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig; |
|
|
import org.thingsboard.server.transport.lwm2m.config.LwM2MTransportServerConfig; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2MOtaConvert; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2mOtaConvert; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2MTransportContext; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportContext; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2MTransportServerHelper; |
|
|
import org.thingsboard.server.transport.lwm2m.server.LwM2mTransportServerHelper; |
|
|
import org.thingsboard.server.transport.lwm2m.server.attributes.LwM2MAttributesService; |
|
|
import org.thingsboard.server.transport.lwm2m.server.attributes.LwM2MAttributesService; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientState; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientStateException; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientStateException; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClient; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClient; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2MClientContext; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.LwM2mClientContext; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.ParametersAnalyzeResult; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.ParametersAnalyzeResult; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.ResultsAddKeyValueProto; |
|
|
import org.thingsboard.server.transport.lwm2m.server.client.ResultsAddKeyValueProto; |
|
|
import org.thingsboard.server.transport.lwm2m.server.common.LwM2MExecutorAwareService; |
|
|
import org.thingsboard.server.transport.lwm2m.server.common.LwM2MExecutorAwareService; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.DownlinkRequestCallback; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.DownlinkRequestCallback; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.LwM2MDownlinkMsgHandler; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.LwM2mDownlinkMsgHandler; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MCancelObserveCallback; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MCancelObserveCallback; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MCancelObserveRequest; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MCancelObserveRequest; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MLatchCallback; |
|
|
import org.thingsboard.server.transport.lwm2m.server.downlink.TbLwM2MLatchCallback; |
|
|
@ -87,7 +87,7 @@ import org.thingsboard.server.transport.lwm2m.server.rpc.LwM2MRpcRequestHandler; |
|
|
import org.thingsboard.server.transport.lwm2m.server.session.LwM2MSessionManager; |
|
|
import org.thingsboard.server.transport.lwm2m.server.session.LwM2MSessionManager; |
|
|
import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore; |
|
|
import org.thingsboard.server.transport.lwm2m.server.store.TbLwM2MDtlsSessionStore; |
|
|
import org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil; |
|
|
import org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil; |
|
|
import org.thingsboard.server.transport.lwm2m.utils.LwM2MValueConverterImpl; |
|
|
import org.thingsboard.server.transport.lwm2m.utils.LwM2mValueConverterImpl; |
|
|
|
|
|
|
|
|
import javax.annotation.PostConstruct; |
|
|
import javax.annotation.PostConstruct; |
|
|
import javax.annotation.PreDestroy; |
|
|
import javax.annotation.PreDestroy; |
|
|
@ -129,34 +129,34 @@ import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.fr |
|
|
@Slf4j |
|
|
@Slf4j |
|
|
@Service |
|
|
@Service |
|
|
@TbLwM2mTransportComponent |
|
|
@TbLwM2mTransportComponent |
|
|
public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService implements LwM2MUplinkMsgHandler { |
|
|
public class DefaultLwM2mUplinkMsgHandler extends LwM2MExecutorAwareService implements LwM2mUplinkMsgHandler { |
|
|
|
|
|
|
|
|
public LwM2MValueConverterImpl converter; |
|
|
public LwM2mValueConverterImpl converter; |
|
|
|
|
|
|
|
|
private final TransportService transportService; |
|
|
private final TransportService transportService; |
|
|
private final LwM2MTransportContext context; |
|
|
private final LwM2mTransportContext context; |
|
|
private final LwM2MAttributesService attributesService; |
|
|
private final LwM2MAttributesService attributesService; |
|
|
private final LwM2MSessionManager sessionManager; |
|
|
private final LwM2MSessionManager sessionManager; |
|
|
private final LwM2MOtaUpdateService otaService; |
|
|
private final LwM2MOtaUpdateService otaService; |
|
|
private final LwM2MTransportServerConfig config; |
|
|
private final LwM2MTransportServerConfig config; |
|
|
private final LwM2MTelemetryLogService logService; |
|
|
private final LwM2MTelemetryLogService logService; |
|
|
private final LwM2MTransportServerHelper helper; |
|
|
private final LwM2mTransportServerHelper helper; |
|
|
private final TbLwM2MDtlsSessionStore sessionStore; |
|
|
private final TbLwM2MDtlsSessionStore sessionStore; |
|
|
private final LwM2MClientContext clientContext; |
|
|
private final LwM2mClientContext clientContext; |
|
|
private final LwM2MRpcRequestHandler rpcHandler; |
|
|
private final LwM2MRpcRequestHandler rpcHandler; |
|
|
private final LwM2MDownlinkMsgHandler defaultLwM2MDownlinkMsgHandler; |
|
|
private final LwM2mDownlinkMsgHandler defaultLwM2MDownlinkMsgHandler; |
|
|
|
|
|
|
|
|
public DefaultLwM2MUplinkMsgHandler(TransportService transportService, |
|
|
public DefaultLwM2mUplinkMsgHandler(TransportService transportService, |
|
|
LwM2MTransportServerConfig config, |
|
|
LwM2MTransportServerConfig config, |
|
|
LwM2MTransportServerHelper helper, |
|
|
LwM2mTransportServerHelper helper, |
|
|
LwM2MClientContext clientContext, |
|
|
LwM2mClientContext clientContext, |
|
|
LwM2MTelemetryLogService logService, |
|
|
LwM2MTelemetryLogService logService, |
|
|
LwM2MSessionManager sessionManager, |
|
|
LwM2MSessionManager sessionManager, |
|
|
@Lazy LwM2MOtaUpdateService otaService, |
|
|
@Lazy LwM2MOtaUpdateService otaService, |
|
|
@Lazy LwM2MAttributesService attributesService, |
|
|
@Lazy LwM2MAttributesService attributesService, |
|
|
@Lazy LwM2MRpcRequestHandler rpcHandler, |
|
|
@Lazy LwM2MRpcRequestHandler rpcHandler, |
|
|
@Lazy LwM2MDownlinkMsgHandler defaultLwM2MDownlinkMsgHandler, |
|
|
@Lazy LwM2mDownlinkMsgHandler defaultLwM2MDownlinkMsgHandler, |
|
|
LwM2MTransportContext context, TbLwM2MDtlsSessionStore sessionStore) { |
|
|
LwM2mTransportContext context, TbLwM2MDtlsSessionStore sessionStore) { |
|
|
this.transportService = transportService; |
|
|
this.transportService = transportService; |
|
|
this.sessionManager = sessionManager; |
|
|
this.sessionManager = sessionManager; |
|
|
this.attributesService = attributesService; |
|
|
this.attributesService = attributesService; |
|
|
@ -175,7 +175,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
public void init() { |
|
|
public void init() { |
|
|
super.init(); |
|
|
super.init(); |
|
|
this.context.getScheduler().scheduleAtFixedRate(this::reportActivity, new Random().nextInt((int) config.getSessionReportTimeout()), config.getSessionReportTimeout(), TimeUnit.MILLISECONDS); |
|
|
this.context.getScheduler().scheduleAtFixedRate(this::reportActivity, new Random().nextInt((int) config.getSessionReportTimeout()), config.getSessionReportTimeout(), TimeUnit.MILLISECONDS); |
|
|
this.converter = LwM2MValueConverterImpl.getInstance(); |
|
|
this.converter = LwM2mValueConverterImpl.getInstance(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@PreDestroy |
|
|
@PreDestroy |
|
|
@ -209,7 +209,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
*/ |
|
|
*/ |
|
|
public void onRegistered(Registration registration, Collection<Observation> previousObservations) { |
|
|
public void onRegistered(Registration registration, Collection<Observation> previousObservations) { |
|
|
executor.submit(() -> { |
|
|
executor.submit(() -> { |
|
|
LwM2MClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
try { |
|
|
try { |
|
|
log.debug("[{}] [{{}] Client: create after Registration", registration.getEndpoint(), registration.getId()); |
|
|
log.debug("[{}] [{{}] Client: create after Registration", registration.getEndpoint(), registration.getId()); |
|
|
Optional<SessionInfoProto> oldSessionInfo = this.clientContext.register(lwM2MClient, registration); |
|
|
Optional<SessionInfoProto> oldSessionInfo = this.clientContext.register(lwM2MClient, registration); |
|
|
@ -250,7 +250,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
*/ |
|
|
*/ |
|
|
public void updatedReg(Registration registration) { |
|
|
public void updatedReg(Registration registration) { |
|
|
executor.submit(() -> { |
|
|
executor.submit(() -> { |
|
|
LwM2MClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
try { |
|
|
try { |
|
|
log.info("[{}] [{{}] Client: update after Registration", registration.getEndpoint(), registration.getId()); |
|
|
log.info("[{}] [{{}] Client: update after Registration", registration.getEndpoint(), registration.getId()); |
|
|
logService.log(lwM2MClient, String.format("[%s][%s] Updated registration.", registration.getId(), registration.getSocketAddress())); |
|
|
logService.log(lwM2MClient, String.format("[%s][%s] Updated registration.", registration.getId(), registration.getSocketAddress())); |
|
|
@ -275,7 +275,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
*/ |
|
|
*/ |
|
|
public void unReg(Registration registration, Collection<Observation> observations) { |
|
|
public void unReg(Registration registration, Collection<Observation> observations) { |
|
|
executor.submit(() -> { |
|
|
executor.submit(() -> { |
|
|
LwM2MClient client = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient client = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
try { |
|
|
try { |
|
|
logService.log(client, LOG_LWM2M_INFO + ": Client unRegistration"); |
|
|
logService.log(client, LOG_LWM2M_INFO + ": Client unRegistration"); |
|
|
clientContext.unregister(client, registration); |
|
|
clientContext.unregister(client, registration); |
|
|
@ -312,7 +312,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
@Override |
|
|
@Override |
|
|
public void onUpdateValueAfterReadResponse(Registration registration, String path, ReadResponse response) { |
|
|
public void onUpdateValueAfterReadResponse(Registration registration, String path, ReadResponse response) { |
|
|
if (response.getContent() != null) { |
|
|
if (response.getContent() != null) { |
|
|
LwM2MClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
ObjectModel objectModelVersion = lwM2MClient.getObjectModel(path, this.config.getModelProvider()); |
|
|
ObjectModel objectModelVersion = lwM2MClient.getObjectModel(path, this.config.getModelProvider()); |
|
|
if (objectModelVersion != null) { |
|
|
if (objectModelVersion != null) { |
|
|
if (response.getContent() instanceof LwM2mObject) { |
|
|
if (response.getContent() instanceof LwM2mObject) { |
|
|
@ -338,7 +338,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
public void onUpdateValueAfterReadCompositeResponse(Registration registration, ReadCompositeResponse response) { |
|
|
public void onUpdateValueAfterReadCompositeResponse(Registration registration, ReadCompositeResponse response) { |
|
|
log.trace("ReadCompositeResponse: [{}]", response); |
|
|
log.trace("ReadCompositeResponse: [{}]", response); |
|
|
if (response.getContent() != null) { |
|
|
if (response.getContent() != null) { |
|
|
LwM2MClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient lwM2MClient = clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
response.getContent().forEach((k, v) -> { |
|
|
response.getContent().forEach((k, v) -> { |
|
|
if (v != null) { |
|
|
if (v != null) { |
|
|
if (v instanceof LwM2mObject) { |
|
|
if (v instanceof LwM2mObject) { |
|
|
@ -367,7 +367,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
@Override |
|
|
@Override |
|
|
public void onDeviceProfileUpdate(SessionInfoProto sessionInfo, DeviceProfile deviceProfile) { |
|
|
public void onDeviceProfileUpdate(SessionInfoProto sessionInfo, DeviceProfile deviceProfile) { |
|
|
try { |
|
|
try { |
|
|
List<LwM2MClient> clients = clientContext.getLwM2mClients() |
|
|
List<LwM2mClient> clients = clientContext.getLwM2mClients() |
|
|
.stream().filter(e -> e.getProfileId() != null) |
|
|
.stream().filter(e -> e.getProfileId() != null) |
|
|
.filter(e -> e.getProfileId().equals(deviceProfile.getUuidId())).collect(Collectors.toList()); |
|
|
.filter(e -> e.getProfileId().equals(deviceProfile.getUuidId())).collect(Collectors.toList()); |
|
|
clients.forEach(client -> client.onDeviceProfileUpdate(deviceProfile)); |
|
|
clients.forEach(client -> client.onDeviceProfileUpdate(deviceProfile)); |
|
|
@ -382,7 +382,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
@Override |
|
|
@Override |
|
|
public void onDeviceUpdate(SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) { |
|
|
public void onDeviceUpdate(SessionInfoProto sessionInfo, Device device, Optional<DeviceProfile> deviceProfileOpt) { |
|
|
try { |
|
|
try { |
|
|
LwM2MClient client = clientContext.getClientByDeviceId(device.getUuidId()); |
|
|
LwM2mClient client = clientContext.getClientByDeviceId(device.getUuidId()); |
|
|
if (client != null) { |
|
|
if (client != null) { |
|
|
this.onDeviceUpdate(client, device, deviceProfileOpt); |
|
|
this.onDeviceUpdate(client, device, deviceProfileOpt); |
|
|
} |
|
|
} |
|
|
@ -424,7 +424,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
* |
|
|
* |
|
|
* @param lwM2MClient - object with All parameters off client |
|
|
* @param lwM2MClient - object with All parameters off client |
|
|
*/ |
|
|
*/ |
|
|
private void initClientTelemetry(LwM2MClient lwM2MClient) { |
|
|
private void initClientTelemetry(LwM2mClient lwM2MClient) { |
|
|
Lwm2mDeviceProfileTransportConfiguration profile = clientContext.getProfile(lwM2MClient.getProfileId()); |
|
|
Lwm2mDeviceProfileTransportConfiguration profile = clientContext.getProfile(lwM2MClient.getProfileId()); |
|
|
Set<String> supportedObjects = clientContext.getSupportedIdVerInClient(lwM2MClient); |
|
|
Set<String> supportedObjects = clientContext.getSupportedIdVerInClient(lwM2MClient); |
|
|
if (supportedObjects != null && supportedObjects.size() > 0) { |
|
|
if (supportedObjects != null && supportedObjects.size() > 0) { |
|
|
@ -436,7 +436,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendReadRequests(LwM2MClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
private void sendReadRequests(LwM2mClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
try { |
|
|
try { |
|
|
Set<String> targetIds = new HashSet<>(profile.getObserveAttr().getAttribute()); |
|
|
Set<String> targetIds = new HashSet<>(profile.getObserveAttr().getAttribute()); |
|
|
targetIds.addAll(profile.getObserveAttr().getTelemetry()); |
|
|
targetIds.addAll(profile.getObserveAttr().getTelemetry()); |
|
|
@ -455,7 +455,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendObserveRequests(LwM2MClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
private void sendObserveRequests(LwM2mClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
try { |
|
|
try { |
|
|
Set<String> targetIds = profile.getObserveAttr().getObserve(); |
|
|
Set<String> targetIds = profile.getObserveAttr().getObserve(); |
|
|
targetIds = targetIds.stream().filter(target -> isSupportedTargetId(supportedObjects, target)).collect(Collectors.toSet()); |
|
|
targetIds = targetIds.stream().filter(target -> isSupportedTargetId(supportedObjects, target)).collect(Collectors.toSet()); |
|
|
@ -473,7 +473,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendWriteAttributeRequests(LwM2MClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
private void sendWriteAttributeRequests(LwM2mClient lwM2MClient, Lwm2mDeviceProfileTransportConfiguration profile, Set<String> supportedObjects) { |
|
|
try { |
|
|
try { |
|
|
Map<String, ObjectAttributes> attributesMap = profile.getObserveAttr().getAttributeLwm2m(); |
|
|
Map<String, ObjectAttributes> attributesMap = profile.getObserveAttr().getAttributeLwm2m(); |
|
|
attributesMap = attributesMap.entrySet().stream().filter(target -> isSupportedTargetId(supportedObjects, target.getKey())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); |
|
|
attributesMap = attributesMap.entrySet().stream().filter(target -> isSupportedTargetId(supportedObjects, target.getKey())).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); |
|
|
@ -484,35 +484,35 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendReadRequest(LwM2MClient lwM2MClient, String versionedId) { |
|
|
private void sendReadRequest(LwM2mClient lwM2MClient, String versionedId) { |
|
|
sendReadRequest(lwM2MClient, versionedId, new TbLwM2MReadCallback(this, logService, lwM2MClient, versionedId)); |
|
|
sendReadRequest(lwM2MClient, versionedId, new TbLwM2MReadCallback(this, logService, lwM2MClient, versionedId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendReadRequest(LwM2MClient lwM2MClient, String versionedId, DownlinkRequestCallback<ReadRequest, ReadResponse> callback) { |
|
|
private void sendReadRequest(LwM2mClient lwM2MClient, String versionedId, DownlinkRequestCallback<ReadRequest, ReadResponse> callback) { |
|
|
TbLwM2MReadRequest request = TbLwM2MReadRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
TbLwM2MReadRequest request = TbLwM2MReadRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
defaultLwM2MDownlinkMsgHandler.sendReadRequest(lwM2MClient, request, callback); |
|
|
defaultLwM2MDownlinkMsgHandler.sendReadRequest(lwM2MClient, request, callback); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendObserveRequest(LwM2MClient lwM2MClient, String versionedId) { |
|
|
private void sendObserveRequest(LwM2mClient lwM2MClient, String versionedId) { |
|
|
sendObserveRequest(lwM2MClient, versionedId, new TbLwM2MObserveCallback(this, logService, lwM2MClient, versionedId)); |
|
|
sendObserveRequest(lwM2MClient, versionedId, new TbLwM2MObserveCallback(this, logService, lwM2MClient, versionedId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendObserveRequest(LwM2MClient lwM2MClient, String versionedId, DownlinkRequestCallback<ObserveRequest, ObserveResponse> callback) { |
|
|
private void sendObserveRequest(LwM2mClient lwM2MClient, String versionedId, DownlinkRequestCallback<ObserveRequest, ObserveResponse> callback) { |
|
|
TbLwM2MObserveRequest request = TbLwM2MObserveRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
TbLwM2MObserveRequest request = TbLwM2MObserveRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
defaultLwM2MDownlinkMsgHandler.sendObserveRequest(lwM2MClient, request, callback); |
|
|
defaultLwM2MDownlinkMsgHandler.sendObserveRequest(lwM2MClient, request, callback); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendWriteAttributesRequest(LwM2MClient lwM2MClient, String targetId, ObjectAttributes params) { |
|
|
private void sendWriteAttributesRequest(LwM2mClient lwM2MClient, String targetId, ObjectAttributes params) { |
|
|
TbLwM2MWriteAttributesRequest request = TbLwM2MWriteAttributesRequest.builder().versionedId(targetId).attributes(params).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
TbLwM2MWriteAttributesRequest request = TbLwM2MWriteAttributesRequest.builder().versionedId(targetId).attributes(params).timeout(clientContext.getRequestTimeout(lwM2MClient)).build(); |
|
|
defaultLwM2MDownlinkMsgHandler.sendWriteAttributesRequest(lwM2MClient, request, new TbLwM2MWriteAttributesCallback(logService, lwM2MClient, targetId)); |
|
|
defaultLwM2MDownlinkMsgHandler.sendWriteAttributesRequest(lwM2MClient, request, new TbLwM2MWriteAttributesCallback(logService, lwM2MClient, targetId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void sendCancelObserveRequest(String versionedId, LwM2MClient client) { |
|
|
private void sendCancelObserveRequest(String versionedId, LwM2mClient client) { |
|
|
TbLwM2MCancelObserveRequest request = TbLwM2MCancelObserveRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(client)).build(); |
|
|
TbLwM2MCancelObserveRequest request = TbLwM2MCancelObserveRequest.builder().versionedId(versionedId).timeout(clientContext.getRequestTimeout(client)).build(); |
|
|
defaultLwM2MDownlinkMsgHandler.sendCancelObserveRequest(client, request, new TbLwM2MCancelObserveCallback(logService, client, versionedId)); |
|
|
defaultLwM2MDownlinkMsgHandler.sendCancelObserveRequest(client, request, new TbLwM2MCancelObserveCallback(logService, client, versionedId)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void updateObjectResourceValue(LwM2MClient client, LwM2mObject lwM2mObject, String pathIdVer, int code) { |
|
|
private void updateObjectResourceValue(LwM2mClient client, LwM2mObject lwM2mObject, String pathIdVer, int code) { |
|
|
LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer)); |
|
|
LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer)); |
|
|
lwM2mObject.getInstances().forEach((instanceId, instance) -> { |
|
|
lwM2mObject.getInstances().forEach((instanceId, instance) -> { |
|
|
String pathInstance = pathIds.toString() + "/" + instanceId; |
|
|
String pathInstance = pathIds.toString() + "/" + instanceId; |
|
|
@ -520,7 +520,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void updateObjectInstanceResourceValue(LwM2MClient client, LwM2mObjectInstance lwM2mObjectInstance, String pathIdVer, int code) { |
|
|
private void updateObjectInstanceResourceValue(LwM2mClient client, LwM2mObjectInstance lwM2mObjectInstance, String pathIdVer, int code) { |
|
|
LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer)); |
|
|
LwM2mPath pathIds = new LwM2mPath(fromVersionedIdToObjectId(pathIdVer)); |
|
|
lwM2mObjectInstance.getResources().forEach((resourceId, resource) -> { |
|
|
lwM2mObjectInstance.getResources().forEach((resourceId, resource) -> { |
|
|
String pathRez = pathIds.toString() + "/" + resourceId; |
|
|
String pathRez = pathIds.toString() + "/" + resourceId; |
|
|
@ -539,7 +539,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
* @param path - resource |
|
|
* @param path - resource |
|
|
* @param mode - Replace, Update |
|
|
* @param mode - Replace, Update |
|
|
*/ |
|
|
*/ |
|
|
private void updateResourcesValue(LwM2MClient lwM2MClient, LwM2mResource lwM2mResource, String path, Mode mode, int code) { |
|
|
private void updateResourcesValue(LwM2mClient lwM2MClient, LwM2mResource lwM2mResource, String path, Mode mode, int code) { |
|
|
Registration registration = lwM2MClient.getRegistration(); |
|
|
Registration registration = lwM2MClient.getRegistration(); |
|
|
if (lwM2MClient.saveResourceValue(path, lwM2mResource, this.config.getModelProvider(), mode)) { |
|
|
if (lwM2MClient.saveResourceValue(path, lwM2mResource, this.config.getModelProvider(), mode)) { |
|
|
if (path.equals(convertObjectIdToVersionedId(FW_NAME_ID, registration))) { |
|
|
if (path.equals(convertObjectIdToVersionedId(FW_NAME_ID, registration))) { |
|
|
@ -622,7 +622,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
return pathAttributes; |
|
|
return pathAttributes; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void onDeviceUpdate(LwM2MClient lwM2MClient, Device device, Optional<DeviceProfile> deviceProfileOpt) { |
|
|
private void onDeviceUpdate(LwM2mClient lwM2MClient, Device device, Optional<DeviceProfile> deviceProfileOpt) { |
|
|
deviceProfileOpt.ifPresent(deviceProfile -> this.onDeviceProfileUpdate(Collections.singletonList(lwM2MClient), deviceProfile)); |
|
|
deviceProfileOpt.ifPresent(deviceProfile -> this.onDeviceProfileUpdate(Collections.singletonList(lwM2MClient), deviceProfile)); |
|
|
lwM2MClient.onDeviceUpdate(device, deviceProfileOpt); |
|
|
lwM2MClient.onDeviceUpdate(device, deviceProfileOpt); |
|
|
} |
|
|
} |
|
|
@ -668,7 +668,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private TransportProtos.KeyValueProto getKvToThingsBoard(String pathIdVer, Registration registration) { |
|
|
private TransportProtos.KeyValueProto getKvToThingsBoard(String pathIdVer, Registration registration) { |
|
|
LwM2MClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
LwM2mClient lwM2MClient = this.clientContext.getClientByEndpoint(registration.getEndpoint()); |
|
|
Map<String, String> names = clientContext.getProfile(lwM2MClient.getProfileId()).getObserveAttr().getKeyName(); |
|
|
Map<String, String> names = clientContext.getProfile(lwM2MClient.getProfileId()).getObserveAttr().getKeyName(); |
|
|
if (names != null && names.containsKey(pathIdVer)) { |
|
|
if (names != null && names.containsKey(pathIdVer)) { |
|
|
String resourceName = names.get(pathIdVer); |
|
|
String resourceName = names.get(pathIdVer); |
|
|
@ -695,7 +695,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
valueKvProto = this.converter.convertValue(resourceValue.getValue(), currentType, expectedType, |
|
|
valueKvProto = this.converter.convertValue(resourceValue.getValue(), currentType, expectedType, |
|
|
new LwM2mPath(fromVersionedIdToObjectId(pathIdVer))); |
|
|
new LwM2mPath(fromVersionedIdToObjectId(pathIdVer))); |
|
|
} |
|
|
} |
|
|
LwM2MOtaConvert lwM2mOtaConvert = convertOtaUpdateValueToString(pathIdVer, valueKvProto, currentType); |
|
|
LwM2mOtaConvert lwM2mOtaConvert = convertOtaUpdateValueToString(pathIdVer, valueKvProto, currentType); |
|
|
valueKvProto = lwM2mOtaConvert.getValue(); |
|
|
valueKvProto = lwM2mOtaConvert.getValue(); |
|
|
currentType = lwM2mOtaConvert.getCurrentType(); |
|
|
currentType = lwM2mOtaConvert.getCurrentType(); |
|
|
return valueKvProto != null ? this.helper.getKvAttrTelemetryToThingsboard(currentType, resourceName, valueKvProto, resourceValue.isMultiInstances()) : null; |
|
|
return valueKvProto != null ? this.helper.getKvAttrTelemetryToThingsboard(currentType, resourceName, valueKvProto, resourceValue.isMultiInstances()) : null; |
|
|
@ -711,7 +711,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void onWriteResponseOk(LwM2MClient client, String path, WriteRequest request, int code) { |
|
|
public void onWriteResponseOk(LwM2mClient client, String path, WriteRequest request, int code) { |
|
|
if (request.getNode() instanceof LwM2mResource) { |
|
|
if (request.getNode() instanceof LwM2mResource) { |
|
|
this.updateResourcesValue(client, ((LwM2mResource) request.getNode()), path, request.isReplaceRequest() ? Mode.REPLACE : Mode.UPDATE, code); |
|
|
this.updateResourcesValue(client, ((LwM2mResource) request.getNode()), path, request.isReplaceRequest() ? Mode.REPLACE : Mode.UPDATE, code); |
|
|
} else if (request.getNode() instanceof LwM2mObjectInstance) { |
|
|
} else if (request.getNode() instanceof LwM2mObjectInstance) { |
|
|
@ -725,7 +725,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void onCreateResponseOk(LwM2MClient client, String path, CreateRequest request) { |
|
|
public void onCreateResponseOk(LwM2mClient client, String path, CreateRequest request) { |
|
|
if (request.getObjectInstances() != null && request.getObjectInstances().size() > 0) { |
|
|
if (request.getObjectInstances() != null && request.getObjectInstances().size() > 0) { |
|
|
request.getObjectInstances().forEach(instance -> |
|
|
request.getObjectInstances().forEach(instance -> |
|
|
instance.getResources() |
|
|
instance.getResources() |
|
|
@ -735,7 +735,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void onWriteCompositeResponseOk(LwM2MClient client, WriteCompositeRequest request, int code) { |
|
|
public void onWriteCompositeResponseOk(LwM2mClient client, WriteCompositeRequest request, int code) { |
|
|
log.trace("ReadCompositeResponse: [{}]", request.getNodes()); |
|
|
log.trace("ReadCompositeResponse: [{}]", request.getNodes()); |
|
|
request.getNodes().forEach((k, v) -> { |
|
|
request.getNodes().forEach((k, v) -> { |
|
|
if (v instanceof LwM2mSingleResource) { |
|
|
if (v instanceof LwM2mSingleResource) { |
|
|
@ -749,7 +749,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//TODO: review and optimize the logic to minimize number of the requests to device.
|
|
|
//TODO: review and optimize the logic to minimize number of the requests to device.
|
|
|
private void onDeviceProfileUpdate(List<LwM2MClient> clients, DeviceProfile deviceProfile) { |
|
|
private void onDeviceProfileUpdate(List<LwM2mClient> clients, DeviceProfile deviceProfile) { |
|
|
var oldProfile = clientContext.getProfile(deviceProfile.getUuidId()); |
|
|
var oldProfile = clientContext.getProfile(deviceProfile.getUuidId()); |
|
|
if (clientContext.profileUpdate(deviceProfile) != null) { |
|
|
if (clientContext.profileUpdate(deviceProfile) != null) { |
|
|
// #1
|
|
|
// #1
|
|
|
@ -851,7 +851,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
* #6.1 - send update WriteAttribute |
|
|
* #6.1 - send update WriteAttribute |
|
|
* #6.2 - send empty WriteAttribute |
|
|
* #6.2 - send empty WriteAttribute |
|
|
*/ |
|
|
*/ |
|
|
private void compareAndSendWriteAttributes(List<LwM2MClient> clients, Map<String, ObjectAttributes> lwm2mAttributesOld, Map<String, ObjectAttributes> lwm2mAttributesNew) { |
|
|
private void compareAndSendWriteAttributes(List<LwM2mClient> clients, Map<String, ObjectAttributes> lwm2mAttributesOld, Map<String, ObjectAttributes> lwm2mAttributesNew) { |
|
|
ParametersAnalyzeResult analyzerParameters = new ParametersAnalyzeResult(); |
|
|
ParametersAnalyzeResult analyzerParameters = new ParametersAnalyzeResult(); |
|
|
Set<String> pathOld = lwm2mAttributesOld.keySet(); |
|
|
Set<String> pathOld = lwm2mAttributesOld.keySet(); |
|
|
Set<String> pathNew = lwm2mAttributesNew.keySet(); |
|
|
Set<String> pathNew = lwm2mAttributesNew.keySet(); |
|
|
@ -903,7 +903,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
* @param lwM2MClient - |
|
|
* @param lwM2MClient - |
|
|
* @return SessionInfoProto - |
|
|
* @return SessionInfoProto - |
|
|
*/ |
|
|
*/ |
|
|
private SessionInfoProto getSessionInfo(LwM2MClient lwM2MClient) { |
|
|
private SessionInfoProto getSessionInfo(LwM2mClient lwM2MClient) { |
|
|
if (lwM2MClient != null && lwM2MClient.getSession() != null) { |
|
|
if (lwM2MClient != null && lwM2MClient.getSession() != null) { |
|
|
return lwM2MClient.getSession(); |
|
|
return lwM2MClient.getSession(); |
|
|
} |
|
|
} |
|
|
@ -944,7 +944,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
* |
|
|
* |
|
|
* @param lwM2MClient - LwM2M Client |
|
|
* @param lwM2MClient - LwM2M Client |
|
|
*/ |
|
|
*/ |
|
|
public void initAttributes(LwM2MClient lwM2MClient, boolean logFailedUpdateOfNonChangedValue) { |
|
|
public void initAttributes(LwM2mClient lwM2MClient, boolean logFailedUpdateOfNonChangedValue) { |
|
|
Map<String, String> keyNamesMap = this.getNamesFromProfileForSharedAttributes(lwM2MClient); |
|
|
Map<String, String> keyNamesMap = this.getNamesFromProfileForSharedAttributes(lwM2MClient); |
|
|
if (!keyNamesMap.isEmpty()) { |
|
|
if (!keyNamesMap.isEmpty()) { |
|
|
Set<String> keysToFetch = new HashSet<>(keyNamesMap.values()); |
|
|
Set<String> keysToFetch = new HashSet<>(keyNamesMap.values()); |
|
|
@ -957,7 +957,7 @@ public class DefaultLwM2MUplinkMsgHandler extends LwM2MExecutorAwareService impl |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private Map<String, String> getNamesFromProfileForSharedAttributes(LwM2MClient lwM2MClient) { |
|
|
private Map<String, String> getNamesFromProfileForSharedAttributes(LwM2mClient lwM2MClient) { |
|
|
Lwm2mDeviceProfileTransportConfiguration profile = clientContext.getProfile(lwM2MClient.getProfileId()); |
|
|
Lwm2mDeviceProfileTransportConfiguration profile = clientContext.getProfile(lwM2MClient.getProfileId()); |
|
|
return profile.getObserveAttr().getKeyName(); |
|
|
return profile.getObserveAttr().getKeyName(); |
|
|
} |
|
|
} |
nickAS21
5 years ago
Andrew Shvayka