Merge branch 'lts-4.2' into release-4.2

# Conflicts:
#	application/pom.xml
#	common/actor/pom.xml
#	common/cache/pom.xml
#	common/cluster-api/pom.xml
#	common/coap-server/pom.xml
#	common/dao-api/pom.xml
#	common/data/pom.xml
#	common/discovery-api/pom.xml
#	common/edge-api/pom.xml
#	common/edqs/pom.xml
#	common/message/pom.xml
#	common/pom.xml
#	common/proto/pom.xml
#	common/queue/pom.xml
#	common/script/pom.xml
#	common/script/remote-js-client/pom.xml
#	common/script/script-api/pom.xml
#	common/stats/pom.xml
#	common/transport/coap/pom.xml
#	common/transport/http/pom.xml
#	common/transport/lwm2m/pom.xml
#	common/transport/mqtt/pom.xml
#	common/transport/pom.xml
#	common/transport/snmp/pom.xml
#	common/transport/transport-api/pom.xml
#	common/util/pom.xml
#	common/version-control/pom.xml
#	dao/pom.xml
#	edqs/pom.xml
#	monitoring/pom.xml
#	msa/black-box-tests/pom.xml
#	msa/edqs/pom.xml
#	msa/js-executor/pom.xml
#	msa/monitoring/pom.xml
#	msa/pom.xml
#	msa/tb-node/pom.xml
#	msa/tb/pom.xml
#	msa/transport/coap/pom.xml
#	msa/transport/http/pom.xml
#	msa/transport/lwm2m/pom.xml
#	msa/transport/mqtt/pom.xml
#	msa/transport/pom.xml
#	msa/transport/snmp/pom.xml
#	msa/vc-executor-docker/pom.xml
#	msa/vc-executor/pom.xml
#	msa/web-ui/pom.xml
#	netty-mqtt/pom.xml
#	pom.xml
#	rest-client/pom.xml
#	rule-engine/pom.xml
#	rule-engine/rule-engine-api/pom.xml
#	rule-engine/rule-engine-components/pom.xml
#	tools/pom.xml
#	transport/coap/pom.xml
#	transport/http/pom.xml
#	transport/lwm2m/pom.xml
#	transport/mqtt/pom.xml
#	transport/pom.xml
#	transport/snmp/pom.xml
#	ui-ngx/pom.xml

TEST_FAST.md

@@ -10,6 +10,7 @@ export SUREFIRE_JAVA_OPTS="-Xmx1200m -Xss256k -XX:+ExitOnOutOfMemoryError"
 mvn clean install -T6 -DskipTests -Dpkg.skip=true
 
 mvn test -pl='!application,!dao,!ui-ngx,!msa/js-executor,!msa/web-ui' -T4
+mvn test -pl='msa/js-executor'
 mvn test -pl dao -Dparallel=packages -DforkCount=4
 
 mvn test -pl application -Dtest='!**/nosql/**,org.thingsboard.server.controller.**'      -DforkCount=6 -Dparallel=classes  -Dsurefire.rerunFailingTestsCount=2 -Dsurefire.failOnFlakeCount=5

application/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>

application/src/main/data/json/system/widget_bundles/cards.json

@@ -24,6 +24,7 @@
     "cards.html_value_card",
     "cards.markdown_card",
     "cards.simple_card",
-    "unread_notifications"
+    "unread_notifications",
+    "html_container"
   ]
 }

application/src/main/data/json/system/widget_bundles/html_widgets.json

@@ -11,6 +11,7 @@
   "widgetTypeFqns": [
     "cards.html_card",
     "cards.html_value_card",
-    "cards.markdown_card"
+    "cards.markdown_card",
+    "html_container"
   ]
 }

application/src/main/data/upgrade/lts/schema_update.sql

@@ -0,0 +1,19 @@
+--
+-- Copyright © 2016-2026 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- LTS cumulative schema update file.
+-- All statements must be idempotent (use IF NOT EXISTS, ADD COLUMN IF NOT EXISTS, DO $$ ... END $$ guards, etc.).
+-- This file is executed by SystemPatchApplier on every version increase within the LTS family.

application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@@ -35,6 +35,7 @@ import org.thingsboard.rule.engine.api.DeviceStateManager;
 import org.thingsboard.rule.engine.api.JobManager;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.MqttClientSettings;
+import org.thingsboard.rule.engine.api.TbHttpClientSettings;
 import org.thingsboard.rule.engine.api.NotificationCenter;
 import org.thingsboard.rule.engine.api.RuleEngineAiChatModelService;
 import org.thingsboard.rule.engine.api.SmsService;
@@ -684,6 +685,10 @@ public class ActorSystemContext {
     @Getter
     private MqttClientSettings mqttClientSettings;
 
+    @Autowired(required = false)
+    @Getter
+    private TbHttpClientSettings tbHttpClientSettings;
+
     @Getter
     @Setter
     private TbActorSystem actorSystem;

application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java

@@ -27,6 +27,7 @@ import org.thingsboard.rule.engine.api.DeviceStateManager;
 import org.thingsboard.rule.engine.api.JobManager;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.rule.engine.api.MqttClientSettings;
+import org.thingsboard.rule.engine.api.TbHttpClientSettings;
 import org.thingsboard.rule.engine.api.NotificationCenter;
 import org.thingsboard.rule.engine.api.RuleEngineAiChatModelService;
 import org.thingsboard.rule.engine.api.RuleEngineAlarmService;
@@ -1062,6 +1063,11 @@ public class DefaultTbContext implements TbContext {
         return mainCtx.getMqttClientSettings();
     }
 
+    @Override
+    public TbHttpClientSettings getTbHttpClientSettings() {
+        return mainCtx.getTbHttpClientSettings();
+    }
+
     private TbMsgMetaData getActionMetaData(RuleNodeId ruleNodeId) {
         TbMsgMetaData metaData = new TbMsgMetaData();
         metaData.putValue("ruleNodeId", ruleNodeId.toString());

application/src/main/java/org/thingsboard/server/config/TbHttpClientSettingsComponent.java

@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.rule.engine.api.TbHttpClientSettings;
+import org.thingsboard.server.queue.util.TbRuleEngineComponent;
+
+@TbRuleEngineComponent
+@Component
+public class TbHttpClientSettingsComponent implements TbHttpClientSettings {
+
+    @Value("${actors.rule.external.http_client.max_parallel_requests:0}")
+    private int maxParallelRequests;
+
+    @Value("${actors.rule.external.http_client.max_pending_requests:0}")
+    private int maxPendingRequests;
+
+    @Value("${actors.rule.external.http_client.pool_max_connections:0}")
+    private int poolMaxConnections;
+
+    @Override
+    public int getMaxParallelRequests() {
+        return maxParallelRequests;
+    }
+
+    @Override
+    public int getMaxPendingRequests() {
+        return maxPendingRequests;
+    }
+
+    @Override
+    public int getPoolMaxConnections() {
+        return poolMaxConnections;
+    }
+
+}

application/src/main/java/org/thingsboard/server/controller/AlarmCommentController.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmComment;
 import org.thingsboard.server.common.data.alarm.AlarmCommentInfo;
+import org.thingsboard.server.common.data.alarm.AlarmCommentType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.AlarmCommentId;
 import org.thingsboard.server.common.data.id.AlarmId;
@@ -77,6 +78,7 @@ public class AlarmCommentController extends BaseController {
         AlarmId alarmId = new AlarmId(toUUID(strAlarmId));
         Alarm alarm = checkAlarmInfoId(alarmId, Operation.WRITE);
         alarmComment.setAlarmId(alarmId);
+        alarmComment.setType(AlarmCommentType.OTHER);
         return tbAlarmCommentService.saveAlarmComment(alarm, alarmComment, getCurrentUser());
     }
 

application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java

@@ -115,7 +115,7 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke
     private final ConcurrentMap<TenantId, Set<String>> tenantSessionsMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<CustomerId, Set<String>> customerSessionsMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<UserId, Set<String>> regularUserSessionsMap = new ConcurrentHashMap<>();
-    private final ConcurrentMap<UserId, Set<String>> publicUserSessionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TenantId, Set<String>> publicUserSessionsMap = new ConcurrentHashMap<>();
 
     private Cache<String, SessionMetaData> pendingSessions;
 
@@ -611,7 +611,7 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke
             }
             if (tenantProfileConfiguration.getMaxWsSessionsPerPublicUser() > 0
                     && UserPrincipal.Type.PUBLIC_ID.equals(sessionRef.getSecurityCtx().getUserPrincipal().getType())) {
-                Set<String> publicUserSessions = publicUserSessionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getId(), id -> ConcurrentHashMap.newKeySet());
+                Set<String> publicUserSessions = publicUserSessionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getTenantId(), id -> ConcurrentHashMap.newKeySet());
                 synchronized (publicUserSessions) {
                     limitAllowed = publicUserSessions.size() < tenantProfileConfiguration.getMaxWsSessionsPerPublicUser();
                     if (limitAllowed) {
@@ -655,7 +655,7 @@ public class TbWebSocketHandler extends TextWebSocketHandler implements WebSocke
                 }
             }
             if (tenantProfileConfiguration.getMaxWsSessionsPerPublicUser() > 0 && UserPrincipal.Type.PUBLIC_ID.equals(sessionRef.getSecurityCtx().getUserPrincipal().getType())) {
-                Set<String> publicUserSessions = publicUserSessionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getId(), id -> ConcurrentHashMap.newKeySet());
+                Set<String> publicUserSessions = publicUserSessionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getTenantId(), id -> ConcurrentHashMap.newKeySet());
                 synchronized (publicUserSessions) {
                     publicUserSessions.remove(sessionId);
                 }

application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.ai;
 
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.Futures;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.Content;
 import dev.langchain4j.data.message.TextContent;
@@ -42,7 +43,12 @@ class AiChatModelServiceImpl implements AiChatModelService {
 
     @Override
     public <C extends AiChatModelConfig<C>> FluentFuture<ChatResponse> sendChatRequestAsync(AiChatModelConfig<C> chatModelConfig, ChatRequest chatRequest) {
-        ChatModel langChainChatModel = chatModelConfig.configure(chatModelConfigurer);
+        ChatModel langChainChatModel;
+        try {
+            langChainChatModel = chatModelConfig.configure(chatModelConfigurer);
+        } catch (Throwable t) {
+            return FluentFuture.from(Futures.immediateFailedFuture(t));
+        }
         if (langChainChatModel.provider() == ModelProvider.GITHUB_MODELS) {
             chatRequest = prepareGithubChatRequest(chatRequest);
         }

application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java

@@ -37,6 +37,7 @@ import dev.langchain4j.model.openai.OpenAiChatModel;
 import dev.langchain4j.model.vertexai.gemini.VertexAiGeminiChatModel;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.SsrfProtectionValidator;
 import org.thingsboard.server.common.data.ai.model.chat.AmazonBedrockChatModelConfig;
 import org.thingsboard.server.common.data.ai.model.chat.AnthropicChatModelConfig;
 import org.thingsboard.server.common.data.ai.model.chat.AzureOpenAiChatModelConfig;
@@ -58,6 +59,7 @@ import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.Base64;
@@ -69,6 +71,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
 
     @Override
     public ChatModel configureChatModel(OpenAiChatModelConfig chatModelConfig) {
+        validateBaseUrl(chatModelConfig.providerConfig().baseUrl());
         return OpenAiChatModel.builder()
                 .baseUrl(chatModelConfig.providerConfig().baseUrl())
                 .apiKey(chatModelConfig.providerConfig().apiKey())
@@ -86,6 +89,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
     @Override
     public ChatModel configureChatModel(AzureOpenAiChatModelConfig chatModelConfig) {
         AzureOpenAiProviderConfig providerConfig = chatModelConfig.providerConfig();
+        validateBaseUrl(providerConfig.endpoint());
         return AzureOpenAiChatModel.builder()
                 .endpoint(providerConfig.endpoint())
                 .serviceVersion(providerConfig.serviceVersion())
@@ -177,8 +181,8 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
         if (chatModelConfig.frequencyPenalty() != null) {
             generationConfigBuilder.setFrequencyPenalty(chatModelConfig.frequencyPenalty().floatValue());
         }
-        if (chatModelConfig.frequencyPenalty() != null) {
+        if (chatModelConfig.presencePenalty() != null) {
-            generationConfigBuilder.setPresencePenalty(chatModelConfig.frequencyPenalty().floatValue());
+            generationConfigBuilder.setPresencePenalty(chatModelConfig.presencePenalty().floatValue());
         }
         if (chatModelConfig.maxOutputTokens() != null) {
             generationConfigBuilder.setMaxOutputTokens(chatModelConfig.maxOutputTokens());
@@ -273,6 +277,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
 
     @Override
     public ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig) {
+        validateBaseUrl(chatModelConfig.providerConfig().baseUrl());
         var builder = OllamaChatModel.builder()
                 .baseUrl(chatModelConfig.providerConfig().baseUrl())
                 .modelName(chatModelConfig.modelId())
@@ -300,6 +305,10 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
         return builder.build();
     }
 
+    private static void validateBaseUrl(String url) {
+        SsrfProtectionValidator.validateUri(URI.create(url));
+    }
+
     private static Duration toDuration(Integer timeoutSeconds) {
         return timeoutSeconds != null ? Duration.ofSeconds(timeoutSeconds) : null;
     }

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

@@ -19,6 +19,7 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.thingsboard.script.api.tbel.TbelInvokeService;
@@ -29,18 +30,23 @@ import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.dao.cf.CalculatedFieldService;
 import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
 
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -183,6 +189,85 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
         log.debug("[{}] evict calculated field links from cached links by entity id: {}", calculatedFieldId, oldCalculatedField);
     }
 
+    @EventListener(ComponentLifecycleMsg.class)
+    public void onComponentLifecycleEvent(ComponentLifecycleMsg event) {
+        switch (event.getEntityId().getEntityType()) {
+            case TENANT:
+                if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    evictTenantCfs(event.getTenantId());
+                }
+                break;
+            case DEVICE, ASSET, DEVICE_PROFILE, ASSET_PROFILE:
+                if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    evictEntityCfs(event.getEntityId());
+                }
+                break;
+            case CALCULATED_FIELD:
+                if (event.getEvent() == ComponentLifecycleEvent.CREATED) {
+                    addCalculatedField(event.getTenantId(), (CalculatedFieldId) event.getEntityId());
+                } else if (event.getEvent() == ComponentLifecycleEvent.UPDATED) {
+                    updateCalculatedField(event.getTenantId(), (CalculatedFieldId) event.getEntityId());
+                } else if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    evict((CalculatedFieldId) event.getEntityId());
+                }
+                break;
+        }
+    }
+
+    private void evictTenantCfs(TenantId tenantId) {
+        var removedCfEntityIds = new HashSet<EntityId>();
+        var removedLinkEntityIds = new HashSet<EntityId>();
+        var toRemove = calculatedFields.entrySet().stream()
+                .filter(e -> e.getValue().getTenantId().equals(tenantId))
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toSet());
+        toRemove.forEach(cfId -> {
+            CalculatedField cf = calculatedFields.remove(cfId);
+            List<CalculatedFieldLink> links = calculatedFieldLinks.remove(cfId);
+            if (links != null) {
+                links.forEach(link -> removedLinkEntityIds.add(link.getEntityId()));
+            }
+            calculatedFieldsCtx.remove(cfId);
+            if (cf != null) {
+                removedCfEntityIds.add(cf.getEntityId());
+            }
+        });
+        removedCfEntityIds.forEach(entityId -> {
+            entityIdCalculatedFields.compute(entityId, (k, cfs) -> {
+                if (cfs != null) {
+                    cfs.removeIf(cf -> toRemove.contains(cf.getId()));
+                    return cfs.isEmpty() ? null : cfs;
+                }
+                return null;
+            });
+        });
+        removedLinkEntityIds.forEach(entityId -> {
+            entityIdCalculatedFieldLinks.compute(entityId, ((entityId1, links) -> {
+                if (links != null) {
+                    links.removeIf(link -> toRemove.contains(link.getCalculatedFieldId()));
+                    return links.isEmpty() ? null : links;
+                }
+                return null;
+            }));
+        });
+    }
+
+    private void evictEntityCfs(EntityId entityId) {
+        List<CalculatedField> cfs = entityIdCalculatedFields.remove(entityId);
+        if (cfs != null) {
+            var cfIds = new HashSet<CalculatedFieldId>();
+            cfs.forEach(cf -> {
+                calculatedFields.remove(cf.getId());
+                calculatedFieldLinks.remove(cf.getId());
+                calculatedFieldsCtx.remove(cf.getId());
+                cfIds.add(cf.getId());
+                log.debug("[{}] evict calculated field from cache on entity deletion: {}", cf.getId(), cf);
+            });
+            entityIdCalculatedFieldLinks.values().forEach(list -> list.removeIf(link -> cfIds.contains(link.getCalculatedFieldId())));
+        }
+        entityIdCalculatedFieldLinks.remove(entityId);
+    }
+
     private Lock getFetchLock(CalculatedFieldId id) {
         return calculatedFieldFetchLocks.computeIfAbsent(id, __ -> new ReentrantLock());
     }

application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java

@@ -135,6 +135,10 @@ public class InstallScripts {
         return Paths.get(getDataDir(), JSON_DIR, SYSTEM_DIR, WIDGET_TYPES_DIR);
     }
 
+    public Path getWidgetBundlesDir() {
+        return Paths.get(getDataDir(), JSON_DIR, SYSTEM_DIR, WIDGET_BUNDLES_DIR);
+    }
+
     public String getDataDir() {
         if (!StringUtils.isEmpty(dataDir)) {
             if (!Paths.get(this.dataDir).toFile().isDirectory()) {
@@ -207,7 +211,7 @@ public class InstallScripts {
     public void loadSystemWidgets() {
         log.info("Loading system widgets");
         Map<Path, JsonNode> widgetsBundlesMap = new HashMap<>();
-        Path widgetBundlesDir = Paths.get(getDataDir(), JSON_DIR, SYSTEM_DIR, WIDGET_BUNDLES_DIR);
+        Path widgetBundlesDir = getWidgetBundlesDir();
         try (Stream<Path> dirStream = listDir(widgetBundlesDir).filter(path -> path.toString().endsWith(JSON_EXT))) {
             dirStream.forEach(
                     path -> {

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -54,6 +54,7 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
     public void upgradeDatabase() {
         log.info("Updating schema...");
         loadSql(getSchemaUpdateFile("basic"));
+        loadSql(getSchemaUpdateFile("lts"));
         log.info("Schema updated.");
     }
 

application/src/main/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCache.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.profile;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
@@ -23,15 +24,19 @@ import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.dao.asset.AssetProfileService;
 import org.thingsboard.server.dao.asset.AssetService;
 
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -143,6 +148,25 @@ public class DefaultTbAssetProfileCache implements TbAssetProfileCache {
         }
     }
 
+    @EventListener(ComponentLifecycleMsg.class)
+    public void onComponentLifecycleEvent(ComponentLifecycleMsg event) {
+        switch (event.getEntityId().getEntityType()) {
+            case TENANT:
+                if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    TenantId tenantId = event.getTenantId();
+                    Set<AssetProfileId> toRemove = assetProfilesMap.values().stream()
+                            .filter(assetProfile -> assetProfile.getTenantId().equals(tenantId))
+                            .map(AssetProfile::getId)
+                            .collect(Collectors.toSet());
+                    assetProfilesMap.keySet().removeAll(toRemove);
+                    assetsMap.entrySet().removeIf(entry -> toRemove.contains(entry.getValue()));
+                    profileListeners.remove(tenantId);
+                    assetProfileListeners.remove(tenantId);
+                }
+                break;
+        }
+    }
+
     private void notifyProfileListeners(AssetProfile profile) {
         ConcurrentMap<EntityId, Consumer<AssetProfile>> tenantListeners = profileListeners.get(profile.getTenantId());
         if (tenantListeners != null) {

application/src/main/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCache.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.profile;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -23,15 +24,19 @@ import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.dao.device.DeviceProfileService;
 import org.thingsboard.server.dao.device.DeviceService;
 
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -143,6 +148,25 @@ public class DefaultTbDeviceProfileCache implements TbDeviceProfileCache {
         }
     }
 
+    @EventListener(ComponentLifecycleMsg.class)
+    public void onComponentLifecycleEvent(ComponentLifecycleMsg event) {
+        switch (event.getEntityId().getEntityType()) {
+            case TENANT:
+                if (event.getEvent() == ComponentLifecycleEvent.DELETED) {
+                    TenantId tenantId = event.getTenantId();
+                    Set<DeviceProfileId> toRemove = deviceProfilesMap.values().stream()
+                            .filter(deviceProfile -> deviceProfile.getTenantId().equals(tenantId))
+                            .map(DeviceProfile::getId)
+                            .collect(Collectors.toSet());
+                    deviceProfilesMap.keySet().removeAll(toRemove);
+                    devicesMap.entrySet().removeIf(entry -> toRemove.contains(entry.getValue()));
+                    profileListeners.remove(tenantId);
+                    deviceProfileListeners.remove(tenantId);
+                }
+                break;
+        }
+    }
+
     private void notifyProfileListeners(DeviceProfile profile) {
         ConcurrentMap<EntityId, Consumer<DeviceProfile>> tenantListeners = profileListeners.get(profile.getTenantId());
         if (tenantListeners != null) {

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCalculatedFieldConsumerService.java

@@ -90,9 +90,8 @@ public class DefaultTbCalculatedFieldConsumerService extends AbstractPartitionBa
                                                    PartitionService partitionService,
                                                    ApplicationEventPublisher eventPublisher,
                                                    JwtSettingsService jwtSettingsService,
-                                                   CalculatedFieldCache calculatedFieldCache,
                                                    CalculatedFieldStateService stateService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService,
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, apiUsageStateService, partitionService,
                 eventPublisher, jwtSettingsService);
         this.queueFactory = tbQueueFactory;
         this.stateService = stateService;

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java

@@ -179,9 +179,8 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         TbImageService imageService,
                                         TbResourceDataCache tbResourceDataCache,
                                         RuleEngineCallService ruleEngineCallService,
-                                        CalculatedFieldCache calculatedFieldCache,
                                         EdqsService edqsService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService,
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, apiUsageStateService, partitionService,
                 eventPublisher, jwtSettingsService);
         this.stateService = stateService;
         this.localSubscriptionService = localSubscriptionService;

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbEdgeConsumerService.java

@@ -87,7 +87,7 @@ public class DefaultTbEdgeConsumerService extends AbstractConsumerService<ToEdge
 
     public DefaultTbEdgeConsumerService(TbCoreQueueFactory tbCoreQueueFactory, ActorSystemContext actorContext,
                                         StatsFactory statsFactory, EdgeContextComponent edgeCtx) {
-        super(actorContext, null, null, null, null, null, null, null,
+        super(actorContext, null, null, null, null, null, null,
                 null, null);
         this.edgeCtx = edgeCtx;
         this.stats = new EdgeConsumerStats(statsFactory);

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java

@@ -84,9 +84,8 @@ public class DefaultTbRuleEngineConsumerService extends AbstractPartitionBasedCo
                                               TbApiUsageStateService apiUsageStateService,
                                               PartitionService partitionService,
                                               ApplicationEventPublisher eventPublisher,
-                                              JwtSettingsService jwtSettingsService,
+                                              JwtSettingsService jwtSettingsService) {
-                                              CalculatedFieldCache calculatedFieldCache) {
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
         this.ctx = ctx;
         this.tbDeviceRpcService = tbDeviceRpcService;
         this.queueService = queueService;

application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java

@@ -26,7 +26,6 @@ import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
-import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -47,7 +46,6 @@ import org.thingsboard.server.queue.discovery.TbApplicationEventListener;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
-import org.thingsboard.server.service.cf.CalculatedFieldCache;
 import org.thingsboard.server.service.profile.TbAssetProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.queue.TbPackCallback;
@@ -75,7 +73,6 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
     protected final TbDeviceProfileCache deviceProfileCache;
     protected final TbAssetProfileCache assetProfileCache;
     protected final TbResourceDataCache tbResourceDataCache;
-    protected final CalculatedFieldCache calculatedFieldCache;
     protected final TbApiUsageStateService apiUsageStateService;
     protected final PartitionService partitionService;
     protected final ApplicationEventPublisher eventPublisher;
@@ -197,15 +194,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
             if (componentLifecycleMsg.getEvent() == ComponentLifecycleEvent.DELETED) {
                 apiUsageStateService.onCustomerDelete((CustomerId) componentLifecycleMsg.getEntityId());
             }
-        } else if (EntityType.CALCULATED_FIELD.equals(componentLifecycleMsg.getEntityId().getEntityType())) {
+        } else if (EntityType.TB_RESOURCE.equals(componentLifecycleMsg.getEntityId().getEntityType())) {
-            if (componentLifecycleMsg.getEvent() == ComponentLifecycleEvent.CREATED) {
-                calculatedFieldCache.addCalculatedField(tenantId, (CalculatedFieldId) componentLifecycleMsg.getEntityId());
-            } else if (componentLifecycleMsg.getEvent() == ComponentLifecycleEvent.UPDATED) {
-                calculatedFieldCache.updateCalculatedField(tenantId, (CalculatedFieldId) componentLifecycleMsg.getEntityId());
-            } else {
-                calculatedFieldCache.evict((CalculatedFieldId) componentLifecycleMsg.getEntityId());
-            }
-        }  else if (EntityType.TB_RESOURCE.equals(componentLifecycleMsg.getEntityId().getEntityType())) {
             tbResourceDataCache.evictResourceData(tenantId, new TbResourceId(componentLifecycleMsg.getEntityId().getId()));
         }
 

application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractPartitionBasedConsumerService.java

@@ -45,12 +45,11 @@ public abstract class AbstractPartitionBasedConsumerService<N extends com.google
                                                  TbDeviceProfileCache deviceProfileCache,
                                                  TbAssetProfileCache assetProfileCache,
                                                  TbResourceDataCache tbResourceDataCache,
-                                                 CalculatedFieldCache calculatedFieldCache,
                                                  TbApiUsageStateService apiUsageStateService,
                                                  PartitionService partitionService,
                                                  ApplicationEventPublisher eventPublisher,
                                                  JwtSettingsService jwtSettingsService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
     }
 
     @PostConstruct

application/src/main/java/org/thingsboard/server/service/ruleengine/DefaultRuleEngineCallService.java

@@ -73,7 +73,7 @@ public class DefaultRuleEngineCallService implements RuleEngineCallService {
         UUID requestId = new UUID(restApiCallResponseMsg.getRequestIdMSB(), restApiCallResponseMsg.getRequestIdLSB());
         Consumer<TbMsg> consumer = requests.remove(requestId);
         if (consumer != null) {
-            consumer.accept(TbMsg.fromProto(null, restApiCallResponseMsg.getResponseProto(), restApiCallResponseMsg.getResponse(), TbMsgCallback.EMPTY));
+            consumer.accept(TbMsg.fromProto(null, restApiCallResponseMsg.getResponseProto(), TbMsgCallback.EMPTY));
         } else {
             log.trace("[{}] Unknown or stale rest api call response received", requestId);
         }

application/src/main/java/org/thingsboard/server/service/system/SystemPatchApplier.java

@@ -28,7 +28,10 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.resource.ImageService;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.install.DatabaseSchemaSettingsService;
 import org.thingsboard.server.service.install.InstallScripts;
@@ -40,7 +43,12 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -48,7 +56,7 @@ import java.util.stream.Stream;
 
 /**
  * Runs at application startup and applies no-downtime data updates
- * when the package PATCH version increases (e.g., 4.2.1.0 -> 4.2.1.1).
+ * when the package version increases within the same LTS family (e.g., 4.3.0.0 -> 4.3.1.0 or 4.3.0.0 -> 4.3.0.1).
  */
 @Slf4j
 @Component
@@ -64,6 +72,8 @@ public class SystemPatchApplier {
     private final InstallScripts installScripts;
     private final DatabaseSchemaSettingsService schemaSettingsService;
     private final WidgetTypeService widgetTypeService;
+    private final WidgetsBundleService widgetsBundleService;
+    private final ImageService imageService;
 
     @PostConstruct
     private void init() {
@@ -91,11 +101,19 @@ public class SystemPatchApplier {
         }
 
         try {
+            updateLtsSqlSchema();
+
             updateSqlViews();
             log.info("Updated sql database views");
 
-            int updated = updateWidgetTypes();
+            WidgetTypeStats widgetStats = updateWidgetTypes();
-            log.info("Updated {} widget types", updated);
+            log.info("System widget types: {} created, {} updated", widgetStats.created(), widgetStats.updated());
+
+            int updatedBundles = updateWidgetBundles();
+            log.info("System widget bundles: {} updated", updatedBundles);
+
+            int createdImages = createMissingSystemImages();
+            log.info("Created {} new system images", createdImages);
 
             schemaSettingsService.updateSchemaVersion();
             log.info("System data patch update completed successfully");
@@ -119,17 +137,37 @@ public class SystemPatchApplier {
             return false;
         }
 
-        if (!isPatchVersionChanged(packageVersionInfo, dbVersionInfo)) {
+        if (!isVersionIncreased(packageVersionInfo, dbVersionInfo)) {
             return false;
         }
 
-        log.info("Patch version increased from {} to {}. Starting system data update.", dbVersion, packageVersion);
+        log.info("Version increased from {} to {}. Starting system data update.", dbVersion, packageVersion);
         return true;
     }
 
-    private boolean isPatchVersionChanged(VersionInfo packageVersion, VersionInfo dbVersion) {
+    private boolean isVersionIncreased(VersionInfo packageVersion, VersionInfo dbVersion) {
-        return packageVersion.major == dbVersion.major && packageVersion.minor == dbVersion.minor
+        if (packageVersion.major != dbVersion.major || packageVersion.minor != dbVersion.minor) {
-                && packageVersion.maintenance == dbVersion.maintenance && packageVersion.patch > dbVersion.patch;
+            return false;
+        }
+        if (packageVersion.maintenance != dbVersion.maintenance) {
+            return packageVersion.maintenance > dbVersion.maintenance;
+        }
+        return packageVersion.patch > dbVersion.patch;
+    }
+
+    private void updateLtsSqlSchema() {
+        Path sqlFile = Paths.get(installScripts.getDataDir(), "upgrade", "lts", "schema_update.sql");
+        if (!Files.exists(sqlFile)) {
+            log.trace("LTS schema update file does not exist: {}", sqlFile);
+            return;
+        }
+        try {
+            String sql = Files.readString(sqlFile);
+            jdbcTemplate.execute(sql);
+            log.info("Applied LTS SQL schema update from {}", sqlFile);
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to read LTS schema update file: " + sqlFile, e);
+        }
     }
 
     private void updateSqlViews() {
@@ -142,20 +180,24 @@ public class SystemPatchApplier {
         }
     }
 
-    private int updateWidgetTypes() {
+    private WidgetTypeStats updateWidgetTypes() {
+        AtomicInteger created = new AtomicInteger();
         AtomicInteger updated = new AtomicInteger();
         Path widgetTypesDir = installScripts.getWidgetTypesDir();
 
         if (!Files.exists(widgetTypesDir)) {
             log.trace("Widget types directory does not exist: {}", widgetTypesDir);
-            return 0;
+            return new WidgetTypeStats(0, 0);
         }
 
         try (Stream<Path> dirStream = listDir(widgetTypesDir).filter(path -> path.toString().endsWith(InstallScripts.JSON_EXT))) {
             dirStream.forEach(
                     path -> {
                         try {
-                            if (updateWidgetTypeFromFile(path)) {
+                            WidgetTypeChange change = updateWidgetTypeFromFile(path);
+                            if (change == WidgetTypeChange.CREATED) {
+                                created.incrementAndGet();
+                            } else if (change == WidgetTypeChange.UPDATED) {
                                 updated.incrementAndGet();
                             }
                         } catch (Exception e) {
@@ -166,18 +208,26 @@ public class SystemPatchApplier {
             );
         }
 
-        return updated.get();
+        return new WidgetTypeStats(created.get(), updated.get());
     }
 
-    private boolean updateWidgetTypeFromFile(Path filePath) {
+    private WidgetTypeChange updateWidgetTypeFromFile(Path filePath) {
         JsonNode json = JacksonUtil.toJsonNode(filePath.toFile());
         WidgetTypeDetails fileWidgetType = JacksonUtil.treeToValue(json, WidgetTypeDetails.class);
+        return saveOrUpdateSystemWidgetType(fileWidgetType);
+    }
+
+    private WidgetTypeChange saveOrUpdateSystemWidgetType(WidgetTypeDetails fileWidgetType) {
         String fqn = fileWidgetType.getFqn();
+        if (fqn == null || fqn.isBlank()) {
+            throw new RuntimeException("Widget type fqn is missing or blank: " + fileWidgetType.getName());
+        }
 
         WidgetTypeDetails existingWidgetType = widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, fqn);
         if (existingWidgetType == null) {
-            // We expect only update here, so it's probably never happening, but for test purpose leave it like this:
+            widgetTypeService.saveWidgetType(fileWidgetType);
-            throw new RuntimeException("Widget type not found: " + fqn);
+            log.trace("Created widget type: {}", fqn);
+            return WidgetTypeChange.CREATED;
         }
         if (isWidgetTypeChanged(existingWidgetType, fileWidgetType)) {
             existingWidgetType.setDescription(fileWidgetType.getDescription());
@@ -185,11 +235,128 @@ public class SystemPatchApplier {
             existingWidgetType.setDescriptor(fileWidgetType.getDescriptor());
             widgetTypeService.saveWidgetType(existingWidgetType);
             log.trace("Updated widget type: {}", fqn);
-            return true;
+            return WidgetTypeChange.UPDATED;
         }
 
         log.trace("Widget type unchanged: {}", fqn);
-        return false;
+        return WidgetTypeChange.UNCHANGED;
+    }
+
+    private int updateWidgetBundles() {
+        AtomicInteger updated = new AtomicInteger();
+        Path widgetBundlesDir = installScripts.getWidgetBundlesDir();
+
+        if (!Files.exists(widgetBundlesDir)) {
+            log.trace("Widget bundles directory does not exist: {}", widgetBundlesDir);
+            return 0;
+        }
+
+        try (Stream<Path> dirStream = listDir(widgetBundlesDir).filter(path -> path.toString().endsWith(InstallScripts.JSON_EXT))) {
+            dirStream.forEach(path -> {
+                try {
+                    if (processWidgetBundleFile(path)) {
+                        updated.incrementAndGet();
+                    }
+                } catch (Exception e) {
+                    log.error("Unable to process widgets bundle from json: [{}]", path);
+                    throw new RuntimeException("Unable to process widgets bundle from json", e);
+                }
+            });
+        }
+
+        return updated.get();
+    }
+
+    private boolean processWidgetBundleFile(Path filePath) {
+        JsonNode bundleJson = JacksonUtil.toJsonNode(filePath.toFile());
+        if (bundleJson == null || !bundleJson.has("widgetsBundle")) {
+            throw new RuntimeException("Invalid widgets bundle json: " + filePath);
+        }
+        WidgetsBundle fileBundle = JacksonUtil.treeToValue(bundleJson.get("widgetsBundle"), WidgetsBundle.class);
+        String alias = fileBundle.getAlias();
+        if (alias == null || alias.isBlank()) {
+            throw new RuntimeException("Widgets bundle alias is missing or blank: " + filePath);
+        }
+
+        WidgetsBundle existingBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, alias);
+        if (existingBundle == null) {
+            log.warn("Widgets bundle '{}' not found in DB; bundle creation is not supported by the patch applier, skipping.", alias);
+            return false;
+        }
+
+        if (bundleJson.has("widgetTypes")) {
+            throw new RuntimeException("Inline widgetTypes in bundle JSON are not supported by the patch applier; " +
+                    "place widget definitions in widget_types/*.json and reference them via widgetTypeFqns: " + filePath);
+        }
+        List<String> fileWidgetFqns = new ArrayList<>();
+        if (bundleJson.has("widgetTypeFqns")) {
+            bundleJson.get("widgetTypeFqns").forEach(fqnJson -> fileWidgetFqns.add(fqnJson.asText()));
+        }
+
+        boolean changed = false;
+        if (isWidgetsBundleChanged(existingBundle, fileBundle)) {
+            existingBundle.setTitle(fileBundle.getTitle());
+            existingBundle.setDescription(fileBundle.getDescription());
+            existingBundle.setImage(fileBundle.getImage());
+            existingBundle.setOrder(fileBundle.getOrder());
+            existingBundle.setScada(fileBundle.isScada());
+            widgetsBundleService.saveWidgetsBundle(existingBundle);
+            log.trace("Updated widgets bundle metadata: {}", alias);
+            changed = true;
+        }
+
+        List<String> existingFqns = widgetTypeService.findWidgetFqnsByWidgetsBundleId(TenantId.SYS_TENANT_ID, existingBundle.getId());
+        LinkedHashSet<String> mergedFqns = new LinkedHashSet<>(existingFqns);
+        if (mergedFqns.addAll(fileWidgetFqns)) {
+            widgetTypeService.updateWidgetsBundleWidgetFqns(TenantId.SYS_TENANT_ID, existingBundle.getId(), new ArrayList<>(mergedFqns));
+            log.trace("Linked {} new widget fqn(s) to bundle: {}", mergedFqns.size() - existingFqns.size(), alias);
+            changed = true;
+        }
+        return changed;
+    }
+
+    private boolean isWidgetsBundleChanged(WidgetsBundle existing, WidgetsBundle file) {
+        // Image is intentionally NOT compared: the file always carries a base64 data URI, while the DB stores
+        // the system-image URL produced by ImageService.replaceBase64WithImageUrl on save. A naive string compare
+        // would always report a diff and re-save every system bundle on every patch run. Image content changes
+        // are out of scope for the patch applier — full reinstall covers them.
+        return !Objects.equals(existing.getTitle(), file.getTitle())
+                || !Objects.equals(existing.getDescription(), file.getDescription())
+                || !Objects.equals(existing.getOrder(), file.getOrder())
+                || existing.isScada() != file.isScada();
+    }
+
+    private int createMissingSystemImages() {
+        AtomicInteger created = new AtomicInteger();
+        Path imagesDir = Paths.get(installScripts.getDataDir(), InstallScripts.RESOURCES_DIR, "images");
+
+        if (!Files.exists(imagesDir)) {
+            log.warn("System images directory does not exist: {}", imagesDir);
+            return 0;
+        }
+
+        Set<String> existingKeys = imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID);
+
+        try (Stream<Path> dirStream = listDir(imagesDir).filter(Files::isRegularFile)) {
+            dirStream.forEach(path -> {
+                String resourceKey = path.getFileName().toString();
+                if (existingKeys.contains(resourceKey)) {
+                    log.trace("System image already exists, skipping: {}", resourceKey);
+                    return;
+                }
+                try {
+                    byte[] data = Files.readAllBytes(path);
+                    imageService.createOrUpdateSystemImage(resourceKey, data);
+                    created.incrementAndGet();
+                    log.trace("Created system image: {}", resourceKey);
+                } catch (Exception e) {
+                    log.error("Unable to create system image from file: [{}]", path);
+                    throw new RuntimeException("Unable to create system image " + resourceKey, e);
+                }
+            });
+        }
+
+        return created.get();
     }
 
     private boolean isWidgetTypeChanged(WidgetTypeDetails existing, WidgetTypeDetails file) {
@@ -287,4 +454,8 @@ public class SystemPatchApplier {
 
     public record VersionInfo(int major, int minor, int maintenance, int patch) {}
 
+    public record WidgetTypeStats(int created, int updated) {}
+
+    private enum WidgetTypeChange { CREATED, UPDATED, UNCHANGED }
+
 }

application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java

@@ -144,7 +144,7 @@ public class DefaultWebSocketService implements WebSocketService {
     private final ConcurrentMap<TenantId, Set<String>> tenantSubscriptionsMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<CustomerId, Set<String>> customerSubscriptionsMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<UserId, Set<String>> regularUserSubscriptionsMap = new ConcurrentHashMap<>();
-    private final ConcurrentMap<UserId, Set<String>> publicUserSubscriptionsMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap = new ConcurrentHashMap<>();
     private final ConcurrentMap<String, Map<Integer, Integer>> sessionCmdMap = new ConcurrentHashMap<>();
 
     private ExecutorService executor;
@@ -315,7 +315,7 @@ public class DefaultWebSocketService implements WebSocketService {
         }
     }
 
-    private void processSessionClose(WebSocketSessionRef sessionRef) {
+    void processSessionClose(WebSocketSessionRef sessionRef) {
         var tenantProfileConfiguration = getTenantProfileConfiguration(sessionRef);
         if (tenantProfileConfiguration != null) {
             String sessionId = "[" + sessionRef.getSessionId() + "]";
@@ -340,7 +340,7 @@ public class DefaultWebSocketService implements WebSocketService {
                     }
                 }
                 if (tenantProfileConfiguration.getMaxWsSubscriptionsPerPublicUser() > 0 && UserPrincipal.Type.PUBLIC_ID.equals(sessionRef.getSecurityCtx().getUserPrincipal().getType())) {
-                    Set<String> publicUserSessions = publicUserSubscriptionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getId(), id -> ConcurrentHashMap.newKeySet());
+                    Set<String> publicUserSessions = publicUserSubscriptionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getTenantId(), id -> ConcurrentHashMap.newKeySet());
                     synchronized (publicUserSessions) {
                         publicUserSessions.removeIf(subId -> subId.startsWith(sessionId));
                     }
@@ -349,7 +349,7 @@ public class DefaultWebSocketService implements WebSocketService {
         }
     }
 
-    private boolean processSubscription(WebSocketSessionRef sessionRef, SubscriptionCmd cmd) {
+    boolean processSubscription(WebSocketSessionRef sessionRef, SubscriptionCmd cmd) {
         var tenantProfileConfiguration = getTenantProfileConfiguration(sessionRef);
         if (tenantProfileConfiguration == null) return true;
 
@@ -401,9 +401,11 @@ public class DefaultWebSocketService implements WebSocketService {
                     }
                 }
                 if (tenantProfileConfiguration.getMaxWsSubscriptionsPerPublicUser() > 0 && UserPrincipal.Type.PUBLIC_ID.equals(sessionRef.getSecurityCtx().getUserPrincipal().getType())) {
-                    Set<String> publicUserSessions = publicUserSubscriptionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getId(), id -> ConcurrentHashMap.newKeySet());
+                    Set<String> publicUserSessions = publicUserSubscriptionsMap.computeIfAbsent(sessionRef.getSecurityCtx().getTenantId(), id -> ConcurrentHashMap.newKeySet());
                     synchronized (publicUserSessions) {
-                        if (publicUserSessions.size() < tenantProfileConfiguration.getMaxWsSubscriptionsPerPublicUser()) {
+                        if (cmd.isUnsubscribe()) {
+                            publicUserSessions.remove(subId);
+                        } else if (publicUserSessions.size() < tenantProfileConfiguration.getMaxWsSubscriptionsPerPublicUser()) {
                             publicUserSessions.add(subId);
                         } else {
                             log.info("[{}][{}][{}] Failed to start subscription. Max public user subscriptions limit reached"

application/src/main/resources/thingsboard.yml

@@ -58,6 +58,14 @@ server:
   http2:
     # Enable/disable HTTP/2 support
     enabled: "${HTTP2_ENABLED:true}"
+  # HTTP response compression
+  compression:
+    # Enable/disable HTTP response compression
+    enabled: "${HTTP_COMPRESSION_ENABLED:false}"
+    # Minimum size (in bytes) required for a response before compression is applied
+    min_response_size: "${HTTP_COMPRESSION_MIN_RESPONSE_SIZE:2048}"
+    # Comma-separated list of MIME types that should be compressed
+    mime_types: "${HTTP_COMPRESSION_MIME_TYPES:text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json,application/xml}"
   # Log errors with stacktrace when REST API throws an exception with the message "Please contact sysadmin"
   log_controller_error_stack_trace: "${HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE:false}"
   ws:
@@ -446,6 +454,7 @@ sql:
   log_tenant_stats: "${SQL_LOG_TENANT_STATS:true}"
   # Interval in milliseconds for printing the latest statistic information about the tenant
   log_tenant_stats_interval_ms: "${SQL_LOG_TENANT_STATS_INTERVAL_MS:60000}"
+  entity_data_query_nulls_order_strategy: "${SQL_ENTITY_DATA_QUERY_NULLS_ORDER_STRATEGY:default}" # Nulls ordering strategy for sql entity data query. Possible values: default, nulls_first, nulls_last. The default value is 'default', which means postgres default behavior will be applied: NULLS LAST for ASC and NULLS FIRST for DESC. The 'nulls_first' value means that NULL values will be ordered before non-NULL values regardless of the sort order. The 'nulls_last' value means that NULL values will be ordered after non-NULL values regardless of the sort order.
   postgres:
     # Specify partitioning size for timestamp key-value storage. Example: DAYS, MONTHS, YEARS, INDEFINITE.
     ts_key_value_partitioning: "${SQL_POSTGRES_TS_KV_PARTITIONING:MONTHS}"
@@ -567,6 +576,18 @@ actors:
       # Use this when your rule chains need to reach devices on private networks (e.g., 192.168.1.0/24).
       # Example: "192.168.1.0/24,10.0.0.0/8,my-internal-service.corp"
       ssrf_allowed_hosts: "${SSRF_ALLOWED_HOSTS:}"
+      http_client:
+        # Server-level ceiling for parallel in-flight HTTP requests per external HTTP rule node instance.
+        # Applied as min(nodeConfig, systemMax) when set; 0 = no system-level restriction (node config wins).
+        max_parallel_requests: "${ACTORS_RULE_EXTERNAL_HTTP_CLIENT_MAX_PARALLEL_REQUESTS:0}"
+        # Server-level ceiling for the pending-request queue depth per external HTTP rule node instance.
+        # Applied as min(nodeConfig, systemMax) when set; 0 = no system-level restriction.
+        max_pending_requests: "${ACTORS_RULE_EXTERNAL_HTTP_CLIENT_MAX_PENDING_REQUESTS:0}"
+        # Maximum number of TCP connections in the reactor-netty connection pool per external HTTP rule node instance.
+        # Defaults to reactor-netty's ConnectionProvider.DEFAULT_POOL_MAX_CONNECTIONS: max(availableProcessors, 8) * 2
+        # (e.g. 16 on an 8-core host). Increase for high-throughput nodes calling remote services that support many connections.
+        # 0 = use reactor-netty default.
+        pool_max_connections: "${ACTORS_RULE_EXTERNAL_HTTP_CLIENT_POOL_MAX_CONNECTIONS:${TB_RE_HTTP_CLIENT_POOL_MAX_CONNECTIONS:0}}"
   rpc:
     # Maximum number of persistent RPC call retries in case of failed request delivery.
     max_retries: "${ACTORS_RPC_MAX_RETRIES:5}"
@@ -1394,6 +1415,15 @@ transport:
         branch: "${TB_GATEWAY_DASHBOARD_SYNC_BRANCH:release/4.0.0}"
         # Fetch frequency in hours for gateways dashboard repository
         fetch_frequency: "${TB_GATEWAY_DASHBOARD_SYNC_FETCH_FREQUENCY:24}"
+  ssl:
+    # SSL/TLS settings for the transport layer
+    certificate:
+      # X.509 certificate configuration to auto-detect and reload certificate used by transport protocols in real-time (MQTT, CoAP, LwM2M, etc.)
+      reload:
+        # Enable/disable automatic SSL certificates reload
+        enabled: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_ENABLED:true}"
+        # Interval in seconds for certificate reload
+        check_interval_seconds: "${TB_TRANSPORT_SSL_CERTIFICATE_RELOAD_CHECK_INTERVAL_SECONDS:60}"
 
 # CoAP server parameters
 coap:
@@ -1530,7 +1560,7 @@ device:
       pem_cert_file: "${DEVICE_CONNECTIVITY_COAPS_CA_ROOT_CERT:cafile.pem}"
     gateway:
       # The docker tag for thingsboard/tb-gateway image used in docker-compose file for gateway launch
-      image_version: "${DEVICE_CONNECTIVITY_GATEWAY_IMAGE_VERSION:3.7-stable}"
+      image_version: "${DEVICE_CONNECTIVITY_GATEWAY_IMAGE_VERSION:3.8-stable}"
 
 # Edges parameters
 edges:
@@ -1659,8 +1689,8 @@ queue:
     acks: "${TB_KAFKA_ACKS:all}"
     # Number of retries. Resend any record whose send fails with a potentially transient error
     retries: "${TB_KAFKA_RETRIES:1}"
-    # The compression type for all data generated by the producer. The default is none (i.e. no compression). Valid values none or gzip
+    # The compression type for all data generated by the producer. The default is none (i.e. no compression). Valid values: none, gzip or lz4
-    compression.type: "${TB_KAFKA_COMPRESSION_TYPE:none}" # none or gzip
+    compression.type: "${TB_KAFKA_COMPRESSION_TYPE:none}" # none, gzip or lz4
     # Default batch size. This setting gives the upper bound of the batch size to be sent
     batch.size: "${TB_KAFKA_BATCH_SIZE:16384}"
     # This variable creates a small amount of artificial delay—that is, rather than immediately sending out a record

application/src/test/java/org/thingsboard/server/controller/AiModelControllerTest.java

@@ -19,8 +19,13 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.junit.Test;
 import org.springframework.test.web.servlet.ResultActions;
+import org.thingsboard.common.util.SsrfProtectionValidator;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ai.AiModel;
+import org.thingsboard.server.common.data.ai.dto.TbChatRequest;
+import org.thingsboard.server.common.data.ai.dto.TbChatResponse;
+import org.thingsboard.server.common.data.ai.dto.TbContent;
+import org.thingsboard.server.common.data.ai.dto.TbUserMessage;
 import org.thingsboard.server.common.data.ai.model.chat.AnthropicChatModelConfig;
 import org.thingsboard.server.common.data.ai.model.chat.GoogleAiGeminiChatModelConfig;
 import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
@@ -34,6 +39,8 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.List;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -136,6 +143,68 @@ public class AiModelControllerTest extends AbstractControllerTest {
         assertThat(updatedModel.getExternalId()).isNull();
     }
 
+    @Test
+    public void saveAiModel_whenBaseUrlIsPrivateIp_shouldReturnBadRequest() throws Exception {
+        // GIVEN
+        loginTenantAdmin();
+        SsrfProtectionValidator.setEnabled(true);
+
+        try {
+            var modelConfig = OpenAiChatModelConfig.builder()
+                    .providerConfig(OpenAiProviderConfig.builder()
+                            .baseUrl("http://172.17.0.1:22/")
+                            .apiKey("test-api-key")
+                            .build())
+                    .modelId("gpt-4o")
+                    .build();
+
+            AiModel model = AiModel.builder()
+                    .tenantId(tenantId)
+                    .name("SSRF test model")
+                    .configuration(modelConfig)
+                    .build();
+
+            // WHEN
+            ResultActions result = doPost("/api/ai/model", model);
+
+            // THEN
+            result.andExpect(status().isBadRequest());
+        } finally {
+            SsrfProtectionValidator.setEnabled(false);
+        }
+    }
+
+    @Test
+    public void sendChatRequest_whenBaseUrlBlockedAtRuntime_shouldReturnFailureEnvelope() throws Exception {
+        // GIVEN
+        loginTenantAdmin();
+        SsrfProtectionValidator.setEnabled(true);
+
+        try {
+            var modelConfig = OpenAiChatModelConfig.builder()
+                    .providerConfig(OpenAiProviderConfig.builder()
+                            .baseUrl("http://10.0.0.1:8080/")
+                            .apiKey("test-api-key")
+                            .build())
+                    .modelId("gpt-4o")
+                    .build();
+
+            var chatRequest = new TbChatRequest(
+                    null,
+                    new TbUserMessage(List.of(new TbContent.TbTextContent("hi"))),
+                    modelConfig);
+
+            // WHEN
+            TbChatResponse response = doPostAsync("/api/ai/model/chat", chatRequest, TbChatResponse.class, status().isOk());
+
+            // THEN
+            assertThat(response).isInstanceOf(TbChatResponse.Failure.class);
+            assertThat(((TbChatResponse.Failure) response).errorDetails()).contains("URI is invalid");
+        } finally {
+            SsrfProtectionValidator.setEnabled(false);
+        }
+    }
+
     /* --- Get by ID API tests --- */
 
     @Test

application/src/test/java/org/thingsboard/server/controller/AlarmCommentControllerTest.java

@@ -44,7 +44,9 @@ import org.thingsboard.server.dao.service.DaoSqlTest;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -223,6 +225,18 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         doDelete("/api/alarm/" + alarm.getId() + "/comment/" + alarmComment.getId())
                 .andExpect(status().isOk());
 
+        Optional<AlarmCommentInfo> systemCommentOpt = doGetTyped(
+                "/api/alarm/" + alarm.getId() + "/comment" + "?page=0&pageSize=10", new TypeReference<PageData<AlarmCommentInfo>>() {
+                }
+        ).getData().stream().filter(alarmCommentInfo -> alarmCommentInfo.getType().equals(AlarmCommentType.SYSTEM)).findFirst();
+        assertThat(systemCommentOpt).isPresent();
+        AlarmCommentInfo systemComment = systemCommentOpt.get();
+
+        assertThat(systemComment.getId()).isEqualTo(alarmComment.getId());
+        assertThat(systemComment.getType()).isEqualTo(AlarmCommentType.SYSTEM);
+        assertThat(systemComment.getComment().get("text").asText()).isEqualTo(String.format("User %s deleted his comment",
+                TENANT_ADMIN_EMAIL));
+
         AlarmComment expectedAlarmComment = AlarmComment.builder()
                 .alarmId(alarm.getId())
                 .type(AlarmCommentType.SYSTEM)
@@ -356,6 +370,39 @@ public class AlarmCommentControllerTest extends AbstractControllerTest {
         Assert.assertTrue("Created alarm doesn't match the found one!", equals);
     }
 
+    @Test
+    public void testShouldNotCreateOrUpdateSystemAlarmComment() throws Exception {
+        loginTenantAdmin();
+
+        AlarmComment alarmComment = AlarmComment.builder()
+                .type(AlarmCommentType.SYSTEM)
+                .comment(JacksonUtil.newObjectNode().set("text", new TextNode("Acknowledged by tenant admin")))
+                .build();
+        AlarmComment created = doPost("/api/alarm/" + alarm.getId() + "/comment", alarmComment, AlarmComment.class);
+        assertThat(created.getType()).isEqualTo(AlarmCommentType.OTHER);
+
+        // acknowledge alarm to create system comment
+        doPost("/api/alarm/" + alarm.getId() + "/ack").andExpect(status().isOk());
+
+        Optional<AlarmCommentInfo> systemCommentOpt = doGetTyped(
+                "/api/alarm/" + alarm.getId() + "/comment" + "?page=0&pageSize=10", new TypeReference<PageData<AlarmCommentInfo>>() {
+                }
+        ).getData().stream().filter(alarmCommentInfo -> alarmCommentInfo.getType().equals(AlarmCommentType.SYSTEM)).findFirst();
+        assertThat(systemCommentOpt).isPresent();
+        AlarmCommentInfo systemComment = systemCommentOpt.get();
+
+        // system comment can't be updated with other type
+        systemComment.setType(AlarmCommentType.OTHER);
+        doPost("/api/alarm/" + alarm.getId() + "/comment", systemComment).andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString("System alarm comment can't be updated!")));
+
+        // system comment can't be updated with other text
+        systemComment.setType(AlarmCommentType.SYSTEM);
+        systemComment.setComment(JacksonUtil.newObjectNode().set("text", new TextNode("New system comment")));
+        doPost("/api/alarm/" + alarm.getId() + "/comment", systemComment).andExpect(status().isBadRequest())
+                .andExpect(statusReason(containsString("System alarm comment can't be updated!")));
+    }
+
     private AlarmComment createAlarmComment(AlarmId alarmId, String text) {
         AlarmComment alarmComment = AlarmComment.builder()
                 .comment(JacksonUtil.newObjectNode().set("text", new TextNode(text)))

application/src/test/java/org/thingsboard/server/controller/DeviceConnectivityControllerTest.java

@@ -95,7 +95,7 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
     private DeviceProfileId mqttDeviceProfileId;
     private DeviceProfileId coapDeviceProfileId;
 
-    @Value("${device.connectivity.gateway.image_version:3.7-stable}")
+    @Value("${device.connectivity.gateway.image_version:3.8-stable}")
     private String gatewayImageVersion;
 
     @Before
@@ -321,9 +321,10 @@ public class DeviceConnectivityControllerTest extends AbstractControllerTest {
                 "\n" +
                 "    # Environment variables\n" +
                 "    environment:\n" +
-                "      - host=host.docker.internal\n" +
+                "      - TB_GW_HOST=host.docker.internal\n" +
-                "      - port=1883\n" +
+                "      - TB_GW_PORT=1883\n" +
-                "      - accessToken=" + credentials.getCredentialsId() + "\n" +
+                "      - TB_GW_SECURITY_TYPE=accessToken\n" +
+                "      - TB_GW_ACCESS_TOKEN=" + credentials.getCredentialsId() + "\n" +
                 "\n" +
                 "    # Volumes bind\n" +
                 "    volumes:\n" +

application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java

@@ -54,11 +54,13 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.awaitility.Awaitility;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -1028,11 +1030,17 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
         MqttDeviceProfileTransportConfiguration mqttDeviceProfileTransportConfiguration = this.createMqttDeviceProfileTransportConfiguration(protoTransportPayloadConfiguration, false);
         DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile", mqttDeviceProfileTransportConfiguration);
 
-        Mockito.reset(tbClusterService, auditLogService);
+        // The request may hit a transient TenantNotFoundException right after the @Before tenant creation
-
+        // if the tenant profile cache is not yet warmed up for the newly created tenant. Retry until the
-        doPost("/api/deviceProfile", deviceProfile)
+        // request returns the expected 400 Bad Request for the invalid schema. Mockito.reset is inside the
-                .andExpect(status().isBadRequest())
+        // retry loop so the subsequent verify* assertions see only the invocations from the last attempt.
-                .andExpect(statusReason(containsString(errorMsg)));
+        Awaitility.await().atMost(10, TimeUnit.SECONDS).pollInterval(500, TimeUnit.MILLISECONDS)
+                .ignoreExceptions().untilAsserted(() -> {
+                    Mockito.reset(tbClusterService, auditLogService);
+                    doPost("/api/deviceProfile", deviceProfile)
+                            .andExpect(status().isBadRequest())
+                            .andExpect(statusReason(containsString(errorMsg)));
+                });
 
         testNotifyEntityEqualsOneTimeServiceNeverError(deviceProfile, savedTenant.getId(),
                 tenantAdmin.getId(), tenantAdmin.getEmail(), ActionType.ADDED, new DataValidationException(errorMsg));

application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java

@@ -405,4 +405,21 @@ public class RuleChainControllerTest extends AbstractControllerTest {
         return doPost("/api/ruleChain", ruleChain, RuleChain.class);
     }
 
+    @Test
+    public void testScriptForbiddenForCustomer() throws Exception {
+        loginCustomerUser();
+
+        doPost("/api/ruleChain/testScript", (Object) """
+                {
+                  "script": "return msg;",
+                  "scriptType": "update",
+                  "argNames": ["msg", "metadata", "msgType"],
+                  "msg": "{}",
+                  "metadata": {},
+                  "msgType": "POST_TELEMETRY_REQUEST"
+                }
+                """)
+                .andExpect(status().isForbidden());
+    }
+
 }

application/src/test/java/org/thingsboard/server/controller/plugin/TbWebSocketHandlerTest.java

@@ -25,16 +25,28 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.adapter.NativeWebSocketSession;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.ws.WebSocketSessionRef;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Deque;
 import java.util.List;
 import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.CountDownLatch;
@@ -184,4 +196,70 @@ class TbWebSocketHandlerTest {
         assertThat(msgs).map(Integer::parseInt).doesNotHaveDuplicates().hasSize(100);
     }
 
+    // Regression test for the bug where publicUserSessionsMap was keyed by UserId(NULL_UUID),
+    // making maxWsSessionsPerPublicUser a global limit shared across all tenants.
+    // The limit is now scoped per-tenant.
+    @Test
+    void checkLimits_publicUserSessions_limitIsPerTenantNotGlobal() throws Exception {
+        TbTenantProfileCache tenantProfileCache = mock(TbTenantProfileCache.class);
+        ReflectionTestUtils.setField(wsHandler, "tenantProfileCache", tenantProfileCache);
+
+        int maxPublicSessions = 2;
+
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile1 = new TenantProfile();
+        profile1.createDefaultTenantProfileData();
+        profile1.getDefaultProfileConfiguration().setMaxWsSessionsPerPublicUser(maxPublicSessions);
+        willReturn(profile1).given(tenantProfileCache).get(tenant1);
+
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile2 = new TenantProfile();
+        profile2.createDefaultTenantProfileData();
+        profile2.getDefaultProfileConfiguration().setMaxWsSessionsPerPublicUser(maxPublicSessions);
+        willReturn(profile2).given(tenantProfileCache).get(tenant2);
+
+        Method checkLimits = TbWebSocketHandler.class.getDeclaredMethod(
+                "checkLimits", WebSocketSession.class, WebSocketSessionRef.class);
+        checkLimits.setAccessible(true);
+
+        // tenant1 fills up its limit
+        for (int i = 0; i < maxPublicSessions; i++) {
+            assertThat((boolean) checkLimits.invoke(wsHandler, mockWsSession("t1-" + i), mockPublicSessionRef(tenant1))).isTrue();
+        }
+
+        // tenant2 must get its own independent quota — this was the bug: with NULL_UUID as key
+        // all tenants shared one global counter, so tenant2 would be blocked here
+        for (int i = 0; i < maxPublicSessions; i++) {
+            assertThat((boolean) checkLimits.invoke(wsHandler, mockWsSession("t2-" + i), mockPublicSessionRef(tenant2)))
+                    .as("tenant2 session %d should not be affected by tenant1's sessions", i + 1)
+                    .isTrue();
+        }
+
+        // tenant1's (maxPublicSessions + 1)-th session must be rejected
+        NativeWebSocketSession overLimit = mockWsSession("t1-over");
+        assertThat((boolean) checkLimits.invoke(wsHandler, overLimit, mockPublicSessionRef(tenant1))).isFalse();
+        verify(overLimit).close(CloseStatus.POLICY_VIOLATION.withReason("Max public user sessions limit reached"));
+    }
+
+    private NativeWebSocketSession mockWsSession(String id) {
+        NativeWebSocketSession s = mock(NativeWebSocketSession.class);
+        willReturn(id).given(s).getId();
+        return s;
+    }
+
+    private WebSocketSessionRef mockPublicSessionRef(TenantId tenantId) {
+        CustomerId customerId = new CustomerId(UUID.randomUUID());
+        SecurityUser securityUser = mock(SecurityUser.class);
+        willReturn(tenantId).given(securityUser).getTenantId();
+        willReturn(customerId).given(securityUser).getCustomerId();
+        willReturn(new UserId(EntityId.NULL_UUID)).given(securityUser).getId();
+        willReturn(true).given(securityUser).isCustomerUser();
+        willReturn(new UserPrincipal(UserPrincipal.Type.PUBLIC_ID, customerId.toString())).given(securityUser).getUserPrincipal();
+
+        WebSocketSessionRef ref = mock(WebSocketSessionRef.class);
+        willReturn(securityUser).given(ref).getSecurityCtx();
+        willReturn(UUID.randomUUID().toString()).given(ref).getSessionId();
+        return ref;
+    }
+
 }

application/src/test/java/org/thingsboard/server/edge/UserEdgeTest.java

@@ -57,7 +57,12 @@ public class UserEdgeTest extends AbstractEdgeTest {
         User savedTenantAdmin = createUser(newTenantAdmin, "tenant");
         Assert.assertTrue(edgeImitator.waitForMessages()); // wait 3 messages - x1 user update msg and x2 user credentials update msgs (create + authenticate user)
         Assert.assertEquals(1, edgeImitator.findAllMessagesByType(UserUpdateMsg.class).size());
-        Assert.assertEquals(2, edgeImitator.findAllMessagesByType(UserCredentialsUpdateMsg.class).size());
+        // The initial USER ADDED edge event may bundle a UserCredentialsUpdateMsg when
+        // user activation completes before the event is processed, in addition to the 2
+        // messages from the CREDENTIALS_UPDATED events fired during activation. Accept 2 or 3.
+        int credMsgCount = edgeImitator.findAllMessagesByType(UserCredentialsUpdateMsg.class).size();
+        Assert.assertTrue("Expected 2 or 3 UserCredentialsUpdateMsg (ADDED/activation race), got " + credMsgCount,
+                credMsgCount == 2 || credMsgCount == 3);
         Optional<UserUpdateMsg> userUpdateMsgOpt = edgeImitator.findMessageByType(UserUpdateMsg.class);
         Assert.assertTrue(userUpdateMsgOpt.isPresent());
         UserUpdateMsg userUpdateMsg = userUpdateMsgOpt.get();

application/src/test/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImplTest.java

@@ -0,0 +1,144 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.ai;
+
+import com.google.cloud.vertexai.api.GenerationConfig;
+import dev.langchain4j.model.chat.ChatModel;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.common.util.SsrfProtectionValidator;
+import org.thingsboard.server.common.data.ai.model.chat.AzureOpenAiChatModelConfig;
+import org.thingsboard.server.common.data.ai.model.chat.GoogleVertexAiGeminiChatModelConfig;
+import org.thingsboard.server.common.data.ai.model.chat.OllamaChatModelConfig;
+import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
+import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.OllamaProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+@ResourceLock("SsrfProtectionValidator")
+class Langchain4jChatModelConfigurerImplTest {
+
+    private static final String TEST_SERVICE_ACCOUNT_KEY = """
+            {
+              "type": "service_account",
+              "project_id": "test-project",
+              "private_key_id": "key-id",
+              "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNrHph/y7zyxIg\\ncmYYeOD8mFg9KraK71n84ffTQyVrl4HzlQgRIz5m4vM2rV5zjVLFi0xlAPT/iq/5\\nbh2zA4iXI0dEsR901nVjcL182t/GRYbKen53ZiuScBxBoCZPXW16Md+Yk8nMdNUb\\n4LoIRGZq64bjsJ+vh3Aa2gdGUHpDyebIXlXbF8ehWmEhgUsL7XjL0PkJ4lt2UMG+\\nx1j2Or25rqJmfc5M9kbxvINtdvSRTPiMOIXX00fCDZjQdd18RBVHOxraGxDgQpmv\\nk4qjFEPqGr0YTsa5dI8fz+4DqJpEi3rancRiTKM/KUwYLGnPSD07XqGfiDA8npVm\\nj4N62LhnAgMBAAECggEADbFfH87DRk7YQO8XgKdCOf7oglX+0NwjjmmlkVvwjgEI\\nZqT0ObPcz9u/MSjfV2vAEs/LK773ELD1NfLQqQjiBfHpfkIZOTLynhwKOYRBjqvf\\n+p38ynUzucGbV/vSC8meuW/AQPe3Nn9MFYQ4znEYrSNLbTWRRA3idvSEtHfffqDA\\nDHRBI1eIlxh1OTIR3L+HhcNYuus1LuoKnSlmwLGhAZLt7fjuWK3PkOiFT15e0M9M\\nUhp3WwhHcRC0o6bxT+BWRYKMVX3Vjlro4sF1fq4+jePThX1bpJcPfUmsC95tXPfX\\njfNGAxHlZ+MS1V/cLlIqyz7drXBcwCDJtbPmvavmNQKBgQD1ZR/ePHcjXUGM57U8\\nbxPatNOrcicvaP2AtTA6Y/JjfbcydkVXsenDGk0h6hykpIiMwrAaJuUTjGeM6QTI\\nOhK0k1QbGitcM71d9TSdLzWUdb3yvsyaPZlPR/6u2FBb6Bf9rWOQRYYyv1Lvu0+1\\nYLnR4sHBxiAur1NGxuHfA4ZUOwKBgQDWj+fcS/x/ifbCqexr7teWU+tUeyG3eLGA\\nMmB9eCkY7djl0/LHu/IHgqrGRVgra3IB1uI7Wr3jZYvlS7qGL3KpjeIPYj7LTQC5\\nznm0875NvJELPjQK/A4EM3mC057QRvb7y52KBNKJi7/JwHU7VHmudB78e7uGlW2K\\n5Ccl0PJFxQKBgCWv5yoJXT64JsYOG95xLLptBQkSmgQE+tHWgdal3Ob8urLsSRAD\\nyePl2Sy5OLbscfA0Qjlx+cJ70LdqXgqmKJNFASi8ZyZc59tTOkZdprvrLUXnmaKi\\njTYI14tgu06yIWUbSOwyUT7f9UvOF5rChSc/zQQGepDQ6lg3WR8X+nxbAoGBAKiu\\nfAcqSfjuuuuxcWgtXpoVoaZKI2i9Xza85DTf+ddabjHJXk3+iTm0VZQIwldoYjnl\\n+PfW0ABtPf1net2xgcChBf84Ksvj3tU06WQEWDF/NLyVC48zN8W/viDHREzT7app\\nGpJ+VhLCpmXzg3bAY+Vt70pp8DTPV05hLhHB4iZNAoGBAJW+bYh7jE61+58VpjvF\\nP36BK09jEEPWVucJdghb2mb62iA6JDy3ApU+8FzckXHDewt0sqvsW4VqukgwVZx3\\npSC7mR4B+Fm6znm0Z5mBWiG5bOOgTJ0mRZv4cYgC+JRRF/E3yYR58RyAKFAFIAFH\\nng8XYP1wQp64Fzv4+rUSwM49\\n-----END PRIVATE KEY-----\\n",
+              "client_email": "test@test-project.iam.gserviceaccount.com",
+              "client_id": "123456789",
+              "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+              "token_uri": "https://oauth2.googleapis.com/token"
+            }
+            """;
+
+    private final Langchain4jChatModelConfigurerImpl configurer = new Langchain4jChatModelConfigurerImpl();
+
+    @BeforeEach
+    void enableSsrfProtection() {
+        SsrfProtectionValidator.setEnabled(true);
+    }
+
+    @AfterEach
+    void disableSsrfProtection() {
+        SsrfProtectionValidator.setEnabled(false);
+    }
+
+    @Test
+    void configureChatModel_openAi_withPrivateIp_shouldThrow() {
+        var config = OpenAiChatModelConfig.builder()
+                .providerConfig(OpenAiProviderConfig.builder()
+                        .baseUrl("http://172.17.0.1:8080/")
+                        .apiKey("test")
+                        .build())
+                .modelId("gpt-4o")
+                .build();
+
+        assertThatThrownBy(() -> configurer.configureChatModel(config))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("URI is invalid");
+    }
+
+    @Test
+    void configureChatModel_openAi_withLocalhostUrl_shouldThrow() {
+        var config = OpenAiChatModelConfig.builder()
+                .providerConfig(OpenAiProviderConfig.builder()
+                        .baseUrl("http://localhost:22/")
+                        .apiKey("test")
+                        .build())
+                .modelId("gpt-4o")
+                .build();
+
+        assertThatThrownBy(() -> configurer.configureChatModel(config))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("URI is invalid");
+    }
+
+    @Test
+    void configureChatModel_azureOpenAi_withPrivateIp_shouldThrow() {
+        var config = AzureOpenAiChatModelConfig.builder()
+                .providerConfig(new AzureOpenAiProviderConfig(
+                        "http://10.0.0.1:8080/", null, "test-key"))
+                .modelId("gpt-4o")
+                .build();
+
+        assertThatThrownBy(() -> configurer.configureChatModel(config))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("URI is invalid");
+    }
+
+    @Test
+    void configureChatModel_ollama_withPrivateIp_shouldThrow() {
+        var config = OllamaChatModelConfig.builder()
+                .providerConfig(new OllamaProviderConfig(
+                        "http://192.168.1.100:11434/", new OllamaProviderConfig.OllamaAuth.None()))
+                .modelId("llama3")
+                .build();
+
+        assertThatThrownBy(() -> configurer.configureChatModel(config))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("URI is invalid");
+    }
+
+    @Test
+    void configureChatModel_vertexAi_setsFrequencyAndPresencePenaltyFromCorrectConfigFields() {
+        // GIVEN
+        var providerConfig = new GoogleVertexAiGeminiProviderConfig(
+                "test.json", "test-project", "us-central1", TEST_SERVICE_ACCOUNT_KEY
+        );
+        var chatModelConfig = GoogleVertexAiGeminiChatModelConfig.builder()
+                .providerConfig(providerConfig)
+                .modelId("gemini-2.0-flash")
+                .frequencyPenalty(0.3)
+                .presencePenalty(0.7)
+                .build();
+
+        // WHEN
+        ChatModel chatModel = configurer.configureChatModel(chatModelConfig);
+
+        // THEN
+        var generationConfig = (GenerationConfig) ReflectionTestUtils.getField(chatModel, "generationConfig");
+        assertThat(generationConfig.getFrequencyPenalty()).isEqualTo(0.3f);
+        assertThat(generationConfig.getPresencePenalty()).isEqualTo(0.7f);
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java

@@ -0,0 +1,349 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.cf;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
+import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.AssetProfileId;
+import org.thingsboard.server.common.data.id.CalculatedFieldId;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
+import org.thingsboard.server.dao.asset.AssetService;
+import org.thingsboard.server.dao.cf.CalculatedFieldService;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.device.DeviceService;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class DefaultCalculatedFieldCacheTest {
+
+    @Mock
+    private CalculatedFieldService calculatedFieldService;
+    @Mock
+    private DeviceService deviceService;
+    @Mock
+    private AssetService assetService;
+    @Mock
+    private CustomerService customerService;
+
+    private DefaultCalculatedFieldCache cache;
+
+    @BeforeEach
+    public void setUp() {
+        cache = new DefaultCalculatedFieldCache(calculatedFieldService, null, null);
+    }
+
+    // --- Tenant deletion tests ---
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_evictsAllTenantCfsFromAllMaps() {
+        TenantId tenant1 = new TenantId(UUID.randomUUID());
+        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        DeviceId device1 = new DeviceId(UUID.randomUUID());
+        DeviceId device2 = new DeviceId(UUID.randomUUID());
+
+        CalculatedField cf1 = addCfToCache(tenant1, device1);
+        CalculatedField cf2 = addCfToCache(tenant2, device2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant1, tenant1, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf1.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(device1)).isEmpty();
+        assertThat(cache.getCalculatedField(cf2.getId())).isEqualTo(cf2);
+        assertThat(cache.getCalculatedFieldsByEntityId(device2)).containsExactly(cf2);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_removesLinksToLinkedEntities() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId cfEntity = new DeviceId(UUID.randomUUID());
+        DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
+
+        CalculatedField cf = addCfToCache(tenant, cfEntity, linkedDevice);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedFieldLinksByEntityId(linkedDevice)).isEmpty();
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictCfs() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, device);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.UPDATED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isEqualTo(cf);
+    }
+
+    // --- Device/Asset deletion tests ---
+
+    @Test
+    public void onComponentLifecycleEvent_deviceDeleted_evictsCfsForThatDevice() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, device);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, device, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(device)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_deviceDeleted_removesLinksForLinkedEntities() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
+        addCfToCache(tenant, device, linkedDevice);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, device, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedFieldLinksByEntityId(linkedDevice)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_assetDeleted_evictsCfsForThatAsset() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetId asset = new AssetId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, asset);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, asset, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(asset)).isEmpty();
+    }
+
+    // --- DeviceProfile/AssetProfile deletion tests ---
+
+    @Test
+    public void onComponentLifecycleEvent_deviceProfileDeleted_evictsCfsForThatProfile() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(profileId)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_deviceProfileDeleted_removesLinksForLinkedEntities() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        DeviceId linkedDevice = new DeviceId(UUID.randomUUID());
+        addCfToCache(tenant, profileId, linkedDevice);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedFieldLinksByEntityId(linkedDevice)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_deviceProfileDeleted_doesNotEvictOtherProfilesCfs() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profile1 = new DeviceProfileId(UUID.randomUUID());
+        DeviceProfileId profile2 = new DeviceProfileId(UUID.randomUUID());
+        CalculatedField cf1 = addCfToCache(tenant, profile1);
+        CalculatedField cf2 = addCfToCache(tenant, profile2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profile1, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf1.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(profile1)).isEmpty();
+        assertThat(cache.getCalculatedField(cf2.getId())).isEqualTo(cf2);
+        assertThat(cache.getCalculatedFieldsByEntityId(profile2)).containsExactly(cf2);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_deviceProfileUpdated_doesNotEvictCfs() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.UPDATED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isEqualTo(cf);
+        assertThat(cache.getCalculatedFieldsByEntityId(profileId)).containsExactly(cf);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_assetProfileDeleted_evictsCfsForThatProfile() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(profileId)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_assetProfileDeleted_removesLinksForLinkedEntities() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        AssetId linkedAsset = new AssetId(UUID.randomUUID());
+        addCfToCache(tenant, profileId, linkedAsset);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedFieldLinksByEntityId(linkedAsset)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_assetProfileDeleted_doesNotEvictOtherProfilesCfs() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profile1 = new AssetProfileId(UUID.randomUUID());
+        AssetProfileId profile2 = new AssetProfileId(UUID.randomUUID());
+        CalculatedField cf1 = addCfToCache(tenant, profile1);
+        CalculatedField cf2 = addCfToCache(tenant, profile2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profile1, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf1.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(profile1)).isEmpty();
+        assertThat(cache.getCalculatedField(cf2.getId())).isEqualTo(cf2);
+        assertThat(cache.getCalculatedFieldsByEntityId(profile2)).containsExactly(cf2);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_assetProfileUpdated_doesNotEvictCfs() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, profileId, ComponentLifecycleEvent.UPDATED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isEqualTo(cf);
+        assertThat(cache.getCalculatedFieldsByEntityId(profileId)).containsExactly(cf);
+    }
+
+    // --- CalculatedField lifecycle tests ---
+
+    @Test
+    public void onComponentLifecycleEvent_calculatedFieldCreated_addsCfToCache() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID());
+        CalculatedField cf = buildCalculatedField(cfId, tenant, device, simpleCfConfig());
+        when(calculatedFieldService.findById(tenant, cfId)).thenReturn(cf);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, cfId, ComponentLifecycleEvent.CREATED));
+
+        assertThat(cache.getCalculatedField(cfId)).isEqualTo(cf);
+        assertThat(cache.getCalculatedFieldsByEntityId(device)).containsExactly(cf);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_calculatedFieldDeleted_evictsCfFromCache() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, device);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, cf.getId(), ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isNull();
+        assertThat(cache.getCalculatedFieldsByEntityId(device)).isEmpty();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_calculatedFieldUpdated_refreshesCfInCache() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceId device = new DeviceId(UUID.randomUUID());
+        CalculatedField cf = addCfToCache(tenant, device);
+
+        CalculatedField updatedCf = buildCalculatedField(cf.getId(), tenant, device, simpleCfConfig());
+        updatedCf.setName("updated-name");
+        when(calculatedFieldService.findById(tenant, cf.getId())).thenReturn(updatedCf);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, cf.getId(), ComponentLifecycleEvent.UPDATED));
+
+        assertThat(cache.getCalculatedField(cf.getId())).isEqualTo(updatedCf);
+    }
+
+    private CalculatedField addCfToCache(TenantId tenantId, EntityId entityId) {
+        CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID());
+        CalculatedField cf = buildCalculatedField(cfId, tenantId, entityId, simpleCfConfig());
+        when(calculatedFieldService.findById(tenantId, cfId)).thenReturn(cf);
+        cache.addCalculatedField(tenantId, cfId);
+        return cf;
+    }
+
+    private CalculatedField addCfToCache(TenantId tenantId, EntityId entityId, EntityId linkedEntity) {
+        CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID());
+        CalculatedFieldConfiguration config = linkedEntityCfConfig(tenantId, cfId, linkedEntity);
+        CalculatedField cf = buildCalculatedField(cfId, tenantId, entityId, config);
+        when(calculatedFieldService.findById(tenantId, cfId)).thenReturn(cf);
+        cache.addCalculatedField(tenantId, cfId);
+        return cf;
+    }
+
+    private CalculatedField buildCalculatedField(CalculatedFieldId id, TenantId tenantId, EntityId entityId, CalculatedFieldConfiguration config) {
+        CalculatedField cf = new CalculatedField();
+        cf.setId(id);
+        cf.setTenantId(tenantId);
+        cf.setEntityId(entityId);
+        cf.setType(CalculatedFieldType.SIMPLE);
+        cf.setName("test-cf-" + id.getId());
+        cf.setConfiguration(config);
+        return cf;
+    }
+
+    private CalculatedFieldConfiguration simpleCfConfig() {
+        CalculatedFieldConfiguration config = mock(CalculatedFieldConfiguration.class);
+        when(config.getReferencedEntities()).thenReturn(Collections.emptyList());
+        when(config.buildCalculatedFieldLinks(any(), any(), any())).thenReturn(Collections.emptyList());
+        return config;
+    }
+
+    private CalculatedFieldConfiguration linkedEntityCfConfig(TenantId tenantId, CalculatedFieldId cfId, EntityId linkedEntity) {
+        CalculatedFieldConfiguration config = mock(CalculatedFieldConfiguration.class);
+        CalculatedFieldLink link = new CalculatedFieldLink(tenantId, linkedEntity, cfId);
+        when(config.getReferencedEntities()).thenReturn(List.of(linkedEntity));
+        when(config.buildCalculatedFieldLinks(any(), any(), any())).thenReturn(List.of(link));
+        when(config.buildCalculatedFieldLink(any(), eq(linkedEntity), any())).thenReturn(link);
+        return config;
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/entitiy/EdqsEntityServiceTest.java

@@ -16,19 +16,27 @@
 package org.thingsboard.server.service.entitiy;
 
 import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
+import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.IdBased;
+import org.thingsboard.server.common.data.kv.TimeseriesSaveResult;
 import org.thingsboard.server.common.data.page.PageData;
+import org.thingsboard.server.common.data.query.DeviceTypeFilter;
 import org.thingsboard.server.common.data.query.EntityCountQuery;
 import org.thingsboard.server.common.data.query.EntityData;
+import org.thingsboard.server.common.data.query.EntityDataPageLink;
 import org.thingsboard.server.common.data.query.EntityDataQuery;
+import org.thingsboard.server.common.data.query.EntityDataSortOrder;
+import org.thingsboard.server.common.data.query.EntityKey;
 import org.thingsboard.server.common.data.query.EntityKeyType;
 import org.thingsboard.server.common.data.query.RelationsQueryFilter;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
@@ -43,10 +51,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
+import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
 
 @DaoSqlTest
 @TestPropertySource(properties = {
@@ -103,6 +114,100 @@ public class EdqsEntityServiceTest extends EntityServiceTest {
         assetService.deleteAssetsByTenantId(tenantId);
     }
 
+    // edqs has no nulls order strategies, always returns NULLs first for ASC and NULLs last for DESC
+    @Override
+    @Test
+    public void testSortByNumericTelemetryKeyWithDifferentNullsOrderStrategy() throws ExecutionException, InterruptedException {
+        List<Device> devices = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device" + i);
+            device.setType("default");
+            devices.add(deviceService.saveDevice(device));
+            Thread.sleep(1);
+        }
+
+        List<Long> values = List.of(1L, 0L, 0L);
+        List<ListenableFuture<TimeseriesSaveResult>> timeseriesFutures = new ArrayList<>();
+        for (int i = 0; i < values.size(); i++) {
+            timeseriesFutures.add(saveTimeseries(devices.get(i).getId(), "test", values.get(i)));
+        }
+        Futures.allAsList(timeseriesFutures).get();
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("");
+
+        List<EntityKey> entityFields = Collections.singletonList(new EntityKey(ENTITY_FIELD, "name"));
+        List<EntityKey> latestValues = Collections.singletonList(new EntityKey(EntityKeyType.TIME_SERIES, "test"));
+
+        EntityDataSortOrder ascSortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.ASC);
+        EntityDataQuery ascQuery = new EntityDataQuery(filter,
+                new EntityDataPageLink(10, 0, null, ascSortOrder), entityFields, latestValues, null);
+        List<String> ascTelemetry = loadAllData(ascQuery, devices.size()).stream()
+                .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                .toList();
+        assertThat(ascTelemetry).containsExactlyElementsOf(List.of("", "", "0", "0", "1"));
+
+        EntityDataSortOrder descSortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.DESC);
+        EntityDataQuery descQuery = new EntityDataQuery(filter,
+                new EntityDataPageLink(10, 0, null, descSortOrder), entityFields, latestValues, null);
+        List<String> descTelemetry = loadAllData(descQuery, devices.size()).stream()
+                .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                .toList();
+        assertThat(descTelemetry).containsExactlyElementsOf(List.of("1", "0", "0", "", ""));
+    }
+
+    // edqs has no nulls order strategies, always returns NULLs first for ASC and NULLs last for DESC
+    @Override
+    @Test
+    public void testSortByBooleanKeyWithDifferentNullsOrderStrategy() throws ExecutionException, InterruptedException {
+        List<Device> devices = new ArrayList<>();
+        for (int i = 0; i < 5; i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device" + i);
+            device.setType("default");
+            devices.add(deviceService.saveDevice(device));
+            Thread.sleep(1);
+        }
+
+        List<Boolean> values = List.of(true, false, false);
+        List<ListenableFuture<TimeseriesSaveResult>> timeseriesFutures = new ArrayList<>();
+        for (int i = 0; i < values.size(); i++) {
+            timeseriesFutures.add(saveTimeseries(devices.get(i).getId(), "test", values.get(i)));
+        }
+        Futures.allAsList(timeseriesFutures).get();
+
+        DeviceTypeFilter filter = new DeviceTypeFilter();
+        filter.setDeviceTypes(List.of("default"));
+        filter.setDeviceNameFilter("");
+
+        List<EntityKey> entityFields = Collections.singletonList(new EntityKey(ENTITY_FIELD, "name"));
+        List<EntityKey> latestValues = Collections.singletonList(new EntityKey(EntityKeyType.TIME_SERIES, "test"));
+
+        EntityDataSortOrder ascSortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.ASC);
+        EntityDataQuery ascQuery = new EntityDataQuery(filter,
+                new EntityDataPageLink(10, 0, null, ascSortOrder), entityFields, latestValues, null);
+        List<String> ascTelemetry = loadAllData(ascQuery, devices.size()).stream()
+                .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                .toList();
+        assertThat(ascTelemetry).containsExactlyElementsOf(List.of("", "", "false", "false", "true"));
+
+        EntityDataSortOrder descSortOrder = new EntityDataSortOrder(
+                new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.DESC);
+        EntityDataQuery descQuery = new EntityDataQuery(filter,
+                new EntityDataPageLink(10, 0, null, descSortOrder), entityFields, latestValues, null);
+        List<String> descTelemetry = loadAllData(descQuery, devices.size()).stream()
+                .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                .toList();
+        assertThat(descTelemetry).containsExactlyElementsOf(List.of("true", "false", "false", "", ""));
+    }
+
     @Override
     protected PageData<EntityData> findByQueryAndCheck(CustomerId customerId, EntityDataQuery query, long expectedResultSize) {
         return await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> findByQuery(customerId, query),

application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java

@@ -26,6 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.Customer;
@@ -47,6 +48,7 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.AttributesSaveResult;
 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
@@ -79,7 +81,6 @@ import org.thingsboard.server.common.data.query.RelationsQueryFilter;
 import org.thingsboard.server.common.data.query.SingleEntityFilter;
 import org.thingsboard.server.common.data.query.StringFilterPredicate;
 import org.thingsboard.server.common.data.query.StringFilterPredicate.StringOperation;
-import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationEntityTypeFilter;
@@ -100,6 +101,7 @@ import org.thingsboard.server.dao.entityview.EntityViewDao;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.dao.sql.query.DefaultEntityQueryRepository;
 import org.thingsboard.server.dao.sql.relation.RelationRepository;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
@@ -124,7 +126,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.thingsboard.server.common.data.AttributeScope.SERVER_SCOPE;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ATTRIBUTE;
 import static org.thingsboard.server.common.data.query.EntityKeyType.ENTITY_FIELD;
-import static org.thingsboard.server.common.data.query.EntityKeyType.SERVER_ATTRIBUTE;
 
 @Slf4j
 @DaoSqlTest
@@ -154,6 +155,8 @@ public class EntityServiceTest extends AbstractControllerTest {
     @Autowired
     RelationRepository relationRepository;
     @Autowired
+    DefaultEntityQueryRepository entityQueryRepository;
+    @Autowired
     RelationService relationService;
     @Autowired
     TimeseriesService timeseriesService;
@@ -1750,6 +1753,117 @@ public class EntityServiceTest extends AbstractControllerTest {
         deviceService.deleteDevicesByTenantId(tenantId);
     }
 
+    @Test
+    public void testSortByNumericTelemetryKeyWithDifferentNullsOrderStrategy() throws ExecutionException, InterruptedException {
+        try {
+            List<Device> devices = new ArrayList<>();
+            for (int i = 0; i < 5; i++) {
+                Device device = new Device();
+                device.setTenantId(tenantId);
+                device.setName("Device" + i);
+                device.setType("default");
+                devices.add(deviceService.saveDevice(device));
+                Thread.sleep(1);
+            }
+
+            List<Long> values = List.of(1L, 0L, 0L);
+            List<ListenableFuture<TimeseriesSaveResult>> timeseriesFutures = new ArrayList<>();
+            for (int i = 0; i < values.size(); i++) {
+                timeseriesFutures.add(saveTimeseries(devices.get(i).getId(), "test", values.get(i)));
+            }
+            Futures.allAsList(timeseriesFutures).get();
+
+            assertNullsOrdering("default",
+                    List.of("0", "0", "1", "", ""),
+                    List.of("", "", "1", "0", "0"),
+                    devices.size());
+
+            assertNullsOrdering("nulls_first",
+                    List.of("", "", "0", "0", "1"),
+                    List.of("", "", "1", "0", "0"),
+                    devices.size());
+
+            assertNullsOrdering("nulls_last",
+                    List.of("0", "0", "1", "", ""),
+                    List.of("1", "0", "0", "", ""),
+                    devices.size());
+        } finally {
+            deviceService.deleteDevicesByTenantId(tenantId);
+        }
+    }
+
+    @Test
+    public void testSortByBooleanKeyWithDifferentNullsOrderStrategy() throws ExecutionException, InterruptedException {
+        try {
+            List<Device> devices = new ArrayList<>();
+            for (int i = 0; i < 5; i++) {
+                Device device = new Device();
+                device.setTenantId(tenantId);
+                device.setName("Device" + i);
+                device.setType("default");
+                devices.add(deviceService.saveDevice(device));
+                Thread.sleep(1);
+            }
+
+            List<Boolean> values = List.of(true, false, false);
+            List<ListenableFuture<TimeseriesSaveResult>> timeseriesFutures = new ArrayList<>();
+            for (int i = 0; i < values.size(); i++) {
+                timeseriesFutures.add(saveTimeseries(devices.get(i).getId(), "test", values.get(i)));
+            }
+            Futures.allAsList(timeseriesFutures).get();
+
+            assertNullsOrdering("default",
+                    List.of("false", "false", "true", "", ""),
+                    List.of("", "", "true", "false", "false"),
+                    devices.size());
+
+            assertNullsOrdering("nulls_first",
+                    List.of("", "", "false", "false", "true"),
+                    List.of("", "", "true", "false", "false"),
+                    devices.size());
+
+            assertNullsOrdering("nulls_last",
+                    List.of("false", "false", "true", "", ""),
+                    List.of("true", "false", "false", "", ""),
+                    devices.size());
+        } finally {
+            deviceService.deleteDevicesByTenantId(tenantId);
+        }
+    }
+
+    private void assertNullsOrdering(String strategy, List<String> expectedAsc, List<String> expectedDesc, int deviceSize) {
+        String originalStrategy = entityQueryRepository.getNullsOrderStrategy();
+        ReflectionTestUtils.setField(entityQueryRepository, "nullsOrderStrategy", strategy);
+        try {
+            DeviceTypeFilter filter = new DeviceTypeFilter();
+            filter.setDeviceTypes(List.of("default"));
+            filter.setDeviceNameFilter("");
+
+            List<EntityKey> entityFields = Collections.singletonList(new EntityKey(ENTITY_FIELD, "name"));
+            List<EntityKey> latestValues = Collections.singletonList(new EntityKey(EntityKeyType.TIME_SERIES, "test"));
+
+            EntityDataSortOrder ascSortOrder = new EntityDataSortOrder(
+                    new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.ASC);
+            EntityDataQuery ascQuery = new EntityDataQuery(filter,
+                    new EntityDataPageLink(10, 0, null, ascSortOrder), entityFields, latestValues, null);
+            List<String> ascTelemetry = loadAllData(ascQuery, deviceSize).stream()
+                    .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                    .toList();
+            assertThat(ascTelemetry).as("ASC with strategy '%s'", strategy).containsExactlyElementsOf(expectedAsc);
+
+            EntityDataSortOrder descSortOrder = new EntityDataSortOrder(
+                    new EntityKey(EntityKeyType.TIME_SERIES, "test"), EntityDataSortOrder.Direction.DESC);
+            EntityDataQuery descQuery = new EntityDataQuery(filter,
+                    new EntityDataPageLink(10, 0, null, descSortOrder), entityFields, latestValues, null);
+            List<String> descTelemetry = loadAllData(descQuery, deviceSize).stream()
+                    .map(ed -> ed.getLatest().get(EntityKeyType.TIME_SERIES).get("test").getValue())
+                    .toList();
+            assertThat(descTelemetry).as("DESC with strategy '%s'", strategy).containsExactlyElementsOf(expectedDesc);
+        } finally {
+            ReflectionTestUtils.setField(entityQueryRepository, "nullsOrderStrategy", originalStrategy);
+        }
+    }
+
     @Test
     public void testFindTenantTelemetry() throws ExecutionException, InterruptedException, TimeoutException {
         // save timeseries by sys admin
@@ -2321,12 +2435,18 @@ public class EntityServiceTest extends AbstractControllerTest {
         return timeseriesService.save(tenantId, entityId, timeseries);
     }
 
-    private ListenableFuture<TimeseriesSaveResult> saveTimeseries(EntityId entityId, String key, Long value) {
+    protected ListenableFuture<TimeseriesSaveResult> saveTimeseries(EntityId entityId, String key, Long value) {
         KvEntry telemetryValue = new LongDataEntry(key, value);
         BasicTsKvEntry timeseries = new BasicTsKvEntry(42L, telemetryValue);
         return timeseriesService.save(tenantId, entityId, timeseries);
     }
 
+    protected ListenableFuture<TimeseriesSaveResult> saveTimeseries(EntityId entityId, String key, Boolean value) {
+        KvEntry telemetryValue = new BooleanDataEntry(key, value);
+        BasicTsKvEntry timeseries = new BasicTsKvEntry(42L, telemetryValue);
+        return timeseriesService.save(tenantId, entityId, timeseries);
+    }
+
     protected void createMultiRootHierarchy(List<Asset> buildings, List<Asset> apartments,
                                             Map<String, Map<UUID, String>> entityNameByTypeMap,
                                             Map<UUID, UUID> childParentRelationMap) throws InterruptedException {

application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java

@@ -0,0 +1,159 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.profile;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.asset.AssetProfile;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.AssetProfileId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
+import org.thingsboard.server.dao.asset.AssetProfileService;
+import org.thingsboard.server.dao.asset.AssetService;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class DefaultTbAssetProfileCacheTest {
+
+    @Mock
+    private AssetProfileService assetProfileService;
+    @Mock
+    private AssetService assetService;
+
+    private DefaultTbAssetProfileCache cache;
+
+    @BeforeEach
+    public void setUp() {
+        cache = new DefaultTbAssetProfileCache(assetProfileService, assetService);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_evictsAssetProfilesForThatTenant() {
+        TenantId tenant1 = new TenantId(UUID.randomUUID());
+        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID());
+        AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID());
+
+        loadProfileIntoCache(tenant1, profileId1);
+        loadProfileIntoCache(tenant2, profileId2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant1, tenant1, ComponentLifecycleEvent.DELETED));
+
+        // After deletion tenant1 profile should be reloaded from service on next get
+        when(assetProfileService.findAssetProfileById(any(), any())).thenReturn(null);
+        assertThat(cache.get(tenant1, profileId1)).isNull();
+        verify(assetProfileService, times(1)).findAssetProfileById(tenant2, profileId2);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_evictsAssetMappingsForThatTenant() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        AssetId assetId = new AssetId(UUID.randomUUID());
+
+        loadProfileIntoCache(tenant, profileId);
+        loadAssetMappingIntoCache(tenant, assetId, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.DELETED));
+
+        // After tenant deletion, asset-to-profile mapping should be gone; get() should try to reload
+        when(assetService.findAssetById(any(), any())).thenReturn(null);
+        assertThat(cache.get(tenant, assetId)).isNull();
+        verify(assetService, times(2)).findAssetById(tenant, assetId); // once on load, once after eviction
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        EntityId listenerId = new AssetId(UUID.randomUUID());
+        AtomicInteger callCount = new AtomicInteger();
+
+        cache.addListener(tenant, listenerId, profile -> callCount.incrementAndGet(), null);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.DELETED));
+
+        // Evicting a profile after tenant deletion should not trigger the removed listener
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        loadProfileIntoCache(tenant, profileId);
+        cache.evict(tenant, profileId);
+
+        assertThat(callCount.get()).isZero();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId = new AssetProfileId(UUID.randomUUID());
+        loadProfileIntoCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.UPDATED));
+
+        // Profile should still be served from cache without hitting the service again
+        cache.get(tenant, profileId);
+        verify(assetProfileService, times(1)).findAssetProfileById(tenant, profileId);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() {
+        TenantId tenant1 = new TenantId(UUID.randomUUID());
+        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID());
+        AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID());
+
+        AssetProfile profile1 = loadProfileIntoCache(tenant1, profileId1);
+        loadProfileIntoCache(tenant2, profileId2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant2, tenant2, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.get(tenant1, profileId1)).isEqualTo(profile1);
+        verify(assetProfileService, times(1)).findAssetProfileById(tenant1, profileId1);
+    }
+
+    // --- Helpers ---
+
+    private AssetProfile loadProfileIntoCache(TenantId tenantId, AssetProfileId profileId) {
+        AssetProfile profile = new AssetProfile();
+        profile.setId(profileId);
+        profile.setTenantId(tenantId);
+        when(assetProfileService.findAssetProfileById(tenantId, profileId)).thenReturn(profile);
+        cache.get(tenantId, profileId);
+        return profile;
+    }
+
+    private void loadAssetMappingIntoCache(TenantId tenantId, AssetId assetId, AssetProfileId profileId) {
+        Asset asset = new Asset();
+        asset.setId(assetId);
+        asset.setAssetProfileId(profileId);
+        when(assetService.findAssetById(tenantId, assetId)).thenReturn(asset);
+        cache.get(tenantId, assetId);
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java

@@ -0,0 +1,160 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.profile;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
+import org.thingsboard.server.dao.device.DeviceProfileService;
+import org.thingsboard.server.dao.device.DeviceService;
+
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class DefaultTbDeviceProfileCacheTest {
+
+    @Mock
+    private DeviceProfileService deviceProfileService;
+    @Mock
+    private DeviceService deviceService;
+
+    private DefaultTbDeviceProfileCache cache;
+
+    @BeforeEach
+    public void setUp() {
+        cache = new DefaultTbDeviceProfileCache(deviceProfileService, deviceService);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceProfilesForThatTenant() {
+        TenantId tenant1 = new TenantId(UUID.randomUUID());
+        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID());
+        DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID());
+
+        loadProfileIntoCache(tenant1, profileId1);
+        loadProfileIntoCache(tenant2, profileId2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant1, tenant1, ComponentLifecycleEvent.DELETED));
+
+        // After deletion tenant1 profile should be reloaded from service on next get
+        when(deviceProfileService.findDeviceProfileById(any(), any())).thenReturn(null);
+        assertThat(cache.get(tenant1, profileId1)).isNull();
+        // tenant2 profile should still be served from cache (no extra service call)
+        verify(deviceProfileService, times(1)).findDeviceProfileById(tenant2, profileId2);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceMappingsForThatTenant() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        DeviceId deviceId = new DeviceId(UUID.randomUUID());
+
+        loadProfileIntoCache(tenant, profileId);
+        loadDeviceMappingIntoCache(tenant, deviceId, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.DELETED));
+
+        // After tenant deletion, device-to-profile mapping should be gone; get() should try to reload
+        when(deviceService.findDeviceById(any(), any())).thenReturn(null);
+        assertThat(cache.get(tenant, deviceId)).isNull();
+        verify(deviceService, times(2)).findDeviceById(tenant, deviceId); // once on load, once after eviction
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        EntityId listenerId = new DeviceId(UUID.randomUUID());
+        AtomicInteger callCount = new AtomicInteger();
+
+        cache.addListener(tenant, listenerId, profile -> callCount.incrementAndGet(), null);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.DELETED));
+
+        // Evicting a profile after tenant deletion should not trigger the removed listener
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        loadProfileIntoCache(tenant, profileId);
+        cache.evict(tenant, profileId);
+
+        assertThat(callCount.get()).isZero();
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() {
+        TenantId tenant = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID());
+        loadProfileIntoCache(tenant, profileId);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant, tenant, ComponentLifecycleEvent.UPDATED));
+
+        // Profile should still be served from cache without hitting the service again
+        cache.get(tenant, profileId);
+        verify(deviceProfileService, times(1)).findDeviceProfileById(tenant, profileId);
+    }
+
+    @Test
+    public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() {
+        TenantId tenant1 = new TenantId(UUID.randomUUID());
+        TenantId tenant2 = new TenantId(UUID.randomUUID());
+        DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID());
+        DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID());
+
+        DeviceProfile profile1 = loadProfileIntoCache(tenant1, profileId1);
+        loadProfileIntoCache(tenant2, profileId2);
+
+        cache.onComponentLifecycleEvent(new ComponentLifecycleMsg(tenant2, tenant2, ComponentLifecycleEvent.DELETED));
+
+        assertThat(cache.get(tenant1, profileId1)).isEqualTo(profile1);
+        verify(deviceProfileService, times(1)).findDeviceProfileById(tenant1, profileId1);
+    }
+
+    // --- Helpers ---
+
+    private DeviceProfile loadProfileIntoCache(TenantId tenantId, DeviceProfileId profileId) {
+        DeviceProfile profile = new DeviceProfile();
+        profile.setId(profileId);
+        profile.setTenantId(tenantId);
+        when(deviceProfileService.findDeviceProfileById(tenantId, profileId)).thenReturn(profile);
+        cache.get(tenantId, profileId);
+        return profile;
+    }
+
+    private void loadDeviceMappingIntoCache(TenantId tenantId, DeviceId deviceId, DeviceProfileId profileId) {
+        Device device = new Device();
+        device.setId(deviceId);
+        device.setDeviceProfileId(profileId);
+        when(deviceService.findDeviceById(tenantId, deviceId)).thenReturn(device);
+        cache.get(tenantId, deviceId);
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/resource/DefaultResourceDataCacheTest.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.resource;
 
+import org.awaitility.Awaitility;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
@@ -29,6 +30,8 @@ import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.timeout;
@@ -61,6 +64,8 @@ public class DefaultResourceDataCacheTest extends AbstractControllerTest {
         TbResourceInfo savedResource = tbResourceService.save(resource);
         verify(resourceDataCache, timeout(2000).times(1)).evictResourceData(tenantId, savedResource.getId());
 
+        Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
+                assertThat(resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get()).isNotNull());
         TbResourceDataInfo cachedData = resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get();
         assertThat(cachedData.getData()).isEqualTo(data);
         assertThat(JacksonUtil.treeToValue(cachedData.getDescriptor(), GeneralFileDescriptor.class)).isEqualTo(descriptor);
@@ -76,8 +81,8 @@ public class DefaultResourceDataCacheTest extends AbstractControllerTest {
         TbResource resourceById = resourceService.findResourceById(tenantId, savedResource.getId());
         tbResourceService.delete(resourceById, true, null);
         verify(resourceDataCache, timeout(2000).times(2)).evictResourceData(tenantId, savedResource.getId());
-        TbResourceDataInfo cachedDataAfterDeletion = resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get();
+        Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() ->
-        assertThat(cachedDataAfterDeletion).isEqualTo(null);
+                assertThat(resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get()).isNull());
     }
 
 }

application/src/test/java/org/thingsboard/server/service/script/TbelInvokeServiceTest.java

@@ -217,6 +217,90 @@ class TbelInvokeServiceTest extends AbstractTbelInvokeTest {
         assertThat(compiledScriptsCache.getIfPresent(scriptIdToHash.get(scriptRemovedFromCache))).isNotNull();
     }
 
+    @Test
+    void givenForbiddenSocketHandler_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("new java.util.logging.SocketHandler(\"127.0.0.1\", 9999)");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getCause().getMessage()).contains("could not resolve class: java.util.logging.SocketHandler");
+                });
+    }
+
+    @Test
+    void givenForbiddenZipFile_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("new java.util.zip.ZipFile(\"/tmp/test.zip\")");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getCause().getMessage()).contains("could not resolve class: java.util.zip.ZipFile");
+                });
+    }
+
+    @Test
+    void givenForbiddenFileHandler_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("new java.util.logging.FileHandler(\"/tmp/test.log\")");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getCause().getMessage()).contains("could not resolve class: java.util.logging.FileHandler");
+                });
+    }
+
+    @Test
+    void givenForbiddenJarFile_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("new java.util.jar.JarFile(\"/tmp/test.jar\")");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getCause().getMessage()).contains("could not resolve class: java.util.jar.JarFile");
+                });
+    }
+
+    @Test
+    void givenForbiddenPreferences_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("java.util.prefs.Preferences.userRoot()");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getMessage()).contains("unresolvable property or identifier: java");
+                });
+    }
+
+    @Test
+    void givenForbiddenLocaleServiceProvider_whenInvoking_thenThrowsRuntimeError() throws ExecutionException, InterruptedException {
+        UUID scriptId = evalScript("new java.util.spi.LocaleServiceProvider()");
+        assertThatThrownBy(() -> invokeScript(scriptId, "{\"temperature\":25}"))
+                .isInstanceOf(ExecutionException.class)
+                .cause()
+                .isInstanceOf(TbScriptException.class)
+                .asInstanceOf(type(TbScriptException.class))
+                .satisfies(ex -> {
+                    assertThat(ex.getErrorCode()).isEqualTo(TbScriptException.ErrorCode.RUNTIME);
+                    assertThat(ex.getCause().getMessage()).contains("could not resolve class: java.util.spi.LocaleServiceProvider");
+                });
+    }
+
     private void assertThatScriptIsBlocked(UUID scriptId) {
         assertThatThrownBy(() -> {
             invokeScriptResultString(scriptId, "{}");

application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java

@@ -0,0 +1,277 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.ws;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.service.security.AccessValidator;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.UserPrincipal;
+import org.thingsboard.server.service.subscription.TbEntityDataSubscriptionService;
+import org.thingsboard.server.service.subscription.TbLocalSubscriptionService;
+import org.thingsboard.server.service.ws.notification.NotificationCommandsHandler;
+import org.thingsboard.server.service.ws.telemetry.cmd.v1.AttributesSubscriptionCmd;
+
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.willReturn;
+import static org.mockito.Mockito.mock;
+
+class DefaultWebSocketServiceTest {
+
+    DefaultWebSocketService service;
+    TbTenantProfileCache tenantProfileCache;
+    WebSocketMsgEndpoint msgEndpoint;
+
+    @BeforeEach
+    void setUp() {
+        tenantProfileCache = mock(TbTenantProfileCache.class);
+        msgEndpoint = mock(WebSocketMsgEndpoint.class);
+
+        service = new DefaultWebSocketService(
+                mock(TbLocalSubscriptionService.class),
+                mock(TbEntityDataSubscriptionService.class),
+                mock(NotificationCommandsHandler.class),
+                msgEndpoint,
+                mock(AccessValidator.class),
+                mock(AttributesService.class),
+                mock(TimeseriesService.class),
+                mock(TbServiceInfoProvider.class),
+                tenantProfileCache
+        );
+    }
+
+    // Regression test: publicUserSubscriptionsMap must be keyed by TenantId, not UserId(NULL_UUID).
+    // With the old UserId(NULL_UUID) key, all tenants shared one global subscription counter.
+    @Test
+    void processSubscription_publicUserSubscriptionsMap_isPerTenantNotGlobal() throws Exception {
+        int maxPublicSubscriptions = 2;
+
+        TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile1 = new TenantProfile();
+        profile1.createDefaultTenantProfileData();
+        profile1.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile1).given(tenantProfileCache).get(tenant1);
+
+        TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile2 = new TenantProfile();
+        profile2.createDefaultTenantProfileData();
+        profile2.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile2).given(tenantProfileCache).get(tenant2);
+
+        // tenant1 fills up its quota
+        for (int i = 0; i < maxPublicSubscriptions; i++) {
+            assertThat(service.processSubscription(mockPublicSessionRef(tenant1, "t1-session-" + i), subscriptionCmd(i)))
+                    .as("tenant1 subscription %d should be accepted", i + 1)
+                    .isTrue();
+        }
+
+        // tenant2 must have its own independent quota — this was the bug:
+        // with UserId(NULL_UUID) as key all tenants shared one counter, so tenant2 would be blocked here
+        for (int i = 0; i < maxPublicSubscriptions; i++) {
+            assertThat(service.processSubscription(mockPublicSessionRef(tenant2, "t2-session-" + i), subscriptionCmd(i)))
+                    .as("tenant2 subscription %d should not be affected by tenant1's subscriptions", i + 1)
+                    .isTrue();
+        }
+
+        // tenant1's (maxPublicSubscriptions + 1)-th subscription must be rejected
+        assertThat(service.processSubscription(mockPublicSessionRef(tenant1, "t1-session-over"), subscriptionCmd(99)))
+                .as("tenant1 should be rejected after exceeding its limit")
+                .isFalse();
+
+        // Verify that publicUserSubscriptionsMap has separate entries per tenant
+        @SuppressWarnings("unchecked")
+        ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap =
+                (ConcurrentMap<TenantId, Set<String>>) ReflectionTestUtils.getField(service, "publicUserSubscriptionsMap");
+
+        assertThat(publicUserSubscriptionsMap).as("map should contain tenant1").containsKey(tenant1);
+        assertThat(publicUserSubscriptionsMap).as("map should contain tenant2").containsKey(tenant2);
+        assertThat(publicUserSubscriptionsMap).as("map must not have a single NULL_UUID entry for all tenants")
+                .doesNotContainKey(new TenantId(EntityId.NULL_UUID));
+
+        assertThat(publicUserSubscriptionsMap.get(tenant1))
+                .as("tenant1 should have exactly %d subscriptions", maxPublicSubscriptions)
+                .hasSize(maxPublicSubscriptions);
+        assertThat(publicUserSubscriptionsMap.get(tenant2))
+                .as("tenant2 should have exactly %d subscriptions", maxPublicSubscriptions)
+                .hasSize(maxPublicSubscriptions);
+    }
+
+    @Test
+    void processSubscription_publicUserSubscriptionsMap_subscriptionIdFormat() {
+        int maxPublicSubscriptions = 5;
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile = new TenantProfile();
+        profile.createDefaultTenantProfileData();
+        profile.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile).given(tenantProfileCache).get(tenantId);
+
+        String sessionId = "my-session-id";
+        int cmdId = 42;
+        WebSocketSessionRef sessionRef = mockPublicSessionRef(tenantId, sessionId);
+        service.processSubscription(sessionRef, subscriptionCmd(cmdId));
+
+        @SuppressWarnings("unchecked")
+        ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap =
+                (ConcurrentMap<TenantId, Set<String>>) ReflectionTestUtils.getField(service, "publicUserSubscriptionsMap");
+
+        Set<String> subs = publicUserSubscriptionsMap.get(tenantId);
+        assertThat(subs).hasSize(1);
+        assertThat(subs.iterator().next()).isEqualTo("[" + sessionId + "]:[" + cmdId + "]");
+    }
+
+    @Test
+    void processSubscription_unsubscribe_removesEntryFromPublicUserSubscriptionsMap() {
+        int maxPublicSubscriptions = 5;
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile = new TenantProfile();
+        profile.createDefaultTenantProfileData();
+        profile.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile).given(tenantProfileCache).get(tenantId);
+
+        String sessionId = "session-1";
+        int cmdId = 1;
+        WebSocketSessionRef sessionRef = mockPublicSessionRef(tenantId, sessionId);
+
+        service.processSubscription(sessionRef, subscriptionCmd(cmdId));
+
+        @SuppressWarnings("unchecked")
+        ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap =
+                (ConcurrentMap<TenantId, Set<String>>) ReflectionTestUtils.getField(service, "publicUserSubscriptionsMap");
+        assertThat(publicUserSubscriptionsMap.get(tenantId)).hasSize(1);
+
+        AttributesSubscriptionCmd unsubCmd = subscriptionCmd(cmdId);
+        unsubCmd.setUnsubscribe(true);
+        service.processSubscription(sessionRef, unsubCmd);
+
+        assertThat(publicUserSubscriptionsMap.get(tenantId)).isEmpty();
+    }
+
+    @Test
+    void processSubscription_unsubscribe_freesSlotForNewSubscription() {
+        int maxPublicSubscriptions = 1;
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile = new TenantProfile();
+        profile.createDefaultTenantProfileData();
+        profile.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile).given(tenantProfileCache).get(tenantId);
+
+        WebSocketSessionRef sessionRef = mockPublicSessionRef(tenantId, "session-1");
+        service.processSubscription(sessionRef, subscriptionCmd(1));
+
+        // slot is full — second subscription on same session should be rejected
+        assertThat(service.processSubscription(sessionRef, subscriptionCmd(2))).isFalse();
+
+        // unsubscribe cmd 1 to free the slot
+        AttributesSubscriptionCmd unsubCmd = subscriptionCmd(1);
+        unsubCmd.setUnsubscribe(true);
+        service.processSubscription(sessionRef, unsubCmd);
+
+        // now a new subscription should succeed
+        assertThat(service.processSubscription(sessionRef, subscriptionCmd(3)))
+                .as("new subscription should succeed after unsubscribe freed the slot")
+                .isTrue();
+    }
+
+    @Test
+    void processSessionClose_removesAllSessionSubscriptionsFromPublicUserSubscriptionsMap() {
+        int maxPublicSubscriptions = 10;
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile = new TenantProfile();
+        profile.createDefaultTenantProfileData();
+        profile.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile).given(tenantProfileCache).get(tenantId);
+
+        String sessionId = "closing-session";
+        WebSocketSessionRef sessionRef = mockPublicSessionRef(tenantId, sessionId);
+
+        service.processSubscription(sessionRef, subscriptionCmd(1));
+        service.processSubscription(sessionRef, subscriptionCmd(2));
+        service.processSubscription(sessionRef, subscriptionCmd(3));
+
+        @SuppressWarnings("unchecked")
+        ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap =
+                (ConcurrentMap<TenantId, Set<String>>) ReflectionTestUtils.getField(service, "publicUserSubscriptionsMap");
+        assertThat(publicUserSubscriptionsMap.get(tenantId)).hasSize(3);
+
+        service.processSessionClose(sessionRef);
+
+        assertThat(publicUserSubscriptionsMap.get(tenantId)).isEmpty();
+    }
+
+    @Test
+    void processSessionClose_onlyRemovesClosedSessionSubscriptions() {
+        int maxPublicSubscriptions = 10;
+        TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+        TenantProfile profile = new TenantProfile();
+        profile.createDefaultTenantProfileData();
+        profile.getDefaultProfileConfiguration().setMaxWsSubscriptionsPerPublicUser(maxPublicSubscriptions);
+        willReturn(profile).given(tenantProfileCache).get(tenantId);
+
+        WebSocketSessionRef session1 = mockPublicSessionRef(tenantId, "session-1");
+        WebSocketSessionRef session2 = mockPublicSessionRef(tenantId, "session-2");
+
+        service.processSubscription(session1, subscriptionCmd(1));
+        service.processSubscription(session1, subscriptionCmd(2));
+        service.processSubscription(session2, subscriptionCmd(1));
+
+        @SuppressWarnings("unchecked")
+        ConcurrentMap<TenantId, Set<String>> publicUserSubscriptionsMap =
+                (ConcurrentMap<TenantId, Set<String>>) ReflectionTestUtils.getField(service, "publicUserSubscriptionsMap");
+        assertThat(publicUserSubscriptionsMap.get(tenantId)).hasSize(3);
+
+        service.processSessionClose(session1);
+
+        Set<String> remaining = publicUserSubscriptionsMap.get(tenantId);
+        assertThat(remaining).hasSize(1);
+        assertThat(remaining).allMatch(subId -> subId.startsWith("[session-2]"));
+    }
+
+    private WebSocketSessionRef mockPublicSessionRef(TenantId tenantId, String sessionId) {
+        CustomerId customerId = new CustomerId(UUID.randomUUID());
+        SecurityUser securityUser = mock(SecurityUser.class);
+        willReturn(tenantId).given(securityUser).getTenantId();
+        willReturn(customerId).given(securityUser).getCustomerId();
+        willReturn(new UserId(EntityId.NULL_UUID)).given(securityUser).getId();
+        willReturn(true).given(securityUser).isCustomerUser();
+        willReturn(new UserPrincipal(UserPrincipal.Type.PUBLIC_ID, customerId.toString())).given(securityUser).getUserPrincipal();
+
+        WebSocketSessionRef ref = mock(WebSocketSessionRef.class);
+        willReturn(securityUser).given(ref).getSecurityCtx();
+        willReturn(sessionId).given(ref).getSessionId();
+        return ref;
+    }
+
+    private AttributesSubscriptionCmd subscriptionCmd(int cmdId) {
+        AttributesSubscriptionCmd cmd = new AttributesSubscriptionCmd();
+        cmd.setCmdId(cmdId);
+        return cmd;
+    }
+
+}

application/src/test/java/org/thingsboard/server/system/SystemPatchApplierTest.java

@@ -31,13 +31,21 @@ import org.springframework.test.util.ReflectionTestUtils;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.resource.ImageService;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
+import org.thingsboard.server.service.install.DatabaseSchemaSettingsService;
 import org.thingsboard.server.service.install.InstallScripts;
 import org.thingsboard.server.service.system.SystemPatchApplier;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -71,9 +79,18 @@ public class SystemPatchApplierTest {
     @Mock
     private InstallScripts installScripts;
 
+    @Mock
+    private DatabaseSchemaSettingsService schemaSettingsService;
+
     @Mock
     private WidgetTypeService widgetTypeService;
 
+    @Mock
+    private WidgetsBundleService widgetsBundleService;
+
+    @Mock
+    private ImageService imageService;
+
     @InjectMocks
     private SystemPatchApplier reconciler;
 
@@ -145,19 +162,72 @@ public class SystemPatchApplierTest {
     }
 
     @Test
-    void whenWidgetNotFound_thenThrowException() throws Exception {
+    void whenWidgetNotFound_thenCreateNewWidget() throws Exception {
         Path widgetTypesDir = tempDir.resolve("widget_types");
         Files.createDirectories(widgetTypesDir);
         when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
 
-        WidgetTypeDetails testWidget = createTestWidgetType("test_widget", "Test Widget");
+        WidgetTypeDetails fileWidget = createTestWidgetType("new_widget", "New Widget");
-        String json = JacksonUtil.toString(testWidget);
+        String json = JacksonUtil.toString(fileWidget);
         assertNotNull(json);
-        Files.writeString(widgetTypesDir.resolve("test_widget.json"), json);
+        Files.writeString(widgetTypesDir.resolve("new_widget.json"), json);
+
+        when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "new_widget")).thenReturn(null);
+
+        SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+
+        assertNotNull(stats);
+        assertEquals(1, stats.created());
+        assertEquals(0, stats.updated());
+        verify(widgetTypeService).saveWidgetType(argThat(w -> "new_widget".equals(w.getFqn())));
+    }
+
+    @Test
+    void whenFqnIsBlank_thenThrowException() throws Exception {
+        Path widgetTypesDir = tempDir.resolve("widget_types");
+        Files.createDirectories(widgetTypesDir);
+        when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
 
-        when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "test_widget")).thenReturn(null);
+        WidgetTypeDetails brokenWidget = createTestWidgetType("", "Broken Widget");
+        String json = JacksonUtil.toString(brokenWidget);
+        assertNotNull(json);
+        Files.writeString(widgetTypesDir.resolve("broken.json"), json);
 
         assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes"));
+        verify(widgetTypeService, never()).saveWidgetType(any());
+    }
+
+    @Test
+    void whenMixOfCreatedAndUpdated_thenStatsAreCorrect() throws Exception {
+        Path widgetTypesDir = tempDir.resolve("widget_types");
+        Files.createDirectories(widgetTypesDir);
+        when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
+
+        WidgetTypeDetails newFileWidget = createTestWidgetType("widget_new", "Widget New");
+        Files.writeString(widgetTypesDir.resolve("widget_new.json"), JacksonUtil.toString(newFileWidget));
+
+        WidgetTypeDetails changedFileWidget = createTestWidgetType("widget_changed", "Widget Changed New Name");
+        Files.writeString(widgetTypesDir.resolve("widget_changed.json"), JacksonUtil.toString(changedFileWidget));
+
+        WidgetTypeDetails sameFileWidget = createTestWidgetType("widget_same", "Widget Same");
+        Files.writeString(widgetTypesDir.resolve("widget_same.json"), JacksonUtil.toString(sameFileWidget));
+
+        WidgetTypeDetails existingChanged = createTestWidgetType("widget_changed", "Widget Changed Old Name");
+        existingChanged.setId(new WidgetTypeId(UUID.randomUUID()));
+
+        WidgetTypeDetails existingSame = createTestWidgetType("widget_same", "Widget Same");
+        existingSame.setId(new WidgetTypeId(UUID.randomUUID()));
+
+        when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "widget_new")).thenReturn(null);
+        when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "widget_changed")).thenReturn(existingChanged);
+        when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "widget_same")).thenReturn(existingSame);
+
+        SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+
+        assertNotNull(stats);
+        assertEquals(1, stats.created());
+        assertEquals(1, stats.updated());
+        verify(widgetTypeService, times(2)).saveWidgetType(any());
     }
 
     @Test
@@ -179,9 +249,11 @@ public class SystemPatchApplierTest {
         when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "test_widget"))
                 .thenReturn(existingWidget);
 
-        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+        SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
 
-        assertEquals(1, updated);
+        assertNotNull(stats);
+        assertEquals(0, stats.created());
+        assertEquals(1, stats.updated());
         verify(widgetTypeService).saveWidgetType(argThat(w ->
                 w.getDescriptor().get("version").asInt() == 2
         ));
@@ -204,9 +276,11 @@ public class SystemPatchApplierTest {
         when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "test_widget"))
                 .thenReturn(existingWidget);
 
-        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+        SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
 
-        assertEquals(1, updated);
+        assertNotNull(stats);
+        assertEquals(0, stats.created());
+        assertEquals(1, stats.updated());
         verify(widgetTypeService).saveWidgetType(argThat(w -> "New Name".equals(w.getName())));
     }
 
@@ -227,9 +301,11 @@ public class SystemPatchApplierTest {
         when(widgetTypeService.findWidgetTypeDetailsByTenantIdAndFqn(TenantId.SYS_TENANT_ID, "test_widget"))
                 .thenReturn(existingWidget);
 
-        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+        SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
 
-        assertEquals(0, updated);
+        assertNotNull(stats);
+        assertEquals(0, stats.created());
+        assertEquals(0, stats.updated());
         verify(widgetTypeService, never()).saveWidgetType(any());
     }
 
@@ -329,8 +405,8 @@ public class SystemPatchApplierTest {
                     // Simulate work while holding lock
                     Thread.sleep(100);
 
-                    Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+                    SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
-                    firstThreadSavedWidget.set(updated != null && updated > 0);
+                    firstThreadSavedWidget.set(stats != null && stats.updated() > 0);
 
                     ReflectionTestUtils.invokeMethod(reconciler, "releaseAdvisoryLock");
                 }
@@ -350,8 +426,8 @@ public class SystemPatchApplierTest {
                 secondThreadAcquiredLock.set(Boolean.TRUE.equals(acquired));
 
                 if (secondThreadAcquiredLock.get()) {
-                    Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
+                    SystemPatchApplier.WidgetTypeStats stats = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetTypes");
-                    secondThreadSavedWidget.set(updated != null && updated > 0);
+                    secondThreadSavedWidget.set(stats != null && stats.updated() > 0);
 
                     ReflectionTestUtils.invokeMethod(reconciler, "releaseAdvisoryLock");
                 }
@@ -373,6 +449,249 @@ public class SystemPatchApplierTest {
         verify(widgetTypeService, times(1)).saveWidgetType(any());
     }
 
+    // --- isVersionIncreased tests ---
+
+    @ParameterizedTest(name = "isVersionIncreased: {0} (package={1}, db={2}) -> {3}")
+    @MethodSource("provideVersionComparisonTestCases")
+    void testIsVersionIncreased(String testName, SystemPatchApplier.VersionInfo packageVersion,
+                                SystemPatchApplier.VersionInfo dbVersion, boolean expected) {
+        Boolean result = ReflectionTestUtils.invokeMethod(reconciler, "isVersionIncreased", packageVersion, dbVersion);
+        assertEquals(expected, result, testName);
+    }
+
+    private static Stream<Arguments> provideVersionComparisonTestCases() {
+        return Stream.of(
+                // Maintenance digit increases within same LTS family
+                Arguments.of("maintenance increased",
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), true),
+                Arguments.of("maintenance increased by more than one",
+                        new SystemPatchApplier.VersionInfo(4, 3, 3, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), true),
+
+                // Patch digit increases within same maintenance
+                Arguments.of("patch increased",
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 1),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), true),
+                Arguments.of("patch increased by more than one",
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 5),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 2), true),
+
+                // Both maintenance and patch increased
+                Arguments.of("maintenance and patch both increased",
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 1),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), true),
+
+                // Maintenance increased, patch value is lower (irrelevant — maintenance wins)
+                Arguments.of("maintenance increased, patch is lower",
+                        new SystemPatchApplier.VersionInfo(4, 3, 2, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 5), true),
+
+                // Same version — no increase
+                Arguments.of("same version",
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), false),
+                Arguments.of("same version with non-zero parts",
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 2),
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 2), false),
+
+                // Decreased versions — no increase
+                Arguments.of("maintenance decreased",
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 1, 0), false),
+                Arguments.of("patch decreased",
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 1), false),
+
+                // Different major — different family, skip
+                Arguments.of("different major",
+                        new SystemPatchApplier.VersionInfo(5, 3, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), false),
+                Arguments.of("major decreased",
+                        new SystemPatchApplier.VersionInfo(3, 3, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), false),
+
+                // Different minor — different LTS family, skip
+                Arguments.of("minor increased (different LTS family)",
+                        new SystemPatchApplier.VersionInfo(4, 4, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), false),
+                Arguments.of("minor decreased",
+                        new SystemPatchApplier.VersionInfo(4, 2, 0, 0),
+                        new SystemPatchApplier.VersionInfo(4, 3, 0, 0), false)
+        );
+    }
+
+    // --- isVersionChanged tests ---
+
+    @Test
+    void whenVersionIncreased_thenVersionChangedReturnsTrue() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.1.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        Boolean result = ReflectionTestUtils.invokeMethod(reconciler, "isVersionChanged");
+
+        assertTrue(result);
+    }
+
+    @Test
+    void whenVersionNotIncreased_thenVersionChangedReturnsFalse() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.0.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        Boolean result = ReflectionTestUtils.invokeMethod(reconciler, "isVersionChanged");
+
+        assertFalse(result);
+    }
+
+    @Test
+    void whenVersionUnparseable_thenVersionChangedReturnsFalse() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("invalid");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        Boolean result = ReflectionTestUtils.invokeMethod(reconciler, "isVersionChanged");
+
+        assertFalse(result);
+    }
+
+    @Test
+    void whenDbVersionUnparseable_thenVersionChangedReturnsFalse() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.1.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("bad");
+
+        Boolean result = ReflectionTestUtils.invokeMethod(reconciler, "isVersionChanged");
+
+        assertFalse(result);
+    }
+
+    // --- updateLtsSqlSchema tests ---
+
+    @Test
+    void whenLtsSqlFileExists_thenExecutesSql() throws Exception {
+        Path dataDir = tempDir.resolve("data");
+        Path ltsDir = dataDir.resolve("upgrade").resolve("lts");
+        Files.createDirectories(ltsDir);
+        Files.writeString(ltsDir.resolve("schema_update.sql"), "ALTER TABLE device ADD COLUMN IF NOT EXISTS test_col VARCHAR(255);");
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        ReflectionTestUtils.invokeMethod(reconciler, "updateLtsSqlSchema");
+
+        verify(jdbcTemplate).execute("ALTER TABLE device ADD COLUMN IF NOT EXISTS test_col VARCHAR(255);");
+    }
+
+    @Test
+    void whenLtsSqlFileDoesNotExist_thenSkips() {
+        Path dataDir = tempDir.resolve("data");
+        // Don't create the file
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        ReflectionTestUtils.invokeMethod(reconciler, "updateLtsSqlSchema");
+
+        verify(jdbcTemplate, never()).execute(anyString());
+    }
+
+    @Test
+    void whenLtsSqlFileHasMultipleStatements_thenExecutesAll() throws Exception {
+        Path dataDir = tempDir.resolve("data");
+        Path ltsDir = dataDir.resolve("upgrade").resolve("lts");
+        Files.createDirectories(ltsDir);
+        String sql = "DO $$ BEGIN\n" +
+                "  IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'test_type') THEN\n" +
+                "    CREATE TYPE test_type AS ENUM ('A', 'B');\n" +
+                "  END IF;\n" +
+                "END $$;\n" +
+                "ALTER TABLE device ADD COLUMN IF NOT EXISTS test_col VARCHAR(255);";
+        Files.writeString(ltsDir.resolve("schema_update.sql"), sql);
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        ReflectionTestUtils.invokeMethod(reconciler, "updateLtsSqlSchema");
+
+        verify(jdbcTemplate).execute(sql);
+    }
+
+    // --- applyPatchIfNeeded flow tests ---
+
+    @Test
+    void whenVersionIncreased_thenAppliesLtsSqlBeforeViewsAndWidgets() throws Exception {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.1.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+        when(jdbcTemplate.queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong())).thenReturn(true);
+        when(jdbcTemplate.queryForObject(contains("pg_advisory_unlock"), eq(Boolean.class), anyLong())).thenReturn(true);
+
+        Path dataDir = tempDir.resolve("data");
+        Path ltsDir = dataDir.resolve("upgrade").resolve("lts");
+        Files.createDirectories(ltsDir);
+        Files.writeString(ltsDir.resolve("schema_update.sql"), "SELECT 1;");
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        Path widgetTypesDir = tempDir.resolve("widget_types");
+        Files.createDirectories(widgetTypesDir);
+        when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(tempDir.resolve("widget_bundles_missing"));
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        // LTS SQL was executed
+        verify(jdbcTemplate).execute("SELECT 1;");
+        // Schema version was updated
+        verify(schemaSettingsService).updateSchemaVersion();
+    }
+
+    @Test
+    void whenVersionNotIncreased_thenSkipsEverything() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.0.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        // No lock acquired
+        verify(jdbcTemplate, never()).queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong());
+        // No schema update
+        verify(schemaSettingsService, never()).updateSchemaVersion();
+    }
+
+    @Test
+    void whenLockNotAcquired_thenSkipsPatchApplication() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.1.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+        when(jdbcTemplate.queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong())).thenReturn(false);
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        verify(schemaSettingsService, never()).updateSchemaVersion();
+        verify(jdbcTemplate, never()).execute(anyString());
+    }
+
+    @Test
+    void whenMaintenanceVersionIncreased_thenAppliesPatch() throws Exception {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.2.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.1.0");
+        when(jdbcTemplate.queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong())).thenReturn(true);
+        when(jdbcTemplate.queryForObject(contains("pg_advisory_unlock"), eq(Boolean.class), anyLong())).thenReturn(true);
+
+        Path dataDir = tempDir.resolve("data");
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        Path widgetTypesDir = tempDir.resolve("widget_types");
+        Files.createDirectories(widgetTypesDir);
+        when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(tempDir.resolve("widget_bundles_missing"));
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        verify(schemaSettingsService).updateSchemaVersion();
+    }
+
+    @Test
+    void whenDifferentLtsFamily_thenSkipsPatch() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.4.0.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        verify(jdbcTemplate, never()).queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong());
+        verify(schemaSettingsService, never()).updateSchemaVersion();
+    }
+
     private static Stream<Arguments> provideDescriptorComparisonTestCases() {
         return Stream.of(
                 Arguments.of("Both null", null, null, true),
@@ -407,4 +726,398 @@ public class SystemPatchApplierTest {
         return widget;
     }
 
+    // --- createMissingSystemImages tests ---
+
+    @Test
+    void whenImagesDirDoesNotExist_thenReturnsZeroAndDoesNotCallImageService() {
+        Path dataDir = tempDir.resolve("data");
+        // Intentionally do not create resources/images dir
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(0, created);
+        verify(imageService, never()).getAllImageKeysByTenantId(any());
+        verify(imageService, never()).createOrUpdateSystemImage(anyString(), any(byte[].class));
+    }
+
+    @Test
+    void whenImagesDirIsEmpty_thenReturnsZeroAndDoesNotCallImageService() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(0, created);
+        verify(imageService, never()).createOrUpdateSystemImage(anyString(), any(byte[].class));
+    }
+
+    @Test
+    void whenSystemImageDoesNotExistInDb_thenCreateIt() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        byte[] imageBytes = new byte[]{1, 2, 3, 4, 5};
+        Files.write(imagesDir.resolve("gateway.png"), imageBytes);
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(1, created);
+        verify(imageService).getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID);
+        verify(imageService).createOrUpdateSystemImage(eq("gateway.png"), eq(imageBytes));
+    }
+
+    @Test
+    void whenSystemImageExistsInDb_thenSkipIt() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        Files.write(imagesDir.resolve("gateway.png"), new byte[]{1, 2, 3});
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Set.of("gateway.png"));
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(0, created);
+        verify(imageService).getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID);
+        verify(imageService, never()).createOrUpdateSystemImage(anyString(), any(byte[].class));
+    }
+
+    @Test
+    void whenMixOfNewAndExistingImages_thenOnlyCreateMissingOnes() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        byte[] newImageBytes = new byte[]{9, 9, 9};
+        byte[] existingImageBytes = new byte[]{1, 1, 1};
+        Files.write(imagesDir.resolve("new.png"), newImageBytes);
+        Files.write(imagesDir.resolve("existing.svg"), existingImageBytes);
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Set.of("existing.svg"));
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(1, created);
+        verify(imageService, times(1)).getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID);
+        verify(imageService).createOrUpdateSystemImage(eq("new.png"), eq(newImageBytes));
+        verify(imageService, never()).createOrUpdateSystemImage(eq("existing.svg"), any(byte[].class));
+    }
+
+    @Test
+    void whenImagesDirContainsSubdirectory_thenSubdirectoryIsIgnored() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        Files.createDirectories(imagesDir.resolve("nested"));
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        byte[] imageBytes = new byte[]{5, 6, 7};
+        Files.write(imagesDir.resolve("logo.png"), imageBytes);
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(1, created);
+        verify(imageService).createOrUpdateSystemImage(eq("logo.png"), eq(imageBytes));
+        verify(imageService, never()).createOrUpdateSystemImage(eq("nested"), any(byte[].class));
+    }
+
+    @Test
+    void whenMultipleNewImages_thenCreatesAll() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        Files.write(imagesDir.resolve("a.png"), new byte[]{1});
+        Files.write(imagesDir.resolve("b.svg"), new byte[]{2});
+        Files.write(imagesDir.resolve("c.jpg"), new byte[]{3});
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+
+        Integer created = ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages");
+
+        assertEquals(3, created);
+        verify(imageService, times(1)).getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID);
+        verify(imageService).createOrUpdateSystemImage(eq("a.png"), any(byte[].class));
+        verify(imageService).createOrUpdateSystemImage(eq("b.svg"), any(byte[].class));
+        verify(imageService).createOrUpdateSystemImage(eq("c.jpg"), any(byte[].class));
+    }
+
+    @Test
+    void whenImageServiceThrows_thenWrapsAndPropagates() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        Files.write(imagesDir.resolve("broken.png"), new byte[]{1, 2});
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+        when(imageService.createOrUpdateSystemImage(eq("broken.png"), any(byte[].class)))
+                .thenThrow(new RuntimeException("DB error"));
+
+        RuntimeException thrown = assertThrows(RuntimeException.class,
+                () -> ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages"));
+        assertTrue(thrown.getMessage().contains("broken.png"));
+    }
+
+    @Test
+    void whenExistingKeysLookupFails_thenDoesNotCreateImage() throws Exception {
+        Path imagesDir = tempDir.resolve("data").resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        when(installScripts.getDataDir()).thenReturn(tempDir.resolve("data").toString());
+
+        Files.write(imagesDir.resolve("img.png"), new byte[]{1});
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID))
+                .thenThrow(new RuntimeException("lookup failed"));
+
+        assertThrows(RuntimeException.class,
+                () -> ReflectionTestUtils.invokeMethod(reconciler, "createMissingSystemImages"));
+        verify(imageService, never()).createOrUpdateSystemImage(anyString(), any(byte[].class));
+    }
+
+    // --- applyPatchIfNeeded integration with createMissingSystemImages ---
+
+    @Test
+    void whenApplyPatchIfNeededRuns_thenCreatesMissingImagesAfterWidgets() throws Exception {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.1.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+        when(jdbcTemplate.queryForObject(contains("pg_try_advisory_lock"), eq(Boolean.class), anyLong())).thenReturn(true);
+        when(jdbcTemplate.queryForObject(contains("pg_advisory_unlock"), eq(Boolean.class), anyLong())).thenReturn(true);
+
+        Path dataDir = tempDir.resolve("data");
+        Path imagesDir = dataDir.resolve(InstallScripts.RESOURCES_DIR).resolve("images");
+        Files.createDirectories(imagesDir);
+        byte[] imgBytes = new byte[]{7, 7, 7};
+        Files.write(imagesDir.resolve("new_icon.svg"), imgBytes);
+        when(installScripts.getDataDir()).thenReturn(dataDir.toString());
+
+        Path widgetTypesDir = tempDir.resolve("widget_types");
+        Files.createDirectories(widgetTypesDir);
+        when(installScripts.getWidgetTypesDir()).thenReturn(widgetTypesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(tempDir.resolve("widget_bundles_missing"));
+
+        when(imageService.getAllImageKeysByTenantId(TenantId.SYS_TENANT_ID)).thenReturn(Collections.emptySet());
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        verify(imageService).createOrUpdateSystemImage(eq("new_icon.svg"), eq(imgBytes));
+        verify(schemaSettingsService).updateSchemaVersion();
+    }
+
+    @Test
+    void whenVersionNotIncreased_thenImagesAreNotTouched() {
+        when(schemaSettingsService.getPackageSchemaVersion()).thenReturn("4.3.0.0");
+        when(schemaSettingsService.getDbSchemaVersion()).thenReturn("4.3.0.0");
+
+        ReflectionTestUtils.invokeMethod(reconciler, "applyPatchIfNeeded");
+
+        verify(imageService, never()).getAllImageKeysByTenantId(any());
+        verify(imageService, never()).createOrUpdateSystemImage(anyString(), any(byte[].class));
+    }
+
+    // --- updateWidgetBundles tests ---
+
+    @Test
+    void whenWidgetBundlesDirDoesNotExist_thenReturnsZero() {
+        when(installScripts.getWidgetBundlesDir()).thenReturn(tempDir.resolve("missing_bundles"));
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(0, updated);
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+    }
+
+    @Test
+    void whenBundleNotInDb_thenSkipWithoutCreation() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"Charts\",\"order\":10}," +
+                        "\"widgetTypeFqns\":[\"line_chart\"]}");
+
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(null);
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(0, updated);
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+    }
+
+    @Test
+    void whenBundleExistsAndHasNewFqn_thenMergeFqns() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"Charts\",\"description\":\"d\",\"order\":10}," +
+                        "\"widgetTypeFqns\":[\"line_chart\",\"bar_chart\",\"new_chart\"]}");
+
+        WidgetsBundle existingBundle = createTestBundle("charts", "Charts");
+        existingBundle.setDescription("d");
+        existingBundle.setOrder(10);
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(existingBundle);
+        when(widgetTypeService.findWidgetFqnsByWidgetsBundleId(TenantId.SYS_TENANT_ID, existingBundle.getId()))
+                .thenReturn(List.of("line_chart", "bar_chart"));
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(1, updated);
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+        verify(widgetTypeService).updateWidgetsBundleWidgetFqns(
+                eq(TenantId.SYS_TENANT_ID),
+                eq(existingBundle.getId()),
+                argThat(fqns -> fqns.size() == 3
+                        && fqns.get(0).equals("line_chart")
+                        && fqns.get(1).equals("bar_chart")
+                        && fqns.get(2).equals("new_chart"))
+        );
+    }
+
+    @Test
+    void whenBundleExistsAndAllFqnsAlreadyLinked_thenNoLinkUpdate() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"Charts\",\"description\":\"d\",\"order\":10}," +
+                        "\"widgetTypeFqns\":[\"line_chart\",\"bar_chart\"]}");
+
+        WidgetsBundle existingBundle = createTestBundle("charts", "Charts");
+        existingBundle.setDescription("d");
+        existingBundle.setOrder(10);
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(existingBundle);
+        when(widgetTypeService.findWidgetFqnsByWidgetsBundleId(TenantId.SYS_TENANT_ID, existingBundle.getId()))
+                .thenReturn(List.of("line_chart", "bar_chart"));
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(0, updated);
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+    }
+
+    @Test
+    void whenOnlyBundleImageFormatDiffers_thenNoUpdate() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        // File carries a base64 data URI; DB has the resolved system-image URL — same content, different format.
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"Charts\",\"description\":\"d\",\"order\":10," +
+                        "\"image\":\"data:image/png;base64,iVBORw0KGgo\"}," +
+                        "\"widgetTypeFqns\":[]}");
+
+        WidgetsBundle existingBundle = createTestBundle("charts", "Charts");
+        existingBundle.setDescription("d");
+        existingBundle.setOrder(10);
+        existingBundle.setImage("tb-image;/api/images/system/charts.png");
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(existingBundle);
+        when(widgetTypeService.findWidgetFqnsByWidgetsBundleId(TenantId.SYS_TENANT_ID, existingBundle.getId()))
+                .thenReturn(List.of());
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(0, updated);
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+    }
+
+    @Test
+    void whenBundleMetadataChanged_thenUpdateBundle() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"New Title\",\"description\":\"new\",\"order\":20}," +
+                        "\"widgetTypeFqns\":[\"line_chart\"]}");
+
+        WidgetsBundle existingBundle = createTestBundle("charts", "Old Title");
+        existingBundle.setDescription("old");
+        existingBundle.setOrder(10);
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(existingBundle);
+        when(widgetTypeService.findWidgetFqnsByWidgetsBundleId(TenantId.SYS_TENANT_ID, existingBundle.getId()))
+                .thenReturn(List.of("line_chart"));
+
+        Integer updated = ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles");
+
+        assertEquals(1, updated);
+        verify(widgetsBundleService).saveWidgetsBundle(argThat(b ->
+                "New Title".equals(b.getTitle()) && "new".equals(b.getDescription()) && b.getOrder() == 20
+        ));
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+    }
+
+    @Test
+    void whenBundleAliasIsBlank_thenThrowException() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("broken.json"),
+                "{\"widgetsBundle\":{\"alias\":\"\",\"title\":\"Broken\"}}");
+
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles"));
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+    }
+
+    @Test
+    void whenBundleJsonMissingWidgetsBundleField_thenThrowException() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("broken.json"), "{\"foo\":\"bar\"}");
+
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles"));
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+    }
+
+    @Test
+    void whenBundleHasInlineWidgetTypes_thenThrowException() throws Exception {
+        Path bundlesDir = tempDir.resolve("widget_bundles");
+        Files.createDirectories(bundlesDir);
+        when(installScripts.getWidgetBundlesDir()).thenReturn(bundlesDir);
+
+        Files.writeString(bundlesDir.resolve("charts.json"),
+                "{\"widgetsBundle\":{\"alias\":\"charts\",\"title\":\"Charts\",\"description\":\"d\",\"order\":10}," +
+                        "\"widgetTypes\":[" +
+                        "{\"fqn\":\"inline_chart\",\"name\":\"Inline\",\"descriptor\":{\"type\":\"latest\"}}" +
+                        "]}");
+
+        WidgetsBundle existingBundle = createTestBundle("charts", "Charts");
+        existingBundle.setDescription("d");
+        existingBundle.setOrder(10);
+        when(widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(TenantId.SYS_TENANT_ID, "charts")).thenReturn(existingBundle);
+
+        assertThrows(RuntimeException.class, () -> ReflectionTestUtils.invokeMethod(reconciler, "updateWidgetBundles"));
+        verify(widgetTypeService, never()).saveWidgetType(any());
+        verify(widgetTypeService, never()).updateWidgetsBundleWidgetFqns(any(), any(), any());
+        verify(widgetsBundleService, never()).saveWidgetsBundle(any());
+    }
+
+    private WidgetsBundle createTestBundle(String alias, String title) {
+        WidgetsBundle bundle = new WidgetsBundle();
+        bundle.setId(new WidgetsBundleId(UUID.randomUUID()));
+        bundle.setAlias(alias);
+        bundle.setTitle(title);
+        bundle.setTenantId(TenantId.SYS_TENANT_ID);
+        return bundle;
+    }
+
 }

common/actor/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cache/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cache/src/main/java/org/thingsboard/server/cache/TbJsonRedisSerializer.java

@@ -18,6 +18,8 @@ package org.thingsboard.server.cache;
 import org.springframework.data.redis.serializer.SerializationException;
 import org.thingsboard.common.util.JacksonUtil;
 
+import java.io.IOException;
+
 public class TbJsonRedisSerializer<K, V> implements TbRedisSerializer<K, V> {
 
     private final Class<V> clazz;
@@ -33,6 +35,13 @@ public class TbJsonRedisSerializer<K, V> implements TbRedisSerializer<K, V> {
 
     @Override
     public V deserialize(K key, byte[] bytes) throws SerializationException {
-        return JacksonUtil.fromBytes(bytes, clazz);
+        if (bytes == null) {
+            return null;
+        }
+        try {
+            return JacksonUtil.IGNORE_UNKNOWN_PROPERTIES_JSON_MAPPER.readValue(bytes, clazz);
+        } catch (IOException e) {
+            throw new SerializationException("Failed to deserialize cached value", e);
+        }
     }
 }

common/cluster-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/coap-server/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/coap-server/src/main/java/org/thingsboard/server/coapserver/DefaultCoapServerService.java

@@ -25,10 +25,12 @@ import org.eclipse.californium.core.server.resources.Resource;
 import org.eclipse.californium.elements.config.Configuration;
 import org.eclipse.californium.scandium.DTLSConnector;
 import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.common.util.ThingsBoardExecutors;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -42,22 +44,41 @@ import static org.eclipse.californium.core.config.CoapConfig.DEFAULT_BLOCKWISE_S
 @Slf4j
 @Component
 @TbCoapServerComponent
-public class DefaultCoapServerService implements CoapServerService {
+public class DefaultCoapServerService implements CoapServerService, SmartInitializingSingleton {
 
     @Autowired
     private CoapServerContext coapServerContext;
 
     private CoapServer server;
 
-    private TbCoapDtlsCertificateVerifier tbDtlsCertificateVerifier;
+    private volatile TbCoapDtlsCertificateVerifier tbDtlsCertificateVerifier;
 
     private ScheduledExecutorService dtlsSessionsExecutor;
 
+    private volatile DTLSConnector dtlsConnector;
+
+    private volatile CoapEndpoint dtlsCoapEndpoint;
+
     @PostConstruct
     public void init() throws UnknownHostException {
         createCoapServer();
     }
 
+    @Override
+    public void afterSingletonsInstantiated() {
+        if (isDtlsEnabled()) {
+            coapServerContext.getDtlsSettings().registerReloadCallback(() -> {
+                try {
+                    log.info("CoAP DTLS certificates reloaded. Recreating DTLS endpoint...");
+                    recreateDtlsEndpoint();
+                    log.info("CoAP DTLS endpoint recreated successfully with new certificates.");
+                } catch (Exception e) {
+                    log.error("Failed to recreate CoAP DTLS endpoint after certificate reload", e);
+                }
+            });
+        }
+    }
+
     @PreDestroy
     public void shutdown() {
         if (dtlsSessionsExecutor != null) {
@@ -83,16 +104,7 @@ public class DefaultCoapServerService implements CoapServerService {
     }
 
     private CoapServer createCoapServer() throws UnknownHostException {
-        Configuration networkConfig = new Configuration();
+        Configuration networkConfig = createNetworkConfiguration();
-        networkConfig.set(CoapConfig.BLOCKWISE_STRICT_BLOCK2_OPTION, true);
-        networkConfig.set(CoapConfig.BLOCKWISE_ENTITY_TOO_LARGE_AUTO_FAILOVER, true);
-        networkConfig.set(CoapConfig.BLOCKWISE_STATUS_LIFETIME, DEFAULT_BLOCKWISE_STATUS_LIFETIME_IN_SECONDS, TimeUnit.SECONDS);
-        networkConfig.set(CoapConfig.MAX_RESOURCE_BODY_SIZE, 256 * 1024 * 1024);
-        networkConfig.set(CoapConfig.RESPONSE_MATCHING, CoapConfig.MatcherMode.RELAXED);
-        networkConfig.set(CoapConfig.PREFERRED_BLOCK_SIZE, 1024);
-        networkConfig.set(CoapConfig.MAX_MESSAGE_SIZE, 1024);
-        networkConfig.set(CoapConfig.MAX_RETRANSMIT, 4);
-        networkConfig.set(CoapConfig.COAP_PORT, coapServerContext.getPort());
         server = new CoapServer(networkConfig);
 
         CoapEndpoint.Builder noSecCoapEndpointBuilder = new CoapEndpoint.Builder();
@@ -104,16 +116,7 @@ public class DefaultCoapServerService implements CoapServerService {
         CoapEndpoint noSecCoapEndpoint = noSecCoapEndpointBuilder.build();
         server.addEndpoint(noSecCoapEndpoint);
         if (isDtlsEnabled()) {
-            CoapEndpoint.Builder dtlsCoapEndpointBuilder = new CoapEndpoint.Builder();
+            createDtlsEndpoint(networkConfig);
-            TbCoapDtlsSettings dtlsSettings = coapServerContext.getDtlsSettings();
-            DtlsConnectorConfig dtlsConnectorConfig = dtlsSettings.dtlsConnectorConfig(networkConfig);
-            networkConfig.set(CoapConfig.COAP_SECURE_PORT, dtlsConnectorConfig.getAddress().getPort());
-            dtlsCoapEndpointBuilder.setConfiguration(networkConfig);
-            DTLSConnector connector = new DTLSConnector(dtlsConnectorConfig);
-            dtlsCoapEndpointBuilder.setConnector(connector);
-            CoapEndpoint dtlsCoapEndpoint = dtlsCoapEndpointBuilder.build();
-            server.addEndpoint(dtlsCoapEndpoint);
-            tbDtlsCertificateVerifier = (TbCoapDtlsCertificateVerifier) dtlsConnectorConfig.getAdvancedCertificateVerifier();
             dtlsSessionsExecutor = ThingsBoardExecutors.newSingleThreadScheduledExecutor(getClass().getSimpleName());
             dtlsSessionsExecutor.scheduleAtFixedRate(this::evictTimeoutSessions, new Random().nextInt((int) getDtlsSessionReportTimeout()), getDtlsSessionReportTimeout(), TimeUnit.MILLISECONDS);
         }
@@ -137,4 +140,106 @@ public class DefaultCoapServerService implements CoapServerService {
         return tbDtlsCertificateVerifier.getDtlsSessionReportTimeout();
     }
 
+    private Configuration createNetworkConfiguration() {
+        Configuration networkConfig = new Configuration();
+        networkConfig.set(CoapConfig.BLOCKWISE_STRICT_BLOCK2_OPTION, true);
+        networkConfig.set(CoapConfig.BLOCKWISE_ENTITY_TOO_LARGE_AUTO_FAILOVER, true);
+        networkConfig.set(CoapConfig.BLOCKWISE_STATUS_LIFETIME, DEFAULT_BLOCKWISE_STATUS_LIFETIME_IN_SECONDS, TimeUnit.SECONDS);
+        networkConfig.set(CoapConfig.MAX_RESOURCE_BODY_SIZE, 256 * 1024 * 1024);
+        networkConfig.set(CoapConfig.RESPONSE_MATCHING, CoapConfig.MatcherMode.RELAXED);
+        networkConfig.set(CoapConfig.PREFERRED_BLOCK_SIZE, 1024);
+        networkConfig.set(CoapConfig.MAX_MESSAGE_SIZE, 1024);
+        networkConfig.set(CoapConfig.MAX_RETRANSMIT, 4);
+        networkConfig.set(CoapConfig.COAP_PORT, coapServerContext.getPort());
+        return networkConfig;
+    }
+
+    // Note: this method has a side effect — it sets COAP_SECURE_PORT on the provided networkConfig.
+    private DtlsConnectorConfig buildDtlsConnectorConfig(Configuration networkConfig) throws UnknownHostException {
+        TbCoapDtlsSettings dtlsSettings = coapServerContext.getDtlsSettings();
+        DtlsConnectorConfig dtlsConnectorConfig = dtlsSettings.dtlsConnectorConfig(networkConfig);
+        networkConfig.set(CoapConfig.COAP_SECURE_PORT, dtlsConnectorConfig.getAddress().getPort());
+        return dtlsConnectorConfig;
+    }
+
+    private CoapEndpoint buildDtlsEndpoint(Configuration networkConfig, DTLSConnector connector) {
+        CoapEndpoint.Builder dtlsCoapEndpointBuilder = new CoapEndpoint.Builder();
+        dtlsCoapEndpointBuilder.setConfiguration(networkConfig);
+        dtlsCoapEndpointBuilder.setConnector(connector);
+        return dtlsCoapEndpointBuilder.build();
+    }
+
+    private void createDtlsEndpoint(Configuration networkConfig) throws UnknownHostException {
+        DtlsConnectorConfig dtlsConnectorConfig = buildDtlsConnectorConfig(networkConfig);
+        DTLSConnector newConnector = createDtlsConnector(dtlsConnectorConfig);
+        CoapEndpoint newEndpoint = buildDtlsEndpoint(networkConfig, newConnector);
+        server.addEndpoint(newEndpoint);
+
+        dtlsConnector = newConnector;
+        dtlsCoapEndpoint = newEndpoint;
+        tbDtlsCertificateVerifier = (TbCoapDtlsCertificateVerifier) dtlsConnectorConfig.getAdvancedCertificateVerifier();
+    }
+
+    private DTLSConnector createDtlsConnector(DtlsConnectorConfig config) {
+        return new DTLSConnector(config);
+    }
+
+    private synchronized void recreateDtlsEndpoint() throws IOException {
+        CoapEndpoint oldDtlsEndpoint = dtlsCoapEndpoint;
+        DTLSConnector oldDtlsConnector = dtlsConnector;
+
+        Configuration networkConfig = createNetworkConfiguration();
+
+        log.info("Creating new DTLS endpoint with updated certificates...");
+
+        DtlsConnectorConfig dtlsConnectorConfig = buildDtlsConnectorConfig(networkConfig);
+        DTLSConnector newConnector = createDtlsConnector(dtlsConnectorConfig);
+        CoapEndpoint newEndpoint = buildDtlsEndpoint(networkConfig, newConnector);
+
+        // We must stop the old endpoint before starting the new one so they don't compete for the same DTLS port.
+        // This creates a brief window where the port is unbound;
+        // if the new endpoint fails to start, we attempt to restore the old one (see rollback below).
+        if (oldDtlsEndpoint != null) {
+            log.info("Stopping old DTLS endpoint to release the port...");
+            server.getEndpoints().remove(oldDtlsEndpoint);
+            oldDtlsEndpoint.stop();
+        }
+
+        server.addEndpoint(newEndpoint);
+        try {
+            newEndpoint.start();
+        } catch (IOException e) {
+            log.error("Failed to start new DTLS endpoint, restoring old endpoint", e);
+            server.getEndpoints().remove(newEndpoint);
+            newEndpoint.destroy();
+            newConnector.destroy();
+            // Attempt to restore the old endpoint
+            if (oldDtlsEndpoint != null) {
+                try {
+                    server.addEndpoint(oldDtlsEndpoint);
+                    oldDtlsEndpoint.start();
+                    log.info("Old DTLS endpoint restored successfully.");
+                } catch (IOException restoreEx) {
+                    log.error("Failed to restore old DTLS endpoint", restoreEx);
+                }
+            }
+            throw e;
+        }
+        log.info("New DTLS endpoint started successfully.");
+
+        // Only swap instance fields after a successful start
+        dtlsConnector = newConnector;
+        dtlsCoapEndpoint = newEndpoint;
+        tbDtlsCertificateVerifier = (TbCoapDtlsCertificateVerifier) dtlsConnectorConfig.getAdvancedCertificateVerifier();
+
+        // Destroy old resources after a successful swap
+        if (oldDtlsEndpoint != null) {
+            if (oldDtlsConnector != null) {
+                oldDtlsConnector.destroy();
+            }
+            oldDtlsEndpoint.destroy();
+            log.info("Old DTLS endpoint destroyed.");
+        }
+    }
+
 }

common/coap-server/src/main/java/org/thingsboard/server/coapserver/TbCoapDtlsSettings.java

@@ -100,6 +100,10 @@ public class TbCoapDtlsSettings {
     @Autowired(required = false)
     private TbServiceInfoProvider serviceInfoProvider;
 
+    public void registerReloadCallback(Runnable callback) {
+        coapDtlsCredentialsConfig.registerReloadCallback(callback);
+    }
+
     public DtlsConnectorConfig dtlsConnectorConfig(Configuration configuration) throws UnknownHostException {
         DtlsConnectorConfig.Builder configBuilder = new DtlsConnectorConfig.Builder(configuration);
         configBuilder.setAddress(getInetSocketAddress());
@@ -154,5 +158,5 @@ public class TbCoapDtlsSettings {
         }
         return null;
     }
-}
 
+}

common/coap-server/src/test/java/org/thingsboard/server/coapserver/CoapDtlsCertificateReloadIntegrationTest.java

@@ -0,0 +1,349 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.coapserver;
+
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
+import org.bouncycastle.util.io.pem.PemObject;
+import org.bouncycastle.util.io.pem.PemWriter;
+import org.eclipse.californium.core.CoapClient;
+import org.eclipse.californium.core.CoapResource;
+import org.eclipse.californium.core.CoapResponse;
+import org.eclipse.californium.core.CoapServer;
+import org.eclipse.californium.core.coap.CoAP;
+import org.eclipse.californium.core.config.CoapConfig;
+import org.eclipse.californium.core.network.CoapEndpoint;
+import org.eclipse.californium.core.server.resources.CoapExchange;
+import org.eclipse.californium.elements.config.Configuration;
+import org.eclipse.californium.elements.util.SslContextUtil;
+import org.eclipse.californium.scandium.DTLSConnector;
+import org.eclipse.californium.scandium.config.DtlsConfig;
+import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.eclipse.californium.scandium.dtls.CertificateType;
+import org.eclipse.californium.scandium.dtls.x509.SingleCertificateProvider;
+import org.eclipse.californium.scandium.dtls.x509.StaticNewAdvancedCertificateVerifier;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.thingsboard.server.common.transport.config.ssl.KeystoreSslCredentials;
+import org.thingsboard.server.common.transport.config.ssl.PemSslCredentials;
+import org.thingsboard.server.common.transport.config.ssl.SslCredentials;
+import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
+import org.thingsboard.server.common.transport.config.ssl.SslCredentialsType;
+
+import java.io.OutputStreamWriter;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.cert.X509Certificate;
+import java.util.Collections;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_CLIENT_AUTHENTICATION_MODE;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DTLS_ROLE;
+import static org.eclipse.californium.scandium.config.DtlsConfig.DtlsRole.SERVER_ONLY;
+
+public class CoapDtlsCertificateReloadIntegrationTest {
+
+    private static final String TEST_RESOURCE_PATH = "test";
+    private static final String TEST_PAYLOAD = "hello-dtls";
+
+    @TempDir
+    Path tempDir;
+
+    private CoapServer coapServer;
+
+    @AfterEach
+    public void teardown() {
+        if (coapServer != null) {
+            coapServer.destroy();
+        }
+    }
+
+    @Test
+    public void givenDtlsServer_whenCertFileChangedAndReloadTriggered_thenNewEndpointServesNewCert() throws Exception {
+        KeyPair keyPairA = generateKeyPair();
+        X509Certificate certA = generateSelfSignedCert(keyPairA, "CN=ServerA");
+        KeyPair keyPairB = generateKeyPair();
+        X509Certificate certB = generateSelfSignedCert(keyPairB, "CN=ServerB");
+
+        Path certFile = tempDir.resolve("server-cert.pem");
+        Path keyFile = tempDir.resolve("server-key.pem");
+        writeCertPem(certFile, certA);
+        writeKeyPem(keyFile, keyPairA);
+
+        SslCredentialsConfig credentialsConfig = createSslCredentialsConfig(certFile, keyFile);
+
+        Configuration config = createServerConfig();
+        coapServer = new CoapServer(config);
+        coapServer.add(new TestResource());
+
+        int dtlsPort = findAvailablePort();
+        CoapEndpoint endpointA = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpointA);
+        coapServer.start();
+
+        CoapResponse responseA = doDtlsRequest(dtlsPort, certA);
+        assertThat(responseA).isNotNull();
+        assertThat(responseA.getCode()).isEqualTo(CoAP.ResponseCode.CONTENT);
+        assertThat(responseA.getResponseText()).isEqualTo(TEST_PAYLOAD);
+
+        writeCertPem(certFile, certB);
+        writeKeyPem(keyFile, keyPairB);
+        credentialsConfig.onCertificateFileChanged();
+
+        coapServer.getEndpoints().remove(endpointA);
+        endpointA.stop();
+
+        CoapEndpoint endpointB = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpointB);
+        endpointB.start();
+        endpointA.destroy();
+
+        CoapResponse responseB = doDtlsRequest(dtlsPort, certB);
+        assertThat(responseB).isNotNull();
+        assertThat(responseB.getCode()).isEqualTo(CoAP.ResponseCode.CONTENT);
+        assertThat(responseB.getResponseText()).isEqualTo(TEST_PAYLOAD);
+    }
+
+    @Test
+    public void givenDtlsServer_whenCertReloaded_thenOldCertClientFails() throws Exception {
+        KeyPair keyPairA = generateKeyPair();
+        X509Certificate certA = generateSelfSignedCert(keyPairA, "CN=ServerA");
+        KeyPair keyPairB = generateKeyPair();
+        X509Certificate certB = generateSelfSignedCert(keyPairB, "CN=ServerB");
+
+        Path certFile = tempDir.resolve("server-cert.pem");
+        Path keyFile = tempDir.resolve("server-key.pem");
+        writeCertPem(certFile, certA);
+        writeKeyPem(keyFile, keyPairA);
+
+        SslCredentialsConfig credentialsConfig = createSslCredentialsConfig(certFile, keyFile);
+
+        Configuration config = createServerConfig();
+        coapServer = new CoapServer(config);
+        coapServer.add(new TestResource());
+
+        int dtlsPort = findAvailablePort();
+        CoapEndpoint endpointA = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpointA);
+        coapServer.start();
+
+        CoapResponse responseA = doDtlsRequest(dtlsPort, certA);
+        assertThat(responseA).isNotNull();
+
+        writeCertPem(certFile, certB);
+        writeKeyPem(keyFile, keyPairB);
+        credentialsConfig.onCertificateFileChanged();
+
+        coapServer.getEndpoints().remove(endpointA);
+        endpointA.stop();
+        CoapEndpoint endpointB = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpointB);
+        endpointB.start();
+        endpointA.destroy();
+
+        CoapResponse failedResponse = doDtlsRequest(dtlsPort, certA);
+        assertThat(failedResponse).isNull();
+
+        CoapResponse responseB = doDtlsRequest(dtlsPort, certB);
+        assertThat(responseB).isNotNull();
+        assertThat(responseB.getCode()).isEqualTo(CoAP.ResponseCode.CONTENT);
+    }
+
+    @Test
+    public void givenDtlsServer_whenReloadWithSameCert_thenConnectionStillWorks() throws Exception {
+        KeyPair keyPair = generateKeyPair();
+        X509Certificate cert = generateSelfSignedCert(keyPair, "CN=Server");
+
+        Path certFile = tempDir.resolve("server-cert.pem");
+        Path keyFile = tempDir.resolve("server-key.pem");
+        writeCertPem(certFile, cert);
+        writeKeyPem(keyFile, keyPair);
+
+        SslCredentialsConfig credentialsConfig = createSslCredentialsConfig(certFile, keyFile);
+
+        Configuration config = createServerConfig();
+        coapServer = new CoapServer(config);
+        coapServer.add(new TestResource());
+
+        int dtlsPort = findAvailablePort();
+        CoapEndpoint endpoint1 = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpoint1);
+        coapServer.start();
+
+        CoapResponse response1 = doDtlsRequest(dtlsPort, cert);
+        assertThat(response1).isNotNull();
+        assertThat(response1.getCode()).isEqualTo(CoAP.ResponseCode.CONTENT);
+
+        credentialsConfig.onCertificateFileChanged();
+
+        coapServer.getEndpoints().remove(endpoint1);
+        endpoint1.stop();
+        CoapEndpoint endpoint2 = buildDtlsEndpointFromCredentials(config, credentialsConfig.getCredentials(), dtlsPort);
+        coapServer.addEndpoint(endpoint2);
+        endpoint2.start();
+        endpoint1.destroy();
+
+        CoapResponse response2 = doDtlsRequest(dtlsPort, cert);
+        assertThat(response2).isNotNull();
+        assertThat(response2.getCode()).isEqualTo(CoAP.ResponseCode.CONTENT);
+    }
+
+    private SslCredentialsConfig createSslCredentialsConfig(Path certFile, Path keyFile) {
+        PemSslCredentials pem = new PemSslCredentials();
+        pem.setCertFile(certFile.toAbsolutePath().toString());
+        pem.setKeyFile(keyFile.toAbsolutePath().toString());
+
+        SslCredentialsConfig config = new SslCredentialsConfig("CoAP DTLS Test", false);
+        config.setEnabled(true);
+        config.setType(SslCredentialsType.PEM);
+        config.setPem(pem);
+        config.setKeystore(new KeystoreSslCredentials());
+        config.init();
+        return config;
+    }
+
+    private CoapEndpoint buildDtlsEndpointFromCredentials(Configuration config, SslCredentials credentials, int port) {
+        DtlsConnectorConfig.Builder dtlsBuilder = new DtlsConnectorConfig.Builder(config);
+        dtlsBuilder.setAddress(new InetSocketAddress(InetAddress.getLoopbackAddress(), port));
+        dtlsBuilder.set(DTLS_ROLE, SERVER_ONLY);
+        dtlsBuilder.set(DTLS_RETRANSMISSION_TIMEOUT, 3000, MILLISECONDS);
+        dtlsBuilder.set(DTLS_CLIENT_AUTHENTICATION_MODE,
+                org.eclipse.californium.elements.config.CertificateAuthenticationMode.WANTED);
+
+        SslContextUtil.Credentials serverCreds = new SslContextUtil.Credentials(
+                credentials.getPrivateKey(), null, credentials.getCertificateChain());
+
+        dtlsBuilder.setCertificateIdentityProvider(
+                new SingleCertificateProvider(serverCreds.getPrivateKey(), serverCreds.getCertificateChain(),
+                        Collections.singletonList(CertificateType.X_509)));
+
+        dtlsBuilder.setAdvancedCertificateVerifier(
+                StaticNewAdvancedCertificateVerifier.builder()
+                        .setTrustAllCertificates()
+                        .build());
+
+        DTLSConnector connector = new DTLSConnector(dtlsBuilder.build());
+
+        CoapEndpoint.Builder endpointBuilder = new CoapEndpoint.Builder();
+        endpointBuilder.setConfiguration(config);
+        endpointBuilder.setConnector(connector);
+        return endpointBuilder.build();
+    }
+
+    private KeyPair generateKeyPair() throws Exception {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("EC");
+        kpg.initialize(256);
+        return kpg.generateKeyPair();
+    }
+
+    private X509Certificate generateSelfSignedCert(KeyPair kp, String subjectDn) throws Exception {
+        X500Name subject = new X500Name(subjectDn);
+        Date now = new Date();
+        Date expiry = new Date(now.getTime() + TimeUnit.DAYS.toMillis(1));
+        return new JcaX509CertificateConverter().getCertificate(
+                new JcaX509v3CertificateBuilder(
+                        subject, BigInteger.valueOf(System.nanoTime()), now, expiry,
+                        subject, kp.getPublic())
+                        .build(new JcaContentSignerBuilder("SHA256withECDSA").build(kp.getPrivate())));
+    }
+
+    private void writeCertPem(Path path, X509Certificate cert) throws Exception {
+        try (PemWriter writer = new PemWriter(new OutputStreamWriter(Files.newOutputStream(path)))) {
+            writer.writeObject(new PemObject("CERTIFICATE", cert.getEncoded()));
+        }
+    }
+
+    private void writeKeyPem(Path path, KeyPair keyPair) throws Exception {
+        try (PemWriter writer = new PemWriter(new OutputStreamWriter(Files.newOutputStream(path)))) {
+            writer.writeObject(new PemObject("PRIVATE KEY", keyPair.getPrivate().getEncoded()));
+        }
+    }
+
+    private Configuration createServerConfig() {
+        Configuration config = new Configuration();
+        config.set(CoapConfig.MAX_RETRANSMIT, 2);
+        config.set(CoapConfig.RESPONSE_MATCHING, CoapConfig.MatcherMode.RELAXED);
+        return config;
+    }
+
+    private CoapResponse doDtlsRequest(int port, X509Certificate trustedCert) {
+        try {
+            Configuration clientConfig = new Configuration();
+            clientConfig.set(CoapConfig.MAX_RETRANSMIT, 1);
+            clientConfig.set(DtlsConfig.DTLS_ROLE, DtlsConfig.DtlsRole.CLIENT_ONLY);
+            clientConfig.set(DtlsConfig.DTLS_RETRANSMISSION_TIMEOUT, 2000, MILLISECONDS);
+            clientConfig.set(DtlsConfig.DTLS_USE_HELLO_VERIFY_REQUEST, false);
+            clientConfig.set(DtlsConfig.DTLS_VERIFY_SERVER_CERTIFICATES_SUBJECT, false);
+
+            DtlsConnectorConfig.Builder clientDtls = new DtlsConnectorConfig.Builder(clientConfig);
+            clientDtls.setAdvancedCertificateVerifier(
+                    StaticNewAdvancedCertificateVerifier.builder()
+                            .setTrustedCertificates(trustedCert)
+                            .build());
+
+            DTLSConnector clientConnector = new DTLSConnector(clientDtls.build());
+            CoapEndpoint clientEndpoint = new CoapEndpoint.Builder()
+                    .setConfiguration(clientConfig)
+                    .setConnector(clientConnector)
+                    .build();
+
+            CoapClient client = new CoapClient("coaps://127.0.0.1:" + port + "/" + TEST_RESOURCE_PATH);
+            client.setEndpoint(clientEndpoint);
+            client.setTimeout((long) 5000);
+
+            try {
+                clientEndpoint.start();
+                return client.get();
+            } finally {
+                client.shutdown();
+                clientEndpoint.destroy();
+            }
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private int findAvailablePort() throws Exception {
+        try (java.net.DatagramSocket socket = new java.net.DatagramSocket(0)) {
+            return socket.getLocalPort();
+        }
+    }
+
+    private static class TestResource extends CoapResource {
+        TestResource() {
+            super(TEST_RESOURCE_PATH);
+        }
+
+        @Override
+        public void handleGET(CoapExchange exchange) {
+            exchange.respond(CoAP.ResponseCode.CONTENT, TEST_PAYLOAD);
+        }
+
+    }
+
+}

common/coap-server/src/test/java/org/thingsboard/server/coapserver/CoapDtlsCertificateReloadTest.java

@@ -0,0 +1,246 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.coapserver;
+
+import org.eclipse.californium.core.CoapServer;
+import org.eclipse.californium.core.network.CoapEndpoint;
+import org.eclipse.californium.core.network.Endpoint;
+import org.eclipse.californium.scandium.DTLSConnector;
+import org.eclipse.californium.scandium.config.DtlsConnectorConfig;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockedConstruction;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class CoapDtlsCertificateReloadTest {
+
+    @Mock
+    private CoapServerContext mockCoapServerContext;
+
+    @Mock
+    private TbCoapDtlsSettings mockDtlsSettings;
+
+    @Mock
+    private CoapServer mockCoapServer;
+
+    @Mock
+    private CoapEndpoint mockDtlsEndpoint;
+
+    @Mock
+    private DTLSConnector mockDtlsConnector;
+
+    private DefaultCoapServerService coapServerService;
+
+    @BeforeEach
+    public void setup() {
+        coapServerService = new DefaultCoapServerService();
+        ReflectionTestUtils.setField(coapServerService, "coapServerContext", mockCoapServerContext);
+
+        when(mockCoapServerContext.getHost()).thenReturn("localhost");
+        when(mockCoapServerContext.getPort()).thenReturn(5683);
+        doAnswer(invocation -> {
+            invocation.getArgument(0);
+            return null;
+        }).when(mockDtlsSettings).registerReloadCallback(any());
+    }
+
+    @Test
+    public void givenDtlsEnabled_whenRegisterCertificateReloadCallback_thenShouldRegisterCallback() {
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+
+        ReflectionTestUtils.invokeMethod(coapServerService, "afterSingletonsInstantiated");
+
+        ArgumentCaptor<Runnable> callbackCaptor = ArgumentCaptor.forClass(Runnable.class);
+        verify(mockDtlsSettings).registerReloadCallback(callbackCaptor.capture());
+        assertThat(callbackCaptor.getValue()).isNotNull();
+    }
+
+    @Test
+    public void givenDtlsNotEnabled_whenRegisterCertificateReloadCallback_thenShouldNotRegisterCallback() {
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(null);
+
+        ReflectionTestUtils.invokeMethod(coapServerService, "afterSingletonsInstantiated");
+
+        verify(mockDtlsSettings, never()).registerReloadCallback(any());
+    }
+
+    @Test
+    public void givenReloadCallbackInvoked_whenNewEndpointCreationFails_thenOldEndpointIsPreserved() {
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+        ReflectionTestUtils.setField(coapServerService, "dtlsCoapEndpoint", mockDtlsEndpoint);
+        ReflectionTestUtils.setField(coapServerService, "dtlsConnector", mockDtlsConnector);
+
+        ArgumentCaptor<Runnable> callbackCaptor = ArgumentCaptor.forClass(Runnable.class);
+        ReflectionTestUtils.invokeMethod(coapServerService, "afterSingletonsInstantiated");
+        verify(mockDtlsSettings).registerReloadCallback(callbackCaptor.capture());
+
+        Runnable reloadCallback = callbackCaptor.getValue();
+        // dtlsSettings.dtlsConnectorConfig() isn't mocked, so the callback will throw.
+        // The old endpoint should not be stopped/destroyed when creation of the new one fails.
+        reloadCallback.run();
+
+        verify(mockDtlsEndpoint, never()).stop();
+        verify(mockDtlsConnector, never()).destroy();
+    }
+
+    @Test
+    public void givenDtlsEnabled_whenInit_thenShouldRegisterCallback() {
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+        when(mockCoapServerContext.getHost()).thenReturn("localhost");
+        when(mockCoapServerContext.getPort()).thenReturn(5683);
+
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+        ReflectionTestUtils.invokeMethod(coapServerService, "afterSingletonsInstantiated");
+
+        verify(mockDtlsSettings).registerReloadCallback(any(Runnable.class));
+    }
+
+    @Test
+    public void givenReloadCallback_whenInvokedMultipleTimes_thenShouldRegisterOnce() {
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+        ReflectionTestUtils.setField(coapServerService, "dtlsCoapEndpoint", mockDtlsEndpoint);
+        ReflectionTestUtils.setField(coapServerService, "dtlsConnector", mockDtlsConnector);
+
+        ArgumentCaptor<Runnable> callbackCaptor = ArgumentCaptor.forClass(Runnable.class);
+        ReflectionTestUtils.invokeMethod(coapServerService, "afterSingletonsInstantiated");
+        verify(mockDtlsSettings).registerReloadCallback(callbackCaptor.capture());
+
+        Runnable reloadCallback = callbackCaptor.getValue();
+        assertThat(reloadCallback).isNotNull();
+    }
+
+    @Test
+    public void givenReloadCallback_whenSuccessful_thenOldEndpointRemovedFromServer() throws Exception {
+        // GIVEN
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+
+        DtlsConnectorConfig mockDtlsConfig = mock(DtlsConnectorConfig.class);
+        TbCoapDtlsCertificateVerifier mockNewVerifier = mock(TbCoapDtlsCertificateVerifier.class);
+        when(mockDtlsConfig.getAdvancedCertificateVerifier()).thenReturn(mockNewVerifier);
+        when(mockDtlsConfig.getAddress()).thenReturn(new InetSocketAddress("localhost", 5684));
+        when(mockDtlsSettings.dtlsConnectorConfig(any())).thenReturn(mockDtlsConfig);
+
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+        ReflectionTestUtils.setField(coapServerService, "dtlsCoapEndpoint", mockDtlsEndpoint);
+        ReflectionTestUtils.setField(coapServerService, "dtlsConnector", mockDtlsConnector);
+
+        List<Endpoint> endpointsList = new CopyOnWriteArrayList<>();
+        endpointsList.add(mockDtlsEndpoint);
+        when(mockCoapServer.getEndpoints()).thenReturn(endpointsList);
+
+        CoapEndpoint mockNewEndpoint = mock(CoapEndpoint.class);
+
+        try (MockedConstruction<DTLSConnector> dtlsMock = mockConstruction(DTLSConnector.class);
+             MockedConstruction<CoapEndpoint.Builder> builderMock = mockConstruction(CoapEndpoint.Builder.class,
+                     (builder, context) -> {
+                         when(builder.build()).thenReturn(mockNewEndpoint);
+                         when(builder.setConfiguration(any())).thenReturn(builder);
+                         when(builder.setConnector(any(DTLSConnector.class))).thenReturn(builder);
+                     })) {
+
+            // WHEN
+            ReflectionTestUtils.invokeMethod(coapServerService, "recreateDtlsEndpoint");
+
+            // THEN
+            assertThat(endpointsList).doesNotContain(mockDtlsEndpoint);
+            verify(mockDtlsEndpoint).stop();
+            verify(mockDtlsEndpoint).destroy();
+            verify(mockDtlsConnector).destroy();
+            verify(mockCoapServer).addEndpoint(mockNewEndpoint);
+            verify(mockNewEndpoint).start();
+            assertThat(ReflectionTestUtils.getField(coapServerService, "dtlsCoapEndpoint")).isSameAs(mockNewEndpoint);
+        }
+    }
+
+    @Test
+    public void givenReloadCallback_whenStartFails_thenNewResourcesCleanedAndOldRestored() throws Exception {
+        // GIVEN
+        when(mockCoapServerContext.getDtlsSettings()).thenReturn(mockDtlsSettings);
+
+        DtlsConnectorConfig mockDtlsConfig = mock(DtlsConnectorConfig.class);
+        when(mockDtlsConfig.getAddress()).thenReturn(new InetSocketAddress("localhost", 5684));
+        when(mockDtlsSettings.dtlsConnectorConfig(any())).thenReturn(mockDtlsConfig);
+
+        ReflectionTestUtils.setField(coapServerService, "server", mockCoapServer);
+        ReflectionTestUtils.setField(coapServerService, "dtlsCoapEndpoint", mockDtlsEndpoint);
+        ReflectionTestUtils.setField(coapServerService, "dtlsConnector", mockDtlsConnector);
+
+        List<Endpoint> endpointsList = new CopyOnWriteArrayList<>();
+        endpointsList.add(mockDtlsEndpoint);
+        when(mockCoapServer.getEndpoints()).thenReturn(endpointsList);
+
+        CoapEndpoint mockNewEndpoint = mock(CoapEndpoint.class);
+        doThrow(new IOException("start failed")).when(mockNewEndpoint).start();
+
+        try (MockedConstruction<DTLSConnector> dtlsMock = mockConstruction(DTLSConnector.class);
+             MockedConstruction<CoapEndpoint.Builder> builderMock = mockConstruction(CoapEndpoint.Builder.class,
+                     (builder, context) -> {
+                         when(builder.build()).thenReturn(mockNewEndpoint);
+                         when(builder.setConfiguration(any())).thenReturn(builder);
+                         when(builder.setConnector(any(DTLSConnector.class))).thenReturn(builder);
+                     })) {
+
+            // WHEN
+            coapServerService.afterSingletonsInstantiated();
+
+            ArgumentCaptor<Runnable> callbackCaptor = ArgumentCaptor.forClass(Runnable.class);
+            verify(mockDtlsSettings).registerReloadCallback(callbackCaptor.capture());
+            Runnable reloadCallback = callbackCaptor.getValue();
+            reloadCallback.run();
+
+            // THEN - new resources cleaned up
+            DTLSConnector constructedConnector = dtlsMock.constructed().get(0);
+            verify(mockNewEndpoint).destroy();
+            verify(constructedConnector).destroy();
+            assertThat(endpointsList).doesNotContain(mockNewEndpoint);
+            // Old endpoint was stopped to release port, then restored after new one failed
+            verify(mockDtlsEndpoint).stop();
+            verify(mockDtlsEndpoint).start();
+            // Old fields preserved
+            assertThat(ReflectionTestUtils.getField(coapServerService, "dtlsCoapEndpoint")).isSameAs(mockDtlsEndpoint);
+            assertThat(ReflectionTestUtils.getField(coapServerService, "dtlsConnector")).isSameAs(mockDtlsConnector);
+        }
+    }
+
+}

common/coap-server/src/test/java/org/thingsboard/server/coapserver/TbCoapDtlsSettingsTest.java

@@ -18,8 +18,8 @@ package org.thingsboard.server.coapserver;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
@@ -41,11 +41,11 @@ class TbCoapDtlsSettingsTest {
 
     @Autowired
     TbCoapDtlsSettings coapDtlsSettings;
-    @MockBean
+    @MockitoBean
     SslCredentialsConfig sslCredentialsConfig;
-    @MockBean
+    @MockitoBean
     private TransportService transportService;
-    @MockBean
+    @MockitoBean
     private TbServiceInfoProvider serviceInfoProvider;
 
     @Test

common/dao-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ImageService.java

@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 
 import java.util.Collection;
+import java.util.Set;
 
 public interface ImageService {
 
@@ -38,6 +39,8 @@ public interface ImageService {
 
     TbResourceInfo getImageInfoByTenantIdAndKey(TenantId tenantId, String key);
 
+    Set<String> getAllImageKeysByTenantId(TenantId tenantId);
+
     TbResourceInfo getPublicImageInfoByKey(String publicResourceKey);
 
     PageData<TbResourceInfo> getImagesByTenantId(TenantId tenantId, ResourceSubType imageSubType, PageLink pageLink);

common/data/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/data/src/main/java/org/thingsboard/server/common/data/ResourceUtils.java

@@ -51,11 +51,9 @@ public class ResourceUtils {
             return true;
         } else {
             try {
-                URL url = Resources.getResource(path);
+                Resources.getResource(path);
-                if (url != null) {
+                return true;
-                    return true;
+            } catch (IllegalArgumentException ignored) {}
-                }
-            } catch (IllegalArgumentException e) {}
         }
         return false;
     }
@@ -93,9 +91,9 @@ public class ResourceUtils {
             }
         } catch (Exception e) {
             if (e instanceof NullPointerException) {
-                log.warn("Unable to find resource: " + filePath);
+                log.warn("Unable to find resource: {}", filePath);
             } else {
-                log.warn("Unable to find resource: " + filePath, e);
+                log.warn("Unable to find resource: {}", filePath, e);
             }
         }
         throw new RuntimeException("Unable to find resource: " + filePath);
@@ -113,15 +111,19 @@ public class ResourceUtils {
                 return resourceFile.getAbsolutePath();
             } else {
                 URL url = classLoader.getResource(filePath);
+                if (url == null) {
+                    throw new RuntimeException("Unable to find resource: " + filePath);
+                }
                 return url.toURI().toString();
             }
         } catch (Exception e) {
             if (e instanceof NullPointerException) {
-                log.warn("Unable to find resource: " + filePath);
+                log.warn("Unable to find resource: {}", filePath);
             } else {
-                log.warn("Unable to find resource: " + filePath, e);
+                log.warn("Unable to find resource: {}", filePath, e);
             }
             throw new RuntimeException("Unable to find resource: " + filePath);
         }
     }
+
 }

common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmCreateOrUpdateActiveRequest.java

@@ -39,6 +39,7 @@ public class AlarmCreateOrUpdateActiveRequest implements AlarmModificationReques
     private TenantId tenantId;
     @Schema(description = "JSON object with Customer Id", accessMode = Schema.AccessMode.READ_ONLY)
     private CustomerId customerId;
+    @NoXss
     @NotNull
     @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "representing type of the Alarm", example = "High Temperature Alarm")
     @Length(fieldName = "type")

common/data/src/test/java/org/thingsboard/server/common/data/ResourceUtilsTest.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+class ResourceUtilsTest {
+
+    @Test
+    public void givenNonExistentResource_whenGetUri_thenThrowsRuntimeException() {
+        assertThatThrownBy(() -> ResourceUtils.getUri(ResourceUtilsTest.class.getClassLoader(), "non/existent/resource/path.txt"))
+                .isInstanceOf(RuntimeException.class)
+                .hasMessageContaining("Unable to find resource");
+    }
+
+    @Test
+    public void givenExistingClasspathResource_whenGetUri_thenReturnsNonNullUri() {
+        String result = ResourceUtils.getUri(ResourceUtilsTest.class.getClassLoader(), "org/thingsboard/server/common/data/ResourceUtilsTest.class");
+
+        assertThat(result).isNotNull();
+        assertThat(result).contains("ResourceUtilsTest");
+    }
+
+}

common/discovery-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/edge-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/edge-api/src/main/proto/edge.proto

@@ -47,6 +47,7 @@ enum EdgeVersion {
   V_4_2_1_2 = 14;
   V_4_2_2 = 4220;
   V_4_2_2_1 = 4221;
+  V_4_2_2_2 = 4222;
 
   V_LATEST = 99999;
 }

common/edqs/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/edqs/src/main/java/org/thingsboard/server/edqs/data/dp/StringDataPoint.java

@@ -33,6 +33,11 @@ public class StringDataPoint extends AbstractDataPoint {
         this.value = deduplicate ? TbStringPool.intern(value) : value;
     }
 
+    @Override
+    public boolean getBool() {
+        return Boolean.parseBoolean(value);
+    }
+
     @Override
     public double getDouble() {
         return Double.parseDouble(value);

common/message/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/message/src/main/java/org/thingsboard/server/common/msg/EncryptionUtil.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.common.msg;
 
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.pqc.legacy.math.linearalgebra.ByteUtils;
+import org.bouncycastle.util.encoders.Hex;
 
 /**
  * @author Valerii Sosliuk
@@ -66,7 +66,7 @@ public class EncryptionUtil {
         md.update(dataBytes, 0, dataBytes.length);
         byte[] hashedBytes = new byte[256 / 8];
         md.doFinal(hashedBytes, 0);
-        String sha3Hash = ByteUtils.toHexString(hashedBytes);
+        String sha3Hash = Hex.toHexString(hashedBytes);
         return sha3Hash;
     }
 

common/message/src/main/java/org/thingsboard/server/common/msg/TbMsg.java

@@ -204,18 +204,6 @@ public final class TbMsg implements Serializable {
         return builder.build();
     }
 
-    @Deprecated(forRemoval = true, since = "4.1") // to be removed in 4.2
-    public static TbMsg fromProto(String queueName, TbMsgProto proto, ByteString data, TbMsgCallback callback) {
-        try {
-            if (!data.isEmpty()) {
-                proto = TbMsgProto.parseFrom(data);
-            }
-        } catch (InvalidProtocolBufferException e) {
-            throw new IllegalStateException("Could not parse protobuf for TbMsg", e);
-        }
-        return fromProto(queueName, proto, callback);
-    }
-
     public static TbMsg fromProto(String queueName, TbMsgProto proto, TbMsgCallback callback) {
         TbMsgMetaData metaData = new TbMsgMetaData(proto.getMetaData().getDataMap());
         EntityId entityId = EntityIdFactory.getByTypeAndUuid(proto.getEntityType(), new UUID(proto.getEntityIdMSB(), proto.getEntityIdLSB()));

common/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>

common/proto/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/proto/src/main/proto/queue.proto

@@ -132,7 +132,6 @@ message SessionInfoProto {
 message RestApiCallResponseMsgProto {
   int64 requestIdMSB = 1;
   int64 requestIdLSB = 2;
-  bytes response = 5 [deprecated = true];
   msgqueue.TbMsgProto responseProto = 6;
 }
 

common/queue/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>
@@ -68,10 +68,6 @@
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
         </dependency>
-        <dependency>
-            <groupId>at.yawk.lz4</groupId>
-            <artifactId>lz4-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-pubsub</artifactId>

common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java

@@ -98,7 +98,10 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
                 doSubscribe(partitions);
                 subscribed = true;
             }
-            records = partitions.isEmpty() ? emptyList() : doPoll(durationInMillis);
+            if (partitions.isEmpty()) {
+                return sleepAndReturnEmpty(startNanos, durationInMillis);
+            }
+            records = doPoll(durationInMillis);
         } finally {
             consumerLock.unlock();
         }

common/queue/src/main/java/org/thingsboard/server/queue/notification/DefaultNotificationDeduplicationService.java

@@ -32,6 +32,7 @@ import org.thingsboard.server.queue.util.PropertyUtils;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 
 import static org.springframework.util.ConcurrentReferenceHashMap.ReferenceType.SOFT;
 
@@ -59,41 +60,48 @@ public class DefaultNotificationDeduplicationService implements NotificationDedu
     }
 
     private boolean alreadyProcessed(NotificationRuleTrigger trigger, String deduplicationKey, boolean onlyLocalCache) {
-        Long lastProcessedTs = localCache.get(deduplicationKey);
+        long deduplicationDuration = getDeduplicationDuration(trigger);
-        if (lastProcessedTs == null && !onlyLocalCache) {
+        final long now = System.currentTimeMillis();
-            Cache externalCache = getExternalCache();
+        boolean[] result = {false};
-            if (externalCache != null) {
+
-                lastProcessedTs = externalCache.get(deduplicationKey, Long.class);
+        localCache.compute(deduplicationKey, (key, lastProcessedTs) -> {
-            } else {
+            if (lastProcessedTs == null && !onlyLocalCache) {
-                log.warn("Sent notifications cache is not set up");
+                Cache externalCache = getExternalCache();
+                if (externalCache != null) {
+                    lastProcessedTs = externalCache.get(key, Long.class);
+                    if (lastProcessedTs != null && lastProcessedTs > now + TimeUnit.HOURS.toMillis(1)) {
+                        log.warn("Discarding dedup entry from external cache for key '{}': timestamp is {} ms in the future",
+                                key, lastProcessedTs - now);
+                        lastProcessedTs = null;
+                    }
+                } else {
+                    log.warn("Sent notifications cache is not set up");
+                }
             }
-        }
 
-        boolean alreadyProcessed = false;
+            if (lastProcessedTs != null) {
-        long deduplicationDuration = getDeduplicationDuration(trigger);
+                long passed = now - lastProcessedTs;
-        if (lastProcessedTs != null) {
+                log.trace("Deduplicating trigger {} by key '{}'. Deduplication duration: {} ms, passed: {} ms",
-            long passed = System.currentTimeMillis() - lastProcessedTs;
+                        trigger.getType(), key, deduplicationDuration, passed);
-            log.trace("Deduplicating trigger {} by key '{}'. Deduplication duration: {} ms, passed: {} ms",
+                if (deduplicationDuration == 0 || passed <= deduplicationDuration) {
-                    trigger.getType(), deduplicationKey, deduplicationDuration, passed);
+                    result[0] = true;
-            if (deduplicationDuration == 0 || passed <= deduplicationDuration) {
+                    return lastProcessedTs;
-                alreadyProcessed = true;
+                }
             }
-        }
 
-        if (!alreadyProcessed) {
+            return now;
-            lastProcessedTs = System.currentTimeMillis();
+        });
-        }
+
-        localCache.put(deduplicationKey, lastProcessedTs);
         if (!onlyLocalCache) {
-            if (!alreadyProcessed || deduplicationDuration == 0) {
+            if (!result[0] || deduplicationDuration == 0) {
                 // if lastProcessedTs is changed or if deduplicating infinitely (so that cache value not removed by ttl)
                 Cache externalCache = getExternalCache();
                 if (externalCache != null) {
-                    externalCache.put(deduplicationKey, lastProcessedTs);
+                    externalCache.put(deduplicationKey, now);
                 }
             }
         }
-        return alreadyProcessed;
+        return result[0];
     }
 
     public static String getDeduplicationKey(NotificationRuleTrigger trigger, NotificationRule rule) {

common/queue/src/test/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplateTest.java

@@ -0,0 +1,146 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.queue.common;
+
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.queue.TbQueueMsg;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.BDDMockito.never;
+import static org.mockito.BDDMockito.spy;
+import static org.mockito.BDDMockito.times;
+import static org.mockito.BDDMockito.verify;
+
+@Slf4j
+@ExtendWith(MockitoExtension.class)
+public class AbstractTbQueueConsumerTemplateTest {
+
+    private static final long POLL_DURATION_MS = 100L;
+    private static final long SLEEP_TOLERANCE_MS = 20L;
+
+    @Test
+    public void givenEmptyPartitionsAndLongPollingSupported_whenPoll_thenSleepsAndDoesNotCallDoPoll() {
+        // Regression: with empty partitions AND isLongPollingSupported()==true (e.g. Kafka),
+        // poll() previously returned instantly with no sleep, causing the consumer loop to busy-spin.
+        TestConsumer consumer = spy(new TestConsumer("test-topic", true));
+        consumer.subscribe(Collections.emptySet());
+
+        long startNs = System.nanoTime();
+        List<TbQueueMsg> result = consumer.poll(POLL_DURATION_MS);
+        long elapsedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
+
+        assertThat(result, is(empty()));
+        verify(consumer, never()).doPoll(anyLong());
+        assertThat("poll() must sleep ~durationInMillis when partitions are empty (no busy-wait)",
+                elapsedMs, greaterThanOrEqualTo(POLL_DURATION_MS - SLEEP_TOLERANCE_MS));
+    }
+
+    @Test
+    public void givenEmptyPartitionsAndNoLongPolling_whenPoll_thenSleepsAndDoesNotCallDoPoll() {
+        TestConsumer consumer = spy(new TestConsumer("test-topic", false));
+        consumer.subscribe(Collections.emptySet());
+
+        long startNs = System.nanoTime();
+        List<TbQueueMsg> result = consumer.poll(POLL_DURATION_MS);
+        long elapsedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
+
+        assertThat(result, is(empty()));
+        verify(consumer, never()).doPoll(anyLong());
+        assertThat(elapsedMs, greaterThanOrEqualTo(POLL_DURATION_MS - SLEEP_TOLERANCE_MS));
+    }
+
+    @Test
+    public void givenNonEmptyPartitions_whenPoll_thenCallsDoPoll() {
+        TestConsumer consumer = spy(new TestConsumer("test-topic", true));
+        consumer.subscribe(Collections.singleton(new TopicPartitionInfo("test-topic", null, 0, true)));
+
+        List<TbQueueMsg> result = consumer.poll(POLL_DURATION_MS);
+
+        assertThat(result, is(empty()));
+        verify(consumer, times(1)).doPoll(POLL_DURATION_MS);
+    }
+
+    @Test
+    public void givenPartitionsBecomeEmptyAfterRebalance_whenPollAgain_thenStopsCallingDoPoll() {
+        // Reproduces the observed trigger: a rebalance leaves the consumer with an empty
+        // partition assignment. Subsequent poll() calls must not busy-spin or call doPoll().
+        TestConsumer consumer = spy(new TestConsumer("test-topic", true));
+        consumer.subscribe(Collections.singleton(new TopicPartitionInfo("test-topic", null, 0, true)));
+        consumer.poll(POLL_DURATION_MS);
+        verify(consumer, times(1)).doPoll(POLL_DURATION_MS);
+
+        consumer.subscribe(Collections.emptySet());
+
+        long startNs = System.nanoTime();
+        List<TbQueueMsg> result = consumer.poll(POLL_DURATION_MS);
+        long elapsedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs);
+
+        assertThat(result, is(empty()));
+        verify(consumer, times(1)).doPoll(anyLong());
+        assertThat(elapsedMs, greaterThanOrEqualTo(POLL_DURATION_MS - SLEEP_TOLERANCE_MS));
+    }
+
+    static class TestConsumer extends AbstractTbQueueConsumerTemplate<Object, TbQueueMsg> {
+
+        private final boolean longPollingSupported;
+
+        TestConsumer(String topic, boolean longPollingSupported) {
+            super(topic);
+            this.longPollingSupported = longPollingSupported;
+        }
+
+        @Override
+        protected List<Object> doPoll(long durationInMillis) {
+            return Collections.emptyList();
+        }
+
+        @Override
+        protected TbQueueMsg decode(Object record) {
+            return null;
+        }
+
+        @Override
+        protected void doSubscribe(Set<TopicPartitionInfo> partitions) {
+        }
+
+        @Override
+        protected void doCommit() {
+        }
+
+        @Override
+        protected void doUnsubscribe() {
+        }
+
+        @Override
+        protected boolean isLongPollingSupported() {
+            return longPollingSupported;
+        }
+    }
+
+}

common/queue/src/test/java/org/thingsboard/server/queue/notification/DefaultNotificationDeduplicationServiceTest.java

@@ -0,0 +1,160 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.queue.notification;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.server.common.data.CacheConstants;
+import org.thingsboard.server.common.data.notification.rule.NotificationRule;
+import org.thingsboard.server.common.data.notification.rule.trigger.NotificationRuleTrigger;
+import org.thingsboard.server.common.data.notification.rule.trigger.config.NotificationRuleTriggerType;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DefaultNotificationDeduplicationServiceTest {
+
+    private static final int TIMEOUT = 30;
+
+    private DefaultNotificationDeduplicationService deduplicationService;
+    private CacheManager cacheManager;
+
+    @BeforeEach
+    void setUp() {
+        deduplicationService = new DefaultNotificationDeduplicationService();
+        deduplicationService.setDeduplicationDurations("");
+        cacheManager = new ConcurrentMapCacheManager(CacheConstants.SENT_NOTIFICATIONS_CACHE);
+        ReflectionTestUtils.setField(deduplicationService, "cacheManager", cacheManager);
+    }
+
+    @Test
+    void testFirstTriggerIsNotDeduplicated() {
+        NotificationRuleTrigger trigger = mockTrigger(TimeUnit.HOURS.toMillis(1));
+        NotificationRule rule = mockRule();
+
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isFalse();
+    }
+
+    @Test
+    void testSecondTriggerIsDeduplicated() {
+        NotificationRuleTrigger trigger = mockTrigger(TimeUnit.HOURS.toMillis(1));
+        NotificationRule rule = mockRule();
+
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isFalse();
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isTrue();
+    }
+
+    @Test
+    void testTriggerPassesAfterDeduplicationWindowExpires() {
+        NotificationRuleTrigger trigger = mockTrigger(50); // 50ms dedup window
+        NotificationRule rule = mockRule();
+
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isFalse();
+
+        try {
+            Thread.sleep(200); // wait well past the 50ms window
+        } catch (InterruptedException ignored) {}
+
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isFalse();
+    }
+
+    @Test
+    void testFutureTimestampFromExternalCacheIsDiscarded() {
+        NotificationRuleTrigger trigger = mockTrigger(TimeUnit.HOURS.toMillis(1));
+        NotificationRule rule = mockRule();
+        String dedupKey = DefaultNotificationDeduplicationService.getDeduplicationKey(trigger, rule);
+
+        // Put a timestamp 2 hours in the future into external cache
+        Cache externalCache = cacheManager.getCache(CacheConstants.SENT_NOTIFICATIONS_CACHE);
+        externalCache.put(dedupKey, System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2));
+
+        // Should NOT be deduplicated — future timestamp must be discarded
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isFalse();
+    }
+
+    @Test
+    void testValidTimestampFromExternalCacheIsDeduplicated() {
+        NotificationRuleTrigger trigger = mockTrigger(TimeUnit.HOURS.toMillis(1));
+        NotificationRule rule = mockRule();
+        String dedupKey = DefaultNotificationDeduplicationService.getDeduplicationKey(trigger, rule);
+
+        // Put a recent timestamp into external cache
+        Cache externalCache = cacheManager.getCache(CacheConstants.SENT_NOTIFICATIONS_CACHE);
+        externalCache.put(dedupKey, System.currentTimeMillis());
+
+        // Should be deduplicated — valid external cache entry
+        assertThat(deduplicationService.alreadyProcessed(trigger, rule)).isTrue();
+    }
+
+    @Test
+    void testConcurrentTriggersProduceExactlyOneNonDeduplicated() throws Exception {
+        NotificationRuleTrigger trigger = mockTrigger(TimeUnit.HOURS.toMillis(1));
+        NotificationRule rule = mockRule();
+
+        int threadCount = 10;
+        CyclicBarrier barrier = new CyclicBarrier(threadCount);
+        List<Boolean> results = new CopyOnWriteArrayList<>();
+
+        ExecutorService executor = Executors.newFixedThreadPool(threadCount);
+        try {
+            for (int i = 0; i < threadCount; i++) {
+                executor.submit(() -> {
+                    try {
+                        barrier.await(TIMEOUT, TimeUnit.SECONDS);
+                    } catch (Exception ignored) {}
+                    results.add(deduplicationService.alreadyProcessed(trigger, rule));
+                });
+            }
+            executor.shutdown();
+            assertThat(executor.awaitTermination(TIMEOUT, TimeUnit.SECONDS)).isTrue();
+
+            assertThat(results).hasSize(threadCount);
+            assertThat(results.stream().filter(r -> !r).count())
+                    .as("exactly one trigger should pass through deduplication")
+                    .isEqualTo(1);
+        } finally {
+            executor.shutdownNow();
+        }
+    }
+
+    private NotificationRuleTrigger mockTrigger(long deduplicationDurationMs) {
+        NotificationRuleTrigger trigger = mock(NotificationRuleTrigger.class);
+        when(trigger.getType()).thenReturn(NotificationRuleTriggerType.RESOURCES_SHORTAGE);
+        when(trigger.getDeduplicationKey()).thenReturn("test:dedup:key");
+        when(trigger.getDefaultDeduplicationDuration()).thenReturn(deduplicationDurationMs);
+        when(trigger.getDeduplicationStrategy()).thenReturn(NotificationRuleTrigger.DeduplicationStrategy.ONLY_MATCHING);
+        return trigger;
+    }
+
+    private NotificationRule mockRule() {
+        NotificationRule rule = mock(NotificationRule.class);
+        when(rule.getDeduplicationKey()).thenReturn("rule:key");
+        return rule;
+    }
+
+}

common/script/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/script/remote-js-client/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/script/script-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/script/script-api/src/main/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArg.java

@@ -73,7 +73,7 @@ public class TbelCfTsRollingArg implements TbelCfArg, Iterable<TbelCfTsDoubleVal
             throw new IllegalArgumentException("Rolling argument values are empty.");
         }
 
-        double max = Double.MIN_VALUE;
+        double max = -Double.MAX_VALUE;
         for (TbelCfTsDoubleVal value : values) {
             double val = value.getValue();
             if (!ignoreNaN && Double.isNaN(val)) {

common/script/script-api/src/test/java/org/thingsboard/script/api/tbel/TbelCfTsRollingArgTest.java

@@ -57,6 +57,19 @@ public class TbelCfTsRollingArgTest {
         assertThat(rollingArg.max(false)).isNaN();
     }
 
+    @Test
+    void testMaxOverAllNegativeValues() {
+        TbelCfTsRollingArg negativeArg = new TbelCfTsRollingArg(
+                new TbTimeWindow(ts - 30000, ts - 10),
+                List.of(
+                        new TbelCfTsDoubleVal(ts - 10, -50.0),
+                        new TbelCfTsDoubleVal(ts - 20, -100.0),
+                        new TbelCfTsDoubleVal(ts - 30, -75.0)
+                )
+        );
+        assertThat(negativeArg.max()).isEqualTo(-50.0);
+    }
+
     @Test
     void testMin() {
         assertThat(rollingArg.min()).isEqualTo(2.0);

common/stats/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java

@@ -245,7 +245,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
     }
 
     List<EfentoTelemetry> getEfentoMeasurements(MeasurementsProtos.ProtoMeasurements protoMeasurements, UUID sessionId) {
-        String serialNumber = CoapEfentoUtils.convertByteArrayToString(protoMeasurements.getSerialNum().toByteArray());
+        String serialNumber = CoapEfentoUtils.convertByteArrayToString(protoMeasurements.getSerialNumber().toByteArray());
         boolean batteryStatus = protoMeasurements.getBatteryStatus();
         int measurementPeriodBase = protoMeasurements.getMeasurementPeriodBase();
         int measurementPeriodFactor = protoMeasurements.getMeasurementPeriodFactor();
@@ -258,6 +258,9 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
         }
 
         Map<Long, JsonObject> valuesMap = new TreeMap<>();
+        // general measurements per message
+        valuesMap.put(TimeUnit.SECONDS.toMillis(channelsList.get(0).getTimestamp()), CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, nextTransmissionAtMillis, signal));
+
         for (int channel = 0; channel < channelsList.size(); channel++) {
             ProtoChannel protoChannel = channelsList.get(channel);
             List<Integer> sampleOffsetsList = protoChannel.getSampleOffsetsList();
@@ -271,6 +274,10 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
             long measurementPeriodMillis = TimeUnit.SECONDS.toMillis(measurementPeriod);
             long startTimestampMillis = TimeUnit.SECONDS.toMillis(protoChannel.getTimestamp());
 
+            // measurements per channel
+            JsonObject tsValues = valuesMap.computeIfAbsent(startTimestampMillis, k -> new JsonObject());
+            tsValues.addProperty("measurement_interval_" + (channel + 1), measurementPeriod);
+
             for (int i = 0; i < sampleOffsetsList.size(); i++) {
                 int sampleOffset = sampleOffsetsList.get(i);
                 if (isSensorError(sampleOffset)) {
@@ -290,22 +297,16 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
                     }
                     long sampleOffsetMillis = TimeUnit.SECONDS.toMillis(sampleOffset);
                     long measurementTimestamp = startTimestampMillis + Math.abs(sampleOffsetMillis);
-                    values = valuesMap.computeIfAbsent(measurementTimestamp - 1000, k ->
+                    values = valuesMap.computeIfAbsent(measurementTimestamp - 1000, k -> new JsonObject());
-                            CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, measurementPeriod, nextTransmissionAtMillis, signal, k));
                     addBinarySample(protoChannel, currentIsOk, values, channel + 1, sessionId);
                 } else {
                     long timestampMillis = startTimestampMillis + i * measurementPeriodMillis;
-                    values = valuesMap.computeIfAbsent(timestampMillis, k -> CoapEfentoUtils.setDefaultMeasurements(
+                    values = valuesMap.computeIfAbsent(timestampMillis, k -> new JsonObject());
-                            serialNumber, batteryStatus, measurementPeriod, nextTransmissionAtMillis, signal, k));
                     addContinuesSample(protoChannel, sampleOffset, values, channel + 1, sessionId);
                 }
             }
         }
 
-        if (CollectionUtils.isEmpty(valuesMap)) {
-            throw new IllegalStateException("[" + sessionId + "]: Failed to collect Efento measurements, reason, values map is empty!");
-        }
-
         return valuesMap.entrySet().stream()
                 .map(entry -> new EfentoTelemetry(entry.getKey(), entry.getValue()))
                 .collect(Collectors.toList());
@@ -446,7 +447,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
         }
     }
 
-    private EfentoTelemetry getEfentoDeviceInfo(DeviceInfoProtos.ProtoDeviceInfo protoDeviceInfo) {
+    EfentoTelemetry getEfentoDeviceInfo(DeviceInfoProtos.ProtoDeviceInfo protoDeviceInfo) {
         JsonObject values = new JsonObject();
         values.addProperty("sw_version", protoDeviceInfo.getSwVersion());
 
@@ -476,41 +477,86 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
 
         //modem info
         DeviceInfoProtos.ProtoModem modem = protoDeviceInfo.getModem();
-        values.addProperty("modem_types", modem.getType().toString());
+        DeviceInfoProtos.ModemType modemType = modem.getType();
-        values.addProperty("sc_EARNFCN_offset", modem.getParameters(0));
+        values.addProperty("modem_types", modemType.toString());
-        values.addProperty("sc_EARFCN", modem.getParameters(1));
+        values.addProperty("sim_card_identification", modem.getSimCardIdentification());
-        values.addProperty("sc_PCI", modem.getParameters(2));
+        values.addProperty("firmware_version", modem.getFirmwareVersion().toString());
-        values.addProperty("sc_Cell_id", modem.getParameters(3));
+        values.addProperty("modem_identification", modem.getModemIdentification());
-        values.addProperty("sc_RSRP", modem.getParameters(4));
+        if (modem.getModemStatisticsCount() >= 4) {
-        values.addProperty("sc_RSRQ", modem.getParameters(5));
+            values.addProperty("modem_transmissions_count", modem.getModemStatistics(0));
-        values.addProperty("sc_RSSI", modem.getParameters(6));
+            values.addProperty("modem_time_since_last_devinfo", modem.getModemStatistics(1));
-        values.addProperty("sc_SINR", modem.getParameters(7));
+            values.addProperty("modem_total_psm_time", modem.getModemStatistics(2));
-        values.addProperty("sc_Band", modem.getParameters(8));
+            values.addProperty("modem_total_active_time", modem.getModemStatistics(3));
-        values.addProperty("sc_TAC", modem.getParameters(9));
+        }
-        values.addProperty("sc_ECL", modem.getParameters(10));
+        switch (modemType) {
-        values.addProperty("sc_TX_PWR", modem.getParameters(11));
+            case MODEM_TYPE_BC660:
-        values.addProperty("op_mode", modem.getParameters(12));
+                values.addProperty("sc_EARFCN", modem.getParameters(0));
-        values.addProperty("nc_EARFCN", modem.getParameters(13));
+                values.addProperty("sc_EARNFCN_offset", modem.getParameters(1));
-        values.addProperty("nc_EARNFCN_offset", modem.getParameters(14));
+                values.addProperty("sc_PCI", modem.getParameters(2));
-        values.addProperty("nc_PCI", modem.getParameters(15));
+                values.addProperty("sc_Cell_id", modem.getParameters(3));
-        values.addProperty("nc_RSRP", modem.getParameters(16));
+                values.addProperty("sc_RSRP", modem.getParameters(4));
-        values.addProperty("RLC_UL_BLER", modem.getParameters(17));
+                values.addProperty("sc_RSRQ", modem.getParameters(5));
-        values.addProperty("RLC_DL_BLER", modem.getParameters(18));
+                values.addProperty("sc_RSSI", modem.getParameters(6));
-        values.addProperty("MAC_UL_BLER", modem.getParameters(19));
+                values.addProperty("sc_SINR", modem.getParameters(7));
-        values.addProperty("MAC_DL_BLER", modem.getParameters(20));
+                values.addProperty("sc_Band", modem.getParameters(8));
-        values.addProperty("MAC_UL_TOTAL_BYTES", modem.getParameters(21));
+                values.addProperty("sc_TAC", modem.getParameters(9));
-        values.addProperty("MAC_DL_TOTAL_BYTES", modem.getParameters(22));
+                values.addProperty("sc_ECL", modem.getParameters(10));
-        values.addProperty("MAC_UL_total_HARQ_Tx", modem.getParameters(23));
+                values.addProperty("sc_TX_PWR", modem.getParameters(11));
-        values.addProperty("MAC_DL_total_HARQ_Tx", modem.getParameters(24));
+                values.addProperty("op_mode", modem.getParameters(12));
-        values.addProperty("MAC_UL_HARQ_re_Tx", modem.getParameters(25));
+                values.addProperty("nc_EARFCN", modem.getParameters(13));
-        values.addProperty("MAC_DL_HARQ_re_Tx", modem.getParameters(26));
+                values.addProperty("nc_PCI", modem.getParameters(14));
-        values.addProperty("RLC_UL_tput", modem.getParameters(27));
+                values.addProperty("nc_RSRP", modem.getParameters(15));
-        values.addProperty("RLC_DL_tput", modem.getParameters(28));
+                values.addProperty("nc_RSRQ", modem.getParameters(16));
-        values.addProperty("MAC_UL_tput", modem.getParameters(29));
+                values.addProperty("sleep_duration", modem.getParameters(17));
-        values.addProperty("MAC_DL_tput", modem.getParameters(30));
+                values.addProperty("rx_time", modem.getParameters(18));
-        values.addProperty("sleep_duration", modem.getParameters(31));
+                values.addProperty("tx_time", modem.getParameters(19));
-        values.addProperty("rx_time", modem.getParameters(32));
+                values.addProperty("PLMN_state", modem.getParameters(20));
-        values.addProperty("tx_time", modem.getParameters(33));
+                values.addProperty("select_PLMN", modem.getParameters(21));
+                break;
+            case MODEM_TYPE_SHARED_MODEM:
+                values.addProperty("RSRP", modem.getParameters(0));
+                values.addProperty("RSRQ", modem.getParameters(1));
+                values.addProperty("RSSI", modem.getParameters(2));
+                values.addProperty("SINR", modem.getParameters(3));
+                break;
+            default:
+                // MODEM_TYPE_UNSPECIFIED, MODEM_TYPE_BC66, MODEM_TYPE_BC66NA
+                values.addProperty("sc_EARNFCN_offset", modem.getParameters(0));
+                values.addProperty("sc_EARFCN", modem.getParameters(1));
+                values.addProperty("sc_PCI", modem.getParameters(2));
+                values.addProperty("sc_Cell_id", modem.getParameters(3));
+                values.addProperty("sc_RSRP", modem.getParameters(4));
+                values.addProperty("sc_RSRQ", modem.getParameters(5));
+                values.addProperty("sc_RSSI", modem.getParameters(6));
+                values.addProperty("sc_SINR", modem.getParameters(7));
+                values.addProperty("sc_Band", modem.getParameters(8));
+                values.addProperty("sc_TAC", modem.getParameters(9));
+                values.addProperty("sc_ECL", modem.getParameters(10));
+                values.addProperty("sc_TX_PWR", modem.getParameters(11));
+                values.addProperty("op_mode", modem.getParameters(12));
+                values.addProperty("nc_EARFCN", modem.getParameters(13));
+                values.addProperty("nc_EARNFCN_offset", modem.getParameters(14));
+                values.addProperty("nc_PCI", modem.getParameters(15));
+                values.addProperty("nc_RSRP", modem.getParameters(16));
+                values.addProperty("RLC_UL_BLER", modem.getParameters(17));
+                values.addProperty("RLC_DL_BLER", modem.getParameters(18));
+                values.addProperty("MAC_UL_BLER", modem.getParameters(19));
+                values.addProperty("MAC_DL_BLER", modem.getParameters(20));
+                values.addProperty("MAC_UL_TOTAL_BYTES", modem.getParameters(21));
+                values.addProperty("MAC_DL_TOTAL_BYTES", modem.getParameters(22));
+                values.addProperty("MAC_UL_total_HARQ_Tx", modem.getParameters(23));
+                values.addProperty("MAC_DL_total_HARQ_Tx", modem.getParameters(24));
+                values.addProperty("MAC_UL_HARQ_re_Tx", modem.getParameters(25));
+                values.addProperty("MAC_DL_HARQ_re_Tx", modem.getParameters(26));
+                values.addProperty("RLC_UL_tput", modem.getParameters(27));
+                values.addProperty("RLC_DL_tput", modem.getParameters(28));
+                values.addProperty("MAC_UL_tput", modem.getParameters(29));
+                values.addProperty("MAC_DL_tput", modem.getParameters(30));
+                values.addProperty("sleep_duration", modem.getParameters(31));
+                values.addProperty("rx_time", modem.getParameters(32));
+                values.addProperty("tx_time", modem.getParameters(33));
+                break;
+        }
 
         //Runtime info
         DeviceInfoProtos.ProtoRuntime runtimeInfo = protoDeviceInfo.getRuntimeInfo();
@@ -521,7 +567,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
         values.addProperty("counter_of_non_confirmable_messages_attempts", runtimeInfo.getMessageCounters(1));
         values.addProperty("counter_of_succeeded_messages", runtimeInfo.getMessageCounters(2));
         values.addProperty("min_battery_mcu_temp", runtimeInfo.getMinBatteryMcuTemperature());
-        values.addProperty("min_battery_voltage", runtimeInfo.getMinBatteryVoltage());
+        values.addProperty("min_battery_voltage", runtimeInfo.getBatteryVoltage());
         values.addProperty("min_mcu_temp", runtimeInfo.getMinMcuTemperature());
         values.addProperty("runtime_errors", runtimeInfo.getRuntimeErrorsCount());
         values.addProperty("up_time", runtimeInfo.getUpTime());
@@ -529,8 +575,8 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource {
         return new EfentoTelemetry(System.currentTimeMillis(), values);
     }
 
-    private JsonElement getEfentoConfiguration(byte[] bytes) throws InvalidProtocolBufferException {
+    JsonElement getEfentoConfiguration(byte[] bytes) throws InvalidProtocolBufferException {
-        return parseString(ProtoConverter.dynamicMsgToJson(bytes, ConfigProtos.getDescriptor().getMessageTypes().get(2)));
+        return parseString(ProtoConverter.dynamicMsgToJson(bytes, ConfigProtos.getDescriptor().getMessageTypes().get(0)));
     }
 
     private static String getDate(long seconds) {

common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/utils/CoapEfentoUtils.java

@@ -59,14 +59,12 @@ public class CoapEfentoUtils {
         return String.format("%s UTC", simpleDateFormat.format(new Date(timestampInMillis)));
     }
 
-    public static JsonObject setDefaultMeasurements(String serialNumber, boolean batteryStatus, long measurementPeriod, long nextTransmissionAtMillis, long signal, long startTimestampMillis) {
+    public static JsonObject setDefaultMeasurements(String serialNumber, boolean batteryStatus, long nextTransmissionAtMillis, long signal) {
         JsonObject values = new JsonObject();
         values.addProperty("serial", serialNumber);
         values.addProperty("battery", batteryStatus ? "ok" : "low");
-        values.addProperty("measured_at", convertTimestampToUtcString(startTimestampMillis));
         values.addProperty("next_transmission_at", convertTimestampToUtcString(nextTransmissionAtMillis));
         values.addProperty("signal", signal);
-        values.addProperty("measurement_interval", measurementPeriod);
         return values;
     }
 

common/transport/coap/src/main/proto/efento/proto_config.proto

@@ -15,338 +15,471 @@
  */
 syntax = "proto3";
 
-import "efento/proto_measurement_types.proto";
 import "efento/proto_rule.proto";
+import "efento/proto_config_types.proto";
+import "efento/proto_measurement_types.proto";
 
 option java_package = "org.thingsboard.server.gen.transport.coap";
 option java_outer_classname = "ConfigProtos";
 
-/* Message containing optional channels control parameters                                                                      */
+message ProtoConfig {
-message ProtoOutputControlState {
-
-  /* Channel index                                                                                                              */
-  uint32 channel_index = 1;
-
-  /* Channel state ON/OFF. Range (1 - OFF; 2 - ON)                                                                              */
-  uint32 channel_state = 2;
-}
-
-/* Message containing request data for accessing calibration parameters                                                         */
-message ProtoCalibrationParameters {
-
-  /* Request details. Bitmask:                                                                                                  */
-  /*      - calibration_request[0:2] - requested channel number.                                                                */
-  uint32 calibration_request = 1;
-
-  /* Assignment of a channel.                                                                                                   */
-  uint32 channel_assignment = 2;
-
-  /* Table of calibration parameters. Max size = 8.                                                                             */
-  repeated int32 parameters = 3;
-}
-
-enum BleAdvertisingPeriodMode {
-
-  /* Invalid value                                                                                                              */
-  BLE_ADVERTISING_PERIOD_MODE_UNSPECIFIED = 0;
 
-  /* Default behavior - faster advertising when measurement period is < 15s.                                                    */
+  /* RESERVED FIELDS ---------------------------------------------------------------------------------------------------------- */
-  BLE_ADVERTISING_PERIOD_MODE_DEFAULT = 1;
 
-  /* User-configured normal interval is used.                                                                                   */
+  reserved 1,48;
-  BLE_ADVERTISING_PERIOD_MODE_NORMAL = 2;
 
-  /* User-configured fast interval is used.                                                                                     */
+  /* DEVICE STATUS FIELDS ----------------------------------------------------------------------------------------------------- */
-  BLE_ADVERTISING_PERIOD_MODE_FAST = 3;
-}
 
-/* Message containing BLE advertising period configuration                                                                      */
+  /* Serial number of the device.                                                                                               *
-message ProtoBleAdvertisingPeriod {
+   * Length: 6 bytes.                                                                                                           *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  bytes serial_number = 25;
 
-  /* BLE advertising mode:                                                                                                      */
+  /* Configuration payload split information:                                                                                   *
-  /*   - 1: Default, BLE advertising interval is set to 1022.5ms or some lower value, based on continuous measurement period.   */
+   *   - Values < 0 - Payload split, expect another part of the payload in the next message.                                    *
-  /*   - 2: Normal, uses user-configured value from 'normal' field.                                                             */
+   *                  The absolute value indicates an index of the current message                                              *
-  /*   - 3: Fast, uses user-configured value from 'fast' field (must be lower than or equal to 'normal' field).                 */
+   *   - Values = 0 - Payload not split                                                                                         *
-  BleAdvertisingPeriodMode mode = 1;
+   *   - Values > 0 - Last part of the split payload, the value indicates the total number of the messages sent                 *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
+  sint32 payload_split_info = 44;
 
-  /* BLE advertising interval when in normal mode, configured in 0.625ms steps.                                                 */
+  /* Identifier of the current configuration.                                                                                   *
-  /* Range: [32:16384]                                                                                                          */
+   * The value of this field changes with every configuration change.                                                           *
-  uint32 normal = 2;
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [07.00.00 - LATEST] / Previously as hash [06.00 - 06.xx.xx]                                                 */
+  uint32 configuration_hash = 21;
+
+  /* Timestamp when the new configuration was set.                                                                              *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [07.00.00 - LATEST] / Previously as hash_timestamp [06.02 - 06.xx.xx]                                       */
+  uint32 configuration_hash_timestamp = 39;
+
+  /* Configuration errors.                                                                                                      *
+   * Up to 20 error codes supported.                                                                                            *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [07.00.00 - LATEST] / Previously as errors [06.00 - 06.xx.xx]                                               */
+  repeated uint32 configuration_errors = 20;
+
+  /* Timestamp when a new configuration error was reported.                                                                     *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [07.00.00 - LATEST] / Previously as timestamp [06.02 - 06.xx.xx]                                            */
+  uint32 configuration_error_timestamp = 38;
+
+  /* Measurement channel types.                                                                                                 *
+   * This field is only sent by the device.                                                                                     *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  repeated MeasurementType channel_types = 27;
 
-  /* BLE advertising interval when in fast mode, configured in 0.625ms steps.                                                   */
+  /* NvM status:                                                                                                                *
-  /* Range: [32:16384]                                                                                                          */
+   *   - 1 - Defaults restored on CRC error: default sensor configuration restored due to the non-volatile memory configuration *
-  uint32 fast = 3;
+   *                                         data integrity failure                                                             *
-}
+   *   - 2 - NvM initialization error: changes in the sensor configuration won't be stored in the non-volatile memory, a power  *
+   *                                   reset of the sensor is required                                                          *
+   * When empty field is sent by the sensor NvM status is OK.                                                                   *
+   * NvM status can be cleared by sending to the sensor value 0x7F.                                                             *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  uint32 nvm_status = 62;
+
+  /* SERVER STATUS FIELDS ----------------------------------------------------------------------------------------------------- */
+
+  /* Current time in seconds since 1st of January 1970 (epoch time).                                                            *
+   * This field is only sent by the server.                                                                                     *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 current_time = 8;
 
-/* Main message sent in the payload. Each field in this message is independent of the others - only parameters that should be   */
+  /* REQUEST FIELDS ----------------------------------------------------------------------------------------------------------- */
-/* changed need to be sent in the payload.                                                                                      */
+
-/* If the value of a selected parameter shall not be changed, do not include it in the payload                                  */
+  /* Specifies whether the device should accept the configuration without functional testing (e.g., network connection).        *
-message ProtoConfig {
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as accept_without_testing [06.00 - 06.xx.xx]                               */
+  bool accept_without_testing_request = 22;
+
+  /* Specifies whether to send the configuration from the sensor to the configuration endpoint.                                 *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as request_configuration [06.00 - 06.xx.xx]                                */
+  bool configuration_request = 19;
+
+  /* Specifies whether to send the device information from the sensor to the device information endpoint.                       *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as request_device_info [06.00 - 06.xx.xx]                                  */
+  bool device_info_request = 6;
+
+  /* Specifies whether to send the extended configuration from the sensor to the extended configuration endpoint.               *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  bool extended_configuration_request = 63;
+
+  /* Specifies, if software update is available.                                                                                *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as request_fw_update [06.00 - 06.xx.xx]                                    */
+  bool update_software_request = 7;
+
+  /* Device will clear all runtime errors.                                                                                      *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as request_runtime_errors_clear [06.02 - 06.xx.xx]                         */
+  bool clear_runtime_errors_request = 37;
+
+  /* Device will power off its cellular modem for requested number of seconds.                                                  *
+   * Range: [60:604800] (1 minute : 7 days)                                                                                     *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 disable_modem_request = 18;
 
-  /* DEPRECATED - Used for backward compatibility with fw versions 5.x                                                          */
+  /* Specifies, if the modem firmware update is available.                                                                      *
-  /* repeated Threshold thresholds = 1;                                                                                         */
+   * String up to 48 characters:                                                                                                *
-
+   *   - DFOTA URL - For use by BC66/BC660 modem.                                                                               *
-  /* 'Measurement_period_base' and 'measurement_period_factor' define how often the measurements are taken.                     */
+   * This field is only sent by the user/server.                                                                                *
-  /* Sensors of 'Continuous' type take measurement each Measurement_period_base * measurement_period_factor.                    */
+   * Status: In use [07.00.00 - LATEST] / Previously as modem_update_request [06.08.00 - 06.xx.xx]                              */
-  /* Sensors of 'Binary' type take measurement each Measurement_period_base.                                                    */
+  string update_modem_request = 45;
-  /* For backward compatibility with versions 5.x in case of binary/mixed sensors, if the 'measurement_period_factor' is        */
+
-  /* not sent (equal to 0), then the default value '14' shall be used for period calculation.                                   */
+  /* Device will erase all measurements from memory.                                                                            *
-  /* For backward compatibility with versions 5.x in case of continues sensors, if the measurement_period_factor is             */
+   * This field is only sent by the user/server.                                                                                *
-  /* not sent (equal to 0), then the default value '1' shall be used for period calculation.                                    */
+   * Status: In use [07.00.00 - LATEST] / Previously as memory_reset_request [06.00 - 06.xx.xx]                                 */
-  /* measurement period base in seconds                                                                                         */
+  bool reset_memory_request = 30;
-  /* Range [1:65535] - minimum value can vary depends on installed sensors */
+
+  /* Device will restart the collection of memory statistics.                                                                   *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  bool restart_memory_stats_request = 64;
+
+  /* Specifies whether to send measurements from the sensor starting at the specified timestamp.                                *
+   * Tiemstamp in seconds since 1st of January 1970 (epoch time).                                                               *
+   * All previous measurements will be marked as sent.                                                                          *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  uint32 data_transfer_start_timestamp_request = 65;
+
+  /* Device will set new calibration parameters or will send the current set of parameters to the configuration endpoint.       *
+   * Status: Deprecated [06.10.00 - 06.xx.xx]                                                                                   */
+  ProtoCalibrationParametersRequest calibration_parameters_request = 49;
+
+  /* Device will set the new output state of the output control channel pins.                                                   *
+   * Up to 3 channels supported in the one request.                                                                             *
+   * This field is only sent by the user/server.                                                                                *
+   * Status: In use [07.00.00 - LATEST] / Previously as output_control_state_request [06.13.00/06.21.00 - 06.xx.xx]             */
+  repeated ProtoOutputControlState set_output_control_state_request = 58;
+
+  /* MEASUREMENTS CONFIGURATION ----------------------------------------------------------------------------------------------- */
+
+  /* Measurement period defines how often the measurements are to be taken.                                                     *
+   * Sensors of 'Continuous' type take measurement each 'measurement_period_base' * 'measurement_period_factor'.                *
+   * Sensors of 'Binary' type take measurement each 'measurement_period_base'.                                                  *
+   * For backward compatibility with versions 5.xx in case of 'Binary/Mixed' sensors, if the 'measurement_period_factor' is     *
+   * not sent (equal to 0), then the default value '14' shall be used for the period calculation.                               *
+   * For backward compatibility with versions 5.xx in case of 'Continuous' sensors, if the 'measurement_period_factor' is       *
+   * not sent (equal to 0), then the default value '1' shall be used for the period calculation.                                */
+
+  /* Measurement period base in seconds.                                                                                        *
+   * Range: [1:65535] (minimum value may vary depending on sensors installed)                                                   *
+   * Group: Measurement Period                                                                                                  *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 measurement_period_base = 2;
 
-  /* Measurement period factor                                                                                                  */
+  /* Measurement period factor.                                                                                                 *
-  /* Range [1:65535] - minimum value can vary depends on installed sensors */
+   * Range: [1:65535] (minimum value may vary depending on sensors installed)                                                   *
+   * Group: Measurement Period                                                                                                  *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 measurement_period_factor = 26;
 
-  /* Transmission interval in seconds. Range: [60:604800]                                                                       */
+  /* BLUETOOTH CONFIGURATION -------------------------------------------------------------------------------------------------- */
-  uint32 transmission_interval = 3;
 
-  /* BLE turnoff time in seconds. Once receiving this setting, BLE will be switched off after the set number of seconds.        */
+  /* Bluetooth turn-off time:                                                                                                   *
-  /* If BLE is already switched off, it will switch on for the set number of seconds and switch off afterwards.                 */
+   *   - [60:604800] - Time in seconds after which Bluetooth is turned off                                                      *
-  /* Range [60:604800] and 0xFFFFFFFF                                                                                           */
+   *   - 0xFFFFFFFF - Bluetooth is always on                                                                                    *
-  /* 0xFFFFFFFF  - always on                                                                                                    */
+   * When this setting is received, Bluetooth is turned off after the set number of seconds.                                    *
+   * If Bluetooth is already off, it will turn on for the set number of seconds and then turn off.                              *
+   * Group: Bluetooth Turn-Off                                                                                                  *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 ble_turnoff_time = 4;
 
-  /* ACK interval in seconds                                                                                                    */
+  /* Bluetooth Tx power level.                                                                                                  *
-  /* Range [180:2592000] and 0xFFFFFFFF                                                                                         */
+   * Value is the index of the absolute value of the Tx power, which depends on the BLE module.                                 *
-  /* 0xFFFFFFFF  - always request ACK                                                                                           */
+   * Range: [1:4]                                                                                                               *
-  uint32 ack_interval = 5;
+   * Group: Bluetooth Tx Power                                                                                                  *
-
+   * Status: In use [06.02 - LATEST]                                                                                            */
-  /* Specifies, if the additional device info is requested. If true, sensor will send a message to endpoint '/i' with the       */
+  uint32 ble_tx_power_level = 36;
-  /* device info. This field is only sent by server                                                                             */
-  bool request_device_info = 6;
-
-  /* Specifies, if software update is available. This field is only sent by server                                              */
-  bool request_fw_update = 7;
-
-  /* Current time in seconds sine 1st of January 1970 (epoch time).                                                             */
-  uint32 current_time = 8;
-
-  /* NB-IoT transfer limit                                                                                                      */
-  /* Range: [1:65535]                                                                                                           */
-  /* 65535 - disable transfer limit function                                                                                    */
-  uint32 transfer_limit = 9;
-
-  /* NB-IoT transfer limit timer in seconds                                                                                     */
-  /* Range: [1:65535]                                                                                                           */
-  /* 65535 - disable transfer limit function                                                                                    */
-  uint32 transfer_limit_timer = 10;
-
-  /* For firmware >= 6.07.00:                                                                                                   */
-  /* IP or URL address of the data (measurements) server                                                                        */
-  /* The IP or URL of the data server, provided as string with a maximum length of 31 characters                                */
-  /* For example, use "18.184.24.239" for an IP address or "efento.test.io" for a URL                                           */
-  /* For firmware < 6.07.00:                                                                                                    */
-  /* IP address of the data (measurements) server                                                                               */
-  /* For example, use "18.184.24.239"                                                                                           */
-  string data_server_ip = 11;
-
-  /* Data (measurements) server port                                                                                            */
-  /* Range: [1:65535]                                                                                                           */
-  uint32 data_server_port = 12;
-
-  /* For firmware >= 6.07.00:                                                                                                   */
-  /* IP or URL address of the update server                                                                                     */
-  /* The IP or URL of the update server, provided as string with a maximum length of 31 characters                              */
-  /* For example, use "18.184.24.239" for an IP address or "efento.test.io" for a URL                                           */
-  /* For firmware < 6.07.00:                                                                                                    */
-  /* IP address of the update server                                                                                            */
-  /* For example, use "18.184.24.239"                                                                                           */
-  string update_server_ip = 13;
-
-  /* Update server port for UDP transmission                                                                                    */
-  /* Range: [1:65535]                                                                                                           */
-  uint32 update_server_port_udp = 14;
-
-  /* Update server port for CoAP transmission                                                                                   */
-  /* Range: [1:65535]                                                                                                           */
-  uint32 update_server_port_coap = 15;
-
-  /* APN as string. Max length 49                                                                                               */
-  /* String with special character 0x7F (DEL) only indicates that automatic apn is turn on                                      */
-  string apn = 16;
 
-  /* PLMN selection                                                                                                             */
+  /* Encryption key.                                                                                                            *
-  /* Range: [100:999999]                                                                                                        */
+   * Max length: 16 bytes.                                                                                                      *
-  /* 0xFFFFFFFF or 1000000 - automatic selection                                                                                */
+   * A one-element array containing only one 0x7F (DEL) byte disables encryption.                                               *
-  uint32 plmn_selection = 17;
+   * Device sends two last bytes of SHA256 hash of current key in this field.                                                   *
+   * When the encryption key is disabled, the device sends a 0x7F (DEL) byte.                                                   *
+   * Group: Encryption                                                                                                          *
+   * Status: In use [06.11.00 - LATEST]                                                                                         */
+  bytes encryption_key = 54;
 
-  /* Device will power off its cellular modem for requested number of seconds.                                                  */
+  /* Bluetooth advertising period.                                                                                              *
-  /* Range: [60:604800] (1 minute : 7 days)                                                                                     */
+   * Group: Bluetooth Advertising Period                                                                                        *
-  /* This field is only sent by server                                                                                          */
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
-  uint32 disable_modem_request = 18;
+  ProtoBleAdvertisingPeriod ble_advertising_period = 59;
 
-  /* If set, the device will send its configuration to the endpoint '/c' as a confirmable message                               */
+  /* Advertisement manufacturer specific data format.                                                                           *
-  /* This field is only sent by server                                                                                          */
+   * Group: Advertisement Manufacturer Data Format                                                                              *
-  bool request_configuration = 19;
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  AdvertisementManufacturerDataFormat advertisement_manufacturer_data_format = 60;
 
-  /* Device's error codes.                                                                                                      */
+  /* EDGE LOGIC CONFIGURATION ------------------------------------------------------------------------------------------------- */
-  /* This field is only sent by device                                                                                          */
-  repeated uint32 errors = 20;
 
-  /* Identifier of current configuration - Every change of the configuration results in change of the value of this field       */
+  /* Edge logic rules set on the device.                                                                                        *
-  /* This field is only sent by device                                                                                          */
+   * Up to 16 rules supported (previously 12 rules [06.00 - 07.01.xx]).                                                         *
-  uint32 hash = 21;
+   * Group: Edge Logic Rule No. #                                                                                               *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  repeated ProtoRule rules = 28;
 
-  /* If true, the device will accept the configuration without functional testing (eg. network connection)                      */
+  /* Calendars set on the device.                                                                                               *
-  bool accept_without_testing = 22;
+   * Up to 6 calendars supported.                                                                                               *
+   * Group: Calendar No. #                                                                                                      *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
+  repeated ProtoCalendar calendars = 47;
 
-  /* Cloud token configuration:                                                                                                 */
+  /* SERVER COMMUNICATION CONFIGURATION --------------------------------------------------------------------------------------- */
-  /*   - 1: cloud token set to the value of cloud_token field                                                                   */
-  /*   - 2: cloud token set to IMEI of the cellular module                                                                      */
-  /*   - 255: do not send cloud_token field                                                                                     */
-  uint32 cloud_token_config = 23;
 
-  /* Cloud token that should be sent with each measurement frame                                                                */
+  /* Transmission interval in seconds.                                                                                          *
-  string cloud_token = 24;
+   * Range: [60:604800]                                                                                                         *
+   * Group: Server Intervals                                                                                                    *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 transmission_interval = 3;
 
-  /* Serial number of the device                                                                                                */
+  /* ACK interval:                                                                                                              *
-  /* This field is only sent by device                                                                                          */
+   *   - [180:2592000] - Time in seconds after which the device will request an ACK                                             *
-  bytes serial_number = 25;
+   *   - 0xFFFFFFFF - Always request ACK                                                                                        *
+   * Group: Server Intervals                                                                                                    *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 ack_interval = 5;
 
-  /* Type of channel                                                                                                            */
+  /* Server transfer limit:                                                                                                     *
-  /* This field is only sent by device                                                                                          */
+   *   - [1:65534] - Number of transfers                                                                                        *
-  repeated MeasurementType channel_types = 27;
+   *   - 65535 - Transfer limit disabled                                                                                        *
+   * Group: Server Transfer Limit                                                                                               *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 transfer_limit = 9;
 
-  /* Edge logic rules set on the device. Up to 12 rules are supported                                                           */
+  /* Server transfer limit timer:                                                                                               *
-  repeated ProtoRule rules = 28;
+   *   - [1:65534] - Time in seconds after which the transfer is renewed                                                        *
+   *   - 65535 - Transfer limit disabled                                                                                        *
+   * Group: Server Transfer Limit                                                                                               *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 transfer_limit_timer = 10;
 
-  /* Supervision period                                                                                                         */
+  /* Server supervision period:                                                                                                 *
-  /* Range: [180:604800]                                                                                                        */
+   *   - [180:604800] - Time in seconds after which the device resets itself if there is no communication with the server       *
-  /* 0xFFFFFFFF - Functionality disabled                                                                                        */
+   *   - 0xFFFFFFFF - Server supervision disabled                                                                               *
+   * Group: Server Supervision                                                                                                  *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 supervision_period = 29;
 
-  /* If true, sensor's measurement memory will be erased                                                                        */
+  /* DATA SERVER CONFIGURATION ------------------------------------------------------------------------------------------------ */
-  bool memory_reset_request = 30;
 
-  /* Bytes 0-4 - Band selection mask. Mask =  1 << position                                                                     */
+  /* Data server address.                                                                                                       *
-  /* Band       | 1 | 2 | 3 | 4 | 5 | 8 | 12 | 13 | 17 | 18 | 19 | 20 | 25 | 26 | 28 | 66 | 71 | 85 |                           */
+   * String up to 31 characters:                                                                                                *
-  /* Position:  | 0 | 1 | 2 | 3 | 4 | 5 | 6  |  7 |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 |                           */
+   *   - IPv4 address (examples: "18.184.24.239") [06.00 - 06.06.xx]                                                            *
-  /* example: To enable band 3, 8 and 20 set to  (1 << 2) + (1 << 5) + (1 << 11) = 2084                                         */
+   *   - IPv4/URL address (examples: "18.184.24.239", "efento.test.io") [06.07.00 - LATEST]                                     *
-  uint32 modem_bands_mask = 31;
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  string data_server_ip = 11;
+
+  /* Data server port.                                                                                                          *
+   * Range: [1:65535]                                                                                                           *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 data_server_port = 12;
 
-  /* Data endpoint (string - max length 16)                                                                                     */
+  /* Data endpoint.                                                                                                             *
+   * String up to 11 characters.                                                                                                *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.02 - LATEST]                                                                                            */
   string data_endpoint = 32;
 
-  /* Configuration endpoint (string - max length 16)                                                                            */
+  /* Configuration endpoint.                                                                                                    *
+   * String up to 11 characters.                                                                                                *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.02 - LATEST]                                                                                            */
   string configuration_endpoint = 33;
 
-  /* Device info endpoint (string - max length 16)                                                                              */
+  /* Extended configuration endpoint.                                                                                           *
+   * String up to 11 characters.                                                                                                *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  string extended_configuration_endpoint = 61;
+
+  /* Device information endpoint.                                                                                               *
+   * String up to 11 characters.                                                                                                *
+   * Group: Device Information Endpoint                                                                                         *
+   * Status: In use [06.02 - LATEST]                                                                                            */
   string device_info_endpoint = 34;
 
-  /* Time endpoint (string - max length 16)                                                                                     */
+  /* Time endpoint.                                                                                                             *
+   * String up to 11 characters.                                                                                                *
+   * Group: Time Endpoint                                                                                                       *
+   * Status: In use [06.02 - LATEST]                                                                                            */
   string time_endpoint = 35;
 
-  /* Bluetooth TX power level. Value is the index of the absolute value of TX power, that depends on the BLE module             */
+  /* UPDATE SERVER CONFIGURATION ---------------------------------------------------------------------------------------------- */
-  /* Range: [1:4]                                                                                                               */
-  uint32 ble_tx_power_level = 36;
 
-  /* Deprecated field                                                                                                           */
+  /* Update server address.                                                                                                     *
-  /* If true, the sensor's runtime errors will be cleared                                                                       */
+   * String up to 31 characters:                                                                                                *
-  bool request_runtime_errors_clear = 37;
+   *   - IPv4 address (examples: "18.184.24.239") [06.00 - 06.06.xx]                                                            *
+   *   - IPv4/URL address (examples: "18.184.24.239", "efento.test.io") [06.07.00 - LATEST]                                     *
+   * Group: Update Server                                                                                                       *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  string update_server_ip = 13;
 
-  /* Timestamp when a new error code was reported                                                                               */
+  /* Update server port for UDP transfer.                                                                                       *
-  uint32 error_timestamp = 38;
+   * Range: [1:65535]                                                                                                           *
+   * Group: Update Server                                                                                                       *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 update_server_port_udp = 14;
 
-  /* Timestamp when the new configuration was set                                                                               */
+  /* Update server port for CoAP transfer.                                                                                      *
-  uint32 hash_timestamp = 39;
+   * Range: [1:65535]                                                                                                           *
+   * Group: Update Server                                                                                                       *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 update_server_port_coap = 15;
 
-  /* Cloud token CoAP option ID:                                                                                                */
+  /* CLOUD CONFIGURATION ------------------------------------------------------------------------------------------------------ */
-  /*   - [1:64999] - CoAP option ID containing cloud token                                                                      */
-  /*   - 65000 - cloud token sent in the payload                                                                                */
-  uint32 cloud_token_coap_option = 40;
 
-  /* ECDSA payload signature CoAP option ID:                                                                                    */
+  /* Cloud token configuration:                                                                                                 *
-  /*   - [1:64999] - CoAP option ID containing ECDSA payload signature                                                          */
+   *   - 1 - Cloud token set to the value of the 'cloud_token' field                                                            *
-  /*   - 65000 - no payload signature in CoAP option                                                                            */
+   *   - 2 - Cloud token set to the modem identification (IMEI for cellular modems)                                             *
-  uint32 payload_signature_coap_option = 41;
+   *   - 255 - Do not send 'cloud_token' field                                                                                  *
+   * Group: Cloud Token                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 cloud_token_config = 23;
 
-  /* DNS server IP address grouped in the array as four octets. Set 255.255.255.255 to use a network DNS server                 */
+  /* Cloud token that should be sent with each measurement frame.                                                               *
-  /* Note: when setting less than four octets the remaining will be filled with zeros.                                          */
+   * String up to 36 characters.                                                                                                *
-  repeated uint32 dns_server_ip = 42;
+   * Group: Cloud Token                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  string cloud_token = 24;
 
-  /* DNS TTL configuration:                                                                                                     */
+  /* Cloud token CoAP option ID:                                                                                                *
-  /*   - [1:864000] - custom TTL in seconds (additionally, the DNS request when communication has failed)                       */
+   *   - [1:64999] - CoAP option ID with cloud token                                                                            *
-  /*   - 864001 - accept TTL from the DNS server (additionally, the DNS request when communication has failed)                  */
+   *   - 65000 - Cloud token sent in the payload                                                                                *
-  /*   - 864002 - DNS request is only after communication failed                                                                */
+   * Group: Cloud Token                                                                                                         *
-  uint32 dns_ttl_config = 43;
+   * Status: In use [06.07.00 - LATEST]                                                                                         */
+  uint32 cloud_token_coap_option = 40;
 
-  /* Configuration payload split information. Information about dividing the payload into parts                                 */
+  /* ECDSA payload signature CoAP option ID:                                                                                    *
-  /* values < 0 - payload has been split, expect another part of the payload in the next message.                               */
+   *   - [1:64999] - CoAP option ID with payload signature                                                                      *
-  /*             The absolute value indicates an index of the current message.                                                  */
+   *   - 65000 - Payload signature is not sent                                                                                  *
-  /* value = 0 - payload has not been splitted                                                                                  */
+   * Group: Cloud Token                                                                                                         *
-  /* values > 0 - last part of the split payload, the value indicates the total number of the messages sent                     */
+   * Status: In use [06.07.00 - LATEST]                                                                                         */
-  sint32 payload_split_info = 44;
+  uint32 payload_signature_coap_option = 41;
 
-  /* Modem update request (string - max length 48)                                                                              */
+  /* Modem identification CoAP option ID:                                                                                       *
-  /* This field is only sent by server                                                                                          */
+   *   - [1:64999] - CoAP option ID with modem identification                                                                   *
-  /* For BC66 module, this field is a DFOTA URL                                                                                 */
+   *   - 65000 - Modem identification is not sent                                                                               *
-  string modem_update_request = 45;
+   * Group: Cloud Token                                                                                                         *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  uint32 modem_identification_coap_option = 52;
 
-  /* Cellular configuration parameters.                                                                                         */
+  /* NETWORK CONFIGURATION ---------------------------------------------------------------------------------------------------- */
-  /* 1st item - Number of used cellular parameters                                                                              */
-  /* 2nd - 12th items - Cellular parameters                                                                                     */
-  repeated uint32 cellular_config_params = 46;
 
-  /* Calendar configuration. Up to 6 calendars are supported                                                                    */
+  /* DNS server IP address.                                                                                                     *
-  repeated ProtoCalendar calendars = 47;
+   * Grouped in the array as four octets. Set 255.255.255.255 to use a cellular network DNS server.                             *
+   * Note: when setting less than four octets the remaining will be filled with zeros.                                          *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.07.00 - LATEST]                                                                                         */
+  repeated uint32 dns_server_ip = 42;
 
-  /* DEPRECATED - Used for backward compatibility                                                                               */
+  /* DNS TTL configuration:                                                                                                     *
-  reserved 48;
+   *   - [1:864000] - Custom TTL in seconds (if communication fails, DNS is also queried)                                       *
-
+   *   - 864001 - Accept TTL from the DNS server (if communication fails, DNS is also queried)                                  *
-  /* Set/get calibration parameters for single channel.                                                                         */
+   *   - 864002 - DNS query only after communication failure                                                                    *
-  ProtoCalibrationParameters calibration_parameters_request = 49;
+   * Group: DNS                                                                                                                 *
-
+   * Status: In use [06.07.00 - LATEST]                                                                                         */
-  /* LED behaviour configuration:                                                                                               */
+  uint32 dns_ttl_config = 43;
-  /*    Period of LEDs flashing (5-600 seconds in 5 seconds resolution):                                                        */
-  /*        - led_config[0] - green LED                                                                                         */
-  /*        - led_config[1] - red LED                                                                                           */
-  /*    Time from entering the normal state, after which the LED indication is turned off                                       */
-  /*    (0-240 minutes in 1 minute resolution, or 255 for always turned on):                                                    */
-  /*        - led_config[2] - flashing red led on communication problem                                                         */
-  /*        - led_config[3] - flashing red led on a sensor problem                                                              */
-  /*        - led_config[4] - flashing red led on a low power                                                                   */
-  /*        - led_config[5] - flashing green led on measurement                                                                 */
-  /*        - led_config[6] - flashing green led on transmission                                                                */
-  /*        - led_config[7] - flashing green led to indicate sensor's proper operation                                          */
-  /*    - led_config[8] - Blink duration (20-1000ms in 5 ms resolution)                                                         */
-  repeated uint32 led_config = 50;
 
-  /* Network troubleshooting configuration, if bluetooth is turned off and communication with the server is faulty,             */
+  /* Network troubleshooting:
-  /* bluetooth will be automatically turned on until the connection is stabilized                                               */
+   *   - 1 - Network troubleshooting disabled                                                                                   *
-  /*   - 1: network troubleshooting disabled                                                                                    */
+   *   - 2 - Network troubleshooting enabled                                                                                    *
-  /*   - 2: network troubleshooting enabled                                                                                     */
+   * If Bluetooth is turned off and communication with the server is faulty, Bluetooth will be automatically turned on until    *
+   * the connection is stabilized.                                                                                              *
+   * Group: Network                                                                                                             *
+   * Status: In use [06.10.00 - LATEST]                                                                                         */
   uint32 network_troubleshooting = 51;
 
-  /* Reserved by gateway client                                                                                                 */
+  /* Network key.                                                                                                               *
-  reserved 52, 53;
+   * Max length: 16 bytes.                                                                                                      *
-
+   * A one-element array containing only one 0x7F (DEL) byte disables network key.                                              *
-  /* Encryption key configuration. Sensor sends in this field two last bytes of SHA256 hash calculated from its current         */
+   * Device sends two last bytes of SHA256 hash of current key in this field.                                                   *
-  /* encryption_key configuration. When encryption key is disabled one byte 0x7F (DEL) is sent.                                 */
+   * When the network key is disabled, the device sends a 0x7F (DEL) byte.                                                      *
-  /* Max length: 16 bytes.                                                                                                      */
+   * Group: Local Network                                                                                                       *
-  /* 0x7F - encryption key disabled.                                                                                            */
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
-  bytes encryption_key = 54;
+  bytes network_key = 53;
-
+
-  /* User name as string. Max length 31                                                                                         */
+  /* MODEM CONFIGURATION ------------------------------------------------------------------------------------------------------ */
-  /* String with special character 0x7F (DEL) only indicates that automatic user name is turn on                                */
+
-  /* User name can only be set to custom value if apn has been configured (is not automatic)                                    */
+  /* APN (Access Point Name).                                                                                                   *
-  string apn_user_name = 55;
+   * String up to 49 characters.                                                                                                *
+   * A string containing only the special character 0x7F (DEL) indicates that automatic APN is enabled.                         *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  string apn = 16;
 
-  /* Password as string. Max length 31                                                                                          */
+  /* APN username.                                                                                                              *
-  /* String with special character 0x7F (DEL) only indicates that automatic password is turn on                                 */
+   * String up to 31 characters.                                                                                                *
-  /* Password can only be set to custom value if apn_user_name has been configured (is not automatic)                           */
+   * A string containing only the special character 0x7F (DEL) indicates that the username is not being used.                   *
+   * The username can only be set to a custom value if APN has been configured.                                                 *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [07.00.00 - LATEST] / Previously as apn_user_name [06.11.00 - 06.xx.xx]                                     */
+  string apn_username = 55;
+
+  /* APN password.                                                                                                              *
+   * String up to 31 characters.                                                                                                *
+   * A string containing only the special character 0x7F (DEL) indicates that the password is not being used.                   *
+   * The password can only be set to a custom value if APN username has been configured.                                        *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.11.00 - LATEST]                                                                                         */
   string apn_password = 56;
 
-  /* Reserved by versions above 06.20.00                                                                                        */
+  /* PLMN selection:                                                                                                            *
-  reserved 57;
+   *   - [100:999999] - Selected operator code                                                                                  *
+   *   - 1000000 - Automatic selection                                                                                          *
+   *   - 0xFFFFFFFF - Automatic selection (legacy)                                                                              *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 plmn_selection = 17;
 
-  /* Control output state on channel pin. Maximal number of requests equals 3                                                   */
+  /* Modem bands mask.                                                                                                          *
-  /* This field is only sent by server                                                                                          */
+   * 4-byte bit mask, where each bit represents a specific band:                                                                *
-  repeated ProtoOutputControlState output_control_state_request = 58;
+   * Band: | 1 | 2 | 3 | 4 | 5 | 8 | 12 | 13 | 17 | 18 | 19 | 20 | 25 | 26 | 28 | 66 | 71 | 85 | 70 |                           *
+   * Bit:  | 0 | 1 | 2 | 3 | 4 | 5 |  6 |  7 |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 |                           *
+   * Example: To enable band 3, 8 and 20 set to 2084 = (1 << 2) + (1 << 5) + (1 << 11)                                          *
+   * Group: Data Server                                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 modem_bands_mask = 31;
 
-  /* BLE advertising period configuration.                                                                                      */
+  /* Modem configuration parameters.                                                                                            *
-  ProtoBleAdvertisingPeriod ble_advertising_period = 59;
+   * 1st item - The number of cellular parameters that are used (depending on the modem in use).                                *
-}
+   * 2nd - 16th item - Cellular parameters.                                                                                     *
+   * Group: Cellular Configuration                                                                                              *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
+  repeated uint32 cellular_config_params = 46;
+
+  /* Network search schema.                                                                                                     *
+   * Group: Network Search                                                                                                      *
+   * Status: In use [06.20.00 - LATEST]                                                                                         */
+  ProtoNetworkSearch network_search = 57;
+
+  /* USER INTERFACE CONFIGURATION --------------------------------------------------------------------------------------------- */
+
+  /* LEDs behavior.                                                                                                             *
+   * Period of LED blinking in 5-second unit (value is multiplied by 5). Range: [1:120]:                                        *
+   *   - 1st item - Period of GREEN LED blinking                                                                                *
+   *   - 2nd item - Period of RED LED blinking                                                                                  *
+   * Time elapsing from the entry into the normal state, after which the LED indicator is switched off, in minutes.             *
+   * Range: [0:240; 255]. Value of 255 means always on:                                                                         *
+   *   - 3rd item - Blinking RED LED on communication problem                                                                   *
+   *   - 4th item - Blinking RED LED on a sensor problem                                                                        *
+   *   - 5th item - Blinking RED LED on a low power                                                                             *
+   *   - 6th item - Blinking GREEN LED on measurement                                                                           *
+   *   - 7th item - Blinking GREEN LED on transmission                                                                          *
+   *   - 8th item - Blinking GREEN LED to indicate sensor's proper operation                                                    *
+   * 9th item - Duration of LED blinking in 5-millisecond unit. Range: [4:200]                                                  *
+   * Group: LED                                                                                                                 *
+   * Status: In use [06.10.00 - LATEST]                                                                                         */
+  repeated uint32 led_config = 50;
+}

common/transport/coap/src/main/proto/efento/proto_config_types.proto

@@ -0,0 +1,125 @@
+/**
+ * Copyright © 2016-2026 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+syntax = "proto3";
+
+option java_package = "org.thingsboard.server.gen.transport.coap";
+option java_outer_classname = "ConfigTypesProtos";
+
+message ProtoCalibrationParametersRequest {
+
+  /* Request details.                                                                                                           *
+   * Bitmask:                                                                                                                   *
+   *   - Bit 0:2 - Requested channel number, range: [1:6]                                                                       *
+   * Status: Deprecated [06.10.00 - 06.xx.xx]                                                                                   */
+  uint32 calibration_request = 1;
+
+  /* Channel assignment - the sensor code.                                                                                      *
+   * Status: Deprecated [06.10.00 - 06.xx.xx]                                                                                   */
+  uint32 channel_assignment = 2;
+
+  /* Channel calibration parameters.                                                                                            *
+   * Up to 8 parameters supported.                                                                                              *
+   * If this field is empty, the sensor will send the current set of parameters.                                                *
+   * Status: Deprecated [06.10.00 - 06.xx.xx]                                                                                   */
+  repeated int32 parameters = 3;
+}
+
+message ProtoOutputControlState {
+
+  /* Channel index.                                                                                                             *
+   * Range: [0:5]                                                                                                               *
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
+  uint32 channel_index = 1;
+
+  /* Channel output state:                                                                                                      *
+   *   - 1 - OFF                                                                                                                *
+   *   - 2 - ON                                                                                                                 *
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
+  uint32 channel_state = 2;
+}
+
+enum BleAdvertisingPeriodMode {
+
+  /* Invalid value.                                                                                                             */
+  BLE_ADVERTISING_PERIOD_MODE_UNSPECIFIED = 0;
+
+  /* Default mode.                                                                                                              *
+   * Bluetooth advertising interval is set to 1022.5ms or a lower value, based on the continuous measurement period.            */
+  BLE_ADVERTISING_PERIOD_MODE_DEFAULT = 1;
+
+  /* Normal mode.                                                                                                               *
+   * Uses the value configured by the user from the 'normal' field.                                                             */
+  BLE_ADVERTISING_PERIOD_MODE_NORMAL = 2;
+
+  /* Fast mode.                                                                                                                 *
+   * Uses the value configured by the user from the 'fast' field.                                                               */
+  BLE_ADVERTISING_PERIOD_MODE_FAST = 3;
+}
+
+message ProtoBleAdvertisingPeriod {
+
+  /* Bluetooth advertising mode.                                                                                                *
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
+  BleAdvertisingPeriodMode mode = 1;
+
+  /* Bluetooth advertising interval in normal mode, configured in steps of 0.625 ms.                                            *
+   * Range: [32:16384]                                                                                                          *
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
+  uint32 normal = 2;
+
+  /* Bluetooth advertising interval in fast mode, configured in steps of 0.625 ms.                                              *
+   * Range: [32:16384]                                                                                                          *
+   * Status: In use [06.13.00/06.21.00 - LATEST]                                                                                */
+  uint32 fast = 3;
+}
+
+enum AdvertisementManufacturerDataFormat {
+
+  /* Invalid value.                                                                                                             */
+  ADVERTISEMENT_MANUFACTURER_DATA_FORMAT_UNSPECIFIED = 0;
+
+  /* Advertisement manufacturer specific data format 3.                                                                         */
+  ADVERTISEMENT_MANUFACTURER_DATA_FORMAT_V3 = 1;
+
+  /* Advertisement manufacturer specific data format 5.                                                                         */
+  ADVERTISEMENT_MANUFACTURER_DATA_FORMAT_V5 = 2;
+}
+
+message ProtoNetworkSearch {
+
+  /* Timing schema, if successful registration since the last reset.                                                            *
+   * Length: 6 items.                                                                                                           *
+   * 1st - 6th item - Time in minutes. Range: [1:255].                                                                          *
+   * Status: In use [06.20.00 - LATEST]                                                                                         */
+  repeated uint32 time_schema_last_registration_ok = 1;
+
+  /* Timing schema, if no successful registration since the last reset.                                                         *
+   * Length: 6 items.                                                                                                           *
+   * 1st - 6th item - Time in minutes. Range: [1:255].                                                                          *
+   * Status: In use [06.20.00 - LATEST]                                                                                         */
+  repeated uint32 time_schema_last_registration_not_ok = 2;
+
+  /* Disable base period in minutes.                                                                                            *
+   * Disable time = 'disable_period_base' * counter (from 1 to 'counter_max').                                                  *
+   * Range: [1:255]                                                                                                             *
+   * Status: In use [06.20.00 - LATEST]                                                                                         */
+  uint32 disable_period_base = 3;
+
+  /* Disable counter maximum.                                                                                                   *
+   * Range: [1:255]                                                                                                             *
+   * Status: In use [06.20.00 - LATEST]                                                                                         */
+  uint32 counter_max = 4;
+}

common/transport/coap/src/main/proto/efento/proto_device_info.proto

@@ -18,185 +18,330 @@ syntax = "proto3";
 option java_package = "org.thingsboard.server.gen.transport.coap";
 option java_outer_classname = "DeviceInfoProtos";
 
+message ProtoRuntime
+{
+
+  /* Up-time in seconds (since reset).                                                                                          *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 up_time = 1;
+
+  /* Message counters (since reset).                                                                                            *
+   * 1st item - Confirmable message attempts counter.                                                                           *
+   * 2nd item - Non-confirmable message attempts counter.                                                                       *
+   * 3rd item - Successful message counter.                                                                                     *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  repeated uint32 message_counters = 2;
+
+  /* MCU temperature in Celsius.                                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  sint32 mcu_temperature = 3;
+
+  /* Battery voltage in mV.                                                                                                     *
+   *   - [0:65534] - Battery voltage in millivolts                                                                              *
+   *   - 65535 - No measurement                                                                                                 *
+   * Status: In use [07.00.00 - LATEST] / Previously as min_battery_voltage [06.00 - 06.xx.xx]                                  */
+  uint32 battery_voltage = 4;
+
+  /* MCU temperature in Celsius when minimum battery voltage was reached.                                                       *
+   * Status: Deprecated [06.00 - 06.xx.xx]                                                                                      */
+  sint32 min_battery_mcu_temperature = 5;
+
+  /* Battery reset timestamp in seconds since 1st of January 1970 (epoch time).                                                 *
+   * Status: Deprecated [06.00 - 06.xx.xx]                                                                                      */
+  uint32 battery_reset_timestamp = 6;
+
+  /* Maximum MCU temperature in Celsius.                                                                                        *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  sint32 max_mcu_temperature = 7;
+
+  /* Minimum MCU temperature in Celsius                                                                                         *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  sint32 min_mcu_temperature = 8;
+
+  /* Device's runtime errors.                                                                                                   *
+   * Up to 20 error items supported.                                                                                            *
+   * Status: In use [06.02 - LATEST]                                                                                            */
+  repeated uint32 runtime_errors = 9;
+
+  /* Number of sensor resets (since power-up).                                                                                  *
+   * Status: In use [06.21.00 - LATEST]                                                                                         */
+  uint32 reset_counter = 10;
+}
+
+message ProtoUpdateInfo
+{
+
+  /* Timestamp of the last update check in seconds since 1st of January 1970 (epoch time).                                      *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 timestamp = 1;
+
+  /* Status of the last update check:                                                                                           *
+   *   - 1 - No update check                                                                                                    *
+   *   - 2 - No error                                                                                                           *
+   *   - 3 - UDP socekt error                                                                                                   *
+   *   - 4 - Invalid hash                                                                                                       *
+   *   - 5 - Missing packet                                                                                                     *
+   *   - 6 - Invalid data                                                                                                       *
+   *   - 7 - Sending timeout                                                                                                    *
+   *   - 8 - No software to update                                                                                              *
+   *   - 9 - Sending unexpected error                                                                                           *
+   *   - 10 - Unexpected error                                                                                                  *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  uint32 status = 2;
+}
+
 enum ModemType
 {
 
-  /* Invalid value                                                                                                              */
+  /* Invalid value.                                                                                                             */
   MODEM_TYPE_UNSPECIFIED = 0;
 
-  /* Quectel BC66 modem                                                                                                         */
+  /* Quectel BC66 modem.                                                                                                        */
   MODEM_TYPE_BC66 = 1;
 
-  /* Quectel BC66-NA modem                                                                                                      */
+  /* Quectel BC66-NA modem.                                                                                                     */
   MODEM_TYPE_BC66NA = 2;
+
+  /* Uses a shared modem from another sensor.                                                                                   */
+  MODEM_TYPE_SHARED_MODEM = 3;
+
+  /* Quectel BC660 modem.                                                                                                       */
+  MODEM_TYPE_BC660 = 4;
 }
 
-message ProtoRuntime
+enum ModemFirmwareVersion
 {
+  /* Invalid value.                                                                                                             */
+  MODEM_FIRMWARE_VERSION_UNSPECIFIED = 0;
 
-  /* Up-time in seconds (since reset)                                                                                           */
+  /* Unable to read firmware version from device.                                                                               */
-  uint32 up_time = 1;
+  MODEM_FIRMWARE_VERSION_READING_ERROR = 1;
 
-  /* Message counters (since reset). There are 3 counters:                                                                      */
+  /* Unknown firmware version.                                                                                                  */
-  /*   message_counters[0] - Counter of confirmable messages attempts                                                           */
+  MODEM_FIRMWARE_VERSION_UNKNOWN = 2;
-  /*   message_counters[1] - Counter of non-confirmable messages attempts                                                       */
-  /*   message_counters[2] - Counter of succeeded messages                                                                      */
-  repeated uint32 message_counters = 2;
 
-  /* MCU temperature in Celsius                                                                                                 */
+  /* BC660KGLAAR01A05_01.002.01.002.                                                                                            */
-  sint32 mcu_temperature = 3;
+  MODEM_FIRMWARE_VERSION_BC660_V1 = 3;
 
-  /* Minimum battery voltage in mV                                                                                              */
+  /* BC660KGLAAR01A05_01.200.01.200.                                                                                            */
-  uint32 min_battery_voltage = 4;
+  MODEM_FIRMWARE_VERSION_BC660_V2 = 4;
 
-  /* MCU temperature in Celsius, while the minimum battery voltage was reached                                                  */
+  /* BC660KGLAAR01A05_01.202.01.202.                                                                                            */
-  sint32 min_battery_mcu_temperature = 5;
+  MODEM_FIRMWARE_VERSION_BC660_V3 = 5;
 
-  /* Battery reset timestamp (Unix timestamp)                                                                                   */
+  /* BC660KGLAAR01A05_01.203.01.203.                                                                                            */
-  uint32 battery_reset_timestamp = 6;
+  MODEM_FIRMWARE_VERSION_BC660_V4 = 6;
 
-  /* Max MCU temperature in Celsius                                                                                             */
+  /* BC660KGLAAR01A05_01.204.01.204.                                                                                            */
-  sint32 max_mcu_temperature = 7;
+  MODEM_FIRMWARE_VERSION_BC660_V5 = 7;
 
-  /* Min MCU temperature in Celsius                                                                                             */
+  /* BC660KGLAAR01A05_01.205.01.205.                                                                                            */
-  sint32 min_mcu_temperature = 8;
+  MODEM_FIRMWARE_VERSION_BC660_V6 = 8;
 
-  /* Table of runtime errors. Max length: 20                                                                                    */
+  /* BC660KGLAAR01A05_01.301.01.301.                                                                                            */
-  repeated uint32 runtime_errors = 9;
+  MODEM_FIRMWARE_VERSION_BC660_V7 = 9;
+
+  /* BC660KGLAAR01A05_01.303.01.303.                                                                                            */
+  MODEM_FIRMWARE_VERSION_BC660_V8 = 10;
 }
 
 message ProtoModem
 {
 
+  /* Modem type.                                                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   ModemType type = 1;
 
-  /* Parameters for BC66 modem:                                                                                                 */
+  /* Modem runtime parameters.                                                                                                  *
-  /*   parameters[0] - sc_EARFCN - Range: [0:262143]. Unknown value: -1                                                         */
+   * For BC66 modem (34 parameters):                                                                                            *
-  /*   parameters[1] - sc_EARNFCN_offset - Range: [0:4] mapped to [-2, -1, -0.5, 0, 1]. Unknown value: -1                       */
+   *   - 1st item - sc_EARFCN. Range: [0:262143]. Unknown value: -1                                                             *
-  /*   parameters[2] - sc_PCI - Range: [0:502]. Unknown value: -1                                                               */
+   *   - 2nd item - sc_EARNFCN_offset. Range: [0:4] mapped to [-2, -1, -0.5, 0, 1]. Unknown value: -1                           *
-  /*   parameters[3] - sc_Cell id - Range: [1:268435456]. Unknown value: 0                                                      */
+   *   - 3rd item - sc_PCI. Range: [0:502]. Unknown value: -1                                                                   *
-  /*   parameters[4] - sc_RSRP - [dBm] - Range: [-140:-44]. Unknown value: 0                                                    */
+   *   - 4th item - sc_Cell_Id. Range: [1:268435456]. Unknown value: 0                                                          *
-  /*   parameters[5] - sc_RSRQ - [dB] - Range: [-20:-3]. Unknown value: 0                                                       */
+   *   - 5th item - sc_RSRP [dBm]. Range: [-140:-44]. Unknown value: 0                                                          *
-  /*   parameters[6] - sc_RSSI - [dBm] - Range: [-110:-3] Unknown value: 0                                                      */
+   *   - 6th item - sc_RSRQ [dB]. Range: [-20:-3]. Unknown value: 0                                                             *
-  /*   parameters[7] - sc_SINR - [dB] - Range: [-10:30]. Unknown value: 31                                                      */
+   *   - 7th item - sc_RSSI [dBm]. Range: [-110:-3] Unknown value: 0                                                            *
-  /*   parameters[8] - sc_Band - Range: [see module supported bands]. The current serving cell band. Unknown value: -1          */
+   *   - 8th item - sc_SINR [dB]. Range: [-10:30]. Unknown value: 31                                                            *
-  /*   parameters[9] - sc_TAC - Range: [0:65536]. Unknown value: -1                                                             */
+   *   - 9th item - sc_Band. Range: [see module supported bands]. The current serving cell band. Unknown value: -1              *
-  /*   parameters[10] - sc_ECL - Range: [0:2]. Unknown value: -1                                                                */
+   *   - 10th item - sc_TAC. Range: [0:65536]. Unknown value: -1                                                                *
-  /*   parameters[11] - sc_TX_PWR - [0.1cBm] - Range [-440:230]. Unknown value: -1000                                           */
+   *   - 11th item - sc_ECL. Range: [0:2]. Unknown value: -1                                                                    *
-  /*   parameters[12] - OP_MODE - Range: [0:3]. Unknown value: -1                                                               */
+   *   - 12th item - sc_TX_PWR [0.1dBm]. Range [-440:230]. Unknown value: -1000                                                 *
-  /*   parameters[13] - nc_EARFCN - Range: [0:262143]. Unknown value: -1                                                        */
+   *   - 13th item - OP_MODE. Range: [0:3]. Unknown value: -1                                                                   *
-  /*   parameters[14] - nc_EARNFCN_offset - Range: [0:4] mapped to [-2, -1, -0.5, 0, 1]. Unknown value: -1                      */
+   *   - 14th item - nc_EARFCN. Range: [0:262143]. Unknown value: -1                                                            *
-  /*   parameters[15] - nc_PCI - Range: [0:502]. Unknown value: -1                                                              */
+   *   - 15th item - nc_EARNFCN_offset. Range: [0:4] mapped to [-2, -1, -0.5, 0, 1]. Unknown value: -1                          *
-  /*   parameters[16] - nc_RSRP - [dBm] - Range: [-140:-44]. Unknown value: 0                                                   */
+   *   - 16th item - nc_PCI. Range: [0:502]. Unknown value: -1                                                                  *
-  /*   parameters[17] - RLC_UL_BLER - Range: [0:100]. Unknown value: -1                                                         */
+   *   - 17th item - nc_RSRP [dBm]. Range: [-140:-44]. Unknown value: 0                                                         *
-  /*   parameters[18] - RLC_DL_BLER - Range: [0:100]. Unknown value: -1                                                         */
+   *   - 18th item - RLC_UL_BLER. Range: [0:100]. Unknown value: -1                                                             *
-  /*   parameters[19] - MAC_UL_BLER - Range: [0:100]. Unknown value: -1                                                         */
+   *   - 19th item - RLC_DL_BLER. Range: [0:100]. Unknown value: -1                                                             *
-  /*   parameters[20] - MAC_DL_BLER - Range: [0:100]. Unknown value: -1                                                         */
+   *   - 20th item - MAC_UL_BLER. Range: [0:100]. Unknown value: -1                                                             *
-  /*   parameters[21] - MAC_UL_TOTAL_BYTES - Range: [0:2147483647]. Unknown value: -1                                           */
+   *   - 21th item - MAC_DL_BLER. Range: [0:100]. Unknown value: -1                                                             *
-  /*   parameters[22] - MAC_DL_TOTAL_BYTES - Range: [0:2147483647]. Unknown value: -1                                           */
+   *   - 22th item - MAC_UL_TOTAL_BYTES. Range: [0:2147483647]. Unknown value: -1                                               *
-  /*   parameters[23] - MAC_UL_total_HARQ_Tx - Range: [0:2147483647]. Unknown value: -1                                         */
+   *   - 23th item - MAC_DL_TOTAL_BYTES. Range: [0:2147483647]. Unknown value: -1                                               *
-  /*   parameters[24] - MAC_DL_total_HARQ_Tx - Range: [0:2147483647]. Unknown value: -1                                         */
+   *   - 24th item - MAC_UL_total_HARQ_Tx. Range: [0:2147483647]. Unknown value: -1                                             *
-  /*   parameters[25] - MAC_UL_HARQ_re_Tx - Range: [0:2147483647]. Unknown value: -1                                            */
+   *   - 25th item - MAC_DL_total_HARQ_Tx. Range: [0:2147483647]. Unknown value: -1                                             *
-  /*   parameters[26] - MAC_DL_HARQ_re_Tx - Range: [0:2147483647]. Unknown value: -1                                            */
+   *   - 26th item - MAC_UL_HARQ_re_Tx. Range: [0:2147483647]. Unknown value: -1                                                *
-  /*   parameters[27] - RLC_UL_tput - Range: [0:2147483647]. Unknown value: -1                                                  */
+   *   - 27th item - MAC_DL_HARQ_re_Tx. Range: [0:2147483647]. Unknown value: -1                                                *
-  /*   parameters[28] - RLC_DL_tput - Range: [0:2147483647]. Unknown value: -1                                                  */
+   *   - 28th item - RLC_UL_tput. Range: [0:2147483647]. Unknown value: -1                                                      *
-  /*   parameters[29] - MAC_UL_tput - Range: [0:2147483647]. Unknown value: -1                                                  */
+   *   - 29th item - RLC_DL_tput. Range: [0:2147483647]. Unknown value: -1                                                      *
-  /*   parameters[30] - MAC_DL_tput - Range: [0:2147483647]. Unknown value: -1                                                  */
+   *   - 30th item - MAC_UL_tput. Range: [0:2147483647]. Unknown value: -1                                                      *
-  /*   parameters[31] - sleep_duration - [0.1s] - Range: [0:2147483647]. Unknown value: -1                                      */
+   *   - 31th item - MAC_DL_tput. Range: [0:2147483647]. Unknown value: -1                                                      *
-  /*   parameters[32] - Rx_time - [0.1s] - Range: [0:2147483647]. Unknown value: -1                                             */
+   *   - 32th item - sleep_duration [0.1s]. Range: [0:2147483647]. Unknown value: -1                                            *
-  /*   parameters[33] - Tx_time - [0.1s] - Range: [0:2147483647]. Unknown value: -1                                             */
+   *   - 33th item - Rx_time [0.1s]. Range: [0:2147483647]. Unknown value: -1                                                   *
+   *   - 34th item - Tx_time [0.1s]. Range: [0:2147483647]. Unknown value: -1                                                   *
+   * For BC660 modem (22 parameters):                                                                                           *
+   *   - 1st item - sc_EARFCN. Range: [0:262143]. Unknown value: -1                                                             *
+   *   - 2nd item - sc_EARNFCN_offset. Range: [0:21] mapped to                                                                  *
+   *                   [Invalid, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -0.5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9].                  *
+   *                   Unknown value: -1                                                                                        *
+   *   - 3rd item - sc_PCI. Range: [0:503]. Unknown value: -1                                                                   *
+   *   - 4th item - sc_Cell_Id. Range: [1:268435456]. Unknown value: 0                                                          *
+   *   - 5th item - sc_RSRP [dBm]. Range: [-140:-44]. Unknown value: 0                                                          *
+   *   - 6th item - sc_RSRQ [dB]. Range: [-20:-3]. Unknown value: 0                                                             *
+   *   - 7th item - sc_RSSI [dBm]. Range: [-110:-3] Unknown value: 0                                                            *
+   *   - 8th item - sc_SINR [dB]. Range: [-10:30]. Unknown value: 31                                                            *
+   *   - 9th item - sc_Band. Range: [see module supported bands]. The current serving cell band. Unknown value: -1              *
+   *   - 10th item - sc_TAC. Range: [0:65536]. Unknown value: -1                                                                *
+   *   - 11th item - sc_ECL. Range: [0:2]. Unknown value: -1                                                                    *
+   *   - 12th item - sc_TX_PWR [dBm]. Range [-45:23]. Unknown value: 128                                                        *
+   *   - 13th item - OP_MODE. Range: [0:3] mapped to [In-band same PCI, In-band different PCI, Guard band, Stand alone].        *
+   *                 Unknown value: -1                                                                                          *
+   *   - 14th item - nc_EARFCN. Range: [0:262143]. Unknown value: -1                                                            *
+   *   - 15th item - nc_PCI. Range: [0:503]. Unknown value: -1                                                                  *
+   *   - 16th item - nc_RSRP [dBm]. Range: [-140:-44]. Unknown value: 0                                                         *
+   *   - 17th item - nc_RSRQ [dBm]. Range: [-140:-44]. Unknown value: 0                                                         *
+   *   - 18th item - sleep_duration [0.1s]. Range: [0:2147483647]. Unknown value: -1                                            *
+   *   - 19th item - Rx_time [0.1s]. Range: [0:2147483647]. Unknown value: -1                                                   *
+   *   - 20th item - Tx_time [0.1s]. Range: [0:2147483647]. Unknown value: -1                                                   *
+   *   - 21st item - PLMN_state. Range: [0:3] mapped to [No PLMN, Searching, Selected, Unknown]. Unknown value: 3               *
+   *   - 22nd item - select_PLMN. Range: [100:999999]. Unknown value: -1                                                        *
+   * For shared modem client (4 parameters):                                                                                    *
+   *   - 1st item - RSRP [dBm]. Range: [-140:-44]. Unknown value: 0                                                             *
+   *   - 2nd item - RSRQ [dB]. Range: [-20:-3]. Unknown value: 0                                                                *
+   *   - 3rd item - RSSI [dBm]. Range: [-110:-3] Unknown value: 0                                                               *
+   *   - 4th item - SINR [dB]. Range: [-10:30]. Unknown value: 31                                                               *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   repeated sint32 parameters = 2;
 
-  /* ICCID of inserted/soldered sim card. String up to 22 characters long.                                                      */
+  /* Integrated Circuit Card Identifier (ICCID) of the inserted/soldered SIM card.                                              *
-  /* 0x7F if sim card is not detected, empty (not sent) if device does not have modem.                                          */
+   * String up to 22 characters:                                                                                                *
-  /* This field is only sent by device                                                                                          */
+   * A string containing only the special character 0x7F (DEL) indicates that the SIM card is not detected.                     *
+   * Status: In use [06.07.04/06.09.09/06.10.10/06.11.09/06.12.06/06.13.00/06.21.00 - LATEST]                                   */
   string sim_card_identification = 3;
+
+  /* Modem firmware version.                                                                                                    *
+   * Status: In use [06.20.05/06.21.00 - LATEST]                                                                                */
+  ModemFirmwareVersion firmware_version = 4;
+
+  /* Modem identification:                                                                                                      *
+   *   - IMEI (International Mobile Equipment Identity) of the modem                                                            *
+   *   - Serial number of the most recently used modem-sharing sensor                                                           *
+   * String up to 15 characters.                                                                                                *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  string modem_identification = 5;
+
+  /* Modem statistics.                                                                                                          *
+   * 1st item - Number of transmissions since the last device information message. Undefined value: 0.                          *
+   * 2nd item - Time in seconds since the last device information message. Undefined value: 0.                                  *
+   * 3rd item - Total time in the power saving mode, in seconds. Undefined value: 0.                                            *
+   * 4th item - Total time in the active state in seconds. Undefined value: 0.                                                  *
+   * Status: In use [07.00.00 - LATEST]                                                                                         */
+  repeated uint32 modem_statistics = 6;
 }
 
-message ProtoUpdateInfo
+message ProtoDeviceInfo
 {
 
-  /* Timestamp of update (Unix timestamp)                                                                                       */
+  /* RESERVED FIELDS ---------------------------------------------------------------------------------------------------------- */
-  uint32 timestamp = 1;
 
-  /* Update status, possible values:                                                                                            */
+  reserved 2,4,5,6,7,8,9,10,11,12;
-  /*    - 1 - No update yet                                                                                                     */
-  /*    - 2 - No error                                                                                                          */
-  /*    - 3 - UDP socekt error                                                                                                  */
-  /*    - 4 - Hash error                                                                                                        */
-  /*    - 5 - Missing packet error                                                                                              */
-  /*    - 6 - Invalid data error                                                                                                */
-  /*    - 7 - Sending timeout error                                                                                             */
-  /*    - 8 - No SW to update error                                                                                             */
-  /*    - 9 - Sending unexpected error                                                                                          */
-  /*    - 10 - Unexpected error                                                                                                 */
-  uint32 status = 2;
-}
 
-message ProtoDeviceInfo
+  /* DEVICE STATUS FIELDS ----------------------------------------------------------------------------------------------------- */
-{
 
-  /* Serial number of device                                                                                                    */
+  /* Serial number of the device.                                                                                               *
-  bytes serial_num = 1;
+   * Length: 6 bytes.                                                                                                           *
+   * Status: In use [07.00.00 - LATEST] / Previously as serial_num [06.00 - 06.xx.xx]                                           */
+  bytes serial_number = 1;
 
-  /* Deprecated field                                                                                                           */
+  /* DEVICE INFORMATION FIELDS ------------------------------------------------------------------------------------------------ */
-  reserved 2;
 
-  /* Software version e.g ver 06.10 -> 0x060A -> 1546                                                                           */
+  /* Software version (excluding LTS).                                                                                          *
+   * Example: 1546 -> 0x060A -> SW version 06.10                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 sw_version = 3;
 
-  /* Deprecated fields                                                                                                          */
+  /* Software commit ID and LTS version.                                                                                        *
-  reserved 4,5,6,7,8,9,10,11,12;
+   * String of 7 characters:                                                                                                    *
+   *   - Commit ID (examples: "fa02cd0" means the beginning of the commit ID "fa02cd0") [06.00 - 06.06.xx]                      *
+   *   - LTS version and commit ID (examples: "0bdd23f" means LTS version 11 and the beginning of the commit ID "dd23f")        *
+         [06.07.00 - LATEST]                                                                                                    *
+   * Status: In use [06.00 - LATEST]                                                                                            */
+  string commit_id = 15;
 
-  /* Structure with battery and temperature information                                                                         */
+  /* Device runtime information.                                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   ProtoRuntime runtime_info = 13;
 
-  /* Structure with modem specific runtime information                                                                          */
+  /* Memory statistics:                                                                                                         *
+   * 1st item - Status of the non-volatile storage:                                                                             *
+   *   - 0 - Non-volatile storage works properly                                                                                *
+   *   - 1 - Non-volatile storage has some corrupt packets. Memory is read-only                                                 *
+   *   - 2 - Non-volatile storage is corrupted. Memory is unavailable                                                           *
+   * 2nd item - Timestamp of the end of collecting statistics in seconds since 1st of January 1970 (epoch time).                *
+                Undefined value: 4294967295.                                                                                    *
+   * 3rd item - Capacity of the memory in bytes.                                                                                *
+   * 4th item - Used space in bytes.                                                                                            *
+   * 5th item - Size of invalid (outdated) packets in bytes.                                                                    *
+   * 6th item - Size of corrupt packets in bytes.                                                                               *
+   * 7th item - Number of valid packets.                                                                                        *
+   * 8th item - Number of invalid (outdated) packets.                                                                           *
+   * 9th item - Number of corrupt packets.                                                                                      *
+   * 10th item - Number of all samples for channel 1 (valid packets).                                                           *
+   * 11th item - Number of all samples for channel 2 (valid packets).                                                           *
+   * 12th item - Number of all samples for channel 3 (valid packets).                                                           *
+   * 13th item - Number of all samples for channel 4 (valid packets).                                                           *
+   * 14th item - Number of all samples for channel 5 (valid packets).                                                           *
+   * 15th item - Number of all samples for channel 6 (valid packets).                                                           *
+   * 16th item - Timestamp of the first binary measurement in seconds since 1st of January 1970 (epoch time).                   *
+   *             Undefined value: 4294967295.                                                                                   *
+   * 17th item - Timestamp of the last binary measurement in seconds since 1st of January 1970 (epoch time).                    *
+   *             Undefined value: 4294967295.                                                                                   *
+   * 18th item - Timestamp of the last binary measurement marked as sent, in seconds since 1st of January 1970 (epoch time).    *
+   *             Undefined value: 4294967295.                                                                                   *
+   * 19th item - Timestamp of the first continuous measurement in seconds since 1st of January 1970 (epoch time).               *
+   *             Undefined value: 4294967295.                                                                                   *
+   * 20th item - Timestamp of the last continuous measurement in seconds since 1st of January 1970 (epoch time).                *
+   *             Undefined value: 4294967295.                                                                                   *
+   * 21th item - Timestamp of the last continuous measurement marked as sent, in seconds since 1st of January 1970 (epoch time).*
+   *             Undefined value: 4294967295.                                                                                   *
+   * 22th item - NvM write counter.                                                                                             *
+   * Status: In use [06.02 - LATEST]                                                                                            */
+  repeated uint32 memory_statistics = 17;
+
+  /* Last update check information.                                                                                             *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
+  ProtoUpdateInfo last_update_info = 18;
+
+  /* Modem information.                                                                                                         *
+   * Only used if the sensor has a modem.                                                                                       *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   ProtoModem modem = 14;
 
-  /* String up to 7 bytes long. Software commit id e.g. "e0e8556"                                                               */
+  /* SERVER COMMUNICATION FIELDS ---------------------------------------------------------------------------------------------- */
-  /* From version 06.07 the first two characters indicate the LTS version.                                                      */
-  /* For example: the value "0bdd23f" means LTS version 11 and the beginning of the commit ID "dd23f"                           */
-  string commit_id = 15;
 
-  /* Optional string up to 36 bytes long. Can be set to any user define value or hold device's IMEI                             */
+  /* Cloud token.                                                                                                               *
+   * Can be empty, set to any user-defined value, or hold device IMEI.                                                          *
+   * String up to 36 characters.                                                                                                *
+   * This field is only sent during server communication.                                                                       *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   string cloud_token = 16;
 
-  /* Memory statistics:                                                                                                         */
+  /* Enclosure tamper alert:                                                                                                    *
-  /*   memory_statistics[0] - Status of Nv storage:                                                                             */
+   *   - 0 - Inactive                                                                                                           *
-  /*     - 0 - Nv storage hasn't errors                                                                                         */
+   *   - 1 - Active (enclosure opened)                                                                                          *
-  /*     - 1 - Nv storage has some corrupted packet. Memory is read-only                                                        */
+   *   - 2 - Inactive, was active (enclosure closed)                                                                            *
-  /*     - 2 - Nv storage is corrupted. Memory is unavailable                                                                   */
+   * The transition from 'Inactive, was active' to 'Inactive' occurs after the alert has been successfully sent to the server   *
-  /*   memory_statistics[1] - Timestamp of the end of collecting statistics.                                                    */
+   * or the user has reset the alert via Bluetooth.                                                                             *
-  /*                          Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                         */
+   * This field is only sent during server communication.                                                                       *
-  /*   memory_statistics[2] - Capacity of memory in bytes                                                                       */
+   * Status: In use [07.00.01 - LATEST]                                                                                         */
-  /*   memory_statistics[3] - Used space in bytes                                                                               */
+  uint32 enclosure_tamper_alert = 19;
-  /*   memory_statistics[4] - Size of invalid (outdated) packets in bytes                                                       */
-  /*   memory_statistics[5] - Size of corrupted packets in bytes                                                                */
-  /*   memory_statistics[6] - Number of valid packets                                                                           */
-  /*   memory_statistics[7] - Number of invalid (outdated) packets                                                              */
-  /*   memory_statistics[8] - Number of corrupted packets                                                                       */
-  /*   memory_statistics[9] - Number of all samples for channel 1 (valid packets)                                               */
-  /*   memory_statistics[10] - Number of all samples for channel 2 (valid packets)                                              */
-  /*   memory_statistics[11] - Number of all samples for channel 3 (valid packets)                                              */
-  /*   memory_statistics[12] - Number of all samples for channel 4 (valid packets)                                              */
-  /*   memory_statistics[13] - Number of all samples for channel 5 (valid packets)                                              */
-  /*   memory_statistics[14] - Number of all samples for channel 6 (valid packets)                                              */
-  /*   memory_statistics[15] - Timestamp of the first binary measurement.                                                       */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[16] - Timestamp of the last binary measurement.                                                        */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[17] - Timestamp of the last binary measurement, that marked as sent.                                   */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[18] - Timestamp of the first continuous measurement.                                                   */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[19] - Timestamp of the last continuous measurement.                                                    */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[20] - Timestamp of the last continuous measurement, that marked as sent.                               */
-  /*                           Value in seconds since UNIX EPOCH 01-01-1970. Undefined value: 4294967295                        */
-  /*   memory_statistics[21] - NVM write counter                                                                                */
-  repeated uint32 memory_statistics = 17;
-
-  /* Information about last sensor SW update                                                                                    */
-  ProtoUpdateInfo last_update_info = 18;
 }

common/transport/coap/src/main/proto/efento/proto_measurement_types.proto

@@ -19,160 +19,201 @@ option java_package = "org.thingsboard.server.gen.transport.coap";
 option java_outer_classname = "MeasurementTypeProtos";
 
 enum MeasurementType {
-    /* [] - No sensor on the channel                                                                                              */
+
+    /* [] - No sensor on the channel.                                                                                             */
     MEASUREMENT_TYPE_NO_SENSOR = 0;
 
-    /* [°C] - Celsius degree. Resolution 0.1°C. Range [-273.2:4000.0]. Type: Continuous                                           */
+    /* [°C] - Celsius degree. Temperature. Resolution: 0.1°C. Range: [-273.2:4000.0]. Type: Continuous.                           */
     MEASUREMENT_TYPE_TEMPERATURE = 1;
 
-    /* [% RH] - Relative humidity. Resolution 1%. Range [0:100]. Type: Continuous                                                 */
+    /* [% RH] - Percentage. Relative humidity. Resolution: 1%. Range: [0:100]. Type: Continuous.                                  */
     MEASUREMENT_TYPE_HUMIDITY = 2;
 
-    /* [hPa] - Hectopascal (1hPa = 100Pa). Resolution 0.1hPa. Range: [1.0:2000.0]. Atmospheric pressure. Type: Continuous         */
+    /* [hPa] - Hectopascal. Atmospheric pressure. Resolution: 0.1hPa. Range: [1.0:2000.0]. Type: Continuous.                      */
     MEASUREMENT_TYPE_ATMOSPHERIC_PRESSURE = 3;
 
-    /* [Pa] - Pascal. Resolution 1Pa. Range [-10000:10000]. Differential pressure. Type: Continuous                               */
+    /* [Pa] - Pascal. Differential pressure. Resolution: 1Pa. Range: [-10000:10000]. Type: Continuous.                            */
     MEASUREMENT_TYPE_DIFFERENTIAL_PRESSURE = 4;
 
-    /* Sign indicates state: (+) ALARM, (-) OK. Type: Binary                                                                      */
+    /* Sign indicates state: (+) Alarm, (-) OK. Type: Binary.                                                                     */
     MEASUREMENT_TYPE_OK_ALARM = 5;
 
-    /* [IAQ] - IAQ index. Resolution 1IAQ. Range [0:500]. To get IAQ index the value should be divided by 3.                      */
+    /* [IAQ] - IAQ index. Air quality. Resolution: 1IAQ. Range: [0:500]. Type: Continuous.                                        *
-    /* Sensor return also calibration status as metadata (is the remainder when the absolute value is divided by 3):              */
+     * To obtain the IAQ index, the measurement value should be divided by 3.                                                     *
-    /*   - 0: Calibration required (sensor returns not accurate values)                                                           */
+     * Measurement also includes calibration status as metadata (is the remainder of the absolute value divided by 3):            *
-    /*   - 1: Calibration on-going (sensor returns not accurate values)                                                           */
+     *   - 0 - Calibration required (sensor returns not accurate values)                                                          *
-    /*   - 2: Calibration done (best accuracy of IAQ sensor)                                                                      */
+     *   - 1 - Calibration on-going (sensor returns not accurate values)                                                          *
-    /* Type: Continuous                                                                                                           */
+     *   - 2 - Calibration done (best accuracy of IAQ sensor)                                                                     */
     MEASUREMENT_TYPE_IAQ = 6;
 
-    /* Sign indicates water presence: (+) water not detected, (-) water detected. Type: Binary                                    */
+    /* Sign indicates state: (+) Water detected, (-) Water not detected. Type: Binary.                                            */
     MEASUREMENT_TYPE_FLOODING = 7;
 
-    /* [NB] Number of pulses. Resolution 1 pulse. Range [0:8000000]. Type: Continuous                                             */
+    /* [NB] - Number of pulses. Number of pulses in a single period. Resolution: 1 pulse. Range: [0:8000000]. Type: Continuous.   */
     MEASUREMENT_TYPE_PULSE_CNT = 8;
 
-    /* [Wh] - Watthour; Resolution 1Wh. Range [0:8000000]. Number of Watthours in a single period. Type: Continuous               */
+    /* [Wh] - Watt-hour. Number of watt-hours in a single period. Resolution: 1Wh. Range: [0:8000000]. Type: Continuous.          */
     MEASUREMENT_TYPE_ELECTRICITY_METER = 9;
 
-    /* [l] - Liter. Resolution 1l. Range [0:8000000]. Number of litres in a single period. Type: Continuous                       */
+    /* [l] - Liter. Number of litres in a single period. Resolution: 1l. Range: [0:8000000]. Type: Continuous.                    */
     MEASUREMENT_TYPE_WATER_METER = 10;
 
-    /* [kPa] - Kilopascal (1kPa = 1000Pa); Resolution 1kPa. Range [-1000:0]. Soil moisture (tension). Type: Continuous            */
+    /* [kPa] - Kilopascal. Soil moisture (tension). Resolution: 1kPa. Range: [-1000:0]. Type: Continuous.                         */
     MEASUREMENT_TYPE_SOIL_MOISTURE = 11;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Carbon monoxide concentration. Type: Continuous             */
+    /* [ppm] - Parts per million. Carbon monoxide concentration. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.          */
     MEASUREMENT_TYPE_CO_GAS = 12;
 
-    /* [ppm] - Parts per million. Resolution 1.0ppm. Range [0:1000000]. Nitrogen dioxide concentration. Type: Continuous          */
+    /* [ppm] - Parts per million. Nitrogen dioxide concentration. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.         */
     MEASUREMENT_TYPE_NO2_GAS = 13;
 
-    /* [ppm] - Parts per million. Resolution 0.01ppm. Range [0.00:80000.00]. Hydrogen sulfide concentration. Type: Continuous     */
+    /* [ppm] - Parts per million. Hydrogen sulfide concentration. Resolution: 0.01ppm. Range: [0.00:80000.00]. Type: Continuous.  */
     MEASUREMENT_TYPE_H2S_GAS = 14;
 
-    /* [lx] - Lux. Resolution 0.1lx. Range [0.0:100000.0]. Illuminance. Type: Continuous                                          */
+    /* [lx] - Lux. Illuminance. Resolution: 0.1lx. Range: [0.0:100000.0]. Type: Continuous.                                       */
     MEASUREMENT_TYPE_AMBIENT_LIGHT = 15;
 
-    /* [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3. Range [0:1000].                                                 */
+    /* [µg/m^3] - Microgram per cubic meter. Particles with an aerodynamic diameter of less than 1 micrometers.                   *
-    /* Particles with an aerodynamic diameter less than 1 micrometer. Type: Continuous                                            */
+     * Resolution: 1µg/m^3. Range: [0:1000]. Type: Continuous.                                                                    */
     MEASUREMENT_TYPE_PM_1_0 = 16;
 
-    /* [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3. Range [0:1000].                                                 */
+    /* [µg/m^3] - Microgram per cubic meter. Particles with an aerodynamic diameter of less than 2.5 micrometers.                 *
-    /* Particles with an aerodynamic diameter less than 2.5 micrometers. Type: Continuous                                         */
+     * Resolution: 1µg/m^3. Range: [0:1000]. Type: Continuous.                                                                    */
     MEASUREMENT_TYPE_PM_2_5 = 17;
 
-    /* [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3. Range [0:1000].                                                 */
+    /* [µg/m^3] - Microgram per cubic meter. Particles with an aerodynamic diameter of less than 10 micrometers.                  *
-    /* Particles with an aerodynamic diameter less than 10 micrometers. Type: Continuous                                          */
+     * Resolution: 1µg/m^3. Range: [0:1000]. Type: Continuous.                                                                    */
     MEASUREMENT_TYPE_PM_10_0 = 18;
 
-    /* [dB] - Decibels. Resolution 0.1 dB. Range: [0.0:200.0]. Noise level. Type: Continuous                                      */
+    /* [dB] - Decibel. Noise level. Resolution: 0.1 dB. Range: [0.0:200.0]. Type: Continuous.                                     */
     MEASUREMENT_TYPE_NOISE_LEVEL = 19;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Ammonia concentration. Type: Continuous                     */
+    /* [ppm] - Parts per million. Ammonia concentration. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.                  */
     MEASUREMENT_TYPE_NH3_GAS = 20;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Methane concentration. Type: Continuous                     */
+    /* [ppm] - Parts per million. Methane concentration. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.                  */
     MEASUREMENT_TYPE_CH4_GAS = 21;
 
-    /* [kPa] - Kilopascal (1kPa = 1000Pa, 100kPa = 1bar). Resolution 1kPa. Range [0:200000]. Pressure. Type: Continuous           */
+    /* [kPa] - Kilopascal (100kPa = 1bar). Pressure. Resolution: 1kPa. Range: [0:200000]. Type: Continuous.                       */
     MEASUREMENT_TYPE_HIGH_PRESSURE = 22;
 
-    /* [mm] - Millimeter. Resolution 1mm. Range [0:100000]. Distance. Type: Continuous                                            */
+    /* [mm] - Millimeter. Distance. Resolution: 1mm. Range: [0:100000]. Type: Continuous.                                         */
     MEASUREMENT_TYPE_DISTANCE_MM = 23;
 
-    /* [l] - Liter. Resolution 1l. Range [0:1000000]. Accumulative water meter (minor). Type: Continuous                          */
+    /* [l] - Liter. Water meter (minor). Resolution: 1l. Range: [0:99]. Type: Continuous.                                         *
+     * To obtain the liters, the measurement value should be divided by 6.                                                        *
+     * Measurement also includes a major channel index related with the minor channel as metadata                                 *
+     * (is the remainder of the absolute value divided by 6).                                                                     */
     MEASUREMENT_TYPE_WATER_METER_ACC_MINOR = 24;
 
-    /* [hl] - Hectoliter. Resolution 1hl. Range [0:1000000]. Accumulative water meter (major). Type: Continuous                   */
+    /* [hl] - Hectoliter. Water meter (major). Resolution: 1hl. Range: [0:999999]. Type: Continuous.                              *
+     * To obtain the hectoliters, the measurement value should be divided by 4.                                                   *
+     * Measurement also includes a measurement status as metadata (is the remainder of the absolute value divided by 4):          *
+     *   - 0 - Counter works properly                                                                                             *
+     *   - 1 - Error occurred (the counted value may be underestimated)                                                           *
+     *   - 2 - Sensor reset occurred (the counted value may be underestimated)                                                    *
+     *   - 3 - Sensor reset and error occurred (the counted value may be underestimated)                                          */
     MEASUREMENT_TYPE_WATER_METER_ACC_MAJOR = 25;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Carbon dioxide concentration. Type: Continuous              */
+    /* [ppm] - Parts per million. Carbon dioxide concentration. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.           *
+     * To obtain the carbon dioxide concentration, the measurement value should be divided by 3.                                  *
+     * Measurement also includes calibration status as metadata (is the remainder of the absolute value divided by 3):            *
+     *   - 0 - Auto calibration has not yet been performed                                                                        *
+     *   - 1 - The last auto calibration was successful                                                                           *
+     *   - 2 - Last auto calibration failed                                                                                       */
     MEASUREMENT_TYPE_CO2_GAS = 26;
 
-    /* [% RH] - Relative humidity. Resolution 0.1%. Range [0.0:100.0]. Type: Continuous                                           */
+    /* [% RH] - Percentage. Relative humidity (accurate). Resolution: 0.1%. Range: [0.0:100.0]. Type: Continuous.                 */
     MEASUREMENT_TYPE_HUMIDITY_ACCURATE = 27;
 
-    /* [sIAQ] - Static IAQ index. Resolution 1IAQ. Range [0:10000]. To get static IAQ index the value should be divided by 3.     */
+    /* [sIAQ] - Static IAQ index. Air quality. Resolution: 1sIAQ. Range: [0:10000]. Type: Continuous.                             *
-    /* Sensor return also calibration status as metadata (is the remainder when the absolute value is divided by 3):              */
+     * To obtain the static IAQ index, the measurement value should be divided by 3.                                              *
-    /*   - 0: Calibration required (sensor returns not accurate values)                                                           */
+     * Measurement also includes calibration status as metadata (is the remainder of the absolute value divided by 3):            *
-    /*   - 1: Calibration on-going (sensor returns not accurate values)                                                           */
+     *   - 0 - Calibration required (sensor returns not accurate values)                                                          *
-    /*   - 2: Calibration done (best accuracy of IAQ sensor)                                                                      */
+     *   - 1 - Calibration on-going (sensor returns not accurate values)                                                          *
-    /* Type: Continuous                                                                                                           */
+     *   - 2 - Calibration done (best accuracy of IAQ sensor)                                                                     */
     MEASUREMENT_TYPE_STATIC_IAQ = 28;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. CO2 equivalent.                                             */
+    /* [ppm] - Parts per million. CO2 equivalent. Resolution: 1ppm. Range: [0:1000000]. Type: Continuous.                         *
-    /* To get CO2 equivalent the value should be divided by 3.                                                                    */
+     * To obtain the CO2 equivalent, the measurement value should be divided by 3.                                                *
-    /* Sensor return also calibration status as metadata (is the remainder when the absolute value is divided by 3):              */
+     * Measurement also includes calibration status as metadata (is the remainder of the absolute value divided by 3):            *
-    /*   - 0: Calibration required (sensor returns not accurate values)                                                           */
+     *   - 0 - Calibration required (sensor returns not accurate values)                                                          *
-    /*   - 1: Calibration on-going (sensor returns not accurate values)                                                           */
+     *   - 1 - Calibration on-going (sensor returns not accurate values)                                                          *
-    /*   - 2: Calibration done (best accuracy of IAQ sensor)                                                                      */
+     *   - 2 - Calibration done (best accuracy of IAQ sensor)                                                                     */
-    /* Type: Continuous                                                                                                           */
     MEASUREMENT_TYPE_CO2_EQUIVALENT = 29;
 
-    /* [ppm] - Parts per million. Resolution 1ppm. Range [0:100000]. Breath VOC estimate.                                         */
+    /* [ppm] - Parts per million. Breath VOC estimate. Resolution: 1ppm. Range: [0:100000]. Type: Continuous.                     *
-    /* To get breath VOC estimate the value should be divided by 3.                                                               */
+     * To obtain the breath VOC estimate, the measurement value should be divided by 3.                                           *
-    /* Sensor return also calibration status as metadata (is the remainder when the absolute value is divided by 3):              */
+     * Measurement also includes calibration status as metadata (is the remainder of the absolute value divided by 3):            *
-    /*   - 0: Calibration required (sensor returns not accurate values)                                                           */
+     *   - 0 - Calibration required (sensor returns not accurate values)                                                          *
-    /*   - 1: Calibration on-going (sensor returns not accurate values)                                                           */
+     *   - 1 - Calibration on-going (sensor returns not accurate values)                                                          *
-    /*   - 2: Calibration done (best accuracy of IAQ sensor)                                                                      */
+     *   - 2 - Calibration done (best accuracy of IAQ sensor)                                                                     */
-    /* Type: Continuous                                                                                                           */
     MEASUREMENT_TYPE_BREATH_VOC = 30;
 
-    /* Special measurement type reserved for cellular gateway.                                                                    */
+    /* Reserved for the Shared Modem functionality. Type: Continuous.                                                             */
-    /* Type: Continuous                                                                                                           */
+    MEASUREMENT_TYPE_SHARED_MODEM = 31;
-    MEASUREMENT_TYPE_CELLULAR_GATEWAY = 31;
 
-    /* [%] - Percentage. Resolution 0.01%. Range [0.00:100.00]. Type: Continuous                                                  */
+    /* [%] - Percentage. Generic type. Resolution: 0.01%. Range: [0.00:100.00]. Type: Continuous.                                 */
     MEASUREMENT_TYPE_PERCENTAGE = 32;
 
-    /* [mV] - Milivolt. Resolution 0.1mV. Range [0.0:100000.0]. Type: Continuous                                                  */
+    /* [mV] - Millivolt. Voltage. Resolution: 0.1mV. Range: [0.0:100000.0]. Type: Continuous.                                     */
     MEASUREMENT_TYPE_VOLTAGE = 33;
 
-    /* [mA] - Milliampere. Resolution 0.01mA. Range [0.0:10000.00]. Type: Continuous                                              */
+    /* [mA] - Milliampere. Current. Resolution: 0.01mA. Range: [0.00:10000.00]. Type: Continuous.                                 */
     MEASUREMENT_TYPE_CURRENT = 34;
 
-    /* [NB] Number of pulses. Resolution 1 pulse. Range [0:1000000]. Type: Continuous                                             */
+    /* [NB] - Number of pulses. Pulse counter (minor). Resolution: 1 pulse. Range: [0:999]. Type: Continuous.                     *
+     * To obtain the number of pulses, the measurement value should be divided by 6.                                              *
+     * Measurement also includes a major channel index related with the minor channel as metadata                                 *
+     * (is the remainder of the absolute value divided by 6).                                                                     */
     MEASUREMENT_TYPE_PULSE_CNT_ACC_MINOR = 35;
 
-    /* [kNB] Number of kilopulses. Resolution 1 kilopulse. Range [0:1000000]. Type: Continuous                                    */
+    /* [kNB] - Number of kilopulses. Pulse counter (major). Resolution: 1 kilopulse. Range: [0:999999]. Type: Continuous.         *
+     * To obtain the number of kilopulses, the measurement value should be divided by 4.                                          *
+     * Measurement also includes a measurement status as metadata (is the remainder of the absolute value divided by 4):          *
+     *   - 0 - Counter works properly                                                                                             *
+     *   - 1 - Error occurred (the counted value may be underestimated)                                                           *
+     *   - 2 - Sensor reset occurred (the counted value may be underestimated)                                                    *
+     *   - 3 - Sensor reset and error occurred (the counted value may be underestimated)                                          */
     MEASUREMENT_TYPE_PULSE_CNT_ACC_MAJOR = 36;
 
-    /* [Wh] - Watt-hour; Resolution 1Wh. Range [0:1000000]. Number of watt-hours in a single period. Type: Continuous             */
+    /* [Wh] - Watt-hour. Electricity meter (minor). Resolution: 1Wh. Range: [0:999]. Type: Continuous.                            *
+     * To obtain the watt-hours, the measurement value should be divided by 6.                                                    *
+     * Measurement also includes a major channel index related with the minor channel as metadata                                 *
+     * (is the remainder of the absolute value divided by 6).                                                                     */
     MEASUREMENT_TYPE_ELEC_METER_ACC_MINOR = 37;
 
-    /* [kWh] - Kilowatt-hour; Resolution 1kWh. Range [0:1000000]. Number of kilowatt-hours in a single period. Type: Continuous   */
+    /* [kWh] - Kilowatt-hour. Electricity meter (major). Resolution: 1kWh. Range: [0:999999]. Type: Continuous.                   *
+     * To obtain the kilowatt-hours, the measurement value should be divided by 4.                                                *
+     * Measurement also includes a measurement status as metadata (is the remainder of the absolute value divided by 4):          *
+     *   - 0 - Counter works properly                                                                                             *
+     *   - 1 - Error occurred (the counted value may be underestimated)                                                           *
+     *   - 2 - Sensor reset occurred (the counted value may be underestimated)                                                    *
+     *   - 3 - Sensor reset and error occurred (the counted value may be underestimated)                                          */
     MEASUREMENT_TYPE_ELEC_METER_ACC_MAJOR = 38;
 
-    /* [NB] Number of pulses (wide range). Resolution 1 pulse. Range [0:999999]. Type: Continuous                                 */
+    /* [NB] - Number of pulses. Wide-range pulse counter (minor). Resolution: 1 pulse. Range: [0:999999]. Type: Continuous.       *
+     * To obtain the number of pulses, the measurement value should be divided by 6.                                              *
+     * Measurement also includes a major channel index related with the minor channel as metadata                                 *
+     * (is the remainder of the absolute value divided by 6).                                                                     */
     MEASUREMENT_TYPE_PULSE_CNT_ACC_WIDE_MINOR = 39;
 
-    /* [MNB] Number of megapulses (wide range). Resolution 1 megapulse. Range [0:999999]. Type: Continuous                        */
+    /* [MNB] - Number of megapulses. Wide-range pulse counter (major). Resolution: 1 megapulse. Range: [0:999999].                *
+     * Type: Continuous.                                                                                                          *
+     * To obtain the number of megapulses, the measurement value should be divided by 4.                                          *
+     * Measurement also includes a measurement status as metadata (is the remainder of the absolute value divided by 4):          *
+     *   - 0 - Counter works properly                                                                                             *
+     *   - 1 - Error occurred (the counted value may be underestimated)                                                           *
+     *   - 2 - Sensor reset occurred (the counted value may be underestimated)                                                    *
+     *   - 3 - Sensor reset and error occurred (the counted value may be underestimated)                                          */
     MEASUREMENT_TYPE_PULSE_CNT_ACC_WIDE_MAJOR = 40;
 
-    /* [mA] - Milliampere. Resolution 0.001mA. Range [-4 000.000:4 000.000]. Type: Continuous                                     */
+    /* [mA] - Milliampere. Current (precise). Resolution: 0.001mA. Range: [-4000.000:4000.000]. Type: Continuous.                 */
     MEASUREMENT_TYPE_CURRENT_PRECISE = 41;
 
-    /* Sign indicates state: (+) ON, (-) OFF. Type: Binary                                                                        */
+    /* Sign indicates state: (+) ON, (-) OFF. Type: Binary.                                                                       */
     MEASUREMENT_TYPE_OUTPUT_CONTROL = 42;
-}
-
 
+    /* [Ω] - Ohm. Resolution: 1Ω. Range: [0:1000000]. Type: Continuous.                                                           */
+    MEASUREMENT_TYPE_RESISTANCE = 43;
+}

common/transport/coap/src/main/proto/efento/proto_measurements.proto

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 syntax = "proto3";
+
 import "efento/proto_measurement_types.proto";
 
 option java_package = "org.thingsboard.server.gen.transport.coap";
@@ -21,106 +22,166 @@ option java_outer_classname = "MeasurementsProtos";
 
 message ProtoChannel {
 
-    /* Type of channel                                                                                                            */
+    /* Reserved fields.                                                                                                           */
+    reserved 6,7,8;
+
+    /* Type of measurement.                                                                                                       *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     MeasurementType type = 1;
 
-    /* Timestamp of the first sample (the oldest one) in seconds since UNIX EPOCH 01-01-1970                                      */
+    /* Timestamp of the first (oldest) sample in seconds since 1st of January 1970 (epoch time).                                  *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     int32 timestamp = 2;
 
-    /* Only used for 'Continuous' sensor types. Value used as the starting point for calculating the values of all                */
+    /* Start point of measurement values.                                                                                         *
-    /* measurements in the package.                                                                                               */
+     * This is used as the base value for calculating the values of all channel measurements in the message.                      *
-    /* Format defined by 'MeasurementType' field                                                                                  */
+     * Used for 'Continuous' sensor types only.                                                                                   *
+     * Format is defined by 'MeasurementType' field.                                                                              *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     sint32 start_point = 4;
 
-    /* 'Continuous' sensor types                                                                                                  */
+    /* Measurement value offsets.                                                                                                 *
-    /* Value of the offset from the 'start_point' for each measurement in the package. The oldest sample first ([0]).             */
+     * For 'Continuous' sensor types:                                                                                             *
-    /* 'sample_offsets' format defined by 'MeasurementType' field.                                                                */
+     *   These are the values of the offsets from the 'start_point' for each channel measurement in the message.                  *
-    /* If the 'sample_offset' has a value from the range [8355840: 8388607], it should be interpreted as a sensor error code.     */
+     *   Format is defined by 'MeasurementType' field. The first sample is the oldest.                                            *
-    /* In that case value of the 'start_point' field should not be added to this 'sample_offset'. See ES6-264 for error codes.    */
+     *   If the sample offset has a value in the range [8355840:8388607], it should be interpreted as a sensor error code.        *
-    /* Example: MeasurementType = 1 (temperature), start_point = 100, sample_offsets[0] = 15, sample_offsets[1] = 20,             */
+     *   In this case, the value of the 'start_point' field should not be added to this sample offset.                            *
-    /* sample_offset[2] = 8388605                                                                                                 */
+     *   Example: type = 1 (temperature)                                                                                          *
-    /* 1st sample in the package temperature value = 11.5 °C, 2nd sample in the package temperature value = 12 °C                 */
+     *            start_point = 100                                                                                               *
-    /* 3rd sample in the package has no temperature value. It has information about failure of MCP9808 (temperature) sensor.      */
+     *            sample_offsets[0] = 15, sample_offsets[1] = 20, sample_offsets[2] = 8388557                                     *
-    /* Calculating timestamps of the measurements: timestamp = 1606391700, measurement_period_base = 60,                          */
+     *            timestamp = 1606391700                                                                                          *
-    /* measurement_period_factor = 1. Timestamp of the 1st sample = 1606391700, timestamp of the 2nd sample = 1606391760,         */
+     *            measurement_period_base = 60                                                                                    *
-    /* timestamp of the 3rd sample 1606391820                                                                                     */
+     *            measurement_period_factor = 1                                                                                   *
-
+     *            1st measurement is the temperature value = 11.5°C, measured at 1606391700                                       *
-    /* 'Binary' sensor types:                                                                                                     */
+     *            2nd measurement is the temperature value = 12°C, measured at 1606391760                                         *
-    /* Absolute value of the 'sample_offsets' field indicates the offset in seconds from 'timestamp' field.                       */
+     *            3rd measurement is the error code (failure of the SHT4x temperature sensor), measured at 1606391820             *
-    /* Sign (- or +) indicates the state of measurements depending on the sensor type.                                            */
+     * For 'Binary' sensor types:                                                                                                 *
-    /* Value of this field equals to '1' or '-1' indicates the state at the 'timestamp'. Other values                             */
+     *   The absolute value of the sample offset minus 1 is the offset in seconds from the 'timestamp' field.                     *
-    /* indicate the state of the relay at the time (in seconds) equal to 'timestamp' + absolute value -1.                         */
+     *   Sign (- or +) indicates the state of the measurement depending on the sensor type.                                       *
-    /* Values of this field are incremented starting from 1 (1->0: state at the time                                              */
+     *   The first and the last samples define the time range of the measurements.                                                *
-    /* of 'timestamp', 2->1: state at the time equal to 'timestamp' + 1 s, 3->2 :                                                 */
+     *   Only state changes within the time range are included in the 'sample_offsets' field.                                     *
-    /* state at the time equal to 'timestamp' + 2 s, etc.). The first and the last sample define the time range of the            */
+     *   Example: type = 5 (OK/Alarm)                                                                                             *
-    /* measurements. Only state changes in the time range are included in the 'sample_offsets' field                              */
+     *            sample_offsets[0] = 1, sample_offsets[1] = -9, sample_offsets[2] = 13                                           *
-    /* Examples: if 'timestamp' value is 1553518060 and 'sample_offsets' equals '1', it means that at 1553518060 the state        */
+     *            timestamp = 1606391700                                                                                          *
-    /* was high, if 'timestamp' value is 1553518060 and 'sample_offsets' equals '-9', it means at 1553518068 the state was low    */
+     *            1st measurement is the state at 1606391700, which is Alarm (+)                                                  *
+     *            2nd measurement is the state at 1606391708, which is OK (-)                                                     *
+     *            3rd measurement is the state at 1606391712, which is Alarm (+)                                                  *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     repeated sint32 sample_offsets = 5 [packed=true];
-
-    /* Deprecated - configuration is sent to endpoint 'c'                                                                         */
-    /* int32 lo_threshold = 6;                                                                                                    */
-    reserved 6;
-
-    /* Deprecated - configuration is sent to endpoint 'c'                                                                         */
-    /* int32 hi_threshold = 7;                                                                                                    */
-    reserved 7;
-
-    /* Deprecated - configurations sent to endpoint 'c'                                                                          */
-    /* int32 diff_threshold = 8;                                                                                                  */
-    reserved 8;
 }
 
 message ProtoMeasurements {
 
-    /* Serial number of the device                                                                                                */
+    /* RESERVED FIELDS ---------------------------------------------------------------------------------------------------------- */
-    bytes serial_num = 1;
+
-
+    reserved 10,11,12,13,14,15;
-    /* Battery status: true - battery ok, false - battery low                                                                     */
+
-    bool battery_status = 2;
+    /* DEVICE STATUS FIELDS ----------------------------------------------------------------------------------------------------- */
-
+
-    /* 'Measurement_period_base' and 'measurement_period_factor' define how often the measurements are taken.                     */
+    /* Serial number of the device.                                                                                               *
-    /* Sensors of 'Continuous' type take measurement each Measurement_period_base * measurement_period_factor.                    */
+     * Length: 6 bytes.                                                                                                           *
-    /* Sensors of 'Binary' type take measurement each Measurement_period_base.                                                    */
+     * Status: In use [07.00.00 - LATEST] / Previously as serial_num [06.00 - 06.xx.xx]                                           */
-    /* For backward compatibility with versions 5.x in case of binary/mixed sensors, if the 'measurement_period_factor' is        */
+    bytes serial_number = 1;
-    /* not sent (equal to 0), then the default value '14' shall be used for period calculation.                                   */
+
-    /* For backward compatibility with versions 5.x in case of continues sensors, if the measurement_period_factor is             */
+    /* Identifier of the current configuration.                                                                                   *
-    /* not sent (equal to 0), then the default value '1' shall be used for period calculation.                                    */
+     * The value of this field changes with every configuration change.                                                           *
-    /* measurement period base in seconds                                                                                         */
+     * Status: In use [07.00.00 - LATEST] / Previously as hash [06.00 - 06.xx.xx]                                                 */
+    uint32 configuration_hash = 9;
+
+    /* Identifier of the current extended configuration.                                                                          *
+     * The value of this field changes with every extended configuration change.                                                  *
+     * Status: In use [07.00.00 - LATEST]                                                                                         */
+    uint32 extended_configuration_hash = 17;
+
+    /* Battery level and status:                                                                                                  *
+     *   - [1:65525] - Battery voltage measurement and a battery status                                                           *
+     *   - [65526:65531] - No battery voltage measurement and a battery status                                                    *
+     * To obtain the battery voltage, the battery_level value should be divided by 6 and the remainder of the division discarded. *
+     * The result is in hundredths of a volt or 10921 (no battery voltage measurement).                                           *
+     * Battery level also includes a battery status as metadata (the remainder of the value divided by 6):                        *
+     *   - 0 - Device is powered by a battery                                                                                     *
+     *   - 1 - Device is powered by a rechargeable battery                                                                        *
+     *   - 2 - Device is powered by an external source and a battery is charging                                                  *
+     *   - 3 - Reserved for the future use                                                                                        *
+     *   - 4 - Reserved for the future use                                                                                        *
+     *   - 5 - Reserved for the future use                                                                                        *
+     * Example: battery_level = 2474                                                                                              *
+     *          Battery voltage = 2474/6 = 412 = 4.12[V]                                                                          *
+     *          Battery status = 2474 % 6 = 2                                                                                     *
+     * Status: In use [07.00.00 - LATEST]                                                                                         */
+    uint32 battery_level = 18;
+
+    /* MEASUREMENT FIELDS ------------------------------------------------------------------------------------------------------- */
+
+    /* Measurement period defines how often the measurements are to be taken.                                                     *
+     * Sensors of 'Continuous' type take measurement each 'measurement_period_base' * 'measurement_period_factor'.                *
+     * Sensors of 'Binary' type take measurement each 'measurement_period_base'.                                                  *
+     * For backward compatibility with versions 5.xx in case of 'Binary/Mixed' sensors, if the 'measurement_period_factor' is     *
+     * not sent (equal to 0), then the default value '14' shall be used for the period calculation.                               *
+     * For backward compatibility with versions 5.xx in case of 'Continuous' sensors, if the 'measurement_period_factor' is       *
+     * not sent (equal to 0), then the default value '1' shall be used for the period calculation.                                */
+
+    /* Measurement period base in seconds.                                                                                        *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     uint32 measurement_period_base = 3;
 
-    /* Measurement period factor                                                                                                  */
+    /* Measurement period factor.                                                                                                 *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     uint32 measurement_period_factor = 8;
 
+    /* Measurements grouped by channel.                                                                                           *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     repeated ProtoChannel channels = 4;
 
-    /* Timestamp of the next scheduled transmission. If the device will not send data until this time,                            */
+    /* SERVER COMMUNICATION FIELDS ---------------------------------------------------------------------------------------------- */
-    /* it should be considered as 'lost'                                                                                          */
+
+    /* Battery status:                                                                                                            *
+     *   - True - Battery OK                                                                                                      *
+     *   - False - Battery discharged                                                                                             *
+     * Status: In use [06.00 - LATEST]                                                                                        */
+    bool battery_status = 2;
+
+    /* Timestamp of the next scheduled transmission.                                                                              *
+     * If the device has not sent any data by this time, it should be considered 'lost'.                                          *
+     * This field is only sent during server communication.                                                                       *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     uint32 next_transmission_at = 5;
 
-    /* Reason of transmission - unsigned integer where each bit indicates different possible communication reason.                */
+    /* Reason for transmission.                                                                                                   *
-    /* Can be more than one:                                                                                                      */
+     * Bitmask, where each bit represents a specific reason for initiating communication (multiple reasons can be active          *
-    /*  - bit 0: first message after sensor reset                                                                                 */
+     * simultaneously):                                                                                                           *
-    /*  - bit 1: user button triggered                                                                                            */
+     *   - Bit 0 - First message after sensor reset                                                                               *
-    /*  - bit 2: user BLE triggered                                                                                               */
+     *   - Bit 1 - User-triggered (button press)                                                                                  *
-    /*  - bit 3-7: number of retries -> incremented after each unsuccessful transmission. Max value 31.                            */
+     *   - Bit 2 - User-triggered (Bluetooth)                                                                                     *
-    /*                                  Set to 0 after a successful transmission.                                                 */
+     *   - Bit 3:7 - Number of retries - incremented after each failed transmission and reset upon success. Range: [0:31]         *
-    /*  - bit 8...19: rule 1...12 was met                                                                                         */
+     *   - Bit 8:19 - Rule-based triggers (12 bits):                                                                              *
-    /*  - bit 20: triggered after the end of the limit                                                                            */
+     *      - [06.00 - 07.01.xx]: Bitmask indicating which of the rules 1-12 were met                                             *
+     *      - [07.02.00 - LATEST]: The transfer bit 'i' (where i = 0 to 11) is set if either rule 'i' (0-11) is set               *
+     *        or if rule 'i + 12' (12-15) is set. This aggregation applies only to bits 0-3 (rules 0-3 and 12-15).                *
+     *        The mask aggregates 16 rules (0-15) onto 12 bits.                                                                   *
+     *   - Bit 20 - Triggered at the end of the defined limit                                                                     *
+     *   - Bit 21 - Triggered after a PIN tamper alert                                                                            *
+     *   - Bit 22 - Triggered after an enclosure tamper alert                                                                     *
+     *   - Bit 23 - Triggered before shutdown                                                                                     *
+     * This field is only sent during server communication.                                                                       *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     uint32 transfer_reason = 6;
 
-    /* Signal strength level mapped from RSSI:                                                                                    */
+    /* Signal strength (RSSI - Received Signal Strength Level):                                                                   *
-    /*  - 0: RSSI < -110 dBm                                                                                                      */
+     *   - 0 - RSSI < -110dBm                                                                                                     *
-    /*  - 1: -110 dBm <= RSSI < -109 dBm                                                                                          */
+     *   - 1 - -110dBm <= RSSI < -109dBm                                                                                          *
-    /*  - 2...61: -109 <= RSSI < -108 dBm ... -50 dBm <= RSSI < -49 dBm                                                           */
+     *   - 2:61 - -109dBm <= RSSI < -108dBm ... -50dBm <= RSSI < -49dBm                                                           *
-    /*  - 62: -49 dBm <= RSSI < -48 dBm                                                                                           */
+     *   - 62 - -49dBm <= RSSI < -48dBm                                                                                           *
-    /*  - 63: RSSI >= -48 dBm                                                                                                     */
+     *   - 63 -  RSSI >= -48dBm                                                                                                   *
-    /*  - 99: Not known or not detectable                                                                                         */
+     *   - 99 - Unknown or undetectable                                                                                           *
+     * This field is only sent during server communication.                                                                       *
+     * Status: Deprecated [06.00 - 06.xx.xx]                                                                                      */
     uint32 signal = 7;
 
-    /* Hash of the current configuration. Hash value changes each time a device receives a new configuration                      */
+    /* Cloud token.                                                                                                               *
-    uint32 hash = 9;
+     * Can be empty, set to any user-defined value, or hold device IMEI.                                                          *
-
+     * String up to 36 characters.                                                                                                *
-    /* Optional string up to 36 bytes long. Can be set to any user define value or hold device's IMEI                             */
+     * This field is only sent during server communication.                                                                       *
+     * Status: In use [06.00 - LATEST]                                                                                            */
     string cloud_token = 16;
 }

common/transport/coap/src/main/proto/efento/proto_rule.proto

@@ -18,270 +18,287 @@ syntax = "proto3";
 option java_package = "org.thingsboard.server.gen.transport.coap";
 option java_outer_classname = "ProtoRuleProtos";
 
-/* Encoding A: used to set absolute values in the Rules (e.g. upper and lower threshold values)                                 */
+/* Encoding A: used to set absolute values in rules (e.g., upper and lower thresholds):                                         *
-/*  - TEMPERATURE - [°C] - Celsius degree. Resolution 0.1°C. Range [-273.2:4000.0].                                             */
+ *   - TEMPERATURE - [°C] Celsius degree. Resolution: 0.1°C. Range: [-273.2:4000.0]                                             *
-/*  - HUMIDITY - [% RH] - Relative humidity. Resolution 1%. Range [0:100].                                                      */
+ *   - HUMIDITY - [% RH] Percentage (Relative humidity). Resolution: 1%. Range: [0:100]                                         *
-/*  - ATMOSPHERIC_PRESSURE - [hPa] - Hectopascal (1hPa = 100Pa). Resolution 0.1hPa. Range: [1.0:2000.0].                        */
+ *   - ATMOSPHERIC_PRESSURE - [hPa] Hectopascal. Resolution: 0.1hPa. Range: [1.0:2000.0]                                        *
-/*  - DIFERENTIAL_PRESSURE - [Pa] - Pascal. Resolution 1Pa. Range [-10000:10000]                                                */
+ *   - DIFERENTIAL_PRESSURE - [Pa] Pascal. Resolution: 1Pa. Range: [-10000:10000]                                               *
-/*  - OK/ALARM - Not applicable                                                                                                 */
+ *   - OK_ALARM - Not applicable                                                                                                *
-/*  - IAQ - [IAQ] - IAQ index. Resolution 1IAQ. Range [0:500].                                                                  */
+ *   - IAQ - [IAQ] IAQ index. Resolution: 1IAQ. Range: [0:500]                                                                  *
-/*  - FLOODING - Not applicable                                                                                                 */
+ *   - FLOODING - Not applicable                                                                                                *
-/*  - PULSE_CNT - [NB] Number of pulses. Resolution 1 pulse. Range [0:8000000].                                                 */
+ *   - PULSE_CNT - [NB] Number of pulses. Resolution: 1 pulse. Range: [0:8000000]. Period number of pulses                      *
-/*  - ELECTRICITY_METER - [W] - Watt; Resolution 1W. Range [0:8000000]. Average power consumption in period                     */
+ *   - ELECTRICITY_METER - [W] Watt. Resolution: 1W. Range: [0:8000000]. Period average power consumption                       *
-/*  - WATER_METER [l/min] - Liter per minute. Resolution 1l/min. Range [0:8000000]. Average water flow in period.               */
+ *   - WATER_METER - [l/min] Liter per minute. Resolution: 1l/min. Range: [0:8000000]. Period average water                     *
-/*  - SOIL_MOISTURE - [kPa] - Kilopascal (1kPa = 1000Pa); Resolution 1kPa. Range [-1000:0]. Soil moisture (tension).            */
+ *   - SOIL_MOISTURE - [kPa] Kilopascal. Resolution: 1kPa. Range: [-1000:0]                                                     *
-/*  - CO_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Carbon monoxide concentration.                    */
+ *   - CO_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                                   *
-/*  - NO2_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Nitrogen dioxide concentration.                  */
+ *   - NO2_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                                  *
-/*  - H2S_GAS - [ppm] - Parts per million. Resolution 0.01ppm. Range [0.00:80000.00]. Hydrogen sulfide concentration.           */
+ *   - H2S_GAS - [ppm] Parts per million. Resolution: 0.01ppm. Range: [0.00:80000.00]                                           *
-/*  - AMBIENT_LIGHT -[lx] - Lux. Resolution 0.1lx. Range [0.0:100000.0]. Illuminance.                                           */
+ *   - AMBIENT_LIGHT - [lx] Lux. Resolution: 0.1lx. Range: [0.0:100000.0]                                                       *
-/*  - PM_1_0 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [0:1000].                                        */
+ *   - PM_1_0 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [0:1000]                                        *
-/*  - PM_2_5 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [0:1000].                                        */
+ *   - PM_2_5 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [0:1000]                                        *
-/*  - PM_10_0 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [0:1000].                                       */
+ *   - PM_10_0 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [0:1000]                                       *
-/*  - NOISE_LEVEL - [dB] - Decibels. Resolution 0.1 dB. Range: [0.0:200.0]. Noise level.                                        */
+ *   - NOISE_LEVEL - [dB] Decibel. Resolution: 0.1 dB. Range: [0.0:200.0]                                                       *
-/*  - NH3_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Ammonia concentration.                           */
+ *   - NH3_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                                  *
-/*  - CH4_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Methane concentration.                           */
+ *   - CH4_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                                  *
-/*  - HIGH_PRESSURE - [kPa] - Kilopascal (1kPa = 1000Pa, 100kPa = 1bar). Resolution 1kPa. Range [0:200000]. Pressure.           */
+ *   - HIGH_PRESSURE - [kPa] Kilopascal (100kPa = 1bar). Resolution: 1kPa. Range: [0:200000]                                    *
-/*  - DISTANCE_MM - [mm] - Millimeter. Resolution 1mm. Range [0:100000]. Distance.                                              */
+ *   - DISTANCE_MM - [mm] Millimeter. Resolution: 1mm. Range: [0:100000]                                                        *
-/*  - WATER_METER_ACC_MINOR - [l] - Liter. Resolution 1l. Range [0:1000000]. Accumulative water meter (minor).                  */
+ *   - WATER_METER_ACC_MINOR - [l] Liter. Resolution: 1l. Range: [0:99]                                                         *
-/*  - WATER_METER_ACC_MAJOR - [hl] - Hectoliter. Resolution 1hl. Range [0:1000000]. Accumulative water meter (major).           */
+ *   - WATER_METER_ACC_MAJOR - [hl] Hectoliter. Resolution: 1hl. Range: [0:999999]                                              *
-/*  - CO2_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Carbon dioxide concentration.                    */
+ *   - CO2_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                                  *
-/*  - HUMIDITY ACCURATE - [% RH] - Relative humidity. Resolution 0.1%. Range [0.0:100.0].                                       */
+ *   - HUMIDITY_ACCURATE - [% RH] Percentage (Relative humidity). Resolution: 0.1%. Range: [0.0:100.0]                          *
-/*  - STATIC_IAQ - [sIAQ] - Static IAQ index. Resolution 1sIAQ. Range [0:10000].                                                */
+ *   - STATIC_IAQ - [sIAQ] Static IAQ index. Resolution: 1sIAQ. Range: [0:10000]                                                *
-/*  - CO2_EQUIVALENT - [ppm] - Parts per million. Resolution 1ppm. Range [0:1000000]. Carbon dioxide equivalent.                */
+ *   - CO2_EQUIVALENT - [ppm] Parts per million. Resolution: 1ppm. Range: [0:1000000]                                           *
-/*  - BREATH_VOC - [ppm] - Parts per million. Resolution 1ppm. Range [0:100000]. Breath VOC estimate.                           */
+ *   - BREATH_VOC - [ppm] Parts per million. Resolution: 1ppm. Range: [0:100000]                                                *
-/*  - PERCENTAGE - [%] - Percentage. Resolution 0.01%. Range [0.00:100.00].                                                     */
+ *   - CELLULAR_GATEWAY - Not applicable                                                                                        *
-/*  - VOLTAGE - [mV] - Milivolt. Resolution 0.1mV. Range [0.0:100000.0].                                                        */
+ *   - PERCENTAGE - [%] Percentage. Resolution: 0.01%. Range: [0.00:100.00]                                                     *
-/*  - CURRENT - [mA] - Miliampere. Resolution 0.01mA. Range [0.00:10000.00].                                                    */
+ *   - VOLTAGE - [mV] Millivolt. Resolution: 0.1mV. Range: [0.0:100000.0]                                                       *
-/*  - PULSE_CNT_ACC_MINOR - [NB] - Number of pulses. Resolution 1 pulse. Range [0:1000000]. Accumulative pulse counter (minor). */
+ *   - CURRENT - [mA] Milliampere. Resolution: 0.01mA. Range: [0.00:10000.00]                                                   *
-/*  - PULSE_CNT_ACC_MAJOR - [kNB] - Number of kilopulses. Resolution 1 kilopulse. Range [0:1000000].                            */
+ *   - PULSE_CNT_ACC_MINOR - [NB] Number of pulses. Resolution: 1 pulse. Range: [0:999]                                         *
-/*                                  Accumulative pulse counter (major).                                                         */
+ *   - PULSE_CNT_ACC_MAJOR - [kNB] Number of kilopulses. Resolution: 1 kilopulse. Range: [0:999999]                             *
-/*  - ELEC_METER_ACC_MINOR - [Wh] - Watt-hour. Resolution 1Wh. Range [0:1000000]. Accumulative electricity meter (minor).       */
+ *   - ELEC_METER_ACC_MINOR - [Wh] Watt-hour. Resolution: 1Wh. Range: [0:999]                                                   *
-/*  - ELEC_METER_ACC_MAJOR - [kWh] - Kilowatt-hour. Resolution 1kWh. Range [0:1000000]. Accumulative electricity meter (major). */
+ *   - ELEC_METER_ACC_MAJOR - [kWh] Kilowatt-hour. Resolution: 1kWh. Range: [0:999999]                                          *
-/*  - PULSE_CNT_ACC_WIDE_MINOR - [NB] - Number of pulses. Resolution 1 pulse. Range [0:999999].                                 */
+ *   - PULSE_CNT_ACC_WIDE_MINOR - [NB] Number of pulses. Resolution: 1 pulse. Range: [0:999999]                                 *
-/*                                      Accumulative pulse counter wide range (minor).                                          */
+ *   - PULSE_CNT_ACC_WIDE_MAJOR - [MNB] Number of megapulses. Resolution: 1 megapulse. Range: [0:999999]                        *
-/*  - PULSE_CNT_ACC_WIDE_MAJOR - [MNB] - Number of megapulses. Resolution 1 megapulse. Range [0:999999].                        */
+ *   - CURRENT_PRECISE - [mA] Milliampere. Resolution: 0.001mA. Range: [-4000.000:4000.000]                                     *
-/*                                       Accumulative pulse counter wide range (major).                                         */
+ *   - OUTPUT_CONTROL - Not applicable                                                                                          *
-/*  - CURRENT_PRECISE - [mA] - Miliampere. Resolution 0.001mA. Range [-4 000.000:4 000.000].                                    */
+ *   - RESISTANCE - [Ω] Ohm. Resolution: 1Ω. Range: [0:1000000]                                                                 */
-/*  - OUTPUT_CONTROL - Not applicable                                                                                           */
+
-
+/* Encoding R: used to set relative values in rules (e.g., differential threshold and hysteresis):                              *
-/* Encoding R: used to set relative values in the Rules (e.g. differential threshold and hysteresis)                            */
+ *   - TEMPERATURE - [°C] Celsius degree. Resolution: 0.1°C. Range: [0.1:4273.2]                                                *
-/*  - TEMPERATURE - [°C] - Celsius degree. Resolution 0.1°C. Range [0.1:4273.2].                                                */
+ *   - HUMIDITY - [% RH] Percentage (Relative humidity). Resolution: 1%. Range: [1:100]                                         *
-/*  - HUMIDITY - [% RH] - Relative humidity. Resolution 1%. Range [1:100].                                                      */
+ *   - ATMOSPHERIC_PRESSURE - [hPa] Hectopascal. Resolution: 0.1hPa. Range: [0.1:1999.0]                                        *
-/*  - ATMOSPHERIC_PRESSURE - [hPa] - Hectopascal (1hPa = 100Pa). Resolution 0.1hPa. Range: [0.1:1999.0].                        */
+ *   - DIFERENTIAL_PRESSURE - [Pa] Pascal. Resolution: 1Pa. Range: [1:20000]                                                    *
-/*  - DIFERENTIAL_PRESSURE - [Pa] - Pascal. Resolution 1Pa. Range [1:20000]                                                     */
+ *   - OK_ALARM - Not applicable                                                                                                *
-/*  - OK/ALARM - Not applicable                                                                                                 */
+ *   - IAQ - [IAQ] IAQ index. Resolution: 1IAQ. Range: [1:500]                                                                  *
-/*  - VOC - [IAQ] - Iaq index. Resolution 1IAQ. Range [1:500].                                                                  */
+ *   - FLOODING - Not applicable                                                                                                *
-/*  - FLOODING - Not applicable                                                                                                 */
+ *   - PULSE_CNT - [NB] Number of pulses. Resolution: 1 pulse. Range: [1:8000000]. Period number of pulses                      *
-/*  - PULSE_CNT - [NB] Number of pulses. Resolution 1 pulse. Range [1:8000000].                                                 */
+ *   - ELECTRICITY_METER - [W] Watt. Resolution: 1W. Range: [1:8000000]. Period average power consumption                       *
-/*  - ELECTRICITY_METER - [W] - Watt; Resolution 1W. Range [1:8000000]. Average power consumption in period                     */
+ *   - WATER_METER - [l/min] Liter per minute. Resolution: 1l/min. Range: [1:8000000]. Period average water                     *
-/*  - WATER_METER [l/min] - Liter per minute. Resolution 1l/min. Range [1:8000000]. Average water flow in period.               */
+ *   - SOIL_MOISTURE - [kPa] Kilopascal. Resolution: 1kPa. Range: [1:1000]                                                      *
-/*  - SOIL_MOISTURE - [kPa] - Kilopascal (1kPa = 1000Pa); Resolution 1kPa. Range [1:1000]. Soil moisture (tension).             */
+ *   - CO_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                                   *
-/*  - CO_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Carbon monoxide concentration.                    */
+ *   - NO2_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                                  *
-/*  - NO2_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Nitrogen dioxide concentration.                  */
+ *   - H2S_GAS - [ppm] Parts per million. Resolution: 0.01ppm. Range: [0.01:80000.00]                                           *
-/*  - H2S_GAS - [ppm] - Parts per million. Resolution 0.01ppm. Range [0.01:80000.00]. Hydrogen sulfide concentration.           */
+ *   - AMBIENT_LIGHT - [lx] Lux. Resolution: 0.1lx. Range: [0.1:100000.0]                                                       *
-/*  - AMBIENT_LIGHT -[lx] - Lux. Resolution 0.1lx. Range [0.1:100000.0]. Illuminance.                                           */
+ *   - PM_1_0 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [1:1000]                                        *
-/*  - PM_1_0 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [1:1000].                                        */
+ *   - PM_2_5 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [1:1000]                                        *
-/*  - PM_2_5 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [1:1000].                                        */
+ *   - PM_10_0 - [µg/m^3] Microgram per cubic meter. Resolution: 1µg/m^3. Range: [1:1000]                                       *
-/*  - PM_10_0 - [µg/m^3] - Micro gram per cubic meter. Resolution 1µg/m^3 Range [1:1000].                                       */
+ *   - NOISE_LEVEL - [dB] Decibel. Resolution: 0.1 dB. Range: [0.1:200.0]                                                       *
-/*  - NOISE_LEVEL - [dB] - Decibels. Resolution 0.1 dB. Range: [0.1:200.0]. Noise level.                                        */
+ *   - NH3_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                                  *
-/*  - NH3_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Ammonia concentration.                           */
+ *   - CH4_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                                  *
-/*  - CH4_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Methane concentration.                           */
+ *   - HIGH_PRESSURE - [kPa] Kilopascal (100kPa = 1bar). Resolution: 1kPa. Range: [1:200000]                                    *
-/*  - HIGH_PRESSURE - [kPa] - Kilopascal (1kPa = 1000Pa, 100kPa = 1bar). Resolution 1kPa. Range [1:200000]. Pressure.           */
+ *   - DISTANCE_MM - [mm] Millimeter. Resolution: 1mm. Range: [1:100000]                                                        *
-/*  - DISTANCE_MM - [mm] - Millimeter. Resolution 1mm. Range [1:100000]. Distance.                                              */
+ *   - WATER_METER_ACC_MINOR - [l] Liter. Resolution: 1l. Range: [1:99]                                                         *
-/*  - WATER_METER_ACC_MINOR - [l] - Liter. Resolution 1l. Range [1:1000000]. Accumulative water meter (minor).                  */
+ *   - WATER_METER_ACC_MAJOR - [hl] Hectoliter. Resolution: 1hl. Range: [1:999999]                                              *
-/*  - WATER_METER_ACC_MAJOR - [hl] - Hectoliter. Resolution 1hl. Range [1:1000000]. Accumulative water meter (major).           */
+ *   - CO2_GAS - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                                  *
-/*  - CO2_GAS - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Carbon dioxide concentration.                    */
+ *   - HUMIDITY_ACCURATE - [% RH] Percentage (Relative humidity). Resolution: 0.1%. Range: [0.1:100.0]                          *
-/*  - HUMIDITY ACCURATE - [% RH] - Relative humidity. Resolution 0.1%. Range [0.1:100.0].                                       */
+ *   - STATIC_IAQ - [sIAQ] Static IAQ index. Resolution: 1sIAQ. Range: [1:10000]                                                *
-/*  - STATIC_IAQ - [sIAQ] - Static IAQ index. Resolution 1sIAQ. Range [1:10000].                                                */
+ *   - CO2_EQUIVALENT - [ppm] Parts per million. Resolution: 1ppm. Range: [1:1000000]                                           *
-/*  - CO2_EQUIVALENT - [ppm] - Parts per million. Resolution 1ppm. Range [1:1000000]. Carbon dioxide equivalent.                */
+ *   - BREATH_VOC - [ppm] Parts per million. Resolution: 1ppm. Range: [1:100000]                                                *
-/*  - BREATH_VOC - [ppm] - Parts per million. Resolution 1ppm. Range [1:100000]. Breath VOC estimate.                           */
+ *   - CELLULAR_GATEWAY - Not applicable                                                                                        *
-/*  - PERCENTAGE - [%] - Percentage. Resolution 0.01%. Range [0.01:100.00].                                                     */
+ *   - PERCENTAGE - [%] Percentage. Resolution: 0.01%. Range: [0.01:100.00]                                                     *
-/*  - VOLTAGE - [mV] - Milivolt. Resolution 0.1mV. Range [0.1:100000.0].                                                        */
+ *   - VOLTAGE - [mV] Millivolt. Resolution: 0.1mV. Range: [0.1:100000.0]                                                       *
-/*  - CURRENT - [mA] - Miliampere. Resolution 0.01mA. Range [0.01:10000.00].                                                    */
+ *   - CURRENT - [mA] Milliampere. Resolution: 0.01mA. Range: [0.01:10000.00]                                                   *
-/*  - PULSE_CNT_ACC_MINOR - [NB] - Number of pulses. Resolution 1 pulse. Range [1:1000000]. Accumulative pulse counter (minor). */
+ *   - PULSE_CNT_ACC_MINOR - [NB] Number of pulses. Resolution: 1 pulse. Range: [1:999]                                         *
-/*  - PULSE_CNT_ACC_MAJOR - [kNB] - Number of kilopulses. Resolution 1 kilopulse. Range [1:1000000].                            */
+ *   - PULSE_CNT_ACC_MAJOR - [kNB] Number of kilopulses. Resolution: 1 kilopulse. Range: [1:999999]                             *
-/*                                  Accumulative pulse counter (major).                                                         */
+ *   - ELEC_METER_ACC_MINOR - [Wh] Watt-hour. Resolution: 1Wh. Range: [1:999]                                                   *
-/*  - ELEC_METER_ACC_MINOR - [Wh] - Watt-hour. Resolution 1Wh. Range [1:1000000]. Accumulative electricity meter (minor).       */
+ *   - ELEC_METER_ACC_MAJOR - [kWh] Kilowatt-hour. Resolution: 1kWh. Range: [1:999999]                                          *
-/*  - ELEC_METER_ACC_MAJOR - [kWh] - Kilowatt-hour. Resolution 1kWh. Range [1:1000000]. Accumulative electricity meter (major). */
+ *   - PULSE_CNT_ACC_WIDE_MINOR - [NB] Number of pulses. Resolution: 1 pulse. Range: [1:999999]                                 *
-/*  - PULSE_CNT_ACC_WIDE_MINOR - [NB] - Number of pulses. Resolution 1 pulse. Range [1:999999].                                 */
+ *   - PULSE_CNT_ACC_WIDE_MAJOR - [MNB] Number of megapulses. Resolution: 1 megapulse. Range: [1:999999]                        *
-/*                                      Accumulative pulse counter wide range (minor).                                          */
+ *   - CURRENT_PRECISE - [mA] Milliampere. Resolution: 0.001mA. Range: [0.001:8000.000]                                         *
-/*  - PULSE_CNT_ACC_WIDE_MAJOR - [MNB] - Number of megapulses. Resolution 1 megapulse. Range [1:999999].                        */
+ *   - OUTPUT_CONTROL - Not applicable                                                                                          *
-/*                                       Accumulative pulse counter wide range (major).                                         */
+ *   - RESISTANCE - [Ω] Ohm. Resolution: 1Ω. Range: [1:1000000]                                                                 */
-/*  - CURRENT_PRECISE - [mA] - Miliampere. Resolution 0.001mA. Range [0.001:8 000.000].                                         */
+
-/*  - OUTPUT_CONTROL - Not applicable                                                                                           */
+/* Condition to be checked by the device. If the condition is true, an action is triggered.                                     */
-
-/* Condition to be checked by the device. If the condition is true, an action is triggered                                      */
 enum Condition {
 
-  /* Invalid value                                                                                                              */
+  /* Invalid value.                                                                                                             */
   CONDITION_UNSPECIFIED = 0;
 
-  /* Threshold function for given rule_id is disabled                                                                           */
+  /* The rule is disabled.                                                                                                      */
   CONDITION_DISABLED = 1;
 
-  /* Upper threshold. Continuous sensors only. If the measurement (or average from a few measurements) is over the threshold,   */
+  /* Upper threshold. 'Continuous' sensors only.                                                                                *
-  /* an action is triggered.                                                                                                    */
+   * If the measurement (or average from a few measurements) is over the threshold, an action is triggered.                     *
-  /* parameter[0] - Threshold value in "Encoding A" format. Must match channel type                                             */
+   * parameter[0] - Threshold value in "Encoding A" format. Must match channel type.                                            *
-  /* parameter[1] - Hysteresis value in "Encoding R" format. Must much channel type. Set to "0" to disable                      */
+   * parameter[1] - Hysteresis value in "Encoding R" format. Must match channel type. Set to "0" to disable.                    *
-  /* parameter[2] - Triggering mode:                                                                                            */
+   * parameter[2] - Triggering mode:                                                                                            *
-  /*                  - 1 - moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             */
+   *                  - 1 - Moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             *
-  /*                  - 2 - window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             */
+   *                  - 2 - Window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             *
-  /*                  - 3 - consecutive samples (number of consecutive samples above threshold)                                 */
+   *                  - 3 - Consecutive samples (number of consecutive samples above threshold)                                 *
-  /* parameter[3] - Number of measurements for trigger determination. E.g parameter[3] equals 3, average value from three       */
+   * parameter[3] - Number of measurements for trigger determination. E.g., parameter[3] equals 3, average value from three     *
-  /*                samples will be calculated and compared to the threshold value in average mode or the third consecutive     */
+   *                samples will be calculated and compared to the threshold value in average mode or the third consecutive     *
-  /*                sample above threshold will trigger action in consecutive mode. Range: [1:10].                              */
+   *                sample above threshold will trigger action in consecutive mode. Range: [1:10].                              *
-  /* parameter[4] - Type of measurement (as described in MeasurementType).                                                      */
+   * parameter[4] - Type of measurement (as described in MeasurementType).                                                      */
   CONDITION_HIGH_THRESHOLD = 2;
 
-  /* Lower threshold. Continuous sensors only. If the measurement (or average from a few measurements) is below the threshold,  */
+  /* Lower threshold. 'Continuous' sensors only.                                                                                *
-  /* an action is triggered.                                                                                                    */
+   * If the measurement (or average from a few measurements) is below the threshold, an action is triggered.                    *
-  /* parameter[0] - Threshold value in "Encoding A" format. Must match channel type                                             */
+   * parameter[0] - Threshold value in "Encoding A" format. Must match channel type.                                            *
-  /* parameter[1] - Hysteresis value in "Encoding R" format. Must much channel type. Set to "0" to disable                      */
+   * parameter[1] - Hysteresis value in "Encoding R" format. Must match channel type. Set to "0" to disable.                    *
-  /* parameter[2] - Triggering mode:                                                                                            */
+   * parameter[2] - Triggering mode:                                                                                            *
-  /*                  - 1 - moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             */
+   *                  - 1 - Moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             *
-  /*                  - 2 - window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             */
+   *                  - 2 - Window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             *
-  /*                  - 3 - consecutive samples (number of consecutive samples above threshold)                                 */
+   *                  - 3 - Consecutive samples (number of consecutive samples above threshold)                                 *
-  /* parameter[3] - Number of measurements for trigger determination. E.g parameter[3] equals 3, average value from three       */
+   * parameter[3] - Number of measurements for trigger determination. E.g., parameter[3] equals 3, average value from three     *
-  /*                samples will be calculated and compared to the threshold value in average mode or the third consecutive     */
+   *                samples will be calculated and compared to the threshold value in average mode or the third consecutive     *
-  /*                sample below threshold will trigger action in consecutive mode. Range: [1:10].                              */
+   *                sample below threshold will trigger action in consecutive mode. Range: [1:10].                              *
-  /* parameter[4] - Type of measurement (as described in MeasurementType).                                                      */
+   * parameter[4] - Type of measurement (as described in MeasurementType).                                                      */
   CONDITION_LOW_THRESHOLD = 3;
 
-  /* Differential threshold. Continuous sensors only. If the absolute value of the difference between the last value sent to    */
+  /* Differential threshold. 'Continuous' sensors only.                                                                         *
-  /* the server and the measurement value (or average from a few measurements) is greater or equal to the value of              */
+   * If the absolute value of the difference between the last value sent to the server and the measurement value                *
-  /* the threshold set, an action is triggered.                                                                                 */
+   * (or average from a few measurements) is greater or equal to the value of the threshold set, an action is triggered.        *
-  /* parameter[0] - Threshold value in "Encoding R" format. Must match channel type                                             */
+   * parameter[0] - Threshold value in "Encoding R" format. Must match channel type.                                            *
-  /* parameter[1] - Triggering mode:                                                                                            */
+   * parameter[1] - Triggering mode:                                                                                            *
-  /*                  - 1 - moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             */
+   *                  - 1 - Moving average (a1=(n1+n2+n3)/3, a2=(n2+n3+n4)/3, etc.)                                             *
-  /*                  - 2 - window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             */
+   *                  - 2 - Window average (a1=(n1+n2+n3)/3, a2=(n4+n5+n6)/3, etc.)                                             *
-  /*                  - 3 - consecutive samples (number of consecutive samples above threshold)                                 */
+   *                  - 3 - Consecutive samples (number of consecutive samples above threshold)                                 *
-  /* parameter[2] - Number of measurements for trigger determination. E.g parameter[3] equals 3, average value from three       */
+   * parameter[2] - Number of measurements for trigger determination. E.g., parameter[3] equals 3, average value from three     *
-  /*                samples will be calculated and compared to the threshold value in average mode or the third consecutive     */
+   *                samples will be calculated and compared to the threshold value in average mode or the third consecutive     *
-  /*                sample exceeding threshold will trigger action in consecutive mode. Range: [1:10].                          */
+   *                sample exceeding threshold will trigger action in consecutive mode. Range: [1:10].                          *
-  /* parameter[3] - Type of measurement (as described in MeasurementType).                                                      */
+   * parameter[3] - Type of measurement (as described in MeasurementType).                                                      */
   CONDITION_DIFF_THRESHOLD = 4;
 
-  /* Change of binary sensor's state. Binary sensors only. Each change of the binary's sensor state will trigger an action.     */
+  /* Change of binary sensor's state. 'Binary' sensors only.                                                                    *
+   * Each change of the binary sensor's state will trigger an action.                                                           */
   CONDITION_BINARY_CHANGE_STATE = 5;
 
-  /* Logic operator. Used for combining multiple rules into more complex conditions. If the logic condition specified by        */
+  /* Logic operator. Used for combining multiple rules into more complex conditions.                                            *
-  /* parameters (logic operator and selected rules) is met, an action is triggered.                                             */
+   * If the logic condition specified by parameters (logic operator and selected rules) is met, an action is triggered.         *
-  /* parameter[0] - Logic operator (as described in LogicOperation).                                                            */
+   * parameter[0] - Logic operator (as described in LogicOperator).                                                             *
-  /* parameter[1] - Rule selector (bit mask). Specifies which rules should be taken into account while determining              */
+   * parameter[1] - Rule selector (bitmask). Specifies which rules should be taken into account while determining               *
-  /*                rules outcome.                                                                                              */
+   *                rules outcome.                                                                                              *
-  /* parameter[2] - Rule negation (bit mask). Specifies which of chosen in parameter[1] rules should be negated                 */
+   * parameter[2] - Rule negation (bitmask). Specifies which of chosen in parameter[1] rules should be negated                  *
-  /*                before determining rules outcome.                                                                           */
+   *                before determining rules outcome.                                                                           *
-  /* parameter[3] - Rule action delay [s]. Specifies time delay between the rule activation and rule action being triggered.    */
+   * parameter[3] - Rule action delay [s]. Specifies time delay between the rule activation and rule action being triggered.    *
-  /*                Range: [0:864000].                                                                                          */
+   *                Range: [0:864000].                                                                                          *
-  /* parameter[4] - Rule return delay [s]. Specifies time delay between the rule deactivation and rule action being triggered.  */
+   * parameter[4] - Rule return delay [s]. Specifies time delay between the rule deactivation and rule action being triggered.  *
-  /*                Range: [0:864001]. Max parameter value disables action triggering on rule deactivation.                     */
+   *                Range: [0:864001]. Max parameter value disables action triggering on rule deactivation.                     */
   CONDITION_LOGIC_OPERATOR = 6;
 
-  /* On measurement. Continous sensors only. The basic function is to trigger communication after measurement if at least 60s   */
+  /* On measurement. 'Continous' sensors only.
-  /* have passed since the last one. Transmission may occur every x measurement. Optionally dependency on the other rule can    */
+   * The basic function is to trigger communication after measurement if at least 60s have passed since the last one.           *
-  /* be configured, then, when all conditions are met, transmission is triggered.                                               */
+   * Transmission may occur every n-th measurement. Optionally dependency on the other rule can be configured, then, when all   *
-  /* parameter[0] - Send every n measurement. This parameter specifies every which measurement transmission will be triggered   */
+   * conditions are met, transmission is triggered.                                                                             *
-  /*                if all other conditions are met. Range: [1:500]. If parameter[0] equals 1, transmission will occur after    */
+   * parameter[0] - Send every n-th measurement. This parameter specifies every which measurement transmission will be          *
-  /*                every measurement.                                                                                          */
+   *                triggered if all other conditions are met. Range: [1:500]. If parameter[0] equals 1, transmission will      *
-  /* parameter[1] - Optional. Rule selector (bit mask). Specifies which rule should be taken into account while determining     */
+   *                occur after every measurement.                                                                              *
-  /*                the measurement rule outcome.                                                                               */
+   * parameter[1] - Optional. Rule selector (bitmask). Specifies which rule should be taken into account while determining      *
-  /* parameter[2] - Optional. Rule negation (bit mask). Specifies which of chosen in parameter[1] rule should be negated        */
+   *                the measurement rule outcome.                                                                               *
-  /*                before determining the measurement rule outcome.                                                            */
+   * parameter[2] - Optional. Rule negation (bitmask). Specifies which of the rules selected in parameter[1] should be negated  *
+   *                before determining the measurement rule outcome.                                                            */
   CONDITION_ON_MEASUREMENT = 7;
+
+  /* On sensor error. 'Continous' sensors only.                                                                                 *
+   * If the sensor returns an error code, an action will be triggered.                                                          *
+   * The rule becomes inactive when a correct measurement appears.                                                              */
+  CONDITION_ON_SENSOR_ERROR = 8;
 }
 
 /* Logic operators to be used for determining the outcome of rules with logic operator condition.                               */
 enum LogicOperator {
 
-  /* Invalid use                                                                                                                */
+  /* Invalid value.                                                                                                             */
   LOGIC_OPERATOR_UNSPECIFIED = 0;
 
-  /* Logic AND                                                                                                                  */
+  /* Logic AND.                                                                                                                 */
   LOGIC_OPERATOR_AND = 1;
 
-  /* Logic OR                                                                                                                   */
+  /* Logic OR.                                                                                                                  */
   LOGIC_OPERATOR_OR = 2;
 }
 
-/* Action to be triggered. Currently the only possible action is to trigger the transmission.                                   */
+/* Action to be triggered.                                                                                                      */
-/* Other actions will be available in next SW releases.                                                                         */
 enum Action {
 
-  /* Invalid value                                                                                                              */
+  /* Invalid value.                                                                                                             */
   ACTION_UNSPECIFIED = 0;
 
-  /* To trigger the transmission                                                                                                */
+  /* To trigger the transmission.                                                                                               */
   ACTION_TRIGGER_TRANSMISSION = 1;
 
-  /* To take no action. Possible for logic operator components                                                                  */
+  /* To take no action. Possible for logic operator components.                                                                 */
   ACTION_NO_ACTION = 2;
 
-  /* To trigger the transmission with ACK                                                                                       */
+  /* To trigger the transmission with ACK.                                                                                      */
   ACTION_TRIGGER_TRANSMISSION_WITH_ACK = 3;
 
-  /* To change BLE advertising period mode to fast (with lower user-configured advertising interval).                           */
+  /* To change BLE advertising period mode to fast (with lower user-configured advertising interval).                           *
-  /* Once the rule is deactived avertising period mode returns to previously configured value.                                  */
+   * Once the rule is deactived avertising period mode returns to previously configured value.                                  */
   ACTION_FAST_ADVERTISING_MODE = 4;
 }
 
 /* Type of a rule calendars.                                                                                                    */
 enum CalendarType {
 
-  /* Invalid value                                                                                                              */
+  /* Invalid value.                                                                                                             */
   CALENDAR_TYPE_UNSPECIFIED = 0;
 
-  /* Type for inactive calendars                                                                                                */
+  /* Calendar is inactive.                                                                                                      */
   CALENDAR_TYPE_DISABLED = 1;
 
-  /* Week type. Enables selcted rules on specified days of the week in specified time periods.                                  */
+  /* Week calendar. Enables selcted rules on specified days of the week in specified time periods.                              *
-  /* parameter[0] - Week day mask. Bitmask of days when selected rules are enabled                                              */
+   * parameter[0] - Week day mask. Bitmask of days when selected rules are enabled:                                             *
-  /*                  - Bit 0 - Sunday                                                                                          */
+   *                  - Bit 0 - Sunday                                                                                          *
-  /*                  - Bit 1 - Monday                                                                                          */
+   *                  - Bit 1 - Monday                                                                                          *
-  /*                    ...                                                                                                     */
+   *                    ...                                                                                                     *
-  /*                  - Bit 6 - Saturday                                                                                        */
+   *                  - Bit 6 - Saturday                                                                                        *
-  /* parameter[1] - 'From time' - point in time from which selected rules will be enabled (in minutes from midnight).           */
+   * parameter[1] - 'From time' - point in time from which selected rules will be enabled (in minutes from midnight).           *
-  /* parameter[2] - 'To time' - point in time from which selected rules will be disabled (in minutes from midnight).            */
+   * parameter[2] - 'To time' - point in time from which selected rules will be disabled (in minutes from midnight).            *
-  /* Note: if 'From time' is bigger than 'To time' there are two periods when rules are enabled - from 00:00 to 'To time'       */
+   * parameter[3] - Timezone - desired timezone for date comparison. Encoded as number (N) of 15 minutes offsets,               *
-  /*        and from 'From time' to 23:59.                                                                                      */
+   *                for example: if N = 4, then  offset = 4 * 15min = 1h. I.e. timezone is UTC+1.                               *
-  /* parameter[3] - Timezone - desired timezone for date comparison. Encoded as number (N) of 15 minutes offsets                */
+   * Note: If 'From time' is bigger than 'To time' there are two periods when rules are enabled - from 00:00 to 'To time'       *
-  /*                  - example - if N = 4, then  offset = 4 * 15min = 1h. I.e. timezone is UTC+1.                              */
+   *       and from 'From time' to 23:59.                                                                                       */
   CALENDAR_TYPE_WEEK = 2;
 }
 
 /* Rules calendars. Used for enabling/disabling rules based on date/time.                                                       */
-/* It is possible to configure up to 6 calendars. Each of them can affect any number of rules.                                  */
 message ProtoCalendar {
 
-  /* Bit mask of selected rules. Mask on bits [0:11]                                                                            */
+  /* Selected rules.                                                                                                            *
-  /*                  - Bit 0 - Rule ID 0                                                                                       */
+   * Bitmask - up to 16 rules supported (previously 12 rules [06.00 - 07.01.xx]):                                               *
-  /*                  - Bit 1 - Rule ID 1                                                                                       */
+   *   - Bit 0 - Rule 1                                                                                                         *
-  /*                    ...                                                                                                     */
+   *   - Bit 1 - Rule 2                                                                                                         *
-  /*                  - Bit 11 - Rule ID 11                                                                                     */
+   *   ...                                                                                                                      *
+   *   - Bit 15 - Rule 16                                                                                                       *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
   uint32 rule_mask = 1;
 
-  /* Calendars's parameters. Described in Type.                                                                                 */
+  /* Calendar parameters (as described in CalendarType).                                                                        *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
   repeated sint32 parameters = 2;
 
-  /* Calendar's type.  Described in Type.                                                                                       */
+  /* Calendar type (as described in CalendarType).                                                                              *
+   * Status: In use [06.08.00 - LATEST]                                                                                         */
   CalendarType type = 3;
 }
 
-/* Rules used to define edge logic on the device. Rules are defined by conditions and actions:                                  */
+/* Rules are used to define edge logic on the device. Rules are defined by conditions and actions.                              *
-/* If Condition is true, trigger Action. It is possible to configure up to 12 rules and assign them to different channels.      */
+ * If 'condition' is true, trigger 'action'. One rule can be assigned to any number of channels.                                *
-/* One rule can be assigned to any number of channels. For instance rule "If temperature is over 10 C, trigger the transmission"*/
+ * For instance rule "If temperature is over 10 C, trigger the transmission" can be assigned to channels 1 and 2.               *
-/* can be assigned to channels 1 and 2. No matter to how many channels a rule is assigned, it's still counted as one rule.      */
+ * No matter to how many channels a rule is assigned, it's still counted as one rule.                                           */
 message ProtoRule {
 
-  /* Channels to which the rule is assigned. One rule can be assigned to multiple channels as long as those are of the same type*/
+  /* Channels to which the rule is assigned.                                                                                    *
-  /* Bit mask on bits [0:5]. E.g. To assign the rule for channel 1: "000001", to assign rule to channels 2 and 4: "001010"      */
+   * One rule can be assigned to multiple channels as long as those are of the same type.                                       *
+   * Bitmask:                                                                                                                   *
+   *   - Bit 0 - Channel 1                                                                                                      *
+   *   - Bit 1 - Channel 2                                                                                                      *
+   *   ...                                                                                                                      *
+   *   - Bit 5 - Channel 6                                                                                                      *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   uint32 channel_mask = 1;
 
-  /* Rule's condition (as described in Condition).                                                                              */
+  /* Rule condition (as described in Condition).                                                                                *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   Condition condition = 2;
 
-  /* Condition's parameters (as described in Condition). For binary sensors there are no parameters                             */
+  /* Condition parameters (as described in Condition).                                                                          *
+   * For 'Binary' sensors there are no parameters.                                                                              *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   repeated sint32 parameters = 3;
 
-  /* Action to be triggered.                                                                                                    */
+  /* Action to be triggered.                                                                                                    *
+   * Status: In use [06.00 - LATEST]                                                                                            */
   Action action = 4;
 }

common/transport/coap/src/test/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResourceTest.java

@@ -16,23 +16,32 @@
 package org.thingsboard.server.transport.coap.efento;
 
 import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.thingsboard.server.gen.transport.coap.ConfigProtos;
+import org.thingsboard.server.gen.transport.coap.ConfigTypesProtos;
+import org.thingsboard.server.gen.transport.coap.DeviceInfoProtos;
 import org.thingsboard.server.gen.transport.coap.MeasurementTypeProtos.MeasurementType;
 import org.thingsboard.server.gen.transport.coap.MeasurementsProtos;
 import org.thingsboard.server.gen.transport.coap.MeasurementsProtos.ProtoMeasurements;
+import org.thingsboard.server.gen.transport.coap.ProtoRuleProtos;
 import org.thingsboard.server.transport.coap.CoapTransportContext;
 import org.thingsboard.server.transport.coap.efento.utils.CoapEfentoUtils;
 
 import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -85,7 +94,7 @@ class CoapEfentoTransportResourceTest {
     void checkContinuousSensorWithSomeMeasurements() {
         long tsInSec = Instant.now().getEpochSecond();
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(5)
@@ -93,7 +102,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .addAllChannels(List.of(MeasurementsProtos.ProtoChannel.newBuilder()
                                 .setType(MeasurementType.MEASUREMENT_TYPE_TEMPERATURE)
                                 .setTimestamp(Math.toIntExact(tsInSec))
@@ -114,7 +123,7 @@ class CoapEfentoTransportResourceTest {
         assertThat(efentoMeasurements.get(1).getTs()).isEqualTo((tsInSec + 180 * 5) * 1000);
         assertThat(efentoMeasurements.get(1).getValues().getAsJsonObject().get("temperature_1").getAsDouble()).isEqualTo(22.4);
         assertThat(efentoMeasurements.get(1).getValues().getAsJsonObject().get("humidity_2").getAsDouble()).isEqualTo(30);
-        checkDefaultMeasurements(measurements, efentoMeasurements, 180 * 5, false);
+        checkDefaultMeasurements(measurements, efentoMeasurements, 180 * 5);
     }
 
     @ParameterizedTest
@@ -122,7 +131,7 @@ class CoapEfentoTransportResourceTest {
     void checkContinuousSensor(MeasurementType measurementType, List<Integer> sampleOffsets, String property, double expectedValue) {
         long tsInSec = Instant.now().getEpochSecond();
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(0)
@@ -130,7 +139,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .addAllChannels(List.of(MeasurementsProtos.ProtoChannel.newBuilder()
                         .setType(measurementType)
                         .setTimestamp(Math.toIntExact(tsInSec))
@@ -142,7 +151,7 @@ class CoapEfentoTransportResourceTest {
         assertThat(efentoMeasurements).hasSize(1);
         assertThat(efentoMeasurements.get(0).getTs()).isEqualTo(tsInSec * 1000);
         assertThat(efentoMeasurements.get(0).getValues().getAsJsonObject().get(property).getAsDouble()).isEqualTo(expectedValue);
-        checkDefaultMeasurements(measurements, efentoMeasurements, 180, false);
+        checkDefaultMeasurements(measurements, efentoMeasurements, 180);
     }
 
     private static Stream<Arguments> checkContinuousSensor() {
@@ -176,7 +185,7 @@ class CoapEfentoTransportResourceTest {
                                   String totalPropertyName, double expectedTotalValue) {
         long tsInSec = Instant.now().getEpochSecond();
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(0)
@@ -184,7 +193,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .addAllChannels(Arrays.asList(MeasurementsProtos.ProtoChannel.newBuilder()
                                 .setType(majorType)
                                 .setTimestamp(Math.toIntExact(tsInSec))
@@ -200,7 +209,7 @@ class CoapEfentoTransportResourceTest {
         assertThat(efentoMeasurements).hasSize(1);
         assertThat(efentoMeasurements.get(0).getTs()).isEqualTo(tsInSec * 1000);
         assertThat(efentoMeasurements.get(0).getValues().getAsJsonObject().get(totalPropertyName + "_2").getAsDouble()).isEqualTo(expectedTotalValue);
-        checkDefaultMeasurements(measurements, efentoMeasurements, 180, false);
+        checkDefaultMeasurements(measurements, efentoMeasurements, 180);
     }
 
     private static Stream<Arguments> checkPulseCounterSensors() {
@@ -220,7 +229,7 @@ class CoapEfentoTransportResourceTest {
     void checkBinarySensor() {
         long tsInSec = Instant.now().getEpochSecond();
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(0)
@@ -228,7 +237,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .addChannels(MeasurementsProtos.ProtoChannel.newBuilder()
                         .setType(MEASUREMENT_TYPE_OK_ALARM)
                         .setTimestamp(Math.toIntExact(tsInSec))
@@ -239,7 +248,7 @@ class CoapEfentoTransportResourceTest {
         assertThat(efentoMeasurements).hasSize(1);
         assertThat(efentoMeasurements.get(0).getTs()).isEqualTo(tsInSec * 1000);
         assertThat(efentoMeasurements.get(0).getValues().getAsJsonObject().get("ok_alarm_1").getAsString()).isEqualTo("ALARM");
-        checkDefaultMeasurements(measurements, efentoMeasurements, 180 * 14, true);
+        checkDefaultMeasurements(measurements, efentoMeasurements, 180 * 14);
     }
 
     @ParameterizedTest
@@ -247,7 +256,7 @@ class CoapEfentoTransportResourceTest {
     void checkBinarySensorWhenValueIsVarying(MeasurementType measurementType, String property, String expectedValueWhenOffsetNotOk, String expectedValueWhenOffsetOk) {
         long tsInSec = Instant.now().getEpochSecond();
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(1)
@@ -255,7 +264,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .addChannels(MeasurementsProtos.ProtoChannel.newBuilder()
                         .setType(measurementType)
                         .setTimestamp(Math.toIntExact(tsInSec))
@@ -268,7 +277,7 @@ class CoapEfentoTransportResourceTest {
         assertThat(efentoMeasurements.get(0).getValues().getAsJsonObject().get(property).getAsString()).isEqualTo(expectedValueWhenOffsetNotOk);
         assertThat(efentoMeasurements.get(1).getTs()).isEqualTo((tsInSec + 9) * 1000);
         assertThat(efentoMeasurements.get(1).getValues().getAsJsonObject().get(property).getAsString()).isEqualTo(expectedValueWhenOffsetOk);
-        checkDefaultMeasurements(measurements, efentoMeasurements, 180, true);
+        checkDefaultMeasurements(measurements, efentoMeasurements, 180);
     }
 
     private static Stream<Arguments> checkBinarySensorWhenValueIsVarying() {
@@ -282,7 +291,7 @@ class CoapEfentoTransportResourceTest {
     @Test
     void checkExceptionWhenChannelsListIsEmpty() {
         ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
-                .setSerialNum(integerToByteString(1234))
+                .setSerialNumber(integerToByteString(1234))
                 .setCloudToken("test_token")
                 .setMeasurementPeriodBase(180)
                 .setMeasurementPeriodFactor(1)
@@ -290,7 +299,7 @@ class CoapEfentoTransportResourceTest {
                 .setSignal(0)
                 .setNextTransmissionAt(1000)
                 .setTransferReason(0)
-                .setHash(0)
+                .setConfigurationHash(0)
                 .build();
         UUID sessionId = UUID.randomUUID();
 
@@ -299,29 +308,587 @@ class CoapEfentoTransportResourceTest {
                 .hasMessage("[" + sessionId + "]: Failed to get Efento measurements, reason: channels list is empty!");
     }
 
+    // -------------------------------------------------------------------------
+    // ProtoDeviceInfo parsing tests
+    // -------------------------------------------------------------------------
+
     @Test
-    void checkExceptionWhenValuesMapIsEmpty() {
+    void getEfentoDeviceInfo_parsesSwVersion() {
-        long tsInSec = Instant.now().getEpochSecond();
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
-        ProtoMeasurements measurements = ProtoMeasurements.newBuilder()
+                .setSwVersion(1546)   // ver 06.10 => 0x060A => 1546
-                .setSerialNum(integerToByteString(1234))
+                .build();
-                .setCloudToken("test_token")
+
-                .setMeasurementPeriodBase(180)
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
-                .setMeasurementPeriodFactor(1)
+
-                .setBatteryStatus(true)
+        assertThat(result.getValues().getAsJsonObject().get("sw_version").getAsInt()).isEqualTo(1546);
-                .setSignal(0)
+    }
-                .setNextTransmissionAt(1000)
+
-                .setTransferReason(0)
+    @Test
-                .setHash(0)
+    void getEfentoDeviceInfo_parsesAllMemoryStatistics() {
-                .addChannels(MeasurementsProtos.ProtoChannel.newBuilder()
+        // proto uint32 maps to Java int; the "undefined" sentinel is 0xFFFFFFFF = -1 in signed int
-                        .setType(MEASUREMENT_TYPE_TEMPERATURE)
+        int undefinedTs = -1;
-                        .setTimestamp(Math.toIntExact(tsInSec))
+        int knownTs = 1_700_000_000; // arbitrary known Unix timestamp fitting in uint32
+        // clearMemoryStatistics() is needed because minimalDeviceInfo() pre-populates 22 zeros;
+        // addAllMemoryStatistics() appends in proto, so without clear the test values land at indices 22-43
+        DeviceInfoProtos.ProtoDeviceInfo.Builder builder = minimalDeviceInfo().clearMemoryStatistics();
+        builder.addAllMemoryStatistics(List.of(
+                0,          // [0] nv_storage_status: 0 = no errors
+                knownTs,    // [1] timestamp_of_the_end_of_collecting_statistics
+                1048576,    // [2] capacity_of_memory_in_bytes
+                512000,     // [3] used_space_in_bytes
+                1024,       // [4] size_of_invalid_packets_in_bytes
+                256,        // [5] size_of_corrupted_packets_in_bytes
+                100,        // [6] number_of_valid_packets
+                10,         // [7] number_of_invalid_packets
+                2,          // [8] number_of_corrupted_packets
+                500,        // [9] number_of_all_samples_for_channel_1
+                400,        // [10] number_of_all_samples_for_channel_2
+                300,        // [11] number_of_all_samples_for_channel_3
+                200,        // [12] number_of_all_samples_for_channel_4
+                100,        // [13] number_of_all_samples_for_channel_5
+                50,         // [14] number_of_all_samples_for_channel_6
+                undefinedTs, // [15] timestamp_of_the_first_binary_measurement (undefined)
+                undefinedTs, // [16] timestamp_of_the_last_binary_measurement (undefined)
+                undefinedTs, // [17] timestamp_of_the_first_binary_measurement_sent (undefined)
+                knownTs,    // [18] timestamp_of_the_first_continuous_measurement
+                knownTs,    // [19] timestamp_of_the_last_continuous_measurement
+                knownTs,    // [20] timestamp_of_the_last_continuous_measurement_sent
+                42          // [21] nvm_write_counter
+        ));
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(builder.build());
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("nv_storage_status").getAsLong()).isEqualTo(0);
+        assertThat(json.get("timestamp_of_the_end_of_collecting_statistics").getAsString()).isEqualTo(formatDate(knownTs));
+        assertThat(json.get("capacity_of_memory_in_bytes").getAsLong()).isEqualTo(1048576L);
+        assertThat(json.get("used_space_in_bytes").getAsLong()).isEqualTo(512000L);
+        assertThat(json.get("size_of_invalid_packets_in_bytes").getAsLong()).isEqualTo(1024L);
+        assertThat(json.get("size_of_corrupted_packets_in_bytes").getAsLong()).isEqualTo(256L);
+        assertThat(json.get("number_of_valid_packets").getAsLong()).isEqualTo(100L);
+        assertThat(json.get("number_of_invalid_packets").getAsLong()).isEqualTo(10L);
+        assertThat(json.get("number_of_corrupted_packets").getAsLong()).isEqualTo(2L);
+        assertThat(json.get("number_of_all_samples_for_channel_1").getAsLong()).isEqualTo(500L);
+        assertThat(json.get("number_of_all_samples_for_channel_2").getAsLong()).isEqualTo(400L);
+        assertThat(json.get("number_of_all_samples_for_channel_3").getAsLong()).isEqualTo(300L);
+        assertThat(json.get("number_of_all_samples_for_channel_4").getAsLong()).isEqualTo(200L);
+        assertThat(json.get("number_of_all_samples_for_channel_5").getAsLong()).isEqualTo(100L);
+        assertThat(json.get("number_of_all_samples_for_channel_6").getAsLong()).isEqualTo(50L);
+        assertThat(json.get("timestamp_of_the_first_binary_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_last_binary_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_first_binary_measurement_sent").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_first_continuous_measurement").getAsString()).isEqualTo(formatDate(knownTs));
+        assertThat(json.get("timestamp_of_the_last_continuous_measurement").getAsString()).isEqualTo(formatDate(knownTs));
+        assertThat(json.get("timestamp_of_the_last_continuous_measurement_sent").getAsString()).isEqualTo(formatDate(knownTs));
+        assertThat(json.get("nvm_write_counter").getAsLong()).isEqualTo(42L);
+    }
+
+    @Test
+    void getEfentoDeviceInfo_parsesModemInfo() {
+        // 34 modem parameters (indices 0-33) as defined in proto_device_info.proto
+        List<Integer> params = List.of(
+                0,    // [0]  sc_EARNFCN_offset
+                1000, // [1]  sc_EARFCN
+                42,   // [2]  sc_PCI
+                123456, // [3]  sc_Cell_id
+                -90,  // [4]  sc_RSRP
+                -10,  // [5]  sc_RSRQ
+                -80,  // [6]  sc_RSSI
+                15,   // [7]  sc_SINR
+                3,    // [8]  sc_Band
+                1234, // [9]  sc_TAC
+                1,    // [10] sc_ECL
+                -30,  // [11] sc_TX_PWR
+                2,    // [12] op_mode
+                999,  // [13] nc_EARFCN
+                1,    // [14] nc_EARNFCN_offset
+                100,  // [15] nc_PCI
+                -95,  // [16] nc_RSRP
+                5,    // [17] RLC_UL_BLER
+                3,    // [18] RLC_DL_BLER
+                4,    // [19] MAC_UL_BLER
+                2,    // [20] MAC_DL_BLER
+                50000,// [21] MAC_UL_TOTAL_BYTES
+                60000,// [22] MAC_DL_TOTAL_BYTES
+                200,  // [23] MAC_UL_total_HARQ_Tx
+                150,  // [24] MAC_DL_total_HARQ_Tx
+                10,   // [25] MAC_UL_HARQ_re_Tx
+                8,    // [26] MAC_DL_HARQ_re_Tx
+                1000, // [27] RLC_UL_tput
+                1200, // [28] RLC_DL_tput
+                900,  // [29] MAC_UL_tput
+                1100, // [30] MAC_DL_tput
+                5000, // [31] sleep_duration
+                300,  // [32] rx_time
+                100   // [33] tx_time
+        );
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
+                .setModem(DeviceInfoProtos.ProtoModem.newBuilder()
+                        .setType(DeviceInfoProtos.ModemType.MODEM_TYPE_BC66)
+                        .addAllParameters(params)
                         .build())
                 .build();
-        UUID sessionId = UUID.randomUUID();
 
-        assertThatThrownBy(() -> coapEfentoTransportResource.getEfentoMeasurements(measurements, sessionId))
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
-                .isInstanceOf(IllegalStateException.class)
+        var json = result.getValues().getAsJsonObject();
-                .hasMessage("[" + sessionId + "]: Failed to collect Efento measurements, reason, values map is empty!");
+
+        assertThat(json.get("modem_types").getAsString()).isEqualTo("MODEM_TYPE_BC66");
+        assertThat(json.get("sc_EARNFCN_offset").getAsInt()).isEqualTo(0);
+        assertThat(json.get("sc_EARFCN").getAsInt()).isEqualTo(1000);
+        assertThat(json.get("sc_PCI").getAsInt()).isEqualTo(42);
+        assertThat(json.get("sc_Cell_id").getAsInt()).isEqualTo(123456);
+        assertThat(json.get("sc_RSRP").getAsInt()).isEqualTo(-90);
+        assertThat(json.get("sc_RSRQ").getAsInt()).isEqualTo(-10);
+        assertThat(json.get("sc_RSSI").getAsInt()).isEqualTo(-80);
+        assertThat(json.get("sc_SINR").getAsInt()).isEqualTo(15);
+        assertThat(json.get("sc_Band").getAsInt()).isEqualTo(3);
+        assertThat(json.get("sc_TAC").getAsInt()).isEqualTo(1234);
+        assertThat(json.get("sc_ECL").getAsInt()).isEqualTo(1);
+        assertThat(json.get("sc_TX_PWR").getAsInt()).isEqualTo(-30);
+        assertThat(json.get("op_mode").getAsInt()).isEqualTo(2);
+        assertThat(json.get("nc_EARFCN").getAsInt()).isEqualTo(999);
+        assertThat(json.get("nc_EARNFCN_offset").getAsInt()).isEqualTo(1);
+        assertThat(json.get("nc_PCI").getAsInt()).isEqualTo(100);
+        assertThat(json.get("nc_RSRP").getAsInt()).isEqualTo(-95);
+        assertThat(json.get("RLC_UL_BLER").getAsInt()).isEqualTo(5);
+        assertThat(json.get("RLC_DL_BLER").getAsInt()).isEqualTo(3);
+        assertThat(json.get("MAC_UL_BLER").getAsInt()).isEqualTo(4);
+        assertThat(json.get("MAC_DL_BLER").getAsInt()).isEqualTo(2);
+        assertThat(json.get("MAC_UL_TOTAL_BYTES").getAsInt()).isEqualTo(50000);
+        assertThat(json.get("MAC_DL_TOTAL_BYTES").getAsInt()).isEqualTo(60000);
+        assertThat(json.get("MAC_UL_total_HARQ_Tx").getAsInt()).isEqualTo(200);
+        assertThat(json.get("MAC_DL_total_HARQ_Tx").getAsInt()).isEqualTo(150);
+        assertThat(json.get("MAC_UL_HARQ_re_Tx").getAsInt()).isEqualTo(10);
+        assertThat(json.get("MAC_DL_HARQ_re_Tx").getAsInt()).isEqualTo(8);
+        assertThat(json.get("RLC_UL_tput").getAsInt()).isEqualTo(1000);
+        assertThat(json.get("RLC_DL_tput").getAsInt()).isEqualTo(1200);
+        assertThat(json.get("MAC_UL_tput").getAsInt()).isEqualTo(900);
+        assertThat(json.get("MAC_DL_tput").getAsInt()).isEqualTo(1100);
+        assertThat(json.get("sleep_duration").getAsInt()).isEqualTo(5000);
+        assertThat(json.get("rx_time").getAsInt()).isEqualTo(300);
+        assertThat(json.get("tx_time").getAsInt()).isEqualTo(100);
+    }
+
+    @Test
+    void getEfentoDeviceInfo_parsesModemInfoBC660() {
+        // 22 modem parameters for MODEM_TYPE_BC660 as defined in proto_device_info.proto
+        List<Integer> params = List.of(
+                1000, // [0]  sc_EARFCN
+                5,    // [1]  sc_EARNFCN_offset
+                42,   // [2]  sc_PCI
+                123456, // [3]  sc_Cell_id
+                -90,  // [4]  sc_RSRP
+                -10,  // [5]  sc_RSRQ
+                -80,  // [6]  sc_RSSI
+                15,   // [7]  sc_SINR
+                3,    // [8]  sc_Band
+                1234, // [9]  sc_TAC
+                1,    // [10] sc_ECL
+                -30,  // [11] sc_TX_PWR
+                2,    // [12] op_mode
+                999,  // [13] nc_EARFCN
+                100,  // [14] nc_PCI
+                -95,  // [15] nc_RSRP
+                -12,  // [16] nc_RSRQ
+                5000, // [17] sleep_duration
+                300,  // [18] rx_time
+                100,  // [19] tx_time
+                1,    // [20] PLMN_state
+                26201 // [21] select_PLMN
+        );
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
+                .setModem(DeviceInfoProtos.ProtoModem.newBuilder()
+                        .setType(DeviceInfoProtos.ModemType.MODEM_TYPE_BC660)
+                        .addAllParameters(params)
+                        .setSimCardIdentification("89001012012341234120")
+                        .setFirmwareVersion(DeviceInfoProtos.ModemFirmwareVersion.MODEM_FIRMWARE_VERSION_BC660_V2)
+                        .setModemIdentification("123456789012345")
+                        .addAllModemStatistics(List.of(10, 3600, 7200, 600))
+                        .build())
+                .build();
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("modem_types").getAsString()).isEqualTo("MODEM_TYPE_BC660");
+        assertThat(json.get("sim_card_identification").getAsString()).isEqualTo("89001012012341234120");
+        assertThat(json.get("firmware_version").getAsString()).isEqualTo("MODEM_FIRMWARE_VERSION_BC660_V2");
+        assertThat(json.get("modem_identification").getAsString()).isEqualTo("123456789012345");
+        assertThat(json.get("modem_transmissions_count").getAsInt()).isEqualTo(10);
+        assertThat(json.get("modem_time_since_last_devinfo").getAsInt()).isEqualTo(3600);
+        assertThat(json.get("modem_total_psm_time").getAsInt()).isEqualTo(7200);
+        assertThat(json.get("modem_total_active_time").getAsInt()).isEqualTo(600);
+        assertThat(json.get("sc_EARFCN").getAsInt()).isEqualTo(1000);
+        assertThat(json.get("sc_EARNFCN_offset").getAsInt()).isEqualTo(5);
+        assertThat(json.get("sc_PCI").getAsInt()).isEqualTo(42);
+        assertThat(json.get("sc_Cell_id").getAsInt()).isEqualTo(123456);
+        assertThat(json.get("sc_RSRP").getAsInt()).isEqualTo(-90);
+        assertThat(json.get("sc_RSRQ").getAsInt()).isEqualTo(-10);
+        assertThat(json.get("sc_RSSI").getAsInt()).isEqualTo(-80);
+        assertThat(json.get("sc_SINR").getAsInt()).isEqualTo(15);
+        assertThat(json.get("sc_Band").getAsInt()).isEqualTo(3);
+        assertThat(json.get("sc_TAC").getAsInt()).isEqualTo(1234);
+        assertThat(json.get("sc_ECL").getAsInt()).isEqualTo(1);
+        assertThat(json.get("sc_TX_PWR").getAsInt()).isEqualTo(-30);
+        assertThat(json.get("op_mode").getAsInt()).isEqualTo(2);
+        assertThat(json.get("nc_EARFCN").getAsInt()).isEqualTo(999);
+        assertThat(json.get("nc_PCI").getAsInt()).isEqualTo(100);
+        assertThat(json.get("nc_RSRP").getAsInt()).isEqualTo(-95);
+        assertThat(json.get("nc_RSRQ").getAsInt()).isEqualTo(-12);
+        assertThat(json.get("sleep_duration").getAsInt()).isEqualTo(5000);
+        assertThat(json.get("rx_time").getAsInt()).isEqualTo(300);
+        assertThat(json.get("tx_time").getAsInt()).isEqualTo(100);
+        assertThat(json.get("PLMN_state").getAsInt()).isEqualTo(1);
+        assertThat(json.get("select_PLMN").getAsInt()).isEqualTo(26201);
+        // BC66-specific fields must not be present
+        assertThat(json.has("nc_EARNFCN_offset")).isFalse();
+        assertThat(json.has("RLC_UL_BLER")).isFalse();
+    }
+
+    @Test
+    void getEfentoDeviceInfo_parsesModemInfoSharedModem() {
+        // 4 modem parameters for MODEM_TYPE_SHARED_MODEM as defined in proto_device_info.proto
+        List<Integer> params = List.of(
+                -90,  // [0] RSRP
+                -10,  // [1] RSRQ
+                -80,  // [2] RSSI
+                15    // [3] SINR
+        );
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
+                .setModem(DeviceInfoProtos.ProtoModem.newBuilder()
+                        .setType(DeviceInfoProtos.ModemType.MODEM_TYPE_SHARED_MODEM)
+                        .addAllParameters(params)
+                        .setModemIdentification("SN-ABCDEF")
+                        .build())
+                .build();
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("modem_types").getAsString()).isEqualTo("MODEM_TYPE_SHARED_MODEM");
+        assertThat(json.get("modem_identification").getAsString()).isEqualTo("SN-ABCDEF");
+        assertThat(json.get("RSRP").getAsInt()).isEqualTo(-90);
+        assertThat(json.get("RSRQ").getAsInt()).isEqualTo(-10);
+        assertThat(json.get("RSSI").getAsInt()).isEqualTo(-80);
+        assertThat(json.get("SINR").getAsInt()).isEqualTo(15);
+        // BC66/BC660-specific fields must not be present
+        assertThat(json.has("sc_EARFCN")).isFalse();
+        assertThat(json.has("sc_EARNFCN_offset")).isFalse();
+    }
+
+    @Test
+    void getEfentoDeviceInfo_parsesNewModemFields() {
+        // New ProtoModem fields: sim_card_identification, firmware_version, modem_identification, modem_statistics
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
+                .setModem(DeviceInfoProtos.ProtoModem.newBuilder()
+                        .setType(DeviceInfoProtos.ModemType.MODEM_TYPE_BC66)
+                        .addAllParameters(java.util.Collections.nCopies(34, 0))
+                        .setSimCardIdentification("89012345678901234567")
+                        .setFirmwareVersion(DeviceInfoProtos.ModemFirmwareVersion.MODEM_FIRMWARE_VERSION_READING_ERROR)
+                        .setModemIdentification("352519100417272")
+                        .addAllModemStatistics(List.of(5, 1800, 3600, 120))
+                        .build())
+                .build();
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("sim_card_identification").getAsString()).isEqualTo("89012345678901234567");
+        assertThat(json.get("firmware_version").getAsString()).isEqualTo("MODEM_FIRMWARE_VERSION_READING_ERROR");
+        assertThat(json.get("modem_identification").getAsString()).isEqualTo("352519100417272");
+        assertThat(json.get("modem_transmissions_count").getAsInt()).isEqualTo(5);
+        assertThat(json.get("modem_time_since_last_devinfo").getAsInt()).isEqualTo(1800);
+        assertThat(json.get("modem_total_psm_time").getAsInt()).isEqualTo(3600);
+        assertThat(json.get("modem_total_active_time").getAsInt()).isEqualTo(120);
+    }
+
+    @Test
+    void getEfentoDeviceInfo_parsesRuntimeInfo() {
+        long batteryResetTs = 1_700_000_000L;
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo()
+                .setRuntimeInfo(DeviceInfoProtos.ProtoRuntime.newBuilder()
+                        .setUpTime(3600)
+                        .addAllMessageCounters(List.of(10, 5, 9))
+                        .setMcuTemperature(25)
+                        .setBatteryVoltage(3200)
+                        .setMinBatteryMcuTemperature(20)
+                        .setBatteryResetTimestamp((int) batteryResetTs)
+                        .setMaxMcuTemperature(40)
+                        .setMinMcuTemperature(10)
+                        .addAllRuntimeErrors(List.of(0, 1))
+                        .build())
+                .build();
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("up_time").getAsLong()).isEqualTo(3600);
+        assertThat(json.get("mcu_temp").getAsInt()).isEqualTo(25);
+        assertThat(json.get("min_battery_voltage").getAsLong()).isEqualTo(3200);
+        assertThat(json.get("min_battery_mcu_temp").getAsInt()).isEqualTo(20);
+        assertThat(json.get("battery_reset_timestamp").getAsString()).isEqualTo(formatDate(batteryResetTs));
+        assertThat(json.get("max_mcu_temp").getAsInt()).isEqualTo(40);
+        assertThat(json.get("min_mcu_temp").getAsInt()).isEqualTo(10);
+        assertThat(json.get("counter_of_confirmable_messages_attempts").getAsInt()).isEqualTo(10);
+        assertThat(json.get("counter_of_non_confirmable_messages_attempts").getAsInt()).isEqualTo(5);
+        assertThat(json.get("counter_of_succeeded_messages").getAsInt()).isEqualTo(9);
+        assertThat(json.get("runtime_errors").getAsInt()).isEqualTo(2); // count of errors, not values
+    }
+
+    @Test
+    void getEfentoDeviceInfo_undefinedTimestampRenderedAsUndefinedString() {
+        // -1 as signed int == 0xFFFFFFFF == uint32 max (4294967295), the "Undefined" sentinel
+        DeviceInfoProtos.ProtoDeviceInfo deviceInfo = minimalDeviceInfo().clearMemoryStatistics()
+                .addAllMemoryStatistics(List.of(
+                        0, -1, 0, 0, 0, 0, 0, 0, 0,
+                        0, 0, 0, 0, 0, 0,
+                        -1, -1, -1,
+                        -1, -1, -1,
+                        0))
+                .build();
+
+        CoapEfentoTransportResource.EfentoTelemetry result = coapEfentoTransportResource.getEfentoDeviceInfo(deviceInfo);
+        var json = result.getValues().getAsJsonObject();
+
+        assertThat(json.get("timestamp_of_the_end_of_collecting_statistics").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_first_binary_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_last_binary_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_first_binary_measurement_sent").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_first_continuous_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_last_continuous_measurement").getAsString()).isEqualTo("Undefined");
+        assertThat(json.get("timestamp_of_the_last_continuous_measurement_sent").getAsString()).isEqualTo("Undefined");
+    }
+
+    @Test
+    void getEfentoDeviceInfo_tsIsCurrentTimeMillis() {
+        long before = System.currentTimeMillis();
+        CoapEfentoTransportResource.EfentoTelemetry result =
+                coapEfentoTransportResource.getEfentoDeviceInfo(minimalDeviceInfo().build());
+        long after = System.currentTimeMillis();
+
+        assertThat(result.getTs()).isBetween(before, after);
+    }
+
+    // -------------------------------------------------------------------------
+    // ProtoConfig / getEfentoConfiguration parsing tests
+    // -------------------------------------------------------------------------
+
+    @Test
+    void getEfentoConfiguration_parsesServerCommunicationFields() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setDataServerIp("18.184.24.239")
+                .setDataServerPort(5683)
+                .setUpdateServerIp("efento.update.io")
+                .setUpdateServerPortCoap(5684)
+                .setUpdateServerPortUdp(5685)
+                .setTransmissionInterval(300)
+                .setAckInterval(600)
+                .setSupervisionPeriod(3600)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("dataServerIp").getAsString()).isEqualTo("18.184.24.239");
+        assertThat(json.get("dataServerPort").getAsLong()).isEqualTo(5683);
+        assertThat(json.get("updateServerIp").getAsString()).isEqualTo("efento.update.io");
+        assertThat(json.get("updateServerPortCoap").getAsLong()).isEqualTo(5684);
+        assertThat(json.get("updateServerPortUdp").getAsLong()).isEqualTo(5685);
+        assertThat(json.get("transmissionInterval").getAsLong()).isEqualTo(300);
+        assertThat(json.get("ackInterval").getAsLong()).isEqualTo(600);
+        assertThat(json.get("supervisionPeriod").getAsLong()).isEqualTo(3600);
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesMeasurementPeriod() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setMeasurementPeriodBase(60)
+                .setMeasurementPeriodFactor(5)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("measurementPeriodBase").getAsLong()).isEqualTo(60);
+        assertThat(json.get("measurementPeriodFactor").getAsLong()).isEqualTo(5);
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesBooleanRequestFields() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setDeviceInfoRequest(true)
+                .setUpdateSoftwareRequest(true)
+                .setConfigurationRequest(true)
+                .setAcceptWithoutTestingRequest(true)
+                .setResetMemoryRequest(true)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("deviceInfoRequest").getAsBoolean()).isTrue();
+        assertThat(json.get("updateSoftwareRequest").getAsBoolean()).isTrue();
+        assertThat(json.get("configurationRequest").getAsBoolean()).isTrue();
+        assertThat(json.get("acceptWithoutTestingRequest").getAsBoolean()).isTrue();
+        assertThat(json.get("resetMemoryRequest").getAsBoolean()).isTrue();
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesModemAndNetworkFields() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setApn("internet.example.com")
+                .setApnUsername("user")
+                .setApnPassword("pass")
+                .setPlmnSelection(26001)
+                .setModemBandsMask(2084) // bands 3, 8, 20
+                .setNetworkTroubleshooting(2)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("apn").getAsString()).isEqualTo("internet.example.com");
+        assertThat(json.get("apnUsername").getAsString()).isEqualTo("user");
+        assertThat(json.get("apnPassword").getAsString()).isEqualTo("pass");
+        assertThat(json.get("plmnSelection").getAsLong()).isEqualTo(26001);
+        assertThat(json.get("modemBandsMask").getAsLong()).isEqualTo(2084);
+        assertThat(json.get("networkTroubleshooting").getAsLong()).isEqualTo(2);
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesCloudTokenFields() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setCloudToken("my-device-token")
+                .setCloudTokenConfig(1)
+                .setCloudTokenCoapOption(65000)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("cloudToken").getAsString()).isEqualTo("my-device-token");
+        assertThat(json.get("cloudTokenConfig").getAsLong()).isEqualTo(1);
+        assertThat(json.get("cloudTokenCoapOption").getAsLong()).isEqualTo(65000);
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesEndpointFields() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setDataEndpoint("/m")
+                .setConfigurationEndpoint("/c")
+                .setDeviceInfoEndpoint("/i")
+                .setTimeEndpoint("/t")
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        assertThat(json.get("dataEndpoint").getAsString()).isEqualTo("/m");
+        assertThat(json.get("configurationEndpoint").getAsString()).isEqualTo("/c");
+        assertThat(json.get("deviceInfoEndpoint").getAsString()).isEqualTo("/i");
+        assertThat(json.get("timeEndpoint").getAsString()).isEqualTo("/t");
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesBleAdvertisingPeriod() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .setBleAdvertisingPeriod(ConfigTypesProtos.ProtoBleAdvertisingPeriod.newBuilder()
+                        .setMode(ConfigTypesProtos.BleAdvertisingPeriodMode.BLE_ADVERTISING_PERIOD_MODE_NORMAL)
+                        .setNormal(1600)
+                        .setFast(320)
+                        .build())
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+        var ble = json.get("bleAdvertisingPeriod").getAsJsonObject();
+
+        assertThat(ble.get("mode").getAsString()).isEqualTo("BLE_ADVERTISING_PERIOD_MODE_NORMAL");
+        assertThat(ble.get("normal").getAsLong()).isEqualTo(1600);
+        assertThat(ble.get("fast").getAsLong()).isEqualTo(320);
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesRepeatedChannelTypes() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .addChannelTypes(MeasurementType.MEASUREMENT_TYPE_TEMPERATURE)
+                .addChannelTypes(MeasurementType.MEASUREMENT_TYPE_HUMIDITY)
+                .addChannelTypes(MeasurementType.MEASUREMENT_TYPE_ATMOSPHERIC_PRESSURE)
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+        var channelTypes = json.get("channelTypes").getAsJsonArray();
+
+        assertThat(channelTypes).hasSize(3);
+        assertThat(channelTypes.get(0).getAsString()).isEqualTo("MEASUREMENT_TYPE_TEMPERATURE");
+        assertThat(channelTypes.get(1).getAsString()).isEqualTo("MEASUREMENT_TYPE_HUMIDITY");
+        assertThat(channelTypes.get(2).getAsString()).isEqualTo("MEASUREMENT_TYPE_ATMOSPHERIC_PRESSURE");
+    }
+
+    @Test
+    void getEfentoConfiguration_parsesEdgeLogicRules() throws InvalidProtocolBufferException {
+        // ProtoRule uses channel_mask (bit mask), condition, parameters, action
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder()
+                .addRules(ProtoRuleProtos.ProtoRule.newBuilder()
+                        .setChannelMask(1)  // channel 1 → bit mask 0b000001
+                        .setCondition(ProtoRuleProtos.Condition.CONDITION_HIGH_THRESHOLD)
+                        .addParameters(500)  // threshold value
+                        .setAction(ProtoRuleProtos.Action.ACTION_TRIGGER_TRANSMISSION)
+                        .build())
+                .build()
+                .toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+        var rules = json.get("rules").getAsJsonArray();
+
+        assertThat(rules).hasSize(1);
+        var rule = rules.get(0).getAsJsonObject();
+        assertThat(rule.get("channelMask").getAsInt()).isEqualTo(1);
+        assertThat(rule.get("condition").getAsString()).isEqualTo("CONDITION_HIGH_THRESHOLD");
+        assertThat(rule.get("parameters").getAsJsonArray().get(0).getAsInt()).isEqualTo(500);
+        assertThat(rule.get("action").getAsString()).isEqualTo("ACTION_TRIGGER_TRANSMISSION");
+    }
+
+    @Test
+    void getEfentoConfiguration_emptyConfigProducesJsonWithDefaultValues() throws InvalidProtocolBufferException {
+        byte[] bytes = ConfigProtos.ProtoConfig.newBuilder().build().toByteArray();
+
+        var json = coapEfentoTransportResource.getEfentoConfiguration(bytes).getAsJsonObject();
+
+        // JsonFormat with includingDefaultValueFields prints all fields — verify a representative subset
+        assertThat(json.get("measurementPeriodBase").getAsLong()).isEqualTo(0);
+        assertThat(json.get("transmissionInterval").getAsLong()).isEqualTo(0);
+        assertThat(json.get("dataServerIp").getAsString()).isEmpty();
+        assertThat(json.get("deviceInfoRequest").getAsBoolean()).isFalse();
+        assertThat(json.get("cloudToken").getAsString()).isEmpty();
+    }
+
+    /**
+     * Builds a ProtoDeviceInfo with the minimum set of repeated fields required by getEfentoDeviceInfo:
+     * 22 memory_statistics, 34 modem parameters and 3 message_counters — all set to 0.
+     */
+    private static DeviceInfoProtos.ProtoDeviceInfo.Builder minimalDeviceInfo() {
+        List<Integer> zeroMemStats = java.util.Collections.nCopies(22, 0);
+        List<Integer> zeroModemParams = java.util.Collections.nCopies(34, 0);
+        return DeviceInfoProtos.ProtoDeviceInfo.newBuilder()
+                .setSerialNumber(integerToByteString(1234))
+                .setCloudToken("test_token")
+                .setSwVersion(0)
+                .addAllMemoryStatistics(zeroMemStats)
+                .setModem(DeviceInfoProtos.ProtoModem.newBuilder()
+                        .setType(DeviceInfoProtos.ModemType.MODEM_TYPE_UNSPECIFIED)
+                        .addAllParameters(zeroModemParams)
+                        .build())
+                .setRuntimeInfo(DeviceInfoProtos.ProtoRuntime.newBuilder()
+                        .setUpTime(0)
+                        .addAllMessageCounters(List.of(0, 0, 0))
+                        .build());
+    }
+
+    private static String formatDate(long seconds) {
+        SimpleDateFormat sdf = new SimpleDateFormat("dd MMM yyyy HH:mm:ss Z");
+        return sdf.format(new Date(TimeUnit.SECONDS.toMillis(seconds)));
     }
 
     public static ByteString integerToByteString(Integer intValue) {
@@ -340,20 +907,17 @@ class CoapEfentoTransportResourceTest {
 
     private void checkDefaultMeasurements(ProtoMeasurements incomingMeasurements,
                                           List<CoapEfentoTransportResource.EfentoTelemetry> actualEfentoMeasurements,
-                                          long expectedMeasurementInterval,
+                                          long expectedMeasurementInterval) {
-                                          boolean isBinarySensor) {
+        CoapEfentoTransportResource.EfentoTelemetry efentoTelemetry = actualEfentoMeasurements.stream()
-        for (int i = 0; i < actualEfentoMeasurements.size(); i++) {
+                .sorted(Comparator.comparing(CoapEfentoTransportResource.EfentoTelemetry::getTs))
-            CoapEfentoTransportResource.EfentoTelemetry actualEfentoMeasurement = actualEfentoMeasurements.get(i);
+                .toList().get(0);
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("serial").getAsString()).isEqualTo(CoapEfentoUtils.convertByteArrayToString(incomingMeasurements.getSerialNum().toByteArray()));
+
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("battery").getAsString()).isEqualTo(incomingMeasurements.getBatteryStatus() ? "ok" : "low");
+        assertThat(efentoTelemetry.getValues().getAsJsonObject().get("serial").getAsString()).isEqualTo(CoapEfentoUtils.convertByteArrayToString(incomingMeasurements.getSerialNumber().toByteArray()));
-            MeasurementsProtos.ProtoChannel protoChannel = incomingMeasurements.getChannelsList().get(0);
+        assertThat(efentoTelemetry.getValues().getAsJsonObject().get("battery").getAsString()).isEqualTo(incomingMeasurements.getBatteryStatus() ? "ok" : "low");
-            long measuredAt = isBinarySensor ?
+        assertThat(efentoTelemetry.getValues().getAsJsonObject().get("next_transmission_at").getAsString()).isEqualTo(convertTimestampToUtcString(TimeUnit.SECONDS.toMillis(incomingMeasurements.getNextTransmissionAt())));
-                    TimeUnit.SECONDS.toMillis(protoChannel.getTimestamp()) + Math.abs(TimeUnit.SECONDS.toMillis(protoChannel.getSampleOffsetsList().get(i))) - 1000 :
+        assertThat(efentoTelemetry.getValues().getAsJsonObject().get("signal").getAsLong()).isEqualTo(incomingMeasurements.getSignal());
-                    TimeUnit.SECONDS.toMillis(protoChannel.getTimestamp() + i * expectedMeasurementInterval);
+        for (int i = 1; i < incomingMeasurements.getChannelsCount() + 1; i++) {
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("measured_at").getAsString()).isEqualTo(convertTimestampToUtcString(measuredAt));
+            assertThat(efentoTelemetry.getValues().getAsJsonObject().get("measurement_interval_" + i).getAsDouble()).isEqualTo(expectedMeasurementInterval);
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("next_transmission_at").getAsString()).isEqualTo(convertTimestampToUtcString(TimeUnit.SECONDS.toMillis(incomingMeasurements.getNextTransmissionAt())));
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("signal").getAsLong()).isEqualTo(incomingMeasurements.getSignal());
-            assertThat(actualEfentoMeasurement.getValues().getAsJsonObject().get("measurement_interval").getAsDouble()).isEqualTo(expectedMeasurementInterval);
         }
     }
 

common/transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/http/src/main/java/org/thingsboard/server/transport/http/DeviceApiController.java

@@ -76,10 +76,6 @@ import java.util.List;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-
-/**
- * @author Andrew Shvayka
- */
 @RestController
 @ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.http.enabled}'=='true')")
 @RequestMapping("/api/v1")

common/transport/http/src/main/java/org/thingsboard/server/transport/http/HttpTransportContext.java

@@ -26,9 +26,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportContext;
 
-/**
- * Created by ashvayka on 04.10.18.
- */
 @Slf4j
 @ConditionalOnExpression("'${service.type:null}'=='tb-transport' || ('${service.type:null}'=='monolith' && '${transport.api_enabled:true}'=='true' && '${transport.http.enabled}'=='true')")
 @Component
@@ -52,4 +49,5 @@ public class HttpTransportContext extends TransportContext {
             }
         };
     }
+
 }

common/transport/lwm2m/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.2.2.1</version>
+        <version>4.2.2.2-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java

@@ -29,6 +29,7 @@ import org.eclipse.leshan.server.californium.bootstrap.LwM2mBootstrapPskStore;
 import org.eclipse.leshan.server.californium.bootstrap.endpoint.CaliforniumBootstrapServerEndpointsProvider;
 import org.eclipse.leshan.server.californium.bootstrap.endpoint.coap.CoapBootstrapServerProtocolProvider;
 import org.eclipse.leshan.server.californium.bootstrap.endpoint.coaps.CoapsBootstrapServerProtocolProvider;
+import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentials;
@@ -55,7 +56,7 @@ import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.se
 @Component
 @TbLwM2mBootstrapTransportComponent
 @RequiredArgsConstructor
-public class LwM2MTransportBootstrapService {
+public class LwM2MTransportBootstrapService implements SmartInitializingSingleton {
 
     private final LwM2MTransportServerConfig serverConfig;
     private final LwM2MTransportBootstrapConfig bootstrapConfig;
@@ -63,7 +64,20 @@ public class LwM2MTransportBootstrapService {
     private final LwM2MInMemoryBootstrapConfigStore lwM2MInMemoryBootstrapConfigStore;
     private final TransportService transportService;
     private final TbLwM2MDtlsBootstrapCertificateVerifier certificateVerifier;
-    private LeshanBootstrapServer server;
+    private volatile LeshanBootstrapServer server;
+
+    @Override
+    public void afterSingletonsInstantiated() {
+        bootstrapConfig.registerServerReloadCallback(() -> {
+            try {
+                log.info("LwM2M Bootstrap certificates reloaded. Recreating bootstrap server...");
+                recreateBootstrapServer();
+                log.info("LwM2M Bootstrap server recreated successfully with new certificates.");
+            } catch (Exception e) {
+                log.error("Failed to recreate LwM2M Bootstrap server after certificate reload", e);
+            }
+        });
+    }
 
     @PostConstruct
     public void init() {
@@ -110,7 +124,7 @@ public class LwM2MTransportBootstrapService {
 
         // Create Californium Configuration
         Configuration serverCoapConfig = endpointsBuilder.createDefaultConfiguration();
-        getCoapConfig(serverCoapConfig, bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(),serverConfig);
+        getCoapConfig(serverCoapConfig, bootstrapConfig.getPort(), bootstrapConfig.getSecurePort(), serverConfig);
         serverCoapConfig.setTransient(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY);
         serverCoapConfig.set(DtlsConfig.DTLS_RECOMMENDED_CIPHER_SUITES_ONLY, serverConfig.isRecommendedCiphers());
         serverCoapConfig.setTransient(DtlsConfig.DTLS_CONNECTION_ID_LENGTH);
@@ -119,7 +133,7 @@ public class LwM2MTransportBootstrapService {
         serverCoapConfig.set(DTLS_RETRANSMISSION_TIMEOUT, serverConfig.getDtlsRetransmissionTimeout(), MILLISECONDS);
 
         if (serverConfig.getDtlsCidLength() != null) {
-            setDtlsConnectorConfigCidLength( serverCoapConfig, serverConfig.getDtlsCidLength());
+            setDtlsConnectorConfigCidLength(serverCoapConfig, serverConfig.getDtlsCidLength());
         }
 
         /* Create DTLS Config */
@@ -164,4 +178,42 @@ public class LwM2MTransportBootstrapService {
             builder.setTrustedCertificates(new X509Certificate[0]);
         }
     }
+
+    private synchronized void recreateBootstrapServer() {
+        LeshanBootstrapServer oldServer = this.server;
+
+        log.info("Creating new LwM2M Bootstrap server with updated certificates...");
+        LeshanBootstrapServer newServer = getLhBootstrapServer();
+
+        // Stop (not destroy) the old server to release ports but keep it restartable for rollback
+        if (oldServer != null) {
+            log.info("Stopping old LwM2M Bootstrap server to release ports...");
+            oldServer.stop();
+        }
+
+        try {
+            newServer.start();
+        } catch (Exception e) {
+            log.error("Failed to start new LwM2M Bootstrap server", e);
+            newServer.destroy();
+            // Attempt to restart the old server (only stopped, not destroyed)
+            if (oldServer != null) {
+                try {
+                    oldServer.start();
+                    log.info("Restored old LwM2M Bootstrap server successfully.");
+                } catch (Exception restoreEx) {
+                    log.error("Failed to restore old LwM2M Bootstrap server", restoreEx);
+                }
+            }
+            throw e;
+        }
+        this.server = newServer;
+        log.info("New LwM2M Bootstrap server started successfully.");
+
+        // Destroy the old server only after a successful swap
+        if (oldServer != null) {
+            oldServer.destroy();
+        }
+    }
+
 }

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportBootstrapConfig.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.transport.lwm2m.config;
 
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +28,9 @@ import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentials;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
 
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 @Slf4j
 @Component
 @ConditionalOnExpression("'${service.type:null}'=='tb-transport' || '${service.type:null}'=='monolith' || '${service.type:null}'=='tb-core'")
@@ -62,8 +66,33 @@ public class LwM2MTransportBootstrapConfig implements LwM2MSecureServerConfig {
     @Qualifier("lwm2mBootstrapCredentials")
     private SslCredentialsConfig credentialsConfig;
 
+    private final List<Runnable> serverReloadCallbacks = new CopyOnWriteArrayList<>();
+
+    @PostConstruct
+    public void init() {
+        credentialsConfig.registerReloadCallback(() -> {
+            log.info("LwM2M Bootstrap DTLS certificates reloaded. Triggering bootstrap server reload...");
+            notifyServerReload();
+        });
+    }
+
+    public void registerServerReloadCallback(Runnable callback) {
+        serverReloadCallbacks.add(callback);
+    }
+
+    private void notifyServerReload() {
+        for (Runnable callback : serverReloadCallbacks) {
+            try {
+                callback.run();
+            } catch (Exception e) {
+                log.error("Error executing LwM2M bootstrap server reload callback", e);
+            }
+        }
+    }
+
     @Override
     public SslCredentials getSslCredentials() {
         return this.credentialsConfig.getCredentials();
     }
+
 }

common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java

@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.transport.lwm2m.config;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -26,11 +28,17 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.common.data.TbProperty;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentials;
 import org.thingsboard.server.common.transport.config.ssl.SslCredentialsConfig;
 
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Component
@@ -38,6 +46,13 @@ import java.util.List;
 @ConfigurationProperties(prefix = "transport.lwm2m")
 public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
 
+    private static final long RELOAD_DEBOUNCE_SECONDS = 2;
+
+    private final List<Runnable> serverReloadCallbacks = new CopyOnWriteArrayList<>();
+    private final ScheduledExecutorService reloadDebouncer = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("lwm2m-reload-debouncer"));
+
+    private volatile ScheduledFuture<?> pendingReload;
+
     @Getter
     @Value("${transport.lwm2m.dtls.retransmission_timeout:9000}")
     private int dtlsRetransmissionTimeout;
@@ -134,6 +149,52 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     @Qualifier("lwm2mTrustCredentials")
     private SslCredentialsConfig trustCredentialsConfig;
 
+    @PostConstruct
+    public void init() {
+        credentialsConfig.registerReloadCallback(() -> {
+            log.info("LwM2M Server DTLS certificates reloaded. Scheduling debounced server reload...");
+            scheduleServerReload();
+        });
+
+        trustCredentialsConfig.registerReloadCallback(() -> {
+            log.info("LwM2M Trust certificates reloaded. Scheduling debounced server reload...");
+            scheduleServerReload();
+        });
+    }
+
+    @PreDestroy
+    public void destroy() {
+        reloadDebouncer.shutdownNow();
+    }
+
+    public void registerServerReloadCallback(Runnable callback) {
+        serverReloadCallbacks.add(callback);
+    }
+
+    /**
+     * Debounces server reload so that if both server and trust credentials change in the same
+     * poll cycle, only the 'single server recreation' is triggered after both are reloaded.
+     */
+    private synchronized void scheduleServerReload() {
+        if (pendingReload != null) {
+            pendingReload.cancel(false);
+        }
+        pendingReload = reloadDebouncer.schedule(() -> {
+            log.info("Debounce window elapsed. Triggering LwM2M server reload...");
+            notifyServerReload();
+        }, RELOAD_DEBOUNCE_SECONDS, TimeUnit.SECONDS);
+    }
+
+    private void notifyServerReload() {
+        for (Runnable callback : serverReloadCallbacks) {
+            try {
+                callback.run();
+            } catch (Exception e) {
+                log.error("Error executing LwM2M server reload callback", e);
+            }
+        }
+    }
+
     @Override
     public SslCredentials getSslCredentials() {
         return this.credentialsConfig.getCredentials();
@@ -142,4 +203,5 @@ public class LwM2MTransportServerConfig implements LwM2MSecureServerConfig {
     public SslCredentials getTrustSslCredentials() {
         return this.trustCredentialsConfig.getCredentials();
     }
+
 }